uTox-git: Use GNUInstallDirs (to be merged upstream)

[Mateusz Poszwa <old4%o2.pl@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Mateusz Poszwa <old4%o2.pl@localhost>
Pushed By:	f8l
Date:		Mon Jan 30 22:05:01 2017 +0100
Changeset:	18be1f8b073a722507b220456ade73cff93a9428

Modified Files:
	uTox-git/Makefile
	uTox-git/distinfo
	uTox-git/patches/patch-src_xlib_CMakeLists.txt

Log Message:
uTox-git: Use GNUInstallDirs (to be merged upstream)

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

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

diffstat:
 uTox-git/Makefile                              |  4 ++--
 uTox-git/distinfo                              |  2 +-
 uTox-git/patches/patch-src_xlib_CMakeLists.txt | 15 +++++++++++++--
 3 files changed, 16 insertions(+), 5 deletions(-)

diffs:
diff --git a/uTox-git/Makefile b/uTox-git/Makefile
index 0e0b314..37a7497 100644
--- a/uTox-git/Makefile
+++ b/uTox-git/Makefile
@@ -1,12 +1,12 @@
 # $NetBSD$
 
-DISTNAME=	uTox-0.12.1
+DISTNAME=	uTox-0.12.2
 CATEGORIES=	chat
 MASTER_SITES=	${MASTER_SITE_GITHUB:=uTox/}
 
 GIT_REPOSITORIES=	uTox
 GIT_REPO.uTox=		http://github.com/uTox/uTox.git
-GIT_BRANCH.uTox=	master
+GIT_BRANCH.uTox=	develop
 WRKSRC=			${WRKDIR}/uTox
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
diff --git a/uTox-git/distinfo b/uTox-git/distinfo
index 9cadb913..3753ae2 100644
--- a/uTox-git/distinfo
+++ b/uTox-git/distinfo
@@ -2,7 +2,7 @@ $NetBSD$
 
 SHA1 (patch-src_main.h) = 1def46cb26e474b20a5e34ae5a471a7c9fbb004c
 SHA1 (patch-src_updater.c) = c02cec879f954d6c2abb3e1ea6b0e0a01b4e0b50
-SHA1 (patch-src_xlib_CMakeLists.txt) = efb01107005a759509b81e8887f75c7a65c58f5f
+SHA1 (patch-src_xlib_CMakeLists.txt) = 237e0413434908d2540c9ad95b0c31befc15ea62
 SHA1 (patch-src_xlib_main.c) = f474254680c6da875e5e3454afcb07455f858bbf
 SHA1 (patch-src_xlib_v4l.c) = 8f8de28684886ea9a135820b21f3bb3a91ba87b9
 SHA1 (patch-src_xlib_video.c) = e8a036070322af80736fb7789de3a2dbdeb86d45
diff --git a/uTox-git/patches/patch-src_xlib_CMakeLists.txt b/uTox-git/patches/patch-src_xlib_CMakeLists.txt
index 15d5f1a..7712fdb 100644
--- a/uTox-git/patches/patch-src_xlib_CMakeLists.txt
+++ b/uTox-git/patches/patch-src_xlib_CMakeLists.txt
@@ -2,9 +2,9 @@ $NetBSD$
 
 Don’t link with dl on non-Linux
 
---- src/xlib/CMakeLists.txt.orig	2017-01-09 21:54:26.000000000 +0000
+--- src/xlib/CMakeLists.txt.orig	2017-01-30 00:16:46.000000000 +0000
 +++ src/xlib/CMakeLists.txt
-@@ -39,7 +39,11 @@ message("X library: ${X11_LIBRARIES}")
+@@ -39,14 +39,20 @@ message("X library: ${X11_LIBRARIES}")
  message("Xrender include: ${X11_Xrender_INCLUDE_PATH}")
  message("Xrender library: ${X11_Xrender_LIB}")
  
@@ -14,6 +14,17 @@ Don’t link with dl on non-Linux
 +if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
 +  target_link_libraries(utoxNATIVE dl)
 +endif()
++
++include(GNUInstallDirs)
  
  install(FILES
      ../utox.desktop
+-    DESTINATION "share/applications"
++    DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications"
+     )
+ 
+ install(FILES
+     ../utox.1
+-    DESTINATION "share/man/man1"
++    DESTINATION "${CMAKE_INSTALL_MANDIR}/man1"
+     )