lasso: Don't overwrite user CFLAGS.

Also remove patched configure.ac, we don't do that if we're also patching
configure as it doesn't achieve anything and can cause timestamp issues.

3 files changed, 17 insertions, 43 deletions

diff --git a/security/lasso/distinfo b/security/lasso/distinfo
index dcb6cb25888..28f0ffb6561 100644
--- a/security/lasso/distinfo
+++ b/security/lasso/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.20 2017/03/23 17:06:58 joerg Exp $
+$NetBSD: distinfo,v 1.21 2017/12/18 15:33:59 jperkin Exp $
 
 SHA1 (lasso-2.5.1.tar.gz) = fe0e68010bab6e11383003b5cf869c0447ed7a6e
 RMD160 (lasso-2.5.1.tar.gz) = 8cc0506fe8cbac770e952fdb0f067c7e58f5bb43
 SHA512 (lasso-2.5.1.tar.gz) = f20bea62c04f3082d5c423f658bafe1bdde0012321c43092ed5d5a2c3ec7b21ec27d88d9fc630743fd7c99e767d9fd92b98de5d4f7d98c3a9e680717483daae1
 Size (lasso-2.5.1.tar.gz) = 4552152 bytes
-SHA1 (patch-configure) = 8acdd57ba89fea824ea0bc6b0080298b78226678
-SHA1 (patch-configure.ac) = 8cb6a7ad3aec9a7c17892ae4e0493ad3d6a8cde1
+SHA1 (patch-configure) = fe5650cfe939d8c4de66d185c36936840958e5d1
diff --git a/security/lasso/patches/patch-configure b/security/lasso/patches/patch-configure
index 4ebb807d07a..230c50d21f2 100644
--- a/security/lasso/patches/patch-configure
+++ b/security/lasso/patches/patch-configure
@@ -1,14 +1,23 @@
-$NetBSD: patch-configure,v 1.2 2015/04/01 14:05:02 manu Exp $
+$NetBSD: patch-configure,v 1.3 2017/12/18 15:33:59 jperkin Exp $
 
 Make sure _POSIX_C_SOURCE=199506 so that strtok() is defined by <string.h>
 Otherwise, compiler assumes it returns an int, which badly breaks on LP64
 
 Also use = instead of == for test(1) portability sake.
 
---- configure.orig	2014-08-28 16:05:55.000000000 +0200
-+++ configure	2015-03-25 11:43:14.000000000 +0100
-@@ -13771,9 +13771,9 @@
-   enable_java=no
+--- configure.orig	2016-02-18 23:11:38.249290059 +0000
++++ configure
+@@ -4382,9 +4382,6 @@ else
+ fi
+ 
+ 
+-CFLAGS=""
+-AM_CFLAGS=""
+-
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -13976,7 +13973,7 @@ else
    JAVA_VERSION=""
  fi
  
@@ -17,9 +26,7 @@ Also use = instead of == for test(1) portability sake.
      JNI_EXTRA_LDFLAGS="-shrext .jnilib"
  fi
  
-  if test "x$enable_java" = "xyes"; then
-@@ -15279,8 +15279,9 @@
- fi
+@@ -15650,6 +15647,7 @@ fi
  
  
  LASSO_PUB_CFLAGS="$LASSO_DEFINES"
@@ -27,4 +34,3 @@ Also use = instead of == for test(1) portability sake.
  LASSO_CORE_CFLAGS="$LASSO_CFLAGS $LASSO_DEFINES $Z_CFLAGS -DLASSO_INTERNALS"
  if test $MINGW -eq 1; then
    LASSO_CORE_LIBS="-llasso-0"
- else
diff --git a/security/lasso/patches/patch-configure.ac b/security/lasso/patches/patch-configure.ac
deleted file mode 100644
index fd1e9e3317a..00000000000
--- a/security/lasso/patches/patch-configure.ac
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-configure.ac,v 1.2 2015/04/01 14:05:02 manu Exp $
-
-Make sure _POSIX_C_SOURCE=199506 so that strtok() is defined by <string.h>
-Otherwise, compiler assumes it returns an int, which badly breaks on LP64
-
-Also use = instead of == for test(1) portability sake.
-
---- configure.ac.orig	2014-08-28 15:47:50.000000000 +0200
-+++ configure.ac	2015-03-25 11:43:28.000000000 +0100
-@@ -286,9 +286,9 @@
-   JAVA_VERSION=""
- fi
- 
- dnl Support JNI under MacOsX
--if test  "$DARWIN" == 1; then
-+if test  "$DARWIN" = 1; then
-     JNI_EXTRA_LDFLAGS="-shrext .jnilib"
- fi
- 
- dnl Conditional java sub dir test.
-@@ -748,8 +748,10 @@
- dnl ==========================================================================
- dnl Final steps: lasso config
- dnl ==========================================================================
- LASSO_PUB_CFLAGS="$LASSO_DEFINES"
-+dnl For strtok_r()
-+LASSO_CFLAGS="$LASSO_CFLAGS -D_POSIX_C_SOURCE=199506"
- LASSO_CORE_CFLAGS="$LASSO_CFLAGS $LASSO_DEFINES $Z_CFLAGS -DLASSO_INTERNALS" 
- if test $MINGW -eq 1; then 
-   LASSO_CORE_LIBS="-llasso-0"
- else