Attachment 145434 Details for Bug 192458 – sysutils/deboostrap - update to 1.0.60, stage

[patch] sysutils/deboostrap - update to 1.0.60, stage

debootstrap-1.0.60.diff (text/plain), 4.08 KB, created by Nikolai Lifanov on 2014-08-06 23:51:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nikolai Lifanov

Created: 2014-08-06 23:51:24 UTC

Size: 4.08 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 364234)
>+++ Makefile	(working copy)
>@@ -2,13 +2,13 @@
> # $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
>@@ -15,22 +15,19 @@
> 
> 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 <bsd.port.mk>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 364234)
>+++ distinfo	(working copy)
>@@ -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: files/patch-Makefile
>===================================================================
>--- files/patch-Makefile	(revision 364234)
>+++ files/patch-Makefile	(working copy)
>@@ -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: files/patch-debootstrap
>===================================================================
>--- files/patch-debootstrap	(revision 364234)
>+++ files/patch-debootstrap	(working copy)
>@@ -1,6 +1,15 @@
>---- 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
>  
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 364234)
>+++ pkg-plist	(working copy)
>@@ -1,4 +1,7 @@
>+@mode 0755
> sbin/debootstrap
>+@mode
>+man/man8/debootstrap.8.gz
> share/debootstrap/functions
> share/debootstrap/scripts/breezy
> share/debootstrap/scripts/dapper

Actions: View | Diff

Attachments on bug 192458: 145434