mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-12 07:27:57 +00:00
Code Issues Releases Activity

Don't overwrite config files when reinstalling. [1]

Browse Source 
Don't detect /dev/dspN.0 instead of /dev/dpsN. We should not reference a
virtual channel 0, which is automatically cloned from /dev/dspN. [2]

Reported by:	someone on #bsdports [1]
		jkim@ [2]
This commit is contained in:
Koop Mast 2010-07-25 12:35:50 +00:00
parent 777e941e1f
commit f62dd21d6e
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=258225
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
audio/pulseaudio/Makefile
View File

@ -3,7 +3,7 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
# $MCom: ports/audio/pulseaudio/Makefile,v 1.21 2009/11/28 19:08:20 marcus Exp $
# $MCom: ports-stable/audio/pulseaudio/Makefile,v 1.7 2010/06/25 20:35:01 kwm Exp $
#
# !!!NOTE!!! Any PORTVERSION update to this port must be accompanied by
# PORTREVISION bumps to audio/gnome-media, sysutils/gnome-settings-daemon,
@ -12,7 +12,7 @@
PORTNAME= pulseaudio
PORTVERSION= 0.9.21
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= audio
MASTER_SITES= http://0pointer.de/lennart/projects/${PORTNAME}/
@ -117,9 +117,14 @@ post-patch:
${WRKSRC}/configure
post-install:
${MKDIR} ${PREFIX}/etc/pulse
.for ii in default.pa daemon.conf client.conf system.pa
${INSTALL_DATA} ${WRKSRC}/src/${ii} \
${PREFIX}/etc/pulse/${ii}-dist
. if !exists(${PREFIX}/etc/pulse/${II})
${INSTALL_DATA} ${WRKSRC}/src/${ii} \
${PREFIX}/etc/pulse/${ii}
. endif
.endfor
.include <bsd.port.post.mk>

10
audio/pulseaudio/files/patch-src_Makefile.in
View File

@ -1,6 +1,6 @@
--- src/Makefile.in.orig 2009-09-11 21:23:13.000000000 -0400
+++ src/Makefile.in 2009-09-11 21:24:41.000000000 -0400
@@ -2890,7 +2890,7 @@ libpulsecommon_@PA_MAJORMINORMICRO@_la_C
--- src/Makefile.in.orig 2010-06-25 21:42:58.000000000 +0200
+++ src/Makefile.in 2010-06-25 21:52:27.000000000 +0200
@@ -2914,7 +2914,7 @@
libpulsecommon_@PA_MAJORMINORMICRO@_la_LDFLAGS = $(AM_LDFLAGS) \
-avoid-version $(am__append_14)
libpulsecommon_@PA_MAJORMINORMICRO@_la_LIBADD = $(AM_LIBADD) \
@ -9,14 +9,14 @@
$(LIBSNDFILE_LIBS) $(am__append_16) $(am__append_20)
###################################
@@ -7745,9 +7745,8 @@ info: info-am
@@ -7778,9 +7778,8 @@
info-am:
-install-data-am: install-alsapathsDATA install-alsaprofilesetsDATA \
- install-dbuspolicyDATA install-pulseconfDATA \
- install-pulseincludeHEADERS install-udevrulesDATA \
+install-data-am: install-dbuspolicyDATA install-pulseconfDATA \
+install-data-am: install-dbuspolicyDATA \
+ install-pulseincludeHEADERS \
install-xdgautostartDATA