On Sun, Mar 14, 2021 at 05:51:50PM +0000, Stuart Henderson wrote:
> On 2021/03/14 17:02, Klemens Nanni wrote:
> > 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?
>
> quirks would stay the same, all that's needed is the pkgpath marker (we've
> been doing these for long before quirks was a thing)
I thought I already did this but now rediscovered this diff/thread.
Removal diff without quirks and with @pkgpath in PLIST-main, ok?
Reminding quote from my original mail:
> Nothing uses it and both Qt4 and sqlite2 are (being) deprecated.
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/qt4/Makefile,v
retrieving revision 1.166
diff -u -p -r1.166 Makefile
--- Makefile 10 May 2021 15:02:29 -0000 1.166
+++ Makefile 8 Jul 2021 20:04:14 -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 = 25
+REVISION-main = 26
REVISION-mysql = 8
REVISION-postgresql = 7
-REVISION-sqlite2 = 7
REVISION-tds = 7
REVISION-debug = 6
REVISION-examples = 11
@@ -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: pkg/DESCR-sqlite2
===================================================================
RCS file: pkg/DESCR-sqlite2
diff -N pkg/DESCR-sqlite2
--- 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: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/x11/qt4/pkg/PLIST-main,v
retrieving revision 1.39
diff -u -p -r1.39 PLIST-main
--- pkg/PLIST-main 26 Jan 2021 18:29:01 -0000 1.39
+++ 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: pkg/PLIST-sqlite2
===================================================================
RCS file: pkg/PLIST-sqlite2
diff -N pkg/PLIST-sqlite2
--- 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
