[Midnightbsd-cvs] mports [18582] trunk/audio/linux-f10-alsa-plugins-oss: revise port to not use a special config file

[laffer1 at midnightbsd.org]

Revision: 18582
          http://svnweb.midnightbsd.org/mports/?rev=18582
Author:   laffer1
Date:     2015-04-04 09:47:12 -0400 (Sat, 04 Apr 2015)
Log Message:
-----------
revise port to not use a special config file

Modified Paths:
--------------
    trunk/audio/linux-f10-alsa-plugins-oss/Makefile
    trunk/audio/linux-f10-alsa-plugins-oss/pkg-plist

Removed Paths:
-------------
    trunk/audio/linux-f10-alsa-plugins-oss/files/
    trunk/audio/linux-f10-alsa-plugins-oss/pkg-deinstall
    trunk/audio/linux-f10-alsa-plugins-oss/pkg-install

Modified: trunk/audio/linux-f10-alsa-plugins-oss/Makefile
===================================================================
--- trunk/audio/linux-f10-alsa-plugins-oss/Makefile	2015-04-04 13:06:17 UTC (rev 18581)
+++ trunk/audio/linux-f10-alsa-plugins-oss/Makefile	2015-04-04 13:47:12 UTC (rev 18582)
@@ -2,10 +2,8 @@
 
 PORTNAME=	alsa-plugins-oss
 PORTVERSION=	1.0.21
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio linux
-PKGNAMEPREFIX=	linux-f10-
-DISTNAME=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	OSS plugin for ALSA (Linux Fedora 10)
@@ -12,22 +10,16 @@
 LICENSE=	unknown
 
 ONLY_FOR_ARCHS=	i386 amd64
+USE_LINUX=	f10
 USE_LINUX_RPM=	yes
 USE_LINUX_APPS=	alsalib
-LINUX_DIST_VER=	10
+
 RPMVERSION=	3.fc10
 SRC_DISTFILES=	${PORTNAME:S/-oss//}-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}
 USE_LDCONFIG=	yes
 
-CONF_FILE=	etc/alsa/pcm/pcm-oss.conf
+# We will use native configuration file, so delete a linux one
+post-extract:
+	@${RM} -r ${WRKSRC}/etc
 
-post-patch:
-	@${RM} ${WRKSRC}/${CONF_FILE}.orig
-	@${MV} ${WRKSRC}/${CONF_FILE} ${WRKSRC}/${CONF_FILE}-dist
-
-post-install:
-	@if [ ! -f ${PREFIX}/${CONF_FILE} ]; then \
-		${CP} -p ${PREFIX}/${CONF_FILE}-dist ${PREFIX}/${CONF_FILE} ; \
-	fi
-
 .include <bsd.port.mk>

Deleted: trunk/audio/linux-f10-alsa-plugins-oss/pkg-deinstall
===================================================================
--- trunk/audio/linux-f10-alsa-plugins-oss/pkg-deinstall	2015-04-04 13:06:17 UTC (rev 18581)
+++ trunk/audio/linux-f10-alsa-plugins-oss/pkg-deinstall	2015-04-04 13:47:12 UTC (rev 18582)
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-case "$2" in
-	POST-DEINSTALL)
-		conf=${PKG_PREFIX}/etc/asound.conf
-		if [ ! -f "$conf" ]; then
-			exit 1
-		fi
-		grep -v '/etc/alsa/pcm/pcm-oss\.conf' <$conf >/tmp/asound.conf.new
-		;;
-	*)
-		exit 0
-		;;
-esac
-
-exit 0

Deleted: trunk/audio/linux-f10-alsa-plugins-oss/pkg-install
===================================================================
--- trunk/audio/linux-f10-alsa-plugins-oss/pkg-install	2015-04-04 13:06:17 UTC (rev 18581)
+++ trunk/audio/linux-f10-alsa-plugins-oss/pkg-install	2015-04-04 13:47:12 UTC (rev 18582)
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-case "$2" in
-	POST-INSTALL)
-		conf=${PKG_PREFIX}/etc/asound.conf
-		if [ ! -f "$conf" ]; then
-			exit 1
-		fi
-		awk '{print $0}; /files/ { print "\t\t\t\"/etc/alsa/pcm/pcm-oss.conf\""}' <$conf >/tmp/asound.conf.new
-		mv /tmp/asound.conf.new $conf
-		exit 0
-		;;
-	*)
-		exit 0
-		;;
-esac
-
-exit 0

Modified: trunk/audio/linux-f10-alsa-plugins-oss/pkg-plist
===================================================================
--- trunk/audio/linux-f10-alsa-plugins-oss/pkg-plist	2015-04-04 13:06:17 UTC (rev 18581)
+++ trunk/audio/linux-f10-alsa-plugins-oss/pkg-plist	2015-04-04 13:47:12 UTC (rev 18582)
@@ -1,13 +1,5 @@
- at unexec if cmp -s %D/etc/alsa/pcm/pcm-oss.conf-dist %D/etc/alsa/pcm/pcm-oss.conf; then rm -f %D/etc/alsa/pcm/pcm-oss.conf; fi
-etc/alsa/pcm/pcm-oss.conf-dist
- at exec if [ ! -f %D/etc/alsa/pcm/pcm-oss.conf ] ; then cp -p %D/%F %B/pcm-oss.conf; fi
 usr/lib/alsa-lib/libasound_module_ctl_oss.so
 usr/lib/alsa-lib/libasound_module_pcm_oss.so
 usr/share/doc/alsa-plugins-oss-1.0.21/COPYING
 usr/share/doc/alsa-plugins-oss-1.0.21/COPYING.GPL
 usr/share/doc/alsa-plugins-oss-1.0.21/README-pcm-oss
- at dirrm usr/share/doc/alsa-plugins-oss-1.0.21
- at dirrmtry etc/alsa/pcm
- at dirrmtry etc/alsa
- at dirrmtry usr/lib/alsa-lib
- at unexec if [ -f %D/etc/asound.conf ]; then fgrep -v '/etc/alsa/pcm/pcm-oss.conf' <%D/etc/asound.conf >/tmp/asound.conf.new; mv /tmp/asound.conf.new %D/etc/asound.conf; fi