API tools faq
paste
gusibsd

Untitled

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