Attachment #152091 for bug #191853

Lines 3-9 Link Here

(-)Makefile (-1 / +2 lines)
3		3
4	PORTNAME= ldns	4	PORTNAME= ldns
5	PORTVERSION= 1.6.17	5	PORTVERSION= 1.6.17
6	PORTREVISION= 3	6	PORTREVISION= 4
7	CATEGORIES= dns	7	CATEGORIES= dns
8	MASTER_SITES= http://www.nlnetlabs.nl/downloads/ldns/ \	8	MASTER_SITES= http://www.nlnetlabs.nl/downloads/ldns/ \
9	LOCAL/ehaupt	9	LOCAL/ehaupt
Lines 80-85 Link Here
80	.if ${PORT_OPTIONS:MGOST}	80	.if ${PORT_OPTIONS:MGOST}
81	. if ${OSVERSION} < 1000015	81	. if ${OSVERSION} < 1000015
82	BUILD_DEPENDS+= openssl>=1.0:${PORTSDIR}/security/openssl	82	BUILD_DEPENDS+= openssl>=1.0:${PORTSDIR}/security/openssl
		83	CONFLICTS+= libressl-*
83	. endif	84	. endif
84	.else	85	.else
85	NO_GOST= --disable-gost	86	NO_GOST= --disable-gost

Line 0 Link Here

(-)files/patch-drill_Makefile.in (+11 lines)
	1	--- drill/Makefile.in.orig 2014-01-10 21:04:41 UTC
	2	+++ drill/Makefile.in
	3	@@ -98,7 +98,7 @@ doc:
	4
	5	install: all
	6	$(INSTALL) -d $(DESTDIR)$(bindir)
	7	- $(INSTALL) drill $(DESTDIR)$(bindir)/drill
	8	+ $(INSTALL) -s drill $(DESTDIR)$(bindir)/drill
	9	$(INSTALL) -m 644 drill.1 $(DESTDIR)$(mandir)/man1/drill.1
	10
	11	uninstall:




--- examples/Makefile.in.orig	2014-01-10 21:04:41 UTC
+++ examples/Makefile.in
@@ -169,7 +169,7 @@ install:	$(PROGRAMS) $(SSL_PROGRAMS)
 		$(INSTALL) -d -m 755 $(DESTDIR)$(mandir)
 		$(INSTALL) -d -m 755 $(DESTDIR)$(mandir)/man1
 		for i in $(PROGRAMS) $(SSL_PROGRAMS); do \
-			$(libtool) --tag=CC --mode=install ${INSTALL} -c $$i $(DESTDIR)$(bindir) ; \
+			$(libtool) --tag=CC --mode=install ${INSTALL} -s -c $$i $(DESTDIR)$(bindir) ; \
 			if test -f $$i.1 ; \
 			then $(INSTALL) -c -m 644 $$i.1 $(DESTDIR)$(mandir)/man1/$$i.1 ; \
 			else $(INSTALL) -c -m 644 $(srcdir)/$$i.1 $(DESTDIR)$(mandir)/man1/$$i.1 ; \
@@ -182,14 +182,14 @@ install-static:	all-static
 		$(INSTALL) -d -m 755 $(DESTDIR)$(mandir)
 		$(INSTALL) -d -m 755 $(DESTDIR)$(mandir)/man1
 		for i in $(PROGRAMS); do \
-			$(libtool) --tag=CC --mode=install ${INSTALL} -c $$i.stc $(DESTDIR)$(bindir) ; \
+			$(libtool) --tag=CC --mode=install ${INSTALL} -s -c $$i.stc $(DESTDIR)$(bindir) ; \
 			if test -f $$i.1 ; \
 			then $(INSTALL) -c -m 644 $$i.1 $(DESTDIR)$(mandir)/man1/$$i.1 ; \
 			else $(INSTALL) -c -m 644 $(srcdir)/$$i.1 $(DESTDIR)$(mandir)/man1/$$i.1 ; \
 			fi ; \
 			done
 		for i in $(SSL_PROGRAMS); do \
-			$(libtool) --tag=CC --mode=install ${INSTALL} -c $$i.stc-ssl $(DESTDIR)$(bindir) ; \
+			$(libtool) --tag=CC --mode=install ${INSTALL} -s -c $$i.stc-ssl $(DESTDIR)$(bindir) ; \
 			if test -f $$i.1 ; \
 			then $(INSTALL) -c -m 644 $$i.1 $(DESTDIR)$(mandir)/man1/$$i.1 ; \
 			else $(INSTALL) -c -m 644 $(srcdir)/$$i.1 $(DESTDIR)$(mandir)/man1/$$i.1 ; \

