Tue Apr 30 20:51:54 2013 UTC ()
Add a pulseaudio option.


(markd)
diff -r1.21 -r1.22 pkgsrc/x11/kde-runtime4/Makefile
diff -r1.3 -r1.4 pkgsrc/x11/kde-runtime4/options.mk
cvs diff -r1.21 -r1.22 pkgsrc/x11/kde-runtime4/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/kde-runtime4/Makefile 2013/04/28 03:18:17 1.21
+++ pkgsrc/x11/kde-runtime4/Makefile 2013/04/30 20:51:54 1.22
@@ -1,25 +1,24 @@ @@ -1,25 +1,24 @@
1# $NetBSD: Makefile,v 1.21 2013/04/28 03:18:17 markd Exp $ 1# $NetBSD: Makefile,v 1.22 2013/04/30 20:51:54 markd Exp $
2 2
3DISTNAME= kde-runtime-${_KDE_VERSION} 3DISTNAME= kde-runtime-${_KDE_VERSION}
4PKGNAME= ${DISTNAME:S/-4/4-4/} 4PKGNAME= ${DISTNAME:S/-4/4-4/}
5PKGREVISION= 2 5PKGREVISION= 2
6CATEGORIES= x11 6CATEGORIES= x11
7COMMENT= Runtime requirements for the KDE integrated X11 desktop 7COMMENT= Runtime requirements for the KDE integrated X11 desktop
8 8
9.include "../../meta-pkgs/kde4/Makefile.kde4" 9.include "../../meta-pkgs/kde4/Makefile.kde4"
10 10
11# BUILD_MAKE_FLAGS+= VERBOSE=1 11# BUILD_MAKE_FLAGS+= VERBOSE=1
12CMAKE_ARGS+= -DWITH_PulseAudio:BOOL=off 
13CMAKE_ARGS+= -DWITH_LibSSH:BOOL=OFF 12CMAKE_ARGS+= -DWITH_LibSSH:BOOL=OFF
14CMAKE_ARGS+= -DLIBLZMA_INCLUDE_DIR:PATH=${BUILDLINK_PREFIX.xz}/include 13CMAKE_ARGS+= -DLIBLZMA_INCLUDE_DIR:PATH=${BUILDLINK_PREFIX.xz}/include
15CMAKE_ARGS+= -DLIBLZMA_LIBRARY:FILEPATH=${BUILDLINK_PREFIX.xz}/lib/liblzma.so 14CMAKE_ARGS+= -DLIBLZMA_LIBRARY:FILEPATH=${BUILDLINK_PREFIX.xz}/lib/liblzma.so
16 15
17DEPENDS+= htdig>=3.2.0:../../www/htdig 16DEPENDS+= htdig>=3.2.0:../../www/htdig
18DEPENDS+= oxygen-icons-[0-9]*:../../graphics/oxygen-icons 17DEPENDS+= oxygen-icons-[0-9]*:../../graphics/oxygen-icons
19 18
20USE_TOOLS+= gmake 19USE_TOOLS+= gmake
21 20
22.include "../../mk/bsd.prefs.mk" 21.include "../../mk/bsd.prefs.mk"
23.include "options.mk" 22.include "options.mk"
24 23
25# Some files are conditional on 'md5sum' or 'md5' being present. 24# Some files are conditional on 'md5sum' or 'md5' being present.
cvs diff -r1.3 -r1.4 pkgsrc/x11/kde-runtime4/options.mk (expand / switch to unified diff)

--- pkgsrc/x11/kde-runtime4/options.mk 2013/04/28 03:18:18 1.3
+++ pkgsrc/x11/kde-runtime4/options.mk 2013/04/30 20:51:54 1.4
@@ -1,25 +1,31 @@ @@ -1,25 +1,31 @@
1# $NetBSD: options.mk,v 1.3 2013/04/28 03:18:18 markd Exp $ 1# $NetBSD: options.mk,v 1.4 2013/04/30 20:51:54 markd Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.kde-runtime4 3PKG_OPTIONS_VAR= PKG_OPTIONS.kde-runtime4
4PKG_SUPPORTED_OPTIONS= samba alsa 4PKG_SUPPORTED_OPTIONS= samba alsa pulseaudio
5PKG_SUGGESTED_OPTIONS= samba 5PKG_SUGGESTED_OPTIONS= samba
6 6
7.if ${OPSYS} == "Linux" 7.if ${OPSYS} == "Linux"
8PKG_SUGGESTED_OPTIONS+= alsa 8PKG_SUGGESTED_OPTIONS+= alsa
9.endif 9.endif
10 10
11.include "../../mk/bsd.options.mk" 11.include "../../mk/bsd.options.mk"
12 12
13PLIST_VARS+= smb 13PLIST_VARS+= smb
14.if !empty(PKG_OPTIONS:Msamba) 14.if !empty(PKG_OPTIONS:Msamba)
15.include "../../net/samba/buildlink3.mk" 15.include "../../net/samba/buildlink3.mk"
16#CMAKE_ARGS+= -DSAMBA_INCLUDE_DIR:PATH=${BUILDLINK_PREFIX.samba}/include 16#CMAKE_ARGS+= -DSAMBA_INCLUDE_DIR:PATH=${BUILDLINK_PREFIX.samba}/include
17#CMAKE_ARGS+= -DSAMBA_LIBRARIES:FILEPATH=${BUILDLINK_PREFIX.samba}/lib/samba 17#CMAKE_ARGS+= -DSAMBA_LIBRARIES:FILEPATH=${BUILDLINK_PREFIX.samba}/lib/samba
18PLIST.smb= yes 18PLIST.smb= yes
19.endif 19.endif
20 20
21.if !empty(PKG_OPTIONS:Malsa) 21.if !empty(PKG_OPTIONS:Malsa)
22.include "../../audio/alsa-lib/buildlink3.mk" 22.include "../../audio/alsa-lib/buildlink3.mk"
23.else 23.else
24CMAKE_ARGS+= -DWITH_ALSA=OFF 24CMAKE_ARGS+= -DWITH_ALSA=OFF
25.endif 25.endif
 26
 27.if !empty(PKG_OPTIONS:Mpulseaudio)
 28.include "../../audio/pulseaudio/buildlink3.mk"
 29.else
 30CMAKE_ARGS+= -DWITH_PulseAudio:BOOL=OFF
 31.endif