ports/154072: [PATCH] update textproc/xmlstarlet to 1.0.4

[Steve Wills]

>Number:         154072
>Category:       ports
>Synopsis:       [PATCH] update textproc/xmlstarlet to 1.0.4
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jan 17 05:00:18 UTC 2011
>Closed-Date:
>Last-Modified:
>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:
>Unformatted: