Major infrastructure changes, part 2.

* Moved helpers, common and triggers dirs into xbps-src, where
  they belong.
* Renamed the templates dir to srcpkgs, it was so redundant before.
* Make it possible to add subpkgs with no restriction in names, for
  example udev now has a subpkgs called "libgudev". Previously
  subpkgs were named "${sourcepkg}-${pkgname}".
* xbps-src: changed to look for template files in current directory.
  That means that most arguments from the targets have been removed.
* xbps-src: added a reinstall target, to remove + install.
* xbps-src: do not overwrite binpkgs by default, skip them.

And more that I forgot because it's a mega-commit that I've been
working for some days already...

--HG--
extra : convert_revision : 0f466878584d1e6895d2a234f07ea1b2d1e61b3e

srcpkgs/glibc/depends

@@ -0,0 +1,2 @@
+abi_depends=">=2.8"
+api_depends="${abi_depends}"

srcpkgs/glibc/glibc-devel.template

@@ -0,0 +1,22 @@
+# Template file for 'glibc-devel'.
+#
+short_desc="${short_desc} (development files)"
+long_desc="${long_desc}
+
+ This package contains files for development: headers, static libs, etc."
+
+Add_dependency run glibc
+
+revision=1
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
+	mv ${SRCPKGDESTDIR}/usr/lib/*.a ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/*.so ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/*crt1.o ${DESTDIR}/usr/lib
+
+	# Remove scsi.h, it's installed by kernel-libc-headers.
+	rm -f ${DESTDIR}/usr/include/scsi/scsi.h
+}

srcpkgs/glibc/glibc-locales.template

@@ -0,0 +1,15 @@
+# Template file for 'glibc-locales'.
+#
+short_desc="${short_desc} (locales)"
+long_desc="${long_desc}
+
+ This package contains the ${sourcepkg} locale files, for non US users."
+
+noarch=yes
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/share
+	mv ${SRCPKGDESTDIR}/usr/share/i18n ${DESTDIR}/usr/share
+	mv ${SRCPKGDESTDIR}/usr/share/locale ${DESTDIR}/usr/share
+}

srcpkgs/glibc/patches/disable_timezone.diff

@@ -0,0 +1,11 @@
+--- Makeconfig.orig	2009-06-07 06:17:04.561863100 +0200
++++ Makeconfig	2009-06-07 06:17:43.384890260 +0200
+@@ -918,7 +918,7 @@ all-subdirs = csu assert ctype locale in
+ 	      stdlib stdio-common libio malloc string wcsmbs time dirent    \
+ 	      grp pwd posix io termios resource misc socket sysvipc gmon    \
+ 	      gnulib iconv iconvdata wctype manual shadow gshadow po argp   \
+-	      crypt nss localedata timezone rt conform debug		    \
++	      crypt nss localedata rt conform debug		    \
+ 	      $(add-on-subdirs) $(dlfcn) $(binfmt-subdir)
+ 
+ ifndef avoid-generated

srcpkgs/glibc/patches/xattr.h-dupdefs.diff

@@ -0,0 +1,12 @@
+--- misc/sys/xattr.h.orig	2009-04-24 15:56:12.517504626 +0200
++++ misc/sys/xattr.h	2009-04-24 15:56:27.825593128 +0200
+@@ -30,9 +30,7 @@ __BEGIN_DECLS
+ enum
+ {
+   XATTR_CREATE = 1,	/* set value, fail if attr already exists.  */
+-#define XATTR_CREATE	XATTR_CREATE
+   XATTR_REPLACE = 2	/* set value, fail if attr does not exist.  */
+-#define XATTR_REPLACE	XATTR_REPLACE
+ };
+ 
+ /* Set the attribute NAME of the file pointed to by PATH to VALUE (which

srcpkgs/glibc/template

@@ -0,0 +1,86 @@
+# Template file for 'glibc'
+pkgname=glibc
+version=2.11
+revision=1
+distfiles="http://ftp.gnu.org/gnu/glibc/glibc-${version}.tar.bz2"
+build_style=gnu_configure
+configure_script="../configure"
+configure_args="--with-tls -disable-profile --with-__thread
+ --enable-kernel=2.6.27 --enable-add-ons --without-gd
+ --without-cvs --without-selinux --libexecdir=/usr/lib
+ --libdir=/usr/lib --enable-stackguard-randomization
+ --with-headers=$XBPS_MASTERDIR/usr/include"
+make_install_target="install_root=$XBPS_DESTDIR/$pkgname-$version install"
+short_desc="The GNU C library"
+maintainer="Juan RP <xtraeme@gmail.com>"
+checksum=9ef10e498fac4acc458029898fd8fa76c3cedee1f63d23fedf0c579c505ed62c
+long_desc="
+ The GNU C Library is the standard system C library for all GNU systems,
+ and is an important part of what makes up a GNU system.  It provides the
+ system API for all programs written in C and C-compatible languages such
+ as C++ and Objective C; the runtime facilities of other programming
+ languages use the C library to access the underlying operating system."
+
+essential=yes
+base_chroot=yes
+conf_files="/etc/rpc /etc/ld.so.conf /etc/nsswitch.conf"
+subpackages="glibc-devel glibc-locales"
+
+Add_dependency build	gcc
+Add_dependency build	kernel-libc-headers
+Add_dependency run	xbps-base-files
+Add_dependency run	libgcc
+Add_dependency run	glibc-locales
+
+pre_configure()
+{
+	# We must configure it in another directory.
+	wrksrc=$wrksrc/build_obj
+	mkdir -p $wrksrc
+	echo "slibdir=/lib" > $wrksrc/configparms
+	# glibc fails to build if -march not set for a minimal cpu.
+	if [ "$xbps_machine" != "x86_64" ]; then
+		echo "CFLAGS+=-march=${xbps_machine%%-*} -mtune=generic" \
+			>> $wrksrc/configparms
+	fi
+}
+
+pre_install()
+{
+	# Create DESTDIR/etc/ld.so.conf
+	mkdir -p ${DESTDIR}/etc
+	echo "/usr/local/lib" > ${DESTDIR}/etc/ld.so.conf
+}
+
+post_install()
+{
+	# Replace hardcoded path to bash.
+	. $XBPS_HELPERSDIR/replace-interpreter.sh
+	replace_interpreter bash ${DESTDIR}/usr/bin/ldd
+
+	# On x86_64, add dynamic linker's 32bit version to ldd.
+	if [ "$xbps_machine" = "x86_64" ]; then
+		rtldlist="/lib/ld-linux.so.2 /lib/ld-linux-x86-64.so.2"
+		sed -i "s|^RTLDLIST.*$|RTLDLIST=\"$rtldlist\"|" \
+			${DESTDIR}/usr/bin/ldd
+	fi
+
+	# Create nsswitch.conf
+	( 				\
+	echo "passwd: files";		\
+	echo "group: files";		\
+	echo "shadow: files";		\
+	echo;				\
+	echo "hosts: files dns";	\
+	echo "networks: files";		\
+	echo;				\
+	echo "protocols: files";	\
+	echo "services: files";		\
+	echo "ethers: files";		\
+	echo "rpc: files";		\
+	) > ${DESTDIR}/etc/nsswitch.conf
+
+	rm -f ${DESTDIR}/etc/ld.so.cache
+
+	wrksrc=${wrksrc%%/build_obj}
+}