- 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, 22 insertions, 37 deletions

diff --git a/audio/linux-c6-alsa-plugins-pulseaudio/Makefile b/audio/linux-c6-alsa-plugins-pulseaudio/Makefile
index f85642a233c2..16e6b40d2d32 100644
--- a/audio/linux-c6-alsa-plugins-pulseaudio/Makefile
+++ b/audio/linux-c6-alsa-plugins-pulseaudio/Makefile
@@ -1,31 +1,25 @@
 # Created by: Johannes Meixner <johannes@perceivon.net>
 # $FreeBSD$
 
-PORTNAME=	alsa-plugins-pulseaudio
+PORTNAME=	alsa-plugins
 PORTVERSION=	1.1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio linux
+PKGNAMESUFFIX=	-pulseaudio
+LIB_DISTNAMES=	${LINUXNAME}-${DISTVERSIONFULL}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	PulseAudio plugin for ALSA (Linux CentOS ${LINUX_DIST_VER})
 
 LICENSE=	GPLv3
 
-CONFLICTS=	linux-f10-alsa-plugins-pulseaudio-[0-9]*
-
-.if defined(PACKAGE_BUILDING)
-SRC_DISTFILES=	alsa-plugins-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}:SOURCE
-.endif
-
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
+DOCSDIR=	${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION}
+LINUXNAME=	${PORTNAME}${PKGNAMESUFFIX}
+RPMVERSION=	1.el6
 USES=		linux:c6
+USE_LDCONFIG=	yes
 USE_LINUX=	alsalib pulseaudio-libs
 USE_LINUX_RPM=	yes
-RPMVERSION=	1.el6
-
-USE_LDCONFIG=	yes
-
-# We will use native configuration file, so delete a linux one
-post-extract:
-	@${RM} -r ${WRKSRC}/etc
 
 .include <bsd.port.mk>
