diff options
| author | adam <adam@pkgsrc.org> | 2014-04-08 06:40:50 +0000 |
|---|---|---|
| committer | adam <adam@pkgsrc.org> | 2014-04-08 06:40:50 +0000 |
| commit | 86ad7a4f5f548e2bf81ae46132083c452689c4af (patch) | |
| tree | 11c2441e402c78581918e0316f8b8a912a254a42 | |
| parent | 85b35af6ca28ac9e3d39f5529bc86a6240581752 (diff) | |
| download | pkgsrc-86ad7a4f5f548e2bf81ae46132083c452689c4af.tar.gz | |
PLIST fix accoring to options; cosmetics
| -rw-r--r-- | audio/libcanberra/Makefile | 12 | ||||
| -rw-r--r-- | audio/libcanberra/PLIST | 12 |
2 files changed, 11 insertions, 13 deletions
diff --git a/audio/libcanberra/Makefile b/audio/libcanberra/Makefile index 478d59919af..34fb06f84de 100644 --- a/audio/libcanberra/Makefile +++ b/audio/libcanberra/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2013/10/10 14:41:53 ryoon Exp $ +# $NetBSD: Makefile,v 1.36 2014/04/08 06:40:50 adam Exp $ DISTNAME= libcanberra-0.27 PKGREVISION= 3 @@ -10,9 +10,10 @@ HOMEPAGE= http://0pointer.de/lennart/projects/libcanberra/ COMMENT= Desktop event sound library LICENSE= gnu-lgpl-v2.1 -GNU_CONFIGURE= yes -USE_LIBTOOL= yes -USE_TOOLS+= pkg-config gmake +USE_LIBTOOL= yes +USE_TOOLS+= gmake pkg-config +GNU_CONFIGURE= yes +CONFIGURE_ENV+= ac_cv_lib_ltdl_lt_dladvise_init=yes PKGCONFIG_OVERRIDE+= libcanberra-gtk.pc.in PKGCONFIG_OVERRIDE+= libcanberra-gtk3.pc.in @@ -20,15 +21,12 @@ PKGCONFIG_OVERRIDE+= libcanberra.pc.in REPLACE_SH= src/libcanberra-logout-sound.sh.in -CONFIGURE_ENV+= ac_cv_lib_ltdl_lt_dladvise_init=yes - PLIST_VARS+= oss .include "options.mk" .include "../../devel/libltdl/buildlink3.mk" .include "../../devel/GConf/schemas.mk" -.include "../../mk/oss.buildlink3.mk" .include "../../multimedia/gstreamer0.10/buildlink3.mk" .include "../../audio/libvorbis/buildlink3.mk" .include "../../mk/oss.buildlink3.mk" diff --git a/audio/libcanberra/PLIST b/audio/libcanberra/PLIST index a0e3a565aea..f95e2395b71 100644 --- a/audio/libcanberra/PLIST +++ b/audio/libcanberra/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.8 2013/08/12 07:09:59 obache Exp $ +@comment $NetBSD: PLIST,v 1.9 2014/04/08 06:40:50 adam Exp $ ${PLIST.gtk-any}bin/canberra-gtk-play ${PLIST.gtk-any}include/canberra-gtk.h include/canberra.h @@ -16,10 +16,10 @@ ${PLIST.gtk}lib/pkgconfig/libcanberra-gtk.pc ${PLIST.gtk3}lib/pkgconfig/libcanberra-gtk3.pc lib/pkgconfig/libcanberra.pc share/doc/libcanberra/README -${PLIST.gtk}share/gconf/schemas/libcanberra.schemas -${PLIST.gtk}share/gdm/autostart/LoginWindow/libcanberra-ready-sound.desktop -${PLIST.gtk}share/gnome/autostart/libcanberra-login-sound.desktop -${PLIST.gtk}share/gnome/shutdown/libcanberra-logout-sound.sh +${PLIST.gtk-any}share/gconf/schemas/libcanberra.schemas +${PLIST.gtk-any}share/gdm/autostart/LoginWindow/libcanberra-ready-sound.desktop +${PLIST.gtk-any}share/gnome/autostart/libcanberra-login-sound.desktop +${PLIST.gtk-any}share/gnome/shutdown/libcanberra-logout-sound.sh share/gtk-doc/html/libcanberra/ch01.html share/gtk-doc/html/libcanberra/home.png share/gtk-doc/html/libcanberra/index.html @@ -32,5 +32,5 @@ share/gtk-doc/html/libcanberra/libcanberra.devhelp2 share/gtk-doc/html/libcanberra/right.png share/gtk-doc/html/libcanberra/style.css share/gtk-doc/html/libcanberra/up.png -${PLIST.gtk}share/vala/vapi/libcanberra-gtk.vapi +${PLIST.gtk-any}share/vala/vapi/libcanberra-gtk.vapi share/vala/vapi/libcanberra.vapi |