This fixes build in -current by checking for ENGINE_load_cryptodev
and disabling the -E option if not present.  OK?

Index: Makefile
===================================================================
RCS file: /cvs/ports/net/ldns/utils/Makefile,v
retrieving revision 1.29
diff -u -p -r1.29 Makefile
--- Makefile    22 Jan 2014 00:15:37 -0000      1.29
+++ Makefile    12 Jun 2014 18:49:41 -0000
@@ -13,4 +13,7 @@ USE_GMAKE=    Yes
 CONFIGURE_ARGS+= --with-ldns=${LOCALBASE}
 CONFIGURE_ENV+=        libtool=${LIBTOOL}
 
+CONFIGURE_STYLE=  autoconf
+AUTOCONF_VERSION= 2.68
+
 .include <bsd.port.mk>
Index: patches/patch-examples_configure_ac
===================================================================
RCS file: patches/patch-examples_configure_ac
diff -N patches/patch-examples_configure_ac
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-examples_configure_ac 12 Jun 2014 18:49:41 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- examples/configure.ac.orig Fri Jan 10 21:04:41 2014
++++ examples/configure.ac      Thu Jun 12 19:44:27 2014
+@@ -207,6 +207,8 @@ case "$enable_dane" in
+       ;;
+ esac
+ 
++AC_CHECK_FUNCS(ENGINE_load_cryptodev)
++
+ LDFLAGS="$tmp_LDFLAGS"
+ LIBS="$tmp_LIBS"
+ 
Index: patches/patch-examples_ldns-signzone_c
===================================================================
RCS file: patches/patch-examples_ldns-signzone_c
diff -N patches/patch-examples_ldns-signzone_c
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-examples_ldns-signzone_c      12 Jun 2014 18:49:41 -0000
@@ -0,0 +1,30 @@
+$OpenBSD$
+--- examples/ldns-signzone.c.orig      Thu Jun 12 19:37:28 2014
++++ examples/ldns-signzone.c   Thu Jun 12 19:39:31 2014
+@@ -39,8 +39,10 @@ usage(FILE *fp, const char *prog) {
+       fprintf(fp, "  -o <domain>\torigin for the zone\n");
+       fprintf(fp, "  -v\t\tprint version and exit\n");
+       fprintf(fp, "  -A\t\tsign DNSKEY with all keys instead of minimal\n");
++#ifdef HAVE_ENGINE_LOAD_CRYPTODEV
+       fprintf(fp, "  -E <name>\tuse <name> as the crypto engine for 
signing\n");
+       fprintf(fp, "           \tThis can have a lot of extra options, see the 
manual page for more info\n");
++#endif
+       fprintf(fp, "  -k <id>,<int>\tuse key id with algorithm int from 
engine\n");
+       fprintf(fp, "  -K <id>,<int>\tuse key id with algorithm int from engine 
as KSK\n");
+       fprintf(fp, "\t\tif no key is given (but an external one is used 
through the engine support, it might be necessary to provide the right 
algorithm number.\n");
+@@ -470,6 +472,7 @@ main(int argc, char *argv[])
+               case 'A':
+                       signflags |= LDNS_SIGN_DNSKEY_WITH_ZSK;
+                       break;
++#ifdef HAVE_ENGINE_LOAD_CRYPTODEV
+               case 'E':
+                       ENGINE_load_builtin_engines();
+                       ENGINE_load_dynamic();
+@@ -494,6 +497,7 @@ main(int argc, char *argv[])
+                               ENGINE_set_default(engine, 0);
+                       }
+                       break;
++#endif
+               case 'k':
+                       eng_key_l = strchr(optarg, ',');
+                       if (eng_key_l && strlen(eng_key_l) > 1) {

Reply via email to