- Replace Mk/bsd.linux-apps.mk and Mk/bsd.linux-rpm.mk with

  Mk/Uses/linux.mk.
- Replace USE_LINUX=yes with USES+=linux and USE_LINUX=(.*) with
  USES+=linux:\1 in all ports.
- Replace USE_LINUX_APPS with USE_LINUX in all ports.
- Use INSTALL_SCRIPT instead of INSTALL_PROGRAM to install scripts in some
  ports.
- When USE_LINUX_RPM is defined, simplify the way DISTFILES and EXTRACT_ONLY
  are defined.
- Remove BRANDELF_DIRS and BRANDELF_FILES handling.  In the very rare cases
  that it is still necessary ports can run ${BRANDELF} from post-patch.
- Remove AUTOMATIC_PLIST handling.  Only one port used it.
- Fix Linux MASTER_SITES.
- Replace OVERRIDE_LINUX_BASE_PORT and OVERRIDE_LINUX_NONBASE_PORTS with
  default versions framework.
- bsd.port.mk:
  - Move Linux related bits to Uses/linux.mk, except USE_LINUX_PREFIX.
  - Put USE_LINUX_PREFIX handling after USES processing.
  - Define DOCSDIR, DATADIR, etc. after handling USE_LINUX_PREFIX so it can
    give these variables a different default value.
  - When a package needs to run Linux ldconfig check before installation if
    Linux support is enabled.
- emulators/linux_base-*:
  - Use USES=linux and remove duplication.
  - Remove files/lp.  FreeBSD or CUPS lp(1) should work.
  - Remove files/yp.conf.  No longer seems to be used.
  - Remove pkg-deinstall and move pkg-install into pkg-plist.
  - Update pkg-descr and pkg-message.
  - Fix handling of ldconfig cache in pkg-plist.
- devel/fb-adb: Use a Linux shell to run a Linux script but patch the script
  to use FreeBSD mkdir so mkdir -p $path creates $path and not
  /compat/linux/$path.

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

39 files changed, 94 insertions, 119 deletions

diff --git a/games/adom/Makefile b/games/adom/Makefile
index 7a2f338c673b..f2c04b99362b 100644
--- a/games/adom/Makefile
+++ b/games/adom/Makefile
@@ -21,12 +21,11 @@ NO_CDROM=	Copy of CD must be sent to author
 OPTIONS_DEFINE=	DOCS
 
 ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	yes
-USE_LINUX_APPS=	ncurses-base xorglibs
+USES=		linux
+USE_LINUX=	ncurses-base xorglibs
 
 WRKSRC=		${WRKDIR}/adom
 NO_BUILD=	yes
-STRIP=		# empty: do not strip linux binary!
 
 SUB_FILES=	pkg-message
 
diff --git a/games/arkanoidsb/Makefile b/games/arkanoidsb/Makefile
index 619cc96b1610..65ddcd4c9f73 100644
--- a/games/arkanoidsb/Makefile
+++ b/games/arkanoidsb/Makefile
@@ -12,10 +12,9 @@ COMMENT=	Arkanoid and space game
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-USES=		tar:bzip2
+USES=		linux tar:bzip2
 NO_BUILD=	yes
-USE_LINUX=	yes
-USE_LINUX_APPS=	libogg sdlmixer sdlimage
+USE_LINUX=	libogg sdlmixer sdlimage
 
 SUB_FILES=	${PORTNAME}.sh
 
diff --git a/games/dsnake/Makefile b/games/dsnake/Makefile
index 14d1c587ef7b..73ad914b2e20 100644
--- a/games/dsnake/Makefile
+++ b/games/dsnake/Makefile
@@ -14,8 +14,9 @@ COMMENT=	Deluxe Snake - snake clone with frogs and mushrooms
 RESTRICTED=	Licence forbids any repacking and reselling
 
 ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	yes
-USE_LINUX_APPS=	allegro xorglibs
+STRIP=
+USES=		linux:f10
+USE_LINUX=	allegro xorglibs
 WRKSRC=		${WRKDIR}/DeluxeSnake
 
 CONFIG_FILES=	config.dat hiscores.dat stats.dat
diff --git a/games/gish-demo/Makefile b/games/gish-demo/Makefile
index 55a1de23625b..e85371748d13 100644
--- a/games/gish-demo/Makefile
+++ b/games/gish-demo/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Platform game with a gelatinous 12-pound ball of tar (Demo version)
 RESTRICTED=	(c) Copyright 2004 Chronic Logic All rights reserved
 ONLY_FOR_ARCHS=	i386 amd64
 ONLY_FOR_ARCHS_REASON=	is an i386 Linux binary
-USE_LINUX=	yes
-USE_LINUX_APPS=	libvorbis openal-soft
+USES=		linux
+USE_LINUX=	libvorbis openal-soft
 NO_BUILD=	yes
 DATADIR=	${PREFIX}/lib/${PORTNAME}
 SUB_FILES=	rungish.sh
