Mega patch to improve how build dependencies are handled and

how packages are found.

First: I removed all these *-deps.db files and only a single file
is used now "build-depends.db"; it's smaller and will be easier
to handle in the future... when "run-depends.db" is added :-)

Second: there's no need to specify version of package anymore;
before you had to do:

	$ pkgfs.sh install git-1.6.0.2

now you only do:

	$ pkgfs.sh install git

This will read the variables located at PKGFS_TEMPLATESDIR/git.tmpl
and will the install the version that is there.

--HG--
extra : convert_revision : 9e3e5d70965a69c76f59e322b7c7b674d627af52

templates/MesaLib.tmpl

@@ -1,7 +1,8 @@
-# Template build file for 'MesaLib-7.2'.
-pkgname=MesaLib-7.2
+# Template build file for 'MesaLib'.
+pkgname=MesaLib
+version=7.2
 patch_files="$pkgname-fix-dri-build.diff"
-wrksrc=Mesa-7.2
+wrksrc=Mesa-$version
 extract_sufx=".tar.bz2"
 url=http://kent.dl.sourceforge.net/sourceforge/mesa3d
 build_style=gnu_configure

templates/atk.tmpl

@@ -1,5 +1,6 @@
-# Template build file for 'atk-1.24.0'.
-pkgname=atk-1.24.0
+# Template build file for 'atk'.
+pkgname=atk
+version=1.24.0
 extract_sufx=".tar.bz2"
 url=http://ftp.gnome.org/pub/GNOME/sources/atk/1.24
 build_style=gnu_configure

templates/bigreqsproto.tmpl

@@ -1,5 +1,6 @@
-# Template file for 'bigreqsproto-1.0.2'
-pkgname=bigreqsproto-1.0.2
+# Template file for 'bigreqsproto'
+pkgname=bigreqsproto
+version=1.0.2
 extract_sufx=".tar.bz2"
 url=http://xorg.freedesktop.org/releases/individual/proto
 build_style=gnu_configure

templates/cairo.tmpl

@@ -1,5 +1,6 @@
-# Template build file for 'cairo-1.7.6'.
-pkgname=cairo-1.7.6
+# Template build file for 'cairo'.
+pkgname=cairo
+version=1.7.6
 patch_files="$pkgname-doc-public-Makefile-in.diff"
 extract_sufx=".tar.gz"
 url=http://cairographics.org/snapshots

templates/compositeproto.tmpl

@@ -1,5 +1,6 @@
-# Template build file for 'compositeproto-0.4'.
-pkgname=compositeproto-0.4
+# Template build file for 'compositeproto'.
+pkgname=compositeproto
+version=0.4
 extract_sufx=".tar.bz2"
 url=http://xorg.freedesktop.org/releases/individual/proto
 build_style=gnu_configure

templates/curl.tmpl

@@ -1,5 +1,6 @@
-# Template file for 'curl-7.18.0'
-pkgname=curl-7.18.0
+# Template file for 'curl'
+pkgname=curl
+version=7.18.0
 extract_sufx=".tar.bz2"
 url=http://curl.haxx.se/download/
 build_style=gnu_configure

templates/damageproto.tmpl

@@ -1,5 +1,6 @@
-# Template build file for 'damageproto-1.1.0'.
-pkgname=damageproto-1.1.0
+# Template build file for 'damageproto'.
+pkgname=damageproto
+version=1.1.0
 extract_sufx=".tar.bz2"
 url=http://xorg.freedesktop.org/releases/individual/proto
 build_style=gnu_configure

templates/dmxproto.tmpl

@@ -1,5 +1,6 @@
-# Template build file for 'dmxproto-2.2.2'.
-pkgname=dmxproto-2.2.2
+# Template build file for 'dmxproto'.
+pkgname=dmxproto
+version=2.2.2
 extract_sufx=".tar.bz2"
 url=http://xorg.freedesktop.org/releases/individual/proto
 build_style=gnu_configure

templates/evieext.tmpl

@@ -1,5 +1,6 @@
-# Template build file for 'evieext-1.0.2'.
-pkgname=evieext-1.0.2
+# Template build file for 'evieext'.
+pkgname=evieext
+version=1.0.2
 extract_sufx=".tar.bz2"
 url=http://xorg.freedesktop.org/releases/individual/proto
 build_style=gnu_configure

templates/expat.tmpl

@@ -1,5 +1,6 @@
-# Template file for 'expat-2.0.1'
-pkgname=expat-2.0.1
+# Template file for 'expat'
+pkgname=expat
+version=2.0.1
 extract_sufx=".tar.gz"
 url=http://kent.dl.sourceforge.net/sourceforge/expat
 build_style=gnu_configure

