- Clarify LICENSE

- Switch to options helpers

1 files changed, 7 insertions, 10 deletions

diff --git a/multimedia/dv2jpg/Makefile b/multimedia/dv2jpg/Makefile
index 92bd6a2bd640..4c6624d81fce 100644
--- a/multimedia/dv2jpg/Makefile
+++ b/multimedia/dv2jpg/Makefile
@@ -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 format
 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}