Add balsa2 after a repo copy from balsa. balsa2 is a mail reader (still

quite unstable) for the GNOME 2 desktop environment.

12 files changed, 124 insertions, 156 deletions

diff --git a/mail/Makefile b/mail/Makefile
index ede6960bf000..679525811c4e 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -10,6 +10,7 @@
     SUBDIR += autorespond
     SUBDIR += autosig
     SUBDIR += balsa
+    SUBDIR += balsa2
     SUBDIR += bbmail
     SUBDIR += biabam
     SUBDIR += biffer
diff --git a/mail/balsa2/Makefile b/mail/balsa2/Makefile
index 853a88007d7a..b9cc4bd2f72e 100644
--- a/mail/balsa2/Makefile
+++ b/mail/balsa2/Makefile
@@ -1,47 +1,55 @@
-# New ports collection makefile for:	balsa
-# Date created:				02 December 1998
-# Whom:					Glenn Johnson <gljohns@bellsouth.net>
+# New ports collection makefile for:	balsa2
+# Date created:				19 June 2002
+# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	balsa
-PORTVERSION=	1.3.6
+PORTVERSION=	2.0.1
 CATEGORIES=	mail gnome
 MASTER_SITES=	http://www.theochem.kth.se/~pawsa/balsa/ \
 		ftp://ftp.newton.cx/pub/balsa/
 
 MAINTAINER=	gnome@FreeBSD.org
 
+BUILD_DEPENDS=	${LOCALBASE}/bin/ispell:${PORTSDIR}/textproc/ispell
 LIB_DEPENDS=	ldap.2:${PORTSDIR}/net/openldap2 \
 		aspell.11:${PORTSDIR}/textproc/aspell \
 		pcre.0:${PORTSDIR}/devel/pcre \
-		esmtp.5:${PORTSDIR}/mail/libesmtp
+		esmtp.5:${PORTSDIR}/mail/libesmtp \
+		gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui \
+		gnomeprintui-2.0:${PORTSDIR}/x11-toolkits/libgnomeprintui \
+		gtkhtml-2.0:${PORTSDIR}/www/libgtkhtml
 RUN_DEPENDS=	${LOCALBASE}/bin/ispell:${PORTSDIR}/textproc/ispell
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
-USE_GNOME=	yes
 USE_LIBTOOL=	yes
+USE_PERL5=	yes
+USE_REINPLACE=	yes
 USE_OPENSSL=	yes
 LIBTOOLFILES=	libmutt/configure
 CONFIGURE_ARGS=	--enable-threads \
 		--enable-gtkhtml \
 		--enable-ldap \
 		--disable-more-warnings \
-		--with-ssl
+		--with-ssl \
+		--localstatedir=${PREFIX}/share/gnome \
+		--datadir=${PREFIX}/share/gnome
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LIBS="-L${LOCALBASE}/lib -liconv"
+CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 MAN1=		balsa.1
 
 post-patch:
-	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
+	@${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 ${PERL} -pi -e \
-		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
-		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g ; \
-		 s|\$\(gnomedatadir\)/gnome|\$\(gnomedatadir\)|g'
+	@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 3f997803b277..d7ad5cfedf43 100644
--- a/mail/balsa2/distinfo
+++ b/mail/balsa2/distinfo
@@ -1 +1 @@
-MD5 (balsa-1.3.6.tar.bz2) = 9960c21ce02ee6218ea9524d1d817986
+MD5 (balsa-2.0.1.tar.bz2) = 30f867b45b202a34e161f61ced8be73b
diff --git a/mail/balsa2/files/patch-aa b/mail/balsa2/files/patch-aa
deleted file mode 100644
index 1f26b5241986..000000000000
--- a/mail/balsa2/files/patch-aa
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/Makefile.in.orig	Wed Apr 24 06:01:26 2002
-+++ src/Makefile.in	Fri Apr 26 00:40:50 2002
-@@ -230,7 +230,6 @@
- 	$(top_builddir)/libmutt/libmutt.a	\
- 	$(top_builddir)/libinit_balsa/libinit_balsa.a \
- 	-lpspell \
--	-lltdl	\
- 	$(GDBM_LIBS) \
- 	$(INTLLIBS) \
- 	$(PCRE_LIBS) \
diff --git a/mail/balsa2/files/patch-configure b/mail/balsa2/files/patch-configure
index 7143c8afe49f..93bf4007c971 100644
--- a/mail/balsa2/files/patch-configure
+++ b/mail/balsa2/files/patch-configure
@@ -1,20 +1,56 @@
---- configure	Fri Dec 14 06:13:21 2001
-+++ configure.new	Sun Dec 16 12:52:33 2001
-@@ -8869,7 +8869,7 @@
-   echo $ac_n "(cached) $ac_c" 1>&6
+--- configure.orig	Mon Jun 10 04:35:15 2002
++++ configure	Thu Jun 20 00:06:10 2002
+@@ -9345,7 +9345,7 @@
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ CATOBJEXT=.mo
+-	         DATADIRNAME=lib
++	         DATADIRNAME=share
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ 	      INSTOBJEXT=.mo
+@@ -9643,7 +9643,7 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-   ac_save_LIBS="$LIBS"
+   ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lldap -llber -lresolv $LIBS"
 +LIBS="-lldap -llber $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 8875 "configure"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line 9648 "configure"
  #include "confdefs.h"
-@@ -8900,7 +8900,7 @@
-   cat >> confdefs.h <<\EOF
+@@ -9690,7 +9690,7 @@
+   cat >>confdefs.h <<\EOF
  #define ENABLE_LDAP 1
  EOF
 - LIBS="-lldap -llber -lresolv $LIBS"
 + LIBS="-lldap -llber $LIBS"
  else
-   echo "$ac_t""no" 1>&6
- { echo "configure: error: *** You enabled LDAP but ldap library is not found." 1>&2; exit 1; }
+   { { echo "$as_me:9695: error: *** You enabled LDAP but ldap library is not found." >&5
+ echo "$as_me: error: *** You enabled LDAP but ldap library is not found." >&2;}
+@@ -9726,7 +9726,7 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lesmtp -lpthread $LIBS"
++LIBS="-lesmtp "-pthread" $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line 9731 "configure"
+ #include "confdefs.h"
+@@ -9770,7 +9770,7 @@
+ echo "$as_me:9770: result: $ac_cv_lib_esmtp_smtp_start_session" >&5
+ echo "${ECHO_T}$ac_cv_lib_esmtp_smtp_start_session" >&6
+ if test $ac_cv_lib_esmtp_smtp_start_session = yes; then
+-  LIBS="$LIBS -lesmtp -lpthread"
++  LIBS="$LIBS -lesmtp "-pthread""
+ else
+   { { echo "$as_me:9775: error: *** You enabled ESMTP but esmtp library is not found." >&5
+ echo "$as_me: error: *** You enabled ESMTP but esmtp library is not found." >&2;}
+@@ -11508,7 +11508,7 @@
+       { echo "$as_me:11508: running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir" >&5
+ echo "$as_me: running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir" >&6;}
+       # The eval makes quoting arguments work.
+-      eval $ac_sub_configure $ac_sub_configure_args \
++      eval $ac_sub_configure \
+            --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir ||
+         { { echo "$as_me:11513: error: $ac_sub_configure failed for $ac_subdir" >&5
+ echo "$as_me: error: $ac_sub_configure failed for $ac_subdir" >&2;}
diff --git a/mail/balsa2/files/patch-ltmain.sh b/mail/balsa2/files/patch-ltmain.sh
deleted file mode 100644
index 98cb05e4ddb3..000000000000
--- a/mail/balsa2/files/patch-ltmain.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-
-$FreeBSD$
-
---- ltmain.sh	2001/08/27 09:51:26	1.1
-+++ ltmain.sh	2001/08/27 09:51:42
-@@ -2408,6 +2408,9 @@
- 	  *-*-netbsd*)
- 	    # Don't link with libc until the a.out ld.so is fixed.
- 	    ;;
-+	  *-*-freebsd*)
-+	    # FreeBSD doesn't need this...
-+	    ;;
- 	  *)
- 	    # Add libc to deplibs on all other systems if necessary.
- 	    if test "$build_libtool_need_lc" = "yes"; then
-@@ -4175,10 +4178,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/mail/balsa2/files/patch-po::Makefile.in.in b/mail/balsa2/files/patch-po::Makefile.in.in
deleted file mode 100644
index 4ef430113ba2..000000000000
--- a/mail/balsa2/files/patch-po::Makefile.in.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$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/files/patch-src_address-book-config.c b/mail/balsa2/files/patch-src_address-book-config.c
new file mode 100644
index 000000000000..b623a2eff93c
--- /dev/null
+++ b/mail/balsa2/files/patch-src_address-book-config.c
@@ -0,0 +1,11 @@
+--- src/address-book-config.c.orig	Thu Jun 20 00:18:24 2002
++++ src/address-book-config.c	Thu Jun 20 00:16:15 2002
+@@ -576,7 +576,7 @@
+ 	create_entry(mcw, table, NULL, NULL, 1, 
+ 		     ab ? ab->host : host, label);
+ 
+-    label = create_label(_("_Base Domain Name"), table, 2, label);
++    label = create_label(_("_Base Domain Name"), table, 2);
+     abc->ab_specific.ldap.base_dn = 
+ 	create_entry(mcw, table, NULL, NULL, 2, 
+ 		     ab ? ab->base_dn : base, label);
diff --git a/mail/balsa2/files/patch-src_main.c b/mail/balsa2/files/patch-src_main.c
new file mode 100644
index 000000000000..b9511bc33d89
--- /dev/null
+++ b/mail/balsa2/files/patch-src_main.c
@@ -0,0 +1,11 @@
+--- src/main.c.orig	Thu Jun 20 01:55:36 2002
++++ src/main.c	Thu Jun 20 01:52:11 2002
+@@ -336,7 +336,7 @@
+     /* FIXME: gnome_i18n_get_language seems to have gone away; 
+      * is this a reasonable replacement? */
+     setlocale(LC_CTYPE,
+-              (const char *) gnome_i18n_get_language_list(LC_CTYPE)->data);
++              (const char *) gnome_i18n_get_language_list("LC_CTYPE")->data);
+ #endif
+ 
+ #ifdef BALSA_USE_THREADS
diff --git a/mail/balsa2/pkg-comment b/mail/balsa2/pkg-comment
index 150a5e184dd1..221b9ce360f6 100644
--- a/mail/balsa2/pkg-comment
+++ b/mail/balsa2/pkg-comment
@@ -1 +1 @@
-A mail reader for the gnome interface
+A mail reader for the GNOME 2.0 desktop
diff --git a/mail/balsa2/pkg-descr b/mail/balsa2/pkg-descr
index 484e6febcc10..06d18a364ea9 100644
--- a/mail/balsa2/pkg-descr
+++ b/mail/balsa2/pkg-descr
@@ -1,4 +1,4 @@
-A mail reader for gnome. It supports local mail, pop3, and IMAP. It can
+A mail reader for GNOME 2. It supports local mail, pop3, and IMAP. It can
 view mail files in mbox, maildir, and mh format.
 
 The pop3 support is not complete. All mail retrieved will be left on the
@@ -9,4 +9,4 @@ Balsa is probably not fully usable as one's primary mail client at this
 time.  However, it is under active development and fits with other gnome
 applications.
 
-WWW: http://www.balsa.net/
+WWW: http://balsa.gnome.org/
diff --git a/mail/balsa2/pkg-plist b/mail/balsa2/pkg-plist
index 83333bd923a8..b3bb1284e59c 100644
--- a/mail/balsa2/pkg-plist
+++ b/mail/balsa2/pkg-plist
@@ -2,78 +2,31 @@ bin/balsa
 etc/sound/events/balsa.soundlist
 etc/sound/events/email.soundlist
 share/gnome/apps/Internet/balsa.desktop
-share/gnome/help/balsa/C/ab-conf.html
-share/gnome/help/balsa/C/authors.html
-share/gnome/help/balsa/C/authours.html
-share/gnome/help/balsa/C/common-tasks.html
-share/gnome/help/balsa/C/folder-config.html
-share/gnome/help/balsa/C/getting-started.html
-share/gnome/help/balsa/C/glossary.html
-share/gnome/help/balsa/C/identities.html
-share/gnome/help/balsa/C/images/address-book-ldap.png
-share/gnome/help/balsa/C/images/address-book-modify.png
-share/gnome/help/balsa/C/images/address-book-start.png
-share/gnome/help/balsa/C/images/address-book-vcard.png
-share/gnome/help/balsa/C/images/address-book.png
-share/gnome/help/balsa/C/images/balsa_logo.png
-share/gnome/help/balsa/C/images/druid-start.png
-share/gnome/help/balsa/C/images/example-alias.png
-share/gnome/help/balsa/C/images/main-window-toolbar.png
-share/gnome/help/balsa/C/images/main-window.png
-share/gnome/help/balsa/C/images/newmsg-window-attachments.png
-share/gnome/help/balsa/C/images/newmsg-window-toolbar.png
-share/gnome/help/balsa/C/images/newmsg-window.png
-share/gnome/help/balsa/C/images/preferences-window.png
-share/gnome/help/balsa/C/images/spell-check.png
-share/gnome/help/balsa/C/index.html
-share/gnome/help/balsa/C/its-not-working.html
-share/gnome/help/balsa/C/ln28.html
-share/gnome/help/balsa/C/ln7.html
-share/gnome/help/balsa/C/mbox-formats.html
-share/gnome/help/balsa/C/preferences-0.html
-share/gnome/help/balsa/C/preferences-1.html
-share/gnome/help/balsa/C/preferences-2.html
-share/gnome/help/balsa/C/preferences-3.html
-share/gnome/help/balsa/C/preferences-4.html
-share/gnome/help/balsa/C/preferences-5.html
-share/gnome/help/balsa/C/preferences-6.html
-share/gnome/help/balsa/C/preferences.html
-share/gnome/help/balsa/C/stylesheet-images/caution.gif
-share/gnome/help/balsa/C/stylesheet-images/home.gif
-share/gnome/help/balsa/C/stylesheet-images/important.gif
-share/gnome/help/balsa/C/stylesheet-images/next.gif
-share/gnome/help/balsa/C/stylesheet-images/note.gif
-share/gnome/help/balsa/C/stylesheet-images/prev.gif
-share/gnome/help/balsa/C/stylesheet-images/tip.gif
-share/gnome/help/balsa/C/stylesheet-images/toc-blank.gif
-share/gnome/help/balsa/C/stylesheet-images/toc-minus.gif
-share/gnome/help/balsa/C/stylesheet-images/toc-plus.gif
-share/gnome/help/balsa/C/stylesheet-images/up.gif
-share/gnome/help/balsa/C/stylesheet-images/warning.gif
-share/gnome/help/balsa/C/toolbars.html
-share/gnome/help/balsa/C/topic.dat
-share/gnome/help/balsa/C/win-composer.html
-share/gnome/help/balsa/C/win-config-0.html
-share/gnome/help/balsa/C/win-config-1.html
-share/gnome/help/balsa/C/win-config-10.html
-share/gnome/help/balsa/C/win-config-2.html
-share/gnome/help/balsa/C/win-config-3.html
-share/gnome/help/balsa/C/win-config-4.html
-share/gnome/help/balsa/C/win-config-5.html
-share/gnome/help/balsa/C/win-config-6.html
-share/gnome/help/balsa/C/win-config-7.html
-share/gnome/help/balsa/C/win-config-8.html
-share/gnome/help/balsa/C/win-config-9.html
-share/gnome/help/balsa/C/win-config.html
-share/gnome/help/balsa/C/win-main.html
-share/gnome/help/balsa/C/win-message.html
-share/gnome/pixmaps/balsa/attachment.png
-share/gnome/pixmaps/balsa/balsa-logo.png
-share/gnome/pixmaps/balsa/balsa-top.png
-share/gnome/pixmaps/balsa/balsa-watermark.png
-share/gnome/pixmaps/balsa/balsa_icon.png
-share/gnome/pixmaps/balsa/balsa_logo.png
-share/gnome/pixmaps/gnome-balsa2.png
+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/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/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/help/balsa-manual/C/topic.dat
 share/gnome/sounds/balsa/newmail.wav
 share/gnome/sounds/balsa/startup.wav
 share/locale/az/LC_MESSAGES/balsa.mo
@@ -112,8 +65,8 @@ share/locale/wa/LC_MESSAGES/balsa.mo
 share/locale/zh_CN/LC_MESSAGES/balsa.mo
 share/locale/zh_TW/LC_MESSAGES/balsa.mo
 @dirrm share/gnome/sounds/balsa
-@dirrm share/gnome/pixmaps/balsa
-@dirrm share/gnome/help/balsa/C/stylesheet-images
-@dirrm share/gnome/help/balsa/C/images
-@dirrm share/gnome/help/balsa/C
-@dirrm share/gnome/help/balsa
+@dirrm share/gnome/help/balsa-manual/C/figures
+@dirrm share/gnome/help/balsa-manual/C
+@dirrm share/gnome/help/balsa-manual
+@dirrm share/gnome/balsa/pixmaps
+@dirrm share/gnome/balsa