CVS commit: pkgsrc/archivers/bsdtar

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

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.

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