- Fix missing library problems when the linker enforces explicit linking

PR:		192062
Exp-run by:	antoine
Approved by:	portmgr (antoine)

51 files changed, 121 insertions, 101 deletions

diff --git a/games/airstrike/Makefile b/games/airstrike/Makefile
index 267b046297d1..45994e6735e8 100644
--- a/games/airstrike/Makefile
+++ b/games/airstrike/Makefile
@@ -39,6 +39,7 @@ DESKTOP_ENTRIES="Airstrike" "" "${PORTNAME}" \
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|CFLAGS += -DLINUX|#CFLAGS += -DLINUX|' \
+		-e '/$$(CC)/s/$$/ -lm/' \
 		${WRKSRC}/src/Makefile
 	@${FIND} ${WRKSRC} -name '*.c' -or -name '*.h' | ${XARGS} \
 		${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|g'
diff --git a/games/asteroid/Makefile b/games/asteroid/Makefile
index 7dd624c8fa42..f85f8fbd218f 100644
--- a/games/asteroid/Makefile
+++ b/games/asteroid/Makefile
@@ -23,6 +23,7 @@ USE_SDL=	mixer sdl
 USE_GNOME=	gtk20
 USE_XORG=	xmu
 INSTALLS_ICONS=	yes
+LDFLAGS+=	-lm
 
 PORTDOCS=	AUTHORS NEWS README.md
 OPTIONS_DEFINE=	DOCS
diff --git a/games/atanks/Makefile b/games/atanks/Makefile
index f02b159e8cfa..e4dbf5df46af 100644
--- a/games/atanks/Makefile
+++ b/games/atanks/Makefile
@@ -22,6 +22,7 @@ PORTDOCS=	Changelog README README_ru.txt credits.txt
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
+	@${REINPLACE_CMD} '/^LDFLAGS =/s/$$/ -pthread/' ${WRKSRC}/src/Makefile.bsd
 	@${REINPLACE_CMD} -e \
 		's/int Filter_File( struct dirent/int Filter_File( const struct dirent/' \
 		${WRKSRC}/src/files.cpp
diff --git a/games/belooted/Makefile b/games/belooted/Makefile
index 59f5c221eff7..38ddf30119e0 100644
--- a/games/belooted/Makefile
+++ b/games/belooted/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	belooted
 PORTVERSION=	0.1.4.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	games
 MASTER_SITES=	http://boby.joe.free.fr/dev/belooted/files/ \
 		LOCAL/martymac
@@ -12,18 +12,16 @@ MAINTAINER=	martymac@FreeBSD.org
 COMMENT=	Popular 32-card trick-taking game played in France
 
 LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		gmake pkgconfig desktop-file-utils
+USES=		gmake pkgconfig
 USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-PORTDOCS=	AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
-
-post-install:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
+post-patch:
+	@${REINPLACE_CMD} '/^LIBS =/s/$$/ -lm/' ${WRKSRC}/src/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/games/belooted/pkg-plist b/games/belooted/pkg-plist
index 9337f2e2c7c8..5597935269b9 100644
--- a/games/belooted/pkg-plist
+++ b/games/belooted/pkg-plist
@@ -42,5 +42,3 @@ share/pixmaps/belooted/icon-spade.xpm
 share/pixmaps/belooted/icon-none.xpm
 @dirrm share/pixmaps/belooted
 share/pixmaps/belooted.png
-@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
diff --git a/games/bitefusion/Makefile b/games/bitefusion/Makefile
index 5652f1b75348..9919f4cf7c68 100644
--- a/games/bitefusion/Makefile
+++ b/games/bitefusion/Makefile
@@ -15,7 +15,7 @@ GNU_CONFIGURE=	yes
 USES=		gmake
 USE_SDL=	sdl
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+LIBS+=		-L${LOCALBASE}/lib -lm
 
 PLIST_FILES=	bin/bitefusion
 
diff --git a/games/blokish/Makefile b/games/blokish/Makefile
index 4693f476c1ba..5b24414c0691 100644
--- a/games/blokish/Makefile
+++ b/games/blokish/Makefile
@@ -29,5 +29,6 @@ PLIST_FILES=	bin/blokish
 post-patch:
 	@${REINPLACE_CMD} -e 's|wx-config|${WX_CONFIG}|' \
 		${WRKSRC}/makefile.in ${WRKSRC}/configure
+	@${REINPLACE_CMD} '/^LIBS =/s/$$/ -lGL/' ${WRKSRC}/makefile.in
 
 .include <bsd.port.mk>
diff --git a/games/bomberclone/Makefile b/games/bomberclone/Makefile
index d7451426dc89..ee15120f4969 100644
--- a/games/bomberclone/Makefile
+++ b/games/bomberclone/Makefile
@@ -16,8 +16,8 @@ USES=		gmake
 USE_SDL=	image mixer sdl
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--target="" --disable-werror
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
-CXXFLAGS+=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib -lm
 
 PORTDOCS=	AUTHORS ChangeLog README TODO
 
diff --git a/games/caph/Makefile b/games/caph/Makefile
index de1ab070a499..6fc6d1a9d0e4 100644
--- a/games/caph/Makefile
+++ b/games/caph/Makefile
@@ -42,7 +42,7 @@ CFLAGS+=	-O3 -ffast-math
 
 do-build:
 	cd ${BUILD_WRKSRC} && ${CC} ${CFLAGS} -o caph -I../include *.c \
-		`${SDL_CONFIG} --libs --cflags` -D_OPENGL -lGL -lpng ${ICONV_LIB}
+		`${SDL_CONFIG} --libs --cflags` -D_OPENGL -lGL -lpng -lm ${ICONV_LIB}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|../share/caph|${DATADIR}|' ${BUILD_WRKSRC}/caph.c
diff --git a/games/construo/Makefile b/games/construo/Makefile
index 334a557bc42a..65fdac44de40 100644
--- a/games/construo/Makefile
+++ b/games/construo/Makefile
@@ -16,7 +16,7 @@ USE_XORG=	sm ice x11 xext xxf86vm
 USE_GL=		gl glu
 
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib -lGLU
+LIBS+=		-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--bindir=${PREFIX}/bin --datadir=${DATADIR}
 
 PLIST_FILES=	bin/${PORTNAME} bin/${PORTNAME}.x11
@@ -41,7 +41,10 @@ PLIST_FILES+=	bin/${PORTNAME}.glut
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} 's|bindir = .*|bindir = @bindir@|' ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} \
+		-e 's|bindir = .*|bindir = @bindir@|' \
+		-e '/^construo_glut_LDADD =/s/$$/ -lGLU -lGL/' \
+		${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} 's|pkgdatadir = .*|pkgdatadir = @datadir@/examples|' ${WRKSRC}/examples/Makefile.in
 	@${REINPLACE_CMD} '/stream/!s/std:://' ${WRKSRC}/vector.cxx
 	@${REINPLACE_CMD} 's|^\(#define CONSTRUO_DATADIR DATADIR\).*|\1|' ${WRKSRC}/construo.hxx
