2 files changed, 5 insertions, 83 deletions

diff --git a/multimedia/lives/Makefile b/multimedia/lives/Makefile
index 0c5d9b5c391d..e205cc539034 100644
--- a/multimedia/lives/Makefile
+++ b/multimedia/lives/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	lives
 PORTVERSION=	2.2.4
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://salsaman.home.xs4all.nl/lives/current/
 DISTNAME=	LiVES-${PORTVERSION}
@@ -41,7 +42,7 @@ RUN_DEPENDS=	${LOCALBASE}/bin/analyseplugin:${PORTSDIR}/audio/ladspa \
 
 WRKSRC=		${WRKDIR}/${DISTNAME:L}
 
-USES=		perl5 pkgconfig shebangfix tar:bzip2 
+USES=		libtool pathfix perl5 pkgconfig shebangfix tar:bzip2 
 SHEBANG_FILES=	build-lives-rfx-plugin build-lives-rfx-plugin-multi \
 		smogrify tools/autolives.pl
 GNU_CONFIGURE=	yes
@@ -94,8 +95,6 @@ post-patch:
 		${WRKSRC}/lives-plugins/plugins/decoders/ogg_decoder.h
 	@${REINPLACE_CMD} -e 's|/usr/local/lib/|${LOCALBASE}/lib/|g' \
 		${WRKSRC}/lives-plugins/weed-plugins/frei0r.c
-	@${REINPLACE_CMD} 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|g' \
-		${WRKSRC}/libweed/Makefile.in
 	@${REINPLACE_CMD} 's|/bin/touch|/usr/bin/touch|g' \
 		${WRKSRC}/src/callbacks.c \
 		${WRKSRC}/src/saveplay.c \
diff --git a/multimedia/lives/pkg-plist b/multimedia/lives/pkg-plist
index 5b54a2c0a645..09afe7d1e5d3 100644
--- a/multimedia/lives/pkg-plist
+++ b/multimedia/lives/pkg-plist
@@ -31,159 +31,89 @@ include/weed/weed-palettes.h
 include/weed/weed-plugin.h
 include/weed/weed-utils.h
 include/weed/weed.h
-lib/libweed-utils.la
 lib/libweed-utils.so
 lib/libweed-utils.so.0
-lib/libweed.la
+lib/libweed-utils.so.0.0.6
 lib/libweed.so
 lib/libweed.so.0
-lib/libweed_slice.la
+lib/libweed.so.0.0.6
 lib/libweed_slice.so
 lib/libweed_slice.so.0
-lib/lives/plugins/decoders/asf_decoder.la
+lib/libweed_slice.so.0.0.6
 lib/lives/plugins/decoders/asf_decoder.so
-lib/lives/plugins/decoders/dv_decoder.la
 lib/lives/plugins/decoders/dv_decoder.so
-lib/lives/plugins/decoders/flv_decoder.la
 lib/lives/plugins/decoders/flv_decoder.so
-lib/lives/plugins/decoders/mkv_decoder.la
 lib/lives/plugins/decoders/mkv_decoder.so
-lib/lives/plugins/decoders/mpegts_decoder.la
 lib/lives/plugins/decoders/mpegts_decoder.so
-lib/lives/plugins/decoders/ogg_decoder.la
 lib/lives/plugins/decoders/ogg_decoder.so
-lib/lives/plugins/decoders/zzavformat_decoder.la
 lib/lives/plugins/decoders/zzavformat_decoder.so
-lib/lives/plugins/effects/realtime/weed/RGBdelay.la
 lib/lives/plugins/effects/realtime/weed/RGBdelay.so
-lib/lives/plugins/effects/realtime/weed/alien_overlay.la
 lib/lives/plugins/effects/realtime/weed/alien_overlay.so
-lib/lives/plugins/effects/realtime/weed/alpha_means.la
 lib/lives/plugins/effects/realtime/weed/alpha_means.so
-lib/lives/plugins/effects/realtime/weed/audio_fft.la
 lib/lives/plugins/effects/realtime/weed/audio_fft.so
-lib/lives/plugins/effects/realtime/weed/audio_transition.la
 lib/lives/plugins/effects/realtime/weed/audio_transition.so
-lib/lives/plugins/effects/realtime/weed/audio_volume.la
 lib/lives/plugins/effects/realtime/weed/audio_volume.so
-lib/lives/plugins/effects/realtime/weed/beat_detector.la
 lib/lives/plugins/effects/realtime/weed/beat_detector.so
-lib/lives/plugins/effects/realtime/weed/blank_frame_detector.la
 lib/lives/plugins/effects/realtime/weed/blank_frame_detector.so
-lib/lives/plugins/effects/realtime/weed/blurzoom.la
 lib/lives/plugins/effects/realtime/weed/blurzoom.so
