On Sat Oct 21, 2017 at 08:37:50PM +0200, Rafael Sadowski wrote:
> On Mon Oct 16, 2017 at 04:40:52PM +0200, Caspar Schutijser wrote:
> > Hi ports@,
> >
> > Below is a diff that updates databases/sqlitebrowser to 3.10.1. The
> > port uses Qt5 now. The changes in DESCR (remove trailing whitespace)
> > and in PLIST were made to please portcheck. If necessary I can send
> > the whitespace changes separately.
> >
> > Thanks,
> > Caspar Schutijser
> >
>
> Ports update looks fine and sqlitebrowser runs as expected. Thanks Caspar!
>
> ok rsadowski@ Any objections?
>
Please find below a slightly cleanup version with following changes:
- sorted like in Makefile.template
- cleanup GH_ variables
- regen WANTLIB
Anybody wanna give it a okay?
Index: Makefile
===================================================================
RCS file: /cvs/ports/databases/sqlitebrowser/Makefile,v
retrieving revision 1.22
diff -u -p -u -p -r1.22 Makefile
--- Makefile 26 Jul 2017 22:45:17 -0000 1.22
+++ Makefile 25 Oct 2017 09:25:13 -0000
@@ -1,26 +1,27 @@
# $OpenBSD: Makefile,v 1.22 2017/07/26 22:45:17 sthen Exp $
COMMENT= graphical interface to sqlite databases
-V = 3.7.0
+
GH_ACCOUNT = sqlitebrowser
GH_PROJECT = sqlitebrowser
-GH_TAGNAME = v${V}
-DISTNAME = ${GH_PROJECT}-${V}
-PKGNAME = ${DISTNAME}
-REVISION = 1
+GH_TAGNAME = v3.10.1
CATEGORIES= databases x11
-HOMEPAGE= http://sqlitebrowser.org/
-MODULES= x11/qt4 devel/cmake
+HOMEPAGE= http://sqlitebrowser.org/
# MPLv2/GPLv3+
PERMIT_PACKAGE_CDROM= Yes
-WANTLIB += QtGui QtNetwork c m pthread sqlite3 ${COMPILER_LIBCXX}
+WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Gui Qt5Network Qt5PrintSupport
+WANTLIB += Qt5Test Qt5Widgets c m sqlite3
+
+MODULES= x11/qt5 \
+ devel/cmake
+
LIB_DEPENDS = databases/sqlite3
-RUN_DEPENDS = x11/gtk+3,-guic devel/desktop-file-utils
-CONFIGURE_ARGS = -DUSE_QT5=False
+RUN_DEPENDS = x11/gtk+3,-guic \
+ devel/desktop-file-utils
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/databases/sqlitebrowser/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- distinfo 23 Dec 2015 10:30:26 -0000 1.4
+++ distinfo 25 Oct 2017 09:25:13 -0000
@@ -1,2 +1,2 @@
-SHA256 (sqlitebrowser-3.7.0.tar.gz) =
MJOh3PWzE4wa3ymFfWIkmrKwaOcLABhpoxFRdj4ozDo=
-SIZE (sqlitebrowser-3.7.0.tar.gz) = 1509766
+SHA256 (sqlitebrowser-3.10.1.tar.gz) =
NutTvHUZLGh9zimMefFTLEEM5Oy+6s+we50Cowfxa+8=
+SIZE (sqlitebrowser-3.10.1.tar.gz) = 1992186
Index: pkg/DESCR
===================================================================
RCS file: /cvs/ports/databases/sqlitebrowser/pkg/DESCR,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 DESCR
--- pkg/DESCR 9 May 2006 15:18:28 -0000 1.1.1.1
+++ pkg/DESCR 25 Oct 2017 09:25:13 -0000
@@ -1,19 +1,19 @@
-SQLite Database Browser is a public domain visual tool used to create,
-design and edit database files compatible with SQLite3.
+SQLite Database Browser is a public domain visual tool used to create,
+design and edit database files compatible with SQLite3.
-It is meant to be used for users and developers who want to create
-databases, edit and search data using a familiar spreadsheet-like interface,
-without the need to learn complicated SQL commands.
+It is meant to be used for users and developers who want to create
+databases, edit and search data using a familiar spreadsheet-like interface,
+without the need to learn complicated SQL commands.
Controls and wizards are available for users to:
-* Create and compact database files
-* Create, define, modify and delete tables
-* Create, define and delete indexes
-* Browse, edit, add and delete records
-* Search records
+* Create and compact database files
+* Create, define, modify and delete tables
+* Create, define and delete indexes
+* Browse, edit, add and delete records
+* Search records
* Import and export records as text
-* Import and export tables from/to CSV files
-* Import and export databases from/to SQL dump files
+* Import and export tables from/to CSV files
+* Import and export databases from/to SQL dump files
* Issue SQL queries and inspect the results
* Examine a log of all SQL commands issued by the application
-This program, however, is not a visual shell for the sqlite command line tool.
+This program, however, is not a visual shell for the sqlite command line tool.
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/databases/sqlitebrowser/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- pkg/PLIST 23 Dec 2015 10:30:26 -0000 1.3
+++ pkg/PLIST 25 Oct 2017 09:25:13 -0000
@@ -4,7 +4,7 @@ share/appdata/
share/appdata/sqlitebrowser.desktop.appdata.xml
share/applications/sqlitebrowser.desktop
share/icons/hicolor/256x256/apps/sqlitebrowser.png
-@exec gtk-update-icon-cache --quiet %D/share/icons/hicolor
-@unexec gtk-update-icon-cache --quiet %D/share/icons/hicolor
-@exec update-desktop-database %D/share/applications
-@unexec update-desktop-database %D/share/applications
+@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
+@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
+@exec %D/bin/update-desktop-database
+@unexec-delete %D/bin/update-desktop-database
