From 6a31389aa35a1dd4da98062738f21149d46929d8 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 14 Jan 2010 16:58:23 +0100 Subject: [PATCH] udev: add new libudev{,-devel} subpkgs, bumprev. --HG-- extra : convert_revision : 46a690a7dc90fc74e16adbfc5575d6382f02a13e --- srcpkgs/{udev-devel => libudev} | 0 srcpkgs/libudev-devel | 1 + srcpkgs/udev/libgudev-devel.template | 4 ++++ srcpkgs/udev/libgudev.template | 3 +++ srcpkgs/udev/libudev-devel.template | 25 ++++++++++++++++++++ srcpkgs/udev/libudev.template | 14 +++++++++++ srcpkgs/udev/template | 13 ++++++---- srcpkgs/udev/udev-devel.template | 30 ------------------------ xbps-src/common/mapping_shlib_binpkg.txt | 3 ++- 9 files changed, 57 insertions(+), 36 deletions(-) rename srcpkgs/{udev-devel => libudev} (100%) create mode 120000 srcpkgs/libudev-devel create mode 100644 srcpkgs/udev/libudev-devel.template create mode 100644 srcpkgs/udev/libudev.template delete mode 100644 srcpkgs/udev/udev-devel.template diff --git a/srcpkgs/udev-devel b/srcpkgs/libudev similarity index 100% rename from srcpkgs/udev-devel rename to srcpkgs/libudev diff --git a/srcpkgs/libudev-devel b/srcpkgs/libudev-devel new file mode 120000 index 00000000000..b95ad750c43 --- /dev/null +++ b/srcpkgs/libudev-devel @@ -0,0 +1 @@ +udev \ No newline at end of file diff --git a/srcpkgs/udev/libgudev-devel.template b/srcpkgs/udev/libgudev-devel.template index 7fa44a5d6bd..719dbfd3a5f 100644 --- a/srcpkgs/udev/libgudev-devel.template +++ b/srcpkgs/udev/libgudev-devel.template @@ -6,7 +6,11 @@ long_desc="${long_desc} This package contains the libgudev development files (static libs, headers, etc), a library to interact with udev through the GLib bindings." +revision=1 replaces="udev-glib-devel" + +Add_dependency run libudev-devel +Add_dependency run glib-devel Add_dependency run libgudev do_install() diff --git a/srcpkgs/udev/libgudev.template b/srcpkgs/udev/libgudev.template index efee7e5a175..7f655d29e9d 100644 --- a/srcpkgs/udev/libgudev.template +++ b/srcpkgs/udev/libgudev.template @@ -6,9 +6,12 @@ long_desc="${long_desc} This package contains libgudev, a library to interact with udev through the GLib bindings." +revision=1 replaces="udev-glib" + Add_dependency run udev Add_dependency run glib +Add_dependency run glibc do_install() { diff --git a/srcpkgs/udev/libudev-devel.template b/srcpkgs/udev/libudev-devel.template new file mode 100644 index 00000000000..67635959743 --- /dev/null +++ b/srcpkgs/udev/libudev-devel.template @@ -0,0 +1,25 @@ +# Template file for 'libudev-devel'. +# +short_desc="libudev development files" +long_desc="${long_desc} + + This package contains the files needed for developing applications + that use libudev." + +replaces="udev-devel" + +Add_dependency run glibc-devel +Add_dependency run libudev + +do_install() +{ + mkdir -p ${DESTDIR}/usr/lib/pkgconfig \ + ${DESTDIR}/usr/include ${DESTDIR}/lib \ + ${DESTDIR}/usr/share/gtk-doc/html + mv ${SRCPKGDESTDIR}/usr/include/libudev* ${DESTDIR}/usr/include + mv ${SRCPKGDESTDIR}/lib/libudev* ${DESTDIR}/lib + mv ${SRCPKGDESTDIR}/usr/share/gtk-doc/html/libudev \ + ${DESTDIR}/usr/share/gtk-doc/html + mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig/libudev* \ + ${DESTDIR}/usr/lib/pkgconfig +} diff --git a/srcpkgs/udev/libudev.template b/srcpkgs/udev/libudev.template new file mode 100644 index 00000000000..6a4b58d7d62 --- /dev/null +++ b/srcpkgs/udev/libudev.template @@ -0,0 +1,14 @@ +# Template file for 'libudev'. +# +short_desc="ibudev shared library" +long_desc="${long_desc} + + This library provides access to udev device information." + +Add_dependency run glibc + +do_install() +{ + mkdir -p ${DESTDIR}/lib + mv ${SRCPKGDESTDIR}/lib/libudev*.so.* ${DESTDIR}/lib +} diff --git a/srcpkgs/udev/template b/srcpkgs/udev/template index 636687c6429..f6d20408003 100644 --- a/srcpkgs/udev/template +++ b/srcpkgs/udev/template @@ -1,7 +1,7 @@ # Template file for 'udev' pkgname=udev version=149 -revision=1 +revision=2 distfiles="${KERNEL_SITE}/utils/kernel/hotplug/udev-${version}.tar.bz2" build_style=gnu_configure configure_args="--exec-prefix= --without-selinux --libexecdir=/lib/udev @@ -16,18 +16,20 @@ long_desc=" keep_empty_dirs=yes openrc_services="udev sysinit" conf_files="/etc/udev/udev.conf" -subpackages="udev-devel libgudev libgudev-devel" +subpackages="libudev libudev-devel libgudev libgudev-devel" Add_dependency run glibc Add_dependency run acl Add_dependency run glib Add_dependency run libusb-compat +Add_dependency run libudev Add_dependency full usbutils ">=0.82" Add_dependency full pciutils -Add_dependency build glib -Add_dependency build gperf -Add_dependency build gobject-introspection +Add_dependency build pkg-config Add_dependency build libtool +Add_dependency build gperf +Add_dependency build glib-devel +Add_dependency build gobject-introspection-devel Add_dependency build acl-devel Add_dependency build glib-devel Add_dependency build libusb-compat-devel @@ -63,4 +65,5 @@ post_install() mv $DESTDIR/lib/pkgconfig/* $DESTDIR/usr/lib/pkgconfig mv $DESTDIR/usr/share/pkgconfig/* $DESTDIR/usr/lib/pkgconfig rmdir $DESTDIR/usr/share/pkgconfig + rmdir $DESTDIR/lib/pkgconfig } diff --git a/srcpkgs/udev/udev-devel.template b/srcpkgs/udev/udev-devel.template deleted file mode 100644 index f25ef04ba94..00000000000 --- a/srcpkgs/udev/udev-devel.template +++ /dev/null @@ -1,30 +0,0 @@ -# Template file for 'udev-devel'. -# -short_desc="${short_desc} (development files)" -long_desc="${long_desc} - - This package contains files for development, headers, static libs, etc." - -revision=1 - -Add_dependency run libtool -Add_dependency run gperf -Add_dependency run gobject-introspection-devel -Add_dependency run acl-devel -Add_dependency run glib-devel -Add_dependency run libusb-compat-devel -Add_dependency run udev - -do_install() -{ - mkdir -p ${DESTDIR}/usr/share/gtk-doc/html \ - ${DESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/include - mv ${SRCPKGDESTDIR}/usr/include/*.h ${DESTDIR}/usr/include - mv ${SRCPKGDESTDIR}/usr/share/gtk-doc/html/libudev \ - ${DESTDIR}/usr/share/gtk-doc/html - mv ${SRCPKGDESTDIR}/usr/share/doc ${DESTDIR}/usr/share - mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig/udev.pc \ - ${DESTDIR}/usr/lib/pkgconfig - mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig/libudev.pc \ - ${DESTDIR}/usr/lib/pkgconfig -} diff --git a/xbps-src/common/mapping_shlib_binpkg.txt b/xbps-src/common/mapping_shlib_binpkg.txt index ffd27d0781e..36559ffbff2 100644 --- a/xbps-src/common/mapping_shlib_binpkg.txt +++ b/xbps-src/common/mapping_shlib_binpkg.txt @@ -164,7 +164,7 @@ libpcreposix.so pcre pcre-devel libpcrecpp.so pcre pcre-devel libgirepository-everything-1.0.so gobject-introspection gobject-introspection-devel libgirepository-1.0.so gobject-introspection gobject-introspection-devel -libudev.so udev udev-devel +libudev.so libudev libudev-devel libgudev.so libgudev libgudev-devel libproc-3.2.8.so procps libext2fs.so e2fsprogs-libs e2fsprogs-devel @@ -406,3 +406,4 @@ libgfxpsshar.so thunderbird libldap60.so thunderbird libprldap60.so thunderbird libldif60.so thunderbird +libcap-ng.so libcap-ng libcap-ng-devel