- Autodetect the installed linux_base port and use LINUX_DEFAULT only as

  a last resort.
- Construct a list of DISTFILES for every architecture (amd64, i386).
  Select one list for regular make and all lists for make makesum so linux
  ports can have one combined distinfo file.
- Set DIST_SUBDIR?=centos so there's only one copy of common distfiles.
- Use MASTER_SITES and DISTFILES groups so make fetch is a bit smarter.
- Regenerate all distinfo files.
- For linux_base-c6 (just like linux_base-c7 already does) turn bin, lib,
  lib64 and sbin into symbolic links to the same directory under usr.
  This fixes the problem where some programs/libraries exist under / on
  FreeBSD and /usr on Linux or vice versa and then depending on the order
  of search paths Linux programs may run/load FreeBSD programs/libraries
  and fail.
- Turn usr/share/icons into a symbolic link to LOCALBASE/share/icons so
  Linux programs can find desktop theme icons.  This eliminates the need
  for x11-themes/linux*-hicolor-icon-theme.
- Rename pkg-plist.x86_64 to pkg-plist.amd64.
- Regenerate all pkg-plist files.
- Add @preexec to linux_base pkg-plist that moves existing files in bin,
  lib, lib64, sbin and icons to the new destination before the directories
  are turned into symbolic links.
- Remove several empty directories from linux_base ports.
- Sweep over all linux ports: use consistent style, remove old CONFLICTS,
  remove unused pkg-descr files, add NLS option,...
- Remove old linux arts, esound and openssl-compat ports.

9 files changed, 22 insertions, 51 deletions

diff --git a/x11-fonts/linux-c6-fontconfig/Makefile b/x11-fonts/linux-c6-fontconfig/Makefile
index e4dccafd66c0..85b50bf1a867 100644
--- a/x11-fonts/linux-c6-fontconfig/Makefile
+++ b/x11-fonts/linux-c6-fontconfig/Makefile
@@ -9,8 +9,6 @@ CATEGORIES=	x11-fonts linux
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	XML-based font configuration API for X Windows (Linux CentOS ${LINUX_DIST_VER})
 
-CONFLICTS=	linux-fontconfig-[0-9]* linux-f8-fontconfig-[0-9]* linux-f10-fontconfig-[0-9]*
-
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 RPMVERSION=	5.el6
 USES=		linux:c6
@@ -21,12 +19,12 @@ USE_LINUX_RPM=	yes
 # We will use some other configuration file, so delete a linux one
 # Don't let the linux fc-cache mess up the native cache file
 post-patch:
-		@${RM} -r ${WRKSRC}/etc ${WRKSRC}/usr/share/fonts ${WRKSRC}/var \
-			${WRKSRC}/usr/bin/fc-cache \
-			${WRKSRC}/usr/share/man/man1/fc-cache.1.gz
+	@${RM} -r ${WRKSRC}/etc ${WRKSRC}/usr/share/fonts ${WRKSRC}/var \
+		${WRKSRC}/usr/bin/fc-cache \
+		${WRKSRC}/usr/share/man/man1/fc-cache.1.gz
 
 post-install:
