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

4 files changed, 7 insertions, 8 deletions

diff --git a/audio/linux-c7-alsa-plugins-pulseaudio/Makefile b/audio/linux-c7-alsa-plugins-pulseaudio/Makefile
index a7eec15fff35..a331ec48e4a6 100644
--- a/audio/linux-c7-alsa-plugins-pulseaudio/Makefile
+++ b/audio/linux-c7-alsa-plugins-pulseaudio/Makefile
@@ -1,19 +1,22 @@
 # Created by: Piotr Kubaj <pkubaj@anongoth.pl>
 # $FreeBSD$
 
-PORTNAME=	alsa-plugins-pulseaudio
+PORTNAME=	alsa-plugins
 PORTVERSION=	1.1.1
 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-c6-${PORTNAME}-[0-9]*
-
-SRC_DISTFILES=	alsa-plugins-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}:SOURCE
+CONFLICTS=	linux-c6-${LINUXNAME}-[0-9]*
 
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
+DOCSDIR=	${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION}
+LINUXNAME=	${PORTNAME}${PKGNAMESUFFIX}
 RPMVERSION=	1.el7
 USES=		linux:c7
 USE_LDCONFIG=	yes
diff --git a/audio/linux-c7-alsa-plugins-pulseaudio/distinfo.x86_64 b/audio/linux-c7-alsa-plugins-pulseaudio/distinfo
index f4960a1b3e46..f4960a1b3e46 100644
--- a/audio/linux-c7-alsa-plugins-pulseaudio/distinfo.x86_64
+++ b/audio/linux-c7-alsa-plugins-pulseaudio/distinfo
diff --git a/audio/linux-c7-alsa-plugins-pulseaudio/pkg-descr b/audio/linux-c7-alsa-plugins-pulseaudio/pkg-descr
deleted file mode 100644
index 9447636da467..000000000000
--- a/audio/linux-c7-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-c7-alsa-plugins-pulseaudio/pkg-plist.x86_64 b/audio/linux-c7-alsa-plugins-pulseaudio/pkg-plist.amd64
index 5e08139f076c..5e08139f076c 100644
--- a/audio/linux-c7-alsa-plugins-pulseaudio/pkg-plist.x86_64
+++ b/audio/linux-c7-alsa-plugins-pulseaudio/pkg-plist.amd64