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

7 files changed, 119 insertions, 20 deletions

diff --git a/x11-fonts/linux-f10-fontconfig/Makefile b/x11-fonts/linux-f10-fontconfig/Makefile
index 2be72b130f64..8070fa864f77 100644
--- a/x11-fonts/linux-f10-fontconfig/Makefile
+++ b/x11-fonts/linux-f10-fontconfig/Makefile
@@ -7,24 +7,48 @@
 
 PORTNAME=	fontconfig
 PORTVERSION=	2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-fonts linux
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	Linux/i386 binary of Fontconfig
 
+EXTRACT_DEPENDS=rpm2cpio:${PORTSDIR}/archivers/rpm
+BUILD_DEPENDS=	${LINUXBASE}/usr/lib/libexpat.so.0:${PORTSDIR}/textproc/linux-expat
+RUN_DEPENDS=	${BUILD_DEPENDS}
+
+USE_REINPLACE=	yes
 BASEVERSION=	9
 ONLY_FOR_ARCHS=	i386
 PLIST=		${WRKDIR}/plist
 RPM_SET=	fontconfig-2.1-9.i386.rpm
 
+#PKGINSTALL=	${WRKDIR}/pkg-install
+
+do-extract:
+	@${RM} -rf ${WRKSRC}/tmp
+	@${MKDIR} ${WRKSRC}/tmp
+	@cd ${WRKSRC}/tmp; \
+		rpm2cpio < ${DISTDIR}/${DIST_SUBDIR}/${RPM_SET} | cpio -id;
+
+post-patch:
+	@${REINPLACE_CMD} -i ""  -e 's:/usr/share/fonts:${X11BASE}/lib/X11/fonts:g ; \
+		s:/usr/X11R6/lib/X11/fonts/OTF:${X11BASE}/lib/X11/fonts/bitstream-vera:g' \
+		${WRKSRC}/tmp/etc/fonts/fonts.conf
+
 pre-install:
-	${RM} -rf ${WRKSRC}/tmp
-	${MKDIR} ${WRKSRC}/tmp
-	cd ${WRKSRC}/tmp; \
-		rpm2cpio < ${DISTDIR}/${DIST_SUBDIR}/${RPM_SET} | cpio -id; \
+	@cd ${WRKSRC}/tmp; \
 		${FIND} * -type f -o -type l > ${PLIST}; \
 		${FIND} -d * -type d | ${GREP} font | \
 		${SED} -e 's:^:@dirrm :' >> ${PLIST}
 
+post-install:
+	@${INSTALL_DATA} ${WRKSRC}/tmp/etc/fonts/fonts.conf ${PREFIX}/etc/fonts/
+	@${BRANDELF} -t Linux ${PREFIX}/usr/bin/fc-cache ${PREFIX}/usr/bin/fc-list
+#	@${SED} -e 's|%%PREFIX%%|${PREFIX}|g' < ${FILESDIR}/pkg-install.in \
+#		> ${PKGINSTALL}
+#.if !defined(PACKAGE_BUILDING)
+#	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+#.endif
+
 .include "../../x11-toolkits/linux-gtk/Makefile"
diff --git a/x11-fonts/linux-f10-fontconfig/files/pkg-install.in b/x11-fonts/linux-f10-fontconfig/files/pkg-install.in
new file mode 100644
index 000000000000..92023842a8c4
--- /dev/null
+++ b/x11-fonts/linux-f10-fontconfig/files/pkg-install.in
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+PATH=%%PREFIX%%/bin:%%PREFIX%%/sbin:%%PREFIX%%/usr/bin:%%PREFIX%%/usr/sbin:%%PREFIX%%/usr/X11R6/bin
+export PATH
+
+if [ "$2" = "POST-INSTALL" ]; then
+    echo "Running fc-cache to build fontconfig cache..."
+    %%PREFIX%%/usr/bin/fc-cache -f -v
+fi
diff --git a/x11-fonts/linux-f8-fontconfig/Makefile b/x11-fonts/linux-f8-fontconfig/Makefile
index 2be72b130f64..8070fa864f77 100644
--- a/x11-fonts/linux-f8-fontconfig/Makefile
+++ b/x11-fonts/linux-f8-fontconfig/Makefile
@@ -7,24 +7,48 @@
 
 PORTNAME=	fontconfig
 PORTVERSION=	2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-fonts linux
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	Linux/i386 binary of Fontconfig
 