-lib/lives/plugins/effects/realtime/weed/bump2d.la
 lib/lives/plugins/effects/realtime/weed/bump2d.so
-lib/lives/plugins/effects/realtime/weed/ccorrect.la
 lib/lives/plugins/effects/realtime/weed/ccorrect.so
-lib/lives/plugins/effects/realtime/weed/colorkey.la
 lib/lives/plugins/effects/realtime/weed/colorkey.so
-lib/lives/plugins/effects/realtime/weed/comic.la
 lib/lives/plugins/effects/realtime/weed/comic.so
-lib/lives/plugins/effects/realtime/weed/compositor.la
 lib/lives/plugins/effects/realtime/weed/compositor.so
 lib/lives/plugins/effects/realtime/weed/data/fourKlives/songs/examples.txt
 lib/lives/plugins/effects/realtime/weed/data/fourKlives/songs/modulations.txt
 lib/lives/plugins/effects/realtime/weed/data/fourKlives/songs/newlives.txt
 lib/lives/plugins/effects/realtime/weed/data/fourKlives/songs/regrlives.txt
 lib/lives/plugins/effects/realtime/weed/data/fourKlives/songs/roselives.txt
-lib/lives/plugins/effects/realtime/weed/data_processor.la
 lib/lives/plugins/effects/realtime/weed/data_processor.so
-lib/lives/plugins/effects/realtime/weed/data_unpacker.la
 lib/lives/plugins/effects/realtime/weed/data_unpacker.so
-lib/lives/plugins/effects/realtime/weed/deinterlace.la
 lib/lives/plugins/effects/realtime/weed/deinterlace.so
-lib/lives/plugins/effects/realtime/weed/edge.la
 lib/lives/plugins/effects/realtime/weed/edge.so
-lib/lives/plugins/effects/realtime/weed/farneback_analyser.la
 lib/lives/plugins/effects/realtime/weed/farneback_analyser.so
-lib/lives/plugins/effects/realtime/weed/fg_bg_removal.la
 lib/lives/plugins/effects/realtime/weed/fg_bg_removal.so
-lib/lives/plugins/effects/realtime/weed/fireTV.la
 lib/lives/plugins/effects/realtime/weed/fireTV.so
-lib/lives/plugins/effects/realtime/weed/fourKlives.la
 lib/lives/plugins/effects/realtime/weed/fourKlives.so
-%%FREI0R%%lib/lives/plugins/effects/realtime/weed/frei0r/frei0r.la
 %%FREI0R%%lib/lives/plugins/effects/realtime/weed/frei0r/frei0r.so
-lib/lives/plugins/effects/realtime/weed/gdk_fast_resize.la
 lib/lives/plugins/effects/realtime/weed/gdk_fast_resize.so
-lib/lives/plugins/effects/realtime/weed/haar_analyser.la
 lib/lives/plugins/effects/realtime/weed/haar_analyser.so
-lib/lives/plugins/effects/realtime/weed/haip.la
 lib/lives/plugins/effects/realtime/weed/haip.so
-lib/lives/plugins/effects/realtime/weed/kaleidoscope.la
 lib/lives/plugins/effects/realtime/weed/kaleidoscope.so
-lib/lives/plugins/effects/realtime/weed/ladspa.la
 lib/lives/plugins/effects/realtime/weed/ladspa.so
-lib/lives/plugins/effects/realtime/weed/layout_blends.la
 lib/lives/plugins/effects/realtime/weed/layout_blends.so
-lib/lives/plugins/effects/realtime/weed/libvisual/libvis.la
 lib/lives/plugins/effects/realtime/weed/libvisual/libvis.so
-lib/lives/plugins/effects/realtime/weed/lifeTV.la
 lib/lives/plugins/effects/realtime/weed/lifeTV.so
-lib/lives/plugins/effects/realtime/weed/livetext.la
 lib/lives/plugins/effects/realtime/weed/livetext.so
-lib/lives/plugins/effects/realtime/weed/log_sig.la
 lib/lives/plugins/effects/realtime/weed/log_sig.so
-lib/lives/plugins/effects/realtime/weed/mask_overlay.la
 lib/lives/plugins/effects/realtime/weed/mask_overlay.so
-lib/lives/plugins/effects/realtime/weed/mirrors.la
 lib/lives/plugins/effects/realtime/weed/mirrors.so
-lib/lives/plugins/effects/realtime/weed/multi_blends.la
 lib/lives/plugins/effects/realtime/weed/multi_blends.so
-lib/lives/plugins/effects/realtime/weed/multi_transitions.la
 lib/lives/plugins/effects/realtime/weed/multi_transitions.so
-lib/lives/plugins/effects/realtime/weed/negate.la
 lib/lives/plugins/effects/realtime/weed/negate.so
-lib/lives/plugins/effects/realtime/weed/nn_programmer.la
 lib/lives/plugins/effects/realtime/weed/nn_programmer.so
