Index: head/devel/ninja/files/patch-build.ninja =================================================================== --- head/devel/ninja/files/patch-build.ninja (revision 276492) +++ head/devel/ninja/files/patch-build.ninja (nonexistent) @@ -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 Property changes on: head/devel/ninja/files/patch-build.ninja ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/devel/ninja/files/patch-src-ninja.cc =================================================================== --- head/devel/ninja/files/patch-src-ninja.cc (revision 276492) +++ head/devel/ninja/files/patch-src-ninja.cc (nonexistent) @@ -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 - #include - #include -+#if defined(__APPLE__) || defined(__FreeBSD__) -+#include -+#endif - #include - - #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: Property changes on: head/devel/ninja/files/patch-src-ninja.cc ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/devel/ninja/Makefile =================================================================== --- head/devel/ninja/Makefile (revision 276492) +++ head/devel/ninja/Makefile (revision 276493) @@ -1,42 +1,39 @@ # New ports collection makefile for: ninja # Date created: 08 February 2011 # Whom: Grzegorz Blach # # $FreeBSD$ # 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) 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 Property changes on: head/devel/ninja/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/devel/ninja/distinfo =================================================================== --- head/devel/ninja/distinfo (revision 276492) +++ head/devel/ninja/distinfo (revision 276493) @@ -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 Property changes on: head/devel/ninja/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property