[Midnightbsd-cvs] mports [19016] fixup

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Fri May 15 21:03:49 EDT 2015 

Revision: 19016
          http://svnweb.midnightbsd.org/mports/?rev=19016
Author:   laffer1
Date:     2015-05-15 21:03:48 -0400 (Fri, 15 May 2015)
Log Message:
-----------
fixup

Modified Paths:
--------------
    trunk/games/quake3/Makefile
    trunk/games/quake3/files/patch-code-unix-Makefile
    trunk/games/quake3/pkg-plist

Property Changed:
----------------
    trunk/games/quake3/files/patch-code-cgame-cg_weapons.c
    trunk/games/quake3/files/patch-code-client-cl_ui.c
    trunk/games/quake3/files/patch-code-game-q_shared.c
    trunk/games/quake3/files/patch-code-game-q_shared.h
    trunk/games/quake3/files/patch-code-q3_ui-ui_playermodel.c
    trunk/games/quake3/files/patch-code-q3_ui-ui_players.c
    trunk/games/quake3/files/patch-code-q3_ui-ui_saveconfig.c
    trunk/games/quake3/files/patch-code-qcommon-common.c
    trunk/games/quake3/files/patch-code-qcommon-files.c
    trunk/games/quake3/files/patch-code-qcommon-vm.c
    trunk/games/quake3/files/patch-code-renderer-tr_bsp.c
    trunk/games/quake3/files/patch-code-renderer-tr_shader.c
    trunk/games/quake3/files/patch-code-server-sv_client.c
    trunk/games/quake3/files/patch-code-ui-ui_main.c
    trunk/games/quake3/files/patch-code-ui-ui_players.c
    trunk/games/quake3/files/patch-code-unix-Makefile
    trunk/games/quake3/files/patch-code-unix-unix_main.c
    trunk/games/quake3/files/patch-code-unix-unix_shared.c
    trunk/games/quake3/pkg-descr

Modified: trunk/games/quake3/Makefile
===================================================================
--- trunk/games/quake3/Makefile	2015-05-16 01:01:01 UTC (rev 19015)
+++ trunk/games/quake3/Makefile	2015-05-16 01:03:48 UTC (rev 19016)
@@ -8,13 +8,11 @@
 
 PORTNAME=	quake3
 PORTVERSION=	1.32c
+PORTREVISION=	1
 CATEGORIES=	games
-MASTER_SITES=	http://www.proarena.com/p/ftpx/x8524/quake_3_arena/ \
-		http://www.planetgargoyle.com/ \
-		http://www.teamdarkside.net/ \
-		http://0day.icculus.org/mirrors/quake3/ \
-		http://www.olpainless.net/files/ \
+MASTER_SITES=	ftp://mancubus.net/pub/idgames/idstuff/source/ \
 		http://ftp.mancubus.net/pub/idgames/idstuff/source/ \
+		http://www.gamers.org/pub/idgames/idstuff/source/ \
 		${MASTER_SITE_IDSOFTWARE:S|$|source/|}
 DISTNAME=	${PORTNAME}-${REALVERSION}-source
 
@@ -22,20 +20,23 @@
 COMMENT=	Quake III Arena -- first person shooter (native build)
 LICENSE=	gpl2
 
+USES=		dos2unix gmake zip
 ONLY_FOR_ARCHS=	i386
 ONLY_FOR_ARCHS_REASON=	does not run properly; try games/ioquake3
-USE_ZIP=	yes
-USE_DOS2UNIX=	yes
-USE_GMAKE=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${REALVERSION}
 BUILD_WRKSRC=	${WRKSRC}/code/unix
+MAKE_JOBS_UNSAFE=	yes
 
-OPTIONS=	CLIENT "Build client" on \
-		DEDICATED "Build dedicated server" on \
-		GAMELIBS "Build game libraries (when not mandatory)" off \
-		OPTIMIZED_CFLAGS "Enable compilation optimizations" on \
-		SMP "Build SMP (threaded) client" on
+OPTIONS_DEFINE=	GAMELIBS OPTIMIZED_CFLAGS
+OPTIONS_MULTI=	FLAVOR
+OPTIONS_MULTI_FLAVOR=	CLIENT DEDICATED THREADS
+FLAVOR_DESC=	Executable Selection
+CLIENT_DESC=	Build client
+DEDICATED_DESC=	Build dedicated server
+GAMELIBS_DESC=	Build game libraries (when not mandatory)
 
