tech-pkg archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Re: update databases/sqlitebrowser



Hello Brook,

Brook Milligan writes:
> [...]
> Thanks for the comment.  I have attached an updated version of the patch and will commit it after a bit unless I hear comments to the contrary.
> [...]

It is accidentally missing mk/bsd.prefs.mk inclusion.

I think that PLIST_VAR(S) `mac' can be avoided at the moment because
no extra files are installed on Darwin.

And, sorry for not commenting about that in the previous email
- and these are unrelated to problem reported in this thread -
running pkglint pointed out that graphics/hicolor-icon-theme/buildlink3.mk
should be added too (on non-Darwin) because icons are installed.
The .desktop file has a MimeType field and in order to be properly
handled sysutils/desktop-file-utils/desktopdb.mk should be included.

Only cosmetic, GITHUB_PROJECT can be removed because by default it
is already initialized to PKGBASE (sqlitebrowser).

Possible adjusted patch attached in this email (WARNING: I have
not tested it!).


Thank you!
sqlitebrowser: Fix PLIST mismatches on macOS

share/* files are installed only on non-macOS, adjust PLIST
accordingly and include graphics/hicolor-icon-theme bl3 for installed
icon and desktopdb.mk for .desktop file that has a MimeEntry field.

Bump PKGREVISION

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/databases/sqlitebrowser/Makefile,v
retrieving revision 1.28
diff -u -p -r1.28 Makefile
--- Makefile	9 Dec 2018 18:52:21 -0000	1.28
+++ Makefile	30 Jan 2019 16:28:35 -0000
@@ -1,10 +1,9 @@
 # $NetBSD: Makefile,v 1.28 2018/12/09 18:52:21 adam Exp $
 
 DISTNAME=	sqlitebrowser-3.8.0
-PKGREVISION=	10
+PKGREVISION=	11
 CATEGORIES=	databases x11
 MASTER_SITES=	${MASTER_SITE_GITHUB:=sqlitebrowser/}
-GITHUB_PROJECT=	sqlitebrowser
 GITHUB_TAG=	v${PKGVERSION_NOREV}
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
@@ -15,6 +14,18 @@ LICENSE=	mpl-2.0 OR gnu-gpl-v3
 USE_LANGUAGES=	c c++
 USE_CMAKE=	yes
 
+.include "../../mk/bsd.prefs.mk"
+
+# XXX - CMakeLists.txt (lines 304-313) omits some files from the
+# installation with the conditional "if(UNIX AND NOT APPLE)"
+#
+PLIST_VARS+=		unix
+.if ${OPSYS} != "Darwin"
+PLIST.unix=		yes
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.endif
+
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../x11/qt4-libs/buildlink3.mk"
 .include "../../x11/qt4-tools/buildlink3.mk"
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/databases/sqlitebrowser/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- PLIST	5 Mar 2016 07:45:21 -0000	1.2
+++ PLIST	30 Jan 2019 16:28:35 -0000
@@ -1,5 +1,5 @@
 @comment $NetBSD: PLIST,v 1.2 2016/03/05 07:45:21 ryoon Exp $
 bin/sqlitebrowser
-share/appdata/sqlitebrowser.desktop.appdata.xml
-share/applications/sqlitebrowser.desktop
-share/icons/hicolor/256x256/apps/sqlitebrowser.png
+${PLIST.unix}share/appdata/sqlitebrowser.desktop.appdata.xml
+${PLIST.unix}share/applications/sqlitebrowser.desktop
+${PLIST.unix}share/icons/hicolor/256x256/apps/sqlitebrowser.png


Home | Main Index | Thread Index | Old Index