Upgrade this to 0.3 version so that it works with the new clanlib

5 files changed, 26 insertions, 42 deletions

diff --git a/games/pacman/Makefile b/games/pacman/Makefile
index bc6c2ac6e71..5535e7bea4e 100644
--- a/games/pacman/Makefile
+++ b/games/pacman/Makefile
@@ -1,13 +1,15 @@
-# $NetBSD: Makefile,v 1.5 2000/12/14 23:09:27 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2000/12/15 03:18:31 garbled Exp $
 
-DISTNAME=		Pacman-1.0.0
+DISTNAME=		Pacman-0.3-CVS-00-11-17
+PKGNAME=		Pacman-0.3
 CATEGORIES=		games x11
-MASTER_SITES=		http://dark.x.dtu.dk/clansoft/clanlib/download/
+MASTER_SITES=		http://dark.x.dtu.dk/~mbn/clanlib/download/snapshots/Games/
 
 MAINTAINER=		root@garbled.net
 HOMEPAGE=		http://www.clanlib.org/
 
-DEPENDS+=		ClanLib-0.2.2:../../graphics/clanlib
+DEPENDS+=		ClanLib>=0.2.2:../../graphics/clanlib
+DEPENDS+=		autoconf>=2.13:../../devel/autoconf
 
 USE_X11BASE=		yes
 GNU_CONFIGURE=		yes
@@ -15,6 +17,9 @@ USE_GMAKE=		yes
 
 LDFLAGS+=		-L${LOCALBASE}/lib
 CFLAGS+=		-I${X11BASE}/include
-MAKE_ENV+=		LDFLAGS="${LDFLAGS}" CFLAGS="${CFLAGS}"
+MAKE_ENV+=		LDFLAGS="${LDFLAGS}" CPPFLAGS="${CFLAGS}"
+
+pre-configure:
+	cd ${WRKSRC} && autoconf
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/pacman/files/md5 b/games/pacman/files/md5
index ea2c5b07371..ced32ca933b 100644
--- a/games/pacman/files/md5
+++ b/games/pacman/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 1999/07/21 22:58:26 garbled Exp $
+$NetBSD: md5,v 1.2 2000/12/15 03:18:32 garbled Exp $
 
-MD5 (Pacman-1.0.0.tar.gz) = e96a1849b0ae70b6bb9cfba11cac086a
+MD5 (Pacman-0.3-CVS-00-11-17.tar.gz) = 85ea26d9b6e21e4e528007c4f0cb5373
diff --git a/games/pacman/files/patch-sum b/games/pacman/files/patch-sum
index b28883ef4b1..89b8c28c505 100644
--- a/games/pacman/files/patch-sum
+++ b/games/pacman/files/patch-sum
@@ -1,4 +1,3 @@
-$NetBSD: patch-sum,v 1.1.1.1 1999/07/21 22:58:26 garbled Exp $
+$NetBSD: patch-sum,v 1.2 2000/12/15 03:18:32 garbled Exp $
 
-MD5 (patch-aa) = 10eef50f8b825f2fe0664aaca3a8a809
-MD5 (patch-ab) = 66b07bd619cf9c0225a8e708de37f596
+MD5 (patch-aa) = 452b5fc6a093bc5bfbff25cf5f19baaf
diff --git a/games/pacman/patches/patch-aa b/games/pacman/patches/patch-aa
index cbd50fe12e7..0713fbe6c7a 100644
--- a/games/pacman/patches/patch-aa
+++ b/games/pacman/patches/patch-aa
@@ -1,29 +1,19 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/07/21 22:58:26 garbled Exp $
---- Makefile.in.orig	Mon Jun  7 10:49:02 1999
-+++ Makefile.in	Tue Jul 20 23:59:02 1999
-@@ -4,9 +4,10 @@
- datadir =	@datadir@
- bindir =	@bindir@
+$NetBSD: patch-aa,v 1.2 2000/12/15 03:18:33 garbled Exp $
+--- Makefile.in.orig	Thu Dec 14 20:00:59 2000
++++ Makefile.in	Thu Dec 14 20:04:31 2000
+@@ -8,7 +8,8 @@
  
-+CPPFLAGS+=	$(CFLAGS)
- OBJF =          pacman.o objects.o fontblowup.o
+ OBJF =          .build/pacman.o .build/objects.o .build/fontblowup.o
  DATAFILES =     pacman.dat
--EXTERN_LIBS =   -lclan -lclanlayer2
-+EXTERN_LIBS =   $(LDFLAGS) -lclan -lclanlayer2
+-EXTERN_LIBS =   -lclanCore
++EXTERN_LIBS =   -L$(X11BASE)/lib -Wl,-R$(X11BASE)/lib -lclanCore \
++		-L$(LOCALBASE)/lib -Wl,-R$(LOCALBASE)/lib -lHermes -lpth -lz
  
- all: pacman
+ all: pacman $(DATAFILES)
  
-@@ -29,11 +30,11 @@
+@@ -40,4 +41,4 @@
  
- pacman: $(OBJF) $(DATAFILES)
- 	@echo "Building executable pacman..."
--	@g++ $(EXTERN_LIBS) -o pacman $(OBJF)
-+	@g++ $(EXTERN_LIBS) -DDATAFILE=\"$(datadir)/pacman/pacman.dat\" -o pacman $(OBJF)
- 
- %.o : %.cpp
- 	@echo "Compiling $<"
--	@$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) -O3 -Wall $< -o $@
-+	@$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) -DDATAFILE=\"$(datadir)/pacman/pacman.dat\" -O3 -Wall  $< -o $@
  %.dat : %.scr
  	@echo "Building datafile $<"
- 	@datafile_compiler $< $@
+-	@./pacman -datafile $< $@
++	@echo "x11" | ./pacman -datafile $< $@
diff --git a/games/pacman/patches/patch-ab b/games/pacman/patches/patch-ab
deleted file mode 100644
index 1e39284941a..00000000000
--- a/games/pacman/patches/patch-ab
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 1999/07/21 22:58:26 garbled Exp $
---- config.h.in.orig	Tue Jul 20 23:50:42 1999
-+++ config.h.in	Tue Jul 20 23:51:30 1999
-@@ -2,6 +2,4 @@
- #ifndef header_config
- #define header_config
- 
--#define DATAFILE "/usr/share/pacman/pacman.dat"
--
- #endif