Received: by mail.netbsd.org (Postfix, from userid 605) id AC0FB84F10; Thu, 18 Jan 2024 18:04:13 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id DAD2684F0D for ; Thu, 18 Jan 2024 18:04:12 +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 2tuRaLKcJTpo for ; Thu, 18 Jan 2024 18:04:12 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 5AF0F84F0C for ; Thu, 18 Jan 2024 18:04:12 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 50E19FA42; Thu, 18 Jan 2024 18:04:12 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_170560105218810" MIME-Version: 1.0 Date: Thu, 18 Jan 2024 18:04:12 +0000 From: "Adam Ciarcinski" Subject: CVS commit: pkgsrc/archivers/bsdtar To: pkgsrc-changes@NetBSD.org Reply-To: adam@netbsd.org X-Mailer: log_accum Message-Id: <20240118180412.50E19FA42@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_170560105218810 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: adam Date: Thu Jan 18 18:04:12 UTC 2024 Modified Files: pkgsrc/archivers/bsdtar: Makefile Log Message: bsdtar: apply pkglint suggestions To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 pkgsrc/archivers/bsdtar/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_170560105218810 Content-Disposition: inline Content-Length: 1891 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/archivers/bsdtar/Makefile diff -u pkgsrc/archivers/bsdtar/Makefile:1.28 pkgsrc/archivers/bsdtar/Makefile:1.29 --- pkgsrc/archivers/bsdtar/Makefile:1.28 Mon Oct 11 20:27:50 2021 +++ pkgsrc/archivers/bsdtar/Makefile Thu Jan 18 18:04:12 2024 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2021/10/11 20:27:50 jperkin Exp $ +# $NetBSD: Makefile,v 1.29 2024/01/18 18:04:12 adam Exp $ .include "../../archivers/libarchive/Makefile.common" .include "../../mk/bsd.prefs.mk" @@ -24,20 +24,20 @@ CHECK_BUILTIN.openssl:= yes .include "../../security/openssl/builtin.mk" CHECK_BUILTIN.openssl:= no -.if empty(USE_BUILTIN.bzip2:M[yY][eE][sS]) +.if ${USE_BUILTIN.bzip2:tl} != yes CPPFLAGS+= -I${WRKDIR}/bzip2 LDFLAGS+= -L${WRKDIR}/bzip2 .endif -.if empty(USE_BUILTIN.zlib:M[yY][eE][sS]) +.if ${USE_BUILTIN.zlib:tl} != yes CPPFLAGS+= -I${WRKDIR}/zlib LDFLAGS+= -L${WRKDIR}/zlib .endif -.if empty(USE_BUILTIN.openssl:M[yY][eE][sS]) +.if ${USE_BUILTIN.openssl:tl} != yes CONFIGURE_ARGS+= --without-openssl .else LDFLAGS+= -lcrypto .endif -.if empty(USE_BUILTIN.xz:M[yY][eE][sS]) +.if ${USE_BUILTIN.xz:tl} != yes CONFIGURE_ARGS+= --without-lzma .endif @@ -57,19 +57,19 @@ CONFIGURE_ENV+= ac_cv_header_windows_h= .endif do-extract: -.if empty(USE_BUILTIN.bzip2:M[yY][eE][sS]) +.if ${USE_BUILTIN.bzip2:tl} != yes ${RUN}${CP} -R ${FILESDIR.bzip2} ${WRKDIR}/bzip2 .endif -.if empty(USE_BUILTIN.zlib:M[yY][eE][sS]) +.if ${USE_BUILTIN.zlib:tl} != yes ${RUN}${CP} -R ${FILESDIR.zlib} ${WRKDIR}/zlib .endif ${RUN}${CP} -R ${FILESDIR.libarchive} ${WRKSRC} pre-configure: -.if empty(USE_BUILTIN.bzip2:M[yY][eE][sS]) +.if ${USE_BUILTIN.bzip2:tl} != yes cd ${WRKDIR}/bzip2 && ${BUILD_MAKE_CMD} libbz2.a .endif -.if empty(USE_BUILTIN.zlib:M[yY][eE][sS]) +.if ${USE_BUILTIN.zlib:tl} != yes cd ${WRKDIR}/zlib && ${BUILD_MAKE_CMD} libz.a .endif --_----------=_170560105218810--