24 files changed, 54 insertions, 19 deletions

diff --git a/games/HeroesOfMightAndMagic/Makefile b/games/HeroesOfMightAndMagic/Makefile
index 728d626bb628..1518ee2cebdc 100644
--- a/games/HeroesOfMightAndMagic/Makefile
+++ b/games/HeroesOfMightAndMagic/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	HeroesOfMightAndMagic
 PORTVERSION=	3
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=
 DISTFILES=
@@ -14,12 +15,12 @@ DISTFILES=
 MAINTAINER=	holger@e-gitt.net
 COMMENT=	BSD Installation of the Linux game "Heroes of Might and Magic III"
 
-RUN_DEPENDS=	${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base \
-		${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-toolkits/linux-gtk
+RUN_DEPENDS=	${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-toolkits/linux-gtk
 
 PLIST=		${WRKDIR}/PLIST
 IS_INTERACTIVE=	yes
 ONLY_FOR_ARCHS=	i386
+USE_LINUX=	yes
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 NO_CDROM=	Software is commercial
diff --git a/games/adom/Makefile b/games/adom/Makefile
index f4058c6f85a3..7d1dbc1f39bd 100644
--- a/games/adom/Makefile
+++ b/games/adom/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	adom
 PORTVERSION=	1.1.1
+PORTREVISION=	1
 CATEGORIES=	games linux
 MASTER_SITES=	http://www.adom.de/adom/download/linux/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//g}-elf
@@ -14,6 +15,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//g}-elf
 MAINTAINER=	sr-13@mail.ru
 COMMENT=	An rogue-like advanced rpg with color support (binary port)
 
+RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
+
 NO_CDROM=	Copy of CD must be sent to author
 
 ONLY_FOR_ARCHS=	i386
diff --git a/games/atitd/Makefile b/games/atitd/Makefile
index 5c3c3e8c748e..1679993b0c33 100644
--- a/games/atitd/Makefile
+++ b/games/atitd/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	atitd
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	games graphics linux
 MASTER_SITES=	http://www.atitd.com/
 DISTNAME=	eClient-linux.run
diff --git a/games/dsnake/Makefile b/games/dsnake/Makefile
index f207f1ab3d71..7ab55814583c 100644
--- a/games/dsnake/Makefile
+++ b/games/dsnake/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	dsnake
 PORTVERSION=	3.0.0
+PORTREVISION=	1
 CATEGORIES=	games linux
 MASTER_SITES=	http://bitblaze.com/downloads/
 DISTNAME=	${PORTNAME}-linux-${PORTVERSION}
@@ -20,7 +21,8 @@ NO_PACKAGE=	Licence forbids any repacking and reselling
 
 ONLY_FOR_ARCHS=	i386
 NO_BUILD=	yes
-USE_X_PREFIX=	yes
+PREFIX?=	${X11BASE}
+USE_LINUX=	yes
 WRKSRC=		${WRKDIR}/DeluxeSnake
 
 do-install:
diff --git a/games/halflifeserver/Makefile b/games/halflifeserver/Makefile
index 1257cc7d2080..4989f8948a2a 100644
--- a/games/halflifeserver/Makefile
+++ b/games/halflifeserver/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	hlds
 PORTVERSION=	3.1.1.1.d
+PORTREVISION=	1
 CATEGORIES=	games linux
 MASTER_SITES=	http://www.isis.de/members/~hmenze/cs/server/linux/
 DISTFILES=	hlds_l_3111_full.tar.gz \
@@ -17,6 +18,7 @@ COMMENT=	Half-Life Dedicated Server for Linux
 
 ONLY_FOR_ARCHS=	i386
 USE_LINUX_PREFIX=	yes
+USE_LINUX=	yes
 USE_PERL5=	yes
 NO_CDROM=	"Size; the data set is much too big"
 NO_BUILD=	yes
diff --git a/games/hlserver-cs/Makefile b/games/hlserver-cs/Makefile
index 97be1a8db4f2..5c2a84031f15 100644
--- a/games/hlserver-cs/Makefile
+++ b/games/hlserver-cs/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME?=	cs
 PORTVERSION?=	1.5
+PORTREVISION?=	1
 CATEGORIES?=	games linux
 MASTER_SITES?=	http://files.redphive.org/ \
 		http://www.jetstreamgames.co.nz/files/pub/halflife/cstrike/ \
@@ -25,6 +26,7 @@ USE_SUBMAKE=	yes
 
 ONLY_FOR_ARCHS=	i386
 USE_LINUX_PREFIX=	yes
+USE_LINUX=	yes
 USE_PERL5=	yes
 NO_CDROM=	"Size; the data set is much too big"
 NO_BUILD=	yes
diff --git a/games/hohlin/Makefile b/games/hohlin/Makefile
index bbb43c17487c..c09c21026a9d 100644
--- a/games/hohlin/Makefile
+++ b/games/hohlin/Makefile
@@ -17,6 +17,8 @@ DISTNAME=	${PORTNAME}-${SHORTPORTVERSION}
 MAINTAINER=	janos.mohacsi@bsd.hu
 COMMENT=	Remake of the classic spectrum game Head over Heels
 
+RUN_DEPENDS+=	${LINUXBASE}/usr/X11R6/lib/libXrandr.so.2:${PORTSDIR}/x11/linux-XFree86-libs
+
 WRKSRC=		${WRKDIR}/hoh-install-${PORTVERSION}/
 
 USE_BZIP2=	YES
@@ -25,12 +27,7 @@ ONLY_FOR_ARCHS=	i386
 SHORTPORTVERSION=${PORTVERSION:C/([0-9]*)\.([0-9]*)/\1\2/}
 
 .include <bsd.port.pre.mk>
-.if exists(${LINUXBASE}/lib/libc-2.3.2.so) || defined(WITH_LINUX8)
-RUN_DEPENDS+=	${LINUXBASE}/usr/X11R6/lib/libXrandr.so.2:${PORTSDIR}/x11/linux-XFree86-libs
-WITH_LINUX8=	YES
-.else
 USE_LINUX=	YES
-.endif
 
 do-install:
 	${MKDIR} ${DATADIR}
diff --git a/games/linux-enemyterritory/Makefile b/games/linux-enemyterritory/Makefile
index b35468faf3b3..c28e4ee75d0e 100644
--- a/games/linux-enemyterritory/Makefile
+++ b/games/linux-enemyterritory/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	enemyterritory
 PORTVERSION=	2.56.2
+PORTREVISION=	1
 CATEGORIES=	games linux
 MASTER_SITES=	http://ftp.wireplay.co.uk/enemyterritory/server/linux/ \
 		ftp://3dgamers.in-span.net/pub/3dgamers4/games/wolfensteinet/ \
@@ -22,6 +23,7 @@ COMMENT=	Wolfenstein: Enemy Territory (Linux version)
 
 ONLY_FOR_ARCHS=	i386
 USE_LINUX_PREFIX=	yes
+USE_LINUX=	yes
 NO_PACKAGE=	Distfile is 258MB, set FORCE_PACKAGE if you really want to build this package
 RESTRICTED=	Redistribution is limited, see license
 NO_BUILD=	yes
diff --git a/games/linux-nwnclient/Makefile b/games/linux-nwnclient/Makefile
index e56b049d7b37..5acc76a7785e 100644
--- a/games/linux-nwnclient/Makefile
+++ b/games/linux-nwnclient/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	nwnclient
 PORTVERSION=	1.65
+PORTREVISION=	1
 CATEGORIES=	games linux
 MASTER_SITES=	http://content.bioware.com/neverwinternights/linux/${PORTVERSION:S/.//}/
 PKGNAMEPREFIX=	linux-
diff --git a/games/linux-nwserver/Makefile b/games/linux-nwserver/Makefile
index 55b6d90d6fcd..5754031bb88c 100644
--- a/games/linux-nwserver/Makefile
+++ b/games/linux-nwserver/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	nwserver
 PORTVERSION=	1.32
+PORTREVISION=	1
 CATEGORIES=	games linux
 MASTER_SITES=	http://nwdownloads.bioware.com/neverwinternights/linux/${PORTVERSION:S/.//}/
 PKGNAMEPREFIX=	linux-
diff --git a/games/linux-q3ademo/Makefile b/games/linux-q3ademo/Makefile
index b82ada239563..1af278097f51 100644
--- a/games/linux-q3ademo/Makefile
+++ b/games/linux-q3ademo/Makefile
@@ -10,7 +10,7 @@
 
 PORTNAME=	linux-q3ademo
 PORTVERSION=	1.11.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games graphics linux
 # fetch manually
 MASTER_SITES=
@@ -21,10 +21,9 @@ EXTRACT_SUFX=
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Linux 3d shooter from id Software / Loki Software (demo version)
 
-RUN_DEPENDS=	${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
-
-USE_X_PREFIX=	yes
+PREFIX?=	${X11BASE}
 USE_GL=		yes
+USE_LINUX=	yes
 
 .include <bsd.port.pre.mk>
 
diff --git a/games/linux-quake3-demo/Makefile b/games/linux-quake3-demo/Makefile
index b82ada239563..1af278097f51 100644
--- a/games/linux-quake3-demo/Makefile
+++ b/games/linux-quake3-demo/Makefile
@@ -10,7 +10,7 @@
 
 PORTNAME=	linux-q3ademo
 PORTVERSION=	1.11.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games graphics linux
 # fetch manually
 MASTER_SITES=
@@ -21,10 +21,9 @@ EXTRACT_SUFX=
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Linux 3d shooter from id Software / Loki Software (demo version)
 
-RUN_DEPENDS=	${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
-
-USE_X_PREFIX=	yes
+PREFIX?=	${X11BASE}
 USE_GL=		yes
+USE_LINUX=	yes
 
 .include <bsd.port.pre.mk>
 
diff --git a/games/linux-quake3/Makefile b/games/linux-quake3/Makefile
index 64239652ee3a..402bbc6573cf 100644
--- a/games/linux-quake3/Makefile
+++ b/games/linux-quake3/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	q3ded
 PORTVERSION=	1.32b
+PORTREVISION=	1
 CATEGORIES=	games linux
 MASTER_SITES=	ftp://ftp.bluesnews.com/idstuff/quake3/linux/ \
 		ftp://ftp.idsoftware.com/idstuff/quake3/linux/
@@ -18,6 +19,7 @@ COMMENT=	Quake III Arena Dedicated Server for Linux
 
 ONLY_FOR_ARCHS=	i386
 USE_LINUX_PREFIX=	yes
+USE_LINUX=	yes
 USE_PERL5=	yes
 NO_CDROM=	"Size; the data set is much too big"
 NO_BUILD=	yes
diff --git a/games/linux-ssamtse/Makefile b/games/linux-ssamtse/Makefile
index 8062e319427e..57469a3bd3fa 100644
--- a/games/linux-ssamtse/Makefile
+++ b/games/linux-ssamtse/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ssamtse
 PORTVERSION=	b1
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	# must fetch manually
 DISTFILES=	${PORTNAME}-${PORTVERSION:S|b|beta|}.sh.bin
@@ -15,10 +16,12 @@ EXTRACT_ONLY=
 MAINTAINER=	asa@gascom.ru
 COMMENT=	Serious Sam - The Second Encounter
 
+RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
+
 NO_BUILD=	yes
 USE_BZIP2=	yes
 USE_REINPLACE=	yes
-USE_XLIB=	yes
+USE_X_PREFIX=	yes
 USE_GL=		yes
 USE_LINUX=	yes
 INSTALLS_SHLIB=	yes
diff --git a/games/linux-steam/Makefile b/games/linux-steam/Makefile
index 8646c5ca90eb..4f970630fe47 100644
--- a/games/linux-steam/Makefile
+++ b/games/linux-steam/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	steam
 PORTVERSION=	1.0
+PORTREVISOIN=	1
 CATEGORIES=	games linux
 MASTER_SITES=	http://www.coreblack.com/files/
 PKGNAMEPREFIX=	linux-
@@ -14,6 +15,8 @@ PKGNAMEPREFIX=	linux-
 MAINTAINER=	hido@coreblack.com
 COMMENT=	Half Life dedicated server running on steam
 
+RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libX11.so.6:${PORTSDIR}/x11/linux-XFree86-libs
+
 IS_INTERACTIVE=	yes
 PKGMESSAGE=	${WRKDIR}/pkg-message
 USE_LINUX=	yes
diff --git a/games/q3server/Makefile b/games/q3server/Makefile
index 64239652ee3a..402bbc6573cf 100644
--- a/games/q3server/Makefile
+++ b/games/q3server/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	q3ded
 PORTVERSION=	1.32b
+PORTREVISION=	1
 CATEGORIES=	games linux
 MASTER_SITES=	ftp://ftp.bluesnews.com/idstuff/quake3/linux/ \
 		ftp://ftp.idsoftware.com/idstuff/quake3/linux/
@@ -18,6 +19,7 @@ COMMENT=	Quake III Arena Dedicated Server for Linux
 
 ONLY_FOR_ARCHS=	i386
 USE_LINUX_PREFIX=	yes
+USE_LINUX=	yes
 USE_PERL5=	yes
 NO_CDROM=	"Size; the data set is much too big"
 NO_BUILD=	yes
diff --git a/games/rt2-demo/Makefile b/games/rt2-demo/Makefile
index 80ea210a8315..8ea4735c9423 100644
--- a/games/rt2-demo/Makefile
+++ b/games/rt2-demo/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	rt2_demo
 PORTVERSION=	1.54b
+PORTREVISION=	1
 CATEGORIES=	games linux
 MASTER_SITES=	ftp://ftp.linuxgames.com/loki/demos/rt2/
 DISTNAME=	rt2-demo
@@ -18,6 +19,7 @@ COMMENT=	The free demo of Railroad Tycoon II
 
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
+USE_LINUX=	yes
 
 do-install:
 		@${SH} ${FILESDIR}/do-install ${PREFIX} ${DISTDIR}
diff --git a/games/rtcw-paks/Makefile b/games/rtcw-paks/Makefile
index 734aa3341d2a..c7c2f5aa8078 100644
--- a/games/rtcw-paks/Makefile
+++ b/games/rtcw-paks/Makefile
@@ -24,6 +24,7 @@ BUILD_DEPENDS=	${PREFIX}/usr/games/rtcw/wolf.x86:${PORTSDIR}/games/rtcw
 
 ONLY_FOR_ARCHS=	i386
 USE_LINUX_PREFIX=	yes
+USE_LINUX=	yes
 EXTRACT_ONLY=	# Don't extract anything
 STRIP=
 
diff --git a/games/rtcw/Makefile b/games/rtcw/Makefile
index 78295a50edcf..d6afa2d4f265 100644
--- a/games/rtcw/Makefile
+++ b/games/rtcw/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	rtcw
 PORTVERSION=	1.1b
+PORTREVISION=	1
 CATEGORIES=	games linux
 MASTER_SITES=	ftp://ftp.idsoftware.com/idstuff/wolf/linux/old/
 DISTNAME=	wolf-linux-${PORTVERSION}.x86
@@ -17,6 +18,7 @@ COMMENT=	Return to Castle Wolfenstein for Linux
 
 ONLY_FOR_ARCHS=	i386
 USE_LINUX_PREFIX=	yes
+USE_LINUX=	yes
 NO_CDROM=	"Size; the data set is much too big"
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
diff --git a/games/ssamtse/Makefile b/games/ssamtse/Makefile
index 8062e319427e..57469a3bd3fa 100644
--- a/games/ssamtse/Makefile
+++ b/games/ssamtse/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ssamtse
 PORTVERSION=	b1
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	# must fetch manually
 DISTFILES=	${PORTNAME}-${PORTVERSION:S|b|beta|}.sh.bin
@@ -15,10 +16,12 @@ EXTRACT_ONLY=
 MAINTAINER=	asa@gascom.ru
 COMMENT=	Serious Sam - The Second Encounter
 
+RUN_DEPENDS=	${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs
+
 NO_BUILD=	yes
 USE_BZIP2=	yes
 USE_REINPLACE=	yes
-USE_XLIB=	yes
+USE_X_PREFIX=	yes
 USE_GL=		yes
 USE_LINUX=	yes
 INSTALLS_SHLIB=	yes
diff --git a/games/stvef-paks/Makefile b/games/stvef-paks/Makefile
index bfdf6776207f..1d12b416c8f7 100644
--- a/games/stvef-paks/Makefile
+++ b/games/stvef-paks/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	stvef-paks
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	games linux
 MASTER_SITES=	#
 DISTFILES=	pak0.pk3
@@ -22,6 +23,7 @@ BUILD_DEPENDS=	${PREFIX}/usr/games/stvef/linuxstvefded_1.2-static:${PORTSDIR}/ga
 
 ONLY_FOR_ARCHS=	i386
 USE_LINUX_PREFIX=	yes
+USE_LINUX=	yes
 EXTRACT_ONLY=	# Don't extract anything
 STRIP=
 
diff --git a/games/stvef-server/Makefile b/games/stvef-server/Makefile
index e6ab9c8da05b..75999cc1ab0c 100644
--- a/games/stvef-server/Makefile
+++ b/games/stvef-server/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	stvef-server
 PORTVERSION=	1.20
+PORTREVISION=	1
 CATEGORIES=	games linux
 MASTER_SITES=	ftp://3dgamers.in-span.net/pub/3dgamers/games/stveliteforce/
 DISTFILES=	stveflinuxdedicated120.zip
@@ -16,6 +17,7 @@ COMMENT=	Star Trek Voyager: Elite Forces dedicated server for Linux
 ONLY_FOR_ARCHS=	i386
 USE_ZIP=	yes
 USE_LINUX_PREFIX=	yes
+USE_LINUX=	yes
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/Linux
 STRIP=
diff --git a/games/utserver-to/Makefile b/games/utserver-to/Makefile
index ba83ffa1f7f7..0bace144f6b7 100644
--- a/games/utserver-to/Makefile
+++ b/games/utserver-to/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME?=	to
 PORTVERSION?=	2.2.0
+PORTREVISION?=	1
 CATEGORIES=	games linux
 MASTER_SITES?=	http://www.netreachgames.com/downloads/to/ \
 		http://downloads.fragism.com/ \
@@ -25,6 +26,7 @@ RUN_DEPENDS=	${LINUXBASE}/usr/games/ut-server/System/ucc-bin:${UTSERVER_PORT}
 
 ONLY_FOR_ARCHS=	i386
 USE_LINUX_PREFIX=	yes
+USE_LINUX=	yes
 USE_PERL5=	yes
 NO_CDROM=	"Size; the data set is much too big"
 NO_BUILD=	yes
diff --git a/games/utserver/Makefile b/games/utserver/Makefile
index e79446db06c2..62fcb305e3df 100644
--- a/games/utserver/Makefile
+++ b/games/utserver/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	utserver
 PORTVERSION=	436
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games linux
 MASTER_SITES=	http://public.planetmirror.com/pub/lokigames/installers/ut/ \
 		http://fileserver.talkware.net/ut/
@@ -21,6 +21,7 @@ BUILD_DEPENDS=	${RUN_DEPENDS}
 
 ONLY_FOR_ARCHS=	i386
 USE_LINUX_PREFIX=	yes
+USE_LINUX=	yes
 USE_PERL5=	yes
 NO_CDROM=	"Size; the data set is much too big"
 NO_BUILD=	yes