Sun Jan 25 16:56:01 2009 UTC ()
Move options handling into seperate file.


(tron)
diff -r1.14 -r1.15 pkgsrc/audio/pulseaudio/Makefile
diff -r0 -r1.1 pkgsrc/audio/pulseaudio/options.mk
cvs diff -r1.14 -r1.15 pkgsrc/audio/pulseaudio/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/pulseaudio/Makefile 2009/01/19 14:19:00 1.14
+++ pkgsrc/audio/pulseaudio/Makefile 2009/01/25 16:56:01 1.15
@@ -1,36 +1,29 @@ @@ -1,36 +1,29 @@
1# $NetBSD: Makefile,v 1.14 2009/01/19 14:19:00 jmcneill Exp $ 1# $NetBSD: Makefile,v 1.15 2009/01/25 16:56:01 tron Exp $
2# 
3 2
4DISTNAME= pulseaudio-0.9.14 3DISTNAME= pulseaudio-0.9.14
5CATEGORIES= audio 4CATEGORIES= audio
6MASTER_SITES= http://0pointer.de/lennart/projects/pulseaudio/ 5MASTER_SITES= http://0pointer.de/lennart/projects/pulseaudio/
7 6
8MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.pulseaudio.org/ 8HOMEPAGE= http://www.pulseaudio.org/
10COMMENT= Sound server for POSIX and Win32 systems 9COMMENT= Sound server for POSIX and Win32 systems
11 10
12GNU_CONFIGURE= yes 11GNU_CONFIGURE= yes
13USE_LIBTOOL= yes 12USE_LIBTOOL= yes
14USE_TOOLS+= pkg-config gmake m4 msgfmt intltool perl \ 13USE_TOOLS+= pkg-config gmake m4 msgfmt intltool perl \
15 autoconf automake autoreconf 14 autoconf automake autoreconf
16USE_DIRS+= xdg-1.4 15USE_DIRS+= xdg-1.4
17 16
18PKG_OPTIONS_VAR= PKG_OPTIONS.pulseaudio 
19PKG_SUPPORTED_OPTIONS= avahi 
20PKG_SUGGESTED_OPTIONS= avahi 
21PLIST_VARS+= ${PKG_SUPPORTED_OPTIONS} 
22.include "../../mk/bsd.options.mk" 
23 
24PKGCONFIG_OVERRIDE+= libpulse-browse.pc.in 17PKGCONFIG_OVERRIDE+= libpulse-browse.pc.in
25PKGCONFIG_OVERRIDE+= libpulse-mainloop-glib.pc.in 18PKGCONFIG_OVERRIDE+= libpulse-mainloop-glib.pc.in
26PKGCONFIG_OVERRIDE+= libpulse-simple.pc.in 19PKGCONFIG_OVERRIDE+= libpulse-simple.pc.in
27PKGCONFIG_OVERRIDE+= libpulse.pc.in 20PKGCONFIG_OVERRIDE+= libpulse.pc.in
28 21
29PULSE_USER?= pulse 22PULSE_USER?= pulse
30PULSE_GROUP?= pulse 23PULSE_GROUP?= pulse
31PULSE_GROUP_REALTIME?= pulsert 24PULSE_GROUP_REALTIME?= pulsert
32PULSE_GROUP_ACCESS?= pulseacc 25PULSE_GROUP_ACCESS?= pulseacc
33 26
34BUILD_DEFS+= VARBASE PKG_SYSCONFBASE 27BUILD_DEFS+= VARBASE PKG_SYSCONFBASE
35 28
36PKG_SYSCONFSUBDIR= pulse 29PKG_SYSCONFSUBDIR= pulse
@@ -66,33 +59,27 @@ PKG_GROUPS+= ${PULSE_GROUP_ACCESS} @@ -66,33 +59,27 @@ PKG_GROUPS+= ${PULSE_GROUP_ACCESS}
66PKG_USERS= ${PULSE_USER}:${PULSE_GROUP} 59PKG_USERS= ${PULSE_USER}:${PULSE_GROUP}
67 60
68BUILDLINK_TRANSFORM+= rm:-Wl,--gc-sections 61BUILDLINK_TRANSFORM+= rm:-Wl,--gc-sections
69 62
70# Use native atomic ops on NetBSD >= 5.0, otherwise 63# Use native atomic ops on NetBSD >= 5.0, otherwise
71# fallback to libatomic_ops 64# fallback to libatomic_ops
72.if ${OPSYS} == "NetBSD" && exists(/usr/include/sys/atomic.h) 65.if ${OPSYS} == "NetBSD" && exists(/usr/include/sys/atomic.h)
73CONFIGURE_ARGS+= --enable-netbsd-atomic-ops 66CONFIGURE_ARGS+= --enable-netbsd-atomic-ops
74.else 67.else
75CONFIGURE_ARGS+= --disable-netbsd-atomic-ops 68CONFIGURE_ARGS+= --disable-netbsd-atomic-ops
76.include "../../devel/libatomic_ops/buildlink3.mk" 69.include "../../devel/libatomic_ops/buildlink3.mk"
77.endif 70.endif
78 71
79# avahi support 72.include "options.mk"
80.if !empty(PKG_OPTIONS:Mavahi) 
81.include "../../net/avahi/buildlink3.mk" 
82PLIST.avahi= yes 
83.else 
84CONFIGURE_ARGS+= --disable-avahi 
85.endif 
86 73
87pre-configure: 74pre-configure:
88 cd ${WRKSRC} && autoreconf -f 75 cd ${WRKSRC} && autoreconf -f
89 76
90.include "../../audio/libsamplerate/buildlink3.mk" 77.include "../../audio/libsamplerate/buildlink3.mk"
91.include "../../audio/libsndfile/buildlink3.mk" 78.include "../../audio/libsndfile/buildlink3.mk"
92.include "../../audio/speex/buildlink3.mk" 79.include "../../audio/speex/buildlink3.mk"
93.include "../../databases/gdbm/buildlink3.mk" 80.include "../../databases/gdbm/buildlink3.mk"
94.include "../../devel/GConf/schemas.mk" 81.include "../../devel/GConf/schemas.mk"
95.include "../../devel/glib2/buildlink3.mk" 82.include "../../devel/glib2/buildlink3.mk"
96.include "../../devel/libltdl/buildlink3.mk" 83.include "../../devel/libltdl/buildlink3.mk"
97.include "../../devel/liboil/buildlink3.mk" 84.include "../../devel/liboil/buildlink3.mk"
98.include "../../security/policykit/buildlink3.mk" 85.include "../../security/policykit/buildlink3.mk"
File Added: pkgsrc/audio/pulseaudio/options.mk
# $NetBSD: options.mk,v 1.1 2009/01/25 16:56:01 tron Exp $

PKG_OPTIONS_VAR=	PKG_OPTIONS.pulseaudio
PKG_SUPPORTED_OPTIONS=	avahi
PKG_SUGGESTED_OPTIONS=	avahi
PLIST_VARS+=		${PKG_SUPPORTED_OPTIONS}
.include "../../mk/bsd.options.mk"

###
### avahi
###
.if !empty(PKG_OPTIONS:Mavahi)
.include "../../net/avahi/buildlink3.mk"
PLIST.avahi=		yes
.else
CONFIGURE_ARGS+=	--disable-avahi
.endif