Thu Jan 21 12:12:27 2010 UTC ()
make the "avahi" option "off" per defauld, as in other pkgs,
bump PKGREVISION


(drochner)
diff -r1.29 -r1.30 pkgsrc/audio/pulseaudio/Makefile
diff -r1.1 -r1.2 pkgsrc/audio/pulseaudio/options.mk
cvs diff -r1.29 -r1.30 pkgsrc/audio/pulseaudio/Makefile (switch to unified diff)

--- pkgsrc/audio/pulseaudio/Makefile 2009/12/27 15:06:28 1.29
+++ pkgsrc/audio/pulseaudio/Makefile 2010/01/21 12:12:27 1.30
@@ -1,120 +1,120 @@ @@ -1,120 +1,120 @@
1# $NetBSD: Makefile,v 1.29 2009/12/27 15:06:28 abs Exp $ 1# $NetBSD: Makefile,v 1.30 2010/01/21 12:12:27 drochner Exp $
2 2
3# NOTE: Please send a copy of any patches that are not pkgsrc-specific 3# NOTE: Please send a copy of any patches that are not pkgsrc-specific
4# to <pulseaudio-discuss@mail.0pointer.de> 4# to <pulseaudio-discuss@mail.0pointer.de>
5 5
6DISTNAME= pulseaudio-0.9.14 6DISTNAME= pulseaudio-0.9.14
7PKGREVISION= 6 7PKGREVISION= 7
8CATEGORIES= audio 8CATEGORIES= audio
9MASTER_SITES= http://0pointer.de/lennart/projects/pulseaudio/ 9MASTER_SITES= http://0pointer.de/lennart/projects/pulseaudio/
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= http://www.pulseaudio.org/ 12HOMEPAGE= http://www.pulseaudio.org/
13COMMENT= Sound server for POSIX and Win32 systems 13COMMENT= Sound server for POSIX and Win32 systems
14 14
15PKG_DESTDIR_SUPPORT= user-destdir 15PKG_DESTDIR_SUPPORT= user-destdir
16 16
17GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
18USE_LIBTOOL= yes 18USE_LIBTOOL= yes
19USE_TOOLS+= pkg-config gmake m4 msgfmt intltool perl \ 19USE_TOOLS+= pkg-config gmake m4 msgfmt intltool perl \
20 autoconf automake autoreconf 20 autoconf automake autoreconf
21 21
22AUTOCONF_REQD= 2.62 22AUTOCONF_REQD= 2.62
23 23
24PKGCONFIG_OVERRIDE+= libpulse-browse.pc.in 24PKGCONFIG_OVERRIDE+= libpulse-browse.pc.in
25PKGCONFIG_OVERRIDE+= libpulse-mainloop-glib.pc.in 25PKGCONFIG_OVERRIDE+= libpulse-mainloop-glib.pc.in
26PKGCONFIG_OVERRIDE+= libpulse-simple.pc.in 26PKGCONFIG_OVERRIDE+= libpulse-simple.pc.in
27PKGCONFIG_OVERRIDE+= libpulse.pc.in 27PKGCONFIG_OVERRIDE+= libpulse.pc.in
28 28
29PULSE_USER?= pulse 29PULSE_USER?= pulse
30PULSE_GROUP?= pulse 30PULSE_GROUP?= pulse
31PULSE_GROUP_REALTIME?= pulsert 31PULSE_GROUP_REALTIME?= pulsert
32PULSE_GROUP_ACCESS?= pulseacc 32PULSE_GROUP_ACCESS?= pulseacc
33 33
34BUILD_DEFS+= VARBASE PKG_SYSCONFBASE 34BUILD_DEFS+= VARBASE PKG_SYSCONFBASE
35 35
36PKG_SYSCONFSUBDIR= pulse 36PKG_SYSCONFSUBDIR= pulse
37EGDIR= ${PREFIX}/share/examples/pulseaudio 37EGDIR= ${PREFIX}/share/examples/pulseaudio
38CONF_FILES= ${EGDIR}/client.conf ${PKG_SYSCONFDIR}/client.conf 38CONF_FILES= ${EGDIR}/client.conf ${PKG_SYSCONFDIR}/client.conf
39CONF_FILES+= ${EGDIR}/daemon.conf ${PKG_SYSCONFDIR}/daemon.conf 39CONF_FILES+= ${EGDIR}/daemon.conf ${PKG_SYSCONFDIR}/daemon.conf
40CONF_FILES+= ${EGDIR}/default.pa ${PKG_SYSCONFDIR}/default.pa 40CONF_FILES+= ${EGDIR}/default.pa ${PKG_SYSCONFDIR}/default.pa
41CONF_FILES+= ${EGDIR}/system.pa ${PKG_SYSCONFDIR}/system.pa 41CONF_FILES+= ${EGDIR}/system.pa ${PKG_SYSCONFDIR}/system.pa
42 42
43CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE} 43CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE}
44CONFIGURE_ARGS+= --localstatedir=${VARBASE} 44CONFIGURE_ARGS+= --localstatedir=${VARBASE}
45CONFIGURE_ARGS+= --with-system-user=${PULSE_USER} 45CONFIGURE_ARGS+= --with-system-user=${PULSE_USER}
46CONFIGURE_ARGS+= --with-system-group=${PULSE_GROUP} 46CONFIGURE_ARGS+= --with-system-group=${PULSE_GROUP}
47CONFIGURE_ARGS+= --with-realtime-group=${PULSE_GROUP_REALTIME} 47CONFIGURE_ARGS+= --with-realtime-group=${PULSE_GROUP_REALTIME}
48CONFIGURE_ARGS+= --with-access-group=${PULSE_GROUP_ACCESS} 48CONFIGURE_ARGS+= --with-access-group=${PULSE_GROUP_ACCESS}
49MAKE_ENV+= EGDIR=${EGDIR} 49MAKE_ENV+= EGDIR=${EGDIR}
50 50
51SPECIAL_PERMS+= bin/pulseaudio ${SETUID_ROOT_PERMS} 51SPECIAL_PERMS+= bin/pulseaudio ${SETUID_ROOT_PERMS}
52 52
53SUBST_CLASSES+= padsp 53SUBST_CLASSES+= padsp
54SUBST_MESSAGE.padsp= Fixing LD_PRELOAD paths 54SUBST_MESSAGE.padsp= Fixing LD_PRELOAD paths
55SUBST_STAGE.padsp= post-build 55SUBST_STAGE.padsp= post-build
56SUBST_FILES.padsp= src/utils/padsp 56SUBST_FILES.padsp= src/utils/padsp
57SUBST_SED.padsp= -e 's@libpulsedsp\.so@${PREFIX}/lib/&@' 57SUBST_SED.padsp= -e 's@libpulsedsp\.so@${PREFIX}/lib/&@'
58 58
59.include "../../mk/bsd.prefs.mk" 59.include "../../mk/bsd.prefs.mk"
60.if ${OPSYS} == "NetBSD" 60.if ${OPSYS} == "NetBSD"
61# broken test for TLS 61# broken test for TLS
62CONFIGURE_ENV+= cc_cv_tls___thread=no 62CONFIGURE_ENV+= cc_cv_tls___thread=no
63.endif 63.endif
64 64
65PLIST_VARS+= evdev hal oss 65PLIST_VARS+= evdev hal oss
66 66
67.if ${OPSYS} == "Darwin" 67.if ${OPSYS} == "Darwin"
68BUILDLINK_TRANSFORM+= rm:-Wl,-version-script=./map-file 68BUILDLINK_TRANSFORM+= rm:-Wl,-version-script=./map-file
69BUILDLINK_TRANSFORM+= rm:-Wl,-no-undefined 69BUILDLINK_TRANSFORM+= rm:-Wl,-no-undefined
70BUILDLINK_TRANSFORM+= rm:-Wl,-z rm:-Wl,nodelete 70BUILDLINK_TRANSFORM+= rm:-Wl,-z rm:-Wl,nodelete
71.else 71.else
72PLIST.hal= yes 72PLIST.hal= yes
73PLIST.oss= yes 73PLIST.oss= yes
74.endif 74.endif
75 75
76PKG_GROUPS= ${PULSE_GROUP} 76PKG_GROUPS= ${PULSE_GROUP}
77PKG_GROUPS+= ${PULSE_GROUP_REALTIME} 77PKG_GROUPS+= ${PULSE_GROUP_REALTIME}
78PKG_GROUPS+= ${PULSE_GROUP_ACCESS} 78PKG_GROUPS+= ${PULSE_GROUP_ACCESS}
79PKG_USERS= ${PULSE_USER}:${PULSE_GROUP} 79PKG_USERS= ${PULSE_USER}:${PULSE_GROUP}
80 80
81BUILDLINK_TRANSFORM+= rm:-Wl,--gc-sections 81BUILDLINK_TRANSFORM+= rm:-Wl,--gc-sections
82 82
83# Use native atomic ops on NetBSD >= 5.0, otherwise 83# Use native atomic ops on NetBSD >= 5.0, otherwise
84# fallback to libatomic_ops 84# fallback to libatomic_ops
85.if ${OPSYS} == "NetBSD" && exists(/usr/include/sys/atomic.h) 85.if ${OPSYS} == "NetBSD" && exists(/usr/include/sys/atomic.h)
86CONFIGURE_ARGS+= --enable-netbsd-atomic-ops 86CONFIGURE_ARGS+= --enable-netbsd-atomic-ops
87.else 87.else
88CONFIGURE_ARGS+= --disable-netbsd-atomic-ops 88CONFIGURE_ARGS+= --disable-netbsd-atomic-ops
89.include "../../devel/libatomic_ops/buildlink3.mk" 89.include "../../devel/libatomic_ops/buildlink3.mk"
90.endif 90.endif
91 91
92# Build module-mmkbd-evdev.so under Linux 92# Build module-mmkbd-evdev.so under Linux
93.if ${OPSYS} == "Linux" && exists(/usr/include/linux/input.h) 93.if ${OPSYS} == "Linux" && exists(/usr/include/linux/input.h)
94PLIST.evdev= yes 94PLIST.evdev= yes
95.endif 95.endif
96 96
97.include "options.mk" 97.include "options.mk"
98 98
99pre-configure: 99pre-configure:
100 cd ${WRKSRC} && autoreconf -f 100 cd ${WRKSRC} && autoreconf -f
101 101
102.include "../../audio/libsamplerate/buildlink3.mk" 102.include "../../audio/libsamplerate/buildlink3.mk"
103.include "../../audio/libsndfile/buildlink3.mk" 103.include "../../audio/libsndfile/buildlink3.mk"
104.include "../../audio/speex/buildlink3.mk" 104.include "../../audio/speex/buildlink3.mk"
105.include "../../databases/gdbm/buildlink3.mk" 105.include "../../databases/gdbm/buildlink3.mk"
106.include "../../devel/GConf/schemas.mk" 106.include "../../devel/GConf/schemas.mk"
107.include "../../devel/glib2/buildlink3.mk" 107.include "../../devel/glib2/buildlink3.mk"
108.include "../../devel/libltdl/buildlink3.mk" 108.include "../../devel/libltdl/buildlink3.mk"
109.include "../../devel/liboil/buildlink3.mk" 109.include "../../devel/liboil/buildlink3.mk"
110.include "../../security/policykit/buildlink3.mk" 110.include "../../security/policykit/buildlink3.mk"
111.include "../../sysutils/dbus/buildlink3.mk" 111.include "../../sysutils/dbus/buildlink3.mk"
112.if ${OPSYS} != "Darwin" 112.if ${OPSYS} != "Darwin"
113.include "../../sysutils/consolekit/buildlink3.mk" 113.include "../../sysutils/consolekit/buildlink3.mk"
114.endif 114.endif
115.include "../../sysutils/hal/buildlink3.mk" 115.include "../../sysutils/hal/buildlink3.mk"
116.include "../../x11/libICE/buildlink3.mk" 116.include "../../x11/libICE/buildlink3.mk"
117.include "../../x11/libSM/buildlink3.mk" 117.include "../../x11/libSM/buildlink3.mk"
118.include "../../x11/libX11/buildlink3.mk" 118.include "../../x11/libX11/buildlink3.mk"
119.include "../../mk/oss.buildlink3.mk" 119.include "../../mk/oss.buildlink3.mk"
120.include "../../mk/bsd.pkg.mk" 120.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1 -r1.2 pkgsrc/audio/pulseaudio/options.mk (switch to unified diff)

