Attachment 150092 Details for Bug 195576 – Proposed patch (since 372182 revision)

[patch] Proposed patch (since 372182 revision)

pkg-plist_1.2-1.3.diff (text/plain), 4.68 KB, created by lightside on 2014-12-02 01:21:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: lightside

Created: 2014-12-02 01:21:55 UTC

Size: 4.68 KB

patch

obsolete

>diff -ruN pkg-plist.orig/Makefile pkg-plist/Makefile
>--- pkg-plist.orig/Makefile	2014-11-05 15:05:02.000000000 +0400
>+++ pkg-plist/Makefile	2014-12-02 03:30:20.000000000 +0400
>@@ -2,9 +2,11 @@
> # $FreeBSD: head/ports-mgmt/pkg-plist/Makefile 372182 2014-11-05 11:05:02Z mat $
> 
> PORTNAME=	pkg-plist
>-PORTVERSION=	1.2
>+PORTVERSION=	1.3
> CATEGORIES=	ports-mgmt python
>-MASTER_SITES=	http://code.arp242.net/pkg-plist/downloads/
>+MASTER_SITES=	http://code.arp242.net/pkg-plist/get/
>+DISTNAME=	version_${PORTVERSION}
>+DIST_SUBDIR=	${PORTNAME}
> 
> MAINTAINER=	martin@arp242.net
> COMMENT=	Generate a pkg-plist for a port
>@@ -13,12 +15,10 @@
> 
> USES=		python
> NO_BUILD=	yes
>+WRKSRC=		${WRKDIR}/Carpetsmoker-pkg-plist-cbcdd05740ae
> 
> PLIST_FILES=	bin/pkg-plist man/man1/pkg-plist.1.gz
> 
>-DEPRECATED=	Generate incorrect plists
>-EXPIRATION_DATE=	2014-11-30
>-
> do-install:
> 	${INSTALL_SCRIPT} ${WRKSRC}/pkg-plist ${STAGEDIR}${PREFIX}/bin
> 	${INSTALL_MAN} ${WRKSRC}/pkg-plist.1 ${STAGEDIR}${MANPREFIX}/man/man1
>diff -ruN pkg-plist.orig/distinfo pkg-plist/distinfo
>--- pkg-plist.orig/distinfo	2012-11-08 03:17:21.000000000 +0400
>+++ pkg-plist/distinfo	2014-12-02 03:32:45.000000000 +0400
>@@ -1,2 +1,2 @@
>-SHA256 (pkg-plist-1.2.tar.gz) = 9cdb872627ad29c211923454faa111d5f85f5c1b5c6c9dba4621923d802a4831
>-SIZE (pkg-plist-1.2.tar.gz) = 4064
>+SHA256 (pkg-plist/version_1.3.tar.gz) = b9f413a36a0f4aca454ad1ad3e1026cb3d84a103bb3faae43940f8916c2c1d6b
>+SIZE (pkg-plist/version_1.3.tar.gz) = 4034
>diff -ruN pkg-plist.orig/files/patch-pkg-plist pkg-plist/files/patch-pkg-plist
>--- pkg-plist.orig/files/patch-pkg-plist	1970-01-01 03:00:00.000000000 +0300
>+++ pkg-plist/files/patch-pkg-plist	2014-12-02 04:11:30.000000000 +0400
>@@ -0,0 +1,77 @@
>+--- pkg-plist.orig	2013-03-14 00:26:09.000000000 +0400
>++++ pkg-plist	2014-12-02 04:10:57.000000000 +0400
>+@@ -27,7 +27,7 @@
>+ 	print("Usage: %s [-hdn] [-p portdir] [-x prefix]" % sys.argv[0])
>+ 	print("")
>+ 	print("  -h, --help\t\tPrint this help message and exit")
>+-	print("  -x, --prefix\t\tTemporary prefix to use (Default: /var/tmp/ptest)")
>++	print("  -x, --prefix\t\tTemporary prefix to use (Default: /var/tmp/ptest or ${STAGEDIR}${LOCALBASE})")
>+ 	print("  -p, --portdir\t\tPort directory (Default: current directory)")
>+ 	print("  -d, --noportdocs\tDo not prefix entries in %%DOCSDIR%% with %%PORTDOCS%%")
>+ 	print("  -e, --noportexamples\tDo not prefix entries in %%EXAMPLESSDIR%%")
>+@@ -67,6 +67,8 @@
>+ 		'localbase': '/usr/local',
>+ 	}
>+ 
>++	prefixselected = False
>++
>+ 	for opt, arg in options:
>+ 		if opt in ['-h', '--help']:
>+ 			Usage()
>+@@ -75,6 +77,7 @@
>+ 			defaults['portdir'] = arg
>+ 		if opt in ['-x', '--prefix']:
>+ 			defaults['prefix'] = arg
>++			prefixselected = True
>+ 		if opt in ['-d' '--noportdocs']:
>+ 			defaults['noportdocs'] = True
>+ 		if opt in ['-e', '--noportexamples']:
>+@@ -99,11 +102,14 @@
>+ 				mkdir, e.message))
>+ 			sys.exit(1)
>+ 
>+-	proc = subprocess.Popen(['make', '-V', 'PORTSDIR', '-V', 'LOCALBASE'],
>++	proc = subprocess.Popen(['make', '-V', 'PORTSDIR', '-V', 'LOCALBASE', '-V', 'STAGEDIR'],
>+ 		stdout=subprocess.PIPE)
>+-	defaults['portsdir'], defaults['localbase'] = (
>++	defaults['portsdir'], defaults['localbase'], stagedir = (
>+ 		proc.communicate()[0][:-1].decode().split('\n'))
>+ 
>++	if not prefixselected and stagedir:
>++		defaults['prefix'] = stagedir + defaults['localbase']
>++
>+ 	return defaults
>+ 
>+ 
>+@@ -150,23 +156,26 @@
>+ 
>+ 		path = os.path.join(prev, file)
>+ 		if os.path.isdir(os.path.join(prefix, path)):
>+-			if CheckDir(mtree, path):
>+-				d.append('@dirrm ' + path)
>++			if CheckEmtpyDir(mtree, prefix, path):
>++				d.append('@dir ' + path)
>+ 			GetTree(options, mtree, prefix, path, d, f)
>+ 		else:
>+ 			f.append(path)
>+ 	return d, f
>+ 
>+ 
>+-def CheckDir(mtree, path):
>+-	""" Check if dir is in mtree """
>++def CheckEmtpyDir(mtree, prefix, path):
>++	""" Check if empty dir is not in mtree """
>+ 
>+ 	for m in mtree:
>+ 		if path == m:
>+ 			return False
>+ 		else:
>+ 			continue
>+-	return True
>++	if os.listdir(os.path.join(prefix, path)):
>++		return False
>++	else:
>++		return True
>+ 
>+ 
>+ def GetVars(options):
>diff -ruN pkg-plist.orig/files/patch-pkg-plist.1 pkg-plist/files/patch-pkg-plist.1
>--- pkg-plist.orig/files/patch-pkg-plist.1	1970-01-01 03:00:00.000000000 +0300
>+++ pkg-plist/files/patch-pkg-plist.1	2014-12-02 04:11:48.000000000 +0400
>@@ -0,0 +1,11 @@
>+--- pkg-plist.1.orig	2013-03-14 00:26:09.000000000 +0400
>++++ pkg-plist.1	2014-12-02 04:10:57.000000000 +0400
>+@@ -10,7 +10,7 @@
>+       Print help message and exit
>+ .P
>+   \-\fIx\fR, \fI\-\-prefix\fR
>+-      Temporary prefix to use (Default: /var/tmp/ptest)
>++      Temporary prefix to use (Default: /var/tmp/ptest or ${STAGEDIR}${LOCALBASE})
>+ .P
>+   \fI\-p\fR, \fI\-\-portdir\fR
>+       Port directory (Default: current directory)

Actions: View | Diff

Attachments on bug 195576: 150092 | 150109 | 150110