Nothing depends on it and sqlite2 is long deprecated.

This configures and builds the same way with and without sqlite-2.8.17p5
installed.

Feedback? Objections? OK?

Index: Makefile
===================================================================
RCS file: /cvs/ports/databases/libdbi-drivers/Makefile,v
retrieving revision 1.37
diff -u -p -r1.37 Makefile
--- Makefile    12 Jul 2019 20:43:53 -0000      1.37
+++ Makefile    11 Jul 2021 22:47:00 -0000
@@ -1,17 +1,15 @@
 # $OpenBSD: Makefile,v 1.37 2019/07/12 20:43:53 sthen Exp $
 
 V =                    0.9.0
-REVISION =             2
-REVISION-freetds =     3
+REVISION =             3
+REVISION-freetds =     4
 COMMENT-main =         mysql driver for libdbi
 COMMENT-pgsql =                pgsql driver for libdbi
-COMMENT-sqlite =       sqlite driver for libdbi
 COMMENT-sqlite3 =      sqlite3 driver for libdbi
 COMMENT-freetds =      freetds driver for libdbi
 DISTNAME =             libdbi-drivers-$V
 PKGNAME-main =         libdbi-drivers-mysql-${V:S/-/./}
 PKGNAME-pgsql =                libdbi-drivers-pgsql-${V:S/-/./}
-PKGNAME-sqlite =       libdbi-drivers-sqlite-${V:S/-/./}
 PKGNAME-sqlite3 =      libdbi-drivers-sqlite3-${V:S/-/./}
 PKGNAME-freetds =      libdbi-drivers-freetds-${V:S/-/./}
 
@@ -20,7 +18,7 @@ CATEGORIES =          databases
 HOMEPAGE =             http://libdbi-drivers.sourceforge.net/
 MASTER_SITES =         ${MASTER_SITE_SOURCEFORGE:=libdbi-drivers/}
 
-MULTI_PACKAGES =       -main -pgsql -sqlite -sqlite3 -freetds
+MULTI_PACKAGES =       -main -pgsql -sqlite3 -freetds
 
 # LGPLv2.1
 PERMIT_PACKAGE =       Yes
@@ -36,9 +34,6 @@ CONFIGURE_ARGS =      --disable-docs \
                        --with-pgsql \
                        --with-pgsql-incdir="${LOCALBASE}/include 
-I${LOCALBASE}/include/postgresql" \
                        --with-pgsql-libdir=${LOCALBASE}/lib/postgresql \
-                       --with-sqlite \
-                       --with-sqlite-incdir=${LOCALBASE}/include \
-                       --with-sqlite-libdir=${LOCALBASE}/lib \
                        --with-sqlite3 \
                        --with-sqlite3-incdir=${LOCALBASE}/include \
                        --with-sqlite3-libdir=${LOCALBASE}/lib \
@@ -56,11 +51,6 @@ LIB_DEPENDS-pgsql =  databases/postgresql
                        databases/libdbi
 RUN_DEPENDS-pgsql =
 
-WANTLIB-sqlite =       m sqlite dbi
-LIB_DEPENDS-sqlite =   databases/sqlite \
-                       databases/libdbi
-RUN_DEPENDS-sqlite =
-
 WANTLIB-sqlite3 =      m pthread sqlite3 dbi z
 LIB_DEPENDS-sqlite3 =  databases/libdbi \
                        databases/sqlite3
@@ -76,7 +66,6 @@ LIB_DEPENDS-freetds = databases/freetds 
 TEST_IS_INTERACTIVE =  Yes
 TEST_DEPENDS =         databases/libdbi-drivers,-main \
                        databases/libdbi-drivers,-pgsql \
-                       databases/libdbi-drivers,-sqlite \
                        databases/libdbi-drivers,-sqlite3 \
                        databases/libdbi-drivers,-freetds \
                        databases/mariadb,-server \
@@ -86,7 +75,7 @@ pre-configure:
        chmod +x ${WRKSRC}/tests/test_freetds.sh
 
 post-install:
-.for d in mysql pgsql sqlite sqlite3
+.for d in mysql pgsql sqlite3
        ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/libdbi-drivers/dbd_${d}
        ${INSTALL_DATA} ${WRKSRC}/drivers/${d}/dbd_${d}.pdf \
                ${PREFIX}/share/doc/libdbi-drivers
Index: pkg/DESCR-sqlite
===================================================================
RCS file: pkg/DESCR-sqlite
diff -N pkg/DESCR-sqlite
--- pkg/DESCR-sqlite    2 Jun 2009 00:58:58 -0000       1.1.1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,5 +0,0 @@
-The libdbi-drivers project provides the database-specific drivers for
-the libdbi framework. The current version of libdbi-drivers will work
-with any 0.8.x release of the framework.
-
-This package has the sqlite driver.
Index: pkg/PLIST-freetds
===================================================================
RCS file: /cvs/ports/databases/libdbi-drivers/pkg/PLIST-freetds,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-freetds
--- pkg/PLIST-freetds   19 Mar 2016 10:24:33 -0000      1.2
+++ pkg/PLIST-freetds   11 Jul 2021 22:41:52 -0000
@@ -1,5 +1,5 @@
 @comment $OpenBSD: PLIST-freetds,v 1.2 2016/03/19 10:24:33 sthen Exp $
 lib/dbd/
-lib/dbd/libdbdfreetds.a
+@static-lib lib/dbd/libdbdfreetds.a
 lib/dbd/libdbdfreetds.la
-lib/dbd/libdbdfreetds.so
+@so lib/dbd/libdbdfreetds.so
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/databases/libdbi-drivers/pkg/PLIST-main,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST-main
--- pkg/PLIST-main      3 Jun 2017 16:24:05 -0000       1.3
+++ pkg/PLIST-main      11 Jul 2021 22:41:52 -0000
@@ -1,8 +1,9 @@
 @comment $OpenBSD: PLIST-main,v 1.3 2017/06/03 16:24:05 steven Exp $
+@pkgpath databases/libdbi-drivers,-sqlite
 lib/dbd/
-lib/dbd/libdbdmysql.a
+@static-lib lib/dbd/libdbdmysql.a
 lib/dbd/libdbdmysql.la
-lib/dbd/libdbdmysql.so
+@so lib/dbd/libdbdmysql.so
 share/doc/libdbi-drivers/
 share/doc/libdbi-drivers/dbd_mysql/
 share/doc/libdbi-drivers/dbd_mysql.pdf
Index: pkg/PLIST-pgsql
===================================================================
RCS file: /cvs/ports/databases/libdbi-drivers/pkg/PLIST-pgsql,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-pgsql
--- pkg/PLIST-pgsql     19 Mar 2016 10:24:33 -0000      1.2
+++ pkg/PLIST-pgsql     11 Jul 2021 22:41:52 -0000
@@ -1,8 +1,8 @@
 @comment $OpenBSD: PLIST-pgsql,v 1.2 2016/03/19 10:24:33 sthen Exp $
 lib/dbd/
-lib/dbd/libdbdpgsql.a
+@static-lib lib/dbd/libdbdpgsql.a
 lib/dbd/libdbdpgsql.la
-lib/dbd/libdbdpgsql.so
+@so lib/dbd/libdbdpgsql.so
 share/doc/libdbi-drivers/
 share/doc/libdbi-drivers/dbd_pgsql/
 share/doc/libdbi-drivers/dbd_pgsql.pdf
Index: pkg/PLIST-sqlite
===================================================================
RCS file: pkg/PLIST-sqlite
diff -N pkg/PLIST-sqlite
--- pkg/PLIST-sqlite    3 Jun 2017 16:24:05 -0000       1.3
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-@comment $OpenBSD: PLIST-sqlite,v 1.3 2017/06/03 16:24:05 steven Exp $
-lib/dbd/
-lib/dbd/libdbdsqlite.a
-lib/dbd/libdbdsqlite.la
-lib/dbd/libdbdsqlite.so
-share/doc/libdbi-drivers/
-share/doc/libdbi-drivers/dbd_sqlite/
-share/doc/libdbi-drivers/dbd_sqlite.pdf
-share/doc/libdbi-drivers/dbd_sqlite/c100.html
-share/doc/libdbi-drivers/dbd_sqlite/c136.html
-share/doc/libdbi-drivers/dbd_sqlite/c34.html
-share/doc/libdbi-drivers/dbd_sqlite/c45.html
-share/doc/libdbi-drivers/dbd_sqlite/copying-fdl.html
-share/doc/libdbi-drivers/dbd_sqlite/f23.html
-share/doc/libdbi-drivers/dbd_sqlite/index.html
-share/doc/libdbi-drivers/dbd_sqlite/x139.html
-share/doc/libdbi-drivers/dbd_sqlite/x215.html
-share/doc/libdbi-drivers/dbd_sqlite/x48.html
-share/doc/libdbi-drivers/dbd_sqlite/x62.html
Index: pkg/PLIST-sqlite3
===================================================================
RCS file: /cvs/ports/databases/libdbi-drivers/pkg/PLIST-sqlite3,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST-sqlite3
--- pkg/PLIST-sqlite3   3 Jun 2017 16:24:05 -0000       1.3
+++ pkg/PLIST-sqlite3   11 Jul 2021 22:41:52 -0000
@@ -1,8 +1,8 @@
 @comment $OpenBSD: PLIST-sqlite3,v 1.3 2017/06/03 16:24:05 steven Exp $
 lib/dbd/
-lib/dbd/libdbdsqlite3.a
+@static-lib lib/dbd/libdbdsqlite3.a
 lib/dbd/libdbdsqlite3.la
-lib/dbd/libdbdsqlite3.so
+@so lib/dbd/libdbdsqlite3.so
 share/doc/libdbi-drivers/
 share/doc/libdbi-drivers/dbd_sqlite3/
 share/doc/libdbi-drivers/dbd_sqlite3.pdf

Reply via email to