pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/net/ccrtp net/ccrtp: Install GNU info files into ${PKG...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/d1e497d0a944
branches:  trunk
changeset: 366906:d1e497d0a944
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sat Aug 19 00:27:44 2017 +0000

description:
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".

diffstat:

 net/ccrtp/Makefile                         |   8 +-------
 net/ccrtp/distinfo                         |   3 ++-
 net/ccrtp/patches/patch-doc_CMakeLists.txt |  10 ++++++++++
 3 files changed, 13 insertions(+), 8 deletions(-)

diffs (49 lines):

diff -r 15fbefb97f8a -r d1e497d0a944 net/ccrtp/Makefile
--- a/net/ccrtp/Makefile        Sat Aug 19 00:27:26 2017 +0000
+++ b/net/ccrtp/Makefile        Sat Aug 19 00:27:44 2017 +0000
@@ -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 @@
 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
diff -r 15fbefb97f8a -r d1e497d0a944 net/ccrtp/distinfo
--- a/net/ccrtp/distinfo        Sat Aug 19 00:27:26 2017 +0000
+++ b/net/ccrtp/distinfo        Sat Aug 19 00:27:44 2017 +0000
@@ -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
diff -r 15fbefb97f8a -r d1e497d0a944 net/ccrtp/patches/patch-doc_CMakeLists.txt
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/ccrtp/patches/patch-doc_CMakeLists.txt        Sat Aug 19 00:27:44 2017 +0000
@@ -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})



Home | Main Index | Thread Index | Old Index