Index: head/sysutils/debootstrap/Makefile =================================================================== --- head/sysutils/debootstrap/Makefile (revision 364254) +++ head/sysutils/debootstrap/Makefile (revision 364255) @@ -1,36 +1,33 @@ # Created by: Martin Matuska # $FreeBSD$ PORTNAME= debootstrap -PORTVERSION= 1.0.53 +PORTVERSION= 1.0.60 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_DEBIAN} MASTER_SITE_SUBDIR= pool/main/d/${PORTNAME} DISTNAME= ${PORTNAME}_${PORTVERSION} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= lifanov@mail.lifanov.com COMMENT= Install Debian base system into a directory RUN_DEPENDS= wget:${PORTSDIR}/ftp/wget WRKSRC= ${WRKDIR}/${DISTNAME:S/_/-/} NO_BUILD= yes -USES= gmake -MAKE_ARGS= DESTDIR="${PREFIX}" +USES= gmake tar:xz +MAKE_ARGS= DESTDIR="${STAGEDIR}" -MAN8= debootstrap.8 - ONLY_FOR_ARCHS= i386 amd64 ONLY_FOR_ARCHS_REASON= Debian GNU/kFreeBSD available only for i386 and amd64 -NO_STAGE= yes post-patch: - @${REINPLACE_CMD} -e 's,/usr/share,${PREFIX}/share,g' \ + @${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' \ + ${WRKSRC}/Makefile \ ${WRKSRC}/debootstrap post-install: @${INSTALL_MAN} ${WRKSRC}/debootstrap.8 \ - ${MAN8PREFIX}/man/man8/debootstrap.8 - @${CAT} ${PKGMESSAGE} + ${STAGEDIR}${PREFIX}/man/man8/debootstrap.8 .include Index: head/sysutils/debootstrap/distinfo =================================================================== --- head/sysutils/debootstrap/distinfo (revision 364254) +++ head/sysutils/debootstrap/distinfo (revision 364255) @@ -1,2 +1,2 @@ -SHA256 (debootstrap_1.0.53.tar.gz) = 26b74baee6909e9ce363891cc355fced6d875ca8c3715e72ff9dfb580c9cc272 -SIZE (debootstrap_1.0.53.tar.gz) = 59064 +SHA256 (debootstrap_1.0.60.tar.xz) = 886b140a6801012aba3f502d1f50f5b8e94fc032965400a6c2da19437a75dd4b +SIZE (debootstrap_1.0.60.tar.xz) = 49612 Index: head/sysutils/debootstrap/files/patch-Makefile =================================================================== --- head/sysutils/debootstrap/files/patch-Makefile (revision 364254) +++ head/sysutils/debootstrap/files/patch-Makefile (revision 364255) @@ -1,26 +1,24 @@ ---- Makefile.orig 2011-08-15 20:29:37.000000000 +0200 -+++ Makefile 2011-08-25 19:19:09.951348991 +0200 -@@ -13,17 +13,17 @@ +--- ./Makefile.orig 2011-08-10 07:59:34.000000000 -0400 ++++ ./Makefile 2014-08-06 19:37:57.799160204 -0400 +@@ -13,17 +13,15 @@ rm -f devices.tar.gz rm -rf dev -DSDIR=$(DESTDIR)/usr/share/debootstrap -+DSDIR=$(PREFIX)/share/debootstrap ++DSDIR=$(DESTDIR)%%PREFIX%%/share/debootstrap install: mkdir -p $(DSDIR)/scripts - mkdir -p $(DESTDIR)/usr/sbin -+ mkdir -p $(PREFIX)/sbin ++ mkdir -p $(DESTDIR)%%PREFIX%%/sbin cp -a scripts/* $(DSDIR)/scripts/ - install -o root -g root -m 0644 functions $(DSDIR)/ -+ install -o root -g wheel -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 -+ sed 's/@VERSION@/$(VERSION)/g' debootstrap >$(PREFIX)/sbin/debootstrap -+ chown root:wheel $(PREFIX)/sbin/debootstrap -+ chmod 0755 $(PREFIX)/sbin/debootstrap ++ sed 's/@VERSION@/$(VERSION)/g' debootstrap >$(DESTDIR)%%PREFIX%%/sbin/debootstrap ifeq ($(shell uname),Linux) install -o root -g root -m 0644 devices.tar.gz $(DSDIR)/ Index: head/sysutils/debootstrap/files/patch-debootstrap =================================================================== --- head/sysutils/debootstrap/files/patch-debootstrap (revision 364254) +++ head/sysutils/debootstrap/files/patch-debootstrap (revision 364255) @@ -1,13 +1,22 @@ ---- debootstrap.orig 2011-08-25 20:19:23.294346076 +0200 -+++ debootstrap 2011-08-25 20:22:42.850735086 +0200 -@@ -419,6 +419,10 @@ +--- ./debootstrap.orig 2014-02-07 10:25:58.000000000 -0500 ++++ ./debootstrap 2014-08-06 19:34:46.435155899 -0400 +@@ -13,7 +13,7 @@ + if [ -x /debootstrap/debootstrap ]; then + DEBOOTSTRAP_DIR=/debootstrap + else +- DEBOOTSTRAP_DIR=/usr/share/debootstrap ++ DEBOOTSTRAP_DIR=%%PREFIX%%/share/debootstrap + fi + fi + +@@ -425,6 +425,10 @@ esac fi +if [ "$HOST_OS" = "freebsd" -a -z "$HOST_ARCH" ]; then + HOST_ARCH=kfreebsd-`/sbin/sysctl -n hw.machine_arch` +fi + if [ -z "$ARCH" ]; then ARCH=$HOST_ARCH fi Index: head/sysutils/debootstrap/pkg-plist =================================================================== --- head/sysutils/debootstrap/pkg-plist (revision 364254) +++ head/sysutils/debootstrap/pkg-plist (revision 364255) @@ -1,42 +1,47 @@ +@mode 0755 sbin/debootstrap +@mode +man/man8/debootstrap.8.gz share/debootstrap/functions share/debootstrap/scripts/breezy share/debootstrap/scripts/dapper share/debootstrap/scripts/edgy share/debootstrap/scripts/etch share/debootstrap/scripts/etch-m68k share/debootstrap/scripts/feisty share/debootstrap/scripts/gutsy share/debootstrap/scripts/hardy share/debootstrap/scripts/hoary share/debootstrap/scripts/hoary.buildd share/debootstrap/scripts/intrepid share/debootstrap/scripts/jaunty share/debootstrap/scripts/jessie share/debootstrap/scripts/karmic share/debootstrap/scripts/lenny share/debootstrap/scripts/lucid share/debootstrap/scripts/maverick share/debootstrap/scripts/natty share/debootstrap/scripts/oldstable share/debootstrap/scripts/oneiric share/debootstrap/scripts/potato share/debootstrap/scripts/precise share/debootstrap/scripts/quantal share/debootstrap/scripts/raring share/debootstrap/scripts/sarge share/debootstrap/scripts/sarge.buildd share/debootstrap/scripts/sarge.fakechroot share/debootstrap/scripts/saucy share/debootstrap/scripts/sid share/debootstrap/scripts/squeeze share/debootstrap/scripts/stable share/debootstrap/scripts/testing +share/debootstrap/scripts/trusty share/debootstrap/scripts/unstable +share/debootstrap/scripts/utopic share/debootstrap/scripts/warty share/debootstrap/scripts/warty.buildd share/debootstrap/scripts/wheezy share/debootstrap/scripts/woody share/debootstrap/scripts/woody.buildd @dirrm share/debootstrap/scripts @dirrm share/debootstrap