- 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, 77 insertions, 63 deletions

diff --git a/x11-toolkits/linux-c6-qt47-x11/Makefile b/x11-toolkits/linux-c6-qt47-x11/Makefile
index 3eba64195e86..85440c4f6e31 100644
--- a/x11-toolkits/linux-c6-qt47-x11/Makefile
+++ b/x11-toolkits/linux-c6-qt47-x11/Makefile
@@ -3,27 +3,24 @@
 
 PORTNAME=	qt47-x11
 PORTVERSION=	4.7.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-toolkits linux
-MASTER_SITES=	https://www.mirrorservice.org/sites/dl.atrpms.net/el6-x86_64/atrpms/testing/\
-		https://www.mirrorservice.org/sites/dl.atrpms.net/el6-i386/atrpms/testing/ \
-		LOCAL/xmj
-DIST_SUBDIR=	rpm/${LINUX_RPM_ARCH}/atrpms/6
+MASTER_SITES=	LOCAL/tijl/atrpms:amd64,i386
+SRC_DISTFILES=	# unavailable
+DIST_SUBDIR=	atrpms
 
 MAINTAINER=	emulation@FreeBSD.org
-COMMENT=	RPM of QT4 (Linux CentOS 6)
-
-SRC_DISTFILES=	# unretrievable.
+COMMENT=	Cross-platform application and UI framework (Linux CentOS ${LINUX_DIST_VER})
 
+DATADIR=	${PREFIX}/usr/share/qt47
+DESCR=		${.CURDIR}/../../devel/qt4/pkg-descr
 RPMVERSION=	1_18.el6
 USES=		linux:c6
 USE_LDCONFIG=	yes
 USE_LINUX=	alsalib dri fontconfig jpeg openssl png qt47 tiff xorglibs
 USE_LINUX_RPM=	yes
 
-DESCR=	${.CURDIR}/../../devel/qt4/pkg-descr
-
 post-patch:
-	${RM} ${WRKSRC}/usr/share/qt47/translations/qt_help_*.qm
+	@${RM} -r ${WRKSRC}/usr/share/icons
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/linux-c6-qt47-x11/distinfo b/x11-toolkits/linux-c6-qt47-x11/distinfo
new file mode 100644
index 000000000000..7a76f8730cb1
--- /dev/null
+++ b/x11-toolkits/linux-c6-qt47-x11/distinfo
@@ -0,0 +1,5 @@
+TIMESTAMP = 1485696341
+SHA256 (atrpms/qt47-x11-4.7.2-1_18.el6.i686.rpm) = ca8b75fd11e75f1d70545f04633e313a168ef5fe4e194bff58bef7455aae6414
+SIZE (atrpms/qt47-x11-4.7.2-1_18.el6.i686.rpm) = 12853688
+SHA256 (atrpms/qt47-x11-4.7.2-1_18.el6.x86_64.rpm) = c74163d34d320c559129b95cb2a747c7312547697beb0d45ed0f54a0d542ebc9
+SIZE (atrpms/qt47-x11-4.7.2-1_18.el6.x86_64.rpm) = 12674320
diff --git a/x11-toolkits/linux-c6-qt47-x11/distinfo.i386 b/x11-toolkits/linux-c6-qt47-x11/distinfo.i386
deleted file mode 100644
index 2e5b85465645..000000000000
--- a/x11-toolkits/linux-c6-qt47-x11/distinfo.i386
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1466256699
-SHA256 (rpm/i686/atrpms/6/qt47-x11-4.7.2-1_18.el6.i686.rpm) = ca8b75fd11e75f1d70545f04633e313a168ef5fe4e194bff58bef7455aae6414
-SIZE (rpm/i686/atrpms/6/qt47-x11-4.7.2-1_18.el6.i686.rpm) = 12853688
diff --git a/x11-toolkits/linux-c6-qt47-x11/distinfo.x86_64 b/x11-toolkits/linux-c6-qt47-x11/distinfo.x86_64
deleted file mode 100644
index cb1c59f31fab..000000000000
--- a/x11-toolkits/linux-c6-qt47-x11/distinfo.x86_64
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1466256984
-SHA256 (rpm/x86_64/atrpms/6/qt47-x11-4.7.2-1_18.el6.x86_64.rpm) = c74163d34d320c559129b95cb2a747c7312547697beb0d45ed0f54a0d542ebc9
-SIZE (rpm/x86_64/atrpms/6/qt47-x11-4.7.2-1_18.el6.x86_64.rpm) = 12674320
-SHA256 (rpm/x86_64/atrpms/6/qt47-x11-4.7.2-1_18.el6.i686.rpm) = ca8b75fd11e75f1d70545f04633e313a168ef5fe4e194bff58bef7455aae6414
-SIZE (rpm/x86_64/atrpms/6/qt47-x11-4.7.2-1_18.el6.i686.rpm) = 12853688
diff --git a/x11-toolkits/linux-c6-qt47-x11/pkg-plist.x86_64 b/x11-toolkits/linux-c6-qt47-x11/pkg-plist.amd64
index 283dd47c4d5c..f3deb30e5005 100644
--- a/x11-toolkits/linux-c6-qt47-x11/pkg-plist.x86_64
+++ b/x11-toolkits/linux-c6-qt47-x11/pkg-plist.amd64
@@ -150,28 +150,38 @@ usr/lib64/qt47/plugins/inputmethods/libqimsw-multi.so
 usr/lib64/qt47/plugins/qmltooling/libtcpserver.so
 usr/lib64/qt47/plugins/script/libqtscriptdbus.so
 usr/share/dbus-1/interfaces/org.kde.Phonon.AudioOutput.xml
