Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 1 Dec 2017 12:02:10 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r455279 - head/graphics/aoi
Message-ID:  <201712011202.vB1C2AfW018124@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Fri Dec  1 12:02:09 2017
New Revision: 455279
URL: https://svnweb.freebsd.org/changeset/ports/455279

Log:
  - Add LICENSE_FILE
  - Simplify documentation installation
  - Switch to options helpers

Modified:
  head/graphics/aoi/Makefile

Modified: head/graphics/aoi/Makefile
==============================================================================
--- head/graphics/aoi/Makefile	Fri Dec  1 11:54:35 2017	(r455278)
+++ head/graphics/aoi/Makefile	Fri Dec  1 12:02:09 2017	(r455279)
@@ -14,11 +14,12 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Open source Java written 3D modelling and rendering studio
 
 LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libjogl.so:graphics/jogl
 
-USES=		dos2unix zip
-DOS2UNIX_FILES=	../AoI_Manual/*.html
+USES=		zip
+DOS2UNIX_FILES=	../AoI_Manual/*.html # USES=dos2unix is optional
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 NO_BUILD=	yes
@@ -28,29 +29,20 @@ DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 
 PORTDOCS=	*
 
-DOCSRCDIR1=	${WRKSRC}
-DOC_FILES1=	HISTORY README
-
-DOCSRCDIR2=	${WRKDIR}/AoI_Manual
-DOCSDIR2=	${DOCSDIR}/AoI_Manual
-DOC_FILES2=	*
-
-OPTIONS_DEFINE= DOCS
-
 SUB_FILES=	${PORTNAME} pkg-deinstall pkg-message
 
 DESKTOP_ENTRIES="Art of Illusion" "3D modelling and rendering studio" \
 		"${PORTNAME}" "${PORTNAME}" "Graphics;3DGraphics;" ""
 
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE= DOCS
 
-.if ${PORT_OPTIONS:MDOCS}
-DISTFILES+=	manual${PORTVERSION}${EXTRACT_SUFX}:docs
-post-extract:
+DOCS_DISTFILES=	manual${PORTVERSION}${EXTRACT_SUFX}:docs
+DOCS_USES=	dos2unix
+
+post-extract-DOCS-on:
 	@(cd ${WRKDIR} && ${MV} "AoI Manual" AoI_Manual)
-.endif
 
-post-patch::
+post-patch:
 	@(cd ${WRKSRC} && ${RM} "Textures and Materials/Library/.DS_Store")
 
 do-install:
@@ -65,10 +57,9 @@ do-install:
 	${LN} -sf ${DATADIR}/Icons/48x48.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png
 
-.if ${PORT_OPTIONS:MDOCS}
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${STAGEDIR}${DOCSDIR}
-	@(cd ${WRKDIR}/AoI_Manual && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR2})
-.endif
+	cd ${WRKSRC} && ${INSTALL_DATA} HISTORY README ${STAGEDIR}${DOCSDIR}
+	cd ${WRKDIR} && ${COPYTREE_SHARE} "AoI_Manual" ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201712011202.vB1C2AfW018124>