+OPTIONS_DEFAULT=	CLIENT DEDICATED OPTIMIZED_CFLAGS THREADS
+
 MAKE_ENV=	LIBDIR="${LIBDIR}"
 PLIST_SUB=	LIBDIR="${LIBDIR:S/${PREFIX}\///}"
 
@@ -43,13 +44,8 @@
 REALVERSION=	1.32b
 VM_ARCHS=	i386 powerpc
 
-.include <bsd.port.pre.mk>
+.include <bsd.mport.options.mk>
 
-.if defined(WITHOUT_CLIENT) && defined(WITHOUT_DEDICATED) && \
-    defined(WITHOUT_SMP)
-IGNORE=		needs at least one of CLIENT, DEDICATED and SMP options
-.endif
-
 .if ${ARCH} == "i386"
 BUILD_DEPENDS+=	nasm:${PORTSDIR}/devel/nasm
 .endif
@@ -64,12 +60,12 @@
 MAKE_ENV+=	DLL_ONLY=true
 .endif
 
-.if !defined(WITHOUT_CLIENT) || !defined(WITHOUT_SMP)
+.if ${PORT_OPTIONS:MCLIENT} || ${PORT_OPTIONS:MTHREADS}
 USE_GL=		yes
 USE_XORG=	xxf86dga
 .endif
 
-.if !defined(WITHOUT_CLIENT)
+.if ${PORT_OPTIONS:MCLIENT}
 MAKE_ENV+=	CLIENT=YES
 PLIST_SUB+=	CLIENT=""
 Q3BIN+=		quake3
@@ -77,7 +73,7 @@
 PLIST_SUB+=	CLIENT="@comment "
 .endif
 
-.if !defined(WITHOUT_DEDICATED)
+.if ${PORT_OPTIONS:MDEDICATED}
 MAKE_ENV+=	DEDICATED=YES
 PLIST_SUB+=	DEDICATED=""
 Q3BIN+=		q3ded
@@ -85,7 +81,7 @@
 PLIST_SUB+=	DEDICATED="@comment "
 .endif
 
-.if defined(WITH_GAMELIBS) || !defined(HAVE_VM_COMPILED)
+.if ${PORT_OPTIONS:MGAMELIBS} || !defined(HAVE_VM_COMPILED)
 MAKE_ENV+=	GAMELIBS=YES
 PLIST_SUB+=	GAMELIBS=""
 .else
@@ -92,11 +88,11 @@
 PLIST_SUB+=	GAMELIBS="@comment "
 .endif
 
-.if !defined(WITHOUT_OPTIMIZED_CFLAGS)
+.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
 MAKE_ENV+=	OPTIMIZED_CFLAGS=YES
 .endif
 
-.if !defined(WITHOUT_SMP)
+.if ${PORT_OPTIONS:MTHREADS}
 MAKE_ENV+=	SMP=YES \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
 PLIST_SUB+=	SMP=""
@@ -117,7 +113,7 @@
 .for bin in ${Q3BIN}
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/release/${bin} ${PREFIX}/bin
 .endfor
