- Convert to USES=libtool and USES=pathfix

- Add INSTALL_TARGET=install-strip

4 files changed, 11 insertions, 33 deletions

diff --git a/audio/libcanberra-gtk3/Makefile b/audio/libcanberra-gtk3/Makefile
index 0e333f1da80d..28f4a804b592 100644
--- a/audio/libcanberra-gtk3/Makefile
+++ b/audio/libcanberra-gtk3/Makefile
@@ -2,7 +2,6 @@
 # $FreeBSD$
 #   $MCom: ports/audio/libcanberra-gtk3/Makefile,v 1.8 2011/03/16 10:24:48 kwm Exp $
 
-PORTREVISION=	1
 CATEGORIES=	audio devel
 PKGNAMESUFFIX=	-gtk3
 
@@ -19,17 +18,11 @@ ALL_TARGET=	libcanberra-gtk3.la libcanberra-gtk3-module.la
 pre-build:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} libcanberra-gtk3.pc
 
-post-build:
-# fix the .la file so it doesn't point to the build dir anymore.
-	@${REINPLACE_CMD} -e '/^relink_command/ d' \
-		-e 's|${WRKSRC}/src/libcanberra.la|${LOCALBASE}/lib/libcanberra.la|g' \
-		${WRKSRC}/src/.libs/libcanberra-gtk3.la
-
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/libcanberra-gtk3.pc \
 		${STAGEDIR}${PREFIX}/libdata/pkgconfig/
-.for i in .a .la .so .so.0
-	${INSTALL_DATA} ${WRKSRC}/src/.libs/libcanberra-gtk3${i} \
+.for i in .so .so.0 .so.0.1.8
+	${INSTALL_LIB} ${WRKSRC}/src/.libs/libcanberra-gtk3${i} \
 		${STAGEDIR}${PREFIX}/lib/
 .endfor
 	cd ${WRKSRC}/src && ${SETENV} DESTDIR=${STAGEDIR} \
diff --git a/audio/libcanberra-gtk3/pkg-plist b/audio/libcanberra-gtk3/pkg-plist
index 9a3276d53376..1d82f2d632a8 100644
--- a/audio/libcanberra-gtk3/pkg-plist
+++ b/audio/libcanberra-gtk3/pkg-plist
@@ -1,9 +1,6 @@
 lib/gtk-3.0/modules/libcanberra-gtk-module.so
-lib/gtk-3.0/modules/libcanberra-gtk3-module.a
-lib/gtk-3.0/modules/libcanberra-gtk3-module.la
 lib/gtk-3.0/modules/libcanberra-gtk3-module.so
-lib/libcanberra-gtk3.a
-lib/libcanberra-gtk3.la
 lib/libcanberra-gtk3.so
 lib/libcanberra-gtk3.so.0
+lib/libcanberra-gtk3.so.0.1.8
 libdata/pkgconfig/libcanberra-gtk3.pc
diff --git a/audio/libcanberra/Makefile b/audio/libcanberra/Makefile
index 5bf74ccf2b46..6fd649c02f2c 100644
--- a/audio/libcanberra/Makefile
+++ b/audio/libcanberra/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	libcanberra
 PORTVERSION=	0.28
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio devel
 MASTER_SITES=	http://0pointer.de/lennart/projects/libcanberra/
 
@@ -16,13 +16,15 @@ LICENSE_FILE=	${WRKSRC}/LGPL
 
 LIB_DEPENDS=	libvorbisfile.so:${PORTSDIR}/audio/libvorbis
 
-USES=		gmake pkgconfig
-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
+USE_AUTOTOOLS=	libltdl
 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
diff --git a/audio/libcanberra/pkg-plist b/audio/libcanberra/pkg-plist
index 305764c1d46f..c4d1efa588ef 100644
--- a/audio/libcanberra/pkg-plist
+++ b/audio/libcanberra/pkg-plist
@@ -2,31 +2,17 @@ bin/canberra-gtk-play
 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.0.1.8
 lib/libcanberra.so
 lib/libcanberra.so.0
-%%GSTREAMER%%lib/libcanberra-%%VERSION%%/libcanberra-gstreamer.a
-%%GSTREAMER%%lib/libcanberra-%%VERSION%%/libcanberra-gstreamer.la
+lib/libcanberra.so.0.2.5
 %%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