11 files changed, 33 insertions, 51 deletions

diff --git a/games/alephone/Makefile b/games/alephone/Makefile
index 3699037309bc..f31870e1754f 100644
--- a/games/alephone/Makefile
+++ b/games/alephone/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	alephone
 PORTVERSION=	20120514
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	SF/marathon/Aleph%20One/2012-05-14
 DISTNAME=	AlephOne-${PORTVERSION}
@@ -13,21 +13,14 @@ COMMENT=	The open source version of Bungie's Marathon game
 
 BUILD_DEPENDS+=	${LOCALBASE}/include/boost/function.hpp:${PORTSDIR}/devel/boost-libs
 
-USE_GMAKE=	yes
-
-USES=		pkgconfig
-USE_BZIP2=	yes
-USE_SDL+=	image net sdl sound
+USES=		gmake pkgconfig tar:bzip2
+USE_SDL=	image net sdl sound
 USE_GL=		yes
-PKG_CONFIG?=	${LOCALBASE}/bin/pkg-config
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--disable-alsa --disable-sndfile
-CONFIGURE_ENV=	PKG_CONFIG="${PKG_CONFIG}"
 
 DATADIR=	${PREFIX}/share/AlephOne
 
-MAN6=		alephone.6
-
 OPTIONS_DEFINE=	MAD OGG SPEEX SMPEG TTF ZZIP
 SMPEG_DESC=	Use SMPEG for movie playback
 TTF_DESC=	Enable SDL_ttf font rendering
@@ -35,29 +28,28 @@ ZZIP_DESC=	Enable zziplib support
 
 OPTIONS_DEFAULT=	MAD OGG SPEEX SMPEG TTF ZZIP
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMAD}
-LIB_DEPEND+=	mad.2:${PORTSDIR}/audio/libmad
+LIB_DEPEND+=	libmad.so:${PORTSDIR}/audio/libmad
 .else
 CONFIGURE_ARGS+=--disable-mad
 .endif
 
 .if ${PORT_OPTIONS:MOGG}
-LIB_DEPEND+=	vorbisfile.6:${PORTSDIR}/audio/libvorbis
+LIB_DEPEND+=	libvorbisfile.so:${PORTSDIR}/audio/libvorbis
 .else
 CONFIGURE_ARGS+=--disable-vorbis
 .endif
 
 .if ${PORT_OPTIONS:MSPEEX}
-LIB_DEPENDS+=	speex.1:${PORTSDIR}/audio/speex
+LIB_DEPENDS+=	libspeex.so:${PORTSDIR}/audio/speex
 .else
 CONFIGURE_ARGS+=--disable-speex
 .endif
 
 .if ${PORT_OPTIONS:MSMPEG}
-LIB_DEPENDS+=	smpeg.1:${PORTSDIR}/multimedia/smpeg
+LIB_DEPENDS+=	libsmpeg.so:${PORTSDIR}/multimedia/smpeg
 .else
 CONFIGURE_ARGS+=--disable-smpeg
 .endif
@@ -69,19 +61,16 @@ CONFIGURE_ARGS+=--disable-ttf
 .endif
 
 .if ${PORT_OPTIONS:MZZIP}
-LIB_DEPENDS+=	zzip.13:${PORTSDIR}/devel/zziplib
+LIB_DEPENDS+=	libzzip.so:${PORTSDIR}/devel/zziplib
 .else
 CONFIGURE_ARGS+=--disable-zzip
 .endif
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} README ${DOCSDIR}
-	cd ${WRKSRC}/docs && ${INSTALL_DATA} *.html ${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} README ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC}/docs && ${INSTALL_DATA} *.html ${STAGEDIR}${DOCSDIR}
 .endif
-	@${ECHO_CMD}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_CMD}
 
 .include <bsd.port.mk>
diff --git a/games/alephone/pkg-plist b/games/alephone/pkg-plist
index 1dbd89580bbf..cf857b79a57f 100644
--- a/games/alephone/pkg-plist
+++ b/games/alephone/pkg-plist
@@ -1,4 +1,5 @@
 bin/alephone
+man/man6/alephone.6.gz
 %%DATADIR%%/Fonts
 %%DATADIR%%/MML/Interface_Rects.mml
 %%DATADIR%%/MML/Transparent_Liquids.mml
diff --git a/games/asc/Makefile b/games/asc/Makefile
index 9ed690fe11db..f8a64ff0ac08 100644
--- a/games/asc/Makefile
+++ b/games/asc/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	asc
 PORTVERSION=	2.6.0.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}-hq/ASC%20Source/${PORTVERSION:R} \
 		http://www.asc-hq.org/music/:music
@@ -27,7 +27,7 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 OPTIONS_DEFINE=	MUSIC XVID
 MUSIC_DESC=	Install extra music files
 
-USES=		gmake perl5 pkgconfig tar:bzip2
+USES=		gmake libtool perl5 pkgconfig tar:bzip2
 USE_SDL=	image mixer sound sdl
 USE_WX=		3.0
 WX_UNICODE=	yes
