summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoerg <joerg>2013-09-19 20:29:34 +0000
committerjoerg <joerg>2013-09-19 20:29:34 +0000
commitf11d1f9ff96d4662759f32caa6a27d49f8bd344a (patch)
tree38ae35a18a1e4568d021e60b6293761c05e6125d
parenta346c3c3ed02ce2be02b7b8da9afaa08c601fe35 (diff)
downloadpkgsrc-f11d1f9ff96d4662759f32caa6a27d49f8bd344a.tar.gz
Revert last, my grep-fu is weak. Bump revision again.
-rw-r--r--textproc/xmltooling/Makefile4
-rw-r--r--textproc/xmltooling/distinfo3
-rw-r--r--textproc/xmltooling/patches/patch-xmltooling_util_Threads.h47
3 files changed, 3 insertions, 51 deletions
diff --git a/textproc/xmltooling/Makefile b/textproc/xmltooling/Makefile
index 3c983c6671a..636602cf0cd 100644
--- a/textproc/xmltooling/Makefile
+++ b/textproc/xmltooling/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2013/09/17 21:16:16 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2013/09/19 20:29:34 joerg Exp $
DISTNAME= xmltooling-1.5.3
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= textproc
MASTER_SITES= http://www.shibboleth.net/downloads/c++-opensaml/${PKGVERSION_NOREV}/
diff --git a/textproc/xmltooling/distinfo b/textproc/xmltooling/distinfo
index 392f8a6f74a..c2cb12669b7 100644
--- a/textproc/xmltooling/distinfo
+++ b/textproc/xmltooling/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.7 2013/09/19 11:08:05 joerg Exp $
+$NetBSD: distinfo,v 1.8 2013/09/19 20:29:34 joerg Exp $
SHA1 (xmltooling-1.5.3.tar.gz) = b8498a8dafe18bf612a6651ab7af662add5c2a68
RMD160 (xmltooling-1.5.3.tar.gz) = 2b8530f41576511b222f515a86e39981f34c2102
Size (xmltooling-1.5.3.tar.gz) = 675350 bytes
SHA1 (patch-xmltooling_Makefile.in) = 9c6764c89d0c81c46486283063e02791c22c37e2
-SHA1 (patch-xmltooling_util_Threads.h) = 7c59c74986693a52164e20bb382465cc951fed15
SHA1 (patch-xmltooling_util_XMLHelper.cpp) = 2dc0915af93e4b2aeb0a946ea14f2de89050867f
SHA1 (patch-xmltooling_util_XMLHelper.h) = 98c6c0552c81a8599c5337642bcdcaa9cdb76d80
diff --git a/textproc/xmltooling/patches/patch-xmltooling_util_Threads.h b/textproc/xmltooling/patches/patch-xmltooling_util_Threads.h
deleted file mode 100644
index 6fadf1e147f..00000000000
--- a/textproc/xmltooling/patches/patch-xmltooling_util_Threads.h
+++ /dev/null
@@ -1,47 +0,0 @@
-$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() {