templates/fixesproto.tmpl

@@ -1,5 +1,6 @@
-# Template build file for 'fixesproto-4.0'.
-pkgname=fixesproto-4.0
+# Template build file for 'fixesproto'.
+pkgname=fixesproto
+version=4.0
 extract_sufx=".tar.bz2"
 url=http://xorg.freedesktop.org/releases/individual/proto
 build_style=gnu_configure

templates/fontcacheproto.tmpl

@@ -1,5 +1,6 @@
-# Template build file for 'fontcacheproto-0.1.2'.
-pkgname=fontcacheproto-0.1.2
+# Template build file for 'fontcacheproto'.
+pkgname=fontcacheproto
+version=0.1.2
 extract_sufx=".tar.bz2"
 url=http://xorg.freedesktop.org/releases/individual/proto
 build_style=gnu_configure

templates/fontconfig.tmpl

@@ -1,5 +1,6 @@
-# Template build file for 'fontconfig-2.6.0'.
-pkgname=fontconfig-2.6.0
+# Template build file for 'fontconfig'.
+pkgname=fontconfig
+version=2.6.0
 patch_files="$pkgname-Makefile-fc-cache.diff"
 extract_sufx=".tar.gz"
 url=http://www.fontconfig.org/release

templates/fontsproto.tmpl

@@ -1,5 +1,6 @@
-# Template build file for 'fontsproto-2.0.2'.
-pkgname=fontsproto-2.0.2
+# Template build file for 'fontsproto'.
+pkgname=fontsproto
+version=2.0.2
 extract_sufx=".tar.bz2"
 url=http://xorg.freedesktop.org/releases/individual/proto
 build_style=gnu_configure

templates/freetype2.tmpl

@@ -1,9 +1,8 @@
-# Template build file for 'freetype2-2.3.7'.
-freetype2_version="2.3.7"
-
-pkgname=freetype2-$freetype2_version
+# Template build file for 'freetype2'.
+pkgname=freetype2
+version=2.3.7
 extract_sufx=".tar.bz2"
-distfiles="freetype-$freetype2_version"
+distfiles="freetype-$version"
 url=http://download.savannah.gnu.org/releases/freetype
 build_style=gnu_configure
 make_cmd="$PKGFS_MASTERDIR/bin/gmake"

templates/git.tmpl

@@ -1,5 +1,6 @@
-# Template build file for 'git-1.6.0.2".
-pkgname=git-1.6.0.2
+# Template build file for 'git".
+pkgname=git
+version=1.6.0.2
 extract_sufx=".tar.bz2"
 url=http://www.kernel.org/pub/software/scm/git
 build_style=gnu_configure

templates/glib.tmpl

@@ -1,7 +1,8 @@
-# Template build file for 'glib-2.18.1'
-pkgname=glib-2.18.1
+# Template build file for 'glib'
+pkgname=glib
+version=2.18.1
 extract_sufx=".tar.bz2"
-patch_files="glib-2.18.1-fix-statfs-netbsd.diff"
+patch_files="glib-fix-statfs-netbsd.diff"
 url=http://ftp.gnome.org/pub/gnome/sources/glib/2.18
 make_cmd="$PKGFS_MASTERDIR/bin/gmake"
 # Disable FAM for now and use the installed pcre package instead

templates/glitz.tmpl

@@ -1,5 +1,6 @@
-# Template build file for 'glitz-0.5.6'.
-pkgname=glitz-0.5.6
+# Template build file for 'glitz'.
+pkgname=glitz
+version=0.5.6
 extract_sufx=".tar.gz"
 url=http://cairographics.org/snapshots
 build_style=gnu_configure

templates/glproto.tmpl

@@ -1,5 +1,6 @@
-# Template build file for 'glproto-1.4.9'.
-pkgname=glproto-1.4.9
+# Template build file for 'glproto'.
+pkgname=glproto
+version=1.4.9
 extract_sufx=".tar.bz2"
 url=http://xorg.freedesktop.org/releases/individual/proto
 build_style=gnu_configure

templates/gmake.tmpl

@@ -1,7 +1,8 @@
-# Template build file for 'gmake-3.81'
-pkgname=gmake-3.81
+# Template build file for 'gmake'
+pkgname=gmake
+version=3.81
 extract_sufx=".tar.bz2"
-distfiles="make-3.81"
+distfiles="make-$version"
 url=http://ftp.gnu.org/pub/gnu/make
 configure_args="--program-prefix=g"
 build_style=gnu_configure

templates/gtk+.tmpl

@@ -1,5 +1,6 @@
-# Template build file for 'gtk+-2.14.3'.
-pkgname=gtk+-2.14.3
+# Template build file for 'gtk+'.
+pkgname=gtk+
+version=2.14.3
 patch_files="$pkgname-tests-Makefile-in.diff"
 extract_sufx=".tar.bz2"
 url=http://ftp.gnome.org/pub/GNOME/sources/gtk+/2.14

templates/inputproto.tmpl

@@ -1,5 +1,6 @@
-# Template file for 'inputproto-1.4.4'
-pkgname=inputproto-1.4.4
+# Template file for 'inputproto'
+pkgname=inputproto
+version=1.4.4
 extract_sufx=".tar.bz2"
 url=http://xorg.freedesktop.org/releases/individual/proto
 build_style=gnu_configure

templates/intltool.tmpl

@@ -1,5 +1,6 @@
-# Template build file for 'intltool-0.40.4'.
-pkgname=intltool-0.40.4
+# Template build file for 'intltool'.
+pkgname=intltool
+version=0.40.4
 extract_sufx=".tar.bz2"
 url=http://ftp.gnome.org/pub/GNOME/sources/intltool/0.40
 build_style=gnu_configure

templates/irssi.tmpl

@@ -1,5 +1,6 @@
-# Template build file for 'irssi-0.8.12'
-pkgname=irssi-0.8.12
+# Template build file for 'irssi'
+pkgname=irssi
+version=0.8.12
 extract_sufx=".tar.bz2"
 url=http://www.irssi.org/files
 # We need this to get some perl paths.

templates/jasper.tmpl

@@ -1,5 +1,6 @@
-# Template build file for 'jasper-1.900.1'.
-pkgname=jasper-1.900.1
+# Template build file for 'jasper'.
+pkgname=jasper
+version=1.900.1
 extract_sufx=".zip"
 url=http://www.ece.uvic.ca/~mdadams/jasper/software
 build_style=gnu_configure

templates/jpeg.tmpl

@@ -1,7 +1,8 @@
-# Template build file for 'jpeg-6b'.
-pkgname=jpeg-6b
+# Template build file for 'jpeg'.
+pkgname=jpeg
+version=6b
+wrksrc=$pkgname-$version
 patch_files="$pkgname-makefile-cfg.diff"
-wrksrc="$pkgname"
 distfiles="jpegsrc.v6b"
 extract_sufx=".tar.gz"
 url=ftp://ftp.fu-berlin.de/unix/graphics/jpeg

templates/kbproto.tmpl

@@ -1,5 +1,6 @@
-# Template file for 'kbproto-1.0.3'
-pkgname=kbproto-1.0.3
+# Template file for 'kbproto'
+pkgname=kbproto
+version=1.0.3
 extract_sufx=".tar.bz2"
 url=http://xorg.freedesktop.org/releases/individual/proto
 build_style=gnu_configure

templates/libICE.tmpl

@@ -1,5 +1,6 @@
-# Template build file for 'libICE-1.0.4'.
-pkgname=libICE-1.0.4
+# Template build file for 'libICE'.
+pkgname=libICE
+version=1.0.4
 extract_sufx=".tar.bz2"
 url=http://xorg.freedesktop.org/releases/individual/lib
 build_style=gnu_configure

templates/libSM.tmpl

@@ -1,5 +1,6 @@
-# Template build file for 'libSM-1.1.0'.
-pkgname=libSM-1.1.0
+# Template build file for 'libSM'.
+pkgname=libSM
+version=1.1.0
 extract_sufx=".tar.bz2"
 url=http://xorg.freedesktop.org/releases/individual/lib
 build_style=gnu_configure

templates/libX11.tmpl

@@ -1,5 +1,6 @@
-# Template file for 'libX11-1.1.5'
-pkgname=libX11-1.1.5
+# Template file for 'libX11'
+pkgname=libX11
+version=1.1.5
 extract_sufx=".tar.bz2"
 url=http://xorg.freedesktop.org/releases/individual/lib
 build_style=gnu_configure

templates/libXau.tmpl

@@ -1,5 +1,6 @@
-# Template file for 'libXau-1.0.4'
-pkgname=libXau-1.0.4
+# Template file for 'libXau'
+pkgname=libXau
+version=1.0.4
 extract_sufx=".tar.bz2"
 url=http://xorg.freedesktop.org/releases/individual/lib
 build_style=gnu_configure

templates/libXaw.tmpl

@@ -1,5 +1,6 @@
-# Template build file for 'libXaw-1.0.4'.
-pkgname=libXaw-1.0.4
+# Template build file for 'libXaw'.
+pkgname=libXaw
+version=1.0.4
 extract_sufx=".tar.bz2"
 url=http://xorg.freedesktop.org/releases/individual/lib
 build_style=gnu_configure

