From 8b960222d269fdd248683a0b9c3f939f2435af9b Mon Sep 17 00:00:00 2001
From: jperkin <jperkin@pkgsrc.org>
Date: Thu, 21 Apr 2016 11:12:19 +0000
Subject: Fix PKGMANDIR handling.

---
 x11/sakura/Makefile                     | 8 +-------
 x11/sakura/distinfo                     | 4 ++--
 x11/sakura/patches/patch-CMakeLists.txt | 6 ++++--
 3 files changed, 7 insertions(+), 11 deletions(-)

(limited to 'x11')

diff --git a/x11/sakura/Makefile b/x11/sakura/Makefile
index 78a04dffacb..20525420c2e 100644
--- a/x11/sakura/Makefile
+++ b/x11/sakura/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2015/04/25 14:25:20 tnn Exp $
+# $NetBSD: Makefile,v 1.23 2016/04/21 11:12:19 jperkin Exp $
 #
 
 DISTNAME=	sakura-${SAKURA_VER}
@@ -17,12 +17,6 @@ USE_LANGUAGES=	c c++
 USE_TOOLS+=	pkg-config pod2man xgettext
 USE_CMAKE=	yes
 
-SUBST_CLASSES+=			fix-man-path
-SUBST_STAGE.fix-man-path=	post-patch
-SUBST_MESSAGE.fix-man-path=	Fix path for man1.
-SUBST_FILES.fix-man-path=	CMakeLists.txt
-SUBST_SED.fix-man-path=		-e 's,share/man/man1,${PKGMANDIR}/man1,g'
-
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.20.0
 .include "../../devel/glib2/buildlink3.mk"
 BUILDLINK_API_DEPENDS.gtk3+=	gtk3+>=3.0
diff --git a/x11/sakura/distinfo b/x11/sakura/distinfo
index 84c7959b4a8..0d6e16ef87f 100644
--- a/x11/sakura/distinfo
+++ b/x11/sakura/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.7 2015/11/04 03:28:54 agc Exp $
+$NetBSD: distinfo,v 1.8 2016/04/21 11:12:19 jperkin Exp $
 
 SHA1 (sakura-3.1.3.tar.bz2) = 44556f30eb63c95eb46d253a0e69c81ec7e0112b
 RMD160 (sakura-3.1.3.tar.bz2) = 168fdf99ebf8bf6370ccbe90d19a8e36e9958cd1
 SHA512 (sakura-3.1.3.tar.bz2) = be2500bcd5aafbeb069a2421331c55240293b675813f18dbfc91992c281d6d232e2506d693c272bf24d695759e0463a2bd4a4476641e267dcb4284d760471b18
 Size (sakura-3.1.3.tar.bz2) = 50326 bytes
-SHA1 (patch-CMakeLists.txt) = 4a6de5b1ec6e871a784959231ddf8c90a0e9fb4f
+SHA1 (patch-CMakeLists.txt) = 86dbc6a6ae2cb0acdbbb2d3110270c47463ad4e4
diff --git a/x11/sakura/patches/patch-CMakeLists.txt b/x11/sakura/patches/patch-CMakeLists.txt
index 545296cad52..b12d40bbe60 100644
--- a/x11/sakura/patches/patch-CMakeLists.txt
+++ b/x11/sakura/patches/patch-CMakeLists.txt
@@ -1,4 +1,6 @@
-$NetBSD: patch-CMakeLists.txt,v 1.4 2014/01/03 05:26:24 ryoon Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.5 2016/04/21 11:12:20 jperkin Exp $
+
+Use CMAKE_INSTALL_MANDIR.
 
 --- CMakeLists.txt.orig	2013-12-13 19:31:31.000000000 +0000
 +++ CMakeLists.txt
@@ -7,7 +9,7 @@ $NetBSD: patch-CMakeLists.txt,v 1.4 2014/01/03 05:26:24 ryoon Exp $
  INSTALL (FILES terminal-tango.svg DESTINATION share/pixmaps)
  IF (POD2MAN)	
 -	INSTALL (FILES ${sakura_BINARY_DIR}/sakura.1 DESTINATION share/man/man1)	
-+	INSTALL (FILES ${sakura_BINARY_DIR}/sakura.1 DESTINATION man/man1)	
++	INSTALL (FILES ${sakura_BINARY_DIR}/sakura.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
  ENDIF (POD2MAN)
  INSTALL (FILES INSTALL DESTINATION share/doc/sakura)	
  
-- 
cgit v1.2.3