Use new gnome libs and set USE_LIBTOOL=yes.

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

3 files changed, 14 insertions, 22 deletions

diff --git a/games/gnomegames2/Makefile b/games/gnomegames2/Makefile
index a49329c950a7..834fdf287a93 100644
--- a/games/gnomegames2/Makefile
+++ b/games/gnomegames2/Makefile
@@ -3,7 +3,7 @@
 # Date created:				03 July 1998
 # Whom:					Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.15 1999/04/08 18:08:32 steve Exp $
+# $Id: Makefile,v 1.16 1999/05/09 17:06:20 steve Exp $
 #
 
 DISTNAME=	gnome-games-1.0.2
@@ -17,17 +17,16 @@ MAINTAINER=	nacai@iname.com
 BUILD_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore
 RUN_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore
 
+GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
+
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
 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"
-
-post-install:
-	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
+		--with-gnome=${PREFIX}
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		GTK_CONFIG="${GTK_CONFIG}" \
+		LIBS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.mk>
diff --git a/games/gnomegames2/files/patch-ab b/games/gnomegames2/files/patch-ab
index de972c331051..a0f6935380e5 100644
--- a/games/gnomegames2/files/patch-ab
+++ b/games/gnomegames2/files/patch-ab
@@ -142,7 +142,7 @@
  CONFIG_HEADER = ../../../config.h
  CONFIG_CLEAN_FILES = 
 --- gnome-stones/Makefile.in.orig	Mon Mar  1 02:50:55 1999
-+++  gnome-stones/Makefile.in	Wed Mar  3 00:33:00 1999
++++ gnome-stones/Makefile.in	Wed Mar  3 00:33:00 1999
 @@ -125,12 +125,12 @@
  
  SUBDIRS = objects graphics
@@ -181,16 +181,16 @@
  
  
  object_LTLIBRARIES = libgnome-stones.la libgnomekoban.la
-@@ -142,10 +142,10 @@
+@@ -143,10 +143,10 @@
  
  DEFS = @DEFS@ -I. -I$(srcdir) -I../..
  LIBS = @LIBS@
 -libgnome_stones_la_LDFLAGS = 
-+libgnome_stones_la_LDFLAGS = --export-dynamic
++libgnome_stones_la_LDFLAGS = -avoid-version
  libgnome_stones_la_LIBADD = 
  libgnome_stones_la_OBJECTS =  gnome-stones.lo
 -libgnomekoban_la_LDFLAGS = 
-+libgnomekoban_la_LDFLAGS = --export-dynamic
++libgnomekoban_la_LDFLAGS = -avoid-version
  libgnomekoban_la_LIBADD = 
  libgnomekoban_la_OBJECTS =  gnomekoban.lo
  COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
diff --git a/games/gnomegames2/pkg-plist b/games/gnomegames2/pkg-plist
index 2febe8cfa4e4..419803d9cd85 100644
--- a/games/gnomegames2/pkg-plist
+++ b/games/gnomegames2/pkg-plist
@@ -19,7 +19,6 @@ etc/sound/events/gnobots2.soundlist
 etc/sound/events/iagno.soundlist
 include/gdkcardimage/gdk-card-image.h
 lib/libgdkcardimage.a
-lib/libgdkcardimage.la
 lib/libgdkcardimage.so
 lib/libgdkcardimage.so.1
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib
@@ -114,14 +113,8 @@ share/gnome/gnome-stones/default.caves
 share/gnome/gnome-stones/gnome-stonesrc
 share/gnome/gnome-stones/gnome-stonesrc.ko
 share/gnome/gnome-stones/gnomekoban.caves
-share/gnome/gnome-stones/objects/libgnome-stones.a
-share/gnome/gnome-stones/objects/libgnome-stones.la
 share/gnome/gnome-stones/objects/libgnome-stones.so
-share/gnome/gnome-stones/objects/libgnome-stones.so.0
-share/gnome/gnome-stones/objects/libgnomekoban.a
-share/gnome/gnome-stones/objects/libgnomekoban.la
 share/gnome/gnome-stones/objects/libgnomekoban.so
-share/gnome/gnome-stones/objects/libgnomekoban.so.0
 share/gnome/gnome-stones/tutorial.caves
 share/gnome/gturing/examples/3ones2zeroes.tur
 share/gnome/gturing/examples/add.tur
@@ -258,8 +251,8 @@ share/gnome/pixmaps/cards/suits_medium/xpat-21x21.png
 share/gnome/pixmaps/cards/suits_small/knuth-09x10.png
 share/gnome/pixmaps/cards/suits_small/xpat-11x11.png
 share/gnome/pixmaps/cards/suits_small/xpat-15x15.png
-share/gnome/pixmaps/gnibbles/gnibbles.png
 share/gnome/pixmaps/gnibbles/gnibbles-logo.png
+share/gnome/pixmaps/gnibbles/gnibbles.png
 share/gnome/pixmaps/gnobots/aieee.png
 share/gnome/pixmaps/gnobots/cows.png
 share/gnome/pixmaps/gnobots/eggs.png
@@ -284,8 +277,8 @@ share/gnome/pixmaps/gnome-gtali.png
 share/gnome/pixmaps/gnome-gtetris.png
 share/gnome/pixmaps/gnome-mahjongg.png
 share/gnome/pixmaps/gnome-metatris.png
-share/gnome/pixmaps/gnome-stones.png
 share/gnome/pixmaps/gnome-stones-file.png
+share/gnome/pixmaps/gnome-stones.png
 share/gnome/pixmaps/gnome-stones/amoeba.png
 share/gnome/pixmaps/gnome-stones/boulder.png
 share/gnome/pixmaps/gnome-stones/butterfly.png