Fix finding gettext libraries in a better way. Remove CPP definition which

was breaking compilation on my machine -- not sure why it was set in the
first place, and the reason wasn't logged in CVS.

4 files changed, 21 insertions, 22 deletions

diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile
index d564c1f8f19..ee2d29805ae 100644
--- a/devel/libgtop/Makefile
+++ b/devel/libgtop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2000/09/05 09:33:15 jlam Exp $
+# $NetBSD: Makefile,v 1.44 2000/10/17 18:03:23 jlam Exp $
 
 DISTNAME=		libgtop-1.0.9
 CATEGORIES=		devel gnome
@@ -26,14 +26,12 @@ IGNORE+=		"(More information can be found in libgtop.info.)"
 .endif
 .endif
 
-GNU_CONFIGURE=		# defined
 USE_X11BASE=		# defined
 USE_GMAKE=		# defined
 USE_LIBTOOL=		# defined
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
-CPPFLAGS+=		-I${LOCALBASE}/include
-LDFLAGS+=		-L${LOCALBASE}/lib -lintl
+CPPFLAGS+=		-I${LOCALBASE}/include	# libintl.h
 
 # The following flags are for debugging purposes.  They don't need to
 # be used unless you are actively developing/debugging libgtop.
@@ -41,14 +39,12 @@ LDFLAGS+=		-L${LOCALBASE}/lib -lintl
 #CFLAGS+=		-g
 #LDFLAGS+=		-g
 
+GNU_CONFIGURE=		# defined
 CONFIGURE_ARGS+=	--with-glib-prefix=${LOCALBASE} \
 			--with-libgtop-guile --with-catgets
 CONFIGURE_ENV+=		AWK="${AWK}" \
-			CPP="${CPP}" \
 			LN_S="${LN} -s" \
 			PERL="${PERL5}" \
 			CPPFLAGS="${CPPFLAGS}"  \
-			LOCALBASE=${LOCALBASE} \
-			X11BASE=${X11BASE}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libgtop/files/patch-sum b/devel/libgtop/files/patch-sum
index d07b934c685..0fbc80d6a0d 100644
--- a/devel/libgtop/files/patch-sum
+++ b/devel/libgtop/files/patch-sum
@@ -1,6 +1,6 @@
-$NetBSD: patch-sum,v 1.17 2000/07/30 02:45:40 jlam Exp $
+$NetBSD: patch-sum,v 1.18 2000/10/17 18:03:26 jlam Exp $
 
-MD5 (patch-ab) = 1be0d48b1e41fea46ee459a320fb11c7
+MD5 (patch-aa) = c20fbf8c437f72a35bd5dada09aca1a4
 MD5 (patch-ac) = f84a83914548206edccb11e1f84bf1bf
 MD5 (patch-ad) = 617e9e681d3576d14d2b9dd4185dfd68
 MD5 (patch-ae) = 500e5a7bf247842cef93af16027a7cbf
diff --git a/devel/libgtop/patches/patch-aa b/devel/libgtop/patches/patch-aa
new file mode 100644
index 00000000000..b405c4b04ce
--- /dev/null
+++ b/devel/libgtop/patches/patch-aa
@@ -0,0 +1,16 @@
+$NetBSD: patch-aa,v 1.10 2000/10/17 18:03:26 jlam Exp $
+
+--- configure.orig	Thu May 25 10:35:06 2000
++++ configure
+@@ -8433,6 +8433,11 @@
+ 	< $srcdir/po/POTFILES.in > po/POTFILES
+   
+ 
++# NetBSD: set DATADIRNAME to "share"
++DATADIRNAME="share"
++INTLDEPS=
++INTLLIBS="-lintl"
++
+ # If we find X, set shell vars x_includes and x_libraries to the
+ # paths, otherwise set no_x=yes.
+ # Uses ac_ vars as temps to allow command line to override cache and checks.
diff --git a/devel/libgtop/patches/patch-ab b/devel/libgtop/patches/patch-ab
deleted file mode 100644
index e588b32a074..00000000000
--- a/devel/libgtop/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.6 1999/03/07 19:50:56 tron Exp $
-
---- po/Makefile.in.in.orig	Mon Mar  1 22:52:02 1999
-+++ po/Makefile.in.in	Sun Mar  7 20:28:31 1999
-@@ -19,7 +19,7 @@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
- datadir = $(prefix)/@DATADIRNAME@
--localedir = $(datadir)/locale
-+localedir = $(prefix)/share/locale
- gnulocaledir = $(prefix)/share/locale
- gettextsrcdir = $(prefix)/share/gettext/po
- subdir = po