- 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, 14 insertions, 20 deletions

diff --git a/devel/linux-c6-libgfortran/Makefile b/devel/linux-c6-libgfortran/Makefile
index d761699e8025..f79824fb8c18 100644
--- a/devel/linux-c6-libgfortran/Makefile
+++ b/devel/linux-c6-libgfortran/Makefile
@@ -4,15 +4,14 @@ PORTNAME=	libgfortran
 PORTVERSION=	4.4.7
 PORTREVISION=	4
 CATEGORIES=	devel linux
+SRC_DISTFILES=	gcc-${DISTVERSIONFULL}${SRC_SUFX}:SOURCE
 
 MAINTAINER=	emulation@FreeBSD.org
-COMMENT=	RPM of runtime libs for gfortran (Linux Centos ${LINUX_DIST_VER})
-
-USES=		linux:c6
-USE_LINUX_RPM=	yes
+COMMENT=	Runtime libraries for gfortran (Linux Centos ${LINUX_DIST_VER})
 
 RPMVERSION=	17.el6
+USES=		linux:c6
 USE_LDCONFIG=	yes
-SRC_DISTFILES=	gcc-${DISTVERSION}-${RPMVERSION}${SRC_SUFX}:SOURCE
+USE_LINUX_RPM=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/linux-c6-libgfortran/distinfo b/devel/linux-c6-libgfortran/distinfo
new file mode 100644
index 000000000000..6e79e6c8fabd
--- /dev/null
+++ b/devel/linux-c6-libgfortran/distinfo
@@ -0,0 +1,7 @@
+TIMESTAMP = 1485514860
+SHA256 (centos/libgfortran-4.4.7-17.el6.i686.rpm) = 6c7b68194bc24c90f4d9d619973bb9fa03626bf60e386d53c233821906541882
+SIZE (centos/libgfortran-4.4.7-17.el6.i686.rpm) = 251576
+SHA256 (centos/libgfortran-4.4.7-17.el6.x86_64.rpm) = 30c9de7704d5c598168012e299dbfdebbfa41d28254c457aec4be1c3935df369
+SIZE (centos/libgfortran-4.4.7-17.el6.x86_64.rpm) = 274212
+SHA256 (centos/gcc-4.4.7-17.el6.src.rpm) = 4b14f08c109dce1f43fe4956bbb8f0a3ff1e076950ca3e89a75d28a59465217c
+SIZE (centos/gcc-4.4.7-17.el6.src.rpm) = 52394741
diff --git a/devel/linux-c6-libgfortran/distinfo.i386 b/devel/linux-c6-libgfortran/distinfo.i386
deleted file mode 100644
index 8cfef29443a7..000000000000
--- a/devel/linux-c6-libgfortran/distinfo.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1466260093
-SHA256 (rpm/i686/centos/6.8/libgfortran-4.4.7-17.el6.i686.rpm) = 6c7b68194bc24c90f4d9d619973bb9fa03626bf60e386d53c233821906541882
-SIZE (rpm/i686/centos/6.8/libgfortran-4.4.7-17.el6.i686.rpm) = 251576
-SHA256 (rpm/i686/centos/6.8/gcc-4.4.7-17.el6.src.rpm) = 4b14f08c109dce1f43fe4956bbb8f0a3ff1e076950ca3e89a75d28a59465217c
-SIZE (rpm/i686/centos/6.8/gcc-4.4.7-17.el6.src.rpm) = 52394741
diff --git a/devel/linux-c6-libgfortran/distinfo.x86_64 b/devel/linux-c6-libgfortran/distinfo.x86_64
deleted file mode 100644
index 16beb6554e7c..000000000000
--- a/devel/linux-c6-libgfortran/distinfo.x86_64
+++ /dev/null
@@ -1,7 +0,0 @@
-TIMESTAMP = 1466260083
-SHA256 (rpm/x86_64/centos/6.8/libgfortran-4.4.7-17.el6.x86_64.rpm) = 30c9de7704d5c598168012e299dbfdebbfa41d28254c457aec4be1c3935df369
-SIZE (rpm/x86_64/centos/6.8/libgfortran-4.4.7-17.el6.x86_64.rpm) = 274212
-SHA256 (rpm/x86_64/centos/6.8/libgfortran-4.4.7-17.el6.i686.rpm) = 6c7b68194bc24c90f4d9d619973bb9fa03626bf60e386d53c233821906541882
-SIZE (rpm/x86_64/centos/6.8/libgfortran-4.4.7-17.el6.i686.rpm) = 251576
-SHA256 (rpm/x86_64/centos/6.8/gcc-4.4.7-17.el6.src.rpm) = 4b14f08c109dce1f43fe4956bbb8f0a3ff1e076950ca3e89a75d28a59465217c
-SIZE (rpm/x86_64/centos/6.8/gcc-4.4.7-17.el6.src.rpm) = 52394741
diff --git a/devel/linux-c6-libgfortran/pkg-plist.x86_64 b/devel/linux-c6-libgfortran/pkg-plist.amd64
index b0cf056c36fa..813381ad1fa2 100644
--- a/devel/linux-c6-libgfortran/pkg-plist.x86_64
+++ b/devel/linux-c6-libgfortran/pkg-plist.amd64
@@ -1,4 +1,4 @@
-usr/lib/libgfortran.so.3.0.0
 usr/lib/libgfortran.so.3
-usr/lib64/libgfortran.so.3.0.0
+usr/lib/libgfortran.so.3.0.0
 usr/lib64/libgfortran.so.3
+usr/lib64/libgfortran.so.3.0.0
diff --git a/devel/linux-c6-libgfortran/pkg-plist.i386 b/devel/linux-c6-libgfortran/pkg-plist.i386
index 5eb445616af8..0169104fb60e 100644
--- a/devel/linux-c6-libgfortran/pkg-plist.i386
+++ b/devel/linux-c6-libgfortran/pkg-plist.i386
@@ -1,2 +1,2 @@
-usr/lib/libgfortran.so.3.0.0
 usr/lib/libgfortran.so.3
+usr/lib/libgfortran.so.3.0.0