- Update to version 1.8.0

- Order USE_ flags, drop gnomehack it's messy
- Cleanup REINPLACE_CMDs
- Sort plist

3 files changed, 43 insertions, 44 deletions

diff --git a/multimedia/lives/Makefile b/multimedia/lives/Makefile
index 9c6828d246e..0f9e74a09f2 100644
--- a/multimedia/lives/Makefile
+++ b/multimedia/lives/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	lives
-PORTVERSION=	1.6.4
-PORTREVISION=	1
+PORTVERSION=	1.8.0
 CATEGORIES=	multimedia
 MASTER_SITES=	http://salsaman.home.xs4all.nl/lives/current/
 DISTNAME=	LiVES-${PORTVERSION}
@@ -33,6 +32,7 @@ LIB_DEPENDS=	asound:${PORTSDIR}/audio/alsa-lib \
 		cairo:${PORTSDIR}/graphics/cairo \
 		visual-0.4:${PORTSDIR}/graphics/libvisual04 \
 		opencv_calib3d:${PORTSDIR}/graphics/opencv \
+		opencv_core:${PORTSDIR}/graphics/opencv-core \
 		png15:${PORTSDIR}/graphics/png \
 		fftw3:${PORTSDIR}/math/fftw3 \
 		fftw3f:${PORTSDIR}/math/fftw3-float \
@@ -45,8 +45,8 @@ LIB_DEPENDS=	asound:${PORTSDIR}/audio/alsa-lib \
 		xvidcore:${PORTSDIR}/multimedia/xvid \
 		freetype:${PORTSDIR}/print/freetype2 \
 		expat:${PORTSDIR}/textproc/expat2 \
-		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
-		xcb:${PORTSDIR}/x11/libxcb
+		xcb:${PORTSDIR}/x11/libxcb \
+		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
 RUN_DEPENDS=	${LOCALBASE}/bin/analyseplugin:${PORTSDIR}/audio/ladspa \
 		mpg123:${PORTSDIR}/audio/mpg123 \
 		sox:${PORTSDIR}/audio/sox \
@@ -64,19 +64,19 @@ RUN_DEPENDS=	${LOCALBASE}/bin/analyseplugin:${PORTSDIR}/audio/ladspa \
 WRKSRC=		${WRKDIR}/${DISTNAME:L}
 
 USE_BZIP2=	yes
-USE_LDCONFIG=	yes
+GNU_CONFIGURE=	yes
+USE_PKGCONFIG=	build
 USE_ICONV=	yes
 USE_NCURSES=	yes
-USE_GNOME=	gtk20 gnomehack gdkpixbuf2
-USE_SDL=	sdl
 USE_PYTHON=	yes
 USE_PERL5=	yes
 USE_CDRTOOLS=	yes
 USE_GHOSTSCRIPT_RUN=	yes
-GNU_CONFIGURE=	yes
-USE_PKGCONFIG=	build
 USE_XORG=	ice pixman sm x11 xau xcomposite xcursor xdamage xdmcp xext \
 		xfixes xi xinerama xrandr xrender xtst
+USE_SDL=	sdl
+USE_GNOME=	gdkpixbuf2 gtk20
+USE_LDCONFIG=	yes
 MAKE_JOBS_SAFE=	yes
 
 CONFIGURE_ARGS=	--disable-ldvgrab
