- 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.

6 files changed, 10 insertions, 17 deletions

diff --git a/databases/linux-c6-sqlite3/Makefile b/databases/linux-c6-sqlite3/Makefile
index 486bd4602e6f..c73037de36c2 100644
--- a/databases/linux-c6-sqlite3/Makefile
+++ b/databases/linux-c6-sqlite3/Makefile
@@ -9,14 +9,10 @@ CATEGORIES=	databases linux
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Library that implements an embeddable SQL database engine (Linux CentOS ${LINUX_DIST_VER})
 
-CONFLICTS=	linux-f8-sqlite3-[0-9]* linux-f10-sqlite3-[0-9]*
-
+DESCR=		${.CURDIR}/../${PORTNAME}3/pkg-descr
 RPMVERSION=	1.el6_7.2
 USES=		linux:c6
 USE_LDCONFIG=	yes
 USE_LINUX_RPM=	yes
 
-PORTDOCS=	README
-DESCR=		${.CURDIR}/../${PORTNAME}3/pkg-descr
-
 .include <bsd.port.mk>
diff --git a/databases/linux-c6-sqlite3/distinfo b/databases/linux-c6-sqlite3/distinfo
new file mode 100644
index 000000000000..b7f29f8a0f9b
--- /dev/null
+++ b/databases/linux-c6-sqlite3/distinfo
@@ -0,0 +1,7 @@
+TIMESTAMP = 1485461621
+SHA256 (centos/sqlite-3.6.20-1.el6_7.2.i686.rpm) = 6d06ed0adf5e60dadb88da40e062b961cf2661f07f5ec84c5bce5c3a5e7c9ecd
+SIZE (centos/sqlite-3.6.20-1.el6_7.2.i686.rpm) = 313792
+SHA256 (centos/sqlite-3.6.20-1.el6_7.2.x86_64.rpm) = 85c33d9453f890eead343eb9a3b9b4c036b8b9edba531ab9356b71b8b00b327d
+SIZE (centos/sqlite-3.6.20-1.el6_7.2.x86_64.rpm) = 307360
+SHA256 (centos/sqlite-3.6.20-1.el6_7.2.src.rpm) = 09b54fd6a222696b67bf4c9cad01ae5f55a3f71b3d63d9f6a9a2842ae47c0fc9
+SIZE (centos/sqlite-3.6.20-1.el6_7.2.src.rpm) = 5327584
diff --git a/databases/linux-c6-sqlite3/distinfo.i386 b/databases/linux-c6-sqlite3/distinfo.i386
deleted file mode 100644
index 79050492ad1b..000000000000
--- a/databases/linux-c6-sqlite3/distinfo.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1466256707
-SHA256 (rpm/i686/centos/6.8/sqlite-3.6.20-1.el6_7.2.i686.rpm) = 6d06ed0adf5e60dadb88da40e062b961cf2661f07f5ec84c5bce5c3a5e7c9ecd
-SIZE (rpm/i686/centos/6.8/sqlite-3.6.20-1.el6_7.2.i686.rpm) = 313792
-SHA256 (rpm/i686/centos/6.8/sqlite-3.6.20-1.el6_7.2.src.rpm) = 09b54fd6a222696b67bf4c9cad01ae5f55a3f71b3d63d9f6a9a2842ae47c0fc9
-SIZE (rpm/i686/centos/6.8/sqlite-3.6.20-1.el6_7.2.src.rpm) = 5327584
diff --git a/databases/linux-c6-sqlite3/distinfo.x86_64 b/databases/linux-c6-sqlite3/distinfo.x86_64
deleted file mode 100644
index c99559a36519..000000000000
--- a/databases/linux-c6-sqlite3/distinfo.x86_64
+++ /dev/null
@@ -1,7 +0,0 @@
-TIMESTAMP = 1466257011
-SHA256 (rpm/x86_64/centos/6.8/sqlite-3.6.20-1.el6_7.2.x86_64.rpm) = 85c33d9453f890eead343eb9a3b9b4c036b8b9edba531ab9356b71b8b00b327d
-SIZE (rpm/x86_64/centos/6.8/sqlite-3.6.20-1.el6_7.2.x86_64.rpm) = 307360
-SHA256 (rpm/x86_64/centos/6.8/sqlite-3.6.20-1.el6_7.2.i686.rpm) = 6d06ed0adf5e60dadb88da40e062b961cf2661f07f5ec84c5bce5c3a5e7c9ecd
-SIZE (rpm/x86_64/centos/6.8/sqlite-3.6.20-1.el6_7.2.i686.rpm) = 313792
-SHA256 (rpm/x86_64/centos/6.8/sqlite-3.6.20-1.el6_7.2.src.rpm) = 09b54fd6a222696b67bf4c9cad01ae5f55a3f71b3d63d9f6a9a2842ae47c0fc9
-SIZE (rpm/x86_64/centos/6.8/sqlite-3.6.20-1.el6_7.2.src.rpm) = 5327584
diff --git a/databases/linux-c6-sqlite3/pkg-plist.x86_64 b/databases/linux-c6-sqlite3/pkg-plist.amd64
index 66106f840d7b..b18908a1a454 100644
--- a/databases/linux-c6-sqlite3/pkg-plist.x86_64
+++ b/databases/linux-c6-sqlite3/pkg-plist.amd64
@@ -3,4 +3,5 @@ usr/lib/libsqlite3.so.0
 usr/lib/libsqlite3.so.0.8.6
 usr/lib64/libsqlite3.so.0
 usr/lib64/libsqlite3.so.0.8.6
+%%PORTDOCS%%%%DOCSDIR%%/README
 usr/share/man/man1/sqlite3.1.gz
diff --git a/databases/linux-c6-sqlite3/pkg-plist.i386 b/databases/linux-c6-sqlite3/pkg-plist.i386
index f808d65c65a1..d16a5bb79c36 100644
--- a/databases/linux-c6-sqlite3/pkg-plist.i386
+++ b/databases/linux-c6-sqlite3/pkg-plist.i386
@@ -1,4 +1,5 @@
 usr/bin/sqlite3
 usr/lib/libsqlite3.so.0
 usr/lib/libsqlite3.so.0.8.6
+%%PORTDOCS%%%%DOCSDIR%%/README
 usr/share/man/man1/sqlite3.1.gz