- 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.

7 files changed, 28 insertions, 27 deletions

diff --git a/devel/linux-c6-libsigc++20/Makefile b/devel/linux-c6-libsigc++20/Makefile
index c219309ecb44..d9152e7734b1 100644
--- a/devel/linux-c6-libsigc++20/Makefile
+++ b/devel/linux-c6-libsigc++20/Makefile
@@ -7,17 +7,12 @@ PORTREVISION=	2
 CATEGORIES=	devel linux
 
 MAINTAINER=	emulation@FreeBSD.org
-COMMENT=	Callback Framework for C++(Linux CentOS ${LINUX_DIST_VER})
-
-CONFLICTS=	linux-f10-libsigc++20-[0-9]*
-
-USES=		linux:c6
-USE_LINUX_RPM=	yes
+COMMENT=	Callback Framework for C++ (Linux CentOS ${LINUX_DIST_VER})
 
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 RPMVERSION=	1.el6
+USES=		linux:c6
 USE_LDCONFIG=	yes
-
-PORTDOCS=	AUTHORS COPYING ChangeLog NEWS README TODO
-DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
+USE_LINUX_RPM=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/linux-c6-libsigc++20/distinfo b/devel/linux-c6-libsigc++20/distinfo
new file mode 100644
index 000000000000..4fa0991447fd
--- /dev/null
+++ b/devel/linux-c6-libsigc++20/distinfo
@@ -0,0 +1,7 @@
+TIMESTAMP = 1485515690
+SHA256 (centos/libsigc++20-2.2.4.2-1.el6.i686.rpm) = e3f3df0720d297c35f87e008de6d40de4329fb17aac2cd047c52783ec3bac05e
+SIZE (centos/libsigc++20-2.2.4.2-1.el6.i686.rpm) = 54644
+SHA256 (centos/libsigc++20-2.2.4.2-1.el6.x86_64.rpm) = 1893a6fbcf6c504d2165e069fec27080251d086c7977cc9e2bb064a01e31c839
+SIZE (centos/libsigc++20-2.2.4.2-1.el6.x86_64.rpm) = 54236
+SHA256 (centos/libsigc++20-2.2.4.2-1.el6.src.rpm) = 1dd742ac7a01cadcc87ae64bd5b1fd5ba1f7c2ac8fee629ffe6c66583884342a
+SIZE (centos/libsigc++20-2.2.4.2-1.el6.src.rpm) = 3604821
diff --git a/devel/linux-c6-libsigc++20/distinfo.i386 b/devel/linux-c6-libsigc++20/distinfo.i386
deleted file mode 100644
index 31a0909e8537..000000000000
--- a/devel/linux-c6-libsigc++20/distinfo.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1466256712
-SHA256 (rpm/i686/centos/6.8/libsigc++20-2.2.4.2-1.el6.i686.rpm) = e3f3df0720d297c35f87e008de6d40de4329fb17aac2cd047c52783ec3bac05e
-SIZE (rpm/i686/centos/6.8/libsigc++20-2.2.4.2-1.el6.i686.rpm) = 54644
-SHA256 (rpm/i686/centos/6.8/libsigc++20-2.2.4.2-1.el6.src.rpm) = 1dd742ac7a01cadcc87ae64bd5b1fd5ba1f7c2ac8fee629ffe6c66583884342a
-SIZE (rpm/i686/centos/6.8/libsigc++20-2.2.4.2-1.el6.src.rpm) = 3604821
diff --git a/devel/linux-c6-libsigc++20/distinfo.x86_64 b/devel/linux-c6-libsigc++20/distinfo.x86_64
deleted file mode 100644
index c13273e48831..000000000000
--- a/devel/linux-c6-libsigc++20/distinfo.x86_64
+++ /dev/null
@@ -1,7 +0,0 @@
-TIMESTAMP = 1466257030
-SHA256 (rpm/x86_64/centos/6.8/libsigc++20-2.2.4.2-1.el6.x86_64.rpm) = 1893a6fbcf6c504d2165e069fec27080251d086c7977cc9e2bb064a01e31c839
-SIZE (rpm/x86_64/centos/6.8/libsigc++20-2.2.4.2-1.el6.x86_64.rpm) = 54236
-SHA256 (rpm/x86_64/centos/6.8/libsigc++20-2.2.4.2-1.el6.i686.rpm) = e3f3df0720d297c35f87e008de6d40de4329fb17aac2cd047c52783ec3bac05e
-SIZE (rpm/x86_64/centos/6.8/libsigc++20-2.2.4.2-1.el6.i686.rpm) = 54644
-SHA256 (rpm/x86_64/centos/6.8/libsigc++20-2.2.4.2-1.el6.src.rpm) = 1dd742ac7a01cadcc87ae64bd5b1fd5ba1f7c2ac8fee629ffe6c66583884342a
-SIZE (rpm/x86_64/centos/6.8/libsigc++20-2.2.4.2-1.el6.src.rpm) = 3604821
diff --git a/devel/linux-c6-libsigc++20/pkg-plist.amd64 b/devel/linux-c6-libsigc++20/pkg-plist.amd64
new file mode 100644
index 000000000000..c1a44bdb4a1d
--- /dev/null
+++ b/devel/linux-c6-libsigc++20/pkg-plist.amd64
@@ -0,0 +1,10 @@
+usr/lib/libsigc-2.0.so.0
+usr/lib/libsigc-2.0.so.0.0.0
+usr/lib64/libsigc-2.0.so.0
+usr/lib64/libsigc-2.0.so.0.0.0
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
diff --git a/devel/linux-c6-libsigc++20/pkg-plist.i386 b/devel/linux-c6-libsigc++20/pkg-plist.i386
index 687e04f92ab8..722e0895c9b1 100644
--- a/devel/linux-c6-libsigc++20/pkg-plist.i386
+++ b/devel/linux-c6-libsigc++20/pkg-plist.i386
@@ -1,2 +1,8 @@
-usr/lib/libsigc-2.0.so.0.0.0
 usr/lib/libsigc-2.0.so.0
+usr/lib/libsigc-2.0.so.0.0.0
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
diff --git a/devel/linux-c6-libsigc++20/pkg-plist.x86_64 b/devel/linux-c6-libsigc++20/pkg-plist.x86_64
deleted file mode 100644
index 3757f7c942a1..000000000000
--- a/devel/linux-c6-libsigc++20/pkg-plist.x86_64
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/lib/libsigc-2.0.so.0.0.0
-usr/lib/libsigc-2.0.so.0
-usr/lib64/libsigc-2.0.so.0.0.0
-usr/lib64/libsigc-2.0.so.0
-