Line 0 Link Here

(-)files/patch-examples_configure.ac (+11 lines)
	1	--- examples/configure.ac.orig 2014-01-10 21:04:41 UTC
	2	+++ examples/configure.ac
	3	@@ -207,6 +207,8 @@ case "$enable_dane" in
	4	;;
	5	esac
	6
	7	+AC_CHECK_FUNCS(ENGINE_load_cryptodev)
	8	+
	9	LDFLAGS="$tmp_LDFLAGS"
	10	LIBS="$tmp_LIBS"
	11




--- examples/ldns-signzone.c.orig	2014-01-10 21:04:41 UTC
+++ examples/ldns-signzone.c
@@ -470,6 +470,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 +495,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) {

Return to bug 191853

Line 0 Link Here

(-)files/patch-examples_Makefile.in (+28 lines)
	1	--- examples/Makefile.in.orig 2014-01-10 21:04:41 UTC
	2	+++ examples/Makefile.in
	3	@@ -169,7 +169,7 @@ install: $(PROGRAMS) $(SSL_PROGRAMS)
	4	$(INSTALL) -d -m 755 $(DESTDIR)$(mandir)
	5	$(INSTALL) -d -m 755 $(DESTDIR)$(mandir)/man1
	6	for i in $(PROGRAMS) $(SSL_PROGRAMS); do \
	7	- $(libtool) --tag=CC --mode=install ${INSTALL} -c $$i $(DESTDIR)$(bindir) ; \
	8	+ $(libtool) --tag=CC --mode=install ${INSTALL} -s -c $$i $(DESTDIR)$(bindir) ; \
	9	if test -f $$i.1 ; \
	10	then $(INSTALL) -c -m 644 $$i.1 $(DESTDIR)$(mandir)/man1/$$i.1 ; \
	11	else $(INSTALL) -c -m 644 $(srcdir)/$$i.1 $(DESTDIR)$(mandir)/man1/$$i.1 ; \
	12	@@ -182,14 +182,14 @@ install-static: all-static
	13	$(INSTALL) -d -m 755 $(DESTDIR)$(mandir)
	14	$(INSTALL) -d -m 755 $(DESTDIR)$(mandir)/man1
	15	for i in $(PROGRAMS); do \
	16	- $(libtool) --tag=CC --mode=install ${INSTALL} -c $$i.stc $(DESTDIR)$(bindir) ; \
	17	+ $(libtool) --tag=CC --mode=install ${INSTALL} -s -c $$i.stc $(DESTDIR)$(bindir) ; \
	18	if test -f $$i.1 ; \
	19	then $(INSTALL) -c -m 644 $$i.1 $(DESTDIR)$(mandir)/man1/$$i.1 ; \
	20	else $(INSTALL) -c -m 644 $(srcdir)/$$i.1 $(DESTDIR)$(mandir)/man1/$$i.1 ; \
	21	fi ; \
	22	done
	23	for i in $(SSL_PROGRAMS); do \
	24	- $(libtool) --tag=CC --mode=install ${INSTALL} -c $$i.stc-ssl $(DESTDIR)$(bindir) ; \
	25	+ $(libtool) --tag=CC --mode=install ${INSTALL} -s -c $$i.stc-ssl $(DESTDIR)$(bindir) ; \
	26	if test -f $$i.1 ; \
	27	then $(INSTALL) -c -m 644 $$i.1 $(DESTDIR)$(mandir)/man1/$$i.1 ; \
	28	else $(INSTALL) -c -m 644 $(srcdir)/$$i.1 $(DESTDIR)$(mandir)/man1/$$i.1 ; \

Line 0 Link Here

(-)files/patch-examples_ldns-signzone.c (+18 lines)
	1	--- examples/ldns-signzone.c.orig 2014-01-10 21:04:41 UTC
	2	+++ examples/ldns-signzone.c
	3	@@ -470,6 +470,7 @@ main(int argc, char *argv[])
	4	case 'A':
	5	signflags \|= LDNS_SIGN_DNSKEY_WITH_ZSK;
	6	break;
	7	+#ifdef HAVE_ENGINE_LOAD_CRYPTODEV
	8	case 'E':
	9	ENGINE_load_builtin_engines();
	10	ENGINE_load_dynamic();
	11	@@ -494,6 +495,7 @@ main(int argc, char *argv[])
	12	ENGINE_set_default(engine, 0);
	13	}
	14	break;
	15	+#endif
	16	case 'k':
	17	eng_key_l = strchr(optarg, ',');
	18	if (eng_key_l && strlen(eng_key_l) > 1) {