templates/libXdamage.tmpl

@@ -1,5 +1,6 @@
-# Template build file for 'libXdamage-1.1.1'.
-pkgname=libXdamage-1.1.1
+# Template build file for 'libXdamage'.
+pkgname=libXdamage
+version=1.1.1
 extract_sufx=".tar.bz2"
 url=http://xorg.freedesktop.org/releases/individual/lib
 build_style=gnu_configure

templates/libXdmcp.tmpl

@@ -1,5 +1,6 @@
-# Template file for 'libXdmcp-1.0.2'
-pkgname=libXdmcp-1.0.2
+# Template file for 'libXdmcp'
+pkgname=libXdmcp
+version=1.0.2
 extract_sufx=".tar.bz2"
 url=http://xorg.freedesktop.org/releases/individual/lib
 build_style=gnu_configure

templates/libXext.tmpl

@@ -1,5 +1,6 @@
-# Template build file for 'libXext-1.0.4'.
-pkgname=libXext-1.0.4
+# Template build file for 'libXext'.
+pkgname=libXext
+version=1.0.4
 extract_sufx=".tar.bz2"
 url=http://xorg.freedesktop.org/releases/individual/lib
 build_style=gnu_configure

templates/libXfixes.tmpl

@@ -1,5 +1,6 @@
-# Template build file for 'libXfixes-4.0.3'.
-pkgname=libXfixes-4.0.3
+# Template build file for 'libXfixes'.
+pkgname=libXfixes
+version=4.0.3
 extract_sufx=".tar.bz2"
 url=http://xorg.freedesktop.org/releases/individual/lib
 build_style=gnu_configure

templates/libXfont.tmpl

@@ -1,5 +1,6 @@
-# Template build file for 'libXfont-1.3.3'.
-pkgname=libXfont-1.3.3
+# Template build file for 'libXfont'.
+pkgname=libXfont
+version=1.3.3
 extract_sufx=".tar.bz2"
 url=http://xorg.freedesktop.org/releases/individual/lib
 build_style=gnu_configure

templates/libXft.tmpl

@@ -1,5 +1,6 @@
-# Template build file for 'libXft-2.1.13'.
-pkgname=libXft-2.1.13
+# Template build file for 'libXft'.
+pkgname=libXft
+version=2.1.13
 extract_sufx=".tar.bz2"
 url=http://xorg.freedesktop.org/releases/individual/lib
 build_style=gnu_configure

templates/libXi.tmpl

@@ -1,5 +1,6 @@
-# Template build file for 'libXi-1.1.3'.
-pkgname=libXi-1.1.3
+# Template build file for 'libXi'.
+pkgname=libXi
+version=1.1.3
 extract_sufx=".tar.bz2"
 url=http://xorg.freedesktop.org/releases/individual/lib
 build_style=gnu_configure

templates/libXinerama.tmpl

@@ -1,5 +1,6 @@
-# Template build file for 'libXinerama-1.0.3'.
-pkgname=libXinerama-1.0.3
+# Template build file for 'libXinerama'.
+pkgname=libXinerama
+version=1.0.3
 extract_sufx=".tar.bz2"
 url=http://xorg.freedesktop.org/releases/individual/lib
 build_style=gnu_configure

templates/libXmu.tmpl

@@ -1,5 +1,6 @@
-# Template build file for 'libXmu-1.0.4'.
-pkgname=libXmu-1.0.4
+# Template build file for 'libXmu'.
+pkgname=libXmu
+version=1.0.4
 extract_sufx=".tar.bz2"
 url=http://xorg.freedesktop.org/releases/individual/lib
 build_style=gnu_configure

templates/libXp.tmpl

@@ -1,5 +1,6 @@
-# Template build file for 'libXp-1.0.0'.
-pkgname=libXp-1.0.0
+# Template build file for 'libXp'.
+pkgname=libXp
+version=1.0.0
 extract_sufx=".tar.bz2"
 url=http://xorg.freedesktop.org/releases/individual/lib
 build_style=gnu_configure

templates/libXpm.tmpl

@@ -1,5 +1,6 @@
-# Template build file for 'libXpm-3.5.7'.
-pkgname=libXpm-3.5.7
+# Template build file for 'libXpm'.
+pkgname=libXpm
+version=3.5.7
 extract_sufx=".tar.bz2"
 url=http://xorg.freedesktop.org/releases/individual/lib
 build_style=gnu_configure

templates/libXrandr.tmpl

@@ -1,5 +1,6 @@
-# Template build file for 'libXrandr-1.2.3'.
-pkgname=libXrandr-1.2.3
+# Template build file for 'libXrandr'.
+pkgname=libXrandr
+version=1.2.3
 extract_sufx=".tar.bz2"
 url=http://xorg.freedesktop.org/releases/individual/lib
 build_style=gnu_configure

