Sat Feb 2 08:48:06 2019 UTC ()
Install icons and application resources on all Unix platforms.

As discussed on tech-pkg, icons and application resources should be
installed uniformly on all Unix platforms.  Previously, CMakeLists.txt
excluded these on Darwin but not on other Unix platforms.
Consequently, the PLIST was broken on Darwin.  This was fixed with
upstream commit 21d8800ce613775c995212f61d7e95c2189f6da6, which has
been backported here to v3.8.0.

While here, add two buildlink3.mk files, also discussed on tech-pkg,
that should have been present all along but for some reason were not.


(brook)
diff -r1.28 -r1.29 pkgsrc/databases/sqlitebrowser/Makefile
diff -r1.7 -r1.8 pkgsrc/databases/sqlitebrowser/distinfo
diff -r0 -r1.1 pkgsrc/databases/sqlitebrowser/patches/patch-CMakeLists.txt
cvs diff -r1.28 -r1.29 pkgsrc/databases/sqlitebrowser/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/sqlitebrowser/Makefile 2018/12/09 18:52:21 1.28
+++ pkgsrc/databases/sqlitebrowser/Makefile 2019/02/02 08:48:06 1.29
@@ -1,21 +1,22 @@ @@ -1,21 +1,22 @@
1# $NetBSD: Makefile,v 1.28 2018/12/09 18:52:21 adam Exp $ 1# $NetBSD: Makefile,v 1.29 2019/02/02 08:48:06 brook Exp $
2 2
3DISTNAME= sqlitebrowser-3.8.0 3DISTNAME= sqlitebrowser-3.8.0
4PKGREVISION= 10 4PKGREVISION= 11
5CATEGORIES= databases x11 5CATEGORIES= databases x11
6MASTER_SITES= ${MASTER_SITE_GITHUB:=sqlitebrowser/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=sqlitebrowser/}
7GITHUB_PROJECT= sqlitebrowser 
8GITHUB_TAG= v${PKGVERSION_NOREV} 7GITHUB_TAG= v${PKGVERSION_NOREV}
9 8
10MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
11COMMENT= Qt4 lightweight GUI editor/viewer for SQLite Databases 10COMMENT= Qt4 lightweight GUI editor/viewer for SQLite Databases
12HOMEPAGE= http://sqlitebrowser.org/ 11HOMEPAGE= http://sqlitebrowser.org/
13LICENSE= mpl-2.0 OR gnu-gpl-v3 12LICENSE= mpl-2.0 OR gnu-gpl-v3
14 13
15USE_LANGUAGES= c c++ 14USE_LANGUAGES= c c++
16USE_CMAKE= yes 15USE_CMAKE= yes
17 16
18.include "../../databases/sqlite3/buildlink3.mk" 17.include "../../databases/sqlite3/buildlink3.mk"
 18.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 19.include "../../sysutils/desktop-file-utils/desktopdb.mk"
19.include "../../x11/qt4-libs/buildlink3.mk" 20.include "../../x11/qt4-libs/buildlink3.mk"
20.include "../../x11/qt4-tools/buildlink3.mk" 21.include "../../x11/qt4-tools/buildlink3.mk"
21.include "../../mk/bsd.pkg.mk" 22.include "../../mk/bsd.pkg.mk"
cvs diff -r1.7 -r1.8 pkgsrc/databases/sqlitebrowser/distinfo (expand / switch to unified diff)

--- pkgsrc/databases/sqlitebrowser/distinfo 2016/03/05 07:45:21 1.7
+++ pkgsrc/databases/sqlitebrowser/distinfo 2019/02/02 08:48:06 1.8
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.7 2016/03/05 07:45:21 ryoon Exp $ 1$NetBSD: distinfo,v 1.8 2019/02/02 08:48:06 brook Exp $
2 2
3SHA1 (sqlitebrowser-3.8.0.tar.gz) = 466ef6692c569e2e95158fcb6ac8a4f6ea38fc6f 3SHA1 (sqlitebrowser-3.8.0.tar.gz) = 466ef6692c569e2e95158fcb6ac8a4f6ea38fc6f
4RMD160 (sqlitebrowser-3.8.0.tar.gz) = a4af8ecc97a02b042552f539ef67c907042f2c60 4RMD160 (sqlitebrowser-3.8.0.tar.gz) = a4af8ecc97a02b042552f539ef67c907042f2c60
5SHA512 (sqlitebrowser-3.8.0.tar.gz) = 6e262e3bd3b26a1574a69cc9f306774cc9fe69f87c3253aba6b40c35f2491bc0636b6d5e705526e039ee9d8ed27d21a4529a624d62e8879a3917cfb502a65589 5SHA512 (sqlitebrowser-3.8.0.tar.gz) = 6e262e3bd3b26a1574a69cc9f306774cc9fe69f87c3253aba6b40c35f2491bc0636b6d5e705526e039ee9d8ed27d21a4529a624d62e8879a3917cfb502a65589
6Size (sqlitebrowser-3.8.0.tar.gz) = 1538043 bytes 6Size (sqlitebrowser-3.8.0.tar.gz) = 1538043 bytes
 7SHA1 (patch-CMakeLists.txt) = 303617c11c807241cc13a2f664fe667282ce7bda
File Added: pkgsrc/databases/sqlitebrowser/patches/Attic/patch-CMakeLists.txt
$NetBSD: patch-CMakeLists.txt,v 1.1 2019/02/02 08:48:06 brook Exp $

Icons and application resources should be installed on all unix platforms.

See upstream commit 21d8800ce613775c995212f61d7e95c2189f6da6.

--- CMakeLists.txt.orig	2015-12-26 12:10:05.000000000 +0000
+++ CMakeLists.txt
@@ -301,7 +301,7 @@ if(ENABLE_TESTING)
 	add_subdirectory(src/tests)
 endif()
 
-if(UNIX AND NOT APPLE)
+if(UNIX)
 	install(FILES src/icons/${PROJECT_NAME}.png
 		DESTINATION share/icons/hicolor/256x256/apps/)
 	
@@ -310,7 +310,7 @@ if(UNIX AND NOT APPLE)
 
 	install(FILES distri/${PROJECT_NAME}.desktop.appdata.xml
 		DESTINATION share/appdata/)
-endif(UNIX AND NOT APPLE)
+endif(UNIX)
 
 if(WIN32 AND MSVC)
 	set(QT5_BIN_PATH ${QT5_PATH}/bin)