wolfssl: More clean up.

[Santhosh Raju <fox%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Santhosh Raju <fox%NetBSD.org@localhost>
Pushed By:	fox
Date:		Mon Jan 27 17:30:14 2020 -0500
Changeset:	a14a44e63365b3975240216e9ec3c894e3a49845

Modified Files:
	wolfssl/Makefile
	wolfssl/distinfo
Added Files:
	wolfssl/patches/patch-configure
Removed Files:
	wolfssl/patches/patch-configure.ac

Log Message:
wolfssl: More clean up.

- Patches configure directly instead of patching configure.ac
- Removes some redundant lines from Makefile

Suggestions by leot@ and nia@

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=a14a44e63365b3975240216e9ec3c894e3a49845

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

diffstat:
 wolfssl/Makefile                   |  8 +++-----
 wolfssl/distinfo                   |  2 +-
 wolfssl/patches/patch-configure    | 24 ++++++++++++++++++++++++
 wolfssl/patches/patch-configure.ac | 24 ------------------------
 4 files changed, 28 insertions(+), 30 deletions(-)

diffs:
diff --git a/wolfssl/Makefile b/wolfssl/Makefile
index 88e02abd94..4626c17281 100644
--- a/wolfssl/Makefile
+++ b/wolfssl/Makefile
@@ -32,13 +32,11 @@ CONFIGURE_ARGS+=	--enable-tls13-draft23
 CONFIGURE_ARGS+=	--enable-tls13-draft26
 CONFIGURE_ARGS+=	--enable-tls13-draft28
 
-USE_TOOLS+=	autoreconf autoconf automake gawk gmake m4 pkg-config zip
-USE_LANGUAGES=	c c++
+PKGCONFIG_OVERRIDE+=	support/wolfssl.pc.in
+
+USE_TOOLS+=	gawk gmake pkg-config zip
 USE_LIBTOOL=	yes
 
 TEST_TARGET=	check
 
-pre-configure:
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} autoreconf -vif
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/wolfssl/distinfo b/wolfssl/distinfo
index d3cbb8dba0..ffcfc45021 100644
--- a/wolfssl/distinfo
+++ b/wolfssl/distinfo
@@ -5,4 +5,4 @@ RMD160 (wolfssl-4.3.0.zip) = eabf566d1ed80bca0d2188e1194e6569f21821dd
 SHA512 (wolfssl-4.3.0.zip) = ebfe85a5a815ca626e936b4529d6655b9e361bcda551d4bf82b05e1a492a13255705f649224113c587ed2c5249ddfd996b5915bbc6a50fc36da976c581ba9be3
 Size (wolfssl-4.3.0.zip) = 7428521 bytes
 SHA1 (patch-certs_intermediate_genintcerts.sh) = bdcf9a1fd14170aaf780ab9677fd8bc6e4ddc75c
-SHA1 (patch-configure.ac) = e562814f8c2d1c4a242383820e5b730c88e48211
+SHA1 (patch-configure) = 7252cceec28c8f4a1338207429873e0e19ce15d9
diff --git a/wolfssl/patches/patch-configure b/wolfssl/patches/patch-configure
new file mode 100644
index 0000000000..c8c81d3554
--- /dev/null
+++ b/wolfssl/patches/patch-configure
@@ -0,0 +1,24 @@
+$NetBSD$
+
+Make the scripts portable.
+
+--- configure.orig	2019-12-20 19:59:37.000000000 +0000
++++ configure
+@@ -19214,7 +19214,7 @@ then
+     ENABLED_ENCRYPT_THEN_MAC=yes
+ fi
+ 
+-if test "x$ENABLED_SNIFFER" == "xyes"; then :
++if test "x$ENABLED_SNIFFER" = "xyes"; then :
+   ENABLED_ENCRYPT_THEN_MAC="no"
+ fi
+ 
+@@ -19951,7 +19951,7 @@ fi
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 
+-     if test "x$BUILD_INTEL_QAT_VERSION" == "x1"; then :
++     if test "x$BUILD_INTEL_QAT_VERSION" = "x1"; then :
+   LIB_ADD="-ladf_proxy -losal -lrt $LIB_ADD"
+ else
+   LIB_ADD="-losal -lrt $LIB_ADD"
diff --git a/wolfssl/patches/patch-configure.ac b/wolfssl/patches/patch-configure.ac
deleted file mode 100644
index b3e363605b..0000000000
--- a/wolfssl/patches/patch-configure.ac
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD$
-
-Make the script portable.
-
---- configure.ac.orig	2020-01-27 21:11:42.388896166 +0000
-+++ configure.ac
-@@ -3462,7 +3462,7 @@ then
-     ENABLED_ENCRYPT_THEN_MAC=yes
- fi
- 
--AS_IF([test "x$ENABLED_SNIFFER" == "xyes"],[ENABLED_ENCRYPT_THEN_MAC="no"])
-+AS_IF([test "x$ENABLED_SNIFFER" = "xyes"],[ENABLED_ENCRYPT_THEN_MAC="no"])
- 
- if test "x$ENABLED_ENCRYPT_THEN_MAC" = "xyes"
- then
-@@ -3995,7 +3995,7 @@ AS_IF([test "x$ENABLED_INTEL_QA" = "xyes
- 
-      AC_MSG_RESULT([yes])
- 
--     AS_IF([test "x$BUILD_INTEL_QAT_VERSION" == "x1"],
-+     AS_IF([test "x$BUILD_INTEL_QAT_VERSION" = "x1"],
-         [LIB_ADD="-ladf_proxy -losal -lrt $LIB_ADD"],
-         [LIB_ADD="-losal -lrt $LIB_ADD"])
-      CPPFLAGS="$OLD_CPPFLAGS"