On 2021/03/14 15:15, Klemens Nanni wrote:
> Nothing uses it and both Qt4 and sqlite2 are (being) deprecated.
> I've left patches untouched which have sqlite context, my amd64 is still
> running without databases/sqlite installed to see if it builds and
> packages fine after removing the -sqlite2 subpackage and its LIB_DEPENDS
> (which is pulled in at build time).
>
> Assuming that `make package' works: OK?
>
> Index: devel/quirks/Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/quirks/Makefile,v
> retrieving revision 1.1226
> diff -u -p -r1.1226 Makefile
> --- devel/quirks/Makefile 14 Mar 2021 11:53:18 -0000 1.1226
> +++ devel/quirks/Makefile 14 Mar 2021 13:06:34 -0000
> @@ -5,7 +5,7 @@ CATEGORIES = devel databases
> DISTFILES =
>
> # API.rev
> -PKGNAME = quirks-3.613
> +PKGNAME = quirks-3.614
> PKG_ARCH = *
> MAINTAINER = Marc Espie <es...@openbsd.org>
>
> Index: devel/quirks/files/Quirks.pm
> ===================================================================
> RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
> retrieving revision 1.1240
> diff -u -p -r1.1240 Quirks.pm
> --- devel/quirks/files/Quirks.pm 14 Mar 2021 11:53:18 -0000 1.1240
> +++ devel/quirks/files/Quirks.pm 14 Mar 2021 13:06:34 -0000
> @@ -2293,6 +2293,7 @@ my $obsolete_reason = {
> 'lives' => 42,
> 'py-wsgiproxy' => 5,
> 'py-sqlite' => 5,
> + 'qt4-sqlite2' => 5,
seems no pointing in keeping it around by adding it here? I would have
merged into the main package by adding @pkgpath x11/qt4,-sqlite2 to PLIST-main
instead.
> };
>
> # reasons for obsolete packages
> Index: x11/qt4/Makefile
> ===================================================================
> RCS file: /cvs/ports/x11/qt4/Makefile,v
> retrieving revision 1.165
> diff -u -p -r1.165 Makefile
> --- x11/qt4/Makefile 26 Jan 2021 18:29:01 -0000 1.165
> +++ x11/qt4/Makefile 14 Mar 2021 13:06:34 -0000
> @@ -10,14 +10,12 @@ COMMENT-examples = examples for qt4
> COMMENT-html = off-line html documentation for qt4
> COMMENT-postgresql = PostgresSQL plugin for qt4
> COMMENT-mysql = MySQL plugin for qt4
> -COMMENT-sqlite2 = sqlite2 plugin for qt4
> COMMENT-tds = tds plugin for qt4
>
> PKGNAME = qt4-${PKGVERSION}
> PKGNAME-mysql = qt4-mysql-${PKGVERSION}
> PKGNAME-postgresql = qt4-postgresql-${PKGVERSION}
> PKGNAME-examples = qt4-examples-${PKGVERSION}
> -PKGNAME-sqlite2 = qt4-sqlite2-${PKGVERSION}
> PKGNAME-tds = qt4-tds-${PKGVERSION}
> PKGNAME-main = qt4-${PKGVERSION}
> PKGNAME-debug = qt4-debug-${PKGVERSION}
> @@ -26,7 +24,6 @@ FULLPKGPATH-html = ${BASE_PKGPATH},-html
> REVISION-main = 24
> REVISION-mysql = 8
> REVISION-postgresql = 7
> -REVISION-sqlite2 = 7
> REVISION-tds = 7
> REVISION-debug = 5
> REVISION-examples = 10
> @@ -138,7 +135,7 @@ BUILD_DEPENDS += databases/postgresql,-s
> BUILD_DEPENDS += print/cups,-libs
>
> MULTI_PACKAGES = -main -examples \
> - -html -mysql -postgresql -sqlite2 -tds
> + -html -mysql -postgresql -tds
>
> .if ${FLAVOR:Mdebug}
> CONFIGURE_ARGS += -debug
> @@ -182,11 +179,6 @@ WANTLIB-mysql = ${sqlWANTLIB} mariadb
> LIB_DEPENDS-postgresql =${BUILD_PKGPATH} \
> databases/postgresql
> WANTLIB-postgresql = ${sqlWANTLIB} pq
> -
> -
> -LIB_DEPENDS-sqlite2 = ${BUILD_PKGPATH} \
> - databases/sqlite
> -WANTLIB-sqlite2 = ${sqlWANTLIB} sqlite
>
>
> LIB_DEPENDS-tds = ${BUILD_PKGPATH} \
> Index: x11/qt4/pkg/DESCR-sqlite2
> ===================================================================
> RCS file: x11/qt4/pkg/DESCR-sqlite2
> diff -N x11/qt4/pkg/DESCR-sqlite2
> --- x11/qt4/pkg/DESCR-sqlite2 15 May 2006 21:09:39 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1 +0,0 @@
> -database plugin (sqlite2) for qt4.
> Index: x11/qt4/pkg/PLIST-sqlite2
> ===================================================================
> RCS file: x11/qt4/pkg/PLIST-sqlite2
> diff -N x11/qt4/pkg/PLIST-sqlite2
> --- x11/qt4/pkg/PLIST-sqlite2 18 Mar 2020 05:14:03 -0000 1.3
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,2 +0,0 @@
> -@comment $OpenBSD: PLIST-sqlite2,v 1.3 2020/03/18 05:14:03 tb Exp $
> -@so lib/qt4/plugins/sqldrivers/libqsqlite2.so
>
