Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 16 Dec 2016 09:00:51 +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: r428659 - head/games/xlife
Message-ID:  <201612160900.uBG90pAT093269@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Fri Dec 16 09:00:51 2016
New Revision: 428659
URL: https://svnweb.freebsd.org/changeset/ports/428659

Log:
  - Switch to options helpers
  - Simplify installation

Modified:
  head/games/xlife/Makefile

Modified: head/games/xlife/Makefile
==============================================================================
--- head/games/xlife/Makefile	Fri Dec 16 09:00:44 2016	(r428658)
+++ head/games/xlife/Makefile	Fri Dec 16 09:00:51 2016	(r428659)
@@ -19,15 +19,16 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVER
 USES=		imake:notall tar:bzip2
 USE_XORG=	x11
 
-DESKTOP_ENTRIES="XLife" "" "${PORTNAME}" \
-		"${PORTNAME}" "Game;Simulation;" ""
-
-OPTIONS_DEFINE=	DOCS
 PORTDOCS=	*
-DOC_FILES=	CHANGES HACKING MISSED README \
-		SHORT-INFO XLIFE-HISTORY.dot
 
-.include <bsd.port.options.mk>
+DESKTOP_ENTRIES="XLife" \
+		"" \
+		"${PORTNAME}" \
+		"${PORTNAME}" \
+		"Game;Simulation;" \
+		""
+
+OPTIONS_DEFINE=	DOCS
 
 post-extract:
 	@${LN} -sf xlife.man ${WRKSRC}/xlife.6
@@ -46,22 +47,20 @@ post-patch:
 		's|GAWKPATH|${LOCALBASE}/bin/gawk|' ${WRKSRC}/table2r
 
 do-install:
-	(cd ${WRKSRC} && ${INSTALL_PROGRAM} gen-multirules xlife \
-		${STAGEDIR}${PREFIX}/bin)
-	@${LN} -sf xlife ${STAGEDIR}${PREFIX}/bin/lifeconv
-	(cd ${WRKSRC} && ${INSTALL_SCRIPT} table2r \
-		${STAGEDIR}${PREFIX}/bin)
-	(cd ${WRKSRC} && ${INSTALL_MAN} xlife.6 \
-		${STAGEDIR}${MAN6PREFIX}/man/man6)
-	@${LN} -sf xlife.6 ${STAGEDIR}${MAN6PREFIX}/man/man6/lifeconv.6
+	${INSTALL_PROGRAM} ${WRKSRC}/gen-multirules ${WRKSRC}/xlife ${STAGEDIR}${PREFIX}/bin
+	${LN} -sf xlife ${STAGEDIR}${PREFIX}/bin/lifeconv
+	${INSTALL_SCRIPT} ${WRKSRC}/table2r ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/xlife.6 ${STAGEDIR}${MAN6PREFIX}/man/man6
+	${LN} -sf xlife.6 ${STAGEDIR}${MAN6PREFIX}/man/man6/lifeconv.6
 	@${MKDIR} ${STAGEDIR}${DATADIR}/patterns
-	@(cd ${WRKSRC}/patterns && ${COPYTREE_SHARE} . \
-		${STAGEDIR}${DATADIR}/patterns)
+	@(cd ${WRKSRC}/patterns && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/patterns)
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	(cd ${WRKSRC} && ${INSTALL_DATA} ${DOC_FILES} \
-		${STAGEDIR}${DOCSDIR})
+.for f in CHANGES HACKING MISSED README SHORT-INFO XLIFE-HISTORY.dot
+	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
+.endfor
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/doc
-	@(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . \
-		${STAGEDIR}${DOCSDIR}/doc)
+	@(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/doc)
 
 .include <bsd.port.mk>



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