Tue Apr 8 06:40:50 2014 UTC ()
PLIST fix accoring to options; cosmetics


(adam)
diff -r1.35 -r1.36 pkgsrc/audio/libcanberra/Makefile
diff -r1.8 -r1.9 pkgsrc/audio/libcanberra/PLIST
cvs diff -r1.35 -r1.36 pkgsrc/audio/libcanberra/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/libcanberra/Makefile 2013/10/10 14:41:53 1.35
+++ pkgsrc/audio/libcanberra/Makefile 2014/04/08 06:40:50 1.36
@@ -1,38 +1,36 @@ @@ -1,38 +1,36 @@
1# $NetBSD: Makefile,v 1.35 2013/10/10 14:41:53 ryoon Exp $ 1# $NetBSD: Makefile,v 1.36 2014/04/08 06:40:50 adam Exp $
2 2
3DISTNAME= libcanberra-0.27 3DISTNAME= libcanberra-0.27
4PKGREVISION= 3 4PKGREVISION= 3
5CATEGORIES= audio 5CATEGORIES= audio
6MASTER_SITES= http://0pointer.de/lennart/projects/libcanberra/ 6MASTER_SITES= http://0pointer.de/lennart/projects/libcanberra/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://0pointer.de/lennart/projects/libcanberra/ 9HOMEPAGE= http://0pointer.de/lennart/projects/libcanberra/
10COMMENT= Desktop event sound library 10COMMENT= Desktop event sound library
11LICENSE= gnu-lgpl-v2.1 11LICENSE= gnu-lgpl-v2.1
12 12
13GNU_CONFIGURE= yes 13USE_LIBTOOL= yes
14USE_LIBTOOL= yes 14USE_TOOLS+= gmake pkg-config
15USE_TOOLS+= pkg-config gmake 15GNU_CONFIGURE= yes
 16CONFIGURE_ENV+= ac_cv_lib_ltdl_lt_dladvise_init=yes
16 17
17PKGCONFIG_OVERRIDE+= libcanberra-gtk.pc.in 18PKGCONFIG_OVERRIDE+= libcanberra-gtk.pc.in
18PKGCONFIG_OVERRIDE+= libcanberra-gtk3.pc.in 19PKGCONFIG_OVERRIDE+= libcanberra-gtk3.pc.in
19PKGCONFIG_OVERRIDE+= libcanberra.pc.in 20PKGCONFIG_OVERRIDE+= libcanberra.pc.in
20 21
21REPLACE_SH= src/libcanberra-logout-sound.sh.in 22REPLACE_SH= src/libcanberra-logout-sound.sh.in
22 23
23CONFIGURE_ENV+= ac_cv_lib_ltdl_lt_dladvise_init=yes 
24 
25PLIST_VARS+= oss 24PLIST_VARS+= oss
26 25
27.include "options.mk" 26.include "options.mk"
28 27
29.include "../../devel/libltdl/buildlink3.mk" 28.include "../../devel/libltdl/buildlink3.mk"
30.include "../../devel/GConf/schemas.mk" 29.include "../../devel/GConf/schemas.mk"
31.include "../../mk/oss.buildlink3.mk" 
32.include "../../multimedia/gstreamer0.10/buildlink3.mk" 30.include "../../multimedia/gstreamer0.10/buildlink3.mk"
33.include "../../audio/libvorbis/buildlink3.mk" 31.include "../../audio/libvorbis/buildlink3.mk"
34.include "../../mk/oss.buildlink3.mk" 32.include "../../mk/oss.buildlink3.mk"
35.if ${OSS_TYPE} != "none" 33.if ${OSS_TYPE} != "none"
36PLIST.oss= yes 34PLIST.oss= yes
37.endif 35.endif
38.include "../../mk/bsd.pkg.mk" 36.include "../../mk/bsd.pkg.mk"
cvs diff -r1.8 -r1.9 pkgsrc/audio/libcanberra/PLIST (expand / switch to unified diff)

