From owner-svn-ports-head@freebsd.org  Sat Feb  6 23:20:13 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@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 32587A9F399;
 Sat,  6 Feb 2016 23:20:13 +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 05837156B;
 Sat,  6 Feb 2016 23:20:12 +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 u16NKB4E020398;
 Sat, 6 Feb 2016 23:20:11 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u16NKB9j020397;
 Sat, 6 Feb 2016 23:20:11 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201602062320.u16NKB9j020397@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: Sat, 6 Feb 2016 23:20:11 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r408328 - head/graphics/separate
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 06 Feb 2016 23:20:13 -0000

Author: amdmi3
Date: Sat Feb  6 23:20:11 2016
New Revision: 408328
URL: https://svnweb.freebsd.org/changeset/ports/408328

Log:
  - Clarify LICENSE
  - Add LICENSE_FILE
  - Switch to options helpers
  - Don't cat pkg-message from Makefile

Modified:
  head/graphics/separate/Makefile

Modified: head/graphics/separate/Makefile
==============================================================================
--- head/graphics/separate/Makefile	Sat Feb  6 23:20:05 2016	(r408327)
+++ head/graphics/separate/Makefile	Sat Feb  6 23:20:11 2016	(r408328)
@@ -12,9 +12,8 @@ DISTNAME=	${PORTNAME}+-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	CMYK plugin for The GIMP
 
-LICENSE=	GPLv2
-
-OPTIONS_DEFINE=	DOCS EXAMPLES
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	gccmakedep:${PORTSDIR}/devel/gccmakedep
 LIB_DEPENDS=	liblcms.so.1:${PORTSDIR}/graphics/lcms \
@@ -35,10 +34,10 @@ PLIST_FILES+=	share/locale/${lang}/LC_ME
 PORTDOCS=	README*
 PORTEXAMPLES=	qproof.scm qexport.scm
 
-MAKE_ENV+=	TARGETS="${BIN_TARGETS}" \
+MAKE_ENV=	TARGETS="${BIN_TARGETS}" \
 		PREFIX=${STAGEDIR}${PREFIX}
 
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-patch:
 	@${REINPLACE_CMD} \
@@ -53,15 +52,14 @@ do-install:
 .for lang in ${L10N_TARGETS}
 	${INSTALL_DATA} ${WRKSRC}/po/${lang}.gmo ${STAGEDIR}${PREFIX}/share/locale/${lang}/LC_MESSAGES/gimp20-separate.mo
 .endfor
-.if ${PORT_OPTIONS:MDOCS}
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
-.endif
-.if ${PORT_OPTIONS:MEXAMPLES}
+
+do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/sample-scripts && \
-	    ${INSTALL_DATA} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR}
-.endif
-	@${CAT} pkg-message
+		${INSTALL_DATA} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>