From owner-svn-ports-all@freebsd.org  Thu Mar 31 18:58:19 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 2E3D6AE47DF;
 Thu, 31 Mar 2016 18:58:19 +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 00BED1358;
 Thu, 31 Mar 2016 18:58:18 +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 u2VIwIQp005488;
 Thu, 31 Mar 2016 18:58:18 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2VIwIew005487;
 Thu, 31 Mar 2016 18:58:18 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201603311858.u2VIwIew005487@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: Thu, 31 Mar 2016 18:58:18 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r412286 - head/graphics/box
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: Thu, 31 Mar 2016 18:58:19 -0000

Author: amdmi3
Date: Thu Mar 31 18:58:18 2016
New Revision: 412286
URL: https://svnweb.freebsd.org/changeset/ports/412286

Log:
  - Fix license
  - Switch to new test framework
  - Switch to options helpers

Modified:
  head/graphics/box/Makefile

Modified: head/graphics/box/Makefile
==============================================================================
--- head/graphics/box/Makefile	Thu Mar 31 18:55:22 2016	(r412285)
+++ head/graphics/box/Makefile	Thu Mar 31 18:58:18 2016	(r412286)
@@ -11,8 +11,8 @@ DIST_SUBDIR=	box
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Compiler for box, the figure description language
 
-LICENSE=	GPLv2 LGPL3
-LICENSE_COMB=	dual
+LICENSE=	GPLv2+ LGPL3+
+LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	docbook-to-man:${PORTSDIR}/textproc/docbook-to-man
 LIB_DEPENDS=	libcairo.so:${PORTSDIR}/graphics/cairo
@@ -23,24 +23,23 @@ CONFIGURE_ARGS=	--with-cairo
 USE_LDCONFIG=	yes
 MAKE_JOBS_UNSAFE=yes
 MAKE_ENV=	INSTALL_STRIP_FLAG=${STRIP}
+TEST_TARGET=	check
 
 PORTDOCS=	AUTHORS ChangeLog README STYLE
 PORTEXAMPLES=	*
 
-OPTIONS_DEFINE=	DOCS EXAMPLES
+PLIST_SUB=	PLIST_VER=${PORTVERSION:R}
 
-PLIST_SUB+=	PLIST_VER=${PORTVERSION:R}
+OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-patch:
 	${TOUCH} ${WRKSRC}/man/${PORTNAME}.sgml
 
-post-install:
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
+post-install-EXAMPLES-on:
 	@(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
 
-regression-test: build
-	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} check)
-
 .include <bsd.port.mk>