svn commit: r408322 - head/graphics/pngcheck

[Dmitry Marakasov]

Author: amdmi3
Date: Sat Feb  6 23:17:10 2016
New Revision: 408322
URL: https://svnweb.freebsd.org/changeset/ports/408322

Log:
  - Fix license
  - Switch to options helpers

Modified:
  head/graphics/pngcheck/Makefile

Modified: head/graphics/pngcheck/Makefile
==============================================================================
--- head/graphics/pngcheck/Makefile	Sat Feb  6 23:16:55 2016	(r408321)
+++ head/graphics/pngcheck/Makefile	Sat Feb  6 23:17:10 2016	(r408322)
@@ -10,25 +10,27 @@ MASTER_SITES=	SF/png-mng/${PORTNAME}/${P
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Checks the integrity of PNG images
 
-LICENSE=	MIT GPLv2
-LICENSE_COMB=	dual
+LICENSE=	MIT GPLv2+
+LICENSE_COMB=	multi
+LICENSE_FILE_GPLv2+ =	${WRKSRC}/gpl/COPYING
 
 MAKEFILE=	Makefile.unx
 MAKE_ARGS=	CC="${CC}" LD="${CC}" CFLAGS="${CFLAGS} -DUSE_ZLIB" LIBS="-lz"
 
 PORTDOCS=	CHANGELOG README
 
-OPTIONS_DEFINE=	DOCS
-
 PLIST_FILES=	bin/pngcheck \
 		bin/pngsplit \
 		bin/png-fix-IDAT-windowsize
 
+OPTIONS_DEFINE=	DOCS
+
 do-install:
 .for f in pngcheck pngsplit png-fix-IDAT-windowsize
 	${INSTALL_PROGRAM} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/bin/
 .endfor
 
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}