From c9acfc70f37ed1d8c3b417cad8580f0153b64476 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Thu, 24 May 2012 14:47:47 +0200
Subject: [PATCH] glibc: misc cosmetic changes.

---
 srcpkgs/glibc/glibc-devel.template   |  4 +---
 srcpkgs/glibc/glibc-locales.template |  5 ++---
 srcpkgs/glibc/nscd.template          |  9 +++------
 srcpkgs/glibc/template               | 23 +++++++++--------------
 4 files changed, 15 insertions(+), 26 deletions(-)

diff --git a/srcpkgs/glibc/glibc-devel.template b/srcpkgs/glibc/glibc-devel.template
index 02e7e35792..7ec9e6d760 100644
--- a/srcpkgs/glibc/glibc-devel.template
+++ b/srcpkgs/glibc/glibc-devel.template
@@ -1,13 +1,11 @@
 # Template file for 'glibc-devel'.
 #
-depends="kernel-libc-headers>=3.2.6<3.3 glibc>=2.14.1_5"
+depends="kernel-libc-headers>=3.2.6<3.3 glibc>=$version"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development: headers, static libs, etc."
 
-
-
 do_install() {
 	vmove usr/include usr
 	vmove "usr/lib/*.a" usr/lib
diff --git a/srcpkgs/glibc/glibc-locales.template b/srcpkgs/glibc/glibc-locales.template
index 7bdd5f3a7b..9f8fec7aa6 100644
--- a/srcpkgs/glibc/glibc-locales.template
+++ b/srcpkgs/glibc/glibc-locales.template
@@ -1,13 +1,12 @@
 # Template file for 'glibc-locales'.
 #
+noarch=yes
+conf_files="/etc/default/libc-locales"
 short_desc="${short_desc} (locales)"
 long_desc="${long_desc}
 
  This package contains the ${sourcepkg} locale files, for non US users."
 
-conf_files="/etc/default/libc-locales"
-noarch=yes
-
 do_install() {
 	vmove etc/default etc
 	vmove usr/share/i18n usr/share
diff --git a/srcpkgs/glibc/nscd.template b/srcpkgs/glibc/nscd.template
index 7c1c8db024..7a81703973 100644
--- a/srcpkgs/glibc/nscd.template
+++ b/srcpkgs/glibc/nscd.template
@@ -1,16 +1,13 @@
 # Template file for 'nscd'.
 #
+systemd_services="nscd.service on"
+conf_files="/etc/nscd.conf"
 short_desc="Name Service Cache Daemon"
 long_desc="
  This package contains nscd, a daemon that provides a cache for the
  most common name service requests."
 
-systemd_services="nscd.service on"
-conf_files="/etc/nscd.conf"
-
-
-do_install()
-{
+do_install() {
 	vmove usr/sbin/nscd usr/sbin
 	vinstall ${FILESDIR}/nscd.service 644 lib/systemd/system
 	vinstall ${FILESDIR}/nscd.socket 644 lib/systemd/system
diff --git a/srcpkgs/glibc/template b/srcpkgs/glibc/template
index 3427e9590f..f59e75b47b 100644
--- a/srcpkgs/glibc/template
+++ b/srcpkgs/glibc/template
@@ -2,13 +2,16 @@
 pkgname=glibc
 version=2.14.1
 revision=7
-distfiles="http://ftp.gnu.org/gnu/glibc/glibc-${version}.tar.bz2"
-depends="base-files libgcc glibc-locales"
-makedepends="bison perl"
 short_desc="The GNU C library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnu.org/software/libc"
 license="GPL-2, LGPL-2.1, BSD"
+nostrip_files="ld-$version.so libc-$version.so libpthread-$version.so libthread_db-1.0.so"
+conf_files="/etc/rpc /etc/ld.so.conf /etc/nsswitch.conf"
+subpackages="glibc-devel glibc-locales nscd"
+depends="base-files libgcc glibc-locales"
+makedepends="bison perl"
+distfiles="http://ftp.gnu.org/gnu/glibc/glibc-${version}.tar.bz2"
 checksum=6e85a2fa3ebe6b28103361f09d27eeda37a021f24dab73f34064456d5a715b3b
 long_desc="
  The GNU C Library is the standard system C library for all GNU systems,
@@ -17,14 +20,6 @@ long_desc="
  as C++ and Objective C; the runtime facilities of other programming
  languages use the C library to access the underlying operating system."
 
-build_requires=19
-nostrip_files="ld-${version}.so libc-${version}.so libpthread-${version}.so
-libthread_db-1.0.so"
-conf_files="/etc/rpc /etc/ld.so.conf /etc/nsswitch.conf"
-subpackages="glibc-devel glibc-locales nscd"
-
-
-
 do_configure() {
 	local cflags
 
@@ -38,13 +33,13 @@ do_configure() {
 		echo "CFLAGS=$cflags" >> configparms
 	fi
 
-	SHELL=/bin/bash ../configure ${CONFIGURE_SHARED_ARGS} --with-tls \
+	../configure ${CONFIGURE_SHARED_ARGS} --with-tls \
 		--enable-add-ons=nptl,libidn \
 		--enable-multi-arch --with-__thread \
 		--enable-bind-now --enable-kernel=2.6.27 \
 		--enable-stack-guard-randomization --disable-profile \
 		--without-cvs --without-gd --libexecdir=/usr/lib \
-		--libdir=/usr/lib --with-headers=${XBPS_MASTERDIR}/usr/include
+		--libdir=/usr/lib --with-headers=/usr/include
 }
 
 do_build() {
@@ -57,7 +52,7 @@ do_install() {
 	echo "include /etc/ld.so.conf.d/*.conf" > ${DESTDIR}/etc/ld.so.conf
 
 	cd ${wrksrc}/build
-	make SHELL=/bin/bash install_root=${DESTDIR} install
+	make install_root=${DESTDIR} install
 
 	# create /etc/default/libc-locales
 	vinstall ${FILESDIR}/libc-locales 644 etc/default