From owner-svn-ports-all@freebsd.org  Wed Mar 30 00:54:22 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0B736AE2999;
 Wed, 30 Mar 2016 00:54:22 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id B7A321BA3;
 Wed, 30 Mar 2016 00:54:21 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2U0sKha029421;
 Wed, 30 Mar 2016 00:54:20 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2U0sK7g029420;
 Wed, 30 Mar 2016 00:54:20 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201603300054.u2U0sK7g029420@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to
 amdmi3@FreeBSD.org using -f
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Wed, 30 Mar 2016 00:54:20 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r412151 - head/multimedia/dv2jpg
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 30 Mar 2016 00:54:22 -0000

Author: amdmi3
Date: Wed Mar 30 00:54:20 2016
New Revision: 412151
URL: https://svnweb.freebsd.org/changeset/ports/412151

Log:
  - Clarify LICENSE
  - Switch to options helpers

Modified:
  head/multimedia/dv2jpg/Makefile

Modified: head/multimedia/dv2jpg/Makefile
==============================================================================
--- head/multimedia/dv2jpg/Makefile	Wed Mar 30 00:53:57 2016	(r412150)
+++ head/multimedia/dv2jpg/Makefile	Wed Mar 30 00:54:20 2016	(r412151)
@@ -10,18 +10,17 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Convert Type-2 DV codec-encoded AVI streams to mjpeg-encoded AVI
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2+
 
 LIB_DEPENDS=	libdv.so:${PORTSDIR}/multimedia/libdv
 
 USE_GNOME=	gdkpixbuf
 MAKEFILE=	makefile
 
+PORTDOCS=	README.avilib README.dv2jpg.html
 PLIST_FILES=	bin/avijoin bin/dv2jpg
 
-PORTDOCS=	README.avilib README.dv2jpg.html
 OPTIONS_DEFINE=	DOCS
-
 OPTIONS_SINGLE=	VIDEO-FORMAT
 OPTIONS_SINGLE_VIDEO-FORMAT=	NTSC PAL
 OPTIONS_DEFAULT=	NTSC
@@ -30,27 +29,25 @@ VIDEO-FORMAT_DESC=	Use default video for
 NTSC_DESC=	Default video format NTSC
 PAL_DESC=	Default video format PAL
 
-.include <bsd.port.options.mk>
-
 post-extract:
-	${INSTALL_DATA} ${FILESDIR}/makefile ${WRKSRC}
-	${RM} ${WRKSRC}/avijoin ${WRKSRC}/dv2jpg ${WRKSRC}/*.o
+	@${INSTALL_DATA} ${FILESDIR}/makefile ${WRKSRC}
+	@${RM} ${WRKSRC}/avijoin ${WRKSRC}/dv2jpg ${WRKSRC}/*.o
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/opt/vidpb/lib/avilib.h|avilib.h|' \
 		${WRKSRC}/avijoin.c
 
-.if ${PORT_OPTIONS:MPAL}
+post-patch-PAL-on:
 	@${REINPLACE_CMD} -e 's|VIDEO=NTSC|# VIDEO=NTSC|; \
 		s|# VIDEO=PAL|VIDEO=PAL|' \
 		${WRKSRC}/${MAKEFILE}
-.endif
 
 do-install:
 .for f in avijoin dv2jpg
-	(cd ${WRKSRC} && ${INSTALL_PROGRAM} ${f} ${STAGEDIR}${PREFIX}/bin/)
+	${INSTALL_PROGRAM} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/bin/
 .endfor
 
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}