Attachment 126466 Details for Bug 170196 – powerdns-devel-3.1.r3_1,1.patch

[patch] powerdns-devel-3.1.r3_1,1.patch

powerdns-devel-3.1.r3_1,1.patch (text/plain), 5.62 KB, created by Ralf van der Enden on 2012-07-26 15:40:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ralf van der Enden

Created: 2012-07-26 15:40:05 UTC

Size: 5.62 KB

patch

obsolete

>diff -ruN --exclude=CVS ../powerdns-devel.orig/Makefile ./Makefile
>--- ../powerdns-devel.orig/Makefile	2012-05-22 20:53:55.000000000 +0200
>+++ ./Makefile	2012-07-26 16:21:34.144164776 +0200
>@@ -7,10 +7,11 @@
> 
> PORTNAME=	powerdns
> PORTVERSION=	3.1.r3
>-PORTREVISION?=	0
>+PORTREVISION?=	1
> PORTEPOCH=	1
> CATEGORIES=	dns ipv6
> MASTER_SITES=	http://powerdnssec.org/downloads/
>+PKGNAMESUFFIX=	-devel
> DISTNAME=	pdns-${PORTVERSION:S/.r/-rc/}
> 
> MAINTAINER=	tremere@cainites.net
>@@ -18,15 +19,14 @@
> 
> LICENSE=	GPLv2
> 
>-BUILD_DEPENDS=	bjam:${PORTSDIR}/devel/boost-jam \
>-		${LOCALBASE}/lib/libcryptopp.a:${PORTSDIR}/security/cryptopp
>-LIB_DEPENDS=	botan.0:${PORTSDIR}/security/botan \
>-		boost_serialization.[4-9]:${PORTSDIR}/devel/boost-libs
>+BUILD_DEPENDS=	bjam:${PORTSDIR}/devel/boost-jam
>+LIB_DEPENDS=	boost_serialization.[4-9]:${PORTSDIR}/devel/boost-libs
>+#		botan.0:${PORTSDIR}/security/botan
> 
> USE_LUA=	5.1
> LUA_COMPS=	lua
> 
>-CONFLICTS=	powerdns-3.0*
>+CONFLICTS=	powerdns-[2-3].[0-9]*
> 
> NO_LATEST_LINK=	YES
> 
>@@ -40,8 +40,7 @@
> 		--with-dynmodules="pipe ${CONFIGURE_MODULES}" \
> 		--sysconfdir="${PREFIX}/etc/pdns" \
> 		--with-boost="${LOCALBASE}" \
>-		--enable-botan1.8 \
>-		--enable-cryptopp
>+#		--enable-botan1.8
> SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
> 		CURDIR2="${.CURDIR}" \
> 		MKDIR="${MKDIR}" \
>@@ -51,33 +50,40 @@
> 
> SUB_FILES=	pkg-message
> 
>-OPTIONS=	PGSQL           "PostgreSQL backend" on \
>-		PGSQL_LOCAL	"RUN_DEPEND on PostgreSQL" off \
>-		MYSQL           "MySQL backend" off \
>-		MYSQL_LOCAL	"RUN_DEPEND on MySQL server" off \
>-		SQLITE          "SQLite 2 backend" off \
>-		SQLITE3         "SQLite 3 backend" off \
>-		OPENDBX         "OpenDBX backend" off \
>-		OPENLDAP        "OpenLDAP backend" off \
>-		OPENLDAP_LOCAL	"RUN_DEPEND on OpenLDAP server" off \
>-		GEO             "Geo backend" off
>+OPTIONS_DEFINE=	PGSQL PGSQL_LOCAL MYSQL MYSQL_LOCAL SQLITE SQLITE3 OPENDBX OPENLDAP OPENLDAP_LOCAL GEO DNSSEC
>+
>+PGSQL_DESC=		PostgreSQL backend
>+PGSQL_LOCAL_DESC=	RUN_DEPEND on PostgreSQL server
>+MYSQL_DESC=		MySQL backend
>+MYSQL_LOCAL_DESC=	RUN_DEPEND on MySQL server
>+SQLITE_DESC=		SQLite 2 backend
>+SQLITE3_DESC=		SQLite 3 backend
>+OPENDBX_DESC=		OpenDBX backend
>+OPENLDAP_DESC=		OpenLDAP backend
>+OPENLDAP_LOCAL_DESC=	RUN_DEPEND on OpenLDAP server
>+GEO_DESC=		Geo backend
>+DNSSEC_DESC=		Enable extra DNSSEC algorithms (13 & 14)
>+
>+OPTIONS_DEFAULT=	PGSQL
>+
>+.include <bsd.port.options.mk>
> 
> .include <bsd.port.pre.mk>
> 
> USE_RC_SUBR+=	pdns-devel
> 
>-.if defined(WITH_GEO)
>+.if ${PORT_OPTIONS:MGEO}
> CONFIGURE_MODULES+=	"geo"
> PLIST_SUB+=		WITHGEO=""
> .else
> PLIST_SUB+=		WITHGEO="@comment "
> .endif
> 
>-.if defined(WITH_SQLITE) && defined(WITH_SQLITE3)
>+.if ${PORT_OPTIONS:MSQLITE} && ${PORT_OPTIONS:MSQLITE3}
> BROKEN=	choose only one SQLite backend version
> .endif
> 
>-.if defined(WITH_PGSQL)
>+.if ${PORT_OPTIONS:MPGSQL}
> USE_PGSQL?=		YES
> CONFIGURE_ARGS+=	--with-pgsql=${LOCALBASE}
> CONFIGURE_MODULES+=	"gpgsql"
>@@ -87,7 +93,7 @@
> PLIST_SUB+=		WITHPGSQL="@comment "
> .endif
> 
>-.if defined(WITH_MYSQL)
>+.if ${PORT_OPTIONS:MMYSQL}
> USE_MYSQL?=		YES
> CONFIGURE_ARGS+=	--with-mysql=${LOCALBASE}
> CONFIGURE_MODULES+=	"gmysql"
>@@ -99,8 +105,8 @@
> PLIST_SUB+=		WITHMYSQL="@comment "
> .endif
> 
>-.if defined(WITH_OPENDBX) || defined(WITH_PGSQL)
>-.	if defined(WITH_PGSQL_LOCAL)
>+.if ${PORT_OPTIONS:MOPENDBX} || ${PORT_OPTIONS:MPGSQL}
>+.	if ${PORT_OPTIONS:MPGSQL_LOCAL}
> USE_PGSQL?=		YES
> RUN_DEPENDS+=	postgresql-server>=0:${PORTSDIR}/databases/postgresql${PGSQL_VER}-server
> SUB_LIST+=	PGSQL=postgresql
>@@ -108,8 +114,8 @@
> .else
> SUB_LIST+=	PGSQL=
> .endif
>-.if defined(WITH_OPENDBX) || defined(WITH_MYSQL)
>-.	if defined(WITH_MYSQL_LOCAL)
>+.if ${PORT_OPTIONS:MOPENDBX} || ${PORT_OPTIONS:MMYSQL}
>+.	if ${PORT_OPTIONS:MMYSQL_LOCAL}
> USE_MYSQL?=		YES
> RUN_DEPENDS+=	mysql-server>=0:${PORTSDIR}/databases/mysql${MYSQL_VER}-server
> SUB_LIST+=	MYSQL=mysql
>@@ -118,12 +124,12 @@
> SUB_LIST+=	MYSQL=
> .endif
> 
>-.if defined(WITH_OPENLDAP)
>+.if ${PORT_OPTIONS:MOPENLDAP}
> USE_OPENLDAP?=		YES
> CONFIGURE_MODULES+=	"ldap"
> CXXFLAGS+=		-L${LOCALBASE}/lib -DLDAP_DEPRECATED=1
> PLIST_SUB+=		WITHOPENLDAP=""
>-.	if defined(WITH_OPENLDAP_LOCAL)
>+.	if ${PORT_OPTIONS:MOPENLDAP_LOCAL}
> RUN_DEPENDS+=	openldap-server>=0:${PORTSDIR}/net/openldap${WANT_OPENLDAP_VER}-server
> SUB_LIST+=	SLAPD=slapd
> .	else
>@@ -134,7 +140,7 @@
> SUB_LIST+=		SLAPD=
> .endif
> 
>-.if defined(WITH_SQLITE)
>+.if ${PORT_OPTIONS:MSQLITE}
> USE_SQLITE?=		2
> CONFIGURE_MODULES+=	"gsqlite"
> PLIST_SUB+=		WITHSQLITE=""
>@@ -142,7 +148,7 @@
> PLIST_SUB+=		WITHSQLITE="@comment "
> .endif
> 
>-.if defined(WITH_SQLITE3)
>+.if ${PORT_OPTIONS:MSQLITE3}
> USE_SQLITE?=		3
> CONFIGURE_MODULES+=	"gsqlite3"
> PLIST_SUB+=		WITHSQLITE3=""
>@@ -150,8 +156,8 @@
> PLIST_SUB+=		WITHSQLITE3="@comment "
> .endif
> 
>-.if defined(WITH_OPENDBX)
>-LIB_DEPENDS+=		opendbx.3:${PORTSDIR}/databases/opendbx
>+.if ${PORT_OPTIONS:MOPENDBX}
>+LIB_DEPENDS+=		opendbx:${PORTSDIR}/databases/opendbx
> CONFIGURE_MODULES+=	"opendbx"
> PLIST_SUB+=		WITHOPENDBX=""
> CXXFLAGS+=		-L${LOCALBASE}/lib
>@@ -159,8 +165,13 @@
> PLIST_SUB+=		WITHOPENDBX="@comment "
> .endif
> 
>+.if ${PORT_OPTIONS:MDNSSEC}
>+BUILD_DEPENDS+=		${LOCALBASE}/lib/libcryptopp.a:${PORTSDIR}/security/cryptopp
>+CONFIGURE_FLAGS+=	--enable-cryptopp
>+.endif
>+
> post-patch:
>-.if defined(WITH_OPENLDAP)
>+.if ${PORT_OPTIONS:MOPENLDAP}
> 	${REINPLACE_CMD} -e 's;-I. ;-I. -I${LOCALBASE}/include ;' \
> 		-e 's;la_LDFLAGS =;la_LDFLAGS = -L${LOCALBASE}/lib;' \
> 		${WRKSRC}/modules/ldapbackend/Makefile.in
>@@ -168,7 +179,7 @@
> 		-e 's;@modulelibs@;@modulelibs@ -llber;' \
> 		${WRKSRC}/pdns/Makefile.in
> .endif
>-.if defined(WITH_PGSQL)
>+.if ${PORT_OPTIONS:MPGSQL}
> 	@${REINPLACE_CMD} -E -e 's;(PGSQL_inc_check="\$$withval/include/pgsql)";\1 \$$withval/include";' \
> 		${WRKSRC}/configure
> .endif

Actions: View | Diff

Attachments on bug 170196: 126466