Thu Feb 15 19:43:42 2024 UTC (101d)
Don't build bsdunzip, it's not used anyway.


(joerg)
diff -r1.30 -r1.31 pkgsrc/archivers/bsdtar/Makefile
diff -r1.320 -r1.321 pkgsrc/bootstrap/bootstrap
cvs diff -r1.30 -r1.31 pkgsrc/archivers/bsdtar/Makefile (expand / switch to unified diff)

--- pkgsrc/archivers/bsdtar/Makefile 2024/02/15 04:34:21 1.30
+++ pkgsrc/archivers/bsdtar/Makefile 2024/02/15 19:43:42 1.31
@@ -1,26 +1,27 @@ @@ -1,26 +1,27 @@
1# $NetBSD: Makefile,v 1.30 2024/02/15 04:34:21 gutteridge Exp $ 1# $NetBSD: Makefile,v 1.31 2024/02/15 19:43:42 joerg Exp $
2 2
3.include "../../archivers/libarchive/Makefile.common" 3.include "../../archivers/libarchive/Makefile.common"
4.include "../../mk/bsd.prefs.mk" 4.include "../../mk/bsd.prefs.mk"
5 5
6PKGNAME= ${DISTNAME:S/libarchive/bsdtar/} 6PKGNAME= ${DISTNAME:S/libarchive/bsdtar/}
7COMMENT= Fast multi-format tape archiver 7COMMENT= Fast multi-format tape archiver
8 8
9# Explicitly do not depend on libtool as this can be used 9# Explicitly do not depend on libtool as this can be used
10# as bootstrap dependency. 10# as bootstrap dependency.
11#USE_LIBTOOL= yes 11#USE_LIBTOOL= yes
12CONFIGURE_ARGS+= --enable-bsdtar=static 12CONFIGURE_ARGS+= --enable-bsdtar=static
13CONFIGURE_ARGS+= --disable-bsdcpio 13CONFIGURE_ARGS+= --disable-bsdcpio
 14CONFIGURE_ARGS+= --disable-bsdunzip
14CONFIGURE_ARGS+= --disable-shared 15CONFIGURE_ARGS+= --disable-shared
15CONFIGURE_ARGS+= --without-iconv 16CONFIGURE_ARGS+= --without-iconv
16.if "${OS_VARIANT}" == "chromeos" 17.if "${OS_VARIANT}" == "chromeos"
17CONFIGURE_ARGS+= --disable-acl 18CONFIGURE_ARGS+= --disable-acl
18.endif 19.endif
19 20
20.include "../../archivers/bzip2/builtin.mk" 21.include "../../archivers/bzip2/builtin.mk"
21.include "../../archivers/xz/builtin.mk" 22.include "../../archivers/xz/builtin.mk"
22.include "../../devel/zlib/builtin.mk" 23.include "../../devel/zlib/builtin.mk"
23CHECK_BUILTIN.openssl:= yes 24CHECK_BUILTIN.openssl:= yes
24.include "../../security/openssl/builtin.mk" 25.include "../../security/openssl/builtin.mk"
25CHECK_BUILTIN.openssl:= no 26CHECK_BUILTIN.openssl:= no
26 27
cvs diff -r1.320 -r1.321 pkgsrc/bootstrap/bootstrap (expand / switch to unified diff)

