- 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, 28 deletions

diff --git a/textproc/linux-c6-expat/Makefile b/textproc/linux-c6-expat/Makefile
index 9eb690dfa500..b212984d9b50 100644
--- a/textproc/linux-c6-expat/Makefile
+++ b/textproc/linux-c6-expat/Makefile
@@ -3,20 +3,16 @@
 
 PORTNAME=	expat
 PORTVERSION=	2.0.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	textproc linux
 
 MAINTAINER=	emulation@FreeBSD.org
-COMMENT=	Linux/i386 binary port of Expat XML-parsing library (Linux CentOS ${LINUX_DIST_VER})
-
-CONFLICTS=	linux-expat-[0-9]* linux-f8-expat-[0-9]* linux-f10-expat-[0-9]*
+COMMENT=	XML 1.0 parser written in C (Linux CentOS ${LINUX_DIST_VER})
 
+DESCR=		${.CURDIR}/../${PORTNAME}2/pkg-descr
 RPMVERSION=	13.el6_8
 USES=		linux:c6
-USE_LINUX_RPM=	yes
 USE_LDCONFIG=	yes
-
-PORTDOCS=	COPYING README
-DESCR=		${.CURDIR}/../${PORTNAME}2/pkg-descr
+USE_LINUX_RPM=	yes
 
 .include <bsd.port.mk>
diff --git a/textproc/linux-c6-expat/distinfo b/textproc/linux-c6-expat/distinfo
new file mode 100644
index 000000000000..c575ea4febd0
--- /dev/null
+++ b/textproc/linux-c6-expat/distinfo
@@ -0,0 +1,7 @@
+TIMESTAMP = 1485435101
+SHA256 (centos/expat-2.0.1-13.el6_8.i686.rpm) = d8059e72fad589ffb0f0cdac95587126c947c071188cfeb5c2b8e6fd989d7742
+SIZE (centos/expat-2.0.1-13.el6_8.i686.rpm) = 80652
+SHA256 (centos/expat-2.0.1-13.el6_8.x86_64.rpm) = 668543cbe7d320c097b893acdf692a38745096590b58615eb67ea940374a2125
+SIZE (centos/expat-2.0.1-13.el6_8.x86_64.rpm) = 78448
+SHA256 (centos/expat-2.0.1-13.el6_8.src.rpm) = 1c09bb9d3eb76d17de44a027bb97381053fb94000567865ecc4569429afb4c57
+SIZE (centos/expat-2.0.1-13.el6_8.src.rpm) = 469418
diff --git a/textproc/linux-c6-expat/distinfo.i386 b/textproc/linux-c6-expat/distinfo.i386
deleted file mode 100644
index 86c4d2dc7bd1..000000000000
--- a/textproc/linux-c6-expat/distinfo.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1480449540
-SHA256 (rpm/i686/centos/6.8/expat-2.0.1-13.el6_8.i686.rpm) = d8059e72fad589ffb0f0cdac95587126c947c071188cfeb5c2b8e6fd989d7742
-SIZE (rpm/i686/centos/6.8/expat-2.0.1-13.el6_8.i686.rpm) = 80652
-SHA256 (rpm/i686/centos/6.8/expat-2.0.1-13.el6_8.src.rpm) = 1c09bb9d3eb76d17de44a027bb97381053fb94000567865ecc4569429afb4c57
-SIZE (rpm/i686/centos/6.8/expat-2.0.1-13.el6_8.src.rpm) = 469418
diff --git a/textproc/linux-c6-expat/distinfo.x86_64 b/textproc/linux-c6-expat/distinfo.x86_64
deleted file mode 100644
index b6efdd89d33f..000000000000
--- a/textproc/linux-c6-expat/distinfo.x86_64
+++ /dev/null
@@ -1,7 +0,0 @@
-TIMESTAMP = 1480449556
-SHA256 (rpm/x86_64/centos/6.8/expat-2.0.1-13.el6_8.i686.rpm) = d8059e72fad589ffb0f0cdac95587126c947c071188cfeb5c2b8e6fd989d7742
-SIZE (rpm/x86_64/centos/6.8/expat-2.0.1-13.el6_8.i686.rpm) = 80652
-SHA256 (rpm/x86_64/centos/6.8/expat-2.0.1-13.el6_8.x86_64.rpm) = 668543cbe7d320c097b893acdf692a38745096590b58615eb67ea940374a2125
-SIZE (rpm/x86_64/centos/6.8/expat-2.0.1-13.el6_8.x86_64.rpm) = 78448
-SHA256 (rpm/x86_64/centos/6.8/expat-2.0.1-13.el6_8.src.rpm) = 1c09bb9d3eb76d17de44a027bb97381053fb94000567865ecc4569429afb4c57
-SIZE (rpm/x86_64/centos/6.8/expat-2.0.1-13.el6_8.src.rpm) = 469418
diff --git a/textproc/linux-c6-expat/pkg-plist.amd64 b/textproc/linux-c6-expat/pkg-plist.amd64
new file mode 100644
index 000000000000..e3f99ad6d44c
--- /dev/null
+++ b/textproc/linux-c6-expat/pkg-plist.amd64
@@ -0,0 +1,8 @@
+usr/bin/xmlwf
+usr/lib/libexpat.so.1
+usr/lib/libexpat.so.1.5.2
+usr/lib64/libexpat.so.1
+usr/lib64/libexpat.so.1.5.2
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/README
+usr/share/man/man1/xmlwf.1.gz
diff --git a/textproc/linux-c6-expat/pkg-plist.i386 b/textproc/linux-c6-expat/pkg-plist.i386
index 41d3159035f0..9740c6e5153c 100644
--- a/textproc/linux-c6-expat/pkg-plist.i386
+++ b/textproc/linux-c6-expat/pkg-plist.i386
@@ -1,4 +1,6 @@
-lib/libexpat.so.1
-lib/libexpat.so.1.5.2
 usr/bin/xmlwf
+usr/lib/libexpat.so.1
+usr/lib/libexpat.so.1.5.2
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/README
 usr/share/man/man1/xmlwf.1.gz
diff --git a/textproc/linux-c6-expat/pkg-plist.x86_64 b/textproc/linux-c6-expat/pkg-plist.x86_64
deleted file mode 100644
index ef3b44b92d95..000000000000
--- a/textproc/linux-c6-expat/pkg-plist.x86_64
+++ /dev/null
@@ -1,6 +0,0 @@
-lib/libexpat.so.1
-lib/libexpat.so.1.5.2
-lib64/libexpat.so.1
-lib64/libexpat.so.1.5.2
-usr/bin/xmlwf
-usr/share/man/man1/xmlwf.1.gz