diff --git a/games/d2x-xl/Makefile b/games/d2x-xl/Makefile
index 197403c98ad2..2093003b61af 100644
--- a/games/d2x-xl/Makefile
+++ b/games/d2x-xl/Makefile
@@ -56,6 +56,7 @@ do-extract:
 		${CHMOD} +x configure
 
 post-patch:
+	@${ECHO_CMD} 'CCLD = $$(CXX)' >> ${WRKSRC}/Makefile.am
 	@${REINPLACE_CMD} -e '/FLAGS/ s|-O3||; /FLAGS/ s|-g||' \
 		${WRKSRC}/configure.ac
 	@cd ${WRKSRC} && \
diff --git a/games/defendguin/Makefile b/games/defendguin/Makefile
index 507267c1dc80..16903d3181d2 100644
--- a/games/defendguin/Makefile
+++ b/games/defendguin/Makefile
@@ -30,7 +30,7 @@ DESKTOP_ENTRIES="Defendguin" "" "${PORTNAME}" \
 do-build:
 	cd ${WRKSRC} && ${CC} ${CFLAGS} -DDATA_PREFIX=\"${DATADIR}/\" \
 		`${SDL_CONFIG} --cflags` defendguin.c -o defendguin \
-		`${SDL_CONFIG} --libs` -lSDL_mixer
+		`${SDL_CONFIG} --libs` -lSDL_mixer -lm
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
diff --git a/games/egoboo/files/patch-game-Makefile.unix b/games/egoboo/files/patch-game-Makefile.unix
index 400bf93a0f08..c88312ac977e 100644
--- a/games/egoboo/files/patch-game-Makefile.unix
+++ b/games/egoboo/files/patch-game-Makefile.unix
@@ -23,7 +23,7 @@
 -LDFLAGS := ${SDLCONF_L} -lSDL_ttf -lSDL_mixer -lSDL_image -lGL -lGLU
 +INC     := -I. -I.. ${SDLCONF_I} -I${LOCALBASE}/include
 +CFLAGS  += ${INC}
-+LDFLAGS := ${SDLCONF_L} -L${LOCALBASE}/lib -lSDL_ttf -lSDL_mixer -lSDL_image -lGL -lGLU
++LDFLAGS := ${SDLCONF_L} -L${LOCALBASE}/lib -lSDL_ttf -lSDL_mixer -lSDL_image -lGL -lGLU -lm
  
  EGO_BIN := egoboo
  
diff --git a/games/frogatto/Makefile b/games/frogatto/Makefile
index 74e07ef1b729..93d2a058896d 100644
--- a/games/frogatto/Makefile
+++ b/games/frogatto/Makefile
@@ -27,9 +27,7 @@ USE_SDL=	sdl image mixer ttf
 PLIST_FILES=	bin/${PORTNAME} bin/${PORTNAME}-server
 
 post-patch:
