diff --git a/sysutils/debootstrap/Makefile b/sysutils/debootstrap/Makefile index a9febc33c241..021a8c1c5538 100644 --- a/sysutils/debootstrap/Makefile +++ b/sysutils/debootstrap/Makefile @@ -1,52 +1,52 @@ PORTNAME= debootstrap PORTVERSION= 1.0.128 PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= DEBIAN -DISTNAME= ${PORTNAME}_${PORTVERSION} +DISTNAME= ${PORTNAME}_${PORTVERSION}+nmu2~bpo11+1 MAINTAINER= nc@FreeBSD.org COMMENT= Install Debian or Ubuntu base system into a directory WWW= https://wiki.debian.org/Debootstrap LICENSE= MIT LICENSE_FILE= ${WRKSRC}/debian/copyright RUN_DEPENDS= wget:ftp/wget \ bash:shells/bash \ ${LOCALBASE}/bin/grep:textproc/gnugrep \ gpgv2:security/gnupg \ ${LOCALBASE}/share/keyrings/ubuntu-archive-keyring.gpg:security/ubuntu-keyring WRKSRC= ${WRKDIR}/${PORTNAME} NO_BUILD= yes NO_ARCH= yes USES= gmake perl5 USE_PERL5= run post-patch: @${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' \ ${WRKSRC}/Makefile \ ${WRKSRC}/debootstrap @${REINPLACE_CMD} -e 's,%%DATADIR%%,${DATADIR},g' \ ${WRKSRC}/Makefile \ ${WRKSRC}/debootstrap @${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},g' \ ${WRKSRC}/Makefile \ ${WRKSRC}/debootstrap @${REINPLACE_CMD} -e 's,gpgv,gpgv2,g' \ ${WRKSRC}/Makefile \ ${WRKSRC}/debootstrap \ ${WRKSRC}/functions @${FIND} ${WRKSRC}/scripts -type f | \ ${XARGS} ${REINPLACE_CMD} -e 's,/usr/share/keyrings,${LOCALBASE}/share/keyrings,g' # Workaround for bin/255525 @${REINPLACE_CMD} -e 's,grep,${LOCALBASE}/bin/grep,g' \ ${WRKSRC}/functions post-install: ${INSTALL_MAN} ${WRKSRC}/debootstrap.8 \ ${STAGEDIR}${MAN8PREFIX}/man/man8/debootstrap.8 .include diff --git a/sysutils/debootstrap/distinfo b/sysutils/debootstrap/distinfo index e6079cd10e0f..eff91678d5b2 100644 --- a/sysutils/debootstrap/distinfo +++ b/sysutils/debootstrap/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1666058102 -SHA256 (debootstrap_1.0.128.tar.gz) = 09e7f8795fee894b77994213ee3a588e9d8f96ddf5f93afdec91e9a137aa7866 -SIZE (debootstrap_1.0.128.tar.gz) = 84339 +TIMESTAMP = 1677062129 +SHA256 (debootstrap_1.0.128+nmu2~bpo11+1.tar.gz) = 140b2ef281a190c70098462b090ba2997bbcd075a6c1a1c7ce90b4c0e10c207d +SIZE (debootstrap_1.0.128+nmu2~bpo11+1.tar.gz) = 82336 diff --git a/sysutils/debootstrap/files/patch-Makefile b/sysutils/debootstrap/files/patch-Makefile index db211f5a422d..79638ff023e8 100644 --- a/sysutils/debootstrap/files/patch-Makefile +++ b/sysutils/debootstrap/files/patch-Makefile @@ -1,21 +1,22 @@ ---- Makefile.orig 2021-04-06 19:52:02 UTC +--- Makefile.orig 2022-07-13 22:17:17 UTC +++ Makefile -@@ -5,14 +5,13 @@ all: +@@ -5,14 +5,13 @@ clean: clean: -DSDIR=$(DESTDIR)/usr/share/debootstrap +DSDIR=$(DESTDIR)/usr/local/share/debootstrap install: mkdir -p $(DSDIR)/scripts - mkdir -p $(DESTDIR)/usr/sbin + mkdir -p $(DESTDIR)/usr/local/sbin cp -a scripts/* $(DSDIR)/scripts/ - install -o root -g root -m 0644 functions $(DSDIR)/ + cp -a functions $(DSDIR)/ - sed 's/@VERSION@/$(VERSION)/g' debootstrap >$(DESTDIR)/usr/sbin/debootstrap - chown root:root $(DESTDIR)/usr/sbin/debootstrap - chmod 0755 $(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