-usr/share/icons/hicolor/128x128/apps/qt47-logo.png
-usr/share/icons/hicolor/48x48/apps/qt47-logo.png
-usr/share/qt47/translations/assistant_cs.qm
-usr/share/qt47/translations/assistant_da.qm
-usr/share/qt47/translations/assistant_de.qm
-usr/share/qt47/translations/assistant_fr.qm
-usr/share/qt47/translations/assistant_hu.qm
-usr/share/qt47/translations/assistant_ja.qm
-usr/share/qt47/translations/assistant_pl.qm
-usr/share/qt47/translations/assistant_ru.qm
-usr/share/qt47/translations/assistant_sl.qm
-usr/share/qt47/translations/assistant_uk.qm
-usr/share/qt47/translations/assistant_zh_CN.qm
-usr/share/qt47/translations/assistant_zh_TW.qm
-usr/share/qt47/translations/qtconfig_hu.qm
-usr/share/qt47/translations/qtconfig_ja.qm
-usr/share/qt47/translations/qtconfig_pl.qm
-usr/share/qt47/translations/qtconfig_ru.qm
-usr/share/qt47/translations/qtconfig_sl.qm
-usr/share/qt47/translations/qtconfig_uk.qm
-usr/share/qt47/translations/qtconfig_zh_CN.qm
-usr/share/qt47/translations/qtconfig_zh_TW.qm
+%%DATADIR%%/translations/assistant_cs.qm
+%%DATADIR%%/translations/assistant_da.qm
+%%DATADIR%%/translations/assistant_de.qm
+%%DATADIR%%/translations/assistant_fr.qm
+%%DATADIR%%/translations/assistant_hu.qm
+%%DATADIR%%/translations/assistant_ja.qm
+%%DATADIR%%/translations/assistant_pl.qm
+%%DATADIR%%/translations/assistant_ru.qm
+%%DATADIR%%/translations/assistant_sl.qm
+%%DATADIR%%/translations/assistant_uk.qm
+%%DATADIR%%/translations/assistant_zh_CN.qm
+%%DATADIR%%/translations/assistant_zh_TW.qm
+%%DATADIR%%/translations/qt_help_cs.qm
+%%DATADIR%%/translations/qt_help_da.qm
+%%DATADIR%%/translations/qt_help_de.qm
+%%DATADIR%%/translations/qt_help_fr.qm
+%%DATADIR%%/translations/qt_help_hu.qm
+%%DATADIR%%/translations/qt_help_ja.qm
+%%DATADIR%%/translations/qt_help_pl.qm
+%%DATADIR%%/translations/qt_help_ru.qm
+%%DATADIR%%/translations/qt_help_sl.qm
+%%DATADIR%%/translations/qt_help_uk.qm
+%%DATADIR%%/translations/qt_help_zh_CN.qm
+%%DATADIR%%/translations/qt_help_zh_TW.qm
+%%DATADIR%%/translations/qtconfig_hu.qm
+%%DATADIR%%/translations/qtconfig_ja.qm
+%%DATADIR%%/translations/qtconfig_pl.qm
+%%DATADIR%%/translations/qtconfig_ru.qm
+%%DATADIR%%/translations/qtconfig_sl.qm
+%%DATADIR%%/translations/qtconfig_uk.qm
+%%DATADIR%%/translations/qtconfig_zh_CN.qm
+%%DATADIR%%/translations/qtconfig_zh_TW.qm
 @dir usr/lib/qt47/plugins/gui_platform
 @dir usr/lib/qt47/plugins/phonon_backend
 @dir usr/lib/qt47/plugins/styles
