Fix building on Darwin

3 files changed, 18 insertions, 51 deletions

diff --git a/security/xmlsec1/distinfo b/security/xmlsec1/distinfo
index 5cf12ce28cb..8ce8d4402bb 100644
--- a/security/xmlsec1/distinfo
+++ b/security/xmlsec1/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.12 2011/05/18 10:51:39 drochner Exp $
+$NetBSD: distinfo,v 1.13 2012/09/28 12:31:59 adam Exp $
 
 SHA1 (xmlsec1-1.2.18.tar.gz) = 740c3c791be838bf638651a3fe0e80c624c2ae0e
 RMD160 (xmlsec1-1.2.18.tar.gz) = da4eb26dc0f9b2bcc7d8da216cbff47fd5fadbe2
 Size (xmlsec1-1.2.18.tar.gz) = 1731099 bytes
-SHA1 (patch-ab) = 2fb1ee3c9ab02775817340185ab3e3b261253590
-SHA1 (patch-ac) = 6d9d1180468b20b91ae3120c72e0a54e32fb7e91
+SHA1 (patch-ab) = 8dd70e6107f520ec919ea97f38ab3fcaec3100ff
diff --git a/security/xmlsec1/patches/patch-ab b/security/xmlsec1/patches/patch-ab
index 8c6880edf82..11a6f8bf8ab 100644
--- a/security/xmlsec1/patches/patch-ab
+++ b/security/xmlsec1/patches/patch-ab
@@ -1,11 +1,20 @@
-$NetBSD: patch-ab,v 1.4 2010/12/25 11:35:06 obache Exp $
+$NetBSD: patch-ab,v 1.5 2012/09/28 12:31:59 adam Exp $
 
 * portability fix
 * DragonFly also not require extra libs for OpenSSL.
 
---- configure.orig	2010-05-25 21:53:07.000000000 +0000
+--- configure.orig	2011-05-11 23:02:14.000000000 +0000
 +++ configure
-@@ -10988,7 +10988,7 @@ CC="$lt_save_CC"
+@@ -9818,7 +9818,7 @@ darwin* | rhapsody*)
+   soname_spec='${libname}${release}${major}$shared_ext'
+   shlibpath_overrides_runpath=yes
+   shlibpath_var=DYLD_LIBRARY_PATH
+-  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
++  shrext_cmds='.dylib'
+ 
+   sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
+   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+@@ -11005,7 +11005,7 @@ CC="$lt_save_CC"
  
  
  
@@ -14,7 +23,7 @@ $NetBSD: patch-ab,v 1.4 2010/12/25 11:35:06 obache Exp $
      # Extract the first word of "rm", so it can be a program name with args.
  set dummy rm; ac_word=$2
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-@@ -11703,7 +11703,7 @@ else
+@@ -11718,7 +11718,7 @@ else
  fi
  
  
@@ -23,15 +32,16 @@ $NetBSD: patch-ab,v 1.4 2010/12/25 11:35:06 obache Exp $
      shrext=$shrext_cmds
  fi
  
-@@ -12366,6 +12366,7 @@ elif test "z$with_openssl" != "z" ; then
+@@ -12465,6 +12465,8 @@ elif test "z$with_openssl" != "z" ; then
  	*-*-osf5*) openssl_exlibs=;;
  	*-*-openbsd*) openssl_exlibs=;;
  	*-*-netbsd*) openssl_exlibs=;;
 +	*-*-dragonfly*) openssl_exlibs=;;
++	*-*-darwin*) openssl_exlibs=;;
  	#FIXME: check if lib "dl" is required
  	*)          openssl_exlibs=-ldl;;
      esac
-@@ -12771,7 +12772,7 @@ else
+@@ -12864,7 +12866,7 @@ else
      XMLSEC_CRYPTO_DISABLED_LIST="$XMLSEC_CRYPTO_DISABLED_LIST openssl"
  fi
  
diff --git a/security/xmlsec1/patches/patch-ac b/security/xmlsec1/patches/patch-ac
deleted file mode 100644
index c4367ee9919..00000000000
--- a/security/xmlsec1/patches/patch-ac
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2010/12/25 11:35:06 obache Exp $
-
-* portability fix
-* DragonFly also not require extra libs for OpenSSL.
-
---- configure.in.orig	2010-05-25 21:52:46.000000000 +0000
-+++ configure.in
-@@ -37,7 +37,7 @@ LT_INIT
- dnl
- dnl Find programs
- dnl
--if test "z$RM" == "z" ; then 
-+if test "z$RM" = "z" ; then 
-     AC_PATH_PROG(RM, rm, /bin/rm)
- fi
- AC_PATH_PROG(CP, cp, /bin/cp)
-@@ -127,7 +127,7 @@ AM_CONDITIONAL(SHAREDLIB_HACK, [test "z$
- dnl ==========================================================================
- dnl Hack for autoconf version mismatch
- dnl ==========================================================================
--if test "z$shrext" == "z" ; then 
-+if test "z$shrext" = "z" ; then 
-     shrext=$shrext_cmds
- fi
- 
-@@ -348,6 +348,7 @@ elif test "z$with_openssl" != "z" ; then
- 	*-*-osf5*) openssl_exlibs=;;
- 	*-*-openbsd*) openssl_exlibs=;;
- 	*-*-netbsd*) openssl_exlibs=;;
-+	*-*-dragonfly*) openssl_exlibs=;;
- 	#FIXME: check if lib "dl" is required
- 	*)          openssl_exlibs=-ldl;;
-     esac
-@@ -505,7 +506,7 @@ else
-     XMLSEC_CRYPTO_DISABLED_LIST="$XMLSEC_CRYPTO_DISABLED_LIST openssl"
- fi
- 
--AM_CONDITIONAL(XMLSEC_NO_OPENSSL, test "z$XMLSEC_NO_OPENSSL" == "z1")
-+AM_CONDITIONAL(XMLSEC_NO_OPENSSL, test "z$XMLSEC_NO_OPENSSL" = "z1")
- AC_SUBST(XMLSEC_NO_OPENSSL)
- AC_SUBST(OPENSSL_CFLAGS)
- AC_SUBST(OPENSSL_LIBS)