diff --git a/audio/linux-c6-alsa-plugins-pulseaudio/distinfo b/audio/linux-c6-alsa-plugins-pulseaudio/distinfo
new file mode 100644
index 000000000000..30a9bb8d95eb
--- /dev/null
+++ b/audio/linux-c6-alsa-plugins-pulseaudio/distinfo
@@ -0,0 +1,7 @@
+TIMESTAMP = 1485442384
+SHA256 (centos/alsa-plugins-pulseaudio-1.1.0-1.el6.i686.rpm) = 74cce02e05b775c7c8e769511e7cf82642324702b5cbc69b331732a785d7cd90
+SIZE (centos/alsa-plugins-pulseaudio-1.1.0-1.el6.i686.rpm) = 35984
+SHA256 (centos/alsa-plugins-pulseaudio-1.1.0-1.el6.x86_64.rpm) = 2d9448ead1c38915b5929ca096d8910ed7730560354d561193b47e5f3dad90a5
+SIZE (centos/alsa-plugins-pulseaudio-1.1.0-1.el6.x86_64.rpm) = 36712
+SHA256 (centos/alsa-plugins-1.1.0-1.el6.src.rpm) = 231cd1118cc663ece2d96c3d4e5ebe4515b63959ec45ed13ad143b947c5ed6eb
+SIZE (centos/alsa-plugins-1.1.0-1.el6.src.rpm) = 380059
diff --git a/audio/linux-c6-alsa-plugins-pulseaudio/distinfo.i386 b/audio/linux-c6-alsa-plugins-pulseaudio/distinfo.i386
deleted file mode 100644
index 482465af6aed..000000000000
--- a/audio/linux-c6-alsa-plugins-pulseaudio/distinfo.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1466256763
-SHA256 (rpm/i686/centos/6.8/alsa-plugins-pulseaudio-1.1.0-1.el6.i686.rpm) = 74cce02e05b775c7c8e769511e7cf82642324702b5cbc69b331732a785d7cd90
-SIZE (rpm/i686/centos/6.8/alsa-plugins-pulseaudio-1.1.0-1.el6.i686.rpm) = 35984
-SHA256 (rpm/i686/centos/6.8/alsa-plugins-1.1.0-1.el6.src.rpm) = 231cd1118cc663ece2d96c3d4e5ebe4515b63959ec45ed13ad143b947c5ed6eb
-SIZE (rpm/i686/centos/6.8/alsa-plugins-1.1.0-1.el6.src.rpm) = 380059
diff --git a/audio/linux-c6-alsa-plugins-pulseaudio/distinfo.x86_64 b/audio/linux-c6-alsa-plugins-pulseaudio/distinfo.x86_64
deleted file mode 100644
index eb7e98619381..000000000000
--- a/audio/linux-c6-alsa-plugins-pulseaudio/distinfo.x86_64
+++ /dev/null
@@ -1,7 +0,0 @@
-TIMESTAMP = 1466257292
-SHA256 (rpm/x86_64/centos/6.8/alsa-plugins-pulseaudio-1.1.0-1.el6.x86_64.rpm) = 2d9448ead1c38915b5929ca096d8910ed7730560354d561193b47e5f3dad90a5
-SIZE (rpm/x86_64/centos/6.8/alsa-plugins-pulseaudio-1.1.0-1.el6.x86_64.rpm) = 36712
-SHA256 (rpm/x86_64/centos/6.8/alsa-plugins-pulseaudio-1.1.0-1.el6.i686.rpm) = 74cce02e05b775c7c8e769511e7cf82642324702b5cbc69b331732a785d7cd90
-SIZE (rpm/x86_64/centos/6.8/alsa-plugins-pulseaudio-1.1.0-1.el6.i686.rpm) = 35984
-SHA256 (rpm/x86_64/centos/6.8/alsa-plugins-1.1.0-1.el6.src.rpm) = 231cd1118cc663ece2d96c3d4e5ebe4515b63959ec45ed13ad143b947c5ed6eb
-SIZE (rpm/x86_64/centos/6.8/alsa-plugins-1.1.0-1.el6.src.rpm) = 380059
diff --git a/audio/linux-c6-alsa-plugins-pulseaudio/pkg-descr b/audio/linux-c6-alsa-plugins-pulseaudio/pkg-descr
deleted file mode 100644
index 9447636da467..000000000000
--- a/audio/linux-c6-alsa-plugins-pulseaudio/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-The Advanced Linux Sound Architecture (ALSA) provides audio and MIDI
-functionality to the Linux operating system.
-
-WWW: http://www.alsa-project.org/
diff --git a/audio/linux-c6-alsa-plugins-pulseaudio/pkg-plist.x86_64 b/audio/linux-c6-alsa-plugins-pulseaudio/pkg-plist.amd64
index 014cb0dcf901..47694f343790 100644
--- a/audio/linux-c6-alsa-plugins-pulseaudio/pkg-plist.x86_64
+++ b/audio/linux-c6-alsa-plugins-pulseaudio/pkg-plist.amd64
@@ -4,6 +4,6 @@ usr/lib/alsa-lib/libasound_module_pcm_pulse.so
 usr/lib64/alsa-lib/libasound_module_conf_pulse.so
 usr/lib64/alsa-lib/libasound_module_ctl_pulse.so
 usr/lib64/alsa-lib/libasound_module_pcm_pulse.so
-%%PORTDOCS%%usr/share/doc/alsa-plugins-pulseaudio-1.1.0/COPYING
-%%PORTDOCS%%usr/share/doc/alsa-plugins-pulseaudio-1.1.0/COPYING.GPL
-%%PORTDOCS%%usr/share/doc/alsa-plugins-pulseaudio-1.1.0/README-pulse
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/COPYING.GPL
+%%PORTDOCS%%%%DOCSDIR%%/README-pulse
diff --git a/audio/linux-c6-alsa-plugins-pulseaudio/pkg-plist.i386 b/audio/linux-c6-alsa-plugins-pulseaudio/pkg-plist.i386
index bbedf8bcfc8f..3934a1029f0a 100644
--- a/audio/linux-c6-alsa-plugins-pulseaudio/pkg-plist.i386
+++ b/audio/linux-c6-alsa-plugins-pulseaudio/pkg-plist.i386
@@ -1,6 +1,6 @@
 usr/lib/alsa-lib/libasound_module_conf_pulse.so
 usr/lib/alsa-lib/libasound_module_ctl_pulse.so
 usr/lib/alsa-lib/libasound_module_pcm_pulse.so
-%%PORTDOCS%%usr/share/doc/alsa-plugins-pulseaudio-1.1.0/COPYING
-%%PORTDOCS%%usr/share/doc/alsa-plugins-pulseaudio-1.1.0/COPYING.GPL
-%%PORTDOCS%%usr/share/doc/alsa-plugins-pulseaudio-1.1.0/README-pulse
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/COPYING.GPL
+%%PORTDOCS%%%%DOCSDIR%%/README-pulse