xbps-devel: sync with reality.

srcpkgs/xbps-devel/template

@@ -1,8 +1,9 @@
 # Template file for 'xbps'
 pkgname=xbps-devel
 version="$(date +%Y%m%d)"
-build_style=gnu_makefile
-make_install_args="PREFIX= MANDIR=/usr/share/man"
+build_style=configure
+configure_args="--prefix= --includedir=/usr/include
+--datadir=/usr/share --mandir=/usr/share/man --with-pie"
 short_desc="The XBPS package system (development branch)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 long_desc="
@@ -16,15 +17,17 @@ nofetch=yes
 noextract=yes
 
 Add_dependency run glibc
+Add_dependency run zlib
 Add_dependency run libarchive
 Add_dependency run openssl
-Add_dependency build bzr
-Add_dependency build asciidoc
+Add_dependency build mercurial
+Add_dependency build zlib-devel
 Add_dependency build libarchive-devel
 Add_dependency build openssl-devel
 
 do_fetch()
 {
-	msg_normal "Fetching source from launchpad:xbps head branch..."
-	bzr branch lp:xbps ${pkgname}-${version} 2>/dev/null || return 1
+	msg_normal "Fetching source from http://xbps.googlecode.com/hg..."
+	hg clone http://xbps.googlecode.com/hg \
+		${pkgname}-${version} 2>/dev/null || return 1
 }

srcpkgs/xbps-devel/xbps-devel-static.template

@@ -11,7 +11,7 @@ replaces="xbps-static"
 do_install()
 {
 	mkdir -p ${DESTDIR}/sbin ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/include ${DESTDIR}/usr/include
+	mv ${SRCPKGDESTDIR}/include ${DESTDIR}/usr
 	mv ${SRCPKGDESTDIR}/sbin/*.static ${DESTDIR}/sbin
 	mv ${SRCPKGDESTDIR}/lib/*.a ${DESTDIR}/usr/lib
 }