- 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, 69 insertions, 65 deletions

diff --git a/audio/linux-c7-pulseaudio-libs/Makefile b/audio/linux-c7-pulseaudio-libs/Makefile
index 02c9b354f065..04dabe51370d 100644
--- a/audio/linux-c7-pulseaudio-libs/Makefile
+++ b/audio/linux-c7-pulseaudio-libs/Makefile
@@ -1,26 +1,30 @@
 # Created by: Piotr Kubaj <pkubaj@anongoth.pl>
 # $FreeBSD$
 
-PORTNAME=	pulseaudio-libs
+PORTNAME=	pulseaudio
 PORTVERSION=	6.0
 PORTREVISION=	1
 CATEGORIES=	audio linux
-LIB_DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		${PORTNAME}-glib2-${PORTVERSION}-${RPMVERSION}${EXTRACT_SUFX}
-SRC_DISTFILES=	pulseaudio-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}:SOURCE
+PKGNAMESUFFIX=	-libs
+LIB_DISTNAMES=	${LINUXNAME}-${DISTVERSIONFULL} \
+		${LINUXNAME}-glib2-${DISTVERSIONFULL}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Libraries for PulseAudio clients (Linux CentOS ${LINUX_DIST_VER})
 
-CONFLICTS=	linux-c6-${PORTNAME}-[0-9]*
+CONFLICTS=	linux-c6-${LINUXNAME}-[0-9]*
 
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
+DOCSDIR=	${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION}
+LINUXNAME=	${PORTNAME}${PKGNAMESUFFIX}
 RPMVERSION=	8.el7
 USES=		linux:c7
 USE_LDCONFIG=	yes
 USE_LINUX=	dbuslibs libasyncns libsndfile tcp_wrappers-libs xorglibs
 USE_LINUX_RPM=	yes
 
-DESCR=		${.CURDIR}/../pulseaudio/pkg-descr
+OPTIONS_DEFINE=	DOCS NLS
+OPTIONS_SUB=	yes
 
 post-patch:
 	@${RM} ${WRKSRC}/etc/pulse/client.conf.orig \
