From 6a187c429b7c17fde1bf2650cee9176844618dfe Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Fri, 25 May 2012 14:55:45 +0200
Subject: [PATCH] xbps-devel: misc cosmetic changes.

---
 srcpkgs/xbps-devel/template                   | 19 +++++++------------
 srcpkgs/xbps-devel/xbps-devel-static.template |  6 ++----
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/srcpkgs/xbps-devel/template b/srcpkgs/xbps-devel/template
index 5ae11ec3881..35145c44224 100644
--- a/srcpkgs/xbps-devel/template
+++ b/srcpkgs/xbps-devel/template
@@ -1,11 +1,16 @@
 # Template file for 'xbps'
 pkgname=xbps-devel
 version="$(date -u +%Y%m%d)"
+nofetch=yes
+noextract=yes
 build_style=configure
-configure_args="--prefix=/ --exec-prefix=/usr --sbindir=/usr/sbin
---with-pie --with-tests"
+configure_args="--prefix=/ --exec-prefix=/usr --sbindir=/usr/sbin --with-pie --with-tests"
 depends="xbps-triggers"
 makedepends="git which pkg-config zlib-devel proplib-devel openssl-devel libarchive-devel libfetch-devel confuse-devel atf-devel"
+conf_files="/etc/xbps/xbps.conf"
+subpackages="$pkgname-static"
+provides="xbps-9999"
+replaces="xbps>=0"
 short_desc="The XBPS package system (development branch)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://code.google.com/p/xbps"
@@ -15,16 +20,6 @@ long_desc="
  binary package manager. This packages includes code from a development
  branch available from https://github.com/xtraeme/xbps"
 
-build_requires=11
-conf_files="/etc/xbps/xbps.conf"
-subpackages="$pkgname-static"
-provides="xbps-9999"
-replaces="xbps>=0"
-nofetch=yes
-noextract=yes
-
-
-
 do_fetch() {
 	local url="git://github.com/xtraeme/xbps"
 	msg_normal " Fetching source from $url ...\n"
diff --git a/srcpkgs/xbps-devel/xbps-devel-static.template b/srcpkgs/xbps-devel/xbps-devel-static.template
index d5eac99f281..3b077f90857 100644
--- a/srcpkgs/xbps-devel/xbps-devel-static.template
+++ b/srcpkgs/xbps-devel/xbps-devel-static.template
@@ -1,5 +1,7 @@
 # Template file for 'xbps-devel-static'.
 #
+provides="xbps-static-9999"
+replaces="xbps-static>=0"
 depends="xbps-triggers"
 short_desc="${sourcepkg} static binaries"
 long_desc="${long_desc}
@@ -7,10 +9,6 @@ long_desc="${long_desc}
  This package contains the static binaries and library, that can be
  used on any GNU/Linux distribution matching the architecture."
 
-provides="xbps-static-9999"
-replaces="xbps-static>=0"
-
-
 do_install() {
 	vmove usr/include usr
 	vmove "usr/sbin/*.static" usr/sbin