[Midnightbsd-cvs] mports [17802] trunk/audio/libcanberra: fix build of libcanberra

[laffer1 at midnightbsd.org]

Revision: 17802
          http://svnweb.midnightbsd.org/mports/?rev=17802
Author:   laffer1
Date:     2014-11-01 21:35:14 -0400 (Sat, 01 Nov 2014)
Log Message:
-----------
fix build of libcanberra

Modified Paths:
--------------
    trunk/audio/libcanberra/Makefile
    trunk/audio/libcanberra/pkg-plist

Modified: trunk/audio/libcanberra/Makefile
===================================================================
--- trunk/audio/libcanberra/Makefile	2014-11-02 01:32:59 UTC (rev 17801)
+++ trunk/audio/libcanberra/Makefile	2014-11-02 01:35:14 UTC (rev 17802)
@@ -2,7 +2,7 @@
 
 PORTNAME=	libcanberra
 PORTVERSION=	0.28
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio devel
 MASTER_SITES=	http://0pointer.de/lennart/projects/libcanberra/
 
@@ -9,19 +9,20 @@
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	Implementation of the Freedesktop sound theme spec
 
-LICENSE=	lgpl
+LICENSE=	lgpl2.1
 LICENSE_FILE=	${WRKSRC}/LGPL
 
-LIB_DEPENDS=	vorbisfile:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS=	libvorbisfile.so:${PORTSDIR}/audio/libvorbis \
+		libltdl.so:${PORTSDIR}/devel/libltdl
 
-USES=		gmake pkgconfig
-NO_STAGE=	yes
-USE_GNOME=	gnomeprefix gnomehack gtk20 ltverhack gconf2
+USES=		gmake libtool pathfix pkgconfig
+USE_GNOME=	gnomeprefix gtk20 gconf2
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	libtool libltdl
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-lynx --disable-tdb --disable-alsa
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
+INSTALL_TARGET=	install-strip
 
 .if !defined(SLAVEPORT)
 GCONF_SCHEMAS=	libcanberra.schemas
@@ -35,13 +36,13 @@
 
 .if defined(SLAVEPORT)
 USE_GNOME+=	gtk30
-LIB_DEPENDS+=	canberra:${PORTSDIR}/audio/libcanberra
+LIB_DEPENDS+=	libcanberra.so:${PORTSDIR}/audio/libcanberra
 CONFIGURE_ARGS+=--enable-gtk3
 .else
 CONFIGURE_ARGS+=--disable-gtk3
 
 .if ${PORT_OPTIONS:MPULSEAUDIO}
-LIB_DEPENDS+=	pulse:${PORTSDIR}/audio/pulseaudio
+LIB_DEPENDS+=	libpulse.so:${PORTSDIR}/audio/pulseaudio
 PLIST_SUB+=	PULSE=""
 .else
 CONFIGURE_ARGS+=--disable-pulse

Modified: trunk/audio/libcanberra/pkg-plist
===================================================================
--- trunk/audio/libcanberra/pkg-plist	2014-11-02 01:32:59 UTC (rev 17801)
+++ trunk/audio/libcanberra/pkg-plist	2014-11-02 01:35:14 UTC (rev 17802)
@@ -2,31 +2,15 @@
 include/canberra-gtk.h
 include/canberra.h
 lib/gnome-settings-daemon-3.0/gtk-modules/canberra-gtk-module.desktop
-lib/gtk-2.0/modules/libcanberra-gtk-module.a
-lib/gtk-2.0/modules/libcanberra-gtk-module.la
 lib/gtk-2.0/modules/libcanberra-gtk-module.so
-lib/libcanberra-gtk.a
-lib/libcanberra-gtk.la
 lib/libcanberra-gtk.so
-lib/libcanberra-gtk.so.0
-lib/libcanberra.a
-lib/libcanberra.la
+lib/libcanberra-gtk.so.1
 lib/libcanberra.so
-lib/libcanberra.so.0
-%%GSTREAMER%%lib/libcanberra-%%VERSION%%/libcanberra-gstreamer.a
-%%GSTREAMER%%lib/libcanberra-%%VERSION%%/libcanberra-gstreamer.la
+lib/libcanberra.so.2
 %%GSTREAMER%%lib/libcanberra-%%VERSION%%/libcanberra-gstreamer.so
-lib/libcanberra-%%VERSION%%/libcanberra-multi.a
-lib/libcanberra-%%VERSION%%/libcanberra-multi.la
 lib/libcanberra-%%VERSION%%/libcanberra-multi.so
-lib/libcanberra-%%VERSION%%/libcanberra-null.a
-lib/libcanberra-%%VERSION%%/libcanberra-null.la
 lib/libcanberra-%%VERSION%%/libcanberra-null.so
-lib/libcanberra-%%VERSION%%/libcanberra-oss.a
-lib/libcanberra-%%VERSION%%/libcanberra-oss.la
 lib/libcanberra-%%VERSION%%/libcanberra-oss.so
-%%PULSE%%lib/libcanberra-%%VERSION%%/libcanberra-pulse.a
-%%PULSE%%lib/libcanberra-%%VERSION%%/libcanberra-pulse.la
 %%PULSE%%lib/libcanberra-%%VERSION%%/libcanberra-pulse.so
 libdata/pkgconfig/libcanberra-gtk.pc
 libdata/pkgconfig/libcanberra.pc