-	@${REINPLACE_CMD} -e \
-		's|-lpthread|${PTHREAD_LIBS}|g ; \
-		s|-Werror||' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e 's|-Werror||' ${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e 's,%lu,%u,' ${WRKSRC}/src/server.cpp
 	@${REINPLACE_CMD} -e 's,__linux__,__${OPSYS}__,' \
 		${WRKSRC}/src/clipboard.cpp
diff --git a/games/frogatto/files/patch-Makefile b/games/frogatto/files/patch-Makefile
index 72fc79ea8a2b..3f08bcd7243d 100644
--- a/games/frogatto/files/patch-Makefile
+++ b/games/frogatto/files/patch-Makefile
@@ -23,7 +23,7 @@
  # Linker library options.
  LIBS := $(shell pkg-config --libs x11 ) -lSDLmain \
 -	$(shell pkg-config --libs sdl glu glew SDL_image libpng zlib) -lSDL_ttf -lSDL_mixer
-+	$(shell pkg-config --libs sdl glu glew SDL_image libpng) -lSDL_ttf -lSDL_mixer
++	$(shell pkg-config --libs sdl glu glew SDL_image libpng) -lz -lSDL_ttf -lSDL_mixer
  
  include Makefile.common
  
diff --git a/games/gillo/Makefile b/games/gillo/Makefile
index 1c403d5c9445..31a299a9281c 100644
--- a/games/gillo/Makefile
+++ b/games/gillo/Makefile
@@ -20,21 +20,20 @@ BUILD_DEPENDS=	${JAM}:${PORTSDIR}/devel/jam \
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USES=		tar:bzip2
-USE_GL=		gl
+USE_GL=		glu
 USE_SDL=	yes
 
 JAM?=		${LOCALBASE}/bin/jam
 
 post-patch:
-	@${REINPLACE_CMD} -i '' -e 's|SDL/||g' ${WRKSRC}/src/*
-	@${REINPLACE_CMD} -e 's|%%SDL_CFLAGS%%|`${SDL_CONFIG} --cflags`|' \
-		${WRKSRC}/Jamrules
-	@${REINPLACE_CMD} -e 's|%%SDL_LDFLAGS%%|`${SDL_CONFIG} --libs`|' \
+	@${REINPLACE_CMD} '/^LINKLIBS on gillo3/s|;$$|-L${LOCALBASE}/lib -lm ;|' \
 		${WRKSRC}/src/Jamfile
 
 do-build:
-	cd ${WRKSRC} && ${SETENV} "C++=${CC}" "LOCALBASE=${LOCALBASE}" \
-		"CFLAGS=${CFLAGS} -DDATADIR=\\\"${PREFIX}/share\\\"" \
+	cd ${WRKSRC} && ${SETENV} C++="${CXX}" C++FLAGS="${CXXFLAGS}" \
+		CCFLAGS="${CFLAGS} -DDATADIR=\\\"${PREFIX}/share\\\"" \
+		HDRS="${LOCALBASE}/include" \
+		LINK="${CXX}" LINKFLAGS="${LDFLAGS}" \
 		${JAM} -dx -sPREFIX=${PREFIX}
 
 do-install:
diff --git a/games/gillo/files/patch-Jamrules b/games/gillo/files/patch-Jamrules
index e7e8e2c160a7..9e2b3d04fbb2 100644
--- a/games/gillo/files/patch-Jamrules
+++ b/games/gillo/files/patch-Jamrules
@@ -1,15 +1,12 @@
 --- Jamrules.orig
 +++ Jamrules
-@@ -5,8 +5,9 @@
+@@ -5,8 +5,6 @@
  DATADIR = $(PREFIX)/share/gillo ; 
  DOCDIR  = $(PREFIX)/share/doc/gillo ; 
  
 -CCFLAGS  += -DENABLE_BINRELOC ;
 -if $(DEBUG) { CCFLAGS += -g -O0 -DDEBUG ; }
 -else CCFLAGS += -O3 ;
-+CCFLAGS  += $(CFLAGS) %%SDL_CFLAGS%% ;
-+HDRS = $(LOCALBASE)/include ;
-+#if $(DEBUG) { CCFLAGS += -g -O0 -DDEBUG ; }
-+#else CCFLAGS += -O3 ;
++OPTIM = ;
  C++FLAGS += $(CCFLAGS) ;
  #LINKFLAGS += -static ;
diff --git a/games/gillo/files/patch-src_Jamfile b/games/gillo/files/patch-src_Jamfile
deleted file mode 100644
index 0b9f4e2dcd44..000000000000
--- a/games/gillo/files/patch-src_Jamfile
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/Jamfile.orig
-+++ src/Jamfile
-@@ -2,6 +2,6 @@
- 
- Main gillo3 : camera.cpp cameraball.cpp cameratrack.cpp car.cpp context.cpp cube.cpp entity.cpp event.cpp field.cpp game.cpp goal.cpp goalkeeper.cpp img.cpp main.cpp menu.cpp omnicar.cpp overlay.cpp player.cpp pwrup.cpp rect.cpp simpleball.cpp sound.cpp video.cpp viewport.cpp prefix.c iballpicker.cpp ;
- 
--LINKLIBS on gillo3 =  -lpthread -lGL -lGLU -lSDL -lode -lplibssgaux -lplibssg -lplibsg -lplibul -lplibsl ;
-+LINKLIBS on gillo3 =  -lGL -lGLU -lode -lplibssgaux -lplibssg -lplibsg -lplibul -lplibsl -L$(LOCALBASE)/lib %%SDL_LDFLAGS%% ;
- 
- InstallBin $(BINDIR) : gillo3$(SUFEXE) ;
diff --git a/games/gnomebreakout/Makefile b/games/gnomebreakout/Makefile
index 26bf3782bb53..fba8808abc95 100644
--- a/games/gnomebreakout/Makefile
+++ b/games/gnomebreakout/Makefile
@@ -14,11 +14,12 @@ COMMENT=	GNOME version of the classic breakout game
 
 USES=		pathfix pkgconfig
 USE_GNOME=	gnomeprefix libgnomeui
+USE_XORG=	x11
 GNU_CONFIGURE=	yes
 USE_GCC=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib -lm
+LIBS+=		-L${LOCALBASE}/lib -lX11 -lm
 
 PORTDOCS=	AUTHORS ChangeLog NEWS README
 
diff --git a/games/gnurobbo/Makefile b/games/gnurobbo/Makefile
index c137caa8127e..abe9fcbea424 100644
--- a/games/gnurobbo/Makefile
+++ b/games/gnurobbo/Makefile
@@ -27,6 +27,7 @@ OPTIONS_DEFINE=	DOCS
 post-patch:
 	@${REINPLACE_CMD} -e '/define DEBUG_DUMP_VM_USAGE/ d' ${WRKSRC}/game.c
 	@${REINPLACE_CMD} -e '/^install:/,$$ s|$$([A-Z_]*DIR)|${STAGEDIR}&| g' \
+		-e '/^LIBS=/s/$$/ -lm/' \
 		${WRKSRC}/Makefile
 
 post-install:
diff --git a/games/goonies/Makefile b/games/goonies/Makefile
index b50d7abef352..0833efa315e7 100644
--- a/games/goonies/Makefile
+++ b/games/goonies/Makefile
@@ -18,6 +18,7 @@ USE_GL=		yes
 
 BUILD_WRKSRC=	${WRKSRC}/src
 MAKEFILE=	../build/linux/Makefile
+MAKE_ARGS=	CC="${CXX}"
 MAKE_ENV=	DATADIR="${DATADIR}"
 
 PLIST_FILES=	bin/${PORTNAME}
diff --git a/games/goonies/files/patch-build-linux-Makefile b/games/goonies/files/patch-build-linux-Makefile
index e4155ebbabe3..092ac03be7e8 100644
--- a/games/goonies/files/patch-build-linux-Makefile
+++ b/games/goonies/files/patch-build-linux-Makefile
@@ -15,7 +15,7 @@
 -LDFLAGS = `sdl-config --libs` -L/usr/X11R6/lib/ -lSDL_image -lSDL_mixer -lSDL_sound -lGL -lGLU
 +CC ?= c++
 +CFLAGS += -Wall `${SDL_CONFIG} --cflags` -I${LOCALBASE}/include
-+LDFLAGS += `${SDL_CONFIG} --libs` -L${LOCALBASE}/lib -lSDL_image -lSDL_mixer -lGL -lGLU
++LDFLAGS += `${SDL_CONFIG} --libs` -L${LOCALBASE}/lib -lSDL_image -lSDL_mixer -lGL -lGLU -lm
  RM = rm -f
  CP = cp -r
  LN = ln -s
diff --git a/games/holotz-castle/files/patch-src__Makefile b/games/holotz-castle/files/patch-src__Makefile
index 043a6523e380..01ad8c2de56b 100644
--- a/games/holotz-castle/files/patch-src__Makefile
+++ b/games/holotz-castle/files/patch-src__Makefile
@@ -20,7 +20,7 @@
 -CFLAGS=-fno-strict-aliasing -I. -I../JLib `$(SDL_CONFIG) --cflags` -I/usr/local/include/ -I/usr/local/include/SDL -O3 -Wall -Werror -Wshadow $(CPU_OPTS) -ffast-math -c
 -LDFLAGS=-L. -ffast-math -lSDL_image -lSDL_ttf -lSDL_mixer `$(SDL_CONFIG) --libs`
 +CXXFLAGS+=-I. -I../JLib `$(SDL_CONFIG) --cflags` -Wall -Wshadow -c
-+LDFLAGS=-L. -lSDL_image -lSDL_ttf -lSDL_mixer `$(SDL_CONFIG) --libs`
++LDFLAGS=-L. -lSDL_image -lSDL_ttf -lSDL_mixer `$(SDL_CONFIG) --libs` -lz
  
  
  JLib: 
diff --git a/games/lianliankan/Makefile b/games/lianliankan/Makefile
index 8da4be0cc129..255e410c855f 100644
--- a/games/lianliankan/Makefile
+++ b/games/lianliankan/Makefile
@@ -15,14 +15,13 @@ LICENSE=	GPLv3
 
 USES=		libtool pkgconfig
 USE_GNOME=	gtk20 esound
-USE_AUTOTOOLS=	aclocal automake autoconf libtoolize
+USE_AUTOTOOLS=	aclocal automake autoconf autoheader libtoolize
 GNU_CONFIGURE=	yes
 
-AUTOMAKE_ARGS=	--add-missing --copy
-ACLOCAL_ARGS=	-I ${LOCALBASE}/share/aclocal
+AUTOMAKE_ARGS=	-a -c -f
 
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+LIBS+=		-L${LOCALBASE}/lib
 
 DATADIR=	${PREFIX}/share/llk_linux
 
diff --git a/games/lianliankan/files/patch-src__Makefile.am b/games/lianliankan/files/patch-src__Makefile.am
index 5057b153eb3f..43c5d00a0f5d 100644
--- a/games/lianliankan/files/patch-src__Makefile.am
+++ b/games/lianliankan/files/patch-src__Makefile.am
@@ -1,22 +1,26 @@
 --- ./src/Makefile.am.orig	2006-01-01 16:53:12.000000000 +0100
 +++ ./src/Makefile.am	2013-12-27 10:51:14.000000000 +0100
-@@ -9,8 +9,7 @@
+@@ -8,11 +8,6 @@
+ 	$(PACKAGE_CFLAGS)\
  	 -I../ -I../include
  
- AM_CFLAGS =\
+-AM_CFLAGS =\
 -	`pkg-config --cflags --libs gtk+-2.0`\
 -	 -Wall\
-+	`pkg-config --cflags gtk+-2.0`\
- 	 -g
- 
+-	 -g
+-
  bin_PROGRAMS = llk_linux
-@@ -26,7 +25,8 @@
+ 
+ llk_linux_SOURCES = \
+@@ -25,10 +20,7 @@
+ 	eggtrayicon.c\
  	tray.c
  
- llk_linux_LDFLAGS = \
+-llk_linux_LDFLAGS = \
 -	-lesd
-+	-lesd \
-+	`pkg-config --libs gtk+-2.0`
- 
+-
  llk_linux_LDADD =  \
  	$(PACKAGE_LIBS)\
+-	 -lc -lesd
++	 -lX11 -lesd
+ 
diff --git a/games/liquidwar/files/patch-src-Makefile.in b/games/liquidwar/files/patch-src-Makefile.in
new file mode 100644
index 000000000000..dc2f07e18f23
--- /dev/null
+++ b/games/liquidwar/files/patch-src-Makefile.in
@@ -0,0 +1,11 @@
+--- src/Makefile.in.orig
++++ src/Makefile.in
+@@ -250,7 +250,7 @@
+ 
+ liquidwar-mapgen: $(OBJ_FILES_MAPGEN)
+ 	@echo "Linking $@ (target=$(TARGET), debug=$(DEBUG), static=$(STATIC))"
+-	@$(CC) $(LDFLAGS) $(LINK_OPTIONS) -o $@ $(OBJ_FILES_MAPGEN) $(PTHREAD) $(EXTERN_LIBS) 
++	@$(CC) $(LDFLAGS) $(LINK_OPTIONS) -o $@ $(OBJ_FILES_MAPGEN) $(PTHREAD) $(EXTERN_LIBS) -lm
+ 
+ dep:
+ 	@find . \
diff --git a/games/lucidlife/Makefile b/games/lucidlife/Makefile
index 786a8de04338..40d080318aad 100644
--- a/games/lucidlife/Makefile
+++ b/games/lucidlife/Makefile
@@ -12,8 +12,12 @@ COMMENT=	GTK2 implementation of Conway's Game of Life
 
 USES=		gmake pkgconfig
 USE_GNOME=	gtk20 gnomevfs2 intlhack
+USE_XORG=	x11
 GNU_CONFIGURE=	yes
 
 OPTIONS_DEFINE=	DOCS
 
+post-patch:
+	@${REINPLACE_CMD} '/^GNOME_MODULES=/s/"$$/ x11"/' ${WRKSRC}/configure
+
 .include <bsd.port.mk>
diff --git a/games/luola/Makefile b/games/luola/Makefile
index 235ef53421b0..b1c67b72dbc0 100644
--- a/games/luola/Makefile
+++ b/games/luola/Makefile
@@ -18,6 +18,7 @@ GNU_CONFIGURE=	yes
 USES=		gmake
 USE_SDL=	sdl image ttf
 CONFIGURE_ARGS=	--program-prefix=''
+LIBS+=		-lm
 
 PLIST_FILES=	bin/${PORTNAME} \
 		share/pixmaps/${PORTNAME}.png
diff --git a/games/macopix/Makefile b/games/macopix/Makefile
index b8e4c0603b25..8d6d28fb4e93 100644
--- a/games/macopix/Makefile
+++ b/games/macopix/Makefile
@@ -29,12 +29,12 @@ RESTRICTED_FILES=	\
 		macopix-mascot-marimite-euc-ja-2.20.tar.gz \
 		macopix-mascot-HxB-euc-ja-0.30.tar.gz
 
-WANT_GNOME=	yes
-USES=		gettext gmake iconv pkgconfig
+USES=		gettext gmake iconv libtool pkgconfig
+USE_XORG=	x11
 GNU_CONFIGURE=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB}
+LIBS+=		-L${LOCALBASE}/lib -lX11 ${ICONV_LIB}
 
 OPTIONS_DEFINE=	DOCS GNUTLS GTK1
 
diff --git a/games/meritous/files/patch-Makefile b/games/meritous/files/patch-Makefile
index 95a69cceefe3..02a67d7c20d2 100644
--- a/games/meritous/files/patch-Makefile
+++ b/games/meritous/files/patch-Makefile
@@ -6,7 +6,7 @@
  #
 -LDFLAGS = `sdl-config --libs` -lSDL_image -lSDL_mixer -lz
 -CCFLAGS = -O2 -Wall `sdl-config --cflags` -g
-+LDFLAGS = `${SDL_CONFIG} --libs` -lSDL_image -lSDL_mixer -lz
++LDFLAGS = `${SDL_CONFIG} --libs` -lSDL_image -lSDL_mixer -lz -lm
 +CCFLAGS = ${CFLAGS} -Wall `${SDL_CONFIG} --cflags`
  #
  OBJS = 	src/levelblit.o \
diff --git a/games/monkeybubble/Makefile b/games/monkeybubble/Makefile
index faa992a268cd..3f729e0fb8ec 100644
--- a/games/monkeybubble/Makefile
+++ b/games/monkeybubble/Makefile
@@ -13,13 +13,13 @@ COMMENT=	GTK2 Puzzle Bobble clone with monkeys
 
 LICENSE=	GPLv2
 
-USES=		pathfix gmake pkgconfig
+USES=		gmake libtool pathfix pkgconfig
 USE_GNOME=	gnomedocutils gnomeprefix intlhack \
 		librsvg2 libgnomeui
 USE_GSTREAMER=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+LIBS+=		-L${LOCALBASE}/lib -lm
 INSTALLS_OMF=	yes
 
 GCONF_SCHEMAS=	monkey-bubble.schemas
diff --git a/games/motogt/Makefile b/games/motogt/Makefile
index 2397475b01ef..425db2d5b573 100644
--- a/games/motogt/Makefile
+++ b/games/motogt/Makefile
@@ -21,14 +21,14 @@ LICENSE_PERMS_CCbySA=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 LICENSE_FILE_CCbySA=	${WRKSRC}/doc/cc-by-sa.txt
 
 USES=		zip
+USE_GL=		gl
 BUILD_WRKSRC=	${WRKSRC}/src
 MAKEFILE=	Makefile.lnx
 MAKE_JOBS_UNSAFE=	yes
 CFLAGS+=	-I${LOCALBASE}/include/libpng15
-MAKE_ENV+=	PTHREAD_LIBS="${PTHREAD_LIBS}"
 SUB_FILES=	motogt
 CXXFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 PLIST_FILES=	bin/${PORTNAME} libexec/MotoGT.bin
 PORTDATA=	*
diff --git a/games/motogt/files/patch-src-Makefile.lnx b/games/motogt/files/patch-src-Makefile.lnx
index 9905f7ac207c..aba2597dfd59 100644
--- a/games/motogt/files/patch-src-Makefile.lnx
+++ b/games/motogt/files/patch-src-Makefile.lnx
@@ -8,7 +8,7 @@
 -TEMP_DIR=../tmp-lnx
 +CXX?=		g++
 +CXXFLAGS?=	-O2 -ffast-math
-+LIBS=		-lpng -lsfml-window -lsfml-graphics -lsfml-system -lsfml-audio
++LIBS=		-lpng -lsfml-window -lsfml-graphics -lsfml-system -lsfml-audio -lGL
 +LDFLAGS?=	-s
 +TEMP_DIR=	../tmp-lnx
  
diff --git a/games/naev/Makefile b/games/naev/Makefile
index e4e87944397c..993980dec282 100644
--- a/games/naev/Makefile
+++ b/games/naev/Makefile
@@ -26,7 +26,7 @@ USE_SDL=	sdl image
 
 CONFIGURE_ARGS=	--with-ndata-path=${DATADIR}/ndata-${PORTVERSION}
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+LIBS+=		-L${LOCALBASE}/lib -lm
 
 PLIST_FILES=	bin/${PORTNAME} man/man6/naev.6.gz
 SUB_FILES=	pkg-message
diff --git a/games/neverball/Makefile b/games/neverball/Makefile
index ac4fcbc1322d..8fc7895d5f55 100644
--- a/games/neverball/Makefile
+++ b/games/neverball/Makefile
@@ -27,8 +27,6 @@ USE_XORG=	x11
 PORTDOCS=	CHANGES COPYING README
 PORTDATA=	*
 
-LDFLAGS+=	-lX11 # calls X functions directly, but doesn't link libX11
-
 OPTIONS_DEFINE=	DOCS NLS
 
 .include <bsd.port.options.mk>
diff --git a/games/neverball/files/patch-Makefile b/games/neverball/files/patch-Makefile
index b5284cddd4f1..303107227d21 100644
--- a/games/neverball/files/patch-Makefile
+++ b/games/neverball/files/patch-Makefile
@@ -16,7 +16,7 @@
  endif
  
 +ifdef FREEBSD
-+    BASE_LIBS += -L%%LOCALBASE%%/lib
++    BASE_LIBS += -L%%LOCALBASE%%/lib -lX11 -lm
 +
 +    ifneq ($(ENABLE_NLS),0)
 +        INTL_LIBS := -lintl %%ICONV_LIB%%
diff --git a/games/noegnud-littlehack/files/noegnud-littlehack.patch b/games/noegnud-littlehack/files/noegnud-littlehack.patch
index 67ba867c6ad8..bc999421c525 100644
--- a/games/noegnud-littlehack/files/noegnud-littlehack.patch
+++ b/games/noegnud-littlehack/files/noegnud-littlehack.patch
@@ -73,7 +73,7 @@ diff -urN variants/littlehack-0.0.1.orig/sys/unix/Makefile.src variants/littleha
 +CFLAGS += $(STD_CFLAGS)
  
 -LFLAGS = -L/usr/X11R6/lib
-+LFLAGS = -L${LOCALBASE}/lib -lgnuregex
++LFLAGS = -L${LOCALBASE}/lib -lgnuregex -lm
  
  #   OR compile backwards compatible a.out format
  # CFLAGS = -O2 -b i486-linuxaout -fomit-frame-pointer -I../include
diff --git a/games/noegnud-nethack-deet/files/noegnud-nethack-deet.patch b/games/noegnud-nethack-deet/files/noegnud-nethack-deet.patch
index e6d94e177cdd..1847cfcf94b3 100644
--- a/games/noegnud-nethack-deet/files/noegnud-nethack-deet.patch
+++ b/games/noegnud-nethack-deet/files/noegnud-nethack-deet.patch
@@ -82,7 +82,7 @@ diff -urN variants/nethack-3.4.2-deet.orig/sys/unix/Makefile.src variants/nethac
 +CFLAGS += $(STD_CFLAGS)
  
 -LFLAGS = -L/usr/X11R6/lib
-+LFLAGS = -L${LOCALBASE}/lib -lgnuregex
++LFLAGS = -L${LOCALBASE}/lib -lgnuregex -lm
  
  #   OR compile backwards compatible a.out format
  # CFLAGS = -O2 -b i486-linuxaout -fomit-frame-pointer -I../include
diff --git a/games/noegnud-nethack/files/noegnud-nethack.patch b/games/noegnud-nethack/files/noegnud-nethack.patch
index f9ae4b49ed26..2c6e40b737b2 100644
--- a/games/noegnud-nethack/files/noegnud-nethack.patch
+++ b/games/noegnud-nethack/files/noegnud-nethack.patch
@@ -73,7 +73,7 @@ diff -urN variants/nethack-3.4.3.orig/sys/unix/Makefile.src variants/nethack-3.4
 +CFLAGS += $(STD_CFLAGS)
  
 -LFLAGS = -L/usr/X11R6/lib
-+LFLAGS = -L${LOCALBASE}/lib -lgnuregex
++LFLAGS = -L${LOCALBASE}/lib -lgnuregex -lm
  
  #   OR compile backwards compatible a.out format
  # CFLAGS = -O2 -b i486-linuxaout -fomit-frame-pointer -I../include
diff --git a/games/noegnud-slashem/files/noegnud-slashem.patch b/games/noegnud-slashem/files/noegnud-slashem.patch
index 0b61d3dd3c32..786aa68fcf8b 100644
--- a/games/noegnud-slashem/files/noegnud-slashem.patch
+++ b/games/noegnud-slashem/files/noegnud-slashem.patch
@@ -54,7 +54,7 @@ diff -urN variants/slashem-0.0.6E4F8.orig/sys/unix/Makefile.src variants/slashem
  
  WINNOEGNUDCFLAGS = 
 -WINNOEGNUDLIB = `sdl-config --libs` -lSDL_image -lSDL_mixer -lGL -lGLU
-+WINNOEGNUDLIB = `${SDL_CONFIG} --libs` -lSDL_image -lSDL_mixer -lGL -lGLU -lgnuregex
++WINNOEGNUDLIB = `${SDL_CONFIG} --libs` -lSDL_image -lSDL_mixer -lGL -lGLU -lgnuregex -lm
 +
 +.c.o:
 +	${CC} ${CFLAGS} -c $< -o $@
diff --git a/games/nuclearchess/Makefile b/games/nuclearchess/Makefile
index 7f33e45b5726..6f687972851f 100644
--- a/games/nuclearchess/Makefile
+++ b/games/nuclearchess/Makefile
@@ -28,6 +28,10 @@ OPTIONS_DEFINE=	DOCS
 DESKTOP_ENTRIES="NuclearChess" "" "${PORTNAME}" \
 		"${PORTNAME}" "Game;BoardGame;" ""
 
+post-patch:
+	@${REINPLACE_CMD} '/^nuclearchess_LDADD =/s/$$/ -lm/' \
+		${WRKSRC}/src/Makefile.in
+
 post-install:
 	${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/
diff --git a/games/openjazz/files/patch-Makefile b/games/openjazz/files/patch-Makefile
index c5c8f6924511..f17f84929b07 100644
--- a/games/openjazz/files/patch-Makefile
+++ b/games/openjazz/files/patch-Makefile
@@ -5,11 +5,11 @@
  
  OpenJazz: $(objects)
 -	cc -Wall -o OpenJazz -lSDL -lstdc++ -lz $(objects)
-+	${CC} ${LDFLAGS} -Wall -o OpenJazz -lstdc++ -lz $(objects)
++	${CXX} ${LDFLAGS} -Wall -o OpenJazz $(objects) -lz -lm
  
  %.o: %.cpp
 -	cc -Wall -DUSE_SOCKETS -DSCALE -Isrc -O2 -c $< -o $@
-+	${CC} ${CPPFLAGS} ${CFLAGS} -Wall -DUSE_SOCKETS -DSCALE -Isrc -c $< -o $@
++	${CXX} ${CPPFLAGS} ${CFLAGS} -Wall -DUSE_SOCKETS -DSCALE -Isrc -c $< -o $@
  
  clean:
  	rm -f OpenJazz $(objects)
diff --git a/games/pacmanarena/Makefile b/games/pacmanarena/Makefile
index eb80bfb7c4ce..47089cc58ec0 100644
--- a/games/pacmanarena/Makefile
+++ b/games/pacmanarena/Makefile
@@ -22,6 +22,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME:S/arena//}
 
 USE_SDL=	mixer net sdl
 GNU_CONFIGURE=	yes
+LDFLAGS+=	-lm
 
 PORTDOCS=	README
 OPTIONS_DEFINE=	DOCS
diff --git a/games/phlipple/Makefile b/games/phlipple/Makefile
index 463ca2bad229..1b73950c5536 100644
--- a/games/phlipple/Makefile
+++ b/games/phlipple/Makefile
@@ -19,7 +19,7 @@ USE_SDL=	sdl mixer image
 USE_GL=		gl glu
 
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+LIBS+=		-L${LOCALBASE}/lib -lm
 
 PLIST_FILES=	bin/${PORTNAME} \
 		share/applications/${PORTNAME}.desktop \
diff --git a/games/powermanga/Makefile b/games/powermanga/Makefile
index 3238e6674a77..e5ce733cdb56 100644
--- a/games/powermanga/Makefile
+++ b/games/powermanga/Makefile
@@ -21,12 +21,13 @@ USE_XORG=	xext xxf86dga
 USE_SDL=	sdl mixer
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	aclocal automake autoconf autoheader
+AUTOMAKE_ARGS=	-a -c -f --foreign
 
 PORTDOCS=	*
 PORTDATA=	*
 
 CFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+LIBS+=		-L${LOCALBASE}/lib -lm
 
 .include <bsd.port.options.mk>
 
@@ -43,9 +44,6 @@ post-patch:
 		${WRKSRC}/src/tools.c
 	@${REINPLACE_CMD} -e 's|Lang=fr|Lang=en|' ${WRKSRC}/texts/config.ini
 
-run-autotools:
-	cd ${WRKSRC} && ${SH} ./bootstrap
-
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/powermanga.desktop ${STAGEDIR}${PREFIX}/share/applications/
 	${INSTALL_DATA} ${WRKSRC}/powermanga.xpm ${STAGEDIR}${PREFIX}/share/pixmaps/
diff --git a/games/simplevaders/Makefile b/games/simplevaders/Makefile
index 53f196f734d3..8f7470d8ee1e 100644
--- a/games/simplevaders/Makefile
+++ b/games/simplevaders/Makefile
@@ -27,9 +27,9 @@ post-patch:
 	@${RM} ${WRKSRC}/data/*\~
 
 do-build:
-	cd ${WRKSRC} && ${CC} ${CFLAGS} main.cpp -o ${PORTNAME} \
-		`${SDL_CONFIG} --cflags --libs` -lSDL_ttf -lSDL_mixer \
-		-lSDL_image -lGL -lGLU
+	(cd ${WRKSRC} && ${CXX} ${CPPFLAGS} ${CXXFLAGS} ${LDFLAGS} main.cpp \
+		-o ${PORTNAME} `${SDL_CONFIG} --cflags --libs` -lSDL_ttf \
+		-lSDL_mixer -lSDL_image -lGL -lGLU)
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
diff --git a/games/thevalley/Makefile b/games/thevalley/Makefile
index 4bd516f23d12..2f53dfa73fff 100644
--- a/games/thevalley/Makefile
+++ b/games/thevalley/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	thevalley
 PORTVERSION=	0.98
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	games
 MASTER_SITES=	http://www.autismuk.freeserve.co.uk/
 DISTNAME=	valley-${PORTVERSION}
@@ -11,21 +11,14 @@ DISTNAME=	valley-${PORTVERSION}
 MAINTAINER=	edwin@mavetju.org
 COMMENT=	The Valley is a rewrite of an old RPG from the early 1980s
 
-USE_AUTOTOOLS=	libtoolize
 GNU_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}
 USE_SDL=	sdl
 USES=		libtool perl5
 USE_PERL5=	build
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
-CXXFLAGS+=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include
+CXXFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib -lm
 
 PLIST_FILES=	bin/valley
 
-post-configure:
-	${REINPLACE_CMD} \
-		-e 's,^LIBTOOL =.*,LIBTOOL= $$(SHELL) ${LIBTOOL} --silent,' \
-		-e 's,^transform =.*,transform = s\,^\,\,,' \
-		${WRKSRC}/valley/Makefile
-
 .include <bsd.port.mk>
diff --git a/games/viruskiller/Makefile b/games/viruskiller/Makefile
index ef3e0c4c4525..7b4c8c8a40dc 100644
--- a/games/viruskiller/Makefile
+++ b/games/viruskiller/Makefile
@@ -31,6 +31,7 @@ post-patch:
 		 /^DOCDIR/s|=.*|= $$(DESTDIR)$$(PREFIX)/${DOCSDIR_REL}/| ; \
 		 /^ICONDIR/s|=.*|= $$(DESTDIR)$$(PREFIX)/share/icons/hicolor/| ; \
 		 /^DESKTOPDIR/s|=.*|= $$(DESTDIR)$$(PREFIX)/share/applications/| ; \
+		 /^LIBS =/s|$$| -lz| ; \
 		 s|install .* 755|$${BSD_INSTALL_PROGRAM}| ; \
 		 s|install .* 644|$${BSD_INSTALL_DATA}| ; \
 		 /ICONS/s|cp|$${BSD_INSTALL_DATA}|' ${WRKSRC}/makefile
diff --git a/games/volleyball/Makefile b/games/volleyball/Makefile
index d1765263c5ac..d076ffed9453 100644
--- a/games/volleyball/Makefile
+++ b/games/volleyball/Makefile
@@ -13,11 +13,12 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Game similar to GNU Arcade Volleyball
 
+USES=		gmake
 USE_SDL=	sdl image mixer
 GNU_CONFIGURE=	yes
-USES=		gettext gmake
-LDFLAGS+=	-L${LOCALBASE}/lib -lintl
 CONFIGURE_ARGS=	--mandir="${MANPREFIX}/man" --disable-nls # strangeness in nls support
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib -lm
 
 PLIST_FILES=	bin/${PORTNAME} \
 		man/man6/volleyball.6.gz
@@ -33,6 +34,11 @@ DESKTOP_ENTRIES="Pocket Volleyball" \
 		"Game;SportsGame;ArcadeGame;" \
 		false
 
+post-patch:
+	@${REINPLACE_CMD} '/libintl\.h/d' ${WRKSRC}/src/common.h
+	@${REINPLACE_CMD} -e '/setlocale/d' -e '/textdomain/d' \
+		${WRKSRC}/src/volleyball.c
+
 post-configure:
 	cd ${WRKDIR}/${PORTNAME}-data-${DATAVERSION} && \
 		${SETENV} ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}
diff --git a/games/vor/Makefile b/games/vor/Makefile
index 39d57555066f..a85ca86f90c0 100644
--- a/games/vor/Makefile
+++ b/games/vor/Makefile
@@ -14,6 +14,7 @@ COMMENT=	Dodge the rocks until you die
 USES=		tar:bzip2 gmake
 USE_SDL=	mixer image sdl
 GNU_CONFIGURE=	yes
+LDFLAGS+=	-lm
 
 PLIST_FILES=	bin/${PORTNAME}
 PORTDOCS=	*
diff --git a/games/wargus/Makefile b/games/wargus/Makefile
index ed15d06a5980..30cd4d7ab8b8 100644
--- a/games/wargus/Makefile
+++ b/games/wargus/Makefile
@@ -23,8 +23,16 @@ USE_GNOME=	gtk20
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 SUB_FILES=	${PORTNAME} pkg-message
 
-MAKE_ARGS+=	CFLAGS+="-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15" LDFLAGS+=-L${LOCALBASE}/lib
-
+CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15
+LDFLAGS+=	-L${LOCALBASE}/lib
+
+post-patch:
+	@${REINPLACE_CMD} \
+		-e '/^CFLAGS/s|-O2|${CPPFLAGS} ${CFLAGS}|' \
+		-e '/^CXXFLAGS/s|$$| ${CXXFLAGS}|' \
+		-e '/^LDFLAGS/s|$$| ${LDFLAGS}|' \
+		-e '/^GTKFLAGS/s/gtk+-2.0/& x11/' \
+		${WRKSRC}/Makefile
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	cd ${WRKSRC} && ${COPYTREE_SHARE} "campaigns contrib maps scripts" ${STAGEDIR}${DATADIR}