ports/155716: [maintainer-update] games/ioquake3-devel and friends

Dominic Fandrey kamikaze at bsdforen.de
Sun Mar 20 10:50:02 UTC 2011 

>Number:         155716
>Category:       ports
>Synopsis:       [maintainer-update] games/ioquake3-devel and friends
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Mar 20 10:50:01 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Dominic Fandrey
>Release:        RELENG_8
>Organization:
private
>Environment:
FreeBSD mobileKamikaze.norad 8.2-PRERELEASE FreeBSD 8.2-PRERELEASE #0: Tue Feb  8 15:38:58 CET 2011     root at mobileKamikaze.norad:/usr/obj/HP6510b-8/amd64/usr/src/sys/HP6510b-8  amd64

>Description:
- Update engine sources
- Unify PORTVERSION layout for ioquake3 derivatives

games/quake3-data
- Make Q3DIR in Makefile.include PREFIX safe, broke urbanterror-data port test

games/ioquake3-devel
- Update to SVN r1936, includes bug fixes and security enhancements

games/urbanterror-data
- Update from 4.1 to 4.1.1
- Unfortunately currently only 1 working mirror
- Avoid "Q3DIR!=make -V"

games/iourbanterror
- Add SVN release information to PORTVERSION
- Use r1936 engine sources

games/openarena
- Update to SVN r1910 based engine sources

games/openarena-oax
- Update from B47 to B48 release
>How-To-Repeat:

>Fix:
Patch removes files, please use 'patch -E'!

The patch was tested on my tinderbox on all RELENG_7/8 and amd64/i386 combinations. I can provide logs upon request (need to get some ports from my landlord).

Patch attached with submission follows:

diff -Nur quake3-data.orig/Makefile.include quake3-data/Makefile.include
--- quake3-data.orig/Makefile.include	2011-03-19 19:48:56.000000000 +0100
+++ quake3-data/Makefile.include	2011-03-19 19:51:16.000000000 +0100
@@ -1,14 +1,14 @@
-# Makefile for defining variables used by other Doom related ports.
+# Makefile for defining variables used by other Quake3 related ports.
 
 # Set variables.
 
 Q3PKGNAMEPREFIX?=quake3-
-Q3DIR?=		${LOCALBASE}/share/quake3
+Q3DIR?=		${PREFIX}/share/quake3
 
 # Add them to the environment.
 
 MAKE_ENV+=	Q3DIR="${Q3DIR}"
-PLIST_SUB+=	Q3DIR="${Q3DIR:S/${LOCALBASE}\///}"
+PLIST_SUB+=	Q3DIR="${Q3DIR:S/${PREFIX}\///}"
 SUB_LIST+=	Q3DIR="${Q3DIR}"
 
 # Add the dependency.
diff -Nur ioquake3-devel.orig/Makefile ioquake3-devel/Makefile
--- ioquake3-devel.orig/Makefile	2011-03-19 22:48:47.000000000 +0100
+++ ioquake3-devel/Makefile	2011-03-19 22:49:05.000000000 +0100
@@ -17,7 +17,7 @@
 PLIST?=		${.CURDIR}/../ioquake3/pkg-plist
 PATCHDIR?=	${WRKDIR}/freebsd-patchset/
 
-SVNREVISION?=	1897
+SVNREVISION?=	1936
 BINSUFFIX?=	-devel
 
 .include "${.CURDIR}/../ioquake3/Makefile"
diff -Nur ioquake3-devel.orig/distinfo ioquake3-devel/distinfo
--- ioquake3-devel.orig/distinfo	2011-03-19 22:48:47.000000000 +0100
+++ ioquake3-devel/distinfo	2011-03-19 22:51:06.000000000 +0100
@@ -1,2 +1,2 @@
-SHA256 (ioquake3-devel-1.36_SVN1897.zip) = 1f85ffdbc3798c26760281e7387796014dae82c4141095fe6e9bab4c014a6f43
-SIZE (ioquake3-devel-1.36_SVN1897.zip) = 4933919
+SHA256 (ioquake3-devel-1.36_SVN1936.zip) = ed07048e9716d21b0ecea4b5366d4d78030bdfd175245f46260d67726bdc05b9
+SIZE (ioquake3-devel-1.36_SVN1936.zip) = 4947849
diff -Nur urbanterror-data.orig/Makefile urbanterror-data/Makefile
--- urbanterror-data.orig/Makefile	2011-03-20 00:15:41.000000000 +0100
+++ urbanterror-data/Makefile	2011-03-19 22:39:55.000000000 +0100
@@ -6,38 +6,35 @@
 #
 
 PORTNAME=	urbanterror