templates/libXrender.tmpl

@@ -1,5 +1,6 @@
-# Template build file for 'libXrender-0.9.4'.
-pkgname=libXrender-0.9.4
+# Template build file for 'libXrender'.
+pkgname=libXrender
+version=0.9.4
 extract_sufx=".tar.bz2"
 url=http://xorg.freedesktop.org/releases/individual/lib
 build_style=gnu_configure

templates/libXt.tmpl

@@ -1,5 +1,6 @@
-# Template build file for 'libXt-1.0.5'.
-pkgname=libXt-1.0.5
+# Template build file for 'libXt'.
+pkgname=libXt
+version=1.0.5
 extract_sufx=".tar.bz2"
 url=http://xorg.freedesktop.org/releases/individual/lib
 build_style=gnu_configure

templates/libXxf86misc.tmpl

@@ -1,5 +1,6 @@
-# Template build file for 'libXxf86misc-1.0.1'.
-pkgname=libXxf86misc-1.0.1
+# Template build file for 'libXxf86misc'.
+pkgname=libXxf86misc
+version=1.0.1
 extract_sufx=".tar.bz2"
 url=http://xorg.freedesktop.org/releases/individual/lib
 build_style=gnu_configure

templates/libXxf86vm.tmpl

@@ -1,5 +1,6 @@
-# Template build file for 'libXxf86vm-1.0.2'.
-pkgname=libXxf86vm-1.0.2
+# Template build file for 'libXxf86vm'.
+pkgname=libXxf86vm
+version=1.0.2
 extract_sufx=".tar.bz2"
 url=http://xorg.freedesktop.org/releases/individual/lib
 build_style=gnu_configure

templates/libdrm.tmpl

@@ -1,5 +1,6 @@
-# Template build file for 'libdrm-2.3.1'.
-pkgname=libdrm-2.3.1
+# Template build file for 'libdrm'.
+pkgname=libdrm
+version=2.3.1
 extract_sufx=".tar.bz2"
 url=http://dri.freedesktop.org/libdrm
 build_style=gnu_configure

templates/libfontenc.tmpl

@@ -1,5 +1,6 @@
-# Template build file for 'libfontenc-1.0.4'.
-pkgname=libfontenc-1.0.4
+# Template build file for 'libfontenc'.
+pkgname=libfontenc
+version=1.0.4
 extract_sufx=".tar.bz2"
 url=http://xorg.freedesktop.org/releases/individual/lib
 build_style=gnu_configure

templates/libidn.tmpl

@@ -1,5 +1,6 @@
-# Template file for 'libidn-1.9'
-pkgname=libidn-1.9
+# Template file for 'libidn'
+pkgname=libidn
+version=1.9
 extract_sufx=".tar.gz"
 url=http://ftp.gnu.org/gnu/libidn
 build_style=gnu_configure

templates/libpciaccess.tmpl

@@ -1,5 +1,6 @@
-# Template build file for 'libpciaccess-0.10.3'.
-pkgname=libpciaccess-0.10.3
+# Template build file for 'libpciaccess'.
+pkgname=libpciaccess
+version=0.10.3
 extract_sufx=".tar.bz2"
 patch_files="$pkgname-src-common-interface.diff"
 url=http://xorg.freedesktop.org/releases/individual/lib

templates/libpng.tmpl

@@ -1,5 +1,6 @@
-# Template build file for 'libpng-1.2.32'.
-pkgname=libpng-1.2.32
+# Template build file for 'libpng'.
+pkgname=libpng
+version=1.2.32
 extract_sufx=".tar.bz2"
 url=ftp://ftp.fu-berlin.de/unix/graphics/png/src
 build_style=gnu_configure

templates/libtool.tmpl

@@ -1,12 +1,9 @@
-# Template build file for 'libtool-2.2.6a'
-#
-# Variable only used in this template.
-_mypkgname=libtool-2.2.6
-
-pkgname=${_mypkgname}a
+# Template build file for 'libtool'
+pkgname=libtool
+version=2.2.6a
 extract_sufx=".tar.gz"
-patch_files="${_mypkgname}a-fix-ltmain.sh.diff"
-wrksrc=${_mypkgname}
+patch_files="libtool-fix-ltmain.sh.diff"
+wrksrc=$pkgname-2.2.6
 url=http://ftp.gnu.org/pub/gnu/libtool
 build_style=gnu_configure
 short_desc="Generic library support"

templates/libxkbfile.tmpl

