API tools faq
paste
gusibsd

Untitled

gusibsd
May 28th, 2014
203
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 36.82 KB | None | 0 0
raw download clone embed print report
  1. diff -ruN /usr/ports/mail/balsa/Makefile ./Makefile
  2. --- /usr/ports/mail/balsa/Makefile 2014-05-03 16:36:41.749590144 +0000
  3. +++ ./Makefile 2014-05-28 13:40:24.276368993 +0000
  4. @@ -1,94 +1,65 @@
  5. # Created by: Glenn Johnson <[email protected]>
  6. -# $FreeBSD: head/mail/balsa/Makefile 331057 2013-10-20 19:20:15Z jhale $
  7. -# $MCom: ports-stable/mail/balsa/Makefile,v 1.3 2007/12/02 19:18:50 marcus Exp $
  8. +# $FreeBSD$
  9. +# $MCom$
  10.  
  11. PORTNAME= balsa
  12. -PORTVERSION= 2.4.8
  13. -PORTREVISION= 7
  14. +PORTVERSION= 2.5.1
  15. CATEGORIES= mail gnome
  16. MASTER_SITES= http://pawsa.fedorapeople.org/balsa/
  17. -DISTNAME= balsa-${PORTVERSION}
  18.  
  19. MAINTAINER= [email protected]
  20. COMMENT= A mail reader for the GNOME 2 desktop
  21.  
  22. -LIB_DEPENDS= aspell:${PORTSDIR}/textproc/aspell \
  23. - pcre:${PORTSDIR}/devel/pcre \
  24. - esmtp:${PORTSDIR}/mail/libesmtp \
  25. - gmime-2.4:${PORTSDIR}/mail/gmime24 \
  26. - gnome-keyring:${PORTSDIR}/security/gnome-keyring \
  27. - canberra-gtk:${PORTSDIR}/audio/libcanberra
  28. -
  29. -USE_BZIP2= yes
  30. -INSTALLS_OMF= yes
  31. +BUILD_DEPENDS= gnome-keyring:${PORTSDIR}/security/gnome-keyring \
  32. + itstool:${PORTSDIR}/textproc/itstool \
  33. + yelp-tools>=0:${PORTSDIR}/textproc/yelp-tools
  34. +LIB_DEPENDS= libaspell.so:${PORTSDIR}/textproc/aspell \
  35. + libpcre.so:${PORTSDIR}/devel/pcre \
  36. + libesmtp.so:${PORTSDIR}/mail/libesmtp \
  37. + libgmime-2.6.so:${PORTSDIR}/mail/gmime26 \
  38. + libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3
  39. +RUN_DEPENDS= gnome-keyring:${PORTSDIR}/security/gnome-keyring
  40. +
  41. +# Depends on gtkhtml4 (which is being abandonend). When our webkitgtk3
  42. +# in ports gets updated to > 1.10.x, balsa should depend on it.
  43. +USES= desktop-file-utils gettext gmake iconv pathfix \
  44. + perl5 pkgconfig tar:bzip2
  45. +USE_GNOME= gnomeprefix gtkhtml4 intlhack libxslt
  46. INSTALLS_ICONS= yes
  47. USE_OPENSSL= yes
  48. -USES= pathfix gettext iconv perl5 pkgconfig gmake
  49. -USE_GNOME= gnomeprefix intlhack libgnomeui gtkhtml3 \
  50. - libgnomeprintui
  51. -USE_AUTOTOOLS= libltdl
  52. GNU_CONFIGURE= yes
  53. CONFIGURE_ARGS= --enable-threads \
  54. --disable-more-warnings \
  55. --with-ssl \
  56. --without-nm \
  57. + --with-html-widget=gtkhtml4 \
  58. --with-canberra
  59. CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${ICONV_LIB} ${PTHREAD_LIBS}"
  60. CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
  61.  
  62. -MAN1= balsa.1
  63. -
  64. +OPTIONS_SUB= yes
  65. OPTIONS_DEFINE= LDAP GTKSPELL GTKSV NOTIFY GPG
  66. OPTIONS_DEFAULT=LDAP GTKSPELL GTKSV NOTIFY
  67. GTKSPELL_DESC= Spell checking support
  68. GTKSV_DESC= GtkSourceview support
  69. GPG_DESC= GnuPG support
  70. -
  71. -NO_STAGE= yes
  72. -.include <bsd.port.options.mk>
  73. -
  74. -.if ${PORT_OPTIONS:MGPG}
  75. -LIB_DEPENDS+= gpgme:${PORTSDIR}/security/gpgme
  76. -CONFIGURE_ARGS+= --with-gpgme=${LOCALBASE}/bin/gpgme-config
  77. -.endif
  78. -
  79. -.if ${PORT_OPTIONS:MLDAP}
  80. -USE_OPENLDAP= yes
  81. -CONFIGURE_ARGS+= --with-ldap
  82. -.endif
  83. -
  84. -.if ${PORT_OPTIONS:MGTKSPELL}
  85. -LIB_DEPENDS+= gtkspell:${PORTSDIR}/textproc/gtkspell
  86. -CONFIGURE_ARGS+=--with-gtkspell
  87. -.endif
  88. -
  89. -.if ${PORT_OPTIONS:MGTKSV}
  90. -USE_GNOME+= gtksourceview2
  91. -CONFIGURE_ARGS+=--with-gtksourceview=2
  92. -.endif
  93. -
  94. -.if ${PORT_OPTIONS:MNOTIFY}
  95. -LIB_DEPENDS+= notify:${PORTSDIR}/devel/libnotify
  96. -CONFIGURE_ARGS+=--with-libnotify=yes
  97. -.else
  98. -CONFIGURE_ARGS+=--with-libnotify=no
  99. -.endif
  100. +GPG_CONFIGURE_WITH= gpgme
  101. +GPG_LIB_DEPENDS= libgpgme.so:${PORTSDIR}/security/gpgme
  102. +LDAP_USE= OPENLDAP=yes
  103. +LDAP_CONFIGURE_WITH= ldap
  104. +LDAP_LIB_DEPENDS= libldap.so:${PORTSDIR}/net/openldap24-client
  105. +GTKSPELL_CONFIGURE_WITH= gtkspell
  106. +GTKSPELL_LIB_DEPENDS= libgtkspell3-3.so:${PORTSDIR}/textproc/gtkspell3
  107. +GTKSV_USE= GNOME=gtksourceview3
  108. +GTKSV_CONFIGURE_WITH= gtksourceview
  109. +NOTIFY_CONFIGURE_WITH= libnotify
  110. +NOTIFY_LIB_DEPENDS= libnotify.so:${PORTSDIR}/devel/libnotify
  111.  
  112. .include <bsd.port.pre.mk>
  113.  
  114. -.if ${PREFIX}==${LOCALBASE}
  115. -PLIST_SUB+= GTKICON="@comment "
  116. -.else
  117. -PLIST_SUB+= GTKICON=""
  118. -.endif
  119. -
  120. post-patch:
  121. @${REINPLACE_CMD} -e 's|stdint.h|inttypes.h|g' \
  122. ${WRKSRC}/libbalsa/mailbox_imap.c
  123. -# PREFIX safeness
  124. - @${REINPLACE_CMD} -E \
  125. - -e 's|^(HICOLOR_ICON_DIR)[^/]+/|\1=${PREFIX}/|' \
  126. - ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
  127. @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
  128. 's|-D.*_DISABLE_DEPRECATED_SOURCE||g ; s|-D.*_DISABLE_DEPRECATED||g'
  129.  
  130. diff -ruN /usr/ports/mail/balsa/distinfo ./distinfo
  131. --- /usr/ports/mail/balsa/distinfo 2014-05-03 16:36:41.754590079 +0000
  132. +++ ./distinfo 2014-04-30 13:04:39.929329390 +0000
  133. @@ -1,2 +1,2 @@
  134. -SHA256 (balsa-2.4.8.tar.bz2) = 9b313920b754656f6c668f29675fd5630b001f4a3405f00fd9bf58d9b1f213cf
  135. -SIZE (balsa-2.4.8.tar.bz2) = 3150866
  136. +SHA256 (balsa-2.5.1.tar.bz2) = 52ce445dca86eb42e2e402a5b76616a1a522b89acbb631215079022ef80a7a10
  137. +SIZE (balsa-2.5.1.tar.bz2) = 3898061
  138. diff -ruN /usr/ports/mail/balsa/files/patch-configure ./files/patch-configure
  139. --- /usr/ports/mail/balsa/files/patch-configure 2014-05-03 16:36:55.471589192 +0000
  140. +++ ./files/patch-configure 2014-04-30 13:56:55.584113486 +0000
  141. @@ -1,227 +1,47 @@
  142. ---- configure.orig 2010-02-14 15:51:21.000000000 -0500
  143. -+++ configure 2010-02-14 15:51:21.000000000 -0500
  144. -@@ -8884,7 +8884,7 @@ if test "${ac_cv_lib_ldap_ldap_search+se
  145. +--- configure.orig 2014-04-30 13:56:20.982115758 +0000
  146. ++++ configure 2014-04-30 13:56:44.128114528 +0000
  147. +@@ -15038,7 +15038,7 @@
  148. + conftest$ac_exeext conftest.$ac_ext
  149. + if test $have_res_init = no ; then
  150. + save_LIBS=$LIBS
  151. +- LIBS="$LIBS -lresolv"
  152. ++ LIBS="$LIBS"
  153. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  154. + /* end confdefs.h. */
  155. + #include <resolv.h>
  156. +@@ -16088,7 +16088,7 @@
  157. $as_echo_n "(cached) " >&6
  158. else
  159. ac_check_lib_save_LIBS=$LIBS
  160. -LIBS="-lldap -llber -lresolv $LIBS"
  161. +LIBS="-lldap -llber $LIBS"
  162. - cat >conftest.$ac_ext <<_ACEOF
  163. - /* confdefs.h. */
  164. - _ACEOF
  165. -@@ -8949,7 +8949,7 @@ cat >>confdefs.h <<\_ACEOF
  166. - #define ENABLE_LDAP 1
  167. - _ACEOF
  168. -
  169. -- LIBS="-lldap -llber -lresolv $LIBS"
  170. -+ LIBS="-lldap -llber $LIBS"
  171. - else
  172. - { { $as_echo "$as_me:$LINENO: error: *** You enabled LDAP but ldap library is not found." >&5
  173. - $as_echo "$as_me: error: *** You enabled LDAP but ldap library is not found." >&2;}
  174. -@@ -11365,13 +11365,13 @@ _ACEOF
  175. - else
  176. -
  177. -
  178. --{ $as_echo "$as_me:$LINENO: checking for new_pspell_manager in -lpspell" >&5
  179. --$as_echo_n "checking for new_pspell_manager in -lpspell... " >&6; }
  180. --if test "${ac_cv_lib_pspell_new_pspell_manager+set}" = set; then
  181. -+{ $as_echo "$as_me:$LINENO: checking for new_aspell_manager in -laspell" >&5
  182. -+$as_echo_n "checking for new_aspell_manager in -laspell... " >&6; }
  183. -+if test "${ac_cv_lib_aspell_new_aspell_manager+set}" = set; then
  184. - $as_echo_n "(cached) " >&6
  185. - else
  186. - ac_check_lib_save_LIBS=$LIBS
  187. --LIBS="-lpspell -lstdc++ -lpspell-modules $LIBS"
  188. -+LIBS="-laspell -lstdc++ -laspell-modules $LIBS"
  189. - cat >conftest.$ac_ext <<_ACEOF
  190. - /* confdefs.h. */
  191. - _ACEOF
  192. -@@ -11385,11 +11385,11 @@ cat >>conftest.$ac_ext <<_ACEOF
  193. - #ifdef __cplusplus
  194. - extern "C"
  195. - #endif
  196. --char new_pspell_manager ();
  197. -+char new_aspell_manager ();
  198. - int
  199. - main ()
  200. - {
  201. --return new_pspell_manager ();
  202. -+return new_aspell_manager ();
  203. - ;
  204. - return 0;
  205. - }
  206. -@@ -11415,12 +11415,12 @@ $as_echo "$ac_try_echo") >&5
  207. - test "$cross_compiling" = yes ||
  208. - $as_test_x conftest$ac_exeext
  209. - }; then
  210. -- ac_cv_lib_pspell_new_pspell_manager=yes
  211. -+ ac_cv_lib_aspell_new_aspell_manager=yes
  212. - else
  213. - $as_echo "$as_me: failed program was:" >&5
  214. - sed 's/^/| /' conftest.$ac_ext >&5
  215. -
  216. -- ac_cv_lib_pspell_new_pspell_manager=no
  217. -+ ac_cv_lib_aspell_new_aspell_manager=no
  218. - fi
  219. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  220. + /* end confdefs.h. */
  221.  
  222. - rm -rf conftest.dSYM
  223. -@@ -11428,19 +11428,19 @@ rm -f core conftest.err conftest.$ac_obj
  224. - conftest$ac_exeext conftest.$ac_ext
  225. - LIBS=$ac_check_lib_save_LIBS
  226. - fi
  227. --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pspell_new_pspell_manager" >&5
  228. --$as_echo "$ac_cv_lib_pspell_new_pspell_manager" >&6; }
  229. --if test "x$ac_cv_lib_pspell_new_pspell_manager" = x""yes; then
  230. -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_aspell_new_aspell_manager" >&5
  231. -+$as_echo "$ac_cv_lib_aspell_new_aspell_manager" >&6; }
  232. -+if test "x$ac_cv_lib_aspell_new_aspell_manager" = x""yes; then
  233. - cat >>confdefs.h <<_ACEOF
  234. - #define HAVE_LIBPSPELL 1
  235. - _ACEOF
  236. +@@ -16122,7 +16122,7 @@
  237.  
  238. -- LIBS="-lpspell $LIBS"
  239. -+ LIBS="-laspell $LIBS"
  240. + $as_echo "#define ENABLE_LDAP 1" >>confdefs.h
  241.  
  242. +- LIBS="-lldap -llber -lresolv $LIBS"
  243. ++ LIBS="-lldap -llber $LIBS"
  244. else
  245. -
  246. -- { { $as_echo "$as_me:$LINENO: error: *** Neither aspell >=0.50 (recommended) nor pspell (deprecated) library was found. Please check http://balsa.gnome.org for information on the required files. Alternatively, check config.log for clues." >&5
  247. --$as_echo "$as_me: error: *** Neither aspell >=0.50 (recommended) nor pspell (deprecated) library was found. Please check http://balsa.gnome.org for information on the required files. Alternatively, check config.log for clues." >&2;}
  248. -+ { { $as_echo "$as_me:$LINENO: error: *** Neither aspell >=0.50 (recommended) nor aspell (deprecated) library was found. Please check http://balsa.gnome.org for information on the required files. Alternatively, check config.log for clues." >&5
  249. -+$as_echo "$as_me: error: *** Neither aspell >=0.50 (recommended) nor aspell (deprecated) library was found. Please check http://balsa.gnome.org for information on the required files. Alternatively, check config.log for clues." >&2;}
  250. - { (exit 1); exit 1; }; }
  251. -
  252. + as_fn_error $? "*** You enabled LDAP but ldap library is not found." "$LINENO" 5
  253. fi
  254. -@@ -11448,18 +11448,18 @@ fi
  255. +@@ -18071,8 +18071,6 @@
  256.  
  257. - fi
  258.  
  259. -- if test "${ac_cv_header_pspell_pspell_h+set}" = set; then
  260. -- { $as_echo "$as_me:$LINENO: checking for pspell/pspell.h" >&5
  261. --$as_echo_n "checking for pspell/pspell.h... " >&6; }
  262. --if test "${ac_cv_header_pspell_pspell_h+set}" = set; then
  263. -+ if test "${ac_cv_header_aspell_aspell_h+set}" = set; then
  264. -+ { $as_echo "$as_me:$LINENO: checking for aspell/aspell.h" >&5
  265. -+$as_echo_n "checking for aspell/aspell.h... " >&6; }
  266. -+if test "${ac_cv_header_aspell_aspell_h+set}" = set; then
  267. - $as_echo_n "(cached) " >&6
  268. - fi
  269. --{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_pspell_pspell_h" >&5
  270. --$as_echo "$ac_cv_header_pspell_pspell_h" >&6; }
  271. -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_aspell_aspell_h" >&5
  272. -+$as_echo "$ac_cv_header_aspell_aspell_h" >&6; }
  273. - else
  274. - # Is the header compilable?
  275. --{ $as_echo "$as_me:$LINENO: checking pspell/pspell.h usability" >&5
  276. --$as_echo_n "checking pspell/pspell.h usability... " >&6; }
  277. -+{ $as_echo "$as_me:$LINENO: checking aspell/aspell.h usability" >&5
  278. -+$as_echo_n "checking aspell/aspell.h usability... " >&6; }
  279. - cat >conftest.$ac_ext <<_ACEOF
  280. - /* confdefs.h. */
  281. - _ACEOF
  282. -@@ -11467,7 +11467,7 @@ cat confdefs.h >>conftest.$ac_ext
  283. - cat >>conftest.$ac_ext <<_ACEOF
  284. - /* end confdefs.h. */
  285. - $ac_includes_default
  286. --#include <pspell/pspell.h>
  287. -+#include <aspell/aspell.h>
  288. - _ACEOF
  289. - rm -f conftest.$ac_objext
  290. - if { (ac_try="$ac_compile"
  291. -@@ -11500,15 +11500,15 @@ rm -f core conftest.err conftest.$ac_obj
  292. - $as_echo "$ac_header_compiler" >&6; }
  293. -
  294. - # Is the header present?
  295. --{ $as_echo "$as_me:$LINENO: checking pspell/pspell.h presence" >&5
  296. --$as_echo_n "checking pspell/pspell.h presence... " >&6; }
  297. -+{ $as_echo "$as_me:$LINENO: checking aspell/aspell.h presence" >&5
  298. -+$as_echo_n "checking aspell/aspell.h presence... " >&6; }
  299. - cat >conftest.$ac_ext <<_ACEOF
  300. - /* confdefs.h. */
  301. - _ACEOF
  302. - cat confdefs.h >>conftest.$ac_ext
  303. - cat >>conftest.$ac_ext <<_ACEOF
  304. - /* end confdefs.h. */
  305. --#include <pspell/pspell.h>
  306. -+#include <aspell/aspell.h>
  307. - _ACEOF
  308. - if { (ac_try="$ac_cpp conftest.$ac_ext"
  309. - case "(($ac_try" in
  310. -@@ -11542,44 +11542,44 @@ $as_echo "$ac_header_preproc" >&6; }
  311. - # So? What about this header?
  312. - case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
  313. - yes:no: )
  314. -- { $as_echo "$as_me:$LINENO: WARNING: pspell/pspell.h: accepted by the compiler, rejected by the preprocessor!" >&5
  315. --$as_echo "$as_me: WARNING: pspell/pspell.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
  316. -- { $as_echo "$as_me:$LINENO: WARNING: pspell/pspell.h: proceeding with the compiler's result" >&5
  317. --$as_echo "$as_me: WARNING: pspell/pspell.h: proceeding with the compiler's result" >&2;}
  318. -+ { $as_echo "$as_me:$LINENO: WARNING: aspell/aspell.h: accepted by the compiler, rejected by the preprocessor!" >&5
  319. -+$as_echo "$as_me: WARNING: aspell/aspell.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
  320. -+ { $as_echo "$as_me:$LINENO: WARNING: aspell/aspell.h: proceeding with the compiler's result" >&5
  321. -+$as_echo "$as_me: WARNING: aspell/aspell.h: proceeding with the compiler's result" >&2;}
  322. - ac_header_preproc=yes
  323. - ;;
  324. - no:yes:* )
  325. -- { $as_echo "$as_me:$LINENO: WARNING: pspell/pspell.h: present but cannot be compiled" >&5
  326. --$as_echo "$as_me: WARNING: pspell/pspell.h: present but cannot be compiled" >&2;}
  327. -- { $as_echo "$as_me:$LINENO: WARNING: pspell/pspell.h: check for missing prerequisite headers?" >&5
  328. --$as_echo "$as_me: WARNING: pspell/pspell.h: check for missing prerequisite headers?" >&2;}
  329. -- { $as_echo "$as_me:$LINENO: WARNING: pspell/pspell.h: see the Autoconf documentation" >&5
  330. --$as_echo "$as_me: WARNING: pspell/pspell.h: see the Autoconf documentation" >&2;}
  331. -- { $as_echo "$as_me:$LINENO: WARNING: pspell/pspell.h: section \"Present But Cannot Be Compiled\"" >&5
  332. --$as_echo "$as_me: WARNING: pspell/pspell.h: section \"Present But Cannot Be Compiled\"" >&2;}
  333. -- { $as_echo "$as_me:$LINENO: WARNING: pspell/pspell.h: proceeding with the preprocessor's result" >&5
  334. --$as_echo "$as_me: WARNING: pspell/pspell.h: proceeding with the preprocessor's result" >&2;}
  335. -- { $as_echo "$as_me:$LINENO: WARNING: pspell/pspell.h: in the future, the compiler will take precedence" >&5
  336. --$as_echo "$as_me: WARNING: pspell/pspell.h: in the future, the compiler will take precedence" >&2;}
  337. -+ { $as_echo "$as_me:$LINENO: WARNING: aspell/aspell.h: present but cannot be compiled" >&5
  338. -+$as_echo "$as_me: WARNING: aspell/aspell.h: present but cannot be compiled" >&2;}
  339. -+ { $as_echo "$as_me:$LINENO: WARNING: aspell/aspell.h: check for missing prerequisite headers?" >&5
  340. -+$as_echo "$as_me: WARNING: aspell/aspell.h: check for missing prerequisite headers?" >&2;}
  341. -+ { $as_echo "$as_me:$LINENO: WARNING: aspell/aspell.h: see the Autoconf documentation" >&5
  342. -+$as_echo "$as_me: WARNING: aspell/aspell.h: see the Autoconf documentation" >&2;}
  343. -+ { $as_echo "$as_me:$LINENO: WARNING: aspell/aspell.h: section \"Present But Cannot Be Compiled\"" >&5
  344. -+$as_echo "$as_me: WARNING: aspell/aspell.h: section \"Present But Cannot Be Compiled\"" >&2;}
  345. -+ { $as_echo "$as_me:$LINENO: WARNING: aspell/aspell.h: proceeding with the preprocessor's result" >&5
  346. -+$as_echo "$as_me: WARNING: aspell/aspell.h: proceeding with the preprocessor's result" >&2;}
  347. -+ { $as_echo "$as_me:$LINENO: WARNING: aspell/aspell.h: in the future, the compiler will take precedence" >&5
  348. -+$as_echo "$as_me: WARNING: aspell/aspell.h: in the future, the compiler will take precedence" >&2;}
  349. -
  350. - ;;
  351. - esac
  352. --{ $as_echo "$as_me:$LINENO: checking for pspell/pspell.h" >&5
  353. --$as_echo_n "checking for pspell/pspell.h... " >&6; }
  354. --if test "${ac_cv_header_pspell_pspell_h+set}" = set; then
  355. -+{ $as_echo "$as_me:$LINENO: checking for aspell/aspell.h" >&5
  356. -+$as_echo_n "checking for aspell/aspell.h... " >&6; }
  357. -+if test "${ac_cv_header_aspell_aspell_h+set}" = set; then
  358. - $as_echo_n "(cached) " >&6
  359. - else
  360. -- ac_cv_header_pspell_pspell_h=$ac_header_preproc
  361. -+ ac_cv_header_aspell_aspell_h=$ac_header_preproc
  362. - fi
  363. --{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_pspell_pspell_h" >&5
  364. --$as_echo "$ac_cv_header_pspell_pspell_h" >&6; }
  365. -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_aspell_aspell_h" >&5
  366. -+$as_echo "$ac_cv_header_aspell_aspell_h" >&6; }
  367.  
  368. - fi
  369. --if test "x$ac_cv_header_pspell_pspell_h" = x""yes; then
  370. -+if test "x$ac_cv_header_aspell_aspell_h" = x""yes; then
  371. - :
  372. - else
  373. -- { { $as_echo "$as_me:$LINENO: error: ** aspell/pspell library found but not related header files. This probably means corresponding aspell-devel package is not installed " >&5
  374. --$as_echo "$as_me: error: ** aspell/pspell library found but not related header files. This probably means corresponding aspell-devel package is not installed " >&2;}
  375. -+ { { $as_echo "$as_me:$LINENO: error: ** aspell/aspell library found but not related header files. This probably means corresponding aspell-devel package is not installed " >&5
  376. -+$as_echo "$as_me: error: ** aspell/aspell library found but not related header files. This probably means corresponding aspell-devel package is not installed " >&2;}
  377. - { (exit 1); exit 1; }; }
  378. +-$as_echo "#define _XOPEN_SOURCE 500" >>confdefs.h
  379. +-
  380. + ac_fn_c_check_decl "$LINENO" "localtime_r" "ac_cv_have_decl_localtime_r" "#include <time.h>
  381. + "
  382. + if test "x$ac_cv_have_decl_localtime_r" = xyes; then :
  383. +@@ -18339,7 +18337,7 @@
  384. + INSTALL_MIME_ICONS_FALSE=
  385. fi
  386.  
  387. -@@ -11882,7 +11882,7 @@ fi
  388. +-HICOLOR_ICON_DIR=`$PKG_CONFIG --variable=prefix gtk+-3.0`/share/icons/hicolor
  389. ++HICOLOR_ICON_DIR=/usr/local/share/icons/hicolor
  390.  
  391.  
  392. - cat >>confdefs.h <<\_ACEOF
  393. --#define _XOPEN_SOURCE 500
  394. -+/*#define _XOPEN_SOURCE 500*/
  395. - _ACEOF
  396.  
  397. - { $as_echo "$as_me:$LINENO: checking whether localtime_r is declared" >&5
  398. diff -ruN /usr/ports/mail/balsa/files/patch-libbalsa_information.c ./files/patch-libbalsa_information.c
  399. --- /usr/ports/mail/balsa/files/patch-libbalsa_information.c 2014-01-23 09:19:47.649167975 +0000
  400. +++ ./files/patch-libbalsa_information.c 1970-01-01 00:00:00.000000000 +0000
  401. @@ -1,11 +0,0 @@
  402. ---- libbalsa/information.c.orig 2011-08-16 13:30:24.000000000 +0200
  403. -+++ libbalsa/information.c 2011-08-16 13:30:48.000000000 +0200
  404. -@@ -122,7 +122,7 @@ libbalsa_information_varg(GtkWindow *par
  405. - g_free(msg);
  406. -
  407. - note =
  408. -- notify_notification_new("Balsa", escaped->str, icon_str, NULL);
  409. -+ notify_notification_new("Balsa", escaped->str, icon_str);
  410. - g_string_free(escaped, TRUE);
  411. -
  412. - notify_notification_set_timeout(note, 7000); /* 7 seconds */
  413. diff -ruN /usr/ports/mail/balsa/files/patch-libbalsa_mailbox_mh.c ./files/patch-libbalsa_mailbox_mh.c
  414. --- /usr/ports/mail/balsa/files/patch-libbalsa_mailbox_mh.c 2014-05-03 16:36:55.492589219 +0000
  415. +++ ./files/patch-libbalsa_mailbox_mh.c 2014-04-30 13:49:58.740141348 +0000
  416. @@ -1,5 +1,5 @@
  417. ---- libbalsa/mailbox_mh.c.orig Wed May 16 13:49:05 2007
  418. -+++ libbalsa/mailbox_mh.c Thu May 31 01:09:09 2007
  419. +--- libbalsa/mailbox_mh.c.orig 2013-03-04 19:36:37.000000000 +0000
  420. ++++ libbalsa/mailbox_mh.c 2014-04-30 13:49:32.084143219 +0000
  421. @@ -27,6 +27,8 @@
  422. /* to compile this on BSD/Darwin */
  423. #undef _POSIX_SOURCE
  424. @@ -18,7 +18,7 @@
  425. };
  426.  
  427. #define REAL_FLAGS(flags) (flags & LIBBALSA_MESSAGE_FLAGS_REAL)
  428. -@@ -260,7 +262,7 @@ libbalsa_mailbox_mh_load_config(LibBalsa
  429. +@@ -261,7 +263,7 @@
  430.  
  431. #define MH_BASENAME(msg_info) \
  432. g_strdup_printf((msg_info->orig_flags & LIBBALSA_MESSAGE_FLAG_DELETED) ? \
  433. @@ -27,7 +27,7 @@
  434.  
  435. static GMimeStream *
  436. libbalsa_mailbox_mh_get_message_stream(LibBalsaMailbox * mailbox,
  437. -@@ -335,7 +337,7 @@ static gint
  438. +@@ -336,7 +338,7 @@
  439. lbm_mh_compare_fileno(const struct message_info ** a,
  440. const struct message_info ** b)
  441. {
  442. @@ -36,7 +36,7 @@
  443. }
  444.  
  445. static void
  446. -@@ -352,7 +354,7 @@ lbm_mh_parse_mailbox(LibBalsaMailboxMh *
  447. +@@ -353,7 +355,7 @@
  448.  
  449. while ((filename = g_dir_read_name(dir)) != NULL) {
  450. LibBalsaMessageFlag delete_flag = 0;
  451. @@ -45,12 +45,12 @@
  452.  
  453. if (filename[0] == ',') {
  454. filename++;
  455. -@@ -361,22 +363,22 @@ lbm_mh_parse_mailbox(LibBalsaMailboxMh *
  456. +@@ -362,22 +364,22 @@
  457. if (lbm_mh_check_filename(filename) == FALSE)
  458. continue;
  459.  
  460. -- if (sscanf(filename, "%d", &fileno) != 1)
  461. -+ if (sscanf(filename, "%d", &mh_fileno) != 1)
  462. +- if (sscanf(filename, "%10d", &fileno) != 1)
  463. ++ if (sscanf(filename, "%10d", &mh_fileno) != 1)
  464. break; /* FIXME report error? */
  465. - if (fileno > mh->last_fileno)
  466. - mh->last_fileno = fileno;
  467. @@ -74,7 +74,7 @@
  468. }
  469. msg_info->orig_flags = delete_flag;
  470. }
  471. -@@ -394,17 +396,17 @@ static const gchar *LibBalsaMailboxMhRep
  472. +@@ -395,17 +397,17 @@
  473. static const gchar *LibBalsaMailboxMhRecent = "recent:";
  474.  
  475. static void
  476. @@ -96,7 +96,7 @@
  477. return;
  478. }
  479.  
  480. -@@ -433,7 +435,7 @@ lbm_mh_handle_seq_line(LibBalsaMailboxMh
  481. +@@ -434,7 +436,7 @@
  482.  
  483. for (seq = sequences; *seq; seq++) {
  484. guint end = 0;
  485. @@ -105,12 +105,12 @@
  486.  
  487. if (!**seq)
  488. continue;
  489. -@@ -444,11 +446,11 @@ lbm_mh_handle_seq_line(LibBalsaMailboxMh
  490. - if (sscanf(line, "%d", &end) != 1)
  491. +@@ -445,11 +447,11 @@
  492. + if (sscanf(line, "%10d", &end) != 1)
  493. break; /* FIXME report error? */
  494. }
  495. -- if (sscanf(*seq, "%d", &fileno) != 1)
  496. -+ if (sscanf(*seq, "%d", &mh_fileno) != 1)
  497. +- if (sscanf(*seq, "%10d", &fileno) != 1)
  498. ++ if (sscanf(*seq, "%10d", &mh_fileno) != 1)
  499. break; /* FIXME report error? */
  500. do
  501. - lbm_mh_set_flag(mh, fileno, flag);
  502. @@ -120,7 +120,7 @@
  503. }
  504.  
  505. g_strfreev(sequences);
  506. -@@ -580,7 +582,7 @@ lbm_mh_check(LibBalsaMailboxMh * mh, con
  507. +@@ -581,7 +583,7 @@
  508. sequences = g_strsplit(p, " ", 0);
  509. for (seq = sequences; *seq; seq++) {
  510. guint end = 0;
  511. @@ -129,12 +129,12 @@
  512.  
  513. if (!**seq)
  514. continue;
  515. -@@ -591,15 +593,15 @@ lbm_mh_check(LibBalsaMailboxMh * mh, con
  516. - if (sscanf(p, "%d", &end) != 1)
  517. +@@ -592,15 +594,15 @@
  518. + if (sscanf(p, "%10d", &end) != 1)
  519. break; /* FIXME report error? */
  520. }
  521. -- if (sscanf(*seq, "%d", &fileno) != 1)
  522. -+ if (sscanf(*seq, "%d", &mh_fileno) != 1)
  523. +- if (sscanf(*seq, "%10d", &fileno) != 1)
  524. ++ if (sscanf(*seq, "%10d", &mh_fileno) != 1)
  525. break; /* FIXME report error? */
  526. do {
  527. - p = g_strdup_printf("%s/%d", path, fileno);
  528. @@ -148,7 +148,7 @@
  529. }
  530. g_strfreev(sequences);
  531. break;
  532. -@@ -686,7 +688,7 @@ libbalsa_mailbox_mh_check(LibBalsaMailbo
  533. +@@ -687,7 +689,7 @@
  534. else {
  535. g_ptr_array_remove(mh->msgno_2_msg_info, msg_info);
  536. g_hash_table_remove(mh->messages_info,
  537. @@ -157,7 +157,7 @@
  538. libbalsa_mailbox_local_msgno_removed(mailbox, msgno);
  539. if (renumber > msgno)
  540. /* First message that needs renumbering. */
  541. -@@ -763,11 +765,11 @@ lbm_mh_flag_line(struct message_info *ms
  542. +@@ -764,11 +766,11 @@
  543. if (!(msg_info->local_info.flags & flag))
  544. return;
  545.  
  546. @@ -172,7 +172,7 @@
  547. }
  548.  
  549. static gboolean
  550. -@@ -849,7 +851,7 @@ libbalsa_mailbox_mh_sync(LibBalsaMailbox
  551. +@@ -850,7 +852,7 @@
  552. /* free old information */
  553. g_ptr_array_remove(mh->msgno_2_msg_info, msg_info);
  554. g_hash_table_remove(mh->messages_info,
  555. @@ -181,7 +181,7 @@
  556. libbalsa_mailbox_local_msgno_removed(mailbox, msgno);
  557. } else {
  558. lbm_mh_flag_line(msg_info, LIBBALSA_MESSAGE_FLAG_NEW, &unseen);
  559. -@@ -1038,7 +1040,7 @@ libbalsa_mailbox_mh_fetch_message_struct
  560. +@@ -1039,7 +1041,7 @@
  561. * we'll just add new lines and let the next sync merge them with any
  562. * existing lines. */
  563. static void
  564. @@ -190,7 +190,7 @@
  565. LibBalsaMessageFlag flags)
  566. {
  567. FILE *fp;
  568. -@@ -1049,13 +1051,13 @@ lbm_mh_update_sequences(LibBalsaMailboxM
  569. +@@ -1050,13 +1052,13 @@
  570. return;
  571.  
  572. if (flags & LIBBALSA_MESSAGE_FLAG_NEW)
  573. @@ -208,7 +208,7 @@
  574. fclose(fp);
  575. }
  576.  
  577. -@@ -1072,7 +1074,7 @@ libbalsa_mailbox_mh_add_message(LibBalsa
  578. +@@ -1073,7 +1075,7 @@
  579. int fd;
  580. GMimeStream *out_stream;
  581. GMimeFilter *crlffilter;
  582. @@ -217,7 +217,7 @@
  583. int retries;
  584. GMimeStream *in_stream;
  585.  
  586. -@@ -1115,14 +1117,14 @@ libbalsa_mailbox_mh_add_message(LibBalsa
  587. +@@ -1116,14 +1118,14 @@
  588. libbalsa_mime_stream_shared_unlock(stream);
  589. g_object_unref(in_stream);
  590.  
  591. @@ -234,7 +234,7 @@
  592. rename_status = libbalsa_safe_rename(tmp, new_filename);
  593. g_free(new_filename);
  594. if (rename_status != -1)
  595. -@@ -1145,9 +1147,9 @@ libbalsa_mailbox_mh_add_message(LibBalsa
  596. +@@ -1146,9 +1148,9 @@
  597. "Too high activity?");
  598. return FALSE;
  599. }
  600. diff -ruN /usr/ports/mail/balsa/files/patch-src_main-window.c ./files/patch-src_main-window.c
  601. --- /usr/ports/mail/balsa/files/patch-src_main-window.c 2014-01-23 09:19:47.653168582 +0000
  602. +++ ./files/patch-src_main-window.c 1970-01-01 00:00:00.000000000 +0000
  603. @@ -1,11 +0,0 @@
  604. ---- src/main-window.c.orig 2011-08-16 13:32:27.000000000 +0200
  605. -+++ src/main-window.c 2011-08-16 13:33:10.000000000 +0200
  606. -@@ -3406,7 +3406,7 @@ bw_display_new_mail_notification(int num
  607. - } else {
  608. - num_total = num_new;
  609. - balsa_app.main_window->new_mail_note =
  610. -- notify_notification_new("Balsa", NULL, NULL, NULL);
  611. -+ notify_notification_new("Balsa", NULL, NULL);
  612. - g_object_add_weak_pointer(G_OBJECT(balsa_app.main_window->
  613. - new_mail_note),
  614. - (gpointer) & balsa_app.main_window->
  615. diff -ruN /usr/ports/mail/balsa/files/patch-src_main-window.h ./files/patch-src_main-window.h
  616. --- /usr/ports/mail/balsa/files/patch-src_main-window.h 1970-01-01 00:00:00.000000000 +0000
  617. +++ ./files/patch-src_main-window.h 2014-04-30 17:56:54.591121491 +0000
  618. @@ -0,0 +1,11 @@
  619. +--- src/main-window.h.orig 2014-04-30 17:56:08.057123807 +0000
  620. ++++ src/main-window.h 2014-04-30 17:56:29.581127225 +0000
  621. +@@ -28,6 +28,8 @@
  622. + #include <libnotify/notify.h>
  623. + #endif
  624. +
  625. ++#include <glib.h>
  626. ++
  627. + #if GLIB_CHECK_VERSION(2, 32, 0)
  628. + #include <gio/gio.h>
  629. + #elif defined(HAVE_LIBNM_GLIB)
  630. diff -ruN /usr/ports/mail/balsa/pkg-plist ./pkg-plist
  631. --- /usr/ports/mail/balsa/pkg-plist 2014-05-03 16:36:41.764590231 +0000
  632. +++ ./pkg-plist 2014-05-28 11:54:45.006193236 +0000
  633. @@ -1,10 +1,11 @@
  634. bin/balsa
  635. bin/balsa-ab
  636. etc/sound/events/balsa.soundlist
  637. -libdata/bonobo/servers/GNOME_Balsa.server
  638. +man/man1/balsa.1.gz
  639. +share/applications/balsa-mailto-handler.desktop
  640. share/applications/balsa.desktop
  641. -share/balsa/gtksourceview-2.0/balsa-mail-style.xml
  642. -share/balsa/gtksourceview-2.0/balsa-mail.lang
  643. +%%GTKSV%%share/balsa/gtksourceview-2.0/balsa-mail-style.xml
  644. +%%GTKSV%%share/balsa/gtksourceview-2.0/balsa-mail.lang
  645. share/balsa/hicolor/16x16/apps/balsa-drop-down.png
  646. share/balsa/hicolor/16x16/apps/balsa-encrypted.png
  647. share/balsa/hicolor/16x16/apps/balsa-mark-all.png
  648. @@ -62,72 +63,94 @@
  649. share/balsa/hicolor/24x24/apps/stock_mail.png
  650. share/balsa/hicolor/24x24/apps/stock_view-fields.png
  651. share/balsa/pixmaps/attachment.png
  652. -share/balsa/pixmaps/balsa-logo.png
  653. share/balsa/pixmaps/balsa-top.png
  654. -share/balsa/pixmaps/balsa-watermark.png
  655. share/balsa/pixmaps/balsa_icon.png
  656. share/balsa/pixmaps/balsa_logo.png
  657. -share/gnome/help/balsa/C/balsa.xml
  658. -share/gnome/help/balsa/C/figures/address-book-ldap.png
  659. -share/gnome/help/balsa/C/figures/address-book-modify.png
  660. -share/gnome/help/balsa/C/figures/address-book-vcard.png
  661. -share/gnome/help/balsa/C/figures/address-book.png
  662. -share/gnome/help/balsa/C/figures/balsa_logo.png
  663. -share/gnome/help/balsa/C/figures/druid-start.png
  664. -share/gnome/help/balsa/C/figures/example-alias.png
  665. -share/gnome/help/balsa/C/figures/figuresdobaaddress-book-modify.png
  666. -share/gnome/help/balsa/C/figures/main-window-toolbar.png
  667. -share/gnome/help/balsa/C/figures/main-window.png
  668. -share/gnome/help/balsa/C/figures/message-window.png
  669. -share/gnome/help/balsa/C/figures/msg-part-select.png
  670. -share/gnome/help/balsa/C/figures/newmsg-window-attachments.png
  671. -share/gnome/help/balsa/C/figures/newmsg-window-toolbar.png
  672. -share/gnome/help/balsa/C/figures/newmsg-window.png
  673. -share/gnome/help/balsa/C/figures/preferences-window.png
  674. -share/gnome/help/balsa/C/figures/spell-check.png
  675. -share/gnome/help/balsa/de/balsa.xml
  676. -share/gnome/help/balsa/de/figures/address-book-ldap.png
  677. -share/gnome/help/balsa/de/figures/address-book-modify.png
  678. -share/gnome/help/balsa/de/figures/address-book-vcard.png
  679. -share/gnome/help/balsa/de/figures/address-book.png
  680. -share/gnome/help/balsa/de/figures/balsa_logo.png
  681. -share/gnome/help/balsa/de/figures/druid-start.png
  682. -share/gnome/help/balsa/de/figures/example-alias.png
  683. -share/gnome/help/balsa/de/figures/figuresdobaaddress-book-modify.png
  684. -share/gnome/help/balsa/de/figures/main-window-toolbar.png
  685. -share/gnome/help/balsa/de/figures/main-window.png
  686. -share/gnome/help/balsa/de/figures/message-window.png
  687. -share/gnome/help/balsa/de/figures/msg-part-select.png
  688. -share/gnome/help/balsa/de/figures/newmsg-window-attachments.png
  689. -share/gnome/help/balsa/de/figures/newmsg-window-toolbar.png
  690. -share/gnome/help/balsa/de/figures/newmsg-window.png
  691. -share/gnome/help/balsa/de/figures/preferences-window.png
  692. -share/gnome/help/balsa/de/figures/spell-check.png
  693. -share/gnome/help/balsa/es/balsa.xml
  694. -share/gnome/help/balsa/es/figures/address-book-ldap.png
  695. -share/gnome/help/balsa/es/figures/address-book-modify.png
  696. -share/gnome/help/balsa/es/figures/address-book-vcard.png
  697. -share/gnome/help/balsa/es/figures/address-book.png
  698. -share/gnome/help/balsa/es/figures/balsa_logo.png
  699. -share/gnome/help/balsa/es/figures/druid-start.png
  700. -share/gnome/help/balsa/es/figures/example-alias.png
  701. -share/gnome/help/balsa/es/figures/figuresdobaaddress-book-modify.png
  702. -share/gnome/help/balsa/es/figures/main-window-toolbar.png
  703. -share/gnome/help/balsa/es/figures/main-window.png
  704. -share/gnome/help/balsa/es/figures/message-window.png
  705. -share/gnome/help/balsa/es/figures/msg-part-select.png
  706. -share/gnome/help/balsa/es/figures/newmsg-window-attachments.png
  707. -share/gnome/help/balsa/es/figures/newmsg-window-toolbar.png
  708. -share/gnome/help/balsa/es/figures/newmsg-window.png
  709. -share/gnome/help/balsa/es/figures/preferences-window.png
  710. -share/gnome/help/balsa/es/figures/spell-check.png
  711. -share/idl/Balsa.idl
  712. -share/omf/balsa/balsa-C.omf
  713. -share/omf/balsa/balsa-de.omf
  714. -share/omf/balsa/balsa-es.omf
  715. -share/pixmaps/gnome-balsa2.png
  716. -share/sounds/balsa/newmail.wav
  717. -share/sounds/balsa/startup.wav
  718. +share/help/C/balsa/figures/address-book-ldap.png
  719. +share/help/C/balsa/figures/address-book-modify.png
  720. +share/help/C/balsa/figures/address-book-vcard.png
  721. +share/help/C/balsa/figures/address-book.png
  722. +share/help/C/balsa/figures/balsa_logo.png
  723. +share/help/C/balsa/figures/druid-start.png
  724. +share/help/C/balsa/figures/example-alias.png
  725. +share/help/C/balsa/figures/figuresdobaaddress-book-modify.png
  726. +share/help/C/balsa/figures/main-window-toolbar.png
  727. +share/help/C/balsa/figures/main-window.png
  728. +share/help/C/balsa/figures/message-window.png
  729. +share/help/C/balsa/figures/msg-part-select.png
  730. +share/help/C/balsa/figures/newmsg-window-attachments.png
  731. +share/help/C/balsa/figures/newmsg-window-toolbar.png
  732. +share/help/C/balsa/figures/newmsg-window.png
  733. +share/help/C/balsa/figures/preferences-window.png
  734. +share/help/C/balsa/figures/spell-check.png
  735. +share/help/de/balsa/figures/address-book-ldap.png
  736. +share/help/de/balsa/figures/address-book-modify.png
  737. +share/help/de/balsa/figures/address-book-vcard.png
  738. +share/help/de/balsa/figures/address-book.png
  739. +share/help/de/balsa/figures/balsa_logo.png
  740. +share/help/de/balsa/figures/druid-start.png
  741. +share/help/de/balsa/figures/example-alias.png
  742. +share/help/de/balsa/figures/figuresdobaaddress-book-modify.png
  743. +share/help/de/balsa/figures/main-window-toolbar.png
  744. +share/help/de/balsa/figures/main-window.png
  745. +share/help/de/balsa/figures/message-window.png
  746. +share/help/de/balsa/figures/msg-part-select.png
  747. +share/help/de/balsa/figures/newmsg-window-attachments.png
  748. +share/help/de/balsa/figures/newmsg-window-toolbar.png
  749. +share/help/de/balsa/figures/newmsg-window.png
  750. +share/help/de/balsa/figures/preferences-window.png
  751. +share/help/de/balsa/figures/spell-check.png
  752. +share/help/es/balsa/figures/address-book-ldap.png
  753. +share/help/es/balsa/figures/address-book-modify.png
  754. +share/help/es/balsa/figures/address-book-vcard.png
  755. +share/help/es/balsa/figures/address-book.png
  756. +share/help/es/balsa/figures/balsa_logo.png
  757. +share/help/es/balsa/figures/druid-start.png
  758. +share/help/es/balsa/figures/example-alias.png
  759. +share/help/es/balsa/figures/figuresdobaaddress-book-modify.png
  760. +share/help/es/balsa/figures/main-window-toolbar.png
  761. +share/help/es/balsa/figures/main-window.png
  762. +share/help/es/balsa/figures/message-window.png
  763. +share/help/es/balsa/figures/msg-part-select.png
  764. +share/help/es/balsa/figures/newmsg-window-attachments.png
  765. +share/help/es/balsa/figures/newmsg-window-toolbar.png
  766. +share/help/es/balsa/figures/newmsg-window.png
  767. +share/help/es/balsa/figures/preferences-window.png
  768. +share/help/es/balsa/figures/spell-check.png
  769. +share/help/fr/balsa/figures/address-book-ldap.png
  770. +share/help/fr/balsa/figures/address-book-modify.png
  771. +share/help/fr/balsa/figures/address-book-vcard.png
  772. +share/help/fr/balsa/figures/address-book.png
  773. +share/help/fr/balsa/figures/balsa_logo.png
  774. +share/help/fr/balsa/figures/druid-start.png
  775. +share/help/fr/balsa/figures/example-alias.png
  776. +share/help/fr/balsa/figures/figuresdobaaddress-book-modify.png
  777. +share/help/fr/balsa/figures/main-window-toolbar.png
  778. +share/help/fr/balsa/figures/main-window.png
  779. +share/help/fr/balsa/figures/message-window.png
  780. +share/help/fr/balsa/figures/msg-part-select.png
  781. +share/help/fr/balsa/figures/newmsg-window-attachments.png
  782. +share/help/fr/balsa/figures/newmsg-window-toolbar.png
  783. +share/help/fr/balsa/figures/newmsg-window.png
  784. +share/help/fr/balsa/figures/preferences-window.png
  785. +share/help/fr/balsa/figures/spell-check.png
  786. +share/help/sl/balsa/figures/address-book-ldap.png
  787. +share/help/sl/balsa/figures/address-book-modify.png
  788. +share/help/sl/balsa/figures/address-book-vcard.png
  789. +share/help/sl/balsa/figures/address-book.png
  790. +share/help/sl/balsa/figures/balsa_logo.png
  791. +share/help/sl/balsa/figures/druid-start.png
  792. +share/help/sl/balsa/figures/example-alias.png
  793. +share/help/sl/balsa/figures/figuresdobaaddress-book-modify.png
  794. +share/help/sl/balsa/figures/main-window-toolbar.png
  795. +share/help/sl/balsa/figures/main-window.png
  796. +share/help/sl/balsa/figures/message-window.png
  797. +share/help/sl/balsa/figures/msg-part-select.png
  798. +share/help/sl/balsa/figures/newmsg-window-attachments.png
  799. +share/help/sl/balsa/figures/newmsg-window-toolbar.png
  800. +share/help/sl/balsa/figures/newmsg-window.png
  801. +share/help/sl/balsa/figures/preferences-window.png
  802. +share/help/sl/balsa/figures/spell-check.png
  803. share/icons/hicolor/48x48/mimetypes/gnome-mime-application-pgp-signature.png
  804. share/icons/hicolor/48x48/mimetypes/gnome-mime-application-pkcs7-mime.png
  805. share/icons/hicolor/48x48/mimetypes/gnome-mime-application-pkcs7-signature.png
  806. @@ -142,7 +165,6 @@
  807. share/locale/am/LC_MESSAGES/balsa.mo
  808. share/locale/ar/LC_MESSAGES/balsa.mo
  809. share/locale/az/LC_MESSAGES/balsa.mo
  810. -share/locale/be/LC_MESSAGES/balsa.mo
  811. share/locale/bg/LC_MESSAGES/balsa.mo
  812. share/locale/ca/LC_MESSAGES/balsa.mo
  813. share/locale/cs/LC_MESSAGES/balsa.mo
  814. @@ -188,7 +210,7 @@
  815. share/locale/sl/LC_MESSAGES/balsa.mo
  816. share/locale/sq/LC_MESSAGES/balsa.mo
  817. share/locale/sr/LC_MESSAGES/balsa.mo
  818. -share/locale/sr@Latn/LC_MESSAGES/balsa.mo
  819. +share/locale/sr@latin/LC_MESSAGES/balsa.mo
  820. share/locale/sv/LC_MESSAGES/balsa.mo
  821. share/locale/tr/LC_MESSAGES/balsa.mo
  822. share/locale/uk/LC_MESSAGES/balsa.mo
  823. @@ -197,24 +219,9 @@
  824. share/locale/zh_CN/LC_MESSAGES/balsa.mo
  825. share/locale/zh_HK/LC_MESSAGES/balsa.mo
  826. share/locale/zh_TW/LC_MESSAGES/balsa.mo
  827. -@dirrm share/sounds/balsa
  828. -@dirrm share/omf/balsa
  829. -%%GTKICON%%@dirrmtry share/icons/hicolor/48x48/mimetypes
  830. -@dirrm share/gnome/help/balsa/es/figures
  831. -@dirrm share/gnome/help/balsa/es
  832. -@dirrm share/gnome/help/balsa/de/figures
  833. -@dirrm share/gnome/help/balsa/de
  834. -@dirrm share/gnome/help/balsa/C/figures
  835. -@dirrm share/gnome/help/balsa/C
  836. -@dirrm share/gnome/help/balsa
  837. -@dirrm share/balsa/pixmaps
  838. -@dirrm share/balsa/hicolor/24x24/apps
  839. -@dirrm share/balsa/hicolor/24x24
  840. -@dirrm share/balsa/hicolor/16x16/apps
  841. -@dirrm share/balsa/hicolor/16x16
  842. -@dirrm share/balsa/hicolor
  843. -@dirrm share/balsa/gtksourceview-2.0
  844. -@dirrm share/balsa
  845. +share/pixmaps/gnome-balsa2.png
  846. +share/sounds/balsa/newmail.wav
  847. +share/sounds/balsa/startup.wav
  848. @dirrmtry share/locale/zh_HK/LC_MESSAGES
  849. @dirrmtry share/locale/zh_HK
  850. @dirrmtry share/locale/rw/LC_MESSAGES
  851. @@ -223,3 +230,29 @@
  852. @dirrmtry share/locale/oc
  853. @dirrmtry share/locale/dz/LC_MESSAGES
  854. @dirrmtry share/locale/dz
  855. +@dirrmtry share/icons/hicolor/48x48/mimetypes
  856. +@dirrm share/help/sl/balsa/figures
  857. +@dirrm share/help/sl/balsa
  858. +@dirrmtry share/help/sl
  859. +@dirrm share/help/fr/balsa/figures
  860. +@dirrm share/help/fr/balsa
  861. +@dirrmtry share/help/fr
  862. +@dirrm share/help/es/balsa/figures
  863. +@dirrm share/help/es/balsa
  864. +@dirrmtry share/help/es
  865. +@dirrm share/help/de/balsa/figures
  866. +@dirrm share/help/de/balsa
  867. +@dirrmtry share/help/de
  868. +@dirrm share/help/C/balsa/figures
  869. +@dirrm share/help/C/balsa
  870. +@dirrmtry share/help/C
  871. +@dirrmtry share/help
  872. +@dirrm share/sounds/balsa
  873. +@dirrm share/balsa/pixmaps
  874. +@dirrm share/balsa/hicolor/16x16/apps
  875. +@dirrm share/balsa/hicolor/16x16
  876. +@dirrm share/balsa/hicolor/24x24/apps
  877. +@dirrm share/balsa/hicolor/24x24
  878. +@dirrm share/balsa/hicolor
  879. +%%GTKSV%%@dirrm share/balsa/gtksourceview-2.0
  880. +@dirrm share/balsa
Advertisement
Add Comment
Please, Sign In to add comment
Public Pastes
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!