diff --git a/games/avoision/Makefile b/games/avoision/Makefile
index 00f764aebb20..73302adea51a 100644
--- a/games/avoision/Makefile
+++ b/games/avoision/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	avoision
 PORTVERSION=	1.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	SF/avsn/
 
diff --git a/games/cretan-hubris/Makefile b/games/cretan-hubris/Makefile
index 7c6ee4602bc1..02244f4b3f18 100644
--- a/games/cretan-hubris/Makefile
+++ b/games/cretan-hubris/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	cretan-hubris
 PORTVERSION=	0.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	SF/radius-engine/egp/
 
diff --git a/games/f1spirit-remake/Makefile b/games/f1spirit-remake/Makefile
index 0520c38658a2..d94a2937deb2 100644
--- a/games/f1spirit-remake/Makefile
+++ b/games/f1spirit-remake/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	f1spirit-remake
 PORTVERSION=	1.0
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	games
 # Original braingames site is really slow
 MASTER_SITES=	http://mirror.amdmi3.ru/distfiles/ \
diff --git a/games/fbg2/Makefile b/games/fbg2/Makefile
index 014428963356..47c791bc96ee 100644
--- a/games/fbg2/Makefile
+++ b/games/fbg2/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	fbg2
 PORTVERSION=	0.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	SF/fbg/
 
diff --git a/games/gltron/Makefile b/games/gltron/Makefile
index dc78d46cb10b..8fec8233b48f 100644
--- a/games/gltron/Makefile
+++ b/games/gltron/Makefile
@@ -3,27 +3,29 @@
 
 PORTNAME=	gltron
 PORTVERSION=	0.70
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-source/${PORTVERSION}
 EXTRACT_SUFX=	-source.tar.gz
 
 MAINTAINER=	lx@FreeBSD.org
-COMMENT=	A 3D worm game for two players for X Window System
+COMMENT=	3D worm game for two players for X Window System
 
-LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png
 
+USES=		gmake
 USE_GL=		gl
 USE_SDL=	sdl sound
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-warn
 
-CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS_DEFINE=	SDL_NET
 SDL_NET_DESC=	Network Support
+SDL_NET_USE=	SDL=net
+SLD_NET_CONFIGURE_ENABLE=	network
 
 DESKTOP_ENTRIES=	"GLtron" \
 	"3D lightcycle game" \
@@ -32,14 +34,6 @@ DESKTOP_ENTRIES=	"GLtron" \
 	"Game;ArcadeGame;" \
 	false
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MSDL_NET}
-USE_SDL+=	net
-CONFIGURE_ARGS+=	--enable-network
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|CFLAGS="-D|CFLAGS="$$CFLAGS -D|g ; \
 		 s|-O$$enable_optimize||g' ${WRKSRC}/configure
@@ -49,11 +43,9 @@ post-patch:
 		 s|-ansi -pedantic||g'
 
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for file in ChangeLog README
-	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 
 .include <bsd.port.mk>
diff --git a/games/qtads/Makefile b/games/qtads/Makefile
index 573acde5cd0d..ad7a623caf81 100644
--- a/games/qtads/Makefile
+++ b/games/qtads/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	qtads
 PORTVERSION=	2.1.6
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-2.x/${PORTVERSION}
 
@@ -11,8 +12,7 @@ COMMENT=	Cross-platform multimedia interpreter for TADS games
 
 LICENSE=	GPLv2
 
-USES=		gmake pkgconfig qmake
-USE_BZIP2=	yes
+USES=		gmake pkgconfig qmake tar:bzip2
 USE_QT4=	gui moc_build network rcc_build uic_build
 USE_SDL=	sdl mixer sound
 
diff --git a/games/stransball2/Makefile b/games/stransball2/Makefile
index f70095c91212..ba4abeddec95 100644
--- a/games/stransball2/Makefile
+++ b/games/stransball2/Makefile
@@ -3,14 +3,14 @@
 
 PORTNAME=	stransball2
 PORTVERSION=	1.5
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	games
 MASTER_SITES=	http://mirror.amdmi3.ru/distfiles/ \
 		http://braingames.bugreport.nl/stransball2/
 DISTNAME=	${PORTNAME}-v${PORTVERSION:C/\.//}-linux
 
 MAINTAINER=	amdmi3@FreeBSD.org
-COMMENT=	A sequel to Transball and Transball 2 THRUST-type games
+COMMENT=	Sequel to Transball and Transball 2 THRUST-type games
 
 LIB_DEPENDS=	libSGE.so:${PORTSDIR}/devel/sdl_sge
 
diff --git a/games/thegrind/Makefile b/games/thegrind/Makefile
index 74299198ad32..6749f1584a6a 100644
--- a/games/thegrind/Makefile
+++ b/games/thegrind/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	thegrind
 PORTVERSION=	0.1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	SF/radius-engine/ld21/