Say hello to the linux mega patch, it consolidates our linux bits a

little bit and allows to proceed to a more recent linux_base from
a stable (read as: the major bugs should be ironed out or identified
and most linux ports build just fine) source.

It also allows to ship 4.11 with a working linuxolator (the EOLed
linux_base is marked forbidden because of a security hole).

This is a major update, please read UPDATING (and CHANGES if you
develop linux ports).

Changes:
 - change the default linux_base from v7 to v8
 - add a newer freetype to linux_base-8 for nicer fonts display [1]
 - don't let cpio use hardlinks in the linux_base-8 port to quiet some
   warnings in some cases [2]
 - fix a cut&past error in the linux_base-8 pkg-install script [3]
 - convert the binary knob "USE_LINUX" to a version specifier, e.g.
   USE_LINUX=<value> specifies a dependency upon
   emulators/linux_base-<value>, exceptions are a value of "7" (which
   does what you want and adds a dependency to linux_base) and any
   value without a corresponding port in
   PORTSDIR/emulators/linux_base-<value> (which adds a dependency to
   the default linux_base)
 - don't implicitly add USE_LINUX with the USE_LINUX_PREFIX knob,
   this allows us to use the USE_LINUX_PREFIX knob for linux_base and
   paves the way for splitting up future linux base ports into
   individual pieces
 - remove RESTRICTED from some GPL licensed ports, even when we only
   distribute binaries, we get them from official linux sites, so
   anyone can grab them there if he needs to
 - add a dependency upon the linux X11 bits where necessary (based upon
   guesswork)
 - don't use USE_X_PREFIX in some linux ports since it adds a dependency
   to the FreeBSD X11 libs, as a workaround use PREFIX?= (the clean
   solution would be to remove the implicit USE_XLIB from USE_X_PREFIX)
 - bump the portrevision of the linux ports ("better safe than sorry"
   algorithm)
 - pass maintainership of the important linux infrastructure to a
   mailinglist, hijack freebsd-emulation@ for this purpose (if somebody
   doesn't like this: tell us your bikeshed color at freebsd-emulation@,
   my color would be "linuxolator@" in case someone cares...)
 - add a pkg-install script for linux-fontconfig, but don't use it;
   everything should work without it (the FreeBSD fc-cache program should
   do all the work), but in case we need it we just need to decomment the
   pkg-install part in the Makefile
 - fix some dependencies
 - fix some bugs
 - add some static plists
 - unbreak the ports with dependecies to more than one linux_base

This also fixes some ports which are marked BROKEN because of dependencies
to v7 and v8 of linux_base at the same time.

Known bugs:
 - the linux-mesa and linux-devtools ports install libGL*.so symlinks
 - some "minor" plist bugs (e.g. ld.so.{conf,cache} are modified by
   the linux X11 port, so linx_Base-8 moans at deinstall time)

Future work (interested souls should coordinate with freebsd-emulation@):
 - add some kind of USE_LINUX_X11 knob to streamline the X11 dependencies,
   or modify the behavior of USE_XLIB in the USE_LINUX case
   AFAIK trevor has some patches.
 - make USE_XLIB and USE_X_PREFIX orthogonal to be able to get rid of
   the PREFIX?= workaround in some linux ports
   Should be discussed/coordinated on/with x11@.
 - move the RPM bits from x11-toolkits/linux-gtk/Makefile to PORTSDIR/Mk/
 - update to a more recent linux base

PR:			69997, 70539 (and maybe others)
Discussed with/on:	java@, x11@, trevor, portmgr
Tested by:		mezz, portmgr, pointyhat
RPM hunted down by:	Joseph Gelinas <scirocco@tasam.com> [1]
Requested by:		portmgr [2]
Submitted by:		kris [3]
Approved by:		portmgr

2 files changed, 179 insertions, 25 deletions

diff --git a/x11-toolkits/linux-f10-gtk2/Makefile b/x11-toolkits/linux-f10-gtk2/Makefile
index 27275f32bd58..62f0ad8b73f0 100644
--- a/x11-toolkits/linux-f10-gtk2/Makefile
+++ b/x11-toolkits/linux-f10-gtk2/Makefile
@@ -10,42 +10,30 @@ PORTVERSION=	2.2.1
 PORTREVISION=	2
 CATEGORIES=	x11-toolkits linux
 
-MAINTAINER=	trevor@FreeBSD.org
-COMMENT=	GTK+ library, version 2.X, i386 Linux binary
+MAINTAINER=	freebsd-emulation@FreeBSD.org
+COMMENT=	GTK+ library, version 2.X, Linux binary
 
 # these libraries are required by gtk-query-immodules-2.0 or
 # gdk-pixbuf-query-loaders
