- 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, 37 insertions, 42 deletions

diff --git a/net/linux-c6-tcp_wrappers-libs/Makefile b/net/linux-c6-tcp_wrappers-libs/Makefile
index 4d4cf40bec4e..670d083c5e7a 100644
--- a/net/linux-c6-tcp_wrappers-libs/Makefile
+++ b/net/linux-c6-tcp_wrappers-libs/Makefile
@@ -1,22 +1,22 @@
 # Created by: Johannes Meixner <johannes@perceivon.net>
 # $FreeBSD$
 
-PORTNAME=	tcp_wrappers-libs
+PORTNAME=	tcp_wrappers
 PORTVERSION=	7.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net linux
+PKGNAMESUFFIX=	-libs
+LIB_DISTNAMES=	${LINUXNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Libraries tcp wrappers (Linux CentOS ${LINUX_DIST_VER})
 
+DOCSDIR=	${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION}
+LINUXNAME=	${PORTNAME}${PKGNAMESUFFIX}
 RPMVERSION=	58.el6
 USES=		linux:c6
 USE_LDCONFIG=	yes
 USE_LINUX=	xorglibs
 USE_LINUX_RPM=	yes
 
-DOCSDIR=	${PREFIX}/usr/share/doc/tcp_wrappers-${PORTVERSION}
-
-SRC_DISTFILES=	tcp_wrappers-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}:SOURCE
-
 .include <bsd.port.mk>
