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

2 files changed, 108 insertions, 99 deletions

diff --git a/Mk/Uses/linux.mk b/Mk/Uses/linux.mk
index 9cd0f03b15b7..b7f0127ecedc 100644
--- a/Mk/Uses/linux.mk
+++ b/Mk/Uses/linux.mk
@@ -10,14 +10,15 @@
 # USE_LINUX	List of Linux packages to depend on.
 # USE_LINUX_RPM	When defined, additional variables and targets useful to Linux
 #		infrastructure ports are made available.  Possible values:
-#		yes	Default LIB_DISTFILES and empty BIN_DISTFILES.
-#		nolib	Default BIN_DISTFILES and empty LIB_DISTFILES.
-#		noarch	Like nolib but distfiles are architecture neutral.
+#		yes	Set default LIB_DISTNAMES.
+#		nolib	Set default BIN_DISTNAMES.
+#		noarch	Set default SHARE_DISTNAMES.
 # Additional variables when USE_LINUX_RPM is defined:
-# BIN_DISTFILES	List of distfiles to install.
-# LIB_DISTFILES	List of distfiles to install both the 32 and 64 bit version of.
-# SRC_DISTFILES	List of source distfiles that need to be distributed with
-#		binary packages to comply with some licenses.
+# BIN_DISTNAMES		List of architecture dependent distnames.
+# LIB_DISTNAMES		List of distnames with additional 32 bit version.
+# SHARE_DISTNAMES	List of architecture independent distnames.
+# SRC_DISTFILES		List of source distfiles that need to be distributed
+#			with binary packages to comply with some licenses.
 #
 # MAINTAINER: emulation@FreeBSD.org
 
@@ -26,14 +27,19 @@ _INCLUDE_USES_LINUX_MK=	yes
 _USES_POST+=		linux
 
 .if empty(linux_ARGS)