--- pkgsrc/audio/libcanberra/PLIST 2013/08/12 07:09:59 1.8
+++ pkgsrc/audio/libcanberra/PLIST 2014/04/08 06:40:50 1.9
@@ -1,36 +1,36 @@ @@ -1,36 +1,36 @@
1@comment $NetBSD: PLIST,v 1.8 2013/08/12 07:09:59 obache Exp $ 1@comment $NetBSD: PLIST,v 1.9 2014/04/08 06:40:50 adam Exp $
2${PLIST.gtk-any}bin/canberra-gtk-play 2${PLIST.gtk-any}bin/canberra-gtk-play
3${PLIST.gtk-any}include/canberra-gtk.h 3${PLIST.gtk-any}include/canberra-gtk.h
4include/canberra.h 4include/canberra.h
5${PLIST.gtk}lib/gtk-2.0/modules/libcanberra-gtk-module.la 5${PLIST.gtk}lib/gtk-2.0/modules/libcanberra-gtk-module.la
6${PLIST.gtk3}lib/gtk-3.0/modules/libcanberra-gtk-module.so 6${PLIST.gtk3}lib/gtk-3.0/modules/libcanberra-gtk-module.so
7${PLIST.gtk3}lib/gtk-3.0/modules/libcanberra-gtk3-module.la 7${PLIST.gtk3}lib/gtk-3.0/modules/libcanberra-gtk3-module.la
8lib/${PKGNAME}/libcanberra-gstreamer.la 8lib/${PKGNAME}/libcanberra-gstreamer.la
9lib/${PKGNAME}/libcanberra-multi.la 9lib/${PKGNAME}/libcanberra-multi.la
10lib/${PKGNAME}/libcanberra-null.la 10lib/${PKGNAME}/libcanberra-null.la
11${PLIST.oss}lib/${PKGNAME}/libcanberra-oss.la 11${PLIST.oss}lib/${PKGNAME}/libcanberra-oss.la
12${PLIST.gtk}lib/libcanberra-gtk.la 12${PLIST.gtk}lib/libcanberra-gtk.la
13${PLIST.gtk3}lib/libcanberra-gtk3.la 13${PLIST.gtk3}lib/libcanberra-gtk3.la
14lib/libcanberra.la 14lib/libcanberra.la
15${PLIST.gtk}lib/pkgconfig/libcanberra-gtk.pc 15${PLIST.gtk}lib/pkgconfig/libcanberra-gtk.pc
16${PLIST.gtk3}lib/pkgconfig/libcanberra-gtk3.pc 16${PLIST.gtk3}lib/pkgconfig/libcanberra-gtk3.pc
17lib/pkgconfig/libcanberra.pc 17lib/pkgconfig/libcanberra.pc
18share/doc/libcanberra/README 18share/doc/libcanberra/README
19${PLIST.gtk}share/gconf/schemas/libcanberra.schemas 19${PLIST.gtk-any}share/gconf/schemas/libcanberra.schemas
20${PLIST.gtk}share/gdm/autostart/LoginWindow/libcanberra-ready-sound.desktop 20${PLIST.gtk-any}share/gdm/autostart/LoginWindow/libcanberra-ready-sound.desktop
21${PLIST.gtk}share/gnome/autostart/libcanberra-login-sound.desktop 21${PLIST.gtk-any}share/gnome/autostart/libcanberra-login-sound.desktop
22${PLIST.gtk}share/gnome/shutdown/libcanberra-logout-sound.sh 22${PLIST.gtk-any}share/gnome/shutdown/libcanberra-logout-sound.sh
23share/gtk-doc/html/libcanberra/ch01.html 23share/gtk-doc/html/libcanberra/ch01.html
24share/gtk-doc/html/libcanberra/home.png 24share/gtk-doc/html/libcanberra/home.png
25share/gtk-doc/html/libcanberra/index.html 25share/gtk-doc/html/libcanberra/index.html
26share/gtk-doc/html/libcanberra/index.sgml 26share/gtk-doc/html/libcanberra/index.sgml
27share/gtk-doc/html/libcanberra/left.png 27share/gtk-doc/html/libcanberra/left.png
28share/gtk-doc/html/libcanberra/libcanberra-canberra-gtk.html 28share/gtk-doc/html/libcanberra/libcanberra-canberra-gtk.html
29share/gtk-doc/html/libcanberra/libcanberra-canberra.html 29share/gtk-doc/html/libcanberra/libcanberra-canberra.html
30share/gtk-doc/html/libcanberra/libcanberra.devhelp 30share/gtk-doc/html/libcanberra/libcanberra.devhelp
31share/gtk-doc/html/libcanberra/libcanberra.devhelp2 31share/gtk-doc/html/libcanberra/libcanberra.devhelp2
32share/gtk-doc/html/libcanberra/right.png 32share/gtk-doc/html/libcanberra/right.png
33share/gtk-doc/html/libcanberra/style.css 33share/gtk-doc/html/libcanberra/style.css
34share/gtk-doc/html/libcanberra/up.png 34share/gtk-doc/html/libcanberra/up.png
35${PLIST.gtk}share/vala/vapi/libcanberra-gtk.vapi 35${PLIST.gtk-any}share/vala/vapi/libcanberra-gtk.vapi
36share/vala/vapi/libcanberra.vapi 36share/vala/vapi/libcanberra.vapi