xygrib: don' install files via Makefile

[Niclas Rosenvik <nros%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Niclas Rosenvik <nros%NetBSD.org@localhost>
Pushed By:	nros
Date:		Mon Oct 28 20:05:16 2019 +0000
Changeset:	d54c7b063f855a02f927326296d9b5f343ded7a7

Modified Files:
	xygrib/Makefile
	xygrib/distinfo
	xygrib/patches/patch-CMakeLists.txt

Log Message:
xygrib: don' install files via Makefile

Use cmakes install command to install freedesktop files instead of doing it
in the Makefile.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=d54c7b063f855a02f927326296d9b5f343ded7a7

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 xygrib/Makefile                     | 9 ---------
 xygrib/distinfo                     | 2 +-
 xygrib/patches/patch-CMakeLists.txt | 7 ++++++-
 3 files changed, 7 insertions(+), 11 deletions(-)

diffs:
diff --git a/xygrib/Makefile b/xygrib/Makefile
index d844d818ec..6db2093ccf 100644
--- a/xygrib/Makefile
+++ b/xygrib/Makefile
@@ -16,15 +16,6 @@ LICENSE=	gnu-gpl-v3
 USE_LANGUAGES+=	c c++
 USE_CMAKE=	yes
 
-INSTALLATION_DIRS+=share/applications
-INSTALLATION_DIRS+=share/pixmaps
-
-post-install:
-	${INSTALL_DATA} ${WRKSRC}/debian/xygrib.desktop \
-		${DESTDIR}${PREFIX}/share/applications
-	${INSTALL_DATA} ${WRKSRC}/debian/xygrib.png \
-		${DESTDIR}${PREFIX}/share/pixmaps
-
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 
 .include "../../archivers/bzip2/buildlink3.mk"
diff --git a/xygrib/distinfo b/xygrib/distinfo
index c6f9fa6bbf..8329d8a513 100644
--- a/xygrib/distinfo
+++ b/xygrib/distinfo
@@ -4,4 +4,4 @@ SHA1 (XyGrib/XyGrib-1.2.6.1.tar.gz) = 8e3431ed6a5ef114d77ac57029129a26a381f696
 RMD160 (XyGrib/XyGrib-1.2.6.1.tar.gz) = 876e8a53b492b2e2ea0572e5b0cd31a2c04f505a
 SHA512 (XyGrib/XyGrib-1.2.6.1.tar.gz) = 33c8a0fc6791dbe3342524555dc90362560fed08b4e2a624111167d92e2c71890dcb5bfe7e85d7df2ffc11a382ea5afa484cdab84c29935d4be2e673c76a371c
 Size (XyGrib/XyGrib-1.2.6.1.tar.gz) = 14704088 bytes
-SHA1 (patch-CMakeLists.txt) = ea6de2db6b49091b58fee82d23ef9998630910aa
+SHA1 (patch-CMakeLists.txt) = 9effed4867c7d2698460aeb820ed7ed14b2ab171
diff --git a/xygrib/patches/patch-CMakeLists.txt b/xygrib/patches/patch-CMakeLists.txt
index fd657e2a08..34b37f7d99 100644
--- a/xygrib/patches/patch-CMakeLists.txt
+++ b/xygrib/patches/patch-CMakeLists.txt
@@ -3,6 +3,7 @@ $NetBSD$
 * use PATH_SUFFIX fix to find openjpeg
 * install bins and data into the right directory
 * don't install cmake files in the translation directory
+* install icon and desktop files
 --- CMakeLists.txt.orig	2019-07-05 09:01:01.000000000 +0000
 +++ CMakeLists.txt
 @@ -54,71 +54,23 @@ find_package(Qt5Xml CONFIG REQUIRED)
@@ -93,7 +94,7 @@ $NetBSD$
  endif()
  
  add_subdirectory(src)
-@@ -241,4 +194,9 @@ set_target_properties(${PROJECT_NAME} PR
+@@ -241,4 +194,13 @@ set_target_properties(${PROJECT_NAME} PR
  set_target_properties(${PROJECT_NAME} PROPERTIES MACOSX_BUNDLE_BUNDLE_VERSION "${XYGRIB_VERSION}")
  set_target_properties(${PROJECT_NAME} PROPERTIES MACOSX_BUNDLE_COPYRIGHT "${PROJECT_NAME} Authors")
  # Install data
@@ -104,3 +105,7 @@ $NetBSD$
 +        PATTERN "Makefile" EXCLUDE
 +        PATTERN "cmake_install.cmake" EXCLUDE
 +        PATTERN "*.ts" EXCLUDE)
++install(FILES debian/xygrib.desktop
++        DESTINATION ${CMAKE_INSTALL_FULL_DATADIR}/applications)
++install(FILES debian/xygrib.png
++	DESTINATION ${CMAKE_INSTALL_FULL_DATADIR}/pixmaps)