On Sun, Mar 14, 2021 at 03:27:07PM +0000, Stuart Henderson wrote:
> On 2021/03/14 16:00, Klemens Nanni wrote:
> > On Sun, Mar 14, 2021 at 02:54:42PM +0000, Stuart Henderson wrote:
> > > > @@ -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.
> >
> > Merging implies we still provide the sqlite2 bits, no? I intend to not
> > provide it and remove databases/sqlite eventually.
> >
>
> No, just makes the old package vanish.
Sure, that's how it works. Sorry if I wasn't clear: I meant that
merging the package might give the impression (to users) that
qt4-sqlite2 functionality still exists but is merely provided through a
different package now -- either way, I don't think I care enough about
this detail (who else would, anyway?).
OK?
Index: devel/quirks/Makefile
===================================================================
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.1228
diff -u -p -r1.1228 Makefile
--- devel/quirks/Makefile 14 Mar 2021 13:20:01 -0000 1.1228
+++ devel/quirks/Makefile 14 Mar 2021 15:56:04 -0000
@@ -5,7 +5,7 @@ CATEGORIES = devel databases
DISTFILES =
# API.rev
-PKGNAME = quirks-3.615
+PKGNAME = quirks-3.616
PKG_ARCH = *
MAINTAINER = Marc Espie <[email protected]>
Index: devel/quirks/files/Quirks.pm
===================================================================
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.1242
diff -u -p -r1.1242 Quirks.pm
--- devel/quirks/files/Quirks.pm 14 Mar 2021 13:20:01 -0000 1.1242
+++ devel/quirks/files/Quirks.pm 14 Mar 2021 16:00:18 -0000
@@ -608,6 +608,7 @@ my $stem_extensions = {
'py-ofxparse' => 'py3-ofxparse',
'py-puppetboard' => 'py3-puppetboard',
'py-urlgrabber' => 'py3-urlgrabber',
+ 'qt4-sqlite2' => 'qt4',
};
my $obsolete_reason = {
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 15:55:46 -0000
@@ -10,23 +10,20 @@ 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}
FULLPKGNAME-html = qt4-html-${PKGVERSION}
FULLPKGPATH-html = ${BASE_PKGPATH},-html
-REVISION-main = 24
+REVISION-main = 25
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-main
===================================================================
RCS file: /cvs/ports/x11/qt4/pkg/PLIST-main,v
retrieving revision 1.39
diff -u -p -r1.39 PLIST-main
--- x11/qt4/pkg/PLIST-main 26 Jan 2021 18:29:01 -0000 1.39
+++ x11/qt4/pkg/PLIST-main 14 Mar 2021 15:55:13 -0000
@@ -3,6 +3,7 @@
@pkgpath x11/qt4
@pkgpath x11/qt4,-phonon
@pkgpath x11/qt4,-sqlite
+@pkgpath x11/qt4,-sqlite2
bin/assistant4
bin/designer4
bin/findtr4
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
