- 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, 27 insertions, 29 deletions

diff --git a/security/linux-c6-libgcrypt/Makefile b/security/linux-c6-libgcrypt/Makefile
index 35ee808a439a..152f795539e9 100644
--- a/security/linux-c6-libgcrypt/Makefile
+++ b/security/linux-c6-libgcrypt/Makefile
@@ -3,21 +3,16 @@
 
 PORTNAME=	libgcrypt
 PORTVERSION=	1.4.5
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	security linux
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	General purpose crypto library based on code used in GnuPG (Linux CentOS ${LINUX_DIST_VER})
 
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 RPMVERSION=	12.el6_8
 USES=		linux:c6
 USE_LDCONFIG=	yes
 USE_LINUX_RPM=	yes
 
-PORTDOCS=	AUTHORS COPYING.LIB NEWS THANKS
-DESCR=		${.CURDIR}/../libgcrypt/pkg-descr
-
-post-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/gcrypt
-
 .include <bsd.port.mk>
diff --git a/security/linux-c6-libgcrypt/distinfo b/security/linux-c6-libgcrypt/distinfo
new file mode 100644
index 000000000000..59d3de4929a3
--- /dev/null
+++ b/security/linux-c6-libgcrypt/distinfo
@@ -0,0 +1,7 @@
+TIMESTAMP = 1485619407
+SHA256 (centos/libgcrypt-1.4.5-12.el6_8.i686.rpm) = 12f569a66c65aedcf6899fdc85fd4a7ece9179735863e8863c3819b03b901faf
+SIZE (centos/libgcrypt-1.4.5-12.el6_8.i686.rpm) = 233772
+SHA256 (centos/libgcrypt-1.4.5-12.el6_8.x86_64.rpm) = 81c29e7ec131ff3f1e867679b355228ebf9c10a57a680c40766a118a71d7ba71
+SIZE (centos/libgcrypt-1.4.5-12.el6_8.x86_64.rpm) = 234088
+SHA256 (centos/libgcrypt-1.4.5-12.el6_8.src.rpm) = e7510256aa30561185faf8b9e6881f714a19d18ee39f0a39a949d28a97d83114
+SIZE (centos/libgcrypt-1.4.5-12.el6_8.src.rpm) = 1259217
diff --git a/security/linux-c6-libgcrypt/distinfo.i386 b/security/linux-c6-libgcrypt/distinfo.i386
deleted file mode 100644
index 45281559da5b..000000000000
--- a/security/linux-c6-libgcrypt/distinfo.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1478991104
-SHA256 (rpm/i686/centos/6.8/libgcrypt-1.4.5-12.el6_8.i686.rpm) = 12f569a66c65aedcf6899fdc85fd4a7ece9179735863e8863c3819b03b901faf
-SIZE (rpm/i686/centos/6.8/libgcrypt-1.4.5-12.el6_8.i686.rpm) = 233772
-SHA256 (rpm/i686/centos/6.8/libgcrypt-1.4.5-12.el6_8.src.rpm) = e7510256aa30561185faf8b9e6881f714a19d18ee39f0a39a949d28a97d83114
-SIZE (rpm/i686/centos/6.8/libgcrypt-1.4.5-12.el6_8.src.rpm) = 1259217
diff --git a/security/linux-c6-libgcrypt/distinfo.x86_64 b/security/linux-c6-libgcrypt/distinfo.x86_64
deleted file mode 100644
index ed77b5029d91..000000000000
--- a/security/linux-c6-libgcrypt/distinfo.x86_64
+++ /dev/null
@@ -1,7 +0,0 @@
-TIMESTAMP = 1478992169
-SHA256 (rpm/x86_64/centos/6.8/libgcrypt-1.4.5-12.el6_8.i686.rpm) = 12f569a66c65aedcf6899fdc85fd4a7ece9179735863e8863c3819b03b901faf
-SIZE (rpm/x86_64/centos/6.8/libgcrypt-1.4.5-12.el6_8.i686.rpm) = 233772
-SHA256 (rpm/x86_64/centos/6.8/libgcrypt-1.4.5-12.el6_8.x86_64.rpm) = 81c29e7ec131ff3f1e867679b355228ebf9c10a57a680c40766a118a71d7ba71
-SIZE (rpm/x86_64/centos/6.8/libgcrypt-1.4.5-12.el6_8.x86_64.rpm) = 234088
-SHA256 (rpm/x86_64/centos/6.8/libgcrypt-1.4.5-12.el6_8.src.rpm) = e7510256aa30561185faf8b9e6881f714a19d18ee39f0a39a949d28a97d83114
-SIZE (rpm/x86_64/centos/6.8/libgcrypt-1.4.5-12.el6_8.src.rpm) = 1259217
diff --git a/security/linux-c6-libgcrypt/pkg-plist.amd64 b/security/linux-c6-libgcrypt/pkg-plist.amd64
new file mode 100644
index 000000000000..83bc984598fd
--- /dev/null
+++ b/security/linux-c6-libgcrypt/pkg-plist.amd64
@@ -0,0 +1,11 @@
+usr/lib/.libgcrypt.so.11.hmac
+usr/lib/libgcrypt.so.11
+usr/lib/libgcrypt.so.11.5.3
+usr/lib64/.libgcrypt.so.11.hmac
+usr/lib64/libgcrypt.so.11
+usr/lib64/libgcrypt.so.11.5.3
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING.LIB
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/THANKS
+@dir etc/gcrypt
diff --git a/security/linux-c6-libgcrypt/pkg-plist.i386 b/security/linux-c6-libgcrypt/pkg-plist.i386
index 82854eea1c93..41b2980a9caa 100644
--- a/security/linux-c6-libgcrypt/pkg-plist.i386
+++ b/security/linux-c6-libgcrypt/pkg-plist.i386
@@ -1,4 +1,8 @@
-lib/.libgcrypt.so.11.hmac
-lib/libgcrypt.so.11
-lib/libgcrypt.so.11.5.3
+usr/lib/.libgcrypt.so.11.hmac
+usr/lib/libgcrypt.so.11
+usr/lib/libgcrypt.so.11.5.3
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING.LIB
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/THANKS
 @dir etc/gcrypt
diff --git a/security/linux-c6-libgcrypt/pkg-plist.x86_64 b/security/linux-c6-libgcrypt/pkg-plist.x86_64
deleted file mode 100644
index 4f7a0dcdbc53..000000000000
--- a/security/linux-c6-libgcrypt/pkg-plist.x86_64
+++ /dev/null
@@ -1,7 +0,0 @@
-lib/.libgcrypt.so.11.hmac
-lib/libgcrypt.so.11
-lib/libgcrypt.so.11.5.3
-lib64/.libgcrypt.so.11.hmac
-lib64/libgcrypt.so.11
-lib64/libgcrypt.so.11.5.3
-@dir etc/gcrypt