diff options
| author | Hiroki Sato <hrs@FreeBSD.org> | 2011-01-17 06:53:18 +0000 |
|---|---|---|
| committer | Hiroki Sato <hrs@FreeBSD.org> | 2011-01-17 06:53:18 +0000 |
| commit | fee0adfe2ac2d0871bd382d8f4162a211a3f878b (patch) | |
| tree | 9b25aebf247f9906316800d3973520caa6766cb3 /textproc | |
| parent | - utilize DIST_SUBDIR to solve distfiles conflict (diff) | |
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
Notes
Notes:
svn path=/head/; revision=267902
Diffstat (limited to 'textproc')
| -rw-r--r-- | textproc/xmlstarlet/Makefile | 9 | ||||
| -rw-r--r-- | textproc/xmlstarlet/distinfo | 4 | ||||
| -rw-r--r-- | textproc/xmlstarlet/files/patch-configure | 25 |
3 files changed, 5 insertions, 33 deletions
diff --git a/textproc/xmlstarlet/Makefile b/textproc/xmlstarlet/Makefile index 285e512f0ffe..11aa4ff3fda3 100644 --- a/textproc/xmlstarlet/Makefile +++ b/textproc/xmlstarlet/Makefile @@ -7,7 +7,7 @@ # PORTNAME= xmlstarlet -PORTVERSION= 1.0.3 +PORTVERSION= 1.0.4 CATEGORIES= textproc MASTER_SITES= SF/xmlstar/${PORTNAME}/${PORTVERSION} @@ -19,7 +19,8 @@ USE_ICONV= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-libxml-prefix=${LOCALBASE} \ --with-libxslt-prefix=${LOCALBASE} \ - --with-libiconv-prefix=${LOCALBASE} + --with-libiconv-prefix=${LOCALBASE} \ + --disable-static-libs MAN1= xmlstarlet.1 PLIST_FILES= bin/xml @@ -29,10 +30,6 @@ PORTDOCS= xmlstarlet.txt xmlstarlet.pdf xmlstarlet.ps \ xmlstarlet-ug.ps xmlstarlet-ug.xml \ html.css -post-patch: - @${REINPLACE_CMD} -e "s|%%PTHREAD%%|${PTHREAD_LIBS}|g" \ - ${WRKSRC}/configure - .if !defined(NOPORTDOCS) post-install: ${MKDIR} ${DOCSDIR} diff --git a/textproc/xmlstarlet/distinfo b/textproc/xmlstarlet/distinfo index ec37371b59cf..ebaf2e0c5726 100644 --- a/textproc/xmlstarlet/distinfo +++ b/textproc/xmlstarlet/distinfo @@ -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 diff --git a/textproc/xmlstarlet/files/patch-configure b/textproc/xmlstarlet/files/patch-configure deleted file mode 100644 index ce1be9787289..000000000000 --- a/textproc/xmlstarlet/files/patch-configure +++ /dev/null @@ -1,25 +0,0 @@ ---- configure.orig 2010-11-19 02:01:45.000000000 +0900 -+++ configure 2011-01-04 17:39:35.000000000 +0900 -@@ -4123,8 +4123,8 @@ - else - : ${LIBXML_INCDIR="$LIBXML_PREFIX/include/libxml2"} - 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 : - 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" - else -- 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" |