Re: CVS commit: pkgsrc/devel/kdoctools

[Thomas Klausner <wiz%NetBSD.org@localhost>]

On Wed, Jun 16, 2021 at 08:51:10AM -0400, Greg Troxel wrote:
> 
> "Mark Davies" <markd%netbsd.org@localhost> writes:
> 
> > Module Name:        pkgsrc
> > Committed By:       markd
> > Date:               Wed Jun 16 12:48:12 UTC 2021
> >
> > Modified Files:
> >     pkgsrc/devel/kdoctools: buildlink3.mk
> >
> > Log Message:
> > kdoctools: buildlink share/kf5/kdoctools/customization/*.xsl files.
> >
> > needed for latest cmake.
> 
> Do you mean that it is needed for 3.20.4, but was not needed for a
> 3.20.x < 4 that was in pkgsrc before the freeze?

No, I'm pretty sure it's needed since this commit.
 Thomas

--- Begin Message ---

• To: pkgsrc-changes%NetBSD.org@localhost
• Subject: CVS commit: pkgsrc/mk/buildlink3
• From: "Manuel Bouyer" <bouyer%netbsd.org@localhost>
• Date: Tue, 8 Jun 2021 10:10:02 +0000

Module Name:    pkgsrc
Committed By:   bouyer
Date:           Tue Jun  8 10:10:02 UTC 2021

Modified Files:
        pkgsrc/mk/buildlink3: bsd.buildlink3.mk

Log Message:
Explicitely include lib/cmake/ and share/cmake/ in the
BUILDLINK_CONTENTS_FILTER, as discussed on tech-pkg on may 26 and 27.
Fix an issue with www/libwebsockets/buildink3.mk where some cmake files
are missing from the .buildlink dir, causing config failure in consumer
packages.


To generate a diff of this commit:
cvs rdiff -u -r1.246 -r1.247 pkgsrc/mk/buildlink3/bsd.buildlink3.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mk/buildlink3/bsd.buildlink3.mk
diff -u pkgsrc/mk/buildlink3/bsd.buildlink3.mk:1.246 pkgsrc/mk/buildlink3/bsd.buildlink3.mk:1.247
--- pkgsrc/mk/buildlink3/bsd.buildlink3.mk:1.246        Wed Jul  1 09:13:13 2020
+++ pkgsrc/mk/buildlink3/bsd.buildlink3.mk      Tue Jun  8 10:10:02 2021
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink3.mk,v 1.246 2020/07/01 09:13:13 rillig Exp $
+# $NetBSD: bsd.buildlink3.mk,v 1.247 2021/06/08 10:10:02 bouyer Exp $
 #
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -640,7 +640,7 @@ buildlink-${_pkg_}-cookie:
        ${TOUCH} ${TOUCH_FLAGS} ${_BLNK_COOKIE.${_pkg_}}
 
 BUILDLINK_CONTENTS_FILTER.${_pkg_}?=                                   \
-       ${EGREP} '(include.*/|\.h$$|\.idl$$|\.pc$$|/lib[^/]*\.[^/]*$$)'
+       ${EGREP} '(include.*/|\.h$$|\.idl$$|\.pc$$|/lib[^/]*\.[^/]*$$|lib/cmake/|share/cmake/)'
 # XXX: Why not pkg_info -qL?
 BUILDLINK_FILES_CMD.${_pkg_}?=                                         \
        ${_BLNK_PKG_INFO.${_pkg_}} -f ${BUILDLINK_PKGNAME.${_pkg_}} |   \

--- End Message ---