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

3 files changed, 2 insertions, 3 deletions

diff --git a/x11-toolkits/linux-c7-tk85/Makefile b/x11-toolkits/linux-c7-tk85/Makefile
index 9664bdbffce2..9f206512780d 100644
--- a/x11-toolkits/linux-c7-tk85/Makefile
+++ b/x11-toolkits/linux-c7-tk85/Makefile
@@ -12,6 +12,8 @@ COMMENT=	Graphical toolkit for TCL (Linux CentOS ${LINUX_DIST_VER})
 
 CONFLICTS=	linux-c6-${PORTNAME}${PKGNAMESUFFIX}-[0-9]*
 
+DATADIR=	${PREFIX}/usr/share/tk${PORTVERSION:R}
+DESCR=		${.CURDIR}/../${PORTNAME}${PKGNAMESUFFIX}/pkg-descr
 RPMVERSION=	6.el7
 USES=		linux:c7
 USE_LDCONFIG=	yes
@@ -19,7 +21,4 @@ USE_LINUX=	xorglibs
 USE_LINUX_RPM=	yes
 USE_LINUX_RPM_BAD_PERMS=	yes
 
-DATADIR=	${PREFIX}/usr/share/tk${PORTVERSION:R}
-DESCR=		${.CURDIR}/../${PORTNAME}${PKGNAMESUFFIX}/pkg-descr
-
 .include <bsd.port.mk>
diff --git a/x11-toolkits/linux-c7-tk85/distinfo.x86_64 b/x11-toolkits/linux-c7-tk85/distinfo
index 5766b872911e..5766b872911e 100644
--- a/x11-toolkits/linux-c7-tk85/distinfo.x86_64
+++ b/x11-toolkits/linux-c7-tk85/distinfo
diff --git a/x11-toolkits/linux-c7-tk85/pkg-plist.x86_64 b/x11-toolkits/linux-c7-tk85/pkg-plist.amd64
index 7ee4d492ac74..7ee4d492ac74 100644
--- a/x11-toolkits/linux-c7-tk85/pkg-plist.x86_64
+++ b/x11-toolkits/linux-c7-tk85/pkg-plist.amd64