aboutsummaryrefslogtreecommitdiffstats
path: root/audio
diff options
context:
space:
mode:
authortijl <tijl@FreeBSD.org>2017-02-01 00:54:21 +0800
committertijl <tijl@FreeBSD.org>2017-02-01 00:54:21 +0800
commit844eb16a686a8eaf36b88417fa047f2a37149374 (patch)
tree31bde26cde7c64937193d64587b12c96997aad8c /audio
parent475d84cbbcf4a6fe952d02d30a5c2201b7236bbd (diff)
downloadfreebsd-ports-gnome-844eb16a686a8eaf36b88417fa047f2a37149374.tar.gz
freebsd-ports-gnome-844eb16a686a8eaf36b88417fa047f2a37149374.tar.zst
freebsd-ports-gnome-844eb16a686a8eaf36b88417fa047f2a37149374.zip
- 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.
Diffstat (limited to 'audio')
-rw-r--r--audio/Makefile3
-rw-r--r--audio/linux-c6-alsa-lib/Makefile27
-rw-r--r--audio/linux-c6-alsa-lib/distinfo7
-rw-r--r--audio/linux-c6-alsa-lib/distinfo.i3865
-rw-r--r--audio/linux-c6-alsa-lib/distinfo.x86_647
-rw-r--r--audio/linux-c6-alsa-lib/pkg-descr4
-rw-r--r--audio/linux-c6-alsa-lib/pkg-plist.amd6417
-rw-r--r--audio/linux-c6-alsa-lib/pkg-plist.i386126
-rw-r--r--audio/linux-c6-alsa-lib/pkg-plist.x86_64128
-rw-r--r--audio/linux-c6-alsa-plugins-oss/Makefile22
-rw-r--r--audio/linux-c6-alsa-plugins-oss/distinfo7
-rw-r--r--audio/linux-c6-alsa-plugins-oss/distinfo.i3865
-rw-r--r--audio/linux-c6-alsa-plugins-oss/distinfo.x86_647
-rw-r--r--audio/linux-c6-alsa-plugins-oss/pkg-descr4
-rw-r--r--audio/linux-c6-alsa-plugins-oss/pkg-plist.amd64 (renamed from audio/linux-c6-alsa-plugins-oss/pkg-plist.x86_64)6
-rw-r--r--audio/linux-c6-alsa-plugins-oss/pkg-plist.i3866
-rw-r--r--audio/linux-c6-alsa-plugins-pulseaudio/Makefile24
-rw-r--r--audio/linux-c6-alsa-plugins-pulseaudio/distinfo7
-rw-r--r--audio/linux-c6-alsa-plugins-pulseaudio/distinfo.i3865
-rw-r--r--audio/linux-c6-alsa-plugins-pulseaudio/distinfo.x86_647
-rw-r--r--audio/linux-c6-alsa-plugins-pulseaudio/pkg-descr4
-rw-r--r--audio/linux-c6-alsa-plugins-pulseaudio/pkg-plist.amd64 (renamed from audio/linux-c6-alsa-plugins-pulseaudio/pkg-plist.x86_64)6
-rw-r--r--audio/linux-c6-alsa-plugins-pulseaudio/pkg-plist.i3866
-rw-r--r--audio/linux-c6-alsa-utils/Makefile15
-rw-r--r--audio/linux-c6-alsa-utils/distinfo7
-rw-r--r--audio/linux-c6-alsa-utils/distinfo.i3865
-rw-r--r--audio/linux-c6-alsa-utils/distinfo.x86_645
-rw-r--r--audio/linux-c6-alsa-utils/pkg-descr4
-rw-r--r--audio/linux-c6-alsa-utils/pkg-plist.amd64 (renamed from audio/linux-c6-alsa-utils/pkg-plist.x86_64)31
-rw-r--r--audio/linux-c6-alsa-utils/pkg-plist.i38631
-rw-r--r--audio/linux-c6-arts/Makefile24
-rw-r--r--audio/linux-c6-arts/distinfo.i3865
-rw-r--r--audio/linux-c6-arts/distinfo.x86_647
-rw-r--r--audio/linux-c6-arts/pkg-descr1
-rw-r--r--audio/linux-c6-arts/pkg-plist.i38666
-rw-r--r--audio/linux-c6-arts/pkg-plist.x86_64124
-rw-r--r--audio/linux-c6-esound/Makefile27
-rw-r--r--audio/linux-c6-esound/distinfo.i3865
-rw-r--r--audio/linux-c6-esound/distinfo.x86_647
-rw-r--r--audio/linux-c6-esound/pkg-descr1
-rw-r--r--audio/linux-c6-esound/pkg-plist.i3864
-rw-r--r--audio/linux-c6-esound/pkg-plist.x86_648
-rw-r--r--audio/linux-c6-flac/Makefile5
-rw-r--r--audio/linux-c6-flac/distinfo7
-rw-r--r--audio/linux-c6-flac/distinfo.i3865
-rw-r--r--audio/linux-c6-flac/distinfo.x86_647
-rw-r--r--audio/linux-c6-flac/pkg-plist.amd64 (renamed from audio/linux-c6-flac/pkg-plist.x86_64)0
-rw-r--r--audio/linux-c6-libaudiofile/Makefile15
-rw-r--r--audio/linux-c6-libaudiofile/distinfo7
-rw-r--r--audio/linux-c6-libaudiofile/distinfo.i3865
-rw-r--r--audio/linux-c6-libaudiofile/distinfo.x86_647
-rw-r--r--audio/linux-c6-libaudiofile/pkg-plist.amd6425
-rw-r--r--audio/linux-c6-libaudiofile/pkg-plist.i38638
-rw-r--r--audio/linux-c6-libaudiofile/pkg-plist.x86_6425
-rw-r--r--audio/linux-c6-libogg/Makefile11
-rw-r--r--audio/linux-c6-libogg/distinfo7
-rw-r--r--audio/linux-c6-libogg/distinfo.i3865
-rw-r--r--audio/linux-c6-libogg/distinfo.x86_647
-rw-r--r--audio/linux-c6-libogg/pkg-plist.amd648
-rw-r--r--audio/linux-c6-libogg/pkg-plist.i3864
-rw-r--r--audio/linux-c6-libogg/pkg-plist.x86_644
-rw-r--r--audio/linux-c6-libsndfile/Makefile10
-rw-r--r--audio/linux-c6-libsndfile/distinfo7
-rw-r--r--audio/linux-c6-libsndfile/distinfo.i3865
-rw-r--r--audio/linux-c6-libsndfile/distinfo.x86_647
-rw-r--r--audio/linux-c6-libsndfile/pkg-plist.amd64 (renamed from audio/linux-c6-libsndfile/pkg-plist.x86_64)0
-rw-r--r--audio/linux-c6-libvorbis/Makefile12
-rw-r--r--audio/linux-c6-libvorbis/distinfo7
-rw-r--r--audio/linux-c6-libvorbis/distinfo.i3865
-rw-r--r--audio/linux-c6-libvorbis/distinfo.x86_647
-rw-r--r--audio/linux-c6-libvorbis/pkg-plist.amd64 (renamed from audio/linux-c6-libvorbis/pkg-plist.x86_64)0
-rw-r--r--audio/linux-c6-mikmod/Makefile14
-rw-r--r--audio/linux-c6-mikmod/distinfo7
-rw-r--r--audio/linux-c6-mikmod/distinfo.i3865
-rw-r--r--audio/linux-c6-mikmod/distinfo.x86_647
-rw-r--r--audio/linux-c6-mikmod/pkg-plist.amd6410
-rw-r--r--audio/linux-c6-mikmod/pkg-plist.i3866
-rw-r--r--audio/linux-c6-mikmod/pkg-plist.x86_644
-rw-r--r--audio/linux-c6-nas-libs/Makefile11
-rw-r--r--audio/linux-c6-nas-libs/distinfo7
-rw-r--r--audio/linux-c6-nas-libs/distinfo.i3865
-rw-r--r--audio/linux-c6-nas-libs/distinfo.x86_647
-rw-r--r--audio/linux-c6-nas-libs/pkg-plist.amd6410
-rw-r--r--audio/linux-c6-nas-libs/pkg-plist.i38621
-rw-r--r--audio/linux-c6-nas-libs/pkg-plist.x86_6431
-rw-r--r--audio/linux-c6-openal-soft/Makefile15
-rw-r--r--audio/linux-c6-openal-soft/distinfo7
-rw-r--r--audio/linux-c6-openal-soft/distinfo.i3865
-rw-r--r--audio/linux-c6-openal-soft/distinfo.x86_647
-rw-r--r--audio/linux-c6-openal-soft/pkg-plist.amd64 (renamed from audio/linux-c6-openal-soft/pkg-plist.x86_64)1
-rw-r--r--audio/linux-c6-openal-soft/pkg-plist.i3861
-rw-r--r--audio/linux-c6-pulseaudio-libs/Makefile14
-rw-r--r--audio/linux-c6-pulseaudio-libs/distinfo11
-rw-r--r--audio/linux-c6-pulseaudio-libs/distinfo.i3867
-rw-r--r--audio/linux-c6-pulseaudio-libs/distinfo.x86_6411
-rw-r--r--audio/linux-c6-pulseaudio-libs/pkg-plist.amd6453
-rw-r--r--audio/linux-c6-pulseaudio-libs/pkg-plist.i38680
-rw-r--r--audio/linux-c6-pulseaudio-libs/pkg-plist.x86_6453
-rw-r--r--audio/linux-c6-pulseaudio-utils/Makefile10
-rw-r--r--audio/linux-c6-pulseaudio-utils/distinfo7
-rw-r--r--audio/linux-c6-pulseaudio-utils/distinfo.i3865
-rw-r--r--audio/linux-c6-pulseaudio-utils/distinfo.x86_647
-rw-r--r--audio/linux-c6-pulseaudio-utils/pkg-plist.amd64 (renamed from audio/linux-c6-pulseaudio-utils/pkg-plist.x86_64)0
-rw-r--r--audio/linux-c6-sdl_mixer/Makefile14
-rw-r--r--audio/linux-c6-sdl_mixer/distinfo7
-rw-r--r--audio/linux-c6-sdl_mixer/distinfo.i3865
-rw-r--r--audio/linux-c6-sdl_mixer/distinfo.x86_647
-rw-r--r--audio/linux-c6-sdl_mixer/pkg-plist.amd64 (renamed from audio/linux-c6-sdl_mixer/pkg-plist.x86_64)3
-rw-r--r--audio/linux-c6-sdl_mixer/pkg-plist.i3863
-rw-r--r--audio/linux-c7-alsa-lib/Makefile17
-rw-r--r--audio/linux-c7-alsa-lib/distinfo (renamed from audio/linux-c7-alsa-lib/distinfo.x86_64)0
-rw-r--r--audio/linux-c7-alsa-lib/pkg-plist.amd6416
-rw-r--r--audio/linux-c7-alsa-lib/pkg-plist.x86_6495
-rw-r--r--audio/linux-c7-alsa-plugins-oss/Makefile15
-rw-r--r--audio/linux-c7-alsa-plugins-oss/distinfo (renamed from audio/linux-c7-alsa-plugins-oss/distinfo.x86_64)0
-rw-r--r--audio/linux-c7-alsa-plugins-oss/pkg-descr4
-rw-r--r--audio/linux-c7-alsa-plugins-oss/pkg-plist.amd64 (renamed from audio/linux-c7-alsa-plugins-oss/pkg-plist.x86_64)0
-rw-r--r--audio/linux-c7-alsa-plugins-pulseaudio/Makefile11
-rw-r--r--audio/linux-c7-alsa-plugins-pulseaudio/distinfo (renamed from audio/linux-c7-alsa-plugins-pulseaudio/distinfo.x86_64)0
-rw-r--r--audio/linux-c7-alsa-plugins-pulseaudio/pkg-descr4
-rw-r--r--audio/linux-c7-alsa-plugins-pulseaudio/pkg-plist.amd64 (renamed from audio/linux-c7-alsa-plugins-pulseaudio/pkg-plist.x86_64)0
-rw-r--r--audio/linux-c7-alsa-utils/Makefile7
-rw-r--r--audio/linux-c7-alsa-utils/distinfo (renamed from audio/linux-c7-alsa-utils/distinfo.x86_64)0
-rw-r--r--audio/linux-c7-alsa-utils/pkg-descr4
-rw-r--r--audio/linux-c7-alsa-utils/pkg-plist.amd64 (renamed from audio/linux-c7-alsa-utils/pkg-plist.x86_64)6
-rw-r--r--audio/linux-c7-audiofile/Makefile5
-rw-r--r--audio/linux-c7-audiofile/distinfo (renamed from audio/linux-c7-audiofile/distinfo.x86_64)0
-rw-r--r--audio/linux-c7-audiofile/pkg-plist.amd64 (renamed from audio/linux-c7-audiofile/pkg-plist.x86_64)0
-rw-r--r--audio/linux-c7-esound/Makefile29
-rw-r--r--audio/linux-c7-esound/distinfo.x86_645
-rw-r--r--audio/linux-c7-esound/pkg-plist.x86_644
-rw-r--r--audio/linux-c7-flac/Makefile13
-rw-r--r--audio/linux-c7-flac/distinfo (renamed from audio/linux-c7-flac/distinfo.x86_64)4
-rw-r--r--audio/linux-c7-flac/pkg-plist.amd6414
-rw-r--r--audio/linux-c7-flac/pkg-plist.x86_64106
-rw-r--r--audio/linux-c7-libogg/Makefile4
-rw-r--r--audio/linux-c7-libogg/distinfo (renamed from audio/linux-c7-libogg/distinfo.x86_64)0
-rw-r--r--audio/linux-c7-libogg/pkg-plist.amd648
-rw-r--r--audio/linux-c7-libogg/pkg-plist.x86_644
-rw-r--r--audio/linux-c7-libsndfile/Makefile7
-rw-r--r--audio/linux-c7-libsndfile/distinfo (renamed from audio/linux-c7-libsndfile/distinfo.x86_64)4
-rw-r--r--audio/linux-c7-libsndfile/pkg-plist.amd648
-rw-r--r--audio/linux-c7-libsndfile/pkg-plist.x86_6428
-rw-r--r--audio/linux-c7-libvorbis/Makefile4
-rw-r--r--audio/linux-c7-libvorbis/distinfo (renamed from audio/linux-c7-libvorbis/distinfo.x86_64)0
-rw-r--r--audio/linux-c7-libvorbis/pkg-plist.amd64 (renamed from audio/linux-c7-libvorbis/pkg-plist.x86_64)1
-rw-r--r--audio/linux-c7-openal-soft/Makefile10
-rw-r--r--audio/linux-c7-openal-soft/distinfo (renamed from audio/linux-c7-openal-soft/distinfo.x86_64)0
-rw-r--r--audio/linux-c7-openal-soft/pkg-plist.amd64 (renamed from audio/linux-c7-openal-soft/pkg-plist.x86_64)1
-rw-r--r--audio/linux-c7-pulseaudio-libs/Makefile16
-rw-r--r--audio/linux-c7-pulseaudio-libs/distinfo (renamed from audio/linux-c7-pulseaudio-libs/distinfo.x86_64)0
-rw-r--r--audio/linux-c7-pulseaudio-libs/pkg-plist.amd6459
-rw-r--r--audio/linux-c7-pulseaudio-libs/pkg-plist.x86_6459
-rw-r--r--audio/linux-c7-pulseaudio-utils/Makefile12
-rw-r--r--audio/linux-c7-pulseaudio-utils/distinfo (renamed from audio/linux-c7-pulseaudio-utils/distinfo.x86_64)0
-rw-r--r--audio/linux-c7-pulseaudio-utils/pkg-plist.amd64 (renamed from audio/linux-c7-pulseaudio-utils/pkg-plist.x86_64)0
-rw-r--r--audio/linux-c7-sdl_mixer/Makefile10
-rw-r--r--audio/linux-c7-sdl_mixer/distinfo (renamed from audio/linux-c7-sdl_mixer/distinfo.x86_64)0
-rw-r--r--audio/linux-c7-sdl_mixer/pkg-plist.amd64 (renamed from audio/linux-c7-sdl_mixer/pkg-plist.x86_64)3
159 files changed, 621 insertions, 1523 deletions
diff --git a/audio/Makefile b/audio/Makefile
index e665cb07388a..2bdbe7ed7753 100644
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -422,8 +422,6 @@
SUBDIR += linux-c6-alsa-plugins-oss
SUBDIR += linux-c6-alsa-plugins-pulseaudio
SUBDIR += linux-c6-alsa-utils
- SUBDIR += linux-c6-arts
- SUBDIR += linux-c6-esound
SUBDIR += linux-c6-flac
SUBDIR += linux-c6-libaudiofile
SUBDIR += linux-c6-libogg
@@ -440,7 +438,6 @@
SUBDIR += linux-c7-alsa-plugins-pulseaudio
SUBDIR += linux-c7-alsa-utils
SUBDIR += linux-c7-audiofile
- SUBDIR += linux-c7-esound
SUBDIR += linux-c7-flac
SUBDIR += linux-c7-libogg
SUBDIR += linux-c7-libsndfile
diff --git a/audio/linux-c6-alsa-lib/Makefile b/audio/linux-c6-alsa-lib/Makefile
index 139f21480a5f..39e7825d0f63 100644
--- a/audio/linux-c6-alsa-lib/Makefile
+++ b/audio/linux-c6-alsa-lib/Makefile
@@ -3,7 +3,7 @@
PORTNAME= alsa-lib
PORTVERSION= 1.1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio linux
MAINTAINER= emulation@FreeBSD.org
@@ -13,26 +13,19 @@ LICENSE= GPLv3
RUN_DEPENDS= alsa-lib>0:audio/alsa-lib
-CONFLICTS= linux-f10-alsa-lib-[0-9]*
-
-
-USES= linux:c6
-USE_LINUX_RPM= yes
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
RPMVERSION= 4.el6
+USES= linux:c6
USE_LDCONFIG= yes
+USE_LINUX_RPM= yes
-# We will use native configuration file, so delete a linux one
-post-extract:
- @${RM} -r ${WRKSRC}/etc
+post-patch:
+ @${RM} -r ${WRKSRC}/etc/* ${WRKSRC}/usr/lib/alsa-lib/smixer/*.la \
+ ${WRKSRC}/usr/lib64/alsa-lib/smixer/*.la \
+ ${WRKSRC}/usr/share/alsa
post-install:
- @${MKDIR} ${STAGEDIR}${PREFIX}/etc
- ${LN} -fs ${LOCALBASE}/etc/asound.conf ${STAGEDIR}${PREFIX}/etc
- ${RM} ${STAGEDIR}${PREFIX}/usr/lib/alsa-lib/smixer/smixer-ac97.la
- ${RM} ${STAGEDIR}${PREFIX}/usr/lib/alsa-lib/smixer/smixer-hda.la
- ${RM} ${STAGEDIR}${PREFIX}/usr/lib/alsa-lib/smixer/smixer-sbase.la
- ${RM} ${STAGEDIR}${PREFIX}/usr/lib64/alsa-lib/smixer/smixer-ac97.la
- ${RM} ${STAGEDIR}${PREFIX}/usr/lib64/alsa-lib/smixer/smixer-hda.la
- ${RM} ${STAGEDIR}${PREFIX}/usr/lib64/alsa-lib/smixer/smixer-sbase.la
+ ${LN} -sf ${LOCALBASE}/etc/asound.conf ${STAGEDIR}${PREFIX}/etc
+ ${LN} -sf ${LOCALBASE}/share/alsa ${STAGEDIR}${PREFIX}/usr/share
.include <bsd.port.mk>
diff --git a/audio/linux-c6-alsa-lib/distinfo b/audio/linux-c6-alsa-lib/distinfo
new file mode 100644
index 000000000000..cc662eb15b65
--- /dev/null
+++ b/audio/linux-c6-alsa-lib/distinfo
@@ -0,0 +1,7 @@
+TIMESTAMP = 1485440597
+SHA256 (centos/alsa-lib-1.1.0-4.el6.i686.rpm) = 3f18536968313c6fe6d4be3b7d89c38d125ade6478b2cf16390dc201cad6fe1d
+SIZE (centos/alsa-lib-1.1.0-4.el6.i686.rpm) = 396620
+SHA256 (centos/alsa-lib-1.1.0-4.el6.x86_64.rpm) = bfc2cdcd83083c9df5bf4a9ce1b6b73121b54c85d9eb5834dce75caae58b9a4a
+SIZE (centos/alsa-lib-1.1.0-4.el6.x86_64.rpm) = 398332
+SHA256 (centos/alsa-lib-1.1.0-4.el6.src.rpm) = c9da74019a70c7d5dc9841702220d8a8aec7426f95276c28edd489a8ab6124f5
+SIZE (centos/alsa-lib-1.1.0-4.el6.src.rpm) = 953455
diff --git a/audio/linux-c6-alsa-lib/distinfo.i386 b/audio/linux-c6-alsa-lib/distinfo.i386
deleted file mode 100644
index b0cb92c31c8d..000000000000
--- a/audio/linux-c6-alsa-lib/distinfo.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1466256753
-SHA256 (rpm/i686/centos/6.8/alsa-lib-1.1.0-4.el6.i686.rpm) = 3f18536968313c6fe6d4be3b7d89c38d125ade6478b2cf16390dc201cad6fe1d
-SIZE (rpm/i686/centos/6.8/alsa-lib-1.1.0-4.el6.i686.rpm) = 396620
-SHA256 (rpm/i686/centos/6.8/alsa-lib-1.1.0-4.el6.src.rpm) = c9da74019a70c7d5dc9841702220d8a8aec7426f95276c28edd489a8ab6124f5
-SIZE (rpm/i686/centos/6.8/alsa-lib-1.1.0-4.el6.src.rpm) = 953455
diff --git a/audio/linux-c6-alsa-lib/distinfo.x86_64 b/audio/linux-c6-alsa-lib/distinfo.x86_64
deleted file mode 100644
index d208d9c5702a..000000000000
--- a/audio/linux-c6-alsa-lib/distinfo.x86_64
+++ /dev/null
@@ -1,7 +0,0 @@
-TIMESTAMP = 1466257275
-SHA256 (rpm/x86_64/centos/6.8/alsa-lib-1.1.0-4.el6.x86_64.rpm) = bfc2cdcd83083c9df5bf4a9ce1b6b73121b54c85d9eb5834dce75caae58b9a4a
-SIZE (rpm/x86_64/centos/6.8/alsa-lib-1.1.0-4.el6.x86_64.rpm) = 398332
-SHA256 (rpm/x86_64/centos/6.8/alsa-lib-1.1.0-4.el6.i686.rpm) = 3f18536968313c6fe6d4be3b7d89c38d125ade6478b2cf16390dc201cad6fe1d
-SIZE (rpm/x86_64/centos/6.8/alsa-lib-1.1.0-4.el6.i686.rpm) = 396620
-SHA256 (rpm/x86_64/centos/6.8/alsa-lib-1.1.0-4.el6.src.rpm) = c9da74019a70c7d5dc9841702220d8a8aec7426f95276c28edd489a8ab6124f5
-SIZE (rpm/x86_64/centos/6.8/alsa-lib-1.1.0-4.el6.src.rpm) = 953455
diff --git a/audio/linux-c6-alsa-lib/pkg-descr b/audio/linux-c6-alsa-lib/pkg-descr
deleted file mode 100644
index 9447636da467..000000000000
--- a/audio/linux-c6-alsa-lib/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-lib/pkg-plist.amd64 b/audio/linux-c6-alsa-lib/pkg-plist.amd64
new file mode 100644
index 000000000000..b1401a33ba8e
--- /dev/null
+++ b/audio/linux-c6-alsa-lib/pkg-plist.amd64
@@ -0,0 +1,17 @@
+etc/asound.conf
+usr/bin/aserver
+usr/lib/alsa-lib/smixer/smixer-ac97.so
+usr/lib/alsa-lib/smixer/smixer-hda.so
+usr/lib/alsa-lib/smixer/smixer-sbase.so
+usr/lib/libasound.so.2
+usr/lib/libasound.so.2.0.0
+usr/lib64/alsa-lib/smixer/smixer-ac97.so
+usr/lib64/alsa-lib/smixer/smixer-hda.so
+usr/lib64/alsa-lib/smixer/smixer-sbase.so
+usr/lib64/libasound.so.2
+usr/lib64/libasound.so.2.0.0
+usr/share/alsa
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/asoundrc.txt
diff --git a/audio/linux-c6-alsa-lib/pkg-plist.i386 b/audio/linux-c6-alsa-lib/pkg-plist.i386
index f08fda8ef870..aa11db8343b3 100644
--- a/audio/linux-c6-alsa-lib/pkg-plist.i386
+++ b/audio/linux-c6-alsa-lib/pkg-plist.i386
@@ -1,124 +1,12 @@
-@comment file listing
etc/asound.conf
-lib/libasound.so.2
-lib/libasound.so.2.0.0
usr/bin/aserver
usr/lib/alsa-lib/smixer/smixer-ac97.so
usr/lib/alsa-lib/smixer/smixer-hda.so
usr/lib/alsa-lib/smixer/smixer-sbase.so
-usr/share/alsa/alsa.conf
-usr/share/alsa/alsa.conf.d/README
-usr/share/alsa/cards/AACI.conf
-usr/share/alsa/cards/ATIIXP-MODEM.conf
-usr/share/alsa/cards/ATIIXP-SPDMA.conf
-usr/share/alsa/cards/ATIIXP.conf
-usr/share/alsa/cards/AU8810.conf
-usr/share/alsa/cards/AU8820.conf
-usr/share/alsa/cards/AU8830.conf
-usr/share/alsa/cards/Audigy.conf
-usr/share/alsa/cards/Audigy2.conf
-usr/share/alsa/cards/Aureon51.conf
-usr/share/alsa/cards/Aureon71.conf
-usr/share/alsa/cards/CA0106.conf
-usr/share/alsa/cards/CMI8338-SWIEC.conf
-usr/share/alsa/cards/CMI8338.conf
-usr/share/alsa/cards/CMI8738-MC6.conf
-usr/share/alsa/cards/CMI8738-MC8.conf
-usr/share/alsa/cards/CMI8788.conf
-usr/share/alsa/cards/CS46xx.conf
-usr/share/alsa/cards/EMU10K1.conf
-usr/share/alsa/cards/EMU10K1X.conf
-usr/share/alsa/cards/ENS1370.conf
-usr/share/alsa/cards/ENS1371.conf
-usr/share/alsa/cards/ES1968.conf
-usr/share/alsa/cards/Echo_Echo3G.conf
-usr/share/alsa/cards/FM801.conf
-usr/share/alsa/cards/FWSpeakers.conf
-usr/share/alsa/cards/FireWave.conf
-usr/share/alsa/cards/GUS.conf
-usr/share/alsa/cards/HDA-Intel.conf
-usr/share/alsa/cards/ICE1712.conf
-usr/share/alsa/cards/ICE1724.conf
-usr/share/alsa/cards/ICH-MODEM.conf
-usr/share/alsa/cards/ICH.conf
-usr/share/alsa/cards/ICH4.conf
-usr/share/alsa/cards/Loopback.conf
-usr/share/alsa/cards/Maestro3.conf
-usr/share/alsa/cards/NFORCE.conf
-usr/share/alsa/cards/PC-Speaker.conf
-usr/share/alsa/cards/PMac.conf
-usr/share/alsa/cards/PMacToonie.conf
-usr/share/alsa/cards/PS3.conf
-usr/share/alsa/cards/RME9636.conf
-usr/share/alsa/cards/RME9652.conf
-usr/share/alsa/cards/SB-XFi.conf
-usr/share/alsa/cards/SI7018.conf
-usr/share/alsa/cards/SI7018/sndoc-mixer.alisp
-usr/share/alsa/cards/SI7018/sndop-mixer.alisp
-usr/share/alsa/cards/TRID4DWAVENX.conf
-usr/share/alsa/cards/USB-Audio.conf
-usr/share/alsa/cards/VIA686A.conf
-usr/share/alsa/cards/VIA8233.conf
-usr/share/alsa/cards/VIA8233A.conf
-usr/share/alsa/cards/VIA8237.conf
-usr/share/alsa/cards/VX222.conf
-usr/share/alsa/cards/VXPocket.conf
-usr/share/alsa/cards/VXPocket440.conf
-usr/share/alsa/cards/YMF744.conf
-usr/share/alsa/cards/aliases.alisp
-usr/share/alsa/cards/aliases.conf
-usr/share/alsa/pcm/center_lfe.conf
-usr/share/alsa/pcm/default.conf
-usr/share/alsa/pcm/dmix.conf
-usr/share/alsa/pcm/dpl.conf
-usr/share/alsa/pcm/dsnoop.conf
-usr/share/alsa/pcm/front.conf
-usr/share/alsa/pcm/hdmi.conf
-usr/share/alsa/pcm/iec958.conf
-usr/share/alsa/pcm/modem.conf
-usr/share/alsa/pcm/rear.conf
-usr/share/alsa/pcm/side.conf
-usr/share/alsa/pcm/surround21.conf
-usr/share/alsa/pcm/surround40.conf
-usr/share/alsa/pcm/surround41.conf
-usr/share/alsa/pcm/surround50.conf
-usr/share/alsa/pcm/surround51.conf
-usr/share/alsa/pcm/surround71.conf
-usr/share/alsa/smixer.conf
-usr/share/alsa/sndo-mixer.alisp
-usr/share/alsa/topology/broadwell/broadwell.conf
-usr/share/alsa/ucm/DAISY-I2S/DAISY-I2S.conf
-usr/share/alsa/ucm/DAISY-I2S/HiFi.conf
-usr/share/alsa/ucm/GoogleNyan/GoogleNyan.conf
-usr/share/alsa/ucm/GoogleNyan/HiFi.conf
-usr/share/alsa/ucm/PAZ00/HiFi.conf
-usr/share/alsa/ucm/PAZ00/PAZ00.conf
-usr/share/alsa/ucm/PAZ00/Record.conf
-usr/share/alsa/ucm/PandaBoard/FMAnalog
-usr/share/alsa/ucm/PandaBoard/PandaBoard.conf
-usr/share/alsa/ucm/PandaBoard/hifi
-usr/share/alsa/ucm/PandaBoard/hifiLP
-usr/share/alsa/ucm/PandaBoard/record
-usr/share/alsa/ucm/PandaBoard/voice
-usr/share/alsa/ucm/PandaBoard/voiceCall
-usr/share/alsa/ucm/PandaBoardES/FMAnalog
-usr/share/alsa/ucm/PandaBoardES/PandaBoardES.conf
-usr/share/alsa/ucm/PandaBoardES/hifi
-usr/share/alsa/ucm/PandaBoardES/hifiLP
-usr/share/alsa/ucm/PandaBoardES/record
-usr/share/alsa/ucm/PandaBoardES/voice
-usr/share/alsa/ucm/PandaBoardES/voiceCall
-usr/share/alsa/ucm/SDP4430/FMAnalog
-usr/share/alsa/ucm/SDP4430/SDP4430.conf
-usr/share/alsa/ucm/SDP4430/hifi
-usr/share/alsa/ucm/SDP4430/hifiLP
-usr/share/alsa/ucm/SDP4430/record
-usr/share/alsa/ucm/SDP4430/voice
-usr/share/alsa/ucm/SDP4430/voiceCall
-usr/share/alsa/ucm/broadwell-rt286/HiFi
-usr/share/alsa/ucm/broadwell-rt286/broadwell-rt286.conf
-usr/share/alsa/ucm/tegraalc5632/tegraalc5632.conf
-%%PORTDOCS%%usr/share/doc/alsa-lib-1.1.0/COPYING
-%%PORTDOCS%%usr/share/doc/alsa-lib-1.1.0/ChangeLog
-%%PORTDOCS%%usr/share/doc/alsa-lib-1.1.0/TODO
-%%PORTDOCS%%usr/share/doc/alsa-lib-1.1.0/asoundrc.txt
+usr/lib/libasound.so.2
+usr/lib/libasound.so.2.0.0
+usr/share/alsa
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/asoundrc.txt
diff --git a/audio/linux-c6-alsa-lib/pkg-plist.x86_64 b/audio/linux-c6-alsa-lib/pkg-plist.x86_64
deleted file mode 100644
index 626c9ff6d381..000000000000
--- a/audio/linux-c6-alsa-lib/pkg-plist.x86_64
+++ /dev/null
@@ -1,128 +0,0 @@
-etc/asound.conf
-lib/libasound.so.2
-lib/libasound.so.2.0.0
-lib64/libasound.so.2
-lib64/libasound.so.2.0.0
-usr/bin/aserver
-usr/lib/alsa-lib/smixer/smixer-ac97.so
-usr/lib/alsa-lib/smixer/smixer-hda.so
-usr/lib/alsa-lib/smixer/smixer-sbase.so
-usr/lib64/alsa-lib/smixer/smixer-ac97.so
-usr/lib64/alsa-lib/smixer/smixer-hda.so
-usr/lib64/alsa-lib/smixer/smixer-sbase.so
-usr/share/alsa/alsa.conf
-usr/share/alsa/alsa.conf.d/README
-usr/share/alsa/cards/AACI.conf
-usr/share/alsa/cards/ATIIXP-MODEM.conf
-usr/share/alsa/cards/ATIIXP-SPDMA.conf
-usr/share/alsa/cards/ATIIXP.conf
-usr/share/alsa/cards/AU8810.conf
-usr/share/alsa/cards/AU8820.conf
-usr/share/alsa/cards/AU8830.conf
-usr/share/alsa/cards/Audigy.conf
-usr/share/alsa/cards/Audigy2.conf
-usr/share/alsa/cards/Aureon51.conf
-usr/share/alsa/cards/Aureon71.conf
-usr/share/alsa/cards/CA0106.conf
-usr/share/alsa/cards/CMI8338-SWIEC.conf
-usr/share/alsa/cards/CMI8338.conf
-usr/share/alsa/cards/CMI8738-MC6.conf
-usr/share/alsa/cards/CMI8738-MC8.conf
-usr/share/alsa/cards/CMI8788.conf
-usr/share/alsa/cards/CS46xx.conf
-usr/share/alsa/cards/EMU10K1.conf
-usr/share/alsa/cards/EMU10K1X.conf
-usr/share/alsa/cards/ENS1370.conf
-usr/share/alsa/cards/ENS1371.conf
-usr/share/alsa/cards/ES1968.conf
-usr/share/alsa/cards/Echo_Echo3G.conf
-usr/share/alsa/cards/FM801.conf
-usr/share/alsa/cards/FWSpeakers.conf
-usr/share/alsa/cards/FireWave.conf
-usr/share/alsa/cards/GUS.conf
-usr/share/alsa/cards/HDA-Intel.conf
-usr/share/alsa/cards/ICE1712.conf
-usr/share/alsa/cards/ICE1724.conf
-usr/share/alsa/cards/ICH-MODEM.conf
-usr/share/alsa/cards/ICH.conf
-usr/share/alsa/cards/ICH4.conf
-usr/share/alsa/cards/Loopback.conf
-usr/share/alsa/cards/Maestro3.conf
-usr/share/alsa/cards/NFORCE.conf
-usr/share/alsa/cards/PC-Speaker.conf
-usr/share/alsa/cards/PMac.conf
-usr/share/alsa/cards/PMacToonie.conf
-usr/share/alsa/cards/PS3.conf
-usr/share/alsa/cards/RME9636.conf
-usr/share/alsa/cards/RME9652.conf
-usr/share/alsa/cards/SB-XFi.conf
-usr/share/alsa/cards/SI7018.conf
-usr/share/alsa/cards/SI7018/sndoc-mixer.alisp
-usr/share/alsa/cards/SI7018/sndop-mixer.alisp
-usr/share/alsa/cards/TRID4DWAVENX.conf
-usr/share/alsa/cards/USB-Audio.conf
-usr/share/alsa/cards/VIA686A.conf
-usr/share/alsa/cards/VIA8233.conf
-usr/share/alsa/cards/VIA8233A.conf
-usr/share/alsa/cards/VIA8237.conf
-usr/share/alsa/cards/VX222.conf
-usr/share/alsa/cards/VXPocket.conf
-usr/share/alsa/cards/VXPocket440.conf
-usr/share/alsa/cards/YMF744.conf
-usr/share/alsa/cards/aliases.alisp
-usr/share/alsa/cards/aliases.conf
-usr/share/alsa/pcm/center_lfe.conf
-usr/share/alsa/pcm/default.conf
-usr/share/alsa/pcm/dmix.conf
-usr/share/alsa/pcm/dpl.conf
-usr/share/alsa/pcm/dsnoop.conf
-usr/share/alsa/pcm/front.conf
-usr/share/alsa/pcm/hdmi.conf
-usr/share/alsa/pcm/iec958.conf
-usr/share/alsa/pcm/modem.conf
-usr/share/alsa/pcm/rear.conf
-usr/share/alsa/pcm/side.conf
-usr/share/alsa/pcm/surround21.conf
-usr/share/alsa/pcm/surround40.conf
-usr/share/alsa/pcm/surround41.conf
-usr/share/alsa/pcm/surround50.conf
-usr/share/alsa/pcm/surround51.conf
-usr/share/alsa/pcm/surround71.conf
-usr/share/alsa/smixer.conf
-usr/share/alsa/sndo-mixer.alisp
-usr/share/alsa/topology/broadwell/broadwell.conf
-usr/share/alsa/ucm/DAISY-I2S/DAISY-I2S.conf
-usr/share/alsa/ucm/DAISY-I2S/HiFi.conf
-usr/share/alsa/ucm/GoogleNyan/GoogleNyan.conf
-usr/share/alsa/ucm/GoogleNyan/HiFi.conf
-usr/share/alsa/ucm/PAZ00/HiFi.conf
-usr/share/alsa/ucm/PAZ00/PAZ00.conf
-usr/share/alsa/ucm/PAZ00/Record.conf
-usr/share/alsa/ucm/PandaBoard/FMAnalog
-usr/share/alsa/ucm/PandaBoard/PandaBoard.conf
-usr/share/alsa/ucm/PandaBoard/hifi
-usr/share/alsa/ucm/PandaBoard/hifiLP
-usr/share/alsa/ucm/PandaBoard/record
-usr/share/alsa/ucm/PandaBoard/voice
-usr/share/alsa/ucm/PandaBoard/voiceCall
-usr/share/alsa/ucm/PandaBoardES/FMAnalog
-usr/share/alsa/ucm/PandaBoardES/PandaBoardES.conf
-usr/share/alsa/ucm/PandaBoardES/hifi
-usr/share/alsa/ucm/PandaBoardES/hifiLP
-usr/share/alsa/ucm/PandaBoardES/record
-usr/share/alsa/ucm/PandaBoardES/voice
-usr/share/alsa/ucm/PandaBoardES/voiceCall
-usr/share/alsa/ucm/SDP4430/FMAnalog
-usr/share/alsa/ucm/SDP4430/SDP4430.conf
-usr/share/alsa/ucm/SDP4430/hifi
-usr/share/alsa/ucm/SDP4430/hifiLP
-usr/share/alsa/ucm/SDP4430/record
-usr/share/alsa/ucm/SDP4430/voice
-usr/share/alsa/ucm/SDP4430/voiceCall
-usr/share/alsa/ucm/broadwell-rt286/HiFi
-usr/share/alsa/ucm/broadwell-rt286/broadwell-rt286.conf
-usr/share/alsa/ucm/tegraalc5632/tegraalc5632.conf
-%%PORTDOCS%%usr/share/doc/alsa-lib-1.1.0/COPYING
-%%PORTDOCS%%usr/share/doc/alsa-lib-1.1.0/ChangeLog
-%%PORTDOCS%%usr/share/doc/alsa-lib-1.1.0/TODO
-%%PORTDOCS%%usr/share/doc/alsa-lib-1.1.0/asoundrc.txt
diff --git a/audio/linux-c6-alsa-plugins-oss/Makefile b/audio/linux-c6-alsa-plugins-oss/Makefile
index e6b3cffe3911..7c663fee2b82 100644
--- a/audio/linux-c6-alsa-plugins-oss/Makefile
+++ b/audio/linux-c6-alsa-plugins-oss/Makefile
@@ -1,29 +1,25 @@
# Created by: Artyom Mirgorodskiy <artyom.mirgorodsky@gmail.com>
# $FreeBSD$
-PORTNAME= alsa-plugins-oss
+PORTNAME= alsa-plugins
PORTVERSION= 1.1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio linux
+PKGNAMESUFFIX= -oss
+LIB_DISTNAMES= ${LINUXNAME}-${DISTVERSIONFULL}
MAINTAINER= emulation@FreeBSD.org
COMMENT= OSS plugin for ALSA (Linux CentOS ${LINUX_DIST_VER})
LICENSE= GPLv3
-CONFLICTS= linux-f10-alsa-plugins-oss-[0-9]*
-
-SRC_DISTFILES= alsa-plugins-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}:SOURCE
-
+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
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-oss/distinfo b/audio/linux-c6-alsa-plugins-oss/distinfo
new file mode 100644
index 000000000000..442364fb7ce8
--- /dev/null
+++ b/audio/linux-c6-alsa-plugins-oss/distinfo
@@ -0,0 +1,7 @@
+TIMESTAMP = 1485441929
+SHA256 (centos/alsa-plugins-oss-1.1.0-1.el6.i686.rpm) = 365237b3aad6528f3b0f68912e108eb3dfab3b37ee580ce165d65e31cb9cea39
+SIZE (centos/alsa-plugins-oss-1.1.0-1.el6.i686.rpm) = 28740
+SHA256 (centos/alsa-plugins-oss-1.1.0-1.el6.x86_64.rpm) = 4b0e5da16e68381b0683fef424a2a1e3da2bd9921949d79095f8274a5b6890eb
+SIZE (centos/alsa-plugins-oss-1.1.0-1.el6.x86_64.rpm) = 29068
+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-oss/distinfo.i386 b/audio/linux-c6-alsa-plugins-oss/distinfo.i386
deleted file mode 100644
index 63f844b9686f..000000000000
--- a/audio/linux-c6-alsa-plugins-oss/distinfo.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1466256756
-SHA256 (rpm/i686/centos/6.8/alsa-plugins-oss-1.1.0-1.el6.i686.rpm) = 365237b3aad6528f3b0f68912e108eb3dfab3b37ee580ce165d65e31cb9cea39
-SIZE (rpm/i686/centos/6.8/alsa-plugins-oss-1.1.0-1.el6.i686.rpm) = 28740
-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-oss/distinfo.x86_64 b/audio/linux-c6-alsa-plugins-oss/distinfo.x86_64
deleted file mode 100644
index 21fbb175654f..000000000000
--- a/audio/linux-c6-alsa-plugins-oss/distinfo.x86_64
+++ /dev/null
@@ -1,7 +0,0 @@
-TIMESTAMP = 1466257283
-SHA256 (rpm/x86_64/centos/6.8/alsa-plugins-oss-1.1.0-1.el6.x86_64.rpm) = 4b0e5da16e68381b0683fef424a2a1e3da2bd9921949d79095f8274a5b6890eb
-SIZE (rpm/x86_64/centos/6.8/alsa-plugins-oss-1.1.0-1.el6.x86_64.rpm) = 29068
-SHA256 (rpm/x86_64/centos/6.8/alsa-plugins-oss-1.1.0-1.el6.i686.rpm) = 365237b3aad6528f3b0f68912e108eb3dfab3b37ee580ce165d65e31cb9cea39
-SIZE (rpm/x86_64/centos/6.8/alsa-plugins-oss-1.1.0-1.el6.i686.rpm) = 28740
-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-oss/pkg-descr b/audio/linux-c6-alsa-plugins-oss/pkg-descr
deleted file mode 100644
index 9447636da467..000000000000
--- a/audio/linux-c6-alsa-plugins-oss/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-oss/pkg-plist.x86_64 b/audio/linux-c6-alsa-plugins-oss/pkg-plist.amd64
index 0c823f2ab7aa..02cf9a2c25f7 100644
--- a/audio/linux-c6-alsa-plugins-oss/pkg-plist.x86_64
+++ b/audio/linux-c6-alsa-plugins-oss/pkg-plist.amd64
@@ -2,6 +2,6 @@ usr/lib/alsa-lib/libasound_module_ctl_oss.so
usr/lib/alsa-lib/libasound_module_pcm_oss.so
usr/lib64/alsa-lib/libasound_module_ctl_oss.so
usr/lib64/alsa-lib/libasound_module_pcm_oss.so
-%%PORTDOCS%%usr/share/doc/alsa-plugins-oss-1.1.0/COPYING
-%%PORTDOCS%%usr/share/doc/alsa-plugins-oss-1.1.0/COPYING.GPL
-%%PORTDOCS%%usr/share/doc/alsa-plugins-oss-1.1.0/README-pcm-oss
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/COPYING.GPL
+%%PORTDOCS%%%%DOCSDIR%%/README-pcm-oss
diff --git a/audio/linux-c6-alsa-plugins-oss/pkg-plist.i386 b/audio/linux-c6-alsa-plugins-oss/pkg-plist.i386
index 21a49da8546c..d3c738962118 100644
--- a/audio/linux-c6-alsa-plugins-oss/pkg-plist.i386
+++ b/audio/linux-c6-alsa-plugins-oss/pkg-plist.i386
@@ -1,5 +1,5 @@
usr/lib/alsa-lib/libasound_module_ctl_oss.so
usr/lib/alsa-lib/libasound_module_pcm_oss.so
-%%PORTDOCS%%usr/share/doc/alsa-plugins-oss-1.1.0/COPYING
-%%PORTDOCS%%usr/share/doc/alsa-plugins-oss-1.1.0/COPYING.GPL
-%%PORTDOCS%%usr/share/doc/alsa-plugins-oss-1.1.0/README-pcm-oss
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/COPYING.GPL
+%%PORTDOCS%%%%DOCSDIR%%/README-pcm-oss
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
diff --git a/audio/linux-c6-alsa-utils/Makefile b/audio/linux-c6-alsa-utils/Makefile
index 65f79b7d9646..ff207fc87a9d 100644
--- a/audio/linux-c6-alsa-utils/Makefile
+++ b/audio/linux-c6-alsa-utils/Makefile
@@ -3,20 +3,21 @@
PORTNAME= alsa-utils
PORTVERSION= 1.1.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio linux
MAINTAINER= emulation@FreeBSD.org
-COMMENT= Advanced Linux Sound Architecture libraries (Linux CentOS ${LINUX_DIST_VER})
+COMMENT= Advanced Linux Sound Architecture utilities (Linux CentOS ${LINUX_DIST_VER})
LICENSE= GPLv3
-CONFLICTS= linux-alsa-lib-[0-9]* linux-f10-alsa-lib-[0-9]*
-
-USE_LINUX= alsalib alsa-plugins-oss
-
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+RPMVERSION= 8.el6
USES= linux:c6
+USE_LINUX= alsalib alsa-plugins-oss
USE_LINUX_RPM= nolib
-RPMVERSION= 8.el6
+
+OPTIONS_DEFINE= DOCS NLS
+OPTIONS_SUB= yes
.include <bsd.port.mk>
diff --git a/audio/linux-c6-alsa-utils/distinfo b/audio/linux-c6-alsa-utils/distinfo
new file mode 100644
index 000000000000..20d71c0d0941
--- /dev/null
+++ b/audio/linux-c6-alsa-utils/distinfo
@@ -0,0 +1,7 @@
+TIMESTAMP = 1485442599
+SHA256 (centos/alsa-utils-1.1.0-8.el6.i686.rpm) = 7ff61969b9135470be6cd1739b0126c9cbf223b30c2a60baf5911f86d7efeca4
+SIZE (centos/alsa-utils-1.1.0-8.el6.i686.rpm) = 2063348
+SHA256 (centos/alsa-utils-1.1.0-8.el6.x86_64.rpm) = a981e0ef0fbcddfbc849090ae19ef2f9e9fe67fdb7796a7eb61457bfa60e7b27
+SIZE (centos/alsa-utils-1.1.0-8.el6.x86_64.rpm) = 2070184
+SHA256 (centos/alsa-utils-1.1.0-8.el6.src.rpm) = 63ac8d3089d14665206a7619bb212efa8a66a7a21445a3afe63a4d02dcb57a31
+SIZE (centos/alsa-utils-1.1.0-8.el6.src.rpm) = 5516107
diff --git a/audio/linux-c6-alsa-utils/distinfo.i386 b/audio/linux-c6-alsa-utils/distinfo.i386
deleted file mode 100644
index aba2f9b45d97..000000000000
--- a/audio/linux-c6-alsa-utils/distinfo.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1466256752
-SHA256 (rpm/i686/centos/6.8/alsa-utils-1.1.0-8.el6.i686.rpm) = 7ff61969b9135470be6cd1739b0126c9cbf223b30c2a60baf5911f86d7efeca4
-SIZE (rpm/i686/centos/6.8/alsa-utils-1.1.0-8.el6.i686.rpm) = 2063348
-SHA256 (rpm/i686/centos/6.8/alsa-utils-1.1.0-8.el6.src.rpm) = 63ac8d3089d14665206a7619bb212efa8a66a7a21445a3afe63a4d02dcb57a31
-SIZE (rpm/i686/centos/6.8/alsa-utils-1.1.0-8.el6.src.rpm) = 5516107
diff --git a/audio/linux-c6-alsa-utils/distinfo.x86_64 b/audio/linux-c6-alsa-utils/distinfo.x86_64
deleted file mode 100644
index 9b3b3475c897..000000000000
--- a/audio/linux-c6-alsa-utils/distinfo.x86_64
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1466257270
-SHA256 (rpm/x86_64/centos/6.8/alsa-utils-1.1.0-8.el6.x86_64.rpm) = a981e0ef0fbcddfbc849090ae19ef2f9e9fe67fdb7796a7eb61457bfa60e7b27
-SIZE (rpm/x86_64/centos/6.8/alsa-utils-1.1.0-8.el6.x86_64.rpm) = 2070184
-SHA256 (rpm/x86_64/centos/6.8/alsa-utils-1.1.0-8.el6.src.rpm) = 63ac8d3089d14665206a7619bb212efa8a66a7a21445a3afe63a4d02dcb57a31
-SIZE (rpm/x86_64/centos/6.8/alsa-utils-1.1.0-8.el6.src.rpm) = 5516107
diff --git a/audio/linux-c6-alsa-utils/pkg-descr b/audio/linux-c6-alsa-utils/pkg-descr
deleted file mode 100644
index 9447636da467..000000000000
--- a/audio/linux-c6-alsa-utils/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-utils/pkg-plist.x86_64 b/audio/linux-c6-alsa-utils/pkg-plist.amd64
index 17973f773866..d9bc9cf859be 100644
--- a/audio/linux-c6-alsa-utils/pkg-plist.x86_64
+++ b/audio/linux-c6-alsa-utils/pkg-plist.amd64
@@ -1,19 +1,11 @@
-bin/alsaunmute
etc/alsa/alsactl.conf
etc/udev/rules.d/90-alsa.rules
-lib/alsa/init/00main
-lib/alsa/init/ca0106
-lib/alsa/init/default
-lib/alsa/init/hda
-lib/alsa/init/help
-lib/alsa/init/info
-lib/alsa/init/test
-sbin/alsactl
usr/bin/aconnect
usr/bin/alsa-info
usr/bin/alsa-info.sh
usr/bin/alsaloop
usr/bin/alsamixer
+usr/bin/alsaunmute
usr/bin/amidi
usr/bin/amixer
usr/bin/aplay
@@ -24,17 +16,24 @@ usr/bin/aseqdump
usr/bin/aseqnet
usr/bin/iecset
usr/bin/speaker-test
+usr/lib/alsa/init/00main
+usr/lib/alsa/init/ca0106
+usr/lib/alsa/init/default
+usr/lib/alsa/init/hda
+usr/lib/alsa/init/help
+usr/lib/alsa/init/info
+usr/lib/alsa/init/test
usr/sbin/alsa-delay
usr/sbin/alsactl
usr/share/alsa/init
usr/share/alsa/speaker-test/sample_map.csv
-%%PORTDOCS%%usr/share/doc/alsa-utils-1.1.0/COPYING
-%%PORTDOCS%%usr/share/doc/alsa-utils-1.1.0/ChangeLog
-%%PORTDOCS%%usr/share/doc/alsa-utils-1.1.0/README
-%%PORTDOCS%%usr/share/doc/alsa-utils-1.1.0/TODO
-usr/share/locale/de/LC_MESSAGES/alsa-utils.mo
-usr/share/locale/fr/LC_MESSAGES/alsa-utils.mo
-usr/share/locale/ja/LC_MESSAGES/alsa-utils.mo
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%NLS%%usr/share/locale/de/LC_MESSAGES/alsa-utils.mo
+%%NLS%%usr/share/locale/fr/LC_MESSAGES/alsa-utils.mo
+%%NLS%%usr/share/locale/ja/LC_MESSAGES/alsa-utils.mo
usr/share/man/man1/aconnect.1.gz
usr/share/man/man1/alsa-delay.1.gz
usr/share/man/man1/alsa-info.1.gz
diff --git a/audio/linux-c6-alsa-utils/pkg-plist.i386 b/audio/linux-c6-alsa-utils/pkg-plist.i386
index 17973f773866..d9bc9cf859be 100644
--- a/audio/linux-c6-alsa-utils/pkg-plist.i386
+++ b/audio/linux-c6-alsa-utils/pkg-plist.i386
@@ -1,19 +1,11 @@
-bin/alsaunmute
etc/alsa/alsactl.conf
etc/udev/rules.d/90-alsa.rules
-lib/alsa/init/00main
-lib/alsa/init/ca0106
-lib/alsa/init/default
-lib/alsa/init/hda
-lib/alsa/init/help
-lib/alsa/init/info
-lib/alsa/init/test
-sbin/alsactl
usr/bin/aconnect
usr/bin/alsa-info
usr/bin/alsa-info.sh
usr/bin/alsaloop
usr/bin/alsamixer
+usr/bin/alsaunmute
usr/bin/amidi
usr/bin/amixer
usr/bin/aplay
@@ -24,17 +16,24 @@ usr/bin/aseqdump
usr/bin/aseqnet
usr/bin/iecset
usr/bin/speaker-test
+usr/lib/alsa/init/00main
+usr/lib/alsa/init/ca0106
+usr/lib/alsa/init/default
+usr/lib/alsa/init/hda
+usr/lib/alsa/init/help
+usr/lib/alsa/init/info
+usr/lib/alsa/init/test
usr/sbin/alsa-delay
usr/sbin/alsactl
usr/share/alsa/init
usr/share/alsa/speaker-test/sample_map.csv
-%%PORTDOCS%%usr/share/doc/alsa-utils-1.1.0/COPYING
-%%PORTDOCS%%usr/share/doc/alsa-utils-1.1.0/ChangeLog
-%%PORTDOCS%%usr/share/doc/alsa-utils-1.1.0/README
-%%PORTDOCS%%usr/share/doc/alsa-utils-1.1.0/TODO
-usr/share/locale/de/LC_MESSAGES/alsa-utils.mo
-usr/share/locale/fr/LC_MESSAGES/alsa-utils.mo
-usr/share/locale/ja/LC_MESSAGES/alsa-utils.mo
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%NLS%%usr/share/locale/de/LC_MESSAGES/alsa-utils.mo
+%%NLS%%usr/share/locale/fr/LC_MESSAGES/alsa-utils.mo
+%%NLS%%usr/share/locale/ja/LC_MESSAGES/alsa-utils.mo
usr/share/man/man1/aconnect.1.gz
usr/share/man/man1/alsa-delay.1.gz
usr/share/man/man1/alsa-info.1.gz
diff --git a/audio/linux-c6-arts/Makefile b/audio/linux-c6-arts/Makefile
deleted file mode 100644
index 691a6c38df58..000000000000
--- a/audio/linux-c6-arts/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# Created by: Johannes Meixner <johannes@perceivon.net>
-# $FreeBSD$
-
-PORTNAME= arts
-PORTVERSION= 1.5.10
-PORTREVISION= 2
-CATEGORIES= audio kde linux
-
-MAINTAINER= emulation@FreeBSD.org
-COMMENT= Audio system for the KDE integrated X11 desktop (Linux CentOS ${LINUX_DIST_VER})
-
-CONFLICTS= linux-arts-[0-9]* linux-f8-arts-[0-9]*
-
-USES= linux:c6
-USE_LINUX_RPM= yes
-
-RPMVERSION= 10.el6
-USE_LDCONFIG= yes
-
-post-install:
- ${RM} ${STAGEDIR}${PREFIX}/usr/lib/*.la
- ${RM} ${STAGEDIR}${PREFIX}/usr/lib64/*.la
-
-.include <bsd.port.mk>
diff --git a/audio/linux-c6-arts/distinfo.i386 b/audio/linux-c6-arts/distinfo.i386
deleted file mode 100644
index 4d075d3c5ea4..000000000000
--- a/audio/linux-c6-arts/distinfo.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1466256766
-SHA256 (rpm/i686/centos/6.8/arts-1.5.10-10.el6.i686.rpm) = 332ab57a42e5930f175cd4cab7b326b4f1d36b20199f65ca8194bb190c3b2f6f
-SIZE (rpm/i686/centos/6.8/arts-1.5.10-10.el6.i686.rpm) = 933716
-SHA256 (rpm/i686/centos/6.8/arts-1.5.10-10.el6.src.rpm) = a89b4f46f4c26c281fd299ae33beba8496036926472b065984b09968d9d89930
-SIZE (rpm/i686/centos/6.8/arts-1.5.10-10.el6.src.rpm) = 996853
diff --git a/audio/linux-c6-arts/distinfo.x86_64 b/audio/linux-c6-arts/distinfo.x86_64
deleted file mode 100644
index 918df33a27a9..000000000000
--- a/audio/linux-c6-arts/distinfo.x86_64
+++ /dev/null
@@ -1,7 +0,0 @@
-TIMESTAMP = 1466257307
-SHA256 (rpm/x86_64/centos/6.8/arts-1.5.10-10.el6.x86_64.rpm) = d9b4b8b4369d3ef80d4f92beedd4a8f2228c620cf61770fda3075777645bb5b1
-SIZE (rpm/x86_64/centos/6.8/arts-1.5.10-10.el6.x86_64.rpm) = 989216
-SHA256 (rpm/x86_64/centos/6.8/arts-1.5.10-10.el6.i686.rpm) = 332ab57a42e5930f175cd4cab7b326b4f1d36b20199f65ca8194bb190c3b2f6f
-SIZE (rpm/x86_64/centos/6.8/arts-1.5.10-10.el6.i686.rpm) = 933716
-SHA256 (rpm/x86_64/centos/6.8/arts-1.5.10-10.el6.src.rpm) = a89b4f46f4c26c281fd299ae33beba8496036926472b065984b09968d9d89930
-SIZE (rpm/x86_64/centos/6.8/arts-1.5.10-10.el6.src.rpm) = 996853
diff --git a/audio/linux-c6-arts/pkg-descr b/audio/linux-c6-arts/pkg-descr
deleted file mode 100644
index 261bf83da77f..000000000000
--- a/audio/linux-c6-arts/pkg-descr
+++ /dev/null
@@ -1 +0,0 @@
-This is the aRts module from KDE CVS.
diff --git a/audio/linux-c6-arts/pkg-plist.i386 b/audio/linux-c6-arts/pkg-plist.i386
deleted file mode 100644
index 51c9cd40f85c..000000000000
--- a/audio/linux-c6-arts/pkg-plist.i386
+++ /dev/null
@@ -1,66 +0,0 @@
-usr/bin/artscat
-usr/bin/artsd
-usr/bin/artsdsp
-usr/bin/artsplay
-usr/bin/artsrec
-usr/bin/artsshell
-usr/bin/artswrapper
-usr/lib/libartsc.so.0
-usr/lib/libartsc.so.0.0.0
-usr/lib/libartscbackend.so.0
-usr/lib/libartscbackend.so.0.0.0
-usr/lib/libartsdsp.so.0
-usr/lib/libartsdsp.so.0.0.0
-usr/lib/libartsdsp_st.so.0
-usr/lib/libartsdsp_st.so.0.0.0
-usr/lib/libartsflow.so.1
-usr/lib/libartsflow.so.1.0.0
-usr/lib/libartsflow_idl.so.1
-usr/lib/libartsflow_idl.so.1.0.0
-usr/lib/libartsgslplayobject.so.0
-usr/lib/libartsgslplayobject.so.0.0.0
-usr/lib/libartswavplayobject.so.0
-usr/lib/libartswavplayobject.so.0.0.0
-usr/lib/libgmcop.so.1
-usr/lib/libgmcop.so.1.0.0
-usr/lib/libkmedia2.so.1
-usr/lib/libkmedia2.so.1.0.0
-usr/lib/libkmedia2_idl.so.1
-usr/lib/libkmedia2_idl.so.1.0.0
-usr/lib/libmcop.so.1
-usr/lib/libmcop.so.1.0.0
-usr/lib/libmcop_mt.so.1
-usr/lib/libmcop_mt.so.1.0.0
-usr/lib/libqtmcop.so.1
-usr/lib/libqtmcop.so.1.0.0
-usr/lib/libsoundserver_idl.so.1
-usr/lib/libsoundserver_idl.so.1.0.0
-usr/lib/libx11globalcomm.so.1
-usr/lib/libx11globalcomm.so.1.0.0
-usr/lib/mcop/Arts/DataHandlePlay.mcopclass
-usr/lib/mcop/Arts/FileInputStream.mcopclass
-usr/lib/mcop/Arts/GSLPlayObject.mcopclass
-usr/lib/mcop/Arts/Synth_ADD.mcopclass
-usr/lib/mcop/Arts/Synth_AMAN_PLAY.mcopclass
-usr/lib/mcop/Arts/Synth_AMAN_RECORD.mcopclass
-usr/lib/mcop/Arts/Synth_BUS_DOWNLINK.mcopclass
-usr/lib/mcop/Arts/Synth_BUS_UPLINK.mcopclass
-usr/lib/mcop/Arts/Synth_FREQUENCY.mcopclass
-usr/lib/mcop/Arts/Synth_MUL.mcopclass
-usr/lib/mcop/Arts/Synth_MULTI_ADD.mcopclass
-usr/lib/mcop/Arts/Synth_PLAY.mcopclass
-usr/lib/mcop/Arts/Synth_PLAY_WAV.mcopclass
-usr/lib/mcop/Arts/Synth_RECORD.mcopclass
-usr/lib/mcop/Arts/Synth_WAVE_SIN.mcopclass
-usr/lib/mcop/Arts/WavPlayObject.mcopclass
-usr/lib/mcop/Arts/WaveDataHandle.mcopclass
-usr/lib/mcop/Arts/X11GlobalComm.mcopclass
-usr/lib/mcop/artsflow.mcopclass
-usr/lib/mcop/artsflow.mcoptype
-usr/lib/mcop/kmedia2.mcopclass
-usr/lib/mcop/kmedia2.mcoptype
-usr/lib/mcop/soundserver.mcopclass
-usr/lib/mcop/soundserver.mcoptype
-usr/lib/mcop/x11globalcomm.mcopclass
-usr/lib/mcop/x11globalcomm.mcoptype
-usr/share/doc/arts-1.5.10/COPYING.LIB
diff --git a/audio/linux-c6-arts/pkg-plist.x86_64 b/audio/linux-c6-arts/pkg-plist.x86_64
deleted file mode 100644
index 25ad42802ece..000000000000
--- a/audio/linux-c6-arts/pkg-plist.x86_64
+++ /dev/null
@@ -1,124 +0,0 @@
-usr/bin/artscat
-usr/bin/artsd
-usr/bin/artsdsp
-usr/bin/artsplay
-usr/bin/artsrec
-usr/bin/artsshell
-usr/bin/artswrapper
-usr/lib/libartsc.so.0
-usr/lib/libartsc.so.0.0.0
-usr/lib/libartscbackend.so.0
-usr/lib/libartscbackend.so.0.0.0
-usr/lib/libartsdsp.so.0
-usr/lib/libartsdsp.so.0.0.0
-usr/lib/libartsdsp_st.so.0
-usr/lib/libartsdsp_st.so.0.0.0
-usr/lib/libartsflow.so.1
-usr/lib/libartsflow.so.1.0.0
-usr/lib/libartsflow_idl.so.1
-usr/lib/libartsflow_idl.so.1.0.0
-usr/lib/libartsgslplayobject.so.0
-usr/lib/libartsgslplayobject.so.0.0.0
-usr/lib/libartswavplayobject.so.0
-usr/lib/libartswavplayobject.so.0.0.0
-usr/lib/libgmcop.so.1
-usr/lib/libgmcop.so.1.0.0
-usr/lib/libkmedia2.so.1
-usr/lib/libkmedia2.so.1.0.0
-usr/lib/libkmedia2_idl.so.1
-usr/lib/libkmedia2_idl.so.1.0.0
-usr/lib/libmcop.so.1
-usr/lib/libmcop.so.1.0.0
-usr/lib/libmcop_mt.so.1
-usr/lib/libmcop_mt.so.1.0.0
-usr/lib/libqtmcop.so.1
-usr/lib/libqtmcop.so.1.0.0
-usr/lib/libsoundserver_idl.so.1
-usr/lib/libsoundserver_idl.so.1.0.0
-usr/lib/libx11globalcomm.so.1
-usr/lib/libx11globalcomm.so.1.0.0
-usr/lib/mcop/Arts/DataHandlePlay.mcopclass
-usr/lib/mcop/Arts/FileInputStream.mcopclass
-usr/lib/mcop/Arts/GSLPlayObject.mcopclass
-usr/lib/mcop/Arts/Synth_ADD.mcopclass
-usr/lib/mcop/Arts/Synth_AMAN_PLAY.mcopclass
-usr/lib/mcop/Arts/Synth_AMAN_RECORD.mcopclass
-usr/lib/mcop/Arts/Synth_BUS_DOWNLINK.mcopclass
-usr/lib/mcop/Arts/Synth_BUS_UPLINK.mcopclass
-usr/lib/mcop/Arts/Synth_FREQUENCY.mcopclass
-usr/lib/mcop/Arts/Synth_MUL.mcopclass
-usr/lib/mcop/Arts/Synth_MULTI_ADD.mcopclass
-usr/lib/mcop/Arts/Synth_PLAY.mcopclass
-usr/lib/mcop/Arts/Synth_PLAY_WAV.mcopclass
-usr/lib/mcop/Arts/Synth_RECORD.mcopclass
-usr/lib/mcop/Arts/Synth_WAVE_SIN.mcopclass
-usr/lib/mcop/Arts/WavPlayObject.mcopclass
-usr/lib/mcop/Arts/WaveDataHandle.mcopclass
-usr/lib/mcop/Arts/X11GlobalComm.mcopclass
-usr/lib/mcop/artsflow.mcopclass
-usr/lib/mcop/artsflow.mcoptype
-usr/lib/mcop/kmedia2.mcopclass
-usr/lib/mcop/kmedia2.mcoptype
-usr/lib/mcop/soundserver.mcopclass
-usr/lib/mcop/soundserver.mcoptype
-usr/lib/mcop/x11globalcomm.mcopclass
-usr/lib/mcop/x11globalcomm.mcoptype
-usr/lib64/libartsc.so.0
-usr/lib64/libartsc.so.0.0.0
-usr/lib64/libartscbackend.so.0
-usr/lib64/libartscbackend.so.0.0.0
-usr/lib64/libartsdsp.so.0
-usr/lib64/libartsdsp.so.0.0.0
-usr/lib64/libartsdsp_st.so.0
-usr/lib64/libartsdsp_st.so.0.0.0
-usr/lib64/libartsflow.so.1
-usr/lib64/libartsflow.so.1.0.0
-usr/lib64/libartsflow_idl.so.1
-usr/lib64/libartsflow_idl.so.1.0.0
-usr/lib64/libartsgslplayobject.so.0
-usr/lib64/libartsgslplayobject.so.0.0.0
-usr/lib64/libartswavplayobject.so.0
-usr/lib64/libartswavplayobject.so.0.0.0
-usr/lib64/libgmcop.so.1
-usr/lib64/libgmcop.so.1.0.0
-usr/lib64/libkmedia2.so.1
-usr/lib64/libkmedia2.so.1.0.0
-usr/lib64/libkmedia2_idl.so.1
-usr/lib64/libkmedia2_idl.so.1.0.0
-usr/lib64/libmcop.so.1
-usr/lib64/libmcop.so.1.0.0
-usr/lib64/libmcop_mt.so.1
-usr/lib64/libmcop_mt.so.1.0.0
-usr/lib64/libqtmcop.so.1
-usr/lib64/libqtmcop.so.1.0.0
-usr/lib64/libsoundserver_idl.so.1
-usr/lib64/libsoundserver_idl.so.1.0.0
-usr/lib64/libx11globalcomm.so.1
-usr/lib64/libx11globalcomm.so.1.0.0
-usr/lib64/mcop/Arts/DataHandlePlay.mcopclass
-usr/lib64/mcop/Arts/FileInputStream.mcopclass
-usr/lib64/mcop/Arts/GSLPlayObject.mcopclass
-usr/lib64/mcop/Arts/Synth_ADD.mcopclass
-usr/lib64/mcop/Arts/Synth_AMAN_PLAY.mcopclass
-usr/lib64/mcop/Arts/Synth_AMAN_RECORD.mcopclass
-usr/lib64/mcop/Arts/Synth_BUS_DOWNLINK.mcopclass
-usr/lib64/mcop/Arts/Synth_BUS_UPLINK.mcopclass
-usr/lib64/mcop/Arts/Synth_FREQUENCY.mcopclass
-usr/lib64/mcop/Arts/Synth_MUL.mcopclass
-usr/lib64/mcop/Arts/Synth_MULTI_ADD.mcopclass
-usr/lib64/mcop/Arts/Synth_PLAY.mcopclass
-usr/lib64/mcop/Arts/Synth_PLAY_WAV.mcopclass
-usr/lib64/mcop/Arts/Synth_RECORD.mcopclass
-usr/lib64/mcop/Arts/Synth_WAVE_SIN.mcopclass
-usr/lib64/mcop/Arts/WavPlayObject.mcopclass
-usr/lib64/mcop/Arts/WaveDataHandle.mcopclass
-usr/lib64/mcop/Arts/X11GlobalComm.mcopclass
-usr/lib64/mcop/artsflow.mcopclass
-usr/lib64/mcop/artsflow.mcoptype
-usr/lib64/mcop/kmedia2.mcopclass
-usr/lib64/mcop/kmedia2.mcoptype
-usr/lib64/mcop/soundserver.mcopclass
-usr/lib64/mcop/soundserver.mcoptype
-usr/lib64/mcop/x11globalcomm.mcopclass
-usr/lib64/mcop/x11globalcomm.mcoptype
-usr/share/doc/arts-1.5.10/COPYING.LIB
diff --git a/audio/linux-c6-esound/Makefile b/audio/linux-c6-esound/Makefile
deleted file mode 100644
index 22558a9131de..000000000000
--- a/audio/linux-c6-esound/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# Created by: Johannes Meixner <johannes@perceivon.net>
-# $FreeBSD$
-
-PORTNAME= esound
-PORTVERSION= 0.2.41
-PORTREVISION= 3
-CATEGORIES= audio linux
-LIB_DISTFILES= ${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}${EXTRACT_SUFX}
-SRC_DISTFILES= ${DISTNAME}${SRC_SUFX}:SOURCE
-
-MAINTAINER= emulation@FreeBSD.org
-COMMENT= RPM of esound (Linux CentOS ${LINUX_DIST_VER})
-
-CONFLICTS= linux-esound-[0-9]* linux-f10-esound-[0-9]*
-
-LINUX_NAME= ${PORTNAME}-libs
-RPMVERSION= 3.1.el6
-USES= linux:c6
-USE_LDCONFIG= yes
-USE_LINUX= libaudiofile
-USE_LINUX_RPM= yes
-
-DOCSDIR= ${PREFIX}/usr/share/doc/${LINUX_NAME}-${PORTVERSION}
-PORTDOCS= AUTHORS COPYING.LIB ChangeLog NEWS README TIPS TODO esound.sgml
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
-
-.include <bsd.port.mk>
diff --git a/audio/linux-c6-esound/distinfo.i386 b/audio/linux-c6-esound/distinfo.i386
deleted file mode 100644
index fd2da9de2e19..000000000000
--- a/audio/linux-c6-esound/distinfo.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1466256755
-SHA256 (rpm/i686/centos/6.8/esound-libs-0.2.41-3.1.el6.i686.rpm) = 01deb1ca2dbcdcf6738b7c6399b6328393c70df5d7107a4b89b8630163089835
-SIZE (rpm/i686/centos/6.8/esound-libs-0.2.41-3.1.el6.i686.rpm) = 75756
-SHA256 (rpm/i686/centos/6.8/esound-0.2.41-3.1.el6.src.rpm) = 764e4f001f96f71dd6fdcc5ad7dafd990ea734152aee7c6f2293503d8a8f51b4
-SIZE (rpm/i686/centos/6.8/esound-0.2.41-3.1.el6.src.rpm) = 412396
diff --git a/audio/linux-c6-esound/distinfo.x86_64 b/audio/linux-c6-esound/distinfo.x86_64
deleted file mode 100644
index aef2f7a910d9..000000000000
--- a/audio/linux-c6-esound/distinfo.x86_64
+++ /dev/null
@@ -1,7 +0,0 @@
-TIMESTAMP = 1466257281
-SHA256 (rpm/x86_64/centos/6.8/esound-libs-0.2.41-3.1.el6.x86_64.rpm) = 203d1e83ab2c53554ba054c7b763fad55e4e32aa87763a0bef225c369f698038
-SIZE (rpm/x86_64/centos/6.8/esound-libs-0.2.41-3.1.el6.x86_64.rpm) = 75984
-SHA256 (rpm/x86_64/centos/6.8/esound-libs-0.2.41-3.1.el6.i686.rpm) = 01deb1ca2dbcdcf6738b7c6399b6328393c70df5d7107a4b89b8630163089835
-SIZE (rpm/x86_64/centos/6.8/esound-libs-0.2.41-3.1.el6.i686.rpm) = 75756
-SHA256 (rpm/x86_64/centos/6.8/esound-0.2.41-3.1.el6.src.rpm) = 764e4f001f96f71dd6fdcc5ad7dafd990ea734152aee7c6f2293503d8a8f51b4
-SIZE (rpm/x86_64/centos/6.8/esound-0.2.41-3.1.el6.src.rpm) = 412396
diff --git a/audio/linux-c6-esound/pkg-descr b/audio/linux-c6-esound/pkg-descr
deleted file mode 100644
index c8b9af439bfb..000000000000
--- a/audio/linux-c6-esound/pkg-descr
+++ /dev/null
@@ -1 +0,0 @@
-This is a port for esound rpm.
diff --git a/audio/linux-c6-esound/pkg-plist.i386 b/audio/linux-c6-esound/pkg-plist.i386
deleted file mode 100644
index 6e8baa1fc4a7..000000000000
--- a/audio/linux-c6-esound/pkg-plist.i386
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/lib/libesd.so.0
-usr/lib/libesd.so.0.2.39
-usr/lib/libesddsp.so.0
-usr/lib/libesddsp.so.0.2.39
diff --git a/audio/linux-c6-esound/pkg-plist.x86_64 b/audio/linux-c6-esound/pkg-plist.x86_64
deleted file mode 100644
index a4ccfe5fd0b6..000000000000
--- a/audio/linux-c6-esound/pkg-plist.x86_64
+++ /dev/null
@@ -1,8 +0,0 @@
-usr/lib/libesd.so.0
-usr/lib/libesd.so.0.2.39
-usr/lib/libesddsp.so.0
-usr/lib/libesddsp.so.0.2.39
-usr/lib64/libesd.so.0
-usr/lib64/libesd.so.0.2.39
-usr/lib64/libesddsp.so.0
-usr/lib64/libesddsp.so.0.2.39
diff --git a/audio/linux-c6-flac/Makefile b/audio/linux-c6-flac/Makefile
index e10f8ba0602a..7a40111f8fe5 100644
--- a/audio/linux-c6-flac/Makefile
+++ b/audio/linux-c6-flac/Makefile
@@ -9,14 +9,11 @@ CATEGORIES= audio linux
MAINTAINER= emulation@FreeBSD.org
COMMENT= Free lossless audio codec (Linux CentOS ${LINUX_DIST_VER})
-CONFLICTS= linux-flac-[0-9]* linux-f10-flac-[0-9]*
-
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
RPMVERSION= 7.el6_6
USES= linux:c6
USE_LDCONFIG= yes
USE_LINUX= libogg
USE_LINUX_RPM= yes
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
-
.include <bsd.port.mk>
diff --git a/audio/linux-c6-flac/distinfo b/audio/linux-c6-flac/distinfo
new file mode 100644
index 000000000000..78dfb777e401
--- /dev/null
+++ b/audio/linux-c6-flac/distinfo
@@ -0,0 +1,7 @@
+TIMESTAMP = 1485445595
+SHA256 (centos/flac-1.2.1-7.el6_6.i686.rpm) = 205a76001ac677e76ca9455fdebf2ddcdaaaf9cff8523651db23a8c1e444d03e
+SIZE (centos/flac-1.2.1-7.el6_6.i686.rpm) = 259432
+SHA256 (centos/flac-1.2.1-7.el6_6.x86_64.rpm) = 7211ff37e92c809f2d12ce6ea81059087df14fdfd2f59c2eba810d7b47112767
+SIZE (centos/flac-1.2.1-7.el6_6.x86_64.rpm) = 248252
+SHA256 (centos/flac-1.2.1-7.el6_6.src.rpm) = 6c5a6bf61baa48c63f2f529d836888f7b5b2efce964dd212bde4bb1cd74d9282
+SIZE (centos/flac-1.2.1-7.el6_6.src.rpm) = 2016484
diff --git a/audio/linux-c6-flac/distinfo.i386 b/audio/linux-c6-flac/distinfo.i386
deleted file mode 100644
index 47597c7baa63..000000000000
--- a/audio/linux-c6-flac/distinfo.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1466262920
-SHA256 (rpm/i686/centos/6.8/flac-1.2.1-7.el6_6.i686.rpm) = 205a76001ac677e76ca9455fdebf2ddcdaaaf9cff8523651db23a8c1e444d03e
-SIZE (rpm/i686/centos/6.8/flac-1.2.1-7.el6_6.i686.rpm) = 259432
-SHA256 (rpm/i686/centos/6.8/flac-1.2.1-7.el6_6.src.rpm) = 6c5a6bf61baa48c63f2f529d836888f7b5b2efce964dd212bde4bb1cd74d9282
-SIZE (rpm/i686/centos/6.8/flac-1.2.1-7.el6_6.src.rpm) = 2016484
diff --git a/audio/linux-c6-flac/distinfo.x86_64 b/audio/linux-c6-flac/distinfo.x86_64
deleted file mode 100644
index f14292ec1a4e..000000000000
--- a/audio/linux-c6-flac/distinfo.x86_64
+++ /dev/null
@@ -1,7 +0,0 @@
-TIMESTAMP = 1466257263
-SHA256 (rpm/x86_64/centos/6.8/flac-1.2.1-7.el6_6.x86_64.rpm) = 7211ff37e92c809f2d12ce6ea81059087df14fdfd2f59c2eba810d7b47112767
-SIZE (rpm/x86_64/centos/6.8/flac-1.2.1-7.el6_6.x86_64.rpm) = 248252
-SHA256 (rpm/x86_64/centos/6.8/flac-1.2.1-7.el6_6.i686.rpm) = 205a76001ac677e76ca9455fdebf2ddcdaaaf9cff8523651db23a8c1e444d03e
-SIZE (rpm/x86_64/centos/6.8/flac-1.2.1-7.el6_6.i686.rpm) = 259432
-SHA256 (rpm/x86_64/centos/6.8/flac-1.2.1-7.el6_6.src.rpm) = 6c5a6bf61baa48c63f2f529d836888f7b5b2efce964dd212bde4bb1cd74d9282
-SIZE (rpm/x86_64/centos/6.8/flac-1.2.1-7.el6_6.src.rpm) = 2016484
diff --git a/audio/linux-c6-flac/pkg-plist.x86_64 b/audio/linux-c6-flac/pkg-plist.amd64
index 340fdb75d076..340fdb75d076 100644
--- a/audio/linux-c6-flac/pkg-plist.x86_64
+++ b/audio/linux-c6-flac/pkg-plist.amd64
diff --git a/audio/linux-c6-libaudiofile/Makefile b/audio/linux-c6-libaudiofile/Makefile
index 70501d52bcd0..3a9389d9e68a 100644
--- a/audio/linux-c6-libaudiofile/Makefile
+++ b/audio/linux-c6-libaudiofile/Makefile
@@ -1,23 +1,18 @@
# Created by: Johannes Meixner <johannes@perceivon.net>
# $FreeBSD$
-PORTNAME= libaudiofile
+PORTNAME= audiofile
PORTVERSION= 0.2.6
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio linux
-DISTNAME= audiofile-${PORTVERSION}-${RPMVERSION}
MAINTAINER= emulation@FreeBSD.org
COMMENT= Implementation of the Audio File Library from SGI (Linux CentOS ${LINUX_DIST_VER})
-CONTFLICTS= linux-libaudiofile-[0-9]* linux-f10-libaudiofile-[0-9]*
-
-USES= linux:c6
-USE_LINUX_RPM= yes
-
+DESCR= ${.CURDIR}/../lib${PORTNAME}/pkg-descr
RPMVERSION= 11.1.el6
+USES= linux:c6
USE_LDCONFIG= yes
-
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+USE_LINUX_RPM= yes
.include <bsd.port.mk>
diff --git a/audio/linux-c6-libaudiofile/distinfo b/audio/linux-c6-libaudiofile/distinfo
new file mode 100644
index 000000000000..1b859a1ef4a9
--- /dev/null
+++ b/audio/linux-c6-libaudiofile/distinfo
@@ -0,0 +1,7 @@
+TIMESTAMP = 1485446288
+SHA256 (centos/audiofile-0.2.6-11.1.el6.i686.rpm) = 0c69612801fba085f31d4efb86516249349ef468629af48497de3480ed02394c
+SIZE (centos/audiofile-0.2.6-11.1.el6.i686.rpm) = 98100
+SHA256 (centos/audiofile-0.2.6-11.1.el6.x86_64.rpm) = 528b304107d7004939cbb7060151091b81eb4696111f0510418e8444a707d89d
+SIZE (centos/audiofile-0.2.6-11.1.el6.x86_64.rpm) = 97244
+SHA256 (centos/audiofile-0.2.6-11.1.el6.src.rpm) = fc01779d488a6430cfe2c437d996cfd42025a1864f2b15bd241325ecafc05f5b
+SIZE (centos/audiofile-0.2.6-11.1.el6.src.rpm) = 291993
diff --git a/audio/linux-c6-libaudiofile/distinfo.i386 b/audio/linux-c6-libaudiofile/distinfo.i386
deleted file mode 100644
index df1c1ec12ebd..000000000000
--- a/audio/linux-c6-libaudiofile/distinfo.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1466263057
-SHA256 (rpm/i686/centos/6.8/audiofile-0.2.6-11.1.el6.i686.rpm) = 0c69612801fba085f31d4efb86516249349ef468629af48497de3480ed02394c
-SIZE (rpm/i686/centos/6.8/audiofile-0.2.6-11.1.el6.i686.rpm) = 98100
-SHA256 (rpm/i686/centos/6.8/audiofile-0.2.6-11.1.el6.src.rpm) = fc01779d488a6430cfe2c437d996cfd42025a1864f2b15bd241325ecafc05f5b
-SIZE (rpm/i686/centos/6.8/audiofile-0.2.6-11.1.el6.src.rpm) = 291993
diff --git a/audio/linux-c6-libaudiofile/distinfo.x86_64 b/audio/linux-c6-libaudiofile/distinfo.x86_64
deleted file mode 100644
index 9e34ec73a88c..000000000000
--- a/audio/linux-c6-libaudiofile/distinfo.x86_64
+++ /dev/null
@@ -1,7 +0,0 @@
-TIMESTAMP = 1466257278
-SHA256 (rpm/x86_64/centos/6.8/audiofile-0.2.6-11.1.el6.x86_64.rpm) = 528b304107d7004939cbb7060151091b81eb4696111f0510418e8444a707d89d
-SIZE (rpm/x86_64/centos/6.8/audiofile-0.2.6-11.1.el6.x86_64.rpm) = 97244
-SHA256 (rpm/x86_64/centos/6.8/audiofile-0.2.6-11.1.el6.i686.rpm) = 0c69612801fba085f31d4efb86516249349ef468629af48497de3480ed02394c
-SIZE (rpm/x86_64/centos/6.8/audiofile-0.2.6-11.1.el6.i686.rpm) = 98100
-SHA256 (rpm/x86_64/centos/6.8/audiofile-0.2.6-11.1.el6.src.rpm) = fc01779d488a6430cfe2c437d996cfd42025a1864f2b15bd241325ecafc05f5b
-SIZE (rpm/x86_64/centos/6.8/audiofile-0.2.6-11.1.el6.src.rpm) = 291993
diff --git a/audio/linux-c6-libaudiofile/pkg-plist.amd64 b/audio/linux-c6-libaudiofile/pkg-plist.amd64
new file mode 100644
index 000000000000..b601b7547a5e
--- /dev/null
+++ b/audio/linux-c6-libaudiofile/pkg-plist.amd64
@@ -0,0 +1,25 @@
+usr/bin/sfconvert
+usr/bin/sfinfo
+usr/lib/libaudiofile.so.0
+usr/lib/libaudiofile.so.0.0.2
+usr/lib64/libaudiofile.so.0
+usr/lib64/libaudiofile.so.0.0.2
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/docs/afCloseFile
+%%PORTDOCS%%%%DOCSDIR%%/docs/afGetFrameSize
+%%PORTDOCS%%%%DOCSDIR%%/docs/afGetTrackBytes
+%%PORTDOCS%%%%DOCSDIR%%/docs/afIntro
+%%PORTDOCS%%%%DOCSDIR%%/docs/afNewFileSetup
+%%PORTDOCS%%%%DOCSDIR%%/docs/afOpenFile
+%%PORTDOCS%%%%DOCSDIR%%/docs/afQuery
+%%PORTDOCS%%%%DOCSDIR%%/docs/afReadFrames
+%%PORTDOCS%%%%DOCSDIR%%/docs/afReadMisc
+%%PORTDOCS%%%%DOCSDIR%%/docs/afSeekFrame
+%%PORTDOCS%%%%DOCSDIR%%/docs/afSetErrorHandler
+%%PORTDOCS%%%%DOCSDIR%%/docs/afSetVirtualByteOrder
+%%PORTDOCS%%%%DOCSDIR%%/docs/afWriteFrames
+%%PORTDOCS%%%%DOCSDIR%%/docs/sfconvert
+%%PORTDOCS%%%%DOCSDIR%%/docs/sfinfo
diff --git a/audio/linux-c6-libaudiofile/pkg-plist.i386 b/audio/linux-c6-libaudiofile/pkg-plist.i386
index 4df95fb4a8c9..859b83afe577 100644
--- a/audio/linux-c6-libaudiofile/pkg-plist.i386
+++ b/audio/linux-c6-libaudiofile/pkg-plist.i386
@@ -2,22 +2,22 @@ usr/bin/sfconvert
usr/bin/sfinfo
usr/lib/libaudiofile.so.0
usr/lib/libaudiofile.so.0.0.2
-usr/share/doc/audiofile-0.2.6/COPYING
-usr/share/doc/audiofile-0.2.6/ChangeLog
-usr/share/doc/audiofile-0.2.6/README
-usr/share/doc/audiofile-0.2.6/TODO
-usr/share/doc/audiofile-0.2.6/docs/afCloseFile
-usr/share/doc/audiofile-0.2.6/docs/afGetFrameSize
-usr/share/doc/audiofile-0.2.6/docs/afGetTrackBytes
-usr/share/doc/audiofile-0.2.6/docs/afIntro
-usr/share/doc/audiofile-0.2.6/docs/afNewFileSetup
-usr/share/doc/audiofile-0.2.6/docs/afOpenFile
-usr/share/doc/audiofile-0.2.6/docs/afQuery
-usr/share/doc/audiofile-0.2.6/docs/afReadFrames
-usr/share/doc/audiofile-0.2.6/docs/afReadMisc
-usr/share/doc/audiofile-0.2.6/docs/afSeekFrame
-usr/share/doc/audiofile-0.2.6/docs/afSetErrorHandler
-usr/share/doc/audiofile-0.2.6/docs/afSetVirtualByteOrder
-usr/share/doc/audiofile-0.2.6/docs/afWriteFrames
-usr/share/doc/audiofile-0.2.6/docs/sfconvert
-usr/share/doc/audiofile-0.2.6/docs/sfinfo
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/docs/afCloseFile
+%%PORTDOCS%%%%DOCSDIR%%/docs/afGetFrameSize
+%%PORTDOCS%%%%DOCSDIR%%/docs/afGetTrackBytes
+%%PORTDOCS%%%%DOCSDIR%%/docs/afIntro
+%%PORTDOCS%%%%DOCSDIR%%/docs/afNewFileSetup
+%%PORTDOCS%%%%DOCSDIR%%/docs/afOpenFile
+%%PORTDOCS%%%%DOCSDIR%%/docs/afQuery
+%%PORTDOCS%%%%DOCSDIR%%/docs/afReadFrames
+%%PORTDOCS%%%%DOCSDIR%%/docs/afReadMisc
+%%PORTDOCS%%%%DOCSDIR%%/docs/afSeekFrame
+%%PORTDOCS%%%%DOCSDIR%%/docs/afSetErrorHandler
+%%PORTDOCS%%%%DOCSDIR%%/docs/afSetVirtualByteOrder
+%%PORTDOCS%%%%DOCSDIR%%/docs/afWriteFrames
+%%PORTDOCS%%%%DOCSDIR%%/docs/sfconvert
+%%PORTDOCS%%%%DOCSDIR%%/docs/sfinfo
diff --git a/audio/linux-c6-libaudiofile/pkg-plist.x86_64 b/audio/linux-c6-libaudiofile/pkg-plist.x86_64
deleted file mode 100644
index 20b35f382ef9..000000000000
--- a/audio/linux-c6-libaudiofile/pkg-plist.x86_64
+++ /dev/null
@@ -1,25 +0,0 @@
-usr/bin/sfconvert
-usr/bin/sfinfo
-usr/lib/libaudiofile.so.0
-usr/lib/libaudiofile.so.0.0.2
-usr/lib64/libaudiofile.so.0
-usr/lib64/libaudiofile.so.0.0.2
-usr/share/doc/audiofile-0.2.6/COPYING
-usr/share/doc/audiofile-0.2.6/ChangeLog
-usr/share/doc/audiofile-0.2.6/README
-usr/share/doc/audiofile-0.2.6/TODO
-usr/share/doc/audiofile-0.2.6/docs/afCloseFile
-usr/share/doc/audiofile-0.2.6/docs/afGetFrameSize
-usr/share/doc/audiofile-0.2.6/docs/afGetTrackBytes
-usr/share/doc/audiofile-0.2.6/docs/afIntro
-usr/share/doc/audiofile-0.2.6/docs/afNewFileSetup
-usr/share/doc/audiofile-0.2.6/docs/afOpenFile
-usr/share/doc/audiofile-0.2.6/docs/afQuery
-usr/share/doc/audiofile-0.2.6/docs/afReadFrames
-usr/share/doc/audiofile-0.2.6/docs/afReadMisc
-usr/share/doc/audiofile-0.2.6/docs/afSeekFrame
-usr/share/doc/audiofile-0.2.6/docs/afSetErrorHandler
-usr/share/doc/audiofile-0.2.6/docs/afSetVirtualByteOrder
-usr/share/doc/audiofile-0.2.6/docs/afWriteFrames
-usr/share/doc/audiofile-0.2.6/docs/sfconvert
-usr/share/doc/audiofile-0.2.6/docs/sfinfo
diff --git a/audio/linux-c6-libogg/Makefile b/audio/linux-c6-libogg/Makefile
index 7756b48d7ffc..ebe83d753a4f 100644
--- a/audio/linux-c6-libogg/Makefile
+++ b/audio/linux-c6-libogg/Makefile
@@ -9,15 +9,10 @@ CATEGORIES= audio linux
MAINTAINER= emulation@FreeBSD.org
COMMENT= Ogg bitstream library (Linux CentOS ${LINUX_DIST_VER})
-CONFLICTS= linux-libogg-[0-9]* linux-f10-libogg-[0-9]*
-
-USES= linux:c6
-USE_LINUX_RPM= yes
-
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
RPMVERSION= 2.1.el6
+USES= linux:c6
USE_LDCONFIG= yes
-
-PORTDOCS= AUTHORS CHANGES COPYING README
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+USE_LINUX_RPM= yes
.include <bsd.port.mk>
diff --git a/audio/linux-c6-libogg/distinfo b/audio/linux-c6-libogg/distinfo
new file mode 100644
index 000000000000..03d3208d2e39
--- /dev/null
+++ b/audio/linux-c6-libogg/distinfo
@@ -0,0 +1,7 @@
+TIMESTAMP = 1485448641
+SHA256 (centos/libogg-1.1.4-2.1.el6.i686.rpm) = cb9c44995ebd89d5063bb9c91cf64fdae911e1350c412c99019d76ca7e9f70ab
+SIZE (centos/libogg-1.1.4-2.1.el6.i686.rpm) = 22172
+SHA256 (centos/libogg-1.1.4-2.1.el6.x86_64.rpm) = 065a86824f6d88d6f2fbba456cdbaebd458869232a8d6f4c1249a7da81a58a82
+SIZE (centos/libogg-1.1.4-2.1.el6.x86_64.rpm) = 21392
+SHA256 (centos/libogg-1.1.4-2.1.el6.src.rpm) = e3052e1e020779e92aa5a37d453de207071100bde1e50cac046ee1dc9fd535a2
+SIZE (centos/libogg-1.1.4-2.1.el6.src.rpm) = 447558
diff --git a/audio/linux-c6-libogg/distinfo.i386 b/audio/linux-c6-libogg/distinfo.i386
deleted file mode 100644
index 71084c138b45..000000000000
--- a/audio/linux-c6-libogg/distinfo.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1466256765
-SHA256 (rpm/i686/centos/6.8/libogg-1.1.4-2.1.el6.i686.rpm) = cb9c44995ebd89d5063bb9c91cf64fdae911e1350c412c99019d76ca7e9f70ab
-SIZE (rpm/i686/centos/6.8/libogg-1.1.4-2.1.el6.i686.rpm) = 22172
-SHA256 (rpm/i686/centos/6.8/libogg-1.1.4-2.1.el6.src.rpm) = e3052e1e020779e92aa5a37d453de207071100bde1e50cac046ee1dc9fd535a2
-SIZE (rpm/i686/centos/6.8/libogg-1.1.4-2.1.el6.src.rpm) = 447558
diff --git a/audio/linux-c6-libogg/distinfo.x86_64 b/audio/linux-c6-libogg/distinfo.x86_64
deleted file mode 100644
index 312af5db9738..000000000000
--- a/audio/linux-c6-libogg/distinfo.x86_64
+++ /dev/null
@@ -1,7 +0,0 @@
-TIMESTAMP = 1466257299
-SHA256 (rpm/x86_64/centos/6.8/libogg-1.1.4-2.1.el6.x86_64.rpm) = 065a86824f6d88d6f2fbba456cdbaebd458869232a8d6f4c1249a7da81a58a82
-SIZE (rpm/x86_64/centos/6.8/libogg-1.1.4-2.1.el6.x86_64.rpm) = 21392
-SHA256 (rpm/x86_64/centos/6.8/libogg-1.1.4-2.1.el6.i686.rpm) = cb9c44995ebd89d5063bb9c91cf64fdae911e1350c412c99019d76ca7e9f70ab
-SIZE (rpm/x86_64/centos/6.8/libogg-1.1.4-2.1.el6.i686.rpm) = 22172
-SHA256 (rpm/x86_64/centos/6.8/libogg-1.1.4-2.1.el6.src.rpm) = e3052e1e020779e92aa5a37d453de207071100bde1e50cac046ee1dc9fd535a2
-SIZE (rpm/x86_64/centos/6.8/libogg-1.1.4-2.1.el6.src.rpm) = 447558
diff --git a/audio/linux-c6-libogg/pkg-plist.amd64 b/audio/linux-c6-libogg/pkg-plist.amd64
new file mode 100644
index 000000000000..077512f3b35d
--- /dev/null
+++ b/audio/linux-c6-libogg/pkg-plist.amd64
@@ -0,0 +1,8 @@
+usr/lib/libogg.so.0
+usr/lib/libogg.so.0.6.0
+usr/lib64/libogg.so.0
+usr/lib64/libogg.so.0.6.0
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/README
diff --git a/audio/linux-c6-libogg/pkg-plist.i386 b/audio/linux-c6-libogg/pkg-plist.i386
index 471dc04490a4..2de650ed6c1e 100644
--- a/audio/linux-c6-libogg/pkg-plist.i386
+++ b/audio/linux-c6-libogg/pkg-plist.i386
@@ -1,2 +1,6 @@
usr/lib/libogg.so.0
usr/lib/libogg.so.0.6.0
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/README
diff --git a/audio/linux-c6-libogg/pkg-plist.x86_64 b/audio/linux-c6-libogg/pkg-plist.x86_64
deleted file mode 100644
index e021dff729f9..000000000000
--- a/audio/linux-c6-libogg/pkg-plist.x86_64
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/lib/libogg.so.0
-usr/lib/libogg.so.0.6.0
-usr/lib64/libogg.so.0
-usr/lib64/libogg.so.0.6.0
diff --git a/audio/linux-c6-libsndfile/Makefile b/audio/linux-c6-libsndfile/Makefile
index 2c6e6fd53512..e138fdd15cae 100644
--- a/audio/linux-c6-libsndfile/Makefile
+++ b/audio/linux-c6-libsndfile/Makefile
@@ -9,15 +9,11 @@ CATEGORIES= audio linux
MAINTAINER= emulation@FreeBSD.org
COMMENT= Reading and writing files containing sampled sound (like WAV or AIFF) (Linux CentOS ${LINUX_DIST_VER})
-CONTFLICTS= linux-libsndfile-[0-9]* linux-f10-libsndfile-[0-9]*
-
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+RPMVERSION= 5.el6
USES= linux:c6
+USE_LDCONFIG= yes
USE_LINUX= flac libogg libvorbis
USE_LINUX_RPM= yes
-RPMVERSION= 5.el6
-USE_LDCONFIG= yes
-
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
-
.include <bsd.port.mk>
diff --git a/audio/linux-c6-libsndfile/distinfo b/audio/linux-c6-libsndfile/distinfo
new file mode 100644
index 000000000000..8f54bce4b136
--- /dev/null
+++ b/audio/linux-c6-libsndfile/distinfo
@@ -0,0 +1,7 @@
+TIMESTAMP = 1485448886
+SHA256 (centos/libsndfile-1.0.20-5.el6.i686.rpm) = 70068f93a67f926518cf850c8fc082ae3fb82bddcf080f28fcabe412b5f47aac
+SIZE (centos/libsndfile-1.0.20-5.el6.i686.rpm) = 250528
+SHA256 (centos/libsndfile-1.0.20-5.el6.x86_64.rpm) = 46bc5182db51d1fb38acfe3e4b0404371e13c7ddda0dbb2559cfb03d0295ede4
+SIZE (centos/libsndfile-1.0.20-5.el6.x86_64.rpm) = 238272
+SHA256 (centos/libsndfile-1.0.20-5.el6.src.rpm) = 2c464568eab538961923c232e9291723e85309f019648b3228b105ce3a373833
+SIZE (centos/libsndfile-1.0.20-5.el6.src.rpm) = 935996
diff --git a/audio/linux-c6-libsndfile/distinfo.i386 b/audio/linux-c6-libsndfile/distinfo.i386
deleted file mode 100644
index 5ac3406b79d1..000000000000
--- a/audio/linux-c6-libsndfile/distinfo.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1466256764
-SHA256 (rpm/i686/centos/6.8/libsndfile-1.0.20-5.el6.i686.rpm) = 70068f93a67f926518cf850c8fc082ae3fb82bddcf080f28fcabe412b5f47aac
-SIZE (rpm/i686/centos/6.8/libsndfile-1.0.20-5.el6.i686.rpm) = 250528
-SHA256 (rpm/i686/centos/6.8/libsndfile-1.0.20-5.el6.src.rpm) = 2c464568eab538961923c232e9291723e85309f019648b3228b105ce3a373833
-SIZE (rpm/i686/centos/6.8/libsndfile-1.0.20-5.el6.src.rpm) = 935996
diff --git a/audio/linux-c6-libsndfile/distinfo.x86_64 b/audio/linux-c6-libsndfile/distinfo.x86_64
deleted file mode 100644
index ce88695b7983..000000000000
--- a/audio/linux-c6-libsndfile/distinfo.x86_64
+++ /dev/null
@@ -1,7 +0,0 @@
-TIMESTAMP = 1466257297
-SHA256 (rpm/x86_64/centos/6.8/libsndfile-1.0.20-5.el6.x86_64.rpm) = 46bc5182db51d1fb38acfe3e4b0404371e13c7ddda0dbb2559cfb03d0295ede4
-SIZE (rpm/x86_64/centos/6.8/libsndfile-1.0.20-5.el6.x86_64.rpm) = 238272
-SHA256 (rpm/x86_64/centos/6.8/libsndfile-1.0.20-5.el6.i686.rpm) = 70068f93a67f926518cf850c8fc082ae3fb82bddcf080f28fcabe412b5f47aac
-SIZE (rpm/x86_64/centos/6.8/libsndfile-1.0.20-5.el6.i686.rpm) = 250528
-SHA256 (rpm/x86_64/centos/6.8/libsndfile-1.0.20-5.el6.src.rpm) = 2c464568eab538961923c232e9291723e85309f019648b3228b105ce3a373833
-SIZE (rpm/x86_64/centos/6.8/libsndfile-1.0.20-5.el6.src.rpm) = 935996
diff --git a/audio/linux-c6-libsndfile/pkg-plist.x86_64 b/audio/linux-c6-libsndfile/pkg-plist.amd64
index 06597738ffb9..06597738ffb9 100644
--- a/audio/linux-c6-libsndfile/pkg-plist.x86_64
+++ b/audio/linux-c6-libsndfile/pkg-plist.amd64
diff --git a/audio/linux-c6-libvorbis/Makefile b/audio/linux-c6-libvorbis/Makefile
index b2dac0da2226..c50b51a01bf7 100644
--- a/audio/linux-c6-libvorbis/Makefile
+++ b/audio/linux-c6-libvorbis/Makefile
@@ -9,15 +9,11 @@ CATEGORIES= audio linux
MAINTAINER= emulation@FreeBSD.org
COMMENT= Audio compression codec library (Linux CentOS ${LINUX_DIST_VER})
-CONFLICTS= linux-libvorbis-[0-9]* linux-f10-libvorbis-[0-9]*
-
-USES= linux:c6
-USE_LINUX_RPM= yes
-USE_LINUX= libogg
-
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
RPMVERSION= 4.el6_2.1
+USES= linux:c6
USE_LDCONFIG= yes
-
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+USE_LINUX= libogg
+USE_LINUX_RPM= yes
.include <bsd.port.mk>
diff --git a/audio/linux-c6-libvorbis/distinfo b/audio/linux-c6-libvorbis/distinfo
new file mode 100644
index 000000000000..123aae5c3bab
--- /dev/null
+++ b/audio/linux-c6-libvorbis/distinfo
@@ -0,0 +1,7 @@
+TIMESTAMP = 1485448979
+SHA256 (centos/libvorbis-1.2.3-4.el6_2.1.i686.rpm) = ffd0931ac246c926bb29585865f972e262460ac75edeccd35e59bdc4bd6e4e15
+SIZE (centos/libvorbis-1.2.3-4.el6_2.1.i686.rpm) = 160680
+SHA256 (centos/libvorbis-1.2.3-4.el6_2.1.x86_64.rpm) = da803914d66eca64ef7a9dd69cfcf4a0afb3da2d781547fbf4a663f06c0e4431
+SIZE (centos/libvorbis-1.2.3-4.el6_2.1.x86_64.rpm) = 171824
+SHA256 (centos/libvorbis-1.2.3-4.el6_2.1.src.rpm) = 8fa60e212c3ec73da945e31723866426421e1ce376a3bd7c0550719ea489fa57
+SIZE (centos/libvorbis-1.2.3-4.el6_2.1.src.rpm) = 1207467
diff --git a/audio/linux-c6-libvorbis/distinfo.i386 b/audio/linux-c6-libvorbis/distinfo.i386
deleted file mode 100644
index f7973ef8e8d6..000000000000
--- a/audio/linux-c6-libvorbis/distinfo.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1466256774
-SHA256 (rpm/i686/centos/6.8/libvorbis-1.2.3-4.el6_2.1.i686.rpm) = ffd0931ac246c926bb29585865f972e262460ac75edeccd35e59bdc4bd6e4e15
-SIZE (rpm/i686/centos/6.8/libvorbis-1.2.3-4.el6_2.1.i686.rpm) = 160680
-SHA256 (rpm/i686/centos/6.8/libvorbis-1.2.3-4.el6_2.1.src.rpm) = 8fa60e212c3ec73da945e31723866426421e1ce376a3bd7c0550719ea489fa57
-SIZE (rpm/i686/centos/6.8/libvorbis-1.2.3-4.el6_2.1.src.rpm) = 1207467
diff --git a/audio/linux-c6-libvorbis/distinfo.x86_64 b/audio/linux-c6-libvorbis/distinfo.x86_64
deleted file mode 100644
index 3302bb69a9fd..000000000000
--- a/audio/linux-c6-libvorbis/distinfo.x86_64
+++ /dev/null
@@ -1,7 +0,0 @@
-TIMESTAMP = 1466257329
-SHA256 (rpm/x86_64/centos/6.8/libvorbis-1.2.3-4.el6_2.1.x86_64.rpm) = da803914d66eca64ef7a9dd69cfcf4a0afb3da2d781547fbf4a663f06c0e4431
-SIZE (rpm/x86_64/centos/6.8/libvorbis-1.2.3-4.el6_2.1.x86_64.rpm) = 171824
-SHA256 (rpm/x86_64/centos/6.8/libvorbis-1.2.3-4.el6_2.1.i686.rpm) = ffd0931ac246c926bb29585865f972e262460ac75edeccd35e59bdc4bd6e4e15
-SIZE (rpm/x86_64/centos/6.8/libvorbis-1.2.3-4.el6_2.1.i686.rpm) = 160680
-SHA256 (rpm/x86_64/centos/6.8/libvorbis-1.2.3-4.el6_2.1.src.rpm) = 8fa60e212c3ec73da945e31723866426421e1ce376a3bd7c0550719ea489fa57
-SIZE (rpm/x86_64/centos/6.8/libvorbis-1.2.3-4.el6_2.1.src.rpm) = 1207467
diff --git a/audio/linux-c6-libvorbis/pkg-plist.x86_64 b/audio/linux-c6-libvorbis/pkg-plist.amd64
index 8b98ff3ff7dd..8b98ff3ff7dd 100644
--- a/audio/linux-c6-libvorbis/pkg-plist.x86_64
+++ b/audio/linux-c6-libvorbis/pkg-plist.amd64
diff --git a/audio/linux-c6-mikmod/Makefile b/audio/linux-c6-mikmod/Makefile
index cc374ade0036..f6f270d7fd45 100644
--- a/audio/linux-c6-mikmod/Makefile
+++ b/audio/linux-c6-mikmod/Makefile
@@ -1,27 +1,19 @@
# Created by: Johannes Meixner <johannes@perceivon.net>
# $FreeBSD$
-PORTNAME= mikmod
+PORTNAME= libmikmod
PORTVERSION= 3.2.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= audio linux
MASTER_SITES= EPEL
-DISTNAME= ${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
MAINTAINER= emulation@FreeBSD.org
COMMENT= MikMod Sound Library (Linux CentOS ${LINUX_DIST_VER})
-CONFLICTS= linux-mikmod-[0-9]* linux-f8-mikmod-[0-9]*
-
-LINUX_NAME= lib${PORTNAME}
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
RPMVERSION= 10.beta2.el6
USES= linux:c6
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
-DOCSDIR= ${PREFIX}/usr/share/doc/${LINUX_NAME}-${PORTVERSION}
-PORTDOCS= AUTHORS COPYING.LESSER COPYING.LIB NEWS README TODO
-
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
-
.include <bsd.port.mk>
diff --git a/audio/linux-c6-mikmod/distinfo b/audio/linux-c6-mikmod/distinfo
new file mode 100644
index 000000000000..20f5ece6dbe5
--- /dev/null
+++ b/audio/linux-c6-mikmod/distinfo
@@ -0,0 +1,7 @@
+TIMESTAMP = 1485449225
+SHA256 (centos/libmikmod-3.2.0-10.beta2.el6.i686.rpm) = b8092168a549a2966bdd9a388d13560e9af66deccd7e65b26fa487413e163382
+SIZE (centos/libmikmod-3.2.0-10.beta2.el6.i686.rpm) = 163544
+SHA256 (centos/libmikmod-3.2.0-10.beta2.el6.x86_64.rpm) = d567bd9b175d76f7b468c8459082dfcdef2eba020ab44a597c614d9da6a0ed41
+SIZE (centos/libmikmod-3.2.0-10.beta2.el6.x86_64.rpm) = 164048
+SHA256 (centos/libmikmod-3.2.0-10.beta2.el6.src.rpm) = 61c1ccfe2d9afd2b942fe7ffa2a36d0c8b5a713bd71e8c578df55ef3a053e00e
+SIZE (centos/libmikmod-3.2.0-10.beta2.el6.src.rpm) = 559890
diff --git a/audio/linux-c6-mikmod/distinfo.i386 b/audio/linux-c6-mikmod/distinfo.i386
deleted file mode 100644
index ec3c2a24044b..000000000000
--- a/audio/linux-c6-mikmod/distinfo.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1466256771
-SHA256 (rpm/i686/centos/6.8/libmikmod-3.2.0-10.beta2.el6.i686.rpm) = b8092168a549a2966bdd9a388d13560e9af66deccd7e65b26fa487413e163382
-SIZE (rpm/i686/centos/6.8/libmikmod-3.2.0-10.beta2.el6.i686.rpm) = 163544
-SHA256 (rpm/i686/centos/6.8/libmikmod-3.2.0-10.beta2.el6.src.rpm) = 61c1ccfe2d9afd2b942fe7ffa2a36d0c8b5a713bd71e8c578df55ef3a053e00e
-SIZE (rpm/i686/centos/6.8/libmikmod-3.2.0-10.beta2.el6.src.rpm) = 559890
diff --git a/audio/linux-c6-mikmod/distinfo.x86_64 b/audio/linux-c6-mikmod/distinfo.x86_64
deleted file mode 100644
index 0c9c44d207fb..000000000000
--- a/audio/linux-c6-mikmod/distinfo.x86_64
+++ /dev/null
@@ -1,7 +0,0 @@
-TIMESTAMP = 1466257322
-SHA256 (rpm/x86_64/centos/6.8/libmikmod-3.2.0-10.beta2.el6.x86_64.rpm) = d567bd9b175d76f7b468c8459082dfcdef2eba020ab44a597c614d9da6a0ed41
-SIZE (rpm/x86_64/centos/6.8/libmikmod-3.2.0-10.beta2.el6.x86_64.rpm) = 164048
-SHA256 (rpm/x86_64/centos/6.8/libmikmod-3.2.0-10.beta2.el6.i686.rpm) = b8092168a549a2966bdd9a388d13560e9af66deccd7e65b26fa487413e163382
-SIZE (rpm/x86_64/centos/6.8/libmikmod-3.2.0-10.beta2.el6.i686.rpm) = 163544
-SHA256 (rpm/x86_64/centos/6.8/libmikmod-3.2.0-10.beta2.el6.src.rpm) = 61c1ccfe2d9afd2b942fe7ffa2a36d0c8b5a713bd71e8c578df55ef3a053e00e
-SIZE (rpm/x86_64/centos/6.8/libmikmod-3.2.0-10.beta2.el6.src.rpm) = 559890
diff --git a/audio/linux-c6-mikmod/pkg-plist.amd64 b/audio/linux-c6-mikmod/pkg-plist.amd64
new file mode 100644
index 000000000000..2a5e3eb50901
--- /dev/null
+++ b/audio/linux-c6-mikmod/pkg-plist.amd64
@@ -0,0 +1,10 @@
+usr/lib/libmikmod.so.3
+usr/lib/libmikmod.so.3.0.0
+usr/lib64/libmikmod.so.3
+usr/lib64/libmikmod.so.3.0.0
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING.LESSER
+%%PORTDOCS%%%%DOCSDIR%%/COPYING.LIB
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
diff --git a/audio/linux-c6-mikmod/pkg-plist.i386 b/audio/linux-c6-mikmod/pkg-plist.i386
index 1b58b385c43d..5f0a28ea9c57 100644
--- a/audio/linux-c6-mikmod/pkg-plist.i386
+++ b/audio/linux-c6-mikmod/pkg-plist.i386
@@ -1,2 +1,8 @@
usr/lib/libmikmod.so.3
usr/lib/libmikmod.so.3.0.0
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING.LESSER
+%%PORTDOCS%%%%DOCSDIR%%/COPYING.LIB
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
diff --git a/audio/linux-c6-mikmod/pkg-plist.x86_64 b/audio/linux-c6-mikmod/pkg-plist.x86_64
deleted file mode 100644
index 0274a312a465..000000000000
--- a/audio/linux-c6-mikmod/pkg-plist.x86_64
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/lib/libmikmod.so.3
-usr/lib/libmikmod.so.3.0.0
-usr/lib64/libmikmod.so.3
-usr/lib64/libmikmod.so.3.0.0
diff --git a/audio/linux-c6-nas-libs/Makefile b/audio/linux-c6-nas-libs/Makefile
index 7e16ae9ef765..13116eb89e84 100644
--- a/audio/linux-c6-nas-libs/Makefile
+++ b/audio/linux-c6-nas-libs/Makefile
@@ -1,26 +1,23 @@
# Created by: Johannes Meixner <johannes@perceivon.net>
# $FreeBSD$
-PORTNAME= nas-libs
+PORTNAME= nas
PORTVERSION= 1.9.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio linux
MASTER_SITES= EPEL
-DISTNAME= nas-${PORTVERSION}-${RPMVERSION}
MAINTAINER= emulation@FreeBSD.org
COMMENT= Network Audio System (Linux CentOS ${LINUX_DIST_VER})
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
RPMVERSION= 7.el6
USES= linux:c6
USE_LDCONFIG= yes
USE_LINUX= xorglibs
USE_LINUX_RPM= yes
-DOCSDIR= ${PREFIX}/usr/share/doc/nas-${PORTVERSION}
-DESCR= ${.CURDIR}/../nas/pkg-descr
-
post-patch:
- @${RM} -r ${WRKSRC}/usr/bin ${WRKSRC}/etc/rc.d ${WRKSRC}/etc/sysconfig
+ @${RM} -r ${WRKSRC}/etc ${WRKSRC}/usr/bin ${WRKSRC}/usr/share/man
.include <bsd.port.mk>
diff --git a/audio/linux-c6-nas-libs/distinfo b/audio/linux-c6-nas-libs/distinfo
new file mode 100644
index 000000000000..8198bf9d9854
--- /dev/null
+++ b/audio/linux-c6-nas-libs/distinfo
@@ -0,0 +1,7 @@
+TIMESTAMP = 1485450021
+SHA256 (centos/nas-1.9.1-7.el6.i686.rpm) = f9830ef307755aa66c0b8356912c2591c9b00be426dff36c988e0d7e58a126f9
+SIZE (centos/nas-1.9.1-7.el6.i686.rpm) = 339968
+SHA256 (centos/nas-1.9.1-7.el6.x86_64.rpm) = 55fdc433567495bbab33b880a61cd8744057f54e993995abed8846382b5314af
+SIZE (centos/nas-1.9.1-7.el6.x86_64.rpm) = 333456
+SHA256 (centos/nas-1.9.1-7.el6.src.rpm) = 051cc5ab26e5296ecb22044daaf2781f2c7124cb6b3a18fe73b7e1f795749747
+SIZE (centos/nas-1.9.1-7.el6.src.rpm) = 1442022
diff --git a/audio/linux-c6-nas-libs/distinfo.i386 b/audio/linux-c6-nas-libs/distinfo.i386
deleted file mode 100644
index c2ce6c3dfd95..000000000000
--- a/audio/linux-c6-nas-libs/distinfo.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1466256778
-SHA256 (rpm/i686/centos/6.8/nas-1.9.1-7.el6.i686.rpm) = f9830ef307755aa66c0b8356912c2591c9b00be426dff36c988e0d7e58a126f9
-SIZE (rpm/i686/centos/6.8/nas-1.9.1-7.el6.i686.rpm) = 339968
-SHA256 (rpm/i686/centos/6.8/nas-1.9.1-7.el6.src.rpm) = 051cc5ab26e5296ecb22044daaf2781f2c7124cb6b3a18fe73b7e1f795749747
-SIZE (rpm/i686/centos/6.8/nas-1.9.1-7.el6.src.rpm) = 1442022
diff --git a/audio/linux-c6-nas-libs/distinfo.x86_64 b/audio/linux-c6-nas-libs/distinfo.x86_64
deleted file mode 100644
index b56f0d6308eb..000000000000
--- a/audio/linux-c6-nas-libs/distinfo.x86_64
+++ /dev/null
@@ -1,7 +0,0 @@
-TIMESTAMP = 1466257337
-SHA256 (rpm/x86_64/centos/6.8/nas-1.9.1-7.el6.x86_64.rpm) = 55fdc433567495bbab33b880a61cd8744057f54e993995abed8846382b5314af
-SIZE (rpm/x86_64/centos/6.8/nas-1.9.1-7.el6.x86_64.rpm) = 333456
-SHA256 (rpm/x86_64/centos/6.8/nas-1.9.1-7.el6.i686.rpm) = f9830ef307755aa66c0b8356912c2591c9b00be426dff36c988e0d7e58a126f9
-SIZE (rpm/x86_64/centos/6.8/nas-1.9.1-7.el6.i686.rpm) = 339968
-SHA256 (rpm/x86_64/centos/6.8/nas-1.9.1-7.el6.src.rpm) = 051cc5ab26e5296ecb22044daaf2781f2c7124cb6b3a18fe73b7e1f795749747
-SIZE (rpm/x86_64/centos/6.8/nas-1.9.1-7.el6.src.rpm) = 1442022
diff --git a/audio/linux-c6-nas-libs/pkg-plist.amd64 b/audio/linux-c6-nas-libs/pkg-plist.amd64
new file mode 100644
index 000000000000..d671a2ded18a
--- /dev/null
+++ b/audio/linux-c6-nas-libs/pkg-plist.amd64
@@ -0,0 +1,10 @@
+usr/lib/X11/AuErrorDB
+usr/lib/libaudio.so.2
+usr/lib/libaudio.so.2.4
+usr/lib64/X11/AuErrorDB
+usr/lib64/libaudio.so.2
+usr/lib64/libaudio.so.2.4
+%%PORTDOCS%%%%DOCSDIR%%/FAQ
+%%PORTDOCS%%%%DOCSDIR%%/HISTORY
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
diff --git a/audio/linux-c6-nas-libs/pkg-plist.i386 b/audio/linux-c6-nas-libs/pkg-plist.i386
index 9cf15d8ca156..c87aa196775f 100644
--- a/audio/linux-c6-nas-libs/pkg-plist.i386
+++ b/audio/linux-c6-nas-libs/pkg-plist.i386
@@ -1,4 +1,3 @@
-etc/nas/nasd.conf
usr/lib/X11/AuErrorDB
usr/lib/libaudio.so.2
usr/lib/libaudio.so.2.4
@@ -6,23 +5,3 @@ usr/lib/libaudio.so.2.4
%%PORTDOCS%%%%DOCSDIR%%/HISTORY
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/TODO
-usr/share/man/man1/auconvert.1x.gz
-usr/share/man/man1/auctl.1x.gz
-usr/share/man/man1/audemo.1x.gz
-usr/share/man/man1/audial.1x.gz
-usr/share/man/man1/auedit.1x.gz
-usr/share/man/man1/auinfo.1x.gz
-usr/share/man/man1/aupanel.1x.gz
-usr/share/man/man1/auphone.1x.gz
-usr/share/man/man1/auplay.1x.gz
-usr/share/man/man1/aurecord.1x.gz
-usr/share/man/man1/auscope.1x.gz
-usr/share/man/man1/autool.1x.gz
-usr/share/man/man1/auwave.1x.gz
-usr/share/man/man1/checkmail.1x.gz
-usr/share/man/man1/issndfile.1x.gz
-usr/share/man/man1/nas.1x.gz
-usr/share/man/man1/nasd.1x.gz
-usr/share/man/man1/playbucket.1x.gz
-usr/share/man/man1/soundtoh.1x.gz
-usr/share/man/man5/nasd.conf.5x.gz
diff --git a/audio/linux-c6-nas-libs/pkg-plist.x86_64 b/audio/linux-c6-nas-libs/pkg-plist.x86_64
deleted file mode 100644
index 6bad4ea7708a..000000000000
--- a/audio/linux-c6-nas-libs/pkg-plist.x86_64
+++ /dev/null
@@ -1,31 +0,0 @@
-etc/nas/nasd.conf
-usr/lib/X11/AuErrorDB
-usr/lib/libaudio.so.2
-usr/lib/libaudio.so.2.4
-usr/lib64/X11/AuErrorDB
-usr/lib64/libaudio.so.2
-usr/lib64/libaudio.so.2.4
-%%PORTDOCS%%%%DOCSDIR%%/FAQ
-%%PORTDOCS%%%%DOCSDIR%%/HISTORY
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-usr/share/man/man1/auconvert.1x.gz
-usr/share/man/man1/auctl.1x.gz
-usr/share/man/man1/audemo.1x.gz
-usr/share/man/man1/audial.1x.gz
-usr/share/man/man1/auedit.1x.gz
-usr/share/man/man1/auinfo.1x.gz
-usr/share/man/man1/aupanel.1x.gz
-usr/share/man/man1/auphone.1x.gz
-usr/share/man/man1/auplay.1x.gz
-usr/share/man/man1/aurecord.1x.gz
-usr/share/man/man1/auscope.1x.gz
-usr/share/man/man1/autool.1x.gz
-usr/share/man/man1/auwave.1x.gz
-usr/share/man/man1/checkmail.1x.gz
-usr/share/man/man1/issndfile.1x.gz
-usr/share/man/man1/nas.1x.gz
-usr/share/man/man1/nasd.1x.gz
-usr/share/man/man1/playbucket.1x.gz
-usr/share/man/man1/soundtoh.1x.gz
-usr/share/man/man5/nasd.conf.5x.gz
diff --git a/audio/linux-c6-openal-soft/Makefile b/audio/linux-c6-openal-soft/Makefile
index 9a23495b692c..1b5d35d41c26 100644
--- a/audio/linux-c6-openal-soft/Makefile
+++ b/audio/linux-c6-openal-soft/Makefile
@@ -3,21 +3,18 @@
PORTNAME= openal-soft
PORTVERSION= 1.12.854
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= audio linux
MASTER_SITES= EPEL
MAINTAINER= emulation@FreeBSD.org
-COMMENT= A 3D positional spatialized sound library (Linux CentOS ${LINUX_DIST_VER})
-
-USES= linux:c6
-USE_LINUX_RPM= yes
-USE_LINUX= alsalib arts esound
+COMMENT= 3D positional spatialized sound library (Linux CentOS ${LINUX_DIST_VER})
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
RPMVERSION= 1.el6
+USES= linux:c6
USE_LDCONFIG= yes
-
-PORTDOCS= COPYING
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+USE_LINUX= alsalib
+USE_LINUX_RPM= yes
.include <bsd.port.mk>
diff --git a/audio/linux-c6-openal-soft/distinfo b/audio/linux-c6-openal-soft/distinfo
new file mode 100644
index 000000000000..6a27b94dba92
--- /dev/null
+++ b/audio/linux-c6-openal-soft/distinfo
@@ -0,0 +1,7 @@
+TIMESTAMP = 1485443594
+SHA256 (centos/openal-soft-1.12.854-1.el6.i686.rpm) = fc2dd7f0c3e49be942e38bd73a73e32ab950c1ca2390ccf9f208de561d6b3e5c
+SIZE (centos/openal-soft-1.12.854-1.el6.i686.rpm) = 115708
+SHA256 (centos/openal-soft-1.12.854-1.el6.x86_64.rpm) = 607343af6d2782d272f70ea51293b0e5167a690248790fb9e74bcdf7545bdca7
+SIZE (centos/openal-soft-1.12.854-1.el6.x86_64.rpm) = 131664
+SHA256 (centos/openal-soft-1.12.854-1.el6.src.rpm) = efdf8696cd2d3a9bd035815adbde6607c97ea48b91de06aa2bcec6b9bbd10ba7
+SIZE (centos/openal-soft-1.12.854-1.el6.src.rpm) = 113553
diff --git a/audio/linux-c6-openal-soft/distinfo.i386 b/audio/linux-c6-openal-soft/distinfo.i386
deleted file mode 100644
index 4b512f1c5b6d..000000000000
--- a/audio/linux-c6-openal-soft/distinfo.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1466256773
-SHA256 (rpm/i686/centos/6.8/openal-soft-1.12.854-1.el6.i686.rpm) = fc2dd7f0c3e49be942e38bd73a73e32ab950c1ca2390ccf9f208de561d6b3e5c
-SIZE (rpm/i686/centos/6.8/openal-soft-1.12.854-1.el6.i686.rpm) = 115708
-SHA256 (rpm/i686/centos/6.8/openal-soft-1.12.854-1.el6.src.rpm) = efdf8696cd2d3a9bd035815adbde6607c97ea48b91de06aa2bcec6b9bbd10ba7
-SIZE (rpm/i686/centos/6.8/openal-soft-1.12.854-1.el6.src.rpm) = 113553
diff --git a/audio/linux-c6-openal-soft/distinfo.x86_64 b/audio/linux-c6-openal-soft/distinfo.x86_64
deleted file mode 100644
index e1b5340be242..000000000000
--- a/audio/linux-c6-openal-soft/distinfo.x86_64
+++ /dev/null
@@ -1,7 +0,0 @@
-TIMESTAMP = 1466257325
-SHA256 (rpm/x86_64/centos/6.8/openal-soft-1.12.854-1.el6.x86_64.rpm) = 607343af6d2782d272f70ea51293b0e5167a690248790fb9e74bcdf7545bdca7
-SIZE (rpm/x86_64/centos/6.8/openal-soft-1.12.854-1.el6.x86_64.rpm) = 131664
-SHA256 (rpm/x86_64/centos/6.8/openal-soft-1.12.854-1.el6.i686.rpm) = fc2dd7f0c3e49be942e38bd73a73e32ab950c1ca2390ccf9f208de561d6b3e5c
-SIZE (rpm/x86_64/centos/6.8/openal-soft-1.12.854-1.el6.i686.rpm) = 115708
-SHA256 (rpm/x86_64/centos/6.8/openal-soft-1.12.854-1.el6.src.rpm) = efdf8696cd2d3a9bd035815adbde6607c97ea48b91de06aa2bcec6b9bbd10ba7
-SIZE (rpm/x86_64/centos/6.8/openal-soft-1.12.854-1.el6.src.rpm) = 113553
diff --git a/audio/linux-c6-openal-soft/pkg-plist.x86_64 b/audio/linux-c6-openal-soft/pkg-plist.amd64
index d5c3759c196b..acebc1512d64 100644
--- a/audio/linux-c6-openal-soft/pkg-plist.x86_64
+++ b/audio/linux-c6-openal-soft/pkg-plist.amd64
@@ -4,3 +4,4 @@ usr/lib/libopenal.so.1
usr/lib/libopenal.so.1.12.854
usr/lib64/libopenal.so.1
usr/lib64/libopenal.so.1.12.854
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
diff --git a/audio/linux-c6-openal-soft/pkg-plist.i386 b/audio/linux-c6-openal-soft/pkg-plist.i386
index 89a1071c627d..e3b756dc7360 100644
--- a/audio/linux-c6-openal-soft/pkg-plist.i386
+++ b/audio/linux-c6-openal-soft/pkg-plist.i386
@@ -2,3 +2,4 @@ etc/openal/alsoft.conf
usr/bin/openal-info
usr/lib/libopenal.so.1
usr/lib/libopenal.so.1.12.854
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
diff --git a/audio/linux-c6-pulseaudio-libs/Makefile b/audio/linux-c6-pulseaudio-libs/Makefile
index 206e42396e42..aeb397149db5 100644
--- a/audio/linux-c6-pulseaudio-libs/Makefile
+++ b/audio/linux-c6-pulseaudio-libs/Makefile
@@ -1,23 +1,27 @@
# Created by: Johannes Meixner <johannes@perceivon.net>
# $FreeBSD$
-PORTNAME= pulseaudio-libs
+PORTNAME= pulseaudio
PORTVERSION= 0.9.21
PORTREVISION= 6
CATEGORIES= audio linux
-LIB_DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
- ${PORTNAME}-glib2-${PORTVERSION}-${RPMVERSION}${EXTRACT_SUFX}
+PKGNAMESUFFIX= -libs
+LIB_DISTNAMES= ${LINUXNAME}-${DISTVERSIONFULL} \
+ ${LINUXNAME}-glib2-${DISTVERSIONFULL}
MAINTAINER= emulation@FreeBSD.org
COMMENT= Libraries for PulseAudio clients (Linux CentOS ${LINUX_DIST_VER})
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+DOCSDIR= ${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION}
+LINUXNAME= ${PORTNAME}${PKGNAMESUFFIX}
RPMVERSION= 24.el6
USES= linux:c6
USE_LDCONFIG= yes
USE_LINUX= dbuslibs libasyncns libsndfile tcp_wrappers-libs xorglibs
USE_LINUX_RPM= yes
-DESCR= ${.CURDIR}/../pulseaudio/pkg-descr
-SRC_DISTFILES= pulseaudio-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}:SOURCE
+OPTIONS_DEFINE= DOCS NLS
+OPTIONS_SUB= yes
.include <bsd.port.mk>
diff --git a/audio/linux-c6-pulseaudio-libs/distinfo b/audio/linux-c6-pulseaudio-libs/distinfo
new file mode 100644
index 000000000000..c14882f8d184
--- /dev/null
+++ b/audio/linux-c6-pulseaudio-libs/distinfo
@@ -0,0 +1,11 @@
+TIMESTAMP = 1485285872
+SHA256 (centos/pulseaudio-libs-0.9.21-24.el6.i686.rpm) = ebb56fd219094a860dab8c3d703fc6c50d084384083df1fe04a9616d423fd2f9
+SIZE (centos/pulseaudio-libs-0.9.21-24.el6.i686.rpm) = 465276
+SHA256 (centos/pulseaudio-libs-0.9.21-24.el6.x86_64.rpm) = aa10e4e3dd1eec5b1db5f881ff4d3c51f29390029cc2837fffeb9c93bc34106c
+SIZE (centos/pulseaudio-libs-0.9.21-24.el6.x86_64.rpm) = 473772
+SHA256 (centos/pulseaudio-libs-glib2-0.9.21-24.el6.i686.rpm) = ee0884955f5ab06488b2049b8065fdca2742404e72a74b39387f57b027bdb15a
+SIZE (centos/pulseaudio-libs-glib2-0.9.21-24.el6.i686.rpm) = 24252
+SHA256 (centos/pulseaudio-libs-glib2-0.9.21-24.el6.x86_64.rpm) = 6a0948fbcfc1131c5eb8a48a17b3d9a7c325cbc112f3d982012bfafc6abc6d59
+SIZE (centos/pulseaudio-libs-glib2-0.9.21-24.el6.x86_64.rpm) = 24388
+SHA256 (centos/pulseaudio-0.9.21-24.el6.src.rpm) = 2f389e54669332bdc4676fb2c62520a6f71aa54a153bfbbc5c89f5de9f84834e
+SIZE (centos/pulseaudio-0.9.21-24.el6.src.rpm) = 2387179
diff --git a/audio/linux-c6-pulseaudio-libs/distinfo.i386 b/audio/linux-c6-pulseaudio-libs/distinfo.i386
deleted file mode 100644
index 44d754c6f39b..000000000000
--- a/audio/linux-c6-pulseaudio-libs/distinfo.i386
+++ /dev/null
@@ -1,7 +0,0 @@
-TIMESTAMP = 1466256768
-SHA256 (rpm/i686/centos/6.8/pulseaudio-libs-0.9.21-24.el6.i686.rpm) = ebb56fd219094a860dab8c3d703fc6c50d084384083df1fe04a9616d423fd2f9
-SIZE (rpm/i686/centos/6.8/pulseaudio-libs-0.9.21-24.el6.i686.rpm) = 465276
-SHA256 (rpm/i686/centos/6.8/pulseaudio-libs-glib2-0.9.21-24.el6.i686.rpm) = ee0884955f5ab06488b2049b8065fdca2742404e72a74b39387f57b027bdb15a
-SIZE (rpm/i686/centos/6.8/pulseaudio-libs-glib2-0.9.21-24.el6.i686.rpm) = 24252
-SHA256 (rpm/i686/centos/6.8/pulseaudio-0.9.21-24.el6.src.rpm) = 2f389e54669332bdc4676fb2c62520a6f71aa54a153bfbbc5c89f5de9f84834e
-SIZE (rpm/i686/centos/6.8/pulseaudio-0.9.21-24.el6.src.rpm) = 2387179
diff --git a/audio/linux-c6-pulseaudio-libs/distinfo.x86_64 b/audio/linux-c6-pulseaudio-libs/distinfo.x86_64
deleted file mode 100644
index 9cb0e623aff2..000000000000
--- a/audio/linux-c6-pulseaudio-libs/distinfo.x86_64
+++ /dev/null
@@ -1,11 +0,0 @@
-TIMESTAMP = 1466257316
-SHA256 (rpm/x86_64/centos/6.8/pulseaudio-libs-0.9.21-24.el6.i686.rpm) = ebb56fd219094a860dab8c3d703fc6c50d084384083df1fe04a9616d423fd2f9
-SIZE (rpm/x86_64/centos/6.8/pulseaudio-libs-0.9.21-24.el6.i686.rpm) = 465276
-SHA256 (rpm/x86_64/centos/6.8/pulseaudio-libs-glib2-0.9.21-24.el6.i686.rpm) = ee0884955f5ab06488b2049b8065fdca2742404e72a74b39387f57b027bdb15a
-SIZE (rpm/x86_64/centos/6.8/pulseaudio-libs-glib2-0.9.21-24.el6.i686.rpm) = 24252
-SHA256 (rpm/x86_64/centos/6.8/pulseaudio-libs-0.9.21-24.el6.x86_64.rpm) = aa10e4e3dd1eec5b1db5f881ff4d3c51f29390029cc2837fffeb9c93bc34106c
-SIZE (rpm/x86_64/centos/6.8/pulseaudio-libs-0.9.21-24.el6.x86_64.rpm) = 473772
-SHA256 (rpm/x86_64/centos/6.8/pulseaudio-libs-glib2-0.9.21-24.el6.x86_64.rpm) = 6a0948fbcfc1131c5eb8a48a17b3d9a7c325cbc112f3d982012bfafc6abc6d59
-SIZE (rpm/x86_64/centos/6.8/pulseaudio-libs-glib2-0.9.21-24.el6.x86_64.rpm) = 24388
-SHA256 (rpm/x86_64/centos/6.8/pulseaudio-0.9.21-24.el6.src.rpm) = 2f389e54669332bdc4676fb2c62520a6f71aa54a153bfbbc5c89f5de9f84834e
-SIZE (rpm/x86_64/centos/6.8/pulseaudio-0.9.21-24.el6.src.rpm) = 2387179
diff --git a/audio/linux-c6-pulseaudio-libs/pkg-plist.amd64 b/audio/linux-c6-pulseaudio-libs/pkg-plist.amd64
new file mode 100644
index 000000000000..74855437ad03
--- /dev/null
+++ b/audio/linux-c6-pulseaudio-libs/pkg-plist.amd64
@@ -0,0 +1,53 @@
+etc/pulse/client.conf
+usr/lib/libpulse-mainloop-glib.so.0
+usr/lib/libpulse-mainloop-glib.so.0.0.4
+usr/lib/libpulse-simple.so.0
+usr/lib/libpulse-simple.so.0.0.3
+usr/lib/libpulse.so.0
+usr/lib/libpulse.so.0.12.2
+usr/lib/libpulsecommon-0.9.21.so
+usr/lib64/libpulse-mainloop-glib.so.0
+usr/lib64/libpulse-mainloop-glib.so.0.0.4
+usr/lib64/libpulse-simple.so.0
+usr/lib64/libpulse-simple.so.0.0.3
+usr/lib64/libpulse.so.0
+usr/lib64/libpulse.so.0.12.2
+usr/lib64/libpulsecommon-0.9.21.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/hi/LC_MESSAGES/pulseaudio.mo
+%%NLS%%usr/share/locale/hu/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/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/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-c6-pulseaudio-libs/pkg-plist.i386 b/audio/linux-c6-pulseaudio-libs/pkg-plist.i386
index e9dcd365029a..de78468e1562 100644
--- a/audio/linux-c6-pulseaudio-libs/pkg-plist.i386
+++ b/audio/linux-c6-pulseaudio-libs/pkg-plist.i386
@@ -1,46 +1,46 @@
etc/pulse/client.conf
+usr/lib/libpulse-mainloop-glib.so.0
+usr/lib/libpulse-mainloop-glib.so.0.0.4
usr/lib/libpulse-simple.so.0
usr/lib/libpulse-simple.so.0.0.3
usr/lib/libpulse.so.0
usr/lib/libpulse.so.0.12.2
usr/lib/libpulsecommon-0.9.21.so
-usr/lib/libpulse-mainloop-glib.so.0
-usr/lib/libpulse-mainloop-glib.so.0.0.4
-usr/share/doc/pulseaudio-libs-0.9.21/GPL
-usr/share/doc/pulseaudio-libs-0.9.21/LGPL
-usr/share/doc/pulseaudio-libs-0.9.21/LICENSE
-usr/share/doc/pulseaudio-libs-0.9.21/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/hi/LC_MESSAGES/pulseaudio.mo
-usr/share/locale/hu/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/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/uk/LC_MESSAGES/pulseaudio.mo
-usr/share/locale/zh_CN/LC_MESSAGES/pulseaudio.mo
-usr/share/locale/zh_TW/LC_MESSAGES/pulseaudio.mo
+%%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/hi/LC_MESSAGES/pulseaudio.mo
+%%NLS%%usr/share/locale/hu/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/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/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-c6-pulseaudio-libs/pkg-plist.x86_64 b/audio/linux-c6-pulseaudio-libs/pkg-plist.x86_64
deleted file mode 100644
index a256b835f805..000000000000
--- a/audio/linux-c6-pulseaudio-libs/pkg-plist.x86_64
+++ /dev/null
@@ -1,53 +0,0 @@
-etc/pulse/client.conf
-usr/lib/libpulse-simple.so.0
-usr/lib/libpulse-simple.so.0.0.3
-usr/lib/libpulse.so.0
-usr/lib/libpulse.so.0.12.2
-usr/lib/libpulsecommon-0.9.21.so
-usr/lib/libpulse-mainloop-glib.so.0
-usr/lib/libpulse-mainloop-glib.so.0.0.4
-usr/lib64/libpulse-simple.so.0
-usr/lib64/libpulse-simple.so.0.0.3
-usr/lib64/libpulse.so.0
-usr/lib64/libpulse.so.0.12.2
-usr/lib64/libpulsecommon-0.9.21.so
-usr/lib64/libpulse-mainloop-glib.so.0
-usr/lib64/libpulse-mainloop-glib.so.0.0.4
-usr/share/doc/pulseaudio-libs-0.9.21/GPL
-usr/share/doc/pulseaudio-libs-0.9.21/LGPL
-usr/share/doc/pulseaudio-libs-0.9.21/LICENSE
-usr/share/doc/pulseaudio-libs-0.9.21/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/hi/LC_MESSAGES/pulseaudio.mo
-usr/share/locale/hu/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/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/uk/LC_MESSAGES/pulseaudio.mo
-usr/share/locale/zh_CN/LC_MESSAGES/pulseaudio.mo
-usr/share/locale/zh_TW/LC_MESSAGES/pulseaudio.mo
diff --git a/audio/linux-c6-pulseaudio-utils/Makefile b/audio/linux-c6-pulseaudio-utils/Makefile
index 8ecc91a690a0..373b7208714c 100644
--- a/audio/linux-c6-pulseaudio-utils/Makefile
+++ b/audio/linux-c6-pulseaudio-utils/Makefile
@@ -1,22 +1,22 @@
# Created by: Johannes Meixner <johannes@perceivon.net>
# $FreeBSD$
-PORTNAME= pulseaudio-utils
+PORTNAME= pulseaudio
PORTVERSION= 0.9.21
PORTREVISION= 5
CATEGORIES= audio linux
+PKGNAMESUFFIX= -utils
+LIB_DISTNAMES= ${LINUXNAME}-${DISTVERSIONFULL}
MAINTAINER= emulation@FreeBSD.org
COMMENT= Utils for PulseAudio clients (Linux CentOS ${LINUX_DIST_VER})
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+LINUXNAME= ${PORTNAME}${PKGNAMESUFFIX}
RPMVERSION= 24.el6
USES= linux:c6
USE_LDCONFIG= yes
USE_LINUX= xorglibs pulseaudio-libs
USE_LINUX_RPM= yes
-DESCR= ${.CURDIR}/../pulseaudio/pkg-descr
-
-SRC_DISTFILES= pulseaudio-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}:SOURCE
-
.include <bsd.port.mk>
diff --git a/audio/linux-c6-pulseaudio-utils/distinfo b/audio/linux-c6-pulseaudio-utils/distinfo
new file mode 100644
index 000000000000..6f2b26b55c0b
--- /dev/null
+++ b/audio/linux-c6-pulseaudio-utils/distinfo
@@ -0,0 +1,7 @@
+TIMESTAMP = 1485451219
+SHA256 (centos/pulseaudio-utils-0.9.21-24.el6.i686.rpm) = 32de7887a9cc5ddfd301c790376404d91690b4ba309201b8247676d3c61bcab1
+SIZE (centos/pulseaudio-utils-0.9.21-24.el6.i686.rpm) = 72484
+SHA256 (centos/pulseaudio-utils-0.9.21-24.el6.x86_64.rpm) = fc0c61ac740953695ad5de56995baf04754a134b9b0091a0276f5793406c4ff0
+SIZE (centos/pulseaudio-utils-0.9.21-24.el6.x86_64.rpm) = 73064
+SHA256 (centos/pulseaudio-0.9.21-24.el6.src.rpm) = 2f389e54669332bdc4676fb2c62520a6f71aa54a153bfbbc5c89f5de9f84834e
+SIZE (centos/pulseaudio-0.9.21-24.el6.src.rpm) = 2387179
diff --git a/audio/linux-c6-pulseaudio-utils/distinfo.i386 b/audio/linux-c6-pulseaudio-utils/distinfo.i386
deleted file mode 100644
index d7a591fbcbb8..000000000000
--- a/audio/linux-c6-pulseaudio-utils/distinfo.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1466256768
-SHA256 (rpm/i686/centos/6.8/pulseaudio-utils-0.9.21-24.el6.i686.rpm) = 32de7887a9cc5ddfd301c790376404d91690b4ba309201b8247676d3c61bcab1
-SIZE (rpm/i686/centos/6.8/pulseaudio-utils-0.9.21-24.el6.i686.rpm) = 72484
-SHA256 (rpm/i686/centos/6.8/pulseaudio-0.9.21-24.el6.src.rpm) = 2f389e54669332bdc4676fb2c62520a6f71aa54a153bfbbc5c89f5de9f84834e
-SIZE (rpm/i686/centos/6.8/pulseaudio-0.9.21-24.el6.src.rpm) = 2387179
diff --git a/audio/linux-c6-pulseaudio-utils/distinfo.x86_64 b/audio/linux-c6-pulseaudio-utils/distinfo.x86_64
deleted file mode 100644
index ca3debc372e1..000000000000
--- a/audio/linux-c6-pulseaudio-utils/distinfo.x86_64
+++ /dev/null
@@ -1,7 +0,0 @@
-TIMESTAMP = 1466257311
-SHA256 (rpm/x86_64/centos/6.8/pulseaudio-utils-0.9.21-24.el6.x86_64.rpm) = fc0c61ac740953695ad5de56995baf04754a134b9b0091a0276f5793406c4ff0
-SIZE (rpm/x86_64/centos/6.8/pulseaudio-utils-0.9.21-24.el6.x86_64.rpm) = 73064
-SHA256 (rpm/x86_64/centos/6.8/pulseaudio-utils-0.9.21-24.el6.i686.rpm) = 32de7887a9cc5ddfd301c790376404d91690b4ba309201b8247676d3c61bcab1
-SIZE (rpm/x86_64/centos/6.8/pulseaudio-utils-0.9.21-24.el6.i686.rpm) = 72484
-SHA256 (rpm/x86_64/centos/6.8/pulseaudio-0.9.21-24.el6.src.rpm) = 2f389e54669332bdc4676fb2c62520a6f71aa54a153bfbbc5c89f5de9f84834e
-SIZE (rpm/x86_64/centos/6.8/pulseaudio-0.9.21-24.el6.src.rpm) = 2387179
diff --git a/audio/linux-c6-pulseaudio-utils/pkg-plist.x86_64 b/audio/linux-c6-pulseaudio-utils/pkg-plist.amd64
index 3722635b1754..3722635b1754 100644
--- a/audio/linux-c6-pulseaudio-utils/pkg-plist.x86_64
+++ b/audio/linux-c6-pulseaudio-utils/pkg-plist.amd64
diff --git a/audio/linux-c6-sdl_mixer/Makefile b/audio/linux-c6-sdl_mixer/Makefile
index ca49c6917f3e..4cf989aac359 100644
--- a/audio/linux-c6-sdl_mixer/Makefile
+++ b/audio/linux-c6-sdl_mixer/Makefile
@@ -3,25 +3,23 @@
PORTNAME= sdl_mixer
PORTVERSION= 1.2.12
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= audio linux
MASTER_SITES= EPEL
-DISTNAME= ${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
+DISTNAME= ${LINUXNAME}-${DISTVERSIONFULL}
MAINTAINER= emulation@FreeBSD.org
COMMENT= Sample multi-channel audio mixer library (Linux CentOS ${LINUX_DIST_VER})
CONFLICTS= linux-sdl_mixer-[0-9]* linux-f8-sdl_mixer-[0-9]*
-LINUX_NAME= SDL_mixer
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+DOCSDIR= ${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION}
+LINUXNAME= SDL_mixer
RPMVERSION= 1.el6
USES= linux:c6
USE_LDCONFIG= yes
-USE_LINUX= sdl12 mikmod
+USE_LINUX= sdl12
USE_LINUX_RPM= yes
-DOCSDIR= ${PREFIX}/usr/share/doc/${LINUX_NAME}-${PORTVERSION}
-PORTDOCS= CHANGES COPYING README
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
-
.include <bsd.port.mk>
diff --git a/audio/linux-c6-sdl_mixer/distinfo b/audio/linux-c6-sdl_mixer/distinfo
new file mode 100644
index 000000000000..001c196072ca
--- /dev/null
+++ b/audio/linux-c6-sdl_mixer/distinfo
@@ -0,0 +1,7 @@
+TIMESTAMP = 1485451905
+SHA256 (centos/SDL_mixer-1.2.12-1.el6.i686.rpm) = fe55d342e9a75f481dbf13e441f6090e078c6022f3493186ee06084672ea3a7c
+SIZE (centos/SDL_mixer-1.2.12-1.el6.i686.rpm) = 85304
+SHA256 (centos/SDL_mixer-1.2.12-1.el6.x86_64.rpm) = 83c6869de31f9da391e41b57f91f6f1ed81ed38b3fbd6db819b90a91e2c5bbdb
+SIZE (centos/SDL_mixer-1.2.12-1.el6.x86_64.rpm) = 85388
+SHA256 (centos/SDL_mixer-1.2.12-1.el6.src.rpm) = 935b0d8e096dd8f9ec746be2a841531161d247da6de7400fa4072ac61d39a140
+SIZE (centos/SDL_mixer-1.2.12-1.el6.src.rpm) = 3700092
diff --git a/audio/linux-c6-sdl_mixer/distinfo.i386 b/audio/linux-c6-sdl_mixer/distinfo.i386
deleted file mode 100644
index d09c7d1cdaa8..000000000000
--- a/audio/linux-c6-sdl_mixer/distinfo.i386
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1466256763
-SHA256 (rpm/i686/centos/6.8/SDL_mixer-1.2.12-1.el6.i686.rpm) = fe55d342e9a75f481dbf13e441f6090e078c6022f3493186ee06084672ea3a7c
-SIZE (rpm/i686/centos/6.8/SDL_mixer-1.2.12-1.el6.i686.rpm) = 85304
-SHA256 (rpm/i686/centos/6.8/SDL_mixer-1.2.12-1.el6.src.rpm) = 935b0d8e096dd8f9ec746be2a841531161d247da6de7400fa4072ac61d39a140
-SIZE (rpm/i686/centos/6.8/SDL_mixer-1.2.12-1.el6.src.rpm) = 3700092
diff --git a/audio/linux-c6-sdl_mixer/distinfo.x86_64 b/audio/linux-c6-sdl_mixer/distinfo.x86_64
deleted file mode 100644
index 916c00a5ba9c..000000000000
--- a/audio/linux-c6-sdl_mixer/distinfo.x86_64
+++ /dev/null
@@ -1,7 +0,0 @@
-TIMESTAMP = 1466257291
-SHA256 (rpm/x86_64/centos/6.8/SDL_mixer-1.2.12-1.el6.x86_64.rpm) = 83c6869de31f9da391e41b57f91f6f1ed81ed38b3fbd6db819b90a91e2c5bbdb
-SIZE (rpm/x86_64/centos/6.8/SDL_mixer-1.2.12-1.el6.x86_64.rpm) = 85388
-SHA256 (rpm/x86_64/centos/6.8/SDL_mixer-1.2.12-1.el6.i686.rpm) = fe55d342e9a75f481dbf13e441f6090e078c6022f3493186ee06084672ea3a7c
-SIZE (rpm/x86_64/centos/6.8/SDL_mixer-1.2.12-1.el6.i686.rpm) = 85304
-SHA256 (rpm/x86_64/centos/6.8/SDL_mixer-1.2.12-1.el6.src.rpm) = 935b0d8e096dd8f9ec746be2a841531161d247da6de7400fa4072ac61d39a140
-SIZE (rpm/x86_64/centos/6.8/SDL_mixer-1.2.12-1.el6.src.rpm) = 3700092
diff --git a/audio/linux-c6-sdl_mixer/pkg-plist.x86_64 b/audio/linux-c6-sdl_mixer/pkg-plist.amd64
index 543a2d1f78b9..13b4c72e4c80 100644
--- a/audio/linux-c6-sdl_mixer/pkg-plist.x86_64
+++ b/audio/linux-c6-sdl_mixer/pkg-plist.amd64
@@ -4,3 +4,6 @@ usr/lib/libSDL_mixer-1.2.so.0
usr/lib/libSDL_mixer-1.2.so.0.12.0
usr/lib64/libSDL_mixer-1.2.so.0
usr/lib64/libSDL_mixer-1.2.so.0.12.0
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/README
diff --git a/audio/linux-c6-sdl_mixer/pkg-plist.i386 b/audio/linux-c6-sdl_mixer/pkg-plist.i386
index 6af8f411248f..2a75a1212d6f 100644
--- a/audio/linux-c6-sdl_mixer/pkg-plist.i386
+++ b/audio/linux-c6-sdl_mixer/pkg-plist.i386
@@ -2,3 +2,6 @@ usr/bin/playmus
usr/bin/playwave
usr/lib/libSDL_mixer-1.2.so.0
usr/lib/libSDL_mixer-1.2.so.0.12.0
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/README
diff --git a/audio/linux-c7-alsa-lib/Makefile b/audio/linux-c7-alsa-lib/Makefile
index 8f0e7dde7a80..76ed0bb87ac9 100644
--- a/audio/linux-c7-alsa-lib/Makefile
+++ b/audio/linux-c7-alsa-lib/Makefile
@@ -3,6 +3,7 @@
PORTNAME= alsa-lib
PORTVERSION= 1.1.1
+PORTREVISION= 1
CATEGORIES= audio linux
MAINTAINER= emulation@FreeBSD.org
@@ -19,18 +20,12 @@ USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
-# We will use native configuration file, so delete a linux one
-post-extract:
- @${RM} -r ${WRKSRC}/etc
+post-patch:
+ @${RM} -r ${WRKSRC}/etc/* ${WRKSRC}/lib/modprobe.d \
+ ${WRKSRC}/usr/share/alsa ${WRKSRC}/usr/share/doc/alsa-lib
post-install:
- @${MKDIR} ${STAGEDIR}${PREFIX}/etc
- ${LN} -fs ${LOCALBASE}/etc/asound.conf ${STAGEDIR}${PREFIX}/etc
- ${RM} ${STAGEDIR}${PREFIX}/usr/lib/alsa-lib/smixer/smixer-ac97.la
- ${RM} ${STAGEDIR}${PREFIX}/usr/lib/alsa-lib/smixer/smixer-hda.la
- ${RM} ${STAGEDIR}${PREFIX}/usr/lib/alsa-lib/smixer/smixer-sbase.la
- ${RM} ${STAGEDIR}${PREFIX}/usr/lib64/alsa-lib/smixer/smixer-ac97.la
- ${RM} ${STAGEDIR}${PREFIX}/usr/lib64/alsa-lib/smixer/smixer-hda.la
- ${RM} ${STAGEDIR}${PREFIX}/usr/lib64/alsa-lib/smixer/smixer-sbase.la
+ ${LN} -sf ${LOCALBASE}/etc/asound.conf ${STAGEDIR}${PREFIX}/etc
+ ${LN} -sf ${LOCALBASE}/share/alsa ${STAGEDIR}${PREFIX}/usr/share
.include <bsd.port.mk>
diff --git a/audio/linux-c7-alsa-lib/distinfo.x86_64 b/audio/linux-c7-alsa-lib/distinfo
index 45818d6dcbe0..45818d6dcbe0 100644
--- a/audio/linux-c7-alsa-lib/distinfo.x86_64
+++ b/audio/linux-c7-alsa-lib/distinfo
diff --git a/audio/linux-c7-alsa-lib/pkg-plist.amd64 b/audio/linux-c7-alsa-lib/pkg-plist.amd64
new file mode 100644
index 000000000000..5a008ab796f6
--- /dev/null
+++ b/audio/linux-c7-alsa-lib/pkg-plist.amd64
@@ -0,0 +1,16 @@
+etc/asound.conf
+usr/bin/aserver
+usr/lib/alsa-lib/smixer/smixer-ac97.so
+usr/lib/alsa-lib/smixer/smixer-hda.so
+usr/lib/alsa-lib/smixer/smixer-sbase.so
+usr/lib/libasound.so.2
+usr/lib/libasound.so.2.0.0
+usr/lib64/alsa-lib/smixer/smixer-ac97.so
+usr/lib64/alsa-lib/smixer/smixer-hda.so
+usr/lib64/alsa-lib/smixer/smixer-sbase.so
+usr/lib64/libasound.so.2
+usr/lib64/libasound.so.2.0.0
+usr/share/alsa
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/asoundrc.txt
diff --git a/audio/linux-c7-alsa-lib/pkg-plist.x86_64 b/audio/linux-c7-alsa-lib/pkg-plist.x86_64
deleted file mode 100644
index 360c1391f360..000000000000
--- a/audio/linux-c7-alsa-lib/pkg-plist.x86_64
+++ /dev/null
@@ -1,95 +0,0 @@
-etc/asound.conf
-lib/libasound.so.2
-lib/libasound.so.2.0.0
-lib/modprobe.d/dist-alsa.conf
-lib64/libasound.so.2
-lib64/libasound.so.2.0.0
-usr/bin/aserver
-usr/lib/alsa-lib/smixer/smixer-ac97.so
-usr/lib/alsa-lib/smixer/smixer-hda.so
-usr/lib/alsa-lib/smixer/smixer-sbase.so
-usr/lib64/alsa-lib/smixer/smixer-ac97.so
-usr/lib64/alsa-lib/smixer/smixer-hda.so
-usr/lib64/alsa-lib/smixer/smixer-sbase.so
-usr/share/alsa/alsa.conf
-usr/share/alsa/alsa.conf.d/README
-usr/share/alsa/cards/AACI.conf
-usr/share/alsa/cards/ATIIXP-MODEM.conf
-usr/share/alsa/cards/ATIIXP-SPDMA.conf
-usr/share/alsa/cards/ATIIXP.conf
-usr/share/alsa/cards/AU8810.conf
-usr/share/alsa/cards/AU8820.conf
-usr/share/alsa/cards/AU8830.conf
-usr/share/alsa/cards/Audigy.conf
-usr/share/alsa/cards/Audigy2.conf
-usr/share/alsa/cards/Aureon51.conf
-usr/share/alsa/cards/Aureon71.conf
-usr/share/alsa/cards/CA0106.conf
-usr/share/alsa/cards/CMI8338-SWIEC.conf
-usr/share/alsa/cards/CMI8338.conf
-usr/share/alsa/cards/CMI8738-MC6.conf
-usr/share/alsa/cards/CMI8738-MC8.conf
-usr/share/alsa/cards/CMI8788.conf
-usr/share/alsa/cards/CS46xx.conf
-usr/share/alsa/cards/EMU10K1.conf
-usr/share/alsa/cards/EMU10K1X.conf
-usr/share/alsa/cards/ENS1370.conf
-usr/share/alsa/cards/ENS1371.conf
-usr/share/alsa/cards/ES1968.conf
-usr/share/alsa/cards/Echo_Echo3G.conf
-usr/share/alsa/cards/FM801.conf
-usr/share/alsa/cards/FWSpeakers.conf
-usr/share/alsa/cards/FireWave.conf
-usr/share/alsa/cards/GUS.conf
-usr/share/alsa/cards/HDA-Intel.conf
-usr/share/alsa/cards/ICE1712.conf
-usr/share/alsa/cards/ICE1724.conf
-usr/share/alsa/cards/ICH-MODEM.conf
-usr/share/alsa/cards/ICH.conf
-usr/share/alsa/cards/ICH4.conf
-usr/share/alsa/cards/Loopback.conf
-usr/share/alsa/cards/Maestro3.conf
-usr/share/alsa/cards/NFORCE.conf
-usr/share/alsa/cards/PC-Speaker.conf
-usr/share/alsa/cards/PMac.conf
-usr/share/alsa/cards/PMacToonie.conf
-usr/share/alsa/cards/PS3.conf
-usr/share/alsa/cards/RME9636.conf
-usr/share/alsa/cards/RME9652.conf
-usr/share/alsa/cards/SB-XFi.conf
-usr/share/alsa/cards/SI7018.conf
-usr/share/alsa/cards/TRID4DWAVENX.conf
-usr/share/alsa/cards/USB-Audio.conf
-usr/share/alsa/cards/VIA686A.conf
-usr/share/alsa/cards/VIA8233.conf
-usr/share/alsa/cards/VIA8233A.conf
-usr/share/alsa/cards/VIA8237.conf
-usr/share/alsa/cards/VX222.conf
-usr/share/alsa/cards/VXPocket.conf
-usr/share/alsa/cards/VXPocket440.conf
-usr/share/alsa/cards/YMF744.conf
-usr/share/alsa/cards/aliases.conf
-usr/share/alsa/pcm/center_lfe.conf
-usr/share/alsa/pcm/default.conf
-usr/share/alsa/pcm/dmix.conf
-usr/share/alsa/pcm/dpl.conf
-usr/share/alsa/pcm/dsnoop.conf
-usr/share/alsa/pcm/front.conf
-usr/share/alsa/pcm/hdmi.conf
-usr/share/alsa/pcm/iec958.conf
-usr/share/alsa/pcm/modem.conf
-usr/share/alsa/pcm/rear.conf
-usr/share/alsa/pcm/side.conf
-usr/share/alsa/pcm/surround21.conf
-usr/share/alsa/pcm/surround40.conf
-usr/share/alsa/pcm/surround41.conf
-usr/share/alsa/pcm/surround50.conf
-usr/share/alsa/pcm/surround51.conf
-usr/share/alsa/pcm/surround71.conf
-usr/share/alsa/smixer.conf
-usr/share/alsa/topology/broadwell/broadwell.conf
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/asoundrc.txt
-usr/share/doc/alsa-lib/modprobe-dist-oss.conf
-@dir usr/share/alsa/ucm
diff --git a/audio/linux-c7-alsa-plugins-oss/Makefile b/audio/linux-c7-alsa-plugins-oss/Makefile
index 00fb84c0f20e..8ecf35e1d896 100644
--- a/audio/linux-c7-alsa-plugins-oss/Makefile
+++ b/audio/linux-c7-alsa-plugins-oss/Makefile
@@ -1,27 +1,26 @@
# Created by: Piotr Kubaj <pkubaj@anongoth.pl>
# $FreeBSD$
-PORTNAME= alsa-plugins-oss
+PORTNAME= alsa-plugins
PORTVERSION= 1.1.1
CATEGORIES= audio linux
+PKGNAMESUFFIX= -oss
+LIB_DISTNAMES= ${LINUXNAME}-${DISTVERSIONFULL}
MAINTAINER= emulation@FreeBSD.org
COMMENT= OSS 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
USE_LINUX= alsalib
USE_LINUX_RPM= 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-c7-alsa-plugins-oss/distinfo.x86_64 b/audio/linux-c7-alsa-plugins-oss/distinfo
index b9d9bf05b578..b9d9bf05b578 100644
--- a/audio/linux-c7-alsa-plugins-oss/distinfo.x86_64
+++ b/audio/linux-c7-alsa-plugins-oss/distinfo
diff --git a/audio/linux-c7-alsa-plugins-oss/pkg-descr b/audio/linux-c7-alsa-plugins-oss/pkg-descr
deleted file mode 100644
index 9447636da467..000000000000
--- a/audio/linux-c7-alsa-plugins-oss/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-oss/pkg-plist.x86_64 b/audio/linux-c7-alsa-plugins-oss/pkg-plist.amd64
index 91dbf8f23042..91dbf8f23042 100644
--- a/audio/linux-c7-alsa-plugins-oss/pkg-plist.x86_64
+++ b/audio/linux-c7-alsa-plugins-oss/pkg-plist.amd64
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
diff --git a/audio/linux-c7-alsa-utils/Makefile b/audio/linux-c7-alsa-utils/Makefile
index b5a2d69179a1..513143e82f40 100644
--- a/audio/linux-c7-alsa-utils/Makefile
+++ b/audio/linux-c7-alsa-utils/Makefile
@@ -3,18 +3,23 @@
PORTNAME= alsa-utils
PORTVERSION= 1.1.1
+PORTREVISION= 1
CATEGORIES= audio linux
MAINTAINER= emulation@FreeBSD.org
-COMMENT= Advanced Linux Sound Architecture libraries (Linux CentOS ${LINUX_DIST_VER})
+COMMENT= Advanced Linux Sound Architecture utilities (Linux CentOS ${LINUX_DIST_VER})
LICENSE= GPLv3
CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
RPMVERSION= 1.el7
USES= linux:c7
USE_LINUX= alsalib alsa-plugins-oss
USE_LINUX_RPM= nolib
+OPTIONS_DEFINE= DOCS NLS
+OPTIONS_SUB= yes
+
.include <bsd.port.mk>
diff --git a/audio/linux-c7-alsa-utils/distinfo.x86_64 b/audio/linux-c7-alsa-utils/distinfo
index 694d65ff0434..694d65ff0434 100644
--- a/audio/linux-c7-alsa-utils/distinfo.x86_64
+++ b/audio/linux-c7-alsa-utils/distinfo
diff --git a/audio/linux-c7-alsa-utils/pkg-descr b/audio/linux-c7-alsa-utils/pkg-descr
deleted file mode 100644
index 9447636da467..000000000000
--- a/audio/linux-c7-alsa-utils/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-utils/pkg-plist.x86_64 b/audio/linux-c7-alsa-utils/pkg-plist.amd64
index 9670c5095e45..eb24bf333b39 100644
--- a/audio/linux-c7-alsa-utils/pkg-plist.x86_64
+++ b/audio/linux-c7-alsa-utils/pkg-plist.amd64
@@ -40,9 +40,9 @@ usr/share/alsa/speaker-test/sample_map.csv
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/TODO
-usr/share/locale/de/LC_MESSAGES/alsa-utils.mo
-usr/share/locale/fr/LC_MESSAGES/alsa-utils.mo
-usr/share/locale/ja/LC_MESSAGES/alsa-utils.mo
+%%NLS%%usr/share/locale/de/LC_MESSAGES/alsa-utils.mo
+%%NLS%%usr/share/locale/fr/LC_MESSAGES/alsa-utils.mo
+%%NLS%%usr/share/locale/ja/LC_MESSAGES/alsa-utils.mo
usr/share/man/man1/aconnect.1.gz
usr/share/man/man1/alsa-delay.1.gz
usr/share/man/man1/alsa-info.sh.1.gz
diff --git a/audio/linux-c7-audiofile/Makefile b/audio/linux-c7-audiofile/Makefile
index 131d7096bfb6..beff83b0c0db 100644
--- a/audio/linux-c7-audiofile/Makefile
+++ b/audio/linux-c7-audiofile/Makefile
@@ -9,13 +9,12 @@ CATEGORIES= audio linux
MAINTAINER= emulation@FreeBSD.org
COMMENT= Implementation of the Audio File Library (Linux CentOS ${LINUX_DIST_VER})
-CONTFLICTS= linux-c6-libaudiofile-[0-9]*
+CONTFLICTS= linux-c6-${PORTNAME}-[0-9]*
+DESCR= ${.CURDIR}/../lib${PORTNAME}/pkg-descr
RPMVERSION= 4.el7
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
-DESCR= ${.CURDIR}/../lib${PORTNAME}/pkg-descr
-
.include <bsd.port.mk>
diff --git a/audio/linux-c7-audiofile/distinfo.x86_64 b/audio/linux-c7-audiofile/distinfo
index fe0a04fa0791..fe0a04fa0791 100644
--- a/audio/linux-c7-audiofile/distinfo.x86_64
+++ b/audio/linux-c7-audiofile/distinfo
diff --git a/audio/linux-c7-audiofile/pkg-plist.x86_64 b/audio/linux-c7-audiofile/pkg-plist.amd64
index 6ff519f00539..6ff519f00539 100644
--- a/audio/linux-c7-audiofile/pkg-plist.x86_64
+++ b/audio/linux-c7-audiofile/pkg-plist.amd64
diff --git a/audio/linux-c7-esound/Makefile b/audio/linux-c7-esound/Makefile
deleted file mode 100644
index 6529f5fd6434..000000000000
--- a/audio/linux-c7-esound/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# Created by: Piotr Kubaj <pkubaj@anongoth.pl>
-# $FreeBSD$
-
-PORTNAME= esound
-PORTVERSION= 0.2.41
-PORTREVISION= 1
-CATEGORIES= audio linux
-MASTER_SITES= EPEL7/e
-LIB_DISTFILES= ${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}${EXTRACT_SUFX}
-SRC_DISTFILES= ${DISTNAME}${SRC_SUFX}:SOURCE
-
-MAINTAINER= emulation@FreeBSD.org
-COMMENT= RPM of esound (Linux CentOS ${LINUX_DIST_VER})
-
-CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
-
-LINUX_NAME= ${PORTNAME}-libs
-ONLY_FOR_ARCHS= amd64
-RPMVERSION= 12.el7
-USES= linux:c7
-USE_LDCONFIG= yes
-USE_LINUX= libaudiofile
-USE_LINUX_RPM= yes
-
-DOCSDIR= ${PREFIX}/usr/share/doc/${LINUX_NAME}-${PORTVERSION}
-PORTDOCS= AUTHORS COPYING.LIB ChangeLog NEWS README TIPS TODO esound.sgml
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
-
-.include <bsd.port.mk>
diff --git a/audio/linux-c7-esound/distinfo.x86_64 b/audio/linux-c7-esound/distinfo.x86_64
deleted file mode 100644
index 9522b1bfa813..000000000000
--- a/audio/linux-c7-esound/distinfo.x86_64
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1482092195
-SHA256 (centos/esound-libs-0.2.41-12.el7.x86_64.rpm) = fa0c8a1ea02a46633137e3d8787e2952022b952133112048bf0c09c96d94dce9
-SIZE (centos/esound-libs-0.2.41-12.el7.x86_64.rpm) = 79540
-SHA256 (centos/esound-0.2.41-12.el7.src.rpm) = 3e8a2b20914fa977a256d659d4c6d0d09d62cc3ecd7fc69d7c10fd47e75aaa5a
-SIZE (centos/esound-0.2.41-12.el7.src.rpm) = 414450
diff --git a/audio/linux-c7-esound/pkg-plist.x86_64 b/audio/linux-c7-esound/pkg-plist.x86_64
deleted file mode 100644
index adda448c4fbd..000000000000
--- a/audio/linux-c7-esound/pkg-plist.x86_64
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/lib64/libesd.so.0
-usr/lib64/libesd.so.0.2.39
-usr/lib64/libesddsp.so.0
-usr/lib64/libesddsp.so.0.2.39
diff --git a/audio/linux-c7-flac/Makefile b/audio/linux-c7-flac/Makefile
index d17cfca34506..dcd2feb6d3c1 100644
--- a/audio/linux-c7-flac/Makefile
+++ b/audio/linux-c7-flac/Makefile
@@ -3,22 +3,23 @@
PORTNAME= flac
PORTVERSION= 1.3.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio linux
-LIB_DISTFILES= ${PORTNAME}-libs-${PORTVERSION}-${RPMVERSION}${EXTRACT_SUFX}
-SRC_DISTFILES= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}:SOURCE
+PKGNAMESUFFIX= -libs
+LIB_DISTNAMES= ${LINUXNAME}-${DISTVERSIONFULL}
MAINTAINER= emulation@FreeBSD.org
COMMENT= Free lossless audio codec (Linux CentOS ${LINUX_DIST_VER})
CONFLICT= linux-c6-${PORTNAME}-[0-9]*
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+DOCSDIR= ${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION}
+LINUXNAME= ${PORTNAME}${PKGNAMESUFFIX}
RPMVERSION= 5.el7_1
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX= libogg
-USE_LINUX_RPM= nolib
-
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+USE_LINUX_RPM= yes
.include <bsd.port.mk>
diff --git a/audio/linux-c7-flac/distinfo.x86_64 b/audio/linux-c7-flac/distinfo
index d3a7ad33f108..0ce46bf6a491 100644
--- a/audio/linux-c7-flac/distinfo.x86_64
+++ b/audio/linux-c7-flac/distinfo
@@ -1,9 +1,7 @@
-TIMESTAMP = 1473674927
+TIMESTAMP = 1485458887
SHA256 (centos/flac-libs-1.3.0-5.el7_1.i686.rpm) = e9b89ac816e668e4b98ddc90c5bc1a89ce9244455f3923eb6e74b8785f873a7c
SIZE (centos/flac-libs-1.3.0-5.el7_1.i686.rpm) = 175616
SHA256 (centos/flac-libs-1.3.0-5.el7_1.x86_64.rpm) = 0a7b5dc94d9f29a9c72a89771d488f417ca7cea6237d2e10a1461c67059e13e1
SIZE (centos/flac-libs-1.3.0-5.el7_1.x86_64.rpm) = 173224
-SHA256 (centos/flac-1.3.0-5.el7_1.x86_64.rpm) = a3928f2895bda0799a7f1bd7613f5bca9ba30352a1ea64cb5ec56d6d8f16ee59
-SIZE (centos/flac-1.3.0-5.el7_1.x86_64.rpm) = 579556
SHA256 (centos/flac-1.3.0-5.el7_1.src.rpm) = f68b46f5e9f8b368e0070d88b81d970626d7f53a0c70396dc590681c917b17fe
SIZE (centos/flac-1.3.0-5.el7_1.src.rpm) = 1101665
diff --git a/audio/linux-c7-flac/pkg-plist.amd64 b/audio/linux-c7-flac/pkg-plist.amd64
new file mode 100644
index 000000000000..92c5aec8f629
--- /dev/null
+++ b/audio/linux-c7-flac/pkg-plist.amd64
@@ -0,0 +1,14 @@
+usr/lib/libFLAC++.so.6
+usr/lib/libFLAC++.so.6.3.0
+usr/lib/libFLAC.so.8
+usr/lib/libFLAC.so.8.3.0
+usr/lib64/libFLAC++.so.6
+usr/lib64/libFLAC++.so.6.3.0
+usr/lib64/libFLAC.so.8
+usr/lib64/libFLAC.so.8.3.0
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING.FDL
+%%PORTDOCS%%%%DOCSDIR%%/COPYING.GPL
+%%PORTDOCS%%%%DOCSDIR%%/COPYING.LGPL
+%%PORTDOCS%%%%DOCSDIR%%/COPYING.Xiph
+%%PORTDOCS%%%%DOCSDIR%%/README
diff --git a/audio/linux-c7-flac/pkg-plist.x86_64 b/audio/linux-c7-flac/pkg-plist.x86_64
deleted file mode 100644
index 5dc5f6e446bb..000000000000
--- a/audio/linux-c7-flac/pkg-plist.x86_64
+++ /dev/null
@@ -1,106 +0,0 @@
-usr/bin/flac
-usr/bin/metaflac
-usr/lib/libFLAC++.so.6
-usr/lib/libFLAC++.so.6.3.0
-usr/lib/libFLAC.so.8
-usr/lib/libFLAC.so.8.3.0
-usr/lib64/libFLAC++.so.6
-usr/lib64/libFLAC++.so.6.3.0
-usr/lib64/libFLAC.so.8
-usr/lib64/libFLAC.so.8.3.0
-%%PORTDOCS%%%%DOCSDIR%%/html/changelog.html
-%%PORTDOCS%%%%DOCSDIR%%/html/comparison.html
-%%PORTDOCS%%%%DOCSDIR%%/html/comparison__chopin_prelude_24.html
-%%PORTDOCS%%%%DOCSDIR%%/html/comparison__dream_theater_600.html
-%%PORTDOCS%%%%DOCSDIR%%/html/comparison__eddie_warner_titus.html
-%%PORTDOCS%%%%DOCSDIR%%/html/comparison__fanfare_de_l_eventail_de_jeanne.html
-%%PORTDOCS%%%%DOCSDIR%%/html/comparison__gloria_estefan_conga.html
-%%PORTDOCS%%%%DOCSDIR%%/html/comparison__hand_in_my_pocket.html
-%%PORTDOCS%%%%DOCSDIR%%/html/comparison__l_sub_raga_sivapriya.html
-%%PORTDOCS%%%%DOCSDIR%%/html/comparison__laetatus_sum.html
-%%PORTDOCS%%%%DOCSDIR%%/html/comparison__mummified_in_barbed_wire.html
-%%PORTDOCS%%%%DOCSDIR%%/html/comparison__prokofiev_pcon3_3.html
-%%PORTDOCS%%%%DOCSDIR%%/html/comparison__ravel_sq4_4.html
-%%PORTDOCS%%%%DOCSDIR%%/html/comparison__scarlatti_k42.html
-%%PORTDOCS%%%%DOCSDIR%%/html/comparison__tool_forty_six_and_2.html
-%%PORTDOCS%%%%DOCSDIR%%/html/comparison__white_room.html
-%%PORTDOCS%%%%DOCSDIR%%/html/comparison_all_cpudectime.html
-%%PORTDOCS%%%%DOCSDIR%%/html/comparison_all_cpuenctime.html
-%%PORTDOCS%%%%DOCSDIR%%/html/comparison_all_procdectime.html
-%%PORTDOCS%%%%DOCSDIR%%/html/comparison_all_procenctime.html
-%%PORTDOCS%%%%DOCSDIR%%/html/comparison_all_ratio.html
-%%PORTDOCS%%%%DOCSDIR%%/html/developers.html
-%%PORTDOCS%%%%DOCSDIR%%/html/documentation.html
-%%PORTDOCS%%%%DOCSDIR%%/html/documentation_bugs.html
-%%PORTDOCS%%%%DOCSDIR%%/html/documentation_example_code.html
-%%PORTDOCS%%%%DOCSDIR%%/html/documentation_format_overview.html
-%%PORTDOCS%%%%DOCSDIR%%/html/documentation_tasks.html
-%%PORTDOCS%%%%DOCSDIR%%/html/documentation_tools.html
-%%PORTDOCS%%%%DOCSDIR%%/html/documentation_tools_flac.html
-%%PORTDOCS%%%%DOCSDIR%%/html/documentation_tools_metaflac.html
-%%PORTDOCS%%%%DOCSDIR%%/html/documentation_tools_plugins.html
-%%PORTDOCS%%%%DOCSDIR%%/html/download.html
-%%PORTDOCS%%%%DOCSDIR%%/html/faq.html
-%%PORTDOCS%%%%DOCSDIR%%/html/favicon.ico
-%%PORTDOCS%%%%DOCSDIR%%/html/features.html
-%%PORTDOCS%%%%DOCSDIR%%/html/flac.css
-%%PORTDOCS%%%%DOCSDIR%%/html/format.html
-%%PORTDOCS%%%%DOCSDIR%%/html/id.html
-%%PORTDOCS%%%%DOCSDIR%%/html/images/1x1.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/images/cafebug.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/Blackbird_Front_low3_325x87.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/MS300frontsmall_270x108.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/MediaBox_Frt_170x325.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/SB_Hero_Black_325x182.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/Sooloos-ControlOne_325x328.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/Z500_front_325x94.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/a2_01_325x252.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/arcus_325x135.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/bmp-1430_325x241.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/cs505_front_lrg_325x113.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/enus_3-4lft-hires_product_eva8000_325x127.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/escient_ProductLine_325x163.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/hifidelio_bl_front_Z_RGB_325x163.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/i-station-mini-dx_325x237.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/iwod-g10_325x257.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/knc_hr-2800_325x209.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/mediaready_prodmain_MRMCa_325x232.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/meizu_m6_325x206.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/musica_artwork_325x90.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/neodigits_x5000_325x124.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/onda-vx737_325x240.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/request_n_front_325x103.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/rio_karma_279x254.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/sonos_family_RGB_325x200.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/teclast-tl29_325x244.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/transporter_hero_grey_325x208.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/tvix-4000_325x204.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/vibez_nofm_combi_black_b_325x220.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/logo100.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/images/logo130.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/index.html
-%%PORTDOCS%%%%DOCSDIR%%/html/itunes.html
-%%PORTDOCS%%%%DOCSDIR%%/html/license.html
-%%PORTDOCS%%%%DOCSDIR%%/html/links.html
-%%PORTDOCS%%%%DOCSDIR%%/html/news.html
-%%PORTDOCS%%%%DOCSDIR%%/html/ogg_mapping.html
-%%PORTDOCS%%%%DOCSDIR%%/html/ru/authors.html
-%%PORTDOCS%%%%DOCSDIR%%/html/ru/comparison.html
-%%PORTDOCS%%%%DOCSDIR%%/html/ru/developers.html
-%%PORTDOCS%%%%DOCSDIR%%/html/ru/documentation.html
-%%PORTDOCS%%%%DOCSDIR%%/html/ru/download.html
-%%PORTDOCS%%%%DOCSDIR%%/html/ru/features.html
-%%PORTDOCS%%%%DOCSDIR%%/html/ru/format.html
-%%PORTDOCS%%%%DOCSDIR%%/html/ru/goals.html
-%%PORTDOCS%%%%DOCSDIR%%/html/ru/id.html
-%%PORTDOCS%%%%DOCSDIR%%/html/ru/index.html
-%%PORTDOCS%%%%DOCSDIR%%/html/ru/links.html
-%%PORTDOCS%%%%DOCSDIR%%/html/ru/news.html
-%%PORTDOCS%%usr/share/doc/flac-libs-1.3.0/AUTHORS
-%%PORTDOCS%%usr/share/doc/flac-libs-1.3.0/COPYING.FDL
-%%PORTDOCS%%usr/share/doc/flac-libs-1.3.0/COPYING.GPL
-%%PORTDOCS%%usr/share/doc/flac-libs-1.3.0/COPYING.LGPL
-%%PORTDOCS%%usr/share/doc/flac-libs-1.3.0/COPYING.Xiph
-%%PORTDOCS%%usr/share/doc/flac-libs-1.3.0/README
-usr/share/man/man1/flac.1.gz
-usr/share/man/man1/metaflac.1.gz
diff --git a/audio/linux-c7-libogg/Makefile b/audio/linux-c7-libogg/Makefile
index d7ff0ffd70b3..886ebfc745e9 100644
--- a/audio/linux-c7-libogg/Makefile
+++ b/audio/linux-c7-libogg/Makefile
@@ -11,12 +11,10 @@ COMMENT= Ogg bitstream library (Linux CentOS ${LINUX_DIST_VER})
CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
RPMVERSION= 7.el7
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX_RPM= yes
-PORTDOCS= AUTHORS CHANGES COPYING README
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
-
.include <bsd.port.mk>
diff --git a/audio/linux-c7-libogg/distinfo.x86_64 b/audio/linux-c7-libogg/distinfo
index 441629d6740f..441629d6740f 100644
--- a/audio/linux-c7-libogg/distinfo.x86_64
+++ b/audio/linux-c7-libogg/distinfo
diff --git a/audio/linux-c7-libogg/pkg-plist.amd64 b/audio/linux-c7-libogg/pkg-plist.amd64
new file mode 100644
index 000000000000..1e66c55ceec7
--- /dev/null
+++ b/audio/linux-c7-libogg/pkg-plist.amd64
@@ -0,0 +1,8 @@
+usr/lib/libogg.so.0
+usr/lib/libogg.so.0.8.0
+usr/lib64/libogg.so.0
+usr/lib64/libogg.so.0.8.0
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/README
diff --git a/audio/linux-c7-libogg/pkg-plist.x86_64 b/audio/linux-c7-libogg/pkg-plist.x86_64
deleted file mode 100644
index b4cc85169e69..000000000000
--- a/audio/linux-c7-libogg/pkg-plist.x86_64
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/lib/libogg.so.0
-usr/lib/libogg.so.0.8.0
-usr/lib64/libogg.so.0
-usr/lib64/libogg.so.0.8.0
diff --git a/audio/linux-c7-libsndfile/Makefile b/audio/linux-c7-libsndfile/Makefile
index 3c19769a4f1a..a499b1719950 100644
--- a/audio/linux-c7-libsndfile/Makefile
+++ b/audio/linux-c7-libsndfile/Makefile
@@ -3,22 +3,19 @@
PORTNAME= libsndfile
PORTVERSION= 1.0.25
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio linux
-BIN_DISTFILES= ${PORTNAME}-utils-${PORTVERSION}-${RPMVERSION}${EXTRACT_SUFX}
-SRC_DISTFILES= ${PORTNAME}-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}:SOURCE
MAINTAINER= emulation@FreeBSD.org
COMMENT= Reading and writing files containing sampled sound (like WAV or AIFF) (Linux CentOS ${LINUX_DIST_VER})
CONTFLICTS= linux-c6-${PORTNAME}-[0-9]*
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
RPMVERSION= 10.el7
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX= flac libogg libvorbis
USE_LINUX_RPM= yes
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
-
.include <bsd.port.mk>
diff --git a/audio/linux-c7-libsndfile/distinfo.x86_64 b/audio/linux-c7-libsndfile/distinfo
index 30a7020be253..98b3bcd21c7f 100644
--- a/audio/linux-c7-libsndfile/distinfo.x86_64
+++ b/audio/linux-c7-libsndfile/distinfo
@@ -1,9 +1,7 @@
-TIMESTAMP = 1482091724
+TIMESTAMP = 1485459653
SHA256 (centos/libsndfile-1.0.25-10.el7.i686.rpm) = 1d8d3c9fb6fc12ffaacfe1f3330be92a90a269d6190192a28496c1193d86537d
SIZE (centos/libsndfile-1.0.25-10.el7.i686.rpm) = 162888
SHA256 (centos/libsndfile-1.0.25-10.el7.x86_64.rpm) = 50fad657626376fa5b8eca66fd5c9d549f5c036345f2458dc6b6f462c220e1b7
SIZE (centos/libsndfile-1.0.25-10.el7.x86_64.rpm) = 152776
-SHA256 (centos/libsndfile-utils-1.0.25-10.el7.x86_64.rpm) = d80f4f78c24651b775895b40ad3ac8c80d63b8bbfb94880180500c68c667e91a
-SIZE (centos/libsndfile-utils-1.0.25-10.el7.x86_64.rpm) = 60344
SHA256 (centos/libsndfile-1.0.25-10.el7.src.rpm) = 21628d8e805d912d8dfc705f3f0f6283d14c51f89fe62f60b8bbf7a688f778f5
SIZE (centos/libsndfile-1.0.25-10.el7.src.rpm) = 1072937
diff --git a/audio/linux-c7-libsndfile/pkg-plist.amd64 b/audio/linux-c7-libsndfile/pkg-plist.amd64
new file mode 100644
index 000000000000..ec2dc4df0018
--- /dev/null
+++ b/audio/linux-c7-libsndfile/pkg-plist.amd64
@@ -0,0 +1,8 @@
+usr/lib/libsndfile.so.1
+usr/lib/libsndfile.so.1.0.25
+usr/lib64/libsndfile.so.1
+usr/lib64/libsndfile.so.1.0.25
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
diff --git a/audio/linux-c7-libsndfile/pkg-plist.x86_64 b/audio/linux-c7-libsndfile/pkg-plist.x86_64
deleted file mode 100644
index a848fe92b708..000000000000
--- a/audio/linux-c7-libsndfile/pkg-plist.x86_64
+++ /dev/null
@@ -1,28 +0,0 @@
-usr/bin/sndfile-cmp
-usr/bin/sndfile-concat
-usr/bin/sndfile-convert
-usr/bin/sndfile-deinterleave
-usr/bin/sndfile-info
-usr/bin/sndfile-interleave
-usr/bin/sndfile-metadata-get
-usr/bin/sndfile-metadata-set
-usr/bin/sndfile-play
-usr/bin/sndfile-regtest
-usr/bin/sndfile-salvage
-usr/lib/libsndfile.so.1
-usr/lib/libsndfile.so.1.0.25
-usr/lib64/libsndfile.so.1
-usr/lib64/libsndfile.so.1.0.25
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-usr/share/man/man1/sndfile-cmp.1.gz
-usr/share/man/man1/sndfile-concat.1.gz
-usr/share/man/man1/sndfile-convert.1.gz
-usr/share/man/man1/sndfile-deinterleave.1.gz
-usr/share/man/man1/sndfile-info.1.gz
-usr/share/man/man1/sndfile-interleave.1.gz
-usr/share/man/man1/sndfile-metadata-get.1.gz
-usr/share/man/man1/sndfile-metadata-set.1.gz
-usr/share/man/man1/sndfile-play.1.gz
diff --git a/audio/linux-c7-libvorbis/Makefile b/audio/linux-c7-libvorbis/Makefile
index 9b7aaf4e9527..504f5ca8a896 100644
--- a/audio/linux-c7-libvorbis/Makefile
+++ b/audio/linux-c7-libvorbis/Makefile
@@ -11,13 +11,11 @@ COMMENT= Audio compression codec library (Linux CentOS ${LINUX_DIST_VER})
CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
RPMVERSION= 8.el7
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX= libogg
USE_LINUX_RPM= yes
-PORTDOCS= COPYING
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
-
.include <bsd.port.mk>
diff --git a/audio/linux-c7-libvorbis/distinfo.x86_64 b/audio/linux-c7-libvorbis/distinfo
index 9312bf48697d..9312bf48697d 100644
--- a/audio/linux-c7-libvorbis/distinfo.x86_64
+++ b/audio/linux-c7-libvorbis/distinfo
diff --git a/audio/linux-c7-libvorbis/pkg-plist.x86_64 b/audio/linux-c7-libvorbis/pkg-plist.amd64
index 851c2df8c44d..b8d92b0a19d8 100644
--- a/audio/linux-c7-libvorbis/pkg-plist.x86_64
+++ b/audio/linux-c7-libvorbis/pkg-plist.amd64
@@ -10,3 +10,4 @@ usr/lib64/libvorbisenc.so.2
usr/lib64/libvorbisenc.so.2.0.9
usr/lib64/libvorbisfile.so.3
usr/lib64/libvorbisfile.so.3.3.5
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
diff --git a/audio/linux-c7-openal-soft/Makefile b/audio/linux-c7-openal-soft/Makefile
index 43658d7df7bf..c4a16c069686 100644
--- a/audio/linux-c7-openal-soft/Makefile
+++ b/audio/linux-c7-openal-soft/Makefile
@@ -3,23 +3,21 @@
PORTNAME= openal-soft
PORTVERSION= 1.16.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio linux
MASTER_SITES= EPEL7/o
MAINTAINER= emulation@FreeBSD.org
-COMMENT= A 3D positional spatialized sound library (Linux CentOS ${LINUX_DIST_VER})
+COMMENT= 3D positional spatialized sound library (Linux CentOS ${LINUX_DIST_VER})
CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
ONLY_FOR_ARCHS= amd64
RPMVERSION= 3.el7
USES= linux:c7
USE_LDCONFIG= yes
-USE_LINUX= alsalib esound
+USE_LINUX= alsalib
USE_LINUX_RPM= yes
-PORTDOCS= COPYING
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
-
.include <bsd.port.mk>
diff --git a/audio/linux-c7-openal-soft/distinfo.x86_64 b/audio/linux-c7-openal-soft/distinfo
index 0c9ab2a4ee29..0c9ab2a4ee29 100644
--- a/audio/linux-c7-openal-soft/distinfo.x86_64
+++ b/audio/linux-c7-openal-soft/distinfo
diff --git a/audio/linux-c7-openal-soft/pkg-plist.x86_64 b/audio/linux-c7-openal-soft/pkg-plist.amd64
index a8b1a1618b2a..e059832e4193 100644
--- a/audio/linux-c7-openal-soft/pkg-plist.x86_64
+++ b/audio/linux-c7-openal-soft/pkg-plist.amd64
@@ -2,6 +2,7 @@ etc/openal/alsoft.conf
usr/bin/openal-info
usr/lib64/libopenal.so.1
usr/lib64/libopenal.so.1.16.0
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
usr/share/openal/alsoftrc.sample
usr/share/openal/hrtf/default-44100.mhr
usr/share/openal/hrtf/default-48000.mhr
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
diff --git a/audio/linux-c7-pulseaudio-utils/Makefile b/audio/linux-c7-pulseaudio-utils/Makefile
index d788edead36c..12e678a983b9 100644
--- a/audio/linux-c7-pulseaudio-utils/Makefile
+++ b/audio/linux-c7-pulseaudio-utils/Makefile
@@ -1,24 +1,24 @@
# Created by: Piotr Kubaj <pkubaj@anongoth.pl>
# $FreeBSD$
-PORTNAME= pulseaudio-utils
+PORTNAME= pulseaudio
PORTVERSION= 6.0
PORTREVISION= 1
CATEGORIES= audio linux
+PKGNAMESUFFIX= -utils
+BIN_DISTNAMES= ${LINUXNAME}-${DISTVERSIONFULL}
MAINTAINER= emulation@FreeBSD.org
COMMENT= Utils 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
+LINUXNAME= ${PORTNAME}${PKGNAMESUFFIX}
RPMVERSION= 8.el7
USES= linux:c7
USE_LDCONFIG= yes
USE_LINUX= xorglibs pulseaudio-libs
USE_LINUX_RPM= nolib
-DESCR= ${.CURDIR}/../pulseaudio/pkg-descr
-
-SRC_DISTFILES= pulseaudio-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}:SOURCE
-
.include <bsd.port.mk>
diff --git a/audio/linux-c7-pulseaudio-utils/distinfo.x86_64 b/audio/linux-c7-pulseaudio-utils/distinfo
index 446edd3431a6..446edd3431a6 100644
--- a/audio/linux-c7-pulseaudio-utils/distinfo.x86_64
+++ b/audio/linux-c7-pulseaudio-utils/distinfo
diff --git a/audio/linux-c7-pulseaudio-utils/pkg-plist.x86_64 b/audio/linux-c7-pulseaudio-utils/pkg-plist.amd64
index dcf70a734418..dcf70a734418 100644
--- a/audio/linux-c7-pulseaudio-utils/pkg-plist.x86_64
+++ b/audio/linux-c7-pulseaudio-utils/pkg-plist.amd64
diff --git a/audio/linux-c7-sdl_mixer/Makefile b/audio/linux-c7-sdl_mixer/Makefile
index 94846887a436..bfda95569d52 100644
--- a/audio/linux-c7-sdl_mixer/Makefile
+++ b/audio/linux-c7-sdl_mixer/Makefile
@@ -6,14 +6,16 @@ PORTVERSION= 1.2.12
PORTREVISION= 1
CATEGORIES= audio linux
MASTER_SITES= EPEL7/s
-DISTNAME= ${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
+DISTNAME= ${LINUXNAME}-${DISTVERSIONFULL}
MAINTAINER= emulation@FreeBSD.org
COMMENT= Sample multi-channel audio mixer library (Linux CentOS ${LINUX_DIST_VER})
CONFLICTS= linux-c6-${PORTNAME}-[0-9]*
-LINUX_NAME= SDL_mixer
+DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+DOCSDIR= ${PREFIX}/usr/share/doc/${LINUXNAME}-${PORTVERSION}
+LINUXNAME= SDL_mixer
ONLY_FOR_ARCHS= amd64
RPMVERSION= 4.el7
USES= linux:c7
@@ -21,8 +23,4 @@ USE_LDCONFIG= yes
USE_LINUX= sdl12
USE_LINUX_RPM= yes
-DOCSDIR= ${PREFIX}/usr/share/doc/${LINUX_NAME}-${PORTVERSION}
-PORTDOCS= CHANGES COPYING README
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
-
.include <bsd.port.mk>
diff --git a/audio/linux-c7-sdl_mixer/distinfo.x86_64 b/audio/linux-c7-sdl_mixer/distinfo
index 6071ed9c5b00..6071ed9c5b00 100644
--- a/audio/linux-c7-sdl_mixer/distinfo.x86_64
+++ b/audio/linux-c7-sdl_mixer/distinfo
diff --git a/audio/linux-c7-sdl_mixer/pkg-plist.x86_64 b/audio/linux-c7-sdl_mixer/pkg-plist.amd64
index 4639ff0828a3..27bb5cbc4836 100644
--- a/audio/linux-c7-sdl_mixer/pkg-plist.x86_64
+++ b/audio/linux-c7-sdl_mixer/pkg-plist.amd64
@@ -2,3 +2,6 @@ usr/bin/playmus
usr/bin/playwave
usr/lib64/libSDL_mixer-1.2.so.0
usr/lib64/libSDL_mixer-1.2.so.0.12.0
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/README