Update to 20110620

Fixes build with clang

PR:		ports/158143
Submitted by:	"Grzegorz Blach" <magik@roorback.net> (maintainer)
Approved by:	tabthorpe (mentor)

4 files changed, 12 insertions, 59 deletions

diff --git a/devel/ninja/Makefile b/devel/ninja/Makefile
index 6fccf2c512df..4e983613337a 100644
--- a/devel/ninja/Makefile
+++ b/devel/ninja/Makefile
@@ -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@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 @@ do-install:
 	@${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 --git a/devel/ninja/distinfo b/devel/ninja/distinfo
index 96fa705c1214..b6794d737d83 100644
--- a/devel/ninja/distinfo
+++ b/devel/ninja/distinfo
@@ -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 --git a/devel/ninja/files/patch-build.ninja b/devel/ninja/files/patch-build.ninja
deleted file mode 100644
index 4a5a0b485544..000000000000
--- a/devel/ninja/files/patch-build.ninja
+++ /dev/null
@@ -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 --git a/devel/ninja/files/patch-src-ninja.cc b/devel/ninja/files/patch-src-ninja.cc
deleted file mode 100644
index 1e6d680429ea..000000000000
--- a/devel/ninja/files/patch-src-ninja.cc
+++ /dev/null
@@ -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: