From nobody Fri Feb 24 06:51:19 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PNLCC50Mqz3tc2b; Fri, 24 Feb 2023 06:51:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PNLCC4TwJz4ksk; Fri, 24 Feb 2023 06:51:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677221479; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cP74KrBMVJtxdVrI84poR4QLxqcuO+kghXg8ALD7B3U=; b=O83SNRmZn0af3IwwEuz83WESw3tppR1au0mpDEhAFZv3pKllK8NtYWmkpCaOur7mH+bsbV hq/LvisfjEY9vxDiNS8IetaVr78aWjjg6Df+WreFqPHJY6RVB9ejVI5BjhCE2ftt/0TvQL 0R0l5OgRJ9WqovqH5nT99a3uqRZplsMGaqnX31HNCvmlAXDRAsUWDbrBcnaLUwEfNdjiMV 8dwumLSA3WpMC0QS8MginAk8Fs2bAt/SUqXlpRhMOOfY5bo5ZbzHh7Hv7iUajftI6ZL5du RTNWra4qyaNSkBUWpU7KPpH0qbOZ+QD91Q/2M7RIiFhoWwc3LMUfsBP3deq35Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677221479; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cP74KrBMVJtxdVrI84poR4QLxqcuO+kghXg8ALD7B3U=; b=PM0fLHTSryNluHi9myKIuOfEvIeOReNzpCVW2wR/cgBsyZBe98dVfwlbgF/cFcAVyVMn3a cVXS61q6V+cbKHctkvmBmV2o7ED0bni/dBiy/Ik5KbvtIUhUwWhUojdQqwp15lFjckeIVe QA2C6O7j5yZAGLf5EyvjYNe2BgcM3mm6qXyRG+/7kij1XfD4pp+oFw/ghE0aeskyR3oJpG m83F3TuFiNv6bdMk3Rqhmd4uBTahxE+N2VO85r0o4HXc+bKxk3Q9tk51iYnpKPE3QkwXs4 zzsKXYPnf0mbFtMF/CkrinctkUrPyC2rNB61YLIT5k7SQDbmHW8pzkaKYfUYqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677221479; a=rsa-sha256; cv=none; b=mTvvhaOZDCFEXBTWQ+bvzTuRsf8RRFgPn/4gWvOOICSHN8CJjYCrO27nPpL24zYq+ei2hD t6EvWvmxIOl/J0V0T6z96hCKHDo2t0cIfuRet8QbhMSVtinq1Qu6c1KOXaCDYF9DFMRuZ7 y+0eVezUxuKTWoYKrbxbYVjAJ3gNLOIUV8P+vb5XRfnkLhF98O/cYdd7zidSO/BBFyjSN9 6pWgI7vjHPi/ALSdYxSyzdN+ZL5aP9yRtWnikwBFI+pefFiCsZ+Uej7ydAUmGvr3oebZ1j fMB0d9JF2bE4sLPfTXiuyNuAjS77K3fzl6+i4YjHQF9Jsi7Cx9rEls73efVlPA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PNLCC3ZvCz1CsK; Fri, 24 Feb 2023 06:51:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31O6pJah084825; Fri, 24 Feb 2023 06:51:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31O6pJuR084824; Fri, 24 Feb 2023 06:51:19 GMT (envelope-from git) Date: Fri, 24 Feb 2023 06:51:19 GMT Message-Id: <202302240651.31O6pJuR084824@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Felix Palmen Subject: git: 2bf4a73e61cd - main - sysutils/debootstrap: Update to 1.0.128-2 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zirias X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2bf4a73e61cd322efa426f55101afa25bd2481d3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by zirias: URL: https://cgit.FreeBSD.org/ports/commit/?id=2bf4a73e61cd322efa426f55101afa25bd2481d3 commit 2bf4a73e61cd322efa426f55101afa25bd2481d3 Author: Felix Palmen AuthorDate: 2023-02-19 07:33:33 +0000 Commit: Felix Palmen CommitDate: 2023-02-24 06:50:47 +0000 sysutils/debootstrap: Update to 1.0.128-2 For a debian-native package, a +nmuX version should be considered a new upstream version (it just means "non mantainer upload" there). Derive some PORTVERSION from that that's sane for our versioning. While here, eliminate hardcoded /usr/local from Makefile patch. Approved by: nc (maintainer), tcberner (mentor) Differential Revision: https://reviews.freebsd.org/D38670 --- sysutils/debootstrap/Makefile | 10 +++++++--- sysutils/debootstrap/distinfo | 6 +++--- sysutils/debootstrap/files/patch-Makefile | 8 ++++---- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/sysutils/debootstrap/Makefile b/sysutils/debootstrap/Makefile index 021a8c1c5538..fdb808e04908 100644 --- a/sysutils/debootstrap/Makefile +++ b/sysutils/debootstrap/Makefile @@ -1,9 +1,8 @@ PORTNAME= debootstrap -PORTVERSION= 1.0.128 -PORTREVISION= 1 +PORTVERSION= ${DEB_VERSION}-${DEB_NMU} CATEGORIES= sysutils MASTER_SITES= DEBIAN -DISTNAME= ${PORTNAME}_${PORTVERSION}+nmu2~bpo11+1 +DISTNAME= ${PORTNAME}_${DEB_VERSION}+nmu${DEB_NMU} MAINTAINER= nc@FreeBSD.org COMMENT= Install Debian or Ubuntu base system into a directory @@ -24,6 +23,11 @@ NO_ARCH= yes USES= gmake perl5 USE_PERL5= run +# The +nmu suffix used by debian for "non maintainer uploads" of a Debian +# native package doesn't play well with our versioning +DEB_VERSION= 1.0.128 +DEB_NMU= 2 + post-patch: @${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' \ ${WRKSRC}/Makefile \ diff --git a/sysutils/debootstrap/distinfo b/sysutils/debootstrap/distinfo index eff91678d5b2..54933414c156 100644 --- a/sysutils/debootstrap/distinfo +++ b/sysutils/debootstrap/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1677062129 -SHA256 (debootstrap_1.0.128+nmu2~bpo11+1.tar.gz) = 140b2ef281a190c70098462b090ba2997bbcd075a6c1a1c7ce90b4c0e10c207d -SIZE (debootstrap_1.0.128+nmu2~bpo11+1.tar.gz) = 82336 +TIMESTAMP = 1677148183 +SHA256 (debootstrap_1.0.128+nmu2.tar.gz) = 528523228d93a31c9e0cd4eb932977ea8ceec2bfbf8db1103bec2397cc7434fa +SIZE (debootstrap_1.0.128+nmu2.tar.gz) = 82266 diff --git a/sysutils/debootstrap/files/patch-Makefile b/sysutils/debootstrap/files/patch-Makefile index 79638ff023e8..8d55f3868d54 100644 --- a/sysutils/debootstrap/files/patch-Makefile +++ b/sysutils/debootstrap/files/patch-Makefile @@ -5,11 +5,11 @@ clean: -DSDIR=$(DESTDIR)/usr/share/debootstrap -+DSDIR=$(DESTDIR)/usr/local/share/debootstrap ++DSDIR=$(DESTDIR)$(PREFIX)/share/debootstrap install: mkdir -p $(DSDIR)/scripts - mkdir -p $(DESTDIR)/usr/sbin -+ mkdir -p $(DESTDIR)/usr/local/sbin ++ mkdir -p $(DESTDIR)$(PREFIX)/sbin cp -a scripts/* $(DSDIR)/scripts/ - install -o root -g root -m 0644 functions $(DSDIR)/ @@ -18,5 +18,5 @@ - sed 's/@VERSION@/$(VERSION)/g' debootstrap >$(DESTDIR)/usr/sbin/debootstrap - chown root:root $(DESTDIR)/usr/sbin/debootstrap - chmod 0755 $(DESTDIR)/usr/sbin/debootstrap -+ sed 's/@VERSION@/$(VERSION)/g' debootstrap >$(DESTDIR)/usr/local/sbin/debootstrap -+ chmod 0755 $(DESTDIR)/usr/local/sbin/debootstrap ++ sed 's/@VERSION@/$(VERSION)/g' debootstrap >$(DESTDIR)$(PREFIX)/sbin/debootstrap ++ chmod 0755 $(DESTDIR)$(PREFIX)/sbin/debootstrap