-lib/lives/plugins/effects/realtime/weed/noise.la
 lib/lives/plugins/effects/realtime/weed/noise.so
-lib/lives/plugins/effects/realtime/weed/onedTV.la
 lib/lives/plugins/effects/realtime/weed/onedTV.so
-lib/lives/plugins/effects/realtime/weed/palette_test.la
 lib/lives/plugins/effects/realtime/weed/palette_test.so
-lib/lives/plugins/effects/realtime/weed/plasma.la
 lib/lives/plugins/effects/realtime/weed/plasma.so
-lib/lives/plugins/effects/realtime/weed/posterise.la
 lib/lives/plugins/effects/realtime/weed/posterise.so
-lib/lives/plugins/effects/realtime/weed/puretext.la
 lib/lives/plugins/effects/realtime/weed/puretext.so
-lib/lives/plugins/effects/realtime/weed/randomiser.la
 lib/lives/plugins/effects/realtime/weed/randomiser.so
-lib/lives/plugins/effects/realtime/weed/revTV.la
 lib/lives/plugins/effects/realtime/weed/revTV.so
-lib/lives/plugins/effects/realtime/weed/rippleTV.la
 lib/lives/plugins/effects/realtime/weed/rippleTV.so
-lib/lives/plugins/effects/realtime/weed/rotozoom.la
 lib/lives/plugins/effects/realtime/weed/rotozoom.so
-lib/lives/plugins/effects/realtime/weed/scribbler.la
 lib/lives/plugins/effects/realtime/weed/scribbler.so
-lib/lives/plugins/effects/realtime/weed/shift.la
 lib/lives/plugins/effects/realtime/weed/shift.so
-lib/lives/plugins/effects/realtime/weed/simple_blend.la
 lib/lives/plugins/effects/realtime/weed/simple_blend.so
-lib/lives/plugins/effects/realtime/weed/slide_over.la
 lib/lives/plugins/effects/realtime/weed/slide_over.so
-lib/lives/plugins/effects/realtime/weed/softlight.la
 lib/lives/plugins/effects/realtime/weed/softlight.so
-lib/lives/plugins/effects/realtime/weed/targeted_zoom.la
 lib/lives/plugins/effects/realtime/weed/targeted_zoom.so
-lib/lives/plugins/effects/realtime/weed/textfun.la
 lib/lives/plugins/effects/realtime/weed/textfun.so
-lib/lives/plugins/effects/realtime/weed/tone_gen.la
 lib/lives/plugins/effects/realtime/weed/tone_gen.so
-lib/lives/plugins/effects/realtime/weed/tvpic.la
 lib/lives/plugins/effects/realtime/weed/tvpic.so
-lib/lives/plugins/effects/realtime/weed/vector_visualiser.la
 lib/lives/plugins/effects/realtime/weed/vector_visualiser.so
-lib/lives/plugins/effects/realtime/weed/vertigo.la
 lib/lives/plugins/effects/realtime/weed/vertigo.so
-lib/lives/plugins/effects/realtime/weed/videowall.la
 lib/lives/plugins/effects/realtime/weed/videowall.so
-lib/lives/plugins/effects/realtime/weed/warpTV.la
 lib/lives/plugins/effects/realtime/weed/warpTV.so
-lib/lives/plugins/effects/realtime/weed/xeffect.la
 lib/lives/plugins/effects/realtime/weed/xeffect.so
 lib/lives/plugins/effects/rendered/blank_frames
 lib/lives/plugins/effects/rendered/blur
@@ -253,19 +183,12 @@ lib/lives/plugins/encoders/sswf_encoder
 lib/lives/plugins/encoders/transcode_encoder
 lib/lives/plugins/encoders/x264_encoder
 lib/lives/plugins/playback/audiostream/audiostreamer.pl
-lib/lives/plugins/playback/video/SDL.la
 lib/lives/plugins/playback/video/SDL.so
-lib/lives/plugins/playback/video/icecast_output.la
 lib/lives/plugins/playback/video/icecast_output.so
-lib/lives/plugins/playback/video/lives2lives_stream.la
 lib/lives/plugins/playback/video/lives2lives_stream.so
-lib/lives/plugins/playback/video/oggstream.la
 lib/lives/plugins/playback/video/oggstream.so
-lib/lives/plugins/playback/video/vloopback.la
 lib/lives/plugins/playback/video/vloopback.so
-lib/lives/plugins/playback/video/vloopback2.la
 lib/lives/plugins/playback/video/vloopback2.so
-lib/lives/plugins/playback/video/yuv4mpeg_stream.la
 lib/lives/plugins/playback/video/yuv4mpeg_stream.so
 libdata/pkgconfig/libweed-compat.pc
 libdata/pkgconfig/libweed-plugin-utils.pc