Fri Sep 5 14:51:39 2014 UTC ()
Rename devel/ninja to devel/ninja-build to avoid conflict with
chat/ninja.


(joerg)
diff -r1.1967 -r1.1968 pkgsrc/devel/Makefile
diff -r1.1 -r0 pkgsrc/devel/ninja/DESCR
diff -r1.1 -r0 pkgsrc/devel/ninja/Makefile
diff -r1.1 -r0 pkgsrc/devel/ninja/PLIST
diff -r1.1 -r0 pkgsrc/devel/ninja/distinfo
diff -r0 -r1.1 pkgsrc/devel/ninja-build/DESCR
diff -r0 -r1.1 pkgsrc/devel/ninja-build/Makefile
diff -r0 -r1.1 pkgsrc/devel/ninja-build/PLIST
diff -r0 -r1.1 pkgsrc/devel/ninja-build/distinfo
diff -r0 -r1.1 pkgsrc/devel/ninja-build/patches/patch-bootstrap.py
diff -r0 -r1.1 pkgsrc/devel/ninja-build/patches/patch-platform__helper.py
diff -r1.1 -r0 pkgsrc/devel/ninja/patches/patch-bootstrap.py
diff -r1.1 -r0 pkgsrc/devel/ninja/patches/patch-platform__helper.py
diff -r1.3358 -r1.3359 pkgsrc/doc/CHANGES-2014

cvs diff -r1.1967 -r1.1968 pkgsrc/devel/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/Makefile 2014/09/05 07:16:33 1.1967
+++ pkgsrc/devel/Makefile 2014/09/05 14:51:39 1.1968
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.1967 2014/09/05 07:16:33 fhajny Exp $ 1# $NetBSD: Makefile,v 1.1968 2014/09/05 14:51:39 joerg Exp $
2# 2#
3 3
4COMMENT= Development utilities 4COMMENT= Development utilities
5 5
6SUBDIR+= ETL 6SUBDIR+= ETL
7SUBDIR+= ExmanIDE 7SUBDIR+= ExmanIDE
8SUBDIR+= GConf 8SUBDIR+= GConf
9SUBDIR+= GConf-ui 9SUBDIR+= GConf-ui
10SUBDIR+= Gorm 10SUBDIR+= Gorm
11SUBDIR+= ObjectiveLib 11SUBDIR+= ObjectiveLib
12SUBDIR+= ProjectCenter 12SUBDIR+= ProjectCenter
13SUBDIR+= RBTools 13SUBDIR+= RBTools
14SUBDIR+= RTFM 14SUBDIR+= RTFM
@@ -560,27 +560,27 @@ SUBDIR+= msgpack @@ -560,27 +560,27 @@ SUBDIR+= msgpack
560SUBDIR+= nana 560SUBDIR+= nana
561SUBDIR+= nant 561SUBDIR+= nant
562SUBDIR+= nasm 562SUBDIR+= nasm
563SUBDIR+= nbitools 563SUBDIR+= nbitools
564SUBDIR+= nbpatch 564SUBDIR+= nbpatch
565SUBDIR+= ncc 565SUBDIR+= ncc
566SUBDIR+= ncurses 566SUBDIR+= ncurses
567SUBDIR+= ncursesw 567SUBDIR+= ncursesw
568SUBDIR+= netbeans-ide 568SUBDIR+= netbeans-ide
569SUBDIR+= netbsd-iscsi-lib 569SUBDIR+= netbsd-iscsi-lib
570SUBDIR+= netcdf 570SUBDIR+= netcdf
571SUBDIR+= netcdf-fortran 571SUBDIR+= netcdf-fortran
572SUBDIR+= newfile 572SUBDIR+= newfile
573SUBDIR+= ninja 573SUBDIR+= ninja-build
574SUBDIR+= noweb 574SUBDIR+= noweb
575SUBDIR+= npapi-sdk 575SUBDIR+= npapi-sdk
576SUBDIR+= nqc 576SUBDIR+= nqc
577SUBDIR+= nsis 577SUBDIR+= nsis
578SUBDIR+= nspr 578SUBDIR+= nspr
579SUBDIR+= nspr-reference 579SUBDIR+= nspr-reference
580SUBDIR+= nss 580SUBDIR+= nss
581SUBDIR+= ocaml-batteries 581SUBDIR+= ocaml-batteries
582SUBDIR+= ocaml-deriving-ocsigen 582SUBDIR+= ocaml-deriving-ocsigen
583SUBDIR+= ocaml-findlib 583SUBDIR+= ocaml-findlib
584SUBDIR+= ocaml-lwt 584SUBDIR+= ocaml-lwt
585SUBDIR+= ocaml-oasis 585SUBDIR+= ocaml-oasis
586SUBDIR+= ocaml-odn 586SUBDIR+= ocaml-odn