--- pkgsrc/bootstrap/bootstrap 2023/07/07 12:53:22 1.320
+++ pkgsrc/bootstrap/bootstrap 2024/02/15 19:43:42 1.321
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1#! /bin/sh 1#! /bin/sh
2 2
3# $NetBSD: bootstrap,v 1.320 2023/07/07 12:53:22 gdt Exp $ 3# $NetBSD: bootstrap,v 1.321 2024/02/15 19:43:42 joerg Exp $
4# 4#
5# Copyright (c) 2001-2011 Alistair Crooks <agc@NetBSD.org> 5# Copyright (c) 2001-2011 Alistair Crooks <agc@NetBSD.org>
6# All rights reserved. 6# All rights reserved.
7# 7#
8# Redistribution and use in source and binary forms, with or without 8# Redistribution and use in source and binary forms, with or without
9# modification, are permitted provided that the following conditions 9# modification, are permitted provided that the following conditions
10# are met: 10# are met:
11# 1. Redistributions of source code must retain the above copyright 11# 1. Redistributions of source code must retain the above copyright
12# notice, this list of conditions and the following disclaimer. 12# notice, this list of conditions and the following disclaimer.
13# 2. Redistributions in binary form must reproduce the above copyright 13# 2. Redistributions in binary form must reproduce the above copyright
14# notice, this list of conditions and the following disclaimer in the 14# notice, this list of conditions and the following disclaimer in the
15# documentation and/or other materials provided with the distribution. 15# documentation and/or other materials provided with the distribution.
16# 16#
@@ -1345,29 +1345,29 @@ yes) echo_msg "Bootstrapping sed" @@ -1345,29 +1345,29 @@ yes) echo_msg "Bootstrapping sed"
1345 fi 1345 fi
1346 ;; 1346 ;;
1347esac 1347esac
1348 1348
1349# bootstrap pkg_install 1349# bootstrap pkg_install
1350extra_libarchive_depends() { 1350extra_libarchive_depends() {
1351 $sedprog -n -e 's/Libs.private: //p' $wrkdir/libarchive/build/pkgconfig/libarchive.pc 1351 $sedprog -n -e 's/Libs.private: //p' $wrkdir/libarchive/build/pkgconfig/libarchive.pc
1352} 1352}
1353 1353
1354echo_msg "Bootstrapping pkgtools" 1354echo_msg "Bootstrapping pkgtools"
1355copy_src $pkgsrcdir/archivers/libarchive/files libarchive 1355copy_src $pkgsrcdir/archivers/libarchive/files libarchive
1356run_cmd "(cd $wrkdir/libarchive; env $BSTRAP_ENV CONFIG_SHELL=$shprog \ 1356run_cmd "(cd $wrkdir/libarchive; env $BSTRAP_ENV CONFIG_SHELL=$shprog \
1357$shprog ./configure $configure_quiet_flags --enable-static --disable-shared \ 1357$shprog ./configure $configure_quiet_flags --enable-static --disable-shared \
1358--disable-bsdtar --disable-bsdcpio --disable-posix-regex-lib --disable-xattr \ 1358--disable-bsdtar --disable-bsdcpio --disable-bsdunzip --disable-posix-regex-lib \
1359--disable-maintainer-mode --disable-acl --without-zlib --without-bz2lib \ 1359--disable-xattr --disable-maintainer-mode --disable-acl --without-zlib \
1360--without-iconv --without-lzma --without-lzo2 --without-lz4 \ 1360--without-bz2lib --without-iconv --without-lzma --without-lzo2 --without-lz4 \
1361--without-nettle --without-openssl --without-xml2 --without-expat --without-zstd \ 1361--without-nettle --without-openssl --without-xml2 --without-expat --without-zstd \
1362MAKE=$bmake && $bmake $make_quiet_flags -j$make_jobs)" 1362MAKE=$bmake && $bmake $make_quiet_flags -j$make_jobs)"
1363copy_src $pkgsrcdir/pkgtools/pkg_install/files pkg_install 1363copy_src $pkgsrcdir/pkgtools/pkg_install/files pkg_install
1364run_cmd "(cd $wrkdir/pkg_install; env $BSTRAP_ENV \ 1364run_cmd "(cd $wrkdir/pkg_install; env $BSTRAP_ENV \
1365CPPFLAGS='$CPPFLAGS -I${wrkdir}/libnbcompat -I${wrkdir}/libarchive/libarchive' \ 1365CPPFLAGS='$CPPFLAGS -I${wrkdir}/libnbcompat -I${wrkdir}/libarchive/libarchive' \
1366LDFLAGS='$LDFLAGS -L${wrkdir}/libnbcompat' \ 1366LDFLAGS='$LDFLAGS -L${wrkdir}/libnbcompat' \
1367LIBS='$LIBS -lnbcompat' $shprog ./configure $configure_quiet_flags -C \ 1367LIBS='$LIBS -lnbcompat' $shprog ./configure $configure_quiet_flags -C \
1368--enable-bootstrap --prefix=$prefix --sysconfdir=$sysconfdir \ 1368--enable-bootstrap --prefix=$prefix --sysconfdir=$sysconfdir \
1369--with-pkgdbdir=$pkgdbdir --infodir=$infodir \ 1369--with-pkgdbdir=$pkgdbdir --infodir=$infodir \
1370--mandir=$mandir $pkg_install_args && \ 1370--mandir=$mandir $pkg_install_args && \
1371STATIC_LIBARCHIVE=$wrkdir/libarchive/.libs/libarchive.a \ 1371STATIC_LIBARCHIVE=$wrkdir/libarchive/.libs/libarchive.a \
1372STATIC_LIBARCHIVE_LDADD='`extra_libarchive_depends`' \ 1372STATIC_LIBARCHIVE_LDADD='`extra_libarchive_depends`' \
1373PKGSRC_MACHINE_ARCH="$machine_arch" $bmake $make_quiet_flags -j$make_jobs)" 1373PKGSRC_MACHINE_ARCH="$machine_arch" $bmake $make_quiet_flags -j$make_jobs)"