Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 13 Oct 2016 09:03:45 +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: r423904 - head/multimedia/dvdauthor
Message-ID:  <201610130903.u9D93jgl054073@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Thu Oct 13 09:03:45 2016
New Revision: 423904
URL: https://svnweb.freebsd.org/changeset/ports/423904

Log:
  - Fix LICENSE
  - Switch to USES=localbase
  - Cosmetic fixes
  - Switch to options helpers
  - Fix options
  - Simplify docs installation

Modified:
  head/multimedia/dvdauthor/Makefile

Modified: head/multimedia/dvdauthor/Makefile
==============================================================================
--- head/multimedia/dvdauthor/Makefile	Thu Oct 13 08:15:35 2016	(r423903)
+++ head/multimedia/dvdauthor/Makefile	Thu Oct 13 09:03:45 2016	(r423904)
@@ -10,7 +10,8 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Makes a DVD file structure from one or more MPEG2 streams
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libdvdread.so:multimedia/libdvdread \
 		libfribidi.so:converters/fribidi \
@@ -21,55 +22,35 @@ LIB_DEPENDS=	libdvdread.so:multimedia/li
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-USES=		gmake iconv pkgconfig
+USES=		gmake iconv localbase pkgconfig
 USE_GNOME=	libxml2
 GNU_CONFIGURE=	yes
-CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
 
-PORTDOCS=	*
-
-DOCSRCDIR1=	${WRKSRC}
-DOC_FILES1=	AUTHORS ChangeLog README
-
-DOCSRCDIR2=	${WRKDIR}
-DOC_FILES2=	README.FreeBSD
+SUB_FILES=	README.FreeBSD
 
-OPTIONS_DEFINE=	DOCS IMAGEMAGICK VIDEO-FORMAT
+PORTDOCS=	*
 
-OPTIONS_SINGLE=	VIDEO-FORMAT
-OPTIONS_SINGLE_VIDEO-FORMAT=	NTSC PAL
+OPTIONS_DEFINE=	DOCS IMAGEMAGICK
+OPTIONS_RADIO=	VIDEO-FORMAT
+OPTIONS_RADIO_VIDEO-FORMAT=	NTSC PAL
 
 VIDEO-FORMAT_DESC=	Use default video format
 NTSC_DESC=	Default video format NTSC
 PAL_DESC=	Default video format PAL
 
-SUB_FILES=	README.FreeBSD
-
 IMAGEMAGICK_LIB_DEPENDS=	libMagick++-6.so:graphics/ImageMagick
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNTSC}
-.if ${PORT_OPTIONS:MVIDEO-FORMAT}
-CONFIGURE_ENV+=	--enable-default-video-format=NTSC
-.endif
-.endif
-
-.if ${PORT_OPTIONS:MPAL}
-.if ${PORT_OPTIONS:MVIDEO-FORMAT}
-CONFIGURE_ENV+=	--enable-default-video-format=PAL
-.endif
-.endif
+NTSC_CONFIGURE_ON=	--enable-default-video-format=NTSC
+PAL_CONFIGURE_ON=	--enable-default-video-format=PAL
 
-pre-configure:
-.if ! ${PORT_OPTIONS:MIMAGEMAGICK}
+pre-configure-IMAGEMAGICK-off:
 	@${REINPLACE_CMD} 's|usemagick=1|usemagick=0|g' \
 		${WRKSRC}/configure
-.endif
 
-post-install:
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${DOC_FILES2:S|^|${DOCSRCDIR2}/|} ${STAGEDIR}${DOCSDIR}
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} \
+		${WRKSRC}/AUTHORS ${WRKSRC}/ChangeLog ${WRKSRC}/README \
+		${WRKDIR}/README.FreeBSD ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>



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