Date: Sun, 29 Jan 2023 14:13:27 GMT From: Rene Ladan <rene@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 5d17617b187e - main - sysutils/apt-mirror-devel: simplify installing the sample configuration file. Message-ID: <202301291413.30TEDRIq092940@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=5d17617b187ea54f3b9b03609477ea95cf99fbca commit 5d17617b187ea54f3b9b03609477ea95cf99fbca Author: Rene Ladan <rene@FreeBSD.org> AuthorDate: 2023-01-29 14:11:22 +0000 Commit: Rene Ladan <rene@FreeBSD.org> 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 <bsd.port.mk> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202301291413.30TEDRIq092940>