--- pkgsrc/audio/pulseaudio/options.mk 2009/01/25 16:56:01 1.1
+++ pkgsrc/audio/pulseaudio/options.mk 2010/01/21 12:12:27 1.2
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: options.mk,v 1.1 2009/01/25 16:56:01 tron Exp $ 1# $NetBSD: options.mk,v 1.2 2010/01/21 12:12:27 drochner Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.pulseaudio 3PKG_OPTIONS_VAR= PKG_OPTIONS.pulseaudio
4PKG_SUPPORTED_OPTIONS= avahi 4PKG_SUPPORTED_OPTIONS= avahi
5PKG_SUGGESTED_OPTIONS= avahi 
6PLIST_VARS+= ${PKG_SUPPORTED_OPTIONS} 5PLIST_VARS+= ${PKG_SUPPORTED_OPTIONS}
7.include "../../mk/bsd.options.mk" 6.include "../../mk/bsd.options.mk"
8 7
9### 8###
10### avahi 9### avahi
11### 10###
12.if !empty(PKG_OPTIONS:Mavahi) 11.if !empty(PKG_OPTIONS:Mavahi)
13.include "../../net/avahi/buildlink3.mk" 12.include "../../net/avahi/buildlink3.mk"
14PLIST.avahi= yes 13PLIST.avahi= yes
15.else 14.else
16CONFIGURE_ARGS+= --disable-avahi 15CONFIGURE_ARGS+= --disable-avahi
17.endif 16.endif