Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1503102464146240"
MIME-Version: 1.0
Date: Sat, 19 Aug 2017 00:27:44 +0000
From: "Johnny C. Lam" <jlam@netbsd.org>
Subject: CVS commit: pkgsrc/net/ccrtp
To: pkgsrc-changes@NetBSD.org
Reply-To: jlam@netbsd.org
Message-Id: <20170819002744.4B981FAD0@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1503102464146240
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	jlam
Date:		Sat Aug 19 00:27:44 UTC 2017

Modified Files:
	pkgsrc/net/ccrtp: Makefile distinfo
Added Files:
	pkgsrc/net/ccrtp/patches: patch-doc_CMakeLists.txt

Log Message:
net/ccrtp: Install GNU info files into ${PKGINFODIR}.

This project uses CMake to configure the software.  Force the GNU
info files to be installed into ${CMAKE_INSTALL_INFODIR}, which is
defined by the GNUInstallDirs CMake module included by the
top-level CMakeLists.txt file.  The corrct environment variables
are passed so that ${CMAKE_INSTALL_INFODIR} points into
${PKGINFODIR}.

Remove the subst.mk section that tried to force GNU info files to
be always installed under "info".


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/net/ccrtp/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/net/ccrtp/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/net/ccrtp/patches/patch-doc_CMakeLists.txt

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


--_----------=_1503102464146240
Content-Disposition: inline
Content-Length: 2260
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/net/ccrtp/Makefile
diff -u pkgsrc/net/ccrtp/Makefile:1.10 pkgsrc/net/ccrtp/Makefile:1.11
--- pkgsrc/net/ccrtp/Makefile:1.10	Mon Sep 19 13:04:18 2016
+++ pkgsrc/net/ccrtp/Makefile	Sat Aug 19 00:27:44 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2016/09/19 13:04:18 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2017/08/19 00:27:44 jlam Exp $
 #
 
 DISTNAME=	ccrtp-2.1.2
@@ -19,12 +19,6 @@ USE_CMAKE=		yes
 PKGCONFIG_OVERRIDE+=	libccrtp.pc.in
 INFO_FILES=		yes
 
-SUBST_CLASSES+=		info
-SUBST_FILES.info=	doc/cmake_install.cmake
-SUBST_MESSAGE.info=	Fixing infodir path.
-SUBST_SED.info=		-e 's|share/info|info|1'
-SUBST_STAGE.info=	post-configure
-
 .include "options.mk"
 
 BUILDLINK_API_DEPENDS.ucommon+=	ucommon>=6.3.1

Index: pkgsrc/net/ccrtp/distinfo
diff -u pkgsrc/net/ccrtp/distinfo:1.6 pkgsrc/net/ccrtp/distinfo:1.7
--- pkgsrc/net/ccrtp/distinfo:1.6	Wed Nov  4 00:34:54 2015
+++ pkgsrc/net/ccrtp/distinfo	Sat Aug 19 00:27:44 2017
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.6 2015/11/04 00:34:54 agc Exp $
+$NetBSD: distinfo,v 1.7 2017/08/19 00:27:44 jlam Exp $
 
 SHA1 (ccrtp-2.1.2.tar.gz) = ecad8c17c5ed61e1c9fb1b785592958c678b7c4b
 RMD160 (ccrtp-2.1.2.tar.gz) = b3b2cb2f6822e08422b19fcd1528f976ca10ad66
 SHA512 (ccrtp-2.1.2.tar.gz) = a835f57a0eef7cba11c55c93ce2f11ebd8ab4099e7c723043c51e4872f3da87af946fc50fac18b47ea5d72b2a1227b377810e9134c1f3a8982d4ce5944d043e9
 Size (ccrtp-2.1.2.tar.gz) = 764869 bytes
+SHA1 (patch-doc_CMakeLists.txt) = e9cfcfc618dc6bc16da5d3bff61774c57febaff6
 SHA1 (patch-src_ccrtp_crypto_gcrypt_InitializeGcrypt.cpp) = 407f3a7f6536028a1b727a826183133dfe3ce4d6

Added files:

Index: pkgsrc/net/ccrtp/patches/patch-doc_CMakeLists.txt
diff -u /dev/null pkgsrc/net/ccrtp/patches/patch-doc_CMakeLists.txt:1.1
--- /dev/null	Sat Aug 19 00:27:44 2017
+++ pkgsrc/net/ccrtp/patches/patch-doc_CMakeLists.txt	Sat Aug 19 00:27:44 2017
@@ -0,0 +1,10 @@
+$NetBSD: patch-doc_CMakeLists.txt,v 1.1 2017/08/19 00:27:44 jlam Exp $
+
+--- doc/CMakeLists.txt.orig	2015-01-11 14:43:52.000000000 +0000
++++ doc/CMakeLists.txt
+@@ -1,4 +1,4 @@
+ 
+ ########### install files ###############
+ 
+-install(FILES ccrtp.info DESTINATION ${CMAKE_INSTALL_DATADIR}/info)
++install(FILES ccrtp.info DESTINATION ${CMAKE_INSTALL_INFODIR})


--_----------=_1503102464146240--