+.if exists(${LINUXBASE}/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6)
+linux_ARGS=		c6
+.elif exists(${LINUXBASE}/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7)
+linux_ARGS=		c7
+.else
 linux_ARGS=		${LINUX_DEFAULT:S/_64//}
 .endif
+.endif
 
 .if ${linux_ARGS} == c6
 LINUX_DIST_VER?=	6.8
 .if ${ARCH} == amd64 && ${LINUX_DEFAULT} != c6
 LINUX_ARCH=		x86_64
-LINUX_ARCH32=		i386
 .elif ${ARCH} == amd64 || ${ARCH} == i386
 LINUX_ARCH=		i386
 .else
@@ -44,7 +50,6 @@ IGNORE=			Linux CentOS ${LINUX_DIST_VER} is unsupported on ${ARCH}
 LINUX_DIST_VER?=	7.3.1611
 .if ${ARCH} == amd64
 LINUX_ARCH=		x86_64
-LINUX_ARCH32=		i386
 .else
 LINUX_ARCH=		${ARCH}
 IGNORE=			Linux CentOS ${LINUX_DIST_VER} is unsupported on ${ARCH}
@@ -57,38 +62,39 @@ linux_allegro_DEP=		linux-${linux_ARGS}-allegro>0:devel/linux-${linux_ARGS}-alle
 linux_alsa-plugins-oss_DEP=	linux-${linux_ARGS}-alsa-plugins-oss>0:audio/linux-${linux_ARGS}-alsa-plugins-oss
 linux_alsa-plugins-pulseaudio_DEP=linux-${linux_ARGS}-alsa-plugins-pulseaudio>0:audio/linux-${linux_ARGS}-alsa-plugins-pulseaudio
 linux_alsalib_DEP=		linux-${linux_ARGS}-alsa-lib>0:audio/linux-${linux_ARGS}-alsa-lib
-linux_arts_DEP=			linux-${linux_ARGS}-arts>0:audio/linux-${linux_ARGS}-arts
 linux_atk_DEP=			linux-${linux_ARGS}-atk>0:accessibility/linux-${linux_ARGS}-atk
 linux_avahi-libs_DEP=		linux-${linux_ARGS}-avahi-libs>0:net/linux-${linux_ARGS}-avahi-libs
 linux_base_DEP=			linux_base-${linux_ARGS}>0:emulators/linux_base-${linux_ARGS}
 linux_cairo_DEP=		linux-${linux_ARGS}-cairo>0:graphics/linux-${linux_ARGS}-cairo
 linux_cups-libs_DEP=		linux-${linux_ARGS}-cups-libs>0:print/linux-${linux_ARGS}-cups-libs
 linux_curl_DEP=			linux-${linux_ARGS}-curl>0:ftp/linux-${linux_ARGS}-curl
-linux_cyrus-sasl2_DEP=		linux-${linux_ARGS}-cyrus-sasl2>0:security/linux-${linux_ARGS}-cyrus-sasl2
+linux_cyrus-sasl2_DEP=		linux-${linux_ARGS}-cyrus-sasl-lib>0:security/linux-${linux_ARGS}-cyrus-sasl2
 linux_dbusglib_DEP=		linux-${linux_ARGS}-dbus-glib>0:devel/linux-${linux_ARGS}-dbus-glib
 linux_dbuslibs_DEP=		linux-${linux_ARGS}-dbus-libs>0:devel/linux-${linux_ARGS}-dbus-libs
 linux_devtools_DEP=		linux-${linux_ARGS}-devtools>0:devel/linux-${linux_ARGS}-devtools
 linux_dri_DEP=			linux-${linux_ARGS}-dri>0:graphics/linux-${linux_ARGS}-dri
-linux_esound_DEP=		linux-${linux_ARGS}-esound>0:audio/linux-${linux_ARGS}-esound
 linux_expat_DEP=		linux-${linux_ARGS}-expat>0:textproc/linux-${linux_ARGS}-expat
+.if ${linux_ARGS} == c6
 linux_flac_DEP=			linux-${linux_ARGS}-flac>0:audio/linux-${linux_ARGS}-flac
+.else
+linux_flac_DEP=			linux-${linux_ARGS}-flac-libs>0:audio/linux-${linux_ARGS}-flac
+.endif
 linux_fontconfig_DEP=		linux-${linux_ARGS}-fontconfig>0:x11-fonts/linux-${linux_ARGS}-fontconfig
 linux_gdkpixbuf2_DEP=		linux-${linux_ARGS}-gdk-pixbuf2>0:graphics/linux-${linux_ARGS}-gdk-pixbuf2
 linux_gnutls_DEP=		linux-${linux_ARGS}-gnutls>0:security/linux-${linux_ARGS}-gnutls
 linux_graphite2_DEP=		linux-${linux_ARGS}-graphite2>0:graphics/linux-${linux_ARGS}-graphite2
 linux_gtk2_DEP=			linux-${linux_ARGS}-gtk2>0:x11-toolkits/linux-${linux_ARGS}-gtk2
 linux_harfbuzz_DEP=		linux-${linux_ARGS}-harfbuzz>0:print/linux-${linux_ARGS}-harfbuzz
-linux_hicontheme_DEP=		linux-${linux_ARGS}-hicolor-icon-theme>0:x11-themes/linux-${linux_ARGS}-hicolor-icon-theme
-linux_jasper_DEP=		linux-${linux_ARGS}-jasper>0:graphics/linux-${linux_ARGS}-jasper
-linux_jbigkit_DEP=		linux-${linux_ARGS}-jbigkit>0:graphics/linux-${linux_ARGS}-jbigkit
+linux_jasper_DEP=		linux-${linux_ARGS}-jasper-libs>0:graphics/linux-${linux_ARGS}-jasper
+linux_jbigkit_DEP=		linux-${linux_ARGS}-jbigkit-libs>0:graphics/linux-${linux_ARGS}-jbigkit
 linux_jpeg_DEP=			linux-${linux_ARGS}-jpeg>0:graphics/linux-${linux_ARGS}-jpeg
 linux_libasyncns_DEP=		linux-${linux_ARGS}-libasyncns>0:dns/linux-${linux_ARGS}-libasyncns
-.if ${linux_ARGS:Mc6}
-linux_libaudiofile_DEP=		linux-${linux_ARGS}-libaudiofile>0:audio/linux-${linux_ARGS}-libaudiofile
+.if ${linux_ARGS} == c6
+linux_libaudiofile_DEP=		linux-${linux_ARGS}-audiofile>0:audio/linux-${linux_ARGS}-libaudiofile
 .else
 linux_libaudiofile_DEP=		linux-${linux_ARGS}-audiofile>0:audio/linux-${linux_ARGS}-audiofile
 .endif
-linux_libelf_DEP=		linux-${linux_ARGS}-libelf>0:devel/linux-${linux_ARGS}-libelf
+linux_libelf_DEP=		linux-${linux_ARGS}-elfutils-libelf>0:devel/linux-${linux_ARGS}-libelf
 linux_libgcrypt_DEP=		linux-${linux_ARGS}-libgcrypt>0:security/linux-${linux_ARGS}-libgcrypt
 linux_libgfortran_DEP=		linux-${linux_ARGS}-libgfortran>0:devel/linux-${linux_ARGS}-libgfortran
 linux_libgpg-error_DEP=		linux-${linux_ARGS}-libgpg-error>0:security/linux-${linux_ARGS}-libgpg-error
@@ -104,22 +110,29 @@ linux_libtheora_DEP=		linux-${linux_ARGS}-libtheora>0:multimedia/linux-${linux_A
 linux_libv4l_DEP=		linux-${linux_ARGS}-libv4l>0:multimedia/linux-${linux_ARGS}-libv4l
 linux_libvorbis_DEP=		linux-${linux_ARGS}-libvorbis>0:audio/linux-${linux_ARGS}-libvorbis
 linux_libxml2_DEP=		linux-${linux_ARGS}-libxml2>0:textproc/linux-${linux_ARGS}-libxml2
-linux_mikmod_DEP=		linux-${linux_ARGS}-mikmod>0:audio/linux-${linux_ARGS}-mikmod
-linux_naslibs_DEP=		linux-${linux_ARGS}-nas-libs>0:audio/linux-${linux_ARGS}-nas-libs
+linux_mikmod_DEP=		linux-${linux_ARGS}-libmikmod>0:audio/linux-${linux_ARGS}-mikmod
+linux_naslibs_DEP=		linux-${linux_ARGS}-nas>0:audio/linux-${linux_ARGS}-nas-libs
 linux_ncurses-base_DEP=		linux-${linux_ARGS}-ncurses-base>0:devel/linux-${linux_ARGS}-ncurses-base
 linux_nspr_DEP=			linux-${linux_ARGS}-nspr>0:devel/linux-${linux_ARGS}-nspr
 linux_nss_DEP=			linux-${linux_ARGS}-nss>0:security/linux-${linux_ARGS}-nss
 linux_openal_DEP=		linux-${linux_ARGS}-openal>0:audio/linux-${linux_ARGS}-openal
 linux_openal-soft_DEP=		linux-${linux_ARGS}-openal-soft>0:audio/linux-${linux_ARGS}-openal-soft
 linux_openldap_DEP=		linux-${linux_ARGS}-openldap>0:net/linux-${linux_ARGS}-openldap
+.if ${linux_ARGS} == c6
 linux_openmotif_DEP=		linux-${linux_ARGS}-openmotif>0:x11-toolkits/linux-${linux_ARGS}-openmotif
+.else
+linux_openmotif_DEP=		linux-${linux_ARGS}-motif>0:x11-toolkits/linux-${linux_ARGS}-openmotif
+.endif
+.if ${linux_ARGS} == c6
 linux_openssl_DEP=		linux-${linux_ARGS}-openssl>0:security/linux-${linux_ARGS}-openssl
-linux_openssl-compat_DEP=	linux-${linux_ARGS}-openssl-compat>0:security/linux-${linux_ARGS}-openssl-compat
+.else
+linux_openssl_DEP=		linux-${linux_ARGS}-openssl-libs>0:security/linux-${linux_ARGS}-openssl
+.endif
 linux_pango_DEP=		linux-${linux_ARGS}-pango>0:x11-toolkits/linux-${linux_ARGS}-pango
 linux_pixman_DEP=		linux-${linux_ARGS}-pixman>0:x11/linux-${linux_ARGS}-pixman
-linux_png_DEP=			linux-${linux_ARGS}-png>0:graphics/linux-${linux_ARGS}-png
+linux_png_DEP=			linux-${linux_ARGS}-libpng>0:graphics/linux-${linux_ARGS}-png
 linux_pulseaudio-libs_DEP=	linux-${linux_ARGS}-pulseaudio-libs>0:audio/linux-${linux_ARGS}-pulseaudio-libs
-.if ${linux_ARGS:Mc6}
+.if ${linux_ARGS} == c6
 linux_qt_DEP=			linux-${linux_ARGS}-qt47>0:devel/linux-${linux_ARGS}-qt47
 linux_qt-x11_DEP=		linux-${linux_ARGS}-qt47-x11>0:x11-toolkits/linux-${linux_ARGS}-qt47-x11
 linux_qtwebkit_DEP=		linux-${linux_ARGS}-qt47-webkit>0:www/linux-${linux_ARGS}-qt47-webkit
@@ -135,7 +148,7 @@ linux_sdlmixer_DEP=		linux-${linux_ARGS}-sdl_mixer>0:audio/linux-${linux_ARGS}-s
 linux_sqlite3_DEP=		linux-${linux_ARGS}-sqlite>0:databases/linux-${linux_ARGS}-sqlite3
 linux_tcl85_DEP=		linux-${linux_ARGS}-tcl85>0:lang/linux-${linux_ARGS}-tcl85
 linux_tcp_wrappers-libs_DEP=	linux-${linux_ARGS}-tcp_wrappers-libs>0:net/linux-${linux_ARGS}-tcp_wrappers-libs
-linux_tiff_DEP=			linux-${linux_ARGS}-tiff>0:graphics/linux-${linux_ARGS}-tiff
+linux_tiff_DEP=			linux-${linux_ARGS}-libtiff>0:graphics/linux-${linux_ARGS}-tiff
 linux_tk85_DEP=			linux-${linux_ARGS}-tk85>0:x11-toolkits/linux-${linux_ARGS}-tk85
 linux_ucl_DEP=			linux-${linux_ARGS}-ucl>0:archivers/linux-${linux_ARGS}-ucl
 linux_xorglibs_DEP=		linux-${linux_ARGS}-xorg-libs>0:x11/linux-${linux_ARGS}-xorg-libs
@@ -159,58 +172,35 @@ RUN_DEPENDS+=		${linux_${i:C/:.*//}_DEP}
 DISTVERSIONSUFFIX?=	-${RPMVERSION}
 
 .if ${linux_ARGS} == c6
-
 .ifndef MASTER_SITES
 MASTER_SITES=		${MASTER_SITE_CENTOS_LINUX}
-MASTER_SITE_SUBDIR=	centos/${LINUX_DIST_VER}/os/${LINUX_ARCH}/Packages \
-			centos/${LINUX_DIST_VER}/updates/${LINUX_ARCH}/Packages \
+MASTER_SITE_SUBDIR=	centos/${LINUX_DIST_VER}/os/x86_64/Packages/:DEFAULT,amd64 \
+			centos/${LINUX_DIST_VER}/updates/x86_64/Packages/:DEFAULT,amd64 \
+			centos/${LINUX_DIST_VER}/os/i386/Packages/:DEFAULT,i386 \
+			centos/${LINUX_DIST_VER}/updates/i386/Packages/:DEFAULT,i386 \
 			centos/${LINUX_DIST_VER}/os/Source/SPackages/:SOURCE \
 			centos/${LINUX_DIST_VER}/updates/Source/SPackages/:SOURCE
 .endif
-DIST_SUBDIR?=		rpm/${LINUX_RPM_ARCH}/centos/${LINUX_DIST_VER}
-
-.if ${USE_LINUX_RPM} == noarch
-LINUX_RPM_ARCH?=	noarch
-.elif ${LINUX_ARCH} == x86_64
-LINUX_RPM_ARCH?=	x86_64
-LINUX_RPM_ARCH32?=	i686
-.else
-LINUX_RPM_ARCH?=	i686
-.endif
-
+DIST_SUBDIR?=		centos
 .elif ${linux_ARGS} == c7
-
 .ifndef MASTER_SITES
 MASTER_SITES=		${MASTER_SITE_CENTOS_LINUX}
-.if ${LINUX_ARCH} == x86_64
-MASTER_SITE_SUBDIR=	centos/${LINUX_DIST_VER}/os/${LINUX_ARCH}/Packages \
-			centos/${LINUX_DIST_VER}/updates/${LINUX_ARCH}/Packages
-.else
-MASTER_SITE_SUBDIR=	altarch/${LINUX_DIST_VER}/os/${LINUX_ARCH}/Packages \
-			altarch/${LINUX_DIST_VER}/updates/${LINUX_ARCH}/Packages
-.endif
-MASTER_SITE_SUBDIR+=	centos/${LINUX_DIST_VER}/os/Source/SPackages/:SOURCE \
+MASTER_SITE_SUBDIR=	centos/${LINUX_DIST_VER}/os/x86_64/Packages/:DEFAULT,amd64 \
+			centos/${LINUX_DIST_VER}/updates/x86_64/Packages/:DEFAULT,amd64 \
+			altarch/${LINUX_DIST_VER}/os/i386/Packages/:DEFAULT,i386 \
+			altarch/${LINUX_DIST_VER}/updates/i386/Packages/:DEFAULT,i386 \
+			centos/${LINUX_DIST_VER}/os/Source/SPackages/:SOURCE \
 			centos/${LINUX_DIST_VER}/updates/Source/SPackages/:SOURCE
 .endif
 DIST_SUBDIR?=		centos
-
-.if ${USE_LINUX_RPM} == noarch
-LINUX_RPM_ARCH?=	noarch
-.elif ${LINUX_ARCH} == x86_64
-LINUX_RPM_ARCH?=	x86_64
-LINUX_RPM_ARCH32?=	i686
-.else
-LINUX_RPM_ARCH?=	i686
-.endif
-
 .endif # ${linux_ARGS} == *
 
 PKGNAMEPREFIX?=		linux-${linux_ARGS}-
-EXTRACT_SUFX?=		.${LINUX_RPM_ARCH}.rpm
-.ifdef LINUX_RPM_ARCH32
-EXTRACT_SUFX32?=	.${LINUX_RPM_ARCH32}.rpm
-.endif
-SRC_SUFX?=		.src.rpm
+EXTRACT_SUFX?=		.rpm
+EXTRACT_SUFX_amd64?=	.x86_64${EXTRACT_SUFX}
+EXTRACT_SUFX_i386?=	.i686${EXTRACT_SUFX}
+EXTRACT_SUFX_noarch?=	.noarch${EXTRACT_SUFX}
+SRC_SUFX?=		.src${EXTRACT_SUFX}
 
 NO_BUILD=		yes
 NO_WRKSUBDIR=		yes
@@ -227,34 +217,33 @@ _INCLUDE_USES_LINUX_POST_MK=	yes
 
 .if ${USE_LINUX_RPM} == noarch
 NO_ARCH=		yes
+SHARE_DISTNAMES?=	${DISTNAME}
+.elif ${USE_LINUX_RPM} == nolib
+BIN_DISTNAMES?=		${DISTNAME}
 .else
-ONLY_FOR_ARCHS?=	i386 amd64
+LIB_DISTNAMES?=		${DISTNAME}
 .endif
-
-.if ${USE_LINUX_RPM} == yes
-LIB_DISTFILES?=		${DISTNAME}${EXTRACT_SUFX}
+.if !(defined(ONLY_FOR_ARCHS) && empty(ONLY_FOR_ARCHS:Mamd64)) \
+ && empty(NOT_FOR_ARCHS:Mamd64)
+.if !(defined(ONLY_FOR_ARCHS) && empty(ONLY_FOR_ARCHS:Mi386)) \
+ && empty(NOT_FOR_ARCHS:Mi386)
+DISTFILES_amd64?=	${LIB_DISTNAMES:S/$/${EXTRACT_SUFX_i386}:amd64,i386/} \
+			${LIB_DISTNAMES:S/$/${EXTRACT_SUFX_amd64}:amd64/} \
+			${BIN_DISTNAMES:S/$/${EXTRACT_SUFX_amd64}:amd64/} \
+			${SHARE_DISTNAMES:S/$/${EXTRACT_SUFX_noarch}/}
 .else
-BIN_DISTFILES?=		${DISTNAME}${EXTRACT_SUFX}
+DISTFILES_amd64?=	${LIB_DISTNAMES:S/$/${EXTRACT_SUFX_amd64}/} \
+			${BIN_DISTNAMES:S/$/${EXTRACT_SUFX_amd64}/} \
+			${SHARE_DISTNAMES:S/$/${EXTRACT_SUFX_noarch}/}
 .endif
-.if defined(LINUX_ARCH32) && defined(EXTRACT_SUFX32) \
- && !(defined(ONLY_FOR_ARCHS) && empty(ONLY_FOR_ARCHS:M${LINUX_ARCH32})) \
- && empty(NOT_FOR_ARCHS:M${LINUX_ARCH32})
-DISTFILES?=		${LIB_DISTFILES:S/${EXTRACT_SUFX}/${EXTRACT_SUFX32}/} \
-			${LIB_DISTFILES} ${BIN_DISTFILES}
-EXTRACT_ONLY?=		${LIB_DISTFILES:S/${EXTRACT_SUFX}/${EXTRACT_SUFX32}/} \
-			${LIB_DISTFILES} ${BIN_DISTFILES}
-.else
-DISTFILES?=		${LIB_DISTFILES} ${BIN_DISTFILES}
-EXTRACT_ONLY?=		${LIB_DISTFILES} ${BIN_DISTFILES}
 .endif
-.ifdef PACKAGE_BUILDING
-SRC_DISTFILES?=		${LIB_DISTFILES:S/${EXTRACT_SUFX}/${SRC_SUFX}:SOURCE/} \
-			${BIN_DISTFILES:S/${EXTRACT_SUFX}/${SRC_SUFX}:SOURCE/}
-DISTFILES+=		${SRC_DISTFILES}
-ALWAYS_KEEP_DISTFILES=	yes
+.if !(defined(ONLY_FOR_ARCHS) && empty(ONLY_FOR_ARCHS:Mi386)) \
+ && empty(NOT_FOR_ARCHS:Mi386) && ${linux_ARGS} != c7
+DISTFILES_i386?=	${LIB_DISTNAMES:S/$/${EXTRACT_SUFX_i386}:amd64,i386/} \
+			${BIN_DISTNAMES:S/$/${EXTRACT_SUFX_i386}:i386/} \
+			${SHARE_DISTNAMES:S/$/${EXTRACT_SUFX_noarch}/}
 .endif
-
-DISTINFO_FILE?=		${MASTERDIR}/distinfo.${LINUX_ARCH}
+SRC_DISTFILES?=		${DISTNAME}${SRC_SUFX}:SOURCE
 
 .ifdef USE_LINUX_RPM_BAD_PERMS
 EXTRACT_DEPENDS+=	rpm2archive:archivers/rpm4
@@ -264,33 +253,52 @@ EXTRACT_AFTER_ARGS=	| ${TAR} xf - --no-same-owner --no-same-permissions
 .endif
 
 .if ${USE_LINUX_RPM} != noarch
-PLIST?=			${PKGDIR}/pkg-plist.${LINUX_ARCH}
+PLIST?=			${PKGDIR}/pkg-plist.${LINUX_ARCH:S/x86_64/amd64/}
 .endif
 
 .if !target(do-install)
 do-install:
-	(cd ${WRKSRC} && ${FIND} * | ${CPIO} -dumpl ${STAGEDIR}${PREFIX})
+	(cd ${WRKSRC} && \
+		${FIND} * | ${CPIO} -dumpl --quiet ${STAGEDIR}${PREFIX})
+.for d in bin lib lib64 sbin
+	[ ! -e ${STAGEDIR}${PREFIX}/${d} -o -L ${STAGEDIR}${PREFIX}/${d} ] || \
+		(cd ${STAGEDIR}${PREFIX} && \
+		${FIND} ${d} | ${CPIO} -dumpl --quiet usr && ${RM} -r ${d})
+.endfor
+	[ ! -e ${STAGEDIR}${PREFIX}/usr/share/icons -o \
+		-L ${STAGEDIR}${PREFIX}/usr/share/icons ] || \
+		(cd ${STAGEDIR}${PREFIX}/usr/share && ${FIND} icons | \
+		${CPIO} -dumpl --quiet ${STAGEDIR}${LOCALBASE}/share && \
+		${RM} -r icons)
 .endif
 
 .endif # USE_LINUX_RPM
 
+.ifdef DISTNAME_amd64
+DISTFILES_amd64?=	${DISTNAME_amd64}${EXTRACT_SUFX}
+.endif
 .ifdef DISTNAME_i386
 DISTFILES_i386?=	${DISTNAME_i386}${EXTRACT_SUFX}
 .endif
-.ifdef DISTNAME_x86_64
-DISTFILES_x86_64?=	${DISTNAME_x86_64}${EXTRACT_SUFX}
-.endif
-.ifdef DISTFILES_i386 || DISTFILES_x86_64
+.ifndef DISTFILES
+.ifdef DISTFILES_amd64 || DISTFILES_i386
 .if make(makesum)
-.if !defined(DISTFILES)
-DISTFILES=		${DISTFILES_i386} ${DISTFILES_x86_64}
-EXTRACT_ONLY?=		${DISTFILES_${LINUX_ARCH}}
-.endif
+_ALL_DISTFILES=		${DISTFILES_amd64} ${DISTFILES_i386}
+DISTFILES=		${_ALL_DISTFILES:O:u}
 .else
-DISTFILES?=		${DISTFILES_${LINUX_ARCH}}
+DISTFILES=		${DISTFILES_${LINUX_ARCH:S/x86_64/amd64/}}
+.endif
+EXTRACT_ONLY?=		${DISTFILES_${LINUX_ARCH:S/x86_64/amd64/}:C/:[^:]+$//}
+.endif
 .endif
+.if !empty(SRC_DISTFILES) && (make(makesum) || defined(PACKAGE_BUILDING))
+DISTFILES+=		${SRC_DISTFILES}
+ALWAYS_KEEP_DISTFILES=	yes
 .endif
 
+# This triggers on amd64 with DEFAULT_VERSIONS+=linux=c6 (i386 Linux) and
+# ports with ONLY_FOR_ARCHS=amd64 or NOT_FOR_ARCHS=i386.  It may be removed
+# when c6 becomes an alias for c6_64 on amd64 (after FreeBSD 10.3 EoL).
 .if (defined(ONLY_FOR_ARCHS) && empty(ONLY_FOR_ARCHS:M${LINUX_ARCH:S/x86_64/amd64/})) \
  || !empty(NOT_FOR_ARCHS:M${LINUX_ARCH:S/x86_64/amd64/})
 IGNORE=			does not run on Linux/${LINUX_ARCH}
diff --git a/Mk/bsd.sites.mk b/Mk/bsd.sites.mk
index b59045c7132b..5f86931b0c34 100644
--- a/Mk/bsd.sites.mk
+++ b/Mk/bsd.sites.mk
@@ -227,19 +227,20 @@ MASTER_SITE_EXIM+= \
 
 .if !defined(IGNORE_MASTER_SITE_CENTOS_LINUX)
 MASTER_SITE_CENTOS_LINUX+= \
-	http://mirror.centos.org/%SUBDIR%/:DEFAULT,SOURCE \
-	http://vault.centos.org/%SUBDIR%/:DEFAULT,SOURCE
+	http://mirror.centos.org/%SUBDIR%/:DEFAULT,amd64,i386 \
+	http://vault.centos.org/%SUBDIR%/:DEFAULT,amd64,i386,SOURCE
 .endif
 
 .if !defined(IGNORE_MASTER_SITE_EPEL)
 MASTER_SITE_EPEL+= \
-	http://dl.fedoraproject.org/pub/epel/6/${LINUX_ARCH}/ \
+	http://dl.fedoraproject.org/pub/epel/6/x86_64/:DEFAULT,amd64 \
+	http://dl.fedoraproject.org/pub/epel/6/i386/:DEFAULT,i386 \
 	http://dl.fedoraproject.org/pub/epel/6/SRPMS/:SOURCE
 .endif
 
 .if !defined(IGNORE_MASTER_SITE_EPEL7)
 MASTER_SITE_EPEL7+= \
-	http://dl.fedoraproject.org/pub/epel/7/${LINUX_ARCH}/%SUBDIR%/ \
+	http://dl.fedoraproject.org/pub/epel/7/x86_64/%SUBDIR%/:DEFAULT,amd64 \
 	http://dl.fedoraproject.org/pub/epel/7/SRPMS/%SUBDIR%/:SOURCE
 .endif