Update to 1.2.3.

PR:		31680
Submitted by:	John Merryweather Cooper <john_m_cooper@yahoo.com>

10 files changed, 62 insertions, 28 deletions

diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile
index a63200e267a5..25502e03f8f5 100644
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	balsa
-PORTVERSION=	1.2.0
+PORTVERSION=	1.2.3
 CATEGORIES=	mail gnome
 MASTER_SITES=	http://www.theochem.kth.se/~pawsa/balsa/ \
 		ftp://ftp.newton.cx/pub/balsa/
@@ -40,7 +40,7 @@ pre-patch:
 		 s|-liconv|-lgiconv|g ; s|iconv_open|libiconv_open|g ; \
 		 s|([^g])iconv.h|\1giconv.h|g' \
 			${WRKSRC}/configure ${WRKSRC}/libmutt/configure
-	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+	@find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \
 		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
 		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g ; \
 		 s|\$\(gnomedatadir\)/gnome|\$\(gnomedatadir\)|g'
diff --git a/mail/balsa/distinfo b/mail/balsa/distinfo
index 1c5a24da68d5..c702b1f53463 100644
--- a/mail/balsa/distinfo
+++ b/mail/balsa/distinfo
@@ -1 +1 @@
-MD5 (balsa-1.2.0.tar.gz) = 8936f2f1ac6356c76cf29b70e1bf8a32
+MD5 (balsa-1.2.3.tar.gz) = 10fe350475b92863da6704a84be6709e
diff --git a/mail/balsa/files/patch-aa b/mail/balsa/files/patch-aa
index 3c8cfe144f46..3bb9576ba09e 100644
--- a/mail/balsa/files/patch-aa
+++ b/mail/balsa/files/patch-aa
@@ -1,11 +1,13 @@
---- src/Makefile.in	Tue Sep 18 07:25:22 2001
-+++ src/Makefile.in.new	Tue Sep 18 16:06:40 2001
-@@ -149,7 +149,7 @@
- 
- CFLAGS = @CFLAGS@ $(PCRE_CFLAGS) 
- 
--balsa_LDADD =  	$(top_builddir)/libbalsa/libbalsa.a		$(top_builddir)/libmutt/imap/libimap.a		$(top_builddir)/libmutt/libmutt.a		$(top_builddir)/libinit_balsa/libinit_balsa.a 	-lpspell 	-lltdl 	$(INTLLIBS) 	$(PCRE_LIBS) 	$(PTHREAD_LIB)
-+balsa_LDADD =  	$(top_builddir)/libbalsa/libbalsa.a		$(top_builddir)/libmutt/imap/libimap.a		$(top_builddir)/libmutt/libmutt.a		$(top_builddir)/libinit_balsa/libinit_balsa.a 	-lpspell 	$(INTLLIBS) 	$(PCRE_LIBS) 	$(PTHREAD_LIB)
- 
- 
- balsa_DEPENDENCIES =  	$(top_builddir)/libbalsa/libbalsa.a		$(top_builddir)/libmutt/libmutt.a	        $(top_builddir)/libmutt/imap/libimap.a		$(top_builddir)/libmutt/libmutt.a		$(top_builddir)/libinit_balsa/libinit_balsa.a
+
+$FreeBSD$
+
+--- src/Makefile.in.orig	Tue Nov  6 12:02:00 2001
++++ src/Makefile.in	Tue Nov  6 12:03:19 2001
+@@ -216,7 +216,6 @@
+ 	$(top_builddir)/libmutt/libmutt.a	\
+ 	$(top_builddir)/libinit_balsa/libinit_balsa.a \
+ 	-lpspell \
+-	-lltdl \
+ 	$(INTLLIBS) \
+ 	$(PCRE_LIBS) \
+ 	$(PTHREAD_LIB)
diff --git a/mail/balsa/files/patch-po::Makefile.in.in b/mail/balsa/files/patch-po::Makefile.in.in
new file mode 100644
index 000000000000..4ef430113ba2
--- /dev/null
+++ b/mail/balsa/files/patch-po::Makefile.in.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- po/Makefile.in.in	2001/11/06 10:04:10	1.1
++++ po/Makefile.in.in	2001/11/06 10:04:27
+@@ -106,7 +106,7 @@
+ 	@catalogs='$(CATALOGS)'; \
+ 	for cat in $$catalogs; do \
+ 	  cat=`basename $$cat`; \
+-	  lang=`echo $$cat | sed 's/\.gmo$$//'`; \
++	  lang=`echo $$cat | sed 's/\.mo$$//'`; \
+ 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
+ 	  $(mkinstalldirs) $(DESTDIR)$$dir; \
+ 	  if test -r $$cat; then \
diff --git a/mail/balsa/pkg-plist b/mail/balsa/pkg-plist
index 676458d08418..65b175efd4e0 100644
--- a/mail/balsa/pkg-plist
+++ b/mail/balsa/pkg-plist
@@ -63,6 +63,7 @@ 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
+share/locale/bg/LC_MESSAGES/balsa.mo
 share/locale/ca/LC_MESSAGES/balsa.mo
 share/locale/cs/LC_MESSAGES/balsa.mo
 share/locale/da/LC_MESSAGES/balsa.mo
