5 files changed, 35 insertions, 46 deletions

diff --git a/games/xrick/Makefile b/games/xrick/Makefile
index 53072bf6e35b..aa26339c523d 100644
--- a/games/xrick/Makefile
+++ b/games/xrick/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xrick
-PORTVERSION=	010808
+PORTVERSION=	021212
 CATEGORIES=	games
 MASTER_SITES=	http://www.bigorno.net/xrick/
 EXTRACT_SUFX=	.tgz
@@ -14,18 +14,23 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	drs@rucus.ru.ac.za
 COMMENT=	A clone of Rick Dangerous
 
-LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12
+LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
+		jpeg.9:${PORTSDIR}/graphics/jpeg
 
-WRKSRC=		${WRKDIR}/xrick
-HAS_CONFIGURE=	yes
-CONFIGURE_SCRIPT=	config
+NO_PACKAGE=	Copyright status of the graphics and sounds is uncertain
 USE_GMAKE=	yes
+USE_REINPLACE=	yes
 
 MAN6=		xrick.6
 MANCOMPRESSED=	yes
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|sysarg_args_data = NULL|sysarg_args_data = "${PREFIX}/share/xrick/data.zip"|' ${WRKSRC}/src/sysarg.c
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xrick ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/xrick.6.gz ${PREFIX}/man/man6/xrick.6.gz
+	${MKDIR} ${PREFIX}/share/xrick
+	${INSTALL_DATA} ${WRKSRC}/data.zip ${PREFIX}/share/xrick/data.zip
 
 .include <bsd.port.mk>
diff --git a/games/xrick/distinfo b/games/xrick/distinfo
index 9bea3b290128..ec7e489c74d1 100644
--- a/games/xrick/distinfo
+++ b/games/xrick/distinfo
@@ -1 +1 @@
-MD5 (xrick-010808.tgz) = 0a25621afe66b5ef5733cea75f410d40
+MD5 (xrick-021212.tgz) = 615190051481266710cb43ecd1fe930c
diff --git a/games/xrick/files/patch-Makefile b/games/xrick/files/patch-Makefile
new file mode 100644
index 000000000000..ec3c5a003615
--- /dev/null
+++ b/games/xrick/files/patch-Makefile
@@ -0,0 +1,22 @@
+--- Makefile.orig	Tue Dec 24 18:58:26 2002
++++ Makefile	Mon Mar 31 22:28:45 2003
+@@ -15,7 +15,7 @@
+ # Vars
+ #
+ 
+-SDLVERSION=$(shell sdl-config --version 2>/dev/null)
++SDLVERSION=$(shell sdl11-config --version 2>/dev/null)
+ ROOTDIR=$(shell pwd)
+ TARGET=$(shell uname -s | tr [a-z] [A-Z])
+ 
+@@ -71,8 +71,8 @@
+ all:
+ 	@echo "ROOTDIR=$(ROOTDIR)" > Makefile.global
+ 	@echo "XOBJ=$(XOBJ)" >> Makefile.global
+-	@echo "CFLAGS=-g -ansi -pedantic -Wall -W -O2 -I $(ROOTDIR)/include $(shell sdl-config --cflags)" >> Makefile.global
+-	@echo "LDFLAGS=-lz $(shell sdl-config --libs)" >> Makefile.global
++	@echo "CFLAGS=-g -ansi -pedantic -Wall -W -O2 -I $(ROOTDIR)/include $(shell sdl11-config --cflags)" >> Makefile.global
++	@echo "LDFLAGS=-lz $(shell sdl11-config --libs)" >> Makefile.global
+ 	@echo "CC=gcc" >> Makefile.global
+ 	@echo "CPP=gcc -E" >> Makefile.global
+ 	$(MAKE) -C src all
diff --git a/games/xrick/files/patch-config b/games/xrick/files/patch-config
deleted file mode 100644
index 280ff41c0b36..000000000000
--- a/games/xrick/files/patch-config
+++ /dev/null
@@ -1,40 +0,0 @@
---- config.orig	Mon Apr 15 22:08:26 2002
-+++ config	Mon Apr 15 22:33:35 2002
-@@ -46,31 +46,20 @@
- CFLAGS="$CFLAGS -DVERSION=\\\"$VERSION\\\""
- 
- # SDL
--SDLVER=`sdl-config --version 2>&1`
-+SDLVER=`sdl11-config --version 2>&1`
- if [ $? -ne 0 ]; then
-   echo "Error: SDL not found"
-   echo "Abort"
-   exit 1
- else
-   echo "SDL version $SDLVER detected"
--  CFLAGS="$CFLAGS `sdl-config --cflags`"
--  LDFLAGS="$LDFLAGS `sdl-config --libs`"
-+  CFLAGS="$CFLAGS `sdl11-config --cflags`"
-+  LDFLAGS="$LDFLAGS `sdl11-config --libs`"
- fi
- 
--POSDOT=`expr index $SDLVER '.'`
--POSDOTp=`expr $POSDOT - 1`
--POSDOTn=`expr $POSDOT + 1`
--SDL_MAJ=`expr substr $SDLVER 1 $POSDOTp`
--LEN=`expr length $SDLVER`
--LEN=`expr $LEN - $POSDOT`
--SDLVER=`expr substr $SDLVER $POSDOTn $LEN`
--POSDOT=`expr index $SDLVER '.'`
--POSDOTp=`expr $POSDOT - 1`
--POSDOTn=`expr $POSDOT + 1`
--SDL_MIN=`expr substr $SDLVER 1 $POSDOTp`
--LEN=`expr length $SDLVER`
--LEN=`expr $LEN - $POSDOT`
--SDL_MIC=`expr substr $SDLVER $POSDOTn $LEN`
-+SDL_MAJ=`echo $SDLVER | awk -F '.' '{print $1}'`
-+SDL_MIN=`echo $SDLVER | awk -F '.' '{print $2}'`
-+SDL_MIC=`echo $SDLVER | awk -F '.' '{print $3}'`
- 
- case "$TARGET" in
-   cygwin* | CYGWIN*)
diff --git a/games/xrick/pkg-plist b/games/xrick/pkg-plist
index 707a71a5fbd3..131b147053f8 100644
--- a/games/xrick/pkg-plist
+++ b/games/xrick/pkg-plist
@@ -1 +1,3 @@
 bin/xrick
+share/xrick/data.zip
+@dirrm share/xrick