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

2 files changed, 4 insertions, 5 deletions

diff --git a/math/matlab-installer/Makefile b/math/matlab-installer/Makefile
index b2e567216e87..f604eb8fcc09 100644
--- a/math/matlab-installer/Makefile
+++ b/math/matlab-installer/Makefile
@@ -16,9 +16,8 @@ RUN_DEPENDS=	mount_cd9660_image:sysutils/diskimage-tools \
 		auto-ask:sysutils/auto-admin \
 		webbrowser:www/webbrowser \
 
-USES=		tar:xz
-USE_LINUX=	yes
-USE_LINUX_APPS=	ncurses-base dri devtools
+USES=		linux tar:xz
+USE_LINUX=	ncurses-base dri devtools
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 JAVA_OS=	linux
diff --git a/math/wingz3/Makefile b/math/wingz3/Makefile
index c1a9c0ab2b22..64c3a00a7e4e 100644
--- a/math/wingz3/Makefile
+++ b/math/wingz3/Makefile
@@ -19,8 +19,8 @@ COMMENT=	Commercial Spreadsheet
 NO_PACKAGE=	Commercial software with nothing to build - install from port
 
 IA32_BINARY_PORT=yes
-USE_LINUX=	yes
-USE_LINUX_APPS=	xorglibs
+USES=		linux
+USE_LINUX=	xorglibs
 SUB_FILES=	Wingz3
 PLIST_SUB+=	LINUXBASE=${LINUXBASE}
 OLDLIBS=	libm.so.5 libg++.so.27 libstdc++.so.27 libc.so.5 \