fixes patches for previous commit, not for generated file.

4 files changed, 29 insertions, 29 deletions

diff --git a/security/xmlsec1/distinfo b/security/xmlsec1/distinfo
index cd0cf7bb6f4..4e7dfaaaf3f 100644
--- a/security/xmlsec1/distinfo
+++ b/security/xmlsec1/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.8 2010/10/04 12:32:16 obache Exp $
+$NetBSD: distinfo,v 1.9 2010/10/04 12:46:26 obache Exp $
 
 SHA1 (xmlsec1-1.2.16.tar.gz) = ecd220b4498bbe212188fffd0aded92910d4bbd9
 RMD160 (xmlsec1-1.2.16.tar.gz) = 15064b3c3ec84c87b271013cb3fa165972f0e2c4
 Size (xmlsec1-1.2.16.tar.gz) = 1803092 bytes
 SHA1 (patch-ab) = 6c771503bba0d291c26db6102dd1365a561d17a2
 SHA1 (patch-ac) = 03e9d3d97ab6ab2e753516574f1be8e7eda236c4
-SHA1 (patch-ae) = b0c819654ab471997c1db9397bf633f531e0b44d
-SHA1 (patch-af) = 0637f4a473d10709c373e975cfc348c93d33e2be
-SHA1 (patch-ag) = 12632fce3978d2d602fd8b510c26723a301835c2
+SHA1 (patch-ae) = df381960d33810f5501bd904bd4cef2bb7bf30fd
+SHA1 (patch-af) = 2b83843cbc09ae4dfdc21143fb733159ee0c79d1
+SHA1 (patch-ag) = 31aa963be3c46486cea72a98d260fb9a5d5c47ac
diff --git a/security/xmlsec1/patches/patch-ae b/security/xmlsec1/patches/patch-ae
index 39a8d1e85d8..bf6b3ce3802 100644
--- a/security/xmlsec1/patches/patch-ae
+++ b/security/xmlsec1/patches/patch-ae
@@ -1,13 +1,13 @@
-$NetBSD: patch-ae,v 1.1 2010/10/04 12:32:16 obache Exp $
+$NetBSD: patch-ae,v 1.2 2010/10/04 12:46:26 obache Exp $
 
 remove redundant escape slash.
 
---- xmlsec1-gcrypt.pc.orig	2010-05-25 21:53:21.000000000 +0000
-+++ xmlsec1-gcrypt.pc
-@@ -7,5 +7,5 @@ Name: xmlsec1-gcrypt
- Version: 1.2.16
+--- xmlsec-gnutls.pc.in.orig	2010-05-25 21:52:46.000000000 +0000
++++ xmlsec-gnutls.pc.in
+@@ -7,5 +7,5 @@ Name: xmlsec1-gnutls
+ Version: @VERSION@
  Description: XML Security Library implements XML Signature and XML Encryption standards
- Requires: libxml-2.0 >= 2.7.4 libxslt >= 1.0.20
--Cflags: -DXMLSEC_CRYPTO=\\\"gcrypt\\\"  -D__XMLSEC_FUNCTION__=__FUNCTION__ -DXMLSEC_NO_GOST=1 -DXMLSEC_NO_XKMS=1 -DXMLSEC_DL_LIBLTDL=1, -I${prefix}/include/xmlsec1     -DXMLSEC_CRYPTO_GCRYPT=1
-+Cflags: -DXMLSEC_CRYPTO=\"gcrypt\"  -D__XMLSEC_FUNCTION__=__FUNCTION__ -DXMLSEC_NO_GOST=1 -DXMLSEC_NO_XKMS=1 -DXMLSEC_DL_LIBLTDL=1, -I${prefix}/include/xmlsec1     -DXMLSEC_CRYPTO_GCRYPT=1
- Libs: -L${exec_prefix}/lib -lxmlsec1-gcrypt -lxmlsec1 -lltdl   -lgcrypt
+ Requires: libxml-2.0 >= @LIBXML_MIN_VERSION@ libxslt >= @LIBXSLT_MIN_VERSION@
+-Cflags: -DXMLSEC_CRYPTO=\\\"gnutls\\\" @XMLSEC_GNUTLS_CFLAGS@
++Cflags: -DXMLSEC_CRYPTO=\"gnutls\" @XMLSEC_GNUTLS_CFLAGS@
+ Libs: @XMLSEC_GNUTLS_LIBS@
diff --git a/security/xmlsec1/patches/patch-af b/security/xmlsec1/patches/patch-af
index b312891accf..e73ef04981d 100644
--- a/security/xmlsec1/patches/patch-af
+++ b/security/xmlsec1/patches/patch-af
@@ -1,13 +1,13 @@
-$NetBSD: patch-af,v 1.1 2010/10/04 12:32:16 obache Exp $
+$NetBSD: patch-af,v 1.2 2010/10/04 12:46:26 obache Exp $
 
 remove redundant escape slash.
 
