API tools faq
paste
gusibsd

Untitled

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