Use security/botan in place of the shipped (older) copy. Bump revision.

8 files changed, 51 insertions, 135 deletions

diff --git a/x11/qt4-creator/Makefile b/x11/qt4-creator/Makefile
index 788f96572e6..d1a1a18eb6b 100644
--- a/x11/qt4-creator/Makefile
+++ b/x11/qt4-creator/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2013/06/06 12:55:21 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2013/09/19 10:25:44 joerg Exp $
 
 DISTNAME=	qt-creator-2.0.1-src
 PKGNAME=	${DISTNAME:S/qt-/qt4-/:S/-src//}
-PKGREVISION=	17
+PKGREVISION=	18
 CATEGORIES=	devel
 MASTER_SITES=	http://get.qt.nokia.com/qtcreator/
 EXTRACT_SUFX=	.tgz
@@ -25,6 +25,9 @@ BUILD_DEPENDS+=	qt4-sqlite3>=4.7.0:../../x11/qt4-sqlite3
 BUILD_TARGET=	make_default qch_docs
 MAKE_ENV+=	PREFIX=${PREFIX}
 
+pre-configure:
+	rm -rf ${WRKSRC}/src/libs/3rdparty/botan
+
 do-configure:
 	cd ${WRKSRC} && env ${CONFIGURE_ENV} ${QTDIR}/bin/qmake
 
@@ -62,5 +65,6 @@ do-install:
 
 BUILDLINK_DEPMETHOD.qt4-tools=	full
 
+.include "../../security/botan/buildlink3.mk"
 .include "../../x11/qt4-tools/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/qt4-creator/PLIST b/x11/qt4-creator/PLIST
index 636f0f96af4..c83038b9115 100644
--- a/x11/qt4-creator/PLIST
+++ b/x11/qt4-creator/PLIST
@@ -1,8 +1,7 @@
-@comment $NetBSD: PLIST,v 1.3 2010/11/18 22:52:04 adam Exp $
+@comment $NetBSD: PLIST,v 1.4 2013/09/19 10:25:44 joerg Exp $
 bin/qtcreator
 bin/qtcreator_process_stub
 lib/qtcreator/libAggregation.la
-lib/qtcreator/libBotan.la
 lib/qtcreator/libCPlusPlus.la
 lib/qtcreator/libDebuggingHelper.la
 lib/qtcreator/libExtensionSystem.la
diff --git a/x11/qt4-creator/distinfo b/x11/qt4-creator/distinfo
index 0c1a43502b0..17d87491055 100644
--- a/x11/qt4-creator/distinfo
+++ b/x11/qt4-creator/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2012/11/19 23:13:48 joerg Exp $
+$NetBSD: distinfo,v 1.5 2013/09/19 10:25:44 joerg Exp $
 
 SHA1 (qt-creator-2.0.1-src.tgz) = 605bfe7876c4fa322544bc2314b059767eae407f
 RMD160 (qt-creator-2.0.1-src.tgz) = f33a58c926bd710b4688bb5292fa66c417e78070
@@ -18,6 +18,7 @@ SHA1 (patch-al) = b8e116a70ec00c4b5bb50f5c2181d438e81de54f
 SHA1 (patch-am) = 075cfbe1b642f1913976c0cbdf40041e912b308b
 SHA1 (patch-an) = 9b2183299919cea25216143ffdd283e10654fdb7
 SHA1 (patch-ao) = 4359debaebeb4686b8b6b4efefb1f7b480c0287c
-SHA1 (patch-ap) = a96b4a03ce289870fe2a3102e1945e42a57a9459
-SHA1 (patch-src_libs_3rdparty_botan_build_botan_secmem.h) = aa781861ca11bc77486dfa8f95c1dd2dd90874db
+SHA1 (patch-src_libs_3rdparty_3rdparty.pro) = 975eeeeadd70dddeb99236a62e708e32bb8b4c8f
+SHA1 (patch-src_libs_3rdparty_net7ssh_net7ssh__dependencies.pri) = 911f894b0ed60bc13819d23cbd36e3f05675621f
+SHA1 (patch-src_libs_3rdparty_net7ssh_src_src.pro) = da8589813c12d0b75ac20d3c74d3b1142662ed44
 SHA1 (patch-src_plugins_coreplugin_mimedatabase.h) = 33f0d746566247b1866e8262b321bd741c234e0d
diff --git a/x11/qt4-creator/patches/patch-ap b/x11/qt4-creator/patches/patch-ap
deleted file mode 100644
index 68f4e97a30c..00000000000
--- a/x11/qt4-creator/patches/patch-ap
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-ap,v 1.1 2010/11/18 22:52:04 adam Exp $
-
---- src/libs/3rdparty/botan/src/src.pro.orig	2010-11-18 22:36:58.000000000 +0000
-+++ src/libs/3rdparty/botan/src/src.pro
-@@ -277,11 +277,8 @@ unix {
-            pubkey/eckaeg/eckaeg.h \
-            pubkey/eckaeg/eckaeg_core.h \
-            pubkey/eckaeg/eckaeg_op.h \
--           timer/gettimeofday/tm_unix.h
--}
--
--linux*-g++* {
--    HEADERS += timer/posix_rt/tm_posix.h
-+           timer/gettimeofday/tm_unix.h \
-+           timer/posix_rt/tm_posix.h
- }
- 
- SOURCES += algo_factory/algo_factory.cpp \
-@@ -561,11 +558,8 @@ unix {
-            pubkey/eckaeg/eckaeg.cpp \
-            pubkey/eckaeg/eckaeg_core.cpp \
-            pubkey/eckaeg/eckaeg_op.cpp \
--           timer/gettimeofday/tm_unix.cpp
--}
--
--linux*-g++* {
--    SOURCES += timer/posix_rt/tm_posix.cpp
-+           timer/gettimeofday/tm_unix.cpp \
-+           timer/posix_rt/tm_posix.cpp
- }
- 
- linux*-g++* {
diff --git a/x11/qt4-creator/patches/patch-src_libs_3rdparty_3rdparty.pro b/x11/qt4-creator/patches/patch-src_libs_3rdparty_3rdparty.pro
new file mode 100644
index 00000000000..8126c820158
--- /dev/null
+++ b/x11/qt4-creator/patches/patch-src_libs_3rdparty_3rdparty.pro
@@ -0,0 +1,11 @@
+$NetBSD: patch-src_libs_3rdparty_3rdparty.pro,v 1.1 2013/09/19 10:25:44 joerg Exp $
+
+--- src/libs/3rdparty/3rdparty.pro.orig	2013-09-17 20:10:31.000000000 +0000
++++ src/libs/3rdparty/3rdparty.pro
+@@ -1,5 +1,4 @@
+ TEMPLATE = subdirs
+ CONFIG  += ordered
+ 
+-SUBDIRS += botan \
+-           net7ssh
++SUBDIRS += net7ssh
diff --git a/x11/qt4-creator/patches/patch-src_libs_3rdparty_botan_build_botan_secmem.h b/x11/qt4-creator/patches/patch-src_libs_3rdparty_botan_build_botan_secmem.h
deleted file mode 100644
index 58ec2e8ebcf..00000000000
--- a/x11/qt4-creator/patches/patch-src_libs_3rdparty_botan_build_botan_secmem.h
+++ /dev/null
@@ -1,96 +0,0 @@
-$NetBSD: patch-src_libs_3rdparty_botan_build_botan_secmem.h,v 1.1 2012/11/19 23:13:48 joerg Exp $
-
---- src/libs/3rdparty/botan/build/botan/secmem.h.orig	2012-11-19 11:01:09.000000000 +0000
-+++ src/libs/3rdparty/botan/build/botan/secmem.h
-@@ -307,7 +307,7 @@ class MemoryVector : public MemoryRegion
-       * @return a reference to *this
-       */
-       MemoryVector<T>& operator=(const MemoryRegion<T>& in)
--         { if(this != &in) set(in); return (*this); }
-+         { if(this != &in) this->set(in); return (*this); }
- 
-       /**
-       * Create a buffer of the specified length.
-@@ -323,13 +323,13 @@ class MemoryVector : public MemoryRegion
-       * @param n the size of the arry in
-       */
-       MemoryVector(const T in[], u32bit n)
--         { MemoryRegion<T>::init(false); set(in, n); }
-+         { MemoryRegion<T>::init(false); this->set(in, n); }
- 
-       /**
-       * Copy constructor.
-       */
-       MemoryVector(const MemoryRegion<T>& in)
--         { MemoryRegion<T>::init(false); set(in); }
-+         { MemoryRegion<T>::init(false); this->set(in); }
- 
-       /**
-       * Create a buffer whose content is the concatenation of two other
-@@ -338,7 +338,7 @@ class MemoryVector : public MemoryRegion
-       * @param in2 the contents to be appended to in1
-       */
-       MemoryVector(const MemoryRegion<T>& in1, const MemoryRegion<T>& in2)
--         { MemoryRegion<T>::init(false); set(in1); append(in2); }
-+         { MemoryRegion<T>::init(false); this->set(in1); this->append(in2); }
-    };
- 
- /**
-@@ -359,7 +359,7 @@ class SecureVector : public MemoryRegion
-       * @return a reference to *this
-       */
-       SecureVector<T>& operator=(const MemoryRegion<T>& in)
--         { if(this != &in) set(in); return (*this); }
-+         { if(this != &in) this->set(in); return (*this); }
- 
-       /**
-       * Create a buffer of the specified length.
-@@ -375,7 +375,7 @@ class SecureVector : public MemoryRegion
-       * @param n the size of the array in
-       */
-       SecureVector(const T in[], u32bit n)
--         { MemoryRegion<T>::init(true); set(in, n); }
-+         { MemoryRegion<T>::init(true); this->set(in, n); }
- 
-       /**
-       * Create a buffer with contents specified contents.
-@@ -383,7 +383,7 @@ class SecureVector : public MemoryRegion
-       * copied into the newly created buffer.
-       */
-       SecureVector(const MemoryRegion<T>& in)
--         { MemoryRegion<T>::init(true); set(in); }
-+         { MemoryRegion<T>::init(true); this->set(in); }
- 
-       /**
-       * Create a buffer whose content is the concatenation of two other
-@@ -392,7 +392,7 @@ class SecureVector : public MemoryRegion
-       * @param in2 the contents to be appended to in1
-       */
-       SecureVector(const MemoryRegion<T>& in1, const MemoryRegion<T>& in2)
--         { MemoryRegion<T>::init(true); set(in1); append(in2); }
-+         { MemoryRegion<T>::init(true); this->set(in1); this->append(in2); }
-    };
- 
- /**
-@@ -413,7 +413,7 @@ class SecureBuffer : public MemoryRegion
-       * @return a reference to *this
-       */
-       SecureBuffer<T,L>& operator=(const SecureBuffer<T,L>& in)
--         { if(this != &in) set(in); return (*this); }
-+         { if(this != &in) this->set(in); return (*this); }
- 
-       /**
-       * Create a buffer of the length L.
-@@ -427,10 +427,10 @@ class SecureBuffer : public MemoryRegion
-       * @param n the size of the array in
-       */
-       SecureBuffer(const T in[], u32bit n)
--         { MemoryRegion<T>::init(true, L); copy(in, n); }
-+         { MemoryRegion<T>::init(true, L); this->copy(in, n); }
-    private:
-       SecureBuffer<T, L>& operator=(const MemoryRegion<T>& in)
--         { if(this != &in) set(in); return (*this); }
-+         { if(this != &in) this->set(in); return (*this); }
-    };
- 
- }
diff --git a/x11/qt4-creator/patches/patch-src_libs_3rdparty_net7ssh_net7ssh__dependencies.pri b/x11/qt4-creator/patches/patch-src_libs_3rdparty_net7ssh_net7ssh__dependencies.pri
new file mode 100644
index 00000000000..41a5b211a11
--- /dev/null
+++ b/x11/qt4-creator/patches/patch-src_libs_3rdparty_net7ssh_net7ssh__dependencies.pri
@@ -0,0 +1,7 @@
+$NetBSD: patch-src_libs_3rdparty_net7ssh_net7ssh__dependencies.pri,v 1.1 2013/09/19 10:25:44 joerg Exp $
+
+--- src/libs/3rdparty/net7ssh/net7ssh_dependencies.pri.orig	2013-09-18 10:02:39.000000000 +0000
++++ src/libs/3rdparty/net7ssh/net7ssh_dependencies.pri
+@@ -1 +1 @@
+-include(../botan/botan.pri)
++
diff --git a/x11/qt4-creator/patches/patch-src_libs_3rdparty_net7ssh_src_src.pro b/x11/qt4-creator/patches/patch-src_libs_3rdparty_net7ssh_src_src.pro
new file mode 100644
index 00000000000..c97f67a332a
--- /dev/null
+++ b/x11/qt4-creator/patches/patch-src_libs_3rdparty_net7ssh_src_src.pro
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_libs_3rdparty_net7ssh_src_src.pro,v 1.1 2013/09/19 10:25:44 joerg Exp $
+
+--- src/libs/3rdparty/net7ssh/src/src.pro.orig	2010-08-24 07:46:09.000000000 +0000
++++ src/libs/3rdparty/net7ssh/src/src.pro
+@@ -6,7 +6,7 @@ CONFIG += dll
+ include(../../../../qtcreatorlibrary.pri)
+ 
+ DEPENDPATH += .
+-INCLUDEPATH += $$PWD $$PWD/../../botan $$PWD/../../botan/build
++INCLUDEPATH += $$PWD
+ 
+ include(../net7ssh_dependencies.pri)
+ 
+@@ -23,6 +23,8 @@ unix {
+     QMAKE_CXXFLAGS += -Wno-unused-parameter
+ }
+ 
++LIBS += -lbotan
++
+ # Input
+ HEADERS += crypt.h \
+         ne7ssh.h \