4 files changed, 65 insertions, 88 deletions

diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile
index ba79f5f2766e..735134a18588 100644
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@@ -3,11 +3,12 @@
 # Whom:					Glenn Johnson <gljohns@bellsouth.net>
 #
 # $FreeBSD$
-#   $MCom: ports/mail/balsa/Makefile,v 1.10 2007/03/14 17:45:39 marcus Exp $
+#   $MCom: ports/mail/balsa/Makefile,v 1.19 2007/10/11 04:42:18 mezz Exp $
 #
 
 PORTNAME=	balsa
 PORTVERSION=	2.3.17
+PORTREVISION=	2
 CATEGORIES=	mail gnome
 MASTER_SITES=	http://www.theochem.kth.se/~pawsa/balsa/
 DISTNAME=	balsa-${PORTVERSION}
@@ -92,9 +93,7 @@ post-patch:
 	@${REINPLACE_CMD} -E \
 		-e 's|^(HICOLOR_ICON_DIR)[^/]+/|\1=${PREFIX}/|' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
-
-post-install:
-	@${LOCALBASE}/bin/gtk-update-icon-cache -f -q --ignore-theme-index \
-		${PREFIX}/share/gnome/balsa/hicolor
+	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
+		's|-D.*_DISABLE_DEPRECATED_SOURCE||g ; s|-D.*_DISABLE_DEPRECATED||g'
 
 .include <bsd.port.post.mk>
diff --git a/mail/balsa/files/patch-doc_xmldocs.make b/mail/balsa/files/patch-doc_xmldocs.make
deleted file mode 100644
index 9379b0d60628..000000000000
--- a/mail/balsa/files/patch-doc_xmldocs.make
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/xmldocs.make.orig	Wed Sep 18 07:12:20 2002
-+++ doc/xmldocs.make	Tue Oct 29 12:20:37 2002
-@@ -36,7 +36,7 @@
- # ************* Begin of section some packagers may need to modify  **************
- # This variable (docdir) specifies where the documents should be installed.
- # This default value should work for most packages.
--docdir = $(datadir)/gnome/help/$(docname)/$(lang)
-+docdir = $(datadir)/help/$(docname)/$(lang)
- 
- # **************  You should not have to edit below this line  *******************
- xml_files = $(entities) $(docname).xml
diff --git a/mail/balsa/files/patch-src_main.c b/mail/balsa/files/patch-src_main.c
deleted file mode 100644
index 044e51dd98db..000000000000
--- a/mail/balsa/files/patch-src_main.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/main.c.orig	Sun Jan 18 06:39:47 2004
-+++ src/main.c	Sun Jan 18 21:38:15 2004
-@@ -233,7 +233,7 @@
-     gnome_program_init(PACKAGE, VERSION, LIBGNOMEUI_MODULE, argc, argv,
-                        GNOME_PARAM_POPT_TABLE, options,
-                        GNOME_PARAM_APP_PREFIX, BALSA_STD_PREFIX,
--                       GNOME_PARAM_APP_DATADIR, BALSA_STD_PREFIX "/share",
-+                       GNOME_PARAM_APP_DATADIR, BALSA_STD_PREFIX "/share/gnome",
- 		       GNOME_PARAM_HUMAN_READABLE_NAME, _("The Balsa E-Mail Client"),
-                        NULL);
- 
diff --git a/mail/balsa/pkg-plist b/mail/balsa/pkg-plist
index d5bd143b29ac..949aea6c86e3 100644
--- a/mail/balsa/pkg-plist
+++ b/mail/balsa/pkg-plist
@@ -2,53 +2,52 @@ bin/balsa
 bin/balsa-ab
 etc/sound/events/balsa.soundlist
 libdata/bonobo/servers/GNOME_Balsa.server
