util-linux: cross build support; remove long_desc.

srcpkgs/util-linux/libblkid-devel.template

@@ -3,11 +3,6 @@
 noarch=yes
 depends="zlib-devel libuuid-devel-${version}_${revision} libblkid-${version}_${revision}"
 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."
 
 do_install() {
 	vmove usr/include/blkid usr/include

srcpkgs/util-linux/libblkid.template

@@ -1,9 +1,6 @@
 # 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."
 
 do_install() {
 	vmove "usr/lib/libblkid.so*" usr/lib

srcpkgs/util-linux/libmount-devel.template

@@ -3,12 +3,6 @@
 noarch=yes
 depends="libblkid-devel-${version}_${revision} libmount-${version}_${revision}"
 short_desc="mount(8) library development files"
-long_desc="
- This NEW LIBRARY is designed to be used in low-level utils like
- mount(8) and /sbin/mount.<type> helpers as well as in some other
- projects.
- 
- This packages contains files for development, static files, headers, etc."
 
 do_install() {
 	mkdir -p ${DESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/include

srcpkgs/util-linux/libmount.template

@@ -1,10 +1,6 @@
 # Template file for 'libmount'.
 #
 short_desc="A mount(8) library"
-long_desc="
- This NEW LIBRARY is designed to be used in low-level utils like
- mount(8) and /sbin/mount.<type> helpers as well as in some other
- projects."
 
 do_install() {
 	vmove "usr/lib/libmount.so*" usr/lib

srcpkgs/util-linux/libuuid-devel.template

@@ -3,11 +3,6 @@
 noarch=yes
 depends="libuuid-${version}_${revision}"
 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."
 
 do_install() {
 	vmove usr/lib/pkgconfig usr/lib

srcpkgs/util-linux/libuuid.template

@@ -1,9 +1,6 @@
 # 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."
 
 do_install() {
 	vmove "usr/lib/libuuid.so*" usr/lib

srcpkgs/util-linux/template

@@ -1,7 +1,7 @@
 # Template file for 'util-linux'
 pkgname=util-linux
 version=2.22.2
-revision=5
+revision=6
 conflicts="chroot-util-linux>=0"
 depends="coreutils shadow>=4.1.5.1_3"
 makedepends="pkg-config zlib-devel ncurses-devel pam-devel"
@@ -14,10 +14,6 @@ homepage="http://userweb.kernel.org/~kzak/util-linux-ng"
 license="GPL-2"
 distfiles="${KERNEL_SITE}/utils/${pkgname}/v2.22/${pkgname}-${version}.tar.xz"
 checksum=929b517fa39b16a61ec536514e08940a381b92befc629d0348e3097920dd2f12
-long_desc="
- The ${pkgname} package contains miscellaneous utility programs. Among
- them are utilities for handling file systems, consoles, partitions,
- and messages."
 
 # Create uuidd system account for uuidd.
 system_accounts="uuidd"
@@ -31,8 +27,18 @@ conf_files="
 /etc/pam.d/su-l
 /etc/pam.d/login"
 
+if [ -n "$XBPS_CROSS_TRIPLET" ]; then
+	makedepends="automake gettext-devel pkg-config"
+	crossmakedepends="zlib-devel ncurses-devel pam-devel>=1.1.6_3"
+	_confargs="PKG_CONFIG_LIB_DIR=/usr/$XBPS_CROSS_TRIPLET/lib/pkgconfig"
+	pre_configure() {
+		./autogen.sh
+	}
+fi
+
 do_configure() {
-	./configure --prefix=/usr --exec-prefix=/usr --libdir=/usr/lib \
+	./configure ${CONFIGURE_SHARED_ARGS} \
+		--exec-prefix=/usr --libdir=/usr/lib \
 		--bindir=/usr/bin --sbindir=/usr/sbin \
 		--enable-libuuid --disable-makeinstall-chown \
 		--enable-libblkid --enable-fsck --disable-rpath \
@@ -40,7 +46,7 @@ do_configure() {
 		--enable-vipw --enable-newgrp --enable-chfn-chsh \
 		--with-systemdsystemunitdir=/usr/lib/systemd/system \
 		--without-udev --enable-write --disable-kill \
-		--enable-socket-activation --disable-static \
+		--enable-socket-activation --disable-static ${_confargs} \
 		SUID_CFLAGS="-fPIE" SUID_LDFLAGS="-pie"
 }