diff --git a/srcpkgs/libblkid b/srcpkgs/libblkid new file mode 120000 index 0000000000..4bc22946d3 --- /dev/null +++ b/srcpkgs/libblkid @@ -0,0 +1 @@ +util-linux-ng \ No newline at end of file diff --git a/srcpkgs/libblkid-devel b/srcpkgs/libblkid-devel index fee422ced6..4bc22946d3 120000 --- a/srcpkgs/libblkid-devel +++ b/srcpkgs/libblkid-devel @@ -1 +1 @@ -libblkid \ No newline at end of file +util-linux-ng \ No newline at end of file diff --git a/srcpkgs/libblkid/libblkid-devel.template b/srcpkgs/libblkid/libblkid-devel.template deleted file mode 100644 index dc821ca269..0000000000 --- a/srcpkgs/libblkid/libblkid-devel.template +++ /dev/null @@ -1,16 +0,0 @@ -# Template file for 'libblkid-devel'. -# -short_desc="${short_desc} (development files)" -long_desc="${long_desc} - - This package contains files for development, headers, static libs, etc." - -Add_dependency run zlib-devel -Add_dependency run libuuid-devel -Add_dependency run libblkid - -do_install() -{ - mkdir -p ${DESTDIR} - mv ${SRCPKGDESTDIR}/usr ${DESTDIR} -} diff --git a/srcpkgs/libblkid/patches/Makefile_only_shlibs_target.diff b/srcpkgs/libblkid/patches/Makefile_only_shlibs_target.diff deleted file mode 100644 index 20cc59fdd0..0000000000 --- a/srcpkgs/libblkid/patches/Makefile_only_shlibs_target.diff +++ /dev/null @@ -1,13 +0,0 @@ ---- Makefile.in.orig 2009-08-12 11:15:33.768923564 +0200 -+++ Makefile.in 2009-08-12 11:16:29.184473940 +0200 -@@ -288,9 +288,7 @@ ul_libblkid_la = $(top_builddir)/shlibs/ - ul_libuuid_srcdir = $(top_srcdir)/shlibs/uuid/src - ul_libuuid_builddir = $(top_builddir)/shlibs/uuid/src - ul_libuuid_la = $(top_builddir)/shlibs/uuid/src/libuuid.la --SUBDIRS = include disk-utils fdisk getopt lib shlibs login-utils \ -- misc-utils po schedutils sys-utils text-utils tests \ -- $(am__append_1) $(am__append_2) $(am__append_3) -+SUBDIRS = shlibs - RCS_FIND_IGNORE := \( -name SCCS -o -name BitKeeper -o -name .svn -o \ - -name CVS -o -name .pc -o -name .hg -o -name .git \) -prune -o - diff --git a/srcpkgs/libblkid/template b/srcpkgs/libblkid/template deleted file mode 100644 index af56a55bd1..0000000000 --- a/srcpkgs/libblkid/template +++ /dev/null @@ -1,22 +0,0 @@ -# Template file for 'libblkid' -pkgname=libblkid -version=2.17.1 -_utilng=util-linux-ng -wrksrc=${_utilng}-${version} -distfiles="${KERNEL_SITE}/utils/$pkgname/v2.17/${_utilng}-${version}.tar.bz2" -build_style=gnu_configure -configure_args="--disable-libuuid --enable-libblkid" -short_desc="Library to handle device identification" -maintainer="Juan RP " -checksum=e9c019ea3782dc20b82d27c1240009f9e194304a77ac36f51629a487a5181390 -long_desc=" - The libblkid package contains a library to handle device identification - and token extraction." - -subpackages="$pkgname-devel" -Add_dependency run glibc -Add_dependency run zlib -Add_dependency run libuuid -Add_dependency build zlib-devel -Add_dependency build libuuid-devel -Add_dependency build ncurses-devel diff --git a/srcpkgs/libuuid b/srcpkgs/libuuid new file mode 120000 index 0000000000..4bc22946d3 --- /dev/null +++ b/srcpkgs/libuuid @@ -0,0 +1 @@ +util-linux-ng \ No newline at end of file diff --git a/srcpkgs/libuuid-devel b/srcpkgs/libuuid-devel index ab64985bf5..4bc22946d3 120000 --- a/srcpkgs/libuuid-devel +++ b/srcpkgs/libuuid-devel @@ -1 +1 @@ -libuuid \ No newline at end of file +util-linux-ng \ No newline at end of file diff --git a/srcpkgs/libuuid/depends b/srcpkgs/libuuid/depends deleted file mode 100644 index 58f30e0383..0000000000 --- a/srcpkgs/libuuid/depends +++ /dev/null @@ -1,2 +0,0 @@ -abi_depends=">=1.41.5" -api_depends="${abi_depends}" diff --git a/srcpkgs/libuuid/libuuid-devel.template b/srcpkgs/libuuid/libuuid-devel.template deleted file mode 100644 index 0357a07f10..0000000000 --- a/srcpkgs/libuuid/libuuid-devel.template +++ /dev/null @@ -1,14 +0,0 @@ -# Template file for 'libuuid-devel'. -# -short_desc="${short_desc} (development files)" -long_desc="${long_desc} - - This package contains files for development, headers, static libs, etc." - -Add_dependency run libuuid - -do_install() -{ - mkdir -p ${DESTDIR} - mv ${SRCPKGDESTDIR}/usr ${DESTDIR} -} diff --git a/srcpkgs/libuuid/patches/Makefile_in_only_shlibs.diff b/srcpkgs/libuuid/patches/Makefile_in_only_shlibs.diff deleted file mode 100644 index 20cc59fdd0..0000000000 --- a/srcpkgs/libuuid/patches/Makefile_in_only_shlibs.diff +++ /dev/null @@ -1,13 +0,0 @@ ---- Makefile.in.orig 2009-08-12 11:15:33.768923564 +0200 -+++ Makefile.in 2009-08-12 11:16:29.184473940 +0200 -@@ -288,9 +288,7 @@ ul_libblkid_la = $(top_builddir)/shlibs/ - ul_libuuid_srcdir = $(top_srcdir)/shlibs/uuid/src - ul_libuuid_builddir = $(top_builddir)/shlibs/uuid/src - ul_libuuid_la = $(top_builddir)/shlibs/uuid/src/libuuid.la --SUBDIRS = include disk-utils fdisk getopt lib shlibs login-utils \ -- misc-utils po schedutils sys-utils text-utils tests \ -- $(am__append_1) $(am__append_2) $(am__append_3) -+SUBDIRS = shlibs - RCS_FIND_IGNORE := \( -name SCCS -o -name BitKeeper -o -name .svn -o \ - -name CVS -o -name .pc -o -name .hg -o -name .git \) -prune -o - diff --git a/srcpkgs/libuuid/template b/srcpkgs/libuuid/template deleted file mode 100644 index 0c8812d6aa..0000000000 --- a/srcpkgs/libuuid/template +++ /dev/null @@ -1,18 +0,0 @@ -# Template file for 'libuuid' -pkgname=libuuid -version=2.17.1 -_utilng=util-linux-ng -wrksrc=${_utilng}-${version} -distfiles="${KERNEL_SITE}/utils/${_utilng}/v2.17/${_utilng}-${version}.tar.bz2" -build_style=gnu_configure -configure_args="--disable-mount --disable-fsck --enable-libuuid - --disable-libblkid" -short_desc="UUID library" -maintainer="Juan RP " -checksum=e9c019ea3782dc20b82d27c1240009f9e194304a77ac36f51629a487a5181390 -long_desc=" - libuuid generates and parses 128-bit universally unique id's (UUIDs). - See RFC 4122 for more information," - -subpackages="$pkgname-devel" -Add_dependency run glibc diff --git a/srcpkgs/libblkid/depends b/srcpkgs/util-linux-ng/depends similarity index 100% rename from srcpkgs/libblkid/depends rename to srcpkgs/util-linux-ng/depends diff --git a/srcpkgs/util-linux-ng/libblkid-devel.template b/srcpkgs/util-linux-ng/libblkid-devel.template new file mode 100644 index 0000000000..b82740e408 --- /dev/null +++ b/srcpkgs/util-linux-ng/libblkid-devel.template @@ -0,0 +1,26 @@ +# Template file for 'libblkid-devel'. +# +short_desc="libblkid development files" +long_desc=" + libblkid contains a library to handle device identification + and token extraction. + + This package contains files for development, headers, static libs, etc." + +Add_dependency run zlib-devel +Add_dependency run libuuid-devel +Add_dependency run libblkid + +do_install() +{ + mkdir -p ${DESTDIR}/usr/include/blkid ${DESTDIR}/usr/share/man/man3 \ + ${DESTDIR}/usr/lib/pkgconfig + + mv ${SRCPKGDESTDIR}/usr/include/blkid ${DESTDIR}/usr/include + mv ${SRCPKGDESTDIR}/usr/lib/libblkid.a ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/lib/libblkid.so ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig/blkid.pc \ + ${DESTDIR}/usr/lib/pkgconfig + mv ${SRCPKGDESTDIR}/usr/share/man/man3/libblkid.3 \ + ${DESTDIR}/usr/share/man/man3 +} diff --git a/srcpkgs/util-linux-ng/libblkid.template b/srcpkgs/util-linux-ng/libblkid.template new file mode 100644 index 0000000000..642b261e96 --- /dev/null +++ b/srcpkgs/util-linux-ng/libblkid.template @@ -0,0 +1,16 @@ +# Template file for 'libblkid'. +# +short_desc="Library to handle device identification" +long_desc=" + The libblkid package contains a library to handle device identification + and token extraction." + +Add_dependency run glibc +Add_dependency run zlib +Add_dependency run libuuid + +do_install() +{ + mkdir -p ${DESTDIR}/lib + mv ${SRCPKGDESTDIR}/lib/libblkid.so.* ${DESTDIR}/lib +} diff --git a/srcpkgs/util-linux-ng/libuuid-devel.template b/srcpkgs/util-linux-ng/libuuid-devel.template new file mode 100644 index 0000000000..62676c8761 --- /dev/null +++ b/srcpkgs/util-linux-ng/libuuid-devel.template @@ -0,0 +1,18 @@ +# Template file for 'libuuid-devel'. +# +short_desc="UUID library development files" +long_desc=" + libuuid generates and parses 128-bit universally unique id's (UUIDs). + See RFC 4122 for more information. + + This packages contains files for development, static files, headers, etc." + +Add_dependency run glibc-devel + +do_install() +{ + mkdir -p ${DESTDIR}/usr/share/man + mv ${SRCPKGDESTDIR}/usr/lib ${DESTDIR}/usr + mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr + mv ${SRCPKGDESTDIR}/usr/share/man/man3 ${DESTDIR}/usr/share/man +} diff --git a/srcpkgs/util-linux-ng/libuuid.template b/srcpkgs/util-linux-ng/libuuid.template new file mode 100644 index 0000000000..c3baec82e4 --- /dev/null +++ b/srcpkgs/util-linux-ng/libuuid.template @@ -0,0 +1,14 @@ +# Template file for 'libuuid'. +# +short_desc="UUID library" +long_desc=" + libuuid generates and parses 128-bit universally unique id's (UUIDs). + See RFC 4122 for more information." + +Add_dependency run glibc + +do_install() +{ + mkdir -p ${DESTDIR}/lib + mv ${SRCPKGDESTDIR}/lib/libuuid.so.* ${DESTDIR}/lib +} diff --git a/srcpkgs/util-linux-ng/template b/srcpkgs/util-linux-ng/template index 2d25f5b079..4195f0e8bd 100644 --- a/srcpkgs/util-linux-ng/template +++ b/srcpkgs/util-linux-ng/template @@ -13,6 +13,7 @@ long_desc=" them are utilities for handling file systems, consoles, partitions, and messages." +subpackages="libblkid libblkid-devel libuuid libuuid-devel" # Required by /var/lib/hwclock keep_empty_dirs=yes @@ -25,8 +26,6 @@ Add_dependency run ncursesw Add_dependency build pkg-config Add_dependency build gettext Add_dependency build zlib-devel -Add_dependency build libuuid-devel -Add_dependency build libblkid-devel Add_dependency build ncursesw-devel post_configure() @@ -39,10 +38,6 @@ post_configure() post_install() { - # Remove stuff provided by libuuid and libblkid. - rm -rf ${DESTDIR}/usr/lib ${DESTDIR}/usr/include \ - ${DESTDIR}/lib ${DESTDIR}/usr/share/man/man3 - # Move logger to /bin. install -d -m 755 ${DESTDIR}/bin mv ${DESTDIR}/usr/bin/logger ${DESTDIR}/bin