@@ -1,5 +1,6 @@
-# Template build file for 'libxkbfile-1.0.5'.
-pkgname=libxkbfile-1.0.5
+# Template build file for 'libxkbfile'.
+pkgname=libxkbfile
+version=1.0.5
 extract_sufx=".tar.bz2"
 url=http://xorg.freedesktop.org/releases/individual/lib
 build_style=gnu_configure

templates/libxkbui.tmpl

@@ -1,5 +1,6 @@
-# Template build file for 'libxkbui-1.0.2'.
-pkgname=libxkbui-1.0.2
+# Template build file for 'libxkbui'.
+pkgname=libxkbui
+version=1.0.2
 extract_sufx=".tar.bz2"
 url=http://xorg.freedesktop.org/releases/individual/lib
 build_style=gnu_configure

templates/libxml2.tmpl

@@ -1,5 +1,6 @@
-# Template build file for 'libxml2-2.7.1'.
-pkgname=libxml2-2.7.1
+# Template build file for 'libxml2'.
+pkgname=libxml2
+version=2.7.1
 extract_sufx=".tar.gz"
 url=http://xmlsoft.org/sources
 build_style=gnu_configure

templates/mc.tmpl

@@ -1,5 +1,6 @@
-# Template file for 'mc-4.6.1'
-pkgname=mc-4.6.1
+# Template file for 'mc'
+pkgname=mc
+version=4.6.1
 extract_sufx=".tar.gz"
 url=http://www.ibiblio.org/pub/Linux/utils/file/managers/mc
 build_style=gnu_configure

templates/pango.tmpl

@@ -1,5 +1,6 @@
-# Template build file for 'pango-1.22.0'.
-pkgname=pango-1.22.0
+# Template build file for 'pango'.
+pkgname=pango
+version=1.22.0
 patch_files="$pkgname-docs-Makefile-in.diff"
 extract_sufx=".tar.bz2"
 url=http://ftp.gnome.org/pub/GNOME/sources/pango/1.22

templates/pcre.tmpl

@@ -1,5 +1,6 @@
-# Template file for 'pcre-7.8'
-pkgname=pcre-7.8
+# Template file for 'pcre'
+pkgname=pcre
+version=7.8
 extract_sufx=".tar.bz2"
 url=http://kent.dl.sourceforge.net/sourceforge/pcre
 build_style=gnu_configure

templates/pekwm.tmpl

@@ -1,5 +1,6 @@
-# Template build file for 'pekwm-0.1.7'.
-pkgname=pekwm-0.1.7
+# Template build file for 'pekwm'.
+pkgname=pekwm
+version=0.1.7
 extract_sufx=".tar.bz2"
 url=http://www.pekwm.org/projects/3/files
 build_style=gnu_configure

templates/perl-XML-Parser.tmpl

@@ -1,6 +1,7 @@
-# Template build file for 'perl-XML-Parser-2.36'.
-pkgname=perl-XML-Parser-2.36
-distfiles="XML-Parser-2.36"
+# Template build file for 'perl-XML-Parser'.
+pkgname=perl-XML-Parser
+version=2.36
+distfiles="XML-Parser-$version"
 extract_sufx=".tar.gz"
 url=http://cpan.perl.org/modules/by-module/XML
 build_style=perl_module

templates/perl-runstuff-after-install.sh

@@ -1,12 +1,11 @@
 # Fixup Config.pm to look at PKGFS_MASTERDIR, this helps modules
 # to use correct dirs while building/installing them.
 
-perl_version=5.10.0
 perl_arch=$(uname -m)
-perl_libdir=$PKGFS_DESTDIR/$pkgname/lib/perl5
-config_pm=$perl_libdir/$perl_version/$perl_arch-netbsd-thread-multi/Config.pm
+perl_libdir=$PKGFS_DESTDIR/$pkgname-$version/lib/perl5
+config_pm=$perl_libdir/$version/$perl_arch-netbsd-thread-multi/Config.pm
 
-$sed_cmd -e "s|$PKGFS_DESTDIR\/$pkgname|$PKGFS_MASTERDIR|g" \
+$sed_cmd -e "s|$PKGFS_DESTDIR\/$pkgname-$version|$PKGFS_MASTERDIR|g" \
 	$config_pm > $config_pm.in
 $chmod_cmd 444 $config_pm.in
 $mv_cmd -f $config_pm.in $config_pm

templates/perl-runstuff-before-build.sh

@@ -1,6 +1,6 @@
 # This fixes the definitions that the perl binary uses to look at
 # PKGFS_MASTERDIR and not PKGFS_DESTDIR!
 
