From 82a87de90c337aae160ac254606dad78d0d78d11 Mon Sep 17 00:00:00 2001 From: Tijl Coosemans Date: Mon, 5 Sep 2016 19:23:42 +0000 Subject: - 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) --- accessibility/linux-c6-atk/Makefile | 3 +-- accessibility/linux-f10-atk/Makefile | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) (limited to 'accessibility') diff --git a/accessibility/linux-c6-atk/Makefile b/accessibility/linux-c6-atk/Makefile index fb77f2ec0d74..b6ebce017e27 100644 --- a/accessibility/linux-c6-atk/Makefile +++ b/accessibility/linux-c6-atk/Makefile @@ -12,8 +12,7 @@ LICENSE= GPLv3 CONFLICTS= linux-atk-[0-9]* linux-f10-atk-[0-9]* -ONLY_FOR_ARCHS= i386 amd64 -USE_LINUX= c6 +USES= linux:c6 RPMVERSION= 1.el6 USE_LINUX_RPM= yes USE_LDCONFIG= yes diff --git a/accessibility/linux-f10-atk/Makefile b/accessibility/linux-f10-atk/Makefile index 517ae4925ad5..9c1bb05c7bcd 100644 --- a/accessibility/linux-f10-atk/Makefile +++ b/accessibility/linux-f10-atk/Makefile @@ -5,15 +5,13 @@ PORTNAME= atk PORTVERSION= 1.24.0 PORTREVISION= 1 CATEGORIES= accessibility linux -MASTER_SITES= LOCAL/ehaupt/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER} MAINTAINER= emulation@FreeBSD.org COMMENT= Accessibility Toolkit, Linux/i386 binary (Linux Fedora 10) CONFLICTS= linux-atk-[0-9]* linux-f8-atk-[0-9]* -ONLY_FOR_ARCHS= i386 amd64 -USE_LINUX= f10 +USES= linux:f10 USE_LINUX_RPM= yes RPMVERSION= 1.fc10 -- cgit v1.2.3