-		${MKDIR} ${STAGEDIR}${PREFIX}/etc
-		@${LN} -s ${LOCALBASE}/etc/fonts ${STAGEDIR}${PREFIX}/etc/
+	${MKDIR} ${STAGEDIR}${PREFIX}/etc
+	${LN} -s ${LOCALBASE}/etc/fonts ${STAGEDIR}${PREFIX}/etc/
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/linux-c6-fontconfig/distinfo b/x11-fonts/linux-c6-fontconfig/distinfo
new file mode 100644
index 000000000000..a3d6c9e2b4c9
--- /dev/null
+++ b/x11-fonts/linux-c6-fontconfig/distinfo
@@ -0,0 +1,7 @@
+TIMESTAMP = 1485624655
+SHA256 (centos/fontconfig-2.8.0-5.el6.i686.rpm) = 09cee79c086775d03e0219dc92d82f2803d6936bfe44f0c71f4ff7c33918d4f8
+SIZE (centos/fontconfig-2.8.0-5.el6.i686.rpm) = 190768
+SHA256 (centos/fontconfig-2.8.0-5.el6.x86_64.rpm) = 6a915b6e1ad740994aa9688d70a67ff2b6b72e0ced668794aeb27b2d0f2e237b
+SIZE (centos/fontconfig-2.8.0-5.el6.x86_64.rpm) = 189964
+SHA256 (centos/fontconfig-2.8.0-5.el6.src.rpm) = 8a737297dbb39f12c67f88db1b21b37ef97bed2ca00fa0975b16e264d6953a33
+SIZE (centos/fontconfig-2.8.0-5.el6.src.rpm) = 1565935
diff --git a/x11-fonts/linux-c6-fontconfig/distinfo.i386 b/x11-fonts/linux-c6-fontconfig/distinfo.i386
deleted file mode 100644
index bca56df6d8c6..000000000000
--- a/x11-fonts/linux-c6-fontconfig/distinfo.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1466256745
-SHA256 (rpm/i686/centos/6.8/fontconfig-2.8.0-5.el6.i686.rpm) = 09cee79c086775d03e0219dc92d82f2803d6936bfe44f0c71f4ff7c33918d4f8
-SIZE (rpm/i686/centos/6.8/fontconfig-2.8.0-5.el6.i686.rpm) = 190768
-SHA256 (rpm/i686/centos/6.8/fontconfig-2.8.0-5.el6.src.rpm) = 8a737297dbb39f12c67f88db1b21b37ef97bed2ca00fa0975b16e264d6953a33
-SIZE (rpm/i686/centos/6.8/fontconfig-2.8.0-5.el6.src.rpm) = 1565935
diff --git a/x11-fonts/linux-c6-fontconfig/distinfo.x86_64 b/x11-fonts/linux-c6-fontconfig/distinfo.x86_64
deleted file mode 100644
index 20fb3ae3616e..000000000000
--- a/x11-fonts/linux-c6-fontconfig/distinfo.x86_64
+++ /dev/null
@@ -1,7 +0,0 @@
-TIMESTAMP = 1466257251
-SHA256 (rpm/x86_64/centos/6.8/fontconfig-2.8.0-5.el6.x86_64.rpm) = 6a915b6e1ad740994aa9688d70a67ff2b6b72e0ced668794aeb27b2d0f2e237b
-SIZE (rpm/x86_64/centos/6.8/fontconfig-2.8.0-5.el6.x86_64.rpm) = 189964
-SHA256 (rpm/x86_64/centos/6.8/fontconfig-2.8.0-5.el6.i686.rpm) = 09cee79c086775d03e0219dc92d82f2803d6936bfe44f0c71f4ff7c33918d4f8
-SIZE (rpm/x86_64/centos/6.8/fontconfig-2.8.0-5.el6.i686.rpm) = 190768
-SHA256 (rpm/x86_64/centos/6.8/fontconfig-2.8.0-5.el6.src.rpm) = 8a737297dbb39f12c67f88db1b21b37ef97bed2ca00fa0975b16e264d6953a33
-SIZE (rpm/x86_64/centos/6.8/fontconfig-2.8.0-5.el6.src.rpm) = 1565935
diff --git a/x11-fonts/linux-c6-fontconfig/pkg-descr b/x11-fonts/linux-c6-fontconfig/pkg-descr
deleted file mode 100644
index 696a43b90512..000000000000
--- a/x11-fonts/linux-c6-fontconfig/pkg-descr
+++ /dev/null
@@ -1,22 +0,0 @@
-This is a Linux/i386 binary port of the Fontconfig library and utilities.
-
-In the words of its author, Keith Packard:
-
-   Fontconfig can:
-     * discover new fonts when installed automatically, removing a common
-       source of configuration problems.
-     * perform font name substitution, so that appropriate alternative
-       fonts can be selected if fonts are missing.
-     * identify the set of fonts required to completely cover a set of
-       languages.
-     * have GUI configuration tools built as it uses an XML-based
-       configuration file (though with autodiscovery, we believe this need
-       is minimized).
-     * efficiently and quickly find the fonts you need among the set of
-       fonts you have installed, even if you have installed thousands of
-       fonts, while minimzing memory usage.
-     * be used in concert with the X Render Extension and FreeType to
-       implement high quality, anti-aliased and subpixel rendered text on a
-       display.
-
-WWW: http://freedesktop.org/software/fontconfig
diff --git a/x11-fonts/linux-c6-fontconfig/pkg-plist.x86_64 b/x11-fonts/linux-c6-fontconfig/pkg-plist.amd64
index 8712667bd420..97bb8e12348d 100644
--- a/x11-fonts/linux-c6-fontconfig/pkg-plist.x86_64
+++ b/x11-fonts/linux-c6-fontconfig/pkg-plist.amd64
@@ -8,11 +8,11 @@ usr/lib/libfontconfig.so.1
 usr/lib/libfontconfig.so.1.4.4
 usr/lib64/libfontconfig.so.1
 usr/lib64/libfontconfig.so.1.4.4