-share/gnome/applications/balsa.desktop
-share/gnome/balsa/hicolor/16x16/apps/balsa-encrypted.png
-share/gnome/balsa/hicolor/16x16/apps/balsa-mark-all.png
-share/gnome/balsa/hicolor/16x16/apps/balsa-mbox-draft.png
-share/gnome/balsa/hicolor/16x16/apps/balsa-mbox-sent.png
-share/gnome/balsa/hicolor/16x16/apps/balsa-mbox-tray-empty.png
-share/gnome/balsa/hicolor/16x16/apps/balsa-mbox-tray-full.png
-share/gnome/balsa/hicolor/16x16/apps/balsa-next-flagged.png
-share/gnome/balsa/hicolor/16x16/apps/balsa-next-part.png
-share/gnome/balsa/hicolor/16x16/apps/balsa-next-unread.png
-share/gnome/balsa/hicolor/16x16/apps/balsa-next.png
-share/gnome/balsa/hicolor/16x16/apps/balsa-postpone.png
-share/gnome/balsa/hicolor/16x16/apps/balsa-previous-part.png
-share/gnome/balsa/hicolor/16x16/apps/balsa-previous.png
-share/gnome/balsa/hicolor/16x16/apps/balsa-reply-all.png
-share/gnome/balsa/hicolor/16x16/apps/balsa-signature-bad.png
-share/gnome/balsa/hicolor/16x16/apps/balsa-signature-good.png
-share/gnome/balsa/hicolor/16x16/apps/balsa-signature-notrust.png
-share/gnome/balsa/hicolor/16x16/apps/balsa-signature-unknown.png
-share/gnome/balsa/hicolor/22x22
-share/gnome/balsa/hicolor/24x24/apps/balsa-crypt-check.png
-share/gnome/balsa/hicolor/24x24/apps/balsa-encrypt.png
-share/gnome/balsa/hicolor/24x24/apps/balsa-encrypted.png
-share/gnome/balsa/hicolor/24x24/apps/balsa-mark-all.png
-share/gnome/balsa/hicolor/24x24/apps/balsa-marked-new.png
-share/gnome/balsa/hicolor/24x24/apps/balsa-next-flagged.png
-share/gnome/balsa/hicolor/24x24/apps/balsa-next-part.png
-share/gnome/balsa/hicolor/24x24/apps/balsa-next-unread.png
-share/gnome/balsa/hicolor/24x24/apps/balsa-next.png
-share/gnome/balsa/hicolor/24x24/apps/balsa-postpone.png
-share/gnome/balsa/hicolor/24x24/apps/balsa-preview.png
-share/gnome/balsa/hicolor/24x24/apps/balsa-previous-part.png
-share/gnome/balsa/hicolor/24x24/apps/balsa-previous.png
-share/gnome/balsa/hicolor/24x24/apps/balsa-reply-all.png
-share/gnome/balsa/hicolor/24x24/apps/balsa-sign.png
-share/gnome/balsa/hicolor/24x24/apps/balsa-signature-bad.png
-share/gnome/balsa/hicolor/24x24/apps/balsa-signature-good.png
-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
-share/gnome/balsa/pixmaps/attachment.png
-share/gnome/balsa/pixmaps/balsa-logo.png
-share/gnome/balsa/pixmaps/balsa-top.png
-share/gnome/balsa/pixmaps/balsa-watermark.png
-share/gnome/balsa/pixmaps/balsa_icon.png
-share/gnome/balsa/pixmaps/balsa_logo.png
+share/applications/balsa.desktop
+share/balsa/hicolor/16x16/apps/balsa-encrypted.png
+share/balsa/hicolor/16x16/apps/balsa-mark-all.png
+share/balsa/hicolor/16x16/apps/balsa-mbox-draft.png
+share/balsa/hicolor/16x16/apps/balsa-mbox-sent.png
+share/balsa/hicolor/16x16/apps/balsa-mbox-tray-empty.png
+share/balsa/hicolor/16x16/apps/balsa-mbox-tray-full.png
+share/balsa/hicolor/16x16/apps/balsa-next-flagged.png
+share/balsa/hicolor/16x16/apps/balsa-next-part.png
+share/balsa/hicolor/16x16/apps/balsa-next-unread.png
+share/balsa/hicolor/16x16/apps/balsa-next.png
+share/balsa/hicolor/16x16/apps/balsa-postpone.png
+share/balsa/hicolor/16x16/apps/balsa-previous-part.png
+share/balsa/hicolor/16x16/apps/balsa-previous.png
+share/balsa/hicolor/16x16/apps/balsa-reply-all.png
+share/balsa/hicolor/16x16/apps/balsa-signature-bad.png
+share/balsa/hicolor/16x16/apps/balsa-signature-good.png
+share/balsa/hicolor/16x16/apps/balsa-signature-notrust.png
+share/balsa/hicolor/16x16/apps/balsa-signature-unknown.png
+share/balsa/hicolor/22x22
+share/balsa/hicolor/24x24/apps/balsa-crypt-check.png
+share/balsa/hicolor/24x24/apps/balsa-encrypt.png
+share/balsa/hicolor/24x24/apps/balsa-encrypted.png
+share/balsa/hicolor/24x24/apps/balsa-mark-all.png
+share/balsa/hicolor/24x24/apps/balsa-marked-new.png
+share/balsa/hicolor/24x24/apps/balsa-next-flagged.png
+share/balsa/hicolor/24x24/apps/balsa-next-part.png
+share/balsa/hicolor/24x24/apps/balsa-next-unread.png
+share/balsa/hicolor/24x24/apps/balsa-next.png
+share/balsa/hicolor/24x24/apps/balsa-postpone.png
+share/balsa/hicolor/24x24/apps/balsa-preview.png
+share/balsa/hicolor/24x24/apps/balsa-previous-part.png
+share/balsa/hicolor/24x24/apps/balsa-previous.png
+share/balsa/hicolor/24x24/apps/balsa-reply-all.png
+share/balsa/hicolor/24x24/apps/balsa-sign.png
+share/balsa/hicolor/24x24/apps/balsa-signature-bad.png
+share/balsa/hicolor/24x24/apps/balsa-signature-good.png
+share/balsa/hicolor/24x24/apps/balsa-signature-notrust.png
+share/balsa/hicolor/24x24/apps/balsa-signature-unknown.png
+share/balsa/hicolor/24x24/apps/balsa-trash-empty.png
+share/balsa/pixmaps/attachment.png
+share/balsa/pixmaps/balsa-logo.png
+share/balsa/pixmaps/balsa-top.png
+share/balsa/pixmaps/balsa-watermark.png
+share/balsa/pixmaps/balsa_icon.png
+share/balsa/pixmaps/balsa_logo.png
 share/gnome/help/balsa/C/balsa.xml
 share/gnome/help/balsa/C/fdl-appendix.xml
 share/gnome/help/balsa/C/figures/address-book-ldap.png