-.if defined(WITH_GAMELIBS) || !defined(HAVE_VM_COMPILED)
+.if ${PORT_OPTIONS:MGAMELIBS} || !defined(HAVE_VM_COMPILED)
 .for dir in baseq3 missionpack
 	${MKDIR} ${LIBDIR}/${dir}
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/release/${dir}/*.so ${LIBDIR}/${dir}
@@ -125,4 +121,4 @@
 .endif
 
 .include "${.CURDIR}/../quake3-data/Makefile.include"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Index: trunk/games/quake3/files/patch-code-cgame-cg_weapons.c
===================================================================
--- trunk/games/quake3/files/patch-code-cgame-cg_weapons.c	2015-05-16 01:01:01 UTC (rev 19015)
+++ trunk/games/quake3/files/patch-code-cgame-cg_weapons.c	2015-05-16 01:03:48 UTC (rev 19016)

Property changes on: trunk/games/quake3/files/patch-code-cgame-cg_weapons.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/games/quake3/files/patch-code-client-cl_ui.c
===================================================================
--- trunk/games/quake3/files/patch-code-client-cl_ui.c	2015-05-16 01:01:01 UTC (rev 19015)
+++ trunk/games/quake3/files/patch-code-client-cl_ui.c	2015-05-16 01:03:48 UTC (rev 19016)

Property changes on: trunk/games/quake3/files/patch-code-client-cl_ui.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/games/quake3/files/patch-code-game-q_shared.c
===================================================================
--- trunk/games/quake3/files/patch-code-game-q_shared.c	2015-05-16 01:01:01 UTC (rev 19015)
+++ trunk/games/quake3/files/patch-code-game-q_shared.c	2015-05-16 01:03:48 UTC (rev 19016)

Property changes on: trunk/games/quake3/files/patch-code-game-q_shared.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/games/quake3/files/patch-code-game-q_shared.h
===================================================================
--- trunk/games/quake3/files/patch-code-game-q_shared.h	2015-05-16 01:01:01 UTC (rev 19015)
+++ trunk/games/quake3/files/patch-code-game-q_shared.h	2015-05-16 01:03:48 UTC (rev 19016)

Property changes on: trunk/games/quake3/files/patch-code-game-q_shared.h
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/games/quake3/files/patch-code-q3_ui-ui_playermodel.c
===================================================================
--- trunk/games/quake3/files/patch-code-q3_ui-ui_playermodel.c	2015-05-16 01:01:01 UTC (rev 19015)
+++ trunk/games/quake3/files/patch-code-q3_ui-ui_playermodel.c	2015-05-16 01:03:48 UTC (rev 19016)

Property changes on: trunk/games/quake3/files/patch-code-q3_ui-ui_playermodel.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/games/quake3/files/patch-code-q3_ui-ui_players.c
===================================================================
--- trunk/games/quake3/files/patch-code-q3_ui-ui_players.c	2015-05-16 01:01:01 UTC (rev 19015)
+++ trunk/games/quake3/files/patch-code-q3_ui-ui_players.c	2015-05-16 01:03:48 UTC (rev 19016)

Property changes on: trunk/games/quake3/files/patch-code-q3_ui-ui_players.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/games/quake3/files/patch-code-q3_ui-ui_saveconfig.c
===================================================================
--- trunk/games/quake3/files/patch-code-q3_ui-ui_saveconfig.c	2015-05-16 01:01:01 UTC (rev 19015)
+++ trunk/games/quake3/files/patch-code-q3_ui-ui_saveconfig.c	2015-05-16 01:03:48 UTC (rev 19016)

Property changes on: trunk/games/quake3/files/patch-code-q3_ui-ui_saveconfig.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/games/quake3/files/patch-code-qcommon-common.c
===================================================================
--- trunk/games/quake3/files/patch-code-qcommon-common.c	2015-05-16 01:01:01 UTC (rev 19015)
+++ trunk/games/quake3/files/patch-code-qcommon-common.c	2015-05-16 01:03:48 UTC (rev 19016)

Property changes on: trunk/games/quake3/files/patch-code-qcommon-common.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/games/quake3/files/patch-code-qcommon-files.c
===================================================================
--- trunk/games/quake3/files/patch-code-qcommon-files.c	2015-05-16 01:01:01 UTC (rev 19015)
+++ trunk/games/quake3/files/patch-code-qcommon-files.c	2015-05-16 01:03:48 UTC (rev 19016)

Property changes on: trunk/games/quake3/files/patch-code-qcommon-files.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/games/quake3/files/patch-code-qcommon-vm.c
===================================================================
--- trunk/games/quake3/files/patch-code-qcommon-vm.c	2015-05-16 01:01:01 UTC (rev 19015)
+++ trunk/games/quake3/files/patch-code-qcommon-vm.c	2015-05-16 01:03:48 UTC (rev 19016)

Property changes on: trunk/games/quake3/files/patch-code-qcommon-vm.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/games/quake3/files/patch-code-renderer-tr_bsp.c
===================================================================
--- trunk/games/quake3/files/patch-code-renderer-tr_bsp.c	2015-05-16 01:01:01 UTC (rev 19015)
+++ trunk/games/quake3/files/patch-code-renderer-tr_bsp.c	2015-05-16 01:03:48 UTC (rev 19016)

Property changes on: trunk/games/quake3/files/patch-code-renderer-tr_bsp.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/games/quake3/files/patch-code-renderer-tr_shader.c
===================================================================
--- trunk/games/quake3/files/patch-code-renderer-tr_shader.c	2015-05-16 01:01:01 UTC (rev 19015)
+++ trunk/games/quake3/files/patch-code-renderer-tr_shader.c	2015-05-16 01:03:48 UTC (rev 19016)

Property changes on: trunk/games/quake3/files/patch-code-renderer-tr_shader.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/games/quake3/files/patch-code-server-sv_client.c
===================================================================
--- trunk/games/quake3/files/patch-code-server-sv_client.c	2015-05-16 01:01:01 UTC (rev 19015)
+++ trunk/games/quake3/files/patch-code-server-sv_client.c	2015-05-16 01:03:48 UTC (rev 19016)

Property changes on: trunk/games/quake3/files/patch-code-server-sv_client.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/games/quake3/files/patch-code-ui-ui_main.c
===================================================================
--- trunk/games/quake3/files/patch-code-ui-ui_main.c	2015-05-16 01:01:01 UTC (rev 19015)
+++ trunk/games/quake3/files/patch-code-ui-ui_main.c	2015-05-16 01:03:48 UTC (rev 19016)

Property changes on: trunk/games/quake3/files/patch-code-ui-ui_main.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/games/quake3/files/patch-code-ui-ui_players.c
===================================================================
--- trunk/games/quake3/files/patch-code-ui-ui_players.c	2015-05-16 01:01:01 UTC (rev 19015)
+++ trunk/games/quake3/files/patch-code-ui-ui_players.c	2015-05-16 01:03:48 UTC (rev 19016)

Property changes on: trunk/games/quake3/files/patch-code-ui-ui_players.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/games/quake3/files/patch-code-unix-Makefile
===================================================================
--- trunk/games/quake3/files/patch-code-unix-Makefile	2015-05-16 01:01:01 UTC (rev 19015)
+++ trunk/games/quake3/files/patch-code-unix-Makefile	2015-05-16 01:03:48 UTC (rev 19016)
@@ -7,7 +7,7 @@
 -PLATFORM=$(shell uname|tr A-Z a-z)
 -PLATFORM_RELEASE=$(shell uname -r)
 +PLATFORM=freebsd
-+PLATFORM_RELEASE=6.0-RELEASE
++PLATFORM_RELEASE=9.1-RELEASE
  
  ###
  ### These paths are where you probably want to change things


Property changes on: trunk/games/quake3/files/patch-code-unix-Makefile
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/games/quake3/files/patch-code-unix-unix_main.c
===================================================================
--- trunk/games/quake3/files/patch-code-unix-unix_main.c	2015-05-16 01:01:01 UTC (rev 19015)
+++ trunk/games/quake3/files/patch-code-unix-unix_main.c	2015-05-16 01:03:48 UTC (rev 19016)

Property changes on: trunk/games/quake3/files/patch-code-unix-unix_main.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/games/quake3/files/patch-code-unix-unix_shared.c
===================================================================
--- trunk/games/quake3/files/patch-code-unix-unix_shared.c	2015-05-16 01:01:01 UTC (rev 19015)
+++ trunk/games/quake3/files/patch-code-unix-unix_shared.c	2015-05-16 01:03:48 UTC (rev 19016)

Property changes on: trunk/games/quake3/files/patch-code-unix-unix_shared.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/games/quake3/pkg-descr
===================================================================
--- trunk/games/quake3/pkg-descr	2015-05-16 01:01:01 UTC (rev 19015)
+++ trunk/games/quake3/pkg-descr	2015-05-16 01:03:48 UTC (rev 19016)

Property changes on: trunk/games/quake3/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/games/quake3/pkg-plist
===================================================================
--- trunk/games/quake3/pkg-plist	2015-05-16 01:01:01 UTC (rev 19015)
+++ trunk/games/quake3/pkg-plist	2015-05-16 01:03:48 UTC (rev 19016)
@@ -7,6 +7,3 @@
 %%GAMELIBS%%%%LIBDIR%%/missionpack/cgame.so
 %%GAMELIBS%%%%LIBDIR%%/missionpack/qagame.so
 %%GAMELIBS%%%%LIBDIR%%/missionpack/ui.so
-%%GAMELIBS%%@dirrm %%LIBDIR%%/missionpack
-%%GAMELIBS%%@dirrm %%LIBDIR%%/baseq3
-%%GAMELIBS%%@dirrm %%LIBDIR%%

More information about the Midnightbsd-cvs mailing list