summaryrefslogtreecommitdiff
path: root/textproc
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2013-09-17 21:16:16 +0000
committerjoerg <joerg@pkgsrc.org>2013-09-17 21:16:16 +0000
commit1cca8a147d9b3e6c955cac86dbab4cd54f2e6847 (patch)
tree3cced6065007820c94faac080fc2f431799a6ee9 /textproc
parent9ea657038cbbde01c17a87d81055a675ca86b737 (diff)
downloadpkgsrc-1cca8a147d9b3e6c955cac86dbab4cd54f2e6847.tar.gz
No boost/scoped_ptr.h around. Bump revision.
Diffstat (limited to 'textproc')
-rw-r--r--textproc/xmltooling/Makefile3
-rw-r--r--textproc/xmltooling/patches/patch-xmltooling_util_Threads.h47
2 files changed, 49 insertions, 1 deletions
diff --git a/textproc/xmltooling/Makefile b/textproc/xmltooling/Makefile
index 5cf94bb36c0..3c983c6671a 100644
--- a/textproc/xmltooling/Makefile
+++ b/textproc/xmltooling/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2013/09/13 21:08:19 pettai Exp $
+# $NetBSD: Makefile,v 1.13 2013/09/17 21:16:16 joerg Exp $
DISTNAME= xmltooling-1.5.3
+PKGREVISION= 1
CATEGORIES= textproc
MASTER_SITES= http://www.shibboleth.net/downloads/c++-opensaml/${PKGVERSION_NOREV}/
diff --git a/textproc/xmltooling/patches/patch-xmltooling_util_Threads.h b/textproc/xmltooling/patches/patch-xmltooling_util_Threads.h
new file mode 100644
index 00000000000..6fadf1e147f
--- /dev/null
+++ b/textproc/xmltooling/patches/patch-xmltooling_util_Threads.h
@@ -0,0 +1,47 @@
+$NetBSD: patch-xmltooling_util_Threads.h,v 1.1 2013/09/17 21:16:16 joerg Exp $
+
+--- xmltooling/util/Threads.h.orig 2013-09-17 20:39:26.000000000 +0000
++++ xmltooling/util/Threads.h
+@@ -30,7 +30,6 @@
+ #include <xmltooling/exceptions.h>
+
+ #include <memory>
+-#include <boost/scoped_ptr.hpp>
+ #include <signal.h>
+
+ namespace xmltooling
+@@ -317,16 +316,6 @@ namespace xmltooling
+ }
+
+ /**
+- * Locks and wraps the designated mutex.
+- *
+- * @param mtx mutex to lock
+- */
+- Lock(const boost::scoped_ptr<Mutex>& mtx) : mutex(mtx.get()) {
+- if (mutex)
+- mutex->lock();
+- }
+-
+- /**
+ * Unlocks the wrapped mutex, if any.
+ */
+ ~Lock() {
+@@ -378,17 +367,6 @@ namespace xmltooling
+ }
+
+ /**
+- * Locks and wraps the designated shared lock.
+- *
+- * @param lock lock to acquire
+- * @param lockit true if the lock should be acquired here, false if already acquired
+- */
+- SharedLock(const boost::scoped_ptr<RWLock>& lock, bool lockit=true) : rwlock(lock.get()) {
+- if (rwlock && lockit)
+- rwlock->rdlock();
+- }
+-
+- /**
+ * Unlocks the wrapped shared lock, if any.
+ */
+ ~SharedLock() {