-$sed_cmd -e "s|$PKGFS_DESTDIR\/$pkgname|$PKGFS_MASTERDIR|g" \
+$sed_cmd -e "s|$PKGFS_DESTDIR\/$pkgname-$version|$PKGFS_MASTERDIR|g" \
 	$wrksrc/config.h > $wrksrc/config.h.in && \
 $mv_cmd -f $wrksrc/config.h.in $wrksrc/config.h

templates/perl.tmpl

@@ -1,10 +1,11 @@
-# Template build file for 'perl-5.10.0'.
-pkgname=perl-5.10.0
-patch_files="perl-5.10.0-dont-hardcode-rpath.diff"
+# Template build file for 'perl'.
+pkgname=perl
+version=5.10.0
+patch_files="perl-dont-hardcode-rpath.diff"
 extract_sufx=".tar.gz"
 url=http://www.cpan.org/src
 configure_script="Configure"
-configure_args="-Dusethreads -des -Dprefix=$PKGFS_DESTDIR/$pkgname
+configure_args="-Dusethreads -des -Dprefix=$PKGFS_DESTDIR/$pkgname-$version
  -Ui_malloc -Uusemymalloc -Dinstallstyle=lib/perl5"
 build_style=configure
 short_desc="Practical Extraction and Report Language"

templates/pixman.tmpl

@@ -1,5 +1,6 @@
-# Template build file for 'pixman-0.12.0'.
-pkgname=pixman-0.12.0
+# Template build file for 'pixman'.
+pkgname=pixman
+version=0.12.0
 extract_sufx=".tar.bz2"
 url=http://xorg.freedesktop.org/releases/individual/lib
 build_style=gnu_configure

templates/pkg-config.tmpl

@@ -1,5 +1,6 @@
-# Template build file for 'pkg-config-0.23'
-pkgname=pkg-config-0.23
+# Template build file for 'pkg-config'
+pkgname=pkg-config
+version=0.23
 extract_sufx=".tar.gz"
 url=http://pkgconfig.freedesktop.org/releases
 build_style=gnu_configure

templates/printproto.tmpl

@@ -1,5 +1,6 @@
-# Template build file for 'printproto-1.0.4'.
-pkgname=printproto-1.0.4
+# Template build file for 'printproto'.
+pkgname=printproto
+version=1.0.4
 extract_sufx=".tar.bz2"
 url=http://xorg.freedesktop.org/releases/individual/proto
 build_style=gnu_configure

templates/python.tmpl

@@ -1,10 +1,11 @@
-# Template build file for 'python-2.5.2'
-pkgname=python-2.5.2
-distfiles="Python-2.5.2"
+# Template build file for 'python'
+pkgname=python
+version=2.5.2
+distfiles="Python-$version"
 extract_sufx=".tar.bz2"
-patch_files="python-2.5.2-fix-build.diff python-2.5.2-fix-curses-module.diff 
- python-2.5.2-fix-bluetooth.diff python-2.5.2-fix-mremap.diff"
-url=http://www.python.org/ftp/python/2.5.2
+patch_files="python-fix-build.diff python-fix-curses-module.diff 
+ python-fix-bluetooth.diff python-fix-mremap.diff"
+url=http://www.python.org/ftp/python/$version
 configure_args="--with-threads --enable-shared"
 build_style=gnu_configure
 short_desc="Interpreted, interactive, object-oriented programming language"

templates/randrproto.tmpl

@@ -1,5 +1,6 @@
-# Template build file for 'randrproto-1.2.2'.
-pkgname=randrproto-1.2.2
+# Template build file for 'randrproto'.
+pkgname=randrproto
+version=1.2.2
 extract_sufx=".tar.bz2"
 url=http://xorg.freedesktop.org/releases/individual/proto
 build_style=gnu_configure

templates/recordproto.tmpl

@@ -1,5 +1,6 @@
-# Template build file for 'recordproto-1.13.2'.
-pkgname=recordproto-1.13.2
+# Template build file for 'recordproto'.
+pkgname=recordproto
+version=1.13.2
 extract_sufx=".tar.bz2"
 url=http://xorg.freedesktop.org/releases/individual/proto
 build_style=gnu_configure

templates/renderproto.tmpl

@@ -1,5 +1,6 @@
-# Template build file for 'renderproto-0.9.3'.
-pkgname=renderproto-0.9.3
+# Template build file for 'renderproto'.
+pkgname=renderproto
+version=0.9.3
 extract_sufx=".tar.bz2"
 url=http://xorg.freedesktop.org/releases/individual/proto
 build_style=gnu_configure

templates/resourceproto.tmpl

@@ -1,5 +1,6 @@
-# Template build file for 'resourceproto-1.0.2'.
-pkgname=resourceproto-1.0.2
+# Template build file for 'resourceproto'.
+pkgname=resourceproto
+version=1.0.2
 extract_sufx=".tar.bz2"
 url=http://xorg.freedesktop.org/releases/individual/proto
 build_style=gnu_configure

