mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-19 19:59:43 +00:00
Code Issues Releases Activity

In preparation to next version update, cleanup things a bit first:

Browse Source 
- Add missing option description to "clients and servers" multichoice
- Sort the knobs in a more logical order within the Makefile
- Use more specific "gl" in USE_GL instead of umbrella "yes"
- Unbreak the build against Clang and clean up Makefile while here
- Transfer maintainership to the games@ team
This commit is contained in:
Alexey Dokuchaev 2014-09-09 13:15:36 +00:00
parent 392595bc23
commit 06ea9e3968
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=367730
2 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
games/cleanq3/Makefile
View File

@ -8,7 +8,7 @@ CATEGORIES= games
MASTER_SITES= http://www.bfeared.com/library/quake/archive/quakedev/temor/downloads/
DISTNAME= CleanQ3_v${PORTVERSION}-srcbin
MAINTAINER= ports@FreeBSD.org
MAINTAINER= games@FreeBSD.org
COMMENT= Cleaned up copy of the original Quake III Arena source code
USES= dos2unix gmake zip
@ -16,32 +16,33 @@ WRKSRC= ${WRKDIR}/CleanQ3
BUILD_WRKSRC= ${WRKSRC}/code/unix
MAKE_JOBS_UNSAFE= yes
OPTIONS_DEFINE= GAMELIBS OPTIMIZED_CFLAGS
OPTIONS_MULTI= TYPE
OPTIONS_MULTI_TYPE= CLIENT SMP_CLIENT DEDICATED
OPTIONS_DEFAULT= CLIENT SMP_CLIENT DEDICATED OPTIMIZED_CFLAGS
CLIENT_DESC= Build client
SMP_CLIENT_DESC= Build SMP (threaded) client
DEDICATED_DESC= Build dedicated server
GAMELIBS_DESC= Build game libraries (when not mandatory)
MAKE_ENV= LIBDIR="${LIBDIR}"
PLIST_SUB= LIBDIR="${LIBDIR:S/${PREFIX}\///}"
LIBDIR= ${PREFIX}/lib/${PORTNAME}
VM_ARCHS= i386
OPTIONS_DEFINE= GAMELIBS OPTIMIZED_CFLAGS
OPTIONS_MULTI= FLAVOR
OPTIONS_MULTI_FLAVOR= CLIENT SMP_CLIENT DEDICATED
OPTIONS_DEFAULT= CLIENT SMP_CLIENT DEDICATED OPTIMIZED_CFLAGS
FLAVOR_DESC= Clients and servers
CLIENT_DESC= Build client
SMP_CLIENT_DESC= Build SMP (threaded) client
DEDICATED_DESC= Build dedicated server
GAMELIBS_DESC= Build game libraries (when not mandatory)
.include <bsd.port.options.mk>
.if ${ARCH} == "i386"
.if ${ARCH} == i386
BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm
.endif
.for i in ${ARCH}
. if ${VM_ARCHS:M${i}} != ""
. if ${VM_ARCHS:M${i}}
HAVE_VM_COMPILED= yes
. endif
. endif
.endfor
.if !defined(HAVE_VM_COMPILED)
@ -49,7 +50,7 @@ MAKE_ENV+= DLL_ONLY=true
.endif
.if ${PORT_OPTIONS:MCLIENT} || ${PORT_OPTIONS:MSMP_CLIENT}
USE_GL= yes
USE_GL= gl
USE_XORG= xxf86dga
.endif
@ -95,15 +96,19 @@ post-patch:
's|//[[:blank:]]*\(Swap_Init[[:blank:]]*();\)|\1|' \
${WRKSRC}/code/botlib/be_interface.c \
${WRKSRC}/code/renderer/tr_init.c
@${REINPLACE_CMD} -e '/callMask = 0/s|^static||' \
${WRKSRC}/code/qcommon/vm_x86.c
do-install:
.for bin in ${Q3BIN}
${INSTALL_PROGRAM} ${BUILD_WRKSRC}/release/${bin} ${STAGEDIR}${PREFIX}/bin
${INSTALL_PROGRAM} ${BUILD_WRKSRC}/release/${bin} \
${STAGEDIR}${PREFIX}/bin
.endfor
.if ${PORT_OPTIONS:MGAMELIBS} || !defined(HAVE_VM_COMPILED)
.for dir in baseq3 missionpack
@${MKDIR} ${STAGEDIR}${LIBDIR}/${dir}
${INSTALL_PROGRAM} ${BUILD_WRKSRC}/release/${dir}/*.so ${STAGEDIR}${LIBDIR}/${dir}
${INSTALL_PROGRAM} ${BUILD_WRKSRC}/release/${dir}/*.so \
${STAGEDIR}${LIBDIR}/${dir}
.endfor
.endif

2
games/cleanq3/files/patch-code-unix-Makefile
View File

@ -61,7 +61,7 @@
-GL_CFLAGS = -I$(MESADIR)/include -I/usr/X11R6/include
+ifdef OPTIMIZED_CFLAGS
+ ifeq ($(ARCH),i386)
+RELEASE_CFLAGS=$(BASE_CFLAGS) -O3 -fomit-frame-pointer -pipe -ffast-math -falign-loops=2 -falign-jumps=2 -falign-functions=2 -fno-strict-aliasing -fstrength-reduce
+RELEASE_CFLAGS=$(BASE_CFLAGS) -O3 -fomit-frame-pointer -pipe -ffast-math -falign-functions=2 -fno-strict-aliasing -fstrength-reduce
+ else
+RELEASE_CFLAGS=$(BASE_CFLAGS) -O3 -ffast-math -funroll-loops -fomit-frame-pointer -fexpensive-optimizations
+ endif