Use new gnomelibs port and set USE_LIBTOOL=yes

PR:             11844
Submitted by:   Jeremy Lea <reg@shale.csir.co.za>

3 files changed, 68 insertions, 39 deletions

diff --git a/mail/balsa2/Makefile b/mail/balsa2/Makefile
index 039a55d0dcb4..4589a291bfd5 100644
--- a/mail/balsa2/Makefile
+++ b/mail/balsa2/Makefile
@@ -3,7 +3,7 @@
 # Date created:				02 December 1998
 # Whom:					Glenn Johnson <gljohns@bellsouth.net>
 #
-# $Id: Makefile,v 1.4 1999/02/03 20:50:03 vanilla Exp $
+# $Id: Makefile,v 1.5 1999/03/24 16:38:27 nectar Exp $
 #
 
 DISTNAME=	balsa-0.4.9
@@ -14,24 +14,23 @@ MASTER_SITE_SUBDIR=	sources/balsa
 MAINTAINER=	ports@FreeBSD.ORG
 
 RUN_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore
-LIB_DEPENDS=	gnome.1:${PORTSDIR}/x11/gnomelibs \
+LIB_DEPENDS=	gnome.2:${PORTSDIR}/x11/gnomelibs \
 		PropList.1:${PORTSDIR}/devel/libPropList
-BUILD_DEPENDS=	orbit-idl:${PORTSDIR}/devel/ORBit
+
+GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
 USE_X_PREFIX=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+LIBTOOLFILES=	configure libmutt/configure
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
 		--datadir=${PREFIX}/share/gnome \
-		--with-gnome=${X11BASE}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		GTK_CONFIG="${X11BASE}/bin/gtk12-config" \
-		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4"
+		--with-gnome=${PREFIX}
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		GTK_CONFIG="${GTK_CONFIG}" \
+		LIBS="-L${LOCALBASE}/lib"
 
 MAN1=		balsa.1
 
-pre-build:
-	cd ${WRKSRC}/idl && orbit-idl balsa.idl
-
 post-install:
 		${INSTALL_MAN} ${WRKSRC}/balsa.1 ${PREFIX}/man/man1
 
diff --git a/mail/balsa2/files/patch-ab b/mail/balsa2/files/patch-ab
index 882365daef00..fc09237d541d 100644
--- a/mail/balsa2/files/patch-ab
+++ b/mail/balsa2/files/patch-ab
@@ -1,21 +1,51 @@
---- configure.orig	Thu Feb  4 04:23:24 1999
-+++ configure	Thu Feb  4 04:24:24 1999
-@@ -1111,13 +1111,13 @@
- 	    fi
- 	
- 	    if test "$no_gnome_config" = "yes"; then
--              echo $ac_n "checking for gnomeConf.sh file in $gnome_prefix""... $ac_c" 1>&6
--echo "configure:1116: checking for gnomeConf.sh file in $gnome_prefix" >&5
--	      if test -f $gnome_prefix/gnomeConf.sh; then
-+              echo $ac_n "checking for gnomeConf.sh file in $prefix/share/gnome""... $ac_c" 1>&6
-+echo "configure:1116: checking for gnomeConf.sh file in $prefix/share/gnome" >&5
-+	      if test -f $prefix/share/gnome/gnomeConf.sh; then
- 	        echo "$ac_t""found" 1>&6
- 	        echo "loading gnome configuration from" \
--		     "$gnome_prefix/gnomeConf.sh"
--	        . $gnome_prefix/gnomeConf.sh
-+		     "$prefix/share/gnome/gnomeConf.sh"
-+	        . $prefix/share/gnome/gnomeConf.sh
- 	        
- 	      else
- 	        echo "$ac_t""not found" 1>&6
+--- configure.orig	Tue Jan 19 02:21:11 1999
++++ configure	Sat May 22 21:52:27 1999
+@@ -2168,7 +2168,7 @@
+ fi
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+-  PTHREAD_LIB="-lc_r"
++  PTHREAD_LIB=""
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+@@ -3884,7 +3884,7 @@
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   CATOBJEXT=.mo
+-		   DATADIRNAME=lib
++		   DATADIRNAME=share
+ fi
+ rm -f conftest*
+ 		INSTOBJEXT=.mo
+@@ -4272,15 +4272,15 @@
+ fi
+ 
+         
+-	USE_INCLUDED_LIBINTL=yes
++#	USE_INCLUDED_LIBINTL=yes
+         CATOBJEXT=.gmo
+         INSTOBJEXT=.mo
+         DATADIRNAME=share
+-	INTLDEPS='$(top_builddir)/intl/libintl.a'
++	INTLDEPS='-lintl'
+ 	INTLLIBS=$INTLDEPS
+ 	LIBS=`echo $LIBS | sed -e 's/-lintl//'`
+-        nls_cv_header_intl=intl/libintl.h
+-        nls_cv_header_libgt=intl/libgettext.h
++#        nls_cv_header_intl=intl/libintl.h
++#        nls_cv_header_libgt=intl/libgettext.h
+       fi
+ 
+             if test "$XGETTEXT" != ":"; then
+@@ -5168,10 +5168,6 @@
+       *) # Relative path.
+         ac_sub_cache_file="$ac_dots$cache_file" ;;
+       esac
+-  case "$ac_given_INSTALL" in
+-        [/$]*) INSTALL="$ac_given_INSTALL" ;;
+-        *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
+-        esac
+ 
+       echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir"
+       # The eval makes quoting arguments work.
diff --git a/mail/balsa2/pkg-plist b/mail/balsa2/pkg-plist
index f34c1c961f19..7e07c23ec109 100644
--- a/mail/balsa2/pkg-plist
+++ b/mail/balsa2/pkg-plist
@@ -1,20 +1,20 @@
 bin/balsa
+etc/CORBA/servers/balsa.gnorba
 etc/sound/events/balsa.soundlist
 etc/sound/events/email.soundlist
-etc/CORBA/servers/balsa.gnorba
 lib/libbalsasrv.a
+share/gnome/pixmaps/balsa/attachment.png
+share/gnome/pixmaps/balsa/balsa_icon.png
+share/gnome/pixmaps/balsa/balsa_logo.png
+share/gnome/sounds/balsa/newmail.wav
+share/gnome/sounds/balsa/startup.wav
 share/locale/de/LC_MESSAGES/balsa.mo
 share/locale/es/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/it/LC_MESSAGES/balsa.mo
 share/locale/ko/LC_MESSAGES/balsa.mo
 share/locale/no/LC_MESSAGES/balsa.mo
-share/locale/it/LC_MESSAGES/balsa.mo
-share/gnome/sounds/balsa/startup.wav
-share/gnome/sounds/balsa/newmail.wav
-share/gnome/pixmaps/balsa/attachment.png
-share/gnome/pixmaps/balsa/balsa_logo.png
-share/gnome/pixmaps/balsa/balsa_icon.png
 @dirrm share/gnome/sounds/balsa
 @dirrm share/gnome/pixmaps/balsa