templates/ruby.tmpl

@@ -1,5 +1,6 @@
-# Template build file for 'ruby-1.8.7-p72'.
-pkgname=ruby-1.8.7-p72
+# Template build file for 'ruby'.
+pkgname=ruby
+version=1.8.7-p72
 extract_sufx=".tar.bz2"
 url=ftp://ftp.ruby-lang.org/pub/ruby/1.8
 build_style=gnu_configure

templates/scrnsaverproto.tmpl

@@ -1,5 +1,6 @@
-# Template build file for 'scrnsaverproto-1.1.0'.
-pkgname=scrnsaverproto-1.1.0
+# Template build file for 'scrnsaverproto'.
+pkgname=scrnsaverproto
+version=1.1.0
 extract_sufx=".tar.bz2"
 url=http://xorg.freedesktop.org/releases/individual/proto
 build_style=gnu_configure

templates/tiff.tmpl

@@ -1,5 +1,6 @@
-# Template build file for 'tiff-3.8.2'.
-pkgname=tiff-3.8.2
+# Template build file for 'tiff'.
+pkgname=tiff
+version=3.8.2
 extract_sufx=".tar.gz"
 url=http://libtiff.maptools.org/dl
 build_style=gnu_configure

templates/trapproto.tmpl

@@ -1,5 +1,6 @@
-# Template build file for 'trapproto-3.4.3'.
-pkgname=trapproto-3.4.3
+# Template build file for 'trapproto'.
+pkgname=trapproto
+version=3.4.3
 extract_sufx=".tar.bz2"
 url=http://xorg.freedesktop.org/releases/individual/proto
 build_style=gnu_configure

templates/unzip.tmpl

@@ -1,7 +1,8 @@
-# Template file for 'unzip-5.52'
-pkgname=unzip-5.52
+# Template file for 'unzip'
+pkgname=unzip
+version=5.52
 patch_files=$pkgname-fix-unzipsfx.diff
-wrksrc=$pkgname
+wrksrc=$pkgname-$version
 distfiles=unzip552
 extract_sufx=".tgz"
 url=ftp://ftp.info-zip.org/pub/infozip/src/

templates/util-macros.tmpl

@@ -1,5 +1,6 @@
-# Template build file for 'util-macros-1.1.6'.
-pkgname=util-macros-1.1.6
+# Template build file for 'util-macros'.
+pkgname=util-macros
+version=1.1.6
 extract_sufx=".tar.bz2"
 url=http://xorg.freedesktop.org/releases/individual/util
 build_style=gnu_configure

templates/videoproto.tmpl

@@ -1,5 +1,6 @@
-# Template build file for 'videoproto-2.2.2'.
-pkgname=videoproto-2.2.2
+# Template build file for 'videoproto'.
+pkgname=videoproto
+version=2.2.2
 extract_sufx=".tar.bz2"
 url=http://xorg.freedesktop.org/releases/individual/proto
 build_style=gnu_configure

templates/vim.tmpl

@@ -1,5 +1,6 @@
-# Template file for 'vim-7.2'
-pkgname=vim-7.2
+# Template file for 'vim'
+pkgname=vim
+version=7.2
 wrksrc=vim72
 extract_sufx=".tar.bz2"
 url=ftp://ftp.vim.org/pub/vim/unix

templates/xcmiscproto.tmpl

@@ -1,5 +1,6 @@
-# Template file for 'xcmiscproto-1.1.2'
-pkgname=xcmiscproto-1.1.2
+# Template file for 'xcmiscproto'.
+pkgname=xcmiscproto
+version=1.1.2
 extract_sufx=".tar.bz2"
 url=http://xorg.freedesktop.org/releases/individual/proto
 build_style=gnu_configure

templates/xextproto.tmpl

@@ -1,5 +1,6 @@
-# Template file for 'xextproto-7.0.3'
-pkgname=xextproto-7.0.3
+# Template file for 'xextproto'
+pkgname=xextproto
+version=7.0.3
 extract_sufx=".tar.bz2"
 url=http://xorg.freedesktop.org/releases/individual/proto
 build_style=gnu_configure

templates/xf86bigfontproto.tmpl

@@ -1,5 +1,6 @@
-# Template file for 'xf86bigfontproto-1.1.2'
-pkgname=xf86bigfontproto-1.1.2
+# Template file for 'xf86bigfontproto'
+pkgname=xf86bigfontproto
+version=1.1.2
 extract_sufx=".tar.bz2"
 url=http://xorg.freedesktop.org/releases/individual/proto
 build_style=gnu_configure