Received: by mail.netbsd.org (Postfix, from userid 605) id CBD2484D7C; Sat, 27 Oct 2018 11:46:06 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id CAD7E84D79 for ; Sat, 27 Oct 2018 11:46:05 +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 vor3NGOL7UU0 for ; Sat, 27 Oct 2018 11:46:05 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 2F11E84CD9 for ; Sat, 27 Oct 2018 11:46:05 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 1A181FBEE; Sat, 27 Oct 2018 11:46:05 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1540640765267960" MIME-Version: 1.0 Date: Sat, 27 Oct 2018 11:46:05 +0000 From: "Matthias Scheler" Subject: CVS commit: pkgsrc/sysutils/lsof To: pkgsrc-changes@NetBSD.org Reply-To: tron@netbsd.org X-Mailer: log_accum Message-Id: <20181027114605.1A181FBEE@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1540640765267960 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: tron Date: Sat Oct 27 11:46:05 UTC 2018 Modified Files: pkgsrc/sysutils/lsof: Makefile Log Message: lsof: Use "bsdtar" instead of "gtar" during build Remove unnecessary complex logic for optionally using "pax" as well To generate a diff of this commit: cvs rdiff -u -r1.127 -r1.128 pkgsrc/sysutils/lsof/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1540640765267960 Content-Disposition: inline Content-Length: 1788 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/sysutils/lsof/Makefile diff -u pkgsrc/sysutils/lsof/Makefile:1.127 pkgsrc/sysutils/lsof/Makefile:1.128 --- pkgsrc/sysutils/lsof/Makefile:1.127 Wed Aug 22 09:46:35 2018 +++ pkgsrc/sysutils/lsof/Makefile Sat Oct 27 11:46:04 2018 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.127 2018/08/22 09:46:35 wiz Exp $ +# $NetBSD: Makefile,v 1.128 2018/10/27 11:46:04 tron Exp $ DISTNAME= lsof_4.89 PKGNAME= ${DISTNAME:S/_/-/} @@ -21,6 +21,7 @@ CONFIGURE_ARGS+= -n ${LOWER_OPSYS} CONFIGURE_ENV+= LSOF_CC="${CC} ${CFLAGS}" MAKE_FLAGS+= LSOF_BLDCMT="NetBSD pkgsrc rocks!" OSVERSION_SPECIFIC= yes +EXTRACT_USING= bsdtar TMPWRK= ${WRKDIR}/${DISTNAME} SRCBALL_NAME= ${DISTNAME}_src @@ -31,7 +32,7 @@ REPLACE_PERL+= scripts/sort_res.perl5 sc scripts/idrlogin.perl5 scripts/count_pf.perl \ scripts/idrlogin.perl scripts/list_fields.perl \ scripts/watch_a_file.perl -USE_TOOLS+= gtar pax perl:run +USE_TOOLS+= perl:run TEST_DIRS= tests TEST_TARGET= test @@ -62,7 +63,7 @@ post-extract: exit 1 ; \ fi) .endif - @(cd ${TMPWRK} ; \ + @cd ${TMPWRK} ; \ EXPMD5=`${GREP} 'MD5 (' README.${DISTNAME} | ${SED} 's/^[ ]*//'` ; \ CALCMD5=`${DIGEST} MD5 ${SRCBALL_NAME}.tar` ; \ if [ "$${EXPMD5}"X != "$${CALCMD5}"X ]; then \ @@ -70,12 +71,8 @@ post-extract: ${ECHO} "($$EXPMD5 != $$CALCMD5)" ; \ exit 1 ; \ fi ; \ - if [ X${EXTRACT_USING} = Xgtar ]; then \ - ${GTAR} -xf ${SRCBALL_NAME}.tar; \ - else \ - pax -O -r < ${SRCBALL_NAME}.tar; \ - fi) - @( cd ${WRKSRC} ; ${ECHO} "y" | ./Inventory || exit 1 ) + ${TOOLS_PATH.bsdtar} -xf ${SRCBALL_NAME}.tar + @cd ${WRKSRC} ; ${ECHO} "y" | ./Inventory || exit 1 INSTALLATION_DIRS+= sbin ${PKGMANDIR}/man8 share/lsof SPECIAL_PERMS+= ${PREFIX}/sbin/lsof ${REAL_ROOT_USER} ${REAL_GROUP} 2755 --_----------=_1540640765267960--