Enable nls support. Fix support for 4.0-CURRENT. Remove patch-ae

and make port honour ${PREFIX}.  Add category gnome.  Remove
impilict dependency on glib11-devel.
PR:		ports/9810
Submitted by:	Jeremy Lea <reg@shale.csir.co.za>

6 files changed, 84 insertions, 16 deletions

diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile
index e1542f836a00..5fce3c46aed7 100644
--- a/devel/libgtop/Makefile
+++ b/devel/libgtop/Makefile
@@ -3,24 +3,27 @@
 # Date Created:			26 Sep 1998
 # Whom:				Vanilla I. Shu <vanilla@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.12 1999/01/14 17:00:22 vanilla Exp $
+# $Id: Makefile,v 1.13 1999/01/27 08:31:50 fenner Exp $
 #
 
 DISTNAME=	libgtop-0.99.2
-CATEGORIES=	devel
+CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME} \
 		ftp://ftp.home-of-linux.org/pub/libgtop/0.99.2/
 MASTER_SITE_SUBDIR=	libgtop
 
 MAINTAINER=	nacai@iname.com
 
-LIB_DEPENDS=	glib11d.2:${PORTSDIR}/devel/glib11-devel \
-		gnome.1:${PORTSDIR}/x11/gnomelibs \
+LIB_DEPENDS=	gnome.1:${PORTSDIR}/x11/gnomelibs \
 		guile.4:${PORTSDIR}/lang/guile
 
+# implicit dependencies:
+# gettext, glib11-devel
+
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-nls
-CONFIGURE_ENV=	GLIB_CONFIG="${LOCALBASE}/bin/glib11d-config"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+		GLIB_CONFIG="${LOCALBASE}/bin/glib11d-config" \
+		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4"
 USE_GMAKE=	yes
 
 post-install:
diff --git a/devel/libgtop/files/patch-ab b/devel/libgtop/files/patch-ab
index 4e5ed568326c..fc0b93534e15 100644
--- a/devel/libgtop/files/patch-ab
+++ b/devel/libgtop/files/patch-ab
@@ -72,8 +72,8 @@
  LT_VERSION_INFO = @LT_VERSION_INFO@
  MAKEINFO = @MAKEINFO@
  MKINSTALLDIRS = @MKINSTALLDIRS@
---- Makefile.in.orig	Wed Jan  6 03:53:28 1999
-+++ Makefile.in	Thu Jan  7 21:47:02 1999
+--- Makefile.in.orig	Tue Jan  5 21:53:28 1999
++++ Makefile.in	Wed Jan 20 00:33:09 1999
 @@ -172,8 +172,7 @@
  
  @BUILD_GNOME_SUPPORT_TRUE@support = support
@@ -93,6 +93,24 @@
  confexec_DATA	= $(top_builddir)/libgtopConf.sh \
  		  $(top_builddir)/libgtop-features.def
  
+@@ -511,7 +510,7 @@
+ $(top_srcdir)/aclocal.m4: libgtop-sysdeps.m4
+ 
+ libgtopConf.sh: libgtopConf.sh.in Makefile
+-	sed -e 's#\@LIBGTOP_LIBDIR\@#$(libdir)#g' \
++	sed -e 's#\@LIBGTOP_LIBDIR\@#$(confexecdir)#g' \
+ 	  -e 's#\@LIBGTOP_INCLUDEDIR\@#$(includedir)#g' \
+ 	  -e 's#\@LIBGTOP_EXTRA_LIBS\@#$(LIBGTOP_EXTRA_LIBS)#g' \
+ 	  -e 's#\@LIBGTOP_LIBS\@#$(LIBGTOP_LIBS)#g' \
+@@ -539,7 +538,7 @@
+ 	  && mv libgtopConf.tmp libgtopConf.sh
+ 
+ libgtop-config: libgtop-config.in Makefile
+-	sed -e 's#\@LIBGTOP_LIBDIR\@#$(libdir)#g' \
++	sed -e 's#\@LIBGTOP_LIBDIR\@#$(confexecdir)#g' \
+ 	      < $(srcdir)/libgtop-config.in > libgtop-config.tmp \
+ 	  && mv libgtop-config.tmp libgtop-config && \
+ 		chmod 755 libgtop-config
 --- po/Makefile.in.in.orig	Wed Jan  6 03:50:44 1999
 +++ po/Makefile.in.in	Thu Jan  7 21:47:02 1999
 @@ -18,7 +18,7 @@
diff --git a/devel/libgtop/pkg-plist b/devel/libgtop/pkg-plist
index c61e293048b2..8c1e8d447fa0 100644
--- a/devel/libgtop/pkg-plist
+++ b/devel/libgtop/pkg-plist
@@ -81,4 +81,17 @@ lib/libgtop_sysdeps_suid.so
 lib/libgtop_sysdeps_suid.so.1
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+share/locale/de/LC_MESSAGES/libgtop.mo
+share/locale/fr/LC_MESSAGES/libgtop.mo
+share/locale/ja/LC_MESSAGES/libgtop.mo
+share/locale/no/LC_MESSAGES/libgtop.mo
+share/locale/ko/LC_MESSAGES/libgtop.mo
+share/locale/es/LC_MESSAGES/libgtop.mo
+share/locale/es_DO/LC_MESSAGES/libgtop.mo
+share/locale/es_GT/LC_MESSAGES/libgtop.mo
+share/locale/es_HN/LC_MESSAGES/libgtop.mo
+share/locale/es_MX/LC_MESSAGES/libgtop.mo
+share/locale/es_PA/LC_MESSAGES/libgtop.mo
+share/locale/es_PE/LC_MESSAGES/libgtop.mo
+share/locale/es_SV/LC_MESSAGES/libgtop.mo
 @dirrm include/glibtop