diff --git a/games/hohlin/Makefile b/games/hohlin/Makefile
index ec39811a1191..f4416fb437b5 100644
--- a/games/hohlin/Makefile
+++ b/games/hohlin/Makefile
@@ -14,9 +14,8 @@ COMMENT=	Remake of the classic spectrum game Head over Heels
 
 WRKSRC=		${WRKDIR}/hoh-install-${PORTVERSION}/
 
-USES=	tar:bzip2
-USE_LINUX=	yes
-USE_LINUX_APPS=	xorglibs
+USES=		linux tar:bzip2
+USE_LINUX=	xorglibs
 ONLY_FOR_ARCHS=	i386 amd64
 SHORTPORTVERSION=${PORTVERSION:C/([0-9]*)\.([0-9]*)/\1\2/}
 
diff --git a/games/legends/Makefile b/games/legends/Makefile
index 61f4e51d1086..736f3c8bef4b 100644
--- a/games/legends/Makefile
+++ b/games/legends/Makefile
@@ -18,9 +18,8 @@ COMMENT=	Fast-paced first-person-perspective online multiplayer game
 
 RUN_DEPENDS=	bash:shells/bash
 
-USES=		makeself
-USE_LINUX=	yes
-USE_LINUX_APPS+=dri
+USES=		linux makeself
+USE_LINUX=	dri
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 DATADIR=	${PREFIX}/lib/${PORTNAME}
diff --git a/games/linux-darwinia-demo/Makefile b/games/linux-darwinia-demo/Makefile
index 425f4e9292de..a5b6826381de 100644
--- a/games/linux-darwinia-demo/Makefile
+++ b/games/linux-darwinia-demo/Makefile
@@ -12,8 +12,8 @@ MAINTAINER=	mva@FreeBSD.org
 COMMENT=	Real-time action strategy with programs
 
 ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	yes
-USE_LINUX_APPS=	sdl12 libogg libvorbis xorglibs
+USES=		linux
+USE_LINUX=	sdl12 libogg libvorbis xorglibs
 NO_CDROM=	Redistribution is limited, see license
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
@@ -28,24 +28,21 @@ NVIDIA_DESC=	Enable nvidia graphics driver support
 
 .if ${PORT_OPTIONS:MNVIDIA}
 RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver
-USE_LINUX_APPS+=libglu
+USE_LINUX+=	libglu
 .else
-USE_LINUX_APPS+=dri
+USE_LINUX+=	dri
 .endif
 
 do-extract:
 	@cd ${WRKSRC} && ${TAIL} +376 ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} | \
 		${TAR} zxf -
 
-do-build:
-	${BRANDELF} -t Linux ${WRKSRC}/lib/darwinia.bin.x86
-
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	@cd ${WRKSRC}/lib && \
 		${INSTALL_PROGRAM} darwinia.bin.x86 ${STAGEDIR}${DATADIR} && \
 		${INSTALL_DATA} *.dat open-www.sh ${STAGEDIR}${DATADIR}
-	${INSTALL_PROGRAM} ${WRKDIR}/darwinia \
+	${INSTALL_SCRIPT} ${WRKDIR}/darwinia \
 		${STAGEDIR}${PREFIX}/bin/${PKGNAMEPREFIX}darwinia
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/LICENSE ${STAGEDIR}${DOCSDIR}/LICENSE
diff --git a/games/linux-defcon/Makefile b/games/linux-defcon/Makefile
index c7ae7d9f9459..0bc60acaeccd 100644
--- a/games/linux-defcon/Makefile
+++ b/games/linux-defcon/Makefile
@@ -12,8 +12,8 @@ MAINTAINER=	mva@FreeBSD.org
 COMMENT=	Defcon for Linux
 
 ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	yes
-USE_LINUX_APPS=	sdl12 libogg libvorbis xorglibs
+USES=		linux
+USE_LINUX=	sdl12 libogg libvorbis xorglibs
 NO_CDROM=	Redistribution is limited, see license
 NO_BUILD=	yes
 
@@ -27,20 +27,17 @@ NVIDIA_DESC=	support for nvidia
 
 .if ${PORT_OPTIONS:MNVIDIA}
 RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver
-USE_LINUX_APPS+=libglu
+USE_LINUX+=	libglu
 .else
-USE_LINUX_APPS+=dri
+USE_LINUX+=	dri
 .endif
 
-do-build:
-	${BRANDELF} -t Linux ${WRKSRC}/lib/defcon.bin.x86
-
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	@cd ${WRKSRC}/lib && \
 		${INSTALL_PROGRAM} defcon.bin.x86 ${STAGEDIR}${DATADIR} && \
 		${INSTALL_DATA} *.dat open-www.sh ${STAGEDIR}${DATADIR}
