Date: Wed, 25 Apr 2012 15:50:16 GMT From: Dominic Fandrey <kamikaze@bsdforen.de> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/165842: [maintainer-update] games/ioquake3 and slaves Message-ID: <201204251550.q3PFoGDC058425@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/165842; it has been noted by GNATS.
From: Dominic Fandrey <kamikaze@bsdforen.de>
To: bug-followup@FreeBSD.org, kamikaze@bsdforen.de
Cc:
Subject: Re: ports/165842: [maintainer-update] games/ioquake3 and slaves
Date: Wed, 25 Apr 2012 17:46:59 +0200
This is a multi-part message in MIME format.
--------------040401070600040807010702
Content-Type: text/plain; charset=ascii; format=flowed
Content-Transfer-Encoding: 7bit
A little overhaul:
- Newer SVN (2244 instead of 2224)
- Get rid of all fatal portlint warnings
- Add UNIQUENAME to -server ports to avoid options file clash
Remember to use "patch -E" to remove empty files.
--
A: Because it fouls the order in which people normally read text.
Q: Why is top-posting such a bad thing?
A: Top-posting.
Q: What is the most annoying thing on usenet and in e-mail?
--------------040401070600040807010702
Content-Type: text/plain; charset=UTF-8;
name="shar-ports-games-ioquake3-server.txt"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename="shar-ports-games-ioquake3-server.txt"
# This is a shell archive. Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file". Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
# ioquake3-devel-server
# ioquake3-devel-server/Makefile
# ioquake3-server
# ioquake3-server/Makefile
# iourbanterror-server
# iourbanterror-server/Makefile
# openarena-server
# openarena-server/Makefile
#
echo c - ioquake3-devel-server
mkdir -p ioquake3-devel-server > /dev/null 2>&1
echo x - ioquake3-devel-server/Makefile
sed 's/^X//' >ioquake3-devel-server/Makefile << 'ad6dfadc504d86829aef25277ce76b66'
X# New ports collection makefile for: ioquake3-devel-server
X# Date created: 7 March 2012
X# Whom: kamikaze
X#
X# $FreeBSD$
X#
X
XPORTNAME= ioquake3-devel
XPKGNAMESUFFIX= -server
X
XMAINTAINER= kamikaze@bsdforen.de
XCOMMENT= Ioquake3 development snapshot dedicated server
X
XUNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX}
XMASTERDIR= ${.CURDIR}/../${PORTNAME}
X
X.include "${MASTERDIR}/Makefile"
ad6dfadc504d86829aef25277ce76b66
echo c - ioquake3-server
mkdir -p ioquake3-server > /dev/null 2>&1
echo x - ioquake3-server/Makefile
sed 's/^X//' >ioquake3-server/Makefile << '5260366bb6cda2f1a2cde52ef8c4738c'
X# New ports collection makefile for: ioquake3-server
X# Date created: 7 March 2012
X# Whom: kamikaze
X#
X# $FreeBSD$
X#
X
XPORTNAME= ioquake3
XPKGNAMESUFFIX= -server
X
XMAINTAINER= kamikaze@bsdforen.de
XCOMMENT= Ioquake3 dedicated server
X
XUNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX}
XMASTERDIR= ${.CURDIR}/../${PORTNAME}
X
X.include "${MASTERDIR}/Makefile"
5260366bb6cda2f1a2cde52ef8c4738c
echo c - iourbanterror-server
mkdir -p iourbanterror-server > /dev/null 2>&1
echo x - iourbanterror-server/Makefile
sed 's/^X//' >iourbanterror-server/Makefile << 'fd032d1d3462c78bfd827d743653a986'
X# New ports collection makefile for: iourbanterror-server
X# Date created: 7 March 2012
X# Whom: kamikaze
X#
X# $FreeBSD$
X#
X
XPORTNAME= iourbanterror
XPKGNAMESUFFIX= -server
X
XMAINTAINER= kamikaze@bsdforen.de
XCOMMENT= Urban Terror dedicated server
X
XUNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX}
XMASTERDIR= ${.CURDIR}/../${PORTNAME}
X
X.include "${MASTERDIR}/Makefile"
fd032d1d3462c78bfd827d743653a986
echo c - openarena-server
mkdir -p openarena-server > /dev/null 2>&1
echo x - openarena-server/Makefile
sed 's/^X//' >openarena-server/Makefile << '95aff4933013a93dd5f668476986f6d7'
X# New ports collection makefile for: openarena-server
X# Date created: 7 March 2012
X# Whom: kamikaze
X#
X# $FreeBSD$
X#
X
XPORTNAME= openarena
XPKGNAMESUFFIX= -server
X
XMAINTAINER= kamikaze@bsdforen.de
XCOMMENT= OpenArena dedicated server
X
XUNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX}
XMASTERDIR= ${.CURDIR}/../${PORTNAME}
X
X.include "${MASTERDIR}/Makefile"
95aff4933013a93dd5f668476986f6d7
exit
--------------040401070600040807010702
Content-Type: text/plain; charset=UTF-8;
name="patch-ports-games-ioquake3.txt"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename="patch-ports-games-ioquake3.txt"
diff -Nur ioquake3-devel.orig/Makefile ioquake3-devel/Makefile
--- ioquake3-devel.orig/Makefile 2012-03-07 20:15:08.000000000 +0100
+++ ioquake3-devel/Makefile 2012-04-25 10:13:52.000000000 +0200
@@ -14,12 +14,15 @@
MAINTAINER?= kamikaze@bsdforen.de
COMMENT?= Development SVN snapshots of ioquake3
-PLIST?= ${.CURDIR}/../ioquake3/pkg-plist
+MASTERDIR= ${.CURDIR}/../ioquake3
+DESCR?= ${.CURDIR}/../${PORTNAME}/pkg-descr
+DISTINFO_FILE?= ${.CURDIR}/../${PORTNAME}/distinfo
PATCHDIR?= ${WRKDIR}/freebsd-patchset/
+PKGMESSAGE?= ${.CURDIR}/../${PORTNAME}/pkg-message
-SVNREVISION?= 2194
+SVNREVISION?= 2244
BINSUFFIX?= -devel
HAS_DLRENDERER?= yes
-.include "${.CURDIR}/../ioquake3/Makefile"
+.include "${MASTERDIR}/Makefile"
diff -Nur ioquake3-devel.orig/distinfo ioquake3-devel/distinfo
--- ioquake3-devel.orig/distinfo 2012-03-07 20:15:08.000000000 +0100
+++ ioquake3-devel/distinfo 2012-04-25 10:15:08.000000000 +0200
@@ -1,2 +1,2 @@
-SHA256 (ioquake3-devel-1.36_SVN2194.zip) = 91ef10e29ebc49c4d1faa4265b573e98c3b804b71004111142ee7b55543a54ff
-SIZE (ioquake3-devel-1.36_SVN2194.zip) = 5660634
+SHA256 (ioquake3-devel-1.36_SVN2244.zip) = a7ade108c015a1aa572082900a9995371d7853d6953226ef93bdfad9e46583fb
+SIZE (ioquake3-devel-1.36_SVN2244.zip) = 5650901
diff -Nur ioquake3.orig/Makefile ioquake3/Makefile
--- ioquake3.orig/Makefile 2012-03-07 20:15:24.000000000 +0100
+++ ioquake3/Makefile 2012-04-25 13:28:37.000000000 +0200
@@ -7,7 +7,7 @@
PORTNAME?= ioquake3
DISTVERSION?= 1.36
-PORTREVISION?= 9
+PORTREVISION?= 10
CATEGORIES= games
MASTER_SITES?= http://ioquake3.org/files/${DISTVERSION}/
# Using zip this way enables slaves to override it.
@@ -20,25 +20,46 @@
USE_GMAKE= yes
-OPTIONS+= CLIENT "Build client" on \
- DEDICATED "Build dedicated server" on \
+.if defined(PKGNAMESUFFIX) && ${PKGNAMESUFFIX:M*-server}
+# Server config
+WITH_DEDICATED= yes
+WITHOUT_CLIENT= yes
+WITHOUT_SERVER= yes
+WITHOUT_CURL= yes
+WITHOUT_OPENAL= yes
+WITHOUT_MUMBLE= yes
+WITHOUT_VORBIS= yes
+WITHOUT_TOOLS= yes
+WITHOUT_DLRENDERER= yes
+.else
+# Client config
+WITH_CLIENT= yes
+WITHOUT_DEDICATED= yes
+OPTIONS+= SERVER "Install dedicated server" on \
CURL "Enable cURL for http/ftp download" on \
OPENAL "Enable OpenAL audio output" on \
MUMBLE "Enable Mumble support (no dependencies)" on \
VORBIS "Enable Ogg Vorbis support" on
-.if !defined(NO_GAMELIBS)
-OPTIONS+= GAMELIBS "Build game libraries" off
-.endif
-.if defined(HAS_DLRENDERER)
+. if defined(NO_TOOLS)
+WITHOUT_TOOLS= yes
+. else
+OPTIONS+= TOOLS "Enable modding tools" on
+. endif
+. if defined(HAS_DLRENDERER)
OPTIONS+= DLRENDERER "Build dynamically loaded renderer" on
-.else
+. else
WITHOUT_DLRENDERER= yes
+. endif
+.endif
+# Common config
+.if !defined(NO_GAMELIBS)
+OPTIONS+= GAMELIBS "Build game libraries" off
.endif
MAKE_ARGS+= DEFAULT_BASEDIR="${Q3DIR}" \
DEFAULT_LIBDIR="${LIBDIR}" \
HOMEPATH="${HOMEPATH}" \
- VERSION="${DISTVERSION}" \
+ VERSION="${Q3ENGINEVER}" \
ARCH="${ARCH}" \
USE_LOCAL_HEADERS=0
PLIST_SUB+= LIBDIR="${LIBDIR:S/${PREFIX}\///}" \
@@ -47,7 +68,8 @@
ALL_TARGET= release
MAKE_JOBS_SAFE= yes
-LIBDIR= ${PREFIX}/lib/${PORTNAME}
+LIBDIR= ${PREFIX}/lib/${PORTNAME}${PKGNAMESUFFIX}
+DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
BUILDDIR= ${WRKSRC}/build/${ALL_TARGET}-${OPSYS:L}-${ARCH}
BINSUFFIX?=
HOMEPATH?= /.${PORTNAME}
@@ -62,13 +84,10 @@
Q3ICON?= ${PREFIX}/share/pixmaps/quake3.xpm
Q3RENDERER?= renderer_opengl1_${ARCH}
Q3INSTALL?=
+Q3ENGINEVER?= ${DISTVERSION}
ONLY_FOR_ARCHS= amd64 i386
-# Make sure TARGET and CFLAGS fit together for cross-compiling.
-MACHINE_ARCH= ${ARCH}
-.include <bsd.cpu.mk>
-
.include <bsd.port.options.mk>
.if defined(NO_GAMELIBS) && defined(WITH_GAMELIBS)
@@ -82,14 +101,18 @@
ALL_TARGET= debug
.endif
+.if !defined(WITHOUT_SERVER)
+RUN_DEPENDS+= ${Q3SERVER}:${PORTSDIR}/games/${PORTNAME}-server
+.endif
+
.if !defined(DESKTOP_ENTRIES)
. if !defined(WITHOUT_CLIENT)
-DESKTOP_ENTRIES+= "${Q3CLIENT} ${DISTVERSION}" "${COMMENT}" \
+DESKTOP_ENTRIES+= "${Q3CLIENT} ${Q3ENGINEVER}" "${COMMENT}" \
"${Q3ICON}" \
"${Q3CLIENT}${BINSUFFIX}" "Application;Game;" false
. endif
. if defined(WITH_SMP)
-DESKTOP_ENTRIES+= "${Q3CLIENT} ${DISTVERSION} SMP" "${COMMENT}" \
+DESKTOP_ENTRIES+= "${Q3CLIENT} ${Q3ENGINEVER} SMP" "${COMMENT}" \
"${Q3ICON}" \
"${Q3CLIENT}-smp${BINSUFFIX}" "Application;Game;" false
. endif
@@ -179,15 +202,23 @@
PLIST_SUB+= DLRENDERER="@comment "
.endif
+.if !defined(WITHOUT_TOOLS)
+PLIST_SUB+= TOOLS=""
+.else
+PLIST_SUB+= TOOLS="@comment "
+.endif
+
do-install: ${Q3INSTALL}
.for bin in ${Q3BIN}
${INSTALL_PROGRAM} ${BUILDDIR}/${bin}.${ARCH} \
${PREFIX}/bin/${bin}${BINSUFFIX}
.endfor
+.if !defined(WITHOUT_TOOLS)
.for bin in ${Q3TOOLS}
${INSTALL_PROGRAM} ${BUILDDIR}/tools/${bin} \
${PREFIX}/bin/${bin}${BINSUFFIX}
.endfor
+.endif
.if !defined(WITHOUT_DLRENDERER)
.for renderer in ${Q3RENDERER}
${MKDIR} ${LIBDIR}
diff -Nur ioquake3.orig/files/patch-code-client-cl_curl.h ioquake3/files/patch-code-client-cl_curl.h
--- ioquake3.orig/files/patch-code-client-cl_curl.h 2012-03-07 20:15:24.000000000 +0100
+++ ioquake3/files/patch-code-client-cl_curl.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,12 +0,0 @@
---- code/client/cl_curl.h.orig 2011-11-03 10:16:32.000000000 +0100
-+++ code/client/cl_curl.h 2011-11-03 10:16:56.000000000 +0100
-@@ -34,8 +34,7 @@
- #elif defined(MACOS_X)
- #define DEFAULT_CURL_LIB "libcurl.dylib"
- #else
--#define DEFAULT_CURL_LIB "libcurl.so.4"
--#define ALTERNATE_CURL_LIB "libcurl.so.3"
-+#define DEFAULT_CURL_LIB "libcurl.so"
- #endif
-
- #ifdef USE_LOCAL_HEADERS
diff -Nur ioquake3.orig/pkg-plist ioquake3/pkg-plist
--- ioquake3.orig/pkg-plist 2012-03-07 20:15:24.000000000 +0100
+++ ioquake3/pkg-plist 2012-03-07 21:25:10.000000000 +0100
@@ -1,10 +1,10 @@
%%DEDICATED%%bin/ioq3ded%%BINSUFFIX%%
%%CLIENT%%bin/ioquake3%%BINSUFFIX%%
%%SMP%%bin/ioquake3-smp%%BINSUFFIX%%
-bin/q3asm%%BINSUFFIX%%
-bin/q3cpp%%BINSUFFIX%%
-bin/q3lcc%%BINSUFFIX%%
-bin/q3rcc%%BINSUFFIX%%
+%%TOOLS%%bin/q3asm%%BINSUFFIX%%
+%%TOOLS%%bin/q3cpp%%BINSUFFIX%%
+%%TOOLS%%bin/q3lcc%%BINSUFFIX%%
+%%TOOLS%%bin/q3rcc%%BINSUFFIX%%
%%DLRENDERER%%%%LIBDIR%%/renderer_opengl1_%%ARCH%%.so
%%GAMELIBS%%%%LIBDIR%%/baseq3/cgame%%ARCH%%.so
%%GAMELIBS%%%%LIBDIR%%/baseq3/qagame%%ARCH%%.so
diff -Nur iourbanterror.orig/Makefile iourbanterror/Makefile
--- iourbanterror.orig/Makefile 2012-03-07 22:42:19.000000000 +0100
+++ iourbanterror/Makefile 2012-04-25 13:35:53.000000000 +0200
@@ -7,7 +7,6 @@
PORTNAME= iourbanterror
PORTVERSION= ${GAMEVERSION}.s${SVNREVISION}
-DISTVERSION= 1.36_SVN${SVNREVISION}+${GAMEVERSION}
PORTEPOCH= 1
CATEGORIES= games
DISTNAME= ioquake3-devel-1.36_SVN${SVNREVISION}
@@ -17,18 +16,21 @@
RUN_DEPENDS= ${Q3DIR}/q3ut4:${PORTSDIR}/games/urbanterror-data
-PLIST= ${.CURDIR}/pkg-plist
+MASTERDIR= ${.CURDIR}/../ioquake3-devel
+DISTINFO_FILE= ${.CURDIR}/../ioquake3-devel/distinfo
+PLIST= ${.CURDIR}/../${PORTNAME}/pkg-plist
NO_GAMELIBS= yes
+NO_TOOLS= yes
# The docs belong to ioquake3
NOPORTDOCS= yes
GAMEVERSION= 4.1.1
+Q3ENGINEVER= 1.36_SVN${SVNREVISION}+${GAMEVERSION}
Q3TOTALCONV= yes
Q3DIR= ${PREFIX}/share/quake3
Q3ICON= ${PREFIX}/share/quake3/q3ut4/q3ut.ico
Q3CLIENT= ioUrbanTerror
Q3SERVER= ioUrTded
-Q3TOOLS=
Q3BASE= q3ut4
BINSUFFIX=
HOMEPATH= /.ioUrbanTerror
@@ -36,16 +38,16 @@
MAKE_ARGS+= BUILD_MISSIONPACK=0 \
BUILD_STANDALONE=1
-UTPATCHES!= echo ${.CURDIR}/files/*
+UTPATCHES= ${.CURDIR}/../${PORTNAME}/files/*
post-patch:
-.for _file in ${UTPATCHES}
- @${PATCH} -sd "${WRKSRC}" < ${_file}
-.endfor
+ @for utpatch in ${UTPATCHES}; do \
+ ${PATCH} -sd "${WRKSRC}" < $$utpatch; \
+ done
@${REINPLACE_CMD} \
-e 's/ioquake3/${Q3CLIENT}/g' \
-e 's/ioq3ded/${Q3SERVER}/g' \
-e 's/baseq3/${Q3BASE}/g' \
"${WRKSRC}/Makefile"
-.include "../ioquake3-devel/Makefile"
+.include "${MASTERDIR}/Makefile"
diff -Nur iourbanterror.orig/distinfo iourbanterror/distinfo
--- iourbanterror.orig/distinfo 2012-03-07 22:42:19.000000000 +0100
+++ iourbanterror/distinfo 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-SHA256 (ioquake3-devel-1.36_SVN2194.zip) = 91ef10e29ebc49c4d1faa4265b573e98c3b804b71004111142ee7b55543a54ff
-SIZE (ioquake3-devel-1.36_SVN2194.zip) = 5660634
diff -Nur openarena-data.orig/Makefile openarena-data/Makefile
--- openarena-data.orig/Makefile 2012-03-07 23:20:47.000000000 +0100
+++ openarena-data/Makefile 2012-04-25 15:49:46.000000000 +0200
@@ -6,35 +6,33 @@
#
PORTNAME= data
-PORTVERSION= 0.8.5
+PORTVERSION= 0.8.8
CATEGORIES= games
-MASTER_SITES= http://openarena.ws/request.php?2\\\#/:data \
- http://openarena.ws/request.php?3\\\#/:patch
-DISTFILES= ${OA_DATA}:data \
- ${OA_PATCH}:patch
+MASTER_SITES= SF/oarena:data \
+ http://openarena.ws/request.php?4\\\#/:data \
+ SF/oarena:patch \
+ http://openarena.ws/request.php?5\\\#/:patch
+DISTFILES= ${OA_DATA}:data
EXTRACT_ONLY=
MAINTAINER= kamikaze@bsdforen.de
COMMENT= OpenArena game data files
-USE_ZIP= yes
-
WRKSRC= ${WRKDIR}/baseoa
NO_BUILD= yes
FETCH_ARGS=
-USE_ZIP= yes
-OA_DATA= oa081.zip
-OA_DATA_VER= 0.8.1
-OA_PATCH= oa085p.zip
-OA_PATCH_VER= 0.8.1
-
-post-extract:
- ${UNZIP_CMD} -j ${DISTDIR}/${OA_DATA} ${PKGNAMEPREFIX}${OA_DATA_VER}/${OABASE}/\* -d ${WRKSRC}
- ${UNZIP_CMD} -j ${DISTDIR}/${OA_PATCH} ${PKGNAMEPREFIX}${OA_PATCH_VER}/${OABASE}/\* -d ${WRKSRC}
+OA_DATA= ${PKGNAMEPREFIX}${OA_DATA_VER}.zip
+OA_DATA_VER= 0.8.8
+
+.include "../openarena/Makefile.include"
do-install:
${MKDIR} ${DATADIR}
- (cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${DATADIR})
+.for _file in ${DISTFILES:C/:[^:]*//}
+ ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${_file} \
+ ${EXTRACT_AFTER_ARGS} -C ${DATADIR} --strip-components 2 \
+ ${PKGNAMEPREFIX}\?.\?.\?/baseoa/
+.endfor
-.include "../openarena/Makefile.include"
+.include <bsd.port.post.mk>
diff -Nur openarena-data.orig/distinfo openarena-data/distinfo
--- openarena-data.orig/distinfo 2012-03-07 23:20:47.000000000 +0100
+++ openarena-data/distinfo 2012-04-25 13:02:52.000000000 +0200
@@ -1,4 +1,2 @@
-SHA256 (oa081.zip) = c96282de8bc2ac5781df58c6adbce4265376e36190af50d7528f51dc739b6d7d
-SIZE (oa081.zip) = 318927645
-SHA256 (oa085p.zip) = d360c4b095bc3b34d03d9a366b21c12052c3f9e9c57e86b17c8b2c038baa4719
-SIZE (oa085p.zip) = 42528474
+SHA256 (openarena-0.8.8.zip) = 5a8faf7f5b51f351b0a1618c06b6b98a5f1a6758f1d39818de2c87df2a0bac4a
+SIZE (openarena-0.8.8.zip) = 425189255
diff -Nur openarena-data.orig/pkg-plist openarena-data/pkg-plist
--- openarena-data.orig/pkg-plist 2012-03-07 23:20:47.000000000 +0100
+++ openarena-data/pkg-plist 2012-03-10 09:30:09.000000000 +0100
@@ -6,5 +6,6 @@
%%DATADIR%%/pak5-TA.pk3
%%DATADIR%%/pak6-misc.pk3
%%DATADIR%%/pak6-patch085.pk3
+%%DATADIR%%/pak6-patch088.pk3
@dirrm %%DATADIR%%
@dirrmtry %%OADIR%%
diff -Nur openarena-oax.orig/Makefile openarena-oax/Makefile
--- openarena-oax.orig/Makefile 2012-04-25 09:58:36.000000000 +0200
+++ openarena-oax/Makefile 2012-04-25 15:22:50.000000000 +0200
@@ -11,13 +11,10 @@
MASTER_SITES= http://files.poulsander.com/~poul19/public_files/eliminationSource/
DISTNAME= ${PORTNAME}${PORTVERSION}
EXTRACT_SUFX= .zip
-EXTRACT_ONLY=
MAINTAINER= kamikaze@bsdforen.de
COMMENT= OpenArena Mod: OpenArena Xpanded
-USE_ZIP= yes
-
PLIST_SUB+= DISTNAME="${DISTNAME}" \
PORTNAME="${PORTNAME}"
@@ -25,11 +22,10 @@
OABASE= ${DISTNAME}
-post-extract:
- ${UNZIP_CMD} -j ${DISTDIR}/${DISTFILES} -d ${WRKSRC}
-
do-install:
${MKDIR} ${DATADIR}
(cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${DATADIR})
.include "../openarena/Makefile.include"
+
+.include <bsd.port.post.mk>
diff -Nur openarena-oax.orig/distinfo openarena-oax/distinfo
--- openarena-oax.orig/distinfo 2012-04-25 09:58:36.000000000 +0200
+++ openarena-oax/distinfo 2012-04-12 04:30:54.000000000 +0200
@@ -1,2 +1,2 @@
SHA256 (oaxB50.zip) = 8c3a8846544acc4498a0bdc2fdbeb2206f9dd003be06498aab62e4573d7d108f
-SIZE (oaxB50.zip) = 472236
\ No newline at end of file
+SIZE (oaxB50.zip) = 472236
diff -Nur openarena.orig/Makefile openarena/Makefile
--- openarena.orig/Makefile 2012-03-07 22:42:41.000000000 +0100
+++ openarena/Makefile 2012-04-25 13:48:46.000000000 +0200
@@ -7,11 +7,11 @@
PORTNAME= openarena
PORTVERSION= ${GAMEVERSION}.s${SVNREVISION}
-DISTVERSION= 1.36_SVN${SVNREVISION}+${GAMEVERSION}
-PORTREVISION= 9
+PORTREVISION= 0
PORTEPOCH= 1
-MASTER_SITES= http://files.poulsander.com/~poul19/public_files/oa/dev081/
-DISTNAME= ${PORTNAME}-engine-source-0.8.x-22
+MASTER_SITES= SF/oarena/src \
+ http://files.poulsander.com/~poul19/public_files/oa/dev088/
+DISTNAME= ${PORTNAME}-engine-source-0.8.8
# Master port defines EXTRACT_SUFX unless already defined
EXTRACT_SUFX= .tar.bz2
@@ -20,22 +20,29 @@
RUN_DEPENDS= ${DATADIR}/${Q3BASE}/pak0.pk3:${PORTSDIR}/games/openarena-data
+MASTERDIR= ${.CURDIR}/../ioquake3
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+DISTINFO_FILE= ${.CURDIR}/../${PORTNAME}/distinfo
+PATCHDIR= ${.CURDIR}/../${PORTNAME}/files
+PLIST= ${.CURDIR}/../${PORTNAME}/pkg-plist
+PKGMESSAGE= ${.CURDIR}/../${PORTNAME}/pkg-message
+
NO_GAMELIBS= yes
+NO_TOOLS= yes
# OpenArena doc is too messy to bother
NOPORTDOCS= yes
+# Dynamically loaded renderer not yet supported
+WITHOUT_DLRENDERER= yes
-GAMEVERSION= 0.8.5
+GAMEVERSION= 0.8.8
SVNREVISION= 1910
+Q3ENGINEVER= 1.36_SVN${SVNREVISION}+${GAMEVERSION}
Q3TOTALCONV= yes
Q3CLIENT= openarena
Q3SERVER= oa_ded
-Q3TOOLS=
Q3BASE= baseoa
Q3DIR= ${DATADIR}
# No icon included with OpenArena
Q3ICON=
-# Dynamically loaded renderer not yet supported
-WITHOUT_DLRENDERER= yes
-
-.include "../ioquake3/Makefile"
+.include "${MASTERDIR}/Makefile"
diff -Nur openarena.orig/Makefile.include openarena/Makefile.include
--- openarena.orig/Makefile.include 2012-03-07 22:42:41.000000000 +0100
+++ openarena/Makefile.include 2012-04-25 11:37:13.000000000 +0200
@@ -12,12 +12,10 @@
.include <bsd.port.pre.mk>
# You only need server or client.
-.if exists(${PREFIX}/bin/oa_ded)
+.if exists(${LOCALBASE}/bin/oa_ded)
OABIN= oa_ded
-.elif exists(${PREFIX}/bin/openarena)
+.elif exists(${LOCALBASE}/bin/openarena)
OABIN= openarena
.else
OABIN= openarena-smp
.endif
-
-.include <bsd.port.post.mk>
diff -Nur openarena.orig/distinfo openarena/distinfo
--- openarena.orig/distinfo 2012-03-07 22:42:41.000000000 +0100
+++ openarena/distinfo 2012-03-07 22:54:04.000000000 +0100
@@ -1,2 +1,2 @@
-SHA256 (openarena-engine-source-0.8.x-22.tar.bz2) = d2a9123b3e35f656de795957afcb64917612e91cfc55157410cceaa6a7939a60
-SIZE (openarena-engine-source-0.8.x-22.tar.bz2) = 7422832
+SHA256 (openarena-engine-source-0.8.8.tar.bz2) = 95aa500cb7e42e57fb1f6db7b97a254168f4fa2e3676d6cdc33180b69fde0e77
+SIZE (openarena-engine-source-0.8.8.tar.bz2) = 3777830
diff -Nur openarena.orig/files/patch-Makefile openarena/files/patch-Makefile
--- openarena.orig/files/patch-Makefile 2012-03-07 22:42:41.000000000 +0100
+++ openarena/files/patch-Makefile 2012-03-07 23:02:26.000000000 +0100
@@ -1,5 +1,5 @@
---- Makefile.orig 2011-11-04 21:03:54.000000000 +0100
-+++ Makefile 2011-11-04 21:09:54.000000000 +0100
+--- Makefile.orig 2011-12-12 23:48:49.000000000 +0100
++++ Makefile 2012-03-07 23:00:53.000000000 +0100
@@ -205,6 +205,8 @@
OPENAL_LIBS=$(shell pkg-config --silence-errors --libs openal)
SDL_CFLAGS=$(shell pkg-config --silence-errors --cflags sdl|sed 's/-Dmain=SDL_main//')
@@ -9,7 +9,7 @@
endif
# Use sdl-config if all else fails
ifeq ($(SDL_CFLAGS),)
-@@ -569,9 +571,15 @@
+@@ -570,9 +572,15 @@
ifeq ($(PLATFORM),freebsd)
@@ -25,7 +25,7 @@
-DUSE_ICON -DMAP_ANONYMOUS=MAP_ANON
CLIENT_CFLAGS = $(SDL_CFLAGS)
SERVER_CFLAGS =
-@@ -594,27 +602,24 @@
+@@ -595,27 +603,24 @@
# optional features/libraries
ifeq ($(USE_OPENAL),1)
diff -Nur openarena.orig/files/patch-feature-DEFAULT_LIBDIR openarena/files/patch-feature-DEFAULT_LIBDIR
--- openarena.orig/files/patch-feature-DEFAULT_LIBDIR 2012-03-07 22:42:41.000000000 +0100
+++ openarena/files/patch-feature-DEFAULT_LIBDIR 2012-03-07 23:03:54.000000000 +0100
@@ -1,5 +1,5 @@
---- code/qcommon/files.c.orig 2011-03-10 02:01:27.599036000 +0100
-+++ code/qcommon/files.c 2011-03-19 22:40:42.000000000 +0100
+--- code/qcommon/files.c.orig 2011-12-24 13:29:32.000000000 +0100
++++ code/qcommon/files.c 2012-03-07 23:00:53.000000000 +0100
@@ -250,6 +250,7 @@
#endif
@@ -8,15 +8,15 @@
static cvar_t *fs_basegame;
static cvar_t *fs_gamedirvar;
static searchpath_t *fs_searchpaths;
-@@ -2956,6 +2957,7 @@
+@@ -2859,6 +2860,7 @@
fs_debug = Cvar_Get( "fs_debug", "0", 0 );
- fs_basepath = Cvar_Get ("fs_basepath", Sys_DefaultInstallPath(), CVAR_INIT|CVAR_PROTECTED );
+ fs_basepath = Cvar_Get ("fs_basepath", Sys_DefaultInstallPath(), CVAR_INIT );
fs_basegame = Cvar_Get ("fs_basegame", "", CVAR_INIT );
+ fs_libpath = Cvar_Get ("fs_libpath", Sys_DefaultLibPath(), CVAR_INIT );
homePath = Sys_DefaultHomePath();
if (!homePath || !homePath[0]) {
homePath = fs_basepath->string;
-@@ -2975,6 +2977,11 @@
+@@ -2878,6 +2880,11 @@
if (fs_apppath->string[0])
FS_AddGameDirectory(fs_apppath->string, gameName);
#endif
@@ -28,9 +28,9 @@
// NOTE: same filtering below for mods and basegame
if (fs_homepath->string[0] && Q_stricmp(fs_homepath->string,fs_basepath->string)) {
---- code/qcommon/qcommon.h.orig 2011-03-10 02:01:27.599036000 +0100
-+++ code/qcommon/qcommon.h 2011-03-19 22:40:42.000000000 +0100
-@@ -1104,6 +1104,9 @@
+--- code/qcommon/qcommon.h.orig 2011-12-24 13:29:32.000000000 +0100
++++ code/qcommon/qcommon.h 2012-03-07 23:00:53.000000000 +0100
+@@ -1099,6 +1099,9 @@
char *Sys_DefaultAppPath(void);
#endif
@@ -40,8 +40,8 @@
void Sys_SetDefaultHomePath(const char *path);
char *Sys_DefaultHomePath(void);
const char *Sys_TempPath(void);
---- code/sys/sys_main.c.orig 2011-02-23 17:17:09.009063000 +0100
-+++ code/sys/sys_main.c 2011-03-19 22:40:42.000000000 +0100
+--- code/sys/sys_main.c.orig 2011-12-24 13:29:37.000000000 +0100
++++ code/sys/sys_main.c 2012-03-07 23:00:53.000000000 +0100
@@ -49,6 +49,7 @@
static char binaryPath[ MAX_OSPATH ] = { 0 };
diff -Nur urbanterror-data.orig/Makefile urbanterror-data/Makefile
--- urbanterror-data.orig/Makefile 2012-03-08 00:07:27.000000000 +0100
+++ urbanterror-data/Makefile 2012-04-25 12:47:59.000000000 +0200
@@ -5,36 +5,37 @@
# $FreeBSD: ports/games/urbanterror-data/Makefile,v 1.7 2011/03/22 18:53:41 pav Exp $
#
-PORTNAME= urbanterror
+PORTNAME= data
PORTVERSION= 4.1.1
CATEGORIES= games
-MASTER_SITES= ftp://ftp.snt.utwente.nl/pub/games/urbanterror/full_install/linux_or_mac/
-# http://www.urbanterror.info/downloads/software/urt/${DISTNAME}${EXTRACT_SUFX}?download=direct\\\#
-PKGNAMESUFFIX= -data
+MASTER_SITES= ftp://ftp.snt.utwente.nl/pub/games/urbanterror/full_install/linux_or_mac/ \
+ http://www.iourt.com/files/ \
+ http://urbanterror.mtc-team.fr/
+PKGNAMEPREFIX= urbanterror-
DISTNAME= UrbanTerror${PORTVERSION:S/.//g}
+EXTRACT_SUFX= .zip
+EXTRACT_ONLY=
MAINTAINER= kamikaze@bsdforen.de
COMMENT= Standalone realism based mod originally for Quake III Arena
-USE_ZIP= yes
NO_BUILD= yes
NO_PACKAGE= Package will be 1GB; set FORCE_PACKAGE if you really want it
WRKSRC= ${WRKDIR}/UrbanTerror
-DATADIR= ${Q3DIR}
-
-.include "../quake3-data/Makefile.include"
-
-post-extract:
- @cd ${WRKSRC}/q3ut4 && ${MV} readme${PORTVERSION:S/.//:C/\..*//}.txt ..
+DATADIR= ${PREFIX}/share/quake3
do-install:
${MKDIR} ${DATADIR}/q3ut4
- ${CP} -r ${WRKSRC}/q3ut4/* ${DATADIR}/q3ut4
+ ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${DISTFILES} \
+ ${EXTRACT_AFTER_ARGS} -C ${DATADIR} --strip-components 1 \
+ UrbanTerror/q3ut4
.if !defined(NOPORTDOCS)
${MKDIR} ${DOCSDIR}
- ${INSTALL_DATA} ${WRKSRC}/readme${PORTVERSION:S/.//:C/\..*//}.txt \
+ ${MV} ${DATADIR}/q3ut4/readme${PORTVERSION:S/.//:C/\..*//}.txt \
${DOCSDIR}/readme${PORTVERSION:S/.//g}.txt
+.else
+ ${RM} ${DATADIR}/q3ut4/readme${PORTVERSION:S/.//:C/\..*//}.txt
.endif
.include <bsd.port.mk>
--------------040401070600040807010702--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201204251550.q3PFoGDC058425>