update to 0.9

rewritten to use SDL

6 files changed, 119 insertions, 173 deletions

diff --git a/games/gemdropx/Makefile b/games/gemdropx/Makefile
index f49ecbdface..76418c3356b 100644
--- a/games/gemdropx/Makefile
+++ b/games/gemdropx/Makefile
@@ -1,18 +1,16 @@
-# $NetBSD: Makefile,v 1.7 2004/01/20 12:15:40 agc Exp $
+# $NetBSD: Makefile,v 1.8 2004/08/06 16:49:48 drochner Exp $
 #
 
-DISTNAME=	gemdropx
-PKGNAME=	gemdropx-0.3
+DISTNAME=	gemdropx-0.9
 CATEGORIES=	games x11
-MASTER_SITES=	ftp://ftp.sonic.net/pub/users/nbs/unix/x/gemdropx/
+MASTER_SITES=	ftp://ftp.sonic.net/pub/users/nbs/unix/x/gemdropx/src/
 
 MAINTAINER=	root@garbled.net
-HOMEPAGE=	http://www.sonic.net/~nbs/unix/x/gemdropx/
+HOMEPAGE=	http://www.newbreedsoftware.com/gemdropx/
 COMMENT=	Color puzzle game for X11 similar to Gem Drop
 
-WRKSRC=		${WRKDIR}/gemdropx
-MAKEFILE=	makefile
-
-USE_X11BASE=	yes
+USE_BUILDLINK3=	yes
 
+.include "../../devel/SDL/buildlink3.mk"
+.include "../../audio/SDL_mixer/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/gemdropx/PLIST b/games/gemdropx/PLIST
index 91f8ff5ee11..ec1c56c7b1f 100644
--- a/games/gemdropx/PLIST
+++ b/games/gemdropx/PLIST
@@ -1,61 +1,71 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:52:39 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/08/06 16:49:48 drochner Exp $
 bin/gemdropx
-share/gemdropx/README
-share/gemdropx/gfx/author.gif
-share/gemdropx/gfx/author.xbm
-share/gemdropx/gfx/block.gif
-share/gemdropx/gfx/block.xbm
-share/gemdropx/gfx/bomb.gif
-share/gemdropx/gfx/bomb.xbm
-share/gemdropx/gfx/brick.gif
-share/gemdropx/gfx/brick.xbm
-share/gemdropx/gfx/convert
-share/gemdropx/gfx/diamond.gif
-share/gemdropx/gfx/diamond.xbm
-share/gemdropx/gfx/disc.gif
-share/gemdropx/gfx/disc.xbm
-share/gemdropx/gfx/dot.gif
-share/gemdropx/gfx/dot.xbm
-share/gemdropx/gfx/explode0.gif
-share/gemdropx/gfx/explode0.xbm
-share/gemdropx/gfx/explode1.gif
-share/gemdropx/gfx/explode1.xbm
-share/gemdropx/gfx/explode2.gif
-share/gemdropx/gfx/explode2.xbm
-share/gemdropx/gfx/explode3.gif
-share/gemdropx/gfx/explode3.xbm
-share/gemdropx/gfx/face.gif
-share/gemdropx/gfx/face.xbm
-share/gemdropx/gfx/fuji.gif
-share/gemdropx/gfx/fuji.xbm
-share/gemdropx/gfx/happy.gif
-share/gemdropx/gfx/happy.xbm
-share/gemdropx/gfx/sad.gif
-share/gemdropx/gfx/sad.xbm
-share/gemdropx/gfx/star.gif
-share/gemdropx/gfx/star.xbm
-share/gemdropx/gfx/stopwatch.gif
-share/gemdropx/gfx/stopwatch.xbm
-share/gemdropx/gfx/title.gif
-share/gemdropx/gfx/title.xbm
-share/gemdropx/gfx/triangle.gif
-share/gemdropx/gfx/triangle.xbm
-share/gemdropx/gfx/warning.gif
-share/gemdropx/gfx/warning.xbm
-share/gemdropx/gfx/wildcard.gif
-share/gemdropx/gfx/wildcard.xbm
-share/gemdropx/gfx/win1.gif
-share/gemdropx/gfx/win1.xbm
-share/gemdropx/gfx/win2.gif
-share/gemdropx/gfx/win2.xbm
-share/gemdropx/sounds/begin.au
-share/gemdropx/sounds/bomb.au
-share/gemdropx/sounds/clock.au
-share/gemdropx/sounds/gameover.au
-share/gemdropx/sounds/got.au
-share/gemdropx/sounds/levelselect.au
-share/gemdropx/sounds/wildcard.au
-share/gemdropx/sounds/win.au
+share/gemdropx/images/.xvpics/credits.bmp
+share/gemdropx/images/README
+share/gemdropx/images/action-mask.xbm
+share/gemdropx/images/action.xbm
+share/gemdropx/images/author.bmp
+share/gemdropx/images/block.bmp
+share/gemdropx/images/bluegem.bmp
+share/gemdropx/images/bomb.bmp
+share/gemdropx/images/brick.bmp
+share/gemdropx/images/congratulations.bmp
+share/gemdropx/images/credits.bmp
+share/gemdropx/images/diamond.bmp
+share/gemdropx/images/disc.bmp
+share/gemdropx/images/dot.bmp
+share/gemdropx/images/explode0.bmp
+share/gemdropx/images/explode1.bmp
+share/gemdropx/images/explode2.bmp
+share/gemdropx/images/explode3.bmp
+share/gemdropx/images/fuji.bmp
+share/gemdropx/images/gemdropx-icon.xpm
+share/gemdropx/images/happy.bmp
+share/gemdropx/images/left-mask.xbm
+share/gemdropx/images/left.xbm
+share/gemdropx/images/level.bmp
+share/gemdropx/images/lines.bmp
+share/gemdropx/images/need.bmp
+share/gemdropx/images/nothing-mask.xbm
+share/gemdropx/images/nothing.xbm
+share/gemdropx/images/numbers.bmp
+share/gemdropx/images/patience.bmp
+share/gemdropx/images/paused.bmp
+share/gemdropx/images/right-mask.xbm
+share/gemdropx/images/right.xbm
+share/gemdropx/images/sad.bmp
+share/gemdropx/images/score.bmp
+share/gemdropx/images/stopwatch.bmp
+share/gemdropx/images/title.bmp
+share/gemdropx/images/triangle.bmp
+share/gemdropx/images/uhoh.bmp
+share/gemdropx/images/warning.bmp
+share/gemdropx/images/warning1.bmp
+share/gemdropx/images/warning2.bmp
+share/gemdropx/images/warning3.bmp
+share/gemdropx/images/warning4.bmp
+share/gemdropx/images/wildcard.bmp
+share/gemdropx/images/win1.bmp
+share/gemdropx/images/win2.bmp
+share/gemdropx/images/yellowgem.bmp
+share/gemdropx/sounds/22drops.mod
+share/gemdropx/sounds/2force.xm
+share/gemdropx/sounds/README
+share/gemdropx/sounds/applause.wav
+share/gemdropx/sounds/begin.wav
+share/gemdropx/sounds/bomb.wav
+share/gemdropx/sounds/buzzer.wav
+share/gemdropx/sounds/citron.mod
+share/gemdropx/sounds/clock.wav
+share/gemdropx/sounds/gameover.wav
+share/gemdropx/sounds/got.wav
+share/gemdropx/sounds/grab.wav
+share/gemdropx/sounds/hr_suds.xm
+share/gemdropx/sounds/levelselect.wav
+share/gemdropx/sounds/throw.wav
+share/gemdropx/sounds/wildcard.wav
+share/gemdropx/sounds/win.wav
 @dirrm share/gemdropx/sounds
-@dirrm share/gemdropx/gfx
+@dirrm share/gemdropx/images/.xvpics
+@dirrm share/gemdropx/images
 @dirrm share/gemdropx
diff --git a/games/gemdropx/distinfo b/games/gemdropx/distinfo
index daba3f36b4b..73f92c91bca 100644
--- a/games/gemdropx/distinfo
+++ b/games/gemdropx/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 02:08:25 wiz Exp $
+$NetBSD: distinfo,v 1.3 2004/08/06 16:49:48 drochner Exp $
 
-SHA1 (gemdropx.tar.gz) = 03d2be661492e8981e8be019ccf5bb4cf2c0826b
-Size (gemdropx.tar.gz) = 74260 bytes
-SHA1 (patch-aa) = 474c608fb8af18bd0d9ee9ee70d5bca3bf565c35
-SHA1 (patch-ab) = 665e99db7a34c7540cba850e6398196f34253fc7
-SHA1 (patch-ac) = 547e5d92c70add4e9c8dffc35065e766270d70c0
+SHA1 (gemdropx-0.9.tar.gz) = be639c7a468f223ca2a183ee2d0a0d4ca1530981
+Size (gemdropx-0.9.tar.gz) = 903036 bytes
+SHA1 (patch-ab) = 114b9dbe1d58dc2dfb3dec3b2d15c9806b5f3fae
diff --git a/games/gemdropx/patches/patch-aa b/games/gemdropx/patches/patch-aa
deleted file mode 100644
index a7fb66a13b1..00000000000
--- a/games/gemdropx/patches/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aa,v 1.2 1998/08/07 10:40:41 agc Exp $
-
---- gemdropx.c.orig	Sat Jul 25 06:09:10 1998
-+++ gemdropx.c	Sat Jul 25 06:11:50 1998
-@@ -157,3 +157,3 @@
-     {
--       sprintf(cmd, "/bin/cat sounds/%s.au > /dev/audio &", aufile);
-+       sprintf(cmd, "/bin/cat " SOUNDS "/%s.au > /dev/audio &", aufile);
-   
-@@ -312,3 +312,3 @@
-     {
--      sprintf(file, "gfx/%s.xbm", object_filenames[i]);
-+      sprintf(file, GFX "/%s.xbm", object_filenames[i]);
-       
diff --git a/games/gemdropx/patches/patch-ab b/games/gemdropx/patches/patch-ab
index 64064fbab30..489a80a7aab 100644
--- a/games/gemdropx/patches/patch-ab
+++ b/games/gemdropx/patches/patch-ab
@@ -1,78 +1,48 @@
-$NetBSD: patch-ab,v 1.3 1998/08/27 14:06:09 garbled Exp $
+$NetBSD: patch-ab,v 1.4 2004/08/06 16:49:48 drochner Exp $
 
---- makefile.orig	Fri Nov 21 23:56:59 1997
-+++ makefile	Sat Jul 25 06:50:05 1998
-@@ -11,10 +11,11 @@
+--- Makefile.orig	2002-05-18 10:53:29.000000000 +0200
++++ Makefile
+@@ -14,11 +14,11 @@
+ # Added 'install' target (finally!): May 18, 2002
  
--
- CC=gcc
--POSTPROCESS=strip
--
--XLIB=-lX11
--# XLIB=-L/usr/openwin/lib -lX11
--# XLIB=-L/usr/X11/lib -lX11
  
-+INSTALLROOT=$(PREFIX)
-+GFX=$(PREFIX)/share/gemdropx/gfx
-+SOUNDS=$(PREFIX)/share/gemdropx/sounds
-+
-+XLIB= -Wl,-R$(X11BASE)/lib -L$(X11BASE)/lib -lX11 -lm -lcompat
-+XINC= -I$(X11BASE)/include
-+CFLAGS= $(XINC) -DSOUNDS=\"$(SOUNDS)\" -DGFX=\"$(GFX)\"
+-DATA_PREFIX=/usr/local/share/gemdropx
++DATA_PREFIX=${PREFIX}/share/gemdropx
+ SDL_CFLAGS := $(shell sdl-config --cflags)
+ SDL_LDFLAGS := $(shell sdl-config --libs)
+-CC=gcc
+-CXX=gcc
++#CC=gcc
++#CXX=gcc
  
-@@ -29,11 +30,15 @@
  
-+install: gemdropx
-+	/usr/bin/install -c -s -o bin -g games -m 2755 gemdropx $(INSTALLROOT)/bin
-+	mkdir -p $(GFX)
-+	/usr/bin/install -o bin -g bin -m 0644 gfx/* $(GFX)
-+	mkdir -p $(SOUNDS)
-+	/usr/bin/install -o bin -g bin -m 0644 sounds/* $(SOUNDS)
-+	/usr/bin/install -o bin -g bin -m 0644 README $(INSTALLROOT)/share/gemdropx
+ MIXER=-lSDL_mixer
+@@ -27,7 +27,7 @@ JOYFLAG=$(JOY)JOYSTICK
+ EMBEDDEDFLAG=NOT_EMBEDDED
  
--gemdropx:	gemdropx.o connect.o randnum.o window.o hints.o text.o gc.o \
--		color.o visual.o sleepfor.o
--	$(CC)	gemdropx.o connect.o randnum.o window.o hints.o text.o gc.o \
--		color.o visual.o sleepfor.o \
--		$(XLIB) -lm -o gemdropx
--	$(POSTPROCESS) gemdropx
--	chmod 755 gemdropx
-+OBJS=	gemdropx.o connect.o randnum.o window.o hints.o text.o gc.o \
-+	color.o visual.o sleepfor.o
  
-+gemdropx: $(OBJS)
-+	$(CC) $(CFLAGS) -o $@ $(OBJS) $(XLIB)
+-CFLAGS=-Wall $(SDL_CFLAGS) \
++CFLAGS+= $(SDL_CFLAGS) \
+ 	-DDATA_PREFIX=\"$(DATA_PREFIX)\" -D$(NOSOUNDFLAG) -D$(JOYFLAG) \
+ 	-D$(EMBEDDEDFLAG) $(XTRA_FLAGS)
+ SDL_LIB=$(MIXER) $(SDL_LDFLAGS)
+@@ -39,8 +39,8 @@ GFX_LIB=$(SDL_LIB)
+ all:	gemdropx
  
-@@ -41,30 +46,10 @@
- 		color.h visual.h sleepfor.h
--	$(CC)	gemdropx.c -c
--
--
- connect.o:	connect.c connect.h
--	$(CC)	connect.c -c
--
- randnum.o:	randnum.c randnum.h
--	$(CC)	randnum.c -c
--
- window.o:	window.c window.h
--	$(CC)	window.c -c
--
- hints.o:	hints.c hints.h
--	$(CC)	hints.c -c
--
--text.o:	text.c text.h
--	$(CC)	text.c -c
--
--gc.o:	gc.c gc.h
--	$(CC)	gc.c -c
--
-+text.o:		text.c text.h
-+gc.o:		gc.c gc.h
- color.o:	color.c color.h
--	$(CC)	color.c -c
--
- visual.o:	visual.c visual.h
--	$(CC)	visual.c -c
--
- sleepfor.o:	sleepfor.c sleepfor.h
--	$(CC)	sleepfor.c -c
+ install:
+-	cp gemdropx /usr/local/bin/
+-	chmod 755 /usr/local/bin/gemdropx
++	cp gemdropx ${PREFIX}/bin/
++	chmod 755 ${PREFIX}/bin/gemdropx
+ 	-mkdir -p $(DATA_PREFIX)
+ 	chmod 755 $(DATA_PREFIX)
+ 	cp -R data/* $(DATA_PREFIX)
+@@ -61,7 +61,7 @@ clean:
+ 
+ 
+ gemdropx:	gemdropx.o
+-	$(CXX) $(CFLAGS) -o gemdropx gemdropx.o $(GFX_LIB) -lm
++	$(CC) $(LDFLAGS) -o gemdropx gemdropx.o $(GFX_LIB) -lm
+ 
+ 
+ gemdropx.o:	gemdropx.c
diff --git a/games/gemdropx/patches/patch-ac b/games/gemdropx/patches/patch-ac
deleted file mode 100644
index 44f27a2bc8e..00000000000
--- a/games/gemdropx/patches/patch-ac
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ac,v 1.2 1998/08/07 10:40:41 agc Exp $
-
-Fixes typo reported in PR pkg/5864 by
-Mason Loring Bliss <mason@acheron.middleboro.ma.us>
-
---- gemdropx.c.orig	Tue Jul 28 09:30:24 1998
-+++ gemdropx.c	Tue Jul 28 09:30:38 1998
-@@ -1872,7 +1872,7 @@
-   
-   /* Setup: */
-   
--  printf("Conneting to server \"%s\"\n", server);
-+  printf("Connecting to server \"%s\"\n", server);
-   setup(server);
-   
-