4 files changed, 22 insertions, 106 deletions

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