Attachment #144636 for bug #191853





PORTNAME=      ldns
PORTVERSION=   1.6.17
PORTREVISION=  2
CATEGORIES=    dns
MASTER_SITES=  http://www.nlnetlabs.nl/downloads/ldns/ \
               CRITICAL


LICENSE=       BSD3CLAUSE

USES=          gmake libtool
USE_AUTOTOOLS= libtool
USE_OPENSSL=   yes
USE_LDCONFIG=  yes
GNU_CONFIGURE= yes

.if ! (defined(BUILD_PYLDNS) || defined(BUILD_P5PERL))
OPTIONS_DEFINE=        DOXYGEN EXAMPLES DRILL

.if ${PORT_OPTIONS:MGOST}
. if ${OSVERSION} < 1000015
BUILD_DEPENDS+=        openssl>=1.0:${PORTSDIR}/security/openssl
CONFLICTS+=    libressl-*
. endif
.else
NO_GOST=       --disable-gost




--- drill/Makefile.in.orig     2014-07-13 16:39:37.524920780 +0100
+++ drill/Makefile.in  2014-07-13 16:40:28.272739650 +0100
@@ -98,7 +98,7 @@
 
 install: all
       $(INSTALL) -d $(DESTDIR)$(bindir)
-      $(INSTALL) drill $(DESTDIR)$(bindir)/drill
+      $(INSTALL) -s drill $(DESTDIR)$(bindir)/drill
       $(INSTALL) -m 644 drill.1 $(DESTDIR)$(mandir)/man1/drill.1

--- examples/Makefile.in.orig  2014-07-13 16:39:27.125136680 +0100
+++ examples/Makefile.in       2014-07-13 16:40:08.742739840 +0100
@@ -169,7 +169,7 @@
               $(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) -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-ldns-signzone.c (working copy) (+11 lines)
	1	--- examples/ldns-signzone.c.orig 2014-07-13 16:15:08.722786209 +0100
	2	+++ examples/ldns-signzone.c 2014-07-13 16:15:24.772771739 +0100
	3	@@ -473,7 +473,7 @@
	4	case 'E':
	5	ENGINE_load_builtin_engines();
	6	ENGINE_load_dynamic();
	7	- ENGINE_load_cryptodev();
	8	+ /* ENGINE_load_cryptodev(); */
	9	engine = ENGINE_by_id(optarg);
	10	if (!engine) {
	11	printf("No such engine: %s\n", optarg);

Lines 529-536 Link Here

(-)pkg-plist (working copy) (-1 / +1 lines)
529	include/ldns/wire2host.h	529	include/ldns/wire2host.h
530	include/ldns/zone.h	530	include/ldns/zone.h
531	lib/libldns.a	531	lib/libldns.a
532	lib/libldns.la
533	lib/libldns.so	532	lib/libldns.so
534	lib/libldns.so.1	533	lib/libldns.so.1
		534	lib/libldns.so.1.6.17
535	libdata/pkgconfig/libldns.pc	535	libdata/pkgconfig/libldns.pc
536	@dirrm include/ldns	536	@dirrm include/ldns

Return to bug 191853

Lines 3-9 Link Here

(-)Makefile (working copy) (-3 / +4 lines)
3		3
4	PORTNAME= ldns	4	PORTNAME= ldns
5	PORTVERSION= 1.6.17	5	PORTVERSION= 1.6.17
6	PORTREVISION= 1	6	PORTREVISION= 2
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	CRITICAL	9	CRITICAL
Lines 13-22 Link Here
13		13
14	LICENSE= BSD3CLAUSE	14	LICENSE= BSD3CLAUSE
15		15
16	USES= gmake	16	USES= gmake libtool
17	USE_AUTOTOOLS= libtool
18	USE_OPENSSL= yes	17	USE_OPENSSL= yes
19	USE_LDCONFIG= yes	18	USE_LDCONFIG= yes
		19	GNU_CONFIGURE= yes
20		20
21	.if ! (defined(BUILD_PYLDNS) \|\| defined(BUILD_P5PERL))	21	.if ! (defined(BUILD_PYLDNS) \|\| defined(BUILD_P5PERL))
22	OPTIONS_DEFINE= DOXYGEN EXAMPLES DRILL	22	OPTIONS_DEFINE= DOXYGEN EXAMPLES DRILL
Lines 78-83 Link Here
78	.if ${PORT_OPTIONS:MGOST}	78	.if ${PORT_OPTIONS:MGOST}
79	. if ${OSVERSION} < 1000015	79	. if ${OSVERSION} < 1000015
80	BUILD_DEPENDS+= openssl>=1.0:${PORTSDIR}/security/openssl	80	BUILD_DEPENDS+= openssl>=1.0:${PORTSDIR}/security/openssl
		81	CONFLICTS+= libressl-*
81	. endif	82	. endif
82	.else	83	.else
83	NO_GOST= --disable-gost	84	NO_GOST= --disable-gost

Line 0 Link Here

(-)files/patch-examples-Makefile.in (working copy) (+37 lines)
	1	--- drill/Makefile.in.orig 2014-07-13 16:39:37.524920780 +0100
	2	+++ drill/Makefile.in 2014-07-13 16:40:28.272739650 +0100
	3	@@ -98,7 +98,7 @@
	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
Line 0 Link Here
	1	--- examples/Makefile.in.orig 2014-07-13 16:39:27.125136680 +0100
	2	+++ examples/Makefile.in 2014-07-13 16:40:08.742739840 +0100
	3	@@ -169,7 +169,7 @@
	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 @@
	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 ; \