From 4d29f69f322a57fde2a488aac41bb1fb8345ac7b Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 25 Feb 2009 16:39:02 +0100 Subject: [PATCH] curl, libidn: converted to subpkgs. --HG-- extra : convert_revision : 1041370558329cd01bdfaf6258eace73ae42a9cc --- templates/curl-devel | 1 + templates/curl-libs | 1 + templates/curl/depends | 2 ++ templates/curl/devel.template | 27 +++++++++++++++++++++++++++ templates/curl/libs.template | 20 ++++++++++++++++++++ templates/curl/template | 11 +++++++++-- templates/libidn-devel | 1 + templates/libidn/depends | 2 ++ templates/libidn/devel.template | 23 +++++++++++++++++++++++ templates/libidn/template | 9 +++++++-- 10 files changed, 93 insertions(+), 4 deletions(-) create mode 120000 templates/curl-devel create mode 120000 templates/curl-libs create mode 100644 templates/curl/depends create mode 100644 templates/curl/devel.template create mode 100644 templates/curl/libs.template create mode 120000 templates/libidn-devel create mode 100644 templates/libidn/depends create mode 100644 templates/libidn/devel.template diff --git a/templates/curl-devel b/templates/curl-devel new file mode 120000 index 0000000000..8b258ec334 --- /dev/null +++ b/templates/curl-devel @@ -0,0 +1 @@ +curl \ No newline at end of file diff --git a/templates/curl-libs b/templates/curl-libs new file mode 120000 index 0000000000..8b258ec334 --- /dev/null +++ b/templates/curl-libs @@ -0,0 +1 @@ +curl \ No newline at end of file diff --git a/templates/curl/depends b/templates/curl/depends new file mode 100644 index 0000000000..bef47034a2 --- /dev/null +++ b/templates/curl/depends @@ -0,0 +1,2 @@ +abi_depends=7.19 +api_depends=${abi_depends} diff --git a/templates/curl/devel.template b/templates/curl/devel.template new file mode 100644 index 0000000000..45e482d1a7 --- /dev/null +++ b/templates/curl/devel.template @@ -0,0 +1,27 @@ +# Template file for 'curl-devel'. +# +short_desc="${short_desc} (development files)" +long_desc="${long_desc} + + This package contains files for development, headers, static libs, etc." + +Add_dependency run curl-libs + +do_install() +{ + local destdir=${XBPS_DESTDIR}/${pkgname}-${version} + local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} + + mkdir -p ${destdir}/usr/bin + mkdir -p ${destdir}/usr/lib + mkdir -p ${destdir}/usr/share/man/man1 + + mv ${origdir}/usr/bin/curl-config ${destdir}/usr/bin + mv ${origdir}/usr/include ${destdir}/usr + mv ${origdir}/usr/lib/*.*a ${destdir}/usr/lib + mv ${origdir}/usr/lib/*.so ${destdir}/usr/lib + mv ${origdir}/usr/lib/pkgconfig ${destdir}/usr/lib + mv ${origdir}/usr/share/man/man1/curl-config* \ + ${destdir}/usr/share/man/man1 + mv ${origdir}/usr/share/man/man3 ${destdir}/usr/share/man +} diff --git a/templates/curl/libs.template b/templates/curl/libs.template new file mode 100644 index 0000000000..a55e812512 --- /dev/null +++ b/templates/curl/libs.template @@ -0,0 +1,20 @@ +# Template file for 'curl-libs'. +# +short_desc="${short_desc} (shared libraries)" +long_desc="${long_desc} + + This package contains the shared libraries." + +Add_dependency run glibc +Add_dependency run libidn +Add_dependency run zlib +Add_dependency run openssl + +do_install() +{ + local destdir=${XBPS_DESTDIR}/${pkgname}-${version} + local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} + + mkdir -p ${destdir}/usr/lib + mv ${origdir}/usr/lib/lib*.so.* ${destdir}/usr/lib +} diff --git a/templates/curl/template b/templates/curl/template index 4cca4b73e5..28bd84a4f8 100644 --- a/templates/curl/template +++ b/templates/curl/template @@ -1,4 +1,6 @@ +# Template build file for 'curl'. pkgname=curl +sourcepkg=curl version=7.19.0 distfiles="http://curl.haxx.se/download/$pkgname-$version.tar.bz2" build_style=gnu_configure @@ -13,5 +15,10 @@ long_desc=" kerberos...), file transfer resume, proxy tunneling and a busload of other useful tricks." -build_depends="libidn-1.9 zlib-1.2.3 openssl-0.9.8i" -run_depends="glibc-2.8 $build_depends" +subpackages="devel libs" + +Add_dependency full glibc +Add_dependency full libidn +Add_dependency full zlib +Add_dependency full openssl +Add_dependency run curl-libs diff --git a/templates/libidn-devel b/templates/libidn-devel new file mode 120000 index 0000000000..ae25dbc5e2 --- /dev/null +++ b/templates/libidn-devel @@ -0,0 +1 @@ +libidn \ No newline at end of file diff --git a/templates/libidn/depends b/templates/libidn/depends new file mode 100644 index 0000000000..9ab20982f6 --- /dev/null +++ b/templates/libidn/depends @@ -0,0 +1,2 @@ +abi_depends=1.10 +api_depends=${abi_depends} diff --git a/templates/libidn/devel.template b/templates/libidn/devel.template new file mode 100644 index 0000000000..3d78596ad6 --- /dev/null +++ b/templates/libidn/devel.template @@ -0,0 +1,23 @@ +# Template file for 'libidn-devel'. +# +short_desc="${short_desc} (development files)" +long_desc="${long_desc} + + This package contains files for development, headers, static libs, etc." + +Add_dependency run libidn + +do_install() +{ + local destdir=${XBPS_DESTDIR}/${pkgname}-${version} + local origdir=${XBPS_DESTDIR}/${sourcepkg}-${version} + + mkdir -p ${destdir}/usr/lib + mkdir -p ${destdir}/usr/share/man + + mv ${origdir}/usr/include ${destdir}/usr + mv ${origdir}/usr/lib/*.*a ${destdir}/usr/lib + mv ${origdir}/usr/lib/*.so ${destdir}/usr/lib + mv ${origdir}/usr/lib/pkgconfig ${destdir}/usr/lib + mv ${origdir}/usr/share/man/man3 ${destdir}/usr/share/man +} diff --git a/templates/libidn/template b/templates/libidn/template index 0d36266905..90f86659ba 100644 --- a/templates/libidn/template +++ b/templates/libidn/template @@ -1,4 +1,6 @@ +# Template build file for 'libidn'. pkgname=libidn +sourcepkg=libidn version=1.10 distfiles="http://ftp.gnu.org/gnu/libidn/$pkgname-$version.tar.gz" build_style=gnu_configure @@ -20,5 +22,8 @@ long_desc=" SASL, and XMPP are included. Punycode and ASCII Compatible Encoding (ACE) via IDNA are supported." -build_depends="perl-5.10.0 pkg-config-0.23" -run_depends="glibc-2.8" +subpackages="devel" + +Add_dependency full glibc +Add_dependency build perl +Add_dependency build pkg-config