---- xmlsec1-openssl.pc.orig	2010-05-25 21:53:21.000000000 +0000
-+++ xmlsec1-openssl.pc
+--- xmlsec-openssl.pc.in.orig	2010-05-25 21:52:46.000000000 +0000
++++ xmlsec-openssl.pc.in
 @@ -7,5 +7,5 @@ Name: xmlsec1-openssl
- Version: 1.2.16
+ Version: @VERSION@
  Description: XML Security Library implements XML Signature and XML Encryption standards
- Requires: libxml-2.0 >= 2.7.4 libxslt >= 1.0.20 
--Cflags: -DXMLSEC_CRYPTO=\\\"openssl\\\"  -D__XMLSEC_FUNCTION__=__FUNCTION__ -DXMLSEC_NO_GOST=1 -DXMLSEC_NO_XKMS=1 -DXMLSEC_DL_LIBLTDL=1, -I${prefix}/include/xmlsec1     -DXMLSEC_OPENSSL_098=1 -DXMLSEC_CRYPTO_OPENSSL=1
-+Cflags: -DXMLSEC_CRYPTO=\"openssl\"  -D__XMLSEC_FUNCTION__=__FUNCTION__ -DXMLSEC_NO_GOST=1 -DXMLSEC_NO_XKMS=1 -DXMLSEC_DL_LIBLTDL=1, -I${prefix}/include/xmlsec1     -DXMLSEC_OPENSSL_098=1 -DXMLSEC_CRYPTO_OPENSSL=1
- Libs: -L${exec_prefix}/lib -lxmlsec1-openssl -lxmlsec1 -lltdl  -lssl -lcrypto  
+ Requires: libxml-2.0 >= @LIBXML_MIN_VERSION@ libxslt >= @LIBXSLT_MIN_VERSION@ 
+-Cflags: -DXMLSEC_CRYPTO=\\\"openssl\\\" @XMLSEC_OPENSSL_CFLAGS@
++Cflags: -DXMLSEC_CRYPTO=\"openssl\" @XMLSEC_OPENSSL_CFLAGS@
+ Libs: @XMLSEC_OPENSSL_LIBS@
diff --git a/security/xmlsec1/patches/patch-ag b/security/xmlsec1/patches/patch-ag
index 4ba77c7e525..b688954000e 100644
--- a/security/xmlsec1/patches/patch-ag
+++ b/security/xmlsec1/patches/patch-ag
@@ -1,13 +1,13 @@
-$NetBSD: patch-ag,v 1.1 2010/10/04 12:32:16 obache Exp $
+$NetBSD: patch-ag,v 1.2 2010/10/04 12:46:26 obache Exp $
 
 remove redundant escape slash.
 
---- xmlsec1.pc.orig	2010-05-25 21:53:20.000000000 +0000
-+++ xmlsec1.pc
+--- xmlsec.pc.in.orig	2010-05-25 21:52:46.000000000 +0000
++++ xmlsec.pc.in
 @@ -7,5 +7,5 @@ Name: xmlsec1
- Version: 1.2.16
+ Version: @VERSION@
  Description: XML Security Library implements XML Signature and XML Encryption standards
- Requires: libxml-2.0 >= 2.7.4 libxslt >= 1.0.20 
--Cflags: -DXMLSEC_CRYPTO=\\\"openssl\\\" -DXMLSEC_CRYPTO_DYNAMIC_LOADING=1  -D__XMLSEC_FUNCTION__=__FUNCTION__ -DXMLSEC_NO_GOST=1 -DXMLSEC_NO_XKMS=1 -DXMLSEC_DL_LIBLTDL=1, -I${prefix}/include/xmlsec1  
-+Cflags: -DXMLSEC_CRYPTO=\"openssl\" -DXMLSEC_CRYPTO_DYNAMIC_LOADING=1  -D__XMLSEC_FUNCTION__=__FUNCTION__ -DXMLSEC_NO_GOST=1 -DXMLSEC_NO_XKMS=1 -DXMLSEC_DL_LIBLTDL=1, -I${prefix}/include/xmlsec1  
- Libs: -L${libdir} -lxmlsec1 -lltdl  
+ Requires: libxml-2.0 >= @LIBXML_MIN_VERSION@ libxslt >= @LIBXSLT_MIN_VERSION@ 
+-Cflags: -DXMLSEC_CRYPTO=\\\"@XMLSEC_CRYPTO@\\\" -DXMLSEC_CRYPTO_DYNAMIC_LOADING=1 @XMLSEC_CORE_CFLAGS@
++Cflags: -DXMLSEC_CRYPTO=\"@XMLSEC_CRYPTO@\" -DXMLSEC_CRYPTO_DYNAMIC_LOADING=1 @XMLSEC_CORE_CFLAGS@
+ Libs: -L${libdir} @XMLSEC_CORE_LIBS@