Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 1 Feb 2017 09:01:23 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r432993 - head/multimedia/vdr-plugin-xineliboutput
Message-ID:  <201702010901.v1191N0a078810@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Wed Feb  1 09:01:23 2017
New Revision: 432993
URL: https://svnweb.freebsd.org/changeset/ports/432993

Log:
  - Add LICENSE
  - Remove bogus HAVE_CONFIGURE
  - Don't install license with docs
  - Switch to options helpers

Modified:
  head/multimedia/vdr-plugin-xineliboutput/Makefile

Modified: head/multimedia/vdr-plugin-xineliboutput/Makefile
==============================================================================
--- head/multimedia/vdr-plugin-xineliboutput/Makefile	Wed Feb  1 08:13:10 2017	(r432992)
+++ head/multimedia/vdr-plugin-xineliboutput/Makefile	Wed Feb  1 09:01:23 2017	(r432993)
@@ -12,43 +12,36 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:sn
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Video Disk Recorder - xineliboutput plugin/viewer
 
-LIB_DEPENDS+=	libxine.so:multimedia/libxine \
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+LIB_DEPENDS=	libxine.so:multimedia/libxine \
 		libavutil.so:multimedia/ffmpeg \
 		libdbus-glib-1.so:devel/dbus-glib \
 		libvdpau.so:multimedia/libvdpau
 
 PATCH_STRIP=	-p1
 USES=		pkgconfig tar:bzip2
-USE_XORG+=	xrandr xrender
+USE_XORG=	xrandr xrender
+HAS_CONFIGURE=	yes
+CONFIGURE_ARGS=	--cc="${CC}" --cxx="${CXX}" --add-cflags=-I${VDRDIR}
 USE_GL=		gl glu glut
-PORTDOCS=	COPYING README HISTORY
-PORTEXAMPLES=	xine
 WRKSRC=		${WRKDIR}/vdr-${PLUGIN}
-XINE_PLUGINSDIR=	lib/xine/plugins/2.5
-
-OPTIONS_DEFINE=	LIBBLURAY LIBEXTRACTOR EXAMPLES DOCS
-
-HAS_CONFIGURE=	yes
+XINE_PLUGINSDIR=lib/xine/plugins/2.5
 
-.include	"${.CURDIR}/../vdr/Makefile.plugins"
+PORTDOCS=	README HISTORY
+PORTEXAMPLES=	xine
 
-.include <bsd.port.pre.mk>
+PLIST_SUB=	XINE_PLUGINSDIR=${XINE_PLUGINSDIR}
 
-PLIST_SUB+=	XINE_PLUGINSDIR=${XINE_PLUGINSDIR}
+OPTIONS_DEFINE=	LIBBLURAY LIBEXTRACTOR EXAMPLES DOCS
 
-CONFIGURE_ARGS+=	--cc="${CC}" --cxx="${CXX}" --add-cflags=-I${VDRDIR}
+LIBEXTRACTOR_LIB_DEPENDS=	libextractor.so:textproc/libextractor
+LIBEXTRACTOR_CONFIGURE_ENABLE=	libextractor
+LIBBLURAY_LIB_DEPENDS=		libbluray.so:multimedia/libbluray
+LIBBLURAY_CONFIGURE_ENABLE=	libbluray
 
-.if ${PORT_OPTIONS:MLIBEXTRACTOR}
-LIB_DEPENDS+=	libextractor.so:textproc/libextractor
-.else
-CONFIGURE_ARGS+=	--disable-libextractor
-.endif
-
-.if ${PORT_OPTIONS:MLIBBLURAY}
-LIB_DEPENDS+=	libbluray.so:multimedia/libbluray
-.else
-CONFIGURE_ARGS+=	--disable-libbluray
-.endif
+.include	"${.CURDIR}/../vdr/Makefile.plugins"
 
 post-patch: post-patch-plugin
 # clang doesn't know -MG
@@ -56,19 +49,19 @@ post-patch: post-patch-plugin
 		${WRKSRC}/black_720x576.c ${WRKSRC}/vdrlogo_720x576.c
 
 pre-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/lib/vdr
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/vdr
 
 post-install: post-install-pluginlocales
-	${MKDIR} ${STAGEDIR}${PREFIX}/etc/vdr/plugins/${PLUGIN}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/vdr/plugins/${PLUGIN}
 	${INSTALL_DATA} ${WRKSRC}/examples/allowed_hosts.conf \
 		${STAGEDIR}${PREFIX}/etc/vdr/plugins/${PLUGIN}/allowed_hosts.conf.sample
-.if ${PORT_OPTIONS:MEXAMPLES}
-	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/xine
+
+post-install-EXAMPLES-on:
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/xine
 	${INSTALL_DATA} ${FILESDIR}/keymap ${STAGEDIR}${EXAMPLESDIR}/xine
-.endif
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
+
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
-.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201702010901.v1191N0a078810>