File Deleted: pkgsrc/devel/ninja/Attic/DESCR

File Deleted: pkgsrc/devel/ninja/Attic/Makefile

File Deleted: pkgsrc/devel/ninja/Attic/PLIST

File Deleted: pkgsrc/devel/ninja/Attic/distinfo

File Added: pkgsrc/devel/ninja-build/DESCR
Ninja is a small build system with a focus on speed. It differs
from other build systems in two major respects: it is designed to
have its input files generated by a higher-level build system, and
it is designed to run builds as fast as possible.

File Added: pkgsrc/devel/ninja-build/Makefile
# $NetBSD: Makefile,v 1.1 2014/09/05 14:51:39 joerg Exp $

NINJAVER=	1.5.1
DISTNAME=	ninja-build-${NINJAVER}
CATEGORIES=	devel
MASTER_SITES=	-https://github.com/martine/ninja/archive/v${NINJAVER}.tar.gz

MAINTAINER=	ryoon@NetBSD.org
HOMEPAGE=	http://martine.github.io/ninja/
COMMENT=	Ninja is a small build system with a focus on speed
LICENSE=	apache-2.0

USE_LANGUAGES=	c c++

SUBST_CLASSES+=		prefix
SUBST_STAGE.prefix=	pre-configure
SUBST_MESSAGE.prefix=	Fix PREFIX
SUBST_FILES.prefix=	bootstrap.py
SUBST_VARS.prefix=	PREFIX

INSTALLATION_DIRS=	bin share/doc/ninja share/ninja

do-build:
	cd ${WRKSRC} && ${PYTHONBIN} ./bootstrap.py --verbose

do-install:
	${INSTALL_PROGRAM} ${WRKSRC}/ninja \
		${DESTDIR}${PREFIX}/bin
	${INSTALL_DATA} ${WRKSRC}/doc/manual.asciidoc \
		${DESTDIR}${PREFIX}/share/doc/ninja
	${INSTALL_DATA} ${WRKSRC}/misc/ninja-mode.el \
		${DESTDIR}${PREFIX}/share/ninja
	${INSTALL_DATA} ${WRKSRC}/misc/ninja.vim \
		${DESTDIR}${PREFIX}/share/ninja
	${INSTALL_DATA} ${WRKSRC}/misc/bash-completion \
		${DESTDIR}${PREFIX}/share/ninja
	${INSTALL_DATA} ${WRKSRC}/misc/zsh-completion \
		${DESTDIR}${PREFIX}/share/ninja

.include "../../lang/python/tool.mk"
.include "../../mk/bsd.pkg.mk"

File Added: pkgsrc/devel/ninja-build/PLIST
@comment $NetBSD: PLIST,v 1.1 2014/09/05 14:51:39 joerg Exp $
bin/ninja
share/doc/ninja/manual.asciidoc
share/ninja/bash-completion
share/ninja/ninja-mode.el
share/ninja/ninja.vim
share/ninja/zsh-completion

File Added: pkgsrc/devel/ninja-build/distinfo
$NetBSD: distinfo,v 1.1 2014/09/05 14:51:39 joerg Exp $

