Received: by mail.netbsd.org (Postfix, from userid 605) id 58F8384D2C; Sun, 21 Mar 2021 19:32:47 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 918EA84D22 for ; Sun, 21 Mar 2021 19:32:46 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id iatCZTRXMwmN for ; Sun, 21 Mar 2021 19:32:46 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id E4C1A84CDB for ; Sun, 21 Mar 2021 19:32:45 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id D98E9FA95; Sun, 21 Mar 2021 19:32:45 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1616355165199060" MIME-Version: 1.0 Date: Sun, 21 Mar 2021 19:32:45 +0000 From: "Mark Davies" Subject: CVS commit: pkgsrc/textproc/libkolabxml To: pkgsrc-changes@NetBSD.org Reply-To: markd@netbsd.org X-Mailer: log_accum Message-Id: <20210321193245.D98E9FA95@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1616355165199060 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: markd Date: Sun Mar 21 19:32:45 UTC 2021 Modified Files: pkgsrc/textproc/libkolabxml: Makefile buildlink3.mk distinfo Added Files: pkgsrc/textproc/libkolabxml/patches: patch-CMakeLists.txt Log Message: libkolabxml: cleanup installed cmake files To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 pkgsrc/textproc/libkolabxml/Makefile \ pkgsrc/textproc/libkolabxml/buildlink3.mk \ pkgsrc/textproc/libkolabxml/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/textproc/libkolabxml/patches/patch-CMakeLists.txt Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1616355165199060 Content-Disposition: inline Content-Length: 3804 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/textproc/libkolabxml/Makefile diff -u pkgsrc/textproc/libkolabxml/Makefile:1.1 pkgsrc/textproc/libkolabxml/Makefile:1.2 --- pkgsrc/textproc/libkolabxml/Makefile:1.1 Fri Mar 19 22:17:02 2021 +++ pkgsrc/textproc/libkolabxml/Makefile Sun Mar 21 19:32:45 2021 @@ -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 @@ USE_TOOLS+= gmake 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" Index: pkgsrc/textproc/libkolabxml/buildlink3.mk diff -u pkgsrc/textproc/libkolabxml/buildlink3.mk:1.1 pkgsrc/textproc/libkolabxml/buildlink3.mk:1.2 --- pkgsrc/textproc/libkolabxml/buildlink3.mk:1.1 Fri Mar 19 22:17:02 2021 +++ pkgsrc/textproc/libkolabxml/buildlink3.mk Sun Mar 21 19:32:45 2021 @@ -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 @@ LIBKOLABXML_BUILDLINK3_MK:= 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 Index: pkgsrc/textproc/libkolabxml/distinfo diff -u pkgsrc/textproc/libkolabxml/distinfo:1.1 pkgsrc/textproc/libkolabxml/distinfo:1.2 --- pkgsrc/textproc/libkolabxml/distinfo:1.1 Fri Mar 19 22:17:02 2021 +++ pkgsrc/textproc/libkolabxml/distinfo Sun Mar 21 19:32:45 2021 @@ -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 Added files: Index: pkgsrc/textproc/libkolabxml/patches/patch-CMakeLists.txt diff -u /dev/null pkgsrc/textproc/libkolabxml/patches/patch-CMakeLists.txt:1.1 --- /dev/null Sun Mar 21 19:32:45 2021 +++ pkgsrc/textproc/libkolabxml/patches/patch-CMakeLists.txt Sun Mar 21 19:32:45 2021 @@ -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 ) + --_----------=_1616355165199060--