ports/108182: dns/powerdns: fix building issues with gpgsql backend and remove sqlite3 backend (added it a bit too soon)

[Tobias Roth]

The following reply was made to PR ports/108182; it has been noted by GNATS.

From: Tobias Roth <ports at fsck.ch>
To: bug-followup at FreeBSD.org, tremere at cainites.net
Cc:  
Subject: Re: ports/108182: dns/powerdns: fix building issues with gpgsql
 backend and remove sqlite3 backend (added it a bit too soon)
Date: Sun, 28 Jan 2007 21:33:07 +0100

 --MP_/OGu8ReA=KCvGxc07fG07Ka
 Content-Type: text/plain; charset=US-ASCII
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline
 
 Hi
 
 As discussed with Xride on IRC, the attached patch replaces the above
 one. It fixes the pkg-plist and removes an unneeded file.
 
 Cheers,
 Tobias
 --MP_/OGu8ReA=KCvGxc07fG07Ka
 Content-Type: text/x-patch; name=powerdns.patch
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment; filename=powerdns.patch
 
 Index: Makefile
 ===================================================================
 RCS file: /home/ncvs/ports/dns/powerdns/Makefile,v
 retrieving revision 1.52
 diff -u -r1.52 Makefile
 --- Makefile	12 Jan 2007 23:49:04 -0000	1.52
 +++ Makefile	28 Jan 2007 20:28:26 -0000
 @@ -7,7 +7,7 @@
  
  PORTNAME=	powerdns
  PORTVERSION=	2.9.20
 -PORTREVISION=	2
 +PORTREVISION=	3
  CATEGORIES=	dns ipv6
  MASTER_SITES=	http://downloads.powerdns.com/releases/ \
  		http://mirrors.evolva.ro/powerdns.com/releases/
 @@ -41,7 +41,6 @@
  OPTIONS=	PGSQL           "PostgreSQL backend" on \
  		MYSQL           "MySQL backend" off \
  		SQLITE          "SQLite 2 backend" off \
 -		SQLITE3         "SQLite 3 backend" off \
  		OPENDBX         "OpenDBX backend" off \
  		OPENLDAP        "OpenLDAP backend" off \
  		GEO             "Geo backend" off
 @@ -98,14 +97,6 @@
  PLIST_SUB+=		WITHSQLITE="@comment "
  .endif
  
 -.if defined(WITH_SQLITE3)
 -USE_SQLITE?=		3
 -CONFIGURE_MODULES+=	"gsqlite"
 -PLIST_SUB+=		WITHSQLITE3=""
 -.else
 -PLIST_SUB+=		WITHSQLITE3="@comment "
 -.endif
 -
  .if defined(WITH_OPENDBX)
  LIB_DEPENDS+=		opendbx.1:${PORTSDIR}/databases/opendbx
  CONFIGURE_MODULES+=	"opendbx"
 Index: Makefile.inc
 ===================================================================
 RCS file: Makefile.inc
 diff -N Makefile.inc
 Index: pkg-plist
 ===================================================================
 RCS file: /home/ncvs/ports/dns/powerdns/pkg-plist,v
 retrieving revision 1.12
 diff -u -r1.12 pkg-plist
 --- pkg-plist	12 Jan 2007 23:49:04 -0000	1.12
 +++ pkg-plist	28 Jan 2007 20:28:26 -0000
 @@ -2,6 +2,10 @@
  bin/zone2ldap
  bin/zone2sql
  sbin/pdns_server
 +%%WITHPGSQL%%lib/libgpgsqlbackend.a
 +%%WITHPGSQL%%lib/libgpgsqlbackend.la
 +%%WITHPGSQL%%lib/libgpgsqlbackend.so
 +%%WITHPGSQL%%lib/libgpgsqlbackend.so.0
  %%WITHMYSQL%%lib/libgmysqlbackend.a
  %%WITHMYSQL%%lib/libgmysqlbackend.la
  %%WITHMYSQL%%lib/libgmysqlbackend.so
 @@ -10,10 +14,6 @@
  %%WITHSQLITE%%lib/libgsqlitebackend.la
  %%WITHSQLITE%%lib/libgsqlitebackend.so
  %%WITHSQLITE%%lib/libgsqlitebackend.so.0
 -%%WITHSQLITE3%%lib/libgsqlitebackend.a
 -%%WITHSQLITE3%%lib/libgsqlitebackend.la
 -%%WITHSQLITE3%%lib/libgsqlitebackend.so
 -%%WITHSQLITE3%%lib/libgsqlitebackend.so.0
  %%WITHOPENLDAP%%lib/libldapbackend.a
  %%WITHOPENLDAP%%lib/libldapbackend.la
  %%WITHOPENLDAP%%lib/libldapbackend.so
 Index: files/patch-modules_gpgsqlbackend_Makefile_in
 ===================================================================
 RCS file: /home/ncvs/ports/dns/powerdns/files/patch-modules_gpgsqlbackend_Makefile_in,v
 retrieving revision 1.2
 diff -u -r1.2 patch-modules_gpgsqlbackend_Makefile_in
 --- files/patch-modules_gpgsqlbackend_Makefile_in	18 Jul 2005 12:59:51 -0000	1.2
 +++ files/patch-modules_gpgsqlbackend_Makefile_in	28 Jan 2007 20:28:26 -0000
 @@ -17,12 +17,3 @@
   all: all-am
   
   .SUFFIXES:
 -@@ -272,7 +272,7 @@
 - 	  rm -f "$${dir}/so_locations"; \
 - 	done
 - libgpgsqlbackend.la: $(libgpgsqlbackend_la_OBJECTS) $(libgpgsqlbackend_la_DEPENDENCIES) 
 --	$(CXXLINK) -rpath $(libdir) $(libgpgsqlbackend_la_LDFLAGS) $(libgpgsqlbackend_la_OBJECTS) $(libgpgsqlbackend_la_LIBADD) $(LIBS)
 -+#	$(CXXLINK) -rpath $(libdir) $(libgpgsqlbackend_la_LDFLAGS) $(libgpgsqlbackend_la_OBJECTS) $(libgpgsqlbackend_la_LIBADD) $(LIBS)
 - 
 - mostlyclean-compile:
 - 	-rm -f *.$(OBJEXT)
 
 --MP_/OGu8ReA=KCvGxc07fG07Ka--