diff --git a/srcpkgs/curl/libcurl-devel.template b/srcpkgs/curl/libcurl-devel.template index 3a6de89d09..349cf2eb66 100644 --- a/srcpkgs/curl/libcurl-devel.template +++ b/srcpkgs/curl/libcurl-devel.template @@ -13,25 +13,17 @@ long_desc=" replaces="curl-devel<7.20.1" -Add_dependency run pkg-config Add_dependency run libidn-devel -Add_dependency run glibc-devel Add_dependency run openssl-devel -Add_dependency run zlib-devel Add_dependency run libldap-devel Add_dependency run mit-krb5-devel Add_dependency run libcurl -do_install() -{ - mkdir -p ${DESTDIR}/usr/{bin,lib} - mkdir -p ${DESTDIR}/usr/share/man/man1 - - mv ${SRCPKGDESTDIR}/usr/bin/curl-config ${DESTDIR}/usr/bin - mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr - mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/share/man/man1/curl-config* \ - ${DESTDIR}/usr/share/man/man1 - mv ${SRCPKGDESTDIR}/usr/share/man/man3 ${DESTDIR}/usr/share/man +do_install() { + vmove usr/bin/curl-config usr/bin + vmove "usr/share/man/man1/curl-config*" usr/share/man/man1 + vmove usr/include usr + vmove "usr/lib/*.a" usr/lib + vmove usr/lib/pkgconfig usr/lib + vmove usr/share/man/man3 usr/share/man } diff --git a/srcpkgs/curl/libcurl.template b/srcpkgs/curl/libcurl.template index 0917dfad92..08f8a6e763 100644 --- a/srcpkgs/curl/libcurl.template +++ b/srcpkgs/curl/libcurl.template @@ -1,6 +1,5 @@ # Template file for 'libcurl'. # -revision=1 short_desc="The multiprotocol file transfer library" long_desc=" libcurl is a free and easy-to-use client-side URL transfer library, @@ -12,8 +11,6 @@ long_desc=" replaces="curl-libs<7.20.1" -do_install() -{ - mkdir -p ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/lib/lib*.so* ${DESTDIR}/usr/lib +do_install() { + vmove "usr/lib/*.so*" usr/lib } diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template index 0342899aed..7f6bdc8b95 100644 --- a/srcpkgs/curl/template +++ b/srcpkgs/curl/template @@ -1,16 +1,15 @@ # Template build file for 'curl'. pkgname=curl -version=7.22.0 +version=7.23.0 homepage="http://curl.haxx.se" distfiles="$homepage/download/$pkgname-$version.tar.bz2" build_style=gnu-configure -configure_args="--enable-ldaps --with-gssapi=/usr \ - --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt" -revision=2 +configure_args="--enable-ldaps --with-gssapi=/usr + --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt" short_desc="Client that groks URLs" maintainer="Juan RP " license="MIT" -checksum=bda0da862322b122784f5a9d7a65efdd99a6061292cfb8e9357e0c67c03e5112 +checksum=ce3a9ed2e830d2b1c3402f5f07547b5652a607af88c2f379e7e74a4264f5e756 long_desc=" Curl is a command line tool for transferring files with URL syntax, supporting FTP, FTPS, HTTP, HTTPS, GOPHER, TELNET, DICT, FILE and LDAP. Curl supports @@ -21,7 +20,6 @@ long_desc=" subpackages="libcurl libcurl-devel" -Add_dependency run libidn Add_dependency run ca-certificates Add_dependency build pkg-config