CVS commit: pkgsrc/security/qca2

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Tue Jan 23 12:57:05 UTC 2018

Modified Files:
        pkgsrc/security/qca2: distinfo
        pkgsrc/security/qca2/patches: patch-aa
Added Files:
        pkgsrc/security/qca2/patches: patch-app.pri

Log Message:
qca2: Don't override QMAKE_MACOSX_DEPLOYMENT_TARGET.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/security/qca2/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/security/qca2/patches/patch-aa
cvs rdiff -u -r0 -r1.1 pkgsrc/security/qca2/patches/patch-app.pri

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/qca2/distinfo
diff -u pkgsrc/security/qca2/distinfo:1.7 pkgsrc/security/qca2/distinfo:1.8
--- pkgsrc/security/qca2/distinfo:1.7   Wed Nov  4 01:18:06 2015
+++ pkgsrc/security/qca2/distinfo       Tue Jan 23 12:57:04 2018
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.7 2015/11/04 01:18:06 agc Exp $
+$NetBSD: distinfo,v 1.8 2018/01/23 12:57:04 jperkin Exp $
 
 SHA1 (qca-2.0.3.tar.bz2) = 9c868b05b81dce172c41b813de4de68554154c60
 RMD160 (qca-2.0.3.tar.bz2) = 333cfdce91fedfaec09c205528de52d7b569c521
 SHA512 (qca-2.0.3.tar.bz2) = c1120ffb373e294fbcc76e21dc2f503ebd3398b26d0ffa7ab7ee3a3e1a4228159358b59c2673ac4a1c2363771e61da54a5080b201c65d586ceda2e3b2facc1bb
 Size (qca-2.0.3.tar.bz2) = 4530731 bytes
-SHA1 (patch-aa) = e9c7791aac4b8764100a95a596e109e6ebb6abf0
+SHA1 (patch-aa) = e2e9544eafec8020e8758736aa48ab87b014bf10
+SHA1 (patch-app.pri) = 48f3842f49cd0bebc6e944a689e4d89f99990057
 SHA1 (patch-configure) = c114e4f6c2982f8293d37b332a44781fd884412b
 SHA1 (patch-src_botantools_botan_botan_secmem.h) = 4cb74801291dadb4d2c15c741bbb3b836135fcd9

Index: pkgsrc/security/qca2/patches/patch-aa
diff -u pkgsrc/security/qca2/patches/patch-aa:1.2 pkgsrc/security/qca2/patches/patch-aa:1.3
--- pkgsrc/security/qca2/patches/patch-aa:1.2   Tue Jan 27 11:10:46 2009
+++ pkgsrc/security/qca2/patches/patch-aa       Tue Jan 23 12:57:05 2018
@@ -1,8 +1,19 @@
-$NetBSD: patch-aa,v 1.2 2009/01/27 11:10:46 markd Exp $
+$NetBSD: patch-aa,v 1.3 2018/01/23 12:57:05 jperkin Exp $
 
---- src/src.pro.orig   2008-06-04 12:50:25.000000000 +1200
+Don't override QMAKE_MACOSX_DEPLOYMENT_TARGET.
+
+--- src/src.pro.orig   2010-11-27 21:14:12.000000000 +0000
 +++ src/src.pro
-@@ -109,10 +109,6 @@ unix: {
+@@ -81,8 +81,6 @@ mac: {
+       SOURCES += $$QCA_CPP/qca_systemstore_mac.cpp
+       LIBS += -framework Carbon -framework Security
+       QMAKE_LFLAGS_SONAME = -Wl,-install_name,"$$LIBDIR/"
+-
+-      QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.3
+ }
+ 
+ mac:lib_bundle: {
+@@ -108,10 +106,6 @@ unix: {
        incfiles.files = $$PUBLIC_HEADERS
        incfiles.files += $$QCA_INC/qca.h $$QCA_INC/QtCrypto
        !lib_bundle:INSTALLS += incfiles

Added files:

Index: pkgsrc/security/qca2/patches/patch-app.pri
diff -u /dev/null pkgsrc/security/qca2/patches/patch-app.pri:1.1
--- /dev/null   Tue Jan 23 12:57:05 2018
+++ pkgsrc/security/qca2/patches/patch-app.pri  Tue Jan 23 12:57:05 2018
@@ -0,0 +1,14 @@
+$NetBSD: patch-app.pri,v 1.1 2018/01/23 12:57:05 jperkin Exp $
+
+Don't override QMAKE_MACOSX_DEPLOYMENT_TARGET.
+
+--- app.pri.orig       2009-04-24 21:12:15.000000000 +0000
++++ app.pri
+@@ -1,7 +1,5 @@
+ include(confapp.pri)
+ 
+-mac:QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.3
+-
+ exists(crypto.prf) {
+       # our apps should build against the qca in this tree
+       include(crypto.prf)