pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/textproc/libkolabxml libkolabxml: cleanup installed cm...
details: https://anonhg.NetBSD.org/pkgsrc/rev/fe93a213c6e8
branches: trunk
changeset: 449185:fe93a213c6e8
user: markd <markd%pkgsrc.org@localhost>
date: Sun Mar 21 19:32:45 2021 +0000
description:
libkolabxml: cleanup installed cmake files
diffstat:
textproc/libkolabxml/Makefile | 8 +++++++-
textproc/libkolabxml/buildlink3.mk | 5 ++++-
textproc/libkolabxml/distinfo | 3 ++-
textproc/libkolabxml/patches/patch-CMakeLists.txt | 16 ++++++++++++++++
4 files changed, 29 insertions(+), 3 deletions(-)
diffs (75 lines):
diff -r a5349c56627a -r fe93a213c6e8 textproc/libkolabxml/Makefile
--- a/textproc/libkolabxml/Makefile Sun Mar 21 19:24:24 2021 +0000
+++ b/textproc/libkolabxml/Makefile Sun Mar 21 19:32:45 2021 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2021/03/19 22:17:02 markd Exp $
+# $NetBSD: Makefile,v 1.2 2021/03/21 19:32:45 markd Exp $
DISTNAME= libkolabxml-1.1.6
+PKGREVISION= 1
CATEGORIES= textproc
MASTER_SITES= https://mirror.kolabenterprise.com/pub/releases/
@@ -15,6 +16,11 @@
CMAKE_ARGS+= -DBUILD_TESTS=OFF
+SUBST_CLASSES+= pathes
+SUBST_STAGE.pathes= post-install
+SUBST_FILES.pathes= ${DESTDIR}${PREFIX}/lib/cmake/Libkolabxml/LibkolabxmlTargets-noconfig.cmake
+SUBST_SED.pathes= -e "s,${BUILDLINK_DIR},${PREFIX},g"
+
.include "../../devel/boost-libs/buildlink3.mk"
.include "../../devel/xsd/buildlink3.mk"
.include "../../textproc/xerces-c/buildlink3.mk"
diff -r a5349c56627a -r fe93a213c6e8 textproc/libkolabxml/buildlink3.mk
--- a/textproc/libkolabxml/buildlink3.mk Sun Mar 21 19:24:24 2021 +0000
+++ b/textproc/libkolabxml/buildlink3.mk Sun Mar 21 19:32:45 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2021/03/19 22:17:02 markd Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2021/03/21 19:32:45 markd Exp $
BUILDLINK_TREE+= libkolabxml
@@ -8,6 +8,9 @@
BUILDLINK_API_DEPENDS.libkolabxml+= libkolabxml>=1.1.6
BUILDLINK_PKGSRCDIR.libkolabxml?= ../../textproc/libkolabxml
+.include "../../devel/boost-libs/buildlink3.mk"
+.include "../../textproc/xerces-c/buildlink3.mk"
+.include "../../www/curl/buildlink3.mk"
.endif # LIBKOLABXML_BUILDLINK3_MK
BUILDLINK_TREE+= -libkolabxml
diff -r a5349c56627a -r fe93a213c6e8 textproc/libkolabxml/distinfo
--- a/textproc/libkolabxml/distinfo Sun Mar 21 19:24:24 2021 +0000
+++ b/textproc/libkolabxml/distinfo Sun Mar 21 19:32:45 2021 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.1 2021/03/19 22:17:02 markd Exp $
+$NetBSD: distinfo,v 1.2 2021/03/21 19:32:45 markd Exp $
SHA1 (libkolabxml-1.1.6.tar.gz) = 51c07082b48d5b32e6e9620dc212b6717acf45dd
RMD160 (libkolabxml-1.1.6.tar.gz) = a404e9648b9b1d858ff6732fbe84e54c8eaa94eb
SHA512 (libkolabxml-1.1.6.tar.gz) = ae74a9276cad2840db09ae9f9178991eb22137a13f83c04dd2fb7513407f2a5e6b7c79d71de80ced786457f1d3c8b5229226aecd8ea139f0af7125268aff4121
Size (libkolabxml-1.1.6.tar.gz) = 128843 bytes
+SHA1 (patch-CMakeLists.txt) = 3f3e9c0eb0765b140db3bf6243a5eae608b76d28
diff -r a5349c56627a -r fe93a213c6e8 textproc/libkolabxml/patches/patch-CMakeLists.txt
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/textproc/libkolabxml/patches/patch-CMakeLists.txt Sun Mar 21 19:32:45 2021 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2021/03/21 19:32:45 markd Exp $
+
+Don't use a relative path - confuses wrappers.
+
+--- CMakeLists.txt.orig 2016-09-02 08:50:26.000000000 +0000
++++ CMakeLists.txt
+@@ -202,7 +202,8 @@ endif()
+ #Get the include directory relative to CMAKECONFIG_INSTALL_DIR
+ file(RELATIVE_PATH REL_INCLUDE_DIR "${CMAKECONFIG_INSTALL_DIR}" "${INCLUDE_INSTALL_DIR}")
+ #Assemble the full relative path. This will be used in the LibkolabxmlConfig.cmake, which will be installed in CMAKECONFIG_INSTALL_DIR
+-set(CONF_INCLUDE_DIRS "\${Libkolabxml_CMAKE_DIR}/${REL_INCLUDE_DIR}")
++#set(CONF_INCLUDE_DIRS "\${Libkolabxml_CMAKE_DIR}/${REL_INCLUDE_DIR}")
++set(CONF_INCLUDE_DIRS "${INCLUDE_INSTALL_DIR}")
+
+ install(EXPORT LibkolabxmlExport DESTINATION ${CMAKECONFIG_INSTALL_DIR} FILE LibkolabxmlTargets.cmake )
+
Home |
Main Index |
Thread Index |
Old Index