+EXTRACT_DEPENDS=rpm2cpio:${PORTSDIR}/archivers/rpm
+BUILD_DEPENDS=	${LINUXBASE}/usr/lib/libexpat.so.0:${PORTSDIR}/textproc/linux-expat
+RUN_DEPENDS=	${BUILD_DEPENDS}
+
+USE_REINPLACE=	yes
 BASEVERSION=	9
 ONLY_FOR_ARCHS=	i386
 PLIST=		${WRKDIR}/plist
 RPM_SET=	fontconfig-2.1-9.i386.rpm
 
+#PKGINSTALL=	${WRKDIR}/pkg-install
+
+do-extract:
+	@${RM} -rf ${WRKSRC}/tmp
+	@${MKDIR} ${WRKSRC}/tmp
+	@cd ${WRKSRC}/tmp; \
+		rpm2cpio < ${DISTDIR}/${DIST_SUBDIR}/${RPM_SET} | cpio -id;
+
+post-patch:
+	@${REINPLACE_CMD} -i ""  -e 's:/usr/share/fonts:${X11BASE}/lib/X11/fonts:g ; \
+		s:/usr/X11R6/lib/X11/fonts/OTF:${X11BASE}/lib/X11/fonts/bitstream-vera:g' \
+		${WRKSRC}/tmp/etc/fonts/fonts.conf
+
 pre-install:
-	${RM} -rf ${WRKSRC}/tmp
-	${MKDIR} ${WRKSRC}/tmp
-	cd ${WRKSRC}/tmp; \
-		rpm2cpio < ${DISTDIR}/${DIST_SUBDIR}/${RPM_SET} | cpio -id; \
+	@cd ${WRKSRC}/tmp; \
 		${FIND} * -type f -o -type l > ${PLIST}; \
 		${FIND} -d * -type d | ${GREP} font | \
 		${SED} -e 's:^:@dirrm :' >> ${PLIST}
 
+post-install:
+	@${INSTALL_DATA} ${WRKSRC}/tmp/etc/fonts/fonts.conf ${PREFIX}/etc/fonts/
+	@${BRANDELF} -t Linux ${PREFIX}/usr/bin/fc-cache ${PREFIX}/usr/bin/fc-list
+#	@${SED} -e 's|%%PREFIX%%|${PREFIX}|g' < ${FILESDIR}/pkg-install.in \
+#		> ${PKGINSTALL}
+#.if !defined(PACKAGE_BUILDING)
+#	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+#.endif
+
 .include "../../x11-toolkits/linux-gtk/Makefile"
diff --git a/x11-fonts/linux-f8-fontconfig/files/pkg-install.in b/x11-fonts/linux-f8-fontconfig/files/pkg-install.in
new file mode 100644
index 000000000000..92023842a8c4
--- /dev/null
+++ b/x11-fonts/linux-f8-fontconfig/files/pkg-install.in
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+PATH=%%PREFIX%%/bin:%%PREFIX%%/sbin:%%PREFIX%%/usr/bin:%%PREFIX%%/usr/sbin:%%PREFIX%%/usr/X11R6/bin
+export PATH
+
+if [ "$2" = "POST-INSTALL" ]; then
+    echo "Running fc-cache to build fontconfig cache..."
+    %%PREFIX%%/usr/bin/fc-cache -f -v
+fi
diff --git a/x11-fonts/linux-fontconfig/Makefile b/x11-fonts/linux-fontconfig/Makefile
index 2be72b130f64..8070fa864f77 100644
--- a/x11-fonts/linux-fontconfig/Makefile
+++ b/x11-fonts/linux-fontconfig/Makefile
@@ -7,24 +7,48 @@
 
 PORTNAME=	fontconfig
 PORTVERSION=	2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-fonts linux
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	Linux/i386 binary of Fontconfig
 
