From owner-svn-ports-all@freebsd.org Mon Sep 5 19:23:46 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2D657B96ECC; Mon, 5 Sep 2016 19:23:46 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CDFAFA65; Mon, 5 Sep 2016 19:23:45 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u85JNjlg040426; Mon, 5 Sep 2016 19:23:45 GMT (envelope-from tijl@FreeBSD.org) Received: (from tijl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u85JNgFT040401; Mon, 5 Sep 2016 19:23:42 GMT (envelope-from tijl@FreeBSD.org) Message-Id: <201609051923.u85JNgFT040401@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tijl set sender to tijl@FreeBSD.org using -f From: Tijl Coosemans Date: Mon, 5 Sep 2016 19:23:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r421387 - in head: Mk Mk/Scripts Mk/Uses accessibility/linux-c6-atk accessibility/linux-f10-atk archivers/kzip archivers/linux-f10-ucl archivers/linux-f10-upx archivers/stuffit astro/go... X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Sep 2016 19:23:46 -0000 Author: tijl Date: Mon Sep 5 19:23:42 2016 New Revision: 421387 URL: https://svnweb.freebsd.org/changeset/ports/421387 Log: - 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) Added: head/Mk/Uses/linux.mk (contents, props changed) head/dns/linux-f10-libasyncns/pkg-plist (contents, props changed) Deleted: head/Mk/bsd.linux-apps.mk head/Mk/bsd.linux-rpm.mk head/emulators/linux_base-c6/files/ head/emulators/linux_base-c6/pkg-deinstall head/emulators/linux_base-c6/pkg-install head/emulators/linux_base-f10/files/ head/emulators/linux_base-f10/pkg-deinstall head/emulators/linux_base-f10/pkg-install Modified: head/Mk/Scripts/functions.sh head/Mk/bsd.default-versions.mk head/Mk/bsd.port.mk head/Mk/bsd.sites.mk head/accessibility/linux-c6-atk/Makefile head/accessibility/linux-f10-atk/Makefile head/archivers/kzip/Makefile head/archivers/linux-f10-ucl/Makefile head/archivers/linux-f10-upx/Makefile head/archivers/stuffit/Makefile head/astro/google-earth/Makefile head/audio/baudline/Makefile head/audio/linux-c6-alsa-lib/Makefile head/audio/linux-c6-alsa-plugins-oss/Makefile head/audio/linux-c6-alsa-plugins-pulseaudio/Makefile head/audio/linux-c6-alsa-utils/Makefile head/audio/linux-c6-arts/Makefile head/audio/linux-c6-esound/Makefile head/audio/linux-c6-flac/Makefile head/audio/linux-c6-flac/pkg-plist.i386 head/audio/linux-c6-flac/pkg-plist.x86_64 head/audio/linux-c6-libaudiofile/Makefile head/audio/linux-c6-libogg/Makefile head/audio/linux-c6-libsndfile/Makefile head/audio/linux-c6-libsndfile/pkg-plist.i386 head/audio/linux-c6-libsndfile/pkg-plist.x86_64 head/audio/linux-c6-libvorbis/Makefile head/audio/linux-c6-mikmod/Makefile head/audio/linux-c6-nas-libs/Makefile head/audio/linux-c6-openal-soft/Makefile head/audio/linux-c6-pulseaudio-libs/Makefile head/audio/linux-c6-pulseaudio-utils/Makefile head/audio/linux-c6-sdl_mixer/Makefile head/audio/linux-f10-alsa-lib/Makefile head/audio/linux-f10-alsa-plugins-oss/Makefile head/audio/linux-f10-arts/Makefile head/audio/linux-f10-esound/Makefile head/audio/linux-f10-freealut/Makefile head/audio/linux-f10-libaudiofile/Makefile head/audio/linux-f10-libogg/Makefile head/audio/linux-f10-libvorbis/Makefile head/audio/linux-f10-mikmod/Makefile head/audio/linux-f10-nas-libs/Makefile head/audio/linux-f10-openal-soft/Makefile head/audio/linux-f10-openal/Makefile head/audio/linux-f10-pulseaudio-libs/Makefile head/audio/linux-f10-sdl_mixer/Makefile head/audio/linux-genpuid/Makefile head/audio/linux-laudio/Makefile head/audio/linux-mbrola/Makefile head/audio/linux-neroaaccodec/Makefile head/audio/linux-skype_oss_wrapper/Makefile head/audio/lpac/Makefile head/biology/consed/Makefile head/biology/linux-foldingathome/Makefile head/cad/linux-eagle5/Makefile head/comms/kvasd/Makefile head/comms/rxtx/Makefile head/databases/linux-c6-sqlite3/Makefile head/databases/linux-f10-sqlite3/Makefile head/databases/linux-oracle-instantclient-basic/Makefile head/databases/linux-oracle-instantclient-sqlplus/Makefile head/devel/fb-adb/Makefile head/devel/linux-c6-dbus-glib/Makefile head/devel/linux-c6-dbus-libs/Makefile head/devel/linux-c6-devtools/Makefile head/devel/linux-c6-libgfortran/Makefile head/devel/linux-c6-libglade2/Makefile head/devel/linux-c6-libpciaccess/Makefile head/devel/linux-c6-libsigc++20/Makefile head/devel/linux-c6-libthai/Makefile head/devel/linux-c6-ncurses-base/Makefile head/devel/linux-c6-nspr/Makefile head/devel/linux-c6-qt47/Makefile head/devel/linux-c6-qt47/pkg-plist.i386 head/devel/linux-c6-qt47/pkg-plist.x86_64 head/devel/linux-c6-sdl12/Makefile head/devel/linux-f10-allegro/Makefile head/devel/linux-f10-dbus-glib/Makefile head/devel/linux-f10-dbus-libs/Makefile head/devel/linux-f10-devtools/Makefile head/devel/linux-f10-libglade2/Makefile head/devel/linux-f10-libsigc++20/Makefile head/devel/linux-f10-ncurses-base/Makefile head/devel/linux-f10-nspr/Makefile head/devel/linux-f10-sdl12/Makefile head/devel/linux_kdump/Makefile head/dns/linux-c6-libasyncns/Makefile head/dns/linux-f10-libasyncns/Makefile head/editors/edith/Makefile head/editors/komodo-edit/Makefile head/editors/linux-sublime/Makefile head/editors/linux-sublime/files/sublime.in head/editors/linux-sublime3/Makefile head/emulators/linux-c6/Makefile head/emulators/linux-f10/Makefile head/emulators/linux_base-c6/Makefile head/emulators/linux_base-c6/pkg-descr head/emulators/linux_base-c6/pkg-message head/emulators/linux_base-c6/pkg-plist.i386 head/emulators/linux_base-c6/pkg-plist.x86_64 head/emulators/linux_base-f10/Makefile head/emulators/linux_base-f10/pkg-descr head/emulators/linux_base-f10/pkg-message head/emulators/linux_base-f10/pkg-plist head/emulators/rtc/Makefile head/french/homard/Makefile head/ftp/linux-c6-curl/Makefile head/ftp/linux-f10-curl/Makefile head/games/adom/Makefile head/games/arkanoidsb/Makefile head/games/dsnake/Makefile head/games/gish-demo/Makefile head/games/hohlin/Makefile head/games/legends/Makefile head/games/linux-darwinia-demo/Makefile head/games/linux-defcon/Makefile head/games/linux-doom3-demo/Makefile head/games/linux-doom3/Makefile head/games/linux-enemyterritory-etpro/Makefile head/games/linux-enemyterritory-jaymod-21/Makefile head/games/linux-enemyterritory-jaymod/Makefile head/games/linux-enemyterritory-omni-bot-0660/Makefile head/games/linux-enemyterritory-omni-bot/Makefile head/games/linux-enemyterritory-shrub/Makefile head/games/linux-enemyterritory-tce/Makefile head/games/linux-enemyterritory/Makefile head/games/linux-etqw-demo-server/Makefile head/games/linux-etqw-server/Makefile head/games/linux-nerogame/Makefile head/games/linux-nwnclient/Makefile head/games/linux-quake3-demo/Makefile head/games/linux-quake3/Makefile head/games/linux-quake4-demo/Makefile head/games/linux-quake4/Makefile head/games/linux-rtcw/Makefile head/games/linux-ssamtfe/Makefile head/games/linux-ssamtse/Makefile head/games/linux-unigine-heaven/Makefile head/games/linux-unigine-valley/Makefile head/games/linux-unrealgold/Makefile head/games/linux-uplink-demo/Makefile head/games/linux-ut/Makefile head/games/linux-ut2003-demo/Makefile head/games/linux-virtual-jay-peak/Makefile head/games/linux-worldofgoo-demo/Makefile head/games/mtaserver/Makefile head/games/sampsvr/Makefile head/graphics/linux-adobesvg/Makefile head/graphics/linux-c6-cairo/Makefile head/graphics/linux-c6-dri/Makefile head/graphics/linux-c6-gdk-pixbuf2/Makefile head/graphics/linux-c6-gdk-pixbuf2/pkg-plist.i386 head/graphics/linux-c6-gdk-pixbuf2/pkg-plist.x86_64 head/graphics/linux-c6-glx-utils/Makefile head/graphics/linux-c6-jasper/Makefile head/graphics/linux-c6-jpeg/Makefile head/graphics/linux-c6-jpeg/pkg-plist.i386 head/graphics/linux-c6-jpeg/pkg-plist.x86_64 head/graphics/linux-c6-libGLU/Makefile head/graphics/linux-c6-png/Makefile head/graphics/linux-c6-sdl_image/Makefile head/graphics/linux-c6-sdl_ttf/Makefile head/graphics/linux-c6-tiff/Makefile head/graphics/linux-c6-tiff/pkg-plist.i386 head/graphics/linux-c6-tiff/pkg-plist.x86_64 head/graphics/linux-f10-cairo/Makefile head/graphics/linux-f10-dri/Makefile head/graphics/linux-f10-gdk-pixbuf/Makefile head/graphics/linux-f10-glew/Makefile head/graphics/linux-f10-imlib/Makefile head/graphics/linux-f10-jpeg/Makefile head/graphics/linux-f10-libGLU/Makefile head/graphics/linux-f10-libmng/Makefile head/graphics/linux-f10-png/Makefile head/graphics/linux-f10-sdl_image/Makefile head/graphics/linux-f10-sdl_ttf/Makefile head/graphics/linux-f10-tiff/Makefile head/graphics/linux-f10-ungif/Makefile head/japanese/slimeforest/Makefile head/java/linux-oracle-jdk18/Makefile head/java/linux-oracle-jre18/Makefile head/lang/icc/Makefile head/lang/linux-c6-tcl85/Makefile head/lang/linux-c6-tcl85/pkg-plist.i386 head/lang/linux-c6-tcl85/pkg-plist.x86_64 head/lang/linux-f10-libg2c/Makefile head/lang/linux-f10-tcl85/Makefile head/lang/linux-j/Makefile head/lang/visualworks/Makefile head/mail/linux-thunderbird/Makefile head/mail/linux-thunderbird/pkg-plist head/mail/mulberry/Makefile head/math/matlab-installer/Makefile head/math/wingz3/Makefile head/misc/opencyc/Makefile head/multimedia/linux-c6-libtheora/Makefile head/multimedia/linux-c6-libv4l/Makefile head/multimedia/linux-f10-libtheora/Makefile head/multimedia/linux-f10-libv4l/Makefile head/multimedia/linux-tsmuxer/Makefile head/multimedia/w_scan/Makefile head/net-im/linux-instantbird/Makefile head/net-im/qq/Makefile head/net-im/skype-devel/Makefile head/net-im/skype/Makefile head/net-im/skype4/Makefile head/net-im/yoono/Makefile head/net/boinc-client/Makefile head/net/citrix_ica/Makefile head/net/linux-c6-avahi-libs/Makefile head/net/linux-c6-openldap/Makefile head/net/linux-c6-tcp_wrappers-libs/Makefile head/net/linux-f10-nss_ldap/Makefile head/net/linux-f10-openldap/Makefile head/net/spideroak/Makefile head/print/foxitreader/Makefile head/print/linux-c6-cups-libs/Makefile head/print/linux-f10-cups-libs/Makefile head/security/hamachi/Makefile head/security/linux-c6-cyrus-sasl2/Makefile head/security/linux-c6-gnutls/Makefile head/security/linux-c6-libgcrypt/Makefile head/security/linux-c6-libgpg-error/Makefile head/security/linux-c6-libssh2/Makefile head/security/linux-c6-libtasn1/Makefile head/security/linux-c6-nss/Makefile head/security/linux-c6-openssl-compat/Makefile head/security/linux-c6-openssl/Makefile head/security/linux-c6-openssl/pkg-plist.i386 head/security/linux-c6-openssl/pkg-plist.x86_64 head/security/linux-f10-cyrus-sasl2/Makefile head/security/linux-f10-gnutls/Makefile head/security/linux-f10-libgcrypt/Makefile head/security/linux-f10-libgpg-error/Makefile head/security/linux-f10-libgpg-error/pkg-plist head/security/linux-f10-libssh2/Makefile head/security/linux-f10-libtasn1/Makefile head/security/linux-f10-nss/Makefile head/security/linux-f10-openssl/Makefile head/security/pkcs11-gateway/Makefile head/sysutils/linux-crashplan/Makefile head/sysutils/linux-f10-procps/Makefile head/sysutils/linux-nero/Makefile head/sysutils/seatools/Makefile head/textproc/linux-c6-aspell/Makefile head/textproc/linux-c6-expat/Makefile head/textproc/linux-c6-libxml2/Makefile head/textproc/linux-f10-aspell/Makefile head/textproc/linux-f10-expat/Makefile head/textproc/linux-f10-libxml2/Makefile head/textproc/linux-f10-scim-gtk/Makefile head/textproc/linux-f10-scim-libs/Makefile head/textproc/pocketreader/Makefile head/www/linux-c6-flashplugin11/Makefile head/www/linux-c6-qt47-webkit/Makefile head/www/linux-f10-flashplugin11/Makefile head/www/linux-firefox/Makefile head/www/linux-firefox/pkg-plist head/www/linux-opera/Makefile head/www/linux-seamonkey/Makefile head/www/linux-seamonkey/Makefile.common head/www/linux-seamonkey/pkg-plist head/www/nspluginwrapper/Makefile head/www/opera-linuxplugins/Makefile head/x11-fonts/linux-c6-fontconfig/Makefile head/x11-fonts/linux-f10-fontconfig/Makefile head/x11-themes/linux-c6-hicolor-icon-theme/Makefile head/x11-themes/linux-f10-hicolor-icon-theme/Makefile head/x11-themes/linux-f10-qtcurve-gtk2/Makefile head/x11-themes/linux-hicolor-icon-theme/Makefile head/x11-toolkits/linux-c6-gtk2/Makefile head/x11-toolkits/linux-c6-gtk2/pkg-plist.i386 head/x11-toolkits/linux-c6-gtk2/pkg-plist.x86_64 head/x11-toolkits/linux-c6-openmotif/Makefile head/x11-toolkits/linux-c6-pango/Makefile head/x11-toolkits/linux-c6-pango/pkg-plist.i386 head/x11-toolkits/linux-c6-pango/pkg-plist.x86_64 head/x11-toolkits/linux-c6-qt47-x11/Makefile head/x11-toolkits/linux-c6-tk85/Makefile head/x11-toolkits/linux-c6-tk85/pkg-plist.i386 head/x11-toolkits/linux-c6-tk85/pkg-plist.x86_64 head/x11-toolkits/linux-f10-blt/Makefile head/x11-toolkits/linux-f10-gtk2/Makefile head/x11-toolkits/linux-f10-openmotif/Makefile head/x11-toolkits/linux-f10-pango/Makefile head/x11-toolkits/linux-f10-qt45/Makefile head/x11-toolkits/linux-f10-tk85/Makefile head/x11/linux-c6-pixman/Makefile head/x11/linux-c6-xorg-libs/Makefile head/x11/linux-f10-xorg-libs/Makefile head/x11/linux-f10-xorg-libs/pkg-plist head/x11/nvidia-driver/Makefile Modified: head/Mk/Scripts/functions.sh ============================================================================== --- head/Mk/Scripts/functions.sh Mon Sep 5 19:19:34 2016 (r421386) +++ head/Mk/Scripts/functions.sh Mon Sep 5 19:23:42 2016 (r421387) @@ -180,7 +180,6 @@ export_ports_env() { ARCH \ CONFIGURE_MAX_CMD_LEN \ HAVE_COMPAT_IA32_KERN \ - LINUX_OSRELEASE \ OPSYS \ OSREL \ OSVERSION \ Added: head/Mk/Uses/linux.mk ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/Mk/Uses/linux.mk Mon Sep 5 19:23:42 2016 (r421387) @@ -0,0 +1,277 @@ +# $FreeBSD$ +# +# Ports Linux compatibility framework +# +# Feature: linux:args +# Usage: USES=linux or USES=linux:args +# Valid args: f10 Depend on Fedora 10 packages (deprecated) +# c6 Depend on CentOS 6 packages (default) +# c7 Depend on CentOS 7 packages +# Additional variables: +# USE_LINUX List of Linux packages to depend on. +# USE_LINUX_RPM When defined, additional variables and targets useful to Linux +# infrastructure ports are made available. Possible values: +# yes Default LIB_DISTFILES and empty BIN_DISTFILES. +# nolib Default BIN_DISTFILES and empty LIB_DISTFILES. +# Additional variables when USE_LINUX_RPM is defined: +# BIN_DISTFILES List of distfiles to install. +# LIB_DISTFILES List of distfiles to install both the 32 and 64 bit version of. +# SRC_DISTFILES List of source distfiles that need to be distributed with +# binary packages to comply with some licenses. +# +# MAINTAINER: emulation@FreeBSD.org + +.ifndef _INCLUDE_USES_LINUX_MK +_INCLUDE_USES_LINUX_MK= yes +_USES_POST+= linux + +.if empty(linux_ARGS) +linux_ARGS= ${LINUX_DEFAULT:S/_64//} +.endif + +.if ${linux_ARGS} == f10 +LINUX_DIST_VER?= 10 +.elif ${linux_ARGS} == c6 +LINUX_DIST_VER?= 6.8 +.elif ${linux_ARGS} == c7 +LINUX_DIST_VER?= 7.2.1511 +.else +IGNORE= Invalid Linux distribution: ${linux_ARGS} +.endif + +.if ${linux_ARGS} == f10 +LINUX_ARCH= i386 +DEPRECATED= Fedora 10 is unsupported and vulnerable +EXPIRATION_DATE= 2016-12-31 +.else +.if ${LINUX_DEFAULT:M*_64} +LINUX_ARCH= x86_64 +.if ${ARCH} != amd64 || ${OPSYS} != FreeBSD || ${OSVERSION} < 1002507 \ + || ( ${OSVERSION} >= 1100000 && ${OSVERSION} < 1100105 ) +IGNORE= Linux ${LINUX_DEFAULT} only supported on FreeBSD/amd64 10.3 or higher +.endif +.else +LINUX_ARCH= i386 +.endif +.endif + +linux_allegro_DEP= linux-${linux_ARGS}-allegro>0:devel/linux-${linux_ARGS}-allegro +linux_alsa-plugins-oss_DEP= linux-${linux_ARGS}-alsa-plugins-oss>0:audio/linux-${linux_ARGS}-alsa-plugins-oss +linux_alsa-plugins-pulseaudio_DEP=linux-${linux_ARGS}-alsa-plugins-pulseaudio>0:audio/linux-${linux_ARGS}-alsa-plugins-pulseaudio +linux_alsalib_DEP= linux-${linux_ARGS}-alsa-lib>0:audio/linux-${linux_ARGS}-alsa-lib +linux_arts_DEP= linux-${linux_ARGS}-arts>0:audio/linux-${linux_ARGS}-arts +linux_atk_DEP= linux-${linux_ARGS}-atk>0:accessibility/linux-${linux_ARGS}-atk +linux_avahi-libs_DEP= linux-${linux_ARGS}-avahi-libs>0:net/linux-${linux_ARGS}-avahi-libs +linux_base_DEP= linux_base-${linux_ARGS}>0:emulators/linux_base-${linux_ARGS} +linux_cairo_DEP= linux-${linux_ARGS}-cairo>0:graphics/linux-${linux_ARGS}-cairo +linux_cups-libs_DEP= linux-${linux_ARGS}-cups-libs>0:print/linux-${linux_ARGS}-cups-libs +linux_curl_DEP= linux-${linux_ARGS}-curl>0:ftp/linux-${linux_ARGS}-curl +linux_cyrus-sasl2_DEP= linux-${linux_ARGS}-cyrus-sasl2>0:security/linux-${linux_ARGS}-cyrus-sasl2 +linux_dbusglib_DEP= linux-${linux_ARGS}-dbus-glib>0:devel/linux-${linux_ARGS}-dbus-glib +linux_dbuslibs_DEP= linux-${linux_ARGS}-dbus-libs>0:devel/linux-${linux_ARGS}-dbus-libs +linux_devtools_DEP= linux-${linux_ARGS}-devtools>0:devel/linux-${linux_ARGS}-devtools +linux_dri_DEP= linux-${linux_ARGS}-dri>0:graphics/linux-${linux_ARGS}-dri +linux_esound_DEP= linux-${linux_ARGS}-esound>0:audio/linux-${linux_ARGS}-esound +linux_expat_DEP= linux-${linux_ARGS}-expat>0:textproc/linux-${linux_ARGS}-expat +linux_flac_DEP= linux-${linux_ARGS}-flac>0:audio/linux-${linux_ARGS}-flac +linux_fontconfig_DEP= linux-${linux_ARGS}-fontconfig>0:x11-fonts/linux-${linux_ARGS}-fontconfig +.if ${linux_ARGS:Mf10} +linux_gdkpixbuf2_DEP= linux-${linux_ARGS}-gtk2>0:x11-toolkits/linux-${linux_ARGS}-gtk2 +.else +linux_gdkpixbuf2_DEP= linux-${linux_ARGS}-gdk-pixbuf2>0:graphics/linux-${linux_ARGS}-gdk-pixbuf2 +.endif +linux_gnutls_DEP= linux-${linux_ARGS}-gnutls>0:security/linux-${linux_ARGS}-gnutls +linux_gtk2_DEP= linux-${linux_ARGS}-gtk2>0:x11-toolkits/linux-${linux_ARGS}-gtk2 +linux_hicontheme_DEP= linux-${linux_ARGS}-hicolor-icon-theme>0:x11-themes/linux-${linux_ARGS}-hicolor-icon-theme +linux_jasper_DEP= linux-${linux_ARGS}-jasper>0:graphics/linux-${linux_ARGS}-jasper +linux_jpeg_DEP= linux-${linux_ARGS}-jpeg>0:graphics/linux-${linux_ARGS}-jpeg +linux_libasyncns_DEP= linux-${linux_ARGS}-libasyncns>0:dns/linux-${linux_ARGS}-libasyncns +linux_libaudiofile_DEP= linux-${linux_ARGS}-libaudiofile>0:audio/linux-${linux_ARGS}-libaudiofile +linux_libgcrypt_DEP= linux-${linux_ARGS}-libgcrypt>0:security/linux-${linux_ARGS}-libgcrypt +linux_libgfortran_DEP= linux-${linux_ARGS}-libgfortran>0:devel/linux-${linux_ARGS}-libgfortran +linux_libglu_DEP= linux-${linux_ARGS}-libGLU>0:graphics/linux-${linux_ARGS}-libGLU +linux_libgpg-error_DEP= linux-${linux_ARGS}-libgpg-error>0:security/linux-${linux_ARGS}-libgpg-error +linux_libmng_DEP= linux-${linux_ARGS}-libmng>0:graphics/linux-${linux_ARGS}-libmng +linux_libogg_DEP= linux-${linux_ARGS}-libogg>0:audio/linux-${linux_ARGS}-libogg +linux_libpciaccess_DEP= linux-${linux_ARGS}-libpciaccess>0:devel/linux-${linux_ARGS}-libpciaccess +linux_libsndfile_DEP= linux-${linux_ARGS}-libsndfile>0:audio/linux-${linux_ARGS}-libsndfile +linux_libssh2_DEP= linux-${linux_ARGS}-libssh2>0:security/linux-${linux_ARGS}-libssh2 +linux_libtasn1_DEP= linux-${linux_ARGS}-libtasn1>0:security/linux-${linux_ARGS}-libtasn1 +linux_libthai_DEP= linux-${linux_ARGS}-libthai>0:devel/linux-${linux_ARGS}-libthai +linux_libtheora_DEP= linux-${linux_ARGS}-libtheora>0:multimedia/linux-${linux_ARGS}-libtheora +linux_libv4l_DEP= linux-${linux_ARGS}-libv4l>0:multimedia/linux-${linux_ARGS}-libv4l +linux_libvorbis_DEP= linux-${linux_ARGS}-libvorbis>0:audio/linux-${linux_ARGS}-libvorbis +linux_libxml2_DEP= linux-${linux_ARGS}-libxml2>0:textproc/linux-${linux_ARGS}-libxml2 +linux_mikmod_DEP= linux-${linux_ARGS}-mikmod>0:audio/linux-${linux_ARGS}-mikmod +linux_naslibs_DEP= linux-${linux_ARGS}-nas-libs>0:audio/linux-${linux_ARGS}-nas-libs +linux_ncurses-base_DEP= linux-${linux_ARGS}-ncurses-base>0:devel/linux-${linux_ARGS}-ncurses-base +linux_nspr_DEP= linux-${linux_ARGS}-nspr>0:devel/linux-${linux_ARGS}-nspr +linux_nss_DEP= linux-${linux_ARGS}-nss>0:security/linux-${linux_ARGS}-nss +linux_openal_DEP= linux-${linux_ARGS}-openal>0:audio/linux-${linux_ARGS}-openal +linux_openal-soft_DEP= linux-${linux_ARGS}-openal-soft>0:audio/linux-${linux_ARGS}-openal-soft +linux_openldap_DEP= linux-${linux_ARGS}-openldap>0:net/linux-${linux_ARGS}-openldap +linux_openmotif_DEP= linux-${linux_ARGS}-openmotif>0:x11-toolkits/linux-${linux_ARGS}-openmotif +linux_openssl_DEP= linux-${linux_ARGS}-openssl>0:security/linux-${linux_ARGS}-openssl +linux_openssl-compat_DEP= linux-${linux_ARGS}-openssl-compat>0:security/linux-${linux_ARGS}-openssl-compat +linux_pango_DEP= linux-${linux_ARGS}-pango>0:x11-toolkits/linux-${linux_ARGS}-pango +linux_pixman_DEP= linux-${linux_ARGS}-pixman>0:x11/linux-${linux_ARGS}-pixman +linux_png_DEP= linux-${linux_ARGS}-png>0:graphics/linux-${linux_ARGS}-png +linux_pulseaudio-libs_DEP= linux-${linux_ARGS}-pulseaudio-libs>0:audio/linux-${linux_ARGS}-pulseaudio-libs +linux_qt47_DEP= linux-${linux_ARGS}-qt47>0:devel/linux-${linux_ARGS}-qt47 +linux_qt47-webkit_DEP= linux-${linux_ARGS}-qt47-webkit>0:www/linux-${linux_ARGS}-qt47-webkit +linux_qt47-x11_DEP= linux-${linux_ARGS}-qt47-x11>0:x11-toolkits/linux-${linux_ARGS}-qt47-x11 +linux_scimlibs_DEP= linux-${linux_ARGS}-scim-libs>0:textproc/linux-${linux_ARGS}-scim-libs +linux_sdl12_DEP= linux-${linux_ARGS}-sdl>0:devel/linux-${linux_ARGS}-sdl12 +linux_sdlimage_DEP= linux-${linux_ARGS}-sdl_image>0:graphics/linux-${linux_ARGS}-sdl_image +linux_sdlmixer_DEP= linux-${linux_ARGS}-sdl_mixer>0:audio/linux-${linux_ARGS}-sdl_mixer +.if ${linux_ARGS:Mf10} +linux_sqlite3_DEP= linux-${linux_ARGS}-sqlite3>0:databases/linux-${linux_ARGS}-sqlite3 +.else +linux_sqlite3_DEP= linux-${linux_ARGS}-sqlite>0:databases/linux-${linux_ARGS}-sqlite3 +.endif +linux_tcl85_DEP= linux-${linux_ARGS}-tcl85>0:lang/linux-${linux_ARGS}-tcl85 +linux_tcp_wrappers-libs_DEP= linux-${linux_ARGS}-tcp_wrappers-libs>0:net/linux-${linux_ARGS}-tcp_wrappers-libs +linux_tiff_DEP= linux-${linux_ARGS}-tiff>0:graphics/linux-${linux_ARGS}-tiff +linux_tk85_DEP= linux-${linux_ARGS}-tk85>0:x11-toolkits/linux-${linux_ARGS}-tk85 +linux_ucl_DEP= linux-${linux_ARGS}-ucl>0:archivers/linux-${linux_ARGS}-ucl +linux_xorglibs_DEP= linux-${linux_ARGS}-xorg-libs>0:x11/linux-${linux_ARGS}-xorg-libs + +USE_LINUX?= base +.for i in ${USE_LINUX} +_i:= ${i:C/\:.*//} +_i_args:= ${i:C/^[^\:]*(\:|\$)//:S/,/ /g} +.if ${_i_args:Mpatch} +PATCH_DEPENDS+= ${linux_${_i}_DEP} +.endif +.if ${_i_args:Mbuild} +BUILD_DEPENDS+= ${linux_${_i}_DEP} +.endif +.if ${_i_args:Mrun} || empty(_i_args) +RUN_DEPENDS+= ${linux_${_i}_DEP} +.endif +.endfor + +.ifdef USE_LINUX_RPM + +DISTVERSIONSUFFIX?= -${RPMVERSION} + +.if ${linux_ARGS} == f10 + +.ifndef MASTER_SITES +MASTER_SITES= ${MASTER_SITE_FEDORA_LINUX} +MASTER_SITE_SUBDIR= releases/${LINUX_DIST_VER}/Everything/${LINUX_ARCH}/os/Packages \ + updates/${LINUX_DIST_VER}/${LINUX_ARCH} \ + releases/${LINUX_DIST_VER}/Everything/source/SRPMS/:SOURCE \ + updates/${LINUX_DIST_VER}/SRPMS/:SOURCE +.endif +DIST_SUBDIR?= rpm/${LINUX_ARCH}/fedora/${LINUX_DIST_VER} + +LINUX_RPM_ARCH?= i386 + +.elif ${linux_ARGS} == c6 + +.ifndef MASTER_SITES +MASTER_SITES= ${MASTER_SITE_CENTOS_LINUX} +MASTER_SITE_SUBDIR= centos/${LINUX_DIST_VER}/os/${LINUX_ARCH}/Packages \ + centos/${LINUX_DIST_VER}/updates/${LINUX_ARCH}/Packages \ + centos/${LINUX_DIST_VER}/os/Source/SPackages/:SOURCE \ + centos/${LINUX_DIST_VER}/updates/Source/SPackages/:SOURCE +.endif +DIST_SUBDIR?= rpm/${LINUX_RPM_ARCH}/centos/${LINUX_DIST_VER} + +.if ${LINUX_ARCH} == x86_64 +LINUX_RPM_ARCH?= x86_64 +LINUX_RPM_ARCH32?= i686 +.else +LINUX_RPM_ARCH?= i686 +.endif + +.elif ${linux_ARGS} == c7 + +.ifndef MASTER_SITES +MASTER_SITES= ${MASTER_SITE_CENTOS_LINUX} +.if ${LINUX_ARCH} == x86_64 +MASTER_SITE_SUBDIR= centos/${LINUX_DIST_VER}/os/${LINUX_ARCH}/Packages \ + centos/${LINUX_DIST_VER}/updates/${LINUX_ARCH}/Packages +.else +MASTER_SITE_SUBDIR= altarch/${LINUX_DIST_VER}/os/${LINUX_ARCH}/Packages \ + altarch/${LINUX_DIST_VER}/updates/${LINUX_ARCH}/Packages +.endif +MASTER_SITE_SUBDIR+= centos/${LINUX_DIST_VER}/os/Source/SPackages/:SOURCE \ + centos/${LINUX_DIST_VER}/updates/Source/SPackages/:SOURCE +.endif +DIST_SUBDIR?= rpm/centos/${LINUX_DIST_VER}/${LINUX_ARCH} + +.if ${LINUX_ARCH} == x86_64 +LINUX_RPM_ARCH?= x86_64 +LINUX_RPM_ARCH32?= i686 +.else +LINUX_RPM_ARCH?= i686 +.endif + +.endif # ${linux_ARGS} == * + +PKGNAMEPREFIX?= linux-${linux_ARGS}- +EXTRACT_SUFX?= .${LINUX_RPM_ARCH}.rpm +.ifdef LINUX_RPM_ARCH32 +EXTRACT_SUFX32?= .${LINUX_RPM_ARCH32}.rpm +.endif +SRC_SUFX?= .src.rpm + +NO_BUILD= yes +NO_WRKSUBDIR= yes +USE_LINUX_PREFIX= yes + +.endif # USE_LINUX_RPM + +.endif # ! _INCLUDE_USES_LINUX_MK + +.ifdef _POSTMKINCLUDED && ! _INCLUDE_USES_LINUX_POST_MK +_INCLUDE_USES_LINUX_POST_MK= yes + +.ifdef USE_LINUX_RPM + +.if ${USE_LINUX_RPM} == nolib +BIN_DISTFILES?= ${DISTNAME}${EXTRACT_SUFX} +.else +LIB_DISTFILES?= ${DISTNAME}${EXTRACT_SUFX} +.endif +.ifdef LINUX_RPM_ARCH32 +DISTFILES?= ${LIB_DISTFILES:S/${EXTRACT_SUFX}/${EXTRACT_SUFX32}/} \ + ${LIB_DISTFILES} ${BIN_DISTFILES} +EXTRACT_ONLY?= ${LIB_DISTFILES:S/${EXTRACT_SUFX}/${EXTRACT_SUFX32}/} \ + ${LIB_DISTFILES} ${BIN_DISTFILES} +.else +DISTFILES?= ${LIB_DISTFILES} ${BIN_DISTFILES} +EXTRACT_ONLY?= ${LIB_DISTFILES} ${BIN_DISTFILES} +.endif +.ifdef PACKAGE_BUILDING +SRC_DISTFILES?= ${LIB_DISTFILES:S/${EXTRACT_SUFX}/${SRC_SUFX}:SOURCE/} \ + ${BIN_DISTFILES:S/${EXTRACT_SUFX}/${SRC_SUFX}:SOURCE/} +DISTFILES+= ${SRC_DISTFILES} +ALWAYS_KEEP_DISTFILES= yes +.endif + +DISTINFO_FILE?= ${MASTERDIR}/distinfo.${LINUX_ARCH} + +.ifdef USE_LINUX_RPM_BAD_PERMS +EXTRACT_DEPENDS+= rpm2archive:archivers/rpm4 +EXTRACT_CMD= rpm2archive +EXTRACT_BEFORE_ARGS= < +EXTRACT_AFTER_ARGS= | ${TAR} xf - --no-same-owner --no-same-permissions +.endif + +ONLY_FOR_ARCHS?= i386 amd64 +.if ${linux_ARGS} != f10 +PLIST?= ${PKGDIR}/pkg-plist.${LINUX_ARCH} +.endif + +.if !target(do-install) +do-install: + (cd ${WRKSRC} && ${FIND} * -type d -exec ${MKDIR} "${STAGEDIR}${PREFIX}/{}" \;) + (cd ${WRKSRC} && ${FIND} * ! -type d | ${CPIO} -pm ${STAGEDIR}${PREFIX}) +.endif + +.endif # USE_LINUX_RPM + +.endif # _POSTMKINCLUDED && ! _INCLUDE_USES_LINUX_POST_MK Modified: head/Mk/bsd.default-versions.mk ============================================================================== --- head/Mk/bsd.default-versions.mk Mon Sep 5 19:19:34 2016 (r421386) +++ head/Mk/bsd.default-versions.mk Mon Sep 5 19:23:42 2016 (r421387) @@ -32,6 +32,12 @@ FPC_DEFAULT?= 3.0.0 GCC_DEFAULT?= 4.8 # Possible values: 7, 8, 9, agpl GHOSTSCRIPT_DEFAULT?= agpl +# Possible values: f10, c6, c6_64, c7, c7_64 +LINUX_DEFAULT?= c6 +.if defined(OVERRIDE_LINUX_BASE_PORT) +LINUX_DEFAULT:= ${OVERRIDE_LINUX_BASE_PORT} +WARNING+= "OVERRIDE_LINUX_BASE_PORT is deprecated, please use DEFAULT_VERSIONS+=linux=${OVERRIDE_LINUX_BASE_PORT}." +.endif # Possible values: 5.1, 5.2, 5.3 LUA_DEFAULT?= 5.2 # Possible values: 5.1, 5.5, 5.6, 5.7, 5.5m, 10.0m, 10.1m, 5.5p, 5.6p Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Mon Sep 5 19:19:34 2016 (r421386) +++ head/Mk/bsd.port.mk Mon Sep 5 19:23:42 2016 (r421387) @@ -408,40 +408,15 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # core, webkit). Implies that the port needs Qt. # Implies the inclusion of bsd.qt.mk. See bsd.qt.mk # for more details. -# -# USE_LINUX - Set to yes to say the port needs the default linux base port. -# Set to value , if the port needs emulators/linux_base-. -# Implies appropriate settings for STRIP and STRIP_CMD. +## # USE_LINUX_PREFIX -# - controls the action of PREFIX (see above). Only use this -# if the port is a linux infrastructure port (e.g. contains libs +# - Controls the action of PREFIX (see above). Only use this +# if the port is a Linux infrastructure port (e.g. contains libs # or a sound server which supports the FreeBSD native one), -# use the default or the X11 prefix if it's a leaf port -# (e.g. a game or program). -# Implies NO_MTREE=yes, and, if USE_LDCONFIG is defined: -# - USE_LINUX=yes -# - appropriate invocation of the Linux ldconfig -# USE_LINUX_RPM - Set to yes to pull in variables and targets useful to Linux -# RPM ports. -# Set to nolib if your port does not contain an architecture- -# specific library. -# Implies inclusion of bsd.linux-rpm.mk. -# -# LINUX_OSRELEASE - Contains the value of compat.linux.osrelease sysctl. -# Will be used to distinguish which linux -# infrastructure ports should be used. -# Valid values: 2.6.16. -# -# OVERRIDE_LINUX_BASE_PORT -# - This specifies the default linux base to use, for valid -# values have a look at the description of USE_LINUX. This is -# an user-only variable. Don't use it in any port, it's meant -# to be used in make.conf. -# -# LINUX_BASE_PORT -# - This is a read-only variable, it gets set to a value which is -# usable in *_DEPENDS (e.g. BUILD_DEPENDS=${LINUX_BASE_PORT}). -# It honors USE_LINUX=foo and OVERRIDE_LINUX_BASE_PORT. +# use the default prefix if it's a leaf port (e.g. a game or +# program). +# Implies NO_LICENSES_INSTALL=yes, NO_MTREE=yes, and causes +# Linux ldconfig to be used when USE_LDCONFIG is defined. ## # USE_XORG - Set to a list of X.org module dependencies. # Implies inclusion of bsd.xorg.mk. @@ -1312,20 +1287,6 @@ DISTNAME?= ${PORTNAME}-${DISTVERSIONFULL INDEXFILE?= INDEX-${OSVERSION:C/([0-9]*)[0-9]{5}/\1/} -DOCSDIR?= ${PREFIX}/share/doc/${PORTNAME} -EXAMPLESDIR?= ${PREFIX}/share/examples/${PORTNAME} -DATADIR?= ${PREFIX}/share/${PORTNAME} -WWWDIR?= ${PREFIX}/www/${PORTNAME} -ETCDIR?= ${PREFIX}/etc/${PORTNAME} - -.if defined(USE_LINUX_RPM) -.include "${PORTSDIR}/Mk/bsd.linux-rpm.mk" -.endif - -.if defined(USE_LINUX_APPS) -.include "${PORTSDIR}/Mk/bsd.linux-apps.mk" -.endif - .if defined(USE_XORG) || defined(XORG_CAT) .include "${PORTSDIR}/Mk/bsd.xorg.mk" .endif @@ -1339,16 +1300,7 @@ FILESDIR?= ${MASTERDIR}/files SCRIPTDIR?= ${MASTERDIR}/scripts PKGDIR?= ${MASTERDIR} -.if defined(USE_LINUX_PREFIX) -PREFIX:= ${LINUXBASE} -NO_MTREE= yes -.else PREFIX?= ${LOCALBASE} -.endif - -.if defined(USE_LINUX_PREFIX) -LDCONFIG_CMD?= ${LINUXBASE}/sbin/ldconfig -r ${LINUXBASE} -.endif PKGCOMPATDIR?= ${LOCALBASE}/lib/compat/pkg @@ -1457,6 +1409,14 @@ ${_f}_ARGS:= ${f:C/^[^\:]*(\:|\$)//:S/,/ EXTRACT_SUFX?= .tar.gz +.if defined(USE_LINUX_PREFIX) +PREFIX= ${LINUXBASE} +DATADIR?= ${PREFIX}/usr/share/${PORTNAME} +DOCSDIR?= ${PREFIX}/usr/share/doc/${PORTNAME}-${PORTVERSION} +NO_LICENSES_INSTALL= yes +NO_MTREE= yes +.endif + # You can force skipping these test by defining IGNORE_PATH_CHECKS .if !defined(IGNORE_PATH_CHECKS) .if ! ${PREFIX:M/*} @@ -1467,6 +1427,12 @@ EXTRACT_SUFX?= .tar.gz .endif .endif +DATADIR?= ${PREFIX}/share/${PORTNAME} +DOCSDIR?= ${PREFIX}/share/doc/${PORTNAME} +ETCDIR?= ${PREFIX}/etc/${PORTNAME} +EXAMPLESDIR?= ${PREFIX}/share/examples/${PORTNAME} +WWWDIR?= ${PREFIX}/www/${PORTNAME} + # Owner and group of the WWW user WWWOWN?= www WWWGRP?= www @@ -1763,65 +1729,6 @@ USE_LDCONFIG= ${PREFIX}/lib IGNORE= has USE_LDCONFIG32 set to yes, which is not correct .endif -.if defined(USE_LINUX_PREFIX) && defined(USE_LDCONFIG) -# we need ${LINUXBASE}/sbin/ldconfig -USE_LINUX?= yes -.endif - -.if defined(USE_LINUX) - -. if !defined(LINUX_OSRELEASE) -LINUX_OSRELEASE!= ${ECHO_CMD} `${SYSCTL} -n compat.linux.osrelease 2>/dev/null` -. endif -_EXPORTED_VARS+= LINUX_OSRELEASE - -# install(1) also does a brandelf on strip, so don't strip with FreeBSD tools. -STRIP= -. if exists(${LINUXBASE}/usr/bin/strip) -STRIP_CMD= ${LINUXBASE}/usr/bin/strip -. else -STRIP_CMD= ${TRUE} -. endif - -# Allow the user to specify another linux_base version. -. if defined(OVERRIDE_LINUX_BASE_PORT) -. if ${USE_LINUX:tl} == yes || (${USE_LINUX} == "c6" && ${OVERRIDE_LINUX_BASE_PORT} == "c6_64") -USE_LINUX= ${OVERRIDE_LINUX_BASE_PORT} -. endif -. endif - -# NOTE: when you update the default linux_base version (case "yes"), -# don't forget to update the Handbook! - -. if exists(${PORTSDIR}/emulators/linux_base-${USE_LINUX}) -LINUX_BASE_PORT= ${LINUXBASE}/bin/sh:emulators/linux_base-${USE_LINUX} -. else -. if ${USE_LINUX:tl} == "yes" -USE_LINUX= c6 -LINUX_BASE_PORT= ${LINUXBASE}/etc/redhat-release:emulators/linux_base-c6 -. elif ${USE_LINUX} == "c6_64" -LINUX_BASE_PORT= ${LINUXBASE}/etc/redhat-release:emulators/linux_base-c6 -. else -IGNORE= cannot be built: there is no emulators/linux_base-${USE_LINUX}, perhaps wrong use of USE_LINUX or OVERRIDE_LINUX_BASE_PORT -. endif -. endif - -. if ${USE_LINUX} == "c6_64" || (defined(OVERRIDE_LINUX_BASE_PORT) && ${OVERRIDE_LINUX_BASE_PORT} == "c6_64") -. if ${ARCH} != "amd64" -IGNORE= Cannot install 64 bit Linux on non-64bit platforms -. endif -LINUX_RPM_ARCH?= x86_64 -LINUX_REPO_ARCH?= x86_64 -. elif ${USE_LINUX} == "c6" || ${USE_LINUX} == "yes" # default to CentOS -LINUX_RPM_ARCH?= i686 -LINUX_REPO_ARCH?= i386 -. elif ${USE_LINUX} == "f10" -LINUX_RPM_ARCH?= i386 -LINUX_REPO_ARCH?= i386 -. endif -RUN_DEPENDS+= ${LINUX_BASE_PORT} -.endif - PKG_IGNORE_DEPENDS?= 'this_port_does_not_exist' _GL_gbm_LIB_DEPENDS= libgbm.so:graphics/gbm @@ -1910,14 +1817,6 @@ _FORCE_POST_PATTERNS= rmdir kldxref mkfo .include "${PORTSDIR}/Mk/bsd.ocaml.mk" .endif -.if defined(USE_LINUX_RPM) -.include "${PORTSDIR}/Mk/bsd.linux-rpm.mk" -.endif - -.if defined(USE_LINUX_APPS) -.include "${PORTSDIR}/Mk/bsd.linux-apps.mk" -.endif - .if defined(USE_QT4) || defined(USE_QT5) .include "${PORTSDIR}/Mk/bsd.qt.mk" .endif @@ -4469,8 +4368,9 @@ generate-plist: ${WRKDIR} .if defined(USE_LINUX_PREFIX) .if defined(USE_LDCONFIG) - @${ECHO_CMD} "@postexec ${LDCONFIG_CMD}" >> ${TMPPLIST} - @${ECHO_CMD} "@postunexec ${LDCONFIG_CMD}" >> ${TMPPLIST} + @${ECHO_CMD} '@preexec [ -n "`/sbin/sysctl -q compat.linux.osrelease`" ] || ( echo "Cannot install package: kernel missing Linux support"; exit 1 )' >> ${TMPPLIST} + @${ECHO_CMD} "@postexec ${LINUXBASE}/sbin/ldconfig" >> ${TMPPLIST} + @${ECHO_CMD} "@postunexec ${LINUXBASE}/sbin/ldconfig" >> ${TMPPLIST} .endif .else .if defined(USE_LDCONFIG) Modified: head/Mk/bsd.sites.mk ============================================================================== --- head/Mk/bsd.sites.mk Mon Sep 5 19:19:34 2016 (r421386) +++ head/Mk/bsd.sites.mk Mon Sep 5 19:23:42 2016 (r421387) @@ -229,167 +229,23 @@ MASTER_SITE_EXIM+= \ .if !defined(IGNORE_MASTER_SITE_CENTOS_LINUX) MASTER_SITE_CENTOS_LINUX+= \ - http://mirror.centos.org/%SUBDIR%/ \ - http://vault.centos.org/%SUBDIR%/ \ - http://mirror.centos.org/centos/${LINUX_DIST_VER}/os/${LINUX_REPO_ARCH}/Packages/ \ - http://vault.centos.org/${LINUX_DIST_VER}/os/${LINUX_REPO_ARCH}/Packages/ \ - http://vault.centos.org/${LINUX_DIST_VER}/os/Source/SPackages/:SOURCE -.endif - -.if !defined(IGNORE_MASTER_SITE_CENTOS_LINUX) -MASTER_SITE_CENTOS_LINUX_UPDATES+= \ - http://mirror.centos.org/centos/${LINUX_DIST_VER}/updates/${LINUX_REPO_ARCH}/Packages/ \ - http://vault.centos.org/${LINUX_DIST_VER}/updates/${LINUX_REPO_ARCH}/Packages/ \ - http://vault.centos.org/${LINUX_DIST_VER}/updates/Source/SPackages/:SOURCE + http://mirror.centos.org/%SUBDIR%/:DEFAULT,SOURCE \ + http://vault.centos.org/%SUBDIR%/:DEFAULT,SOURCE .endif .if !defined(IGNORE_MASTER_SITE_EPEL) MASTER_SITE_EPEL+= \ - http://dl.fedoraproject.org/pub/epel/6/${LINUX_REPO_ARCH}/ \ - http://dl.fedoraproject.org/pub/epel/6/SRPMS/:DEFAULT,SOURCE + http://dl.fedoraproject.org/pub/epel/6/${LINUX_ARCH}/ \ + http://dl.fedoraproject.org/pub/epel/6/SRPMS/:SOURCE .endif .if !defined(IGNORE_MASTER_SITE_FEDORA_LINUX) MASTER_SITE_FEDORA_LINUX+= \ - http://archives.fedoraproject.org/pub/archive/fedora/linux/core/%SUBDIR%/ \ - ftp://ftp.pbone.net/vol4/archive.fedoraproject.org/fedora/linux/core/%SUBDIR%/ \ - ftp://mirror.solarvps.com/fedora/archive/fedora/linux/core/%SUBDIR%/ \ - ftp://ftp.gmd.de/archives.fedoraproject.org/fedora/linux/core/%SUBDIR%/ \ - ftp://mirror.fraunhofer.de/archives.fedoraproject.org/fedora/linux/core/%SUBDIR%/ \ - ftp://linuxsoft.cern.ch/fedora/linux/core/%SUBDIR%/ \ - ftp://ftp-mirror.bi.fraunhofer.de/archives.fedoraproject.org/fedora/linux/core/%SUBDIR%/ \ - http://ftp.udl.es/pub/fedora/linux/core/%SUBDIR%/ \ - http://ftp.sunet.se/pub/Linux/distributions/fedora/linux/core/%SUBDIR%/ \ - ftp://ftp.sunet.se/pub/Linux/distributions/fedora/linux/core/%SUBDIR%/ \ - ftp://ftp.udl.es/pub/fedora/linux/core/%SUBDIR%/ \ - http://mirrors.kernel.org/fedora/core/%SUBDIR%/ \ - ftp://mirrors.kernel.org/fedora/core/%SUBDIR%/ \ - http://mirror.web-ster.com/fedora/core/%SUBDIR%/ \ - ftp://mirror.web-ster.com/fedora/core/%SUBDIR%/ \ - http://rpmfind.net/linux/fedora/core/%SUBDIR%/ \ - ftp://ftp.gtlib.gatech.edu/pub/fedora.redhat/linux/core/%SUBDIR%/ \ - ftp://fedora.mirrors.tds.net/pub/fedora-core/%SUBDIR%/ \ - http://ftp.ndlug.nd.edu/pub/fedora/linux/core/%SUBDIR%/ \ - ftp://ftp.ndlug.nd.edu/pub/fedora/linux/core/%SUBDIR%/ \ - ftp://ftp.belnet.be/linux/fedora/linux/core/%SUBDIR%/ \ - http://sunsite.mff.cuni.cz/pub/fedora/%SUBDIR%/ \ - ftp://sunsite.mff.cuni.cz/pub/fedora/%SUBDIR%/ \ - ftp://ultra.linux.cz/pub/fedora/%SUBDIR%/ \ - http://fr2.rpmfind.net/linux/fedora/core/%SUBDIR%/ \ - ftp://fr2.rpmfind.net/linux/fedora/core/%SUBDIR%/ \ - http://wftp.tu-chemnitz.de/pub/linux/fedora-core/%SUBDIR%/ \ - ftp://ftp.tu-chemnitz.de/pub/linux/fedora-core/%SUBDIR%/ \ - http://ftp.heanet.ie/pub/fedora/linux/core/%SUBDIR%/ \ - ftp://ftp.heanet.ie/pub/fedora/linux/core/%SUBDIR%/ \ - ftp://alviss.et.tudelft.nl/pub/fedora/core/%SUBDIR%/ \ - http://ftp.surfnet.nl/ftp/pub/os/Linux/distr/fedora/linux/core/%SUBDIR%/ \ - ftp://ftp.surfnet.nl/pub/os/Linux/distr/fedora/linux/core/%SUBDIR%/ \ - http://ftp.nluug.nl/ftp/pub/os/Linux/distr/fedora/linux/core/%SUBDIR%/ \ - ftp://ftp.nluug.nl/pub/os/Linux/distr/fedora/linux/core/%SUBDIR%/ \ - ftp://ftp.uninett.no/pub/linux/Fedora/core/%SUBDIR%/ \ - http://ftp.man.poznan.pl/pub/linux/fedora/core/%SUBDIR%/ \ - ftp://ftp.man.poznan.pl/pub/linux/fedora/%SUBDIR%/ \ - http://ftp.ps.pl/pub/linux/fedora-core/%SUBDIR%/ \ - ftp://ftp.ps.pl/pub/linux/fedora-core/%SUBDIR%/ \ - ftp://ftp.kappa.ro/pub/Linux/Distributions/fedora/%SUBDIR%/ \ - http://www.mirrorservice.org/sites/dl.fedoraproject.org/pub/fedora/linux/core/%SUBDIR%/ \ - ftp://ftp.mirrorservice.org/sites/dl.fedoraproject.org/pub/fedora/linux/core/%SUBDIR%/ \ - ftp://ftp.hostrino.com/pub/fedora/linux/core/%SUBDIR%/ \ - ftp://ftp.sfc.wide.ad.jp/pub/Linux/Fedora/core/%SUBDIR%/ \ - http://ftp.kddilabs.jp/Linux/packages/fedora/core/%SUBDIR%/ \ - ftp://ftp.kddilabs.jp/Linux/packages/fedora/core/%SUBDIR%/ \ - ftp://ftp.riken.go.jp/pub/Linux/fedora/core/%SUBDIR%/ \ - http://ftp.isu.edu.tw/pub/Linux/Fedora/linux/core/%SUBDIR%/ \ - ftp://ftp.isu.edu.tw/pub/Linux/Fedora/linux/core/%SUBDIR%/ \ - http://www.las.ic.unicamp.br/pub/fedora/linux/core/%SUBDIR%/ \ - ftp://www.las.ic.unicamp.br/pub/fedora/linux/core/%SUBDIR%/ \ - ftp://mirror.netglobalis.net/pub/fedora/%SUBDIR%/ \ - http://mirror.pacific.net.au/linux/redhat/fedora/%SUBDIR%/ \ - ftp://mirror.pacific.net.au/linux/redhat/fedora/%SUBDIR%/ \ - http://ftp.univie.ac.at/systems/linux/fedora/core/%SUBDIR%/ \ - http://mirror.aarnet.edu.au/pub/fedora/linux/core/%SUBDIR%/ \ - ftp://mirror.aarnet.edu.au/pub/fedora/linux/core/%SUBDIR%/ \ - http://fedora.mirror.iweb.ca/core/%SUBDIR%/ \ - ftp://fedora.mirror.iweb.ca/core/%SUBDIR%/ \ - ftp://ftp.telus.net/pub/fedora/linux/core/%SUBDIR%/ \ - http://fedora.arcticnetwork.ca/linux/core/%SUBDIR%/ \ - http://www.muug.mb.ca/pub/fedora/linux/core/%SUBDIR%/ \ - ftp://ftp.muug.mb.ca/pub/fedora/linux/core/%SUBDIR%/ \ - ftp://ftp.solnet.ch/mirror/fedora/linux/core/%SUBDIR%/ \ - http://mirror.karneval.cz/pub/linux/fedora/linux/core/%SUBDIR%/ \ - ftp://ftp.telmexchile.cl/Unix/fedora/linux/core/%SUBDIR%/ \ - http://ftp.sh.cvut.cz/MIRRORS/fedora/%SUBDIR%/ \ - ftp://ftp.sh.cvut.cz/MIRRORS/fedora/%SUBDIR%/ \ - http://sunsite.mff.cuni.cz/MIRRORS/fedora.redhat.com/linux/core/%SUBDIR%/ \ - ftp://sunsite.mff.cuni.cz/MIRRORS/fedora.redhat.com/linux/core/%SUBDIR%/ \ - http://ftp-stud.hs-esslingen.de/pub/fedora/linux/core/%SUBDIR%/ \ - ftp://ftp-stud.hs-esslingen.de/pub/fedora/linux/core/%SUBDIR%/ \ - http://ftp.uni-erlangen.de/pub/Linux/MIRROR.fedora/core/%SUBDIR%/ \ - http://ftp.uni-bayreuth.de/linux/fedora/linux/core/%SUBDIR%/ \ - ftp://ftp.uni-bayreuth.de/pub/linux/fedora/linux/core/%SUBDIR%/ \ - ftp://ftp.fu-berlin.de/linux/fedora/core/%SUBDIR%/ \ - http://ftp.uni-koeln.de/mirrors/fedora/linux/core/%SUBDIR%/ \ - ftp://ftp.uni-koeln.de/mirrors/fedora/linux/core/%SUBDIR%/ \ - ftp://ftp.informatik.uni-frankfurt.de/pub/linux/Mirror/ftp.redhat.com/fedora/core/%SUBDIR%/ \ - http://mirrors.ircam.fr/pub/fedora/linux/core/%SUBDIR%/ \ - ftp://mirrors.ircam.fr/pub/fedora/linux/core/%SUBDIR%/ \ - http://ftp.crihan.fr/mirrors/fedora.redhat.com/fedora/linux/core/%SUBDIR%/ \ - ftp://ftp.crihan.fr/mirrors/fedora.redhat.com/fedora/linux/core/%SUBDIR%/ \ - ftp://ftp.univ-pau.fr/pub/mirrors/fedora/%SUBDIR%/ \ - ftp://ftp.lip6.fr/pub/linux/distributions/fedora/%SUBDIR%/ \ - http://fr.rpmfind.net/linux/fedora/core/%SUBDIR%/ \ - http://www.gtlib.gatech.edu/pub/fedora.redhat/linux/core/%SUBDIR%/ \ - http://ftp.rhnet.is/pub/fedora/linux/core/%SUBDIR%/ \ - ftp://ftp.rhnet.is/pub/fedora/linux/core/%SUBDIR%/ \ - http://ftp.unina.it/pub/linux/distributions/fedora/%SUBDIR%/ \ - ftp://ftp.unina.it/pub/linux/distributions/fedora/%SUBDIR%/ \ - http://ftp.iij.ad.jp/pub/linux/fedora/core/%SUBDIR%/ \ - ftp://ftp.iij.ad.jp/pub/linux/fedora/core/%SUBDIR%/ \ - http://ftp.dti.ad.jp/pub/Linux/Fedora/core/%SUBDIR%/ \ - ftp://ftp.dti.ad.jp/pub/Linux/Fedora/core/%SUBDIR%/ \ - http://ftp.nara.wide.ad.jp/pub/Linux/fedora/core/%SUBDIR%/ \ - http://ftp.yz.yamagata-u.ac.jp/pub/linux/fedora/linux/core/%SUBDIR%/ \ - ftp://ftp.yz.yamagata-u.ac.jp/pub/linux/fedora/linux/core/%SUBDIR%/ \ - http://ftp.jaist.ac.jp/pub/Linux/Fedora/core/%SUBDIR%/ \ - ftp://ftp.jaist.ac.jp/pub/Linux/Fedora/core/%SUBDIR%/ \ - http://ftp.riken.jp/Linux/fedora/core/%SUBDIR%/ \ - ftp://ftp.kreonet.re.kr/pub/Linux/fedora/core/%SUBDIR%/ \ - ftp://fedora.ifc.unam.mx/linux/fedora/core/%SUBDIR%/ \ - ftp://ftp.quicknet.nl/pub/Linux/download.fedora.redhat.com/core/%SUBDIR%/ \ - ftp://ftp.uib.no/pub/fedora/linux/core/%SUBDIR%/ \ - ftp://ftp.tpnet.pl/d17/fedora/%SUBDIR%/ \ - http://ftp.wsisiz.edu.pl/pub/linux/fedora/linux/core/%SUBDIR%/ \ - ftp://ftp.pbone.net/pub/fedora/pub/fedora/linux/core/%SUBDIR%/ \ - http://ftp.pwr.wroc.pl/pub/linux/fedora/linux/core/%SUBDIR%/ \ - ftp://ftp.pwr.wroc.pl/pub/linux/fedora/linux/core/%SUBDIR%/ \ - ftp://mirrors.hpcf.upr.edu/pub/Mirrors/redhat/download.fedora.redhat.com/%SUBDIR%/ \ - http://ftp.astral.ro/mirrors/fedora/pub/fedora/linux/core/%SUBDIR%/ \ - ftp://ftp.astral.ro/mirrors/fedora/pub/fedora/linux/core/%SUBDIR%/ \ - ftp://ftp.rdsor.ro/pub/Linux/Distributions/Fedora/%SUBDIR%/ \ - http://ftp.chg.ru/pub/Linux/fedora/linux/core/%SUBDIR%/ \ - ftp://ftp.chg.ru/pub/Linux/fedora/linux/core/%SUBDIR%/ \ - http://ftp.rhd.ru/pub/fedora/linux/core/%SUBDIR%/ \ - ftp://ftp.rhd.ru/pub/fedora/linux/core/%SUBDIR%/ \ - http://ftp.port80.se/fedora/core/%SUBDIR%/ \ - ftp://ftp.port80.se/fedora/core/%SUBDIR%/ \ - http://ftp.upjs.sk/pub/fedora/linux/core/%SUBDIR%/ \ - ftp://ftp.upjs.sk/pub/fedora/linux/core/%SUBDIR%/ \ - ftp://ftp.tlk-l.net/pub/mirrors/fedora.redhat.com/linux/core/%SUBDIR%/ \ - http://limestone.uoregon.edu/ftp/fedora/%SUBDIR%/ \ - ftp://limestone.uoregon.edu/fedora/%SUBDIR%/ \ - ftp://fedora.bu.edu/core/%SUBDIR%/ \ - http://mirror.anl.gov/pub/fedora-linux-core/%SUBDIR%/ \ - ftp://mirror.anl.gov/pub/fedora-linux-core/%SUBDIR%/ \ - ftp://ftp.cse.buffalo.edu/pub/Linux/fedora/linux/core/%SUBDIR%/ \ - ftp://ftp.applios.net/pub/fedora/linux/core/%SUBDIR%/ \ - http://mirror.steadfast.net/fedora/core/%SUBDIR%/ \ - http://mirror.eas.muohio.edu/fedora/linux/core/%SUBDIR%/ \ - http://mirror.engr.sjsu.edu/pub/fedora/linux/core/%SUBDIR%/ \ - http://www.gtlib.gatech.edu/pub/fedora.redhat/linux/core/%SUBDIR%/ \ - ftp://ftp.gtlib.gatech.edu/pub/fedora.redhat/linux/core/%SUBDIR%/ \ - http://mirror.cogentco.com/pub/linux/fedora/linux/core/%SUBDIR%/ \ - http://mirrors.tummy.com/pub/fedora.redhat.com/fedora/linux/core/%SUBDIR%/ \ - ftp://mirrors.tummy.com/pub/fedora.redhat.com/fedora/linux/core/%SUBDIR%/ + http://archives.fedoraproject.org/pub/archive/fedora/linux/%SUBDIR%/:DEFAULT,SOURCE \ + ftp://ftp.pbone.net/vol4/archive.fedoraproject.org/fedora/linux/%SUBDIR%/:DEFAULT,SOURCE \ + ftp://ftp.gmd.de/archives.fedoraproject.org/fedora/linux/%SUBDIR%/:DEFAULT,SOURCE \ + ftp://mirror.fraunhofer.de/archives.fedoraproject.org/fedora/linux/%SUBDIR%/:DEFAULT,SOURCE \ + ftp://ftp-mirror.bi.fraunhofer.de/archives.fedoraproject.org/fedora/linux/%SUBDIR%/:DEFAULT,SOURCE .endif .if !defined(IGNORE_MASTER_SITE_FARSIGHT) Modified: head/accessibility/linux-c6-atk/Makefile ============================================================================== --- head/accessibility/linux-c6-atk/Makefile Mon Sep 5 19:19:34 2016 (r421386) +++ head/accessibility/linux-c6-atk/Makefile Mon Sep 5 19:23:42 2016 (r421387) @@ -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 Modified: head/accessibility/linux-f10-atk/Makefile ============================================================================== --- head/accessibility/linux-f10-atk/Makefile Mon Sep 5 19:19:34 2016 (r421386) +++ head/accessibility/linux-f10-atk/Makefile Mon Sep 5 19:23:42 2016 (r421387) @@ -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 Modified: head/archivers/kzip/Makefile ============================================================================== --- head/archivers/kzip/Makefile Mon Sep 5 19:19:34 2016 (r421386) +++ head/archivers/kzip/Makefile Mon Sep 5 19:23:42 2016 (r421387) @@ -16,7 +16,7 @@ RESTRICTED= ${NO_CDROM} ONLY_FOR_ARCHS= amd64 i386 -USE_LINUX= yes +USES= linux NO_BUILD= yes WRKSRC_SUBDIR= i686 Modified: head/archivers/linux-f10-ucl/Makefile ============================================================================== --- head/archivers/linux-f10-ucl/Makefile Mon Sep 5 19:19:34 2016 (r421386) +++ head/archivers/linux-f10-ucl/Makefile Mon Sep 5 19:23:42 2016 (r421387) @@ -4,20 +4,18 @@ PORTNAME= ucl PORTVERSION= 1.03 CATEGORIES= archivers linux -MASTER_SITES= LOCAL/ehaupt/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER} MAINTAINER= emulation@FreeBSD.org COMMENT= UCL, a lossless data compression library (Linux Fedora 10) CONFLICTS= linux-ucl-[0-9]* linux-f8-ucl-[0-9]* -USE_LINUX= f10 +USES= linux:f10 USE_LINUX_RPM= yes RPMVERSION= 8.fc9 USE_LDCONFIG= yes PLIST_FILES= usr/lib/libucl.so.1 usr/lib/libucl.so.1.0.0 -DOCSDIR= ${PREFIX}/usr/share/doc/${PORTNAME}-${PORTVERSION} PORTDOCS= COPYING NEWS README THANKS TODO DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr Modified: head/archivers/linux-f10-upx/Makefile ============================================================================== --- head/archivers/linux-f10-upx/Makefile Mon Sep 5 19:19:34 2016 (r421386) +++ head/archivers/linux-f10-upx/Makefile Mon Sep 5 19:23:42 2016 (r421387) @@ -4,7 +4,6 @@ PORTNAME= upx PORTVERSION= 3.03 CATEGORIES= archivers linux -MASTER_SITES= LOCAL/ehaupt/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER} PKGNAMEPREFIX= linux-f10- MAINTAINER= emulation@FreeBSD.org @@ -12,14 +11,12 @@ COMMENT= UPX, a high-performance execut CONFLICTS= linux-upx-[0-9]* linux-f8-upx-[0-9]* -USE_LINUX= f10 +USES= linux:f10 USE_LINUX_RPM= yes -USE_LINUX_APPS= ucl +USE_LINUX= ucl RPMVERSION= 1.fc10 -BRANDELF_FILES= usr/bin/upx PLIST_FILES= usr/bin/upx usr/share/man/man1/upx.1.gz -DOCSDIR= ${PREFIX}/usr/share/doc/${PORTNAME}-${PORTVERSION} PORTDOCS= BUGS COPYING LICENSE NEWS PROJECTS README README.1ST \ THANKS TODO elf-to-mem.txt filter.txt loader.txt selinux.txt DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr Modified: head/archivers/stuffit/Makefile ============================================================================== --- head/archivers/stuffit/Makefile Mon Sep 5 19:19:34 2016 (r421386) +++ head/archivers/stuffit/Makefile Mon Sep 5 19:23:42 2016 (r421387) @@ -15,7 +15,7 @@ RESTRICTED= Only unmodified original pac ONLY_FOR_ARCHS= i386 amd64 -USE_LINUX= yes +USES= linux NO_WRKSUBDIR= yes STUFFIT_FILES= bin/unstuff bin/stuff STUFFIT_MAN= man/man1/stuff.1 man/man1/unstuff.1 Modified: head/astro/google-earth/Makefile ============================================================================== --- head/astro/google-earth/Makefile Mon Sep 5 19:19:34 2016 (r421386) +++ head/astro/google-earth/Makefile Mon Sep 5 19:23:42 2016 (r421387) @@ -21,16 +21,15 @@ LINUX_DRI_DESC= libGL support via Linux NVIDIA_GL_340_DESC= libGL support via nvidia-driver-340 NVIDIA_GL_304_DESC= libGL support via nvidia-driver-304 -USE_LINUX= yes -USE_LINUX_APPS= xorglibs curl nss -USES= desktop-file-utils makeself perl5 shared-mime-info +USES= desktop-file-utils linux makeself perl5 shared-mime-info +USE_LINUX= xorglibs curl nss USE_PERL5= patch build NO_WRKSUBDIR= yes NVIDIA_GL_RUN_DEPENDS= ${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver NVIDIA_GL_340_RUN_DEPENDS= ${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver-340 NVIDIA_GL_304_RUN_DEPENDS= ${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver-304 -LINUX_DRI_USE= LINUX_APPS=dri,libpciaccess +LINUX_DRI_USE= LINUX=dri,libpciaccess post-extract: @cd ${WRKSRC} && ${TAR} -xf googleearth-data.tar && ${RM} googleearth-data.tar @@ -62,7 +61,7 @@ do-install: ${STAGEDIR}${PREFIX}/share/mime/packages/ ${INSTALL_DATA} ${WRKSRC}/Google-googleearth.desktop \ ${STAGEDIR}${PREFIX}/share/applications/googleearth.desktop - ${INSTALL_PROGRAM} ${WRKSRC}/bin/googleearth ${STAGEDIR}${DATADIR}/bin/ + ${INSTALL_SCRIPT} ${WRKSRC}/bin/googleearth ${STAGEDIR}${DATADIR}/bin/ ${INSTALL_PROGRAM} ${WRKSRC}/googleearth-bin ${STAGEDIR}${DATADIR}/ ${RM} ${WRKSRC}/googleearth-mimetypes.xml \ ${WRKSRC}/googleearth.desktop \ Modified: head/audio/baudline/Makefile ============================================================================== --- head/audio/baudline/Makefile Mon Sep 5 19:19:34 2016 (r421386) +++ head/audio/baudline/Makefile Mon Sep 5 19:23:42 2016 (r421387) @@ -14,8 +14,8 @@ MAINTAINER= hamradio@FreeBSD.org COMMENT= Real-time signal analysis and time-frequency browser WRKSRC= ${WRKDIR}/${DISTNAME:S/i686/x86/} -USE_LINUX= yes -USE_LINUX_APPS= xorglibs +USES= linux +USE_LINUX= xorglibs ONLY_FOR_ARCHS= i386 amd64 RESTRICTED= author requests no distribution except from their site Modified: head/audio/linux-c6-alsa-lib/Makefile ============================================================================== --- head/audio/linux-c6-alsa-lib/Makefile Mon Sep 5 19:19:34 2016 (r421386) +++ head/audio/linux-c6-alsa-lib/Makefile Mon Sep 5 19:23:42 2016 (r421387) @@ -14,10 +14,8 @@ RUN_DEPENDS= alsa-lib>0:audio/alsa-lib CONFLICTS= linux-f10-alsa-lib-[0-9]* -BRANDELF_FILES= usr/bin/aserver -ONLY_FOR_ARCHS= i386 amd64 -USE_LINUX= c6 +USES= linux:c6 USE_LINUX_RPM= yes RPMVERSION= 4.el6 USE_LDCONFIG= yes Modified: head/audio/linux-c6-alsa-plugins-oss/Makefile ============================================================================== --- head/audio/linux-c6-alsa-plugins-oss/Makefile Mon Sep 5 19:19:34 2016 (r421386) +++ head/audio/linux-c6-alsa-plugins-oss/Makefile Mon Sep 5 19:23:42 2016 (r421387) @@ -14,9 +14,8 @@ CONFLICTS= linux-f10-alsa-plugins-oss-[0 SRC_DISTFILES= alsa-plugins-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}:SOURCE -ONLY_FOR_ARCHS= i386 amd64 -USE_LINUX= c6 -USE_LINUX_APPS= alsalib +USES= linux:c6 +USE_LINUX= alsalib USE_LINUX_RPM= yes RPMVERSION= 1.el6 Modified: head/audio/linux-c6-alsa-plugins-pulseaudio/Makefile ============================================================================== --- head/audio/linux-c6-alsa-plugins-pulseaudio/Makefile Mon Sep 5 19:19:34 2016 (r421386) +++ head/audio/linux-c6-alsa-plugins-pulseaudio/Makefile Mon Sep 5 19:23:42 2016 (r421387) @@ -16,9 +16,8 @@ CONFLICTS= linux-f10-alsa-plugins-pulsea SRC_DISTFILES= alsa-plugins-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}:SOURCE .endif -ONLY_FOR_ARCHS= i386 amd64 -USE_LINUX= c6 -USE_LINUX_APPS= alsalib pulseaudio-libs +USES= linux:c6 +USE_LINUX= alsalib pulseaudio-libs USE_LINUX_RPM= yes RPMVERSION= 1.el6 Modified: head/audio/linux-c6-alsa-utils/Makefile ============================================================================== --- head/audio/linux-c6-alsa-utils/Makefile Mon Sep 5 19:19:34 2016 (r421386) +++ head/audio/linux-c6-alsa-utils/Makefile Mon Sep 5 19:23:42 2016 (r421387) @@ -4,7 +4,6 @@ PORTNAME= alsa-utils PORTVERSION= 1.1.0 CATEGORIES= audio linux -MASTER_SITES= CENTOS_LINUX MAINTAINER= emulation@FreeBSD.org COMMENT= Advanced Linux Sound Architecture libraries (Linux CentOS ${LINUX_DIST_VER}) @@ -13,11 +12,9 @@ LICENSE= GPLv3 CONFLICTS= linux-alsa-lib-[0-9]* linux-f10-alsa-lib-[0-9]* -BRANDELF_FILES= sbin/alsactl usr/bin/aconnect usr/bin/alsamixer usr/bin/amidi usr/bin/aplay usr/bin/aplaymidi usr/bin/arecord usr/bin/arecordmidi usr/bin/aseqdump usr/bin/aseqnet usr/bin/iecset usr/bin/speaker-test usr/sbin/alsactl -USE_LINUX_APPS= alsalib alsa-plugins-oss +USE_LINUX= alsalib alsa-plugins-oss -ONLY_FOR_ARCHS= i386 amd64 -USE_LINUX= c6 +USES= linux:c6 USE_LINUX_RPM= nolib RPMVERSION= 8.el6 Modified: head/audio/linux-c6-arts/Makefile ============================================================================== --- head/audio/linux-c6-arts/Makefile Mon Sep 5 19:19:34 2016 (r421386) +++ head/audio/linux-c6-arts/Makefile Mon Sep 5 19:23:42 2016 (r421387) @@ -11,12 +11,10 @@ COMMENT= Audio system for the KDE integ CONFLICTS= linux-arts-[0-9]* linux-f8-arts-[0-9]* -ONLY_FOR_ARCHS= i386 amd64 -USE_LINUX= c6 +USES= linux:c6 USE_LINUX_RPM= yes RPMVERSION= 10.el6 -BRANDELF_DIRS= usr/bin USE_LDCONFIG= yes post-install: Modified: head/audio/linux-c6-esound/Makefile ============================================================================== --- head/audio/linux-c6-esound/Makefile Mon Sep 5 19:19:34 2016 (r421386) +++ head/audio/linux-c6-esound/Makefile Mon Sep 5 19:23:42 2016 (r421387) @@ -5,21 +5,20 @@ PORTNAME= esound PORTVERSION= 0.2.41 PORTREVISION= 2 CATEGORIES= audio linux -DISTNAME= ${PORTNAME}-libs-${PORTVERSION}-${RPMVERSION} +LIB_DISTFILES= ${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}${EXTRACT_SUFX} +SRC_DISTFILES= ${DISTNAME}${SRC_SUFX}:SOURCE MAINTAINER= emulation@FreeBSD.org COMMENT= RPM of esound (Linux CentOS ${LINUX_DIST_VER}) CONFLICTS= linux-esound-[0-9]* linux-f10-esound-[0-9]* -USE_LINUX= c6 -USE_LINUX_RPM= yes -USE_LINUX_APPS= libaudiofile LINUX_NAME= ${PORTNAME}-libs - RPMVERSION= 3.1.el6 +USES= linux:c6 USE_LDCONFIG= yes -SRC_DISTFILES= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}:SOURCE +USE_LINUX= libaudiofile +USE_LINUX_RPM= yes DOCSDIR= ${PREFIX}/usr/share/doc/${LINUX_NAME}-${PORTVERSION} PORTDOCS= AUTHORS COPYING.LIB ChangeLog NEWS README TIPS TODO esound.sgml Modified: head/audio/linux-c6-flac/Makefile ============================================================================== --- head/audio/linux-c6-flac/Makefile Mon Sep 5 19:19:34 2016 (r421386) +++ head/audio/linux-c6-flac/Makefile Mon Sep 5 19:23:42 2016 (r421387) @@ -1,26 +1,22 @@ # Created by: Johannes Meixner # $FreeBSD$ -PORTNAME= flac -PORTVERSION= 1.2.1 -PORTREVISION= 3 -CATEGORIES= audio linux -MASTER_SITES= CENTOS_LINUX - -MAINTAINER= emulation@FreeBSD.org -COMMENT= Free lossless audio codec (Linux CentOS ${LINUX_DIST_VER}) - -CONFLICTS= linux-flac-[0-9]* linux-f10-flac-[0-9]* - -ONLY_FOR_ARCHS= i386 amd64 -USE_LINUX= c6 -USE_LINUX_APPS= libogg -USE_LINUX_RPM= yes - -RPMVERSION= 7.el6_6 -BRANDELF_DIRS= usr/bin -USE_LDCONFIG= yes +PORTNAME= flac +PORTVERSION= 1.2.1 +PORTREVISION= 3 +CATEGORIES= audio linux + +MAINTAINER= emulation@FreeBSD.org +COMMENT= Free lossless audio codec (Linux CentOS ${LINUX_DIST_VER}) + +CONFLICTS= linux-flac-[0-9]* linux-f10-flac-[0-9]* + +RPMVERSION= 7.el6_6 +USES= linux:c6 +USE_LDCONFIG= yes +USE_LINUX= libogg +USE_LINUX_RPM= yes -DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr +DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr .include Modified: head/audio/linux-c6-flac/pkg-plist.i386 ============================================================================== --- head/audio/linux-c6-flac/pkg-plist.i386 Mon Sep 5 19:19:34 2016 (r421386) +++ head/audio/linux-c6-flac/pkg-plist.i386 Mon Sep 5 19:23:42 2016 (r421387) @@ -4,11 +4,11 @@ usr/lib/libFLAC++.so.6 *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***