Update to 2.3.4

Approved by:	marcus

4 files changed, 16 insertions, 17 deletions

diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile
index f40dc720f0c5..5bcf560169c3 100644
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	balsa
-PORTVERSION=	2.3.2
+PORTVERSION=	2.3.4
 CATEGORIES=	mail gnome
 MASTER_SITES=	http://www.theochem.kth.se/~pawsa/balsa/
 DISTNAME=	balsa-${PORTVERSION}
@@ -39,6 +39,8 @@ CONFIGURE_ARGS=	--enable-threads \
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LIBS="-L${LOCALBASE}/lib -liconv"
 
+INSTALLS_OMF=	balsa-C.omf
+
 MAN1=		balsa.1
 
 OPTIONS=	LDAP "Enable LDAP support" on \
@@ -59,6 +61,10 @@ CONFIGURE_ARGS+=	--with-ldap
 post-patch:
 	@${REINPLACE_CMD} -e 's|stdint.h|inttypes.h|g' \
 		${WRKSRC}/libbalsa/mailbox_imap.c
+# PREFIX safeness
+	@${REINPLACE_CMD} -E \
+		-e 's|^(HICOLOR_ICON_DIR)[^/]+/|\1=${PREFIX}/|' \
+		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 
 post-install:
 	-@gtk-update-icon-cache ${X11BASE}/share/icons/hicolor
diff --git a/mail/balsa/distinfo b/mail/balsa/distinfo
index 386a971f98a5..c5e0bcb6f7ef 100644
--- a/mail/balsa/distinfo
+++ b/mail/balsa/distinfo
@@ -1,2 +1,2 @@
-MD5 (balsa-2.3.2.tar.bz2) = ab4d6febaca56d72d13acef819da193b
-SIZE (balsa-2.3.2.tar.bz2) = 3064995
+MD5 (balsa-2.3.4.tar.bz2) = 12b1ffb936ac679468adb33b422b72d8
+SIZE (balsa-2.3.4.tar.bz2) = 3137183
diff --git a/mail/balsa/files/patch-libbalsa_address-book-ldap.c b/mail/balsa/files/patch-libbalsa_address-book-ldap.c
deleted file mode 100644
index 0123de35d06e..000000000000
--- a/mail/balsa/files/patch-libbalsa_address-book-ldap.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- libbalsa/address-book-ldap.c.orig	Tue May  3 01:46:59 2005
-+++ libbalsa/address-book-ldap.c	Tue May  3 01:47:51 2005
-@@ -41,6 +41,7 @@
- #include "address-book-ldap.h"
- #include "information.h"
- #include "libbalsa-conf.h"
-+#include "i18n.h"
- 
- static const int DEBUG_LDAP = 0;
- /* don't search when prefix has length shorter than LDAP_MIN_LEN */
diff --git a/mail/balsa/pkg-plist b/mail/balsa/pkg-plist
index 236be2b39c4e..cc578ba96f7b 100644
--- a/mail/balsa/pkg-plist
+++ b/mail/balsa/pkg-plist
@@ -43,7 +43,7 @@ share/gnome/balsa/hicolor/24x24/apps/balsa-signature-notrust.png
 share/gnome/balsa/hicolor/24x24/apps/balsa-signature-unknown.png
 share/gnome/balsa/hicolor/24x24/apps/balsa-trash-empty.png
 share/gnome/balsa/hicolor/icon-theme.cache
-@exec gtk-update-icon-cache %%X11BASE%%/share/icons/hicolor > /dev/null || /usr/bin/true
+@exec gtk-update-icon-cache %D/share/icons/hicolor 2>/dev/null || true
 share/gnome/balsa/pixmaps/attachment.png
 share/gnome/balsa/pixmaps/balsa-logo.png
 share/gnome/balsa/pixmaps/balsa-top.png
@@ -128,13 +128,16 @@ share/locale/sr/LC_MESSAGES/balsa.mo
 share/locale/sr@Latn/LC_MESSAGES/balsa.mo
 share/locale/sv/LC_MESSAGES/balsa.mo
 share/locale/tr/LC_MESSAGES/balsa.mo
-share/locale/vi/LC_MESSAGES/balsa.mo
 share/locale/uk/LC_MESSAGES/balsa.mo
+share/locale/vi/LC_MESSAGES/balsa.mo
 share/locale/wa/LC_MESSAGES/balsa.mo
 share/locale/zh_CN/LC_MESSAGES/balsa.mo
 share/locale/zh_TW/LC_MESSAGES/balsa.mo
+@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/rw 2>/dev/null || true
 @dirrm share/gnome/sounds/balsa
 @dirrm share/gnome/omf/balsa
+@unexec rmdir %D/share/icons/hicolor/48x48/mimetypes 2>/dev/null || true
 @dirrm share/gnome/help/balsa/C/figures
 @dirrm share/gnome/help/balsa/C
 @dirrm share/gnome/help/balsa
@@ -145,5 +148,5 @@ share/locale/zh_TW/LC_MESSAGES/balsa.mo
 @dirrm share/gnome/balsa/hicolor/16x16
 @dirrm share/gnome/balsa/hicolor
 @dirrm share/gnome/balsa
-@comment @unexec gtk-update-icon-cache %%X11BASE%%/share/icons/hicolor > /dev/null || /usr/bin/true
-@unexec rm -f %%X11BASE%%/share/icons/hicolor/icon-theme.cache
+@unexec rm -f %D/share/icons/hicolor/icon-theme.cache 2>/dev/null || true
+@unexec gtk-update-icon-cache %D/share/icons/hicolor 2>/dev/null || true