-BUILD_DEPENDS=	${LINUXBASE}/usr/lib/libglib-2.0.so.0:${PORTSDIR}/devel/linux-glib2 \
+BUILD_DEPENDS+=	${LINUXBASE}/usr/lib/libglib-2.0.so.0:${PORTSDIR}/devel/linux-glib2 \
 		${LINUXBASE}/usr/lib/libatk-1.0.so.0:${PORTSDIR}/accessibility/linux-atk \
 		${LINUXBASE}/usr/lib/libjpeg.so.62:${PORTSDIR}/graphics/linux-jpeg \
-		${LINUXBASE}/usr/lib/libpng12.so.0:${PORTSDIR}/graphics/linux-png \
+		${LINUXBASE}/usr/lib/libpng12.so.0.1.2.7:${PORTSDIR}/graphics/linux-png \
 		${LINUXBASE}/usr/lib/libtiff.so.3.5:${PORTSDIR}/graphics/linux-tiff \
-		${LINUXBASE}/usr/lib/libpango-1.0.so.0:${PORTSDIR}/x11-toolkits/linux-pango
-RUN_DEPENDS=	${BUILD_DEPENDS}
+		${LINUXBASE}/usr/lib/libpango-1.0.so.0.200.1:${PORTSDIR}/x11-toolkits/linux-pango
+RUN_DEPENDS+=	${LINUXBASE}/usr/X11R6/lib/libX11.so.6:${PORTSDIR}/x11/linux-XFree86-libs \
+		${BUILD_DEPENDS}
 
 BASEVERSION=	9
 ONLY_FOR_ARCHS=	i386
-PLIST=		${WRKDIR}/plist
-RESTRICTED=	"binaries under GNU LGPL without accompanying source"
+PLIST=		${PKGDIR}/pkg-plist
 RPM_SET=	gtk2-2.2.1-4.i386.rpm
 
-pre-install:
-	${RM} -f ${PLIST}
-.for ii in gtk.immodules gdk-pixbuf.loaders
-	${ECHO_CMD} etc/gtk-2.0/${ii} >> ${PLIST}
-.endfor
-	${RM} -rf ${WRKSRC}/tmp
-	${MKDIR} ${WRKSRC}/tmp
-	cd ${WRKSRC}/tmp; \
-		rpm2cpio < ${DISTDIR}/${DIST_SUBDIR}/${RPM_SET} | ${CPIO} -id; \
-		${FIND} * -type f -o -type l >> ${PLIST}; \
-		${FIND} -d * -type d | ${GREP} -E 'gtk|themes' | \
-		${SED} -e 's:^:@dirrm :' >> ${PLIST}; \
-		${FIND} -d * -type d | ${GREP} locale | \
-		${SED} -e 's:^:@unexec rmdir %D/:;s:$$: 2>/dev/null || true:' >> ${PLIST}
-
 post-install:
-	${PREFIX}/usr/bin/gtk-query-immodules-2.0 > ${PREFIX}/etc/gtk-2.0/gtk.immodules
-	${PREFIX}/usr/bin/gdk-pixbuf-query-loaders > ${PREFIX}/etc/gtk-2.0/gdk-pixbuf.loaders
+.for ii in gdk-pixbuf-query-loaders gtk-demo gtk-query-immodules-2.0 testgtk testtext
+	@${BRANDELF} -t Linux ${PREFIX}/usr/bin/${ii}
+.endfor
+	@chroot ${PREFIX} /usr/bin/gtk-query-immodules-2.0 > ${PREFIX}/etc/gtk-2.0/gtk.immodules
+	@chroot ${PREFIX} /usr/bin/gdk-pixbuf-query-loaders > ${PREFIX}/etc/gtk-2.0/gdk-pixbuf.loaders
 
 .include "../linux-gtk/Makefile"