diff --git a/mail/balsa2/Makefile b/mail/balsa2/Makefile
index a63200e267a5..25502e03f8f5 100644
--- a/mail/balsa2/Makefile
+++ b/mail/balsa2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	balsa
-PORTVERSION=	1.2.0
+PORTVERSION=	1.2.3
 CATEGORIES=	mail gnome
 MASTER_SITES=	http://www.theochem.kth.se/~pawsa/balsa/ \
 		ftp://ftp.newton.cx/pub/balsa/
@@ -40,7 +40,7 @@ pre-patch:
 		 s|-liconv|-lgiconv|g ; s|iconv_open|libiconv_open|g ; \
 		 s|([^g])iconv.h|\1giconv.h|g' \
 			${WRKSRC}/configure ${WRKSRC}/libmutt/configure
-	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+	@find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \
 		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
 		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g ; \
 		 s|\$\(gnomedatadir\)/gnome|\$\(gnomedatadir\)|g'
diff --git a/mail/balsa2/distinfo b/mail/balsa2/distinfo
index 1c5a24da68d5..c702b1f53463 100644
--- a/mail/balsa2/distinfo
+++ b/mail/balsa2/distinfo
@@ -1 +1 @@
-MD5 (balsa-1.2.0.tar.gz) = 8936f2f1ac6356c76cf29b70e1bf8a32
+MD5 (balsa-1.2.3.tar.gz) = 10fe350475b92863da6704a84be6709e
diff --git a/mail/balsa2/files/patch-aa b/mail/balsa2/files/patch-aa
index 3c8cfe144f46..3bb9576ba09e 100644
--- a/mail/balsa2/files/patch-aa
+++ b/mail/balsa2/files/patch-aa
@@ -1,11 +1,13 @@
---- src/Makefile.in	Tue Sep 18 07:25:22 2001
-+++ src/Makefile.in.new	Tue Sep 18 16:06:40 2001
-@@ -149,7 +149,7 @@
- 
- CFLAGS = @CFLAGS@ $(PCRE_CFLAGS) 
- 
--balsa_LDADD =  	$(top_builddir)/libbalsa/libbalsa.a		$(top_builddir)/libmutt/imap/libimap.a		$(top_builddir)/libmutt/libmutt.a		$(top_builddir)/libinit_balsa/libinit_balsa.a 	-lpspell 	-lltdl 	$(INTLLIBS) 	$(PCRE_LIBS) 	$(PTHREAD_LIB)
-+balsa_LDADD =  	$(top_builddir)/libbalsa/libbalsa.a		$(top_builddir)/libmutt/imap/libimap.a		$(top_builddir)/libmutt/libmutt.a		$(top_builddir)/libinit_balsa/libinit_balsa.a 	-lpspell 	$(INTLLIBS) 	$(PCRE_LIBS) 	$(PTHREAD_LIB)
- 
- 
- balsa_DEPENDENCIES =  	$(top_builddir)/libbalsa/libbalsa.a		$(top_builddir)/libmutt/libmutt.a	        $(top_builddir)/libmutt/imap/libimap.a		$(top_builddir)/libmutt/libmutt.a		$(top_builddir)/libinit_balsa/libinit_balsa.a
+
+$FreeBSD$
+
+--- src/Makefile.in.orig	Tue Nov  6 12:02:00 2001
++++ src/Makefile.in	Tue Nov  6 12:03:19 2001
+@@ -216,7 +216,6 @@
+ 	$(top_builddir)/libmutt/libmutt.a	\
+ 	$(top_builddir)/libinit_balsa/libinit_balsa.a \
+ 	-lpspell \
+-	-lltdl \
+ 	$(INTLLIBS) \
+ 	$(PCRE_LIBS) \
+ 	$(PTHREAD_LIB)
diff --git a/mail/balsa2/files/patch-po::Makefile.in.in b/mail/balsa2/files/patch-po::Makefile.in.in
new file mode 100644
index 000000000000..4ef430113ba2
--- /dev/null
+++ b/mail/balsa2/files/patch-po::Makefile.in.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- po/Makefile.in.in	2001/11/06 10:04:10	1.1
++++ po/Makefile.in.in	2001/11/06 10:04:27
+@@ -106,7 +106,7 @@
+ 	@catalogs='$(CATALOGS)'; \
+ 	for cat in $$catalogs; do \
+ 	  cat=`basename $$cat`; \
+-	  lang=`echo $$cat | sed 's/\.gmo$$//'`; \
++	  lang=`echo $$cat | sed 's/\.mo$$//'`; \
+ 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
+ 	  $(mkinstalldirs) $(DESTDIR)$$dir; \
+ 	  if test -r $$cat; then \
diff --git a/mail/balsa2/pkg-plist b/mail/balsa2/pkg-plist
index 676458d08418..65b175efd4e0 100644
--- a/mail/balsa2/pkg-plist
+++ b/mail/balsa2/pkg-plist
@@ -63,6 +63,7 @@ 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
+share/locale/bg/LC_MESSAGES/balsa.mo
 share/locale/ca/LC_MESSAGES/balsa.mo
 share/locale/cs/LC_MESSAGES/balsa.mo
 share/locale/da/LC_MESSAGES/balsa.mo