From owner-svn-ports-all@freebsd.org  Sun Feb  7 12:02:04 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 C314BAA020D;
 Sun,  7 Feb 2016 12:02:04 +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 7B907FF6;
 Sun,  7 Feb 2016 12:02:04 +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 u17C23nC049194;
 Sun, 7 Feb 2016 12:02:03 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u17C23uY049193;
 Sun, 7 Feb 2016 12:02:03 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201602071202.u17C23uY049193@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: Sun, 7 Feb 2016 12:02:03 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r408389 - head/graphics/rayshade
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.20
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: Sun, 07 Feb 2016 12:02:04 -0000

Author: amdmi3
Date: Sun Feb  7 12:02:03 2016
New Revision: 408389
URL: https://svnweb.freebsd.org/changeset/ports/408389

Log:
  - Add LICENSE; commercial distribution is not allowed
  - Switch to options helpers

Modified:
  head/graphics/rayshade/Makefile

Modified: head/graphics/rayshade/Makefile
==============================================================================
--- head/graphics/rayshade/Makefile	Sun Feb  7 11:59:48 2016	(r408388)
+++ head/graphics/rayshade/Makefile	Sun Feb  7 12:02:03 2016	(r408389)
@@ -3,21 +3,24 @@
 
 PORTNAME=	rayshade
 PORTVERSION=	4.0.6
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	graphics
 MASTER_SITES=	http://ccl.net/cca/software/SOURCES/C/rayshade/ \
 		http://www.mirrorservice.org/sites/graphics.stanford.edu/pub/rayshade/ \
 		ftp://graphics.stanford.edu/pub/rayshade/
-DISTFILES=	${PORTNAME}.${PORTVERSION}.tar.Z ${GUIDE_PS_Z}
+DISTFILES=	${PORTNAME}.${PORTVERSION}.tar.Z
 DIST_SUBDIR=	rayshade
 EXTRACT_ONLY=	${PORTNAME}.${PORTVERSION}.tar.Z
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Extensible system for creating ray-traced images
 
-BUILD_DEPENDS=	$(LOCALBASE)/lib/librle.a:${PORTSDIR}/graphics/urt
+LICENSE=	rayshade
+LICENSE_NAME=	Rayshade license
+LICENSE_FILE=	${WRKSRC}/Doc/Copyright
+LICENSE_PERMS=	dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept
 
-OPTIONS_DEFINE=	DOCS EXAMPLES
+BUILD_DEPENDS=	$(LOCALBASE)/lib/librle.a:${PORTSDIR}/graphics/urt
 
 WRKSRC=		${WRKDIR}/${PORTNAME}.${PORTVERSION:R}
 
@@ -29,11 +32,10 @@ PORTDOCS=	*
 PORTEXAMPLES=	*
 PLIST_FILES=	bin/rayshade
 
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=	DOCS EXAMPLES
+DOCS_DISTFILES=	guide.ps.Z
 
-.if ${PORT_OPTIONS:MDOCS}
-GUIDE_PS_Z=	guide.ps.Z
-.endif
+.include <bsd.port.options.mk>
 
 .if defined(BATCH) || defined(PACKAGE_BUILDING)
 CONFIGURE_ARGS=	< ${WRKDIR}/config.ans
@@ -48,15 +50,16 @@ pre-configure:
 		< ${FILESDIR}/config.ans > ${WRKDIR}/config.ans
 
 do-install:
-	(cd ${WRKSRC}/rayshade && ${INSTALL_PROGRAM} rayshade \
-		${STAGEDIR}${PREFIX}/bin)
-.if ${PORT_OPTIONS:MDOCS}
+	${INSTALL_PROGRAM} ${WRKSRC}/rayshade/rayshade \
+		${STAGEDIR}${PREFIX}/bin
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	(cd ${DISTDIR}/${DIST_SUBDIR} && ${INSTALL_DATA} ${GUIDE_PS_Z} \
-		${STAGEDIR}${DOCSDIR})
-.endif
+	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/guide.ps.Z \
+		${STAGEDIR}${DOCSDIR}
+
+do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	(cd ${WRKSRC}/Examples && ${INSTALL_DATA} * \
-		${STAGEDIR}${EXAMPLESDIR})
+	${INSTALL_DATA} ${WRKSRC}/Examples/* ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>