This updates ninja to 1.3.3, which includes the OpenBSD patches
upstream and is the official version now used to build and test
Chrome.
ok?
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/ninja/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile 2 May 2013 19:09:18 -0000 1.1.1.1
+++ Makefile 21 May 2013 06:06:17 -0000
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.1.1.1 2013/05/02 19:09:18 matthew Exp $
COMMENT = a small build system with a focus on speed
-V = 1.2.0
+V = 1.3.3
DISTNAME = ninja-${V}
CATEGORIES = devel
HOMEPAGE = http://martine.github.io/ninja/
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/ninja/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 2 May 2013 19:09:18 -0000 1.1.1.1
+++ distinfo 21 May 2013 06:06:17 -0000
@@ -1,2 +1,2 @@
-SHA256 (ninja-1.2.0.tar.gz) = gToeZQ9Q7W6X01O7zjMTSNOet/2tT7pT5Kmb59qTnnI=
-SIZE (ninja-1.2.0.tar.gz) = 136233
+SHA256 (ninja-1.3.3.tar.gz) = YhKvacK9ubbnpKW0WAJIOuv7XYln5DeYH6ZvDaPRej4=
+SIZE (ninja-1.3.3.tar.gz) = 147703
Index: patches/patch-src_subprocess-posix_cc
===================================================================
RCS file: patches/patch-src_subprocess-posix_cc
diff -N patches/patch-src_subprocess-posix_cc
--- patches/patch-src_subprocess-posix_cc 2 May 2013 19:09:18 -0000
1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,70 +0,0 @@
-$OpenBSD: patch-src_subprocess-posix_cc,v 1.1.1.1 2013/05/02 19:09:18 matthew
Exp $
---- src/subprocess-posix.cc.orig Fri Apr 5 09:36:12 2013
-+++ src/subprocess-posix.cc Thu May 2 12:01:23 2013
-@@ -25,13 +25,6 @@
- #include <string.h>
- #include <sys/wait.h>
-
--// Older versions of glibc (like 2.4) won't find this in <poll.h>. glibc
--// 2.4 keeps it in <asm-generic/poll.h>, though attempting to include that
--// will redefine the pollfd structure.
--#ifndef POLLRDHUP
--#define POLLRDHUP 0x2000
--#endif
--
- #include "util.h"
-
- Subprocess::Subprocess() : fd_(-1), pid_(-1) {
-@@ -49,12 +42,12 @@ bool Subprocess::Start(SubprocessSet* set, const strin
- if (pipe(output_pipe) < 0)
- Fatal("pipe: %s", strerror(errno));
- fd_ = output_pipe[0];
--#if !defined(linux)
-- // On linux we use ppoll in DoWork(); elsewhere we use pselect and so must
-- // avoid overly-large FDs.
-+#if !defined(linux) && !defined(__OpenBSD__)
-+ // On Linux and OpenBSD, we use ppoll in DoWork(); elsewhere we use pselect
-+ // and so must avoid overly-large FDs.
- if (fd_ >= static_cast<int>(FD_SETSIZE))
- Fatal("pipe: %s", strerror(EMFILE));
--#endif // !linux
-+#endif // !linux && !__OpenBSD__
- SetCloseOnExec(fd_);
-
- pid_ = fork();
-@@ -189,7 +182,7 @@ Subprocess *SubprocessSet::Add(const string& command)
- return subprocess;
- }
-
--#ifdef linux
-+#if defined(linux) || defined(__OpenBSD__)
- bool SubprocessSet::DoWork() {
- vector<pollfd> fds;
- nfds_t nfds = 0;
-@@ -199,7 +192,7 @@ bool SubprocessSet::DoWork() {
- int fd = (*i)->fd_;
- if (fd < 0)
- continue;
-- pollfd pfd = { fd, POLLIN | POLLPRI | POLLRDHUP, 0 };
-+ pollfd pfd = { fd, POLLIN | POLLPRI, 0 };
- fds.push_back(pfd);
- ++nfds;
- }
-@@ -236,7 +229,7 @@ bool SubprocessSet::DoWork() {
- return false;
- }
-
--#else // linux
-+#else // linux || __OpenBSD__
- bool SubprocessSet::DoWork() {
- fd_set set;
- int nfds = 0;
-@@ -279,7 +272,7 @@ bool SubprocessSet::DoWork() {
-
- return false;
- }
--#endif // linux
-+#endif // linux || __OpenBSD__
-
- Subprocess* SubprocessSet::NextFinished() {
- if (finished_.empty())
