Sat Aug 19 00:27:44 2017 UTC ()
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".


(jlam)
diff -r1.10 -r1.11 pkgsrc/net/ccrtp/Makefile
diff -r1.6 -r1.7 pkgsrc/net/ccrtp/distinfo
diff -r0 -r1.1 pkgsrc/net/ccrtp/patches/patch-doc_CMakeLists.txt
cvs diff -r1.10 -r1.11 pkgsrc/net/ccrtp/Makefile (expand / switch to unified diff)

--- pkgsrc/net/ccrtp/Makefile 2016/09/19 13:04:18 1.10
+++ pkgsrc/net/ccrtp/Makefile 2017/08/19 00:27:44 1.11
@@ -1,33 +1,27 @@ @@ -1,33 +1,27 @@
1# $NetBSD: Makefile,v 1.10 2016/09/19 13:04:18 wiz Exp $ 1# $NetBSD: Makefile,v 1.11 2017/08/19 00:27:44 jlam Exp $
2# 2#
3 3
4DISTNAME= ccrtp-2.1.2 4DISTNAME= ccrtp-2.1.2
5PKGREVISION= 3 5PKGREVISION= 3
6CATEGORIES= net 6CATEGORIES= net
7MASTER_SITES= ${MASTER_SITE_GNU:=ccrtp/} 7MASTER_SITES= ${MASTER_SITE_GNU:=ccrtp/}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.gnu.org/software/ccrtp/ 10HOMEPAGE= http://www.gnu.org/software/ccrtp/
11COMMENT= RTP and RTSP protocol implementation using GNU CommonCpp 11COMMENT= RTP and RTSP protocol implementation using GNU CommonCpp
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14USE_PKGLOCALEDIR= yes 14USE_PKGLOCALEDIR= yes
15USE_LIBTOOL= yes 15USE_LIBTOOL= yes
16USE_LANGUAGES+= c c++ 16USE_LANGUAGES+= c c++
17USE_TOOLS+= pkg-config 17USE_TOOLS+= pkg-config
18USE_CMAKE= yes 18USE_CMAKE= yes
19PKGCONFIG_OVERRIDE+= libccrtp.pc.in 19PKGCONFIG_OVERRIDE+= libccrtp.pc.in
20INFO_FILES= yes 20INFO_FILES= yes
21 21
22SUBST_CLASSES+= info 
23SUBST_FILES.info= doc/cmake_install.cmake 
24SUBST_MESSAGE.info= Fixing infodir path. 
25SUBST_SED.info= -e 's|share/info|info|1' 
26SUBST_STAGE.info= post-configure 
27 
28.include "options.mk" 22.include "options.mk"
29 23
30BUILDLINK_API_DEPENDS.ucommon+= ucommon>=6.3.1 24BUILDLINK_API_DEPENDS.ucommon+= ucommon>=6.3.1
31.include "../../devel/ucommon/buildlink3.mk" 25.include "../../devel/ucommon/buildlink3.mk"
32.include "../../mk/pthread.buildlink3.mk" 26.include "../../mk/pthread.buildlink3.mk"
33.include "../../mk/bsd.pkg.mk" 27.include "../../mk/bsd.pkg.mk"
cvs diff -r1.6 -r1.7 pkgsrc/net/ccrtp/distinfo (expand / switch to unified diff)

--- pkgsrc/net/ccrtp/distinfo 2015/11/04 00:34:54 1.6
+++ pkgsrc/net/ccrtp/distinfo 2017/08/19 00:27:44 1.7
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1$NetBSD: distinfo,v 1.6 2015/11/04 00:34:54 agc Exp $ 1$NetBSD: distinfo,v 1.7 2017/08/19 00:27:44 jlam Exp $
2 2
3SHA1 (ccrtp-2.1.2.tar.gz) = ecad8c17c5ed61e1c9fb1b785592958c678b7c4b 3SHA1 (ccrtp-2.1.2.tar.gz) = ecad8c17c5ed61e1c9fb1b785592958c678b7c4b
4RMD160 (ccrtp-2.1.2.tar.gz) = b3b2cb2f6822e08422b19fcd1528f976ca10ad66 4RMD160 (ccrtp-2.1.2.tar.gz) = b3b2cb2f6822e08422b19fcd1528f976ca10ad66
5SHA512 (ccrtp-2.1.2.tar.gz) = a835f57a0eef7cba11c55c93ce2f11ebd8ab4099e7c723043c51e4872f3da87af946fc50fac18b47ea5d72b2a1227b377810e9134c1f3a8982d4ce5944d043e9 5SHA512 (ccrtp-2.1.2.tar.gz) = a835f57a0eef7cba11c55c93ce2f11ebd8ab4099e7c723043c51e4872f3da87af946fc50fac18b47ea5d72b2a1227b377810e9134c1f3a8982d4ce5944d043e9
6Size (ccrtp-2.1.2.tar.gz) = 764869 bytes 6Size (ccrtp-2.1.2.tar.gz) = 764869 bytes
 7SHA1 (patch-doc_CMakeLists.txt) = e9cfcfc618dc6bc16da5d3bff61774c57febaff6
7SHA1 (patch-src_ccrtp_crypto_gcrypt_InitializeGcrypt.cpp) = 407f3a7f6536028a1b727a826183133dfe3ce4d6 8SHA1 (patch-src_ccrtp_crypto_gcrypt_InitializeGcrypt.cpp) = 407f3a7f6536028a1b727a826183133dfe3ce4d6
File Added: pkgsrc/net/ccrtp/patches/patch-doc_CMakeLists.txt
$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})