+EXTRACT_DEPENDS=rpm2cpio:${PORTSDIR}/archivers/rpm
+BUILD_DEPENDS=	${LINUXBASE}/usr/lib/libexpat.so.0:${PORTSDIR}/textproc/linux-expat
+RUN_DEPENDS=	${BUILD_DEPENDS}
+
+USE_REINPLACE=	yes
 BASEVERSION=	9
 ONLY_FOR_ARCHS=	i386
 PLIST=		${WRKDIR}/plist
 RPM_SET=	fontconfig-2.1-9.i386.rpm
 
+#PKGINSTALL=	${WRKDIR}/pkg-install
+
+do-extract:
+	@${RM} -rf ${WRKSRC}/tmp
+	@${MKDIR} ${WRKSRC}/tmp
+	@cd ${WRKSRC}/tmp; \
+		rpm2cpio < ${DISTDIR}/${DIST_SUBDIR}/${RPM_SET} | cpio -id;
+
+post-patch:
+	@${REINPLACE_CMD} -i ""  -e 's:/usr/share/fonts:${X11BASE}/lib/X11/fonts:g ; \
+		s:/usr/X11R6/lib/X11/fonts/OTF:${X11BASE}/lib/X11/fonts/bitstream-vera:g' \
+		${WRKSRC}/tmp/etc/fonts/fonts.conf
+
 pre-install:
-	${RM} -rf ${WRKSRC}/tmp
-	${MKDIR} ${WRKSRC}/tmp
-	cd ${WRKSRC}/tmp; \
-		rpm2cpio < ${DISTDIR}/${DIST_SUBDIR}/${RPM_SET} | cpio -id; \
+	@cd ${WRKSRC}/tmp; \
 		${FIND} * -type f -o -type l > ${PLIST}; \
 		${FIND} -d * -type d | ${GREP} font | \
 		${SED} -e 's:^:@dirrm :' >> ${PLIST}
 
+post-install:
+	@${INSTALL_DATA} ${WRKSRC}/tmp/etc/fonts/fonts.conf ${PREFIX}/etc/fonts/
+	@${BRANDELF} -t Linux ${PREFIX}/usr/bin/fc-cache ${PREFIX}/usr/bin/fc-list
+#	@${SED} -e 's|%%PREFIX%%|${PREFIX}|g' < ${FILESDIR}/pkg-install.in \
+#		> ${PKGINSTALL}
+#.if !defined(PACKAGE_BUILDING)
+#	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+#.endif
+
 .include "../../x11-toolkits/linux-gtk/Makefile"
diff --git a/x11-fonts/linux-fontconfig/files/pkg-install.in b/x11-fonts/linux-fontconfig/files/pkg-install.in
new file mode 100644
index 000000000000..92023842a8c4
--- /dev/null
+++ b/x11-fonts/linux-fontconfig/files/pkg-install.in
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+PATH=%%PREFIX%%/bin:%%PREFIX%%/sbin:%%PREFIX%%/usr/bin:%%PREFIX%%/usr/sbin:%%PREFIX%%/usr/X11R6/bin
+export PATH
+
+if [ "$2" = "POST-INSTALL" ]; then
+    echo "Running fc-cache to build fontconfig cache..."
+    %%PREFIX%%/usr/bin/fc-cache -f -v
+fi
diff --git a/x11-fonts/linux-urw-fonts/Makefile b/x11-fonts/linux-urw-fonts/Makefile
index 1775ac7ef8e7..9e4912706bb3 100644
--- a/x11-fonts/linux-urw-fonts/Makefile
+++ b/x11-fonts/linux-urw-fonts/Makefile
@@ -7,10 +7,10 @@
 
 PORTNAME=		urw-fonts
 PORTVERSION=		2.0
-PORTREVISION=		1
+PORTREVISION=		2
 CATEGORIES=		x11-fonts linux
 
-MAINTAINER=	trevor@FreeBSD.org
+MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	Truetype fonts for use with Linux programs
 
 BASEVERSION=	9