-	${INSTALL_PROGRAM} ${WRKDIR}/defcon \
+	${INSTALL_SCRIPT} ${WRKDIR}/defcon \
 		${STAGEDIR}${PREFIX}/bin/${PKGNAMEPREFIX}defcon
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/license.txt ${STAGEDIR}${DOCSDIR}/license.txt
diff --git a/games/linux-doom3-demo/Makefile b/games/linux-doom3-demo/Makefile
index c0fd23a122ee..64cfbf97835a 100644
--- a/games/linux-doom3-demo/Makefile
+++ b/games/linux-doom3-demo/Makefile
@@ -17,8 +17,8 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	DOOM III demo for Linux
 
 ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	yes
-USE_LINUX_APPS=	xorglibs
+USES=		linux
+USE_LINUX=	xorglibs
 NO_CDROM=	Redistribution is limited, see license; Requested by id Software
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
@@ -31,7 +31,7 @@ SUB_LIST=	DOOMDIR="${DOOMDIR}"
 OPTIONS_DEFINE=	DOCS NVIDIA_GL
 
 NVIDIA_GL_RUN_DEPENDS=	${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver
-NVIDIA_GL_USE_OFF=	linux_apps=dri
+NVIDIA_GL_USE_OFF=	LINUX=dri
 
 
 do-extract:
diff --git a/games/linux-doom3/Makefile b/games/linux-doom3/Makefile
index a463e9db1251..4decf5edcad9 100644
--- a/games/linux-doom3/Makefile
+++ b/games/linux-doom3/Makefile
@@ -13,8 +13,8 @@ EXTRACT_SUFX=	.run
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Doom III for Linux
 
-USE_LINUX=	yes
-USE_LINUX_APPS=	xorglibs
+USES=		linux
+USE_LINUX=	xorglibs
 NO_CDROM=	Redistribution is limited, see license; Requested by id Software
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
@@ -60,7 +60,7 @@ do-install:
 .endif
 	${INSTALL_DATA} ${WRKSRC}/doom3.png ${STAGEDIR}${PREFIX}/share/pixmaps
 .for f in doom3 doom3-ded
-	${INSTALL_PROGRAM} ${WRKDIR}/${f} ${STAGEDIR}${PREFIX}/bin/${PKGNAMEPREFIX}${f}
+	${INSTALL_SCRIPT} ${WRKDIR}/${f} ${STAGEDIR}${PREFIX}/bin/${PKGNAMEPREFIX}${f}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/games/linux-enemyterritory-etpro/Makefile b/games/linux-enemyterritory-etpro/Makefile
index 40560d71461d..b3bfb31ef51d 100644
--- a/games/linux-enemyterritory-etpro/Makefile
+++ b/games/linux-enemyterritory-etpro/Makefile
@@ -18,8 +18,7 @@ COMMENT=	ET Pro - Enemy Territory Competition Mod
 
 RUN_DEPENDS=	et:games/linux-enemyterritory
 
-USES=		zip
-USE_LINUX=	yes
+USES=		linux zip
 NO_WRKSUBDIR=	yes
 
 DATADIR=	${PREFIX}/lib/enemyterritory/${PORTNAME}
diff --git a/games/linux-enemyterritory-jaymod-21/Makefile b/games/linux-enemyterritory-jaymod-21/Makefile
index 216c6e1ac094..83a3b4893bfb 100644
--- a/games/linux-enemyterritory-jaymod-21/Makefile
+++ b/games/linux-enemyterritory-jaymod-21/Makefile
@@ -17,10 +17,9 @@ VERSTR=		${PORTVERSION:C/([0-9])\.([0-9])\.([0-9]+)/\1\2\3/}
 PKGNAMESUFFIX=	-${VERSTR}
 PLIST_SUB=	VERSTR="${VERSTR}"
 
-USES=		shebangfix
+USES=		linux shebangfix
 SHEBANG_FILES=	linux/convert_shrub
 perl_OLD_CMD=	"/bin/env perl"
-USE_LINUX=	yes
 
 PORTSCOUT=	limit:^2\.1\.7
 
diff --git a/games/linux-enemyterritory-jaymod/Makefile b/games/linux-enemyterritory-jaymod/Makefile
index 98a24d4a105d..975b8310b8e3 100644
--- a/games/linux-enemyterritory-jaymod/Makefile
+++ b/games/linux-enemyterritory-jaymod/Makefile
@@ -14,10 +14,9 @@ COMMENT=	Jaymod - An Enemy Territory Modification
 
 RUN_DEPENDS=	et:games/linux-enemyterritory
 
-USES=		shebangfix
+USES=		linux shebangfix
 SHEBANG_FILES=	linux/convert_shrub
 perl_OLD_CMD=	"/bin/env perl"
-USE_LINUX=	yes
 
 OPTIONS_DEFINE=	DOCS OMNIBOT
 OMNIBOT_DESC=	Install Omni-Bot for bot support
diff --git a/games/linux-enemyterritory-omni-bot-0660/Makefile b/games/linux-enemyterritory-omni-bot-0660/Makefile
index 0fe9b65477e9..9e99faa65aea 100644
--- a/games/linux-enemyterritory-omni-bot-0660/Makefile
+++ b/games/linux-enemyterritory-omni-bot-0660/Makefile
@@ -18,8 +18,7 @@ VERSTR=	${PORTVERSION:C/([0-9])\.([0-9]+)/\1\2/}
 PKGNAMESUFFIX=	-${VERSTR}
 PLIST_SUB=	VERSTR="${VERSTR}"
 
-USES=		zip
-USE_LINUX=	yes
+USES=		linux zip
 NO_WRKSUBDIR=	yes
 
 DATADIR=	${PREFIX}/lib/enemyterritory/${PORTNAME}-${VERSTR}
diff --git a/games/linux-enemyterritory-omni-bot/Makefile b/games/linux-enemyterritory-omni-bot/Makefile
index 0beab12b107a..79a6a7c2cc67 100644
--- a/games/linux-enemyterritory-omni-bot/Makefile
+++ b/games/linux-enemyterritory-omni-bot/Makefile
@@ -14,8 +14,7 @@ COMMENT=	Omni-Bot is a bot for Enemy Territory
 
 RUN_DEPENDS=	et:games/linux-enemyterritory
 
-USES=		zip
-USE_LINUX=	yes
+USES=		linux zip
 NO_WRKSUBDIR=	yes
 
 DATADIR=	${PREFIX}/lib/enemyterritory/${PORTNAME}
diff --git a/games/linux-enemyterritory-shrub/Makefile b/games/linux-enemyterritory-shrub/Makefile
index 24640db072f2..ec9e291a1939 100644
--- a/games/linux-enemyterritory-shrub/Makefile
+++ b/games/linux-enemyterritory-shrub/Makefile
@@ -14,8 +14,7 @@ COMMENT=	Shrub - An Enemy Territory Modification
 
 RUN_DEPENDS=	et:games/linux-enemyterritory
 
-USES=		zip
-USE_LINUX=	yes
+USES=		linux zip
 NO_WRKSUBDIR=	yes
 
 DATADIR=	${PREFIX}/lib/enemyterritory/${PORTNAME}
diff --git a/games/linux-enemyterritory-tce/Makefile b/games/linux-enemyterritory-tce/Makefile
index 5fdb304d71e6..9cda5d4da6ea 100644
--- a/games/linux-enemyterritory-tce/Makefile
+++ b/games/linux-enemyterritory-tce/Makefile
@@ -16,8 +16,7 @@ COMMENT=	Modern tactical Enemy Territory modification
 RUN_DEPENDS=	et:games/linux-enemyterritory
 
 ONLY_FOR_ARCHS=	i386 amd64
-USES=		zip
-USE_LINUX=	yes
+USES=		linux zip
 RESTRICTED=	Redistribution is limited, see license
 ETDIR=		${PREFIX}/lib/enemyterritory
 PORTDOCS=	*
diff --git a/games/linux-enemyterritory/Makefile b/games/linux-enemyterritory/Makefile
index 539874fc25aa..d7c284906c6e 100644
--- a/games/linux-enemyterritory/Makefile
+++ b/games/linux-enemyterritory/Makefile
@@ -15,9 +15,8 @@ MAINTAINER=	bar@FreeBSD.org
 COMMENT=	Wolfenstein: Enemy Territory (Linux version)
 
 ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	yes
-USE_LINUX_APPS=	xorglibs
-USES=		zip:infozip
+USES=		linux zip:infozip
+USE_LINUX=	xorglibs
 NO_CDROM=	Redistribution limited
 ETDIR=		${PREFIX}/lib/${PORTNAME}
 PATCH_260B_DIR=	Enemy Territory 2.60b
@@ -25,7 +24,7 @@ PATCH_260B_DIR=	Enemy Territory 2.60b
 OPTIONS_DEFINE=	DOCS NVIDIA_GL
 
 NVIDIA_GL_RUN_DEPENDS=	${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver
-NVIDIA_GL_USE_OFF=	linux_apps=dri
+NVIDIA_GL_USE_OFF=	LINUX=dri
 
 .include <bsd.port.options.mk>
 
diff --git a/games/linux-etqw-demo-server/Makefile b/games/linux-etqw-demo-server/Makefile
index d87451360658..ba33038de3ac 100644
--- a/games/linux-etqw-demo-server/Makefile
+++ b/games/linux-etqw-demo-server/Makefile
@@ -17,8 +17,7 @@ NO_CDROM=	Redistribution is limited
 NO_BUILD=	yes
 
 ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	yes
-USES=		zip:infozip
+USES=		linux zip:infozip
 
 ETQWDIR=	${PREFIX}/lib/${PORTNAME}${PKGNAMESUFFIX}
 
@@ -37,7 +36,7 @@ post-patch:
 do-install:
 	@${MKDIR} ${STAGEDIR}${ETQWDIR}
 
-	${INSTALL_PROGRAM} ${WRKSRC}/etqwded-demo ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/etqwded-demo ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/data/etqwded.x86 ${STAGEDIR}${ETQWDIR}
 	@cd ${WRKSRC}/data && \
 		${FIND} -E . -type f -iregex ".*\.so\.[0-9]+" \
diff --git a/games/linux-etqw-server/Makefile b/games/linux-etqw-server/Makefile
index 270b0a304cee..0e0fcf828890 100644
--- a/games/linux-etqw-server/Makefile
+++ b/games/linux-etqw-server/Makefile
@@ -20,8 +20,7 @@ NO_CDROM=	Redistribution is limited
 NO_BUILD=	yes
 
 ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	yes
-USES=		zip:infozip
+USES=		linux zip:infozip
 
 ETQWDIR=	${PREFIX}/lib/${PORTNAME}${PKGNAMESUFFIX}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
@@ -40,7 +39,7 @@ post-patch:
 do-install:
 	@${MKDIR} ${STAGEDIR}${ETQWDIR}
 
-	${INSTALL_PROGRAM} ${WRKSRC}/etqwded ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/etqwded ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/data/etqwded.x86 ${STAGEDIR}${ETQWDIR}
 	@cd ${WRKSRC}/data && \
 		${FIND} -E . -type f -iregex ".*\.so\.[0-9]+" \
diff --git a/games/linux-nerogame/Makefile b/games/linux-nerogame/Makefile
index e3a899fe2c30..b1bba70a3c54 100644
--- a/games/linux-nerogame/Makefile
+++ b/games/linux-nerogame/Makefile
@@ -11,8 +11,8 @@ DISTNAME=	nero2_linux_i386
 MAINTAINER=	craig001@lerwick.hopto.org
 COMMENT=	Neuro evolving robotic operatives the game
 
-USE_LINUX=	yes
-USE_LINUX_APPS=	libvorbis sdl12 libtheora
+USES=		linux
+USE_LINUX=	libvorbis sdl12 libtheora
 NO_BUILD=	yes
 RESTRICTED=	Nero is freeware, but i am not sure of its license
 
@@ -30,7 +30,7 @@ NVIDIA_DESC=	Nvidia support
 RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver
 .	endif
 .else
-USE_LINUX_APPS+=dri
+USE_LINUX+=	dri
 .endif
 
 do-install:
diff --git a/games/linux-nwnclient/Makefile b/games/linux-nwnclient/Makefile
index 3923321d5995..6c2cb3c877db 100644
--- a/games/linux-nwnclient/Makefile
+++ b/games/linux-nwnclient/Makefile
@@ -23,15 +23,15 @@ RUN_DEPENDS=	${LOCALBASE}/share/nwndata/docs/readme.txt:games/nwndata
 
 NO_BUILD=	yes
 RESTRICTED=	Distribution not allowed
-USE_LINUX=	yes
-USE_LINUX_APPS=	sdl12 xorglibs
+USES=		linux
+USE_LINUX=	sdl12 xorglibs
 NWNDATADIR=	${LOCALBASE}/share/nwndata
 
 .ifdef WITH_NVIDIA_GL
 RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver
-USE_LINUX_APPS+=libglu
+USE_LINUX+=	libglu
 .else
-USE_LINUX_APPS+=dri
+USE_LINUX+=	dri
 .endif
 
 OPTIONS_DEFINE=	NWMOVIES
@@ -50,7 +50,7 @@ NWMOVIESFILE=	nwmovies-v4-public.20090223.080954.tar.gz
 BINKPLAYERFILE=	BinkLinuxPlayer.zip
 CLIENT_NWMOVIES=${NWMOVIESFILE}:NWMOVIES \
 		${BINKPLAYERFILE}:BINK
-USE_LINUX_APPS+=mikmod sdlmixer
+USE_LINUX+=	mikmod sdlmixer
 PLIST_SUB+=	NWMOVIES=""
 .else
 PLIST_SUB+=	NWMOVIES="@comment "
diff --git a/games/linux-quake3-demo/Makefile b/games/linux-quake3-demo/Makefile
index bfa45bd269cc..080a2ce73d90 100644
--- a/games/linux-quake3-demo/Makefile
+++ b/games/linux-quake3-demo/Makefile
@@ -18,8 +18,8 @@ RESTRICTED=	Restrictive license by Loki Software
 NO_CDROM=	${RESTRICTED}
 NO_PACKAGE=	${RESTRICTED}
 
-USE_LINUX=	yes
-USE_LINUX_APPS+=dri
+USES=		linux
+USE_LINUX=	dri
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
diff --git a/games/linux-quake3/Makefile b/games/linux-quake3/Makefile
index 3e9e3b5a825f..b24f0155e8b3 100644
--- a/games/linux-quake3/Makefile
+++ b/games/linux-quake3/Makefile
@@ -14,8 +14,7 @@ DIST_SUBDIR=	${Q3PKGNAMEPREFIX}data
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Quake III Arena for Linux
 
-USES=		zip:infozip
-USE_LINUX=	yes
+USES=		linux zip:infozip
 NO_WRKSUBDIR=	yes
 
 RESTRICTED=	Restrictive license by Loki Software
diff --git a/games/linux-quake4-demo/Makefile b/games/linux-quake4-demo/Makefile
index 6236828b5873..afea8e087875 100644
--- a/games/linux-quake4-demo/Makefile
+++ b/games/linux-quake4-demo/Makefile
@@ -14,8 +14,8 @@ EXTRACT_SUFX=	.run
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Quake 4 for Linux Demo
 
-USE_LINUX=	yes
-USE_LINUX_APPS=	sdl12
+USES=		linux
+USE_LINUX=	sdl12
 NO_WRKSUBDIR=	yes
 NO_CDROM=	Redistribution is limited, see license
 
diff --git a/games/linux-quake4/Makefile b/games/linux-quake4/Makefile
index 45f039dec66f..3ad22f08fb7d 100644
--- a/games/linux-quake4/Makefile
+++ b/games/linux-quake4/Makefile
@@ -15,8 +15,8 @@ EXTRACT_SUFX=	.run
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Quake 4 for Linux
 
-USE_LINUX=	yes
-USE_LINUX_APPS=	sdl12
+USES=		linux
+USE_LINUX=	sdl12
 NO_WRKSUBDIR=	yes
 NO_CDROM=	Redistribution is limited, see license
 Q4DIR=		lib/${PORTNAME}
diff --git a/games/linux-rtcw/Makefile b/games/linux-rtcw/Makefile
index 3ce406a1b0c4..1f6c115f92cd 100644
--- a/games/linux-rtcw/Makefile
+++ b/games/linux-rtcw/Makefile
@@ -13,9 +13,8 @@ EXTRACT_SUFX=	.run
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Return to Castle Wolfenstein (Linux version)
 
-USES=		makeself
-USE_LINUX=	yes
-USE_LINUX_APPS=	xorglibs
+USES=		linux makeself
+USE_LINUX=	xorglibs
 NO_WRKSUBDIR=	yes
 
 WRAPPERS=	wolf wolfded wolfsp
@@ -33,7 +32,7 @@ OPTIONS_DEFINE=	DOCS NVIDIA_GL
 RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver
 NVIDIA_GL_EXTVER=	'__GL_ExtensionStringVersion=18999 '
 .else
-USE_LINUX_APPS+=	dri
+USE_LINUX+=	dri
 .endif
 
 # XXX: should probably be converted to use the LICENSE framework
diff --git a/games/linux-ssamtfe/Makefile b/games/linux-ssamtfe/Makefile
index 74d597d55ec5..1aef7ab5eaa8 100644
--- a/games/linux-ssamtfe/Makefile
+++ b/games/linux-ssamtfe/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Serious Sam: The First Encounter
 OPTIONS_DEFINE=	VORBIS DOCS
 OPTIONS_DEFAULT=	VORBIS
 
-USE_LINUX=	yes
-USE_LINUX_APPS=	xorglibs
+USES=		linux
+USE_LINUX=	xorglibs
 NO_BUILD=	yes
 RESTRICTED=	Redistribution is limited, see license
 PORTDOCS=	README.liflg ShellSymbols.txt changes.txt notes.txt
@@ -29,7 +29,7 @@ IGNORE=		${PKGNAME} requires CDROM_MOUNT set to mount point of CD
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MVORBIS}
-USE_LINUX_APPS+=libvorbis
+USE_LINUX+=	libvorbis
 PLIST_SUB+=	VORBIS=""
 .else
 PLIST_SUB+=	VORBIS="@comment "
diff --git a/games/linux-ssamtse/Makefile b/games/linux-ssamtse/Makefile
index d362fabcfcca..0c417026e6c1 100644
--- a/games/linux-ssamtse/Makefile
+++ b/games/linux-ssamtse/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Serious Sam: The Second Encounter for Linux
 OPTIONS_DEFINE=	VORBIS DOCS
 OPTIONS_DEFAULT=	VORBIS
 
-USE_LINUX=	yes
-USE_LINUX_APPS=	xorglibs
+USES=		linux
+USE_LINUX=	xorglibs
 NO_BUILD=	yes
 RESTRICTED=	Redistribution is limited, see license
 PORTDOCS=	README.liflg ShellSymbols.txt changes.txt Notes_1_04.txt
@@ -29,7 +29,7 @@ IGNORE=		${PKGNAME} requires CDROM_MOUNT set to mount point of CD
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MVORBIS}
-USE_LINUX_APPS+=libvorbis
+USE_LINUX+=	libvorbis
 PLIST_SUB+=	VORBIS=""
 .else
 PLIST_SUB+=	VORBIS="@comment "
