Convert packages to the new template format (x).

srcpkgs/x11perf/template

@@ -1,16 +1,22 @@
 # Template build file for 'x11perf'.
 pkgname=x11perf
 version=1.5.2
-distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-build_style=gnu-configure
 revision=2
-makedepends="pkg-config libXext-devel libXft-devel libXmu-devel"
+build_style=gnu-configure
+hostmakedepends="pkg-config"
+makedepends="libXext-devel libXft-devel libXmu-devel"
 short_desc="X11 server performance test program"
 homepage="http://xorg.freedesktop.org"
 license="MIT"
 maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
 checksum=a1fd752abd3496568614c2f2209d21452bdd5b8c9a5c14a5705725bd8c298e12
 long_desc="
  The x11perf program runs one or more performance tests and reports how
  fast an X server can execute the tests."
 
+x11perf_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/x264/template

@@ -4,7 +4,6 @@ _snap_date=20120126
 _snap_rev=2245
 version="${_snap_date}.${_snap_rev}"
 revision=3
-subpackages="x264-devel"
 wrksrc="x264-snapshot-${_snap_date}-${_snap_rev}-stable"
 hostmakedepends="yasm"
 short_desc="Free library for encoding H264/AVC video streams"
@@ -37,3 +36,19 @@ do_install() {
 	# Set version as 0.120.0 in pkg-config file.
 	sed -i -e "s|0.120.x|0.120.0|g" ${DESTDIR}/usr/lib/pkgconfig/x264.pc
 }
+
+x264-devel_package() {
+	depends="x264>=${version}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+	}
+}
+
+x264_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/x264/x264-devel.template

