- 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, 43 insertions, 46 deletions

diff --git a/security/linux-c6-libgpg-error/Makefile b/security/linux-c6-libgpg-error/Makefile
index f7696eeb43b5..5a2853f8cda3 100644
--- a/security/linux-c6-libgpg-error/Makefile
+++ b/security/linux-c6-libgpg-error/Makefile
@@ -3,17 +3,19 @@
 
 PORTNAME=	libgpg-error
 PORTVERSION=	1.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security linux
 
 MAINTAINER=	emulation@FreeBSD.org
-COMMENT=	Common error values for all GnuPG components
+COMMENT=	Common error values for all GnuPG components (Linux CentOS ${LINUX_DIST_VER})
 
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 RPMVERSION=	4.el6
 USES=		linux:c6
 USE_LDCONFIG=	yes
 USE_LINUX_RPM=	yes
 
-DESCR=		${.CURDIR}/../libgpg-error/pkg-descr
+OPTIONS_DEFINE=	DOCS NLS
+OPTIONS_SUB=	yes
 
 .include <bsd.port.mk>
diff --git a/security/linux-c6-libgpg-error/distinfo b/security/linux-c6-libgpg-error/distinfo
new file mode 100644
index 000000000000..6d80c8aaafb6
--- /dev/null
+++ b/security/linux-c6-libgpg-error/distinfo
@@ -0,0 +1,7 @@
+TIMESTAMP = 1485619629
+SHA256 (centos/libgpg-error-1.7-4.el6.i686.rpm) = ee1e0dfaa0e6bf4e06b1d6f1f3ce7da90abe8b1d1d46fe61bc1fe79e3227c4ad
+SIZE (centos/libgpg-error-1.7-4.el6.i686.rpm) = 60532
+SHA256 (centos/libgpg-error-1.7-4.el6.x86_64.rpm) = cb494b9932409f9b592d213b8cf8f3ef2ca9a7af16b9cdfcca7998e33a20674a
+SIZE (centos/libgpg-error-1.7-4.el6.x86_64.rpm) = 60628
+SHA256 (centos/libgpg-error-1.7-4.el6.src.rpm) = 955d0a4d5aaa3539c7a58d94cef41ef09a0d8cc08c0aeb5b0986c623aebd53be
+SIZE (centos/libgpg-error-1.7-4.el6.src.rpm) = 413579
diff --git a/security/linux-c6-libgpg-error/distinfo.i386 b/security/linux-c6-libgpg-error/distinfo.i386
deleted file mode 100644
index d743e202ed1b..000000000000
--- a/security/linux-c6-libgpg-error/distinfo.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1466256801
-SHA256 (rpm/i686/centos/6.8/libgpg-error-1.7-4.el6.i686.rpm) = ee1e0dfaa0e6bf4e06b1d6f1f3ce7da90abe8b1d1d46fe61bc1fe79e3227c4ad
-SIZE (rpm/i686/centos/6.8/libgpg-error-1.7-4.el6.i686.rpm) = 60532
-SHA256 (rpm/i686/centos/6.8/libgpg-error-1.7-4.el6.src.rpm) = 955d0a4d5aaa3539c7a58d94cef41ef09a0d8cc08c0aeb5b0986c623aebd53be
-SIZE (rpm/i686/centos/6.8/libgpg-error-1.7-4.el6.src.rpm) = 413579
diff --git a/security/linux-c6-libgpg-error/distinfo.x86_64 b/security/linux-c6-libgpg-error/distinfo.x86_64
deleted file mode 100644
index a6830ec4582c..000000000000
--- a/security/linux-c6-libgpg-error/distinfo.x86_64
+++ /dev/null
@@ -1,7 +0,0 @@
-TIMESTAMP = 1466257412
-SHA256 (rpm/x86_64/centos/6.8/libgpg-error-1.7-4.el6.x86_64.rpm) = cb494b9932409f9b592d213b8cf8f3ef2ca9a7af16b9cdfcca7998e33a20674a
-SIZE (rpm/x86_64/centos/6.8/libgpg-error-1.7-4.el6.x86_64.rpm) = 60628
-SHA256 (rpm/x86_64/centos/6.8/libgpg-error-1.7-4.el6.i686.rpm) = ee1e0dfaa0e6bf4e06b1d6f1f3ce7da90abe8b1d1d46fe61bc1fe79e3227c4ad
-SIZE (rpm/x86_64/centos/6.8/libgpg-error-1.7-4.el6.i686.rpm) = 60532
-SHA256 (rpm/x86_64/centos/6.8/libgpg-error-1.7-4.el6.src.rpm) = 955d0a4d5aaa3539c7a58d94cef41ef09a0d8cc08c0aeb5b0986c623aebd53be
-SIZE (rpm/x86_64/centos/6.8/libgpg-error-1.7-4.el6.src.rpm) = 413579
diff --git a/security/linux-c6-libgpg-error/pkg-plist.amd64 b/security/linux-c6-libgpg-error/pkg-plist.amd64
new file mode 100644
index 000000000000..610d9f698c6a
--- /dev/null
+++ b/security/linux-c6-libgpg-error/pkg-plist.amd64
@@ -0,0 +1,17 @@
+usr/bin/gpg-error
+usr/lib/libgpg-error.so.0
+usr/lib/libgpg-error.so.0.5.0
+usr/lib64/libgpg-error.so.0
+usr/lib64/libgpg-error.so.0.5.0
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/COPYING.LIB
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%NLS%%usr/share/locale/de/LC_MESSAGES/libgpg-error.mo
+%%NLS%%usr/share/locale/fr/LC_MESSAGES/libgpg-error.mo
+%%NLS%%usr/share/locale/pl/LC_MESSAGES/libgpg-error.mo
+%%NLS%%usr/share/locale/ro/LC_MESSAGES/libgpg-error.mo
+%%NLS%%usr/share/locale/sv/LC_MESSAGES/libgpg-error.mo
+%%NLS%%usr/share/locale/vi/LC_MESSAGES/libgpg-error.mo
diff --git a/security/linux-c6-libgpg-error/pkg-plist.i386 b/security/linux-c6-libgpg-error/pkg-plist.i386
index cb2f2977fd6c..01a51f3e11c5 100644
--- a/security/linux-c6-libgpg-error/pkg-plist.i386
+++ b/security/linux-c6-libgpg-error/pkg-plist.i386
@@ -1,15 +1,15 @@
-lib/libgpg-error.so.0
-lib/libgpg-error.so.0.5.0
 usr/bin/gpg-error