diff --git a/net/linux-c6-tcp_wrappers-libs/distinfo b/net/linux-c6-tcp_wrappers-libs/distinfo
new file mode 100644
index 000000000000..4f293c49c8db
--- /dev/null
+++ b/net/linux-c6-tcp_wrappers-libs/distinfo
@@ -0,0 +1,7 @@
+TIMESTAMP = 1485616094
+SHA256 (centos/tcp_wrappers-libs-7.6-58.el6.i686.rpm) = 102df2b5ecd127c1b1f494298990c78cb0d2f27454e9a9a5c81d643024475efc
+SIZE (centos/tcp_wrappers-libs-7.6-58.el6.i686.rpm) = 63536
+SHA256 (centos/tcp_wrappers-libs-7.6-58.el6.x86_64.rpm) = 55f21f483ee7d6f8ce6a0ce4c8c33efd10f6ec237d73a9ad7ee146cd8b2cd7c6
+SIZE (centos/tcp_wrappers-libs-7.6-58.el6.x86_64.rpm) = 63656
+SHA256 (centos/tcp_wrappers-7.6-58.el6.src.rpm) = cac2777dc02508ace6b3f0e158ac5c5ec46af57060740ce249cf035362eea3d0
+SIZE (centos/tcp_wrappers-7.6-58.el6.src.rpm) = 142101
diff --git a/net/linux-c6-tcp_wrappers-libs/distinfo.i386 b/net/linux-c6-tcp_wrappers-libs/distinfo.i386
deleted file mode 100644
index a8f4fe0a0a23..000000000000
--- a/net/linux-c6-tcp_wrappers-libs/distinfo.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1466256802
-SHA256 (rpm/i686/centos/6.8/tcp_wrappers-libs-7.6-58.el6.i686.rpm) = 102df2b5ecd127c1b1f494298990c78cb0d2f27454e9a9a5c81d643024475efc
-SIZE (rpm/i686/centos/6.8/tcp_wrappers-libs-7.6-58.el6.i686.rpm) = 63536
-SHA256 (rpm/i686/centos/6.8/tcp_wrappers-7.6-58.el6.src.rpm) = cac2777dc02508ace6b3f0e158ac5c5ec46af57060740ce249cf035362eea3d0
-SIZE (rpm/i686/centos/6.8/tcp_wrappers-7.6-58.el6.src.rpm) = 142101
diff --git a/net/linux-c6-tcp_wrappers-libs/distinfo.x86_64 b/net/linux-c6-tcp_wrappers-libs/distinfo.x86_64
deleted file mode 100644
index d66a90c302e3..000000000000
--- a/net/linux-c6-tcp_wrappers-libs/distinfo.x86_64
+++ /dev/null
@@ -1,7 +0,0 @@
-TIMESTAMP = 1466257421
-SHA256 (rpm/x86_64/centos/6.8/tcp_wrappers-libs-7.6-58.el6.x86_64.rpm) = 55f21f483ee7d6f8ce6a0ce4c8c33efd10f6ec237d73a9ad7ee146cd8b2cd7c6
-SIZE (rpm/x86_64/centos/6.8/tcp_wrappers-libs-7.6-58.el6.x86_64.rpm) = 63656
-SHA256 (rpm/x86_64/centos/6.8/tcp_wrappers-libs-7.6-58.el6.i686.rpm) = 102df2b5ecd127c1b1f494298990c78cb0d2f27454e9a9a5c81d643024475efc
-SIZE (rpm/x86_64/centos/6.8/tcp_wrappers-libs-7.6-58.el6.i686.rpm) = 63536
-SHA256 (rpm/x86_64/centos/6.8/tcp_wrappers-7.6-58.el6.src.rpm) = cac2777dc02508ace6b3f0e158ac5c5ec46af57060740ce249cf035362eea3d0
-SIZE (rpm/x86_64/centos/6.8/tcp_wrappers-7.6-58.el6.src.rpm) = 142101
diff --git a/net/linux-c6-tcp_wrappers-libs/pkg-plist.amd64 b/net/linux-c6-tcp_wrappers-libs/pkg-plist.amd64
new file mode 100644
index 000000000000..1e8f53d6b581
--- /dev/null
+++ b/net/linux-c6-tcp_wrappers-libs/pkg-plist.amd64
@@ -0,0 +1,15 @@
+usr/lib/libwrap.so.0
+usr/lib/libwrap.so.0.7.6
+usr/lib64/libwrap.so.0
+usr/lib64/libwrap.so.0.7.6
+%%PORTDOCS%%%%DOCSDIR%%/BLURB
+%%PORTDOCS%%%%DOCSDIR%%/Banners.Makefile
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/DISCLAIMER
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.IRIX
+%%PORTDOCS%%%%DOCSDIR%%/README.NIS
+usr/share/man/man5/hosts.allow.5.gz
+usr/share/man/man5/hosts.deny.5.gz
+usr/share/man/man5/hosts_access.5.gz
+usr/share/man/man5/hosts_options.5.gz
diff --git a/net/linux-c6-tcp_wrappers-libs/pkg-plist.i386 b/net/linux-c6-tcp_wrappers-libs/pkg-plist.i386
index 70b742e57c30..136a5ba2e12f 100644
--- a/net/linux-c6-tcp_wrappers-libs/pkg-plist.i386
+++ b/net/linux-c6-tcp_wrappers-libs/pkg-plist.i386
@@ -1,12 +1,12 @@
-lib/libwrap.so.0
-lib/libwrap.so.0.7.6
-usr/share/doc/tcp_wrappers-libs-7.6/BLURB
-usr/share/doc/tcp_wrappers-libs-7.6/Banners.Makefile
-usr/share/doc/tcp_wrappers-libs-7.6/CHANGES
-usr/share/doc/tcp_wrappers-libs-7.6/DISCLAIMER
-usr/share/doc/tcp_wrappers-libs-7.6/README
-usr/share/doc/tcp_wrappers-libs-7.6/README.IRIX
-usr/share/doc/tcp_wrappers-libs-7.6/README.NIS
+usr/lib/libwrap.so.0
+usr/lib/libwrap.so.0.7.6
+%%PORTDOCS%%%%DOCSDIR%%/BLURB
+%%PORTDOCS%%%%DOCSDIR%%/Banners.Makefile
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/DISCLAIMER
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.IRIX
+%%PORTDOCS%%%%DOCSDIR%%/README.NIS
 usr/share/man/man5/hosts.allow.5.gz
 usr/share/man/man5/hosts.deny.5.gz
 usr/share/man/man5/hosts_access.5.gz
diff --git a/net/linux-c6-tcp_wrappers-libs/pkg-plist.x86_64 b/net/linux-c6-tcp_wrappers-libs/pkg-plist.x86_64
deleted file mode 100644
index 05bfa43c477f..000000000000
--- a/net/linux-c6-tcp_wrappers-libs/pkg-plist.x86_64
+++ /dev/null
@@ -1,15 +0,0 @@
-lib/libwrap.so.0
-lib/libwrap.so.0.7.6
-lib64/libwrap.so.0
-lib64/libwrap.so.0.7.6
-usr/share/doc/tcp_wrappers-libs-7.6/BLURB
-usr/share/doc/tcp_wrappers-libs-7.6/Banners.Makefile
-usr/share/doc/tcp_wrappers-libs-7.6/CHANGES
-usr/share/doc/tcp_wrappers-libs-7.6/DISCLAIMER
-usr/share/doc/tcp_wrappers-libs-7.6/README
-usr/share/doc/tcp_wrappers-libs-7.6/README.IRIX
-usr/share/doc/tcp_wrappers-libs-7.6/README.NIS
-usr/share/man/man5/hosts.allow.5.gz
-usr/share/man/man5/hosts.deny.5.gz
-usr/share/man/man5/hosts_access.5.gz
-usr/share/man/man5/hosts_options.5.gz