pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/security/qca2 install qca2 files into qt4 subdirectory...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/aaf7d81e60b9
branches:  trunk
changeset: 536709:aaf7d81e60b9
user:      jdolecek <jdolecek%pkgsrc.org@localhost>
date:      Fri Dec 21 00:19:43 2007 +0000

description:
install qca2 files into qt4 subdirectory, so that qca 1.x and qca2 could
be installed at the same time; also speedup build by disabling building
tests and other miscellaneous cleanup

bump PKGREVISION

diffstat:

 security/qca2/Makefile         |  11 +++++++-
 security/qca2/PLIST            |  50 +++++++++++++++++++++---------------------
 security/qca2/buildlink3.mk    |  18 +++++++-------
 security/qca2/distinfo         |   3 +-
 security/qca2/patches/patch-aa |  15 ++++++++++++
 5 files changed, 60 insertions(+), 37 deletions(-)

diffs (146 lines):

diff -r 127b2b203084 -r aaf7d81e60b9 security/qca2/Makefile
--- a/security/qca2/Makefile    Thu Dec 20 21:40:38 2007 +0000
+++ b/security/qca2/Makefile    Fri Dec 21 00:19:43 2007 +0000
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/12/20 20:17:47 jdolecek Exp $
+# $NetBSD: Makefile,v 1.2 2007/12/21 00:19:43 jdolecek Exp $
 
 DISTNAME=      qca-2.0.0
