- 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)

4 files changed, 6 insertions, 8 deletions

diff --git a/x11-themes/linux-c6-hicolor-icon-theme/Makefile b/x11-themes/linux-c6-hicolor-icon-theme/Makefile
index 4eccde74b9d8..7b4bec7b35fe 100644
--- a/x11-themes/linux-c6-hicolor-icon-theme/Makefile
+++ b/x11-themes/linux-c6-hicolor-icon-theme/Makefile
@@ -7,7 +7,7 @@ PORTREVISION=	4
 CATEGORIES=	x11-themes linux
 MASTER_SITES=	# empty
 DISTFILES=	# empty
-PKGNAMEPREFIX=	linux-${USE_LINUX}-
+PKGNAMEPREFIX=	linux-c6-
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	High-color icon theme shell from the FreeDesktop project
@@ -17,7 +17,7 @@ CONFLICTS=	linux-f10-hicolor-icon-theme-[0-9]*
 RUN_DEPENDS=	${LOCALBASE}/share/icons/hicolor/index.theme:misc/hicolor-icon-theme
 
 NO_BUILD=	yes
-USE_LINUX=	c6
+USES=		linux:c6
 USE_LINUX_PREFIX=	yes
 PLIST_FILES=	usr/share/icons/hicolor
 
diff --git a/x11-themes/linux-f10-hicolor-icon-theme/Makefile b/x11-themes/linux-f10-hicolor-icon-theme/Makefile
index 74101a9bbbb6..3da1c0f27eaa 100644
--- a/x11-themes/linux-f10-hicolor-icon-theme/Makefile
+++ b/x11-themes/linux-f10-hicolor-icon-theme/Makefile
@@ -16,7 +16,7 @@ CONFLICTS=	linux-hicolor-icon-theme-[0-9]* linux-f8-hicolor-icon-theme-[0-9]*
 RUN_DEPENDS=	${LOCALBASE}/share/icons/hicolor/index.theme:misc/hicolor-icon-theme
 
 NO_BUILD=	yes
-USE_LINUX=	f10
+USES=		linux:f10
 USE_LINUX_PREFIX=	yes
 PLIST_FILES=	usr/share/icons/hicolor
 
diff --git a/x11-themes/linux-f10-qtcurve-gtk2/Makefile b/x11-themes/linux-f10-qtcurve-gtk2/Makefile
index eaac073f623c..6ea5917d5e27 100644
--- a/x11-themes/linux-f10-qtcurve-gtk2/Makefile
+++ b/x11-themes/linux-f10-qtcurve-gtk2/Makefile
@@ -9,11 +9,9 @@ PKGNAMEPREFIX=	linux-f10-
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	QtCurve GTK2 Theme Engine (Linux Fedora 10)
 
-ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	f10
+USES=		linux:f10
 USE_LINUX_RPM=	yes
-USE_LINUX_APPS=	gtk2
-LINUX_DIST_VER=	10
+USE_LINUX=	gtk2
 RPMVERSION=	1.fc10
 
 .include <bsd.port.mk>
diff --git a/x11-themes/linux-hicolor-icon-theme/Makefile b/x11-themes/linux-hicolor-icon-theme/Makefile
index 101628d8aed1..a6b61f63c367 100644
--- a/x11-themes/linux-hicolor-icon-theme/Makefile
+++ b/x11-themes/linux-hicolor-icon-theme/Makefile
@@ -17,7 +17,7 @@ RUN_DEPENDS=	${LOCALBASE}/share/icons/hicolor/index.theme:misc/hicolor-icon-them
 CONFLICTS=	linux-f8-hicolor-icon-theme-[0-9]* linux-f10-hicolor-icon-theme-[0-9]*
 
 NO_BUILD=	yes
-USE_LINUX=	yes
+USES=		linux
 USE_LINUX_PREFIX=	yes
 PLIST_FILES=	usr/share/icons/hicolor