Attachment 160346 Details for Bug 202652 – ninja.diff

[patch] ninja.diff

ninja.diff (text/plain), 9.69 KB, created by Grzegorz Blach on 2015-08-25 11:57:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Grzegorz Blach

Created: 2015-08-25 11:57:47 UTC

Size: 9.69 KB

patch

obsolete

>Index: MOVED
>===================================================================
>--- MOVED	(revision 395194)
>+++ MOVED	(working copy)
>@@ -7848,3 +7848,4 @@
> print/ghostscript9-nox11|print/ghostscript9-base|2015-08-22|Integrated into print/ghostscript9-base
> 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
>+devel/ninja16|devel/ninja|2015-08-25|Use devel/ninja instead
>Index: Mk/Uses/ninja.mk
>===================================================================
>--- Mk/Uses/ninja.mk	(revision 395194)
>+++ Mk/Uses/ninja.mk	(working copy)
>@@ -3,7 +3,7 @@
> # Provide support to use Ninja
> #
> # Feature:		ninja
>-# Usage:		USES=ninja
>+# Usage:		USES=ninja[:15]
> #
> # User defined variables:
> # NINJA_VERBOSE		- Enable verbose output.
>@@ -13,19 +13,15 @@
> .if !defined(_INCLUDE_USES_NINJA_MK)
> _INCLUDE_USES_NINJA_MK=	yes
> 
>-.if !empty(ninja_ARGS)
>-IGNORE=	Incorrect 'USES+= ninja:${ninja_ARGS}' ninja takes no arguments
>-.endif
>-
> .if defined(NINJA_VERBOSE)
> MAKE_ARGS+=	-v
> .endif
> 
>-BUILD_DEPENDS+=	ninja:${PORTSDIR}/devel/ninja
>+BUILD_DEPENDS+= ninja${ninja_ARGS}:${PORTSDIR}/devel/ninja${ninja_ARGS}
> 
>-CMAKE_ARGS+=	-GNinja
>+CMAKE_ARGS+=    -GNinja -DCMAKE_MAKE_PROGRAM:STRING="${MAKE_CMD}"
> MAKEFILE=
>-MAKE_CMD=	ninja
>+MAKE_CMD=	ninja${ninja_ARGS}
> MAKE_FLAGS=
> # Set a minimal job of 1
> _MAKE_JOBS=	-j${MAKE_JOBS_NUMBER}
>Index: devel/Makefile
>===================================================================
>--- devel/Makefile	(revision 395194)
>+++ devel/Makefile	(working copy)
>@@ -1485,7 +1485,7 @@
>     SUBDIR += nini
>     SUBDIR += ninja
>     SUBDIR += ninja-ide
>-    SUBDIR += ninja16
>+    SUBDIR += ninja15
>     SUBDIR += node-thrift
>     SUBDIR += notify-sharp
>     SUBDIR += noweb
>Index: devel/ninja/Makefile
>===================================================================
>--- devel/ninja/Makefile	(revision 395194)
>+++ devel/ninja/Makefile	(working copy)
>@@ -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 @@
> COMMENT=	Ninja is a small build system closest in spirit to Make
> 
> LICENSE=	APACHE20
>+LICENSE_FILE=	${WRKSRC}/COPYING
> 
> USE_GITHUB=	yes
> GH_ACCOUNT=	martine
>@@ -18,20 +19,24 @@
> CONFLICTS=	irc/ninja-[0-9]*
> USES=		python:build
> 
>-PLIST_FILES=	bin/ninja
>-PORTDOCS=	COPYING HACKING.md README manual.asciidoc
>+PLIST_FILES=	bin/${PKGBASE}
>+PORTDOCS=	HACKING.md README manual.asciidoc
>+DOCSDIR=	${PREFIX}/share/doc/${PKGBASE}
> 
> 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)
> 
> do-install:
>-	${INSTALL_PROGRAM} ${WRKSRC}/ninja ${STAGEDIR}${PREFIX}/bin
>+	${INSTALL_PROGRAM} ${WRKSRC}/ninja ${STAGEDIR}${PREFIX}/bin/${PKGBASE}
> 	@${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>
>Index: devel/ninja/distinfo
>===================================================================
>--- devel/ninja/distinfo	(revision 395194)
>+++ devel/ninja/distinfo	(working copy)
>@@ -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
>Index: devel/ninja/files/patch-configure.py
>===================================================================
>--- devel/ninja/files/patch-configure.py	(revision 395194)
>+++ devel/ninja/files/patch-configure.py	(working copy)
>@@ -1,20 +0,0 @@
>---- configure.py.orig	2014-11-24 18:37:47.000000000 +0100
>-+++ configure.py	2015-01-18 21:26:42.000000000 +0100
>-@@ -164,7 +164,7 @@
>-         """Run a subcommand, quietly.  Prints the full command on error."""
>-         try:
>-             subprocess.check_call(cmdline, shell=True)
>--        except subprocess.CalledProcessError, e:
>-+        except subprocess.CalledProcessError:
>-             print('when running: ', cmdline)
>-             raise
>- 
>-@@ -297,7 +297,7 @@
>-         cflags += ['/Ox', '/DNDEBUG', '/GL']
>-         ldflags += ['/LTCG', '/OPT:REF', '/OPT:ICF']
>- else:
>--    cflags = ['-g', '-Wall', '-Wextra',
>-+    cflags = ['-Wall', '-Wextra',
>-               '-Wno-deprecated',
>-               '-Wno-unused-parameter',
>-               '-fno-rtti',
>Index: devel/ninja15/Makefile
>===================================================================
>--- devel/ninja15/Makefile	(revision 395175)
>+++ devel/ninja15/Makefile	(working copy)
>@@ -1,37 +1,9 @@
> # Created by: Grzegorz Blach <gblach@FreeBSD.org>
> # $FreeBSD$
> 
>-PORTNAME=	ninja
> PORTVERSION=	1.5.3
>-DISTVERSIONPREFIX=	v
>-PORTEPOCH=	2
>-CATEGORIES=	devel
>+PKGNAMESUFFIX=	15
> 
>-MAINTAINER=	gblach@FreeBSD.org
>-COMMENT=	Ninja is a small build system closest in spirit to Make
>+DESCR=		../ninja/pkg-descr
> 
>-LICENSE=	APACHE20
>-
>-USE_GITHUB=	yes
>-GH_ACCOUNT=	martine
>-
>-CONFLICTS=	irc/ninja-[0-9]*
>-USES=		python:build
>-
>-PLIST_FILES=	bin/ninja
>-PORTDOCS=	COPYING HACKING.md README manual.asciidoc
>-
>-OPTIONS_DEFINE=	DOCS
>-
>-do-build:
>-	@(cd ${WRKSRC} && \
>-		CXX="${CXX}" CFLAGS="${CXXFLAGS}" ${PYTHON_CMD} configure.py --bootstrap)
>-
>-do-install:
>-	${INSTALL_PROGRAM} ${WRKSRC}/ninja ${STAGEDIR}${PREFIX}/bin
>-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>-	(cd ${WRKSRC} && \
>-	    ${INSTALL_DATA} COPYING HACKING.md README doc/manual.asciidoc \
>-	    ${STAGEDIR}${DOCSDIR})
>-
>-.include <bsd.port.mk>
>+.include "../ninja/Makefile"
>Index: devel/ninja15/files/patch-configure.py
>===================================================================
>--- devel/ninja15/files/patch-configure.py	(revision 395175)
>+++ devel/ninja15/files/patch-configure.py	(working copy)
>@@ -9,12 +9,3 @@
>              print('when running: ', cmdline)
>              raise
>  
>-@@ -297,7 +297,7 @@
>-         cflags += ['/Ox', '/DNDEBUG', '/GL']
>-         ldflags += ['/LTCG', '/OPT:REF', '/OPT:ICF']
>- else:
>--    cflags = ['-g', '-Wall', '-Wextra',
>-+    cflags = ['-Wall', '-Wextra',
>-               '-Wno-deprecated',
>-               '-Wno-unused-parameter',
>-               '-fno-rtti',
>Index: devel/ninja16/Makefile
>===================================================================
>--- devel/ninja16/Makefile	(revision 395194)
>+++ devel/ninja16/Makefile	(working copy)
>@@ -1,39 +0,0 @@
>-# Created by: Grzegorz Blach <gblach@FreeBSD.org>
>-# $FreeBSD$
>-
>-PORTNAME=	ninja
>-PORTVERSION=	1.6.0
>-DISTVERSIONPREFIX=	v
>-PORTEPOCH=	1
>-CATEGORIES=	devel
>-PKGNAMESUFFIX=	16
>-
>-MAINTAINER=	gblach@FreeBSD.org
>-COMMENT=	Ninja is a small build system closest in spirit to Make
>-
>-LICENSE=	APACHE20
>-
>-USE_GITHUB=	yes
>-GH_ACCOUNT=	martine
>-GH_PROJECT=	ninja
>-
>-CONFLICTS=	irc/ninja-[0-9]*
>-USES=		python:build
>-
>-PLIST_FILES=	bin/ninja16
>-PORTDOCS=	COPYING HACKING.md README manual.asciidoc
>-
>-OPTIONS_DEFINE=	DOCS
>-
>-do-build:
>-	@(cd ${WRKSRC} && \
>-		CXX="${CXX}" CFLAGS="${CXXFLAGS}" ${PYTHON_CMD} configure.py --bootstrap)
>-
>-do-install:
>-	${INSTALL_PROGRAM} ${WRKSRC}/ninja ${STAGEDIR}${PREFIX}/bin/ninja16
>-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>-	(cd ${WRKSRC} && \
>-	    ${INSTALL_DATA} COPYING HACKING.md README doc/manual.asciidoc \
>-	    ${STAGEDIR}${DOCSDIR})
>-
>-.include <bsd.port.mk>
>Index: devel/ninja16/distinfo
>===================================================================
>--- devel/ninja16/distinfo	(revision 395194)
>+++ devel/ninja16/distinfo	(working copy)
>@@ -1,2 +0,0 @@
>-SHA256 (martine-ninja-v1.6.0_GH0.tar.gz) = b43e88fb068fe4d92a3dfd9eb4d19755dae5c33415db2e9b7b61b4659009cde7
>-SIZE (martine-ninja-v1.6.0_GH0.tar.gz) = 174501
>Index: devel/ninja16/files/patch-configure.py
>===================================================================
>--- devel/ninja16/files/patch-configure.py	(revision 395194)
>+++ devel/ninja16/files/patch-configure.py	(working copy)
>@@ -1,11 +0,0 @@
>---- configure.py.orig	2014-11-24 18:37:47.000000000 +0100
>-+++ configure.py	2015-01-18 21:26:42.000000000 +0100 
>-@@ -297,7 +297,7 @@
>-         cflags += ['/Ox', '/DNDEBUG', '/GL']
>-         ldflags += ['/LTCG', '/OPT:REF', '/OPT:ICF']
>- else:
>--    cflags = ['-g', '-Wall', '-Wextra',
>-+    cflags = ['-Wall', '-Wextra',
>-               '-Wno-deprecated',
>-               '-Wno-unused-parameter',
>-               '-fno-rtti',
>Index: devel/ninja16/pkg-descr
>===================================================================
>--- devel/ninja16/pkg-descr	(revision 395194)
>+++ devel/ninja16/pkg-descr	(working copy)
>@@ -1,11 +0,0 @@
>-Ninja is yet another build system. It takes as input the interdependencies
>-of files (typically source code and output executables) and orchestrates
>-building them, quickly.
>-
>-Ninja joins a sea of other build systems. Its distinguishing goal is to be
>-fast. It is born from my work on the Chromium browser project, which has
>-over 30,000 source files and whose other build systems (including one built
>-from custom non-recursive Makefiles) can take ten seconds to start building
>-after changing one file. Ninja is under a second.
>-
>-WWW: https://github.com/martine/ninja
>Index: graphics/darktable/Makefile
>===================================================================
>--- graphics/darktable/Makefile	(revision 395194)
>+++ graphics/darktable/Makefile	(working copy)
>@@ -21,7 +21,7 @@
> ONLY_FOR_ARCHS_REASON=	uses SSE instructions
> 
> USES=		compiler:c++11-lib cmake:outsource desktop-file-utils	\
>-		ninja pkgconfig tar:xz
>+		ninja:15 pkgconfig tar:xz
> USE_GNOME=	intltool librsvg2
> USE_SQLITE=	yes
> USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}

Actions: View | Diff

Attachments on bug 202652: 160346