+PKGNAME=       qca2-${DISTNAME:C/.*-//}
+PKGREVISION=   1
 CATEGORIES=    security
 MASTER_SITES=  http://delta.affinix.com/download/qca/2.0/
 EXTRACT_SUFX=  .tar.bz2
@@ -14,7 +16,12 @@
 HAS_CONFIGURE= yes
 USE_LANGUAGES= c++
 
-INSTALLATION_DIRS=     include lib
+INSTALLATION_DIRS=     qt4/include qt4/lib qt4/plugins/crypto
+
+# install under qt4 prefix to not clash with qca 1.x
+CONFIGURE_ARGS+=       --prefix=${QTDIR}
+CONFIGURE_ARGS+=       --qtdir=${QTDIR}
+CONFIGURE_ARGS+=       --disable-tests
 
 .include "../../x11/qt4-libs/buildlink3.mk"
 .include "../../x11/qt4-tools/buildlink3.mk"
diff -r 127b2b203084 -r aaf7d81e60b9 security/qca2/PLIST
--- a/security/qca2/PLIST       Thu Dec 20 21:40:38 2007 +0000
+++ b/security/qca2/PLIST       Fri Dec 21 00:19:43 2007 +0000
@@ -1,26 +1,26 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/12/20 20:17:47 jdolecek Exp $
-include/QtCrypto/QtCrypto
-include/QtCrypto/qca.h
-include/QtCrypto/qca_basic.h
-include/QtCrypto/qca_cert.h
-include/QtCrypto/qca_core.h
-include/QtCrypto/qca_export.h
-include/QtCrypto/qca_keystore.h
-include/QtCrypto/qca_publickey.h
-include/QtCrypto/qca_securelayer.h
-include/QtCrypto/qca_securemessage.h
-include/QtCrypto/qca_support.h
-include/QtCrypto/qca_textfilter.h
-include/QtCrypto/qca_tools.h
-include/QtCrypto/qcaprovider.h
-include/QtCrypto/qpipe.h
-lib/libqca.la
-lib/libqca.prl
-lib/pkgconfig/qca2.pc
+@comment $NetBSD: PLIST,v 1.2 2007/12/21 00:19:43 jdolecek Exp $
+qt4/include/QtCrypto/QtCrypto
+qt4/include/QtCrypto/qca.h
+qt4/include/QtCrypto/qca_basic.h
+qt4/include/QtCrypto/qca_cert.h
+qt4/include/QtCrypto/qca_core.h
+qt4/include/QtCrypto/qca_export.h
+qt4/include/QtCrypto/qca_keystore.h
+qt4/include/QtCrypto/qca_publickey.h
+qt4/include/QtCrypto/qca_securelayer.h
+qt4/include/QtCrypto/qca_securemessage.h
+qt4/include/QtCrypto/qca_support.h
+qt4/include/QtCrypto/qca_textfilter.h
+qt4/include/QtCrypto/qca_tools.h
+qt4/include/QtCrypto/qcaprovider.h
+qt4/include/QtCrypto/qpipe.h
+qt4/lib/libqca.la
+qt4/lib/libqca.prl
+qt4/lib/pkgconfig/qca2.pc
 qt4/mkspecs/features/crypto.prf
-share/man/man1/qcatool2.1
-share/qca/certs/README
-share/qca/certs/rootcerts.pem
-@dirrm share/qca/certs
-@dirrm share/qca
-@dirrm include/QtCrypto
+qt4/share/qca/certs/README
+qt4/share/qca/certs/rootcerts.pem
+@dirrm qt4/share/qca/certs
+@dirrm qt4/share/qca
+@dirrm qt4/plugins/crypto
+@dirrm qt4/include/QtCrypto
diff -r 127b2b203084 -r aaf7d81e60b9 security/qca2/buildlink3.mk
--- a/security/qca2/buildlink3.mk       Thu Dec 20 21:40:38 2007 +0000
+++ b/security/qca2/buildlink3.mk       Fri Dec 21 00:19:43 2007 +0000
@@ -1,21 +1,21 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/12/20 20:17:47 jdolecek Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2007/12/21 00:19:43 jdolecek Exp $
 #
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 QCA_BUILDLINK3_MK:=    ${QCA_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=    qca
+BUILDLINK_DEPENDS+=    qca2
 .endif
 
-BUILDLINK_PACKAGES:=   ${BUILDLINK_PACKAGES:Nqca}
-BUILDLINK_PACKAGES+=   qca
-BUILDLINK_ORDER:=      ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}qca
+BUILDLINK_PACKAGES:=   ${BUILDLINK_PACKAGES:Nqca2}
+BUILDLINK_PACKAGES+=   qca2
+BUILDLINK_ORDER:=      ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}qca2
 
 .if !empty(QCA_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.qca+=    qca>=2.0.0
-BUILDLINK_ABI_DEPENDS.qca?=    qca>=2.0.0
-BUILDLINK_PKGSRCDIR.qca?=      ../../security/qca
-.endif # QCA_BUILDLINK3_MK
+BUILDLINK_API_DEPENDS.qca2+=   qca2>=2.0.0
+BUILDLINK_ABI_DEPENDS.qca2?=   qca2>=2.0.0
+BUILDLINK_PKGSRCDIR.qca2?=     ../../security/qca2
+.endif # QCA2_BUILDLINK3_MK
 
 .include "../../x11/qt4-libs/buildlink3.mk"
 .include "../../x11/qt4-tools/buildlink3.mk"
diff -r 127b2b203084 -r aaf7d81e60b9 security/qca2/distinfo
--- a/security/qca2/distinfo    Thu Dec 20 21:40:38 2007 +0000
+++ b/security/qca2/distinfo    Fri Dec 21 00:19:43 2007 +0000
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/12/20 20:17:47 jdolecek Exp $
+$NetBSD: distinfo,v 1.2 2007/12/21 00:19:43 jdolecek Exp $
 
 SHA1 (qca-2.0.0.tar.bz2) = 5b896647426637e1974703f2950786746408c70b
 RMD160 (qca-2.0.0.tar.bz2) = 256ca518fea507d03b67c0f5d26ba2ac7b3db517
 Size (qca-2.0.0.tar.bz2) = 5106520 bytes
+SHA1 (patch-aa) = 5dcb9d5eb4c0906c97f9b8d98eac2ab996c33f67
diff -r 127b2b203084 -r aaf7d81e60b9 security/qca2/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/qca2/patches/patch-aa    Fri Dec 21 00:19:43 2007 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-aa,v 1.1 2007/12/21 00:19:44 jdolecek Exp $
+
+--- src/src.pro.orig   2007-08-14 23:00:28.000000000 +0200
++++ src/src.pro
+@@ -91,10 +91,6 @@ unix: {
+       incfiles.files = $$PUBLIC_HEADERS
+       incfiles.files += $$QCA_INC/qca.h $$QCA_INC/QtCrypto
+       INSTALLS += incfiles
+-
+-      manfiles.path = $$DATADIR/man/man1
+-      manfiles.files = $$QCA_BASE/man/qcatool2.1
+-      INSTALLS += manfiles
+ }
+ 
+ !debug_and_release|build_pass {



Home | Main Index | Thread Index | Old Index