Attachment 135033 Details for Bug 179812 – ldns.diff

[patch] ldns.diff

ldns.diff (text/plain), 3.21 KB, created by Mathieu Arnold on 2013-06-21 15:20:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mathieu Arnold

Created: 2013-06-21 15:20:00 UTC

Size: 3.21 KB

patch

obsolete

>Index: dns/ldns/Makefile
>===================================================================
>--- dns/ldns/Makefile	(revision 321238)
>+++ dns/ldns/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	ldns
> PORTVERSION=	1.6.16
>+PORTREVISION=	1
> CATEGORIES=	dns
> MASTER_SITES=	http://www.nlnetlabs.nl/downloads/ldns/ \
> 		CRITICAL
>@@ -17,23 +18,32 @@
> USE_OPENSSL=	yes
> USE_LDCONFIG=	yes
> 
>-OPTIONS_DEFINE=	DOXYGEN EXAMPLES DRILL GOST PYLDNS
>+.if !defined(BUILD_PYLDNS)
>+OPTIONS_DEFINE=	DOXYGEN EXAMPLES DRILL
> OPTIONS_DEFAULT=	EXAMPLES DRILL
> 
> DRILL_DESC=	With drill program
>+.endif
>+
>+OPTIONS_DEFINE+=	GOST
>+
> GOST_DESC=	GOST signatures enabled, requires openssl >= 1.0.0
>-PYLDNS_DESC=	${PYTHON_DESC}
> 
> .include <bsd.port.options.mk>
> 
>-.if ${PORT_OPTIONS:MPYLDNS}
>+.if defined(BUILD_PYLDNS)
> USE_PYTHON=	yes
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>-CONFLICTS=	ldns-[0-9]*
>+ALL_TARGET=	pyldns
>+INSTALL_TARGET=	install-pyldns
>+
>+CONFIGURE_ARGS+=--with-pyldns
>+LIB_DEPENDS+=	ldns:${PORTSDIR}/dns/ldns
>+BUILD_DEPENDS+=	${LOCALBASE}/bin/swig:${PORTSDIR}/devel/swig13
>+
>+post-patch:
>+	@${SED} -i '' -e 's=-I./include/ldns=-I${LOCALBASE}/include/ldns=' ${WRKSRC}/Makefile.in
> .else
>-CONFLICTS=	py*-ldns-[0-9]*
>-.endif
>-
> ALL_TARGET=	all
> INSTALL_TARGET=	install-lib install-h install-config
> 
>@@ -233,13 +243,6 @@
> MAN1+=	ldns-config.1
> .endif
> 
>-.if ${PORT_OPTIONS:MGOST}
>-BUILD_DEPENDS+=	openssl>=1.0:${PORTSDIR}/security/openssl
>-.else
>-NO_GOST=	--disable-gost
>-CONFIGURE_ARGS+=${NO_GOST}
>-.endif
>-
> .if ${PORT_OPTIONS:MDRILL}
> PLIST_SUB+=	DRILLPROG=""
> MAN1+=	drill.1
>@@ -262,13 +265,13 @@
> PLIST_SUB+=	EXAMPLES="@comment "
> .endif
> 
>-.if ${PORT_OPTIONS:MPYLDNS}
>-CONFIGURE_ARGS+=--with-pyldns
>-BUILD_DEPENDS+=	${LOCALBASE}/bin/swig:${PORTSDIR}/devel/swig13
>-INSTALL_TARGET+=install-pyldns
>-PLIST_SUB+=	PYLDNS=""
>+.endif # BUILD_PYLDNS
>+
>+.if ${PORT_OPTIONS:MGOST}
>+BUILD_DEPENDS+=	openssl>=1.0:${PORTSDIR}/security/openssl
> .else
>-PLIST_SUB+=	PYLDNS="@comment "
>+NO_GOST=	--disable-gost
>+CONFIGURE_ARGS+=${NO_GOST}
> .endif
> 
> post-configure:
>Index: dns/ldns/pkg-plist
>===================================================================
>--- dns/ldns/pkg-plist	(revision 321238)
>+++ dns/ldns/pkg-plist	(working copy)
>@@ -60,10 +60,4 @@
> lib/libldns.la
> lib/libldns.so
> lib/libldns.so.1
>-%%PYLDNS%%%%PYTHON_SITELIBDIR%%/_ldns.so.1
>-%%PYLDNS%%%%PYTHON_SITELIBDIR%%/ldns.py
>-%%PYLDNS%%%%PYTHON_SITELIBDIR%%/_ldns.so
>-%%PYLDNS%%%%PYTHON_SITELIBDIR%%/_ldns.la
>-%%PYLDNS%%%%PYTHON_SITELIBDIR%%/_ldns.a
>-%%PYLDNS%%@dirrm %%PYTHON_SITELIBDIR%%/ldns
> @dirrm include/ldns
>Index: dns/py-ldns/Makefile
>===================================================================
>--- dns/py-ldns/Makefile	(revision 321238)
>+++ dns/py-ldns/Makefile	(working copy)
>@@ -3,6 +3,8 @@
> 
> MASTERDIR=	${.CURDIR}/../../dns/ldns
> 
>-OPTIONS_SET=	PYLDNS
>+BUILD_PYLDNS=yes
> 
>+PLIST=	${.CURDIR}/pkg-plist
>+
> .include "${MASTERDIR}/Makefile"
>Index: dns/py-ldns/pkg-plist
>===================================================================
>--- dns/py-ldns/pkg-plist	(revision 0)
>+++ dns/py-ldns/pkg-plist	(working copy)
>@@ -0,0 +1,6 @@
>+%%PYTHON_SITELIBDIR%%/_ldns.so.1
>+%%PYTHON_SITELIBDIR%%/ldns.py
>+%%PYTHON_SITELIBDIR%%/_ldns.so
>+%%PYTHON_SITELIBDIR%%/_ldns.la
>+%%PYTHON_SITELIBDIR%%/_ldns.a
>+@dirrm %%PYTHON_SITELIBDIR%%/ldns

Actions: View | Diff

Attachments on bug 179812: 135033