CVS commit: pkgsrc

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Feb 18 11:26:48 UTC 2025

Modified Files:
        pkgsrc/bootstrap: bootstrap
        pkgsrc/pkgtools/pkg_install: Makefile

Log Message:
libarchive: Fix build on Cygwin

The default --with-cng ends up including the wrong bcrypt.h from w32api.

>From jperkin@drecklypkg commit d3224759f7ddee6521e3443de51a128acc52e493


To generate a diff of this commit:
cvs rdiff -u -r1.325 -r1.326 pkgsrc/bootstrap/bootstrap
cvs rdiff -u -r1.242 -r1.243 pkgsrc/pkgtools/pkg_install/Makefile

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

Modified files:

Index: pkgsrc/bootstrap/bootstrap
diff -u pkgsrc/bootstrap/bootstrap:1.325 pkgsrc/bootstrap/bootstrap:1.326
--- pkgsrc/bootstrap/bootstrap:1.325    Mon Apr 29 12:37:25 2024
+++ pkgsrc/bootstrap/bootstrap  Tue Feb 18 11:26:48 2025
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: bootstrap,v 1.325 2024/04/29 12:37:25 jperkin Exp $
+# $NetBSD: bootstrap,v 1.326 2025/02/18 11:26:48 wiz Exp $
 #
 # Copyright (c) 2001-2011 Alistair Crooks <agc%NetBSD.org@localhost>
 # All rights reserved.
@@ -1371,7 +1371,7 @@ $shprog ./configure $configure_quiet_fla
 --disable-posix-regex-lib --disable-xattr --disable-maintainer-mode \
 --disable-acl --without-zlib --without-bz2lib --without-iconv --without-lzma \
 --without-lzo2 --without-lz4 --without-nettle --without-openssl \
---without-xml2 --without-expat --without-zstd \
+--without-xml2 --without-expat --without-zstd --without-cng \
 MAKE=$bmake && $bmake $make_quiet_flags -j$make_jobs)"
 copy_src $pkgsrcdir/pkgtools/pkg_install/files pkg_install
 run_cmd "(cd $wrkdir/pkg_install; env $BSTRAP_ENV \

Index: pkgsrc/pkgtools/pkg_install/Makefile
diff -u pkgsrc/pkgtools/pkg_install/Makefile:1.242 pkgsrc/pkgtools/pkg_install/Makefile:1.243
--- pkgsrc/pkgtools/pkg_install/Makefile:1.242  Thu Feb 13 02:31:05 2025
+++ pkgsrc/pkgtools/pkg_install/Makefile        Tue Feb 18 11:26:48 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.242 2025/02/13 02:31:05 pho Exp $
+# $NetBSD: Makefile,v 1.243 2025/02/18 11:26:48 wiz Exp $
 
 # Notes to package maintainers:
 #
@@ -201,7 +201,7 @@ pre-configure:
                --disable-bsdunzip --disable-shared                     \
                --disable-dependency-tracking --disable-maintainer-mode \
                --without-expat --without-xml2 --without-lz4 --without-lzo2 \
-               --without-iconv --without-nettle --without-zstd         \
+               --without-iconv --without-nettle --without-zstd --without-cng \
                ${LIBARCHIVE_CONFIGURE_ARGS}
        cd ${WRKDIR}/libarchive && ${BUILD_MAKE_CMD}
 .endif