diff --git a/games/linux-unigine-heaven/Makefile b/games/linux-unigine-heaven/Makefile
index d2258342b705..2e9821762e07 100644
--- a/games/linux-unigine-heaven/Makefile
+++ b/games/linux-unigine-heaven/Makefile
@@ -22,15 +22,15 @@ LICENSE_TEXT=	Binary only, License text not available. Free-to-use + no-redistri
 LICENSE_PERMS=	no-dist-sell no-pkg-sell no-dist-mirror no-pkg-mirror
 
 ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	yes
-USE_LINUX_APPS=	xorglibs openal-soft
+USES=		linux
+USE_LINUX=	xorglibs openal-soft
 USE_LDCONFIG=	yes
 NO_BUILD=	yes
 
 OPTIONS_DEFINE=	NVIDIA_GL
 NVIDIA_GL_DESC=	Use GL driver from nvidia-driver
 NVIDIA_GL_RUN_DEPENDS=	${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver
-NVIDIA_GL_VARS_OFF=	USE_LINUX_APPS+=dri
+NVIDIA_GL_VARS_OFF=	USE_LINUX+=	dri
 
 do-extract:
 	@${MKDIR} ${WRKSRC}
diff --git a/games/linux-unigine-valley/Makefile b/games/linux-unigine-valley/Makefile
index 3eaef5c81c26..b8a5a71f8040 100644
--- a/games/linux-unigine-valley/Makefile
+++ b/games/linux-unigine-valley/Makefile
@@ -22,15 +22,15 @@ LICENSE_FILE=	${.CURDIR}/pkg-license
 LICENSE_PERMS=	no-dist-sell no-pkg-sell no-dist-mirror no-pkg-mirror
 
 ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	yes
-USE_LINUX_APPS=	xorglibs openal-soft
+USES=		linux
+USE_LINUX=	xorglibs openal-soft
 USE_LDCONFIG=	yes
 NO_BUILD=	yes
 
 OPTIONS_DEFINE=	NVIDIA_GL
 NVIDIA_GL_DESC=	Use GL driver from nvidia-driver
 NVIDIA_GL_RUN_DEPENDS=	${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver
-NVIDIA_GL_VARS_OFF=	USE_LINUX_APPS+=dri
+NVIDIA_GL_VARS_OFF=	USE_LINUX+=	dri
 
 do-extract:
 	@${MKDIR} ${WRKSRC}
diff --git a/games/linux-unrealgold/Makefile b/games/linux-unrealgold/Makefile
index 4d03024f3b8c..c5ee895b149a 100644
--- a/games/linux-unrealgold/Makefile
+++ b/games/linux-unrealgold/Makefile
@@ -17,8 +17,8 @@ COMMENT=	Unreal Gold for Linux
 BUILD_DEPENDS=	ut:games/linux-ut
 RUN_DEPENDS=	ut:games/linux-ut
 
-USE_LINUX=	yes
-USE_LINUX_APPS=	xorglibs
+USES=		linux
+USE_LINUX=	xorglibs
 NO_BUILD=	yes
 RESTRICTED=	Redistribution is limited, see license
 
diff --git a/games/linux-uplink-demo/Makefile b/games/linux-uplink-demo/Makefile
index 94b007b58f71..2904c30deff0 100644
--- a/games/linux-uplink-demo/Makefile
+++ b/games/linux-uplink-demo/Makefile
@@ -13,8 +13,8 @@ MAINTAINER=	mva@FreeBSD.org
 COMMENT=	High tech computer crime and industrial espionage on the Internet
 
 ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	yes
-USE_LINUX_APPS=	sdl12 jpeg sdlmixer mikmod libvorbis xorglibs
+USES=		linux
+USE_LINUX=	sdl12 jpeg sdlmixer mikmod libvorbis xorglibs
 USE_LDCONFIG=	yes
 NO_CDROM=	Redistribution is limited, see license
 NO_BUILD=	yes
@@ -32,24 +32,21 @@ NVIDIA_DESC=	support for nvidia
 
 .if ${PORT_OPTIONS:MNVIDIA}
 RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver
-USE_LINUX_APPS+=libglu
+USE_LINUX+=	libglu
 .else
-USE_LINUX_APPS+=dri
+USE_LINUX+=	dri
 .endif
 
 do-extract:
 	@cd ${WRKSRC} && ${TAIL} +376 ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} | \
 		${TAR} zxf -
 
-do-build:
-	${BRANDELF} -t Linux ${WRKSRC}/lib/uplink.bin.x86
-
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	@cd ${WRKSRC}/lib && \
 		${INSTALL_PROGRAM} uplink.bin.x86 libftgl.so.0 ${STAGEDIR}${DATADIR} && \
 		${INSTALL_DATA} *.dat ${STAGEDIR}${DATADIR}
-	${INSTALL_PROGRAM} ${WRKDIR}/uplink \
+	${INSTALL_SCRIPT} ${WRKDIR}/uplink \
 		${STAGEDIR}${PREFIX}/bin/${PKGNAMEPREFIX}uplink
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for file in ${DOCFILES}
diff --git a/games/linux-ut/Makefile b/games/linux-ut/Makefile
index c074c374219d..3da02a8059db 100644
--- a/games/linux-ut/Makefile
+++ b/games/linux-ut/Makefile
@@ -16,8 +16,8 @@ MAINTAINER=	scf@FreeBSD.org
 COMMENT=	Unreal Tournament for Linux
 
 ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	yes
-USE_LINUX_APPS=	xorglibs sdl12
+USES=		linux
+USE_LINUX=	xorglibs sdl12
 NO_BUILD=	yes
 MANUAL_PACKAGE_BUILD=	Requires CD
 RESTRICTED=	Redistribution is limited, see license
diff --git a/games/linux-ut2003-demo/Makefile b/games/linux-ut2003-demo/Makefile
index f7429405266f..c7d722855111 100644
--- a/games/linux-ut2003-demo/Makefile
+++ b/games/linux-ut2003-demo/Makefile
@@ -12,8 +12,8 @@ EXTRACT_SUFX=	.sh.bin
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Unreal Tournament 2003 demo
 
-USE_LINUX=	yes
-USE_LINUX_APPS=	sdl12 xorglibs
+USES=		linux
+USE_LINUX=	sdl12 xorglibs
 RESTRICTED=	Redistribution is limited, see license
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
@@ -41,7 +41,7 @@ NVIDIA_GL_RUN_DEPENDS=	${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver
 .include <bsd.port.options.mk>
 
 .if ! ${PORT_OPTIONS:MNVIDIA_GL}
-USE_LINUX_APPS+=dri
+USE_LINUX+=	dri
 .endif
 
 do-extract:
diff --git a/games/linux-virtual-jay-peak/Makefile b/games/linux-virtual-jay-peak/Makefile
index c2b0a81a5469..28188e2fd927 100644
--- a/games/linux-virtual-jay-peak/Makefile
+++ b/games/linux-virtual-jay-peak/Makefile
@@ -16,8 +16,8 @@ OPTIONS_DEFINE=	DOCS NVIDIA
 
 WRKSRC=		${WRKDIR}/soulride
 ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	yes
-USE_LINUX_APPS=	xorglibs
+USES=		linux
+USE_LINUX=	xorglibs
 NO_BUILD=	yes
 SUB_FILES=	virtual-jay-peak
 
@@ -26,7 +26,7 @@ SUB_FILES=	virtual-jay-peak
 .if ${PORT_OPTIONS:MNVIDIA}
 RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver
 .else
-USE_LINUX_APPS+=	dri
+USE_LINUX+=	dri
 .endif
 
 do-install:
diff --git a/games/linux-worldofgoo-demo/Makefile b/games/linux-worldofgoo-demo/Makefile
index 08b6997f3d84..d270d10f1073 100644
--- a/games/linux-worldofgoo-demo/Makefile
+++ b/games/linux-worldofgoo-demo/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Demo version of incredible physics based puzzle/construction game
 
 ONLY_FOR_ARCHS=	i386 amd64
 
-USE_LINUX=	yes
-USE_LINUX_APPS=	libvorbis mikmod sdl12 sdlmixer
+USES=		linux
+USE_LINUX=	libvorbis mikmod sdl12 sdlmixer
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/WorldOfGooDemo
 DATADIR=	${PREFIX}/share/WorldOfGoo
@@ -25,9 +25,9 @@ OPTIONS_DEFINE=	DOCS
 
 .if defined(WITH_NVIDIA_GL)
 RUN_DEPENDS=	${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver
-USE_LINUX_APPS+=	libglu
+USE_LINUX+=	libglu
 .else
-USE_LINUX_APPS+=	dri
+USE_LINUX+=	dri
 .endif
 
 .include <bsd.port.pre.mk>
diff --git a/games/mtaserver/Makefile b/games/mtaserver/Makefile
index e0c2482ad5f5..aba9d10d94e8 100644
--- a/games/mtaserver/Makefile
+++ b/games/mtaserver/Makefile
@@ -19,7 +19,7 @@ LICENSE_NAME=	MTA v0.5 LICENSE AGREEMENT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	dist-mirror
 
-USE_LINUX=	yes
+USES=		linux
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
diff --git a/games/sampsvr/Makefile b/games/sampsvr/Makefile
index 41245f42c240..17ec7aa1228e 100644
--- a/games/sampsvr/Makefile
+++ b/games/sampsvr/Makefile
@@ -11,8 +11,7 @@ DISTNAME=	samp${PORTVERSION:S,.,,}svr
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Rockstar's GTA: San Andreas multiplayer modification dedicated server
 
-USES=		dos2unix
-USE_LINUX=	yes
+USES=		dos2unix linux
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/samp03
 DOS2UNIX_GLOB=	*.txt *.pwn *.inc