ports/137773: [patch] games/d2x-xl version upgrade
Aragon Gouveia
aragon at phat.za.net
Fri Aug 14 15:50:05 UTC 2009
>Number: 137773
>Category: ports
>Synopsis: [patch] games/d2x-xl version upgrade
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Fri Aug 14 15:50:04 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: Aragon Gouveia
>Release: 8.0-BETA2
>Organization:
>Environment:
FreeBSD fuzz.geek.sh 8.0-BETA2 FreeBSD 8.0-BETA2 #0: Tue Jul 21 00:28:37 SAST 2009 root at fuzz.geek.sh:/usr/obj/usr/src/sys/FUZZ amd64
>Description:
Firstly, pardon my last update attempt in ports/136665. I was not thinking. :)
This patch should upgrade the port to the latest version of d2x-xl (1.14.94) and also fix the tinderbox failure reported to me a few hours ago.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -u -r -N d2x-xl.old/Makefile d2x-xl/Makefile
--- d2x-xl.old/Makefile 2009-03-16 12:01:07.000000000 +0200
+++ d2x-xl/Makefile 2009-08-14 17:01:59.000000000 +0200
@@ -6,10 +6,13 @@
#
PORTNAME= d2x-xl
-PORTVERSION= 1.13.127
+PORTVERSION= 1.14.94
CATEGORIES= games
-MASTER_SITES= http://www.descent2.de/downloads/
-DISTFILES= ${PORTNAME}-src-${PORTVERSION}.rar
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:S|sourceforge/%SUBDIR%/$|project/${PORTNAME}/Linux/|}:source \
+ ${MASTER_SITE_SOURCEFORGE:S|sourceforge/%SUBDIR%/$|project/${PORTNAME}/Data/|}:data \
+ http://www.descent2.de/downloads/:source,data
+DISTFILES= ${PORTNAME}-src-${PORTVERSION}.rar:source \
+ ${PORTNAME}-data-1.14.0.rar:data
MAINTAINER= aragon at phat.za.net
COMMENT= Community Unix port of Descent 2 Game
@@ -18,7 +21,7 @@
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-debug --enable-release=yes --with-sharepath=${PREFIX}/share/d2x-xl
-USE_SDL= sdl mixer
+USE_SDL= sdl mixer image
USE_GMAKE= yes
USE_AUTOTOOLS= aclocal:110 \
autoheader:262 \
@@ -29,7 +32,6 @@
USE_DOS2UNIX= missing depcomp
SUB_FILES= pkg-message
-PLIST_FILES= bin/d2x-xl
OPTIONS= OPENGL "Use OpenGL for 3D graphics" on
@@ -40,7 +42,7 @@
.endif
.if !defined(WITHOUT_OPENGL)
-USE_GL= gl glu glut
+USE_GL= gl glu
CONFIGURE_ARGS+=--with-opengl
CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" CPPFLAGS="-I${LOCALBASE}/include"
.endif
@@ -48,8 +50,8 @@
do-extract:
@${MKDIR} ${WRKSRC}
@cd ${WRKSRC} && \
- unrar x ${DISTDIR}/${DISTFILES} >/dev/null && \
- unrar x ${PORTNAME}-makefiles.rar >/dev/null && \
+ unrar x -o+ ${DISTDIR}/${PORTNAME}-src-${PORTVERSION}.rar >/dev/null && \
+ unrar x -o+ ${PORTNAME}-makefiles.rar >/dev/null && \
${CHMOD} +x configure
post-patch:
@@ -60,6 +62,9 @@
${XARGS} ${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|'
do-install:
+ @${MKDIR} ${DATADIR}
+ @cd ${DATADIR} && \
+ unrar x -o+ ${DISTDIR}/${PORTNAME}-data-1.14.0.rar >/dev/null
${INSTALL_PROGRAM} ${WRKSRC}/d2x-xl ${PREFIX}/bin/d2x-xl
@${CAT} ${PKGMESSAGE}
diff -u -r -N d2x-xl.old/distinfo d2x-xl/distinfo
--- d2x-xl.old/distinfo 2009-03-04 14:16:29.000000000 +0200
+++ d2x-xl/distinfo 2009-08-14 16:29:29.000000000 +0200
@@ -1,3 +1,6 @@
-MD5 (d2x-xl-src-1.13.127.rar) = 050a60816b90e5f6e1e6b2c729d3ea22
-SHA256 (d2x-xl-src-1.13.127.rar) = a9d856c08b3617412393c80fcdf4a80dd565b2ed8dd375d5f6cedf692288d599
-SIZE (d2x-xl-src-1.13.127.rar) = 1406776
+MD5 (d2x-xl-src-1.14.94.rar) = ea52d85ad7391012d32eee93e1bf624d
+SHA256 (d2x-xl-src-1.14.94.rar) = f0daae82e9397ee9c3d4de9aebc23dfd51ec2d19cbe4ed7b0b8f2b61c67b5892
+SIZE (d2x-xl-src-1.14.94.rar) = 1399464
+MD5 (d2x-xl-data-1.14.0.rar) = 144d8830c59f90d6f5a88df1cc3ab209
+SHA256 (d2x-xl-data-1.14.0.rar) = 74f5761a0c6425eceaceb0dfb6cbfc230da5ac329fc810aacdbb10c485384694
+SIZE (d2x-xl-data-1.14.0.rar) = 9903890
diff -u -r -N d2x-xl.old/files/patch-pstypes.h d2x-xl/files/patch-pstypes.h
--- d2x-xl.old/files/patch-pstypes.h 1970-01-01 02:00:00.000000000 +0200
+++ d2x-xl/files/patch-pstypes.h 2009-07-22 00:31:26.000000000 +0200
@@ -0,0 +1,11 @@
+--- include/pstypes.h.orig 2009-07-22 00:02:08.000000000 +0200
++++ include/pstypes.h 2009-07-22 00:03:47.000000000 +0200
+@@ -28,7 +28,7 @@
+
+ //define unsigned types;
+ typedef unsigned char ubyte;
+-#ifndef __unix__
++#ifdef __unix__
+ typedef unsigned short ushort;
+ typedef unsigned int uint;
+ typedef unsigned long ulong;
diff -u -r -N d2x-xl.old/files/pkg-message.in d2x-xl/files/pkg-message.in
--- d2x-xl.old/files/pkg-message.in 2009-03-05 01:22:13.000000000 +0200
+++ d2x-xl/files/pkg-message.in 2009-08-14 17:20:56.000000000 +0200
@@ -1,8 +1,29 @@
************************************************************
-You need to get data files from an original Descent 2 or 1
-CD or from the free demo and place them in:
+You need to get data files from an original Descent 2 CD.
+The CD contains a file named descent2.sow which must be
+extracted with unarj to:
%%DATADIR%%/data
+After extraction the following files may be deleted:
+
+ d2-2plyr.hog
+ d2-2plyr.mn2
+ d2.bat
+ d2chaos.hog
+ d2chaos.mn2
+ d2icons.dll
+ descent2.dem
+ descentg.ini
+ endnote.txt
+ modem.lst
+ pcxview.exe
+ readme.txt
+
+If you want the original movies to play back, copy *.mvl
+from the CD to:
+
+ %%DATADIR%%/movies
+
See http://www.descent2.de/ for more information and addons.
************************************************************
diff -u -r -N d2x-xl.old/pkg-plist d2x-xl/pkg-plist
--- d2x-xl.old/pkg-plist 1970-01-01 02:00:00.000000000 +0200
+++ d2x-xl/pkg-plist 2009-08-14 17:23:18.000000000 +0200
@@ -0,0 +1,98 @@
+bin/d2x-xl
+%%DATADIR%%/data/descent.tex.eng
+%%DATADIR%%/data/descent.tex.ger
+%%DATADIR%%/data/d2x-xl.hog
+%%DATADIR%%/data/exit.ham
+%%DATADIR%%/config/d2x-default.ini
+%%DATADIR%%/profiles/default.plr
+%%DATADIR%%/profiles/default.plx
+%%DATADIR%%/textures/monsterball.tga
+%%DATADIR%%/textures/bullettime#0.tga
+%%DATADIR%%/textures/slowmotion#0.tga
+%%DATADIR%%/textures/cockpit.tga
+%%DATADIR%%/textures/cockpitb.tga
+%%DATADIR%%/textures/status.tga
+%%DATADIR%%/textures/statusb.tga
+%%DATADIR%%/textures/d2x-xl/blast.tga
+%%DATADIR%%/textures/d2x-xl/bubble.tga
+%%DATADIR%%/textures/d2x-xl/bullcase.tga
+%%DATADIR%%/textures/d2x-xl/corona.tga
+%%DATADIR%%/textures/d2x-xl/deadzone.tga
+%%DATADIR%%/textures/d2x-xl/fire.tga
+%%DATADIR%%/textures/d2x-xl/glare.tga
+%%DATADIR%%/textures/d2x-xl/halfhalo.tga
+%%DATADIR%%/textures/d2x-xl/halo.tga
+%%DATADIR%%/textures/d2x-xl/joymouse.tga
+%%DATADIR%%/textures/d2x-xl/pwupicon.tga
+%%DATADIR%%/textures/d2x-xl/rboticon.tga
+%%DATADIR%%/textures/d2x-xl/shield.tga
+%%DATADIR%%/textures/d2x-xl/smoke.tga
+%%DATADIR%%/textures/d2x-xl/sparks.tga
+%%DATADIR%%/textures/d2x-xl/thrust2d.tga
+%%DATADIR%%/textures/d2x-xl/thrust3d.tga
+%%DATADIR%%/textures/d2x-xl/smoke-hard.tga
+%%DATADIR%%/textures/d2x-xl/smoke-medium.tga
+%%DATADIR%%/textures/d2x-xl/smoke-soft.tga
+%%DATADIR%%/textures/d2x-xl/scope.tga
+%%DATADIR%%/textures/d2x-xl/aimdmg.tga
+%%DATADIR%%/textures/d2x-xl/drivedmg.tga
+%%DATADIR%%/textures/d2x-xl/gundmg.tga
+%%DATADIR%%/textures/d2x-xl/original/blast.tga
+%%DATADIR%%/textures/d2x-xl/original/bubble.tga
+%%DATADIR%%/textures/d2x-xl/original/bullcase.tga
+%%DATADIR%%/textures/d2x-xl/original/corona.tga
+%%DATADIR%%/textures/d2x-xl/original/deadzone.tga
+%%DATADIR%%/textures/d2x-xl/original/fire.tga
+%%DATADIR%%/textures/d2x-xl/original/glare.tga
+%%DATADIR%%/textures/d2x-xl/original/halfhalo.tga
+%%DATADIR%%/textures/d2x-xl/original/halo.tga
+%%DATADIR%%/textures/d2x-xl/original/joymouse.tga
+%%DATADIR%%/textures/d2x-xl/original/pwupicon.tga
+%%DATADIR%%/textures/d2x-xl/original/rboticon.tga
+%%DATADIR%%/textures/d2x-xl/original/shield.tga
+%%DATADIR%%/textures/d2x-xl/original/smoke.tga
+%%DATADIR%%/textures/d2x-xl/original/sparks.tga
+%%DATADIR%%/textures/d2x-xl/original/thrust2d.tga
+%%DATADIR%%/textures/d2x-xl/original/thrust3d.tga
+%%DATADIR%%/textures/d2x-xl/thrust2d-blue.tga
+%%DATADIR%%/textures/d2x-xl/thrust2d-red.tga
+%%DATADIR%%/textures/d2x-xl/thrust3d-blue.tga
+%%DATADIR%%/textures/d2x-xl/thrust3d-red.tga
+%%DATADIR%%/models/bullet.ase
+%%DATADIR%%/models/bullet.tga
+%%DATADIR%%/sounds2/gatling-slowdown.wav
+%%DATADIR%%/sounds2/gatling-speedup.wav
+%%DATADIR%%/sounds2/gauss-firing.wav
+%%DATADIR%%/sounds2/vulcan-firing.wav
+%%DATADIR%%/sounds2/missileflight-big.wav
+%%DATADIR%%/sounds2/missileflight-small.wav
+%%DATADIR%%/sounds2/afbr_1.wav
+%%DATADIR%%/sounds2/airbubbles.wav
+%%DATADIR%%/sounds2/highping.wav
+%%DATADIR%%/sounds2/lowping.wav
+%%DATADIR%%/sounds2/slowdown.wav
+%%DATADIR%%/sounds2/speedup.wav
+%%DATADIR%%/sounds2/lightning.wav
+%%DATADIR%%/sounds2/headlight.wav
+%%DATADIR%%/sounds2/zoom1.wav
+%%DATADIR%%/sounds2/zoom2.wav
+%%DATADIR%%/sounds2/d1/gatling-slowdown.wav
+%%DATADIR%%/sounds2/d1/gatling-speedup.wav
+%%DATADIR%%/sounds2/d1/headlight.wav
+%%DATADIR%%/sounds2/d1/highping.wav
+%%DATADIR%%/sounds2/d1/lowping.wav
+%%DATADIR%%/sounds2/d1/missileflight-big.wav
+%%DATADIR%%/sounds2/d1/missileflight-small.wav
+%%DATADIR%%/sounds2/d1/zoom1.wav
+%%DATADIR%%/sounds2/d1/zoom2.wav
+%%DATADIR%%/sounds2/d1/vulcan-firing.wav
+ at dirrm %%DATADIR%%/sounds2/d1
+ at dirrm %%DATADIR%%/sounds2
+ at dirrm %%DATADIR%%/models
+ at dirrm %%DATADIR%%/textures/d2x-xl/original
+ at dirrm %%DATADIR%%/textures/d2x-xl
+ at dirrm %%DATADIR%%/textures
+ at dirrm %%DATADIR%%/profiles
+ at dirrm %%DATADIR%%/config
+ at dirrm %%DATADIR%%/data
+ at dirrm %%DATADIR%%
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list