- 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, 23 insertions, 23 deletions

diff --git a/security/linux-c6-libssh2/Makefile b/security/linux-c6-libssh2/Makefile
index a56ce73a6d4a..0b33b4fe59c5 100644
--- a/security/linux-c6-libssh2/Makefile
+++ b/security/linux-c6-libssh2/Makefile
@@ -9,16 +9,11 @@ CATEGORIES=	security linux
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Library implementing the SSH2 protocol (Linux CentOS ${LINUX_DIST_VER})
 
-CONFLICTS=	linux-f10-libssh2-[0-9]*
-
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 RPMVERSION=	2.el6_7.1
 USES=		linux:c6
+USE_LDCONFIG=	yes
 USE_LINUX=	openssl
-
 USE_LINUX_RPM=	yes
-USE_LDCONFIG=	yes
-
-PORTDOCS=	AUTHORS COPYING ChangeLog NEWS README
-DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 
 .include <bsd.port.mk>
diff --git a/security/linux-c6-libssh2/distinfo b/security/linux-c6-libssh2/distinfo
new file mode 100644
index 000000000000..aa642b99f92c
--- /dev/null
+++ b/security/linux-c6-libssh2/distinfo
@@ -0,0 +1,7 @@
+TIMESTAMP = 1485619857
+SHA256 (centos/libssh2-1.4.2-2.el6_7.1.i686.rpm) = 3dd5f11872a5254b65711f88a89b4400c87329ed185af7d69d1d705f94abe13d
+SIZE (centos/libssh2-1.4.2-2.el6_7.1.i686.rpm) = 127152
+SHA256 (centos/libssh2-1.4.2-2.el6_7.1.x86_64.rpm) = 729dc417c94e9efbe67f10fe848ce3571945f054bd87fec428179b58dd09bef6
+SIZE (centos/libssh2-1.4.2-2.el6_7.1.x86_64.rpm) = 125760
+SHA256 (centos/libssh2-1.4.2-2.el6_7.1.src.rpm) = 042b1f294e214d514f5b16332956e168cc168c90a416bcfe4bbc1625636581fc
+SIZE (centos/libssh2-1.4.2-2.el6_7.1.src.rpm) = 694227
diff --git a/security/linux-c6-libssh2/distinfo.i386 b/security/linux-c6-libssh2/distinfo.i386
deleted file mode 100644
index 9d2175b7262a..000000000000
--- a/security/linux-c6-libssh2/distinfo.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1466256783
-SHA256 (rpm/i686/centos/6.8/libssh2-1.4.2-2.el6_7.1.i686.rpm) = 3dd5f11872a5254b65711f88a89b4400c87329ed185af7d69d1d705f94abe13d
-SIZE (rpm/i686/centos/6.8/libssh2-1.4.2-2.el6_7.1.i686.rpm) = 127152
-SHA256 (rpm/i686/centos/6.8/libssh2-1.4.2-2.el6_7.1.src.rpm) = 042b1f294e214d514f5b16332956e168cc168c90a416bcfe4bbc1625636581fc
-SIZE (rpm/i686/centos/6.8/libssh2-1.4.2-2.el6_7.1.src.rpm) = 694227
diff --git a/security/linux-c6-libssh2/distinfo.x86_64 b/security/linux-c6-libssh2/distinfo.x86_64
deleted file mode 100644
index a9e6b98831e0..000000000000
--- a/security/linux-c6-libssh2/distinfo.x86_64
+++ /dev/null
@@ -1,7 +0,0 @@
-TIMESTAMP = 1466257356
-SHA256 (rpm/x86_64/centos/6.8/libssh2-1.4.2-2.el6_7.1.x86_64.rpm) = 729dc417c94e9efbe67f10fe848ce3571945f054bd87fec428179b58dd09bef6
-SIZE (rpm/x86_64/centos/6.8/libssh2-1.4.2-2.el6_7.1.x86_64.rpm) = 125760
-SHA256 (rpm/x86_64/centos/6.8/libssh2-1.4.2-2.el6_7.1.i686.rpm) = 3dd5f11872a5254b65711f88a89b4400c87329ed185af7d69d1d705f94abe13d
-SIZE (rpm/x86_64/centos/6.8/libssh2-1.4.2-2.el6_7.1.i686.rpm) = 127152
-SHA256 (rpm/x86_64/centos/6.8/libssh2-1.4.2-2.el6_7.1.src.rpm) = 042b1f294e214d514f5b16332956e168cc168c90a416bcfe4bbc1625636581fc
-SIZE (rpm/x86_64/centos/6.8/libssh2-1.4.2-2.el6_7.1.src.rpm) = 694227
diff --git a/security/linux-c6-libssh2/pkg-plist.amd64 b/security/linux-c6-libssh2/pkg-plist.amd64
new file mode 100644
index 000000000000..64a98107e465
--- /dev/null
+++ b/security/linux-c6-libssh2/pkg-plist.amd64
@@ -0,0 +1,9 @@
+usr/lib/libssh2.so.1
+usr/lib/libssh2.so.1.0.1
+usr/lib64/libssh2.so.1
+usr/lib64/libssh2.so.1.0.1
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
diff --git a/security/linux-c6-libssh2/pkg-plist.i386 b/security/linux-c6-libssh2/pkg-plist.i386
index 108739ce7acf..0b3c598270bd 100644
--- a/security/linux-c6-libssh2/pkg-plist.i386
+++ b/security/linux-c6-libssh2/pkg-plist.i386
@@ -1,2 +1,7 @@
 usr/lib/libssh2.so.1
 usr/lib/libssh2.so.1.0.1
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
diff --git a/security/linux-c6-libssh2/pkg-plist.x86_64 b/security/linux-c6-libssh2/pkg-plist.x86_64
deleted file mode 100644
index 15c8cac04181..000000000000
--- a/security/linux-c6-libssh2/pkg-plist.x86_64
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/lib/libssh2.so.1
-usr/lib/libssh2.so.1.0.1
-usr/lib64/libssh2.so.1
-usr/lib64/libssh2.so.1.0.1