- 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, 0 insertions, 105 deletions

diff --git a/x11-themes/Makefile b/x11-themes/Makefile
index f9b4ef22fcf4..ed742f62a06d 100644
--- a/x11-themes/Makefile
+++ b/x11-themes/Makefile
@@ -128,9 +128,6 @@
     SUBDIR += kf5-kemoticons
     SUBDIR += kf5-kiconthemes
     SUBDIR += kf5-oxygen-icons5
-    SUBDIR += linux-c6-hicolor-icon-theme
-    SUBDIR += linux-c7-hicolor-icon-theme
-    SUBDIR += linux-hicolor-icon-theme
     SUBDIR += lxappearance
     SUBDIR += lxde-icon-theme
     SUBDIR += mate-backgrounds
diff --git a/x11-themes/linux-c6-hicolor-icon-theme/Makefile b/x11-themes/linux-c6-hicolor-icon-theme/Makefile
deleted file mode 100644
index 11f39b15448d..000000000000
--- a/x11-themes/linux-c6-hicolor-icon-theme/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# Created by: Johannes Meixner <johannes@perceivon.net>
-# $FreeBSD$
-
-PORTNAME=	hicolor-icon-theme
-PORTVERSION=	0.5
-PORTREVISION=	5
-CATEGORIES=	x11-themes linux
-MASTER_SITES=	# empty
-DISTFILES=	# empty
-PKGNAMEPREFIX=	linux-c6-
-
-MAINTAINER=	emulation@FreeBSD.org
-COMMENT=	High-color icon theme shell from the FreeDesktop project
-
-CONFLICTS=	linux-f10-hicolor-icon-theme-[0-9]*
-
-RUN_DEPENDS=	${LOCALBASE}/share/icons/hicolor/index.theme:misc/hicolor-icon-theme
-
-NO_BUILD=	yes
-USES=		linux:c6
-USE_LINUX_PREFIX=	yes
-PLIST_FILES=	usr/share/icons/hicolor
-
-do-install:
-	${INSTALL} -d ${STAGEDIR}${PREFIX}/usr/share/icons
-	${LN} -fs ${LOCALBASE}/share/icons/hicolor ${STAGEDIR}${PREFIX}/usr/share/icons
-
-.include <bsd.port.mk>
diff --git a/x11-themes/linux-c6-hicolor-icon-theme/pkg-descr b/x11-themes/linux-c6-hicolor-icon-theme/pkg-descr
deleted file mode 100644
index 08eae69dd45a..000000000000
--- a/x11-themes/linux-c6-hicolor-icon-theme/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-The freedesktop.org project provides a shared high-color desktop
-icon theme shell for use under both KDE and GNOME desktops. This
-is a glue port providing a symlink so that Linux apps find their
-way around.
-
-WWW: http://www.freedesktop.org/Standards/icon-theme-spec
diff --git a/x11-themes/linux-c7-hicolor-icon-theme/Makefile b/x11-themes/linux-c7-hicolor-icon-theme/Makefile
deleted file mode 100644
index e46cd87c93ef..000000000000
--- a/x11-themes/linux-c7-hicolor-icon-theme/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# Created by: Piotr Kubaj <pkubaj@anongoth.pl>
-# $FreeBSD$
-
-PORTNAME=	hicolor-icon-theme
-PORTVERSION=	0.5
-PORTREVISION=	1
-CATEGORIES=	x11-themes linux
-MASTER_SITES=	# empty
-DISTFILES=	# empty
-PKGNAMEPREFIX=	linux-c7-
-
-MAINTAINER=	emulation@FreeBSD.org
-COMMENT=	High-color icon theme shell from the FreeDesktop project
-
-CONFLICTS=	linux-c6-${PORTNAME}-[0-9]*
-
-RUN_DEPENDS=	${LOCALBASE}/share/icons/hicolor/index.theme:misc/hicolor-icon-theme
-
-NO_BUILD=	yes
-USES=		linux:c7
-USE_LINUX_PREFIX=	yes
-PLIST_FILES=	usr/share/icons/hicolor
-
-do-install:
-	${INSTALL} -d ${STAGEDIR}${PREFIX}/usr/share/icons
-	${LN} -fs ${LOCALBASE}/share/icons/hicolor ${STAGEDIR}${PREFIX}/usr/share/icons
-
-.include <bsd.port.mk>
diff --git a/x11-themes/linux-c7-hicolor-icon-theme/pkg-descr b/x11-themes/linux-c7-hicolor-icon-theme/pkg-descr
deleted file mode 100644
index 08eae69dd45a..000000000000
--- a/x11-themes/linux-c7-hicolor-icon-theme/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-The freedesktop.org project provides a shared high-color desktop
-icon theme shell for use under both KDE and GNOME desktops. This
-is a glue port providing a symlink so that Linux apps find their
-way around.
-
-WWW: http://www.freedesktop.org/Standards/icon-theme-spec
diff --git a/x11-themes/linux-hicolor-icon-theme/Makefile b/x11-themes/linux-hicolor-icon-theme/Makefile
deleted file mode 100644
index a6b61f63c367..000000000000
--- a/x11-themes/linux-hicolor-icon-theme/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	hicolor-icon-theme
-PORTVERSION=	0.5
-PORTREVISION=	3
-CATEGORIES=	x11-themes linux
-MASTER_SITES=	# empty
-PKGNAMEPREFIX=	linux-
-DISTFILES=	# empty
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	High-color icon theme shell from the FreeDesktop project
-
-RUN_DEPENDS=	${LOCALBASE}/share/icons/hicolor/index.theme:misc/hicolor-icon-theme
-
-CONFLICTS=	linux-f8-hicolor-icon-theme-[0-9]* linux-f10-hicolor-icon-theme-[0-9]*
-
-NO_BUILD=	yes
-USES=		linux
-USE_LINUX_PREFIX=	yes
-PLIST_FILES=	usr/share/icons/hicolor
-
-do-install:
-	${INSTALL} -d ${STAGEDIR}${PREFIX}/usr/share/icons
-	${LN} -fs ${LOCALBASE}/share/icons/hicolor ${STAGEDIR}${PREFIX}/usr/share/icons
-
-.include <bsd.port.mk>
diff --git a/x11-themes/linux-hicolor-icon-theme/pkg-descr b/x11-themes/linux-hicolor-icon-theme/pkg-descr
deleted file mode 100644
index 08eae69dd45a..000000000000
--- a/x11-themes/linux-hicolor-icon-theme/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-The freedesktop.org project provides a shared high-color desktop
-icon theme shell for use under both KDE and GNOME desktops. This
-is a glue port providing a symlink so that Linux apps find their
-way around.
-
-WWW: http://www.freedesktop.org/Standards/icon-theme-spec