Use USE_GNOMENG.

4 files changed, 33 insertions, 40 deletions

diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile
index 853a88007d7a..8c1ed96ece08 100644
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@@ -21,10 +21,11 @@ RUN_DEPENDS=	${LOCALBASE}/bin/ispell:${PORTSDIR}/textproc/ispell
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
-USE_GNOME=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gnomeprefix gnomehack gnomeprint gnomevfs gtkhtml
 USE_LIBTOOL=	yes
 USE_OPENSSL=	yes
-LIBTOOLFILES=	libmutt/configure
+LIBTOOLFILES=	configure libmutt/configure
 CONFIGURE_ARGS=	--enable-threads \
 		--enable-gtkhtml \
 		--enable-ldap \
@@ -36,12 +37,8 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 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'
 
 .include <bsd.port.mk>
diff --git a/mail/balsa/files/patch-configure b/mail/balsa/files/patch-configure
index 7143c8afe49f..e2ad3172056c 100644
--- a/mail/balsa/files/patch-configure
+++ b/mail/balsa/files/patch-configure
@@ -1,15 +1,26 @@
---- configure	Fri Dec 14 06:13:21 2001
-+++ configure.new	Sun Dec 16 12:52:33 2001
-@@ -8869,7 +8869,7 @@
+
+$FreeBSD$
+
+--- configure.orig	Fri Apr 26 11:25:11 2002
++++ configure	Thu Jul 18 19:48:37 2002
+@@ -5655,6 +5655,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -8925,7 +8926,7 @@
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    ac_save_LIBS="$LIBS"
 -LIBS="-lldap -llber -lresolv $LIBS"
 +LIBS="-lldap -llber $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 8875 "configure"
+ #line 8931 "configure"
  #include "confdefs.h"
-@@ -8900,7 +8900,7 @@
+@@ -8956,7 +8957,7 @@
    cat >> confdefs.h <<\EOF
  #define ENABLE_LDAP 1
  EOF
diff --git a/mail/balsa/files/patch-libmutt::configure b/mail/balsa/files/patch-libmutt::configure
new file mode 100644
index 000000000000..be36a18bb276
--- /dev/null
+++ b/mail/balsa/files/patch-libmutt::configure
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- libmutt/configure	2002/07/18 16:53:06	1.1
++++ libmutt/configure	2002/07/18 16:53:15
+@@ -5192,6 +5192,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/mail/balsa/files/patch-ltmain.sh b/mail/balsa/files/patch-ltmain.sh
deleted file mode 100644
index 98cb05e4ddb3..000000000000
--- a/mail/balsa/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"