development/xmlstarlet: Updated for version 1.1.0.

Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
This commit is contained in:
Vincent Batts 2011-05-31 19:41:36 -04:00 committed by Robby Workman
parent 6e6a1c18a4
commit a51115aaf3
3 changed files with 29 additions and 64 deletions

View file

@ -1,48 +0,0 @@
diff -Nur xmlstarlet-1.0.1.orig/configure xmlstarlet-1.0.1/configure
--- xmlstarlet-1.0.1.orig/configure 2005-03-13 19:32:18.000000000 -0600
+++ xmlstarlet-1.0.1/configure 2009-08-15 11:40:10.052257819 -0500
@@ -1095,7 +1095,7 @@
withval="$with_libxml_prefix"
LIBXML_PREFIX=$withval
LIBXML_CFLAGS="-I$withval/include/libxml2 -I$withval/include/libxml"
- LIBXML_LIBS="$withval/lib/libxml2.a -lz -lm -lpthread -ldl"
+ LIBXML_LIBS="$withval/lib64/libxml2.a -lz -lm -lpthread -ldl"
fi
@@ -1144,7 +1144,7 @@
withval="$with_libxslt_prefix"
LIBXSLT_PREFIX=$withval
LIBXSLT_CFLAGS="-I$withval/include/libxslt -I$withval/include/libexslt"
- LIBXSLT_LIBS="$withval/lib/libxslt.a $withval/lib/libexslt.a -lz -lm -lpthread"
+ LIBXSLT_LIBS="$withval/lib64/libxslt.a $withval/lib64/libexslt.a -lz -lm -lpthread"
fi
@@ -1543,7 +1543,7 @@
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
- CPP=/lib/cpp
+ CPP=/lib64/cpp
fi
rm -f conftest*
fi
@@ -2159,7 +2159,7 @@
if test "x$LIBXML_LIBS" = "x"
then
- LIBXML_LIBS="${LIBXML_PREFIX}/lib/libxml2.a -lz -lm -lpthread -ldl"
+ LIBXML_LIBS="${LIBXML_PREFIX}/lib64/libxml2.a -lz -lm -lpthread -ldl"
fi
if test "x$LIBXSLT_CFLAGS" = "x"
@@ -2169,7 +2169,7 @@
if test "x$LIBXSLT_LIBS" = "x"
then
- LIBXSLT_LIBS="${LIBXSLT_PREFIX}/lib/libxslt.a ${LIBXSLT_PREFIX}/lib/libexslt.a -lz -lm -lpthread"
+ LIBXSLT_LIBS="${LIBXSLT_PREFIX}/lib64/libxslt.a ${LIBXSLT_PREFIX}/lib64/libexslt.a -lz -lm -lpthread"
fi
if test "x$LIBICONV_CFLAGS" = "x"

View file

@ -2,19 +2,35 @@
# Slackware build script for xmlstarlet
# Written by Vincent Batts, vbatts@gmail.com
# Copyright 2009-2011 Vincent Batts, vbatts@hashbangbash.com, http://hashbangbash.com/
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
# permitted provided that the following conditions are met:
#
# 1. Redistributions of this script must retain the above copyright
# notice, this list of conditions and the following disclaimer.
#
# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=xmlstarlet
VERSION=1.0.1
VERSION=1.1.0
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
i?86) ARCH=i486 ;;
arm*) ARCH=arm ;;
# Unless $ARCH is already set, use uname -m for all other archs:
*) ARCH=$( uname -m ) ;;
esac
fi
@ -53,23 +69,20 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
# Fixup build on x86_64
if [ "$ARCH" = "x86_64" ]; then
patch -p1 < $CWD/xmlstarlet-1.0.1-fixup_x86_64.diff
fi
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
--with-libxml-prefix=/usr \
--with-libxml-libs-prefix=/usr/lib${LIBDIRSUFFIX} \
--with-libxslt-prefix=/usr \
--with-libxslt-libs-prefix=/usr/lib${LIBDIRSUFFIX} \
--sysconfdir=/etc \
--localstatedir=/var \
--mandir=/usr/man \
--build=$ARCH-slackware-linux
sed -i 's/pthread/pthread -lgcrypt/' src/Makefile
make
make install DESTDIR=$PKG

View file

@ -1,10 +1,10 @@
PRGNAM="xmlstarlet"
VERSION="1.0.1"
VERSION="1.1.0"
HOMEPAGE="http://sourceforge.net/projects/xmlstar/"
DOWNLOAD="http://downloads.sourceforge.net/xmlstar/xmlstarlet-1.0.1.tar.gz"
MD5SUM="8deb71834bcdfb4443c258a1f0042fce"
DOWNLOAD="http://downloads.sourceforge.net/xmlstar/xmlstarlet-1.1.0.tar.gz"
MD5SUM="1b864b16c1dc78ce87ffc8528f021ab0"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
MAINTAINER="Vincent Batts"
EMAIL="vbatts at gmail.com"
APPROVED="dsomero,rworkman"
EMAIL="vbatts@hashbangbash.com"
APPROVED="dsomero"