Update to 2.0.3.

5 files changed, 33 insertions, 47 deletions

diff --git a/mail/balsa2/Makefile b/mail/balsa2/Makefile
index c9a897999871..b28e762d0bf5 100644
--- a/mail/balsa2/Makefile
+++ b/mail/balsa2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	balsa2
-PORTVERSION=	2.0.2
+PORTVERSION=	2.0.3
 CATEGORIES=	mail gnome
 MASTER_SITES=	http://www.theochem.kth.se/~pawsa/balsa/ \
 		ftp://ftp.newton.cx/pub/balsa/
@@ -31,14 +31,14 @@ USE_LIBTOOL=	yes
 USE_PERL5=	yes
 USE_REINPLACE=	yes
 USE_OPENSSL=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gnomeprefix gnomehack
 LIBTOOLFILES=	libmutt/configure
 CONFIGURE_ARGS=	--enable-threads \
 		--enable-gtkhtml \
 		--enable-ldap \
 		--disable-more-warnings \
-		--with-ssl \
-		--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome
+		--with-ssl
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LIBS="-L${LOCALBASE}/lib -liconv"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
@@ -49,9 +49,5 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' \
 			${WRKSRC}/configure ${WRKSRC}/libmutt/configure
-	@${FIND} ${WRKSRC} -name "Makefile.in*" | xargs ${REINPLACE_CMD} -e \
-		's|[(]datadir[)]/gnome/|(datadir)/|g ; \
-		 s|[(]datadir[)]/locale|(prefix)/share/locale|g ; \
-		 s|[(]gnomedatadir[)]/gnome|(gnomedatadir)|g'
 
 .include <bsd.port.mk>
diff --git a/mail/balsa2/distinfo b/mail/balsa2/distinfo
index c9f3edc95a77..fe5b5c4f7e5e 100644
--- a/mail/balsa2/distinfo
+++ b/mail/balsa2/distinfo
@@ -1 +1 @@
-MD5 (balsa-2.0.2.tar.bz2) = 1be2808633666332ab149a43172aabac
+MD5 (balsa-2.0.3.tar.bz2) = 76a8b19117b149387d11a1580e3839b6
diff --git a/mail/balsa2/files/patch-doc_C_Makefile.in b/mail/balsa2/files/patch-doc_C_Makefile.in
index 276e88c2e291..b6c246c864f8 100644
--- a/mail/balsa2/files/patch-doc_C_Makefile.in
+++ b/mail/balsa2/files/patch-doc_C_Makefile.in
@@ -1,14 +1,5 @@
---- doc/C/Makefile.in.orig	Mon Sep 16 02:48:06 2002
-+++ doc/C/Makefile.in	Mon Sep 16 02:48:50 2002
-@@ -208,7 +208,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)/@PACKAGE@/doc/$(docname)/$(lang)
-+docdir = $(prefix)/share/doc/@PACKAGE@/$(docname)/$(lang)
- 
- # **************  You should not have to edit below this line  *******************
- xml_files = $(entities) $(docname).xml
+--- doc/C/Makefile.in.orig	Tue Oct 29 12:16:58 2002
++++ doc/C/Makefile.in	Tue Oct 29 12:18:46 2002
 @@ -218,7 +218,7 @@
  CLEANFILES = omf_timestamp
  
diff --git a/mail/balsa2/files/patch-doc_xmldocs.make b/mail/balsa2/files/patch-doc_xmldocs.make
index 8637e292e7b5..9379b0d60628 100644
--- a/mail/balsa2/files/patch-doc_xmldocs.make
+++ b/mail/balsa2/files/patch-doc_xmldocs.make
@@ -1,11 +1,11 @@
---- doc/xmldocs.make.orig	Mon Sep 16 02:44:11 2002
-+++ doc/xmldocs.make	Mon Sep 16 02:44:32 2002
+--- 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)/@PACKAGE@/doc/$(docname)/$(lang)
-+docdir = $(prefix)/share/doc/@PACKAGE@/$(docname)/$(lang)
+-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/balsa2/pkg-plist b/mail/balsa2/pkg-plist
index 9f1da9bee49e..9cf183b37ffd 100644
--- a/mail/balsa2/pkg-plist
+++ b/mail/balsa2/pkg-plist
@@ -1,24 +1,6 @@
 bin/balsa
 etc/sound/events/balsa.soundlist
 etc/sound/events/email.soundlist
