From owner-svn-ports-all@FreeBSD.ORG Mon Sep 22 10:40:05 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2B32DD58; Mon, 22 Sep 2014 10:40:05 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 12669FA1; Mon, 22 Sep 2014 10:40:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8MAe5ee001742; Mon, 22 Sep 2014 10:40:05 GMT (envelope-from xmj@FreeBSD.org) Received: (from xmj@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8MAe1qv001621; Mon, 22 Sep 2014 10:40:01 GMT (envelope-from xmj@FreeBSD.org) Message-Id: <201409221040.s8MAe1qv001621@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: xmj set sender to xmj@FreeBSD.org using -f From: Johannes Jost Meixner Date: Mon, 22 Sep 2014 10:40:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r368845 - in head: . Mk accessibility accessibility/linux-c6-atk accessibility/linux-f10-atk archivers/linux-f10-ucl archivers/linux-f10-upx astro/google-earth astro/google-earth/files ... 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.18-1 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, 22 Sep 2014 10:40:05 -0000 Author: xmj Date: Mon Sep 22 10:40:00 2014 New Revision: 368845 URL: http://svnweb.freebsd.org/changeset/ports/368845 QAT: https://qat.redports.org/buildarchive/r368845/ Log: Update CentOS base to 6.5, add userland ports The Fedora 10 infrastructure ports have been in use since June 2009 and, while having served a great deed, have become unsupported upstream and hence affected by unfixed security vulnerabilities. In addition to that, many recent Linux binaries need newer libc / stdlibc++ versions. This commit adds the linux-c6- userland as drop-in replacement for the -f10 infrastructure, as well as upgrading the linux_base-c6 port to CentOS 6.5. If you want to switch to linux-c6 ports, please define at /etc/make.conf: OVERRIDE_LINUX_BASE_PORT=c6 OVERRIDE_LINUX_NONBASE_PORTS=c6 Additionally, please add the following line to /etc/sysctl.conf: compat.linux.osrelease=2.6.18 Upgrading procedures are shown in /usr/ports/UPDATING. This work has been inspired by Artyom Mirgorodskiy's post to emulation@ in November 2013, using and extending mav@'s work. It has been tested extensively and most reported issues were already fixed. Please report any additional bug or "features" to the emulation mailing list. Many thanks to: mav@, rene@, allanjude@, netchild@, antoine@, everyone who's filed Issues and Pull requests on GitHub, PR: 186820 Differential Revision: https://reviews.freebsd.org/D793 Reviewed by: allanjude, antoine, bapt, rene Approved by: portmgr (antoine, bapt) Approved by: koobs (mentor) Sponsored by: Perceivon Hosting Inc. Added: head/accessibility/linux-c6-atk/ head/accessibility/linux-c6-atk/Makefile (contents, props changed) head/accessibility/linux-c6-atk/distinfo.i686 (contents, props changed) head/accessibility/linux-c6-atk/pkg-descr (contents, props changed) head/accessibility/linux-c6-atk/pkg-plist (contents, props changed) head/audio/linux-c6-alsa-lib/ head/audio/linux-c6-alsa-lib/Makefile (contents, props changed) head/audio/linux-c6-alsa-lib/distinfo.i686 (contents, props changed) head/audio/linux-c6-alsa-lib/pkg-descr (contents, props changed) head/audio/linux-c6-alsa-lib/pkg-plist (contents, props changed) head/audio/linux-c6-alsa-plugins-oss/ head/audio/linux-c6-alsa-plugins-oss/Makefile (contents, props changed) head/audio/linux-c6-alsa-plugins-oss/distinfo.i686 (contents, props changed) head/audio/linux-c6-alsa-plugins-oss/files/ head/audio/linux-c6-alsa-plugins-oss/files/patch-pcm-oss.conf (contents, props changed) head/audio/linux-c6-alsa-plugins-oss/pkg-deinstall (contents, props changed) head/audio/linux-c6-alsa-plugins-oss/pkg-descr (contents, props changed) head/audio/linux-c6-alsa-plugins-oss/pkg-install (contents, props changed) head/audio/linux-c6-alsa-plugins-oss/pkg-plist (contents, props changed) head/audio/linux-c6-alsa-plugins-pulseaudio/ head/audio/linux-c6-alsa-plugins-pulseaudio/Makefile (contents, props changed) head/audio/linux-c6-alsa-plugins-pulseaudio/distinfo.i686 (contents, props changed) head/audio/linux-c6-alsa-plugins-pulseaudio/pkg-descr (contents, props changed) head/audio/linux-c6-alsa-plugins-pulseaudio/pkg-plist (contents, props changed) head/audio/linux-c6-alsa-utils/ head/audio/linux-c6-alsa-utils/Makefile (contents, props changed) head/audio/linux-c6-alsa-utils/distinfo.i686 (contents, props changed) head/audio/linux-c6-alsa-utils/pkg-descr (contents, props changed) head/audio/linux-c6-alsa-utils/pkg-plist (contents, props changed) head/audio/linux-c6-arts/ head/audio/linux-c6-arts/Makefile (contents, props changed) head/audio/linux-c6-arts/distinfo.i686 (contents, props changed) head/audio/linux-c6-arts/pkg-descr (contents, props changed) head/audio/linux-c6-arts/pkg-plist (contents, props changed) head/audio/linux-c6-esound/ head/audio/linux-c6-esound/Makefile (contents, props changed) head/audio/linux-c6-esound/distinfo.i686 (contents, props changed) head/audio/linux-c6-esound/pkg-descr (contents, props changed) head/audio/linux-c6-flac/ head/audio/linux-c6-flac/Makefile (contents, props changed) head/audio/linux-c6-flac/distinfo.i686 (contents, props changed) head/audio/linux-c6-flac/pkg-plist (contents, props changed) head/audio/linux-c6-libaudiofile/ head/audio/linux-c6-libaudiofile/Makefile (contents, props changed) head/audio/linux-c6-libaudiofile/distinfo.i686 (contents, props changed) head/audio/linux-c6-libaudiofile/pkg-plist (contents, props changed) head/audio/linux-c6-libogg/ head/audio/linux-c6-libogg/Makefile (contents, props changed) head/audio/linux-c6-libogg/distinfo.i686 (contents, props changed) head/audio/linux-c6-libsndfile/ head/audio/linux-c6-libsndfile/Makefile (contents, props changed) head/audio/linux-c6-libsndfile/distinfo.i686 (contents, props changed) head/audio/linux-c6-libsndfile/pkg-plist (contents, props changed) head/audio/linux-c6-libvorbis/ head/audio/linux-c6-libvorbis/Makefile (contents, props changed) head/audio/linux-c6-libvorbis/distinfo.i686 (contents, props changed) head/audio/linux-c6-mikmod/ head/audio/linux-c6-mikmod/Makefile (contents, props changed) head/audio/linux-c6-mikmod/distinfo.i686 (contents, props changed) head/audio/linux-c6-nas-libs/ head/audio/linux-c6-nas-libs/Makefile (contents, props changed) head/audio/linux-c6-nas-libs/distinfo.i386 (contents, props changed) head/audio/linux-c6-nas-libs/distinfo.i686 (contents, props changed) head/audio/linux-c6-nas-libs/pkg-plist (contents, props changed) head/audio/linux-c6-openal-soft/ head/audio/linux-c6-openal-soft/Makefile (contents, props changed) head/audio/linux-c6-openal-soft/distinfo.i686 (contents, props changed) head/audio/linux-c6-pulseaudio-libs/ head/audio/linux-c6-pulseaudio-libs/Makefile (contents, props changed) head/audio/linux-c6-pulseaudio-libs/distinfo.i686 (contents, props changed) head/audio/linux-c6-pulseaudio-libs/files/ head/audio/linux-c6-pulseaudio-libs/files/patch-etc__pulse__client.conf (contents, props changed) head/audio/linux-c6-pulseaudio-libs/pkg-plist (contents, props changed) head/audio/linux-c6-pulseaudio-utils/ head/audio/linux-c6-pulseaudio-utils/Makefile (contents, props changed) head/audio/linux-c6-pulseaudio-utils/distinfo.i686 (contents, props changed) head/audio/linux-c6-pulseaudio-utils/pkg-plist (contents, props changed) head/audio/linux-c6-sdl_mixer/ head/audio/linux-c6-sdl_mixer/Makefile (contents, props changed) head/audio/linux-c6-sdl_mixer/distinfo.i686 (contents, props changed) head/databases/linux-c6-sqlite3/ head/databases/linux-c6-sqlite3/Makefile (contents, props changed) head/databases/linux-c6-sqlite3/distinfo.i686 (contents, props changed) head/devel/linux-c6-dbus-glib/ head/devel/linux-c6-dbus-glib/Makefile (contents, props changed) head/devel/linux-c6-dbus-glib/distinfo.i686 (contents, props changed) head/devel/linux-c6-dbus-libs/ head/devel/linux-c6-dbus-libs/Makefile (contents, props changed) head/devel/linux-c6-dbus-libs/distinfo.i686 (contents, props changed) head/devel/linux-c6-devtools/ head/devel/linux-c6-devtools/Makefile (contents, props changed) head/devel/linux-c6-devtools/distinfo.i686 (contents, props changed) head/devel/linux-c6-devtools/pkg-descr (contents, props changed) head/devel/linux-c6-devtools/pkg-plist (contents, props changed) head/devel/linux-c6-libglade2/ head/devel/linux-c6-libglade2/Makefile (contents, props changed) head/devel/linux-c6-libglade2/distinfo.i686 (contents, props changed) head/devel/linux-c6-libpciaccess/ head/devel/linux-c6-libpciaccess/Makefile (contents, props changed) head/devel/linux-c6-libpciaccess/distinfo.i686 (contents, props changed) head/devel/linux-c6-libpciaccess/pkg-descr (contents, props changed) head/devel/linux-c6-libpciaccess/pkg-plist (contents, props changed) head/devel/linux-c6-ncurses-base/ head/devel/linux-c6-ncurses-base/Makefile (contents, props changed) head/devel/linux-c6-ncurses-base/distinfo.i686 (contents, props changed) head/devel/linux-c6-ncurses-base/pkg-plist (contents, props changed) head/devel/linux-c6-nspr/ head/devel/linux-c6-nspr/Makefile (contents, props changed) head/devel/linux-c6-nspr/distinfo.i686 (contents, props changed) head/devel/linux-c6-qt47/ head/devel/linux-c6-qt47/Makefile (contents, props changed) head/devel/linux-c6-qt47/distinfo.i386 (contents, props changed) head/devel/linux-c6-qt47/pkg-descr (contents, props changed) head/devel/linux-c6-qt47/pkg-plist (contents, props changed) head/devel/linux-c6-sdl12/ head/devel/linux-c6-sdl12/Makefile (contents, props changed) head/devel/linux-c6-sdl12/distinfo.i686 (contents, props changed) head/dns/linux-c6-libasyncns/ head/dns/linux-c6-libasyncns/Makefile (contents, props changed) head/dns/linux-c6-libasyncns/distinfo.i686 (contents, props changed) head/dns/linux-c6-libasyncns/pkg-descr (contents, props changed) head/editors/sublime/ head/editors/sublime/Makefile (contents, props changed) head/editors/sublime/distinfo (contents, props changed) head/editors/sublime/files/ head/editors/sublime/files/patch-PackageSetup.py (contents, props changed) head/editors/sublime/files/sublime.in (contents, props changed) head/editors/sublime/pkg-descr (contents, props changed) head/editors/sublime/pkg-plist (contents, props changed) head/editors/sublime3/ head/editors/sublime3/Makefile (contents, props changed) head/editors/sublime3/distinfo (contents, props changed) head/editors/sublime3/files/ head/editors/sublime3/files/sublime.in (contents, props changed) head/editors/sublime3/pkg-descr (contents, props changed) head/editors/sublime3/pkg-plist (contents, props changed) head/emulators/linux-c6/ head/emulators/linux-c6/Makefile (contents, props changed) head/emulators/linux-c6/pkg-descr (contents, props changed) head/emulators/linux-c6/pkg-plist (contents, props changed) head/emulators/linux-f10/ head/emulators/linux-f10/Makefile (contents, props changed) head/emulators/linux-f10/pkg-descr (contents, props changed) head/ftp/linux-c6-curl/ head/ftp/linux-c6-curl/Makefile (contents, props changed) head/ftp/linux-c6-curl/distinfo.i686 (contents, props changed) head/ftp/linux-c6-curl/pkg-descr (contents, props changed) head/graphics/linux-c6-cairo/ head/graphics/linux-c6-cairo/Makefile (contents, props changed) head/graphics/linux-c6-cairo/distinfo.i686 (contents, props changed) head/graphics/linux-c6-cairo/pkg-descr (contents, props changed) head/graphics/linux-c6-dri/ head/graphics/linux-c6-dri-compat/ head/graphics/linux-c6-dri-compat/Makefile (contents, props changed) head/graphics/linux-c6-dri-compat/distinfo.i686 (contents, props changed) head/graphics/linux-c6-dri-compat/pkg-descr (contents, props changed) head/graphics/linux-c6-dri-compat/pkg-plist (contents, props changed) head/graphics/linux-c6-dri/Makefile (contents, props changed) head/graphics/linux-c6-dri/distinfo.i686 (contents, props changed) head/graphics/linux-c6-dri/pkg-descr (contents, props changed) head/graphics/linux-c6-dri/pkg-plist (contents, props changed) head/graphics/linux-c6-jpeg/ head/graphics/linux-c6-jpeg/Makefile (contents, props changed) head/graphics/linux-c6-jpeg/distinfo.i686 (contents, props changed) head/graphics/linux-c6-jpeg/pkg-plist (contents, props changed) head/graphics/linux-c6-png/ head/graphics/linux-c6-png/Makefile (contents, props changed) head/graphics/linux-c6-png/distinfo.i686 (contents, props changed) head/graphics/linux-c6-sdl_image/ head/graphics/linux-c6-sdl_image/Makefile (contents, props changed) head/graphics/linux-c6-sdl_image/distinfo.i386 (contents, props changed) head/graphics/linux-c6-sdl_image/distinfo.i686 (contents, props changed) head/graphics/linux-c6-sdl_ttf/ head/graphics/linux-c6-sdl_ttf/Makefile (contents, props changed) head/graphics/linux-c6-sdl_ttf/distinfo.i386 (contents, props changed) head/graphics/linux-c6-sdl_ttf/distinfo.i686 (contents, props changed) head/graphics/linux-c6-tiff/ head/graphics/linux-c6-tiff/Makefile (contents, props changed) head/graphics/linux-c6-tiff/distinfo.i686 (contents, props changed) head/graphics/linux-c6-tiff/pkg-plist (contents, props changed) head/graphics/linux-f10-sdl_ttf/ head/graphics/linux-f10-sdl_ttf/Makefile (contents, props changed) head/graphics/linux-f10-sdl_ttf/distinfo.i386 (contents, props changed) head/graphics/linux-f10-sdl_ttf/pkg-descr (contents, props changed) head/graphics/linux-f10-sdl_ttf/pkg-plist (contents, props changed) head/lang/linux-c6-tcl85/ head/lang/linux-c6-tcl85/Makefile (contents, props changed) head/lang/linux-c6-tcl85/distinfo.i686 (contents, props changed) head/lang/linux-c6-tcl85/pkg-plist (contents, props changed) head/multimedia/linux-c6-libtheora/ head/multimedia/linux-c6-libtheora/Makefile (contents, props changed) head/multimedia/linux-c6-libtheora/distinfo.i686 (contents, props changed) head/multimedia/linux-c6-libv4l/ head/multimedia/linux-c6-libv4l/Makefile (contents, props changed) head/multimedia/linux-c6-libv4l/distinfo.i686 (contents, props changed) head/multimedia/linux-c6-libv4l/pkg-descr (contents, props changed) head/multimedia/linux-c6-libv4l/pkg-plist (contents, props changed) head/net-im/skype4/ head/net-im/skype4/Makefile (contents, props changed) head/net-im/skype4/distinfo (contents, props changed) head/net-im/skype4/files/ head/net-im/skype4/files/skype.sh.in (contents, props changed) head/net-im/skype4/pkg-descr (contents, props changed) head/net-im/skype4/pkg-message (contents, props changed) head/net-im/skype4/pkg-plist (contents, props changed) head/net/linux-c6-openldap/ head/net/linux-c6-openldap/Makefile (contents, props changed) head/net/linux-c6-openldap/distinfo.i686 (contents, props changed) head/net/linux-c6-tcp_wrappers-libs/ head/net/linux-c6-tcp_wrappers-libs/Makefile (contents, props changed) head/net/linux-c6-tcp_wrappers-libs/distinfo.i686 (contents, props changed) head/net/linux-c6-tcp_wrappers-libs/pkg-descr (contents, props changed) head/net/linux-c6-tcp_wrappers-libs/pkg-plist (contents, props changed) head/print/linux-c6-cups-libs/ head/print/linux-c6-cups-libs/Makefile (contents, props changed) head/print/linux-c6-cups-libs/distinfo.i386 (contents, props changed) head/print/linux-c6-cups-libs/distinfo.i686 (contents, props changed) head/security/linux-c6-cyrus-sasl2/ head/security/linux-c6-cyrus-sasl2/Makefile (contents, props changed) head/security/linux-c6-cyrus-sasl2/distinfo.i686 (contents, props changed) head/security/linux-c6-gnutls/ head/security/linux-c6-gnutls/Makefile (contents, props changed) head/security/linux-c6-gnutls/distinfo.i386 (contents, props changed) head/security/linux-c6-gnutls/distinfo.i686 (contents, props changed) head/security/linux-c6-gnutls/pkg-plist (contents, props changed) head/security/linux-c6-libgcrypt/ head/security/linux-c6-libgcrypt/Makefile (contents, props changed) head/security/linux-c6-libgcrypt/distinfo.i686 (contents, props changed) head/security/linux-c6-libgpg-error/ head/security/linux-c6-libgpg-error/Makefile (contents, props changed) head/security/linux-c6-libgpg-error/distinfo.i686 (contents, props changed) head/security/linux-c6-libgpg-error/pkg-plist (contents, props changed) head/security/linux-c6-libssh2/ head/security/linux-c6-libssh2/Makefile (contents, props changed) head/security/linux-c6-libssh2/distinfo.i686 (contents, props changed) head/security/linux-c6-libtasn1/ head/security/linux-c6-libtasn1/Makefile (contents, props changed) head/security/linux-c6-libtasn1/distinfo.i386 (contents, props changed) head/security/linux-c6-libtasn1/distinfo.i686 (contents, props changed) head/security/linux-c6-nss/ head/security/linux-c6-nss/Makefile (contents, props changed) head/security/linux-c6-nss/distinfo.i686 (contents, props changed) head/security/linux-c6-nss/pkg-plist (contents, props changed) head/security/linux-c6-openssl/ head/security/linux-c6-openssl-compat/ head/security/linux-c6-openssl-compat/Makefile (contents, props changed) head/security/linux-c6-openssl-compat/distinfo.i686 (contents, props changed) head/security/linux-c6-openssl-compat/pkg-descr (contents, props changed) head/security/linux-c6-openssl-compat/pkg-plist (contents, props changed) head/security/linux-c6-openssl/Makefile (contents, props changed) head/security/linux-c6-openssl/distinfo.i686 (contents, props changed) head/security/linux-c6-openssl/pkg-plist (contents, props changed) head/textproc/linux-c6-aspell/ head/textproc/linux-c6-aspell/Makefile (contents, props changed) head/textproc/linux-c6-aspell/distinfo.i686 (contents, props changed) head/textproc/linux-c6-aspell/pkg-descr (contents, props changed) head/textproc/linux-c6-aspell/pkg-plist (contents, props changed) head/textproc/linux-c6-expat/ head/textproc/linux-c6-expat/Makefile (contents, props changed) head/textproc/linux-c6-expat/distinfo.i686 (contents, props changed) head/textproc/linux-c6-libxml2/ head/textproc/linux-c6-libxml2/Makefile (contents, props changed) head/textproc/linux-c6-libxml2/distinfo.i686 (contents, props changed) head/www/linux-c6-flashplugin11/ head/www/linux-c6-flashplugin11/Makefile (contents, props changed) head/www/linux-c6-flashplugin11/distinfo (contents, props changed) head/www/linux-c6-flashplugin11/pkg-descr (contents, props changed) head/www/linux-c6-flashplugin11/pkg-message (contents, props changed) head/www/linux-c6-flashplugin11/pkg-plist (contents, props changed) head/www/linux-c6-qt47-webkit/ head/www/linux-c6-qt47-webkit/Makefile (contents, props changed) head/www/linux-c6-qt47-webkit/distinfo.i386 (contents, props changed) head/www/linux-c6-qt47-webkit/pkg-descr (contents, props changed) head/www/linux-c6-qt47-webkit/pkg-plist (contents, props changed) head/x11-fonts/linux-c6-fontconfig/ head/x11-fonts/linux-c6-fontconfig/Makefile (contents, props changed) head/x11-fonts/linux-c6-fontconfig/distinfo.i686 (contents, props changed) head/x11-fonts/linux-c6-fontconfig/pkg-descr (contents, props changed) head/x11-fonts/linux-c6-fontconfig/pkg-plist (contents, props changed) head/x11-themes/linux-c6-hicolor-icon-theme/ head/x11-themes/linux-c6-hicolor-icon-theme/Makefile (contents, props changed) head/x11-themes/linux-c6-hicolor-icon-theme/pkg-descr (contents, props changed) head/x11-toolkits/linux-c6-gtk2/ head/x11-toolkits/linux-c6-gtk2/Makefile (contents, props changed) head/x11-toolkits/linux-c6-gtk2/distinfo.i686 (contents, props changed) head/x11-toolkits/linux-c6-gtk2/pkg-plist (contents, props changed) head/x11-toolkits/linux-c6-openmotif/ head/x11-toolkits/linux-c6-openmotif/Makefile (contents, props changed) head/x11-toolkits/linux-c6-openmotif/distinfo.i686 (contents, props changed) head/x11-toolkits/linux-c6-openmotif/pkg-descr (contents, props changed) head/x11-toolkits/linux-c6-openmotif/pkg-plist (contents, props changed) head/x11-toolkits/linux-c6-pango/ head/x11-toolkits/linux-c6-pango/Makefile (contents, props changed) head/x11-toolkits/linux-c6-pango/distinfo.i686 (contents, props changed) head/x11-toolkits/linux-c6-pango/pkg-plist (contents, props changed) head/x11-toolkits/linux-c6-qt47-x11/ head/x11-toolkits/linux-c6-qt47-x11/Makefile (contents, props changed) head/x11-toolkits/linux-c6-qt47-x11/distinfo.i386 (contents, props changed) head/x11-toolkits/linux-c6-qt47-x11/pkg-plist (contents, props changed) head/x11-toolkits/linux-c6-tk85/ head/x11-toolkits/linux-c6-tk85/Makefile (contents, props changed) head/x11-toolkits/linux-c6-tk85/distinfo.i686 (contents, props changed) head/x11-toolkits/linux-c6-tk85/pkg-plist (contents, props changed) head/x11/linux-c6-xorg-libs/ head/x11/linux-c6-xorg-libs/Makefile (contents, props changed) head/x11/linux-c6-xorg-libs/distinfo.i686 (contents, props changed) head/x11/linux-c6-xorg-libs/files/ head/x11/linux-c6-xorg-libs/pkg-descr (contents, props changed) head/x11/linux-c6-xorg-libs/pkg-plist (contents, props changed) Deleted: head/graphics/linux-sdl_ttf/ Modified: head/Mk/bsd.linux-apps.mk head/Mk/bsd.linux-rpm.mk head/Mk/bsd.port.mk head/Mk/bsd.sites.mk head/UPDATING head/accessibility/Makefile head/accessibility/linux-f10-atk/Makefile head/archivers/linux-f10-ucl/Makefile head/archivers/linux-f10-upx/Makefile head/astro/google-earth/Makefile head/astro/google-earth/files/patch-bin-googleearth head/audio/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/databases/Makefile head/databases/linux-f10-sqlite3/Makefile head/devel/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-ncurses-base/pkg-plist head/devel/linux-f10-nspr/Makefile head/devel/linux-f10-sdl12/Makefile head/devel/linux_kdump/Makefile head/devel/linux_kdump/files/patch-Makefile head/devel/linux_kdump/files/patch-mkioctls.linux head/dns/Makefile head/dns/linux-f10-libasyncns/Makefile head/editors/Makefile head/emulators/Makefile head/emulators/linux_base-c6/Makefile head/emulators/linux_base-c6/distinfo.i686 head/emulators/linux_base-c6/pkg-plist head/emulators/linux_base-f10/Makefile head/emulators/linux_base-f10/distinfo.i386 head/emulators/linux_base-f10/pkg-plist head/ftp/Makefile head/ftp/linux-f10-curl/Makefile head/graphics/Makefile 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-tiff/Makefile head/graphics/linux-f10-ungif/Makefile head/lang/Makefile head/lang/linux-f10-libg2c/Makefile head/lang/linux-f10-tcl85/Makefile head/math/matlab-installer/Makefile head/multimedia/Makefile head/multimedia/linux-f10-libtheora/Makefile head/multimedia/linux-f10-libv4l/Makefile head/net-im/Makefile head/net/Makefile head/net/linux-f10-nss_ldap/Makefile head/net/linux-f10-openldap/Makefile head/print/Makefile head/print/linux-f10-cups-libs/Makefile head/security/Makefile 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-libssh2/Makefile head/security/linux-f10-libtasn1/Makefile head/security/linux-f10-nss/Makefile head/security/linux-f10-openssl/Makefile head/sysutils/linux-f10-procps/Makefile head/textproc/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/www/Makefile head/www/linux-f10-flashplugin11/Makefile head/www/linux-seamonkey/Makefile.common head/www/nspluginwrapper/Makefile head/www/nspluginwrapper/files/patch-src__npw-config.c head/x11-fonts/Makefile head/x11-fonts/linux-f10-fontconfig/Makefile head/x11-themes/Makefile head/x11-themes/linux-f10-hicolor-icon-theme/Makefile head/x11-themes/linux-f10-qtcurve-gtk2/Makefile head/x11-toolkits/Makefile 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-openmotif/distinfo.i386 head/x11-toolkits/linux-f10-pango/Makefile head/x11-toolkits/linux-f10-qt45/Makefile head/x11-toolkits/linux-f10-qt45/pkg-plist.i386 head/x11-toolkits/linux-f10-tk85/Makefile head/x11/Makefile head/x11/linux-f10-xorg-libs/Makefile head/x11/linux-f10-xorg-libs/pkg-plist Modified: head/Mk/bsd.linux-apps.mk ============================================================================== --- head/Mk/bsd.linux-apps.mk Mon Sep 22 10:18:05 2014 (r368844) +++ head/Mk/bsd.linux-apps.mk Mon Sep 22 10:40:00 2014 (r368845) @@ -10,7 +10,7 @@ # # Ports can use this as follows: # -# USE_LINUX_APPS= esound xorglibs +# USE_LINUX_APPS= esound xorglibs # # .include # @@ -39,32 +39,38 @@ Linux_APPS_Pre_Include= bsd.linux-apps Linux_APPS_Post_Include= bsd.linux-apps.mk -# OVERRIDE_LINUX_NONBASE_PORTS may be used only with LINUX_OSRELEASE=2.6.16 -. if (${LINUX_OSRELEASE} == "2.6.16") && defined(OVERRIDE_LINUX_NONBASE_PORTS) -. if ${OVERRIDE_LINUX_NONBASE_PORTS} == "f10" -LINUX_DIST_SUFFIX= -f10 -. else -IGNORE= valid values for OVERRIDE_LINUX_NONBASE_PORTS are: \"f10\" -. endif +#new +. if defined(OVERRIDE_LINUX_NONBASE_PORTS) +. if ${OVERRIDE_LINUX_NONBASE_PORTS} == "f10" || ${OVERRIDE_LINUX_NONBASE_PORTS} == "c6" +LINUX_DIST_SUFFIX= -${OVERRIDE_LINUX_NONBASE_PORTS} +. else +IGNORE= valid values for OVERRIDE_LINUX_NONBASE_PORTS are: \"f10\" and \"c6\" +. endif +. elif defined(USE_LINUX) +. if ${USE_LINUX} == "f10" || ${USE_LINUX} == "c6" +LINUX_DIST_SUFFIX= -${USE_LINUX} +. endif . else -# default for OSVERSION >= 800076 -LINUX_DIST_SUFFIX= -f10 +# default +LINUX_DIST_SUFFIX= -f10 # temporary default, set to -c6 soon . endif WEB_AUTH= nvu # Non-version specific components -_LINUX_APPS_ALL= allegro alsalib arts aspell atk cairo cups-libs curl dri esound expat fontconfig \ - freealut gdkpixbuf gnutls gtk2 hicontheme imlib jpeg libaudiofile \ - libg2c libgcrypt libglade2 libglu libgpg-error libmng libogg \ - libsigcpp20 libtasn1 libtheora libvorbis libxml2 mikmod naslibs \ - ncurses-base openal openmotif openssl pango png scimgtk \ - scimlibs sdl12 sdlimage sdlmixer tiff xorglibs ucl ungif upx webauth +_LINUX_APPS_ALL= allegro alsalib alsa-plugins-oss alsa-plugins-pulseaudio \ + arts aspell atk cairo cups-libs curl dri devtools esound expat \ + flac fontconfig freealut gdkpixbuf gnutls gtk2 hicontheme imlib jpeg libaudiofile \ + libasyncns libg2c libgcrypt libglade2 libglu libgpg-error libmng libogg \ + libpciaccess libsigcpp20 libsndfile libtasn1 libtheora libvorbis libxml2 mikmod \ + naslibs ncurses-base openal openmotif openssl openssl-compat pango png \ + pulseaudio-libs scimgtk scimlibs sdl12 sdlimage sdlmixer sdlttf tiff \ + tcp_wrappers-libs xorglibs ucl ungif upx webauth # 2.6.16 components -_LINUX_26_APPS= alsa-plugins-oss blt cyrus-sasl2 dbusglib dbuslibs \ - libasyncns libidn libssh2 libv4l nspr nss openal-soft \ - openldap pulseaudio-libs qt45 sqlite3 tcl84 tk84 +_LINUX_26_APPS= blt cyrus-sasl2 dbusglib dbuslibs \ + libidn libssh2 libv4l nspr nss openal-soft \ + openldap qt45 sqlite3 tcl85 tk85 qt47 qt47-x11 qt47-webkit _LINUX_APPS_ALL+= ${_LINUX_26_APPS} @@ -79,85 +85,113 @@ _LINUX_APPS_ALL+= ${_LINUX_26_APPS} # component_DEPENDS - A list of components the current component depends on. allegro_f10_FILE= ${LINUXBASE}/usr/lib/liballeg-4.2.2.so +#FIXME: locate weird location for allegro c6 libs allegro_DETECT= ${allegro${LINUX_DIST_SUFFIX:S/-/_/}_FILE} allegro_PORT= ${PORTSDIR}/devel/linux${LINUX_DIST_SUFFIX}-allegro allegro_DEPENDS= xorglibs alsa-plugins-oss_f10_FILE= ${LINUXBASE}/usr/lib/alsa-lib/libasound_module_pcm_oss.so +alsa-plugins-oss_c6_FILE= ${LINUXBASE}/usr/lib/alsa-lib/libasound_module_pcm_oss.so alsa-plugins-oss_DETECT= ${alsa-plugins-oss${LINUX_DIST_SUFFIX:S/-/_/}_FILE} alsa-plugins-oss_PORT= ${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-alsa-plugins-oss alsa-plugins-oss_DEPENDS= alsalib +alsa-plugins-pulseaudio_c6_FILE= ${LINUXBASE}/usr/lib/alsa-lib/libasound_module_conf_pulse.so +alsa-plugins-pulseaudio_DETECT= ${alsa-plugins-oss${LINUX_DIST_SUFFIX:S/-/_/}_FILE} +alsa-plugins-pulseaudio_PORT= ${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-alsa-plugins-pulseaudio +alsa-plugins-pulseaudio_DEPENDS= alsalib + alsalib_f10_FILE= ${LINUXBASE}/lib/libasound.so.2.0.0 +alsalib_c6_FILE= ${LINUXBASE}/lib/libasound.so.2.0.0 alsalib_DETECT= ${alsalib${LINUX_DIST_SUFFIX:S/-/_/}_FILE} alsalib_PORT= ${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-alsa-lib arts_f10_FILE= ${LINUXBASE}/usr/lib/libartsc.so.0 +arts_c6_FILE= ${LINUXBASE}/usr/lib/libartsc.so.0 arts_DETECT= ${arts${LINUX_DIST_SUFFIX:S/-/_/}_FILE} arts_PORT= ${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-arts aspell_f10_FILE= ${LINUXBASE}/usr/lib/libaspell.so.15.1.4 +aspell_c6_FILE= ${LINUXBASE}/usr/lib/libaspell.so.15.1.4 aspell_DETECT= ${aspell${LINUX_DIST_SUFFIX:S/-/_/}_FILE} aspell_PORT= ${PORTSDIR}/textproc/linux${LINUX_DIST_SUFFIX}-aspell atk_f10_FILE= ${LINUXBASE}/usr/lib/libatk-1.0.so.0.2409.1 +atk_c6_FILE= ${LINUXBASE}/usr/lib/libatk-1.0.so.0.3009.1 atk_DETECT= ${atk${LINUX_DIST_SUFFIX:S/-/_/}_FILE} atk_PORT= ${PORTSDIR}/accessibility/linux${LINUX_DIST_SUFFIX}-atk -blt_f10_FILE= ${LINUXBASE}/usr/lib/libBLT24.so +blt_f10_FILE= ${LINUXBASE}/usr/lib/libBLT24.so # FIXME: deprecated, merged into tcl/tk85 blt_DETECT= ${blt${LINUX_DIST_SUFFIX:S/-/_/}_FILE} blt_PORT= ${PORTSDIR}/x11-toolkits/linux${LINUX_DIST_SUFFIX}-blt -blt_DEPENDS= tcl84 tk84 xorglibs +blt_DEPENDS= tcl85 tk85 xorglibs cairo_f10_FILE= ${LINUXBASE}/usr/lib/libcairo.so.2.10800.0 +cairo_c6_FILE= ${LINUXBASE}/usr/lib/libcairo.so.2.10800.8 cairo_DETECT= ${cairo${LINUX_DIST_SUFFIX:S/-/_/}_FILE} cairo_PORT= ${PORTSDIR}/graphics/linux${LINUX_DIST_SUFFIX}-cairo cairo_DEPENDS= fontconfig png xorglibs cups-libs_f10_FILE= ${LINUXBASE}/usr/lib/libcups.so.2 +cups-libs_c6_FILE= ${LINUXBASE}/usr/lib/libcups.so.2 cups-libs_DETECT= ${cups-libs${LINUX_DIST_SUFFIX:S/-/_/}_FILE} cups-libs_PORT= ${PORTSDIR}/print/linux${LINUX_DIST_SUFFIX}-cups-libs cups-libs_DEPENDS= gnutls curl_f10_FILE= ${LINUXBASE}/usr/lib/libcurl.so.4.1.1 +curl_c6_FILE= ${LINUXBASE}/usr/lib/libcurl.so.4.1.1 curl_DETECT= ${curl${LINUX_DIST_SUFFIX:S/-/_/}_FILE} curl_PORT= ${PORTSDIR}/ftp/linux${LINUX_DIST_SUFFIX}-curl -. if ${LINUX_DIST_SUFFIX} == "-f10" curl_DEPENDS= cyrus-sasl2 openldap -. endif cyrus-sasl2_f10_FILE= ${LINUXBASE}/usr/lib/libsasl2.so.2.0.22 +cyrus-sasl2_c6_FILE= ${LINUXBASE}/usr/lib/libsasl2.so.2.0.23 cyrus-sasl2_DETECT= ${cyrus-sasl2${LINUX_DIST_SUFFIX:S/-/_/}_FILE} cyrus-sasl2_PORT= ${PORTSDIR}/security/linux${LINUX_DIST_SUFFIX}-cyrus-sasl2 dbusglib_f10_FILE= ${LINUXBASE}/usr/lib/libdbus-glib-1.so.2 +dbusglib_c6_FILE= ${LINUXBASE}/usr/lib/libdbus-glib-1.so.2 dbusglib_DETECT= ${dbusglib${LINUX_DIST_SUFFIX:S/-/_/}_FILE} dbusglib_PORT= ${PORTSDIR}/devel/linux${LINUX_DIST_SUFFIX}-dbus-glib dbusglib_DEPENDS= dbuslibs expat dbuslibs_f10_FILE= ${LINUXBASE}/lib/libdbus-1.so.3 +dbuslibs_c6_FILE= ${LINUXBASE}/lib/libdbus-1.so.3 dbuslibs_DETECT= ${dbuslibs${LINUX_DIST_SUFFIX:S/-/_/}_FILE} dbuslibs_PORT= ${PORTSDIR}/devel/linux${LINUX_DIST_SUFFIX}-dbus-libs dri_f10_FILE= ${LINUXBASE}/usr/lib/libGL.so.1.2 -dri_DETECT= ${dri${LINUX_DIST_SUFFIX:S/-/_/}_FILE} -dri_PORT= ${PORTSDIR}/graphics/linux${LINUX_DIST_SUFFIX}-dri +dri_c6_FILE= ${LINUXBASE}/usr/lib/libGL.so.1.2.0 +dri_DETECT= ${dri${LINUX_DIST_SUFFIX:S/-/_/}_FILE} +dri_PORT= ${PORTSDIR}/graphics/linux${LINUX_DIST_SUFFIX}-dri dri_DEPENDS= xorglibs +devtools_f10_FILE= ${LINUXBASE}/usr/bin/i386-redhat-linux-gcc +devtools_c6_FILE= ${LINUXBASE}/usr/bin/gcc +devtools_DETECT= ${devtools${LINUX_DIST_SUFFIX:S/-/_/}_FILE} +devtools_PORT= ${PORTSDIR}/devel/linux${LINUX_DIST_SUFFIX}-devtools + esound_f10_FILE= ${LINUXBASE}/usr/lib/libesd.so.0.2.39 +esound_c6_FILE= ${LINUXBASE}/usr/lib/libesd.so.0.2.39 esound_DETECT= ${esound${LINUX_DIST_SUFFIX:S/-/_/}_FILE} esound_PORT= ${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-esound esound_DEPENDS= libaudiofile expat_f10_FILE= ${LINUXBASE}/lib/libexpat.so.1 +expat_c6_FILE= ${LINUXBASE}/lib/libexpat.so.1 expat_DETECT= ${expat${LINUX_DIST_SUFFIX:S/-/_/}_FILE} expat_PORT= ${PORTSDIR}/textproc/linux${LINUX_DIST_SUFFIX}-expat fontconfig_f10_FILE= ${LINUXBASE}/usr/lib/libfontconfig.so.1.3.0 +fontconfig_c6_FILE= ${LINUXBASE}/usr/lib/libfontconfig.so.1.4.4 fontconfig_DETECT= ${fontconfig${LINUX_DIST_SUFFIX:S/-/_/}_FILE} fontconfig_PORT= ${PORTSDIR}/x11-fonts/linux${LINUX_DIST_SUFFIX}-fontconfig fontconfig_DEPENDS= expat +flac_c6_FILE= ${LINUXBASE}/usr/lib/libFLAC.so.8.2.0 +flac_DETECT= ${flac${LINUX_DIST_SUFFIX:S/-/_/}_FILE} +flac_PORT= ${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-flac + freealut_f10_FILE= ${LINUXBASE}/usr/lib/libalut.so.0.1.0 freealut_DETECT= ${freealut${LINUX_DIST_SUFFIX:S/-/_/}_FILE} freealut_PORT= ${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-freealut @@ -168,16 +202,19 @@ gdkpixbuf_DETECT= ${gdkpixbuf${LINUX_DIS gdkpixbuf_PORT= ${PORTSDIR}/graphics/linux${LINUX_DIST_SUFFIX}-gdk-pixbuf gnutls_f10_FILE= ${LINUXBASE}/usr/lib/libgnutls.so.26.4.6 +gnutls_c6_FILE= ${LINUXBASE}/usr/lib/libgnutls.so.26.14.12 gnutls_DETECT= ${gnutls${LINUX_DIST_SUFFIX:S/-/_/}_FILE} gnutls_PORT= ${PORTSDIR}/security/linux${LINUX_DIST_SUFFIX}-gnutls gnutls_DEPENDS= libtasn1 libgcrypt libgpg-error gtk2_f10_FILE= ${LINUXBASE}/usr/lib/libgtk-x11-2.0.so.0.1400.7 +gtk2_c6_FILE= ${LINUXBASE}/usr/lib/libgtk-x11-2.0.so.0.2000.1 gtk2_DETECT= ${gtk2${LINUX_DIST_SUFFIX:S/-/_/}_FILE} gtk2_PORT= ${PORTSDIR}/x11-toolkits/linux${LINUX_DIST_SUFFIX}-gtk2 gtk2_DEPENDS= atk jpeg png pango tiff xorglibs hicontheme_f10_FILE= ${LINUXBASE}/usr/share/icons/hicolor +hicontheme_c6_FILE= ${LINUXBASE}/usr/share/icons/hicolor hicontheme_DETECT= ${hicontheme${LINUX_DIST_SUFFIX:S/-/_/}_FILE} hicontheme_PORT= ${PORTSDIR}/x11-themes/linux${LINUX_DIST_SUFFIX}-hicolor-icon-theme @@ -186,14 +223,17 @@ imlib_DETECT= ${imlib${LINUX_DIST_SUFFI imlib_PORT= ${PORTSDIR}/graphics/linux${LINUX_DIST_SUFFIX}-imlib jpeg_f10_FILE= ${LINUXBASE}/usr/lib/libjpeg.so.62.0.0 +jpeg_c6_FILE= ${LINUXBASE}/usr/lib/libjpeg.so.62.0.0 jpeg_DETECT= ${jpeg${LINUX_DIST_SUFFIX:S/-/_/}_FILE} jpeg_PORT= ${PORTSDIR}/graphics/linux${LINUX_DIST_SUFFIX}-jpeg libasyncns_f10_FILE= ${LINUXBASE}/usr/lib/libasyncns.so.0.3.1 +libasyncns_c6_FILE= ${LINUXBASE}/usr/lib/libasyncns.so.0.3.1 libasyncns_DETECT= ${libasyncns${LINUX_DIST_SUFFIX:S/-/_/}_FILE} libasyncns_PORT= ${PORTSDIR}/dns/linux${LINUX_DIST_SUFFIX}-libasyncns libaudiofile_f10_FILE= ${LINUXBASE}/usr/lib/libaudiofile.so.0.0.2 +libaudiofile_c6_FILE= ${LINUXBASE}/usr/lib/libaudiofile.so.0.0.2 libaudiofile_DETECT= ${libaudiofile${LINUX_DIST_SUFFIX:S/-/_/}_FILE} libaudiofile_PORT= ${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-libaudiofile @@ -202,10 +242,12 @@ libg2c_DETECT= ${libg2c${LINUX_DIST_SUF libg2c_PORT= ${PORTSDIR}/lang/linux${LINUX_DIST_SUFFIX}-libg2c libgcrypt_f10_FILE= ${LINUXBASE}/lib/libgcrypt.so.11.5.2 +libgcrypt_c6_FILE= ${LINUXBASE}/lib/libgcrypt.so.11.5.3 libgcrypt_DETECT= ${libgcrypt${LINUX_DIST_SUFFIX:S/-/_/}_FILE} libgcrypt_PORT= ${PORTSDIR}/security/linux${LINUX_DIST_SUFFIX}-libgcrypt libglade2_f10_FILE= ${LINUXBASE}/usr/lib/libglade-2.0.so.0.0.7 +libglade2_c6_FILE= ${LINUXBASE}/usr/lib/libglade-2.0.so.0.0.7 libglade2_DETECT= ${libglade2${LINUX_DIST_SUFFIX:S/-/_/}_FILE} libglade2_PORT= ${PORTSDIR}/devel/linux${LINUX_DIST_SUFFIX}-libglade2 @@ -214,6 +256,7 @@ libglu_DETECT= ${libglu${LINUX_DIST_SUF libglu_PORT= ${PORTSDIR}/graphics/linux${LINUX_DIST_SUFFIX}-libGLU libgpg-error_f10_FILE= ${LINUXBASE}/lib/libgpg-error.so.0.4.0 +libgpg-error_c6_FILE= ${LINUXBASE}/lib/libgpg-error.so.0.5.0 libgpg-error_DETECT= ${libgpg-error${LINUX_DIST_SUFFIX:S/-/_/}_FILE} libgpg-error_PORT= ${PORTSDIR}/security/linux${LINUX_DIST_SUFFIX}-libgpg-error @@ -227,66 +270,88 @@ libmng_PORT= ${PORTSDIR}/graphics/linux libmng_DEPENDS= jpeg libogg_f10_FILE= ${LINUXBASE}/usr/lib/libogg.so.0.5.3 +libogg_c6_FILE= ${LINUXBASE}/usr/lib/libogg.so.0.6.0 libogg_DETECT= ${libogg${LINUX_DIST_SUFFIX:S/-/_/}_FILE} libogg_PORT= ${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-libogg +libpciaccess_c6_FILE= ${LINUXBASE}/usr/lib/libpciaccess.so.0.11.1 +libpciaccess_DETECT= ${libogg${LINUX_DIST_SUFFIX:S/-/_/}_FILE} +libpciaccess_PORT= ${PORTSDIR}/devel/linux${LINUX_DIST_SUFFIX}-libpciaccess + libsigcpp20_f10_FILE= ${LINUXBASE}/usr/lib/libsigc-2.0.so.0 libsigcpp20_DETECT= ${libsigcpp20${LINUX_DIST_SUFFIX:S/-/_/}_FILE} libsigcpp20_PORT= ${PORTSDIR}/devel/linux${LINUX_DIST_SUFFIX}-libsigc++20 +libsndfile_c6_FILE= ${LINUXBASE}/usr/lib/libsndfile.so.1.0.20 +libsndfile_DETECT= ${libsndfile${LINUX_DIST_SUFFIX:S/-/_/}_FILE} +libsndfile_PORT= ${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-libsndfile + libssh2_f10_FILE= ${LINUXBASE}/usr/lib/libssh2.so.1 +libssh2_c6_FILE= ${LINUXBASE}/usr/lib/libssh2.so.1.0.1 libssh2_DETECT= ${libssh2${LINUX_DIST_SUFFIX:S/-/_/}_FILE} libssh2_PORT= ${PORTSDIR}/security/linux${LINUX_DIST_SUFFIX}-libssh2 libssh2_DEPENDS= openssl libv4l_f10_FILE= ${LINUXBASE}/usr/lib/libv4l1.so.0 +libv4l_c6_FILE= ${LINUXBASE}/usr/lib/libv4l1.so.0 libv4l_DETECT= ${libv4l${LINUX_DIST_SUFFIX:S/-/_/}_FILE} libv4l_PORT= ${PORTSDIR}/multimedia/linux${LINUX_DIST_SUFFIX}-libv4l libtasn1_f10_FILE= ${LINUXBASE}/usr/lib/libtasn1.so.3.0.16 +libtasn1_c6_FILE= ${LINUXBASE}/usr/lib/libtasn1.so.3.1.6 libtasn1_DETECT= ${libtasn1${LINUX_DIST_SUFFIX:S/-/_/}_FILE} libtasn1_PORT= ${PORTSDIR}/security/linux${LINUX_DIST_SUFFIX}-libtasn1 libtheora_f10_FILE= ${LINUXBASE}/usr/lib/libtheora.so.0.3.3 +libtheora_c6_FILE= ${LINUXBASE}/usr/lib/libtheora.so.0.3.9 libtheora_DETECT= ${libtheora${LINUX_DIST_SUFFIX:S/-/_/}_FILE} libtheora_PORT= ${PORTSDIR}/multimedia/linux${LINUX_DIST_SUFFIX}-libtheora libvorbis_f10_FILE= ${LINUXBASE}/usr/lib/libvorbis.so.0.4.0 +libvorbis_c6_FILE= ${LINUXBASE}/usr/lib/libvorbis.so.0.4.3 libvorbis_DETECT= ${libvorbis${LINUX_DIST_SUFFIX:S/-/_/}_FILE} libvorbis_PORT= ${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-libvorbis libvorbis_DEPENDS= libogg libxml2_f10_FILE= ${LINUXBASE}/usr/lib/libxml2.so.2.7.3 +libxml2_c6_FILE= ${LINUXBASE}/usr/lib/libxml2.so.2.7.6 libxml2_DETECT= ${libxml2${LINUX_DIST_SUFFIX:S/-/_/}_FILE} libxml2_PORT= ${PORTSDIR}/textproc/linux${LINUX_DIST_SUFFIX}-libxml2 mikmod_f10_FILE= ${LINUXBASE}/usr/lib/libmikmod.so.3.0.0 +mikmod_c6_FILE= ${LINUXBASE}/usr/lib/libmikmod.so.3.0.0 mikmod_DETECT= ${mikmod${LINUX_DIST_SUFFIX:S/-/_/}_FILE} mikmod_PORT= ${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-mikmod naslibs_f10_FILE= ${LINUXBASE}/usr/lib/libaudio.so.2 +naslibs_c6_FILE= ${LINUXBASE}/usr/lib/libaudio.so.2 naslibs_DETECT= ${naslibs${LINUX_DIST_SUFFIX:S/-/_/}_FILE} naslibs_PORT= ${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-nas-libs naslibs_DEPENDS= xorglibs openldap_f10_FILE= ${LINUXBASE}/usr/lib/libldap-2.4.so.2.2.0 +openldap_c6_FILE= ${LINUXBASE}/lib/libldap-2.4.so.2.5.6 openldap_DETECT= ${openldap${LINUX_DIST_SUFFIX:S/-/_/}_FILE} openldap_PORT= ${PORTSDIR}/net/linux${LINUX_DIST_SUFFIX}-openldap openmotif_f10_FILE= ${LINUXBASE}/usr/lib/libXm.so.4 +openmotif_c6_FILE= ${LINUXBASE}/usr/lib/libXm.so.4.0.3 openmotif_DETECT= ${openmotif${LINUX_DIST_SUFFIX:S/-/_/}_FILE} openmotif_PORT= ${PORTSDIR}/x11-toolkits/linux${LINUX_DIST_SUFFIX}-openmotif openmotif_DEPENDS= xorglibs ncurses-base_f10_FILE= ${LINUXBASE}/lib/terminfo/a/ansi +ncurses-base_c6_FILE= ${LINUXBASE}/lib/terminfo/a/ansi ncurses-base_DETECT= ${ncurses-base${LINUX_DIST_SUFFIX:S/-/_/}_FILE} ncurses-base_PORT= ${PORTSDIR}/devel/linux${LINUX_DIST_SUFFIX}-ncurses-base nspr_f10_FILE= ${LINUXBASE}/lib/libnspr4.so +nspr_c6_FILE= ${LINUXBASE}/lib/libnspr4.so nspr_DETECT= ${nspr${LINUX_DIST_SUFFIX:S/-/_/}_FILE} nspr_PORT= ${PORTSDIR}/devel/linux${LINUX_DIST_SUFFIX}-nspr nss_f10_FILE= ${LINUXBASE}/lib/libnss3.so +nss_c6_FILE= ${LINUXBASE}/usr/lib/libnss3.so nss_DETECT= ${nss${LINUX_DIST_SUFFIX:S/-/_/}_FILE} nss_PORT= ${PORTSDIR}/security/linux${LINUX_DIST_SUFFIX}-nss nss_DEPENDS= nspr sqlite3 @@ -297,24 +362,33 @@ openal_PORT= ${PORTSDIR}/audio/linux${L openal_DEPENDS= alsalib arts esound libaudiofile libvorbis sdl12 openal-soft_f10_FILE= ${LINUXBASE}/usr/lib/libopenal.so.1.8.466 +openal-soft_c6_FILE= ${LINUXBASE}/usr/lib/libopenal.so.1.12.854 openal-soft_DETECT= ${openal-soft${LINUX_DIST_SUFFIX:S/-/_/}_FILE} openal-soft_PORT= ${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-openal-soft openal-soft_DEPENDS= alsalib arts esound openssl_f10_FILE= ${LINUXBASE}/lib/libssl.so.0.9.8g +openssl_c6_FILE= ${LINUXBASE}/usr/lib/libssl.so.10 openssl_DETECT= ${openssl${LINUX_DIST_SUFFIX:S/-/_/}_FILE} openssl_PORT= ${PORTSDIR}/security/linux${LINUX_DIST_SUFFIX}-openssl +openssl-compat_c6_FILE= ${LINUXBASE}/usr/lib/libssl.so.0.9.8e +openssl-compat_DETECT= ${openssl-compat${LINUX_DIST_SUFFIX:S/-/_/}_FILE} +openssl-compat_PORT= ${PORTSDIR}/security/linux${LINUX_DIST_SUFFIX}-openssl-compat + pango_f10_FILE= ${LINUXBASE}/usr/lib/libpango-1.0.so.0.2800.3 +pango_c6_FILE= ${LINUXBASE}/usr/lib/libpango-1.0.so.0.2800.1 pango_DETECT= ${pango${LINUX_DIST_SUFFIX:S/-/_/}_FILE} pango_PORT= ${PORTSDIR}/x11-toolkits/linux${LINUX_DIST_SUFFIX}-pango pango_DEPENDS= cairo expat fontconfig xorglibs png_f10_FILE= ${LINUXBASE}/usr/lib/libpng.so.3.37.0 +png_c6_FILE= ${LINUXBASE}/usr/lib/libpng.so.3.49.0 png_DETECT= ${png${LINUX_DIST_SUFFIX:S/-/_/}_FILE} png_PORT= ${PORTSDIR}/graphics/linux${LINUX_DIST_SUFFIX}-png pulseaudio-libs_f10_FILE= ${LINUXBASE}/usr/lib/libpulse.so.0 +pulseaudio-libs_c6_FILE= ${LINUXBASE}/usr/lib/libpulse.so.0.12.2 pulseaudio-libs_DETECT= ${pulseaudio-libs${LINUX_DIST_SUFFIX:S/-/_/}_FILE} pulseaudio-libs_PORT= ${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-pulseaudio-libs @@ -323,20 +397,29 @@ qt45_DETECT= ${qt45${LINUX_DIST_SUFFIX: qt45_DEPENDS= fontconfig libmng png sdl12_f10_FILE= ${LINUXBASE}/usr/lib/libSDL-1.2.so.0.11.2 +sdl12_c6_FILE= ${LINUXBASE}/usr/lib/libSDL-1.2.so.0.11.3 sdl12_DETECT= ${sdl12${LINUX_DIST_SUFFIX:S/-/_/}_FILE} sdl12_PORT= ${PORTSDIR}/devel/linux${LINUX_DIST_SUFFIX}-sdl12 sdl12_DEPENDS= xorglibs sdlimage_f10_FILE= ${LINUXBASE}/usr/lib/libSDL_image-1.2.so.0.1.5 +sdlimage_c6_FILE= ${LINUXBASE}/usr/lib/libSDL_image-1.2.so.0.8.2 sdlimage_DETECT= ${sdlimage${LINUX_DIST_SUFFIX:S/-/_/}_FILE} sdlimage_PORT= ${PORTSDIR}/graphics/linux${LINUX_DIST_SUFFIX}-sdl_image sdlimage_DEPENDS= jpeg png sdl12 tiff sdlmixer_f10_FILE= ${LINUXBASE}/usr/lib/libSDL_mixer-1.2.so.0.2.6 +sdlmixer_c6_FILE= ${LINUXBASE}/usr/lib/libSDL_mixer-1.2.so.0.10.1 sdlmixer_DETECT= ${sdlmixer${LINUX_DIST_SUFFIX:S/-/_/}_FILE} sdlmixer_PORT= ${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-sdl_mixer sdlmixer_DEPENDS= sdl12 +sdlttf_f10_FILE= ${LINUXBASE}/usr/lib/libSDL_ttf-2.0.so.0.6.2 +sdlttf_c6_FILE= ${LINUXBASE}/usr/lib/libSDL_ttf-2.0.so.0.6.3 +sdlttf_DETECT= ${sdlttf${LINUX_DIST_SUFFIX:S/-/_/}_FILE} +sdlttf_PORT= ${PORTSDIR}/graphics/linux${LINUX_DIST_SUFFIX}-sdl_ttf +sdlttf_DEPENDS= sdl12 + scimgtk_f10_FILE= ${LINUXBASE}/usr/lib/gtk-2.0/immodules/im-scim.so scimgtk_DETECT= ${scimgtk${LINUX_DIST_SUFFIX:S/-/_/}_FILE} scimgtk_PORT= ${PORTSDIR}/textproc/linux${LINUX_DIST_SUFFIX}-scim-gtk @@ -348,26 +431,33 @@ scimlibs_PORT= ${PORTSDIR}/textproc/lin scimlibs_DEPENDS= gtk2 sqlite3_f10_FILE= ${LINUXBASE}/usr/lib/libsqlite3.so.0 +sqlite3_c6_FILE= ${LINUXBASE}/usr/lib/libsqlite3.so.0 sqlite3_DETECT= ${sqlite3${LINUX_DIST_SUFFIX:S/-/_/}_FILE} sqlite3_PORT= ${PORTSDIR}/databases/linux${LINUX_DIST_SUFFIX}-sqlite3 -# XXX: tcl85!!! -tcl84_f10_FILE= ${LINUXBASE}/usr/lib/libtcl8.5.so -tcl84_DETECT= ${tcl84${LINUX_DIST_SUFFIX:S/-/_/}_FILE} -tcl84_PORT= ${PORTSDIR}/lang/linux${LINUX_DIST_SUFFIX}-tcl85 +tcl85_f10_FILE= ${LINUXBASE}/usr/lib/libtcl8.5.so +tcl85_c6_FILE= ${LINUXBASE}/usr/lib/libtcl8.5.so +tcl85_DETECT= ${tcl85${LINUX_DIST_SUFFIX:S/-/_/}_FILE} +tcl85_PORT= ${PORTSDIR}/lang/linux${LINUX_DIST_SUFFIX}-tcl85 + +tcp_wrappers-libs_c6_FILE= ${LINUXBASE}/lib/libwrap.so.0 +tcp_wrappers-libs_DETECT= ${tcp_wrappers-libs${LINUX_DIST_SUFFIX:S/-/_/}_FILE} +tcp_wrappers-libs_PORT= ${PORTSDIR}/net/linux${LINUX_DIST_SUFFIX}-tcp_wrappers-libs tiff_f10_FILE= ${LINUXBASE}/usr/lib/libtiff.so.3.8.2 +tiff_c6_FILE= ${LINUXBASE}/usr/lib/libtiff.so.3.9.4 tiff_DETECT= ${tiff${LINUX_DIST_SUFFIX:S/-/_/}_FILE} tiff_PORT= ${PORTSDIR}/graphics/linux${LINUX_DIST_SUFFIX}-tiff tiff_DEPENDS= jpeg -# XXX: tk85!!! -tk84_f10_FILE= ${LINUXBASE}/usr/lib/libtk8.5.so -tk84_DETECT= ${tk84${LINUX_DIST_SUFFIX:S/-/_/}_FILE} -tk84_PORT= ${PORTSDIR}/x11-toolkits/linux${LINUX_DIST_SUFFIX}-tk85 -tk84_DEPENDS= xorglibs +tk85_f10_FILE= ${LINUXBASE}/usr/lib/libtk8.5.so +tk85_c6_FILE= ${LINUXBASE}/usr/lib/libtk8.5.so +tk85_DETECT= ${tk85${LINUX_DIST_SUFFIX:S/-/_/}_FILE} +tk85_PORT= ${PORTSDIR}/x11-toolkits/linux${LINUX_DIST_SUFFIX}-tk85 +tk85_DEPENDS= xorglibs xorglibs_f10_FILE= ${LINUXBASE}/usr/lib/libXrandr.so.2.1.0 +xorglibs_c6_FILE= ${LINUXBASE}/usr/lib/libXrandr.so.2.2.0 xorglibs_DETECT= ${xorglibs${LINUX_DIST_SUFFIX:S/-/_/}_FILE} xorglibs_PORT= ${PORTSDIR}/x11/linux${LINUX_DIST_SUFFIX}-xorg-libs xorglibs_DEPENDS= fontconfig @@ -390,6 +480,18 @@ webauth_DETECT= ${webauth${LINUX_DIST_S webauth_PORT= ${PORTSDIR}/www/linux-${WEB_AUTH} webauth_DEPENDS= gtk2 atk pango fontconfig +qt47_c6_FILE= ${LINUXBASE}/usr/lib/qt47/libQtCore.so.4.7.2 +qt47_DETECT= ${qt47${LINUX_DIST_SUFFIX:S/-/_/}_FILE} +qt47_PORT= ${PORTSDIR}/devel/linux${LINUX_DIST_SUFFIX}-qt47 + +qt47-x11_c6_FILE= ${LINUXBASE}/usr/lib/qt47/libQtGui.so.4.7.2 +qt47-x11_DETECT= ${qt47-x11${LINUX_DIST_SUFFIX:S/-/_/}_FILE} +qt47-x11_PORT= ${PORTSDIR}/x11-toolkits/linux${LINUX_DIST_SUFFIX}-qt47-x11 + +qt47-webkit_c6_FILE= ${LINUXBASE}/usr/lib/qt47/libQtWebKit.so.4.7.2 +qt47-webkit_DETECT= ${qt47-webkit${LINUX_DIST_SUFFIX:S/-/_/}_FILE} +qt47-webkit_PORT= ${PORTSDIR}/www/linux${LINUX_DIST_SUFFIX}-qt47-webkit + # End component definition section # Let's check if components from USE_LINUX_APPS exist at _LINUX_APPS_ALL Modified: head/Mk/bsd.linux-rpm.mk ============================================================================== --- head/Mk/bsd.linux-rpm.mk Mon Sep 22 10:18:05 2014 (r368844) +++ head/Mk/bsd.linux-rpm.mk Mon Sep 22 10:40:00 2014 (r368845) @@ -42,68 +42,110 @@ USE_LINUX_PREFIX= yes NO_WRKSUBDIR= yes NO_BUILD= yes -. if ${ARCH} == "amd64" +. if ${ARCH} == "amd64" || ${ARCH} == "i386" +. if ${USE_LINUX} == "c6" +# Do not build CentOS 6.5 ports if overridden by f10 +. if defined(OVERRIDE_LINUX_BASE_PORT) && ${OVERRIDE_LINUX_NONBASE_PORTS} == "f10" +IGNORE= This port requires CentOS 6.5. Please remove OVERRIDE_LINUX_NONBASE_PORTS=f10 in /etc/make.conf. +. endif +LINUX_RPM_ARCH?= i686 # ?= because of nasty c5 qt ports +. elif ${USE_LINUX} == "f10" || ${USE_LINUX} == "yes" # temporary default, move or clause to line 46 +# Do not build Fedora 10 ports unless specifically overridden. +#. if ! defined(OVERRIDE_LINUX_NONBASE_PORTS) || ${OVERRIDE_LINUX_NONBASE_PORTS} != "f10" +#IGNORE= This port requires Fedora 10, yet Fedora 10 is heavily outdated and contains many vulnerable ports. If you really need it, add OVERRIDE_LINUX_NONBASE_PORTS=f10 in /etc/make.conf. +#. endif LINUX_RPM_ARCH?= i386 # the linuxulator does not yet support amd64 code -. elif ${ARCH} == "powerpc" -LINUX_RPM_ARCH?= ppc -. else +. else LINUX_RPM_ARCH?= ${ARCH} -. endif +. endif +. elif ${ARCH} == "powerpc" +LINUX_RPM_ARCH?= ppc +. endif .endif .if defined(_POSTMKINCLUDED) && !defined(Linux_RPM_Post_Include) Linux_RPM_Post_Include= bsd.linux-rpm.mk -LINUX_DIST?= fedora -LINUX_DIST_VER?= 10 -. if !defined(OVERRIDE_LINUX_NONBASE_PORTS) && \ - ${LINUX_DIST_VER} != 10 -IGNORE= bsd.linux-rpm.mk test failed: package building defaults to linux-f10 ports, please define OVERRIDE_LINUX_NONBASE_PORTS to build other linux infrastructure ports -. endif +.if ${USE_LINUX} == "f10" || ${USE_LINUX} == "yes" # temporary default, remove or clause soon +USE_LINUX?= "f10" +LINUX_DIST= fedora +LINUX_DIST_VER= 10 +.else +LINUX_DIST= centos +LINUX_DIST_VER= 6.5 +.endif -. if defined(LINUX_DIST) +. if defined(LINUX_DIST) DIST_SUBDIR?= rpm/${LINUX_RPM_ARCH}/${LINUX_DIST}/${LINUX_DIST_VER} -. if ${LINUX_DIST} == "fedora" +. if ${LINUX_DIST} == "fedora" # we do not want to define MASTER_SITES and MASTER_SITE_* if they are already defined # ex.: MASTER_SITES=file:///... -. ifndef MASTER_SITES +. ifndef MASTER_SITES MASTER_SITES= ${MASTER_SITE_FEDORA_LINUX} -. if ${LINUX_DIST_VER} == 10 +. if ${LINUX_DIST_VER} == 10 MASTER_SITE_SUBDIR?= ../releases/${LINUX_DIST_VER}/Everything/${LINUX_RPM_ARCH}/os/Packages \ ../updates/${LINUX_DIST_VER}/${LINUX_RPM_ARCH} MASTER_SITE_SRC_SUBDIR?= ../releases/${LINUX_DIST_VER}/Everything/source/SRPMS \ ../updates/${LINUX_DIST_VER}/SRPMS -. else +. else MASTER_SITE_SUBDIR?= ${LINUX_DIST_VER}/${LINUX_RPM_ARCH}/os/Fedora/RPMS \ updates/${LINUX_DIST_VER}/${LINUX_RPM_ARCH} MASTER_SITE_SRC_SUBDIR?= ${LINUX_DIST_VER}/SRPMS \ updates/${LINUX_DIST_VER}/SRPMS -. endif -. endif -. else -IGNORE= unknown LINUX_DIST in port Makefile -. endif -. endif -PKGNAMEPREFIX?= linux- +. endif +. endif +. elif ${LINUX_DIST} == "centos" +MASTER_SITES_SUBDIR= /centos/6/os/i386/Packages/ +. if ${LINUX_DIST_VER} == "5" #needed for Qt... +LINUX_RPM_ARCH= i386 +MASTER_SITES_SUBDIR= /centos/5/os/i386/Packages/ +. endif + +. ifndef MASTER_SITES +MASTER_SITES= ${MASTER_SITE_CENTOS_LINUX} +. if ${LINUX_DIST_VER} == "6.5" +. if ! defined(PACKAGE_BUILDING) +MASTER_SITES= http://mirror.centos.org/centos/6/os/i386/Packages/ +MASTER_SITES_SUBDIR= /centos/6/os/i386/Packages/ +. else +MASTER_SITES?= http://vault.centos.org/%SUBDIR%/ +MASTER_SITES_SUBDIR= /6.5/os/Source/SPackages/ +. endif + +. else +MASTER_SITES= http://vault.centos.org/${LINUX_DIST_VER}/os/i386/Packages/ +. endif +. endif + +. endif +. endif + + +#.if ${USE_LINUX:L} == "yes" #redundant with bsd.port.mk fu +#USE_LINUX= c6 +#.endif +PKGNAMEPREFIX?= linux-${USE_LINUX}- # DISTFILES and SRC_DISTFILES assume that there is only one bindist # and one src file. -# Please, define them n the Makefile of the port in case this assumption +# Please, define them in the Makefile of the port in case this assumption # is not true. +DISTVERSION= ${PORTVERSION}-${RPMVERSION} +DISTNAME?= ${PORTNAME}-${DISTVERSION} DISTFILES?= ${DISTNAME}${EXTRACT_SUFX} BIN_DISTFILES:= ${DISTFILES} SRC_DISTFILES?= ${DISTNAME}${SRC_SUFX} EXTRACT_ONLY?= ${BIN_DISTFILES:C/:[^:]+$//} -. if defined(PACKAGE_BUILDING) +. if defined(PACKAGE_BUILDING) DISTFILES+= ${SRC_DISTFILES} MASTER_SITE_SUBDIR+= ${MASTER_SITE_SRC_SUBDIR} ALWAYS_KEEP_DISTFILES= yes -. endif +. endif EXTRACT_CMD?= ${TAR} EXTRACT_BEFORE_ARGS?= -xf @@ -119,36 +161,39 @@ BRANDELF_FILES?= . if defined(PORTDOCS) && defined(NOPORTDOCS) pre-patch: linux-rpm-clean-portdocs -. if !target(linux-rpm-clean-portdocs) +. if !target(linux-rpm-clean-portdocs) linux-rpm-clean-portdocs: -. for x in ${PORTDOCS} +. for x in ${PORTDOCS} @${RM} -f ${WRKDIR}/${DOCSDIR_REL}/${x} -. endfor +. endfor @${RMDIR} ${WRKDIR}/${DOCSDIR_REL} -. endif +. endif . endif . if defined(AUTOMATIC_PLIST) -. if ${USE_LINUX} == "f10" || ${USE_LINUX:tl} == "yes" +. if ${USE_LINUX} == "f10" || ${USE_LINUX} == "yes" _LINUX_BASE_SUFFIX= f10 -. else +. elif ${USE_LINUX} == "c6" +USE_LINUX= c6 +_LINUX_BASE_SUFFIX= c6 +. else # other linux_base ports do not provide a pkg-plist file -IGNORE= uses AUTOMATIC_PLIST with an unsupported USE_LINUX, \"${USE_LINUX}\". Supported values are \"yes\" and \"f10\" -. endif +IGNORE= uses AUTOMATIC_PLIST with an unsupported USE_LINUX, \"${USE_LINUX}\". Supported values are \"yes\", \"f10\" and \"c6\" +. endif PLIST?= ${WRKDIR}/.PLIST.linux-rpm pre-install: linux-rpm-generate-plist -. if !target(linux-rpm-generate-plist) +. if !target(linux-rpm-generate-plist) linux-rpm-generate-plist: cd ${WRKSRC} && \ ${FIND} * ! -path "stage/*" ! -type d | ${SORT} > ${PLIST} && \ ${FIND} * ! -path "stage*" -type d | ${SORT} | ${SED} -e 's|^|@dirrm |' > ${PLIST}.dirs @${GREP} '^@dirrm' ${PORTSDIR}/emulators/linux_base-${_LINUX_BASE_SUFFIX}/pkg-plist | ${SED} 's:^@dirrmtry:@dirrm:g' | ${SORT} > ${PLIST}.shared-dirs @${COMM} -1 -3 ${PLIST}.shared-dirs ${PLIST}.dirs | ${SORT} -r >> ${PLIST} -. endif +. endif . endif . if !target(do-install) Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Mon Sep 22 10:18:05 2014 (r368844) +++ head/Mk/bsd.port.mk Mon Sep 22 10:40:00 2014 (r368845) @@ -1749,7 +1749,9 @@ USE_LINUX= ${OVERRIDE_LINUX_BASE_PORT} LINUX_BASE_PORT= ${LINUXBASE}/bin/sh:${PORTSDIR}/emulators/linux_base-${USE_LINUX} . else . if ${USE_LINUX:tl} == "yes" +USE_LINUX= f10 # temporary default, set to c6 soon LINUX_BASE_PORT= ${LINUXBASE}/etc/fedora-release:${PORTSDIR}/emulators/linux_base-f10 +#LINUX_BASE_PORT= ${LINUXBASE}/etc/redhat-release:${PORTSDIR}/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 Modified: head/Mk/bsd.sites.mk ============================================================================== --- head/Mk/bsd.sites.mk Mon Sep 22 10:18:05 2014 (r368844) +++ head/Mk/bsd.sites.mk Mon Sep 22 10:40:00 2014 (r368845) @@ -250,6 +250,27 @@ MASTER_SITE_EXIM+= \ http://ftp.exim.llorien.org/exim/%SUBDIR% .endif +.if !defined(IGNORE_MASTER_SITE_CENTOS_LINUX) +MASTER_SITE_CENTOS_LINUX+= \ + http://mirror.centos.org/centos/6/os/i386/Packages/ \ + http://vault.centos.org/6.5/os/Source/SPackages/ \ + http://mirror.centos.org/%SUBDIR%/ \ + http://vault.centos.org/%SUBDIR%/ + +.endif + +.if !defined(IGNORE_MASTER_SITE_CENTOS_LINUX) +MASTER_SITE_CENTOS_LINUX_UPDATES+= \ + http://mirror.centos.org/centos/6/updates/i386/Packages/ \ + http://vault.centos.org/6.5/updates/Source/SPackages/ +.endif + +.if !defined(IGNORE_MASTER_SITE_EPEL) +MASTER_SITE_EPEL+= \ + http://dl.fedoraproject.org/pub/epel/6/i386/ \ + http://dl.fedoraproject.org/pub/epel/6/SRPMS/ +.endif + .if !defined(IGNORE_MASTER_SITE_FEDORA_LINUX) MASTER_SITE_FEDORA_LINUX+= \ http://archives.fedoraproject.org/pub/archive/fedora/linux/core/%SUBDIR%/ \ Modified: head/UPDATING ============================================================================== --- head/UPDATING Mon Sep 22 10:18:05 2014 (r368844) +++ head/UPDATING Mon Sep 22 10:40:00 2014 (r368845) @@ -5,6 +5,35 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20140922: + AFFECTS: users of emulators/linux_base-f10 and emulators/linux_base-c6 + AUTHOR: xmj@FreeBSD.org + + The complete drop-in replacement linux-c6 port infrastructure is in ports + and will shortly replace the current linux-f10- ports as default. + + To switch to the linux-c6 infrastructure you should: + + 0. Backup all your vital information! + 1. Remove the current linux base port and all linux-f10- ports. + 2. Add the following lines to /etc/make.conf: + OVERRIDE_LINUX_BASE_PORT=c6 + OVERRIDE_LINUX_NONBASE_PORTS=c6 + 3. Make sure no linux application is running. + 4. Set appropriate sysctl (compat.linux.osrelease=2.6.18). + 5. Install emulation/linux-c6. + + That should be enough in most circumstances. If you experience difficulties, + please be sure to expand step 1 to: + + 1a. Remove all ports which depend on linux base port. + 1b. Remove linux base port. + 1c. Clean /compat/linux/ directory. + + Should you encounter any other difficulties not fixed by these extended + steps, please submit an issue report in Bugzilla and send an email to FreeBSD's + emulation@ mailing list. + 20140909: AFFECTS: users seeing build errors about missing *.la files AUTHOR: tijl@FreeBSD.org Modified: head/accessibility/Makefile ============================================================================== --- head/accessibility/Makefile Mon Sep 22 10:18:05 2014 (r368844) +++ head/accessibility/Makefile Mon Sep 22 10:40:00 2014 (r368845) @@ -24,6 +24,7 @@ SUBDIR += kmag SUBDIR += kmousetool SUBDIR += kmouth + SUBDIR += linux-c6-atk SUBDIR += linux-f10-atk SUBDIR += mousetweaks SUBDIR += orca Added: head/accessibility/linux-c6-atk/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/accessibility/linux-c6-atk/Makefile Mon Sep 22 10:40:00 2014 (r368845) @@ -0,0 +1,23 @@ +# Created by: Artyom Mirgorodskiy +# $FreeBSD$ + +PORTNAME= atk +PORTVERSION= 1.30.0 +CATEGORIES= accessibility linux + +MAINTAINER= emulation@FreeBSD.org +COMMENT= Accessibility Toolkit, Linux/i386 binary (Linux CentOS ${LINUX_DIST_VER}) + +LICENSE= GPLv3 + +PKGNAMEPREFIX= linux-${USE_LINUX}- + +CONFLICTS= linux-atk-[0-9]* linux-f10-atk-[0-9]* + +ONLY_FOR_ARCHS= i386 amd64 +USE_LINUX= c6 +RPMVERSION= 1.el6 +USE_LINUX_RPM= yes +USE_LDCONFIG= yes + +.include Added: head/accessibility/linux-c6-atk/distinfo.i686 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/accessibility/linux-c6-atk/distinfo.i686 Mon Sep 22 10:40:00 2014 (r368845) @@ -0,0 +1,4 @@ +SHA256 (rpm/i686/centos/6.5/atk-1.30.0-1.el6.i686.rpm) = 1fb6cdc8bdeaab448dc07d6c326fe402e3170e7b4e9fff84de45c6fc9aeee216 +SIZE (rpm/i686/centos/6.5/atk-1.30.0-1.el6.i686.rpm) = 198868 +SHA256 (rpm/i686/centos/6.5/atk-1.30.0-1.el6.src.rpm) = fc87523ecb6cb944f9452a9da4385c73346acc3714ea494d3110245c4fbce12a +SIZE (rpm/i686/centos/6.5/atk-1.30.0-1.el6.src.rpm) = 758480 Added: head/accessibility/linux-c6-atk/pkg-descr ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/accessibility/linux-c6-atk/pkg-descr Mon Sep 22 10:40:00 2014 (r368845) @@ -0,0 +1,10 @@ +Accessibility Toolkit, Linux/i386 binary + +from the Web page: + + The ATK library provides a set of interfaces for accessibility. By + supporting the ATK interfaces, an application or toolkit can be + used with such tools as screen readers, magnifiers, and + alternative input devices. + +WWW: http://gtk.org Added: head/accessibility/linux-c6-atk/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/accessibility/linux-c6-atk/pkg-plist Mon Sep 22 10:40:00 2014 (r368845) @@ -0,0 +1,100 @@ +@comment file listing +usr/lib/libatk-1.0.so.0 +usr/lib/libatk-1.0.so.0.3009.1 +usr/share/doc/atk-1.30.0/AUTHORS +usr/share/doc/atk-1.30.0/COPYING +usr/share/doc/atk-1.30.0/NEWS +usr/share/doc/atk-1.30.0/README +usr/share/locale/af/LC_MESSAGES/atk10.mo +usr/share/locale/am/LC_MESSAGES/atk10.mo +usr/share/locale/ar/LC_MESSAGES/atk10.mo +usr/share/locale/as/LC_MESSAGES/atk10.mo +usr/share/locale/ast/LC_MESSAGES/atk10.mo +usr/share/locale/az/LC_MESSAGES/atk10.mo +usr/share/locale/be/LC_MESSAGES/atk10.mo +usr/share/locale/be@latin/LC_MESSAGES/atk10.mo +usr/share/locale/bg/LC_MESSAGES/atk10.mo +usr/share/locale/bn/LC_MESSAGES/atk10.mo +usr/share/locale/bn_IN/LC_MESSAGES/atk10.mo +usr/share/locale/bs/LC_MESSAGES/atk10.mo +usr/share/locale/ca/LC_MESSAGES/atk10.mo +usr/share/locale/ca@valencia/LC_MESSAGES/atk10.mo +usr/share/locale/cs/LC_MESSAGES/atk10.mo +usr/share/locale/cy/LC_MESSAGES/atk10.mo +usr/share/locale/da/LC_MESSAGES/atk10.mo +usr/share/locale/de/LC_MESSAGES/atk10.mo +usr/share/locale/dz/LC_MESSAGES/atk10.mo +usr/share/locale/el/LC_MESSAGES/atk10.mo +usr/share/locale/en_CA/LC_MESSAGES/atk10.mo +usr/share/locale/en@shaw/LC_MESSAGES/atk10.mo +usr/share/locale/en_GB/LC_MESSAGES/atk10.mo +usr/share/locale/eo/LC_MESSAGES/atk10.mo +usr/share/locale/es/LC_MESSAGES/atk10.mo +usr/share/locale/et/LC_MESSAGES/atk10.mo +usr/share/locale/eu/LC_MESSAGES/atk10.mo +usr/share/locale/fa/LC_MESSAGES/atk10.mo +usr/share/locale/fi/LC_MESSAGES/atk10.mo +usr/share/locale/fr/LC_MESSAGES/atk10.mo +usr/share/locale/ga/LC_MESSAGES/atk10.mo +usr/share/locale/gl/LC_MESSAGES/atk10.mo +usr/share/locale/gu/LC_MESSAGES/atk10.mo +usr/share/locale/he/LC_MESSAGES/atk10.mo +usr/share/locale/hi/LC_MESSAGES/atk10.mo +usr/share/locale/hr/LC_MESSAGES/atk10.mo +usr/share/locale/hu/LC_MESSAGES/atk10.mo +usr/share/locale/id/LC_MESSAGES/atk10.mo +usr/share/locale/is/LC_MESSAGES/atk10.mo +usr/share/locale/it/LC_MESSAGES/atk10.mo +usr/share/locale/ja/LC_MESSAGES/atk10.mo +usr/share/locale/ka/LC_MESSAGES/atk10.mo +usr/share/locale/kn/LC_MESSAGES/atk10.mo +usr/share/locale/ko/LC_MESSAGES/atk10.mo +usr/share/locale/ku/LC_MESSAGES/atk10.mo +usr/share/locale/li/LC_MESSAGES/atk10.mo +usr/share/locale/lt/LC_MESSAGES/atk10.mo +usr/share/locale/lv/LC_MESSAGES/atk10.mo +usr/share/locale/mai/LC_MESSAGES/atk10.mo +usr/share/locale/mk/LC_MESSAGES/atk10.mo +usr/share/locale/ml/LC_MESSAGES/atk10.mo +usr/share/locale/mn/LC_MESSAGES/atk10.mo +usr/share/locale/mr/LC_MESSAGES/atk10.mo +usr/share/locale/ms/LC_MESSAGES/atk10.mo +usr/share/locale/nb/LC_MESSAGES/atk10.mo +usr/share/locale/ne/LC_MESSAGES/atk10.mo +usr/share/locale/nl/LC_MESSAGES/atk10.mo +usr/share/locale/nn/LC_MESSAGES/atk10.mo +usr/share/locale/oc/LC_MESSAGES/atk10.mo +usr/share/locale/or/LC_MESSAGES/atk10.mo +usr/share/locale/pa/LC_MESSAGES/atk10.mo +usr/share/locale/pl/LC_MESSAGES/atk10.mo +usr/share/locale/ps/LC_MESSAGES/atk10.mo +usr/share/locale/pt/LC_MESSAGES/atk10.mo +usr/share/locale/pt_BR/LC_MESSAGES/atk10.mo +usr/share/locale/ro/LC_MESSAGES/atk10.mo +usr/share/locale/ru/LC_MESSAGES/atk10.mo +usr/share/locale/rw/LC_MESSAGES/atk10.mo +usr/share/locale/si/LC_MESSAGES/atk10.mo +usr/share/locale/sk/LC_MESSAGES/atk10.mo +usr/share/locale/sl/LC_MESSAGES/atk10.mo +usr/share/locale/sq/LC_MESSAGES/atk10.mo +usr/share/locale/sr/LC_MESSAGES/atk10.mo +usr/share/locale/sr@ije/LC_MESSAGES/atk10.mo +usr/share/locale/sr@latin/LC_MESSAGES/atk10.mo +usr/share/locale/sv/LC_MESSAGES/atk10.mo +usr/share/locale/ta/LC_MESSAGES/atk10.mo +usr/share/locale/te/LC_MESSAGES/atk10.mo +usr/share/locale/th/LC_MESSAGES/atk10.mo +usr/share/locale/tk/LC_MESSAGES/atk10.mo +usr/share/locale/tr/LC_MESSAGES/atk10.mo +usr/share/locale/tt/LC_MESSAGES/atk10.mo +usr/share/locale/ug/LC_MESSAGES/atk10.mo +usr/share/locale/uk/LC_MESSAGES/atk10.mo +usr/share/locale/vi/LC_MESSAGES/atk10.mo +usr/share/locale/wa/LC_MESSAGES/atk10.mo +usr/share/locale/xh/LC_MESSAGES/atk10.mo +usr/share/locale/yi/LC_MESSAGES/atk10.mo +usr/share/locale/zh_CN/LC_MESSAGES/atk10.mo +usr/share/locale/zh_HK/LC_MESSAGES/atk10.mo +usr/share/locale/zh_TW/LC_MESSAGES/atk10.mo +@comment non-empty directory listing in revers order +@dirrm usr/share/doc/atk-1.30.0 Modified: head/accessibility/linux-f10-atk/Makefile ============================================================================== --- head/accessibility/linux-f10-atk/Makefile Mon Sep 22 10:18:05 2014 (r368844) +++ head/accessibility/linux-f10-atk/Makefile Mon Sep 22 10:40:00 2014 (r368845) @@ -3,10 +3,9 @@ PORTNAME= atk PORTVERSION= 1.24.0 +PORTREVISION= 1 CATEGORIES= accessibility linux MASTER_SITES= CRITICAL/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER} -PKGNAMEPREFIX= linux-f10- -DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION} MAINTAINER= emulation@FreeBSD.org COMMENT= Accessibility Toolkit, Linux/i386 binary (Linux Fedora 10) @@ -14,8 +13,9 @@ COMMENT= Accessibility Toolkit, Linux/i3 CONFLICTS= linux-atk-[0-9]* linux-f8-atk-[0-9]* ONLY_FOR_ARCHS= i386 amd64 +USE_LINUX= f10 USE_LINUX_RPM= yes -LINUX_DIST_VER= 10 + RPMVERSION= 1.fc10 USE_LDCONFIG= yes Modified: head/archivers/linux-f10-ucl/Makefile ============================================================================== --- head/archivers/linux-f10-ucl/Makefile Mon Sep 22 10:18:05 2014 (r368844) +++ head/archivers/linux-f10-ucl/Makefile Mon Sep 22 10:40:00 2014 (r368845) @@ -5,16 +5,14 @@ PORTNAME= ucl PORTVERSION= 1.03 CATEGORIES= archivers linux MASTER_SITES= CRITICAL/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER} -PKGNAMEPREFIX= linux-f10- -DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION} 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 USE_LINUX_RPM= yes -LINUX_DIST_VER= 10 RPMVERSION= 8.fc9 USE_LDCONFIG= yes @@ -23,6 +21,4 @@ DOCSDIR= ${PREFIX}/usr/share/doc/${PORT PORTDOCS= COPYING NEWS README THANKS TODO DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr -OPTIONS_DEFINE= DOCS - .include Modified: head/archivers/linux-f10-upx/Makefile ============================================================================== --- head/archivers/linux-f10-upx/Makefile Mon Sep 22 10:18:05 2014 (r368844) +++ head/archivers/linux-f10-upx/Makefile Mon Sep 22 10:40:00 2014 (r368845) @@ -13,9 +13,9 @@ COMMENT= UPX, a high-performance execut CONFLICTS= linux-upx-[0-9]* linux-f8-upx-[0-9]* +USE_LINUX= f10 USE_LINUX_RPM= yes USE_LINUX_APPS= ucl -LINUX_DIST_VER= 10 RPMVERSION= 1.fc10 BRANDELF_FILES= usr/bin/upx @@ -25,6 +25,4 @@ PORTDOCS= BUGS COPYING LICENSE NEWS PRO THANKS TODO elf-to-mem.txt filter.txt loader.txt selinux.txt DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr -OPTIONS_DEFINE= DOCS - .include Modified: head/astro/google-earth/Makefile ============================================================================== --- head/astro/google-earth/Makefile Mon Sep 22 10:18:05 2014 (r368844) +++ head/astro/google-earth/Makefile Mon Sep 22 10:40:00 2014 (r368845) @@ -2,7 +2,7 @@ PORTNAME= google-earth PORTVERSION= 6.0.3.2197 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 3 CATEGORIES= astro deskutils geography MASTER_SITES= http://dl.google.com/earth/client/advanced/previous/:previous \ @@ -20,19 +20,24 @@ RESTRICTED= Not really sure about the re WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:C/\..*//g}/ +OPTIONS_DEFINE= NVIDIA + USE_LINUX= yes USE_LINUX_APPS= xorglibs curl USES= perl5 shared-mime-info desktop-file-utils USE_PERL5= patch build +#SUB_FILES= bin/googleearth .include +.include UNMAKESELF= ${LOCALBASE}/bin/unmakeself -.if defined(WITH_NVIDIA_GL) +.if ${PORT_OPTIONS:MNVIDIA} RUN_DEPENDS+= ${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver .else -USE_LINUX_APPS+= dri +USE_LINUX_APPS+= dri libpciaccess +LIBGL_ALWAYS_SOFTWARE=LIBGL_ALWAYS_SOFTWARE=yes .endif # Fixed by the first post-patch target line? Also, linprocfs needs to be mounted. *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***