diff --git a/srcpkgs/libxml2/libxml2-devel.template b/srcpkgs/libxml2/libxml2-devel.template index ea78f097c0..296eaefb0b 100644 --- a/srcpkgs/libxml2/libxml2-devel.template +++ b/srcpkgs/libxml2/libxml2-devel.template @@ -1,27 +1,20 @@ # Template file for 'libxml2-devel'. # -depends="zlib-devel libxml2" +noarch=yes +depends="zlib-devel libxml2>=${version}" short_desc="${short_desc} (development files)" long_desc="${long_desc} This package contains files for development, headers, static libs, etc." - -do_install() -{ - mkdir -p ${DESTDIR}/usr/{bin,lib} - mkdir -p ${DESTDIR}/usr/share/doc - mkdir -p ${DESTDIR}/usr/share/man/man1 - - mv ${SRCPKGDESTDIR}/usr/bin/xml2-config ${DESTDIR}/usr/bin - mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr - mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/lib/xml2Conf.sh ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/share/aclocal ${DESTDIR}/usr/share - mv ${SRCPKGDESTDIR}/usr/share/gtk-doc ${DESTDIR}/usr/share - mv ${SRCPKGDESTDIR}/usr/share/doc/${sourcepkg}-${version} \ - ${DESTDIR}/usr/share/doc - mv ${SRCPKGDESTDIR}/usr/share/man/man1/xml2-config* \ - ${DESTDIR}/usr/share/man/man1 +do_install() { + vmove usr/include usr + vmove usr/bin/xml2-config usr/bin + vmove usr/lib/xml2Conf.sh usr/lib + vmove usr/lib/pkgconfig usr/lib + vmove usr/share/aclocal usr/share + vmove usr/share/gtk-doc usr/share + vmove usr/share/doc/${sourcepkg}-${version} usr/share/doc + vmove "usr/share/man/man1/xml2-config*" usr/share/man/man1 + vmove usr/share/man/man3 usr/share/man } diff --git a/srcpkgs/libxml2/libxml2-python.rshlibs b/srcpkgs/libxml2/libxml2-python.rshlibs index 8be4c9ce09..c37bcd17ab 100644 --- a/srcpkgs/libxml2/libxml2-python.rshlibs +++ b/srcpkgs/libxml2/libxml2-python.rshlibs @@ -6,3 +6,4 @@ libutil.so.1 libm.so.6 libpython2.7.so.1.0 libc.so.6 +liblzma.so.5 diff --git a/srcpkgs/libxml2/libxml2-python.template b/srcpkgs/libxml2/libxml2-python.template index 611b93d49c..8793297140 100644 --- a/srcpkgs/libxml2/libxml2-python.template +++ b/srcpkgs/libxml2/libxml2-python.template @@ -5,12 +5,7 @@ long_desc="${long_desc} This package contains ${sourcepkg} python related files." -do_install() -{ - mkdir -p ${DESTDIR}/usr/lib - mkdir -p ${DESTDIR}/usr/share/doc - - mv ${SRCPKGDESTDIR}/usr/lib/python* ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/share/doc/${sourcepkg}-python-${version} \ - ${DESTDIR}/usr/share/doc +do_install() { + vmove "usr/lib/python*" usr/lib + vmove usr/share/doc/${sourcepkg}-python-${version} usr/share/doc } diff --git a/srcpkgs/libxml2/libxml2.rshlibs b/srcpkgs/libxml2/libxml2.rshlibs index cdc8b3d552..96b1160ea5 100644 --- a/srcpkgs/libxml2/libxml2.rshlibs +++ b/srcpkgs/libxml2/libxml2.rshlibs @@ -2,3 +2,5 @@ libc.so.6 libdl.so.2 libz.so.1 libm.so.6 +liblzma.so.5 +libreadline.so.6 diff --git a/srcpkgs/libxml2/patches/enable_symbol_versioning.patch b/srcpkgs/libxml2/patches/enable_symbol_versioning.patch deleted file mode 100644 index 3e6060999b..0000000000 --- a/srcpkgs/libxml2/patches/enable_symbol_versioning.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.orig 2010-12-05 23:51:33.069152384 +0100 -+++ configure 2010-12-05 23:51:57.890020401 +0100 -@@ -11414,7 +11414,7 @@ else - esac - fi - -- if test -z "$VERSION_SCRIPT_FLAGS"; then -+ if test -n "$VERSION_SCRIPT_FLAGS"; then - USE_VERSION_SCRIPT_TRUE= - USE_VERSION_SCRIPT_FALSE='#' - else diff --git a/srcpkgs/libxml2/patches/largefile64.patch b/srcpkgs/libxml2/patches/largefile64.patch deleted file mode 100644 index b2d32e5c8c..0000000000 --- a/srcpkgs/libxml2/patches/largefile64.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- libxml.h.orig -+++ libxml.h -@@ -13,6 +13,9 @@ - #ifndef _LARGEFILE_SOURCE - #define _LARGEFILE_SOURCE - #endif -+#ifndef _LARGEFILE64_SOURCE -+#define _LARGEFILE64_SOURCE -+#endif - #ifndef _FILE_OFFSET_BITS - #define _FILE_OFFSET_BITS 64 - #endif diff --git a/srcpkgs/libxml2/template b/srcpkgs/libxml2/template index 9620ad07a1..b8e88c1855 100644 --- a/srcpkgs/libxml2/template +++ b/srcpkgs/libxml2/template @@ -1,13 +1,17 @@ # Template build file for 'libxml2'. pkgname=libxml2 -version=2.7.8 -revision=3 -distfiles="http://xmlsoft.org/sources/$pkgname-$version.tar.gz" +version=2.8.0 +revision=1 build_style=gnu-configure -makedepends="zlib-devel python-devel" +configure_args="--disable-static --with-threads --with-history" +subpackages="$pkgname-devel $pkgname-python" +makedepends="ncurses-devel readline-devel liblzma-devel python-devel" short_desc="Library providing XML and HTML support" maintainer="Juan RP " -checksum=cda23bc9ebd26474ca8f3d67e7d1c4a1f1e7106364b690d822e009fdc3c417ec +homepage="http://www.xmlsoft.org/" +license="MIT" +distfiles="http://xmlsoft.org/sources/$pkgname-$version.tar.gz" +checksum=f2e2d0e322685193d1affec83b21dc05d599e17a7306d7b90de95bb5b9ac622a long_desc=" This library allows to manipulate XML files. It includes support to read, modify and write XML and HTML files. There is DTDs support @@ -19,4 +23,6 @@ long_desc=" available, with existing HTTP and FTP modules and combined to an URI library." -subpackages="$pkgname-devel $pkgname-python" +post_install() { + vinstall COPYING 644 usr/share/licenses/${pkgname} +}