@@ -69,11 +68,11 @@ share/gnome/help/balsa/C/figures/newmsg-window-toolbar.png
 share/gnome/help/balsa/C/figures/newmsg-window.png
 share/gnome/help/balsa/C/figures/preferences-window.png
 share/gnome/help/balsa/C/figures/spell-check.png
-share/gnome/idl/Balsa.idl
-share/gnome/omf/balsa/balsa-C.omf
-share/gnome/pixmaps/gnome-balsa2.png
-share/gnome/sounds/balsa/newmail.wav
-share/gnome/sounds/balsa/startup.wav
+share/idl/Balsa.idl
+share/omf/balsa/balsa-C.omf
+share/pixmaps/gnome-balsa2.png
+share/sounds/balsa/newmail.wav
+share/sounds/balsa/startup.wav
 share/icons/hicolor/48x48/mimetypes/gnome-mime-application-pgp-signature.png
 share/icons/hicolor/48x48/mimetypes/gnome-mime-application-pkcs7-mime.png
 share/icons/hicolor/48x48/mimetypes/gnome-mime-application-pkcs7-signature.png
@@ -139,19 +138,19 @@ share/locale/wa/LC_MESSAGES/balsa.mo
 share/locale/zh_CN/LC_MESSAGES/balsa.mo
 share/locale/zh_HK/LC_MESSAGES/balsa.mo
 share/locale/zh_TW/LC_MESSAGES/balsa.mo
-@dirrm share/gnome/sounds/balsa
-@dirrm share/gnome/omf/balsa
+@dirrm share/sounds/balsa
+@dirrm share/omf/balsa
 %%GTKICON%%@dirrmtry share/icons/hicolor/48x48/mimetypes
 @dirrm share/gnome/help/balsa/C/figures
 @dirrm share/gnome/help/balsa/C
 @dirrm share/gnome/help/balsa
-@dirrm share/gnome/balsa/pixmaps
-@dirrm share/gnome/balsa/hicolor/24x24/apps
-@dirrm share/gnome/balsa/hicolor/24x24
-@dirrm share/gnome/balsa/hicolor/16x16/apps
-@dirrm share/gnome/balsa/hicolor/16x16
-@dirrm share/gnome/balsa/hicolor
-@dirrm share/gnome/balsa
+@dirrm share/balsa/pixmaps
+@dirrm share/balsa/hicolor/24x24/apps
+@dirrm share/balsa/hicolor/24x24
+@dirrm share/balsa/hicolor/16x16/apps
+@dirrm share/balsa/hicolor/16x16
+@dirrm share/balsa/hicolor
+@dirrm share/balsa
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/rw/LC_MESSAGES
@@ -160,3 +159,4 @@ share/locale/zh_TW/LC_MESSAGES/balsa.mo
 @dirrmtry share/locale/oc
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
+@dirrmtry share/applications