diff --git a/x11-toolkits/linux-c6-qt47-x11/pkg-plist.i386 b/x11-toolkits/linux-c6-qt47-x11/pkg-plist.i386
index 8e6ba871fc34..3245bed7eb3f 100644
--- a/x11-toolkits/linux-c6-qt47-x11/pkg-plist.i386
+++ b/x11-toolkits/linux-c6-qt47-x11/pkg-plist.i386
@@ -76,28 +76,38 @@ usr/lib/qt47/plugins/inputmethods/libqimsw-multi.so
 usr/lib/qt47/plugins/qmltooling/libtcpserver.so
 usr/lib/qt47/plugins/script/libqtscriptdbus.so
 usr/share/dbus-1/interfaces/org.kde.Phonon.AudioOutput.xml
-usr/share/icons/hicolor/128x128/apps/qt47-logo.png
-usr/share/icons/hicolor/48x48/apps/qt47-logo.png
-usr/share/qt47/translations/assistant_cs.qm
-usr/share/qt47/translations/assistant_da.qm
-usr/share/qt47/translations/assistant_de.qm
-usr/share/qt47/translations/assistant_fr.qm
-usr/share/qt47/translations/assistant_hu.qm
-usr/share/qt47/translations/assistant_ja.qm
-usr/share/qt47/translations/assistant_pl.qm
-usr/share/qt47/translations/assistant_ru.qm
-usr/share/qt47/translations/assistant_sl.qm
-usr/share/qt47/translations/assistant_uk.qm
-usr/share/qt47/translations/assistant_zh_CN.qm
-usr/share/qt47/translations/assistant_zh_TW.qm
-usr/share/qt47/translations/qtconfig_hu.qm
-usr/share/qt47/translations/qtconfig_ja.qm
-usr/share/qt47/translations/qtconfig_pl.qm
-usr/share/qt47/translations/qtconfig_ru.qm
-usr/share/qt47/translations/qtconfig_sl.qm
-usr/share/qt47/translations/qtconfig_uk.qm
-usr/share/qt47/translations/qtconfig_zh_CN.qm
-usr/share/qt47/translations/qtconfig_zh_TW.qm
+%%DATADIR%%/translations/assistant_cs.qm
+%%DATADIR%%/translations/assistant_da.qm
+%%DATADIR%%/translations/assistant_de.qm
+%%DATADIR%%/translations/assistant_fr.qm
+%%DATADIR%%/translations/assistant_hu.qm
+%%DATADIR%%/translations/assistant_ja.qm
+%%DATADIR%%/translations/assistant_pl.qm
+%%DATADIR%%/translations/assistant_ru.qm
+%%DATADIR%%/translations/assistant_sl.qm
+%%DATADIR%%/translations/assistant_uk.qm
+%%DATADIR%%/translations/assistant_zh_CN.qm
+%%DATADIR%%/translations/assistant_zh_TW.qm
+%%DATADIR%%/translations/qt_help_cs.qm
+%%DATADIR%%/translations/qt_help_da.qm
+%%DATADIR%%/translations/qt_help_de.qm
+%%DATADIR%%/translations/qt_help_fr.qm
+%%DATADIR%%/translations/qt_help_hu.qm
+%%DATADIR%%/translations/qt_help_ja.qm
+%%DATADIR%%/translations/qt_help_pl.qm
+%%DATADIR%%/translations/qt_help_ru.qm
+%%DATADIR%%/translations/qt_help_sl.qm
+%%DATADIR%%/translations/qt_help_uk.qm
+%%DATADIR%%/translations/qt_help_zh_CN.qm
+%%DATADIR%%/translations/qt_help_zh_TW.qm
+%%DATADIR%%/translations/qtconfig_hu.qm
+%%DATADIR%%/translations/qtconfig_ja.qm
+%%DATADIR%%/translations/qtconfig_pl.qm
+%%DATADIR%%/translations/qtconfig_ru.qm
+%%DATADIR%%/translations/qtconfig_sl.qm
+%%DATADIR%%/translations/qtconfig_uk.qm
+%%DATADIR%%/translations/qtconfig_zh_CN.qm
+%%DATADIR%%/translations/qtconfig_zh_TW.qm
 @dir usr/lib/qt47/plugins/gui_platform
 @dir usr/lib/qt47/plugins/phonon_backend
 @dir usr/lib/qt47/plugins/styles