- Update to version 2.0.5

- Convert to new options macros, list all options in OPTIONS_DEFINE
- Make DOXYGEN independent of DOCS option, use generated plist for it

3 files changed, 20 insertions, 38 deletions

diff --git a/multimedia/lives/Makefile b/multimedia/lives/Makefile
index be6fae4d253d..529673536149 100644
--- a/multimedia/lives/Makefile
+++ b/multimedia/lives/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	lives
-PORTVERSION=	2.0.4
+PORTVERSION=	2.0.5
 CATEGORIES=	multimedia
 MASTER_SITES=	http://salsaman.home.xs4all.nl/lives/current/
 DISTNAME=	LiVES-${PORTVERSION}
@@ -68,32 +68,20 @@ DOC_FILES=	AUTHORS BUGS ChangeLog FEATURES GETTING.STARTED README \
 
 PORT_VERBS=	lives LiVES _encoder.py midistart midistop smogrify sendOSC
 
-OPTIONS_DEFINE=	DOXYGEN FREI0R
+OPTIONS_DEFINE=	DOCS DOXYGEN FREI0R NLS
+OPTIONS_SUB=	yes
 
-.include <bsd.port.options.mk>
+DOXYGEN_BUILD_DEPENDS=	${LOCALBASE}/bin/doxygen:${PORTSDIR}/devel/doxygen
+DOXYGEN_CONFIGURE_OFF=	--disable-doxygen
+FREI0R_BUILD_DEPENDS=	${LOCALBASE}/include/frei0r.h:${PORTSDIR}/graphics/frei0r
+FREI0R_RUN_DEPENDS=	${LOCALBASE}/include/frei0r.h:${PORTSDIR}/graphics/frei0r
+NLS_USES=		gettext
+NLS_CONFIGURE_OFF=	--disable-nls
 
-.if ${PORT_OPTIONS:MDOCS} && ${PORT_OPTIONS:MDOXYGEN}
-BUILD_DEPENDS+=	${LOCALBASE}/bin/doxygen:${PORTSDIR}/devel/doxygen
-PORTDOCS=	html
-.else
-CONFIGURE_ARGS+=--disable-doxygen
-.endif
+.include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MFREI0R}
-BUILD_DEPENDS+=	${LOCALBASE}/include/frei0r.h:${PORTSDIR}/graphics/frei0r
-RUN_DEPENDS+=	${LOCALBASE}/include/frei0r.h:${PORTSDIR}/graphics/frei0r
-PLIST_SUB+=	FREI0R=""
-.else
+.if ! ${PORT_OPTIONS:MFREI0R}
 CONFIGURE_ENV+=	ac_cv_header_frei0r_h=no
-PLIST_SUB+=	FREI0R="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=	NLS="@comment "
 .endif
 
 post-patch:
@@ -121,9 +109,13 @@ post-patch:
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
-.for file in ${DOC_FILES}
-	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
-.endfor
+	${INSTALL_DATA} ${DOC_FILES:S|^|${WRKSRC}/|} ${DOCSDIR}
+.endif
+.if ${PORT_OPTIONS:MDOXYGEN}
+	@cd ${PREFIX} && \
+	${FIND} ${DOCSDIR:S|${PREFIX}/||} ! -type d >> ${TMPPLIST} && \
+	${FIND} ${DOCSDIR:S|${PREFIX}/||} -type d | ${SORT} -r | \
+	${SED} 's|^|@dirrm |' >> ${TMPPLIST}
 .endif
 
 .include <bsd.port.mk>
diff --git a/multimedia/lives/distinfo b/multimedia/lives/distinfo
index a7c2f698b982..55deaa09a14c 100644
--- a/multimedia/lives/distinfo
+++ b/multimedia/lives/distinfo
@@ -1,2 +1,2 @@
-SHA256 (LiVES-2.0.4.tar.bz2) = a01bbf82687f4c669955e54926e80e8fb6a758c782ed3f974cf48de6cfb64e3f
-SIZE (LiVES-2.0.4.tar.bz2) = 3515562
+SHA256 (LiVES-2.0.5.tar.bz2) = 28c75b035594f4a3490fb4f4dd419cc02912ca20ec456cbe957b226df2b24f78
+SIZE (LiVES-2.0.5.tar.bz2) = 3518054
diff --git a/multimedia/lives/files/patch-src__widget-helper.h b/multimedia/lives/files/patch-src__widget-helper.h
deleted file mode 100644
index 071509a7ac1c..000000000000
--- a/multimedia/lives/files/patch-src__widget-helper.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/widget-helper.h.orig	2013-05-08 16:51:04.000000000 +0200
-+++ src/widget-helper.h	2013-05-08 16:54:33.000000000 +0200
-@@ -82,7 +82,6 @@
- #define LIVES_ORIENTATION_VERTICAL   GTK_ORIENTATION_VERTICAL
- 
- typedef GdkEvent                          LiVESXEvent;
--typedef GdkEventButton                    LiVESXEventButton;
- typedef GdkDisplay                        LiVESXDisplay;
- typedef GdkScreen                         LiVESXScreen;
- typedef GdkDevice                         LiVESXDevice;