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

3 files changed, 9 insertions, 11 deletions

diff --git a/print/foxitreader/Makefile b/print/foxitreader/Makefile
index 62e19e8ce91a..676e5d18893e 100644
--- a/print/foxitreader/Makefile
+++ b/print/foxitreader/Makefile
@@ -23,9 +23,8 @@ NO_BUILD=	yes
 OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_SUB=	yes
 
-USES=	gettext tar:bzip2
-USE_LINUX=	yes
-USE_LINUX_APPS=	avahi-libs cups-libs dbuslibs gtk2 nss
+USES=		gettext linux tar:bzip2
+USE_LINUX=	avahi-libs cups-libs dbuslibs gtk2 nss
 
 WRKSRC=	${WRKDIR}/${PORTVERSION:R}-release
 
diff --git a/print/linux-c6-cups-libs/Makefile b/print/linux-c6-cups-libs/Makefile
index 16d71f15b0f4..82907f379609 100644
--- a/print/linux-c6-cups-libs/Makefile
+++ b/print/linux-c6-cups-libs/Makefile
@@ -5,17 +5,16 @@ PORTNAME=	cups-libs
 PORTVERSION=	1.4.2
 PORTREVISION=	5
 CATEGORIES=	print linux
-MASTER_SITES=	CENTOS_LINUX
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Common UNIX Printing System libraries
 
-USE_LINUX=	c6
-USE_LINUX_RPM=	yes
-USE_LINUX_APPS=	gnutls
-SRC_DISTFILES=	cups-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}:SOURCE
 RPMVERSION=	74.el6
+USES=		linux:c6
 USE_LDCONFIG=	yes
+USE_LINUX=	gnutls
+USE_LINUX_RPM=	yes
+SRC_DISTFILES=	cups-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}:SOURCE
 
 DESCR=		${.CURDIR}/../cups/pkg-descr
 
diff --git a/print/linux-f10-cups-libs/Makefile b/print/linux-f10-cups-libs/Makefile
index e129584e9fb5..1f3be5649c62 100644
--- a/print/linux-f10-cups-libs/Makefile
+++ b/print/linux-f10-cups-libs/Makefile
@@ -9,10 +9,10 @@ CATEGORIES=	print linux
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Common UNIX Printing System libraries
 
-USE_LINUX=	f10
+USES=		linux:f10
+USE_LINUX=	gnutls
 USE_LINUX_RPM=	yes
-USE_LINUX_APPS=	gnutls
-SRC_DISTFILES=	cups-${PORTVERSION}-${RPMVERSION}.src.rpm
+SRC_DISTFILES=	cups-${PORTVERSION}-${RPMVERSION}.src.rpm:SOURCE
 RPMVERSION=	4.fc10
 USE_LDCONFIG=	yes