USE_LIBTOOL instead of PKGLIBTOOL.

4 files changed, 21 insertions, 45 deletions

diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index 5da773a65d9..19f76fbf562 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -1,22 +1,25 @@
-# $NetBSD: Makefile,v 1.6 2000/06/01 11:23:25 rh Exp $
+# $NetBSD: Makefile,v 1.7 2000/06/21 01:28:48 jlam Exp $
 
-DISTNAME=	gnome-games-1.0.51
-CATEGORIES=	games gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=stable/sources/gnome-games/}
+DISTNAME=		gnome-games-1.0.51
+CATEGORIES=		games gnome
+MASTER_SITES=		${MASTER_SITE_GNOME:=stable/sources/gnome-games/}
 
-MAINTAINER=	tron@netbsd.org
-HOMEPAGE=	http://www.gnome.org/
+MAINTAINER=		tron@netbsd.org
+HOMEPAGE=		http://www.gnome.org/
 
-DEPENDS+=	gnome-core-*:../../x11/gnome-core
+DEPENDS+=		gnome-core-*:../../x11/gnome-core
 # Required for ports which don't build "libgtop".
-DEPENDS+=	guile-[0-9]*:../../lang/guile
-DEPENDS+=	xbill-*:../../games/xbill
+DEPENDS+=		guile-[0-9]*:../../lang/guile
+DEPENDS+=		xbill-*:../../games/xbill
 
-GNU_CONFIGURE=	yes
-USE_X11BASE=	yes
-USE_PKGLIBTOOL=	yes
+GNU_CONFIGURE=		# defined
+CONFIGURE_ARGS=		--localstatedir=/var
 
-INSTALL_FILE=	${WRKDIR}/INSTALL
+USE_X11BASE=		# defined
+USE_LIBTOOL=		# defined
+LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
+
+INSTALL_FILE=		${WRKDIR}/INSTALL
 
 post-build:
 	${SED} -e 's#@@INSTALL@@#${INSTALL}#' \
diff --git a/games/gnome-games/files/patch-sum b/games/gnome-games/files/patch-sum
index e57514b785c..7689461c59c 100644
--- a/games/gnome-games/files/patch-sum
+++ b/games/gnome-games/files/patch-sum
@@ -1,5 +1,4 @@
-$NetBSD: patch-sum,v 1.2 2000/04/17 20:02:54 tron Exp $
+$NetBSD: patch-sum,v 1.3 2000/06/21 01:28:49 jlam Exp $
 
-MD5 (patch-aa) = e124b3ffed271556e271df300497aafe
 MD5 (patch-ab) = e21bc6ba9a3c999c4b7defd969c7fce2
 MD5 (patch-ac) = 3edf07e8535675ce6fe4a11e84735b29
diff --git a/games/gnome-games/patches/patch-aa b/games/gnome-games/patches/patch-aa
deleted file mode 100644
index b9dd1176d4c..00000000000
--- a/games/gnome-games/patches/patch-aa
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/11/18 23:20:18 tron Exp $
-
---- configure.orig	Wed Oct  6 07:30:29 1999
-+++ configure	Thu Nov 18 23:59:57 1999
-@@ -78,7 +78,7 @@
- datadir='${prefix}/share'
- sysconfdir='${prefix}/etc'
- sharedstatedir='${prefix}/com'
--localstatedir='${prefix}/var'
-+localstatedir=/var
- libdir='${exec_prefix}/lib'
- includedir='${prefix}/include'
- oldincludedir='/usr/include'
-@@ -2123,6 +2123,7 @@
- fi
- 
- 
-+if false; then
- # Check for any special flags to pass to ltconfig.
- libtool_flags="--cache-file=$cache_file"
- test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
-@@ -2276,6 +2277,7 @@
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+fi
- 
- # Redirect the config.log output again, so that the ltconfig log is not
- # clobbered by the next message.
diff --git a/games/gnome-games/pkg/PLIST b/games/gnome-games/pkg/PLIST
index d166b33cad3..672e4eb3282 100644
--- a/games/gnome-games/pkg/PLIST
+++ b/games/gnome-games/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1999/11/18 23:20:18 tron Exp $
+@comment $NetBSD: PLIST,v 1.2 2000/06/21 01:28:51 jlam Exp $
 bin/GnomeScott
 bin/freecell
 bin/gataxx
@@ -22,10 +22,13 @@ etc/sound/events/gnobots2.soundlist
 etc/sound/events/iagno.soundlist
 include/gdkcardimage/gdk-card-image.h
 lib/gnome-stones/objects/libgnome-stones.a
+lib/gnome-stones/objects/libgnome-stones.la
 lib/gnome-stones/objects/libgnome-stones.so.0.0
 lib/gnome-stones/objects/libgnomekoban.a
+lib/gnome-stones/objects/libgnomekoban.la
 lib/gnome-stones/objects/libgnomekoban.so.0.0
 lib/libgdkcardimage.a
+lib/libgdkcardimage.la
 lib/libgdkcardimage.so.0.0
 share/gnibbles/level001.gnl
 share/gnibbles/level002.gnl