- Switch to USES=libtool, drop .la files

Approved by:	portmgr blanket

2 files changed, 5 insertions, 66 deletions

diff --git a/multimedia/gmerlin/Makefile b/multimedia/gmerlin/Makefile
index 040e5a69569e..d0b5055dc9da 100644
--- a/multimedia/gmerlin/Makefile
+++ b/multimedia/gmerlin/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gmerlin
 PORTVERSION=	1.2.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia
 MASTER_SITES=	SF
 
@@ -16,7 +16,7 @@ LIB_DEPENDS=	libexif.so:${PORTSDIR}/graphics/libexif \
 		libgavl.so:${PORTSDIR}/multimedia/gavl \
 		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
 
-USES=		gettext makeinfo pathfix pkgconfig
+USES=		gettext libtool makeinfo pathfix pkgconfig
 USE_GNOME=	gtk20 libxml2
 USE_XORG=	x11 xext xfixes xinerama xv
 USE_GL=		gl
@@ -29,7 +29,7 @@ USE_LDCONFIG=	yes
 INSTALL_ICONS=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+LDFLAGS+=	-L${LOCALBASE}/lib `pkg-config --libs gtk+-x11-2.0`
 
 INFO=		gmerlin
 
diff --git a/multimedia/gmerlin/pkg-plist b/multimedia/gmerlin/pkg-plist
index 863c9f13637e..4fbe61b63062 100644
--- a/multimedia/gmerlin/pkg-plist
+++ b/multimedia/gmerlin/pkg-plist
@@ -91,134 +91,73 @@ include/gmerlin/utils.h
 include/gmerlin/visualize.h
 include/gmerlin/x11/x11.h
 include/gmerlin/xmlutils.h
-%%QUICKTIME%%lib/gmerlin/plugins/e_lqt.la
 %%QUICKTIME%%lib/gmerlin/plugins/e_lqt.so
-lib/gmerlin/plugins/e_pp_cdrdao.la
 lib/gmerlin/plugins/e_pp_cdrdao.so
-lib/gmerlin/plugins/e_pp_vcdimager.la
 lib/gmerlin/plugins/e_pp_vcdimager.so
-%%PNG%%lib/gmerlin/plugins/e_spumux.la
 %%PNG%%lib/gmerlin/plugins/e_spumux.so
-lib/gmerlin/plugins/e_subtext.la
 lib/gmerlin/plugins/e_subtext.so
-lib/gmerlin/plugins/e_wav.la
 lib/gmerlin/plugins/e_wav.so
-lib/gmerlin/plugins/fa_sampleformat.la
 lib/gmerlin/plugins/fa_sampleformat.so
-lib/gmerlin/plugins/fa_volume.la
 lib/gmerlin/plugins/fa_volume.so
-lib/gmerlin/plugins/fv_bitshift.la
 lib/gmerlin/plugins/fv_bitshift.so
-lib/gmerlin/plugins/fv_blur.la
 lib/gmerlin/plugins/fv_blur.so
-lib/gmerlin/plugins/fv_colorbalance.la
 lib/gmerlin/plugins/fv_colorbalance.so
-lib/gmerlin/plugins/fv_colormatrix_rgb.la
 lib/gmerlin/plugins/fv_colormatrix_rgb.so
-lib/gmerlin/plugins/fv_colormatrix_yuv.la
 lib/gmerlin/plugins/fv_colormatrix_yuv.so
-lib/gmerlin/plugins/fv_cropscale.la
 lib/gmerlin/plugins/fv_cropscale.so
-lib/gmerlin/plugins/fv_decimate.la
 lib/gmerlin/plugins/fv_decimate.so
-lib/gmerlin/plugins/fv_deinterlace.la
 lib/gmerlin/plugins/fv_deinterlace.so
-lib/gmerlin/plugins/fv_equalizer.la
 lib/gmerlin/plugins/fv_equalizer.so
-lib/gmerlin/plugins/fv_flip.la
 lib/gmerlin/plugins/fv_flip.so
-lib/gmerlin/plugins/fv_framerate.la
 lib/gmerlin/plugins/fv_framerate.so
-lib/gmerlin/plugins/fv_interlace.la
 lib/gmerlin/plugins/fv_interlace.so
-lib/gmerlin/plugins/fv_invert_rgb.la
 lib/gmerlin/plugins/fv_invert_rgb.so
-lib/gmerlin/plugins/fv_oldcolor.la
 lib/gmerlin/plugins/fv_oldcolor.so
-lib/gmerlin/plugins/fv_pixelformat.la
 lib/gmerlin/plugins/fv_pixelformat.so
-lib/gmerlin/plugins/fv_swapfields.la
 lib/gmerlin/plugins/fv_swapfields.so
-lib/gmerlin/plugins/fv_tcdisplay.la
 lib/gmerlin/plugins/fv_tcdisplay.so
-lib/gmerlin/plugins/fv_tctweak.la
 lib/gmerlin/plugins/fv_tctweak.so
-lib/gmerlin/plugins/fv_textlogo.la
 lib/gmerlin/plugins/fv_textlogo.so
