From nobody@FreeBSD.org  Mon Jan 17 04:57:32 2011
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7772E106566C
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 17 Jan 2011 04:57:32 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (unknown [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id 671C98FC0A
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 17 Jan 2011 04:57:32 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.4/8.14.4) with ESMTP id p0H4vUAE031172
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 17 Jan 2011 04:57:30 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.4/8.14.4/Submit) id p0H4vUoF031171;
	Mon, 17 Jan 2011 04:57:30 GMT
	(envelope-from nobody)
Message-Id: <201101170457.p0H4vUoF031171@red.freebsd.org>
Date: Mon, 17 Jan 2011 04:57:30 GMT
From: Steve Wills <steve@mouf.net>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [PATCH] update textproc/xmlstarlet to 1.0.4
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         154072
>Category:       ports
>Synopsis:       [PATCH] update textproc/xmlstarlet to 1.0.4
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    hrs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jan 17 05:00:18 UTC 2011
>Closed-Date:    Mon Jan 17 06:54:28 UTC 2011
>Last-Modified:  Mon Jan 17 07:00:18 UTC 2011
>Originator:     Steve Wills
>Release:        
>Organization:
>Environment:
>Description:
See attached
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/textproc/xmlstarlet/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- Makefile	4 Jan 2011 08:42:15 -0000	1.9
+++ Makefile	17 Jan 2011 04:32:19 -0000
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	xmlstarlet
-PORTVERSION=	1.0.3
+PORTVERSION=	1.0.4
 CATEGORIES=	textproc
 MASTER_SITES=	SF/xmlstar/${PORTNAME}/${PORTVERSION}
 
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/textproc/xmlstarlet/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- distinfo	4 Jan 2011 08:42:15 -0000	1.5
+++ distinfo	17 Jan 2011 04:32:27 -0000
@@ -1,2 +1,2 @@
-SHA256 (xmlstarlet-1.0.3.tar.gz) = a080bfb178671c6fc68ef25d797e9d21bcfd20fb4e0bcff46f4f1b4e6207f673
-SIZE (xmlstarlet-1.0.3.tar.gz) = 379746
+SHA256 (xmlstarlet-1.0.4.tar.gz) = d9303b59973cb4a7f0df99beac55bf15ee4547fb270161491d8a652b86fe470a
+SIZE (xmlstarlet-1.0.4.tar.gz) = 376406
Index: files/patch-configure
===================================================================
RCS file: /home/ncvs/ports/textproc/xmlstarlet/files/patch-configure,v
retrieving revision 1.4
diff -u -r1.4 patch-configure
--- files/patch-configure	4 Jan 2011 08:42:15 -0000	1.4
+++ files/patch-configure	17 Jan 2011 04:54:30 -0000
@@ -1,25 +1,33 @@
---- configure.orig	2010-11-19 02:01:45.000000000 +0900
-+++ configure	2011-01-04 17:39:35.000000000 +0900
-@@ -4123,8 +4123,8 @@
+--- configure.orig	2011-01-16 14:17:40.000000000 -0500
++++ configure	2011-01-16 23:54:22.378194269 -0500
+@@ -4231,13 +4231,13 @@
+ : ${LIBXML_INCDIR="$LIBXML_PREFIX/include/libxml2"}
+ 
+ if test "x$STATIC_LIBS" != xno; then :
+-  LIBXML_CPPFLAGS="-I$LIBXML_INCDIR -DLIBXML_STATIC"
++  LIBXML_CPPFLAGS="-I$LIBXML_INCDIR"
  else
-   : ${LIBXML_INCDIR="$LIBXML_PREFIX/include/libxml2"}
+   LIBXML_CPPFLAGS="-I$LIBXML_INCDIR"
  fi
--LIBXML_LIBS="$LIBXML_LIBDIR/libxml2.a"
--LIBXML_CPPFLAGS="-DLIBXML_STATIC -I$LIBXML_INCDIR"
-+LIBXML_LIBS="`pkg-config --libs libxml-2.0` -pthread"
-+LIBXML_CPPFLAGS="-I$LIBXML_INCDIR"
- 
- 
  
-@@ -4249,9 +4249,9 @@
- : ${LIBXSLT_INCDIR="$LIBXSLT_PREFIX/include"}
- if test "x$LIBXSLT_SRCDIR" != x; then :
+ if test "x$STATIC_LIBS" != xno; then :
+-  LIBXML_LIBS="$LIBXML_LIBDIR/libxml2.a"
++  LIBXML_LIBS="`pkg-config --libs libxml-2.0` -pthread"
+ else
+   LIBXML_LIBS="-lxml2"
+ fi
+@@ -4369,12 +4369,12 @@
    LIBXSLT_INCDIR="$LIBXSLT_SRCDIR"
--       LIBXSLT_LIBS="$LIBXSLT_SRCDIR/libexslt/.libs/libexslt.a $LIBXSLT_SRCDIR/libxslt/.libs/libxslt.a"
-+       LIBXSLT_LIBS="`pkg-config --libs libexslt` -pthread"
+        LIBXSLT_LDFLAGS="-L$LIBXSLT_SRCDIR/libexslt/.libs -L$LIBXSLT_SRCDIR/libxslt/.libs"
+        if test "x$STATIC_LIBS" != xno; then :
+-  LIBXSLT_LIBS="$LIBXSLT_SRCDIR/libexslt/.libs/libexslt.a $LIBXSLT_SRCDIR/libxslt/.libs/libxslt.a"
++  LIBXSLT_LIBS="`pkg-config --libs libexslt` -pthread"
+ fi
  else
+   LIBXSLT_LDFLAGS="-L$LIBXSLT_LIBDIR"
+       if test "x$STATIC_LIBS" != xno; then :
 -  LIBXSLT_LIBS="$LIBXSLT_LIBDIR/libexslt.a $LIBXSLT_LIBDIR/libxslt.a"
 +  LIBXSLT_LIBS="`pkg-config --libs libexslt` -pthread"
  fi
- : ${LIBSLT_INCDIR="$LIBXSLT_PREFIX/include"}
- LIBXSLT_CPPFLAGS="-I$LIBXSLT_INCDIR"
+ fi
+ 


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->hrs 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Mon Jan 17 05:00:28 UTC 2011 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=154072 
State-Changed-From-To: open->closed 
State-Changed-By: hrs 
State-Changed-When: Mon Jan 17 06:53:34 UTC 2011 
State-Changed-Why:  
Updated.  If you notice something wrong please let me know. 
Thank you for your submission. 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/154072: commit references a PR
Date: Mon, 17 Jan 2011 06:53:23 +0000 (UTC)

 hrs         2011-01-17 06:53:18 UTC
 
   FreeBSD ports repository
 
   Modified files:
     textproc/xmlstarlet  Makefile distinfo 
   Removed files:
     textproc/xmlstarlet/files patch-configure 
   Log:
   Update to 1.0.4.  Changes include:
   
    - encode special XML characters in arguments (can now include quotes in xpath)
    - non-zero exit code when input file is not found (Bug 3158488)
    - ed with --pf/--ps options doesn't reformat output (Bug 3158490)
    - exit() instead of segfault when trying to delete namespace nodes
    - use TESTS and XFAIL_TESTS for testing, nicer output
   
   Feature safe:   yes
   PR:             ports/154072
   
   Revision  Changes    Path
   1.10      +3 -6      ports/textproc/xmlstarlet/Makefile
   1.6       +2 -2      ports/textproc/xmlstarlet/distinfo
   1.5       +0 -25     ports/textproc/xmlstarlet/files/patch-configure (dead)
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
