6 files changed, 111 insertions, 66 deletions

diff --git a/games/gemdropx/Makefile b/games/gemdropx/Makefile
index 1c42f8addfaf..e076fe244fb1 100644
--- a/games/gemdropx/Makefile
+++ b/games/gemdropx/Makefile
@@ -1,32 +1,33 @@
 # New ports collection makefile for:	gemdropx
-# Version required:			0.4
+# Version required:			0.7
 # Date created:				9 March 1998
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=	gemdropx.0.4
-PKGNAME=	gemdropx-0.4
+DISTNAME=	gemdropx-0.7
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.sonic.net/pub/users/nbs/unix/x/gemdropx/
 
 MAINTAINER=	ports@FreeBSD.org
 
-ALL_TARGET=	gemdropx
-MAKEFILE=	makefile
+LIB_DEPENDS=	SDL-1.0.2:${PORTSDIR}/devel/sdl
+
+USE_GMAKE=	yes
 USE_X_PREFIX=	yes
-WRKSRC=		${WRKDIR}/gemdropx
+ALL_TARGET=	nosound
+MAKE_ARGS=	JOY=NO DATA_PREFIX=${PREFIX}/share/gemdropx -f
 
 do-install:
-	@ ${INSTALL_PROGRAM} ${WRKSRC}/gemdropx ${PREFIX}/bin
-	@ ${MKDIR} ${PREFIX}/share/gemdropx/gfx
-	@ ${INSTALL_DATA} ${WRKSRC}/gfx/* ${PREFIX}/share/gemdropx/gfx
-	@ ${MKDIR} ${PREFIX}/share/gemdropx/sounds
-	@ ${INSTALL_DATA} ${WRKSRC}/sounds/* ${PREFIX}/share/gemdropx/sounds
+	${INSTALL_PROGRAM} ${WRKSRC}/gemdropx ${PREFIX}/bin
+	@${MKDIR} ${PREFIX}/share/gemdropx/images
+	${INSTALL_DATA} ${WRKSRC}/data/images/* ${PREFIX}/share/gemdropx/images
+	@${MKDIR} ${PREFIX}/share/gemdropx/sounds
+	${INSTALL_DATA} ${WRKSRC}/data/sounds/* ${PREFIX}/share/gemdropx/sounds
 .if !defined(NOPORTDOCS)
-	@ ${MKDIR} ${PREFIX}/share/doc/gemdropx
-	@ ${INSTALL_DATA} ${WRKSRC}/README.txt ${PREFIX}/share/doc/gemdropx
+	@${MKDIR} ${PREFIX}/share/doc/gemdropx
+	${INSTALL_DATA} ${WRKSRC}/README.txt ${PREFIX}/share/doc/gemdropx
 .endif
 
 .include <bsd.port.mk>
diff --git a/games/gemdropx/distinfo b/games/gemdropx/distinfo
index ece26e01c5b3..102fc26985d7 100644
--- a/games/gemdropx/distinfo
+++ b/games/gemdropx/distinfo
@@ -1 +1 @@
-MD5 (gemdropx.0.4.tar.gz) = 06b07dd55aa315fd4b77adb990ef8986
+MD5 (gemdropx-0.7.tar.gz) = 9364e9da54939f95d3f5bd58119455a3
diff --git a/games/gemdropx/files/patch-aa b/games/gemdropx/files/patch-aa
index aea0be5db8b0..183ed83f1087 100644
--- a/games/gemdropx/files/patch-aa
+++ b/games/gemdropx/files/patch-aa
@@ -1,23 +1,20 @@
---- makefile	Thu Jul 30 19:53:32 1998
-+++ /home/andy/tmp/wrk/makefile	Mon Aug 10 18:03:04 1998
-@@ -11,14 +11,16 @@
- # X Window Updates: July 29, 1998- July 29, 1998
+--- Makefile.orig	Tue Dec 28 17:33:54 1999
++++ Makefile	Thu Mar 30 00:18:17 2000
+@@ -22,7 +22,7 @@
+ JOYFLAG=$(JOY)JOYSTICK
  
  
--CC=gcc
-+CC?=gcc
-+PREFIX?=/usr/X11R6
-+X11BASE?=/usr/X11R6
+-CFLAGS=-Wall $(SDL_CFLAGS) \
++CFLAGS+=$(SDL_CFLAGS) \
+ 	-DDATA_PREFIX=\"$(DATA_PREFIX)\" -D$(NOSOUNDFLAG) -D$(JOYFLAG)
+ SDL_LIB=$(MIXER) $(SDL_LDFLAGS)
  
--INSTALLROOT= $(PREFIX)
-+INSTALLROOT= $(PREFIX)/share/gemdropx
- GFX= $(INSTALLROOT)/gfx
- SOUNDS= $(INSTALLROOT)/sounds
+@@ -30,7 +30,7 @@
+ all:	gemdropx
  
--XLIB= $(RPATH) -L$(PREFIX)/lib -lX11 -lm
--XINC= -I$(PREFIX)/include
-+XLIB= $(RPATH) -L$(X11BASE)/lib -lX11 -lm
-+XINC= -I$(X11BASE)/include
- CFLAGS= $(XINC) -DSOUNDS=\"$(SOUNDS)\" -DGFX=\"$(GFX)\"
+ nosound:
+-	make MIXER= NOSOUNDFLAG=NOSOUND JOY=$(JOY)
++	$(MAKE) MIXER= NOSOUNDFLAG=NOSOUND JOY=$(JOY)
  
- all:	gemdropx
+ clean:
+ 	-rm gemdropx
diff --git a/games/gemdropx/files/patch-ab b/games/gemdropx/files/patch-ab
new file mode 100644
index 000000000000..7e58af38b3d0
--- /dev/null
+++ b/games/gemdropx/files/patch-ab
@@ -0,0 +1,14 @@
+--- gemdropx.c.orig	Tue Dec 28 18:54:17 1999
++++ gemdropx.c	Thu Mar 30 00:25:25 2000
+@@ -2231,9 +2231,11 @@
+ 		 (JS_VERSION & 0x0000FF));
+ #endif
+ 
++#ifndef NOSOUND
+ 	  SDL_VERSION(&sdlver);
+ 	  printf("SDL version %d.%d.%d\n\n", sdlver.major,
+ 		 sdlver.minor, sdlver.patch);
++#endif
+ 
+ 	  exit(0);
+ 	}
diff --git a/games/gemdropx/pkg-descr b/games/gemdropx/pkg-descr
index 43d35e8cf642..b44545d28a24 100644
--- a/games/gemdropx/pkg-descr
+++ b/games/gemdropx/pkg-descr
@@ -17,4 +17,4 @@ top is a random assortment of colored shapes ("gems"). As time goes
 on, more  gems  appear at the very  top of the  screen, pushing the
 rest downwards.  The game is over when the gems reach the bottom.
 
-WWW: http://www.sonic.net/~nbs/unix/x/gemdropx/
+WWW: http://www.newbreedsoftware.com/gemdropx/
diff --git a/games/gemdropx/pkg-plist b/games/gemdropx/pkg-plist
index 8f1595e7e0bb..0385f4a8b991 100644
--- a/games/gemdropx/pkg-plist
+++ b/games/gemdropx/pkg-plist
@@ -1,37 +1,70 @@
 bin/gemdropx
 share/doc/gemdropx/README.txt
-share/gemdropx/gfx/author.ppm
-share/gemdropx/gfx/block.ppm
-share/gemdropx/gfx/bomb.ppm
-share/gemdropx/gfx/brick.ppm
-share/gemdropx/gfx/diamond.ppm
-share/gemdropx/gfx/disc.ppm
-share/gemdropx/gfx/dot.ppm
-share/gemdropx/gfx/explode0.ppm
-share/gemdropx/gfx/explode1.ppm
-share/gemdropx/gfx/explode2.ppm
-share/gemdropx/gfx/explode3.ppm
-share/gemdropx/gfx/face.ppm
-share/gemdropx/gfx/fuji.ppm
-share/gemdropx/gfx/happy.ppm
-share/gemdropx/gfx/sad.ppm
-share/gemdropx/gfx/star.ppm
-share/gemdropx/gfx/stopwatch.ppm
-share/gemdropx/gfx/title.ppm
-share/gemdropx/gfx/triangle.ppm
-share/gemdropx/gfx/warning.ppm
-share/gemdropx/gfx/wildcard.ppm
-share/gemdropx/gfx/win1.ppm
-share/gemdropx/gfx/win2.ppm
-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
-@dirrm share/doc/gemdropx
-@dirrm share/gemdropx/gfx
+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/images
 @dirrm share/gemdropx
+@dirrm share/doc/gemdropx