@@ -122,10 +122,9 @@ PLIST_SUB+=	NLS="@comment "
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e '/LIBS/s|-ldl ||' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's| install-docDATA||g' \
+	@${REINPLACE_CMD} -e 's| install-docDATA||g; s|-$$(VERSION)||g' \
 		${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e 's|: install-data-local |: |g' \
+	@${REINPLACE_CMD} -e 's|: install-data-local |: |g; s|-ldl||' \
 		${WRKSRC}/lives-plugins/weed-plugins/gdk/Makefile.in \
 		${WRKSRC}/lives-plugins/weed-plugins/Makefile.in
 	@${REINPLACE_CMD} -e 's|off64_t|off_t|g ; s|lseek64|lseek|g' \
@@ -134,16 +133,9 @@ 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
-	@${FIND} ${WRKSRC} -name "Makefile.in" -print0 | ${XARGS} -0 \
-		${REINPLACE_CMD} -e \
-		'/FLAGS/s|-O3||g ; \
-		 /FLAGS/s|-ldl||g ; \
-		 /flags/s|-L/usr/lib64||g ; \
-		 /flags/s|-Wl,-Bsymbolic||g ; \
-		 /flags/s|--tag=disable-static||g'
-	@${REINPLACE_CMD} -e 's|-$$(VERSION)||g' ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|g' \
+		${WRKSRC}/libweed/Makefile.in
 	@${REINPLACE_CMD} 's|/bin/touch|/usr/bin/touch|g' \
-		${WRKSRC}/smogrify \
 		${WRKSRC}/src/callbacks.c \
 		${WRKSRC}/src/saveplay.c \
 		${WRKSRC}/src/utils.c
diff --git a/multimedia/lives/distinfo b/multimedia/lives/distinfo
index a6599288b0b..638784e0339 100644
--- a/multimedia/lives/distinfo
+++ b/multimedia/lives/distinfo
@@ -1,2 +1,2 @@
-SHA256 (LiVES-1.6.4.tar.bz2) = 3745e831ad495ae47cbbdec08116ae2f23afcfaa5116eb3edbb721bbf2910db2
-SIZE (LiVES-1.6.4.tar.bz2) = 3497570
+SHA256 (LiVES-1.8.0.tar.bz2) = 0ba2c289f1fc4903533194a4317b83a4214b3fbf0796bd05dba5d7315e2dfdb6
+SIZE (LiVES-1.8.0.tar.bz2) = 3531294
diff --git a/multimedia/lives/pkg-plist b/multimedia/lives/pkg-plist
index b4c878db9ff..0266c9d85b6 100644
--- a/multimedia/lives/pkg-plist
+++ b/multimedia/lives/pkg-plist
@@ -32,11 +32,6 @@ include/weed/weed-plugin-utils.h
 include/weed/weed-plugin.h
 include/weed/weed-utils.h
 include/weed/weed.h
-libdata/pkgconfig/libweed.pc
-libdata/pkgconfig/libweed-compat.pc
-libdata/pkgconfig/libweed-plugin-utils.pc
-libdata/pkgconfig/libweed-utils.pc
-libdata/pkgconfig/libweed_slice.pc
 lib/libweed-plugin-utils.a
 lib/libweed-plugin-utils.la
 lib/libweed-utils.a
@@ -63,6 +58,8 @@ 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
@@ -85,6 +82,8 @@ 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_processor.la
+lib/lives/plugins/effects/realtime/weed/data_processor.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
@@ -107,6 +106,8 @@ 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
@@ -139,6 +140,8 @@ 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
@@ -162,8 +165,6 @@ 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/libvisual/libvis.la
-lib/lives/plugins/effects/realtime/weed/libvisual/libvis.so
 lib/lives/plugins/effects/realtime/weed/xeffect.so
 lib/lives/plugins/effects/rendered/blank_frames
 lib/lives/plugins/effects/rendered/blur
@@ -247,6 +248,11 @@ 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
+libdata/pkgconfig/libweed-utils.pc
+libdata/pkgconfig/libweed.pc
+libdata/pkgconfig/libweed_slice.pc
 share/app-install/icons/lives.png
 share/applications/LiVES.desktop
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
@@ -342,13 +348,14 @@ share/applications/LiVES.desktop
 %%DATADIR%%/plugins/effects/RFXscripts/trim_frames.script
 %%DATADIR%%/plugins/effects/RFXscripts/tunnel.script
 %%DATADIR%%/plugins/effects/RFXscripts/wave.script
+%%DATADIR%%/plugins/effects/compound/image_stabilizer
 %%DATADIR%%/resources/vidtest.avi
 %%DATADIR%%/themes/camera/frame.jpg
 %%DATADIR%%/themes/camera/main.jpg
-%%DATADIR%%/themes/crayons/frame.jpg
-%%DATADIR%%/themes/crayons/main.jpg
 %%DATADIR%%/themes/crayons-bright/frame.jpg
 %%DATADIR%%/themes/crayons-bright/main.jpg
+%%DATADIR%%/themes/crayons/frame.jpg
+%%DATADIR%%/themes/crayons/main.jpg
 %%DATADIR%%/themes/cutting_room/frame.jpg
 %%DATADIR%%/themes/cutting_room/main.jpg
 %%DATADIR%%/themes/editor/frame.jpg
@@ -387,6 +394,16 @@ share/applications/LiVES.desktop
 %%NLS%%share/locale/uz/LC_MESSAGES/lives.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/lives.mo
 share/pixmaps/lives.xpm
+%%NLS%%@dirrmtry share/locale/ug/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ug
+%%NLS%%@dirrmtry share/locale/te/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/te
+%%NLS%%@dirrmtry share/locale/oc/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/oc
+%%NLS%%@dirrmtry share/locale/nl_NL/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/nl_NL
+%%NLS%%@dirrmtry share/locale/de_DE/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/de_DE
 @dirrm %%DATADIR%%/themes/pinks
 @dirrm %%DATADIR%%/themes/editor
 @dirrm %%DATADIR%%/themes/cutting_room
@@ -395,6 +412,7 @@ share/pixmaps/lives.xpm
 @dirrm %%DATADIR%%/themes/camera
 @dirrm %%DATADIR%%/themes
 @dirrm %%DATADIR%%/resources
+@dirrm %%DATADIR%%/plugins/effects/compound
 @dirrm %%DATADIR%%/plugins/effects/RFXscripts
 @dirrm %%DATADIR%%/plugins/effects
 @dirrm %%DATADIR%%/plugins
@@ -403,7 +421,6 @@ share/pixmaps/lives.xpm
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm share/app-install/icons
 @dirrm share/app-install
-@dirrm include/weed
 @dirrm lib/lives/plugins/playback/video
 @dirrm lib/lives/plugins/playback/audiostream
 @dirrm lib/lives/plugins/playback
@@ -417,14 +434,4 @@ share/pixmaps/lives.xpm
 @dirrm lib/lives/plugins/decoders
 @dirrm lib/lives/plugins
 @dirrm lib/lives
-%%NLS%%@dirrmtry share/locale/ug/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ug
-%%NLS%%@dirrmtry share/locale/te/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/te
-%%NLS%%@dirrmtry share/locale/oc/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/oc
-%%NLS%%@dirrmtry share/locale/nl_NL/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/nl_NL
-%%NLS%%@dirrmtry share/locale/de_DE/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/de_DE
-%%NLS%%@dirrmtry share/applications
+@dirrm include/weed