diff options
| author | nox <nox@FreeBSD.org> | 2011-05-06 05:15:45 +0800 |
|---|---|---|
| committer | nox <nox@FreeBSD.org> | 2011-05-06 05:15:45 +0800 |
| commit | 680e789bcd818606067b76dd26eaffc39328b9b0 (patch) | |
| tree | 32faf8af59419b29c8c909ebc62adeaa51745339 /audio | |
| parent | 0920e5c269ea694db3ffef12e7690293e575a40a (diff) | |
| download | freebsd-ports-gnome-680e789bcd818606067b76dd26eaffc39328b9b0.tar.gz freebsd-ports-gnome-680e789bcd818606067b76dd26eaffc39328b9b0.tar.zst freebsd-ports-gnome-680e789bcd818606067b76dd26eaffc39328b9b0.zip | |
- Handle config file properly on pkg_delete and reinstall, don't just
overwrite it.
- Small cosmetic changes.
Submitted by: avg (final patch via private email)
Approved by: portmgr (miwi, via irc)
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/linux-f10-alsa-plugins-oss/Makefile | 12 | ||||
| -rw-r--r-- | audio/linux-f10-alsa-plugins-oss/pkg-plist | 6 |
2 files changed, 13 insertions, 5 deletions
diff --git a/audio/linux-f10-alsa-plugins-oss/Makefile b/audio/linux-f10-alsa-plugins-oss/Makefile index db5fd12d88b6..14cb9a7fa792 100644 --- a/audio/linux-f10-alsa-plugins-oss/Makefile +++ b/audio/linux-f10-alsa-plugins-oss/Makefile @@ -7,7 +7,7 @@ PORTNAME= alsa-plugins-oss PORTVERSION= 1.0.21 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio linux PKGNAMEPREFIX= linux-f10- DISTNAME= ${PORTNAME}-${PORTVERSION}-${RPMVERSION} @@ -20,13 +20,19 @@ USE_LINUX_RPM= yes USE_LINUX_APPS= alsalib LINUX_DIST_VER= 10 RPMVERSION= 3.fc10 -SRC_DISTFILES= ${PORTNAME:S/-oss//}-${PORTVERSION}-${RPMVERSION}.src.rpm +SRC_DISTFILES= ${PORTNAME:S/-oss//}-${PORTVERSION}-${RPMVERSION}${SRC_SUFX} USE_LDCONFIG= yes +CONF_FILE= etc/alsa/pcm/pcm-oss.conf + post-patch: - ${RM} ${WRKDIR}/etc/alsa/pcm/pcm-oss.conf.orig + @${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 PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.mk> diff --git a/audio/linux-f10-alsa-plugins-oss/pkg-plist b/audio/linux-f10-alsa-plugins-oss/pkg-plist index 424dd80d143f..cd53b8c576c3 100644 --- a/audio/linux-f10-alsa-plugins-oss/pkg-plist +++ b/audio/linux-f10-alsa-plugins-oss/pkg-plist @@ -1,4 +1,6 @@ -etc/alsa/pcm/pcm-oss.conf +@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 +@exec if [ ! -f %D/etc/alsa/pcm/pcm-oss.conf ] ; then cp -p %D/%F %B/client.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 @@ -8,4 +10,4 @@ usr/share/doc/alsa-plugins-oss-1.0.21/README-pcm-oss @dirrmtry etc/alsa/pcm @dirrmtry etc/alsa @dirrmtry usr/lib/alsa-lib -@unexec if [ -f %D/etc/asound.conf ]; then grep -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 +@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 |