-usr/share/doc/libgpg-error-1.7/AUTHORS
-usr/share/doc/libgpg-error-1.7/COPYING
-usr/share/doc/libgpg-error-1.7/COPYING.LIB
-usr/share/doc/libgpg-error-1.7/ChangeLog
-usr/share/doc/libgpg-error-1.7/NEWS
-usr/share/doc/libgpg-error-1.7/README
-usr/share/locale/de/LC_MESSAGES/libgpg-error.mo
-usr/share/locale/fr/LC_MESSAGES/libgpg-error.mo
-usr/share/locale/pl/LC_MESSAGES/libgpg-error.mo
-usr/share/locale/ro/LC_MESSAGES/libgpg-error.mo
-usr/share/locale/sv/LC_MESSAGES/libgpg-error.mo
-usr/share/locale/vi/LC_MESSAGES/libgpg-error.mo
+usr/lib/libgpg-error.so.0
+usr/lib/libgpg-error.so.0.5.0
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/COPYING.LIB
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%NLS%%usr/share/locale/de/LC_MESSAGES/libgpg-error.mo
+%%NLS%%usr/share/locale/fr/LC_MESSAGES/libgpg-error.mo
+%%NLS%%usr/share/locale/pl/LC_MESSAGES/libgpg-error.mo
+%%NLS%%usr/share/locale/ro/LC_MESSAGES/libgpg-error.mo
+%%NLS%%usr/share/locale/sv/LC_MESSAGES/libgpg-error.mo
+%%NLS%%usr/share/locale/vi/LC_MESSAGES/libgpg-error.mo
diff --git a/security/linux-c6-libgpg-error/pkg-plist.x86_64 b/security/linux-c6-libgpg-error/pkg-plist.x86_64
deleted file mode 100644
index d2468c6449a5..000000000000
--- a/security/linux-c6-libgpg-error/pkg-plist.x86_64
+++ /dev/null
@@ -1,17 +0,0 @@
-lib/libgpg-error.so.0
-lib/libgpg-error.so.0.5.0
-lib64/libgpg-error.so.0
-lib64/libgpg-error.so.0.5.0
-usr/bin/gpg-error
-usr/share/doc/libgpg-error-1.7/AUTHORS
-usr/share/doc/libgpg-error-1.7/COPYING
-usr/share/doc/libgpg-error-1.7/COPYING.LIB
-usr/share/doc/libgpg-error-1.7/ChangeLog
-usr/share/doc/libgpg-error-1.7/NEWS
-usr/share/doc/libgpg-error-1.7/README
-usr/share/locale/de/LC_MESSAGES/libgpg-error.mo
-usr/share/locale/fr/LC_MESSAGES/libgpg-error.mo
-usr/share/locale/pl/LC_MESSAGES/libgpg-error.mo
-usr/share/locale/ro/LC_MESSAGES/libgpg-error.mo
-usr/share/locale/sv/LC_MESSAGES/libgpg-error.mo
-usr/share/locale/vi/LC_MESSAGES/libgpg-error.mo