Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 23 Sep 2016 09:01:40 +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: r422658 - head/games/burrtools
Message-ID:  <201609230901.u8N91ebt064741@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Fri Sep 23 09:01:40 2016
New Revision: 422658
URL: https://svnweb.freebsd.org/changeset/ports/422658

Log:
  - Fix LICENSE
  - Simplify installation
  - Switch to options helpers

Modified:
  head/games/burrtools/Makefile

Modified: head/games/burrtools/Makefile
==============================================================================
--- head/games/burrtools/Makefile	Fri Sep 23 09:01:30 2016	(r422657)
+++ head/games/burrtools/Makefile	Fri Sep 23 09:01:40 2016	(r422658)
@@ -10,7 +10,7 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Puzzle solver
 
-LICENSE=	GPLv3
+LICENSE=	GPLv2+ # COPYING is GPLv3
 
 BUILD_DEPENDS=	netpbm>0:graphics/netpbm
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
@@ -34,7 +34,7 @@ PLIST_FILES=	bin/burrTxt bin/burrTxt2 bi
 
 DESKTOP_ENTRIES="BurrGui" "" "burricons" "burrGui" "Game;LogicGame;" ""
 
-OPTIONS_DEFINE=		DOCS EXAMPLES
+OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-patch:
 	@${REINPLACE_CMD} -e '/GL_X_LIBS/d' ${WRKSRC}/configure
@@ -47,17 +47,18 @@ post-build:
 		pnmtopng -transparent=black > burricons.png)
 
 do-install:
-	(cd ${WRKSRC}/src && ${INSTALL_PROGRAM} burrTxt burrTxt2 \
-		${STAGEDIR}${PREFIX}/bin)
-	(cd ${WRKSRC}/src/gui && ${INSTALL_PROGRAM} burrGui \
-		${STAGEDIR}${PREFIX}/bin)
-	(cd ${WRKSRC} && ${INSTALL_DATA} burricons.png \
-		${STAGEDIR}${PREFIX}/share/pixmaps)
+	${INSTALL_PROGRAM} ${WRKSRC}/src/burrTxt ${WRKSRC}/src/burrTxt2 \
+		${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/src/gui/burrGui ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/burricons.png ${STAGEDIR}${PREFIX}/share/pixmaps
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in AUTHORS ChangeLog NEWS README
-	(cd ${WRKSRC} && ${INSTALL_DATA} ${i} \
-		${STAGEDIR}${DOCSDIR})
+	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
+
+do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	@(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . \
 		${STAGEDIR}${EXAMPLESDIR})



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