From 313d7c84b46da5acf142708868bd53e39cd30d28 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 6 Jul 2012 15:13:09 +0200 Subject: [PATCH] xbps: new subpkgs: libxbps{,-devel} and xbps-tests. --- common/shlibs | 1 + srcpkgs/libxbps | 1 + srcpkgs/libxbps-devel | 1 + srcpkgs/xbps-tests | 1 + srcpkgs/xbps/libxbps-devel.template | 15 +++++++++++++++ srcpkgs/xbps/libxbps.rshlibs | 8 ++++++++ srcpkgs/xbps/libxbps.template | 12 ++++++++++++ srcpkgs/xbps/template | 4 ++-- srcpkgs/xbps/xbps-static.template | 3 --- srcpkgs/xbps/xbps-tests.rshlibs | 4 ++++ srcpkgs/xbps/xbps-tests.template | 12 ++++++++++++ srcpkgs/xbps/xbps.rshlibs | 6 +----- 12 files changed, 58 insertions(+), 10 deletions(-) create mode 120000 srcpkgs/libxbps create mode 120000 srcpkgs/libxbps-devel create mode 120000 srcpkgs/xbps-tests create mode 100644 srcpkgs/xbps/libxbps-devel.template create mode 100644 srcpkgs/xbps/libxbps.rshlibs create mode 100644 srcpkgs/xbps/libxbps.template create mode 100644 srcpkgs/xbps/xbps-tests.rshlibs create mode 100644 srcpkgs/xbps/xbps-tests.template diff --git a/common/shlibs b/common/shlibs index 743d6e9ab7..e196fb6a65 100644 --- a/common/shlibs +++ b/common/shlibs @@ -978,3 +978,4 @@ libORBit-2.so.0 libORBit2-2.14.19_1 libORBit-imodule-2.so.0 libORBit2-2.14.19_1 libORBitCosNaming-2.so.0 libORBit2-2.14.19_1 libminiupnpc.so.8 miniupnpc-1.6_1 +libxbps.so.0 libxbps-0.16.3_2 diff --git a/srcpkgs/libxbps b/srcpkgs/libxbps new file mode 120000 index 0000000000..9274d81bf0 --- /dev/null +++ b/srcpkgs/libxbps @@ -0,0 +1 @@ +xbps \ No newline at end of file diff --git a/srcpkgs/libxbps-devel b/srcpkgs/libxbps-devel new file mode 120000 index 0000000000..9274d81bf0 --- /dev/null +++ b/srcpkgs/libxbps-devel @@ -0,0 +1 @@ +xbps \ No newline at end of file diff --git a/srcpkgs/xbps-tests b/srcpkgs/xbps-tests new file mode 120000 index 0000000000..9274d81bf0 --- /dev/null +++ b/srcpkgs/xbps-tests @@ -0,0 +1 @@ +xbps \ No newline at end of file diff --git a/srcpkgs/xbps/libxbps-devel.template b/srcpkgs/xbps/libxbps-devel.template new file mode 100644 index 0000000000..e05d4005d9 --- /dev/null +++ b/srcpkgs/xbps/libxbps-devel.template @@ -0,0 +1,15 @@ +# Template file for 'libxbps'. +# +short_desc="${short_desc} - runtime library (development files)" +long_desc="${long_desc} + + This package contains the libxbps develoment files." + +depends="libxbps>=$version" +replaces="xbps-static<0.16.3_2" + +do_install() { + vmove usr/include usr + vmove "usr/lib/*.a" usr/lib + vmove usr/lib/pkgconfig usr/lib +} diff --git a/srcpkgs/xbps/libxbps.rshlibs b/srcpkgs/xbps/libxbps.rshlibs new file mode 100644 index 0000000000..5875845c86 --- /dev/null +++ b/srcpkgs/xbps/libxbps.rshlibs @@ -0,0 +1,8 @@ +libfetch.so +libz.so.1 +libpthread.so.0 +libprop.so.0 +libarchive.so.12 +libconfuse.so.0 +libcrypto.so.1 +libc.so.6 diff --git a/srcpkgs/xbps/libxbps.template b/srcpkgs/xbps/libxbps.template new file mode 100644 index 0000000000..f62608ed58 --- /dev/null +++ b/srcpkgs/xbps/libxbps.template @@ -0,0 +1,12 @@ +# Template file for 'libxbps'. +# +short_desc="${short_desc} - runtime library" +long_desc="${long_desc} + + This package contains libxbps, the XBPS runtime shared library." + +replaces="xbps<0.16.3_2" + +do_install() { + vmove "usr/lib/*.so*" usr/lib +} diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template index dd628c1b0e..49c88d8c8d 100644 --- a/srcpkgs/xbps/template +++ b/srcpkgs/xbps/template @@ -1,14 +1,14 @@ # Template file for 'xbps' pkgname=xbps version=0.16.3 -revision=1 +revision=2 build_style=configure configure_args="--prefix=/ --exec-prefix=/usr --with-pie --sbindir=/usr/sbin --with-tests" depends="xbps-triggers" makedepends="which pkg-config zlib-devel proplib-devel openssl-devel libfetch-devel libarchive-devel confuse-devel atf-devel" conf_files="/etc/xbps/xbps.conf" -subpackages="$pkgname-static" +subpackages="libxbps libxbps-devel xbps-static xbps-tests" replaces="xbps>=0" short_desc="The XBPS package system utilities" maintainer="Juan RP " diff --git a/srcpkgs/xbps/xbps-static.template b/srcpkgs/xbps/xbps-static.template index a9db96f2da..53a7224183 100644 --- a/srcpkgs/xbps/xbps-static.template +++ b/srcpkgs/xbps/xbps-static.template @@ -10,8 +10,5 @@ long_desc="${long_desc} replaces="xbps-static>=0" do_install() { - vmove usr/include usr vmove "usr/sbin/*.static" usr/sbin - vmove "usr/lib/*.a" usr/lib - vmove usr/lib/pkgconfig usr/lib } diff --git a/srcpkgs/xbps/xbps-tests.rshlibs b/srcpkgs/xbps/xbps-tests.rshlibs new file mode 100644 index 0000000000..d0e1ce3e83 --- /dev/null +++ b/srcpkgs/xbps/xbps-tests.rshlibs @@ -0,0 +1,4 @@ +libprop.so.0 +libxbps.so.0 +libpthread.so.0 +libc.so.6 diff --git a/srcpkgs/xbps/xbps-tests.template b/srcpkgs/xbps/xbps-tests.template new file mode 100644 index 0000000000..5d22350d84 --- /dev/null +++ b/srcpkgs/xbps/xbps-tests.template @@ -0,0 +1,12 @@ +# Template file for 'xbps-tests'. +# +short_desc="${short_desc} - Kyua testsuite" +long_desc="${long_desc} + + This package contains the Kyua testsuite." + +replaces="xbps<0.16.3_2" + +do_install() { + vmove usr/tests usr +} diff --git a/srcpkgs/xbps/xbps.rshlibs b/srcpkgs/xbps/xbps.rshlibs index 5d43b5c4f3..f608e21640 100644 --- a/srcpkgs/xbps/xbps.rshlibs +++ b/srcpkgs/xbps/xbps.rshlibs @@ -1,9 +1,5 @@ libpthread.so.0 libprop.so.0 libc.so.6 -libfetch.so -libz.so.1 -libcrypto.so.1 -libconfuse.so.0 librt.so.1 -libarchive.so.12 +libxbps.so.0