-usr/share/doc/fontconfig-2.8.0/AUTHORS
-usr/share/doc/fontconfig-2.8.0/COPYING
-usr/share/doc/fontconfig-2.8.0/README
-usr/share/doc/fontconfig-2.8.0/fontconfig-user.html
-usr/share/doc/fontconfig-2.8.0/fontconfig-user.txt
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-user.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-user.txt
 usr/share/man/man1/fc-cat.1.gz
 usr/share/man/man1/fc-list.1.gz
 usr/share/man/man1/fc-match.1.gz
diff --git a/x11-fonts/linux-c6-fontconfig/pkg-plist.i386 b/x11-fonts/linux-c6-fontconfig/pkg-plist.i386
index b97d34790a39..73ed84405aa5 100644
--- a/x11-fonts/linux-c6-fontconfig/pkg-plist.i386
+++ b/x11-fonts/linux-c6-fontconfig/pkg-plist.i386
@@ -6,11 +6,11 @@ usr/bin/fc-query
 usr/bin/fc-scan
 usr/lib/libfontconfig.so.1
 usr/lib/libfontconfig.so.1.4.4
-usr/share/doc/fontconfig-2.8.0/AUTHORS
-usr/share/doc/fontconfig-2.8.0/COPYING
-usr/share/doc/fontconfig-2.8.0/README
-usr/share/doc/fontconfig-2.8.0/fontconfig-user.html
-usr/share/doc/fontconfig-2.8.0/fontconfig-user.txt
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-user.html
+%%PORTDOCS%%%%DOCSDIR%%/fontconfig-user.txt
 usr/share/man/man1/fc-cat.1.gz
 usr/share/man/man1/fc-list.1.gz
 usr/share/man/man1/fc-match.1.gz
diff --git a/x11-fonts/linux-c7-fontconfig/distinfo.x86_64 b/x11-fonts/linux-c7-fontconfig/distinfo
index e0002a10f2d7..e0002a10f2d7 100644
--- a/x11-fonts/linux-c7-fontconfig/distinfo.x86_64
+++ b/x11-fonts/linux-c7-fontconfig/distinfo
diff --git a/x11-fonts/linux-c7-fontconfig/pkg-plist.x86_64 b/x11-fonts/linux-c7-fontconfig/pkg-plist.amd64
index 223c75c84885..223c75c84885 100644
--- a/x11-fonts/linux-c7-fontconfig/pkg-plist.x86_64
+++ b/x11-fonts/linux-c7-fontconfig/pkg-plist.amd64