Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 19 Feb 2006 22:53:58 -0500 (EST)
From:      Paul Chvostek <paul+ports@it.ca>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        Paul Chvostek <paul+ports@it.ca>
Subject:   ports/93585: [maintainer update]: textproc/xmldiff - use PERL make var instead of assuming /usr/bin/perl
Message-ID:  <200602200353.k1K3rwVZ073651@mail.it.ca>
Resent-Message-ID: <200602200400.k1K40LTD054106@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         93585
>Category:       ports
>Synopsis:       [maintainer update]: textproc/xmldiff - use PERL make var instead of assuming /usr/bin/perl
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Feb 20 04:00:20 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Paul Chvostek
>Release:        FreeBSD 5.4-RELEASE-p6 i386
>Organization:
>Environment:
System: FreeBSD mail.it.ca 5.4-RELEASE-p6 FreeBSD 5.4-RELEASE-p6 #0: Sun Aug 21 18:50:49 EDT 2005 paul@kanar.int.it.ca:/usr/obj/usr/src/sys/kanar i386


	
>Description:
	Like the last one (this port's dependency), the original port
	submission included a REINPLACE to convert the script's
	/usr/bin/perl to whatever is in the PERL make variable.  The
	REINPLACE was was removed by the committer.  This PR puts it
	back.

>How-To-Repeat:
	n/a
>Fix:

	

--- xmldiff-0.01_1-diff begins here ---
diff -ruN /usr/ports/textproc/xmldiff/Makefile xmldiff/Makefile
--- /usr/ports/textproc/xmldiff/Makefile	Sat Feb 11 02:35:58 2006
+++ xmldiff/Makefile	Sun Feb 19 22:07:08 2006
@@ -7,6 +7,7 @@
 
 PORTNAME=	xmldiff
 PORTVERSION=	0.01
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://software.decisionsoft.com/software/ \
 		http://www.it.ca/~paul/src/
@@ -24,6 +25,9 @@
 do-extract:
 	@${MKDIR} ${WRKSRC}
 	@${CP} -f ${_DISTDIR}/${_DISTFILES} ${WRKSRC}
+
+post-patch:
+	@${REINPLACE_CMD} -e '1s:/usr/bin/perl:${PERL}:' ${WRKSRC}/xmldiff.pl
 
 do-install:
 	@${INSTALL_SCRIPT} ${WRKSRC}/xmldiff.pl ${PREFIX}/bin/xmldiff
diff -ruN /usr/ports/textproc/xmldiff/files/patch-aa xmldiff/files/patch-aa
--- /usr/ports/textproc/xmldiff/files/patch-aa	Wed Dec 31 19:00:00 1969
+++ xmldiff/files/patch-aa	Sun Feb 19 21:55:45 2006
@@ -0,0 +1,17 @@
+--- xmldiff.pl.orig	Sun Oct  9 11:59:04 2005
++++ xmldiff.pl	Sun Oct  9 11:59:37 2005
+@@ -7,12 +7,12 @@
+ # 
+ 
+ #
+-# xmldiff: xmldiff program - uses xmlpp
++# xmldiff: xmldiff program - uses xmlprpr
+ #
+ 
+ #Change this if xmlpp is not in your current path
+ #for example: $XMLPP = "./xmlpp";
+-$XMLPP = "xmlpp";
++$XMLPP = "xmlprpr";
+ 
+ # older versions of less don't support -R, consider -r instead
+ my $pagerCmd = ' | less -R ';
diff -ruN /usr/ports/textproc/xmldiff/files/patch-xmldiff.pl xmldiff/files/patch-xmldiff.pl
--- /usr/ports/textproc/xmldiff/files/patch-xmldiff.pl	Sat Feb 11 02:35:58 2006
+++ xmldiff/files/patch-xmldiff.pl	Wed Dec 31 19:00:00 1969
@@ -1,17 +0,0 @@
---- xmldiff.pl.orig	Sat Feb 11 08:32:29 2006
-+++ xmldiff.pl	Sat Feb 11 08:32:38 2006
-@@ -7,12 +7,12 @@
- # 
- 
- #
--# xmldiff: xmldiff program - uses xmlpp
-+# xmldiff: xmldiff program - uses xmlprpr
- #
- 
- #Change this if xmlpp is not in your current path
- #for example: $XMLPP = "./xmlpp";
--$XMLPP = "xmlpp";
-+$XMLPP = "xmlprpr";
- 
- # older versions of less don't support -R, consider -r instead
- my $pagerCmd = ' | less -R ';
diff -ruN /usr/ports/textproc/xmldiff/pkg-descr xmldiff/pkg-descr
--- /usr/ports/textproc/xmldiff/pkg-descr	Sat Feb 11 02:35:58 2006
+++ xmldiff/pkg-descr	Sun Feb 19 22:09:12 2006
@@ -5,5 +5,4 @@
 
 WWW: http://software.decisionsoft.com/tools.html
 
-- Paul Chvostek
-paul+ports@it.ca
+- Paul Chvostek <paul+ports@it.ca>
--- xmldiff-0.01_1-diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200602200353.k1K3rwVZ073651>