- Remove SQLITE3 backend option, it was added prematurely

- Fix plist

PR:		ports/108182
Submitted by:	Tobias Roth <ports@fsck.ch>
Approved by:	Ralf van der Enden <tremere@cainites.net> (maintainer)

6 files changed, 10 insertions, 46 deletions

diff --git a/dns/powerdns-devel/Makefile b/dns/powerdns-devel/Makefile
index 0fdfc7628786..9ab118ba1516 100644
--- a/dns/powerdns-devel/Makefile
+++ b/dns/powerdns-devel/Makefile
@@ -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 @@ SUB_FILES=	pkg-message
 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=""
 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"
diff --git a/dns/powerdns-devel/files/patch-modules_gpgsqlbackend_Makefile_in b/dns/powerdns-devel/files/patch-modules_gpgsqlbackend_Makefile_in
index 29b0dab57327..1fb8830fff62 100644
--- a/dns/powerdns-devel/files/patch-modules_gpgsqlbackend_Makefile_in
+++ b/dns/powerdns-devel/files/patch-modules_gpgsqlbackend_Makefile_in
@@ -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)
diff --git a/dns/powerdns-devel/pkg-plist b/dns/powerdns-devel/pkg-plist
index 923d58226d22..272969263ac9 100644
--- a/dns/powerdns-devel/pkg-plist
+++ b/dns/powerdns-devel/pkg-plist
@@ -2,6 +2,10 @@ bin/pdns_control
 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 @@ sbin/pdns_server
 %%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
diff --git a/dns/powerdns/Makefile b/dns/powerdns/Makefile
index 0fdfc7628786..9ab118ba1516 100644
--- a/dns/powerdns/Makefile
+++ b/dns/powerdns/Makefile
@@ -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 @@ SUB_FILES=	pkg-message
 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=""
 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"
diff --git a/dns/powerdns/files/patch-modules_gpgsqlbackend_Makefile_in b/dns/powerdns/files/patch-modules_gpgsqlbackend_Makefile_in
index 29b0dab57327..1fb8830fff62 100644
--- a/dns/powerdns/files/patch-modules_gpgsqlbackend_Makefile_in
+++ b/dns/powerdns/files/patch-modules_gpgsqlbackend_Makefile_in
@@ -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)
diff --git a/dns/powerdns/pkg-plist b/dns/powerdns/pkg-plist
index 923d58226d22..272969263ac9 100644
--- a/dns/powerdns/pkg-plist
+++ b/dns/powerdns/pkg-plist
@@ -2,6 +2,10 @@ bin/pdns_control
 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 @@ sbin/pdns_server
 %%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