Date: Mon, 15 Sep 2014 16:36:17 +0000 (UTC) From: William Grzybowski <wg@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r368274 - in head/sysutils/debootstrap: . files Message-ID: <201409151636.s8FGaHa5080170@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: wg Date: Mon Sep 15 16:36:17 2014 New Revision: 368274 URL: http://svnweb.freebsd.org/changeset/ports/368274 QAT: https://qat.redports.org/buildarchive/r368274/ Log: sysutils/debootstrap: update to 1.0.61 - Add LICENSE (GPLv2) PR: 193238 Submitted by: maintainer Modified: head/sysutils/debootstrap/Makefile head/sysutils/debootstrap/distinfo head/sysutils/debootstrap/files/patch-Makefile head/sysutils/debootstrap/files/patch-debootstrap head/sysutils/debootstrap/pkg-plist Modified: head/sysutils/debootstrap/Makefile ============================================================================== --- head/sysutils/debootstrap/Makefile Mon Sep 15 16:11:39 2014 (r368273) +++ head/sysutils/debootstrap/Makefile Mon Sep 15 16:36:17 2014 (r368274) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= debootstrap -PORTVERSION= 1.0.60 -PORTREVISION= 1 +PORTVERSION= 1.0.61 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_DEBIAN} MASTER_SITE_SUBDIR= pool/main/d/${PORTNAME} @@ -12,11 +11,13 @@ DISTNAME= ${PORTNAME}_${PORTVERSION} MAINTAINER= lifanov@mail.lifanov.com COMMENT= Install Debian base system into a directory -RUN_DEPENDS= wget:${PORTSDIR}/ftp/wget \ - dpkg:${PORTSDIR}/archivers/dpkg +LICENSE= GPLv2 + +RUN_DEPENDS= wget:${PORTSDIR}/ftp/wget WRKSRC= ${WRKDIR}/${DISTNAME:S/_/-/} NO_BUILD= yes +NO_ARCH= yes USES= gmake perl5 tar:xz USE_PERL5= run MAKE_ARGS= DESTDIR="${STAGEDIR}" @@ -28,6 +29,9 @@ post-patch: @${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' \ ${WRKSRC}/Makefile \ ${WRKSRC}/debootstrap + @${REINPLACE_CMD} -e 's,%%DATADIR%%,${DATADIR},g' \ + ${WRKSRC}/Makefile \ + ${WRKSRC}/debootstrap post-install: @${INSTALL_MAN} ${WRKSRC}/debootstrap.8 \ Modified: head/sysutils/debootstrap/distinfo ============================================================================== --- head/sysutils/debootstrap/distinfo Mon Sep 15 16:11:39 2014 (r368273) +++ head/sysutils/debootstrap/distinfo Mon Sep 15 16:36:17 2014 (r368274) @@ -1,2 +1,2 @@ -SHA256 (debootstrap_1.0.60.tar.xz) = 886b140a6801012aba3f502d1f50f5b8e94fc032965400a6c2da19437a75dd4b -SIZE (debootstrap_1.0.60.tar.xz) = 49612 +SHA256 (debootstrap_1.0.61.tar.xz) = b6e1d3048c8afe7c819be297f9bac24d8820e7cabba0766d2ed2fc5928e71766 +SIZE (debootstrap_1.0.61.tar.xz) = 49724 Modified: head/sysutils/debootstrap/files/patch-Makefile ============================================================================== --- head/sysutils/debootstrap/files/patch-Makefile Mon Sep 15 16:11:39 2014 (r368273) +++ head/sysutils/debootstrap/files/patch-Makefile Mon Sep 15 16:36:17 2014 (r368274) @@ -1,11 +1,11 @@ ---- ./Makefile.orig 2011-08-10 07:59:34.000000000 -0400 -+++ ./Makefile 2014-08-06 19:37:57.799160204 -0400 +--- Makefile.orig 2011-08-10 11:59:34 UTC ++++ Makefile @@ -13,17 +13,15 @@ rm -f devices.tar.gz rm -rf dev -DSDIR=$(DESTDIR)/usr/share/debootstrap -+DSDIR=$(DESTDIR)%%PREFIX%%/share/debootstrap ++DSDIR=$(DESTDIR)%%DATADIR%% install: mkdir -p $(DSDIR)/scripts - mkdir -p $(DESTDIR)/usr/sbin Modified: head/sysutils/debootstrap/files/patch-debootstrap ============================================================================== --- head/sysutils/debootstrap/files/patch-debootstrap Mon Sep 15 16:11:39 2014 (r368273) +++ head/sysutils/debootstrap/files/patch-debootstrap Mon Sep 15 16:36:17 2014 (r368274) @@ -1,39 +1,42 @@ ---- ./debootstrap.orig 2014-02-07 10:25:58.000000000 -0500 -+++ ./debootstrap 2014-08-07 20:46:10.626600981 -0400 +--- debootstrap.orig 2014-02-07 15:25:58 UTC ++++ debootstrap @@ -13,7 +13,7 @@ if [ -x /debootstrap/debootstrap ]; then DEBOOTSTRAP_DIR=/debootstrap else - DEBOOTSTRAP_DIR=/usr/share/debootstrap -+ DEBOOTSTRAP_DIR=%%PREFIX%%/share/debootstrap ++ DEBOOTSTRAP_DIR=%%DATADIR%% fi fi -@@ -399,10 +399,10 @@ +@@ -397,13 +397,7 @@ - if in_path dpkg && \ - dpkg --print-architecture >/dev/null 2>&1; then + ########################################################################### + +-if in_path dpkg && \ +- dpkg --print-architecture >/dev/null 2>&1; then - HOST_ARCH=`/usr/bin/dpkg --print-architecture` -+ HOST_ARCH=`%%PREFIX%%/bin/dpkg --print-architecture` - elif in_path udpkg && \ - udpkg --print-architecture >/dev/null 2>&1; then +-elif in_path udpkg && \ +- udpkg --print-architecture >/dev/null 2>&1; then - HOST_ARCH=`/usr/bin/udpkg --print-architecture` -+ HOST_ARCH=`%%PREFIX%%/bin/udpkg --print-architecture` - elif [ -e $DEBOOTSTRAP_DIR/arch ]; then +-elif [ -e $DEBOOTSTRAP_DIR/arch ]; then ++if [ -e $DEBOOTSTRAP_DIR/arch ]; then HOST_ARCH=`cat $DEBOOTSTRAP_DIR/arch` fi -@@ -425,6 +425,10 @@ + HOST_OS="$HOST_ARCH" +@@ -425,6 +419,11 @@ esac fi +if [ "$HOST_OS" = "freebsd" -a -z "$HOST_ARCH" ]; then + HOST_ARCH=kfreebsd-`/sbin/sysctl -n hw.machine_arch` ++ EXTRACTOR_OVERRIDE=ar +fi + if [ -z "$ARCH" ]; then ARCH=$HOST_ARCH fi -@@ -621,7 +625,6 @@ +@@ -621,7 +620,6 @@ if ! am_doing_phase second_stage; then cp "$0" "$TARGET/debootstrap/debootstrap" cp $DEBOOTSTRAP_DIR/functions "$TARGET/debootstrap/functions" Modified: head/sysutils/debootstrap/pkg-plist ============================================================================== --- head/sysutils/debootstrap/pkg-plist Mon Sep 15 16:11:39 2014 (r368273) +++ head/sysutils/debootstrap/pkg-plist Mon Sep 15 16:36:17 2014 (r368274) @@ -2,46 +2,46 @@ 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 +%%DATADIR%%/functions +%%DATADIR%%/scripts/breezy +%%DATADIR%%/scripts/dapper +%%DATADIR%%/scripts/edgy +%%DATADIR%%/scripts/etch +%%DATADIR%%/scripts/etch-m68k +%%DATADIR%%/scripts/feisty +%%DATADIR%%/scripts/gutsy +%%DATADIR%%/scripts/hardy +%%DATADIR%%/scripts/hoary +%%DATADIR%%/scripts/hoary.buildd +%%DATADIR%%/scripts/intrepid +%%DATADIR%%/scripts/jaunty +%%DATADIR%%/scripts/jessie +%%DATADIR%%/scripts/karmic +%%DATADIR%%/scripts/lenny +%%DATADIR%%/scripts/lucid +%%DATADIR%%/scripts/maverick +%%DATADIR%%/scripts/natty +%%DATADIR%%/scripts/oldstable +%%DATADIR%%/scripts/oneiric +%%DATADIR%%/scripts/potato +%%DATADIR%%/scripts/precise +%%DATADIR%%/scripts/quantal +%%DATADIR%%/scripts/raring +%%DATADIR%%/scripts/sarge +%%DATADIR%%/scripts/sarge.buildd +%%DATADIR%%/scripts/sarge.fakechroot +%%DATADIR%%/scripts/saucy +%%DATADIR%%/scripts/sid +%%DATADIR%%/scripts/squeeze +%%DATADIR%%/scripts/stable +%%DATADIR%%/scripts/testing +%%DATADIR%%/scripts/trusty +%%DATADIR%%/scripts/unstable +%%DATADIR%%/scripts/utopic +%%DATADIR%%/scripts/warty +%%DATADIR%%/scripts/warty.buildd +%%DATADIR%%/scripts/wheezy +%%DATADIR%%/scripts/woody +%%DATADIR%%/scripts/woody.buildd +@dirrm %%DATADIR%%/scripts +@dirrm %%DATADIR%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409151636.s8FGaHa5080170>