@@ -1,10 +0,0 @@
-# Template file for 'x264-devel'.
-#
-depends="x264>=${version}"
-short_desc="${short_desc} -- development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-	vmove "usr/lib/*.a" usr/lib
-}

srcpkgs/xapian-core/libxapian.template

@@ -1,10 +0,0 @@
-# Template file for 'libxapian'.
-#
-short_desc="${short_desc} -- runtime library"
-long_desc="${long_desc}
-
- This package contains the runtime libraries."
-
-do_install() {
-	vmove "usr/lib/*.so*" usr/lib
-}

srcpkgs/xapian-core/template

@@ -1,11 +1,10 @@
 # Template file for 'xapian-core'
 pkgname=xapian-core
 version=1.2.12
-revision=1
+revision=2
 build_style=gnu-configure
 makedepends="libuuid-devel"
 configure_args="--disable-static"
-subpackages="${pkgname}-devel libxapian"
 short_desc="Open source search engine"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.xapian.org/"
@@ -19,3 +18,30 @@ long_desc="
 
 # xapian-config needs the .la
 keep_libtool_archives=yes
+
+xapian-core-devel_package() {
+	depends="libxapian>=${version}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/share/doc
+		vmove usr/share/aclocal
+		vmove usr/lib/cmake
+		vmove "usr/lib/*.la"
+		vmove usr/bin/xapian-config
+		vmove usr/share/man/man1/xapian-config.1
+	}
+}
+
+libxapian_package() {
+	short_desc="${short_desc} -- runtime library"
+	pkg_install() {
+		vmove "usr/lib/*.so*"
+	}
+}
+
+xapian-core_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/xapian-core/xapian-core-devel.template

@@ -1,18 +0,0 @@
-# Template file for 'xapian-core-devel'.
-#
-noarch=yes
-depends="libxapian>=${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/share/doc usr/share
-	vmove usr/share/aclocal usr/share
-	vmove usr/lib/cmake usr/lib
-	vmove "usr/lib/*.la" usr/lib
-	vmove usr/bin/xapian-config usr/bin
-	vmove usr/share/man/man1/xapian-config.1 usr/share/man/man1
-}

srcpkgs/xar/template

@@ -1,8 +1,7 @@
 # Template file for 'xar'
 pkgname=xar
 version=1.5.2
-revision=1
+revision=2
-subpackages="xar-devel"
 build_style=gnu-configure
 configure_args="--disable-static"
 makedepends="acl-devel libxml2-devel openssl-devel"
@@ -25,3 +24,17 @@ long_desc="
 post_install() {
 	vinstall LICENSE 644 usr/share/licenses/xar
 }
+
+xar-devel_package() {
+	depends="xar>=$version"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+	}
+}
+
+xar_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/xar/xar-devel.template

@@ -1,12 +0,0 @@
-# Template file for 'xar-devel'.
-#
-noarch=yes
-depends="xar>=$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
-}

srcpkgs/xarchiver/template

@@ -2,14 +2,14 @@
 pkgname=xarchiver
 version=0.5.2
 revision=3
-distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
-makedepends="pkg-config intltool glib-devel pango-devel gdk-pixbuf-devel gtk+-devel"
+hostmakedepends="pkg-config intltool"
-fulldepends="xdg-utils desktop-file-utils hicolor-icon-theme"
+makedepends="gtk+-devel xdg-utils desktop-file-utils hicolor-icon-theme"
 short_desc="GTK+2 lightweight desktop independent archive manager"
 homepage="http://xarchiver.sourceforge.net/"
 license="GPL-2"
 maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2"
 checksum=cea932ff9d505969201fd502470bbebbc5726ab3d6765e142fc8295aa677ad2a
 long_desc="
  Xarchiver is a lightweight desktop independent archive manager built with
@@ -19,6 +19,9 @@ long_desc="
  to be fast and easy-to-use. Its user interface is clean and intuitive, and
  does not include any confusing or useless options."
 
-
+xarchiver_package() {
-
+	depends="xdg-utils desktop-file-utils hicolor-icon-theme"
-
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/xauth/template

@@ -2,13 +2,14 @@
 pkgname=xauth
 version=1.0.6
 revision=2
-homepage="http://xorg.freedesktop.org/"
-distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
-makedepends="pkg-config xtrans libXau-devel libXext-devel libXmu-devel"
+hostmakedepends="pkg-config"
+makedepends="xtrans libXau-devel libXext-devel libXmu-devel"
 short_desc="X authentication utility"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="MIT"
+homepage="http://xorg.freedesktop.org/"
+distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
 checksum=a686406951f0ed6be45bc26182a1423e2cdffad2d492b33ff3fbf72f7bcb6b0b
 long_desc="
  This package provides xauth, a program to display and manipulate the
@@ -16,3 +17,8 @@ long_desc="
 
  This is from the modular X.org X11 project."
 
+xauth_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/xbacklight/template

@@ -1,19 +1,23 @@
 # Template build file for 'xbacklight'.
 pkgname=xbacklight
 version=1.1.2
-distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-build_style=gnu-configure
 revision=2
-makedepends="pkg-config libX11-devel libXrandr-devel"
+build_style=gnu-configure
+hostmakedepends="pkg-config"
+makedepends="libX11-devel libXrandr-devel"
 short_desc="Adjust backlight brightness using RandR extension"
 homepage="http://xorg.freedesktop.org"
 license="MIT"
 maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
 checksum=af2f02d09de8a19848e3f3b322320141bceebf9d4097b7bd505457a1bd936509
 long_desc="
  Xbacklight is used to adjust the backlight brightness where supported.
  It finds all outputs on the X server supporting backlight brightness
- control and changes them all in the same way.
+ control and changes them all in the same way."
-
- This is from the modular X.org X11 project."
 
+xbacklight_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/xbitmaps/template

@@ -1,17 +1,20 @@
 # Template build file for 'xbitmaps'.
 pkgname=xbitmaps
 version=1.0.1
-distfiles="${XORG_SITE}/data/$pkgname-$version.tar.bz2"
+revision=3
 build_style=gnu-configure
-revision=2
 short_desc="Common X11 bitmaps"
 homepage="http://xorg.freedesktop.org"
 license="MIT"
 maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="${XORG_SITE}/data/$pkgname-$version.tar.bz2"
 checksum=5aa5be594e77f772b85d39f0c25f61a61c7f6fa02ba940e614c5ee386deeb867
 long_desc="
- This package contains the common X11 bitmaps for direct inclusion in C.
+ This package contains the common X11 bitmaps for direct inclusion in C."
 
- This is from the modular X.org project."
+xbitmaps_package() {
-
+	noarch="yes"
-noarch=yes
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/xbmc/template

@@ -12,10 +12,6 @@ checksum=29e3f36e1884913088f786179a4c925f52e46e9ba7bf8f24e35e934177c01ec3
 disable_debug=yes
 broken_as_needed=yes
 
-# The following dependencies are dlopen(3)ed.
-depends="libbluray libmad libogg libcurl libflac libmodplug libass
- libmpeg2 lame librtmp libnfs libplist"
-
 # XXX add support for webserver (microhttpd), afp and libcec.
 fulldepends="udisks upower hicolor-icon-theme desktop-file-utils mesa-demos"
 
@@ -62,3 +58,14 @@ do_install() {
 
 	rm -f ${DESTDIR}/usr/share/icons/hicolor/icon-theme.cache
 }
+
+xbmc_package() {
+	# The following dependencies are dlopen(3)ed.
+	depends="libbluray libmad libogg libcurl libflac libmodplug libass
+		libmpeg2 lame librtmp libnfs libplist
+		udisks upower hicolor-icon-theme desktop-file-utils
+		mesa-demos"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/xbps-git/libxbps-devel-git.template

@@ -1,13 +0,0 @@
-# Template file for 'libxbps'.
-#
-short_desc="${short_desc} - runtime library (development files)"
-depends="zlib-devel proplib-devel confuse-devel libfetch-devel
- libarchive-devel libxbps>=${version}"
-provides="libxbps-devel-${version}"
-replaces="libxbps-devel>=0"
-
-do_install() {
-	vmove usr/include usr
-	vmove "usr/lib/*.a" usr/lib
-	vmove usr/lib/pkgconfig usr/lib
-}

srcpkgs/xbps-git/libxbps-git.template

@@ -1,9 +0,0 @@
-# Template file for 'libxbps'.
-#
-short_desc="${short_desc} - runtime library"
-provides="libxbps-${version}"
-replaces="libxbps>=0 xbps-devel>=0"
-
-do_install() {
-	vmove "usr/lib/*.so*" usr/lib
-}

srcpkgs/xbps-git/template

@@ -12,18 +12,65 @@ license="Simplified BSD"
 
 nofetch=yes
 noextract=yes
-provides="xbps-${version}"
-replaces="xbps>=0 xbps-devel>=0"
-conf_files="/etc/xbps/xbps.conf"
-subpackages="libxbps-git libxbps-devel-git xbps-static-git xbps-tests-git"
-
 do_fetch() {
 	local url="git://github.com/xtraeme/xbps"
 	msg_normal "Fetching source from $url ...\n"
 	git clone ${url} ${pkgname}-${version}
 }
 
-depends="xbps-triggers libxbps-git-${version}_${revision}"
 hostmakedepends="which pkg-config"
 makedepends="zlib-devel proplib-devel openssl-devel libfetch-devel
  libarchive-devel>=3.1.2 confuse-devel atf-devel"
+
+libxbps-git_package() {
+	short_desc="${short_desc} - runtime library"
+	provides="libxbps-${version}"
+	replaces="libxbps>=0 xbps-devel>=0"
+	pkg_install() {
+		vmove "usr/lib/*.so*"
+	}
+}
+
+libxbps-devel-git_package() {
+	short_desc="${short_desc} - runtime library (development files)"
+	depends="zlib-devel proplib-devel confuse-devel libfetch-devel
+		libarchive-devel libxbps>=${version}"
+	provides="libxbps-devel-${version}"
+	replaces="libxbps-devel>=0"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove usr/lib/pkgconfig
+	}
+}
+
+xbps-static-git_package() {
+	provides="xbps-static-${version}"
+	replaces="xbps-static>=0 xbps-devel-static>=0"
+	depends="xbps-triggers"
+	short_desc+=" -- static binaries"
+	pkg_install() {
+		vmove "usr/sbin/*.static"
+	}
+}
+
+xbps-tests-git_package() {
+	short_desc="${short_desc} - Kyua testsuite"
+	depends="libxbps>=${version}"
+	provides="xbps-tests-${version}"
+	replaces="xbps-tests>=0"
+	pkg_install() {
+		vmove usr/tests
+	}
+}
+
+xbps-git_package() {
+	provides="xbps-${version}"
+	replaces="xbps>=0 xbps-devel>=0"
+	conf_files="/etc/xbps/xbps.conf"
+	depends="xbps-triggers libxbps-git-${version}_${revision}"
+	pkg_install() {
+		vmove etc
+		vmove usr
+	}
+}

srcpkgs/xbps-git/xbps-static-git.template

@@ -1,10 +0,0 @@
-# Template file for 'xbps-devel-static'.
-#
-provides="xbps-static-${version}"
-replaces="xbps-static>=0 xbps-devel-static>=0"
-depends="xbps-triggers"
-short_desc="${sourcepkg} static binaries"
-
-do_install() {
-	vmove "usr/sbin/*.static" usr/sbin
-}

srcpkgs/xbps-git/xbps-tests-git.template

@@ -1,10 +0,0 @@
-# Template file for 'xbps-tests'.
-#
-short_desc="${short_desc} - Kyua testsuite"
-depends="libxbps>=${version}"
-provides="xbps-tests-${version}"
-replaces="xbps-tests>=0"
-
-do_install() {
-	vmove usr/tests usr
-}

srcpkgs/xbps-src-utils/template

@@ -3,9 +3,8 @@ pkgname=xbps-src-utils
 version=20130321
 revision=1
 homepage="https://github.com/davehome/xbps-src-utils"
-depends="libxbps>=0.21"
 hostmakedepends="pkg-config flex"
-makedepends="libfl-devel libxbps-devel>=0.21"
+makedepends="libxbps-devel>=0.21"
 short_desc="Various tools for xbps-src in C (like repo-checkvers)"
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="Simplified BSD"
@@ -20,6 +19,10 @@ long_desc="
 nofetch=yes
 noextract=yes
 
+if [ "$CROSS_BUILD" ]; then
+	makedepends+=" libfl-devel"
+fi
+
 do_fetch() {
 	local url="git://github.com/davehome/xbps-src-utils.git"
 	msg_normal " Fetching source from $url ...\n"
@@ -40,3 +43,10 @@ do_build() {
 do_install() {
 	make DESTDIR=${DESTDIR} install
 }
+
+xbps-src-utils_package() {
+	depends="libxbps>=0.21"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/xbps-src/template

@@ -5,7 +5,6 @@ revision=1
 build_style=gnu-makefile
 make_build_args="PREFIX=/usr ETCDIR=/etc/xbps"
 make_install_args="PREFIX=/usr ETCDIR=/etc/xbps"
-conf_files="/etc/xbps/xbps-src.conf"
 short_desc="The XBPS package system - binary package builder"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://code.google.com/p/xbps"
@@ -13,11 +12,18 @@ license="GPL-2"
 
 nofetch=yes
 noextract=yes
-depends="bash xbps-triggers>=0.54 fakeroot"
-replaces="xbps-src-git>=0"
 
 do_fetch() {
 	local url="git://github.com/xtraeme/xbps-src"
 	msg_normal "Fetching source from $url ...\n"
 	git clone ${url} ${pkgname}-${version}
 }
+
+xbps-src_package() {
+	conf_files="/etc/xbps/xbps-src.conf"
+	replaces="xbps-src-git>=0"
+	depends="bash xbps-triggers>=0.54 fakeroot"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/xbps/libxbps-devel.template

@@ -1,12 +0,0 @@
-# Template file for 'libxbps-devel'.
-#
-short_desc="${short_desc} - runtime library (development files)"
-depends="zlib-devel proplib-devel confuse-devel libfetch-devel
- libarchive-devel libxbps>=${version}"
-replaces="xbps-static<0.16.3_2 libxbps-devel>=0"
-
-do_install() {
-	vmove usr/include usr
-	vmove "usr/lib/*.a" usr/lib
-	vmove usr/lib/pkgconfig usr/lib
-}

srcpkgs/xbps/libxbps.template

@@ -1,8 +0,0 @@
-# Template file for 'libxbps'.
-#
-short_desc="${short_desc} - runtime library"
-replaces="xbps<0.16.3_2 libxbps>=0"
-
-do_install() {
-	vmove "usr/lib/*.so*" usr/lib
-}

srcpkgs/xbps/template

@@ -5,16 +5,59 @@ revision=4
 build_style=configure
 configure_args="--prefix=/ --exec-prefix=/usr --sbindir=/usr/sbin
  --enable-static --enable-debug --enable-tests"
-depends="xbps-triggers"
 hostmakedepends="which pkg-config"
 makedepends="zlib-devel proplib-devel>=0.6.3 openssl-devel
  libfetch-devel libarchive-devel>=3.1.2 confuse-devel atf-devel"
-conf_files="/etc/xbps/xbps.conf"
-subpackages="libxbps libxbps-devel xbps-static xbps-tests"
-replaces="xbps>=0"
 short_desc="The XBPS package system utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://code.google.com/p/xbps"
 license="Simplified BSD"
 distfiles="http://xbps.googlecode.com/files/xbps-$version.tar.gz"
 checksum=717cd34e0ee42215e23d32e00098d64493488a247b631384fa233f12e647f6ca
+
+libxbps_package() {
+	short_desc="${short_desc} - runtime library"
+	replaces="xbps<0.16.3_2 libxbps>=0"
+	pkg_install() {
+		vmove "usr/lib/*.so*"
+	}
+}
+
+libxbps-devel_package() {
+	short_desc="${short_desc} - runtime library (development files)"
+	depends="zlib-devel proplib-devel confuse-devel libfetch-devel
+		libarchive-devel libxbps>=${version}"
+	replaces="xbps-static<0.16.3_2 libxbps-devel>=0"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove usr/lib/pkgconfig
+	}
+}
+
+xbps-static_package() {
+	depends="xbps-triggers"
+	short_desc="${short_desc} - static binaries"
+	replaces="xbps-static>=0"
+	pkg_install() {
+		vmove "usr/sbin/*.static"
+	}
+}
+
+xbps-tests_package() {
+	short_desc="${short_desc} - Kyua testsuite"
+	replaces="xbps<0.16.3_2 xbps-tests>=0"
+	pkg_install() {
+		vmove usr/tests
+	}
+}
+
+xbps_package() {
+	depends="xbps-triggers"
+	conf_files="/etc/xbps/xbps.conf"
+	replaces="xbps>=0"
+	pkg_install() {
+		vmove etc
+		vmove usr
+	}
+}

srcpkgs/xbps/xbps-static.template

@@ -1,9 +0,0 @@
-# Template file for 'xbps-static'.
-#
-depends="xbps-triggers"
-short_desc="${short_desc} - static binaries"
-replaces="xbps-static>=0"
-
-do_install() {
-	vmove "usr/sbin/*.static" usr/sbin
-}

srcpkgs/xbps/xbps-tests.template

@@ -1,8 +0,0 @@
-# Template file for 'xbps-tests'.
-#
-short_desc="${short_desc} - Kyua testsuite"
-replaces="xbps<0.16.3_2 xbps-tests>=0"
-
-do_install() {
-	vmove usr/tests usr
-}

srcpkgs/xcb-util-image/template

@@ -1,10 +1,11 @@
 # Template build for 'xcb-util-image'.
 pkgname=xcb-util-image
 version=0.3.9
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-static"
-makedepends="pkg-config libxcb-devel>=1.8 xcb-util-devel>=0.3.9"
+hostmakedepends="pkg-config"
+makedepends="libxcb-devel>=1.8 xcb-util-devel>=0.3.9"
 short_desc="Utility libraries for XC Binding - Port of Xlib's XImage and XShmImage functions"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://xcb.freedesktop.org"
@@ -14,5 +15,18 @@ checksum=d35a3c0eaae171f5081ec127fb9cec174b716ce5d78196a87f2785376da021df
 long_desc="
  This package provides a port of Xlib's XImage and XShmImage functions for XCB."
 
-subpackages="$pkgname-devel"
+xcb-util-image-devel_package() {
-replaces="xcb-util<0.3.9"
+	depends="libxcb-devel xcb-util-image>=${version}"
+	short_desc="${sourcepkg} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+	}
+}
+
+xcb-util-image_package() {
+	replaces="xcb-util<0.3.9"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/xcb-util-image/xcb-util-image-devel.template

@@ -1,13 +0,0 @@
-# Template file for 'xcb-util-image-devel'.
-#
-noarch=yes
-depends="libxcb-devel xcb-util-image>=${version}"
-short_desc="${sourcepkg} -- 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/pkgconfig usr/lib
-}

srcpkgs/xcb-util-keysyms/template

@@ -1,10 +1,11 @@
 # Template build for 'xcb-util-keysyms'.
 pkgname=xcb-util-keysyms
 version=0.3.9
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static"
-makedepends="pkg-config libxcb-devel>=1.8 xcb-util-devel>=0.3.9"
+hostmakedepends="pkg-config"
+makedepends="libxcb-devel>=1.8 xcb-util-devel>=0.3.9"
 short_desc="Utility libraries for XC Binding - Standard X key constants and conversion to/from keycodes"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://xcb.freedesktop.org"
@@ -15,5 +16,18 @@ long_desc="
  This package provides a port for Standard X key constants and conversion
  to/from keycodes for XCB."
 
-subpackages="$pkgname-devel"
+xcb-util-keysyms-devel_package() {
-replaces="xcb-util<0.3.9"
+	depends="libxcb-devel xcb-util-keysyms>=${version}"
+	short_desc="${sourcepkg} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+	}
+}
+
+xcb-util-keysyms_package() {
+	replaces="xcb-util<0.3.9"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/xcb-util-keysyms/xcb-util-keysyms-devel.template

@@ -1,13 +0,0 @@
-# Template file for 'xcb-util-keysyms-devel'.
-#
-noarch=yes
-depends="libxcb-devel xcb-util-keysyms>=${version}"
-short_desc="${sourcepkg} -- 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/pkgconfig usr/lib
-}

srcpkgs/xcb-util-wm/template

@@ -1,10 +1,11 @@
 # Template build for 'xcb-util-wm'.
 pkgname=xcb-util-wm
 version=0.3.9
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static"
-makedepends="pkg-config libxcb-devel>=1.8 xcb-util-devel>=0.3.9"
+hostmakedepends="pkg-config"
+makedepends="libxcb-devel>=1.8 xcb-util-devel>=0.3.9"
 short_desc="Utility libraries for XC Binding - client and window-manager helpers for ICCCM"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://xcb.freedesktop.org"
@@ -14,5 +15,18 @@ checksum=038f9bdb917b1f6d98a164f57dfb32212a102d771ab6f03de49fef3786746030
 long_desc="
  This package provides client and window-manager helpers for ICCCM for XCB."
 
-subpackages="$pkgname-devel"
+xcb-util-wm-devel_package() {
-replaces="xcb-util<0.3.9"
+	depends="libxcb-devel xcb-util-wm>=${version}"
+	short_desc="${sourcepkg} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+	}
+}
+
+xcb-util-wm_package() {
+	replaces="xcb-util<0.3.9"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/xcb-util-wm/xcb-util-wm-devel.template

@@ -1,13 +0,0 @@
-# Template file for 'xcb-util-wm-devel'.
-#
-noarch=yes
-depends="libxcb-devel xcb-util-wm>=${version}"
-short_desc="${sourcepkg} -- 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/pkgconfig usr/lib
-}

srcpkgs/xcmiscproto/template

@@ -1,15 +1,20 @@
 # Template build file for 'xcmiscproto'.
 pkgname=xcmiscproto
 version=1.2.0
-distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2"
-build_style=gnu-configure
 revision=2
+build_style=gnu-configure
 short_desc="XCMisc extension headers from X.org"
 homepage="http://xorg.freedesktop.org"
 license="MIT"
 maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2"
 checksum=de17c06b7005c5e9ab469e324e76c5c3b8baa2dfc3c1dc7e93438c197facf68e
 long_desc="
  This provides the XCMisc extension headers from modular X.org project."
 
-noarch=yes
+xcmiscproto_package() {
+	noarch="yes"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/xcmsdb/template

@@ -1,17 +1,23 @@
 # Template build file for 'xcmsdb'.
 pkgname=xcmsdb
 version=1.0.3
-distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-build_style=gnu-configure
 revision=2
-makedepends="pkg-config libX11-devel"
+build_style=gnu-configure
+hostmakedepends="pkg-config"
+makedepends="libX11-devel"
 short_desc="Device Color Characterization utility for X"
 homepage="http://xorg.freedesktop.org"
 license="MIT"
 maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
 checksum=b237d060f1eed71fa2bfe089b7fb04508299e1a49091a7d7b0e536f8344d5a80
 long_desc="
  $pkgname is used to load, query, or remove Device Color Characterization
  data stored in properties on the root window of the screen as specified
  in section 7, Device Color Characterization, of the ICCCM."
 
+xcmsdb_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/xcursorgen/template

@@ -3,7 +3,8 @@ pkgname=xcursorgen
 version=1.0.4
 revision=3
 build_style=gnu-configure
-makedepends="pkg-config libX11-devel libXcursor-devel libXrender-devel libXfixes-devel libpng-devel>=1.5.10"
+hostmakedepends="pkg-config"
+makedepends="libX11-devel libXcursor-devel libXrender-devel libXfixes-devel libpng-devel>=1.5.10"
 short_desc="X cursor generator"
 homepage="http://xorg.freedesktop.org"
 license="MIT"
@@ -12,3 +13,9 @@ distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
 checksum=de2adb2f44ffee906024e53322aeb728d46061e6ca8e6f5a7e0da2c00d6f5f1d
 long_desc="
  $pkgname creates an X cursor file from a collection of PNG images."
+
+xcursorgen_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/xdelta3/template

@@ -14,3 +14,9 @@ long_desc="
  Xdelta is a tool and library for differential compression. Xdelta release
  version 3 supports VCDIFF encoding and decoding. Supports compressing 64 bit
  files on Windows, Linux, etc."
+
+xdelta3_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/xdg-user-dirs-gtk/template

@@ -3,11 +3,18 @@ pkgname=xdg-user-dirs-gtk
 version=0.10
 revision=1
 build_style=gnu-configure
-makedepends="pkg-config intltool gtk+3-devel"
+hostmakedepends="pkg-config intltool"
-fulldepends="xdg-user-dirs"
+makedepends="gtk+3-devel xdg-user-dirs"
 short_desc="GTK+ tool to help manage user directories"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/$pkgname/0.10/$pkgname-$version.tar.xz"
 checksum=739a1a89baf34aa7261e924a21d2ae646b0475b67b3db3daa84327a99132d83e
+
+xdg-user-dirs-gtk_package() {
+	depends="xdg-user-dirs"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/xdg-user-dirs/template

@@ -1,20 +1,25 @@
 # Template file for 'xdg-user-dirs'
 pkgname=xdg-user-dirs
 version=0.14
-homepage="http://www.freedesktop.org/wiki/Software/xdg-user-dirs"
-distfiles="http://user-dirs.freedesktop.org/releases/$pkgname-$version.tar.gz"
-build_style=gnu-configure
 revision=1
+build_style=gnu-configure
 short_desc="Tool to help manage user directories"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
+homepage="http://www.freedesktop.org/wiki/Software/xdg-user-dirs"
+distfiles="http://user-dirs.freedesktop.org/releases/$pkgname-$version.tar.gz"
 checksum=5f4e84f57c113f642ffdd646126855f45f1da955103119dbd2382edb516e6255
 long_desc="
  $pkgname is a tool to help manage well known user directories like
  the desktop folder and the music folder. It also handles localization
  (i.e. translation) of the filenames."
 
-conf_files="
+xdg-user-dirs_package() {
-/etc/xdg/user-dirs.conf
+	conf_files="
-/etc/xdg/user-dirs.defaults"
+		/etc/xdg/user-dirs.conf
-
+		/etc/xdg/user-dirs.defaults"
+	pkg_install() {
+		vmove etc
+		vmove usr
+	}
+}

srcpkgs/xdg-utils/template

@@ -1,13 +1,13 @@
 # Template file for 'xdg-utils'
 pkgname=xdg-utils
 version=1.0.2
-distfiles="http://portland.freedesktop.org/download/$pkgname-$version.tgz"
-build_style=gnu-configure
 revision=2
+build_style=gnu-configure
 short_desc="Tools to assist applications with various desktop integration tasks"
 homepage="http://portland.freedesktop.org/"
 license="MIT"
 maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="http://portland.freedesktop.org/download/$pkgname-$version.tgz"
 checksum=21aeb7d16b2529b8d3975118f59eec09953e09f9a68d718159e98c90474b01ac
 long_desc="
  The xdg-utils package is a set of simple scripts that provide basic
@@ -34,4 +34,9 @@ long_desc="
  provide custom scripts, and the third party software should still
  continue to work."
 
-noarch=yes
+xdg-utils_package() {
+	noarch="yes"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/xdot/template

@@ -3,19 +3,26 @@ pkgname=xdot
 version=20130128
 revision=1
 build_style=python-module
-fulldepends="graphviz pygtk python-distribute xbps-triggers>=0.46"
+makedepends="graphviz pygtk python-distribute xbps-triggers>=0.46"
 short_desc="Interactive viewer for Graphviz dot files"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3"
 homepage="https://code.google.com/p/jrfonseca/wiki/XDot"
 
-noarch=yes
 nofetch=yes
 noextract=yes
-pycompile_module="xdot.py"
 
 do_fetch() {
 	local url="https://code.google.com/p/jrfonseca.xdot"
 	msg_normal "Fetching source from $url ...\n"
 	git clone ${url} xdot-${version}
 }
+
+xdot_package() {
+	depends="${makedepends}"
+	noarch="yes"
+	pycompile_module="xdot.py"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/xdpyinfo/template

@@ -1,19 +1,23 @@
 # Template build file for 'xdpyinfo'.
 pkgname=xdpyinfo
 version=1.2.0
-distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
+revision=3
 build_style=gnu-configure
-revision=2
+hostmakedepends="pkg-config"
-makedepends="pkg-config libXext-devel libXtst-devel libXxf86vm-devel
+makedepends="libXext-devel libXtst-devel libXxf86vm-devel
  libXxf86misc-devel libXrender-devel libXcomposite-devel libXinerama-devel
  libdmx-devel"
 short_desc="Display information utility for X"
 homepage="http://xorg.freedesktop.org"
 license="MIT"
 maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
 checksum=fe5bad498ecfbf21f9a2a18eee5ece9de5d52f68878f250db8f575c9b872b5ce
 long_desc="
- This package provides xdpyinfo, a display information utility for X.
+ This package provides xdpyinfo, a display information utility for X."
-
- This is from the modular X.org X11 project."
 
+xdpyinfo_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/xdriinfo/template

@@ -2,17 +2,22 @@
 pkgname=xdriinfo
 version=1.0.4
 revision=3
-distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
-makedepends="pkg-config libX11-devel MesaLib-devel"
+hostmakedepends="pkg-config"
+makedepends="libX11-devel MesaLib-devel"
 short_desc="X.org DRI information utility"
 homepage="http://xorg.freedesktop.org"
 license="MIT"
 maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
 checksum=35c6e43d3b68ef5d93d013b4517014fb890bad96b2c801abf4f607927a94cb1c
 long_desc="
  The xdriinfo utility prints an XML description of a DRI driver. The driver
  can be specified directly by driver name or indirectly by screen number.
  No X connection is needed if the driver name is explicitly specified."
 
-
+xdriinfo_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/xen/template

@@ -3,16 +3,11 @@ pkgname=xen
 version=4.1.2
 wrksrc=xen-${version}
 revision=2
-broken_as_needed=yes
-nostrip=yes
-pycompile_module="xen grub"
-subpackages="xen-devel"
-depends="iproute2 bridge-utils"
 makedepends="which lzo-devel openssl-devel e2fsprogs-devel zlib-devel gnutls-devel>=3.1.5
  libbluetooth-devel pciutils-devel libX11-devel libXext-devel SDL-devel MesaLib-devel
  ncurses-devel liblzma-devel python-devel dev86 acpica-utils wget git"
 if [ "${XBPS_MACHINE}" = "x86_64" ]; then
-	makedepends="${makedepends} gcc-multilib"
+	makedepends+=" gcc-multilib"
 fi
 short_desc="Xen Hypervisor and Utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -24,24 +19,7 @@ long_desc="
  This package provides the official Xen Hypervisor and related utilities
  for starting/stopping/accessing unprivileged domains (domUs)."
 
-make_dirs="
+broken_as_needed=yes
-/var/run/xenstored	755	root	root
-/var/run/xend/boot	755	root	root
-/var/lib/xenstored	755	root 	root
-/var/lib/xen/xenpaging	755	root	root
-/var/xen/dump		755	root	root
-/var/log/xen		755	root	root
-/var/lock/subsys	755	root	root
-/etc/xen/auto		755	root	root"
-
-conf_files="
-/etc/default/xendomains
-/etc/default/xencommons
-/etc/xen/xm-config.xml
-/etc/xen/xl.conf
-/etc/xen/xend-config.sxp
-/etc/xen/xend-pci-quirks.sxp
-/etc/xen/xend-pci-permissive.sxp"
 
 do_build() {
 	install -d ${DESTDIR}
@@ -70,3 +48,39 @@ do_install() {
 	mv ${DESTDIR}/etc/xen/xmexample* ${DESTDIR}/usr/share/examples/xen
 	mv ${DESTDIR}/etc/xen/cpupool ${DESTDIR}/usr/share/examples/xen
 }
+
+xen-devel_package() {
+	depends="xen"
+	short_desc="${sourcepkg} development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/lib*.*a"
+	}
+}
+
+xen_package() {
+	make_dirs="
+		/var/run/xenstored	755	root	root
+		/var/run/xend/boot	755	root	root
+		/var/lib/xenstored	755	root 	root
+		/var/lib/xen/xenpaging	755	root	root
+		/var/xen/dump		755	root	root
+		/var/log/xen		755	root	root
+		/var/lock/subsys	755	root	root
+		/etc/xen/auto		755	root	root"
+	conf_files="
+		/etc/default/xendomains
+		/etc/default/xencommons
+		/etc/xen/xm-config.xml
+		/etc/xen/xl.conf
+		/etc/xen/xend-config.sxp
+		/etc/xen/xend-pci-quirks.sxp
+		/etc/xen/xend-pci-permissive.sxp"
+	pycompile_module="xen grub"
+	depends="iproute2 bridge-utils"
+	nostrip=yes
+	pkg_install() {
+		vmove etc
+		vmove usr
+	}
+}

srcpkgs/xen/xen-devel.template

@@ -1,13 +0,0 @@
-# Template file for 'xen-devel'.
-#
-depends="xen"
-short_desc="${sourcepkg} 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/lib*.*a" usr/lib
-}

srcpkgs/xev/template

@@ -1,20 +1,24 @@
 # Template build file for 'xev'.
 pkgname=xev
 version=1.1.0
-distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-build_style=gnu-configure
 revision=2
-makedepends="pkg-config libX11-devel"
+build_style=gnu-configure
+hostmakedepends="pkg-config"
+makedepends="libX11-devel"
 short_desc="Display X events"
 homepage="http://xorg.freedesktop.org"
 license="MIT"
 maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
 checksum=3859c268edb26ad0484281a244a567ef2f70ba5f91f4b5dfd37799255ccf01c6
 long_desc="
  Xev is an X11 debugging tool. Xev creates a window (or can attach
  to an existing window) and then asks the X server to send it events
  whenever anything happens to the window (such as it being moved,
- resized, typed in, clicked in, etc cetera).
+ resized, typed in, clicked in, etc cetera)."
-
- This is the version of xev maintained by Xorg."
 
+xev_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/xf86-input-evdev/template

@@ -3,8 +3,6 @@ pkgname=xf86-input-evdev
 version=2.8.0
 revision=1
 build_style=gnu-configure
-subpackages="${pkgname}-devel"
-depends="xserver-abi-input>=18<19"
 hostmakedepends="pkg-config"
 makedepends="xorg-server-devel>=1.13.3_3 mtdev-devel"
 short_desc="Xorg event device input driver"
@@ -13,3 +11,19 @@ homepage="http://xorg.freedesktop.org/"
 license="MIT"
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 checksum=2f5b4403955f8e82603acff7f8f21a67e89a7c0230e1506c6924c4b9dd8f0e57
+
+xf86-input-evdev-devel_package() {
+	depends="xorg-server-devel ${sourcepkg}>=${version}"
+	short_desc="${short_desc} - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+	}
+}
+
+xf86-input-evdev_package() {
+	depends="xserver-abi-input>=18<19"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/xf86-input-evdev/xf86-input-evdev-devel.template

@@ -1,9 +0,0 @@
-# Template file for 'xf86-input-evdev-devel'.
-#
-depends="xorg-server-devel ${sourcepkg}>=${version}"
-short_desc="${short_desc} - development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-}

srcpkgs/xf86-input-joystick/template

@@ -1,10 +1,8 @@
 # Template build file for 'xf86-input-joystick'.
 pkgname=xf86-input-joystick
 version=1.6.2
-revision=1
+revision=2
 build_style=gnu-configure
-subpackages="${pkgname}-devel"
-depends="xserver-abi-input>=18<19"
 makedepends="xorg-server-devel>=1.13.1"
 short_desc="Joystick Input driver for Xorg"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -16,3 +14,19 @@ checksum=ee3b86ed72f3b5befdeed39909320f4b6970401cfbcc2cc0dfd8fb1c1576150d
 post_install() {
 	vinstall ${FILESDIR}/50-joystick.conf 644 etc/X11/xorg.conf.d
 }
+
+xf86-input-joystick-devel_package() {
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+	}
+}
+
+xf86-input-joystick_package() {
+	depends="xserver-abi-input>=18<19"
+	pkg_install() {
+		vmove etc
+		vmove usr
+	}
+}

srcpkgs/xf86-input-joystick/xf86-input-joystick-devel.template

@@ -1,10 +0,0 @@
-# Template file for 'xf86-input-joystick-devel'.
-#
-short_desc="${short_desc} -- development files"
-noarch=yes
-
-do_install() {
-	mkdir -p ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
-}

srcpkgs/xf86-input-synaptics/template

@@ -1,10 +1,8 @@
 # Template build file for 'xf86-input-synaptics'.
 pkgname=xf86-input-synaptics
 version=1.6.3
-revision=1
+revision=2
 build_style=gnu-configure
-subpackages="${pkgname}-devel"
-depends="xserver-abi-input>=18<19"
 makedepends="pkg-config libX11-devel libXtst-devel mtdev-devel
  pixman-devel libpciaccess-devel xorg-server-devel>=1.13.1"
 short_desc="Xorg synaptics touchpad input driver"
@@ -13,3 +11,18 @@ homepage="http://www.x.org/"
 license="MIT"
 distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2"
 checksum=b40c9dbd5f743ff1eb2ac81a23b9676df72e76ed3fa6408de3f8a3a260248604
+
+xf86-input-synaptics-devel_package() {
+	short_desc="${sourcepkg} development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+	}
+}
+
+xf86-input-synaptics_package() {
+	depends="xserver-abi-input>=18<19"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/xf86-input-synaptics/xf86-input-synaptics-devel.template

@@ -1,12 +0,0 @@
-# Template file for 'xf86-input-synaptics-devel'.
-#
-noarch=yes
-short_desc="${sourcepkg} 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/pkgconfig usr/lib
-}

srcpkgs/xf86-input-vmmouse/template

@@ -3,7 +3,6 @@ pkgname=xf86-input-vmmouse
 version=13.0.0
 revision=1
 build_style=gnu-configure
-depends="xserver-abi-input>=18<19"
 makedepends="xorg-server-devel>=1.13.1"
 short_desc="Xorg VMware virtual mouse input driver"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -16,3 +15,10 @@ post_install() {
 	# Remove HAL stuff, it's obsolete.
 	rm -rf ${DESTDIR}/usr/{lib,share}/hal
 }
+
+xf86-input-vmmouse_package() {
+	depends="xserver-abi-input>=18<19"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/xf86-input-wacom/template

@@ -1,10 +1,8 @@
 # Template build file for 'xf86-input-wacom'.
 pkgname=xf86-input-wacom
 version=0.19.0
-revision=1
+revision=2
 build_style=gnu-configure
-subpackages="${pkgname}-devel"
-depends="xserver-abi-input>=18<19"
 makedepends="xorg-server-devel>=1.13.1 libXrandr-devel libXinerama-devel libXi-devel"
 short_desc="Xorg Wacom tablet input driver"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -16,3 +14,18 @@ checksum=a3d8f3ee2e8f896a577e67cb4fb36c384b1405c33c4b528268a06b2f73847bd2
 post_install() {
 	vinstall ${FILESDIR}/70-wacom.rules 644 usr/lib/udev/rules.d
 }
+
+xf86-input-wacom-devel_package() {
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+	}
+}
+
+xf86-input-wacom_package() {
+	depends="xserver-abi-input>=18<19"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/xf86-input-wacom/xf86-input-wacom-devel.template

@@ -1,9 +0,0 @@
-# Template file for 'xf86-input-wacom-devel'.
-#
-short_desc="${short_desc} -- development files"
-noarch=yes
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-}

srcpkgs/xf86-video-ati/template

@@ -3,8 +3,6 @@ pkgname=xf86-video-ati
 version=7.1.0
 revision=1
 build_style=gnu-configure
-replaces="${pkgname}>=0"
-depends="xserver-abi-video>=13<14 mesa-ati-dri"
 makedepends="pkg-config xf86driproto libudev-devel>=183 libpciaccess-devel
  libdrm-devel pixman-devel MesaLib-devel>=9.0.2 xorg-server-devel>=1.13<1.14"
 short_desc="Xorg ATI Radeon video driver"
@@ -13,3 +11,11 @@ homepage="http://xorg.freedesktop.org"
 license="MIT"
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 checksum=c8ae44051fcb331625217f98c09a3aa69f493052b69d62c03f41fed0bfe610cd
+
+xf86-video-ati_package() {
+	replaces="xf86-video-ati>=0"
+	depends="xserver-abi-video>=13<14 mesa-ati-dri"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/xf86-video-cirrus/template

@@ -3,7 +3,6 @@ pkgname=xf86-video-cirrus
 version=1.5.1
 revision=2
 build_style=gnu-configure
-depends="xserver-abi-video>=13<14"
 makedepends="pkg-config xorg-server-devel>=1.13<1.14"
 short_desc="Xorg Cirrus Logic video driver"
 homepage="http://xorg.freedesktop.org"
@@ -13,3 +12,10 @@ distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2"
 checksum=a955429cbd673230c4b171afd6d0a6b28372d2f9d0a400f5124869274a27c557
 long_desc="
  This is the X11 video driver for Cirrus Logic video cards."
+
+xf86-video-cirrus_package() {
+	depends="xserver-abi-video>=13<14"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/xf86-video-geode/template

@@ -14,6 +14,11 @@ long_desc="
 
 # This is x86 specific.
 only_for_archs=i686
-
-depends="xserver-abi-video>=13<14"
 makedepends="pkg-config libXv-devel libXrandr-devel xorg-server-devel>=1.13<1.14"
+
+xf86-video-geode_package() {
+	depends="xserver-abi-video>=13<14"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/xf86-video-intel/template

@@ -4,7 +4,6 @@ version=2.21.6
 revision=1
 build_style=gnu-configure
 configure_args="--with-default-accel=sna --enable-kms-only --enable-sna"
-depends="xserver-abi-video>=13<14 mesa-intel-dri"
 makedepends="pkg-config dri2proto>=2.6 libudev-devel>=183 libdrm-devel
  libpciaccess-devel libXext-devel libXfixes-devel libXv-devel libXvMC-devel
  xcb-util-devel>=0.3.9 MesaLib-devel xorg-server-devel>=1.13<1.14"
@@ -18,3 +17,10 @@ checksum=c3ef371e72544350c878d5373b2e7f49b8a0e253f9b63cb1ce2881180b45f8d9
 post_install() {
 	vinstall COPYING 644 usr/share/licenses/${pkgname}
 }
+
+xf86-video-intel_package() {
+	depends="xserver-abi-video>=13<14 mesa-intel-dri"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/xf86-video-modesetting/template

@@ -3,7 +3,6 @@ pkgname=xf86-video-modesetting
 version=0.7.0
 revision=1
 build_style=gnu-configure
-depends="xserver-abi-video>=13<14"
 hostmakedepends="pkg-config"
 makedepends="libdrm-devel>=2.4.37 xorg-server-devel>=1.13<1.14"
 short_desc="X.org generic modesetting video driver"
@@ -12,3 +11,10 @@ homepage="http://xorg.freedesktop.org/"
 license="MIT"
 distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2"
 checksum=2bc55f776eaee7b4e13df13238d36c4facf1cdca095a11519baf2376f5c996ac
+
+xf86-video-modesetting_package() {
+	depends="xserver-abi-video>=13<14"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/xf86-video-nouveau/template

@@ -3,7 +3,6 @@ pkgname=xf86-video-nouveau
 version=1.0.7
 revision=1
 build_style=gnu-configure
-depends="xserver-abi-video>=13<14 mesa-nouveau-dri"
 hostmakedepends="pkg-config"
 makedepends="libudev-devel>=183 libdrm-devel xorg-server-devel>=1.13<1.14"
 short_desc="Xorg opensource NVIDIA video driver"
@@ -12,3 +11,10 @@ homepage="http://nouveau.freedesktop.org/wiki/"
 license="GPL-2"
 distfiles="http://xorg.freedesktop.org/archive/individual/driver/${pkgname}-${version}.tar.bz2"
 checksum=d187c658e1823ca829c941f3f601f8e7220d427e079c3e52b94ecff45bc2e131
+
+xf86-video-nouveau_package() {
+	depends="xserver-abi-video>=13<14 mesa-nouveau-dri"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/xf86-video-openchrome/template

@@ -4,7 +4,6 @@ version=0.3.1
 revision=2
 only_for_archs=i686
 build_style=gnu-configure
-depends="xserver-abi-video>=13<14"
 hostmakedepends="pkg-config"
 makedepends="libdrm-devel libX11-devel libXext-devel libXv-devel libXvMC-devel
  MesaLib-devel xorg-server-devel>=1.13<1.14"
@@ -16,3 +15,10 @@ distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2"
 checksum=eb459a86e20fa090577315a0d9964bf3f94abc5241c5408453f326eaf8915ce7
 long_desc="
  This is the X11 video driver for VIA Unichromes video cards."
+
+xf86-video-openchrome_package() {
+	depends="xserver-abi-video>=13<14"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/xf86-video-qxl/template

@@ -4,7 +4,6 @@ version=0.1.0
 revision=3
 build_style=gnu-configure
 configure_args="--enable-xspice=yes"
-depends="xserver-abi-video>=13<14 spice>=0.12"
 makedepends="pkg-config xf86dgaproto spice-protocol>=0.12.2 spice-devel>=0.12
  xorg-server-devel>=1.13<1.14"
 short_desc="Modular Xorg QXL virtual video driver"
@@ -15,3 +14,10 @@ distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 checksum=5ca3c1039fc195e73fa68558d0d7ee2b97cf10f4e7474ca533732a5d39ebbce5
 long_desc="
  This is the QXL virtual video driver for the modular Xorg server."
+
+xf86-video-qxl_package() {
+	depends="xserver-abi-video>=13<14 spice>=0.12"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/xf86-video-sisusb/template

@@ -3,7 +3,6 @@ pkgname=xf86-video-sisusb
 version=0.9.6
 revision=2
 build_style=gnu-configure
-depends="xserver-abi-video>=13<14"
 makedepends="pkg-config xorg-server-devel>=1.13<1.14"
 short_desc="Xorg SiS USB video driver"
 homepage="http://xorg.freedesktop.org/"
@@ -15,3 +14,10 @@ checksum=73dbef43c56a4ce1445c27ebac2ddc062c643c32ca6e2a4d095aea2185b9e046
 long_desc="
  This is the video driver for SiS (Silicon Integrated Systems) video chips
  that are connected via a Net2280-based USB dongle for the Xorg X11 server."
+
+xf86-video-sisusb_package() {
+	depends="xserver-abi-video>=13<14"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/xf86-video-vesa/template

@@ -5,7 +5,6 @@ version="2:${_distver}"
 wrksrc="${pkgname}-${_distver}"
 revision=4
 build_style=gnu-configure
-depends="xserver-abi-video>=13<14"
 makedepends="automake pkg-config xorg-util-macros xorg-server-devel>=1.13<1.14"
 short_desc="Xorg VESA video driver"
 homepage="http://xorg.freedesktop.org"
@@ -15,3 +14,10 @@ distfiles="${XORG_SITE}/driver/${pkgname}-${_distver}.tar.bz2"
 checksum=144a17ffae3c86603ddc4ae33521a52813498ee1f8213faa662dc4a8d6490ee3
 long_desc="
  This is the X11 video driver for Generic VESA video cards."
+
+xf86-video-vesa_package() {
+	depends="xserver-abi-video>=13<14"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/xf86-video-vmware/template

@@ -4,7 +4,6 @@ version=13.0.0
 revision=1
 build_style=gnu-configure
 configure_args="--enable-vmwarectrl-client"
-depends="xserver-abi-video>=13<14 mesa-vmwgfx-dri"
 makedepends="pkg-config libdrm-devel MesaLib-devel>=9.0.1
  xorg-server-devel>=1.13<1.14"
 short_desc="Modular Xorg VMware virtual video driver"
@@ -13,3 +12,10 @@ homepage="http://xorg.freedesktop.org"
 license="MIT"
 distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
 checksum=44919ecd88654f2ab40a1732b5ea6a1dbd1c696b4b0748e68e8b5f1a3486bca6
+
+xf86-video-vmware_package() {
+	depends="xserver-abi-video>=13<14 mesa-vmwgfx-dri"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/xf86bigfontproto/template

@@ -1,15 +1,20 @@
 # Template build file for 'xf86bigfontproto'.
 pkgname=xf86bigfontproto
 version=1.2.0
-distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2"
-build_style=gnu-configure
 revision=2
+build_style=gnu-configure
 short_desc="XF86BigFont extension headers from X.org"
 homepage="http://xorg.freedesktop.org"
 license="MIT"
 maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2"
 checksum=ba9220e2c4475f5ed2ddaa7287426b30089e4d29bd58d35fad57ba5ea43e1648
 long_desc="
  This provides the XF86BigFont extension headers from modular X.org X11 project."
 
-noarch=yes
+xf86bigfontproto_package() {
+	noarch="yes"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/xf86dgaproto/template

@@ -1,15 +1,20 @@
 # Template build file for 'xf86dgaproto'.
 pkgname=xf86dgaproto
 version=2.1
-distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2"
-build_style=gnu-configure
 revision=2
+build_style=gnu-configure
 short_desc="XF86DGA extension headers"
 homepage="http://xorg.freedesktop.org"
 license="MIT"
 maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2"
 checksum=ac5ef65108e1f2146286e53080975683dae49fc94680042e04bd1e2010e99050
 long_desc="
  This package provides the XF86DGA extension headers from modular X.org."
 
-noarch=yes
+xf86dgaproto_package() {
+	noarch="yes"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/xf86driproto/template

@@ -1,13 +1,13 @@
 # Template build file for 'xf86driproto'.
 pkgname=xf86driproto
 version=2.1.1
-distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2"
-build_style=gnu-configure
 revision=1
+build_style=gnu-configure
 short_desc="XF86DRI extension headers from modular X.org"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="${XORG_HOME}"
 license="MIT"
+distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2"
 checksum=9c4b8d7221cb6dc4309269ccc008a22753698ae9245a398a59df35f1404d661f
 long_desc="
  This provides the XF86DRI extension headers from modular X.org X11
@@ -17,9 +17,13 @@ long_desc="
  between a DRI (direct rendering infrastructure) driver and driver
  loader."
 
-noarch=yes
+post_install() {
-
-post_install()
-{
 	vinstall COPYING 644 usr/share/licenses/${pkgname}
 }
+
+xf86driproto_package() {
+	noarch="yes"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/xf86miscproto/template

@@ -1,16 +1,21 @@
 # Template build file for 'xf86miscproto'.
 pkgname=xf86miscproto
 version=0.9.2
-distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2"
-build_style=gnu-configure
 revision=2
+build_style=gnu-configure
 short_desc="XF86Misc extension headers from modular X.org"
 homepage="http://xorg.freedesktop.org"
 license="MIT"
 maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2"
 checksum=aaab4cbf19c73ded4785ba69cdd7ae23aaf103c7040559283f85fc1237dad6e6
 long_desc="
  This provides the XF86Misc extension headers from modular X.org X11
  project."
 
-noarch=yes
+xf86miscproto_package() {
+	noarch="yes"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/xf86vidmodeproto/template

@@ -1,16 +1,21 @@
 # Template build file for 'xf86vidmodeproto'.
 pkgname=xf86vidmodeproto
 version=2.3
-distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2"
-build_style=gnu-configure
 revision=2
+build_style=gnu-configure
 short_desc="XF86VidMode extension headers from modular X.org"
 homepage="http://xorg.freedesktop.org"
 license="MIT"
 maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2"
 checksum=8f704613a5407b31c594d05cf8e053f2b05777172a44e7cd2abd8090bd2ac247
 long_desc="
  This provides the XF86VidMode extension headers from modular X.org X11
  project."
 
-noarch=yes
+xf86vidmodeproto_package() {
+	noarch="yes"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/xfburn/template

@@ -6,8 +6,7 @@ build_style=gnu-configure
 configure_args="--enable-gstreamer --enable-dbus --disable-hal"
 depends="desktop-file-utils hicolor-icon-theme"
 makedepends="intltool pkg-config libburn-devel libisofs-devel gtk+-devel
-libxfcegui4-devel>=4.10.0_2 exo-devel gst-plugins-base-devel"
+ libxfcegui4-devel>=4.10.0_2 exo-devel gst-plugins-base-devel"
-
 short_desc="CD-burner application for Xfce Desktop Environment"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://goodies.xfce.org/projects/applications/xfburn"
@@ -24,3 +23,10 @@ long_desc="
 pre_configure() {
 	sed -i '1 i#include <glib-object.h>' xfburn/xfburn-settings.h
 }
+
+xfburn_package() {
+	depends="desktop-file-utils hicolor-icon-theme"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/xfce-utils/template

@@ -1,21 +1,24 @@
 # Template file for 'xfce-utils'
 pkgname=xfce-utils
 version=4.8.2
-distfiles="http://archive.xfce.org/src/xfce/$pkgname/4.8/$pkgname-$version.tar.bz2"
-build_style=gnu-configure
 revision=1
-makedepends="pkg-config intltool libxfce4ui-devel libxfce4util-devel gtk+-devel dbus-glib-devel"
+build_style=gnu-configure
-fulldepends="xfconf-perl hicolor-icon-theme desktop-file-utils"
+hostmakedepends="pkg-config intltool"
+makedepends="libxfce4ui-devel libxfce4util-devel gtk+-devel dbus-glib-devel"
+# xfconf-perl is required by the xfconf-migration script.
+makedepends+=" xfconf-perl hicolor-icon-theme desktop-file-utils"
 short_desc="Utilities for the Xfce Desktop Environment"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.xfce.org/"
 license="GPL-2"
+distfiles="http://archive.xfce.org/src/xfce/$pkgname/4.8/$pkgname-$version.tar.bz2"
 checksum=a12b708b0cd19ffa07afb2ab2cd1bf9377ff7fbbfbe16d7493a5bb973bcb0aa5
 long_desc="
  This package includes utilities for the Xfce Desktop Environment."
 
-
+xfce-utils_package() {
-
+	depends="xfconf-perl hicolor-icon-theme desktop-file-utils"
-
+	pkg_install() {
-
+		vmove usr
-# xfconf-perl is required by the xfconf-migration script.
+	}
+}

srcpkgs/xfce4-appfinder/template

@@ -1,19 +1,22 @@
 # Template file for 'xfce4-appfinder'
 pkgname=xfce4-appfinder
 version=4.10.0
-homepage="http://xfce.org"
-distfiles="http://archive.xfce.org/src/xfce/xfce4-appfinder/4.10/$pkgname-$version.tar.bz2"
-build_style=gnu-configure
-depends="desktop-file-utils hicolor-icon-theme"
-makedepends="pkg-config intltool gtk+-devel garcon-devel libxfce4util-devel libxfce4ui-devel xfconf-devel"
 revision=1
+build_style=gnu-configure
+hostmakedepends="pkg-config intltool"
+makedepends="gtk+-devel garcon-devel libxfce4util-devel libxfce4ui-devel xfconf-devel"
 short_desc="Appfinder for the Xfce Desktop Environment"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
+homepage="http://xfce.org"
+distfiles="http://archive.xfce.org/src/xfce/xfce4-appfinder/4.10/$pkgname-$version.tar.bz2"
 checksum=042aae7e366428a6a92b6353b3f2727d64823076a7752b8e0a15f1f8f3645439
 long_desc="
  xfce-appfinder shows system wide installed applications."
 
-
+xfce4-appfinder_package() {
-
+	depends="desktop-file-utils hicolor-icon-theme"
-
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/xfce4-mixer/template

@@ -3,7 +3,6 @@ pkgname=xfce4-mixer
 version=4.10.0
 revision=1
 build_style=gnu-configure
-depends="desktop-file-utils hicolor-icon-theme"
 makedepends="pkg-config intltool gtk+-devel gstreamer-devel
  gst-plugins-base-devel libxfce4util-devel libxfce4ui-devel
  xfconf-devel xfce4-panel-devel libunique1-devel"
@@ -15,3 +14,10 @@ distfiles="http://archive.xfce.org/src/apps/$pkgname/4.10/$pkgname-$version.tar.
 checksum=a8c589001b438171ea5a6b46ce9895c3ffbc5081ab67805ab9870e540068dade
 long_desc="
  This package includes a sound mixer for the XFce Desktop Environment."
+
+xfce4-mixer_package() {
+	depends="desktop-file-utils hicolor-icon-theme"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/xfce4-notifyd/template

@@ -2,24 +2,25 @@
 pkgname=xfce4-notifyd
 version=0.2.2
 revision=2
-distfiles="http://archive.xfce.org/src/apps/$pkgname/0.2/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
-depends="hicolor-icon-theme desktop-file-utils"
+hostmakedepends="pkg-config intltool"
-makedepends="pkg-config intltool libxfce4util-devel libxfce4ui-devel"
+makedepends="libxfce4util-devel libxfce4ui-devel"
 short_desc="Simple, visually-appealing notification daemon for Xfce"
 homepage="http://goodies.xfce.org/projects/applications/xfce4-notifyd"
 license="GPL-2"
 maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="http://archive.xfce.org/src/apps/$pkgname/0.2/$pkgname-$version.tar.bz2"
 checksum=b66e68dfc2164bcf479acd3c7e8b6f83065d23aef988535e2db3506d06a39168
 long_desc="
  Xfce4-notifyd is a simple, visually-appealing notification daemon for Xfce
  that implements the Freedesktop.org Desktop Notifications Specification."
 
-provides="notification-daemon-${version}"
+xfce4-notifyd_package() {
-conflicts="notification-daemon>=0"
+	provides="notification-daemon-${version}"
-replaces="notification-daemon>=0"
+	conflicts="notification-daemon>=0"
-
+	replaces="notification-daemon>=0"
-
+	depends="hicolor-icon-theme desktop-file-utils"
-
+	pkg_install() {
-
+		vmove usr
-
+	}
+}

srcpkgs/xfce4-panel/template

@@ -1,21 +1,33 @@
 # Template:wq file for 'xfce4-panel'
 pkgname=xfce4-panel
 version=4.10.0
-distfiles="http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$version.tar.bz2"
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static"
-depends="hicolor-icon-theme desktop-file-utils"
+makedepends="pkg-config intltool"
-makedepends="pkg-config intltool libxfce4util-devel libxfce4ui-devel gtk+-devel xfconf-devel dbus-glib-devel libwnck2-devel>=2.30.6_1 garcon-devel exo-devel"
+makedepends="libxfce4util-devel libxfce4ui-devel gtk+-devel xfconf-devel
-revision=1
+ dbus-glib-devel libwnck2-devel>=2.30.6_1 garcon-devel exo-devel"
 short_desc="Next generation panel for Xfce"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.xfce.org/"
 license="GPL-2"
+distfiles="http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$version.tar.bz2"
 checksum=3321f998af2bbd14ba68654a8881774f6ea2ec4f1a3544598e7f47d3ed0009b9
 long_desc="
  This package includes the panel for the Xfce desktop environment."
 
+xfce4-panel-devel_package() {
+	depends="libglib-devel gtk+-devel libxfce4util-devel xfce4-panel>=${version}"
+	short_desc="${short_desc} - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/share/gtk-doc
+	}
+}
 
-subpackages="$pkgname-devel"
+xfce4-panel_package() {
-
+	pkg_install() {
-
+		vmove usr
+	}
+}

srcpkgs/xfce4-panel/xfce4-panel-devel.template

@@ -1,16 +0,0 @@
-# Template file for 'xfce4-panel-devel'.
-#
-depends="glib-devel gtk+-devel libxfce4util-devel xfce4-panel>=4.10.0"
-short_desc="${short_desc} - development files"
-long_desc="${long_desc}
-
- This package contains files for development, headers, static libs, etc."
-
-
-noarch=yes
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-	vmove usr/share/gtk-doc usr/share
-}

srcpkgs/xfce4-power-manager/template

@@ -1,21 +1,26 @@
 # Template file for 'xfce4-power-manager'
 pkgname=xfce4-power-manager
 version=1.2.0
-homepage="http://xfce.org"
+revision=1
-distfiles="http://archive.xfce.org/src/xfce/xfce4-power-manager/1.2/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--enable-polkit --enable-dpms
 --disable-debug --enable-network-manager --disable-static"
-depends="upower udisks hicolor-icon-theme desktop-file-utils"
+hostmakedepends="pkg-config intltool"
-makedepends="pkg-config intltool libxfce4ui-devel libxfce4util-devel xfconf-devel libnotify-devel gtk+-devel libXrandr-devel dbus-glib-devel xfce4-panel-devel NetworkManager-devel"
+makedepends="libxfce4ui-devel libxfce4util-devel xfconf-devel libnotify-devel
-revision=1
+ gtk+-devel libXrandr-devel dbus-glib-devel xfce4-panel-devel NetworkManager-devel"
+makedepends+=" upower udisks hicolor-icon-theme desktop-file-utils"
 short_desc="Xfce power manager"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
+homepage="http://xfce.org"
+distfiles="http://archive.xfce.org/src/xfce/xfce4-power-manager/1.2/$pkgname-$version.tar.bz2"
 checksum=d7fb98a540284b62f4201527de17d4b24123f9d26c9f49131dd497c8387184e9
 long_desc="
  $pkgname is the power manager for the Xfce desktop environment."
 
-
+xfce4-power-manager_package() {
-
+	depends="upower udisks hicolor-icon-theme desktop-file-utils"
-
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/xfce4-sensors-plugin/template

@@ -4,9 +4,8 @@ version=1.2.5
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
-
+hostmakedepends="pkg-config intltool"
-makedepends="pkg-config intltool libsensors-devel libxfce4ui-devel xfce4-panel-devel libnotify-devel"
+makedepends="libsensors-devel libxfce4ui-devel xfce4-panel-devel libnotify-devel"
-depends="hicolor-icon-theme desktop-file-utils"
 short_desc="XFCE sensors plugin"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin"
@@ -18,3 +17,10 @@ long_desc="
  Linux and requires libsensors to display your mainboard sensors and fan
  speeds. Furthermore, it supports hddtemp to surveil your hard disk’s
  temperature values."
+
+xfce4-sensors-plugin_package() {
+	depends="hicolor-icon-theme desktop-file-utils"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/xfce4-session/template

@@ -1,13 +1,12 @@
 # Template file for 'xfce4-session'
 pkgname=xfce4-session
 version=4.10.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-static --enable-libgnome-keyring"
-depends="upower udisks hicolor-icon-theme desktop-file-utils"
 makedepends="pkg-config intltool libxfce4ui-devel gtk+-devel
  xfconf-devel dbus-glib-devel libwnck2-devel xfce4-panel-devel
- ConsoleKit-devel libgnome-keyring-devel iceauth"
+ libgnome-keyring-devel iceauth"
 short_desc="Xfce session manager"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -17,5 +16,20 @@ checksum=bb8aa9a74c3d382840596fb4875144d66c7f3f47c8e9ee81d31e3428a72c46ce
 long_desc="
  xfce4-session is the session manager for the Xfce desktop environment."
 
-conf_files="/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml"
+xfce4-session-devel_package() {
-subpackages="$pkgname-devel" 
+	depends="libxfce4ui-devel xfconf-devel ${sourcepkg}>=${version}"
+	short_desc="${short_desc} - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+	}
+}
+
+xfce4-session_package() {
+	depends="upower udisks hicolor-icon-theme desktop-file-utils"
+	conf_files="/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml"
+	pkg_install() {
+		vmove etc
+		vmove usr
+	}
+}

srcpkgs/xfce4-session/xfce4-session-devel.template

@@ -1,15 +0,0 @@
-# Template file for 'xfce4-session-devel'.
-#
-depends="libxfce4ui-devel xfconf-devel xfce4-session>=4.10.0"
-short_desc="${short_desc} - development files"
-long_desc="${long_desc}
-
- This package contains files for development, headers, static libs, etc."
-
-
-noarch=yes
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/lib/pkgconfig usr/lib
-}

srcpkgs/xfce4-settings/template

@@ -2,20 +2,27 @@
 pkgname=xfce4-settings
 version=4.10.0
 revision=1
-homepage="http://xfce.org"
-distfiles="http://archive.xfce.org/src/xfce/xfce4-settings/4.10/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
 configure_args="--enable-sound-settings --enable-pluggable-dialogs"
-depends="desktop-file-utils gnome-icon-theme"
+hostmakedepends="pkg-config intltool"
-makedepends="pkg-config intltool libxfce4ui-devel gtk+-devel xfconf-devel libXi-devel libXcursor-devel exo-devel libXrandr-devel libxklavier-devel libnotify-devel dbus-devel libcanberra-devel garcon-devel"
+makedepends="libxfce4ui-devel gtk+-devel xfconf-devel libXi-devel libXcursor-devel
+ exo-devel libXrandr-devel libxklavier-devel libnotify-devel dbus-devel
+ libcanberra-devel garcon-devel"
 short_desc="Xfce settings manager"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.xfce.org/"
 license="GPL-2"
+homepage="http://xfce.org"
+distfiles="http://archive.xfce.org/src/xfce/xfce4-settings/4.10/$pkgname-$version.tar.bz2"
 checksum=0843f09ba9673f1d1b5df8dce4a17b63c183a9ba3be75fb6ef99a67fc8c1f77e
 long_desc="
  ${pkgname} is the settings manager for the Xfce desktop environment."
 
-conf_files="/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml"
+xfce4-settings_package() {
-
+	conf_files="/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml"
-
+	depends="desktop-file-utils gnome-icon-theme"
+	pkg_install() {
+		vmove etc
+		vmove usr
+	}
+}

srcpkgs/xfce4-terminal/template

@@ -10,7 +10,13 @@ license="GPL-2"
 distfiles="http://archive.xfce.org/src/apps/${pkgname}/0.6/${pkgname}-${version}.tar.bz2"
 checksum=61346427e55af79e86511572bfabb2e025cb13720879226ea1b98a92f0bcd4c8
 
-depends="hicolor-icon-theme desktop-file-utils"
+hostmakedepends="pkg-config intltool"
-makedepends="pkg-config intltool dbus-glib-devel exo-devel
+makedepends="dbus-glib-devel exo-devel vte-devel gtk+-devel libxfce4ui-devel"
- vte-devel gtk+-devel libxfce4ui-devel"
+
-replaces="Terminal>=0"
+xfce4-terminal_package() {
+	replaces="Terminal>=0"
+	depends="hicolor-icon-theme desktop-file-utils"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/xfce4-weather-plugin/template

@@ -3,9 +3,8 @@ pkgname=xfce4-weather-plugin
 version=0.8.1
 revision=1
 build_style=gnu-configure
-makedepends="pkg-config intltool gtk+-devel libxfce4ui-devel xfce4-panel-devel libxml2-devel"
+hostmakedepends="pkg-config intltool"
-fulldepends="hicolor-icon-theme"
+makedepends="gtk+-devel libxfce4ui-devel xfce4-panel-devel libxml2-devel"
-
 short_desc="XFCE panel plagin to show temperature and weather"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://goodies.xfce.org/projects/panel-plugins/xfce4-weather-plugin"
@@ -15,3 +14,10 @@ checksum=a03a001065afdd8a167a44b96885d70013290b88d82e7deec45a2d294411077d
 long_desc="
  This panel plugin shows the current temperature and weather condition,
  using weather data provided by xoap.weather.com."
+
+xfce4-weather-plugin_package() {
+	depends="hicolor-icon-theme"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/xfce4/template

@@ -2,9 +2,8 @@
 pkgname=xfce4
 version=4.10.0
 revision=3
-noarch=yes
 build_style=meta-template
-depends="xfce4-appfinder>=4.10.0 xfce4-mixer>=4.8.0_3 xfce4-panel>=4.10.0
+makedepends="xfce4-appfinder>=4.10.0 xfce4-mixer>=4.8.0_3 xfce4-panel>=4.10.0
  xfce4-session>=4.10.0 xfce4-settings>=4.10.0 xfconf>=4.10.0 xfdesktop>=4.10.0
  xfwm4>=4.10.0 xfwm4-themes>=4.10.0 xfce4-power-manager>=1.2.0 xfce4-terminal
  Thunar>=1.4.0 thunar-volman>=0.8.0 exo>=0.8.0 orage>=4.8.3_1 ristretto>=0.6.0
@@ -14,3 +13,8 @@ short_desc="The XFCE desktop environment meta package"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2, LGPL-2.1, BSD"
 homepage="http://xfce.org"
+
+xfce4_package() {
+	noarch="yes"
+	depends="${makedepends}"
+}

srcpkgs/xfconf/template

@@ -1,17 +1,45 @@
 # Template file for 'xfconf'
 pkgname=xfconf
 version=4.10.0
-revision=1
+revision=2
-homepage="http://xfce.org"
-distfiles="http://archive.xfce.org/src/xfce/xfconf/4.10/$pkgname-$version.tar.bz2"
 build_style=gnu-configure
-subpackages="$pkgname-devel $pkgname-perl"
+hostmakedepends="pkg-config intltool>=0.50.2_1 perl>=5.16"
-makedepends="pkg-config intltool>=0.50.2_1 perl>=5.16 perl-ExtUtils-Depends perl-ExtUtils-PkgConfig perl-Glib>=1.242_1 dbus-glib-devel libxfce4util-devel"
+makedepends="perl-ExtUtils-Depends perl-ExtUtils-PkgConfig
+ perl-Glib>=1.242_1 dbus-glib-devel libxfce4util-devel"
 short_desc="Xfce hierarchical (tree-like) configuration system"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2, LGPL-2.1"
+homepage="http://xfce.org"
+distfiles="http://archive.xfce.org/src/xfce/xfconf/4.10/$pkgname-$version.tar.bz2"
 checksum=175219a441cc7d0f210bbd1a3b0abba41598627cd9db27235811400c3e100576
 long_desc="
  Xfconf is a hierarchical (tree-like) configuration system where the
  immediate child nodes of the root are called channels. All settings
  beneath the channel nodes are called properties."
+
+xfconf-devel_package() {
+	depends="dbus-glib-devel xfconf>=$version"
+	short_desc="${short_desc} - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/share/gtk-doc
+	}
+}
+
+xfconf-perl_package() {
+	depends="perl-Glib>=1.242_1"
+	short_desc="${short_desc} - perl bindings"
+	pkg_install() {
+		vmove usr/lib/perl5 usr/lib
+		vmove usr/share/man usr/share
+		find ${PKGDESTDIR}/usr/lib/perl5 -type f \
+			-name perllocal.pod -o -name .packlist|xargs rm -f
+	}
+}
+
+xfconf_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/xfconf/xfconf-devel.template

@@ -1,14 +0,0 @@
-# Template file for 'xfconf-devel'.
-#
-noarch=yes
-depends="dbus-glib-devel xfconf>=$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/pkgconfig usr/lib
-	vmove usr/share/gtk-doc usr/share
-}

srcpkgs/xfconf/xfconf-perl.template

@@ -1,14 +0,0 @@
-# Template file for 'xfconf-perl'.
-#
-depends="perl-Glib>=1.242_1"
-short_desc="${short_desc} - perl bindings"
-long_desc="${long_desc}
-
- This package contains the Perl bindings."
-
-do_install() {
-	vmove usr/lib/perl5 usr/lib
-	vmove usr/share/man usr/share
-	find ${DESTDIR}/usr/lib/perl5 -type f \
-		-name perllocal.pod -o -name .packlist|xargs rm -f
-}

srcpkgs/xfd/template

@@ -1,22 +1,25 @@
 # Template build file for 'xfd'.
 pkgname=xfd
 version=1.1.1
-distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
+revision=2
 build_style=gnu-configure
-makedepends="pkg-config libXaw-devel freetype-devel libXft-devel"
+hostmakedepends="pkg-config"
-fulldepends="glibc libXft libXaw"
+makedepends="libXaw-devel freetype-devel libXft-devel"
-revision=1
 short_desc="Display all the characters in an X font"
 homepage="http://xorg.freedesktop.org"
 license="MIT"
 maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
 checksum=3fbef0d5ed6dc088017df156e748d187b2d1aaedc3de7ea96e505ea6d1af7b73
 long_desc="
   The xfd utility creates a window containing the name of the font being
  displayed, a row of command buttons, several lines of text for display-
  ing character metrics, and a grid containing one glyph per cell.
  The characters are shown in increasing order from left to right, top to
- bottom.
+ bottom."
 
- This is the version of xfd maintained by Xorg."
+xfd_package() {
- 
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/xfdesktop/template

@@ -1,19 +1,24 @@
 # Template file for 'xfdesktop'
 pkgname=xfdesktop
 version=4.10.0
-homepage="http://xfce.org"
-distfiles="http://archive.xfce.org/src/xfce/xfdesktop/4.10/$pkgname-$version.tar.bz2"
-build_style=gnu-configure
-depends="hicolor-icon-theme desktop-file-utils"
-makedepends="pkg-config intltool xfconf-devel libxfce4ui-devel exo-devel gtk+-devel libxfce4util-devel libnotify-devel libwnck2-devel garcon-devel Thunar-devel dbus-glib-devel"
 revision=1
+build_style=gnu-configure
+makedepends="pkg-config intltool"
+makedepends="xfconf-devel libxfce4ui-devel exo-devel gtk+-devel
+ libxfce4util-devel libnotify-devel libwnck2-devel garcon-devel
+ Thunar-devel dbus-glib-devel"
 short_desc="Desktop manager for the XFce Desktop Environment"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
+homepage="http://xfce.org"
+distfiles="http://archive.xfce.org/src/xfce/xfdesktop/4.10/$pkgname-$version.tar.bz2"
 checksum=897ae6ee435dcc89809ad70c15c5d15347d1cf4fc8033238b17dcc47836c2d7b
 long_desc="
  This package includes a desktop manager for the XFce Desktop Environment."
 
-
+xfdesktop_package() {
-
+	depends="hicolor-icon-theme desktop-file-utils"
-
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/xfontsel/template

@@ -1,19 +1,22 @@
 # Template build file for 'xfontsel'.
 pkgname=xfontsel
 version=1.0.4
-distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
+revision=2
 build_style=gnu-configure
-makedepends="pkg-config libXaw-devel"
+hostmakedepends="pkg-config"
-fulldepends="glibc libXaw"
+makedepends="libXaw-devel"
-revision=1
 short_desc="X font selector"
 homepage="http://xorg.freedesktop.org"
 license="MIT"
 maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
 checksum=25491e9b7762607299f8a7099c97452d9b83e92266f8b0579b380ca01e5a5f7e
 long_desc="
  This package provides xfontsel, a program to query and display
- X11 fonts.
+ X11 fonts."
 
- This is from the modular X.org X11 project."
+xfontsel_package() {
- 
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/xfsprogs/template

@@ -1,7 +1,7 @@
 # Template file for 'xfsprogs'
 pkgname=xfsprogs
 version=3.1.10
-revision=1
+revision=2
 makedepends="libuuid-devel libblkid-devel readline-devel"
 short_desc="Utilities for managing the XFS filesystem"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -10,9 +10,6 @@ homepage="http://oss.sgi.com/projects/xfs/"
 distfiles="ftp://ftp.archlinux.org/other/xfsprogs/${pkgname}-${version}.tar.gz"
 checksum=9ec8dc77bf3bc114c3ba89f87316a32e3097efb3e7fc44df23421614bb21aa6c
 
-replaces="xfsprogs-libs>=0"
-subpackages="${pkgname}-devel"
-
 do_configure() {
 	export DEBUG=-DNDEBUG
 	./configure ${CONFIGURE_SHARED_ARGS} \
@@ -34,3 +31,19 @@ do_install() {
 	vmove "sbin/*" usr/sbin
 	vmove "lib/*" usr/lib
 }
+
+xfsprogs-devel_package() {
+	depends="libuuid-devel xfsprogs>=${version}"
+	short_desc="${short_desc} -- development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/share/man/man3
+	}
+}
+
+xfsprogs_package() {
+	replaces="xfsprogs-libs>=0"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/xfsprogs/xfsprogs-devel.template

@@ -1,10 +0,0 @@
-# Template file for 'xfsprogs-devel'.
-#
-noarch=yes
-depends="libuuid-devel xfsprogs>=${version}"
-short_desc="${short_desc} -- development files"
-
-do_install() {
-	vmove usr/include usr
-	vmove usr/share/man/man3 usr/share/man
-}

srcpkgs/xfwm4-themes/template

@@ -1,15 +1,20 @@
 # Template file for 'xfwm4-themes'
 pkgname=xfwm4-themes
 version=4.10.0
-noarch=yes
-homepage="http://xfce.org"
-distfiles="http://archive.xfce.org/src/art/$pkgname/4.10/$pkgname-$version.tar.bz2"
-build_style=gnu-configure
 revision=1
+build_style=gnu-configure
 short_desc="Themes for the XFCE window manager"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
+homepage="http://xfce.org"
+distfiles="http://archive.xfce.org/src/art/$pkgname/4.10/$pkgname-$version.tar.bz2"
 checksum=3214d5f00e9703b5e8c9e7c3287d606dedec7285ceb4d5db332e93ada66fd575
 long_desc="
  xfwm4-themes is a collection of themes for the XFCE window manager."
 
+xfwm4-themes_package() {
+	noarch="yes"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/xfwm4/template

@@ -1,20 +1,26 @@
 # Template file for 'xfwm4'
 pkgname=xfwm4
 version=4.10.0
-homepage="http://xfce.org"
-distfiles="http://archive.xfce.org/src/xfce/xfwm4/4.10/xfwm4-$version.tar.bz2"
-build_style=gnu-configure
-depends="hicolor-icon-theme desktop-file-utils"
-makedepends="pkg-config intltool libxfce4ui-devel gtk+-devel libxfce4util-devel xfconf-devel startup-notification-devel libXcomposite-devel libXdamage-devel libXfixes-devel libXrandr-devel libXrender-devel dbus-glib-devel libwnck2-devel"
 revision=1
+build_style=gnu-configure
+hostmakedepends="pkg-config intltool"
+makedepends="libxfce4ui-devel gtk+-devel libxfce4util-devel xfconf-devel
+ startup-notification-devel libXcomposite-devel libXdamage-devel
+ libXfixes-devel libXrandr-devel libXrender-devel dbus-glib-devel
+ libwnck2-devel"
 short_desc="Next generation window manager for Xfce"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
+homepage="http://xfce.org"
+distfiles="http://archive.xfce.org/src/xfce/xfwm4/4.10/xfwm4-$version.tar.bz2"
 checksum=492357bf48121ebffabf2bf0d3b84213d19bf81087321175d687c8a68efe1f9c
 long_desc="
  xfwm4 is a window manager compatible with GNOME, GNOME2, KDE2,
  KDE3 and Xfce."
 
-
+xfwm4_package() {
-
+	depends="hicolor-icon-theme desktop-file-utils"
-
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/xgamma/template

@@ -1,18 +1,22 @@
 # Template build file for 'xgamma'.
 pkgname=xgamma
 version=1.0.4
-distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
+revision=3
 build_style=gnu-configure
-revision=2
+hostmakedepends="pkg-config"
-makedepends="pkg-config libX11-devel libXxf86vm-devel"
+makedepends="libX11-devel libXxf86vm-devel"
 short_desc="Alter gamma correction"
 homepage="http://xorg.freedesktop.org"
 license="MIT"
 maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
 checksum=7dc8334882a060bcc90042bceac5132dd87d5acc8d043b16311ef2134aea8e16
 long_desc="
  This package provides xgamma, a program to alter the gamma correction of
- the monitor.
+ the monitor."
-
- This is from the modular X.org X11 project."
 
+xgamma_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/xhost/template

@@ -1,17 +1,21 @@
 # Template build file for 'xhost'.
 pkgname=xhost
 version=1.0.4
-distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
+revision=3
 build_style=gnu-configure
-revision=2
+hostmakedepends="pkg-config"
-makedepends="pkg-config libX11-devel libXmu-devel"
+makedepends="libX11-devel libXmu-devel"
 short_desc="Server access control program for X"
 homepage="http://xorg.freedesktop.org"
 license="MIT"
 maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
 checksum=5e02c06caeb7a258f3621bf11459a7820cfeaf9bf269c1f8da86d7071346a594
 long_desc="
- This package provides xhost, the server access control program for X.
+ This package provides xhost, the server access control program for X."
-
- This is from the modular X.org X11 project."
 
+xhost_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/xineramaproto/template

@@ -1,16 +1,21 @@
 # Template build file for 'xineramaproto'.
 pkgname=xineramaproto
 version=1.2
-distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2"
-build_style=gnu-configure
 revision=2
+build_style=gnu-configure
 short_desc="Xinerama extension headers from X.org"
 homepage="http://xorg.freedesktop.org"
 license="MIT"
 maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2"
 checksum=58e88087ceec7201d918f94d6b1247325adca2a9903fed11291b412427a7ba64
 long_desc="
  This provides the Xinerama extension headers from modular X.org X11
  project."
 
-noarch=yes
+xineramaproto_package() {
+	noarch="yes"
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/xinit/template

@@ -4,7 +4,8 @@ version=1.3.2
 revision=3
 build_style=gnu-configure
 configure_args="--with-xinitdir=/etc/X11/xinit"
-makedepends="pkg-config libX11-devel"
+hostmakedepends="pkg-config"
+makedepends="libX11-devel"
 short_desc="X init program"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://xorg.freedesktop.org/"
@@ -15,12 +16,6 @@ long_desc="
  This package provides xinit and startx, utilities for starting the
  X Window System server."
 
-conf_files="
- /etc/X11/xinit/xinitrc
- /etc/X11/xinit/xserverrc
- /etc/skel/.xinitrc
- /etc/skel/.xsession"
-
 pre_configure() {
 	sed -i -e 's/XSLASHGLOB.sh/XSLASHGLOB/' xinitrc.cpp
 }
@@ -31,3 +26,15 @@ post_install() {
 	vinstall ${FILESDIR}/xserverrc 644 etc/X11/xinit
 	vinstall COPYING 644 usr/share/licenses/${pkgname}
 }
+
+xinit_package() {
+	conf_files="
+		/etc/X11/xinit/xinitrc
+		/etc/X11/xinit/xserverrc
+		/etc/skel/.xinitrc
+		/etc/skel/.xsession"
+	pkg_install() {
+		vmove etc
+		vmove usr
+	}
+}

srcpkgs/xinput/template

@@ -1,16 +1,22 @@
 # Template build file for 'xinput'.
 pkgname=xinput
 version=1.6.0
-homepage="http://www.x.org"
-distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-build_style=gnu-configure
-makedepends="pkg-config libXext-devel libXi-devel libXrandr-devel libXinerama-devel"
 revision=1
+build_style=gnu-configure
+hostmakedepends="pkg-config"
+makedepends="libXext-devel libXi-devel libXrandr-devel libXinerama-devel"
 short_desc="Utility to configure and test X input devices"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="MIT"
+homepage="http://www.x.org"
+distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
 checksum=4ab007d952c76665603bcb82ceb15fd3929d10faf0580fc4873ac16f5f63847e
 long_desc="
  xinput is a utility to list available input devices, query information about
  a device and change input device settings."
  
+xinput_package() {
+	pkg_install() {
+		vmove usr
+	}
+}

srcpkgs/xkbcomp/template

@@ -17,3 +17,9 @@ long_desc="
 post_install() {
 	vinstall COPYING 644 usr/share/licenses/${pkgname}
 }
+
+xkbcomp_package() {
+	pkg_install() {
+		vmove usr
+	}
+}