From eikemeier@fillmore-labs.com  Thu Sep 11 11:32:06 2003
Return-Path: <eikemeier@fillmore-labs.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id BDA2016A4C0; Thu, 11 Sep 2003 11:31:35 -0700 (PDT)
Received: from mx2.fillmore-labs.com (lima.fillmore-labs.com [62.138.193.83])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id CD8E943FA3; Thu, 11 Sep 2003 11:31:33 -0700 (PDT)
	(envelope-from eikemeier@fillmore-labs.com)
Received: from pd951a34c.dip.t-dialin.net
	([217.81.163.76] helo=fillmore-labs.com ident=pi7p7px1f2vds89q)
	by mx2.fillmore-labs.com with asmtp (TLSv1:AES256-SHA:256)
	(Exim 4.22)
	id 19xWE7-000Ir3-Dq; Thu, 11 Sep 2003 20:31:32 +0200
Message-Id: <3F60BF7F.9000602@fillmore-labs.com>
Date: Thu, 11 Sep 2003 20:31:27 +0200
From: Oliver Eikemeier <eikemeier@fillmore-labs.com>
To: FreeBSD-gnats-submit@FreeBSD.org
Cc: Lev Serebryakov <lev@FreeBSD.org>
Subject: [PATCH] port textproc/p5-XML-XSH: update to version 1.8.2

>Number:         56712
>Category:       ports
>Synopsis:       [PATCH] port textproc/p5-XML-XSH: update to version 1.8.2
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    lev
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Sep 11 11:40:14 PDT 2003
>Closed-Date:    Thu Oct 09 07:06:30 PDT 2003
>Last-Modified:  Thu Oct  9 10:10:15 PDT 2003
>Originator:     Oliver Eikemeier
>Release:        FreeBSD 4.9-PRERELEASE i386
>Organization:
Fillmore Labs - http://www.fillmore-labs.com
>Environment:
System: FreeBSD nuuk.fillmore-labs.com 4.9-PRERELEASE

>Description:

- update to 1.8.2,
  for new feature see http://xsh.sf.net/
- added sourceforge mirrors
- require perl >= 5.6,
  see http://xsh.sf.net/requirements.html
- use SITE_PERL, make portlint happy
- add sourceforge homepage

>How-To-Repeat:
>Fix:

Required dependencies
  textproc/p5-XML-LibXML-Iterator
  textproc/p5-XML-LibXML-XPathContext
  textproc/p5-XML-NodeFilter
have been submitted in seperate PRs

--- p5-XML-XSH.patch begins here ---
diff -Nur textproc/p5-XML-XSH/Makefile.orig textproc/p5-XML-XSH/Makefile
--- textproc/p5-XML-XSH/Makefile.orig	Wed Jun 18 02:06:39 2003
+++ textproc/p5-XML-XSH/Makefile	Thu Sep 11 20:15:21 2003
@@ -6,25 +6,38 @@
 #
 
 PORTNAME=	XML-XSH
-PORTVERSION=	1.4
+PORTVERSION=	1.8.2
 CATEGORIES=	textproc perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR=	XML
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN:S/$/:cpan/} \
+		${MASTER_SITE_SOURCEFORGE:S/$/:sourceforge/}
+MASTER_SITE_SUBDIR=	XML/:cpan xsh/:sourceforge
 PKGNAMEPREFIX=	p5-
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:cpan,sourceforge
 
 MAINTAINER=	lev@FreeBSD.org
 COMMENT=	This is xsh - an XML Editing Shell
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/LibXML.pm:${PORTSDIR}/textproc/p5-XML-LibXML \
-		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Text/Iconv.pm:${PORTSDIR}/converters/p5-Text-Iconv \
-		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Parse/RecDescent.pm:${PORTSDIR}/devel/p5-Parse-RecDescent \
-		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/XML/XUpdate/LibXML.pm:${PORTSDIR}/textproc/p5-XML-XUpdate-LibXML
+BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/XML/LibXML.pm:${PORTSDIR}/textproc/p5-XML-LibXML \
+		${SITE_PERL}/${PERL_ARCH}/XML/LibXSLT.pm:${PORTSDIR}/textproc/p5-XML-LibXSLT \
+		${SITE_PERL}/XML/LibXML/Iterator.pm:${PORTSDIR}/textproc/p5-XML-LibXML-Iterator \
+		${SITE_PERL}/Parse/RecDescent.pm:${PORTSDIR}/devel/p5-Parse-RecDescent \
+		${SITE_PERL}/XML/XUpdate/LibXML.pm:${PORTSDIR}/textproc/p5-XML-XUpdate-LibXML \
+		${SITE_PERL}/${PERL_ARCH}/XML/LibXML/XPathContext.pm:${PORTSDIR}/textproc/p5-XML-LibXML-XPathContext
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
 