diff --git a/x11-toolkits/linux-f10-gtk2/pkg-plist b/x11-toolkits/linux-f10-gtk2/pkg-plist
new file mode 100644
index 000000000000..2ee863b4e630
--- /dev/null
+++ b/x11-toolkits/linux-f10-gtk2/pkg-plist
@@ -0,0 +1,166 @@
+etc/gtk-2.0/gtk.immodules
+etc/gtk-2.0/gdk-pixbuf.loaders
+usr/bin/gdk-pixbuf-query-loaders
+usr/bin/gtk-demo
+usr/bin/gtk-query-immodules-2.0
+usr/bin/testgtk
+usr/bin/testtext
+usr/lib/gtk-2.0/2.2.0/immodules/im-am-et.la
+usr/lib/gtk-2.0/2.2.0/immodules/im-am-et.so
+usr/lib/gtk-2.0/2.2.0/immodules/im-cyrillic-translit.la
+usr/lib/gtk-2.0/2.2.0/immodules/im-cyrillic-translit.so
+usr/lib/gtk-2.0/2.2.0/immodules/im-hangul.la
+usr/lib/gtk-2.0/2.2.0/immodules/im-hangul.so
+usr/lib/gtk-2.0/2.2.0/immodules/im-inuktitut.la
+usr/lib/gtk-2.0/2.2.0/immodules/im-inuktitut.so
+usr/lib/gtk-2.0/2.2.0/immodules/im-ipa.la
+usr/lib/gtk-2.0/2.2.0/immodules/im-ipa.so
+usr/lib/gtk-2.0/2.2.0/immodules/im-thai-broken.la
+usr/lib/gtk-2.0/2.2.0/immodules/im-thai-broken.so
+usr/lib/gtk-2.0/2.2.0/immodules/im-ti-er.la
+usr/lib/gtk-2.0/2.2.0/immodules/im-ti-er.so
+usr/lib/gtk-2.0/2.2.0/immodules/im-ti-et.la
+usr/lib/gtk-2.0/2.2.0/immodules/im-ti-et.so
+usr/lib/gtk-2.0/2.2.0/immodules/im-viqr.la
+usr/lib/gtk-2.0/2.2.0/immodules/im-viqr.so
+usr/lib/gtk-2.0/2.2.0/immodules/im-xim.la
+usr/lib/gtk-2.0/2.2.0/immodules/im-xim.so
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-ani.la
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-ani.so
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-bmp.la
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-bmp.so
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-gif.la
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-gif.so
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-ico.la
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-ico.so
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-jpeg.la
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-jpeg.so
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-png.la
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-png.so
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-pnm.la
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-pnm.so
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-ras.la
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-ras.so
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-tga.la
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-tga.so
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-tiff.la
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-tiff.so
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-wbmp.la
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-wbmp.so
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-xbm.la
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-xbm.so
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-xpm.la
+usr/lib/gtk-2.0/2.2.0/loaders/libpixbufloader-xpm.so
+usr/lib/libgdk-x11-2.0.so.0
+usr/lib/libgdk-x11-2.0.so.0.200.1
+usr/lib/libgdk_pixbuf-2.0.so.0
+usr/lib/libgdk_pixbuf-2.0.so.0.200.1
+usr/lib/libgdk_pixbuf_xlib-2.0.so.0
+usr/lib/libgdk_pixbuf_xlib-2.0.so.0.200.1
+usr/lib/libgtk-x11-2.0.so.0
+usr/lib/libgtk-x11-2.0.so.0.200.1
+usr/share/doc/gtk2-2.2.1/AUTHORS
+usr/share/doc/gtk2-2.2.1/COPYING
+usr/share/doc/gtk2-2.2.1/ChangeLog
+usr/share/doc/gtk2-2.2.1/NEWS
+usr/share/doc/gtk2-2.2.1/README
+usr/share/gtk-2.0/demo/alphatest.png
+usr/share/gtk-2.0/demo/apple-red.png
+usr/share/gtk-2.0/demo/appwindow.c
+usr/share/gtk-2.0/demo/background.jpg
+usr/share/gtk-2.0/demo/button_box.c
+usr/share/gtk-2.0/demo/changedisplay.c
+usr/share/gtk-2.0/demo/colorsel.c
+usr/share/gtk-2.0/demo/dialog.c
+usr/share/gtk-2.0/demo/drawingarea.c
+usr/share/gtk-2.0/demo/editable_cells.c
+usr/share/gtk-2.0/demo/floppybuddy.gif
+usr/share/gtk-2.0/demo/gnome-applets.png
+usr/share/gtk-2.0/demo/gnome-calendar.png
+usr/share/gtk-2.0/demo/gnome-foot.png
+usr/share/gtk-2.0/demo/gnome-gimp.png
+usr/share/gtk-2.0/demo/gnome-gmush.png
+usr/share/gtk-2.0/demo/gnome-gsame.png
+usr/share/gtk-2.0/demo/gnu-keys.png
+usr/share/gtk-2.0/demo/gtk-logo-rgb.gif
+usr/share/gtk-2.0/demo/images.c
+usr/share/gtk-2.0/demo/item_factory.c
+usr/share/gtk-2.0/demo/list_store.c
+usr/share/gtk-2.0/demo/menus.c
+usr/share/gtk-2.0/demo/panes.c
+usr/share/gtk-2.0/demo/pixbufs.c
+usr/share/gtk-2.0/demo/sizegroup.c
+usr/share/gtk-2.0/demo/stock_browser.c
+usr/share/gtk-2.0/demo/textview.c
+usr/share/gtk-2.0/demo/tree_store.c
+usr/share/locale/am/LC_MESSAGES/gtk20.mo
+usr/share/locale/az/LC_MESSAGES/gtk20.mo
+usr/share/locale/be/LC_MESSAGES/gtk20.mo
+usr/share/locale/bg/LC_MESSAGES/gtk20.mo
+usr/share/locale/ca/LC_MESSAGES/gtk20.mo
+usr/share/locale/cs/LC_MESSAGES/gtk20.mo
+usr/share/locale/cy/LC_MESSAGES/gtk20.mo
+usr/share/locale/da/LC_MESSAGES/gtk20.mo
+usr/share/locale/de/LC_MESSAGES/gtk20.mo
+usr/share/locale/el/LC_MESSAGES/gtk20.mo
+usr/share/locale/en@IPA/LC_MESSAGES/gtk20.mo
+usr/share/locale/en_GB/LC_MESSAGES/gtk20.mo
+usr/share/locale/es/LC_MESSAGES/gtk20.mo
+usr/share/locale/et/LC_MESSAGES/gtk20.mo
+usr/share/locale/eu/LC_MESSAGES/gtk20.mo
+usr/share/locale/fa/LC_MESSAGES/gtk20.mo
+usr/share/locale/fi/LC_MESSAGES/gtk20.mo
+usr/share/locale/fr/LC_MESSAGES/gtk20.mo
+usr/share/locale/ga/LC_MESSAGES/gtk20.mo
+usr/share/locale/gl/LC_MESSAGES/gtk20.mo
+usr/share/locale/he/LC_MESSAGES/gtk20.mo
+usr/share/locale/hi/LC_MESSAGES/gtk20.mo
+usr/share/locale/hr/LC_MESSAGES/gtk20.mo
+usr/share/locale/hu/LC_MESSAGES/gtk20.mo
+usr/share/locale/ia/LC_MESSAGES/gtk20.mo
+usr/share/locale/it/LC_MESSAGES/gtk20.mo
+usr/share/locale/ja/LC_MESSAGES/gtk20.mo
+usr/share/locale/ko/LC_MESSAGES/gtk20.mo
+usr/share/locale/lt/LC_MESSAGES/gtk20.mo
+usr/share/locale/lv/LC_MESSAGES/gtk20.mo
+usr/share/locale/mk/LC_MESSAGES/gtk20.mo
+usr/share/locale/mn/LC_MESSAGES/gtk20.mo
+usr/share/locale/ms/LC_MESSAGES/gtk20.mo
+usr/share/locale/nl/LC_MESSAGES/gtk20.mo
+usr/share/locale/nn/LC_MESSAGES/gtk20.mo
+usr/share/locale/no/LC_MESSAGES/gtk20.mo
+usr/share/locale/pl/LC_MESSAGES/gtk20.mo
+usr/share/locale/pt/LC_MESSAGES/gtk20.mo
+usr/share/locale/pt_BR/LC_MESSAGES/gtk20.mo
+usr/share/locale/ro/LC_MESSAGES/gtk20.mo
+usr/share/locale/ru/LC_MESSAGES/gtk20.mo
+usr/share/locale/sk/LC_MESSAGES/gtk20.mo
+usr/share/locale/sl/LC_MESSAGES/gtk20.mo
+usr/share/locale/sp/LC_MESSAGES/gtk20.mo
+usr/share/locale/sr/LC_MESSAGES/gtk20.mo
+usr/share/locale/sv/LC_MESSAGES/gtk20.mo
+usr/share/locale/ta/LC_MESSAGES/gtk20.mo
+usr/share/locale/tr/LC_MESSAGES/gtk20.mo
+usr/share/locale/uk/LC_MESSAGES/gtk20.mo
+usr/share/locale/vi/LC_MESSAGES/gtk20.mo
+usr/share/locale/wa/LC_MESSAGES/gtk20.mo
+usr/share/locale/zh_CN/LC_MESSAGES/gtk20.mo
+usr/share/locale/zh_TW/LC_MESSAGES/gtk20.mo
+usr/share/themes/Default/gtk-2.0-key/gtkrc
+usr/share/themes/Emacs/gtk-2.0-key/gtkrc
+usr/share/themes/Raleigh/gtk-2.0/gtkrc
+@dirrm etc/gtk-2.0
+@dirrm usr/lib/gtk-2.0/2.2.0/immodules
+@dirrm usr/lib/gtk-2.0/2.2.0/loaders
+@dirrm usr/lib/gtk-2.0/2.2.0
+@dirrm usr/lib/gtk-2.0
+@dirrm usr/share/doc/gtk2-2.2.1
+@dirrm usr/share/gtk-2.0/demo
+@dirrm usr/share/gtk-2.0
+@dirrm usr/share/themes/Default/gtk-2.0-key
+@dirrm usr/share/themes/Default
+@dirrm usr/share/themes/Emacs/gtk-2.0-key
+@dirrm usr/share/themes/Emacs
+@dirrm usr/share/themes/Raleigh/gtk-2.0
+@dirrm usr/share/themes/Raleigh
+@dirrm usr/share/themes