diff --git a/devel/libgtop2/Makefile b/devel/libgtop2/Makefile
index e1542f836a00..5fce3c46aed7 100644
--- a/devel/libgtop2/Makefile
+++ b/devel/libgtop2/Makefile
@@ -3,24 +3,27 @@
 # Date Created:			26 Sep 1998
 # Whom:				Vanilla I. Shu <vanilla@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.12 1999/01/14 17:00:22 vanilla Exp $
+# $Id: Makefile,v 1.13 1999/01/27 08:31:50 fenner Exp $
 #
 
 DISTNAME=	libgtop-0.99.2
-CATEGORIES=	devel
+CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME} \
 		ftp://ftp.home-of-linux.org/pub/libgtop/0.99.2/
 MASTER_SITE_SUBDIR=	libgtop
 
 MAINTAINER=	nacai@iname.com
 
-LIB_DEPENDS=	glib11d.2:${PORTSDIR}/devel/glib11-devel \
-		gnome.1:${PORTSDIR}/x11/gnomelibs \
+LIB_DEPENDS=	gnome.1:${PORTSDIR}/x11/gnomelibs \
 		guile.4:${PORTSDIR}/lang/guile
 
+# implicit dependencies:
+# gettext, glib11-devel
+
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-nls
-CONFIGURE_ENV=	GLIB_CONFIG="${LOCALBASE}/bin/glib11d-config"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+		GLIB_CONFIG="${LOCALBASE}/bin/glib11d-config" \
+		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4"
 USE_GMAKE=	yes
 
 post-install:
diff --git a/devel/libgtop2/files/patch-ab b/devel/libgtop2/files/patch-ab
index 4e5ed568326c..fc0b93534e15 100644
--- a/devel/libgtop2/files/patch-ab
+++ b/devel/libgtop2/files/patch-ab
@@ -72,8 +72,8 @@
  LT_VERSION_INFO = @LT_VERSION_INFO@
  MAKEINFO = @MAKEINFO@
  MKINSTALLDIRS = @MKINSTALLDIRS@
---- Makefile.in.orig	Wed Jan  6 03:53:28 1999
-+++ Makefile.in	Thu Jan  7 21:47:02 1999
+--- Makefile.in.orig	Tue Jan  5 21:53:28 1999
++++ Makefile.in	Wed Jan 20 00:33:09 1999
 @@ -172,8 +172,7 @@
  
  @BUILD_GNOME_SUPPORT_TRUE@support = support
@@ -93,6 +93,24 @@
  confexec_DATA	= $(top_builddir)/libgtopConf.sh \
  		  $(top_builddir)/libgtop-features.def
  
+@@ -511,7 +510,7 @@
+ $(top_srcdir)/aclocal.m4: libgtop-sysdeps.m4
+ 
+ libgtopConf.sh: libgtopConf.sh.in Makefile
+-	sed -e 's#\@LIBGTOP_LIBDIR\@#$(libdir)#g' \
++	sed -e 's#\@LIBGTOP_LIBDIR\@#$(confexecdir)#g' \
+ 	  -e 's#\@LIBGTOP_INCLUDEDIR\@#$(includedir)#g' \
+ 	  -e 's#\@LIBGTOP_EXTRA_LIBS\@#$(LIBGTOP_EXTRA_LIBS)#g' \
+ 	  -e 's#\@LIBGTOP_LIBS\@#$(LIBGTOP_LIBS)#g' \
+@@ -539,7 +538,7 @@
+ 	  && mv libgtopConf.tmp libgtopConf.sh
+ 
+ libgtop-config: libgtop-config.in Makefile
+-	sed -e 's#\@LIBGTOP_LIBDIR\@#$(libdir)#g' \
++	sed -e 's#\@LIBGTOP_LIBDIR\@#$(confexecdir)#g' \
+ 	      < $(srcdir)/libgtop-config.in > libgtop-config.tmp \
+ 	  && mv libgtop-config.tmp libgtop-config && \
+ 		chmod 755 libgtop-config
 --- po/Makefile.in.in.orig	Wed Jan  6 03:50:44 1999
 +++ po/Makefile.in.in	Thu Jan  7 21:47:02 1999
 @@ -18,7 +18,7 @@
diff --git a/devel/libgtop2/pkg-plist b/devel/libgtop2/pkg-plist
index c61e293048b2..8c1e8d447fa0 100644
--- a/devel/libgtop2/pkg-plist
+++ b/devel/libgtop2/pkg-plist
@@ -81,4 +81,17 @@ lib/libgtop_sysdeps_suid.so
 lib/libgtop_sysdeps_suid.so.1
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+share/locale/de/LC_MESSAGES/libgtop.mo
+share/locale/fr/LC_MESSAGES/libgtop.mo
+share/locale/ja/LC_MESSAGES/libgtop.mo
+share/locale/no/LC_MESSAGES/libgtop.mo
+share/locale/ko/LC_MESSAGES/libgtop.mo
+share/locale/es/LC_MESSAGES/libgtop.mo
+share/locale/es_DO/LC_MESSAGES/libgtop.mo
+share/locale/es_GT/LC_MESSAGES/libgtop.mo
+share/locale/es_HN/LC_MESSAGES/libgtop.mo
+share/locale/es_MX/LC_MESSAGES/libgtop.mo
+share/locale/es_PA/LC_MESSAGES/libgtop.mo
+share/locale/es_PE/LC_MESSAGES/libgtop.mo
+share/locale/es_SV/LC_MESSAGES/libgtop.mo
 @dirrm include/glibtop