From owner-svn-ports-all@FreeBSD.ORG  Tue Jan  7 08:16:26 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 1F3C2E6D;
 Tue,  7 Jan 2014 08:16:26 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 0BA6B1D50;
 Tue,  7 Jan 2014 08:16:26 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s078GP1f000987;
 Tue, 7 Jan 2014 08:16:25 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s078GPgg000986;
 Tue, 7 Jan 2014 08:16:25 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201401070816.s078GPgg000986@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Tue, 7 Jan 2014 08:16:25 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r338981 - head/devel/ninja
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.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 07 Jan 2014 08:16:26 -0000

Author: bapt
Date: Tue Jan  7 08:16:25 2014
New Revision: 338981
URL: http://svnweb.freebsd.org/changeset/ports/338981

Log:
  Make python only a build dependency
  While here do not conditionnalize docs installation the avoid double .include
  and stage make sure DOCS is respected

Modified:
  head/devel/ninja/Makefile

Modified: head/devel/ninja/Makefile
==============================================================================
--- head/devel/ninja/Makefile	Tue Jan  7 08:04:09 2014	(r338980)
+++ head/devel/ninja/Makefile	Tue Jan  7 08:16:25 2014	(r338981)
@@ -3,6 +3,7 @@
 
 PORTNAME=	ninja
 PORTVERSION=	1.4.0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	devel
 
@@ -17,24 +18,20 @@ GH_TAGNAME=	v${PORTVERSION}
 GH_COMMIT=	63d5b10
 
 CONFLICTS=	irc/ninja-[0-9]*
-USE_PYTHON=	yes
+USE_PYTHON_BUILD=	yes
 
 PLIST_FILES=	bin/ninja
 PORTDOCS=	COPYING HACKING.md README manual.asciidoc
 
-.include <bsd.port.options.mk>
-
 do-build:
 	@(cd ${WRKSRC} && \
 		CXX=${CXX} CFLAGS="${CXXFLAGS}" ${PYTHON_CMD} bootstrap.py --verbose)
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/ninja ${STAGEDIR}${PREFIX}/bin
-.if ${PORT_OPTIONS:MDOCS}
+	${INSTALL_PROGRAM} ${WRKSRC}/ninja ${STAGEDIR}${PREFIX}/bin
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	@(cd ${WRKSRC} && \
+	(cd ${WRKSRC} && \
 	    ${INSTALL_DATA} COPYING HACKING.md README doc/manual.asciidoc \
 	    ${STAGEDIR}${DOCSDIR})
-.endif
 
 .include <bsd.port.mk>