Re: Remote databases/libdbi-drivers,-sqlite

2021-07-26 Thread Stuart Henderson
> On Sun Jul 11, 2021 at 11:20:16PM +, Klemens Nanni wrote:
> > Nothing depends on it and sqlite2 is long deprecated.

Saying preemptively since I can see it coming ;) while I agree with
removing the uses in other software, please keep the sqlite2 port
itself for people who need to do data extraction from those files.



Re: Remote databases/libdbi-drivers,-sqlite

2021-07-25 Thread Rafael Sadowski
On Sun Jul 11, 2021 at 11:20:16PM +, Klemens Nanni wrote:
> 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?

OK rsadowski

> 
> 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 -  1.37
> +++ Makefile  11 Jul 2021 22:47:00 -
> @@ -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 -   1.1.1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -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 -  1.2
> +++ pkg/PLIST-freetds 11 Jul 2021 22:41:52 -
> @@ -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-main3 Jun 2017 16:24:05 -   

Remote databases/libdbi-drivers,-sqlite

2021-07-11 Thread Klemens Nanni
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
--- Makefile12 Jul 2019 20:43:53 -  1.37
+++ Makefile11 Jul 2021 22:47:00 -
@@ -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-sqlite2 Jun 2009 00:58:58 -   1.1.1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -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 -  1.2
+++ pkg/PLIST-freetds   11 Jul 2021 22:41:52 -
@@ -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 -   1.3
+++ pkg/PLIST-main  11 Jul 2021 22:41:52 -
@@ -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