From nobody Sun Jan 29 14:13:27 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 4P4YFM2TXHz3cckH; Sun, 29 Jan 2023 14:13:27 +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 4P4YFM21Cjz46M5; Sun, 29 Jan 2023 14:13:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675001607; 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=u78GfXG75BXhx9PgdNWTCpPUSc5oWEkS/zE0GA5/US4=; b=W9ASPmdUYXJHpSkpIBLNVjo4CgqAEOyp5avav6flbt+V+gy31apvzd3QsyWJjn+Wt0yirE /GaUxR0tdUpmeNrz52ZHq/o3KuS79fMjHGj6L1BNa4kvlVh+LdQ+jjmJTYit/qVT6bnCLM +6WTPZbi+TSK3NCPW7becYfK/cwE6rWLIjYAGunthx58wAfbFwQQbeyGns2XApKfurNVUF p3sJAc3wR6GJqamMZBAPd5q8jRtVt58XFF3tN0WKSNue5akHJxZo0gGkBBlJAuAFSmXxvs Av6l2UyUHuRzmmc/NEiddHN10hpmexAuLpr8PuiXFrrvgkM8NzeRmOV7GjlHVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675001607; 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=u78GfXG75BXhx9PgdNWTCpPUSc5oWEkS/zE0GA5/US4=; b=OWy/92Jz+wMQEyLO+nE3quzlFDzX0yDTCSL6+EGWGELQHCrpWsxF1AEn+MypTAlLrcvyu1 S7q19t1B9IXL9z0lr4EhR0gXKqlEgW7i3nQ8n0kfG2OMMjRHwwiTTG1Zr0xrlLnNGXHNS6 VgPjmG+mnrGAfA0Cit4D6SN41z6brUs1iVOjQ0vWOf8QC8YMrN0Lknv3bGEI/hXGkil4CZ Mic3RZhYYmQaD2Xn3wt8n4ZHUN/BSPKnuSq5f7GOkLXkxyfQvA7/LLZDW46hf6SVJ5zX9p 2qlxn3QZ8BfpMYhyO+LcqYoyAXyug0ldTkfMmH4mGb7AosYYx5BfVkrLzfYoTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675001607; a=rsa-sha256; cv=none; b=GYx6KkN6WfmfiSuPSSqjJ+9C1J9Ro54IAcGmuVAxkegqQgXNrEhvkQLfwFQPsyWsJw6Cyb /v5OWm8Zv/tNaKdOBTqpR2v6QLFBG1ahJfEeNi/sCzr0uixgml/pSogyyr5lm2wlxx1zmR oQeIykpkAViqeoMb4ZuYKHsGSUC0PjE7O2BtlNHhDKs3zV74zbfkgPqQQ+bffffMILnK6P BQKeCMypba/dW8fwpiciYONWgUqfN1kXoDXW1LM77qKc6V7mGDlaqaHjvmn49yDOgiqwWD bFPz468QgDYFmmQNwQjp9FExNwLTT9JQGREl9iMNwsHcN8qmdbrgqoH4IxlAKg== 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 4P4YFM0lZFzX7f; Sun, 29 Jan 2023 14:13:27 +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 30TEDRTD092941; Sun, 29 Jan 2023 14:13:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30TEDRIq092940; Sun, 29 Jan 2023 14:13:27 GMT (envelope-from git) Date: Sun, 29 Jan 2023 14:13:27 GMT Message-Id: <202301291413.30TEDRIq092940@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Rene Ladan Subject: git: 5d17617b187e - main - sysutils/apt-mirror-devel: simplify installing the sample configuration file. 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: rene X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5d17617b187ea54f3b9b03609477ea95cf99fbca Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=5d17617b187ea54f3b9b03609477ea95cf99fbca commit 5d17617b187ea54f3b9b03609477ea95cf99fbca Author: Rene Ladan AuthorDate: 2023-01-29 14:11:22 +0000 Commit: Rene Ladan CommitDate: 2023-01-29 14:13:09 +0000 sysutils/apt-mirror-devel: simplify installing the sample configuration file. It looks like the build cluster failed to build the previous revision of this port, although local poudriere bulk -t was fine. --- sysutils/apt-mirror-devel/Makefile | 4 +--- sysutils/apt-mirror-devel/files/patch-Makefile | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/sysutils/apt-mirror-devel/Makefile b/sysutils/apt-mirror-devel/Makefile index 54c8397ce7f4..e3bcd7c7ac2e 100644 --- a/sysutils/apt-mirror-devel/Makefile +++ b/sysutils/apt-mirror-devel/Makefile @@ -1,7 +1,7 @@ PORTNAME= apt-mirror DISTVERSION= 0.5.4-35 DISTVERSIONSUFFIX= -g088fa51 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils PKGNAMESUFFIX= -devel @@ -22,7 +22,5 @@ NO_ARCH= yes post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g' ${WRKSRC}/Makefile - @${MKDIR} ${STAGEDIR}/etc/apt - @${CP} ${WRKSRC}/mirror.list ${STAGEDIR}/etc/apt/mirror.list.sample .include diff --git a/sysutils/apt-mirror-devel/files/patch-Makefile b/sysutils/apt-mirror-devel/files/patch-Makefile index 55816c519305..a735d844e681 100644 --- a/sysutils/apt-mirror-devel/files/patch-Makefile +++ b/sysutils/apt-mirror-devel/files/patch-Makefile @@ -11,7 +11,7 @@ pod2man apt-mirror > $(DESTDIR)$(PREFIX)/share/man/man1/apt-mirror.1 - if test ! -f $(DESTDIR)/etc/apt/mirror.list; then install -m 644 -D mirror.list $(DESTDIR)/etc/apt/mirror.list; fi + mkdir -p $(DESTDIR)/etc/apt -+ if test ! -f $(DESTDIR)/etc/apt/mirror.list; then install -m 644 mirror.list $(DESTDIR)/etc/apt/mirror.list; fi ++ if test ! -f $(DESTDIR)/etc/apt/mirror.list.sample; then install -m 644 mirror.list $(DESTDIR)/etc/apt/mirror.list.sample; fi mkdir -p $(DESTDIR)$(BASE_PATH)/mirror mkdir -p $(DESTDIR)$(BASE_PATH)/skel mkdir -p $(DESTDIR)$(BASE_PATH)/var