diff --git a/audio/linux-c7-pulseaudio-libs/distinfo.x86_64 b/audio/linux-c7-pulseaudio-libs/distinfo
index d58c6975bd82..d58c6975bd82 100644
--- a/audio/linux-c7-pulseaudio-libs/distinfo.x86_64
+++ b/audio/linux-c7-pulseaudio-libs/distinfo
diff --git a/audio/linux-c7-pulseaudio-libs/pkg-plist.amd64 b/audio/linux-c7-pulseaudio-libs/pkg-plist.amd64
new file mode 100644
index 000000000000..a3bda724430b
--- /dev/null
+++ b/audio/linux-c7-pulseaudio-libs/pkg-plist.amd64
@@ -0,0 +1,59 @@
+etc/pulse/client.conf
+usr/lib/libpulse-mainloop-glib.so.0
+usr/lib/libpulse-mainloop-glib.so.0.0.5
+usr/lib/libpulse-simple.so.0
+usr/lib/libpulse-simple.so.0.1.0
+usr/lib/libpulse.so.0
+usr/lib/libpulse.so.0.18.0
+usr/lib/pulseaudio/libpulsecommon-6.0.so
+usr/lib/pulseaudio/libpulsedsp.so
+usr/lib64/libpulse-mainloop-glib.so.0
+usr/lib64/libpulse-mainloop-glib.so.0.0.5
+usr/lib64/libpulse-simple.so.0
+usr/lib64/libpulse-simple.so.0.1.0
+usr/lib64/libpulse.so.0
+usr/lib64/libpulse.so.0.18.0
+usr/lib64/pulseaudio/libpulsecommon-6.0.so
+usr/lib64/pulseaudio/libpulsedsp.so
+%%PORTDOCS%%%%DOCSDIR%%/GPL
+%%PORTDOCS%%%%DOCSDIR%%/LGPL
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%NLS%%usr/share/locale/as/LC_MESSAGES/pulseaudio.mo
+%%NLS%%usr/share/locale/bn_IN/LC_MESSAGES/pulseaudio.mo
+%%NLS%%usr/share/locale/ca/LC_MESSAGES/pulseaudio.mo
+%%NLS%%usr/share/locale/cs/LC_MESSAGES/pulseaudio.mo
+%%NLS%%usr/share/locale/de/LC_MESSAGES/pulseaudio.mo
+%%NLS%%usr/share/locale/de_CH/LC_MESSAGES/pulseaudio.mo
+%%NLS%%usr/share/locale/el/LC_MESSAGES/pulseaudio.mo
+%%NLS%%usr/share/locale/es/LC_MESSAGES/pulseaudio.mo
+%%NLS%%usr/share/locale/fi/LC_MESSAGES/pulseaudio.mo
+%%NLS%%usr/share/locale/fr/LC_MESSAGES/pulseaudio.mo
+%%NLS%%usr/share/locale/gu/LC_MESSAGES/pulseaudio.mo
+%%NLS%%usr/share/locale/he/LC_MESSAGES/pulseaudio.mo
+%%NLS%%usr/share/locale/hi/LC_MESSAGES/pulseaudio.mo
+%%NLS%%usr/share/locale/hu/LC_MESSAGES/pulseaudio.mo
+%%NLS%%usr/share/locale/id/LC_MESSAGES/pulseaudio.mo
+%%NLS%%usr/share/locale/it/LC_MESSAGES/pulseaudio.mo
+%%NLS%%usr/share/locale/ja/LC_MESSAGES/pulseaudio.mo
+%%NLS%%usr/share/locale/kn/LC_MESSAGES/pulseaudio.mo
+%%NLS%%usr/share/locale/ko/LC_MESSAGES/pulseaudio.mo
+%%NLS%%usr/share/locale/ml/LC_MESSAGES/pulseaudio.mo
+%%NLS%%usr/share/locale/mr/LC_MESSAGES/pulseaudio.mo
+%%NLS%%usr/share/locale/nl/LC_MESSAGES/pulseaudio.mo
+%%NLS%%usr/share/locale/or/LC_MESSAGES/pulseaudio.mo
+%%NLS%%usr/share/locale/pa/LC_MESSAGES/pulseaudio.mo
+%%NLS%%usr/share/locale/pl/LC_MESSAGES/pulseaudio.mo
+%%NLS%%usr/share/locale/pt/LC_MESSAGES/pulseaudio.mo
+%%NLS%%usr/share/locale/pt_BR/LC_MESSAGES/pulseaudio.mo
+%%NLS%%usr/share/locale/ru/LC_MESSAGES/pulseaudio.mo
+%%NLS%%usr/share/locale/sk/LC_MESSAGES/pulseaudio.mo
+%%NLS%%usr/share/locale/sr/LC_MESSAGES/pulseaudio.mo
+%%NLS%%usr/share/locale/sr@latin/LC_MESSAGES/pulseaudio.mo
+%%NLS%%usr/share/locale/sv/LC_MESSAGES/pulseaudio.mo
+%%NLS%%usr/share/locale/ta/LC_MESSAGES/pulseaudio.mo
+%%NLS%%usr/share/locale/te/LC_MESSAGES/pulseaudio.mo
+%%NLS%%usr/share/locale/tr/LC_MESSAGES/pulseaudio.mo
+%%NLS%%usr/share/locale/uk/LC_MESSAGES/pulseaudio.mo
+%%NLS%%usr/share/locale/zh_CN/LC_MESSAGES/pulseaudio.mo
+%%NLS%%usr/share/locale/zh_TW/LC_MESSAGES/pulseaudio.mo
diff --git a/audio/linux-c7-pulseaudio-libs/pkg-plist.x86_64 b/audio/linux-c7-pulseaudio-libs/pkg-plist.x86_64
deleted file mode 100644
index 64605cdc74cc..000000000000
--- a/audio/linux-c7-pulseaudio-libs/pkg-plist.x86_64
+++ /dev/null
@@ -1,59 +0,0 @@
-etc/pulse/client.conf
-usr/lib/libpulse-mainloop-glib.so.0
-usr/lib/libpulse-mainloop-glib.so.0.0.5
-usr/lib/libpulse-simple.so.0
-usr/lib/libpulse-simple.so.0.1.0
-usr/lib/libpulse.so.0
-usr/lib/libpulse.so.0.18.0
-usr/lib/pulseaudio/libpulsecommon-6.0.so
-usr/lib/pulseaudio/libpulsedsp.so
-usr/lib64/libpulse-mainloop-glib.so.0
-usr/lib64/libpulse-mainloop-glib.so.0.0.5
-usr/lib64/libpulse-simple.so.0
-usr/lib64/libpulse-simple.so.0.1.0
-usr/lib64/libpulse.so.0
-usr/lib64/libpulse.so.0.18.0
-usr/lib64/pulseaudio/libpulsecommon-6.0.so
-usr/lib64/pulseaudio/libpulsedsp.so
-%%PORTDOCS%%%%DOCSDIR%%/GPL
-%%PORTDOCS%%%%DOCSDIR%%/LGPL
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE
-%%PORTDOCS%%%%DOCSDIR%%/README
-usr/share/locale/as/LC_MESSAGES/pulseaudio.mo
-usr/share/locale/bn_IN/LC_MESSAGES/pulseaudio.mo
-usr/share/locale/ca/LC_MESSAGES/pulseaudio.mo
-usr/share/locale/cs/LC_MESSAGES/pulseaudio.mo
-usr/share/locale/de/LC_MESSAGES/pulseaudio.mo
-usr/share/locale/de_CH/LC_MESSAGES/pulseaudio.mo
-usr/share/locale/el/LC_MESSAGES/pulseaudio.mo
-usr/share/locale/es/LC_MESSAGES/pulseaudio.mo
-usr/share/locale/fi/LC_MESSAGES/pulseaudio.mo
-usr/share/locale/fr/LC_MESSAGES/pulseaudio.mo
-usr/share/locale/gu/LC_MESSAGES/pulseaudio.mo
-usr/share/locale/he/LC_MESSAGES/pulseaudio.mo
-usr/share/locale/hi/LC_MESSAGES/pulseaudio.mo
-usr/share/locale/hu/LC_MESSAGES/pulseaudio.mo
-usr/share/locale/id/LC_MESSAGES/pulseaudio.mo
-usr/share/locale/it/LC_MESSAGES/pulseaudio.mo
-usr/share/locale/ja/LC_MESSAGES/pulseaudio.mo
-usr/share/locale/kn/LC_MESSAGES/pulseaudio.mo
-usr/share/locale/ko/LC_MESSAGES/pulseaudio.mo
-usr/share/locale/ml/LC_MESSAGES/pulseaudio.mo
-usr/share/locale/mr/LC_MESSAGES/pulseaudio.mo
-usr/share/locale/nl/LC_MESSAGES/pulseaudio.mo
-usr/share/locale/or/LC_MESSAGES/pulseaudio.mo
-usr/share/locale/pa/LC_MESSAGES/pulseaudio.mo
-usr/share/locale/pl/LC_MESSAGES/pulseaudio.mo
-usr/share/locale/pt/LC_MESSAGES/pulseaudio.mo
-usr/share/locale/pt_BR/LC_MESSAGES/pulseaudio.mo
-usr/share/locale/ru/LC_MESSAGES/pulseaudio.mo
-usr/share/locale/sk/LC_MESSAGES/pulseaudio.mo
-usr/share/locale/sr/LC_MESSAGES/pulseaudio.mo
-usr/share/locale/sr@latin/LC_MESSAGES/pulseaudio.mo
-usr/share/locale/sv/LC_MESSAGES/pulseaudio.mo
-usr/share/locale/ta/LC_MESSAGES/pulseaudio.mo
-usr/share/locale/te/LC_MESSAGES/pulseaudio.mo
-usr/share/locale/tr/LC_MESSAGES/pulseaudio.mo
-usr/share/locale/uk/LC_MESSAGES/pulseaudio.mo
-usr/share/locale/zh_CN/LC_MESSAGES/pulseaudio.mo
-usr/share/locale/zh_TW/LC_MESSAGES/pulseaudio.mo