SHA1 (ninja-1.5.1.tar.gz) = c5a3af39f6d7ee3a30263f34091c046964d442f0
RMD160 (ninja-1.5.1.tar.gz) = c2bbb37038925a34f0f62bab4893441290b26783
Size (ninja-1.5.1.tar.gz) = 163437 bytes
SHA1 (patch-bootstrap.py) = 20448a3a7e96f7ddeec72182d64e237cabc017ab
SHA1 (patch-platform__helper.py) = 62b7db93bc16fc7862da9fb2c25d507d6630ec95

File Added: pkgsrc/devel/ninja-build/patches/Attic/patch-bootstrap.py
$NetBSD: patch-bootstrap.py,v 1.1 2014/09/05 14:51:39 joerg Exp $

* pkgsrc installation

--- bootstrap.py.orig	2014-06-27 23:37:05.000000000 +0000
+++ bootstrap.py
@@ -58,6 +58,9 @@ ldflags = os.environ.get('LDFLAGS', '').
 if platform.is_freebsd() or platform.is_openbsd() or platform.is_bitrig():
     cflags.append('-I/usr/local/include')
     ldflags.append('-L/usr/local/lib')
+if platform.is_netbsd():
+    cflags.append('-I@PREFIX@/include')
+    ldflags.append('-L@PREFIX@/lib')
 
 print('Building ninja manually...')
 

File Added: pkgsrc/devel/ninja-build/patches/Attic/patch-platform__helper.py
$NetBSD: patch-platform__helper.py,v 1.1 2014/09/05 14:51:39 joerg Exp $

* Add NetBSD support

--- platform_helper.py.orig	2014-06-27 23:37:05.000000000 +0000
+++ platform_helper.py
@@ -19,7 +19,7 @@ import sys
 
 def platforms():
     return ['linux', 'darwin', 'freebsd', 'openbsd', 'solaris', 'sunos5',
-            'mingw', 'msvc', 'gnukfreebsd', 'bitrig']
+            'mingw', 'msvc', 'gnukfreebsd', 'bitrig', 'netbsd']
 
 class Platform(object):
     def __init__(self, platform):
@@ -43,6 +43,8 @@ class Platform(object):
             self._platform = 'msvc'
         elif self._platform.startswith('bitrig'):
             self._platform = 'bitrig'
+        elif self._platform.startswith('netbsd'):
+            self._platform = 'netbsd'
 
     def platform(self):
         return self._platform
@@ -81,3 +83,6 @@ class Platform(object):
 
     def is_bitrig(self):
         return self._platform == 'bitrig'
+
+    def is_netbsd(self):
+        return self._platform == 'netbsd'

File Deleted: pkgsrc/devel/ninja/patches/Attic/patch-bootstrap.py

File Deleted: pkgsrc/devel/ninja/patches/Attic/patch-platform__helper.py

cvs diff -r1.3358 -r1.3359 pkgsrc/doc/CHANGES-2014 (expand / switch to unified diff)

