Index: head/games/boswars/Makefile =================================================================== --- head/games/boswars/Makefile (revision 382274) +++ head/games/boswars/Makefile (revision 382275) @@ -1,52 +1,51 @@ # Created by: Alejandro Pulver # $FreeBSD$ PORTNAME= boswars PORTVERSION= 2.6.1 PORTREVISION= 7 CATEGORIES= games MASTER_SITES= http://www.boswars.org/dist/releases/ DISTNAME= ${PORTNAME}-${PORTVERSION}-src MAINTAINER= martin@arp242.net COMMENT= Futuristic real-time strategy game LICENSE= GPLv2 LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png \ libtheora.so:${PORTSDIR}/multimedia/libtheora \ libvorbis.so:${PORTSDIR}/audio/libvorbis USES= lua:51 scons USE_SDL= sdl USE_GL= yes MAKE_ARGS+= opengl=1 CPPPATH= ${LOCALBASE}/include ${LUA_INCDIR} LIBPATH= ${LOCALBASE}/lib ${LUA_LIBDIR} CFLAGS+= -DSTRATAGUS_LIB_PATH='"\"${DATADIR}\""' DESKTOP_ENTRIES= "Bos Wars" "${COMMENT}" "" \ "boswars" "Game;StrategyGame;" false PORTDOCS= * OPTIONS_DEFINE= DOCS post-patch: @${REINPLACE_CMD} -e '\ - s|-pthread|${PTHREAD_LIBS}|g; \ s|/usr/local|${LOCALBASE}|g; \ s|lua51|lua-${LUA_VER}|g;' \ ${WRKSRC}/SConstruct do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin ${MKDIR} ${STAGEDIR}${DATADIR} .for f in campaigns graphics intro languages maps patches scripts sounds units ${CP} -R ${WRKSRC}/${f} ${STAGEDIR}${DATADIR} .endfor ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/CHANGELOG ${WRKSRC}/README.txt ${STAGEDIR}${DOCSDIR} ${COPYTREE_SHARE} ${WRKSRC}/doc/* ${STAGEDIR}${DOCSDIR} .include Index: head/games/cleanq3/Makefile =================================================================== --- head/games/cleanq3/Makefile (revision 382274) +++ head/games/cleanq3/Makefile (revision 382275) @@ -1,119 +1,119 @@ # Created by: Alexey Dokuchaev # $FreeBSD$ PORTNAME= cleanq3 PORTVERSION= 0.5.2 PORTREVISION= 3 CATEGORIES= games MASTER_SITES= http://www.bfeared.com/library/quake/archive/quakedev/temor/downloads/ DISTNAME= CleanQ3_v${PORTVERSION}-srcbin MAINTAINER= ports@FreeBSD.org COMMENT= Cleaned up copy of the original Quake III Arena source code LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING.txt USES= dos2unix gmake zip WRKSRC= ${WRKDIR}/CleanQ3 BUILD_WRKSRC= ${WRKSRC}/code/unix MAKE_JOBS_UNSAFE= yes 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 .if ${ARCH} == i386 BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm .endif .for i in ${ARCH} . if ${VM_ARCHS:M${i}} HAVE_VM_COMPILED= yes . endif .endfor .if !defined(HAVE_VM_COMPILED) MAKE_ENV+= DLL_ONLY=true .endif .if ${PORT_OPTIONS:MCLIENT} || ${PORT_OPTIONS:MSMP_CLIENT} USE_GL= gl USE_XORG= xxf86dga .endif .if ${PORT_OPTIONS:MCLIENT} MAKE_ENV+= CLIENT=YES PLIST_SUB+= CLIENT="" Q3BIN+= cleanq3 .else PLIST_SUB+= CLIENT="@comment " .endif .if ${PORT_OPTIONS:MSMP_CLIENT} -MAKE_ENV+= SMP=YES PTHREAD_LIBS="${PTHREAD_LIBS}" +MAKE_ENV+= SMP=YES PLIST_SUB+= SMP_CLIENT="" Q3BIN+= cleanq3-smp .else PLIST_SUB+= SMP_CLIENT="@comment " .endif .if ${PORT_OPTIONS:MDEDICATED} MAKE_ENV+= DEDICATED=YES PLIST_SUB+= DEDICATED="" Q3BIN+= cleanq3ded .else PLIST_SUB+= DEDICATED="@comment " .endif .if ${PORT_OPTIONS:MGAMELIBS} || !defined(HAVE_VM_COMPILED) MAKE_ENV+= GAMELIBS=YES PLIST_SUB+= GAMELIBS="" .else PLIST_SUB+= GAMELIBS="@comment " .endif .if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} MAKE_ENV+= OPTIMIZED_CFLAGS=YES .endif post-patch: @${REINPLACE_CMD} -e 's|botlib\.log|/dev/null|' \ ${WRKSRC}/code/botlib/be_interface.c @${REINPLACE_CMD} -e \ '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 .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} .endfor .endif .include "${.CURDIR}/../quake3-data/Makefile.include" .include Index: head/games/cleanq3/files/patch-code-unix-Makefile =================================================================== --- head/games/cleanq3/files/patch-code-unix-Makefile (revision 382274) +++ head/games/cleanq3/files/patch-code-unix-Makefile (revision 382275) @@ -1,364 +1,364 @@ --- code/unix/Makefile.orig Sun Jun 4 18:06:17 2006 +++ code/unix/Makefile Sun Jun 4 18:07:46 2006 @@ -19,6 +19,7 @@ PLATFORM=$(shell uname|tr A-Z a-z) PLATFORM_RELEASE=$(shell uname -r) +ARCH=$(shell uname -m) ### ### These paths are where you probably want to change things @@ -34,7 +35,7 @@ # Build name # BUILD_NAME=$(BUILD_NAME) -BUILD_NAME=quake3.x86 +BUILD_NAME=quake3 @@ -46,8 +47,8 @@ BASEQ3_DIR=$(BDIR)/baseq3 -BD=debug$(ARCH)$(GLIBC) -BR=release$(ARCH)$(GLIBC) +BD=debug +BR=release CDIR=$(MOUNT_DIR)/client SDIR=$(MOUNT_DIR)/server RDIR=$(MOUNT_DIR)/renderer @@ -76,7 +77,7 @@ ############################################################################# ## Defaults -DLL_ONLY=false +DLL_ONLY?=false # bk010215 - TODO - add all defaults / kill Ryan @@ -199,31 +200,23 @@ GLIBC= #libc is irrelevant -ifneq (,$(findstring alpha,$(shell uname -m))) -ARCH=axp -RPMARCH=alpha -VENDOR=dec -else #default to i386 -ARCH=i386 -RPMARCH=i386 -VENDOR=unknown -endif #alpha test +BASE_CFLAGS = $(CFLAGS) -DDATADIR='\"$(Q3DIR)\"' -DLIBDIR='\"$(LIBDIR)\"' -pipe +GL_CFLAGS = -I$(LOCALBASE)/include -BASE_CFLAGS = -pipe +DEBUG_CFLAGS=$(BASE_CFLAGS) -g -Wall -Werror +RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -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-functions=2 -fno-strict-aliasing -fstrength-reduce + else +RELEASE_CFLAGS=$(BASE_CFLAGS) -O3 -ffast-math -funroll-loops -fomit-frame-pointer -fexpensive-optimizations + endif +endif -DEBUG_CFLAGS=$(BASE_CFLAGS) -g -Wall -Werror -ifeq ($(ARCH),axp) -CC=pgcc -RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O6 -ffast-math -funroll-loops -fomit-frame-pointer -fexpensive-optimizations -else -#NEWPGCC=/loki/global/x86/bin/gcc # raistlin012301 -#NEWPGCC=/usr/local/gcc-2.95.2/bin/gcc -NEWPGCC=/home/raistllin/src/gcc/build/install/bin/gcc -CC=$(shell if [ -f $(NEWPGCC) ]; then echo $(NEWPGCC); else echo pgcc; fi ) -RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O6 -mcpu=pentiumpro -march=pentium -fomit-frame-pointer -pipe -ffast-math -malign-loops=2 -malign-jumps=2 -malign-functions=2 -fno-strict-aliasing - fstrength-reduce +ifeq ($(DLL_ONLY),true) +BASE_CFLAGS += -DDLL_ONLY endif LIBEXT=a @@ -235,25 +228,37 @@ ARFLAGS=ar rv RANLIB=ranlib -THREAD_LDFLAGS=-lpthread -+THREAD_LDFLAGS=$(PTHREAD_LIBS) ++THREAD_LDFLAGS=-lpthread # don't need -ldl (FreeBSD) -LDFLAGS=-lm +LDFLAGS+=-lm #GLLDFLAGS=-L/usr/X11R6/lib -L$(MESADIR)/lib -lGL -lX11 -lXext -lXxf86dga -lXxf86vm #GLLDFLAGS=-L/usr/X11/lib -lGL -lX11 -lXext -lm -GLLDFLAGS=-L/usr/X11R6/lib -lGL -lX11 -lXext -lXxf86dga -lXxf86vm +GLLDFLAGS=-L$(LOCALBASE)/lib -lGL -lX11 -lXext -lXxf86dga -lXxf86vm -ifeq ($(ARCH),axp) -TARGETS=\ - $(B)/$(PLATFORM)q3ded -else -TARGETS=\ - $(B)/$(PLATFORM)quake3 \ - $(B)/baseq3/cgame$(ARCH).$(SHLIBEXT) \ - $(B)/baseq3/qagame$(ARCH).$(SHLIBEXT) \ - $(B)/baseq3/ui$(ARCH).$(SHLIBEXT) \ - $(B)/missionpack/cgame$(ARCH).$(SHLIBEXT) \ - $(B)/missionpack/qagame$(ARCH).$(SHLIBEXT) \ - $(B)/missionpack/ui$(ARCH).$(SHLIBEXT) +ifdef CLIENT +TARGETS+=$(B)/cleanq3 +endif + +ifdef DEDICATED +TARGETS+=$(B)/cleanq3ded +endif + +ifdef SMP +TARGETS+=$(B)/cleanq3-smp +endif + +ifeq ($(DLL_ONLY),true) +GAMELIBS=yes +endif + +ifdef GAMELIBS +TARGETS+=\ + $(B)/baseq3/cgame.$(SHLIBEXT) \ + $(B)/baseq3/qagame.$(SHLIBEXT) \ + $(B)/baseq3/ui.$(SHLIBEXT) \ + $(B)/missionpack/cgame.$(SHLIBEXT) \ + $(B)/missionpack/qagame.$(SHLIBEXT) \ + $(B)/missionpack/ui.$(SHLIBEXT) endif else # ifeq freebsd @@ -348,7 +353,7 @@ $(MAKE) targets B=$(BR) CFLAGS="$(RELEASE_CFLAGS)" #Build both debug and release builds -all:build_debug build_release +all:build_release targets:makedirs $(TARGETS) @@ -516,20 +521,6 @@ $(B)/client/unix_net.o \ $(B)/client/unix_shared.o \ \ - $(B)/client/ahoptim.o \ - $(B)/client/autohint.o \ - $(B)/client/ftbase.o \ - $(B)/client/ftdebug.o \ - $(B)/client/ftglyph.o \ - $(B)/client/ftinit.o \ - $(B)/client/ftmm.o \ - $(B)/client/ftsystem.o \ - $(B)/client/raster1.o \ - $(B)/client/sfnt.o \ - $(B)/client/sfobjs.o \ - $(B)/client/smooth.o \ - $(B)/client/truetype.o -# \ # $(B)/client/q_parse.o \ # $(B)/client/math_quaternion.o \ # $(B)/client/util_str.o \ @@ -541,10 +532,12 @@ # $(B)/client/q_shared.o \ ifeq ($(ARCH),i386) - Q3OBJ += $(B)/client/vm_x86.o + ifeq ($(DLL_ONLY),false) + Q3OBJ += $(B)/client/vm_x86.o + endif endif - ifeq ($(ARCH),ppc) + ifeq ($(ARCH),powerpc) ifeq ($(DLL_ONLY),false) Q3OBJ += $(B)/client/vm_ppc.o endif @@ -559,10 +552,24 @@ $(B)/client/linux_qgl.o \ $(B)/client/linux_glimp.o \ $(B)/client/linux_snd.o \ + $(B)/client/linux_signals.o \ + $(B)/client/snd_mixa.o \ + $(B)/client/matha.o + + Q3POBJ_SMP=\ + $(B)/client/linux_common.o \ + $(B)/client/linux_qgl.o \ + $(B)/client/linux_glimp_smp.o \ + $(B)/client/linux_snd.o \ + $(B)/client/linux_signals.o \ $(B)/client/snd_mixa.o \ $(B)/client/matha.o \ - $(B)/client/ftol.o \ - $(B)/client/snapvector.o + + ifeq ($(ARCH),i386) + Q3POBJ += $(B)/client/ftol.o $(B)/client/snapvector.o + Q3POBJ_SMP += $(B)/client/ftol.o $(B)/client/snapvector.o + endif + else ifeq ($(PLATFORM),irix) Q3POBJ=\ @@ -602,12 +609,12 @@ endif #FreeBSD endif #IRIX -$(B)/$(PLATFORM)quake3 : $(Q3OBJ) $(Q3POBJ) +$(B)/cleanq3 : $(Q3OBJ) $(Q3POBJ) $(CC) -o $@ $(Q3OBJ) $(Q3POBJ) $(GLLDFLAGS) $(LDFLAGS) # TTimo: splines code requires C++ linking, but splines have not been officially included in the codebase # $(CXX) -o $@ $(Q3OBJ) $(Q3POBJ) $(GLLDFLAGS) $(LDFLAGS) -$(B)/$(PLATFORM)quake3-smp : $(Q3OBJ) $(Q3POBJ_SMP) +$(B)/cleanq3-smp : $(Q3OBJ) $(Q3POBJ_SMP) $(CC) -o $@ $(Q3OBJ) $(Q3POBJ_SMP) $(GLLDFLAGS) \ $(THREAD_LDFLAGS) $(LDFLAGS) @@ -758,6 +765,7 @@ $(B)/client/linux_qgl.o : $(UDIR)/linux_qgl.c; $(DO_CC) $(GL_CFLAGS) $(B)/client/linux_input.o : $(UDIR)/linux_input.c; $(DO_CC) $(B)/client/linux_snd.o : $(UDIR)/linux_snd.c; $(DO_CC) +$(B)/client/linux_signals.o : $(UDIR)/linux_signals.c; $(DO_CC) $(GL_CFLAGS) $(B)/client/snd_mixa.o : $(UDIR)/snd_mixa.s; $(DO_AS) $(B)/client/matha.o : $(UDIR)/matha.s; $(DO_AS) @@ -767,7 +775,7 @@ $(B)/client/vm_x86.o : $(CMDIR)/vm_x86.c; $(DO_CC) endif -ifeq ($(ARCH),ppc) +ifeq ($(ARCH),powerpc) ifeq ($(DLL_ONLY),false) $(B)/client/vm_ppc.o : $(CMDIR)/vm_ppc.c; $(DO_CC) endif @@ -912,22 +920,26 @@ $(B)/ded/unix_main.o \ $(B)/ded/unix_net.o \ $(B)/ded/unix_shared.o \ + $(B)/ded/linux_signals.o \ \ $(B)/ded/null_client.o \ $(B)/ded/null_input.o \ $(B)/ded/null_snddma.o ifeq ($(ARCH),i386) - Q3DOBJ += $(B)/ded/vm_x86.o $(B)/ded/ftol.o $(B)/ded/snapvector.o + Q3DOBJ += $(B)/ded/ftol.o $(B)/ded/snapvector.o + ifeq ($(DLL_ONLY),false) + Q3DOBJ += $(B)/ded/vm_x86.o + endif endif -ifeq ($(ARCH),ppc) +ifeq ($(ARCH),powerpc) ifeq ($(DLL_ONLY),false) Q3DOBJ += $(B)/ded/vm_ppc.o endif endif -$(B)/$(PLATFORM)q3ded : $(Q3DOBJ) +$(B)/cleanq3ded : $(Q3DOBJ) $(CC) -o $@ $(Q3DOBJ) $(LDFLAGS) $(B)/ded/sv_bot.o : $(SDIR)/sv_bot.c; $(DO_DED_CC) @@ -988,6 +1000,7 @@ $(B)/ded/unix_main.o : $(UDIR)/unix_main.c; $(DO_DED_CC) $(B)/ded/unix_net.o : $(UDIR)/unix_net.c; $(DO_DED_CC) $(B)/ded/unix_shared.o : $(UDIR)/unix_shared.c; $(DO_DED_CC) +$(B)/ded/linux_signals.o : $(UDIR)/linux_signals.c; $(DO_DED_CC) $(B)/ded/null_client.o : $(NDIR)/null_client.c; $(DO_DED_CC) $(B)/ded/null_input.o : $(NDIR)/null_input.c; $(DO_DED_CC) $(B)/ded/null_snddma.o : $(NDIR)/null_snddma.c; $(DO_DED_CC) @@ -1001,7 +1014,7 @@ $(B)/ded/snapvector.o : $(UDIR)/snapvector.nasm; $(DO_NASM) endif -ifeq ($(ARCH),ppc) +ifeq ($(ARCH),powerpc) ifeq ($(DLL_ONLY),false) $(B)/ded/vm_ppc.o : $(CMDIR)/vm_ppc.c; $(DO_DED_CC) endif @@ -1068,7 +1081,7 @@ $(B)/baseq3/cgame/q_math.o \ $(B)/baseq3/cgame/q_shared.o -$(B)/baseq3/cgame$(ARCH).$(SHLIBEXT) : $(Q3CGOBJ) +$(B)/baseq3/cgame.$(SHLIBEXT) : $(Q3CGOBJ) $(CC) $(SHLIBLDFLAGS) -o $@ $(Q3CGOBJ) $(B)/baseq3/cgame/bg_misc.o : $(GDIR)/bg_misc.c; $(DO_SHLIB_CC) @@ -1128,7 +1141,7 @@ $(B)/missionpack/cgame/q_shared.o \ $(B)/missionpack/cgame/ui_shared.o -$(B)/missionpack/cgame$(ARCH).$(SHLIBEXT) : $(MPCGOBJ) +$(B)/missionpack/cgame.$(SHLIBEXT) : $(MPCGOBJ) $(CC) $(SHLIBLDFLAGS) -o $@ $(MPCGOBJ) $(B)/missionpack/cgame/bg_misc.o : $(GDIR)/bg_misc.c; $(DO_SHLIB_CC) -DMISSIONPACK @@ -1200,7 +1213,7 @@ $(B)/baseq3/game/q_math.o \ $(B)/baseq3/game/q_shared.o -$(B)/baseq3/qagame$(ARCH).$(SHLIBEXT) : $(Q3GOBJ) +$(B)/baseq3/qagame.$(SHLIBEXT) : $(Q3GOBJ) $(CC) $(SHLIBLDFLAGS) -o $@ $(Q3GOBJ) $(B)/baseq3/game/ai_chat.o : $(GDIR)/ai_chat.c; $(DO_SHLIB_CC) @@ -1278,7 +1291,7 @@ $(B)/missionpack/game/q_math.o \ $(B)/missionpack/game/q_shared.o -$(B)/missionpack/qagame$(ARCH).$(SHLIBEXT) : $(MPGOBJ) +$(B)/missionpack/qagame.$(SHLIBEXT) : $(MPGOBJ) $(CC) $(SHLIBLDFLAGS) -o $@ $(MPGOBJ) $(B)/missionpack/game/ai_chat.o : $(GDIR)/ai_chat.c; $(DO_SHLIB_CC) -DMISSIONPACK @@ -1367,7 +1380,7 @@ $(B)/baseq3/ui/q_math.o \ $(B)/baseq3/ui/q_shared.o -$(B)/baseq3/ui$(ARCH).$(SHLIBEXT) : $(Q3UIOBJ) +$(B)/baseq3/ui.$(SHLIBEXT) : $(Q3UIOBJ) $(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(Q3UIOBJ) $(B)/baseq3/ui/bg_misc.o : $(GDIR)/bg_misc.c; $(DO_SHLIB_CC) @@ -1410,7 +1423,7 @@ $(B)/baseq3/ui/ui_startserver.o : $(Q3UIDIR)/ui_startserver.c; $(DO_SHLIB_CC) $(B)/baseq3/ui/ui_team.o : $(Q3UIDIR)/ui_team.c; $(DO_SHLIB_CC) $(B)/baseq3/ui/ui_teamorders.o : $(Q3UIDIR)/ui_teamorders.c; $(DO_SHLIB_CC) -$(B)/baseq3/ui/ui_syscalls.o : $(Q3UIDIR)/ui_syscalls.c; $(DO_SHLIB_CC) +$(B)/baseq3/ui/ui_syscalls.o : $(UIDIR)/ui_syscalls.c; $(DO_SHLIB_CC) $(B)/baseq3/ui/ui_video.o : $(Q3UIDIR)/ui_video.c; $(DO_SHLIB_CC) # bk001205 - these wre the only SHLIB compiles in 1.17 @@ -1450,7 +1463,7 @@ # $(B)/missionpack/ui/q_math.o \ # $(B)/missionpack/ui/q_shared.o -$(B)/missionpack/ui$(ARCH).$(SHLIBEXT) : $(MPUIOBJ) +$(B)/missionpack/ui.$(SHLIBEXT) : $(MPUIOBJ) $(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(MPUIOBJ) $(B)/missionpack/ui/ui_atoms.o : $(UIDIR)/ui_atoms.c; $(DO_SHLIB_CC) -DMISSIONPACK @@ -2059,9 +2072,9 @@ copyfiles: -mkdirhier $(COPYDIR) - cp $(BR)/linuxquake3 $(COPYDIR)/quake3.x86 - strip $(COPYDIR)/quake3.x86 - chmod 755 $(COPYDIR)/quake3.x86 + cp $(BR)/linuxquake3 $(COPYDIR)/quake3 + strip $(COPYDIR)/quake3 + chmod 755 $(COPYDIR)/quake3 cp $(BR)/linuxq3ded $(COPYDIR)/q3ded strip $(COPYDIR)/q3ded chmod 755 $(COPYDIR)/q3ded Index: head/games/cosmosmash/Makefile =================================================================== --- head/games/cosmosmash/Makefile (revision 382274) +++ head/games/cosmosmash/Makefile (revision 382275) @@ -1,36 +1,36 @@ # Created by: Ganael Laplanche # $FreeBSD$ PORTNAME= cosmosmash DISTVERSION= 1.4.7 PORTREVISION= 4 CATEGORIES= games MASTER_SITES= http://perso.b2b2c.ca/sarrazip/dev/ \ LOCAL/martymac MAINTAINER= martymac@FreeBSD.org COMMENT= Clone of the Intellivision(TM) game Astrosmash(TM) LICENSE= GPLv2 LIB_DEPENDS= libflatzebra-0.1.so:${PORTSDIR}/devel/flatzebra \ libaa.so:${PORTSDIR}/graphics/aalib \ libmikmod.so:${PORTSDIR}/audio/libmikmod \ libaudiofile.so:${PORTSDIR}/audio/libaudiofile USE_SDL= sdl image mixer USE_XORG= x11 xau xdmcp USES= iconv pkgconfig desktop-file-utils GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include `${SDL_CONFIG} --cflags` -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} `${SDL_CONFIG} --libs` +LDFLAGS+= -lpthread -L${LOCALBASE}/lib `${SDL_CONFIG} --libs` OPTIONS_DEFINE= DOCS post-patch: @${REINPLACE_CMD} 's|^pkgsounddir = .*|pkgsounddir = ${DATADIR}/sounds|' \ ${WRKSRC}/src/Makefile.in @${REINPLACE_CMD} 's|^docdir = .*|docdir = ${DOCSDIR}|' \ ${WRKSRC}/Makefile.in .include Index: head/games/egl/Makefile =================================================================== --- head/games/egl/Makefile (revision 382274) +++ head/games/egl/Makefile (revision 382275) @@ -1,80 +1,80 @@ # Created by: Alejandro Pulver # $FreeBSD$ PORTNAME= egl PORTVERSION= 0.3.1 PORTREVISION= 7 CATEGORIES= games MASTER_SITES= http://freebsd.nsu.ru/distfiles/ DISTNAME= ${PORTNAME}-v${PORTVERSION}-stable-src DISTFILES= ${DISTNAME}${EXTRACT_SUFX} egl.pkz EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= danfe@FreeBSD.org COMMENT= Enhanced OpenGL-only Quake II engine LICENSE= GPLv2 USES= dos2unix gmake zip MAKEFILE= makefile NO_WRKSUBDIR= yes -MAKE_ENV= LIBDIR="${LIBDIR}" PTHREAD_LIBS="${PTHREAD_LIBS}" +MAKE_ENV= LIBDIR="${LIBDIR}" PLIST_SUB= LIBDIR="${LIBDIR:S,${PREFIX}/,,}" LIBDIR= ${PREFIX}/lib/${PORTNAME} OPTIONS_DEFINE= CLIENT DEDICATED GAME OPTIMIZED_CFLAGS OPTIONS_DEFAULT= CLIENT DEDICATED GAME OPTIMIZED_CFLAGS CLIENT_DESC= Build client DEDICATED_DESC= Build dedicated server GAME_DESC= Build main game (default mod) .include .if ${PORT_OPTIONS:MCLIENT} LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ libpng.so:${PORTSDIR}/graphics/png USE_GL= gl PLIST_SUB+= CLIENT="" EGL_BIN+= egl .else MAKE_ENV+= BUILD_CLIENT=NO \ BUILD_CGAME=NO PLIST_SUB+= CLIENT="@comment " .endif .if ${PORT_OPTIONS:MDEDICATED} PLIST_SUB+= DEDICATED="" EGL_BIN+= eglded .else MAKE_ENV+= BUILD_DEDICATED=NO PLIST_SUB+= DEDICATED="@comment " .endif .if ${PORT_OPTIONS:MGAME} PLIST_SUB+= GAME="" .else MAKE_ENV+= BUILD_GAME=NO PLIST_SUB+= GAME="@comment " .endif .if ! ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} MAKE_ENV+= WITH_OPT_CFLAGS=NO .endif # Fix the build against Clang post-patch: @${REINPLACE_CMD} -e '145s/return qFalse/return/' \ ${WRKSRC}/unix/unix_snd_main.c do-install: ${INSTALL_PROGRAM} ${EGL_BIN:S,^,${WRKSRC}/release/,} \ ${STAGEDIR}${PREFIX}/bin @${MKDIR} ${STAGEDIR}${LIBDIR}/baseq2 ${INSTALL_PROGRAM} ${WRKSRC}/release/baseq2/*.so \ ${STAGEDIR}${LIBDIR}/baseq2 ${INSTALL_DATA} ${DISTDIR}/egl.pkz ${STAGEDIR}${LIBDIR}/baseq2 .include "${.CURDIR}/../quake2-data/Makefile.include" .include Index: head/games/egl/files/patch-makefile =================================================================== --- head/games/egl/files/patch-makefile (revision 382274) +++ head/games/egl/files/patch-makefile (revision 382275) @@ -1,230 +1,230 @@ --- makefile.orig Mon Jul 24 15:18:20 2006 +++ makefile Mon Jul 24 15:22:20 2006 @@ -1,19 +1,30 @@ +# GNU Makefile for EGL. + +# Compilation components and options. BUILD_CLIENT?=YES # client executable BUILD_DEDICATED?=YES # server executable BUILD_CGAME?=YES # cgame dll BUILD_GAME?=YES # game dll +WITH_OPT_CFLAGS?=YES # Optimized compiler flags. +WITH_HOMEDIR?=YES # Write files in "~/.egl". +# Common variables. +CC?=gcc VERSION=0.0.6 - -CC=gcc EGL_MAKEFILE=makefile -SHARED_FLAGS:= -RELEASE_CFLAGS=-Isource/ -I./ -I../ $(SHARED_FLAGS) -O2 -fno-strict-aliasing -ffast-math -fexpensive-optimizations -DEBUG_CFLAGS=-g -Isource/ -I./ -I../ $(SHARED_FLAGS) -DC_ONLY -LDFLAGS=-ldl -lm -lz -ljpeg -lpng -DED_LDFLAGS=-ldl -lm -lz -MODULE_LDFLAGS=-ldl -lm -X11_LDFLAGS=-L/usr/X11R6/lib -lX11 -lXext + +# Compiler flags. +SHARED_FLAGS:=-Isource -I./ -I../ $(CFLAGS) +RELEASE_CFLAGS=$(SHARED_FLAGS) +DEBUG_CFLAGS=$(SHARED_FLAGS) -g -DC_ONLY + +# Linker flags. +LDFLAGS+=-lm +DED_LDFLAGS=-lz +MODULE_LDFLAGS= +X11_LDFLAGS=-lX11 -lXext -ljpeg -lpng -lz + +# Compilation commands. SHLIBCFLAGS=-fPIC SHLIBLDFLAGS=-shared @@ -26,8 +37,22 @@ ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc/ -e s/sparc64/sparc/ -e s/arm.*/arm/ -e s/sa110/arm/ -e s/alpha/axp/) SHLIBEXT =so -BUILD_DEBUG_DIR=debug$(ARCH) -BUILD_RELEASE_DIR=release$(ARCH) +OSTYPE := $(shell uname -s) + +BUILD_DEBUG_DIR=debug +BUILD_RELEASE_DIR=release + +ifeq ($(OSTYPE),Linux) +LDFLAGS+=-ldl +endif + +ifeq ($(OSTYPE),FreeBSD) +# These variables are defined from the port, and passed by the environment. +SHARED_FLAGS+= -I$(LOCALBASE)/include \ + -DDATADIR='\"$(Q2DIR)\"' -DLIBDIR='\"$(LIBDIR)\"' +LDFLAGS+= -L$(LOCALBASE)/lib -+X11_LDFLAGS+= $(PTHREAD_LIBS) ++X11_LDFLAGS+= -lpthread +endif ifeq ($(strip $(BUILD_CLIENT)),YES) TARGETS += $(BUILDDIR)/egl @@ -38,19 +63,27 @@ endif ifeq ($(strip $(BUILD_CGAME)),YES) - TARGETS += $(BUILDDIR)/baseq2/eglcgame$(ARCH).$(SHLIBEXT) + TARGETS += $(BUILDDIR)/baseq2/eglcgame.$(SHLIBEXT) endif ifeq ($(strip $(BUILD_GAME)),YES) - TARGETS += $(BUILDDIR)/baseq2/game$(ARCH).$(SHLIBEXT) + TARGETS += $(BUILDDIR)/baseq2/game.$(SHLIBEXT) endif -ifeq ($(wildcard /usr/include/X11/extensions/xf86vmode.h),/usr/include/X11/extensions/xf86vmode.h) +ifeq ($(strip $(WITH_OPT_CFLAGS)),YES) +RELEASE_CFLAGS += -O2 -fno-strict-aliasing -ffast-math -fexpensive-optimizations +endif + +ifeq ($(strip $(WITH_HOMEDIR)),YES) +SHARED_FLAGS += -DHOMEDIR +endif + +ifeq ($(wildcard $(LOCALBASE)/include/X11/extensions/xf86vmode.h),/usr/include/X11/extensions/xf86vmode.h) SHARED_FLAGS += -DXF86VMODE X11_LDFLAGS += -lXxf86vm endif -ifeq ($(wildcard /usr/include/X11/extensions/xf86dga.h),/usr/include/X11/extensions/xf86dga.h) +ifeq ($(wildcard $(LOCALBASE)/include/X11/extensions/xf86dga.h),/usr/include/X11/extensions/xf86dga.h) SHARED_FLAGS += -DXF86DGA X11_LDFLAGS += -lXxf86dga endif @@ -111,6 +144,7 @@ $(BUILDDIR)/client/sv_user.o \ $(BUILDDIR)/client/sv_world.o \ \ + $(BUILDDIR)/client/cl_acapi.o \ $(BUILDDIR)/client/cl_cgapi.o \ $(BUILDDIR)/client/cl_cin.o \ $(BUILDDIR)/client/cl_console.o \ @@ -135,7 +169,7 @@ \ $(BUILDDIR)/client/r_math.o \ $(BUILDDIR)/client/rb_batch.o \ - $(BUILDDIR)/client/rb_cin.o \ + $(BUILDDIR)/client/rf_video.o \ $(BUILDDIR)/client/rb_entity.o \ $(BUILDDIR)/client/rb_light.o \ $(BUILDDIR)/client/rb_math.o \ @@ -173,7 +207,6 @@ $(BUILDDIR)/client/x11_main.o \ $(BUILDDIR)/client/x11_utils.o \ \ - $(BUILDDIR)/client/byteswap.o \ $(BUILDDIR)/client/infostrings.o \ $(BUILDDIR)/client/m_angles.o \ $(BUILDDIR)/client/m_bounds.o \ @@ -222,6 +255,7 @@ $(BUILDDIR)/client/sv_user.o: $(SOURCEDIR)/server/sv_user.c; $(DO_CC) $(BUILDDIR)/client/sv_world.o: $(SOURCEDIR)/server/sv_world.c; $(DO_CC) +$(BUILDDIR)/client/cl_acapi.o: $(SOURCEDIR)/client/cl_acapi.c; $(DO_CC) $(BUILDDIR)/client/cl_cgapi.o: $(SOURCEDIR)/client/cl_cgapi.c; $(DO_CC) $(BUILDDIR)/client/cl_cin.o: $(SOURCEDIR)/client/cl_cin.c; $(DO_CC) $(BUILDDIR)/client/cl_console.o: $(SOURCEDIR)/client/cl_console.c; $(DO_CC) @@ -246,7 +280,7 @@ $(BUILDDIR)/client/r_math.o: $(SOURCEDIR)/renderer/r_math.c; $(DO_CC) $(BUILDDIR)/client/rb_batch.o: $(SOURCEDIR)/renderer/rb_batch.c; $(DO_CC) -$(BUILDDIR)/client/rb_cin.o: $(SOURCEDIR)/renderer/rb_cin.c; $(DO_CC) +$(BUILDDIR)/client/rf_video.o: $(SOURCEDIR)/renderer/rf_video.c; $(DO_CC) $(BUILDDIR)/client/rb_entity.o: $(SOURCEDIR)/renderer/rb_entity.c; $(DO_CC) $(BUILDDIR)/client/rb_light.o: $(SOURCEDIR)/renderer/rb_light.c; $(DO_CC) $(BUILDDIR)/client/rb_math.o: $(SOURCEDIR)/renderer/rb_math.c; $(DO_CC) @@ -284,7 +318,6 @@ $(BUILDDIR)/client/x11_main.o: $(SOURCEDIR)/unix/x11_main.c; $(DO_CC) $(BUILDDIR)/client/x11_utils.o: $(SOURCEDIR)/unix/x11_utils.c; $(DO_CC) -$(BUILDDIR)/client/byteswap.o: $(SOURCEDIR)/shared/byteswap.c; $(DO_CC) $(BUILDDIR)/client/infostrings.o: $(SOURCEDIR)/shared/infostrings.c; $(DO_CC) $(BUILDDIR)/client/m_angles.o: $(SOURCEDIR)/shared/m_angles.c; $(DO_CC) $(BUILDDIR)/client/m_bounds.o: $(SOURCEDIR)/shared/m_bounds.c; $(DO_CC) @@ -337,7 +370,6 @@ $(BUILDDIR)/dedicated/unix_main.o \ $(BUILDDIR)/dedicated/unix_udp.o \ \ - $(BUILDDIR)/dedicated/byteswap.o \ $(BUILDDIR)/dedicated/infostrings.o \ $(BUILDDIR)/dedicated/m_angles.o \ $(BUILDDIR)/dedicated/m_bounds.o \ @@ -355,7 +387,7 @@ $(BUILDDIR)/eglded: $(OBJS_DEDICATED) @echo Linking eglded; - $(CC) $(CFLAGS) -o $@ $(OBJS_DEDICATED) $(DED_LDFLAGS) + $(CC) $(CFLAGS) -o $@ $(OBJS_DEDICATED) $(LDFLAGS) $(DED_LDFLAGS) $(BUILDDIR)/dedicated/alias.o: $(SOURCEDIR)/common/alias.c; $(DO_DED_CC) $(BUILDDIR)/dedicated/cbuf.o: $(SOURCEDIR)/common/cbuf.c; $(DO_DED_CC) @@ -390,7 +422,6 @@ $(BUILDDIR)/dedicated/unix_main.o: $(SOURCEDIR)/unix/unix_main.c; $(DO_DED_CC) $(BUILDDIR)/dedicated/unix_udp.o: $(SOURCEDIR)/unix/unix_udp.c; $(DO_DED_CC) -$(BUILDDIR)/dedicated/byteswap.o: $(SOURCEDIR)/shared/byteswap.c; $(DO_DED_CC) $(BUILDDIR)/dedicated/infostrings.o: $(SOURCEDIR)/shared/infostrings.c; $(DO_DED_CC) $(BUILDDIR)/dedicated/m_angles.o: $(SOURCEDIR)/shared/m_angles.c; $(DO_DED_CC) $(BUILDDIR)/dedicated/m_bounds.o: $(SOURCEDIR)/shared/m_bounds.c; $(DO_DED_CC) @@ -475,7 +506,6 @@ \ $(BUILDDIR)/baseq2/cgame/pmove.o \ \ - $(BUILDDIR)/baseq2/cgame/byteswap.o \ $(BUILDDIR)/baseq2/cgame/infostrings.o \ $(BUILDDIR)/baseq2/cgame/m_angles.o \ $(BUILDDIR)/baseq2/cgame/m_bounds.o \ @@ -490,9 +520,9 @@ $(BUILDDIR)/baseq2/cgame/m_flash.o \ -$(BUILDDIR)/baseq2/eglcgame$(ARCH).$(SHLIBEXT): $(OBJS_CGAME) +$(BUILDDIR)/baseq2/eglcgame.$(SHLIBEXT): $(OBJS_CGAME) @echo Linking cgame dll; - $(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(OBJS_CGAME) $(MODULE_LDFLAGS) + $(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(OBJS_CGAME) $(LDFLAGS) $(MODULE_LDFLAGS) $(BUILDDIR)/baseq2/cgame/cg_api.o: $(SOURCEDIR)/cgame/cg_api.c; $(DO_SHLIB_CC) $(BUILDDIR)/baseq2/cgame/cg_console.o: $(SOURCEDIR)/cgame/cg_console.c; $(DO_SHLIB_CC) @@ -557,7 +587,6 @@ $(BUILDDIR)/baseq2/cgame/ui_keys.o: $(SOURCEDIR)/cgame/ui/ui_keys.c; $(DO_SHLIB_CC) $(BUILDDIR)/baseq2/cgame/pmove.o: $(SOURCEDIR)/cgame/pmove.c; $(DO_SHLIB_CC) -$(BUILDDIR)/baseq2/cgame/byteswap.o: $(SOURCEDIR)/shared/byteswap.c; $(DO_SHLIB_CC) $(BUILDDIR)/baseq2/cgame/infostrings.o: $(SOURCEDIR)/shared/infostrings.c; $(DO_SHLIB_CC) $(BUILDDIR)/baseq2/cgame/m_angles.o: $(SOURCEDIR)/shared/m_angles.c; $(DO_SHLIB_CC) $(BUILDDIR)/baseq2/cgame/m_bounds.o: $(SOURCEDIR)/shared/m_bounds.c; $(DO_SHLIB_CC) @@ -625,7 +654,6 @@ $(BUILDDIR)/baseq2/game/p_view.o \ $(BUILDDIR)/baseq2/game/p_weapon.o \ \ - $(BUILDDIR)/baseq2/game/byteswap.o \ $(BUILDDIR)/baseq2/game/infostrings.o \ $(BUILDDIR)/baseq2/game/m_angles.o \ $(BUILDDIR)/baseq2/game/m_bounds.o \ @@ -639,9 +667,9 @@ $(BUILDDIR)/baseq2/game/string.o \ -$(BUILDDIR)/baseq2/game$(ARCH).$(SHLIBEXT): $(OBJS_GAME) +$(BUILDDIR)/baseq2/game.$(SHLIBEXT): $(OBJS_GAME) @echo Linking game dll; - $(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(OBJS_GAME) $(MODULE_LDFLAGS) + $(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(OBJS_GAME) $(LDFLAGS) $(MODULE_LDFLAGS) $(BUILDDIR)/baseq2/game/g_ai.o: $(SOURCEDIR)/game/g_ai.c; $(DO_SHLIB_CC) $(BUILDDIR)/baseq2/game/g_chase.o: $(SOURCEDIR)/game/g_chase.c; $(DO_SHLIB_CC) @@ -691,7 +719,6 @@ $(BUILDDIR)/baseq2/game/p_view.o: $(SOURCEDIR)/game/p_view.c; $(DO_SHLIB_CC) $(BUILDDIR)/baseq2/game/p_weapon.o: $(SOURCEDIR)/game/p_weapon.c; $(DO_SHLIB_CC) -$(BUILDDIR)/baseq2/game/byteswap.o: $(SOURCEDIR)/shared/byteswap.c; $(DO_SHLIB_CC) $(BUILDDIR)/baseq2/game/infostrings.o: $(SOURCEDIR)/shared/infostrings.c; $(DO_SHLIB_CC) $(BUILDDIR)/baseq2/game/m_angles.o: $(SOURCEDIR)/shared/m_angles.c; $(DO_SHLIB_CC) $(BUILDDIR)/baseq2/game/m_bounds.o: $(SOURCEDIR)/shared/m_bounds.c; $(DO_SHLIB_CC) Index: head/games/evq3/Makefile =================================================================== --- head/games/evq3/Makefile (revision 382274) +++ head/games/evq3/Makefile (revision 382275) @@ -1,159 +1,159 @@ # Created by: alepulver # $FreeBSD$ PORTNAME= evq3 PORTVERSION= 1.3.20080810 PORTREVISION= 11 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_LOCAL:S|$|alepulver/|} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ pak-evq3.pk3 \ pak-5evq3.pk3 EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= ports@FreeBSD.org COMMENT= Marriage of XreaL and Icculus.org Q3 w/ Improvements LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 USES= gmake dos2unix tar:bzip2 ALL_TARGET= release WRKSRC= ${WRKDIR}/${PORTNAME} CFLAGS+= -DMAP_ANONYMOUS=MAP_ANON OPTIONS_DEFINE= CURL CURL_DLOPEN GAMELIBS OPENAL OPENAL_DLOPEN VOIP VORBIS OPTIMIZED_CFLAGS DOCS OPTIONS_DEFAULT= CLIENT CURL CURL_DLOPEN DEDICATED OPTIMIZED_CFLAGS SMP VORBIS OPTIONS_MULTI= TYPE OPTIONS_MULTI_TYPE= CLIENT DEDICATED SMP CLIENT_DESC= Build client CURL_DLOPEN_DESC= Enable dynamic loading of curl GAMELIBS_DESC= Build game libraries (when not mandatory) DEDICATED_DESC= Build dedicated server OPENAL_DESC= Enable OpenAL (3D sound) support OPENAL_DLOPEN_DESC= Enable dynamic loading of OpenAL SMP_DESC= Build SMP (threaded) client VOIP_DESC= Enable Voice Over IP # USES must be before bsd.port.pre.mk OPENAL_USES= openal:al MAKE_ENV= DEFAULT_BASEDIR="${Q3DIR}" LIBDIR="${LIBDIR}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" + PTHREAD_LIBS="-lpthread" PLIST_SUB= LIBDIR="${LIBDIR:S/${PREFIX}\///}" LIBDIR= ${PREFIX}/lib/${PORTNAME} VM_ARCHS= amd64 i386 .include "${.CURDIR}/../quake3-data/Makefile.include" .include .for i in ${ARCH} . if ${VM_ARCHS:M${i}} != "" HAVE_VM_COMPILED= yes . endif .endfor .if defined(HAVE_VM_COMPILED) MAKE_ENV+= HAVE_VM_COMPILED=true .endif .if ${PORT_OPTIONS:MCLIENT} || !empty(PORT_OPTIONS:MSMP) # curl . if ${PORT_OPTIONS:MCURL} LIB_DEPENDS+= libcurl.so:${PORTSDIR}/ftp/curl MAKE_ENV+= USE_CURL=1 . if ${PORT_OPTIONS:MCURL_DLOPEN} MAKE_ENV+= USE_CURL_DLOPEN=1 . endif . endif # OpenAL . if ${PORT_OPTIONS:MOPENAL} MAKE_ENV+= USE_OPENAL=1 . if ${PORT_OPTIONS:MOPENAL_DLOPEN} MAKE_ENV+= USE_OPENAL_DLOPEN=1 . endif . endif # SDL USE_SDL= sdl # VOIP . if ${PORT_OPTIONS:MVOIP} LIB_DEPENDS+= libspeex.so:${PORTSDIR}/audio/speex MAKE_ENV+= USE_VOIP=1 . endif # Vorbis . if ${PORT_OPTIONS:MVORBIS} LIB_DEPENDS+= libvorbis.so:${PORTSDIR}/audio/libvorbis MAKE_ENV+= USE_CODEC_VORBIS=1 . endif .endif .if ${PORT_OPTIONS:MCLIENT} MAKE_ENV+= BUILD_CLIENT=1 PLIST_SUB+= CLIENT="" Q3BIN+= evq3 .else PLIST_SUB+= CLIENT="@comment " .endif .if ${PORT_OPTIONS:MDEDICATED} MAKE_ENV+= BUILD_SERVER=1 PLIST_SUB+= DEDICATED="" Q3BIN+= evq3ded .else PLIST_SUB+= DEDICATED="@comment " .endif .if ${PORT_OPTIONS:MGAMELIBS} || !defined(HAVE_VM_COMPILED) MAKE_ENV+= BUILD_GAME_SO=1 PLIST_SUB+= GAMELIBS="" .else PLIST_SUB+= GAMELIBS="@comment " .endif .if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} MAKE_ENV+= USE_OPTIMIZED_CFLAGS=1 .endif .if ${PORT_OPTIONS:MSMP} MAKE_ENV+= BUILD_CLIENT_SMP=1 PLIST_SUB+= SMP="" Q3BIN+= evq3-smp .else PLIST_SUB+= SMP="@comment " .endif post-patch: # Do not log debug output of bots (can be enabled with "homedir"/"gamedir"). @${REINPLACE_CMD} -e 's|"botlib\.log"|"/dev/null"|' \ ${WRKSRC}/code/botlib/be_interface.c # Enable mmap on i386. @${REINPLACE_CMD} -e 's|__linux__|__unix__|' \ ${WRKSRC}/code/qcommon/vm_x86.c do-install: @${MKDIR} ${STAGEDIR}${LIBDIR}/baseq3 ${INSTALL_DATA} ${DISTDIR}/pak-evq3.pk3 ${DISTDIR}/pak-5evq3.pk3 \ ${STAGEDIR}${LIBDIR}/baseq3 .for bin in ${Q3BIN} ${INSTALL_PROGRAM} ${WRKSRC}/build/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} ${WRKSRC}/build/release/${dir}/*.so ${STAGEDIR}${LIBDIR}/${dir} . endfor .endif @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} maint-gen-distfile: @if [ -f ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ]; then \ ${ECHO_CMD} "ERROR: the distfile already exists."; \ ${FALSE}; \ fi svn export svn://70.86.44.154/evolution/trunk/evq3 ${PORTNAME} tar cjf ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ${PORTNAME} ${RM} -rf ${PORTNAME} .include Index: head/games/gl-117/Makefile =================================================================== --- head/games/gl-117/Makefile (revision 382274) +++ head/games/gl-117/Makefile (revision 382275) @@ -1,39 +1,39 @@ # Created by: ijliao # $FreeBSD$ PORTNAME= gl-117 PORTVERSION= 1.3.2 DISTVERSIONSUFFIX= -src PORTREVISION= 10 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/GL-117%20Source MAINTAINER= erik@bz.bzflag.bz COMMENT= OpenGL & SDL action flight simulator USE_GL= glut USES= tar:bzip2 GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-opengl-dir=${LOCALBASE} CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +LDFLAGS+= -lpthread -L${LOCALBASE}/lib DESKTOP_ENTRIES= "GL-117" \ "Action flight simulator" \ "" \ "gl-117" \ "Game;ArcadeGame;" \ false OPTIONS_DEFINE= DOCS .include post-install: ${INSTALL_MAN} ${WRKSRC}/doc/gl-117.6 ${STAGEDIR}${MANPREFIX}/man/man6 .if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/gl-117.pdf ${STAGEDIR}${DOCSDIR} .endif .include Index: head/games/glest/Makefile =================================================================== --- head/games/glest/Makefile (revision 382274) +++ head/games/glest/Makefile (revision 382275) @@ -1,80 +1,85 @@ # Created by: Jose Alonso Cardenas Marquez # $FreeBSD$ PORTNAME= glest PORTVERSION= 3.2.2 PORTREVISION= 9 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20source/${PORTVERSION} DISTNAME= ${PORTNAME}_source_${PORTVERSION} DIST_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= Free 3D real-time customizable strategy game LIB_DEPENDS= libxerces-c.so:${PORTSDIR}/textproc/xerces-c3 \ libvorbis.so:${PORTSDIR}/audio/libvorbis BUILD_DEPENDS= jam:${PORTSDIR}/devel/jam RUN_DEPENDS= ${DATADIR}/servers.ini:${PORTSDIR}/games/glest-data USES= dos2unix openal:al,alut pkgconfig zip lua:51 USE_AUTOTOOLS= automake:env autoconf:env USE_SDL= yes USE_GL= yes GNU_CONFIGURE= yes CONFIGURE_SCRIPT= mk/linux/configure CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib SUB_FILES= glest-wrapper pkg-message JAM_CMD= ${LOCALBASE}/bin/jam -qa OPTIONS_DEFINE= DOCS EDITOR OPTIONS_SUB= yes EDITOR_DESC= Build map editor EXTRACT_AFTER_ARGS= -d ${WRKDIR}/${DISTNAME} .include .if ${PORT_OPTIONS:MEDITOR} USE_WX= 2.6+ WX_CONF_ARGS= relative WANT_UNICODE= yes HAVE_EDITOR= true .endif pre-extract: @${MKDIR} ${WRKDIR}/${DISTNAME} post-patch: - @${REINPLACE_CMD} -e "s|%%ACLOCAL%%|${ACLOCAL}|g" -e "s|%%AUTOCONF%%|${AUTOCONF}|g" \ + @${REINPLACE_CMD} -e "s|%%ACLOCAL%%|${ACLOCAL}|g" \ + -e "s|%%AUTOCONF%%|${AUTOCONF}|g" \ ${WRKSRC}/mk/linux/autogen.sh - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' -e \ - 's|PTHREAD_LIBS="-l[$$]flag"|PTHREAD_LIBS="${PTHREAD_LIBS}"|g' -e \ - 's|pthreads library -l[$$]flag|pthreads library ${PTHREAD_LIBS}|g' -e \ - 's|include/lua5.1|include/lua51|g' -e 's|-llua5.1|-llua-5.1|g' \ - ${WRKSRC}/mk/linux/configure.ac ${WRKSRC}/mk/linux/mk/autoconf/* - @${FIND} -E ${WRKDIR} -type f -name '*.bak' -o -name '*.orig' | ${XARGS} ${RM} + @${REINPLACE_CMD} \ + -e 's|PTHREAD_LIBS="-l[$$]flag"|PTHREAD_LIBS="-lpthread"|g' \ + -e 's|pthreads library -l[$$]flag|pthreads library -lpthread|g' \ + -e 's|include/lua5.1|include/lua51|g' \ + -e 's|-llua5.1|-llua-5.1|g' \ + ${WRKSRC}/mk/linux/configure.ac \ + ${WRKSRC}/mk/linux/mk/autoconf/* + @${FIND} -E ${WRKDIR} -type f -name '*.bak' -o -name '*.orig' | \ + ${XARGS} ${RM} pre-configure: - @cd ${WRKSRC}/mk/linux && ${SH} autogen.sh && \ + @(cd ${WRKSRC}/mk/linux && ${SH} autogen.sh && \ ${REINPLACE_CMD} -e 's|-llua5.1|-llua-5.1|g' -e 's|.lng||g' \ - ${WRKSRC}/${CONFIGURE_SCRIPT} ${WRKSRC}/mk/linux/glest.ini + ${WRKSRC}/${CONFIGURE_SCRIPT} ${WRKSRC}/mk/linux/glest.ini) do-build: - @cd ${WRKSRC} && ${JAM_CMD} + @(cd ${WRKSRC} && ${JAM_CMD}) do-install: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/docs/code_license.txt ${STAGEDIR}${DOCSDIR}/code_license.txt - @${MKDIR} ${STAGEDIR}${DATADIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/docs/code_license.txt \ + ${STAGEDIR}${DOCSDIR}/code_license.txt ${INSTALL_PROGRAM} ${WRKSRC}/glest ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/mk/linux/glest.ini ${STAGEDIR}${DATADIR} - ${INSTALL_SCRIPT} ${WRKDIR}/glest-wrapper ${STAGEDIR}${PREFIX}/bin/${PORTNAME} + ${INSTALL_SCRIPT} ${WRKDIR}/glest-wrapper \ + ${STAGEDIR}${PREFIX}/bin/${PORTNAME} .if ${PORT_OPTIONS:MEDITOR} ${INSTALL_PROGRAM} ${WRKSRC}/glest_editor ${STAGEDIR}${PREFIX}/bin/ .endif .include Index: head/games/glob2/Makefile =================================================================== --- head/games/glob2/Makefile (revision 382274) +++ head/games/glob2/Makefile (revision 382275) @@ -1,88 +1,88 @@ # Created by: thierry@pompo.net # $FreeBSD$ PORTNAME= glob2 PORTVERSION= 0.9.4.4 PORTREVISION= 13 CATEGORIES= games MASTER_SITES= SAVANNAH/${PORTNAME}/${PORTVERSION:R}/ MAINTAINER= ports@FreeBSD.org COMMENT= Globulation 2, free and innovative strategy game LICENSE= GPLv3 # or later LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libvorbis.so:${PORTSDIR}/audio/libvorbis \ libspeex.so:${PORTSDIR}/audio/speex \ libfribidi.so:${PORTSDIR}/converters/fribidi \ libboost_thread.so:${PORTSDIR}/devel/boost-libs \ libfreetype.so:${PORTSDIR}/print/freetype2 OPTIONS_DEFINE= DOCS PORTAUDIO USES= pkgconfig scons USE_SDL= image net sdl ttf USE_GL= gl glu MAKE_ARGS= CCFLAGS="${CFLAGS}" \ LINKFLAGS="${LDFLAGS}" \ LIBPATH="${LIBPATH}" \ BINDIR="${STAGEDIR}${PREFIX}/bin" \ INSTALLDIR="${STAGEDIR}${PREFIX}/share" \ DATADIR="${DATADIR}" INSTALLS_ICONS= yes CFLAGS+= ${PA2_CFLAGS} -I${LOCALBASE}/include -Wno-return-type -LDFLAGS+= ${PA2_LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS} +LDFLAGS+= -lpthread ${PA2_LDFLAGS} -L${LOCALBASE}/lib LIBPATH= ${LIBPATH2}${LOCALBASE}/lib PORTDOCS= README SUB_FILES= pkg-message .include .if ${PORT_OPTIONS:MPORTAUDIO} LIB_DEPENDS+= libportaudio.so.2:${PORTSDIR}/audio/portaudio2 PA2_CFLAGS+= -I${LOCALBASE}/include/portaudio2 PA2_LDFLAGS+= -L${LOCALBASE}/lib/portaudio2 LIBPATH2= ${LOCALBASE}/lib/portaudio2: MAKE_ARGS+= --portaudio=true .else MAKE_ARGS+= --portaudio=false .endif pre-configure: ${REINPLACE_CMD} -e \ 's|"-g"|""|' \ ${WRKSRC}/SConstruct ${REINPLACE_CMD} -e \ 's|portaudio.h|portaudio2/portaudio.h|' \ ${WRKSRC}/src/VoiceRecorder.cpp ${REINPLACE_CMD} -e \ '/^Icon/s|=.*|=${PORTNAME}|' \ ${WRKSRC}/data/${PORTNAME}.desktop ${REINPLACE_CMD} -e \ '/(PACKAGE_SOURCE_DIR)/s|^|//|' \ ${WRKSRC}/libgag/src/FileManager.cpp manual-regression-test: # Don't enable these tests on pointyhat, they take too long. .if defined(MAINTAINER_MODE) (cd ${WRKSRC}/src && ./glob2 -test-games) .else (cd ${WRKSRC}/src && ./glob2 -test-games-nox) .endif post-install: .for s in 16 24 32 48 64 128 ${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps (cd ${WRKSRC}/data/icons && ${INSTALL_DATA} glob2-icon-${s}x${s}.png \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps/${PORTNAME}.png) .endfor ${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png \ ${STAGEDIR}${PREFIX}/share/pixmaps ${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC} && ${INSTALL_DATA} README ${STAGEDIR}${DOCSDIR}) ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/glob2 .include Index: head/games/heretic/Makefile =================================================================== --- head/games/heretic/Makefile (revision 382274) +++ head/games/heretic/Makefile (revision 382275) @@ -1,77 +1,76 @@ # Created by: Will Andrews # $FreeBSD$ PORTNAME= heretic PORTVERSION= 1.2 PORTREVISION= 8 CATEGORIES= games MASTER_SITES= http://heretic.linuxgames.com/heretic/src/:source \ http://heretic.linuxgames.com/wad/:wad DISTNAME= gl${PORTNAME}-${PORTVERSION} MAINTAINER= oliver@FreeBSD.org COMMENT= Unix source-port of the famous Heretic game by id Software USES= gmake USE_XORG= x11 xi xpm xau -MAKE_ENV= PTHREAD_LIBS=${PTHREAD_LIBS} OPTIONS_DEFINE= WAD DOCS OPTIONS_SINGLE= SG1 OPTIONS_SINGLE_SG1= X11 FASTX11 SDL FASTX11_DESC= Use FastX11 WAD_DESC= With shareware WAD SG1_DESC= Graphics Selections OPTIONS_DEFAULT= X11 WAD .include .if ${PORT_OPTIONS:MX11} ALL_TARGET= x11 BINARY= xheretic .endif .if ${PORT_OPTIONS:MFASTX11} ALL_TARGET= fastx11 BINARY= xaheretic .endif .if ${PORT_OPTIONS:MSDL} USE_SDL= yes ALL_TARGET= sdl BINARY= sdlheretic CFLAGS+= `${SDL_CONFIG} --cflags` .endif .if ${PORT_OPTIONS:MWAD} DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:source heretic_share.wad.gz:wad EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} PLIST_SUB= WAD:="" .else PLIST_SUB= WAD:="@comment " .endif post-extract: .if ${PORT_OPTIONS:MWAD} @${GZIP_CMD} -dc ${_DISTDIR}/heretic_share.wad.gz \ > ${WRKSRC}/heretic_share.wad .endif @${FIND} ${WRKSRC} -name .depend -type f -delete @${RM} ${WRKSRC}/i_ipx.c do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${BINARY} ${STAGEDIR}${PREFIX}/bin/heretic ${INSTALL_PROGRAM} ${WRKSRC}/sndserver ${STAGEDIR}${PREFIX}/bin/sndserver .if ${PORT_OPTIONS:MWAD} @${MKDIR} ${STAGEDIR}${PREFIX}/share/heretic ${INSTALL_DATA} ${WRKSRC}/heretic_share.wad ${STAGEDIR}${PREFIX}/share/heretic .endif .if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in "End User License Heretic Source Code.txt" Gamekeys.txt README.txt AUTHORS SourceReadme.txt Changelog README.opengl ${INSTALL_DATA} ${WRKSRC}/doc/${i} ${STAGEDIR}${DOCSDIR} .endfor .endif .include Index: head/games/heretic/files/patch-Makefile =================================================================== --- head/games/heretic/files/patch-Makefile (revision 382274) +++ head/games/heretic/files/patch-Makefile (revision 382275) @@ -1,91 +1,91 @@ --- Makefile.orig Mon May 1 22:56:45 2000 +++ Makefile Fri Aug 30 01:43:32 2002 @@ -1,19 +1,19 @@ # Makefile for Linux Heretic/GLHeretic # Comment the line below if you don't want to build GLHeretic. -WANT_OGL = yes +#WANT_OGL = yes # Comment this if you don't want to build GLHeretic # with highest quality options. # (Only if you have WANT_OGL !) -WANT_NICE_OGL = yes +#WANT_NICE_OGL = yes # Uncomment the line below if you want to use GSI for sound. # (doesn't really work yet. :-() #WANT_GSI = yes -CC = gcc -pipe +#CC = gcc -pipe # # For old SVGALIB, comment out -D__NEWVGALIB__ @@ -21,7 +21,7 @@ CDEFS.ipx = -DUNIX -DHAVE_USLEEP -DHAVE_MATH_H -DHAVE_VALUES_H -DLINUX_MOUSE \ -DIPX_PROTOCOL -DI_GGI_HERETIC -DNEED_SHMGETEVENTBASE \ -D__NEWVGALIB__ # -DIPX_DEBUG -DEXTRA_WADS -CDEFS.udp = -DUNIX -DHAVE_USLEEP -DHAVE_MATH_H -DHAVE_VALUES_H -DLINUX_MOUSE \ +CDEFS.udp = -DUNIX -DHAVE_USLEEP -DHAVE_MATH_H -DLINUX_MOUSE \ -DUDP_PROTOCOL -DI_GGI_HERETIC -DNEED_SHMGETEVENTBASE \ -D__NEWVGALIB__ # -DEXTRA_WADS @@ -38,7 +38,7 @@ COPT.alpha = -O2 -D__64BIT__ -DHAVE_ALLOCA_H -COPT.FreeBSD = -m486 -O2 -malign-jumps=2 -malign-functions=2 -D__32BIT__ +COPT.FreeBSD = -D__32BIT__ -DHOMEDIR='"\"${PREFIX}/share/heretic\""' COPT.arm = -O2 -D__32BIT__ -fsigned-char -fomit-frame-pointer \ -DHAVE_ALLOCA_H -D__PACKED__=__attribute__\ \(\(packed\)\) @@ -57,12 +57,12 @@ endif # Change this to change the platform -COPT.arch = $(COPT.x86) +COPT.arch = $(COPT.FreeBSD) # If you want IPX-netcode compiled, replace $(CDEFS.udp) with $(CDEFS.ipx) -CFLAGS = -Wall $(CDEFS.udp) $(COPT.arch) \ - -I. -I.. -I/usr/X11R6/include $(COPT.sound) $(COPT.opengl) +CFLAGS += $(CDEFS.udp) $(COPT.arch) \ + -I. -I.. -I${LOCALBASE}/include -I${LOCALBASE}/include $(COPT.sound) $(COPT.opengl) # Uncomment the line below if you want to use original "[" and "]" keys # for inventory access, instead of "k" and "l". @@ -85,18 +85,18 @@ COPT.sound = -D__DOSOUND__ -DSNDSERV -Isoundclient -D__DOMUSIC__ -DMUSSERV # -D_DEBUGSOUND X11LIBS = -lXext -lX11 -MUSSERV = musserver +#MUSSERV = musserver SNDSERV = sndserver endif -X_LDFLAGS = -L/usr/X11R6/lib +X_LDFLAGS = -L${LOCALBASE}/lib X11LIBS = -lXext -lX11 -GLLIBS = -lSDL -lpthread -+GLLIBS = `${SDL_CONFIG} --libs` ${PTHREAD_LIBS} ++GLLIBS = `${SDL_CONFIG} --libs` -lpthread GGILIBS = -lggi -lm VGALIBS = -lvga -SDLLIBS = -lSDL -lpthread -+SDLLIBS = `${SDL_CONFIG} --libs` ${PTHREAD_LIBS} ++SDLLIBS = `${SDL_CONFIG} --libs` -lpthread OBJS = am_map.o ct_chat.o d_main.o d_net.o f_finale.o g_game.o \ p_ceilng.o p_doors.o p_enemy.o p_floor.o p_inter.o p_lights.o \ @@ -104,7 +104,7 @@ p_spec.o p_switch.o p_telept.o p_tick.o p_user.o r_bsp.o r_data.o \ r_draw.o r_plane.o r_segs.o r_things.o r_main.o mn_menu.o sb_bar.o \ tables.o v_video.o w_wad.o z_zone.o in_lude.o \ - info.o i_net.o i_system.o i_udp.o i_ipx.o i_main.o $(SOUND_OBJS) + info.o i_net.o i_system.o i_udp.o i_main.o $(SOUND_OBJS) GLOBJS = opengl/gl_effects.o opengl/gl_floorceil.o opengl/gl_fonts.o \ opengl/gl_func.o opengl/gl_init.o opengl/gl_lights.o \ Index: head/games/heroes/Makefile =================================================================== --- head/games/heroes/Makefile (revision 382274) +++ head/games/heroes/Makefile (revision 382275) @@ -1,65 +1,65 @@ # Created by: Maxim Sobolev # $FreeBSD$ PORTNAME= heroes PORTVERSION= 0.21 PORTREVISION= 16 CATEGORIES= games MASTER_SITES= SF \ SF/${PORTNAME}/${PORTNAME}-data/${DATAVERSION}:data \ SF/${PORTNAME}/${PORTNAME}-sound-effects/${SOUNDVERSION}:sound \ SF/${PORTNAME}/${PORTNAME}-sound-tracks/${MUSICVERSION}:music DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \ ${DATADISTNAME}${EXTRACT_SUFX}:data \ ${SOUNDISTNAME}${EXTRACT_SUFX}:sound \ ${MUSICDISTNAME}${EXTRACT_SUFX}:music MAINTAINER= ports@FreeBSD.org COMMENT= Game of yore similar to the "Tron" and "Nibbles" LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING DATAVERSION= 1.5 SOUNDVERSION= 1.0 MUSICVERSION= 1.0 DATADISTNAME= ${PORTNAME}-data-${DATAVERSION} SOUNDISTNAME= ${PORTNAME}-sound-effects-${SOUNDVERSION} MUSICDISTNAME= ${PORTNAME}-sound-tracks-${MUSICVERSION} DATASRC= ${WRKDIR}/${DATADISTNAME} SOUNDSRC= ${WRKDIR}/${SOUNDISTNAME} MUSICSRC= ${WRKDIR}/${MUSICDISTNAME} USE_SDL= mixer sdl USES= gettext gmake iconv makeinfo GNU_CONFIGURE= yes CONFIGURE_ENV= MAKEINFO="makeinfo --no-split" CONFIGURE_ARGS= --with-sdl_mixer=${LOCALBASE} --without-gii --without-ggi OPTIONS_DEFINE= OPTIMIZED_CFLAGS OPTIMIZED_CFLAGS_CONFIGURE_ENABLE= optimizations INFO= heroes -CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -LDFLAGS+= -L${LOCALBASE}/lib -lsmpeg -lm ${PTHREAD_LIBS} +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -lpthread -L${LOCALBASE}/lib -lsmpeg -lm post-patch: @for dir in ${DATASRC} ${SOUNDSRC} ${MUSICSRC}; do \ ${FIND} $${dir} -name "Makefile*" -delete; \ done @${RM} -f ${WRKSRC}/lib/getopt.h @${RM} -f ${WRKSRC}/doc/*.info* post-install: .for dir in levels pics tilesets @${MKDIR} ${STAGEDIR}${DATADIR}/${dir} ${INSTALL_DATA} ${DATASRC}/${dir}/* ${STAGEDIR}${DATADIR}/${dir} .endfor @${MKDIR} ${STAGEDIR}${DATADIR}/sfx ${INSTALL_DATA} ${SOUNDSRC}/*.wav ${SOUNDSRC}/sfx.conf ${STAGEDIR}${DATADIR}/sfx @${MKDIR} ${STAGEDIR}${DATADIR}/mod ${INSTALL_DATA} ${MUSICSRC}/*.xm ${MUSICSRC}/sound.conf ${STAGEDIR}${DATADIR}/mod .include Index: head/games/kuklomenos/Makefile =================================================================== --- head/games/kuklomenos/Makefile (revision 382274) +++ head/games/kuklomenos/Makefile (revision 382275) @@ -1,37 +1,37 @@ # Created by: chinsan # $FreeBSD$ PORTNAME= kuklomenos PORTVERSION= 0.4.5 PORTREVISION= 4 CATEGORIES= games MASTER_SITES= http://mbays.freeshell.org/kuklomenos/src/ MAINTAINER= ports@FreeBSD.org COMMENT= Simple but challenging abstract shoot-em-up game LICENSE= GPLv3 # or later LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl OPTIONS_DEFINE= VORBIS OPTIONS_DEFAULT= VORBIS OPTIONS_SUB= yes USE_SDL= sdl GNU_CONFIGURE= yes -CPPFLAGS+= -I${LOCALBASE}/include ${PTHEAD_CFLAGS} -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -lpthread -L${LOCALBASE}/lib VORBIS_LIB_DEPENDS= libvorbis.so:${PORTSDIR}/audio/libvorbis VORBIS_CONFIGURE_ENABLE= sound post-patch: @${REINPLACE_CMD} -e \ 's||"SDL_mixer.h"|g' ${WRKSRC}/SDL_mixer/load_ogg.c @${REINPLACE_CMD} -e \ '/^sounds_DATA/s|Makefile.am||g' ${WRKSRC}/sounds/Makefile.in .include Index: head/games/lincity-ng/Makefile =================================================================== --- head/games/lincity-ng/Makefile (revision 382274) +++ head/games/lincity-ng/Makefile (revision 382275) @@ -1,44 +1,44 @@ # Created by: Andrej Zverev # $FreeBSD$ PORTNAME= lincity-ng PORTVERSION= 2.0 PORTREVISION= 12 CATEGORIES= games MASTER_SITES= BERLIOS MAINTAINER= ports@FreeBSD.org COMMENT= Improved rich city simulation game for X BUILD_DEPENDS= jam:${PORTSDIR}/devel/jam LIB_DEPENDS= libphysfs.so:${PORTSDIR}/devel/physfs USES= pkgconfig tar:bzip2 USE_SDL= sdl mixer image ttf gfx USE_GL= yes USE_GNOME= libxml2 GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-libphysfs=${PREFIX} \ --x-libraries=${LOCALBASE}/lib --x-includes=${LOCALBASE}/include CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +LDFLAGS+= -lpthread -L${LOCALBASE}/lib PLIST_FILES= bin/lincity-ng \ share/applications/lincity-ng.desktop \ share/pixmaps/lincity-ng.png PORTDATA= * PORTDOCS= * OPTIONS_DEFINE= DOCS post-patch: @${REINPLACE_CMD} -e 's| -O| -I${LOCALBASE}/include&|g' \ ${WRKSRC}/Jamrules do-build: @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} jam -j${MAKE_JOBS_NUMBER}) do-install: @(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} jam -sprefix=${STAGEDIR}${PREFIX} ${INSTALL_TARGET}) .include Index: head/games/netpanzer/Makefile =================================================================== --- head/games/netpanzer/Makefile (revision 382274) +++ head/games/netpanzer/Makefile (revision 382275) @@ -1,45 +1,44 @@ # $FreeBSD$ PORTNAME= netpanzer PORTVERSION= 0.8.4 PORTREVISION= 4 CATEGORIES= games MASTER_SITES= LOCAL/madpilot/netpanzer MAINTAINER= madpilot@FreeBSD.org COMMENT= Real time, isometric view, tank multiplayer strategy game LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -LDFLAGS+= ${PTHREAD_LIBS} -CFLAGS+= ${PTHREAD_CFLAGS} +LDFLAGS+= -lpthreads USES= scons tar:bzip2 USE_SDL= sdl mixer image USE_GNOME= libxml2 SCONS_ARGS+= datadir="${DATADIR}" SCONS_BUILDENV= ${SCONS_ENV} PORTDOCS= * PORTDATA= * post-configure: ${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/SConstruct do-install: ${INSTALL_PROGRAM} ${WRKSRC}/netpanzer ${STAGEDIR}${PREFIX}/bin ${MKDIR} ${STAGEDIR}${DATADIR} (cd ${WRKSRC} && ${COPYTREE_SHARE} "cache maps pics powerups scripts sound units wads" ${STAGEDIR}${DATADIR}) ${INSTALL_MAN} ${WRKSRC}/docs/netpanzer.6 ${STAGEDIR}${MANPREFIX}/man/man6 ${INSTALL_DATA} ${WRKSRC}/netpanzer.desktop ${STAGEDIR}${PREFIX}/share/applications ${INSTALL_DATA} ${WRKSRC}/netpanzer.png ${WRKSRC}/netpanzer.xpm ${STAGEDIR}${PREFIX}/share/pixmaps ${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC} && ${INSTALL_MAN} COPYING ChangeLog README RELNOTES TODO ${STAGEDIR}${DOCSDIR}) (cd ${WRKSRC}/docs && ${INSTALL_MAN} Doxyfile code-notes.txt coding.txt serverhowto.html tipofday.txt ${STAGEDIR}${DOCSDIR}) do-fetch-svn: svn export svn://svn.berlios.de/${PORTNAME}/tags/${PORTNAME}/${PORTVERSION} ${PORTNAME}-${PORTVERSION} tar cjf ${PORTNAME}-${PORTVERSION}.tar.bz2 ${PORTNAME}-${PORTVERSION} .include Index: head/games/openalchemist/Makefile =================================================================== --- head/games/openalchemist/Makefile (revision 382274) +++ head/games/openalchemist/Makefile (revision 382275) @@ -1,49 +1,49 @@ # Created by: Ganael LAPLANCHE # $FreeBSD$ PORTNAME= openalchemist PORTVERSION= 0.3 PORTREVISION= 19 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} DISTNAME= ${PORTNAME}-${PORTVERSION}-src MAINTAINER= martymac@FreeBSD.org COMMENT= Tetris-like game LICENSE= GPLv2 CCbySA LICENSE_COMB= multi LICENSE_NAME_CCbySA= Creative Commons Attribution-ShareAlike LICENSE_FILE_CCbySA= ${WRKSRC}/GRAPHICS-LICENSE LICENSE_PERMS_CCbySA= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip LIB_DEPENDS= libclanCore.so:${PORTSDIR}/devel/clanlib1 \ libjpeg.so:${PORTSDIR}/graphics/jpeg \ libpng.so:${PORTSDIR}/graphics/png USE_AUTOTOOLS= aclocal automake autoconf # Necessary to find pkg.m4 (PKG_CHECK_MODULES) ACLOCAL_ARGS+= -I ${LOCALBASE}/share/aclocal CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +LDFLAGS+= -lpthread -L${LOCALBASE}/lib GNU_CONFIGURE= yes USE_GNOME= pygtk2 USE_XORG= xxf86vm xi x11 xmu xext xdamage xfixes xau xdmcp xt sm ice USE_GL= gl glu USE_SDL= sdl gfx USES= pkgconfig iconv shebangfix gmake SHEBANG_FILES= openalchemist-config PORTDOCS= AUTHORS ChangeLog README TODO post-patch: @${REINPLACE_CMD} -E -e 's|0.8|1.0|g' -e 's|^%|#|g' ${WRKSRC}/configure.ac @${REINPLACE_CMD} -E -e 's|0.8|1.0|g' ${WRKSRC}/build/Makefile.am @${REINPLACE_CMD} -E -e 's|^dist_pkgdata_DATA =.*|dist_pkgdata_DATA = data/* skins/aqua.zip skins/brushed.zip skins/vectoriel.zip|g' ${WRKSRC}/Makefile.am post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .include Index: head/games/openjazz/Makefile =================================================================== --- head/games/openjazz/Makefile (revision 382274) +++ head/games/openjazz/Makefile (revision 382275) @@ -1,40 +1,40 @@ # Created by: Ganael Laplanche # $FreeBSD$ PORTNAME= openjazz PORTVERSION= 20120819 PORTREVISION= 4 CATEGORIES= games MASTER_SITES= http://alister.eu/jazz/oj/ \ LOCAL/martymac DISTNAME= OpenJazz-src-190812 MAINTAINER= martymac@FreeBSD.org COMMENT= Free re-implementation of the Jazz Jackrabbit(tm) game engine LICENSE= GPLv2 WRKSRC= ${WRKDIR}/${PORTNAME} EXTRACT_AFTER_ARGS= -d ${WRKSRC} USES= dos2unix gmake zip DOS2UNIX_REGEX= .*\.(h|cpp) ALL_TARGET= OpenJazz USE_XORG= x11 xext xrandr xrender xau xdmcp USE_SDL= sdl CPPFLAGS+= -I${LOCALBASE}/include `${SDL_CONFIG} --cflags` \ -DDATAPATH=\\\"${DATADIR}/\\\" -DHOMEDIR -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} `${SDL_CONFIG} --libs` +LDFLAGS+= -lpthread -L${LOCALBASE}/lib `${SDL_CONFIG} --libs` SUB_FILES= pkg-message pre-extract: @${MKDIR} ${WRKSRC} do-install: @${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/openjazz.000 ${STAGEDIR}${DATADIR} ${INSTALL_PROGRAM} ${WRKSRC}/OpenJazz ${STAGEDIR}${PREFIX}/bin/openjazz .include Index: head/games/q3cellshading/Makefile =================================================================== --- head/games/q3cellshading/Makefile (revision 382274) +++ head/games/q3cellshading/Makefile (revision 382275) @@ -1,110 +1,110 @@ # Created by: Alejandro Pulver # $FreeBSD$ PORTNAME= q3cellshading PORTVERSION= 1.0 PORTREVISION= 2 CATEGORIES= games MASTER_SITES= SF DISTNAME= q3cel-${PORTVERSION}-src MAINTAINER= ports@FreeBSD.org COMMENT= Quake III engine with Cell Shading capabilities ONLY_FOR_ARCHS= i386 ONLY_FOR_ARCHS_REASON= does not run properly; try games/ioquake3 with option USES= compiler dos2unix gmake zip WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} BUILD_WRKSRC= ${WRKSRC}/code/unix MAKE_JOBS_UNSAFE= yes LIBDIR= ${PREFIX}/lib/${PORTNAME} MAKE_ENV= LIBDIR="${LIBDIR}" PLIST_SUB= LIBDIR="${LIBDIR:S/${PREFIX}\///}" VM_ARCHS= i386 powerpc OPTIONS_DEFINE= GAMELIBS OPTIMIZED_CFLAGS OPTIONS_MULTI= FLAVOR OPTIONS_MULTI_FLAVOR= CLIENT DEDICATED SMP_CLIENT OPTIONS_DEFAULT= CLIENT DEDICATED OPTIMIZED_CFLAGS SMP_CLIENT OPTIONS_SUB= yes CLIENT_DESC= Build client DEDICATED_DESC= Build dedicated server GAMELIBS_DESC= Force building game libraries SMP_CLIENT_DESC= Build SMP (threaded) client .include .if ${ARCH} == "i386" BUILD_DEPENDS+= nasm:${PORTSDIR}/devel/nasm .endif .for arch in ${ARCH} . if ${VM_ARCHS:M${arch}} != "" HAVE_VM_COMPILED= yes . endif .endfor .if !defined(HAVE_VM_COMPILED) MAKE_ENV+= DLL_ONLY=true .endif .if ${PORT_OPTIONS:MCLIENT} || ${PORT_OPTIONS:MSMP_CLIENT} USE_GL= yes USE_XORG= xxf86dga .endif .if ${PORT_OPTIONS:MCLIENT} MAKE_ENV+= CLIENT=YES Q3BIN+= quake3 .endif .if ${PORT_OPTIONS:MDEDICATED} MAKE_ENV+= DEDICATED=YES Q3BIN+= q3ded .endif .if ${PORT_OPTIONS:MGAMELIBS} || !defined(HAVE_VM_COMPILED) MAKE_ENV+= GAMELIBS=YES .endif .if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} MAKE_ENV+= OPTIMIZED_CFLAGS=YES .endif .if ${PORT_OPTIONS:MSMP_CLIENT} -MAKE_ENV+= SMP=YES PTHREAD_LIBS="${PTHREAD_LIBS}" +MAKE_ENV+= SMP=YES Q3BIN+= quake3-smp .endif post-patch: @${REINPLACE_CMD} -e 's|botlib\.log|/dev/null|' \ ${WRKSRC}/code/botlib/be_interface.c @${REINPLACE_CMD} -e \ 's|//[[:blank:]]*\(Swap_Init[[:blank:]]*();\)|\1|' \ ${WRKSRC}/code/botlib/be_interface.c \ ${WRKSRC}/code/renderer/tr_init.c .if ${COMPILER_TYPE} == clang @${REINPLACE_CMD} -E 's,-falign-(jumps|loops)=2,,g; s|-O6||' \ ${WRKSRC}/code/unix/Makefile .endif do-install: .for bin in ${Q3BIN} # Adjust program names to avoid conflicts with other Quake3 ports ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/release/${bin} \ ${STAGEDIR}${PREFIX}/bin/${bin:C/(quake3|q3)/\1cel/} .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} .endfor .endif .include "${.CURDIR}/../quake3-data/Makefile.include" .include Index: head/games/q3cellshading/files/patch-code-unix-Makefile =================================================================== --- head/games/q3cellshading/files/patch-code-unix-Makefile (revision 382274) +++ head/games/q3cellshading/files/patch-code-unix-Makefile (revision 382275) @@ -1,480 +1,480 @@ --- code/unix/Makefile.orig Tue Aug 8 18:19:12 2006 +++ code/unix/Makefile Tue Aug 8 18:22:25 2006 @@ -34,7 +34,7 @@ # Build name # BUILD_NAME=$(BUILD_NAME) -BUILD_NAME=quake3.x86 +BUILD_NAME=quake3 @@ -46,8 +46,8 @@ BASEQ3_DIR=$(BDIR)/baseq3 -BD=debug$(ARCH)$(GLIBC) -BR=release$(ARCH)$(GLIBC) +BD=debug +BR=release CDIR=$(MOUNT_DIR)/client SDIR=$(MOUNT_DIR)/server RDIR=$(MOUNT_DIR)/renderer @@ -65,7 +65,7 @@ SPLNDIR=$(MOUNT_DIR)/splines # extract version info -VERSION=$(shell ./extract_ver.pl) +VERSION="Q3 1.32c" RPM_RELEASE=1 # NOTE: used by dcp rcp targets, not referenced @@ -76,7 +76,7 @@ ############################################################################# ## Defaults -DLL_ONLY=false +DLL_ONLY?=false # bk010215 - TODO - add all defaults / kill Ryan @@ -136,7 +136,7 @@ ifeq ($(ARCH),ppc) NEWPGCC=/loki/global/ppc/bin/gcc CC=$(NEWPGCC) - RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O6 -fomit-frame-pointer -pipe -ffast-math -malign-loops=2 -malign-jumps=2 -malign-functions=2 -fno-strict-aliasing -fstrength-reduce + RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O6 -fomit-frame-pointer -pipe -ffast-math -falign-loops=2 -falign-jumps=2 -falign-functions=2 -fno-strict-aliasing -fstrength-reduce else #NEWPGCC=/usr/local/gcc-2.95.2/bin/gcc # bk001205 #NEWPGCC=/loki/global/x86/bin/gcc @@ -146,9 +146,9 @@ # TTimo: legacy RELEASE_CFLAGS # NOTE: the -fomit-frame-pointer option leads to an unstable binary on my test box if it was built on the main box # but building on the Mdk 7.2 baseline seems to work - RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O6 -mcpu=pentiumpro -march=pentium -fomit-frame-pointer -pipe -ffast-math -malign-loops=2 -malign-jumps=2 -malign-functions=2 -fno-strict-aliasing -fstrength-reduce + RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O6 -fomit-frame-pointer -pipe -ffast-math -falign-loops=2 -falign-jumps=2 -falign-functions=2 -fno-strict-aliasing -fstrength-reduce # TTimo: use this for building on P3 gcc 2.95.3 libc2.2 for all targets (experimental! -fomit-fram-pointer removed) -# RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O6 -mcpu=pentiumpro -march=pentium -pipe -ffast-math -malign-loops=2 -malign-jumps=2 -malign-functions=2 -fno-strict-aliasing -fstrength-reduce +# RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O6 -pipe -ffast-math -falign-loops=2 -falign-jumps=2 -falign-functions=2 -fno-strict-aliasing -fstrength-reduce endif endif @@ -162,7 +162,7 @@ RANLIB=ranlib THREAD_LDFLAGS=-lpthread - LDFLAGS=-ldl -lm + LDFLAGS=-lm GLLDFLAGS=-L/usr/X11R6/lib -lX11 -lXext -lXxf86dga -lXxf86vm ifeq ($(ARCH),axp) @@ -197,33 +197,29 @@ ifeq ($(PLATFORM),freebsd) +ifeq ($(ARCH),powerpc) +ARCH=ppc +endif + GLIBC= #libc is irrelevant -ifneq (,$(findstring alpha,$(shell uname -m))) -ARCH=axp -RPMARCH=alpha -VENDOR=dec -else #default to i386 -ARCH=i386 -RPMARCH=i386 -VENDOR=unknown -endif #alpha test +BASE_CFLAGS = $(CFLAGS) -DDATADIR='\"$(Q3DIR)\"' -DLIBDIR='\"$(LIBDIR)\"' -pipe +GL_CFLAGS = -I$(LOCALBASE)/include -BASE_CFLAGS = -pipe +DEBUG_CFLAGS=$(BASE_CFLAGS) -g -Wall -Werror +RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -GL_CFLAGS = -I$(MESADIR)/include -I/usr/X11R6/include +ifdef OPTIMIZED_CFLAGS + ifeq ($(ARCH),i386) +RELEASE_CFLAGS+=-O6 -fomit-frame-pointer -pipe -ffast-math -falign-loops=2 -falign-jumps=2 -falign-functions=2 -fno-strict-aliasing -fstrength-reduce + else +RELEASE_CFLAGS+=-O6 -ffast-math -funroll-loops -fomit-frame-pointer -fexpensive-optimizations + endif +endif -DEBUG_CFLAGS=$(BASE_CFLAGS) -g -Wall -Werror -ifeq ($(ARCH),axp) -CC=pgcc -RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O6 -ffast-math -funroll-loops -fomit-frame-pointer -fexpensive-optimizations -else -#NEWPGCC=/loki/global/x86/bin/gcc # raistlin012301 -#NEWPGCC=/usr/local/gcc-2.95.2/bin/gcc -NEWPGCC=/home/raistllin/src/gcc/build/install/bin/gcc -CC=$(shell if [ -f $(NEWPGCC) ]; then echo $(NEWPGCC); else echo pgcc; fi ) -RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O6 -mcpu=pentiumpro -march=pentium -fomit-frame-pointer -pipe -ffast-math -malign-loops=2 -malign-jumps=2 -malign-functions=2 -fno-strict-aliasing - fstrength-reduce +ifeq ($(DLL_ONLY),true) +BASE_CFLAGS += -DDLL_ONLY endif LIBEXT=a @@ -235,25 +231,33 @@ ARFLAGS=ar rv RANLIB=ranlib -THREAD_LDFLAGS=-lpthread -+THREAD_LDFLAGS=$(PTHREAD_LIBS) ++THREAD_LDFLAGS=-lpthread # don't need -ldl (FreeBSD) -LDFLAGS=-lm +LDFLAGS+=-lm #GLLDFLAGS=-L/usr/X11R6/lib -L$(MESADIR)/lib -lGL -lX11 -lXext -lXxf86dga -lXxf86vm #GLLDFLAGS=-L/usr/X11/lib -lGL -lX11 -lXext -lm -GLLDFLAGS=-L/usr/X11R6/lib -lGL -lX11 -lXext -lXxf86dga -lXxf86vm +GLLDFLAGS=-L$(LOCALBASE)/lib -lGL -lX11 -lXext -lXxf86dga -lXxf86vm -ifeq ($(ARCH),axp) -TARGETS=\ - $(B)/$(PLATFORM)q3ded -else -TARGETS=\ - $(B)/$(PLATFORM)quake3 \ - $(B)/baseq3/cgame$(ARCH).$(SHLIBEXT) \ - $(B)/baseq3/qagame$(ARCH).$(SHLIBEXT) \ - $(B)/baseq3/ui$(ARCH).$(SHLIBEXT) \ - $(B)/missionpack/cgame$(ARCH).$(SHLIBEXT) \ - $(B)/missionpack/qagame$(ARCH).$(SHLIBEXT) \ - $(B)/missionpack/ui$(ARCH).$(SHLIBEXT) +ifdef CLIENT +TARGETS+=$(B)/quake3 +endif + +ifdef DEDICATED +TARGETS+=$(B)/q3ded +endif + +ifdef SMP +TARGETS+=$(B)/quake3-smp +endif + +ifdef GAMELIBS +TARGETS+=\ + $(B)/baseq3/cgame.$(SHLIBEXT) \ + $(B)/baseq3/qagame.$(SHLIBEXT) \ + $(B)/baseq3/ui.$(SHLIBEXT) \ + $(B)/missionpack/cgame.$(SHLIBEXT) \ + $(B)/missionpack/qagame.$(SHLIBEXT) \ + $(B)/missionpack/ui.$(SHLIBEXT) endif else # ifeq freebsd @@ -283,7 +287,7 @@ ARFLAGS=ar rv RANLIB=ranlib -LDFLAGS=-ldl -lm +LDFLAGS=-lm GLLDFLAGS=-L/usr/X11/lib -lGL -lX11 -lXext -lm TARGETS=$(B)/sgiquake3 \ @@ -310,9 +314,9 @@ RANLIB=ranlib ifeq ($(PLATFORM),freebsd) -LDFLAGS=-lm +LDFLAGS+=-lm else -LDFLAGS=-ldl -lm +LDFLAGS=-lm endif # ifeq freebsd TARGETS=\ @@ -348,7 +352,7 @@ $(MAKE) targets B=$(BR) CFLAGS="$(RELEASE_CFLAGS)" #Build both debug and release builds -all:build_debug build_release +all:build_release targets:makedirs $(TARGETS) @@ -516,20 +520,6 @@ $(B)/client/unix_net.o \ $(B)/client/unix_shared.o \ \ - $(B)/client/ahoptim.o \ - $(B)/client/autohint.o \ - $(B)/client/ftbase.o \ - $(B)/client/ftdebug.o \ - $(B)/client/ftglyph.o \ - $(B)/client/ftinit.o \ - $(B)/client/ftmm.o \ - $(B)/client/ftsystem.o \ - $(B)/client/raster1.o \ - $(B)/client/sfnt.o \ - $(B)/client/sfobjs.o \ - $(B)/client/smooth.o \ - $(B)/client/truetype.o -# \ # $(B)/client/q_parse.o \ # $(B)/client/math_quaternion.o \ # $(B)/client/util_str.o \ @@ -541,10 +531,12 @@ # $(B)/client/q_shared.o \ ifeq ($(ARCH),i386) - Q3OBJ += $(B)/client/vm_x86.o + ifeq ($(DLL_ONLY),false) + Q3OBJ += $(B)/client/vm_x86.o + endif endif - ifeq ($(ARCH),ppc) + ifeq ($(ARCH),powerpc) ifeq ($(DLL_ONLY),false) Q3OBJ += $(B)/client/vm_ppc.o endif @@ -559,10 +551,24 @@ $(B)/client/linux_qgl.o \ $(B)/client/linux_glimp.o \ $(B)/client/linux_snd.o \ + $(B)/client/linux_signals.o \ $(B)/client/snd_mixa.o \ - $(B)/client/matha.o \ - $(B)/client/ftol.o \ - $(B)/client/snapvector.o + $(B)/client/matha.o + + Q3POBJ_SMP=\ + $(B)/client/linux_common.o \ + $(B)/client/linux_qgl.o \ + $(B)/client/linux_glimp_smp.o \ + $(B)/client/linux_snd.o \ + $(B)/client/linux_signals.o \ + $(B)/client/snd_mixa.o \ + $(B)/client/matha.o + + ifeq ($(ARCH),i386) + Q3POBJ += $(B)/client/ftol.o $(B)/client/snapvector.o + Q3POBJ_SMP += $(B)/client/ftol.o $(B)/client/snapvector.o + endif + else ifeq ($(PLATFORM),irix) Q3POBJ=\ @@ -578,7 +584,6 @@ $(B)/client/linux_common.o \ $(B)/client/linux_qgl.o \ $(B)/client/linux_glimp.o \ - $(B)/client/linux_joystick.o \ $(B)/client/linux_snd.o \ $(B)/client/snd_mixa.o \ $(B)/client/matha.o \ @@ -587,7 +592,6 @@ $(B)/client/linux_common.o \ $(B)/client/linux_qgl.o \ $(B)/client/linux_glimp_smp.o \ - $(B)/client/linux_joystick.o \ $(B)/client/linux_snd.o \ $(B)/client/snd_mixa.o \ $(B)/client/matha.o @@ -602,12 +606,12 @@ endif #FreeBSD endif #IRIX -$(B)/$(PLATFORM)quake3 : $(Q3OBJ) $(Q3POBJ) +$(B)/quake3 : $(Q3OBJ) $(Q3POBJ) $(CC) -o $@ $(Q3OBJ) $(Q3POBJ) $(GLLDFLAGS) $(LDFLAGS) # TTimo: splines code requires C++ linking, but splines have not been officially included in the codebase # $(CXX) -o $@ $(Q3OBJ) $(Q3POBJ) $(GLLDFLAGS) $(LDFLAGS) -$(B)/$(PLATFORM)quake3-smp : $(Q3OBJ) $(Q3POBJ_SMP) +$(B)/quake3-smp : $(Q3OBJ) $(Q3POBJ_SMP) $(CC) -o $@ $(Q3OBJ) $(Q3POBJ_SMP) $(GLLDFLAGS) \ $(THREAD_LDFLAGS) $(LDFLAGS) @@ -754,10 +758,10 @@ $(B)/client/linux_common.o : $(UDIR)/linux_common.c; $(DO_CC) $(B)/client/linux_glimp.o : $(UDIR)/linux_glimp.c; $(DO_CC) $(GL_CFLAGS) $(B)/client/linux_glimp_smp.o : $(UDIR)/linux_glimp.c; $(DO_SMP_CC) $(GL_CFLAGS) -$(B)/client/linux_joystick.o : $(UDIR)/linux_joystick.c; $(DO_CC) $(B)/client/linux_qgl.o : $(UDIR)/linux_qgl.c; $(DO_CC) $(GL_CFLAGS) $(B)/client/linux_input.o : $(UDIR)/linux_input.c; $(DO_CC) $(B)/client/linux_snd.o : $(UDIR)/linux_snd.c; $(DO_CC) +$(B)/client/linux_signals.o : $(UDIR)/linux_signals.c; $(DO_CC) $(GL_CFLAGS) $(B)/client/snd_mixa.o : $(UDIR)/snd_mixa.s; $(DO_AS) $(B)/client/matha.o : $(UDIR)/matha.s; $(DO_AS) @@ -767,7 +771,7 @@ $(B)/client/vm_x86.o : $(CMDIR)/vm_x86.c; $(DO_CC) endif -ifeq ($(ARCH),ppc) +ifeq ($(ARCH),powerpc) ifeq ($(DLL_ONLY),false) $(B)/client/vm_ppc.o : $(CMDIR)/vm_ppc.c; $(DO_CC) endif @@ -912,22 +916,26 @@ $(B)/ded/unix_main.o \ $(B)/ded/unix_net.o \ $(B)/ded/unix_shared.o \ + $(B)/ded/linux_signals.o \ \ $(B)/ded/null_client.o \ $(B)/ded/null_input.o \ $(B)/ded/null_snddma.o ifeq ($(ARCH),i386) - Q3DOBJ += $(B)/ded/vm_x86.o $(B)/ded/ftol.o $(B)/ded/snapvector.o + Q3DOBJ += $(B)/ded/ftol.o $(B)/ded/snapvector.o + ifeq ($(DLL_ONLY),false) + Q3DOBJ += $(B)/ded/vm_x86.o + endif endif -ifeq ($(ARCH),ppc) +ifeq ($(ARCH),powerpc) ifeq ($(DLL_ONLY),false) Q3DOBJ += $(B)/ded/vm_ppc.o endif endif -$(B)/$(PLATFORM)q3ded : $(Q3DOBJ) +$(B)/q3ded : $(Q3DOBJ) $(CC) -o $@ $(Q3DOBJ) $(LDFLAGS) $(B)/ded/sv_bot.o : $(SDIR)/sv_bot.c; $(DO_DED_CC) @@ -988,6 +996,7 @@ $(B)/ded/unix_main.o : $(UDIR)/unix_main.c; $(DO_DED_CC) $(B)/ded/unix_net.o : $(UDIR)/unix_net.c; $(DO_DED_CC) $(B)/ded/unix_shared.o : $(UDIR)/unix_shared.c; $(DO_DED_CC) +$(B)/ded/linux_signals.o : $(UDIR)/linux_signals.c; $(DO_DED_CC) $(B)/ded/null_client.o : $(NDIR)/null_client.c; $(DO_DED_CC) $(B)/ded/null_input.o : $(NDIR)/null_input.c; $(DO_DED_CC) $(B)/ded/null_snddma.o : $(NDIR)/null_snddma.c; $(DO_DED_CC) @@ -1001,7 +1010,7 @@ $(B)/ded/snapvector.o : $(UDIR)/snapvector.nasm; $(DO_NASM) endif -ifeq ($(ARCH),ppc) +ifeq ($(ARCH),powerpc) ifeq ($(DLL_ONLY),false) $(B)/ded/vm_ppc.o : $(CMDIR)/vm_ppc.c; $(DO_DED_CC) endif @@ -1068,7 +1077,7 @@ $(B)/baseq3/cgame/q_math.o \ $(B)/baseq3/cgame/q_shared.o -$(B)/baseq3/cgame$(ARCH).$(SHLIBEXT) : $(Q3CGOBJ) +$(B)/baseq3/cgame.$(SHLIBEXT) : $(Q3CGOBJ) $(CC) $(SHLIBLDFLAGS) -o $@ $(Q3CGOBJ) $(B)/baseq3/cgame/bg_misc.o : $(GDIR)/bg_misc.c; $(DO_SHLIB_CC) @@ -1128,7 +1137,7 @@ $(B)/missionpack/cgame/q_shared.o \ $(B)/missionpack/cgame/ui_shared.o -$(B)/missionpack/cgame$(ARCH).$(SHLIBEXT) : $(MPCGOBJ) +$(B)/missionpack/cgame.$(SHLIBEXT) : $(MPCGOBJ) $(CC) $(SHLIBLDFLAGS) -o $@ $(MPCGOBJ) $(B)/missionpack/cgame/bg_misc.o : $(GDIR)/bg_misc.c; $(DO_SHLIB_CC) -DMISSIONPACK @@ -1200,7 +1209,7 @@ $(B)/baseq3/game/q_math.o \ $(B)/baseq3/game/q_shared.o -$(B)/baseq3/qagame$(ARCH).$(SHLIBEXT) : $(Q3GOBJ) +$(B)/baseq3/qagame.$(SHLIBEXT) : $(Q3GOBJ) $(CC) $(SHLIBLDFLAGS) -o $@ $(Q3GOBJ) $(B)/baseq3/game/ai_chat.o : $(GDIR)/ai_chat.c; $(DO_SHLIB_CC) @@ -1278,7 +1287,7 @@ $(B)/missionpack/game/q_math.o \ $(B)/missionpack/game/q_shared.o -$(B)/missionpack/qagame$(ARCH).$(SHLIBEXT) : $(MPGOBJ) +$(B)/missionpack/qagame.$(SHLIBEXT) : $(MPGOBJ) $(CC) $(SHLIBLDFLAGS) -o $@ $(MPGOBJ) $(B)/missionpack/game/ai_chat.o : $(GDIR)/ai_chat.c; $(DO_SHLIB_CC) -DMISSIONPACK @@ -1367,7 +1376,7 @@ $(B)/baseq3/ui/q_math.o \ $(B)/baseq3/ui/q_shared.o -$(B)/baseq3/ui$(ARCH).$(SHLIBEXT) : $(Q3UIOBJ) +$(B)/baseq3/ui.$(SHLIBEXT) : $(Q3UIOBJ) $(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(Q3UIOBJ) $(B)/baseq3/ui/bg_misc.o : $(GDIR)/bg_misc.c; $(DO_SHLIB_CC) @@ -1410,7 +1419,7 @@ $(B)/baseq3/ui/ui_startserver.o : $(Q3UIDIR)/ui_startserver.c; $(DO_SHLIB_CC) $(B)/baseq3/ui/ui_team.o : $(Q3UIDIR)/ui_team.c; $(DO_SHLIB_CC) $(B)/baseq3/ui/ui_teamorders.o : $(Q3UIDIR)/ui_teamorders.c; $(DO_SHLIB_CC) -$(B)/baseq3/ui/ui_syscalls.o : $(Q3UIDIR)/ui_syscalls.c; $(DO_SHLIB_CC) +$(B)/baseq3/ui/ui_syscalls.o : $(UIDIR)/ui_syscalls.c; $(DO_SHLIB_CC) $(B)/baseq3/ui/ui_video.o : $(Q3UIDIR)/ui_video.c; $(DO_SHLIB_CC) # bk001205 - these wre the only SHLIB compiles in 1.17 @@ -1450,7 +1459,7 @@ # $(B)/missionpack/ui/q_math.o \ # $(B)/missionpack/ui/q_shared.o -$(B)/missionpack/ui$(ARCH).$(SHLIBEXT) : $(MPUIOBJ) +$(B)/missionpack/ui.$(SHLIBEXT) : $(MPUIOBJ) $(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(MPUIOBJ) $(B)/missionpack/ui/ui_atoms.o : $(UIDIR)/ui_atoms.c; $(DO_SHLIB_CC) -DMISSIONPACK @@ -1613,23 +1622,8 @@ $(B)/q3static/unix_net.o \ $(B)/q3static/unix_shared.o \ \ - $(B)/q3static/ahoptim.o \ - $(B)/q3static/autohint.o \ - $(B)/q3static/ftbase.o \ - $(B)/q3static/ftdebug.o \ - $(B)/q3static/ftglyph.o \ - $(B)/q3static/ftinit.o \ - $(B)/q3static/ftmm.o \ - $(B)/q3static/ftsystem.o \ - $(B)/q3static/raster1.o \ - $(B)/q3static/sfnt.o \ - $(B)/q3static/sfobjs.o \ - $(B)/q3static/smooth.o \ - $(B)/q3static/truetype.o \ - \ $(B)/q3static/linux_qgl.o \ $(B)/q3static/linux_glimp.o \ - $(B)/q3static/linux_joystick.o \ $(B)/q3static/linux_snd.o \ $(B)/q3static/snd_mixa.o \ $(B)/q3static/matha.o @@ -1779,7 +1773,6 @@ $(B)/q3static/unix_net.o : $(UDIR)/unix_net.c; $(DO_CC) -DQ3_STATIC $(B)/q3static/unix_shared.o : $(UDIR)/unix_shared.c; $(DO_CC) -DQ3_STATIC $(B)/q3static/linux_glimp.o : $(UDIR)/linux_glimp.c; $(DO_CC) -DQ3_STATIC -$(B)/q3static/linux_joystick.o : $(UDIR)/linux_joystick.c; $(DO_CC) -DQ3_STATIC $(B)/q3static/linux_qgl.o : $(UDIR)/linux_qgl.c; $(DO_CC) -DQ3_STATIC $(B)/q3static/linux_input.o : $(UDIR)/linux_input.c; $(DO_CC) -DQ3_STATIC $(B)/q3static/linux_snd.o : $(UDIR)/linux_snd.c; $(DO_CC) -DQ3_STATIC @@ -2020,7 +2013,7 @@ -$(B)/$(PLATFORM)q3static : $(Q3SOBJ) +$(B)/q3static : $(Q3SOBJ) $(CC) $(CFLAGS) -o $@ $(Q3SOBJ) $(GLLDFLAGS) $(LDFLAGS) @@ -2059,9 +2052,9 @@ copyfiles: -mkdirhier $(COPYDIR) - cp $(BR)/linuxquake3 $(COPYDIR)/quake3.x86 - strip $(COPYDIR)/quake3.x86 - chmod 755 $(COPYDIR)/quake3.x86 + cp $(BR)/linuxquake3 $(COPYDIR)/quake3 + strip $(COPYDIR)/quake3 + chmod 755 $(COPYDIR)/quake3 cp $(BR)/linuxq3ded $(COPYDIR)/q3ded strip $(COPYDIR)/q3ded chmod 755 $(COPYDIR)/q3ded Index: head/games/quake3/Makefile =================================================================== --- head/games/quake3/Makefile (revision 382274) +++ head/games/quake3/Makefile (revision 382275) @@ -1,118 +1,117 @@ # Created by: pypt # $FreeBSD$ PORTNAME= quake3 PORTVERSION= 1.32c PORTREVISION= 4 CATEGORIES= games 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 MAINTAINER= shirshegsm@gmail.com COMMENT= Quake III Arena -- first person shooter (native build) USES= dos2unix gmake zip ONLY_FOR_ARCHS= i386 ONLY_FOR_ARCHS_REASON= does not run properly; try games/ioquake3 WRKSRC= ${WRKDIR}/${PORTNAME}-${REALVERSION} BUILD_WRKSRC= ${WRKSRC}/code/unix MAKE_JOBS_UNSAFE= yes 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}\///}" LIBDIR= ${PREFIX}/lib/${PORTNAME} REALVERSION= 1.32b VM_ARCHS= i386 powerpc .include .if ${ARCH} == "i386" BUILD_DEPENDS+= nasm:${PORTSDIR}/devel/nasm .endif .for i in ${ARCH} . if ${VM_ARCHS:M${i}} != "" HAVE_VM_COMPILED= yes . endif .endfor .if !defined(HAVE_VM_COMPILED) MAKE_ENV+= DLL_ONLY=true .endif .if ${PORT_OPTIONS:MCLIENT} || ${PORT_OPTIONS:MTHREADS} USE_GL= yes USE_XORG= xxf86dga .endif .if ${PORT_OPTIONS:MCLIENT} MAKE_ENV+= CLIENT=YES PLIST_SUB+= CLIENT="" Q3BIN+= quake3 .else PLIST_SUB+= CLIENT="@comment " .endif .if ${PORT_OPTIONS:MDEDICATED} MAKE_ENV+= DEDICATED=YES PLIST_SUB+= DEDICATED="" Q3BIN+= q3ded .else PLIST_SUB+= DEDICATED="@comment " .endif .if ${PORT_OPTIONS:MGAMELIBS} || !defined(HAVE_VM_COMPILED) MAKE_ENV+= GAMELIBS=YES PLIST_SUB+= GAMELIBS="" .else PLIST_SUB+= GAMELIBS="@comment " .endif .if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} MAKE_ENV+= OPTIMIZED_CFLAGS=YES .endif .if ${PORT_OPTIONS:MTHREADS} -MAKE_ENV+= SMP=YES \ - PTHREAD_LIBS="${PTHREAD_LIBS}" +MAKE_ENV+= SMP=YES PLIST_SUB+= SMP="" Q3BIN+= quake3-smp .else PLIST_SUB+= SMP="@comment " .endif post-patch: @${REINPLACE_CMD} -e 's|botlib\.log|/dev/null|' \ ${WRKSRC}/code/botlib/be_interface.c @${REINPLACE_CMD} -e \ 's|//[[:blank:]]*\(Swap_Init[[:blank:]]*();\)|\1|' \ ${WRKSRC}/code/botlib/be_interface.c \ ${WRKSRC}/code/renderer/tr_init.c do-install: .for bin in ${Q3BIN} ${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} .endfor .endif .include "${.CURDIR}/../quake3-data/Makefile.include" .include Index: head/games/quake3/files/patch-code-unix-Makefile =================================================================== --- head/games/quake3/files/patch-code-unix-Makefile (revision 382274) +++ head/games/quake3/files/patch-code-unix-Makefile (revision 382275) @@ -1,477 +1,477 @@ --- code/unix/Makefile.orig 2013-10-18 02:01:30.000000000 +0300 +++ code/unix/Makefile 2013-10-18 02:07:18.000000000 +0300 @@ -34,7 +34,7 @@ # Build name # BUILD_NAME=$(BUILD_NAME) -BUILD_NAME=quake3.x86 +BUILD_NAME=quake3 @@ -46,8 +46,8 @@ BASEQ3_DIR=$(BDIR)/baseq3 -BD=debug$(ARCH)$(GLIBC) -BR=release$(ARCH)$(GLIBC) +BD=debug +BR=release CDIR=$(MOUNT_DIR)/client SDIR=$(MOUNT_DIR)/server RDIR=$(MOUNT_DIR)/renderer @@ -76,7 +76,7 @@ ############################################################################# ## Defaults -DLL_ONLY=false +DLL_ONLY?=false # bk010215 - TODO - add all defaults / kill Ryan @@ -131,12 +131,12 @@ # DEBUG_CFLAGS=$(BASE_CFLAGS) -g -Wall -O ifeq ($(ARCH),axp) CC=pgcc - RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O6 -ffast-math -funroll-loops -fomit-frame-pointer -fexpensive-optimizations + RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O2 -ffast-math -funroll-loops -fomit-frame-pointer -fexpensive-optimizations else ifeq ($(ARCH),ppc) NEWPGCC=/loki/global/ppc/bin/gcc CC=$(NEWPGCC) - RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O6 -fomit-frame-pointer -pipe -ffast-math -malign-loops=2 -malign-jumps=2 -malign-functions=2 -fno-strict-aliasing -fstrength-reduce + RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O2 -fomit-frame-pointer -pipe -ffast-math -falign-functions=2 -fno-strict-aliasing -fstrength-reduce else #NEWPGCC=/usr/local/gcc-2.95.2/bin/gcc # bk001205 #NEWPGCC=/loki/global/x86/bin/gcc @@ -146,9 +146,9 @@ # TTimo: legacy RELEASE_CFLAGS # NOTE: the -fomit-frame-pointer option leads to an unstable binary on my test box if it was built on the main box # but building on the Mdk 7.2 baseline seems to work - RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O6 -mcpu=pentiumpro -march=pentium -fomit-frame-pointer -pipe -ffast-math -malign-loops=2 -malign-jumps=2 -malign-functions=2 -fno-strict-aliasing -fstrength-reduce + RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O2 -fomit-frame-pointer -pipe -ffast-math -falign-functions=2 -fno-strict-aliasing -fstrength-reduce # TTimo: use this for building on P3 gcc 2.95.3 libc2.2 for all targets (experimental! -fomit-fram-pointer removed) -# RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O6 -mcpu=pentiumpro -march=pentium -pipe -ffast-math -malign-loops=2 -malign-jumps=2 -malign-functions=2 -fno-strict-aliasing -fstrength-reduce +# RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O2 -pipe -ffast-math -falign-functions=2 -fno-strict-aliasing -fstrength-reduce endif endif @@ -162,7 +162,7 @@ RANLIB=ranlib THREAD_LDFLAGS=-lpthread - LDFLAGS=-ldl -lm + LDFLAGS=-lm GLLDFLAGS=-L/usr/X11R6/lib -lX11 -lXext -lXxf86dga -lXxf86vm ifeq ($(ARCH),axp) @@ -197,33 +197,29 @@ ifeq ($(PLATFORM),freebsd) +ifeq ($(ARCH),powerpc) +ARCH=ppc +endif + GLIBC= #libc is irrelevant -ifneq (,$(findstring alpha,$(shell uname -m))) -ARCH=axp -RPMARCH=alpha -VENDOR=dec -else #default to i386 -ARCH=i386 -RPMARCH=i386 -VENDOR=unknown -endif #alpha test +BASE_CFLAGS = $(CFLAGS) -DDATADIR='\"$(Q3DIR)\"' -DLIBDIR='\"$(LIBDIR)\"' -pipe +GL_CFLAGS = -I$(LOCALBASE)/include -BASE_CFLAGS = -pipe +DEBUG_CFLAGS=$(BASE_CFLAGS) -g -Wall -Werror +RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -GL_CFLAGS = -I$(MESADIR)/include -I/usr/X11R6/include +ifdef OPTIMIZED_CFLAGS + ifeq ($(ARCH),i386) +RELEASE_CFLAGS+=-O2 -fomit-frame-pointer -pipe -ffast-math -falign-functions=2 -fno-strict-aliasing -fstrength-reduce + else +RELEASE_CFLAGS+=-O2 -ffast-math -funroll-loops -fomit-frame-pointer -fexpensive-optimizations + endif +endif -DEBUG_CFLAGS=$(BASE_CFLAGS) -g -Wall -Werror -ifeq ($(ARCH),axp) -CC=pgcc -RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O6 -ffast-math -funroll-loops -fomit-frame-pointer -fexpensive-optimizations -else -#NEWPGCC=/loki/global/x86/bin/gcc # raistlin012301 -#NEWPGCC=/usr/local/gcc-2.95.2/bin/gcc -NEWPGCC=/home/raistllin/src/gcc/build/install/bin/gcc -CC=$(shell if [ -f $(NEWPGCC) ]; then echo $(NEWPGCC); else echo pgcc; fi ) -RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O6 -mcpu=pentiumpro -march=pentium -fomit-frame-pointer -pipe -ffast-math -malign-loops=2 -malign-jumps=2 -malign-functions=2 -fno-strict-aliasing - fstrength-reduce +ifeq ($(DLL_ONLY),true) +BASE_CFLAGS += -DDLL_ONLY endif LIBEXT=a @@ -235,25 +231,33 @@ ARFLAGS=ar rv RANLIB=ranlib -THREAD_LDFLAGS=-lpthread -+THREAD_LDFLAGS=$(PTHREAD_LIBS) ++THREAD_LDFLAGS=-lpthread # don't need -ldl (FreeBSD) -LDFLAGS=-lm +LDFLAGS+=-lm #GLLDFLAGS=-L/usr/X11R6/lib -L$(MESADIR)/lib -lGL -lX11 -lXext -lXxf86dga -lXxf86vm #GLLDFLAGS=-L/usr/X11/lib -lGL -lX11 -lXext -lm -GLLDFLAGS=-L/usr/X11R6/lib -lGL -lX11 -lXext -lXxf86dga -lXxf86vm +GLLDFLAGS=-L$(LOCALBASE)/lib -lGL -lX11 -lXext -lXxf86dga -lXxf86vm -ifeq ($(ARCH),axp) -TARGETS=\ - $(B)/$(PLATFORM)q3ded -else -TARGETS=\ - $(B)/$(PLATFORM)quake3 \ - $(B)/baseq3/cgame$(ARCH).$(SHLIBEXT) \ - $(B)/baseq3/qagame$(ARCH).$(SHLIBEXT) \ - $(B)/baseq3/ui$(ARCH).$(SHLIBEXT) \ - $(B)/missionpack/cgame$(ARCH).$(SHLIBEXT) \ - $(B)/missionpack/qagame$(ARCH).$(SHLIBEXT) \ - $(B)/missionpack/ui$(ARCH).$(SHLIBEXT) +ifdef CLIENT +TARGETS+=$(B)/quake3 +endif + +ifdef DEDICATED +TARGETS+=$(B)/q3ded +endif + +ifdef SMP +TARGETS+=$(B)/quake3-smp +endif + +ifdef GAMELIBS +TARGETS+=\ + $(B)/baseq3/cgame.$(SHLIBEXT) \ + $(B)/baseq3/qagame.$(SHLIBEXT) \ + $(B)/baseq3/ui.$(SHLIBEXT) \ + $(B)/missionpack/cgame.$(SHLIBEXT) \ + $(B)/missionpack/qagame.$(SHLIBEXT) \ + $(B)/missionpack/ui.$(SHLIBEXT) endif else # ifeq freebsd @@ -283,7 +287,7 @@ ARFLAGS=ar rv RANLIB=ranlib -LDFLAGS=-ldl -lm +LDFLAGS=-lm GLLDFLAGS=-L/usr/X11/lib -lGL -lX11 -lXext -lm TARGETS=$(B)/sgiquake3 \ @@ -310,9 +314,9 @@ RANLIB=ranlib ifeq ($(PLATFORM),freebsd) -LDFLAGS=-lm +LDFLAGS+=-lm else -LDFLAGS=-ldl -lm +LDFLAGS=-lm endif # ifeq freebsd TARGETS=\ @@ -348,7 +352,7 @@ $(MAKE) targets B=$(BR) CFLAGS="$(RELEASE_CFLAGS)" #Build both debug and release builds -all:build_debug build_release +all:build_release targets:makedirs $(TARGETS) @@ -516,20 +520,6 @@ $(B)/client/unix_net.o \ $(B)/client/unix_shared.o \ \ - $(B)/client/ahoptim.o \ - $(B)/client/autohint.o \ - $(B)/client/ftbase.o \ - $(B)/client/ftdebug.o \ - $(B)/client/ftglyph.o \ - $(B)/client/ftinit.o \ - $(B)/client/ftmm.o \ - $(B)/client/ftsystem.o \ - $(B)/client/raster1.o \ - $(B)/client/sfnt.o \ - $(B)/client/sfobjs.o \ - $(B)/client/smooth.o \ - $(B)/client/truetype.o -# \ # $(B)/client/q_parse.o \ # $(B)/client/math_quaternion.o \ # $(B)/client/util_str.o \ @@ -541,10 +531,12 @@ # $(B)/client/q_shared.o \ ifeq ($(ARCH),i386) - Q3OBJ += $(B)/client/vm_x86.o + ifeq ($(DLL_ONLY),false) + Q3OBJ += $(B)/client/vm_x86.o + endif endif - ifeq ($(ARCH),ppc) + ifeq ($(ARCH),powerpc) ifeq ($(DLL_ONLY),false) Q3OBJ += $(B)/client/vm_ppc.o endif @@ -559,10 +551,24 @@ $(B)/client/linux_qgl.o \ $(B)/client/linux_glimp.o \ $(B)/client/linux_snd.o \ + $(B)/client/linux_signals.o \ + $(B)/client/snd_mixa.o \ + $(B)/client/matha.o + + Q3POBJ_SMP=\ + $(B)/client/linux_common.o \ + $(B)/client/linux_qgl.o \ + $(B)/client/linux_glimp_smp.o \ + $(B)/client/linux_snd.o \ + $(B)/client/linux_signals.o \ $(B)/client/snd_mixa.o \ - $(B)/client/matha.o \ - $(B)/client/ftol.o \ - $(B)/client/snapvector.o + $(B)/client/matha.o + + ifeq ($(ARCH),i386) + Q3POBJ += $(B)/client/ftol.o $(B)/client/snapvector.o + Q3POBJ_SMP += $(B)/client/ftol.o $(B)/client/snapvector.o + endif + else ifeq ($(PLATFORM),irix) Q3POBJ=\ @@ -578,7 +584,6 @@ $(B)/client/linux_common.o \ $(B)/client/linux_qgl.o \ $(B)/client/linux_glimp.o \ - $(B)/client/linux_joystick.o \ $(B)/client/linux_snd.o \ $(B)/client/snd_mixa.o \ $(B)/client/matha.o \ @@ -587,7 +592,6 @@ $(B)/client/linux_common.o \ $(B)/client/linux_qgl.o \ $(B)/client/linux_glimp_smp.o \ - $(B)/client/linux_joystick.o \ $(B)/client/linux_snd.o \ $(B)/client/snd_mixa.o \ $(B)/client/matha.o @@ -602,12 +606,12 @@ endif #FreeBSD endif #IRIX -$(B)/$(PLATFORM)quake3 : $(Q3OBJ) $(Q3POBJ) +$(B)/quake3 : $(Q3OBJ) $(Q3POBJ) $(CC) -o $@ $(Q3OBJ) $(Q3POBJ) $(GLLDFLAGS) $(LDFLAGS) # TTimo: splines code requires C++ linking, but splines have not been officially included in the codebase # $(CXX) -o $@ $(Q3OBJ) $(Q3POBJ) $(GLLDFLAGS) $(LDFLAGS) -$(B)/$(PLATFORM)quake3-smp : $(Q3OBJ) $(Q3POBJ_SMP) +$(B)/quake3-smp : $(Q3OBJ) $(Q3POBJ_SMP) $(CC) -o $@ $(Q3OBJ) $(Q3POBJ_SMP) $(GLLDFLAGS) \ $(THREAD_LDFLAGS) $(LDFLAGS) @@ -754,10 +758,10 @@ $(B)/client/linux_common.o : $(UDIR)/linux_common.c; $(DO_CC) $(B)/client/linux_glimp.o : $(UDIR)/linux_glimp.c; $(DO_CC) $(GL_CFLAGS) $(B)/client/linux_glimp_smp.o : $(UDIR)/linux_glimp.c; $(DO_SMP_CC) $(GL_CFLAGS) -$(B)/client/linux_joystick.o : $(UDIR)/linux_joystick.c; $(DO_CC) $(B)/client/linux_qgl.o : $(UDIR)/linux_qgl.c; $(DO_CC) $(GL_CFLAGS) $(B)/client/linux_input.o : $(UDIR)/linux_input.c; $(DO_CC) $(B)/client/linux_snd.o : $(UDIR)/linux_snd.c; $(DO_CC) +$(B)/client/linux_signals.o : $(UDIR)/linux_signals.c; $(DO_CC) $(GL_CFLAGS) $(B)/client/snd_mixa.o : $(UDIR)/snd_mixa.s; $(DO_AS) $(B)/client/matha.o : $(UDIR)/matha.s; $(DO_AS) @@ -767,7 +771,7 @@ $(B)/client/vm_x86.o : $(CMDIR)/vm_x86.c; $(DO_CC) endif -ifeq ($(ARCH),ppc) +ifeq ($(ARCH),powerpc) ifeq ($(DLL_ONLY),false) $(B)/client/vm_ppc.o : $(CMDIR)/vm_ppc.c; $(DO_CC) endif @@ -912,22 +916,26 @@ $(B)/ded/unix_main.o \ $(B)/ded/unix_net.o \ $(B)/ded/unix_shared.o \ + $(B)/ded/linux_signals.o \ \ $(B)/ded/null_client.o \ $(B)/ded/null_input.o \ $(B)/ded/null_snddma.o ifeq ($(ARCH),i386) - Q3DOBJ += $(B)/ded/vm_x86.o $(B)/ded/ftol.o $(B)/ded/snapvector.o + Q3DOBJ += $(B)/ded/ftol.o $(B)/ded/snapvector.o + ifeq ($(DLL_ONLY),false) + Q3DOBJ += $(B)/ded/vm_x86.o + endif endif -ifeq ($(ARCH),ppc) +ifeq ($(ARCH),powerpc) ifeq ($(DLL_ONLY),false) Q3DOBJ += $(B)/ded/vm_ppc.o endif endif -$(B)/$(PLATFORM)q3ded : $(Q3DOBJ) +$(B)/q3ded : $(Q3DOBJ) $(CC) -o $@ $(Q3DOBJ) $(LDFLAGS) $(B)/ded/sv_bot.o : $(SDIR)/sv_bot.c; $(DO_DED_CC) @@ -988,6 +996,7 @@ $(B)/ded/unix_main.o : $(UDIR)/unix_main.c; $(DO_DED_CC) $(B)/ded/unix_net.o : $(UDIR)/unix_net.c; $(DO_DED_CC) $(B)/ded/unix_shared.o : $(UDIR)/unix_shared.c; $(DO_DED_CC) +$(B)/ded/linux_signals.o : $(UDIR)/linux_signals.c; $(DO_DED_CC) $(B)/ded/null_client.o : $(NDIR)/null_client.c; $(DO_DED_CC) $(B)/ded/null_input.o : $(NDIR)/null_input.c; $(DO_DED_CC) $(B)/ded/null_snddma.o : $(NDIR)/null_snddma.c; $(DO_DED_CC) @@ -1001,7 +1010,7 @@ $(B)/ded/snapvector.o : $(UDIR)/snapvector.nasm; $(DO_NASM) endif -ifeq ($(ARCH),ppc) +ifeq ($(ARCH),powerpc) ifeq ($(DLL_ONLY),false) $(B)/ded/vm_ppc.o : $(CMDIR)/vm_ppc.c; $(DO_DED_CC) endif @@ -1068,7 +1077,7 @@ $(B)/baseq3/cgame/q_math.o \ $(B)/baseq3/cgame/q_shared.o -$(B)/baseq3/cgame$(ARCH).$(SHLIBEXT) : $(Q3CGOBJ) +$(B)/baseq3/cgame.$(SHLIBEXT) : $(Q3CGOBJ) $(CC) $(SHLIBLDFLAGS) -o $@ $(Q3CGOBJ) $(B)/baseq3/cgame/bg_misc.o : $(GDIR)/bg_misc.c; $(DO_SHLIB_CC) @@ -1128,7 +1137,7 @@ $(B)/missionpack/cgame/q_shared.o \ $(B)/missionpack/cgame/ui_shared.o -$(B)/missionpack/cgame$(ARCH).$(SHLIBEXT) : $(MPCGOBJ) +$(B)/missionpack/cgame.$(SHLIBEXT) : $(MPCGOBJ) $(CC) $(SHLIBLDFLAGS) -o $@ $(MPCGOBJ) $(B)/missionpack/cgame/bg_misc.o : $(GDIR)/bg_misc.c; $(DO_SHLIB_CC) -DMISSIONPACK @@ -1200,7 +1209,7 @@ $(B)/baseq3/game/q_math.o \ $(B)/baseq3/game/q_shared.o -$(B)/baseq3/qagame$(ARCH).$(SHLIBEXT) : $(Q3GOBJ) +$(B)/baseq3/qagame.$(SHLIBEXT) : $(Q3GOBJ) $(CC) $(SHLIBLDFLAGS) -o $@ $(Q3GOBJ) $(B)/baseq3/game/ai_chat.o : $(GDIR)/ai_chat.c; $(DO_SHLIB_CC) @@ -1278,7 +1287,7 @@ $(B)/missionpack/game/q_math.o \ $(B)/missionpack/game/q_shared.o -$(B)/missionpack/qagame$(ARCH).$(SHLIBEXT) : $(MPGOBJ) +$(B)/missionpack/qagame.$(SHLIBEXT) : $(MPGOBJ) $(CC) $(SHLIBLDFLAGS) -o $@ $(MPGOBJ) $(B)/missionpack/game/ai_chat.o : $(GDIR)/ai_chat.c; $(DO_SHLIB_CC) -DMISSIONPACK @@ -1367,7 +1376,7 @@ $(B)/baseq3/ui/q_math.o \ $(B)/baseq3/ui/q_shared.o -$(B)/baseq3/ui$(ARCH).$(SHLIBEXT) : $(Q3UIOBJ) +$(B)/baseq3/ui.$(SHLIBEXT) : $(Q3UIOBJ) $(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(Q3UIOBJ) $(B)/baseq3/ui/bg_misc.o : $(GDIR)/bg_misc.c; $(DO_SHLIB_CC) @@ -1410,7 +1419,7 @@ $(B)/baseq3/ui/ui_startserver.o : $(Q3UIDIR)/ui_startserver.c; $(DO_SHLIB_CC) $(B)/baseq3/ui/ui_team.o : $(Q3UIDIR)/ui_team.c; $(DO_SHLIB_CC) $(B)/baseq3/ui/ui_teamorders.o : $(Q3UIDIR)/ui_teamorders.c; $(DO_SHLIB_CC) -$(B)/baseq3/ui/ui_syscalls.o : $(Q3UIDIR)/ui_syscalls.c; $(DO_SHLIB_CC) +$(B)/baseq3/ui/ui_syscalls.o : $(UIDIR)/ui_syscalls.c; $(DO_SHLIB_CC) $(B)/baseq3/ui/ui_video.o : $(Q3UIDIR)/ui_video.c; $(DO_SHLIB_CC) # bk001205 - these wre the only SHLIB compiles in 1.17 @@ -1450,7 +1459,7 @@ # $(B)/missionpack/ui/q_math.o \ # $(B)/missionpack/ui/q_shared.o -$(B)/missionpack/ui$(ARCH).$(SHLIBEXT) : $(MPUIOBJ) +$(B)/missionpack/ui.$(SHLIBEXT) : $(MPUIOBJ) $(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(MPUIOBJ) $(B)/missionpack/ui/ui_atoms.o : $(UIDIR)/ui_atoms.c; $(DO_SHLIB_CC) -DMISSIONPACK @@ -1613,23 +1622,8 @@ $(B)/q3static/unix_net.o \ $(B)/q3static/unix_shared.o \ \ - $(B)/q3static/ahoptim.o \ - $(B)/q3static/autohint.o \ - $(B)/q3static/ftbase.o \ - $(B)/q3static/ftdebug.o \ - $(B)/q3static/ftglyph.o \ - $(B)/q3static/ftinit.o \ - $(B)/q3static/ftmm.o \ - $(B)/q3static/ftsystem.o \ - $(B)/q3static/raster1.o \ - $(B)/q3static/sfnt.o \ - $(B)/q3static/sfobjs.o \ - $(B)/q3static/smooth.o \ - $(B)/q3static/truetype.o \ - \ $(B)/q3static/linux_qgl.o \ $(B)/q3static/linux_glimp.o \ - $(B)/q3static/linux_joystick.o \ $(B)/q3static/linux_snd.o \ $(B)/q3static/snd_mixa.o \ $(B)/q3static/matha.o @@ -1779,7 +1773,6 @@ $(B)/q3static/unix_net.o : $(UDIR)/unix_net.c; $(DO_CC) -DQ3_STATIC $(B)/q3static/unix_shared.o : $(UDIR)/unix_shared.c; $(DO_CC) -DQ3_STATIC $(B)/q3static/linux_glimp.o : $(UDIR)/linux_glimp.c; $(DO_CC) -DQ3_STATIC -$(B)/q3static/linux_joystick.o : $(UDIR)/linux_joystick.c; $(DO_CC) -DQ3_STATIC $(B)/q3static/linux_qgl.o : $(UDIR)/linux_qgl.c; $(DO_CC) -DQ3_STATIC $(B)/q3static/linux_input.o : $(UDIR)/linux_input.c; $(DO_CC) -DQ3_STATIC $(B)/q3static/linux_snd.o : $(UDIR)/linux_snd.c; $(DO_CC) -DQ3_STATIC @@ -2020,7 +2013,7 @@ -$(B)/$(PLATFORM)q3static : $(Q3SOBJ) +$(B)/q3static : $(Q3SOBJ) $(CC) $(CFLAGS) -o $@ $(Q3SOBJ) $(GLLDFLAGS) $(LDFLAGS) @@ -2059,9 +2052,9 @@ copyfiles: -mkdirhier $(COPYDIR) - cp $(BR)/linuxquake3 $(COPYDIR)/quake3.x86 - strip $(COPYDIR)/quake3.x86 - chmod 755 $(COPYDIR)/quake3.x86 + cp $(BR)/linuxquake3 $(COPYDIR)/quake3 + strip $(COPYDIR)/quake3 + chmod 755 $(COPYDIR)/quake3 cp $(BR)/linuxq3ded $(COPYDIR)/q3ded strip $(COPYDIR)/q3ded chmod 755 $(COPYDIR)/q3ded Index: head/games/r1q2/Makefile =================================================================== --- head/games/r1q2/Makefile (revision 382274) +++ head/games/r1q2/Makefile (revision 382275) @@ -1,105 +1,105 @@ # Created by: Alejandro Pulver # $FreeBSD$ PORTNAME= r1q2 PORTVERSION= 8012 PORTREVISION= 3 CATEGORIES= games MASTER_SITES= http://old.r1ch.net/stuff/r1q2/src/ DISTNAME= ${PORTNAME}-b${PORTVERSION}-src MAINTAINER= danfe@FreeBSD.org COMMENT= Enhanced Quake II client/server focusing on stability .if !exists(/usr/include/execinfo.h) LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/devel/libexecinfo .endif ONLY_FOR_ARCHS= i386 amd64 ONLY_FOR_ARCHS_REASON= sets the FPU rounding mode and precision (not available in fenv.h) USES= dos2unix gmake zip NO_WRKSUBDIR= yes BUILD_WRKSRC= ${WRKSRC}/binaries ALL_TARGET= # LIBDIR= ${PREFIX}/lib/${PORTNAME} -MAKE_ENV= LIBDIR="${LIBDIR}" PTHREAD_LIBS="${PTHREAD_LIBS}" +MAKE_ENV= LIBDIR="${LIBDIR}" PLIST_SUB= LIBDIR="${LIBDIR:S|${PREFIX}/||}" OPTIONS_DEFINE= GAME REF_GL DOCS OPTIONS_MULTI= FLAVOR OPTIONS_MULTI_FLAVOR= CLIENT DEDICATED OPTIONS_DEFAULT= CLIENT DEDICATED REF_GL FLAVOR_DESC= Clients and servers CLIENT_DESC= Build client DEDICATED_DESC= Build dedicated server GAME_DESC= Build main game (default mod) REF_GL_DESC= Build renderer (required for client) .include .if ${PORT_OPTIONS:MCLIENT} ALL_TARGET+= client PLIST_SUB+= CLIENT="" .else PLIST_SUB+= CLIENT="@comment " .endif .if ${PORT_OPTIONS:MDEDICATED} ALL_TARGET+= r1q2ded PLIST_SUB+= DEDICATED="" .else PLIST_SUB+= DEDICATED="@comment " .endif .if ${PORT_OPTIONS:MGAME} ALL_TARGET+= game PLIST_SUB+= GAME="" .else PLIST_SUB+= GAME="@comment " .endif .if ${PORT_OPTIONS:MREF_GL} USE_GL= gl USE_SDL= sdl LIB_DEPENDS+= libjpeg.so:${PORTSDIR}/graphics/jpeg \ libpng.so:${PORTSDIR}/graphics/png ALL_TARGET+= ref_gl PLIST_SUB+= REF_GL="" .else PLIST_SUB+= REF_GL="@comment " .endif post-patch: @${REINPLACE_CMD} -e 's|game$$(ARCH)|game|g' \ ${BUILD_WRKSRC}/game/Makefile pre-build: @${FIND} ${BUILD_WRKSRC} -type d -depth 1 -exec ${MKDIR} {}/.depends \; do-install: .if ${PORT_OPTIONS:MCLIENT} ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/client/quake2 \ ${STAGEDIR}${PREFIX}/bin/${PORTNAME} .endif .if ${PORT_OPTIONS:MDEDICATED} ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/r1q2ded/r1q2ded \ ${STAGEDIR}${PREFIX}/bin .endif @${MKDIR} ${STAGEDIR}${LIBDIR}/baseq2 .if ${PORT_OPTIONS:MGAME} ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/game/game.so \ ${STAGEDIR}${LIBDIR}/baseq2 .endif .if ${PORT_OPTIONS:MREF_GL} ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/ref_gl/ref_gl.so \ ${STAGEDIR}${LIBDIR} .endif @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/r1q2.txt ${WRKSRC}/readme.txt \ ${STAGEDIR}${DOCSDIR} .include "${.CURDIR}/../quake2-data/Makefile.include" .include Index: head/games/r1q2/files/patch-binaries__client__Makefile =================================================================== --- head/games/r1q2/files/patch-binaries__client__Makefile (revision 382274) +++ head/games/r1q2/files/patch-binaries__client__Makefile (revision 382275) @@ -1,11 +1,11 @@ --- binaries/client/Makefile.orig Thu Dec 21 14:55:31 2006 +++ binaries/client/Makefile Fri Dec 22 00:38:19 2006 @@ -24,7 +24,7 @@ include ../make.inc -LDFLAGS+=-lm -lz -+LDFLAGS+=-lm -lz $(PTHREAD_LIBS) ++LDFLAGS+=-lm -lz -lpthread ifeq ($(shell uname),Linux) LDFLAGS+=-ldl Index: head/games/scummvm/Makefile =================================================================== --- head/games/scummvm/Makefile (revision 382274) +++ head/games/scummvm/Makefile (revision 382275) @@ -1,69 +1,69 @@ # Created by: Alex Trull # $FreeBSD$ PORTNAME= scummvm DISTVERSION= 1.7.0 PORTREVISION= 3 CATEGORIES= games emulators MASTER_SITES= SF MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTNAME}/${DISTVERSION} MAINTAINER= lme@FreeBSD.org COMMENT= Interpreter for several adventure games USES= gmake tar:bzip2 HAS_CONFIGURE= yes USE_SDL= sdl CONFIGURE_ARGS= --with-sdl-prefix=${LOCALBASE} \ --disable-alsa \ --with-zlib-prefix=/usr \ --disable-debug \ --disable-nasm \ --disable-tremor -LDFLAGS+= ${PTHREAD_LIBS} +LDFLAGS+= -lpthread OPTIONS_DEFINE= VORBIS MP3 PNG FLAC FLUIDSYNTH MT32EMU DOCS FLUIDSYNTH_DESC= FluidSynth MIDI synthesizer MT32EMU_DESC= MT-32 emulator OPTIONS_DEFAULT= VORBIS MP3 PNG MT32EMU VORBIS_LIB_DEPENDS= libogg.so:${PORTSDIR}/audio/libogg \ libvorbis.so:${PORTSDIR}/audio/libvorbis VORBIS_CONFIGURE_ON= --with-ogg-prefix=${LOCALBASE} \ --with-vorbis-prefix=${LOCALBASE} VORBIS_CONFIGURE_OFF= --disable-vorbis MP3_LIB_DEPENDS= libmad.so:${PORTSDIR}/audio/libmad MP3_CONFIGURE_ON= --with-mad-prefix=${LOCALBASE} MP3_CONFIGURE_OFF= --disable-mad PNG_LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png PNG_CONFIGURE_ON= --with-png-prefix=${LOCALBASE} PNG_CONFIGURE_OFF= --disable-png FLAC_LIB_DEPENDS= libFLAC.so:${PORTSDIR}/audio/flac FLAC_CONFIGURE_ON= --with-flac-prefix=${LOCALBASE} FLAC_CONFIGURE_OFF= --disable-flac FLUIDSYNTH_LIB_DEPENDS= libfluidsynth.so:${PORTSDIR}/audio/fluidsynth FLUIDSYNTH_CONFIGURE_ON= --with-fluidsynth-prefix=${LOCALBASE} FLUIDSYNTH_CONFIGURE_OFF= --disable-fluidsynth MT32EMU_CONFIGURE_OFF= --disable-mt32emu .include .if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64" BROKEN= Does not compile on ia64, powerpc, or sparc64 .endif post-patch: @${REINPLACE_CMD} -e '/^mandir=/s/datarootdir/prefix/' ${WRKSRC}/configure post-install: ${MKDIR} ${STAGEDIR}${DESKTOPDIR} ${INSTALL_DATA} ${WRKSRC}/dists/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR}/ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} .include Index: head/games/tank/Makefile =================================================================== --- head/games/tank/Makefile (revision 382274) +++ head/games/tank/Makefile (revision 382275) @@ -1,26 +1,25 @@ # Created by: Donald Burr # $FreeBSD$ PORTNAME= tank PORTVERSION= 0.4a PORTREVISION= 4 CATEGORIES= games MASTER_SITES= http://elfga.com/~erik/fbsd/files/ EXTRACT_SUFX= -src.tar.gz MAINTAINER= erik@bz.bzflag.bz COMMENT= 3-D network tank game that uses OpenGL/Mesa BUILD_DEPENDS= libaux>=1.0:${PORTSDIR}/graphics/libaux USES= gmake -MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" PTHREAD_LIBS="${PTHREAD_LIBS}" ALL_TARGET= linux-mesa-elf do-install: ${INSTALL_PROGRAM} ${WRKSRC}/tank ${STAGEDIR}${PREFIX}/bin @${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/*.tga ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/*.au ${STAGEDIR}${DATADIR} .include Index: head/games/tank/files/patch-Makefile.Linux.Mesa =================================================================== --- head/games/tank/files/patch-Makefile.Linux.Mesa (revision 382274) +++ head/games/tank/files/patch-Makefile.Linux.Mesa (revision 382275) @@ -1,42 +1,42 @@ --- Makefile.Linux.Mesa.orig Sun Feb 2 12:59:42 1997 +++ Makefile.Linux.Mesa Sat Dec 4 08:56:39 2004 @@ -3,23 +3,23 @@ .SUFFIXES: .cc .o -ARCH = -DLINUX -DMESA #-DSOUND +TARCH = -DLINUX -DPREFIX=\"$(PREFIX)\" #-DUSING_MESA -DSOUND MESA = Mesa -INCLUDE = -I/usr/include -I$(MESA)/include -I$(MESA)/include/GL +INCLUDE = -I$(LOCALBASE)/include -I$(LOCALBASE)/include/GL -CFLAGS = $(INCLUDE) $(ARCH) -O2 -m486 -Wall -pipe \ - -pedantic -funroll-loops -mieee-fp -+CFLAGS += $(INCLUDE) $(TARCH) -DSOUND -Wall -pipe ${PTHREAD_CFLAGS} \ ++CFLAGS += $(INCLUDE) $(TARCH) -DSOUND -Wall -pipe \ + -pedantic -funroll-loops -LDFLAGS = -L/usr/X11R6/lib -L$(MESA)/lib +LDFLAGS = -L$(LOCALBASE)/lib TAR = tar COMPRESS = compress -v MV = mv RM = rm -f LS = /bin/ls -CC = gcc -Wall +CC ?= gcc -Wall CD = cd .c.o: @@ -31,8 +31,7 @@ linux-elf: $(Obj) @echo "Linking $(Obj) to $(EXECNAME)..." $(CC) -o $(EXECNAME) $(Obj) $(LDFLAGS) \ - -lMesaaux -lMesatk -lMesaGLU -lMesaGL \ - -lXext -lX11 -lm -+ -laux -lGLU -lGL -lXext -lX11 -lm $(PTHREAD_LIBS) ++ -laux -lGLU -lGL -lXext -lX11 -lm -lpthread @echo "****** Done ******" linux: $(Obj) Index: head/games/tenebrae/Makefile =================================================================== --- head/games/tenebrae/Makefile (revision 382274) +++ head/games/tenebrae/Makefile (revision 382275) @@ -1,50 +1,50 @@ # Created by: Igor Pokrovsky # $FreeBSD$ PORTNAME= tenebrae PORTVERSION= 1.04 PORTREVISION= 10 CATEGORIES= games MASTER_SITES= http://tenebrae.sourceforge.net/downloads/ DISTFILES= ${PORTNAME}_src${EXTRACT_SUFX} \ ${PORTNAME}data${EXTRACT_SUFX} MAINTAINER= ports@FreeBSD.org COMMENT= Quake engine with lighting similar to that in Doom III LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png USES= gmake dos2unix zip USE_GL= glu USE_SDL= yes USE_XORG= xxf86dga WRKSRC= ${WRKDIR}/${PORTNAME}_0 BUILD_WRKSRC= ${WRKSRC}/linux MAKEFILE= Makefile.i386linux -MAKE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}" +MAKE_ENV= PTHREAD_LIBS="-lpthread" OPTIONS_DEFINE= DOCS OPTIONS_DEFINE_amd64= ASM OPTIONS_DEFAULT_amd64= ASM ASM_MAKE_ENV= USE_ASM=1 post-patch: ${REINPLACE_CMD} -e 's|gray_1_2_4_to_8|expand_&|' \ ${WRKSRC}/gl_warp.c pre-build: @cd ${BUILD_WRKSRC} && ${LN} -sf Makefile.i386linux Makefile do-install: ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/release/bin/${PORTNAME} \ ${STAGEDIR}${PREFIX}/bin @${MKDIR} ${STAGEDIR}${Q1DIR}/${PORTNAME} ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}/Pak0.pak ${STAGEDIR}${Q1DIR}/${PORTNAME} @${MKDIR} ${STAGEDIR}${DOCSDIR} ${TR} -d '\r' < ${WRKDIR}/Tenebrae_Readme.txt \ > ${STAGEDIR}${DOCSDIR}/Tenebrae_Readme.txt .include "${.CURDIR}/../quake-data/Makefile.include" .include Index: head/games/tremulous/Makefile =================================================================== --- head/games/tremulous/Makefile (revision 382274) +++ head/games/tremulous/Makefile (revision 382275) @@ -1,145 +1,145 @@ # Created by: Alejandro Pulver # $FreeBSD$ PORTNAME= tremulous PORTVERSION= 1.1.0 PORTREVISION= 11 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:R} MAINTAINER= ports@FreeBSD.org COMMENT= Free FPS game featuring two opposing teams: humans and aliens LICENSE= GPLv2 USES= gmake zip -MAKE_ENV= DEFAULT_BASEDIR="${DATADIR}" PTHREAD_LIBS="${PTHREAD_LIBS}" +MAKE_ENV= DEFAULT_BASEDIR="${DATADIR}" PTHREAD_LIBS="-lpthread" WRKSRC= ${WRKDIR}/${PORTNAME} BUILD_WRKSRC= ${WRKSRC}/${DISTNAME}-src VM_ARCHS= amd64 i386 OPTIONS_DEFINE= GAMELIBS OPENAL OPENAL_DLOPEN OPTIMIZED_CFLAGS \ SDL_AUDIO SDL_VIDEO VORBIS OPTIONS_MULTI= FLAVOR OPTIONS_MULTI_FLAVOR= CLIENT DEDICATED SMP_CLIENT MASTER_SERVER OPTIONS_DEFAULT= CLIENT DEDICATED OPTIMIZED_CFLAGS SMP_CLIENT FLAVOR_DESC= Clients and servers CLIENT_DESC= Build client GAMELIBS_DESC= Force building game libraries DEDICATED_DESC= Build dedicated server MASTER_SERVER_DESC= Build master server OPENAL_DLOPEN_DESC= Enable dinamic loading of OpenAL SDL_AUDIO_DESC= Use SDL for audio SDL_VIDEO_DESC= Use SDL for video SMP_CLIENT_DESC= Build SMP (threaded) client .include .for arch in ${ARCH} . if ${VM_ARCHS:M${arch}} HAVE_VM_COMPILED= yes . endif .endfor .if defined(HAVE_VM_COMPILED) MAKE_ENV+= HAVE_VM_COMPILED=true .endif .if ${PORT_OPTIONS:MCLIENT} || ${PORT_OPTIONS:MSMP_CLIENT} # OpenAL . if ${PORT_OPTIONS:MOPENAL} USES+= openal:al MAKE_ENV+= USE_OPENAL=1 . if ${PORT_OPTIONS:MOPENAL_DLOPEN} MAKE_ENV+= USE_OPENAL_DLOPEN=1 . endif . endif # SDL . if ${PORT_OPTIONS:MSDL_AUDIO} USE_SDL= sdl MAKE_ENV+= USE_SDL_AUDIO=1 . endif . if ${PORT_OPTIONS:MSDL_VIDEO} USE_SDL= sdl MAKE_ENV+= USE_SDL_VIDEO=1 . else USE_GL= gl USE_XORG= x11 xxf86dga . endif # Vorbis . if ${PORT_OPTIONS:MVORBIS} LIB_DEPENDS+= libvorbis.so:${PORTSDIR}/audio/libvorbis MAKE_ENV+= USE_CODEC_VORBIS=1 . endif .endif .if ${PORT_OPTIONS:MCLIENT} MAKE_ENV+= BUILD_CLIENT=1 PLIST_SUB+= CLIENT="" TRBIN+= tremulous .else PLIST_SUB+= CLIENT="@comment " .endif .if ${PORT_OPTIONS:MDEDICATED} MAKE_ENV+= BUILD_SERVER=1 PLIST_SUB+= DEDICATED="" TRBIN+= tremded .else PLIST_SUB+= DEDICATED="@comment " .endif .if ${PORT_OPTIONS:MGAMELIBS} || !defined(HAVE_VM_COMPILED) MAKE_ENV+= BUILD_GAME_SO=1 PLIST_SUB+= GAMELIBS="" .else PLIST_SUB+= GAMELIBS="@comment " .endif .if ${PORT_OPTIONS:MMASTER_SERVER} LIB_DEPENDS+= libtdb.so:${PORTSDIR}/databases/tdb MAKE_ENV+= BUILD_MASTER_SERVER=1 PLIST_SUB+= MASTER_SERVER="" .else PLIST_SUB+= MASTER_SERVER="@comment " .endif .if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} MAKE_ENV+= USE_OPTIMIZED_CFLAGS=1 .endif .if ${PORT_OPTIONS:MSMP_CLIENT} MAKE_ENV+= BUILD_CLIENT_SMP=1 PLIST_SUB+= SMP="" TRBIN+= tremulous-smp .else PLIST_SUB+= SMP="@comment " .endif post-extract: @cd ${WRKSRC} && ${TAR} zxf ${DISTNAME}-src.tar.gz post-patch: @${REINPLACE_CMD} -e 's|botlib\.log|/dev/null|' \ ${BUILD_WRKSRC}/src/botlib/be_interface.c @${REINPLACE_CMD} -e '/callMask = 0/s|^static||' \ ${BUILD_WRKSRC}/src/qcommon/vm_x86.c do-install: .for bin in ${TRBIN} ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/build/release/${bin} \ ${STAGEDIR}${PREFIX}/bin .endfor .if ${PORT_OPTIONS:MMASTER_SERVER} ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/src/master/release/tremmaster \ ${STAGEDIR}${PREFIX}/bin .endif @${MKDIR} ${STAGEDIR}${DATADIR}/base ${INSTALL_DATA} ${WRKSRC}/base/* ${STAGEDIR}${DATADIR}/base ${INSTALL_DATA} ${WRKSRC}/tremulous.xpm \ ${STAGEDIR}${PREFIX}/share/pixmaps .include Index: head/games/tuxkart/Makefile =================================================================== --- head/games/tuxkart/Makefile (revision 382274) +++ head/games/tuxkart/Makefile (revision 382275) @@ -1,52 +1,51 @@ # Created by: Alexander Langer # $FreeBSD$ PORTNAME= tuxkart PORTVERSION= 0.4.0 PORTREVISION= 5 CATEGORIES= games MASTER_SITES= http://tuxkart.sourceforge.net/dist/ \ SF/nemysisfreebsdp/${CATEGORIES}/:icons DISTFILES= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \ ${PORTNAME}.png:icons EXTRACT_ONLY= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} MAINTAINER= ports@FreeBSD.org COMMENT= Racing game starring Tux LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib USES= gmake USE_GL= gl GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-plib=${LOCALBASE} CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib -lusbhid PORTDOCS= * OPTIONS_DEFINE= DOCS DESKTOP_ENTRIES="TuxKart" "" ${PORTNAME} \ "${PORTNAME}" "Game;SportsGame;" "" post-patch: - @${REINPLACE_CMD} -e 's|-O6|${PTHREAD_CFLAGS}|g ; \ - s|-lpthread|${PTHREAD_LIBS}|g ; \ - s|datadir/games|datadir|g' ${WRKSRC}/configure - @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \ - 's|$$(prefix)/games|@bindir@|g ; \ + @${REINPLACE_CMD} -e 's|-O6||g ; s|datadir/games|datadir|g' \ + ${WRKSRC}/configure + @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} \ + -e 's|$$(prefix)/games|@bindir@|g ; \ s|$$(datadir)/games|$$(datadir)|g' @${REINPLACE_CMD} -e 's|doc contrib| contrib|' \ ${WRKSRC}/Makefile.in post-install: ${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/ cd ${WRKSRC} && ${COPYTREE_SHARE} "AUTHORS CHANGES README doc/*.png doc/*.html" \ ${STAGEDIR}${DOCSDIR} .include Index: head/games/ufoai/Makefile =================================================================== --- head/games/ufoai/Makefile (revision 382274) +++ head/games/ufoai/Makefile (revision 382275) @@ -1,148 +1,148 @@ # Created by: Alonso Cardenas Marquez # $FreeBSD$ PORTNAME= ufoai PORTVERSION= 2.5 PORTREVISION= 3 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/UFO_AI%202.x/${PORTVERSION} DISTNAME= ${PORTNAME:S/$/-/}${PORTVERSION}-source DIST_SUBDIR= ${PORTNAME} MAINTAINER= m.tsatsenko@gmail.com COMMENT= Strategy game featuring tactical combat LIB_DEPENDS= libvorbis.so:${PORTSDIR}/audio/libvorbis \ libjpeg.so:${PORTSDIR}/graphics/jpeg \ libpng.so:${PORTSDIR}/graphics/png \ libcurl.so:${PORTSDIR}/ftp/curl \ libtheora.so:${PORTSDIR}/multimedia/libtheora \ libxvidcore.so:${PORTSDIR}/multimedia/xvid \ libmxml.so:${PORTSDIR}/textproc/mxml BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip RUN_DEPENDS= ${LOCALBASE}/share/${PORTNAME}/base/default.cfg:${PORTSDIR}/games/ufoai-data USE_GL= yes USE_SDL= sdl image mixer ttf USE_CXXSTD= c++11 USES= compiler:c++11-lang execinfo gettext gmake openal:soft pkgconfig \ python:build tar:bzip2 HAS_CONFIGURE= yes CONFIGURE_ARGS+= --enable-release --target-os=freebsd -CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lexecinfo +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -lpthread -L${LOCALBASE}/lib -lexecinfo CFLAGS+= -I${LOCALBASE}/include DATADIR= share/${PORTNAME} SUB_FILES= pkg-message WRKSRC= ${WRKDIR}/${PORTNAME:S/$/-/}${PORTVERSION}-source UFO_DIR= ${PREFIX}/lib/${PORTNAME} UFO_FILES= ufo ufomodel OPTIONS_DEFINE= SERVER UFO2MAP UFORADIANT OPTIONS_DEFAULT= SERVER UFO2MAP SERVER_DESC= Install dedicated server UFO2MAP_DESC= Install UFO tools UFORADIANT_DESC= Install UFO map editor .include .if ${PORT_OPTIONS:MSERVER} CONFIGURE_ARGS+= --enable-ufoded UFO_FILES+= ufoded PLIST_SUB+= UFOSERVER="" .else CONFIGURE_ARGS+= --disable-ufoded PLIST_SUB+= UFOSERVER="@comment " .endif .if ${PORT_OPTIONS:MUFO2MAP} CONFIGURE_ARGS+= --enable-ufo2map UFO_FILES+= ufo2map PLIST_SUB+= UFO2MAP="" .else CONFIGURE_ARGS+= --disable-ufo2map PLIST_SUB+= UFO2MAP="@comment " .endif .if ${PORT_OPTIONS:MUFORADIANT} CONFIGURE_ARGS+=--enable-uforadiant USE_GNOME+= gtk20 glib20 gtksourceview2 libxml2 LIB_DEPENDS+= libgtkglext-x11-1.0.so:${PORTSDIR}/x11-toolkits/gtkglext RADIANT_FILES= colours.xml game.xml input.xml mapdef.template menu.xml user.xml RADIANT_DIRS= bitmaps i18n prefabs sourceviewer PLIST_SUB+= UFORADIANT="" .else CONFIGURE_ARGS+=--disable-uforadiant PLIST_SUB+= UFORADIANT="@comment " .endif .if ${OSVERSION} < 1000024 FAVORITE_COMPILER= gcc .endif .include .if ${OSVERSION} < 900000 BROKEN= Fails to build on 8.x .endif post-extract: @${MKDIR} ${WRKSRC}/base/maps ${WRKSRC}/base/models ${REINPLACE_CMD} \ -e 's|DEFAULT_COMPILER_CC=cc|DEFAULT_COMPILER_CC=${CC}|' \ -e 's|DEFAULT_COMPILER_CXX=c++|DEFAULT_COMPILER_CXX=${CXX}|' \ ${WRKSRC}/configure .if ${CHOSEN_COMPILER_TYPE} == "clang" ${REINPLACE_CMD} \ -e 's|-falign-loops=2 -falign-jumps=2 -falign-functions=2||' \ ${WRKSRC}/build/modes/release.mk .endif post-build: @cd ${WRKSRC} && ${MAKE_CMD} lang .if $(PORT_OPTIONS:MUFORADIANT) @cd ${WRKSRC} && ${MAKE_CMD} uforadiant .endif do-install: ${MKDIR} ${STAGEDIR}${UFO_DIR} .for FILE in ${UFO_FILES} @${SED} \ -e 's|@UFODIR@|${UFO_DIR}|' \ -e 's|@APP@|${FILE}|' \ ${FILESDIR}/run.sh.in > ${WRKDIR}/${FILE} ${INSTALL_PROGRAM} ${WRKSRC}/${FILE} ${STAGEDIR}${UFO_DIR} ${INSTALL_SCRIPT} ${WRKDIR}/${FILE} ${STAGEDIR}${PREFIX}/bin .endfor ${MKDIR} ${STAGEDIR}${PREFIX}/${DATADIR}/base ${INSTALL_PROGRAM} ${WRKSRC}/base/game.so ${STAGEDIR}${PREFIX}/${DATADIR}/base .if ${PORT_OPTIONS:MUFORADIANT} ${MKDIR} ${STAGEDIR}${UFO_DIR}/radiant @${SED} \ -e 's|@UFODIR@|${UFO_DIR}/radiant|' \ -e 's|@APP@|uforadiant|' \ ${FILESDIR}/run.sh.in > ${WRKDIR}/uforadiant ${INSTALL_PROGRAM} ${WRKSRC}/radiant/uforadiant ${STAGEDIR}${UFO_DIR}/radiant ${INSTALL_SCRIPT} ${WRKDIR}/uforadiant ${STAGEDIR}${PREFIX}/bin .for FILE in ${RADIANT_FILES} ${INSTALL_DATA} ${WRKSRC}/radiant/${FILE} ${STAGEDIR}${UFO_DIR}/radiant .endfor .for DIRE in ${RADIANT_DIRS} ${MKDIR} ${STAGEDIR}${UFO_DIR}/radiant/${DIRE} cd ${WRKSRC}/radiant/${DIRE} && \ ${FIND} * -type d -exec ${MKDIR} "${STAGEDIR}${UFO_DIR}/radiant/${DIRE}/{}" \; && \ ${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${STAGEDIR}${UFO_DIR}/radiant/${DIRE}/{}" \; .endfor .endif cd ${WRKSRC}/base/i18n && \ ${FIND} * -type d -exec ${MKDIR} "${STAGEDIR}${PREFIX}/${DATADIR}/base/i18n/{}" \; && \ ${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${STAGEDIR}${PREFIX}/${DATADIR}/base/i18n/{}" \; ${LN} -s ${PREFIX}/${DATADIR}/base ${STAGEDIR}${UFO_DIR}/base .include Index: head/games/uhexen2/Makefile =================================================================== --- head/games/uhexen2/Makefile (revision 382274) +++ head/games/uhexen2/Makefile (revision 382275) @@ -1,154 +1,153 @@ # Created by: alepulver # $FreeBSD$ PORTNAME= uhexen2 PORTVERSION= 1.5.6 PORTREVISION= 2 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/Hammer%20of%20Thyrion/${PORTVERSION}/Source \ SF/${PORTNAME}/Hexen2%20GameData/gamedata-1.28:data DISTNAME= hexen2source-${PORTVERSION} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ gamedata-all-1.28${EXTRACT_SUFX}:data DIST_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= Hexen II source port supporting Linux/FreeBSD/Unix/Windows LICENSE= GPLv2 # (or later) LICENSE_FILE= ${WRKSRC}/LICENSE.txt LIB_DEPENDS= libmad.so:${PORTSDIR}/audio/libmad \ libvorbis.so:${PORTSDIR}/audio/libvorbis OPTIONS_MULTI= BIN OPTIONS_MULTI_BIN= HEXEN2 HW OPTIONS_DEFINE= LAUNCHER_GTK1 LAUNCHER_GTK2 LAUNCHER_GTK3 DOCS OPTIONS_DEFAULT= HEXEN2 HW LAUNCHER_GTK2 OPTIONS_DEFINE_i386= ASM OPTIONS_DEFAULT_i386= ASM HEXEN2_DESC= Build Hexen II clients and servers HW_DESC= Build HexenWorld clients and servers LAUNCHER_GTK1_DESC= Build graphical (GTK1) game launcher LAUNCHER_GTK2_DESC= Build graphical (GTK2) game launcher LAUNCHER_GTK3_DESC= Build graphical (GTK3) game launcher USES= gmake pkgconfig tar:tgz USE_SDL= sdl USE_GL= gl MAKE_ENV= X11BASE="${LOCALBASE}" MAKE_JOBS_UNSAFE=yes SUB_FILES= pkg-message PORTSCOUT= skipb:yes .include .if ${PORT_OPTIONS:MHEXEN2} MAKE_ENV+= BUILD_HEXEN2=yes PLIST_SUB+= HEXEN2="" UH2_BIN+= engine/hexen2/glhexen2 \ engine/hexen2/hexen2 .else PLIST_SUB+= HEXEN2="@comment " .endif .if ${PORT_OPTIONS:MHW} MASTER_SITES+= SF/${PORTNAME}/Hexen2%20GameData/hexenworld-pakfiles:hw DISTFILES+= hexenworld-pakfiles-0.15${EXTRACT_SUFX}:hw MAKE_ENV+= BUILD_HW=yes PLIST_SUB+= HW="" UH2_BIN+= engine/hexenworld/client/glhwcl \ engine/hexenworld/client/hwcl \ engine/hexenworld/server/hwsv \ hw_utils/hwmaster/hwmaster .else PLIST_SUB+= HW="@comment " .endif .if ${PORT_OPTIONS:MLAUNCHER_GTK1} USE_GNOME+= gtk12 MAKE_ENV+= BUILD_LAUNCHER_GTK1=yes PLIST_SUB+= LAUNCHER_GTK1="" .else PLIST_SUB+= LAUNCHER_GTK1="@comment " .endif .if ${PORT_OPTIONS:MLAUNCHER_GTK2} USE_GNOME+= gtk20 MAKE_ENV+= BUILD_LAUNCHER_GTK2=yes PLIST_SUB+= LAUNCHER_GTK2="" .else PLIST_SUB+= LAUNCHER_GTK2="@comment " .endif .if ${PORT_OPTIONS:MLAUNCHER_GTK3} USE_GNOME+= gtk30 MAKE_ENV+= BUILD_LAUNCHER_GTK3=yes PLIST_SUB+= LAUNCHER_GTK3="" .else PLIST_SUB+= LAUNCHER_GTK3="@comment " .endif .if ${PORT_OPTIONS:MASM} BUILD_DEPENDS+= nasm:${PORTSDIR}/devel/nasm MAKE_ENV+= USE_X86_ASM=yes .else MAKE_ENV+= USE_X86_ASM=no .endif post-extract: @${CP} ${FILESDIR}/${MAKEFILE} ${WRKSRC} post-patch: .for f in engine/hexen2/Makefile engine/hexenworld/client/Makefile \ engine/hexenworld/server/Makefile hw_utils/hwmaster/Makefile \ launcher/Makefile libs/timidity/Makefile @${REINPLACE_CMD} -e \ '/^USE_X86_ASM/s|^|#| ; \ /^CPU_X86/s|^|#| ; \ /^CFLAGS/s| -g | | ; \ - /^CFLAGS/s| -O2 | | ; \ - /^PTHREAD_LIBS/s|-lpthread|-pthread|' ${WRKSRC}/${f} + /^CFLAGS/s| -O2 | | ;' ${WRKSRC}/${f} .endfor .for f in engine/h2shared/cd_bsd.c @${REINPLACE_CMD} -e \ 's|"acd0"|"cd0"|' ${WRKSRC}/${f} .endfor .for f in engine/hexen2/sys_unix.c engine/hexenworld/client/sys_unix.c @${REINPLACE_CMD} -e \ '/parms.basedir/s|= cwd;|= "${DATADIR}";|' ${WRKSRC}/${f} .endfor do-install: .for f in ${UH2_BIN} ${INSTALL_PROGRAM} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/bin .endfor ${MKDIR} ${STAGEDIR}${DATADIR}/data1 .for f in default.cfg hexen.rc progs.dat progs2.dat strings.txt ${INSTALL_DATA} ${WRKDIR}/data1/${f} ${STAGEDIR}${DATADIR}/data1 .endfor ${INSTALL_DATA} ${WRKDIR}/patchdat/data1/* ${STAGEDIR}${DATADIR}/data1 @(cd ${WRKDIR} && ${COPYTREE_SHARE} portals ${STAGEDIR}${DATADIR}) .if ${PORT_OPTIONS:MHW} ${MKDIR} ${STAGEDIR}${DATADIR}/hw ${INSTALL_DATA} ${WRKDIR}/hw/* ${STAGEDIR}${DATADIR}/hw .endif .if ${PORT_OPTIONS:MLAUNCHER_GTK1} ${INSTALL_PROGRAM} ${WRKSRC}/launcher/h2launcher.gtk1 \ ${STAGEDIR}${PREFIX}/bin .endif .if ${PORT_OPTIONS:MLAUNCHER_GTK2} ${INSTALL_PROGRAM} ${WRKSRC}/launcher/h2launcher.gtk2 \ ${STAGEDIR}${PREFIX}/bin .endif .if ${PORT_OPTIONS:MLAUNCHER_GTK3} ${INSTALL_PROGRAM} ${WRKSRC}/launcher/h2launcher.gtk3 \ ${STAGEDIR}${PREFIX}/bin .endif ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/docs/* ${STAGEDIR}${DOCSDIR} .include Index: head/games/vamos/Makefile =================================================================== --- head/games/vamos/Makefile (revision 382274) +++ head/games/vamos/Makefile (revision 382275) @@ -1,71 +1,71 @@ # Created by: ijliao # $FreeBSD$ PORTNAME= vamos PORTVERSION= 0.7.1 PORTREVISION= 7 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/ \ SF/nemysisfreebsdp/${CATEGORIES}/:icons DISTFILES= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \ ${PORTNAME}_icons${EXTRACT_SUFX}:icons MAINTAINER= ports@FreeBSD.org COMMENT= Automotive simulation framework LICENSE= GPLv2 # or later LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libboost_date_time.so:${PORTSDIR}/devel/boost-libs \ libpng.so:${PORTSDIR}/graphics/png USES= libtool openal:al,alut pkgconfig USE_XORG= sm ice x11 xi xext xmu USE_GL= glut USE_SDL= sdl GNU_CONFIGURE= yes CONFIGURE_ARGS= ac_cv_lib_freeglut_glutGetModifiers=no \ --disable-unit-tests USE_LDCONFIG= yes -CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -lpthread -L${LOCALBASE}/lib INFO= vamos PORTDOCS= * OPTIONS_DEFINE= DOCS INSTALLS_ICONS= yes ICON_SIZES= 32x32 48x48 64x64 72x72 96x96 128x128 DESKTOP_ENTRIES="Vamos" "" ${PORTNAME} \ "${PORTNAME}" "Game;ArcadeGame;" "" post-extract: @${CHMOD} ${BINMODE} ${WRKSRC}/config/install-sh post-patch: @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \ '/^AM_CXXFLAGS/s| -pedantic|| ; \ /^AM_CXXFLAGS/s| -O[[:alnum:]]|| ; \ /^AM_CXXFLAGS/s| -g|| ; \ /^AM_CXXFLAGS/s| -DBOOST_TEST_DYN_LINK|| ; \ /^AM_CXXFLAGS/s| -L/usr/lib/boost||' post-install: .for l in geometry media body track world ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libvamos-${l}.so.0 .endfor .for s in ${ICON_SIZES} @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}/apps ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}_${s}.png \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}/apps/${PORTNAME}.png .endfor ${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/ cd ${WRKSRC} && ${COPYTREE_SHARE} "AUTHORS ChangeLog README TODO doc/matrixfaq.htm" \ ${STAGEDIR}${DOCSDIR} .include Index: head/games/worldofpadman/Makefile =================================================================== --- head/games/worldofpadman/Makefile (revision 382274) +++ head/games/worldofpadman/Makefile (revision 382275) @@ -1,161 +1,161 @@ # Created by: Alejandro Pulver # $FreeBSD$ PORTNAME= worldofpadman PORTVERSION= 1.2.20080621 PORTREVISION= 12 CATEGORIES= games MASTER_SITES= ftp://ftp.snt.utwente.nl/pub/games/worldofpadman/linux/:full,update \ ${MASTER_SITE_LOCAL:S|$|alepulver/:source|} DISTFILES= worldofpadman.run:full \ wop_patch_1_2.run:update \ ${SRC_FILE}.tar.bz2:source EXTRACT_ONLY= worldofpadman.run \ wop_patch_1_2.run MAINTAINER= ports@FreeBSD.org COMMENT= Open source FPS game inspired by the Padman comic strip MANUAL_PACKAGE_BUILD= huge (~600MB) USES= gmake makeself -MAKE_ENV= DEFAULT_BASEDIR="${DATADIR}" PTHREAD_LIBS="${PTHREAD_LIBS}" +MAKE_ENV= DEFAULT_BASEDIR="${DATADIR}" PTHREAD_LIBS="-lpthread" ALL_TARGET= release SRC_FILE= ${PORTNAME}-${PORTVERSION} VM_ARCHS= amd64 i386 powerpc PLIST_FILES= share/pixmaps/worldofpadman.png PORTDOCS= * PORTDATA= * OPTIONS_DEFINE= CURL CURL_DLOPEN GAMELIBS MP3 OPENAL OPENAL_DLOPEN \ OPTIMIZED_CFLAGS VORBIS DOCS OPTIONS_MULTI= FLAVOR OPTIONS_MULTI_FLAVOR= CLIENT SERVER SMP_CLIENT OPTIONS_DEFAULT= CLIENT CURL CURL_DLOPEN SERVER OPTIMIZED_CFLAGS \ VORBIS SMP_CLIENT OPTIONS_SUB= yes FLAVOR_DESC= Clients and servers CLIENT_DESC= Build client CURL_DLOPEN_DESC= Enable dynamic loading of cURL SERVER_DESC= Build dedicated server GAMELIBS_DESC= Force building game libraries OPENAL_DLOPEN_DESC= Enable dynamic loading of OpenAL SMP_CLIENT_DESC= Build SMP (threaded) client .include .for arch in ${ARCH} . if ${VM_ARCHS:M${arch}} != "" HAVE_VM_COMPILED= yes . endif .endfor .if defined(HAVE_VM_COMPILED) MAKE_ENV+= HAVE_VM_COMPILED=true .endif .if ${PORT_OPTIONS:MCLIENT} || ${PORT_OPTIONS:MSMP_CLIENT} # cURL . if ${PORT_OPTIONS:MCURL} LIB_DEPENDS+= libcurl.so:${PORTSDIR}/ftp/curl MAKE_ENV+= USE_CURL=1 . if ${PORT_OPTIONS:MCURL_DLOPEN} MAKE_ENV+= USE_CURL_DLOPEN=1 . endif . endif # OpenAL . if ${PORT_OPTIONS:MOPENAL} USES+= openal:al MAKE_ENV+= USE_OPENAL=1 . if ${PORT_OPTIONS:MOPENAL_DLOPEN} MAKE_ENV+= USE_OPENAL_DLOPEN=1 . endif . endif # SDL USE_GL= glu USE_SDL= sdl # Vorbis . if ${PORT_OPTIONS:MVORBIS} LIB_DEPENDS+= libvorbis.so:${PORTSDIR}/audio/libvorbis MAKE_ENV+= USE_CODEC_VORBIS=1 . endif .endif .if ${PORT_OPTIONS:MCLIENT} MAKE_ENV+= BUILD_CLIENT=1 WOPBIN+= wop PLIST_FILES+= bin/worldofpadman .endif .if ${PORT_OPTIONS:MSERVER} MAKE_ENV+= BUILD_SERVER=1 WOPBIN+= wopded PLIST_FILES+= bin/worldofpadmanded .endif .if ${PORT_OPTIONS:MGAMELIBS} || !defined(HAVE_VM_COMPILED) MAKE_ENV+= BUILD_GAME_SO=1 .endif .if ${PORT_OPTIONS:MMP3} LIB_DEPENDS+= libmad.so:${PORTSDIR}/audio/libmad MAKE_ENV+= USE_CODEC_MP3=1 .endif .if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} MAKE_ENV+= USE_OPTIMIZED_CFLAGS=1 .endif .if ${PORT_OPTIONS:MSMP_CLIENT} MAKE_ENV+= BUILD_CLIENT_SMP=1 WOPBIN+= wop-smp PLIST_FILES+= bin/worldofpadman-smp .endif post-extract: @${TAR} jxf ${DISTDIR}/${SRC_FILE}.tar.bz2 -C ${WRKDIR} @${MKDIR} ${WRKDIR}/wop .for f in wop-data wop-data-1.2 extras @cd ${WRKDIR} && ${TAR} xf ${f}.tar -C wop .endfor @cd ${WRKDIR} && ${TAR} xf readme.tar post-patch: # Do not log debug output of bots (can be enabled with "homedir"/"gamedir") @${REINPLACE_CMD} -e 's|"botlib\.log"|"/dev/null"|' \ ${WRKSRC}/code/botlib/be_interface.c @${REINPLACE_CMD} '/callMask/ s|static||' \ ${WRKSRC}/code/qcommon/vm_x86.c @${REINPLACE_CMD} 's|-falign-loops=2||; s|-falign-jumps=2||' \ ${WRKSRC}/Makefile do-install: @${MKDIR} ${STAGEDIR}${DATADIR}/wop ${CP} -a ${WRKDIR}/wop/* ${STAGEDIR}${DATADIR}/wop ${INSTALL_DATA} ${WRKDIR}/wop.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png .for bin in ${WOPBIN} # Rename wop* -> worldofpadman* to avoid conflicts with `games/wop' ${INSTALL_PROGRAM} ${WRKSRC}/build/release/${bin} \ ${STAGEDIR}${PREFIX}/bin/${bin:S/wop/${PORTNAME}/} .endfor .if ${PORT_OPTIONS:MGAMELIBS} || !defined(HAVE_VM_COMPILED) ${INSTALL_PROGRAM} ${WRKSRC}/build/release/baseq3/*.so \ ${STAGEDIR}${DATADIR}/wop .endif @${MKDIR} ${STAGEDIR}${DOCSDIR} ${CP} -a ${WRKDIR}/readme/* ${STAGEDIR}${DOCSDIR} generate-distfile: @if [ -f ${DISTDIR}/${SRC_FILE}.tar.bz2 ]; then \ ${ECHO_CMD} "ERROR: the distfile already exists."; \ ${FALSE}; \ fi svn export https://wop-engine.svn.sourceforge.net/svnroot/wop-engine/trunk ${SRC_FILE} tar cjf ${DISTDIR}/${SRC_FILE}.tar.bz2 ${SRC_FILE} ${RM} -rf ${SRC_FILE} .include Index: head/games/xrally/Makefile =================================================================== --- head/games/xrally/Makefile (revision 382274) +++ head/games/xrally/Makefile (revision 382275) @@ -1,23 +1,23 @@ # Created by: Edwin Groothuis # $FreeBSD$ PORTNAME= xrally PORTVERSION= 1.1.1 PORTREVISION= 6 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/1.1 DISTNAME= ${PORTNAME}-1.1 MAINTAINER= edwin@mavetju.org COMMENT= XRally is a Linux clone of the classic Rally X arcade game WRKSRC= ${WRKDIR}/${PORTNAME} HAS_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${PREFIX} USE_XORG= x11 xi xpm USES= gmake tar:bzip2 -CFLAGS+= ${PTHREAD_CFLAGS} -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +CFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -lpthread -L${LOCALBASE}/lib MAKE_ENV= INCLUDES="-I${LOCALBASE}/include" .include