Sat Dec 20 16:50:38 2008 UTC ()
Of course I meant /usr/include instead of /include...


(ahoka)
diff -r1.4 -r1.5 pkgsrc/audio/pulseaudio/Makefile
cvs diff -r1.4 -r1.5 pkgsrc/audio/pulseaudio/Makefile (switch to unified diff)

--- pkgsrc/audio/pulseaudio/Makefile 2008/12/20 16:10:25 1.4
+++ pkgsrc/audio/pulseaudio/Makefile 2008/12/20 16:50:38 1.5
@@ -1,93 +1,93 @@ @@ -1,93 +1,93 @@
1# $NetBSD: Makefile,v 1.4 2008/12/20 16:10:25 ahoka Exp $ 1# $NetBSD: Makefile,v 1.5 2008/12/20 16:50:38 ahoka Exp $
2# 2#
3 3
4DISTNAME= pulseaudio-0.9.13 4DISTNAME= pulseaudio-0.9.13
5PKGREVISION= 2 5PKGREVISION= 2
6CATEGORIES= audio 6CATEGORIES= audio
7MASTER_SITES= http://0pointer.de/lennart/projects/pulseaudio/ 7MASTER_SITES= http://0pointer.de/lennart/projects/pulseaudio/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.pulseaudio.org/ 10HOMEPAGE= http://www.pulseaudio.org/
11COMMENT= Sound server for POSIX and Win32 systems 11COMMENT= Sound server for POSIX and Win32 systems
12 12
13GNU_CONFIGURE= yes 13GNU_CONFIGURE= yes
14USE_LIBTOOL= yes 14USE_LIBTOOL= yes
15USE_TOOLS+= pkg-config gmake msgfmt intltool perl \ 15USE_TOOLS+= pkg-config gmake msgfmt intltool perl \
16 autoconf automake 16 autoconf automake
17USE_DIRS+= xdg-1.4 17USE_DIRS+= xdg-1.4
18 18
19PKGCONFIG_OVERRIDE+= libpulse-browse.pc.in 19PKGCONFIG_OVERRIDE+= libpulse-browse.pc.in
20PKGCONFIG_OVERRIDE+= libpulse-mainloop-glib.pc.in 20PKGCONFIG_OVERRIDE+= libpulse-mainloop-glib.pc.in
21PKGCONFIG_OVERRIDE+= libpulse-simple.pc.in 21PKGCONFIG_OVERRIDE+= libpulse-simple.pc.in
22PKGCONFIG_OVERRIDE+= libpulse.pc.in 22PKGCONFIG_OVERRIDE+= libpulse.pc.in
23 23
24PULSE_USER?= pulse 24PULSE_USER?= pulse
25PULSE_GROUP?= pulse 25PULSE_GROUP?= pulse
26PULSE_GROUP_REALTIME?= pulsert 26PULSE_GROUP_REALTIME?= pulsert
27PULSE_GROUP_ACCESS?= pulseacc 27PULSE_GROUP_ACCESS?= pulseacc
28 28
29BUILD_DEFS+= VARBASE 29BUILD_DEFS+= VARBASE
30 30
31PKG_SYSCONFSUBDIR= pulse 31PKG_SYSCONFSUBDIR= pulse
32EGDIR= ${PREFIX}/share/examples/pulseaudio 32EGDIR= ${PREFIX}/share/examples/pulseaudio
33CONF_FILES= ${EGDIR}/client.conf ${PKG_SYSCONFDIR}/client.conf 33CONF_FILES= ${EGDIR}/client.conf ${PKG_SYSCONFDIR}/client.conf
34CONF_FILES+= ${EGDIR}/daemon.conf ${PKG_SYSCONFDIR}/daemon.conf 34CONF_FILES+= ${EGDIR}/daemon.conf ${PKG_SYSCONFDIR}/daemon.conf
35CONF_FILES+= ${EGDIR}/default.pa ${PKG_SYSCONFDIR}/default.pa 35CONF_FILES+= ${EGDIR}/default.pa ${PKG_SYSCONFDIR}/default.pa
36CONF_FILES+= ${EGDIR}/system.pa ${PKG_SYSCONFDIR}/system.pa 36CONF_FILES+= ${EGDIR}/system.pa ${PKG_SYSCONFDIR}/system.pa
37 37
38CONFIGURE_ARGS+= --localstatedir=${VARBASE} 38CONFIGURE_ARGS+= --localstatedir=${VARBASE}
39CONFIGURE_ARGS+= --with-system-user=${PULSE_USER} 39CONFIGURE_ARGS+= --with-system-user=${PULSE_USER}
40CONFIGURE_ARGS+= --with-system-group=${PULSE_GROUP} 40CONFIGURE_ARGS+= --with-system-group=${PULSE_GROUP}
41CONFIGURE_ARGS+= --with-realtime-group=${PULSE_GROUP_REALTIME} 41CONFIGURE_ARGS+= --with-realtime-group=${PULSE_GROUP_REALTIME}
42CONFIGURE_ARGS+= --with-access-group=${PULSE_GROUP_ACCESS} 42CONFIGURE_ARGS+= --with-access-group=${PULSE_GROUP_ACCESS}
43MAKE_ENV+= EGDIR=${EGDIR} 43MAKE_ENV+= EGDIR=${EGDIR}
44 44
45SUBST_CLASSES+= padsp 45SUBST_CLASSES+= padsp
46SUBST_MESSAGE.padsp= Fixing LD_PRELOAD paths 46SUBST_MESSAGE.padsp= Fixing LD_PRELOAD paths
47SUBST_STAGE.padsp= post-build 47SUBST_STAGE.padsp= post-build
48SUBST_FILES.padsp= src/utils/padsp 48SUBST_FILES.padsp= src/utils/padsp
49SUBST_SED.padsp= -e 's@libpulsedsp\.so@${PREFIX}/lib/&@' 49SUBST_SED.padsp= -e 's@libpulsedsp\.so@${PREFIX}/lib/&@'
50 50
51.include "../../mk/bsd.prefs.mk" 51.include "../../mk/bsd.prefs.mk"
52.if ${OPSYS} == "NetBSD" 52.if ${OPSYS} == "NetBSD"
53# broken test for TLS 53# broken test for TLS
54CONFIGURE_ENV+= cc_cv_tls___thread=no 54CONFIGURE_ENV+= cc_cv_tls___thread=no
55.endif 55.endif
56 56
57PKG_GROUPS= ${PULSE_GROUP} 57PKG_GROUPS= ${PULSE_GROUP}
58PKG_GROUPS+= ${PULSE_GROUP_REALTIME} 58PKG_GROUPS+= ${PULSE_GROUP_REALTIME}
59PKG_GROUPS+= ${PULSE_GROUP_ACCESS} 59PKG_GROUPS+= ${PULSE_GROUP_ACCESS}
60PKG_USERS= ${PULSE_USER}:${PULSE_GROUP} 60PKG_USERS= ${PULSE_USER}:${PULSE_GROUP}
61 61
62BUILDLINK_TRANSFORM+= rm:-Wl,--gc-sections 62BUILDLINK_TRANSFORM+= rm:-Wl,--gc-sections
63 63
64# Needs libatomic_ops if the compiler is not >=GCC4.1 64# Needs libatomic_ops if the compiler is not >=GCC4.1
65# We can use native atomic operation on 5.0 and newer. 65# We can use native atomic operation on 5.0 and newer.
66# 66#
67.if exists(/include/sys/atomic.h) # NetBSD >=5.0 67.if exists(/usr/include/sys/atomic.h) # NetBSD >=5.0
68 CONFIGURE_ARGS+= --enable-netbsd-atomic-ops 68 CONFIGURE_ARGS+= --enable-netbsd-atomic-ops
69.else # NetBSD <5.0 and other OS 69.else # NetBSD <5.0 and other OS
70. include "../../mk/compiler.mk" 70. include "../../mk/compiler.mk"
71. if empty(CC_VERSION:Mgcc-4.[1-9]*) && empty(CC_VERSION:Mgcc-[5-9]*)  71. if empty(CC_VERSION:Mgcc-4.[1-9]*) && empty(CC_VERSION:Mgcc-[5-9]*)
72. include "../../devel/libatomic_ops/buildlink3.mk" 72. include "../../devel/libatomic_ops/buildlink3.mk"
73. endif 73. endif
74.endif 74.endif
75 75
76pre-configure: 76pre-configure:
77 cd ${WRKSRC} && autoreconf -f 77 cd ${WRKSRC} && autoreconf -f
78 78
79.include "../../audio/libsamplerate/buildlink3.mk" 79.include "../../audio/libsamplerate/buildlink3.mk"
80.include "../../audio/libsndfile/buildlink3.mk" 80.include "../../audio/libsndfile/buildlink3.mk"
81.include "../../audio/speex/buildlink3.mk" 81.include "../../audio/speex/buildlink3.mk"
82.include "../../databases/gdbm/buildlink3.mk" 82.include "../../databases/gdbm/buildlink3.mk"
83.include "../../devel/GConf/schemas.mk" 83.include "../../devel/GConf/schemas.mk"
84.include "../../devel/libltdl/buildlink3.mk" 84.include "../../devel/libltdl/buildlink3.mk"
85.include "../../devel/liboil/buildlink3.mk" 85.include "../../devel/liboil/buildlink3.mk"
86.include "../../security/policykit/buildlink3.mk" 86.include "../../security/policykit/buildlink3.mk"
87.include "../../sysutils/dbus/buildlink3.mk" 87.include "../../sysutils/dbus/buildlink3.mk"
88.include "../../sysutils/hal/buildlink3.mk" 88.include "../../sysutils/hal/buildlink3.mk"
89.include "../../x11/libICE/buildlink3.mk" 89.include "../../x11/libICE/buildlink3.mk"
90.include "../../x11/libSM/buildlink3.mk" 90.include "../../x11/libSM/buildlink3.mk"
91.include "../../x11/libX11/buildlink3.mk" 91.include "../../x11/libX11/buildlink3.mk"
92.include "../../mk/oss.buildlink3.mk" 92.include "../../mk/oss.buildlink3.mk"
93.include "../../mk/bsd.pkg.mk" 93.include "../../mk/bsd.pkg.mk"