-post-patch:
-	@${PERL} -pi -e 's/^(?=no warnings;)/#/ if $$.==6' \
-		${WRKSRC}/lib/XML/XSH/Functions.pm
+MAN1=		xsh.1
+MAN3=		XSH.3
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 500600
+IGNORE=		"requires perl 5.6.x or later. Install lang/perl5 and try again"
+.endif
+
+test: build
+	@cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} \
+		${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} test
+
+.include <bsd.port.post.mk>
diff -Nur textproc/p5-XML-XSH/distinfo.orig textproc/p5-XML-XSH/distinfo
--- textproc/p5-XML-XSH/distinfo.orig	Wed Jul 17 12:15:47 2002
+++ textproc/p5-XML-XSH/distinfo	Thu Sep 11 16:33:06 2003
@@ -1 +1 @@
-MD5 (XML-XSH-1.4.tar.gz) = fa67dc1156c37125b47838b1f7c13e34
+MD5 (XML-XSH-1.8.2.tar.gz) = c25f59c465f785347d0466d653d9893f
diff -Nur textproc/p5-XML-XSH/pkg-descr.orig textproc/p5-XML-XSH/pkg-descr
--- textproc/p5-XML-XSH/pkg-descr.orig	Wed Jul 17 12:15:47 2002
+++ textproc/p5-XML-XSH/pkg-descr	Thu Sep 11 19:09:16 2003
@@ -3,4 +3,5 @@
 editors like ed.  It can be used either interactively or for batch-mode
 XML processing.
 
-WWW: http://search.cpan.org/search?dist=XML-XSH
+WWW: http://xsh.sourceforge.net/
+WWW: http://search.cpan.org/perldoc?XML::XSH
diff -Nur textproc/p5-XML-XSH/pkg-plist.orig textproc/p5-XML-XSH/pkg-plist
--- textproc/p5-XML-XSH/pkg-plist.orig	Wed Jul 17 12:15:47 2002
+++ textproc/p5-XML-XSH/pkg-plist	Thu Sep 11 17:07:21 2003
@@ -1,13 +1,20 @@
 bin/xsh
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/XSH/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/XML/XSH.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/XSH/Completion.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/XSH/CompletionList.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/XSH/Functions.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/XSH/Grammar.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/XSH/Help.pm
-lib/perl5/site_perl/%%PERL_VER%%/XML/XSH/Parser.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML/XSH
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/XML/XSH
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/XML 2>/dev/null || true
+%%SITE_PERL%%/XML/XSH.pm
+%%SITE_PERL%%/XML/XSH.pod
+%%SITE_PERL%%/XML/XSH/Completion.pm
+%%SITE_PERL%%/XML/XSH/CompletionList.pm
+%%SITE_PERL%%/XML/XSH/DummyXPathContext.pm
+%%SITE_PERL%%/XML/XSH/Functions.pm
+%%SITE_PERL%%/XML/XSH/GDOMECompat.pm
+%%SITE_PERL%%/XML/XSH/Grammar.pm
+%%SITE_PERL%%/XML/XSH/Help.pm
+%%SITE_PERL%%/XML/XSH/Iterators.pm
+%%SITE_PERL%%/XML/XSH/LibXMLCompat.pm
+%%SITE_PERL%%/XML/XSH/Parser.pm
+@dirrm %%SITE_PERL%%/XML/XSH
+@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/XSH/.packlist
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/XSH
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+%%SITE_PERL%%/Inline/XSH.pm
+@unexec rmdir %D/%%SITE_PERL%%/Inline 2>/dev/null || true
--- p5-XML-XSH.patch ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->lev 
Responsible-Changed-By: erwin 
Responsible-Changed-When: Thu Sep 11 11:48:21 PDT 2003 
Responsible-Changed-Why:  
Over to maintainer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=56712 

From: Oliver Eikemeier <eikemeier@fillmore-labs.com>
To: FreeBSD-gnats-submit@FreeBSD.org
Cc:  
Subject: Re: ports/56712: [PATCH] port textproc/p5-XML-XSH: update to version
 1.8.2
Date: Thu, 11 Sep 2003 20:50:52 +0200

 required ports:
 
 PR 56711: textproc/p5-XML-LibXML-XPathContext
 PR 56713: textproc/p5-XML-NodeFilter
 PR 56714: textproc/p5-XML-LibXML-Iterator
 
 
State-Changed-From-To: open->closed 
State-Changed-By: lev 
State-Changed-When: Thu Oct 9 07:05:45 PDT 2003 
State-Changed-Why:  

Commited, thanks! 

May be you want to become maintainer?  


http://www.freebsd.org/cgi/query-pr.cgi?pr=56712 

From: Oliver Eikemeier <eikemeier@fillmore-labs.com>
To: "Lev A. Serebryakov" <lev@FreeBSD.org>
Cc: freebsd-gnats-submit@FreeBSD.org
Subject: Re: ports/56712: [PATCH] port textproc/p5-XML-XSH: update to version
 1.8.2
Date: Thu, 09 Oct 2003 19:03:40 +0200

 Lev A. Serebryakov wrote:
 
 > Synopsis: [PATCH] port textproc/p5-XML-XSH: update to version 1.8.2
 > 
 > State-Changed-From-To: open->closed
 > State-Changed-By: lev
 > State-Changed-When: Thu Oct 9 07:05:45 PDT 2003
 > State-Changed-Why: 
 > 
 >   Commited, thanks!
 >   
 >   May be you want to become maintainer? 
 
 Thanks for the offer, I played around with the port a little, but I
 do not really use it. Maybe you could ask Mathieu Arnold <m@absolight.net>,
 he grabbed maintainership for all three required ports I posted.
 
>Unformatted:
