svn commit: r382258 - in head: audio/audiere games/flyhard games/minetest games/numptyphysics games/pachi games/passage games/pengupop games/pipewalker games/teeworlds games/zaz

Dmitry Marakasov amdmi3 at FreeBSD.org
Wed Mar 25 18:30:30 UTC 2015 

Author: amdmi3
Date: Wed Mar 25 18:30:25 2015
New Revision: 382258
URL: https://svnweb.freebsd.org/changeset/ports/382258
QAT: https://qat.redports.org/buildarchive/r382258/

Log:
  Remove PTHREAD_LIBS, PTHREAD_CFLAGS from my ports

Modified:
  head/audio/audiere/Makefile
  head/games/flyhard/Makefile
  head/games/minetest/Makefile
  head/games/numptyphysics/Makefile
  head/games/pachi/Makefile
  head/games/passage/Makefile
  head/games/pengupop/Makefile
  head/games/pipewalker/Makefile
  head/games/teeworlds/Makefile
  head/games/zaz/Makefile

Modified: head/audio/audiere/Makefile
==============================================================================
--- head/audio/audiere/Makefile	Wed Mar 25 18:20:42 2015	(r382257)
+++ head/audio/audiere/Makefile	Wed Mar 25 18:30:25 2015	(r382258)
@@ -17,7 +17,7 @@ USE_AUTOTOOLS=	autoconf
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
-CONFIGURE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}" PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"
+CONFIGURE_ENV=	PTHREAD_LIBS="-pthread"
 CPPFLAGS+=	-I${LOCALBASE}/include/speex -I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
@@ -71,7 +71,7 @@ CONFIGURE_REPLACES+='/AC_CHECK_HEADER/ s
 
 post-patch:
 	@${REINPLACE_CMD} ${CONFIGURE_REPLACES:C/.*/-e &/} \
-		-e 's|-lpthread|${PTHREAD_LIBS}|' \
+		-e 's|-lpthread|-pthread|' \
 		${WRKSRC}/configure.in
 
 post-install:

Modified: head/games/flyhard/Makefile
==============================================================================
--- head/games/flyhard/Makefile	Wed Mar 25 18:20:42 2015	(r382257)
+++ head/games/flyhard/Makefile	Wed Mar 25 18:30:25 2015	(r382258)
@@ -19,7 +19,7 @@ USES=		gmake
 USE_SDL=	sdl mixer
 
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	${PTHREAD_LIBS} -L${LOCALBASE}/lib
+LDFLAGS+=	-L${LOCALBASE}/lib -pthread
 
 PLIST_FILES=	bin/${PORTNAME}
 PORTDOCS=	*

Modified: head/games/minetest/Makefile
==============================================================================
--- head/games/minetest/Makefile	Wed Mar 25 18:20:42 2015	(r382257)
+++ head/games/minetest/Makefile	Wed Mar 25 18:30:25 2015	(r382258)
@@ -89,7 +89,7 @@ EXTRA_PATCHES+=	${FILESDIR}/extra-patch-
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
 		${WRKSRC}/cmake/Modules/*.cmake
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|' \
+	@${REINPLACE_CMD} -e 's|-lpthread|-pthread|' \
 		${WRKSRC}/src/CMakeLists.txt
 .if ! ${PORT_OPTIONS:MLUAJIT}
 	@${REINPLACE_CMD} -e '/find_/ s|LUA_|NO&|g' \

Modified: head/games/numptyphysics/Makefile
==============================================================================
--- head/games/numptyphysics/Makefile	Wed Mar 25 18:20:42 2015	(r382257)
+++ head/games/numptyphysics/Makefile	Wed Mar 25 18:30:25 2015	(r382258)
@@ -19,7 +19,7 @@ USE_SDL=	sdl image
 INSTALLS_ICONS=	yes
 
 CONFIGURE_ENV=	AUTOMAKE="${TRUE}" ACLOCAL="${TRUE}" MISSING="${TRUE}"
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+LDFLAGS+=	-L${LOCALBASE}/lib -pthread
 CPPFLAGS+=	-I${LOCALBASE}/include -DINSTALL_BASE_PATH=\"\\\"${DATADIR}\\\"\"
 
 WRKSRC=		${WRKDIR}/${PORTNAME}

Modified: head/games/pachi/Makefile
==============================================================================
--- head/games/pachi/Makefile	Wed Mar 25 18:20:42 2015	(r382257)
+++ head/games/pachi/Makefile	Wed Mar 25 18:30:25 2015	(r382258)
@@ -15,7 +15,7 @@ USE_SDL=	mixer sdl
 USES=		gmake tar:tgz
 GNU_CONFIGURE=	yes
 
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+LDFLAGS+=	-L${LOCALBASE}/lib -pthread
 CPPFLAGS+=	-I${LOCALBASE}/include
 
 WRKSRC=		${WRKDIR}/Pachi

Modified: head/games/passage/Makefile
==============================================================================
--- head/games/passage/Makefile	Wed Mar 25 18:20:42 2015	(r382257)
+++ head/games/passage/Makefile	Wed Mar 25 18:30:25 2015	(r382258)
@@ -19,7 +19,7 @@ PLIST_FILES=	bin/${PORTNAME}
 PORTDATA=	*
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|^\(PLATFORM_LINK_FLAGS =\).*|\1 ${PTHREAD_LIBS}|' \
+	@${REINPLACE_CMD} -e 's|^\(PLATFORM_LINK_FLAGS =\).*|\1 -pthread|' \
 		${WRKSRC}/Makefile.GnuLinux
 	@${REINPLACE_CMD} -e 's|"graphics"|"${DATADIR}/graphics"|' \
 		${WRKSRC}/common.cpp

Modified: head/games/pengupop/Makefile
==============================================================================
--- head/games/pengupop/Makefile	Wed Mar 25 18:20:42 2015	(r382257)
+++ head/games/pengupop/Makefile	Wed Mar 25 18:30:25 2015	(r382258)
@@ -15,7 +15,7 @@ GNU_CONFIGURE=	yes
 USES=		gmake
 USE_SDL=	sdl
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+LDFLAGS+=	-L${LOCALBASE}/lib -pthread
 
 PLIST_FILES=	bin/pengupop
 

Modified: head/games/pipewalker/Makefile
==============================================================================
--- head/games/pipewalker/Makefile	Wed Mar 25 18:20:42 2015	(r382257)
+++ head/games/pipewalker/Makefile	Wed Mar 25 18:30:25 2015	(r382258)
@@ -16,7 +16,7 @@ USE_SDL=	sdl
 USE_GL=		gl glu
 
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+LDFLAGS+=	-L${LOCALBASE}/lib -pthread
 
 PLIST_FILES=	bin/${PORTNAME} \
 		share/applications/${PORTNAME}.desktop \

Modified: head/games/teeworlds/Makefile
==============================================================================
--- head/games/teeworlds/Makefile	Wed Mar 25 18:20:42 2015	(r382257)
+++ head/games/teeworlds/Makefile	Wed Mar 25 18:30:25 2015	(r382258)
@@ -54,7 +54,7 @@ DESKTOP_ENTRIES="Teeworlds" \
 post-patch:
 	@${REINPLACE_CMD} -e 's|"python "|"${PYTHON_CMD} "|' \
 		${WRKSRC}/bam.lua
-	@${REINPLACE_CMD} -e 's|-O.||; s|-lpthread|${PTHREAD_LIBS}|; s|^gcc|${CC} ${CFLAGS}|; s|-ldl||g' \
+	@${REINPLACE_CMD} -e 's|-O.||; s|-lpthread|-pthread|; s|^gcc|${CC} ${CFLAGS}|; s|-ldl||g' \
 		${BAM_WRKSRC}/make_unix.sh
 	@${REINPLACE_CMD} -e 's|sdl-config|${SDL_CONFIG}|' ${WRKSRC}/other/sdl/sdl.lua
 	@${REINPLACE_CMD} -e '/aDirs\[\]/,/}/ s|"/.*"|"${DATADIR}"|' \

Modified: head/games/zaz/Makefile
==============================================================================
--- head/games/zaz/Makefile	Wed Mar 25 18:20:42 2015	(r382257)
+++ head/games/zaz/Makefile	Wed Mar 25 18:30:25 2015	(r382258)
@@ -21,7 +21,7 @@ USE_SDL=	sdl image
 USE_GL=		gl glu
 
 CPPFLAGS+=	-I${LOCALBASE}/include/freetype2 -I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+LDFLAGS+=	-L${LOCALBASE}/lib -pthread
 CONFIGURE_ARGS=	--with-icondir="${PREFIX}/share/pixmaps"
 
 PORTDOCS=	*

More information about the svn-ports-all mailing list