>Number: 158143
>Category: ports
>Synopsis: Update devel/ninja to 20110620 snapshot; Fixed build with clang
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Tue Jun 21 21:50:11 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: Grzegorz Blach
>Release: FreeBSD 8.2-RELEASE-p2 amd64
>Organization:
>Environment:
System: FreeBSD 8.2-RELEASE-p2 #9 r222446: Mon Jun 6 21:21:02 CEST 2011
root at silver.nine:/usr/obj/usr/src/sys/SILVER
>Description:
- Port devel/ninja updated to latest snapshot
- Fixed build with clang
- Switched master_site to github
>How-To-Repeat:
>Fix:
--- ninja.diff.txt begins here ---
diff -x .svn -ruN /var/cache/portshaker/ports/devel/ninja/Makefile devel/ninja/Makefile
--- /var/cache/portshaker/ports/devel/ninja/Makefile 2011-02-13 12:10:59.000000000 +0100
+++ devel/ninja/Makefile 2011-06-21 23:37:22.059424016 +0200
@@ -6,29 +6,25 @@
#
PORTNAME= ninja
-PORTVERSION= 20110208
+PORTVERSION= 20110620
CATEGORIES= devel
-MASTER_SITES= http://files.roorback.net/src/
+MASTER_SITES= https://github.com/Roorback/ninja/tarball/${DISTVERSION}/
+DISTNAME= Roorabck-${PORTNAME}-${DISTVERSION}-0-g${GITVERSION}
MAINTAINER= magik at roorback.net
COMMENT= Ninja is a small build system closest in spirit to Make
-LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo
-
LICENSE= ASL
CONFLICTS= irc/ninja-[0-9]*
+USE_PYTHON= yes
+
+GITVERSION= ed48ae5
+FETCH_ARGS= -pRr
+WRKSRC= ${WRKDIR}/Roorback-${PORTNAME}-${GITVERSION}
PLIST_FILES= bin/ninja
PORTDOCS= COPYING HACKING README manual.asciidoc todo
-post-patch:
- @${REINPLACE_CMD} \
- -e 's|/bin/bash|/bin/sh|' \
- -e 's|conf_cflags = -O2|conf_cflags = ${CXXFLAGS} -I${LOCALBASE}/include|' \
- -e 's|conf_ldflags = -s|conf_ldflags = -s -L${LOCALBASE}/lib -lexecinfo|' \
- -e 's|g++|g++ -I${LOCALBASE}/include -L${LOCALBASE}/lib -lexecinfo|' \
- ${WRKSRC}/bootstrap.sh
-
do-build:
@(cd ${WRKSRC}; ./bootstrap.sh)
@@ -36,7 +32,8 @@
@${INSTALL} -m 755 ${WRKSRC}/ninja ${PREFIX}/bin
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
- @(cd ${WRKSRC}; ${INSTALL} -m 644 ${PORTDOCS} ${DOCSDIR})
+ @(cd ${WRKSRC}; ${INSTALL} -m 644 COPYING HACKING README todo ${DOCSDIR})
+ @(cd ${WRKSRC}/doc; ${INSTALL} -m 644 manual.asciidoc ${DOCSDIR})
.endif
.include <bsd.port.mk>
diff -x .svn -ruN /var/cache/portshaker/ports/devel/ninja/distinfo devel/ninja/distinfo
--- /var/cache/portshaker/ports/devel/ninja/distinfo 2011-02-13 12:10:59.000000000 +0100
+++ devel/ninja/distinfo 2011-06-21 23:25:17.340288763 +0200
@@ -1,2 +1,2 @@
-SHA256 (ninja-20110208.tar.gz) = 0b4ce3a9b9755479b7e34e7da6a7dfbf6e49df0a38e0553bda1e2565cbba8b99
-SIZE (ninja-20110208.tar.gz) = 46644
+SHA256 (Roorabck-ninja-20110620-0-ged48ae5.tar.gz) = cee45007caeedf5636660b5cd0723edad756268b60861fa7a85de2137e4de2ff
+SIZE (Roorabck-ninja-20110620-0-ged48ae5.tar.gz) = 75719
diff -x .svn -ruN /var/cache/portshaker/ports/devel/ninja/files/patch-build.ninja devel/ninja/files/patch-build.ninja
--- /var/cache/portshaker/ports/devel/ninja/files/patch-build.ninja 2011-02-13 12:10:59.000000000 +0100
+++ devel/ninja/files/patch-build.ninja 1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
---- build.ninja.orig 2011-02-10 19:29:29.000000000 +0100
-+++ build.ninja 2011-02-10 19:29:33.000000000 +0100
-@@ -24,7 +24,7 @@
- description = CC $out
-
- rule ar
-- command = ar crsT $out $in
-+ command = ar crs $out $in
- description = AR $out
-
- rule link
diff -x .svn -ruN /var/cache/portshaker/ports/devel/ninja/files/patch-src-ninja.cc devel/ninja/files/patch-src-ninja.cc
--- /var/cache/portshaker/ports/devel/ninja/files/patch-src-ninja.cc 2011-02-13 12:10:59.000000000 +0100
+++ devel/ninja/files/patch-src-ninja.cc 1970-01-01 01:00:00.000000000 +0100
@@ -1,33 +0,0 @@
---- src/ninja.orig 2011-02-10 17:21:11.000000000 +0200
-+++ src/ninja.cc 2011-02-10 17:21:43.000000000 +0200
-@@ -20,6 +20,9 @@
- #include <stdio.h>
- #include <string.h>
- #include <sys/stat.h>
-+#if defined(__APPLE__) || defined(__FreeBSD__)
-+#include <sys/sysctl.h>
-+#endif
- #include <sys/types.h>
-
- #include "build.h"
-@@ -64,6 +67,7 @@ void usage(const BuildConfig& config) {
- int GuessParallelism() {
- int processors = 0;
-
-+#if defined(linux)
- const char kProcessorPrefix[] = "processor\t";
- char buf[16 << 10];
- FILE* f = fopen("/proc/cpuinfo", "r");
-@@ -74,6 +78,12 @@ int GuessParallelism() {
- ++processors;
- }
- fclose(f);
-+#elif defined(__APPLE__) || defined(__FreeBSD__)
-+ size_t procSize = sizeof(processors);
-+ int name[] = {CTL_HW, HW_NCPU};
-+ if (sysctl(name, sizeof(name) / sizeof(int), &processors, &procSize, NULL, 0))
-+ return 2;
-+#endif
-
- switch (processors) {
- case 0:
--- ninja.diff.txt ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted: