Sun Mar 21 19:32:45 2021 UTC ()
libkolabxml: cleanup installed cmake files


(markd)
diff -r1.1 -r1.2 pkgsrc/textproc/libkolabxml/Makefile
diff -r1.1 -r1.2 pkgsrc/textproc/libkolabxml/buildlink3.mk
diff -r1.1 -r1.2 pkgsrc/textproc/libkolabxml/distinfo
diff -r0 -r1.1 pkgsrc/textproc/libkolabxml/patches/patch-CMakeLists.txt
cvs diff -r1.1 -r1.2 pkgsrc/textproc/libkolabxml/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/libkolabxml/Makefile 2021/03/19 22:17:02 1.1
+++ pkgsrc/textproc/libkolabxml/Makefile 2021/03/21 19:32:45 1.2
@@ -1,22 +1,28 @@ @@ -1,22 +1,28 @@
1# $NetBSD: Makefile,v 1.1 2021/03/19 22:17:02 markd Exp $ 1# $NetBSD: Makefile,v 1.2 2021/03/21 19:32:45 markd Exp $
2 2
3DISTNAME= libkolabxml-1.1.6 3DISTNAME= libkolabxml-1.1.6
 4PKGREVISION= 1
4CATEGORIES= textproc 5CATEGORIES= textproc
5MASTER_SITES= https://mirror.kolabenterprise.com/pub/releases/ 6MASTER_SITES= https://mirror.kolabenterprise.com/pub/releases/
6 7
7MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= https://www.kolab.org/ 9HOMEPAGE= https://www.kolab.org/
9COMMENT= Kolab XML Format Schema Definitions Library 10COMMENT= Kolab XML Format Schema Definitions Library
10LICENSE= apache-2.0 AND gnu-lgpl-v3 11LICENSE= apache-2.0 AND gnu-lgpl-v3
11 12
12USE_LANGUAGES= c c++ 13USE_LANGUAGES= c c++
13USE_CMAKE= yes 14USE_CMAKE= yes
14USE_TOOLS+= gmake 15USE_TOOLS+= gmake
15 16
16CMAKE_ARGS+= -DBUILD_TESTS=OFF 17CMAKE_ARGS+= -DBUILD_TESTS=OFF
17 18
 19SUBST_CLASSES+= pathes
 20SUBST_STAGE.pathes= post-install
 21SUBST_FILES.pathes= ${DESTDIR}${PREFIX}/lib/cmake/Libkolabxml/LibkolabxmlTargets-noconfig.cmake
 22SUBST_SED.pathes= -e "s,${BUILDLINK_DIR},${PREFIX},g"
 23
18.include "../../devel/boost-libs/buildlink3.mk" 24.include "../../devel/boost-libs/buildlink3.mk"
19.include "../../devel/xsd/buildlink3.mk" 25.include "../../devel/xsd/buildlink3.mk"
20.include "../../textproc/xerces-c/buildlink3.mk" 26.include "../../textproc/xerces-c/buildlink3.mk"
21.include "../../www/curl/buildlink3.mk" 27.include "../../www/curl/buildlink3.mk"
22.include "../../mk/bsd.pkg.mk" 28.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1 -r1.2 pkgsrc/textproc/libkolabxml/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/textproc/libkolabxml/buildlink3.mk 2021/03/19 22:17:02 1.1
+++ pkgsrc/textproc/libkolabxml/buildlink3.mk 2021/03/21 19:32:45 1.2
@@ -1,13 +1,16 @@ @@ -1,13 +1,16 @@
1# $NetBSD: buildlink3.mk,v 1.1 2021/03/19 22:17:02 markd Exp $ 1# $NetBSD: buildlink3.mk,v 1.2 2021/03/21 19:32:45 markd Exp $
2 2
3BUILDLINK_TREE+= libkolabxml 3BUILDLINK_TREE+= libkolabxml
4 4
5.if !defined(LIBKOLABXML_BUILDLINK3_MK) 5.if !defined(LIBKOLABXML_BUILDLINK3_MK)
6LIBKOLABXML_BUILDLINK3_MK:= 6LIBKOLABXML_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.libkolabxml+= libkolabxml>=1.1.6 8BUILDLINK_API_DEPENDS.libkolabxml+= libkolabxml>=1.1.6
9BUILDLINK_PKGSRCDIR.libkolabxml?= ../../textproc/libkolabxml 9BUILDLINK_PKGSRCDIR.libkolabxml?= ../../textproc/libkolabxml
10 10
 11.include "../../devel/boost-libs/buildlink3.mk"
 12.include "../../textproc/xerces-c/buildlink3.mk"
 13.include "../../www/curl/buildlink3.mk"
11.endif # LIBKOLABXML_BUILDLINK3_MK 14.endif # LIBKOLABXML_BUILDLINK3_MK
12 15
13BUILDLINK_TREE+= -libkolabxml 16BUILDLINK_TREE+= -libkolabxml
cvs diff -r1.1 -r1.2 pkgsrc/textproc/libkolabxml/distinfo (expand / switch to unified diff)

--- pkgsrc/textproc/libkolabxml/distinfo 2021/03/19 22:17:02 1.1
+++ pkgsrc/textproc/libkolabxml/distinfo 2021/03/21 19:32:45 1.2
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.1 2021/03/19 22:17:02 markd Exp $ 1$NetBSD: distinfo,v 1.2 2021/03/21 19:32:45 markd Exp $
2 2
3SHA1 (libkolabxml-1.1.6.tar.gz) = 51c07082b48d5b32e6e9620dc212b6717acf45dd 3SHA1 (libkolabxml-1.1.6.tar.gz) = 51c07082b48d5b32e6e9620dc212b6717acf45dd
4RMD160 (libkolabxml-1.1.6.tar.gz) = a404e9648b9b1d858ff6732fbe84e54c8eaa94eb 4RMD160 (libkolabxml-1.1.6.tar.gz) = a404e9648b9b1d858ff6732fbe84e54c8eaa94eb
5SHA512 (libkolabxml-1.1.6.tar.gz) = ae74a9276cad2840db09ae9f9178991eb22137a13f83c04dd2fb7513407f2a5e6b7c79d71de80ced786457f1d3c8b5229226aecd8ea139f0af7125268aff4121 5SHA512 (libkolabxml-1.1.6.tar.gz) = ae74a9276cad2840db09ae9f9178991eb22137a13f83c04dd2fb7513407f2a5e6b7c79d71de80ced786457f1d3c8b5229226aecd8ea139f0af7125268aff4121
6Size (libkolabxml-1.1.6.tar.gz) = 128843 bytes 6Size (libkolabxml-1.1.6.tar.gz) = 128843 bytes
 7SHA1 (patch-CMakeLists.txt) = 3f3e9c0eb0765b140db3bf6243a5eae608b76d28
File Added: pkgsrc/textproc/libkolabxml/patches/patch-CMakeLists.txt
$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 )