-PORTVERSION=	4.1
+PORTVERSION=	4.1.1
 CATEGORIES=	games
-MASTER_SITES=	ftp://ftp.snt.utwente.nl/pub/games/urbanterror/ \
-		http://mirror.kickassctf.com/ \
-		http://mrsentry.net/release/ \
-		http://www.iourt.com/urt${PORTVERSION:S/.//}/
+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
-DISTNAME=	UrbanTerror_${PORTVERSION:S/.//}_FULL
+DISTNAME=	UrbanTerror${PORTVERSION:S/.//g}
 
 MAINTAINER=	kamikaze at bsdforen.de
 COMMENT=	Standalone realism based mod originally for Quake III Arena
 
 USE_ZIP=	yes
 NO_BUILD=	yes
-NO_PACKAGE=	Package will be 715MB; set FORCE_PACKAGE if you really want it
+NO_PACKAGE=	Package will be 1GB; set FORCE_PACKAGE if you really want it
 WRKSRC=		${WRKDIR}/UrbanTerror
 
 DATADIR=	${Q3DIR}
 
-.include <bsd.port.pre.mk>
-
-Q3DIR!=		cd ${PORTSDIR}/games/quake3-data && ${MAKE} -V Q3DIR
+.include "../quake3-data/Makefile.include"
 
 post-extract:
-	@cd ${WRKSRC}/q3ut4 && ${MV} readme${PORTVERSION:S/.//}.txt ..
+	@cd ${WRKSRC}/q3ut4 && ${MV} readme${PORTVERSION:S/.//:C/\..*//}.txt ..
 
 do-install:
 	${MKDIR} ${DATADIR}/q3ut4
 	${CP} -r ${WRKSRC}/q3ut4/* ${DATADIR}/q3ut4
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/readme${PORTVERSION:S/.//}.txt ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/readme${PORTVERSION:S/.//:C/\..*//}.txt \
+		${DOCSDIR}/readme${PORTVERSION:S/.//g}.txt
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -Nur urbanterror-data.orig/distinfo urbanterror-data/distinfo
--- urbanterror-data.orig/distinfo	2011-03-20 00:15:41.000000000 +0100
+++ urbanterror-data/distinfo	2011-03-19 18:27:57.000000000 +0100
@@ -1,3 +1,2 @@
-MD5 (UrbanTerror_41_FULL.zip) = 1370306ea236f65f595e7ca70765e469
-SHA256 (UrbanTerror_41_FULL.zip) = 5706957783d0e4e77fcc4bbbc2df83aefc0f9a6388f6a63b60947e84f9ed265f
-SIZE (UrbanTerror_41_FULL.zip) = 754307397
+SHA256 (UrbanTerror411.zip) = 32d578c556975db2b09735d8be49b575cc0bfc4d379ca57d9981c656115a6f47
+SIZE (UrbanTerror411.zip) = 1074190065
diff -Nur urbanterror-data.orig/pkg-plist urbanterror-data/pkg-plist
--- urbanterror-data.orig/pkg-plist	2011-03-20 00:15:41.000000000 +0100
+++ urbanterror-data/pkg-plist	2011-03-19 19:43:43.000000000 +0100
@@ -1,4 +1,4 @@
-%%PORTDOCS%%%%DOCSDIR%%/readme41.txt
+%%PORTDOCS%%%%DOCSDIR%%/readme411.txt
 %%DATADIR%%/q3ut4/QIIIA Game Source (SDK) License.doc
 %%DATADIR%%/q3ut4/Urban Terror on the Web.url
 %%DATADIR%%/q3ut4/autoexec.cfg
@@ -8,8 +8,10 @@
 %%DATADIR%%/q3ut4/q3ut.ico
 %%DATADIR%%/q3ut4/screenshots/shot0000.jpg
 %%DATADIR%%/q3ut4/server.cfg
+%%DATADIR%%/q3ut4/ut4_commune.pk3
 %%DATADIR%%/q3ut4/zpak000.pk3
 %%DATADIR%%/q3ut4/zpak000_assets.pk3
+%%DATADIR%%/q3ut4/zpak001_assets.pk3
 @dirrm %%DATADIR%%/q3ut4/screenshots
 @dirrm %%DATADIR%%/q3ut4/demos
 @dirrm %%DATADIR%%/q3ut4
diff -Nur iourbanterror.orig/Makefile iourbanterror/Makefile
--- iourbanterror.orig/Makefile	2011-03-19 21:35:37.000000000 +0100
+++ iourbanterror/Makefile	2011-03-19 23:34:54.000000000 +0100
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	iourbanterror
-PORTVERSION=	4.1
-DISTVERSION=	1.36_SVN${SVNREVISION}+${PORTVERSION}
-PORTREVISION=	1
+PORTVERSION=	${GAMEVERSION}.s${SVNREVISION}
+DISTVERSION=	1.36_SVN${SVNREVISION}+${GAMEVERSION}
+PORTREVISION=	0
 PORTEPOCH=	1
 CATEGORIES=	games
 DISTNAME=	ioquake3-devel-1.36_SVN${SVNREVISION}
@@ -23,6 +23,7 @@
 # The docs belong to ioquake3
 NOPORTDOCS=	yes
 
+GAMEVERSION=	4.1.1
 Q3TOTALCONV=	yes
 Q3DIR=		${PREFIX}/share/quake3
 Q3ICON=		${PREFIX}/share/quake3/q3ut4/q3ut.ico
diff -Nur iourbanterror.orig/distinfo iourbanterror/distinfo
--- iourbanterror.orig/distinfo	2011-03-19 21:35:37.000000000 +0100
+++ iourbanterror/distinfo	2011-03-19 23:01:39.000000000 +0100
@@ -1,2 +1,2 @@
-SHA256 (ioquake3-devel-1.36_SVN1897.zip) = 1f85ffdbc3798c26760281e7387796014dae82c4141095fe6e9bab4c014a6f43
-SIZE (ioquake3-devel-1.36_SVN1897.zip) = 4933919
+SHA256 (ioquake3-devel-1.36_SVN1936.zip) = ed07048e9716d21b0ecea4b5366d4d78030bdfd175245f46260d67726bdc05b9
+SIZE (ioquake3-devel-1.36_SVN1936.zip) = 4947849
diff -Nur iourbanterror.orig/pkg-message iourbanterror/pkg-message
--- iourbanterror.orig/pkg-message	2011-03-19 21:35:37.000000000 +0100
+++ iourbanterror/pkg-message	2011-03-19 23:03:51.000000000 +0100
@@ -5,7 +5,7 @@
 UrbanTerror project is switching to a closed source licensing model:
 	http://www.urbanterror.info/news/texts/285/
 
-Should the game have trouble meeting com_maxfps, com_busywait 1 to restore the
-old behaviour.
+Should the game have trouble meeting com_maxfps, set com_busywait 1 to restore
+the old behaviour.
 
 ==============================================================================
diff -Nur openarena.orig/Makefile openarena/Makefile
--- openarena.orig/Makefile	2011-03-19 23:02:50.000000000 +0100
+++ openarena/Makefile	2011-03-19 23:45:00.000000000 +0100
@@ -6,11 +6,12 @@
 #
 
 PORTNAME=	openarena
-PORTVERSION=	0.8.5
-DISTVERSION=	1.36_SVN1788+${PORTVERSION}
-PORTREVISION=	1
+PORTVERSION=	${GAMEVERSION}.s${SVNREVISION}
+DISTVERSION=	1.36_SVN${SVNREVISION}+${GAMEVERSION}
+PORTREVISION=	0
+PORTEPOCH=	1
 MASTER_SITES=	http://files.poulsander.com/~poul19/public_files/oa/dev081/
-DISTNAME=	${PORTNAME}-engine-source-0.8.x-18
+DISTNAME=	${PORTNAME}-engine-source-0.8.x-20
 
 MAINTAINER=	kamikaze at bsdforen.de
 COMMENT=	Quake3 total conversion based on the ioquake3 engine
@@ -22,6 +23,8 @@
 # OpenArena doc is too messy to bother
 NOPORTDOCS=	yes
 
+GAMEVERSION=	0.8.5
+SVNREVISION=	1910
 Q3TOTALCONV=	yes
 Q3CLIENT=	openarena
 Q3SERVER=	oa_ded
diff -Nur openarena.orig/distinfo openarena/distinfo
--- openarena.orig/distinfo	2011-03-19 23:02:50.000000000 +0100
+++ openarena/distinfo	2011-03-19 23:05:15.000000000 +0100
@@ -1,2 +1,2 @@
-SHA256 (openarena-engine-source-0.8.x-18.tar.bz2) = 77180d70af00134b3cfbc51a3c1371f99665e2f073b2ec5fdbf08f6c93ae1c24
-SIZE (openarena-engine-source-0.8.x-18.tar.bz2) = 7211834
+SHA256 (openarena-engine-source-0.8.x-20.tar.bz2) = 0017ef8d15c2b5f028b0118765059420e0dec7b4100e483b659295efff75afa6
+SIZE (openarena-engine-source-0.8.x-20.tar.bz2) = 7413615
diff -Nur openarena.orig/files/patch-code-qcommon-vm_x86.c openarena/files/patch-code-qcommon-vm_x86.c
--- openarena.orig/files/patch-code-qcommon-vm_x86.c	2011-03-19 23:02:50.000000000 +0100
+++ openarena/files/patch-code-qcommon-vm_x86.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,29 +0,0 @@
---- code/qcommon/vm_x86.c.orig	2008-08-18 01:22:06.000000000 +0200
-+++ code/qcommon/vm_x86.c	2010-11-27 14:01:33.000000000 +0100
-@@ -36,7 +36,25 @@
- 
- /* need this on NX enabled systems (i386 with PAE kernel or
-  * noexec32=on x86_64) */
--#ifdef __linux__
-+//     Rambetter's note: I'm adding the test for __FreeBSD__ in addition to the [already
-+// existing] test for __linux__.  Here is why.  I own a 32 bit FreeBSD 8.0 server with
-+// a PAE kernel.  Without VM_X86_MMAP, ioq3ded segfaults shortly after starting
-+// (this should come as no surprise).  With VM_X86_MMAP, ioq3ded runs very smoothly.
-+// So, at a very minimum, we need to set VM_X86_MMAP for FreeBSD PAE kernels.
-+//     Now, I also happen to own a 32 bit FreeBSD 7.1 server with just the standard kernel
-+// (non-PAE).  I have run ioq3ded successfully on it with and without VM_X86_MMAP for many
-+// months.  So, in the case of non-PAE FreeBSD, we can go either way - use VM_X86_MMAP or
-+// not use it.  The absolute safest fix to this problem is to only set VM_X86_MMAP on
-+// PAE FreeBSD kernels (in addition to Linux); however, I don't know of a way to detect
-+// the PAE kernel easily.  Therefore, since using VM_X86_MMAP won't break anything on
-+// non-PAE kernels [apparently], we'll just use it all the time on FreeBSD 32 bit.
-+//     Now, you may ask the question: Why not change the entire test for just __unix__?
-+// Unfortunately I cannot say anything about this because I don't have access to every
-+// other system that has __unix__ defined, so I cannot possibly test all those cases to
-+// make sure things work.  We'll just leave it with __linux__ and __FreeBSD__ to be safe.
-+// If someone with a different flavor of UNIX running a PAE kernel has this problem too,
-+// they can report the bug and we will adjust the line below accordingly.
-+#if defined(__linux__) || defined(__FreeBSD__)
- #define VM_X86_MMAP
- #endif
- 
diff -Nur openarena.orig/files/patch-feature-DEFAULT_LIBDIR openarena/files/patch-feature-DEFAULT_LIBDIR
--- openarena.orig/files/patch-feature-DEFAULT_LIBDIR	2011-03-19 23:02:50.000000000 +0100
+++ openarena/files/patch-feature-DEFAULT_LIBDIR	2011-03-19 23:13:31.000000000 +0100
@@ -1,6 +1,6 @@
---- code/qcommon/files.c.orig	2009-11-09 23:41:42.205886000 +0100
-+++ code/qcommon/files.c	2010-02-16 15:26:18.000000000 +0100
-@@ -242,6 +242,7 @@
+--- 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
+@@ -250,6 +250,7 @@
  #endif
  
  static	cvar_t		*fs_basepath;
@@ -8,18 +8,29 @@
  static	cvar_t		*fs_basegame;
  static	cvar_t		*fs_gamedirvar;
  static	searchpath_t	*fs_searchpaths;
-@@ -2807,6 +2808,8 @@
+@@ -2956,6 +2957,7 @@
  	fs_debug = Cvar_Get( "fs_debug", "0", 0 );
- 	fs_basepath = Cvar_Get ("fs_basepath", Sys_DefaultInstallPath(), CVAR_INIT );
+ 	fs_basepath = Cvar_Get ("fs_basepath", Sys_DefaultInstallPath(), CVAR_INIT|CVAR_PROTECTED );
  	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;
---- code/qcommon/qcommon.h.orig	2010-02-15 17:20:33.680787000 +0100
-+++ code/qcommon/qcommon.h	2010-02-16 15:26:18.000000000 +0100
-@@ -1085,6 +1085,9 @@
+@@ -2975,6 +2977,11 @@
+ 	if (fs_apppath->string[0])
+ 		FS_AddGameDirectory(fs_apppath->string, gameName);
+ 	#endif
++
++	// Search default library location if given
++	if (fs_libpath->string[0]) {
++		FS_AddGameDirectory ( fs_libpath->string, gameName );
++	}
+ 	
+ 	// 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 @@
  char    *Sys_DefaultAppPath(void);
  #endif
  
@@ -29,8 +40,8 @@
  void  Sys_SetDefaultHomePath(const char *path);
  char	*Sys_DefaultHomePath(void);
  const char	*Sys_TempPath(void);
---- code/sys/sys_main.c.orig	2010-02-15 17:20:33.680787000 +0100
-+++ code/sys/sys_main.c	2010-02-16 15:26:18.000000000 +0100
+--- 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
 @@ -49,6 +49,7 @@
  
  static char binaryPath[ MAX_OSPATH ] = { 0 };
@@ -69,41 +80,7 @@
  Sys_DefaultAppPath
  =================
  */
-@@ -435,6 +459,7 @@
- Used to load a development dll instead of a virtual machine
- #1 look in fs_homepath
- #2 look in fs_basepath
-+#3 look in fs_libpath
- =================
- */
- void *Sys_LoadDll( const char *name, char *fqpath ,
-@@ -445,6 +470,7 @@
- 	void  (*dllEntry)( intptr_t (*syscallptr)(intptr_t, ...) );
- 	char  fname[MAX_OSPATH];
- 	char  *basepath;
-+	char  *libpath;
- 	char  *homepath;
- 	char  *gamedir;
- 
-@@ -454,6 +480,7 @@
- 
- 	// TODO: use fs_searchpaths from files.c
- 	basepath = Cvar_VariableString( "fs_basepath" );
-+	libpath = Cvar_VariableString( "fs_libpath" );
- 	homepath = Cvar_VariableString( "fs_homepath" );
- 	gamedir = Cvar_VariableString( "fs_game" );
- 
-@@ -462,6 +489,9 @@
- 	if(!libHandle && basepath)
- 		libHandle = Sys_TryLibraryLoad(basepath, gamedir, fname, fqpath);
- 
-+	if(!libHandle && libpath)
-+		libHandle = Sys_TryLibraryLoad(libpath, gamedir, fname, fqpath);
-+
- 	if(!libHandle) {
- 		Com_Printf ( "Sys_LoadDll(%s) failed to load library\n", name );
- 		return NULL;
-@@ -515,6 +545,14 @@
+@@ -490,6 +514,14 @@
  #	endif
  #endif
  
@@ -118,7 +95,7 @@
  /*
  =================
  Sys_SigHandler
-@@ -589,6 +627,7 @@
+@@ -564,6 +596,7 @@
  	Sys_ParseArgs( argc, argv );
  	Sys_SetBinaryPath( Sys_Dirname( argv[ 0 ] ) );
  	Sys_SetDefaultInstallPath( DEFAULT_BASEDIR );
diff -Nur openarena.orig/pkg-message openarena/pkg-message
--- openarena.orig/pkg-message	2011-03-19 23:02:50.000000000 +0100
+++ openarena/pkg-message	2011-03-19 23:16:53.000000000 +0100
@@ -1,6 +1,6 @@
 ==============================================================================
 
-Should the game freeze when entering a match, try to change the value of
-com_zoneMegs (e.g. to 48).
+Should the game have trouble meeting com_maxfps, which would result in less
+effective strafe jumping, set com_busywait 1 to restore the old behaviour.
 
 ==============================================================================
diff -Nur openarena-oax.orig/Makefile openarena-oax/Makefile
--- openarena-oax.orig/Makefile	2011-03-19 23:30:54.000000000 +0100
+++ openarena-oax/Makefile	2011-03-19 23:31:02.000000000 +0100
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	oax
-PORTVERSION=	B47
+PORTVERSION=	B48
 CATEGORIES=	games
 MASTER_SITES=	http://files.poulsander.com/~poul19/public_files/eliminationSource/
 DISTNAME=	${PORTNAME}${PORTVERSION}
diff -Nur openarena-oax.orig/distinfo openarena-oax/distinfo
--- openarena-oax.orig/distinfo	2011-03-19 23:30:54.000000000 +0100
+++ openarena-oax/distinfo	2011-03-19 23:31:05.000000000 +0100
@@ -1,2 +1,2 @@
-SHA256 (oaxB47.zip) = 16f4a199621162a09107d043b8edfc9cda70fa432c9351aaa8fd055e94048952
-SIZE (oaxB47.zip) = 468070
+SHA256 (oaxB48.zip) = 26564e53625adad46513b3ddc6f906d3c74fe22b3222516a135351928a57602f
+SIZE (oaxB48.zip) = 469333


>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list