svn commit: r382275 - in head/games: boswars cleanq3 cleanq3/files cosmosmash egl egl/files evq3 gl-117 glest glob2 heretic heretic/files heroes kuklomenos lincity-ng netpanzer openalchemist openja...
John Marino
marino at FreeBSD.org
Wed Mar 25 23:01:04 UTC 2015
Author: marino
Date: Wed Mar 25 23:00:50 2015
New Revision: 382275
URL: https://svnweb.freebsd.org/changeset/ports/382275
QAT: https://qat.redports.org/buildarchive/r382275/
Log:
games category: Remove $PTHREAD_LIBS
approved by: PTHREAD blanket
Modified:
head/games/boswars/Makefile
head/games/cleanq3/Makefile
head/games/cleanq3/files/patch-code-unix-Makefile
head/games/cosmosmash/Makefile
head/games/egl/Makefile
head/games/egl/files/patch-makefile
head/games/evq3/Makefile
head/games/gl-117/Makefile
head/games/glest/Makefile
head/games/glob2/Makefile
head/games/heretic/Makefile
head/games/heretic/files/patch-Makefile
head/games/heroes/Makefile
head/games/kuklomenos/Makefile
head/games/lincity-ng/Makefile
head/games/netpanzer/Makefile
head/games/openalchemist/Makefile
head/games/openjazz/Makefile
head/games/q3cellshading/Makefile
head/games/q3cellshading/files/patch-code-unix-Makefile
head/games/quake3/Makefile
head/games/quake3/files/patch-code-unix-Makefile
head/games/r1q2/Makefile
head/games/r1q2/files/patch-binaries__client__Makefile
head/games/scummvm/Makefile
head/games/tank/Makefile
head/games/tank/files/patch-Makefile.Linux.Mesa
head/games/tenebrae/Makefile
head/games/tremulous/Makefile
head/games/tuxkart/Makefile
head/games/ufoai/Makefile
head/games/uhexen2/Makefile
head/games/vamos/Makefile
head/games/worldofpadman/Makefile
head/games/xrally/Makefile
Modified: head/games/boswars/Makefile
==============================================================================
--- head/games/boswars/Makefile Wed Mar 25 22:54:04 2015 (r382274)
+++ head/games/boswars/Makefile Wed Mar 25 23:00:50 2015 (r382275)
@@ -34,7 +34,6 @@ 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
Modified: head/games/cleanq3/Makefile
==============================================================================
--- head/games/cleanq3/Makefile Wed Mar 25 22:54:04 2015 (r382274)
+++ head/games/cleanq3/Makefile Wed Mar 25 23:00:50 2015 (r382275)
@@ -66,7 +66,7 @@ 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
Modified: head/games/cleanq3/files/patch-code-unix-Makefile
==============================================================================
--- head/games/cleanq3/files/patch-code-unix-Makefile Wed Mar 25 22:54:04 2015 (r382274)
+++ head/games/cleanq3/files/patch-code-unix-Makefile Wed Mar 25 23:00:50 2015 (r382275)
@@ -87,7 +87,7 @@
RANLIB=ranlib
-THREAD_LDFLAGS=-lpthread
-+THREAD_LDFLAGS=$(PTHREAD_LIBS)
++THREAD_LDFLAGS=-lpthread
# don't need -ldl (FreeBSD)
-LDFLAGS=-lm
+LDFLAGS+=-lm
Modified: head/games/cosmosmash/Makefile
==============================================================================
--- head/games/cosmosmash/Makefile Wed Mar 25 22:54:04 2015 (r382274)
+++ head/games/cosmosmash/Makefile Wed Mar 25 23:00:50 2015 (r382275)
@@ -23,7 +23,7 @@ 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
Modified: head/games/egl/Makefile
==============================================================================
--- head/games/egl/Makefile Wed Mar 25 22:54:04 2015 (r382274)
+++ head/games/egl/Makefile Wed Mar 25 23:00:50 2015 (r382275)
@@ -19,7 +19,7 @@ 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}
Modified: head/games/egl/files/patch-makefile
==============================================================================
--- head/games/egl/files/patch-makefile Wed Mar 25 22:54:04 2015 (r382274)
+++ head/games/egl/files/patch-makefile Wed Mar 25 23:00:50 2015 (r382275)
@@ -60,7 +60,7 @@
+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)
Modified: head/games/evq3/Makefile
==============================================================================
--- head/games/evq3/Makefile Wed Mar 25 22:54:04 2015 (r382274)
+++ head/games/evq3/Makefile Wed Mar 25 23:00:50 2015 (r382275)
@@ -38,7 +38,7 @@ VOIP_DESC= Enable Voice Over IP
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}
Modified: head/games/gl-117/Makefile
==============================================================================
--- head/games/gl-117/Makefile Wed Mar 25 22:54:04 2015 (r382274)
+++ head/games/gl-117/Makefile Wed Mar 25 23:00:50 2015 (r382275)
@@ -16,7 +16,7 @@ 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" \
Modified: head/games/glest/Makefile
==============================================================================
--- head/games/glest/Makefile Wed Mar 25 22:54:04 2015 (r382274)
+++ head/games/glest/Makefile Wed Mar 25 23:00:50 2015 (r382275)
@@ -48,30 +48,35 @@ 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/
Modified: head/games/glob2/Makefile
==============================================================================
--- head/games/glob2/Makefile Wed Mar 25 22:54:04 2015 (r382274)
+++ head/games/glob2/Makefile Wed Mar 25 23:00:50 2015 (r382275)
@@ -33,7 +33,7 @@ MAKE_ARGS= CCFLAGS="${CFLAGS}" \
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
Modified: head/games/heretic/Makefile
==============================================================================
--- head/games/heretic/Makefile Wed Mar 25 22:54:04 2015 (r382274)
+++ head/games/heretic/Makefile Wed Mar 25 23:00:50 2015 (r382275)
@@ -14,7 +14,6 @@ COMMENT= Unix source-port of the famous
USES= gmake
USE_XORG= x11 xi xpm xau
-MAKE_ENV= PTHREAD_LIBS=${PTHREAD_LIBS}
OPTIONS_DEFINE= WAD DOCS
OPTIONS_SINGLE= SG1
Modified: head/games/heretic/files/patch-Makefile
==============================================================================
--- head/games/heretic/files/patch-Makefile Wed Mar 25 22:54:04 2015 (r382274)
+++ head/games/heretic/files/patch-Makefile Wed Mar 25 23:00:50 2015 (r382275)
@@ -72,11 +72,11 @@
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 \
Modified: head/games/heroes/Makefile
==============================================================================
--- head/games/heroes/Makefile Wed Mar 25 22:54:04 2015 (r382274)
+++ head/games/heroes/Makefile Wed Mar 25 23:00:50 2015 (r382275)
@@ -42,8 +42,8 @@ OPTIMIZED_CFLAGS_CONFIGURE_ENABLE= optim
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 \
Modified: head/games/kuklomenos/Makefile
==============================================================================
--- head/games/kuklomenos/Makefile Wed Mar 25 22:54:04 2015 (r382274)
+++ head/games/kuklomenos/Makefile Wed Mar 25 23:00:50 2015 (r382275)
@@ -22,8 +22,8 @@ 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
Modified: head/games/lincity-ng/Makefile
==============================================================================
--- head/games/lincity-ng/Makefile Wed Mar 25 22:54:04 2015 (r382274)
+++ head/games/lincity-ng/Makefile Wed Mar 25 23:00:50 2015 (r382275)
@@ -22,7 +22,7 @@ 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 \
Modified: head/games/netpanzer/Makefile
==============================================================================
--- head/games/netpanzer/Makefile Wed Mar 25 22:54:04 2015 (r382274)
+++ head/games/netpanzer/Makefile Wed Mar 25 23:00:50 2015 (r382275)
@@ -12,8 +12,7 @@ COMMENT= Real time, isometric view, tank
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-LDFLAGS+= ${PTHREAD_LIBS}
-CFLAGS+= ${PTHREAD_CFLAGS}
+LDFLAGS+= -lpthreads
USES= scons tar:bzip2
USE_SDL= sdl mixer image
Modified: head/games/openalchemist/Makefile
==============================================================================
--- head/games/openalchemist/Makefile Wed Mar 25 22:54:04 2015 (r382274)
+++ head/games/openalchemist/Makefile Wed Mar 25 23:00:50 2015 (r382275)
@@ -26,7 +26,7 @@ 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
Modified: head/games/openjazz/Makefile
==============================================================================
--- head/games/openjazz/Makefile Wed Mar 25 22:54:04 2015 (r382274)
+++ head/games/openjazz/Makefile Wed Mar 25 23:00:50 2015 (r382275)
@@ -25,7 +25,7 @@ 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
Modified: head/games/q3cellshading/Makefile
==============================================================================
--- head/games/q3cellshading/Makefile Wed Mar 25 22:54:04 2015 (r382274)
+++ head/games/q3cellshading/Makefile Wed Mar 25 23:00:50 2015 (r382275)
@@ -76,7 +76,7 @@ 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
Modified: head/games/q3cellshading/files/patch-code-unix-Makefile
==============================================================================
--- head/games/q3cellshading/files/patch-code-unix-Makefile Wed Mar 25 22:54:04 2015 (r382274)
+++ head/games/q3cellshading/files/patch-code-unix-Makefile Wed Mar 25 23:00:50 2015 (r382275)
@@ -124,7 +124,7 @@
RANLIB=ranlib
-THREAD_LDFLAGS=-lpthread
-+THREAD_LDFLAGS=$(PTHREAD_LIBS)
++THREAD_LDFLAGS=-lpthread
# don't need -ldl (FreeBSD)
-LDFLAGS=-lm
+LDFLAGS+=-lm
Modified: head/games/quake3/Makefile
==============================================================================
--- head/games/quake3/Makefile Wed Mar 25 22:54:04 2015 (r382274)
+++ head/games/quake3/Makefile Wed Mar 25 23:00:50 2015 (r382275)
@@ -87,8 +87,7 @@ 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
Modified: head/games/quake3/files/patch-code-unix-Makefile
==============================================================================
--- head/games/quake3/files/patch-code-unix-Makefile Wed Mar 25 22:54:04 2015 (r382274)
+++ head/games/quake3/files/patch-code-unix-Makefile Wed Mar 25 23:00:50 2015 (r382275)
@@ -121,7 +121,7 @@
RANLIB=ranlib
-THREAD_LDFLAGS=-lpthread
-+THREAD_LDFLAGS=$(PTHREAD_LIBS)
++THREAD_LDFLAGS=-lpthread
# don't need -ldl (FreeBSD)
-LDFLAGS=-lm
+LDFLAGS+=-lm
Modified: head/games/r1q2/Makefile
==============================================================================
--- head/games/r1q2/Makefile Wed Mar 25 22:54:04 2015 (r382274)
+++ head/games/r1q2/Makefile Wed Mar 25 23:00:50 2015 (r382275)
@@ -24,7 +24,7 @@ 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
Modified: head/games/r1q2/files/patch-binaries__client__Makefile
==============================================================================
--- head/games/r1q2/files/patch-binaries__client__Makefile Wed Mar 25 22:54:04 2015 (r382274)
+++ head/games/r1q2/files/patch-binaries__client__Makefile Wed Mar 25 23:00:50 2015 (r382275)
@@ -5,7 +5,7 @@
include ../make.inc
-LDFLAGS+=-lm -lz
-+LDFLAGS+=-lm -lz $(PTHREAD_LIBS)
++LDFLAGS+=-lm -lz -lpthread
ifeq ($(shell uname),Linux)
LDFLAGS+=-ldl
Modified: head/games/scummvm/Makefile
==============================================================================
--- head/games/scummvm/Makefile Wed Mar 25 22:54:04 2015 (r382274)
+++ head/games/scummvm/Makefile Wed Mar 25 23:00:50 2015 (r382275)
@@ -21,7 +21,7 @@ CONFIGURE_ARGS= --with-sdl-prefix=${LOCA
--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
Modified: head/games/tank/Makefile
==============================================================================
--- head/games/tank/Makefile Wed Mar 25 22:54:04 2015 (r382274)
+++ head/games/tank/Makefile Wed Mar 25 23:00:50 2015 (r382275)
@@ -14,7 +14,6 @@ COMMENT= 3-D network tank game that uses
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:
Modified: head/games/tank/files/patch-Makefile.Linux.Mesa
==============================================================================
--- head/games/tank/files/patch-Makefile.Linux.Mesa Wed Mar 25 22:54:04 2015 (r382274)
+++ head/games/tank/files/patch-Makefile.Linux.Mesa Wed Mar 25 23:00:50 2015 (r382275)
@@ -14,7 +14,7 @@
-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
@@ -36,7 +36,7 @@
$(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)
Modified: head/games/tenebrae/Makefile
==============================================================================
--- head/games/tenebrae/Makefile Wed Mar 25 22:54:04 2015 (r382274)
+++ head/games/tenebrae/Makefile Wed Mar 25 23:00:50 2015 (r382275)
@@ -22,7 +22,7 @@ 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
Modified: head/games/tremulous/Makefile
==============================================================================
--- head/games/tremulous/Makefile Wed Mar 25 22:54:04 2015 (r382274)
+++ head/games/tremulous/Makefile Wed Mar 25 23:00:50 2015 (r382275)
@@ -13,7 +13,7 @@ COMMENT= Free FPS game featuring two opp
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
Modified: head/games/tuxkart/Makefile
==============================================================================
--- head/games/tuxkart/Makefile Wed Mar 25 22:54:04 2015 (r382274)
+++ head/games/tuxkart/Makefile Wed Mar 25 23:00:50 2015 (r382275)
@@ -34,11 +34,10 @@ 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
Modified: head/games/ufoai/Makefile
==============================================================================
--- head/games/ufoai/Makefile Wed Mar 25 22:54:04 2015 (r382274)
+++ head/games/ufoai/Makefile Wed Mar 25 23:00:50 2015 (r382275)
@@ -29,8 +29,8 @@ USES= compiler:c++11-lang execinfo gett
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}
Modified: head/games/uhexen2/Makefile
==============================================================================
--- head/games/uhexen2/Makefile Wed Mar 25 22:54:04 2015 (r382274)
+++ head/games/uhexen2/Makefile Wed Mar 25 23:00:50 2015 (r382275)
@@ -110,8 +110,7 @@ post-patch:
'/^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 \
Modified: head/games/vamos/Makefile
==============================================================================
--- head/games/vamos/Makefile Wed Mar 25 22:54:04 2015 (r382274)
+++ head/games/vamos/Makefile Wed Mar 25 23:00:50 2015 (r382275)
@@ -28,8 +28,8 @@ CONFIGURE_ARGS= ac_cv_lib_freeglut_glutG
--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= *
Modified: head/games/worldofpadman/Makefile
==============================================================================
--- head/games/worldofpadman/Makefile Wed Mar 25 22:54:04 2015 (r382274)
+++ head/games/worldofpadman/Makefile Wed Mar 25 23:00:50 2015 (r382275)
@@ -19,7 +19,7 @@ COMMENT= Open source FPS game inspired b
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}
Modified: head/games/xrally/Makefile
==============================================================================
--- head/games/xrally/Makefile Wed Mar 25 22:54:04 2015 (r382274)
+++ head/games/xrally/Makefile Wed Mar 25 23:00:50 2015 (r382275)
@@ -16,8 +16,8 @@ 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 <bsd.port.mk>
More information about the svn-ports-head
mailing list