-lib/gmerlin/plugins/fv_tlp.la
 lib/gmerlin/plugins/fv_tlp.so
-lib/gmerlin/plugins/fv_transform.la
 lib/gmerlin/plugins/fv_transform.so
-lib/gmerlin/plugins/fv_zoom.la
 lib/gmerlin/plugins/fv_zoom.so
-%%ALSA%%lib/gmerlin/plugins/i_alsa.la
 %%ALSA%%lib/gmerlin/plugins/i_alsa.so
-%%CDIO%%lib/gmerlin/plugins/i_cdaudio.la
 %%CDIO%%lib/gmerlin/plugins/i_cdaudio.so
-lib/gmerlin/plugins/i_edl.la
 lib/gmerlin/plugins/i_edl.so
-%%ESOUND%%lib/gmerlin/plugins/i_esd.la
 %%ESOUND%%lib/gmerlin/plugins/i_esd.so
-%%JACK%%lib/gmerlin/plugins/i_jack.la
 %%JACK%%lib/gmerlin/plugins/i_jack.so
-%%QUICKTIME%%lib/gmerlin/plugins/i_lqt.la
 %%QUICKTIME%%lib/gmerlin/plugins/i_lqt.so
-lib/gmerlin/plugins/i_mikmod.la
 lib/gmerlin/plugins/i_mikmod.so
-lib/gmerlin/plugins/i_oss.la
 lib/gmerlin/plugins/i_oss.so
-%%PULSEAUDIO%%lib/gmerlin/plugins/i_pulse.la
 %%PULSEAUDIO%%lib/gmerlin/plugins/i_pulse.so
-lib/gmerlin/plugins/i_x11.la
 lib/gmerlin/plugins/i_x11.so
-lib/gmerlin/plugins/ir_bmp.la
 lib/gmerlin/plugins/ir_bmp.so
-lib/gmerlin/plugins/ir_gavl.la
 lib/gmerlin/plugins/ir_gavl.so
-%%JPEG%%lib/gmerlin/plugins/ir_jpeg.la
 %%JPEG%%lib/gmerlin/plugins/ir_jpeg.so
-%%PNG%%lib/gmerlin/plugins/ir_png.la
 %%PNG%%lib/gmerlin/plugins/ir_png.so
-lib/gmerlin/plugins/ir_pnm.la
 lib/gmerlin/plugins/ir_pnm.so
-lib/gmerlin/plugins/ir_tga.la
 lib/gmerlin/plugins/ir_tga.so
-%%TIFF%%lib/gmerlin/plugins/ir_tiff.la
 %%TIFF%%lib/gmerlin/plugins/ir_tiff.so
-lib/gmerlin/plugins/iw_bmp.la
 lib/gmerlin/plugins/iw_bmp.so
-lib/gmerlin/plugins/iw_gavl.la
 lib/gmerlin/plugins/iw_gavl.so
-%%JPEG%%lib/gmerlin/plugins/iw_jpeg.la
 %%JPEG%%lib/gmerlin/plugins/iw_jpeg.so
-%%PNG%%lib/gmerlin/plugins/iw_png.la
 %%PNG%%lib/gmerlin/plugins/iw_png.so
-lib/gmerlin/plugins/iw_pnm.la
 lib/gmerlin/plugins/iw_pnm.so
-lib/gmerlin/plugins/iw_tga.la
 lib/gmerlin/plugins/iw_tga.so
-%%TIFF%%lib/gmerlin/plugins/iw_tiff.la
 %%TIFF%%lib/gmerlin/plugins/iw_tiff.so
-%%ALSA%%lib/gmerlin/plugins/oa_alsa.la
 %%ALSA%%lib/gmerlin/plugins/oa_alsa.so
-%%ESOUND%%lib/gmerlin/plugins/oa_esd.la
 %%ESOUND%%lib/gmerlin/plugins/oa_esd.so
-%%JACK%%lib/gmerlin/plugins/oa_jack.la
 %%JACK%%lib/gmerlin/plugins/oa_jack.so
-lib/gmerlin/plugins/oa_oss.la
 lib/gmerlin/plugins/oa_oss.so
-%%PULSEAUDIO%%lib/gmerlin/plugins/oa_pulse.la
 %%PULSEAUDIO%%lib/gmerlin/plugins/oa_pulse.so
-lib/gmerlin/plugins/ov_x11.la
 lib/gmerlin/plugins/ov_x11.so
-lib/gmerlin/plugins/vis_scope.la
 lib/gmerlin/plugins/vis_scope.so
-lib/libgmerlin.la
 lib/libgmerlin.so
 lib/libgmerlin.so.0
-lib/libgmerlin_gtk.la
+lib/libgmerlin.so.0.0.0
 lib/libgmerlin_gtk.so
 lib/libgmerlin_gtk.so.0
+lib/libgmerlin_gtk.so.0.0.0
 libdata/pkgconfig/gmerlin-gtk.pc
 libdata/pkgconfig/gmerlin.pc
 man/man1/gmerlin-record.1.gz