-share/doc/balsa/balsa-manual/C/balsa-manual.xml
-share/doc/balsa/balsa-manual/C/fdl-appendix.xml
-share/doc/balsa/balsa-manual/C/figures/address-book-ldap.png
-share/doc/balsa/balsa-manual/C/figures/address-book-modify.png
-share/doc/balsa/balsa-manual/C/figures/address-book-start.png
-share/doc/balsa/balsa-manual/C/figures/address-book-vcard.png
-share/doc/balsa/balsa-manual/C/figures/address-book.png
-share/doc/balsa/balsa-manual/C/figures/balsa_logo.png
-share/doc/balsa/balsa-manual/C/figures/druid-start.png
-share/doc/balsa/balsa-manual/C/figures/example-alias.png
-share/doc/balsa/balsa-manual/C/figures/figuresdobaaddress-book-modify.png
-share/doc/balsa/balsa-manual/C/figures/main-window-toolbar.png
-share/doc/balsa/balsa-manual/C/figures/main-window.png
-share/doc/balsa/balsa-manual/C/figures/newmsg-window-attachments.png
-share/doc/balsa/balsa-manual/C/figures/newmsg-window-toolbar.png
-share/doc/balsa/balsa-manual/C/figures/newmsg-window.png
-share/doc/balsa/balsa-manual/C/figures/preferences-window.png
-share/doc/balsa/balsa-manual/C/figures/spell-check.png
 share/gnome/applications/balsa.desktop
 share/gnome/balsa/pixmaps/attachment.png
 share/gnome/balsa/pixmaps/balsa-logo.png
@@ -26,8 +8,26 @@ 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/gnome/balsa/pixmaps/gnome-balsa2.png
+share/gnome/help/balsa-manual/C/balsa-manual.xml
+share/gnome/help/balsa-manual/C/fdl-appendix.xml
+share/gnome/help/balsa-manual/C/figures/address-book-ldap.png
+share/gnome/help/balsa-manual/C/figures/address-book-modify.png
+share/gnome/help/balsa-manual/C/figures/address-book-start.png
+share/gnome/help/balsa-manual/C/figures/address-book-vcard.png
+share/gnome/help/balsa-manual/C/figures/address-book.png
+share/gnome/help/balsa-manual/C/figures/balsa_logo.png
+share/gnome/help/balsa-manual/C/figures/druid-start.png
+share/gnome/help/balsa-manual/C/figures/example-alias.png
+share/gnome/help/balsa-manual/C/figures/figuresdobaaddress-book-modify.png
+share/gnome/help/balsa-manual/C/figures/main-window-toolbar.png
+share/gnome/help/balsa-manual/C/figures/main-window.png
+share/gnome/help/balsa-manual/C/figures/newmsg-window-attachments.png
+share/gnome/help/balsa-manual/C/figures/newmsg-window-toolbar.png
+share/gnome/help/balsa-manual/C/figures/newmsg-window.png
+share/gnome/help/balsa-manual/C/figures/preferences-window.png
+share/gnome/help/balsa-manual/C/figures/spell-check.png
 share/gnome/omf/balsa/balsa-manual-C.omf
+share/gnome/pixmaps/gnome-balsa2.png
 share/gnome/sounds/balsa/newmail.wav
 share/gnome/sounds/balsa/startup.wav
 share/locale/az/LC_MESSAGES/balsa.mo
@@ -43,6 +43,7 @@ share/locale/et/LC_MESSAGES/balsa.mo
 share/locale/fi/LC_MESSAGES/balsa.mo
 share/locale/fr/LC_MESSAGES/balsa.mo
 share/locale/ga/LC_MESSAGES/balsa.mo
+share/locale/he/LC_MESSAGES/balsa.mo
 share/locale/hu/LC_MESSAGES/balsa.mo
 share/locale/it/LC_MESSAGES/balsa.mo
 share/locale/ja/LC_MESSAGES/balsa.mo
@@ -68,9 +69,7 @@ share/locale/zh_CN/LC_MESSAGES/balsa.mo
 share/locale/zh_TW/LC_MESSAGES/balsa.mo
 @dirrm share/gnome/sounds/balsa
 @dirrm share/gnome/omf/balsa
+@dirrm share/gnome/help/balsa-manual/C/figures
+@dirrm share/gnome/help/balsa-manual/C
 @dirrm share/gnome/balsa/pixmaps
 @dirrm share/gnome/balsa
-@dirrm share/doc/balsa/balsa-manual/C/figures
-@dirrm share/doc/balsa/balsa-manual/C
-@dirrm share/doc/balsa/balsa-manual
-@dirrm share/doc/balsa