svn commit: r395558 - in head: . devel devel/ninja devel/ninja/files devel/ninja16

[Grzegorz Blach]

Author: gblach
Date: Sat Aug 29 14:40:37 2015
New Revision: 395558
URL: https://svnweb.freebsd.org/changeset/ports/395558

Log:
  - Update devel/ninja to 1.6.0
  - Remove devel/ninja16
  - Replace files/patch-configure.py with REINPLACE_CMD
  - Move share/doc/ninja/COPYING
    to share/licenses/ninja-${PKGVERSION}/APACHE20

Deleted:
  head/devel/ninja/files/
  head/devel/ninja16/
Modified:
  head/MOVED
  head/devel/Makefile
  head/devel/ninja/Makefile
  head/devel/ninja/distinfo

Modified: head/MOVED
==============================================================================
--- head/MOVED	Sat Aug 29 14:07:15 2015	(r395557)
+++ head/MOVED	Sat Aug 29 14:40:37 2015	(r395558)
@@ -7849,3 +7849,4 @@ print/ghostscript9-nox11|print/ghostscri
 print/ghostscript9-agpl|print/ghostscript9-agpl-base|2015-08-22|Split into print/ghostscript9-agpl-base and print/ghostscript9-agpl-x11
 print/ghostscript9-agpl-nox11|print/ghostscript9-agpl-base|2015-08-22|Integrated into print/ghostscript9-agpl-base
 www/pelican|www/py-pelican|2015-08-29|Rename to match Python naming conventions
+devel/ninja16|devel/ninja|2015-08-29|Use devel/ninja instead

Modified: head/devel/Makefile
==============================================================================
--- head/devel/Makefile	Sat Aug 29 14:07:15 2015	(r395557)
+++ head/devel/Makefile	Sat Aug 29 14:40:37 2015	(r395558)
@@ -1486,7 +1486,6 @@
     SUBDIR += nini
     SUBDIR += ninja
     SUBDIR += ninja-ide
-    SUBDIR += ninja16
     SUBDIR += node-thrift
     SUBDIR += notify-sharp
     SUBDIR += noweb

Modified: head/devel/ninja/Makefile
==============================================================================
--- head/devel/ninja/Makefile	Sat Aug 29 14:07:15 2015	(r395557)
+++ head/devel/ninja/Makefile	Sat Aug 29 14:40:37 2015	(r395558)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ninja
-PORTVERSION=	1.5.3
+PORTVERSION=	1.6.0
 DISTVERSIONPREFIX=	v
 PORTEPOCH=	2
 CATEGORIES=	devel
@@ -11,6 +11,7 @@ MAINTAINER=	gblach at FreeBSD.org
 COMMENT=	Ninja is a small build system closest in spirit to Make
 
 LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	martine
@@ -19,10 +20,13 @@ CONFLICTS=	irc/ninja-[0-9]*
 USES=		python:build
 
 PLIST_FILES=	bin/ninja
-PORTDOCS=	COPYING HACKING.md README manual.asciidoc
+PORTDOCS=	HACKING.md README manual.asciidoc
 
 OPTIONS_DEFINE=	DOCS
 
+post-patch:
+	@${REINPLACE_CMD} "s/'-g', //" ${WRKSRC}/configure.py
+
 do-build:
 	@(cd ${WRKSRC} && \
 		CXX="${CXX}" CFLAGS="${CXXFLAGS}" ${PYTHON_CMD} configure.py --bootstrap)
@@ -31,7 +35,7 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ninja ${STAGEDIR}${PREFIX}/bin
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC} && \
-	    ${INSTALL_DATA} COPYING HACKING.md README doc/manual.asciidoc \
+	    ${INSTALL_DATA} HACKING.md README doc/manual.asciidoc \
 	    ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>

Modified: head/devel/ninja/distinfo
==============================================================================
--- head/devel/ninja/distinfo	Sat Aug 29 14:07:15 2015	(r395557)
+++ head/devel/ninja/distinfo	Sat Aug 29 14:40:37 2015	(r395558)
@@ -1,2 +1,2 @@
-SHA256 (martine-ninja-v1.5.3_GH0.tar.gz) = 7c953b5a7c26cfcd082882e3f3e2cd08fee8848ad228bb47223b18ea18777ec0
-SIZE (martine-ninja-v1.5.3_GH0.tar.gz) = 168829
+SHA256 (martine-ninja-v1.6.0_GH0.tar.gz) = b43e88fb068fe4d92a3dfd9eb4d19755dae5c33415db2e9b7b61b4659009cde7
+SIZE (martine-ninja-v1.6.0_GH0.tar.gz) = 174501