Attachment #29841 for bug #50508

View | Details | Raw Unified | Return to bug 50508
Collapse All | Expand All




#

PORTNAME=	xrick
PORTVERSION=	021212
CATEGORIES=	games
MASTER_SITES=	http://www.bigorno.net/xrick/
EXTRACT_SUFX=	.tgz

MAINTAINER=	drs@rucus.ru.ac.za
COMMENT=	A clone of Rick Dangerous

LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
		jpeg.9:${PORTSDIR}/graphics/jpeg

NO_PACKAGE=	Copyright status of the graphics and sounds is uncertain
HAS_CONFIGURE=	yes
CONFIGURE_SCRIPT=	config
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>

Line 1 Link Here

(-)xrick/distinfo (-1 / +1 lines)
1	MD5 (xrick-010808.tgz) = 0a25621afe66b5ef5733cea75f410d40	1	MD5 (xrick-021212.tgz) = 615190051481266710cb43ecd1fe930c




--- 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




--- 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*)

Line 1 Link Here

(-)xrick/pkg-plist (+2 lines)
1	bin/xrick	1	bin/xrick
		2	share/xrick/data.zip
		3	@dirrm share/xrick

Return to bug 50508

Lines 6-12 Link Here

(-)xrick/Makefile (-5 / +10 lines)
6	#	6	#
7		7
8	PORTNAME= xrick	8	PORTNAME= xrick
9	PORTVERSION= 010808	9	PORTVERSION= 021212
10	CATEGORIES= games	10	CATEGORIES= games
11	MASTER_SITES= http://www.bigorno.net/xrick/	11	MASTER_SITES= http://www.bigorno.net/xrick/
12	EXTRACT_SUFX= .tgz	12	EXTRACT_SUFX= .tgz
Lines 14-31 Link Here
14	MAINTAINER= drs@rucus.ru.ac.za	14	MAINTAINER= drs@rucus.ru.ac.za
15	COMMENT= A clone of Rick Dangerous	15	COMMENT= A clone of Rick Dangerous
16		16
17	LIB_DEPENDS= SDL-1.1.5:${PORTSDIR}/devel/sdl12	17	LIB_DEPENDS= SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
		18	jpeg.9:${PORTSDIR}/graphics/jpeg
18		19
19	WRKSRC= ${WRKDIR}/xrick	20	NO_PACKAGE= Copyright status of the graphics and sounds is uncertain
20	HAS_CONFIGURE= yes
21	CONFIGURE_SCRIPT= config
22	USE_GMAKE= yes	21	USE_GMAKE= yes
		22	USE_REINPLACE= yes
23		23
24	MAN6= xrick.6	24	MAN6= xrick.6
25	MANCOMPRESSED= yes	25	MANCOMPRESSED= yes
26		26
		27	post-patch:
		28	@${REINPLACE_CMD} -e 's\|sysarg_args_data = NULL\|sysarg_args_data = "${PREFIX}/share/xrick/data.zip"\|' ${WRKSRC}/src/sysarg.c
		29
27	do-install:	30	do-install:
28	${INSTALL_PROGRAM} ${WRKSRC}/xrick ${PREFIX}/bin	31	${INSTALL_PROGRAM} ${WRKSRC}/xrick ${PREFIX}/bin
29	${INSTALL_MAN} ${WRKSRC}/xrick.6.gz ${PREFIX}/man/man6/xrick.6.gz	32	${INSTALL_MAN} ${WRKSRC}/xrick.6.gz ${PREFIX}/man/man6/xrick.6.gz
		33	${MKDIR} ${PREFIX}/share/xrick
		34	${INSTALL_DATA} ${WRKSRC}/data.zip ${PREFIX}/share/xrick/data.zip
30		35
31	.include <bsd.port.mk>	36	.include <bsd.port.mk>

Line 0 Link Here

(-)xrick/files/patch-Makefile (+22 lines)
	1	--- Makefile.orig Tue Dec 24 18:58:26 2002
	2	+++ Makefile Mon Mar 31 22:28:45 2003
	3	@@ -15,7 +15,7 @@
	4	# Vars
	5	#
	6
	7	-SDLVERSION=$(shell sdl-config --version 2>/dev/null)
	8	+SDLVERSION=$(shell sdl11-config --version 2>/dev/null)
	9	ROOTDIR=$(shell pwd)
	10	TARGET=$(shell uname -s \| tr [a-z] [A-Z])
	11
	12	@@ -71,8 +71,8 @@
	13	all:
	14	@echo "ROOTDIR=$(ROOTDIR)" > Makefile.global
	15	@echo "XOBJ=$(XOBJ)" >> Makefile.global
	16	- @echo "CFLAGS=-g -ansi -pedantic -Wall -W -O2 -I $(ROOTDIR)/include $(shell sdl-config --cflags)" >> Makefile.global
	17	- @echo "LDFLAGS=-lz $(shell sdl-config --libs)" >> Makefile.global
	18	+ @echo "CFLAGS=-g -ansi -pedantic -Wall -W -O2 -I $(ROOTDIR)/include $(shell sdl11-config --cflags)" >> Makefile.global
	19	+ @echo "LDFLAGS=-lz $(shell sdl11-config --libs)" >> Makefile.global
	20	@echo "CC=gcc" >> Makefile.global
	21	@echo "CPP=gcc -E" >> Makefile.global
	22	$(MAKE) -C src all

Lines 1-40 Link Here

(-)xrick/files/patch-config (-40 lines)
1	--- config.orig Mon Apr 15 22:08:26 2002
2	+++ config Mon Apr 15 22:33:35 2002
3	@@ -46,31 +46,20 @@
4	CFLAGS="$CFLAGS -DVERSION=\\\"$VERSION\\\""
5
6	# SDL
7	-SDLVER=`sdl-config --version 2>&1`
8	+SDLVER=`sdl11-config --version 2>&1`
9	if [ $? -ne 0 ]; then
10	echo "Error: SDL not found"
11	echo "Abort"
12	exit 1
13	else
14	echo "SDL version $SDLVER detected"
15	- CFLAGS="$CFLAGS `sdl-config --cflags`"
16	- LDFLAGS="$LDFLAGS `sdl-config --libs`"
17	+ CFLAGS="$CFLAGS `sdl11-config --cflags`"
18	+ LDFLAGS="$LDFLAGS `sdl11-config --libs`"
19	fi
20
21	-POSDOT=`expr index $SDLVER '.'`
22	-POSDOTp=`expr $POSDOT - 1`
23	-POSDOTn=`expr $POSDOT + 1`
24	-SDL_MAJ=`expr substr $SDLVER 1 $POSDOTp`
25	-LEN=`expr length $SDLVER`
26	-LEN=`expr $LEN - $POSDOT`
27	-SDLVER=`expr substr $SDLVER $POSDOTn $LEN`
28	-POSDOT=`expr index $SDLVER '.'`
29	-POSDOTp=`expr $POSDOT - 1`
30	-POSDOTn=`expr $POSDOT + 1`
31	-SDL_MIN=`expr substr $SDLVER 1 $POSDOTp`
32	-LEN=`expr length $SDLVER`
33	-LEN=`expr $LEN - $POSDOT`
34	-SDL_MIC=`expr substr $SDLVER $POSDOTn $LEN`
35	+SDL_MAJ=`echo $SDLVER \| awk -F '.' '{print $1}'`
36	+SDL_MIN=`echo $SDLVER \| awk -F '.' '{print $2}'`
37	+SDL_MIC=`echo $SDLVER \| awk -F '.' '{print $3}'`
38
39	case "$TARGET" in
40	cygwin* \| CYGWIN*)