--- pkgsrc/doc/CHANGES-2014 2014/09/05 12:10:53 1.3358
+++ pkgsrc/doc/CHANGES-2014 2014/09/05 14:51:39 1.3359
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: CHANGES-2014,v 1.3358 2014/09/05 12:10:53 obache Exp $ 1$NetBSD: CHANGES-2014,v 1.3359 2014/09/05 14:51:39 joerg Exp $
2 2
3Changes to the packages collection and infrastructure in 2014: 3Changes to the packages collection and infrastructure in 2014:
4 4
5 Updated games/supertuxkart to 0.8.1 [ryoon 2014-01-01] 5 Updated games/supertuxkart to 0.8.1 [ryoon 2014-01-01]
6 Updated devel/libgetopt to 1.4.5 [ryoon 2014-01-01] 6 Updated devel/libgetopt to 1.4.5 [ryoon 2014-01-01]
7 Added devel/p5-Data-GUID version 0.048 [ryoon 2014-01-01] 7 Added devel/p5-Data-GUID version 0.048 [ryoon 2014-01-01]
8 Added devel/p5-Role-Basic version 0.13 [ryoon 2014-01-01] 8 Added devel/p5-Role-Basic version 0.13 [ryoon 2014-01-01]
9 Added devel/p5-Symbol-Global-Name version 0.04 [ryoon 2014-01-01] 9 Added devel/p5-Symbol-Global-Name version 0.04 [ryoon 2014-01-01]
10 Added mail/p5-Email-Address-List version 0.01 [ryoon 2014-01-01] 10 Added mail/p5-Email-Address-List version 0.01 [ryoon 2014-01-01]
11 Added security/p5-Crypt-X509 version 0.51 [ryoon 2014-01-01] 11 Added security/p5-Crypt-X509 version 0.51 [ryoon 2014-01-01]
12 Added time/p5-Date-Extract version 0.04 [ryoon 2014-01-01] 12 Added time/p5-Date-Extract version 0.04 [ryoon 2014-01-01]
13 Updated misc/p5-Locale-Maketext-Fuzzy to 0.11 [ryoon 2014-01-01] 13 Updated misc/p5-Locale-Maketext-Fuzzy to 0.11 [ryoon 2014-01-01]
14 Updated devel/rt4 to 4.2.1 [ryoon 2014-01-01] 14 Updated devel/rt4 to 4.2.1 [ryoon 2014-01-01]
@@ -4312,13 +4312,15 @@ Changes to the packages collection and i @@ -4312,13 +4312,15 @@ Changes to the packages collection and i
4312 Added sysutils/rsyslog-pgsql version 8.4.0 [fhajny 2014-09-05] 4312 Added sysutils/rsyslog-pgsql version 8.4.0 [fhajny 2014-09-05]
4313 Added sysutils/rsyslog-rabbitmq version 8.4.0 [fhajny 2014-09-05] 4313 Added sysutils/rsyslog-rabbitmq version 8.4.0 [fhajny 2014-09-05]
4314 Added sysutils/rsyslog-snmp version 8.4.0 [fhajny 2014-09-05] 4314 Added sysutils/rsyslog-snmp version 8.4.0 [fhajny 2014-09-05]
4315 Updated ham/fldigi to 3.21.83 [mef 2014-09-05] 4315 Updated ham/fldigi to 3.21.83 [mef 2014-09-05]
4316 Added audio/sphinxbase version 0.8 [fhajny 2014-09-05] 4316 Added audio/sphinxbase version 0.8 [fhajny 2014-09-05]
4317 Added audio/sphinx3 version 0.8 [fhajny 2014-09-05] 4317 Added audio/sphinx3 version 0.8 [fhajny 2014-09-05]
4318 Added audio/sphinxtrain version 1.0.8 [fhajny 2014-09-05] 4318 Added audio/sphinxtrain version 1.0.8 [fhajny 2014-09-05]
4319 Added audio/pocketsphinx version 0.8 [fhajny 2014-09-05] 4319 Added audio/pocketsphinx version 0.8 [fhajny 2014-09-05]
4320 Updated inputmethod/ibus-table-others to 1.3.3 [obache 2014-09-05] 4320 Updated inputmethod/ibus-table-others to 1.3.3 [obache 2014-09-05]
4321 Updated inputmethod/ibus-table to 1.8.10 [obache 2014-09-05] 4321 Updated inputmethod/ibus-table to 1.8.10 [obache 2014-09-05]
4322 Updated graphics/libsixel to 1.0.3 [obache 2014-09-05] 4322 Updated graphics/libsixel to 1.0.3 [obache 2014-09-05]
4323 Updated net/nmap to 6.47 [adam 2014-09-05] 4323 Updated net/nmap to 6.47 [adam 2014-09-05]
4324 Updated devel/ruby-gettext to 3.1.4nb1 [obache 2014-09-05] 4324 Updated devel/ruby-gettext to 3.1.4nb1 [obache 2014-09-05]
 4325 Removed devel/ninja [joerg 2014-09-05]
 4326 Added devel/ninja-build [joerg 2014-09-05]