diff --git a/dependencies/MesaLib-7.2-deps.db b/dependencies/MesaLib-7.2-deps.db deleted file mode 100644 index f439614045e..00000000000 Binary files a/dependencies/MesaLib-7.2-deps.db and /dev/null differ diff --git a/dependencies/atk-1.24.0-deps.db b/dependencies/atk-1.24.0-deps.db deleted file mode 100644 index cbd675152ca..00000000000 Binary files a/dependencies/atk-1.24.0-deps.db and /dev/null differ diff --git a/dependencies/build-depends.db b/dependencies/build-depends.db new file mode 100644 index 00000000000..557ee568714 Binary files /dev/null and b/dependencies/build-depends.db differ diff --git a/dependencies/cairo-1.7.6-deps.db b/dependencies/cairo-1.7.6-deps.db deleted file mode 100644 index bd589872088..00000000000 Binary files a/dependencies/cairo-1.7.6-deps.db and /dev/null differ diff --git a/dependencies/compositeproto-0.4-deps.db b/dependencies/compositeproto-0.4-deps.db deleted file mode 100644 index 1974605904b..00000000000 Binary files a/dependencies/compositeproto-0.4-deps.db and /dev/null differ diff --git a/dependencies/curl-7.18.0-deps.db b/dependencies/curl-7.18.0-deps.db deleted file mode 100644 index f6860e94865..00000000000 Binary files a/dependencies/curl-7.18.0-deps.db and /dev/null differ diff --git a/dependencies/damageproto-1.1.0-deps.db b/dependencies/damageproto-1.1.0-deps.db deleted file mode 100644 index 1974605904b..00000000000 Binary files a/dependencies/damageproto-1.1.0-deps.db and /dev/null differ diff --git a/dependencies/dmxproto-2.2.2-deps.db b/dependencies/dmxproto-2.2.2-deps.db deleted file mode 100644 index 45355c91e26..00000000000 Binary files a/dependencies/dmxproto-2.2.2-deps.db and /dev/null differ diff --git a/dependencies/fixesproto-4.0-deps.db b/dependencies/fixesproto-4.0-deps.db deleted file mode 100644 index 2c07ad50223..00000000000 Binary files a/dependencies/fixesproto-4.0-deps.db and /dev/null differ diff --git a/dependencies/fontconfig-2.6.0-deps.db b/dependencies/fontconfig-2.6.0-deps.db deleted file mode 100644 index 1723fe446a8..00000000000 Binary files a/dependencies/fontconfig-2.6.0-deps.db and /dev/null differ diff --git a/dependencies/git-1.6.0.2-deps.db b/dependencies/git-1.6.0.2-deps.db deleted file mode 100644 index 622c5fea6c1..00000000000 Binary files a/dependencies/git-1.6.0.2-deps.db and /dev/null differ diff --git a/dependencies/glib-2.18.1-deps.db b/dependencies/glib-2.18.1-deps.db deleted file mode 100644 index 20f05f3b1a1..00000000000 Binary files a/dependencies/glib-2.18.1-deps.db and /dev/null differ diff --git a/dependencies/glitz-0.5.6-deps.db b/dependencies/glitz-0.5.6-deps.db deleted file mode 100644 index 72b6d6bb3c5..00000000000 Binary files a/dependencies/glitz-0.5.6-deps.db and /dev/null differ diff --git a/dependencies/gtk+-2.14.3-deps.db b/dependencies/gtk+-2.14.3-deps.db deleted file mode 100644 index 8a6b066f6fb..00000000000 Binary files a/dependencies/gtk+-2.14.3-deps.db and /dev/null differ diff --git a/dependencies/intltool-0.40.4-deps.db b/dependencies/intltool-0.40.4-deps.db deleted file mode 100644 index 1498b08198a..00000000000 Binary files a/dependencies/intltool-0.40.4-deps.db and /dev/null differ diff --git a/dependencies/irssi-0.8.12-deps.db b/dependencies/irssi-0.8.12-deps.db deleted file mode 100644 index c3f382dc0b6..00000000000 Binary files a/dependencies/irssi-0.8.12-deps.db and /dev/null differ diff --git a/dependencies/jasper-1.900.1-deps.db b/dependencies/jasper-1.900.1-deps.db deleted file mode 100644 index f59bf7b8088..00000000000 Binary files a/dependencies/jasper-1.900.1-deps.db and /dev/null differ diff --git a/dependencies/libICE-1.0.4-deps.db b/dependencies/libICE-1.0.4-deps.db deleted file mode 100644 index f924bbde276..00000000000 Binary files a/dependencies/libICE-1.0.4-deps.db and /dev/null differ diff --git a/dependencies/libSM-1.1.0-deps.db b/dependencies/libSM-1.1.0-deps.db deleted file mode 100644 index b817fb01629..00000000000 Binary files a/dependencies/libSM-1.1.0-deps.db and /dev/null differ diff --git a/dependencies/libX11-1.1.5-deps.db b/dependencies/libX11-1.1.5-deps.db deleted file mode 100644 index e53476260c8..00000000000 Binary files a/dependencies/libX11-1.1.5-deps.db and /dev/null differ diff --git a/dependencies/libXau-1.0.4-deps.db b/dependencies/libXau-1.0.4-deps.db deleted file mode 100644 index c725ed6ad99..00000000000 Binary files a/dependencies/libXau-1.0.4-deps.db and /dev/null differ diff --git a/dependencies/libXaw-1.0.4-deps.db b/dependencies/libXaw-1.0.4-deps.db deleted file mode 100644 index b56d3d1b2da..00000000000 Binary files a/dependencies/libXaw-1.0.4-deps.db and /dev/null differ diff --git a/dependencies/libXdamage-1.1.1-deps.db b/dependencies/libXdamage-1.1.1-deps.db deleted file mode 100644 index d36cc71d46d..00000000000 Binary files a/dependencies/libXdamage-1.1.1-deps.db and /dev/null differ diff --git a/dependencies/libXdmcp-1.0.2-deps.db b/dependencies/libXdmcp-1.0.2-deps.db deleted file mode 100644 index c725ed6ad99..00000000000 Binary files a/dependencies/libXdmcp-1.0.2-deps.db and /dev/null differ diff --git a/dependencies/libXext-1.0.4-deps.db b/dependencies/libXext-1.0.4-deps.db deleted file mode 100644 index 784486b3290..00000000000 Binary files a/dependencies/libXext-1.0.4-deps.db and /dev/null differ diff --git a/dependencies/libXfixes-4.0.3-deps.db b/dependencies/libXfixes-4.0.3-deps.db deleted file mode 100644 index a6a3a7be6eb..00000000000 Binary files a/dependencies/libXfixes-4.0.3-deps.db and /dev/null differ diff --git a/dependencies/libXfont-1.3.3-deps.db b/dependencies/libXfont-1.3.3-deps.db deleted file mode 100644 index e47697540ec..00000000000 Binary files a/dependencies/libXfont-1.3.3-deps.db and /dev/null differ diff --git a/dependencies/libXft-2.1.13-deps.db b/dependencies/libXft-2.1.13-deps.db deleted file mode 100644 index df8339b3de4..00000000000 Binary files a/dependencies/libXft-2.1.13-deps.db and /dev/null differ diff --git a/dependencies/libXi-1.1.3-deps.db b/dependencies/libXi-1.1.3-deps.db deleted file mode 100644 index 9ffe312c401..00000000000 Binary files a/dependencies/libXi-1.1.3-deps.db and /dev/null differ diff --git a/dependencies/libXinerama-1.0.3-deps.db b/dependencies/libXinerama-1.0.3-deps.db deleted file mode 100644 index f0532b1d874..00000000000 Binary files a/dependencies/libXinerama-1.0.3-deps.db and /dev/null differ diff --git a/dependencies/libXmu-1.0.4-deps.db b/dependencies/libXmu-1.0.4-deps.db deleted file mode 100644 index e4fb5486f87..00000000000 Binary files a/dependencies/libXmu-1.0.4-deps.db and /dev/null differ diff --git a/dependencies/libXp-1.0.0-deps.db b/dependencies/libXp-1.0.0-deps.db deleted file mode 100644 index 79ff6e2df92..00000000000 Binary files a/dependencies/libXp-1.0.0-deps.db and /dev/null differ diff --git a/dependencies/libXpm-3.5.7-deps.db b/dependencies/libXpm-3.5.7-deps.db deleted file mode 100644 index 5349527a431..00000000000 Binary files a/dependencies/libXpm-3.5.7-deps.db and /dev/null differ diff --git a/dependencies/libXrandr-1.2.3-deps.db b/dependencies/libXrandr-1.2.3-deps.db deleted file mode 100644 index c7f08fee0e2..00000000000 Binary files a/dependencies/libXrandr-1.2.3-deps.db and /dev/null differ diff --git a/dependencies/libXrender-0.9.4-deps.db b/dependencies/libXrender-0.9.4-deps.db deleted file mode 100644 index 8ee9873af4e..00000000000 Binary files a/dependencies/libXrender-0.9.4-deps.db and /dev/null differ diff --git a/dependencies/libXt-1.0.5-deps.db b/dependencies/libXt-1.0.5-deps.db deleted file mode 100644 index c70054610d4..00000000000 Binary files a/dependencies/libXt-1.0.5-deps.db and /dev/null differ diff --git a/dependencies/libXxf86misc-1.0.1-deps.db b/dependencies/libXxf86misc-1.0.1-deps.db deleted file mode 100644 index ceda4c30c20..00000000000 Binary files a/dependencies/libXxf86misc-1.0.1-deps.db and /dev/null differ diff --git a/dependencies/libXxf86vm-1.0.2-deps.db b/dependencies/libXxf86vm-1.0.2-deps.db deleted file mode 100644 index ae763031b3a..00000000000 Binary files a/dependencies/libXxf86vm-1.0.2-deps.db and /dev/null differ diff --git a/dependencies/libfontenc-1.0.4-deps.db b/dependencies/libfontenc-1.0.4-deps.db deleted file mode 100644 index 15b98b49e81..00000000000 Binary files a/dependencies/libfontenc-1.0.4-deps.db and /dev/null differ diff --git a/dependencies/libidn-1.9-deps.db b/dependencies/libidn-1.9-deps.db deleted file mode 100644 index 8427ba199dc..00000000000 Binary files a/dependencies/libidn-1.9-deps.db and /dev/null differ diff --git a/dependencies/libxkbfile-1.0.5-deps.db b/dependencies/libxkbfile-1.0.5-deps.db deleted file mode 100644 index f9c18c58ff6..00000000000 Binary files a/dependencies/libxkbfile-1.0.5-deps.db and /dev/null differ diff --git a/dependencies/libxkbui-1.0.2-deps.db b/dependencies/libxkbui-1.0.2-deps.db deleted file mode 100644 index 33c3b0b1bec..00000000000 Binary files a/dependencies/libxkbui-1.0.2-deps.db and /dev/null differ diff --git a/dependencies/mc-4.6.1-deps.db b/dependencies/mc-4.6.1-deps.db deleted file mode 100644 index c3f382dc0b6..00000000000 Binary files a/dependencies/mc-4.6.1-deps.db and /dev/null differ diff --git a/dependencies/pango-1.22.0-deps.db b/dependencies/pango-1.22.0-deps.db deleted file mode 100644 index cadc6ed6758..00000000000 Binary files a/dependencies/pango-1.22.0-deps.db and /dev/null differ diff --git a/dependencies/pcre-7.8-deps.db b/dependencies/pcre-7.8-deps.db deleted file mode 100644 index bc75f1486ee..00000000000 Binary files a/dependencies/pcre-7.8-deps.db and /dev/null differ diff --git a/dependencies/pekwm-0.1.7-deps.db b/dependencies/pekwm-0.1.7-deps.db deleted file mode 100644 index 0cf992ceb63..00000000000 Binary files a/dependencies/pekwm-0.1.7-deps.db and /dev/null differ diff --git a/dependencies/perl-XML-Parser-2.36-deps.db b/dependencies/perl-XML-Parser-2.36-deps.db deleted file mode 100644 index 7c86be22a2b..00000000000 Binary files a/dependencies/perl-XML-Parser-2.36-deps.db and /dev/null differ diff --git a/dependencies/pixman-0.12.0-deps.db b/dependencies/pixman-0.12.0-deps.db deleted file mode 100644 index 8427ba199dc..00000000000 Binary files a/dependencies/pixman-0.12.0-deps.db and /dev/null differ diff --git a/dependencies/printproto-1.0.4-deps.db b/dependencies/printproto-1.0.4-deps.db deleted file mode 100644 index 45355c91e26..00000000000 Binary files a/dependencies/printproto-1.0.4-deps.db and /dev/null differ diff --git a/dependencies/tiff-3.8.2-deps.db b/dependencies/tiff-3.8.2-deps.db deleted file mode 100644 index f59bf7b8088..00000000000 Binary files a/dependencies/tiff-3.8.2-deps.db and /dev/null differ diff --git a/dependencies/trapproto-3.4.3-deps.db b/dependencies/trapproto-3.4.3-deps.db deleted file mode 100644 index dfc8902b6e9..00000000000 Binary files a/dependencies/trapproto-3.4.3-deps.db and /dev/null differ diff --git a/dependencies/videoproto-2.2.2-deps.db b/dependencies/videoproto-2.2.2-deps.db deleted file mode 100644 index f9c18c58ff6..00000000000 Binary files a/dependencies/videoproto-2.2.2-deps.db and /dev/null differ diff --git a/dependencies/xf86dgaproto-2.0.3-deps.db b/dependencies/xf86dgaproto-2.0.3-deps.db deleted file mode 100644 index 45355c91e26..00000000000 Binary files a/dependencies/xf86dgaproto-2.0.3-deps.db and /dev/null differ diff --git a/dependencies/xf86driproto-2.0.4-deps.db b/dependencies/xf86driproto-2.0.4-deps.db deleted file mode 100644 index 30e65367994..00000000000 Binary files a/dependencies/xf86driproto-2.0.4-deps.db and /dev/null differ diff --git a/dependencies/xf86miscproto-0.9.2-deps.db b/dependencies/xf86miscproto-0.9.2-deps.db deleted file mode 100644 index 45355c91e26..00000000000 Binary files a/dependencies/xf86miscproto-0.9.2-deps.db and /dev/null differ diff --git a/dependencies/xf86vidmodeproto-2.2.2-deps.db b/dependencies/xf86vidmodeproto-2.2.2-deps.db deleted file mode 100644 index 45355c91e26..00000000000 Binary files a/dependencies/xf86vidmodeproto-2.2.2-deps.db and /dev/null differ diff --git a/dependencies/xineramaproto-1.1.2-deps.db b/dependencies/xineramaproto-1.1.2-deps.db deleted file mode 100644 index f9c18c58ff6..00000000000 Binary files a/dependencies/xineramaproto-1.1.2-deps.db and /dev/null differ diff --git a/dependencies/xkbcomp-1.0.5-deps.db b/dependencies/xkbcomp-1.0.5-deps.db deleted file mode 100644 index ca371ce236e..00000000000 Binary files a/dependencies/xkbcomp-1.0.5-deps.db and /dev/null differ diff --git a/dependencies/xkeyboard-config-1.3-deps.db b/dependencies/xkeyboard-config-1.3-deps.db deleted file mode 100644 index 0fd5754413a..00000000000 Binary files a/dependencies/xkeyboard-config-1.3-deps.db and /dev/null differ diff --git a/dependencies/xorg-server-1.5.1-deps.db b/dependencies/xorg-server-1.5.1-deps.db deleted file mode 100644 index 249d24c6957..00000000000 Binary files a/dependencies/xorg-server-1.5.1-deps.db and /dev/null differ diff --git a/helper-templates/perl-module.sh b/helper-templates/perl-module.sh index b1fbba8324e..7e39bd0bedb 100755 --- a/helper-templates/perl-module.sh +++ b/helper-templates/perl-module.sh @@ -18,7 +18,7 @@ : ${perl_cmd:=$PKGFS_MASTERDIR/bin/perl} : ${PERL_DESTDIR:=$PKGFS_MASTERDIR} : ${PERL_PREFIX:=$PERL_DESTDIR} -: ${PERL_DPREFIX:=$PKGFS_DESTDIR/$pkgname} +: ${PERL_DPREFIX:=$PKGFS_DESTDIR/$pkgname-$version} : ${PERL_VERSION:=5.10.0} : ${PERL_LDDLFLAGS:=--whole-archive -shared -L$PKGFS_MASTERDIR/lib} : ${PERL_SITELIBEXP:=$PERL_DPREFIX/lib/perl5/site_perl/$PERL_VERSION} diff --git a/helper-templates/pkg-config-transform.sh b/helper-templates/pkg-config-transform.sh index 709b8219cc0..cddfa2bff39 100755 --- a/helper-templates/pkg-config-transform.sh +++ b/helper-templates/pkg-config-transform.sh @@ -5,11 +5,12 @@ pkgconfig_transform_file() { local file="$1" + local pkg="$pkgname-$version" [ -z "$file" ] && return 1 $sed_cmd \ - -e "s|^exec_prefix=$PKGFS_DESTDIR/$pkgname.*$|exec_prefix=\${prefix}|" \ + -e "s|^exec_prefix=$PKGFS_DESTDIR/$pkg.*$|exec_prefix=\${prefix}|" \ -e "s|-L\${libdir}|-L\${libdir} -Wl,-R\${libdir}|" \ $file > $file.in && \ $mv_cmd $file.in $file diff --git a/helper-templates/unzip-extraction.sh b/helper-templates/unzip-extraction.sh index 6e8bc7de2d1..c7a8b3b22c3 100755 --- a/helper-templates/unzip-extraction.sh +++ b/helper-templates/unzip-extraction.sh @@ -12,7 +12,7 @@ save_pkgname=$pkgname check_installed_tmpl unzip-$unzip_version if [ "$?" -ne 0 ]; then echo "=> unzip not installed, will install it." - install_tmpl unzip-$unzip_version + install_tmpl unzip # # Continue with previous template that called us. # diff --git a/pkgfs.sh b/pkgfs.sh index dc250f349c0..64a33fff15b 100755 --- a/pkgfs.sh +++ b/pkgfs.sh @@ -61,7 +61,6 @@ : ${db_cmd:=/usr/bin/db -q} : ${chmod_cmd:=/bin/chmod} -: ${xstow_version:=xstow-0.6.1-unstable} : ${xstow_args:=-ap} : ${xstow_ignore_files:=perllocal.pod} # XXX For now ignore them. @@ -70,6 +69,7 @@ set_defvars() # Directories : ${PKGFS_TEMPLATESDIR:=$PKGFS_DISTRIBUTIONDIR/templates} : ${PKGFS_DEPSDIR:=$PKGFS_DISTRIBUTIONDIR/dependencies} + : ${PKGFS_BUILD_DEPS_DB:=$PKGFS_DEPSDIR/build-depends.db} : ${PKGFS_TMPLHELPDIR:=$PKGFS_DISTRIBUTIONDIR/helper-templates} local DDIRS="PKGFS_DEPSDIR PKGFS_TEMPLATESDIR PKGFS_TMPLHELPDIR" @@ -160,6 +160,9 @@ merge_infodir_tmpl() $PKGFS_MASTERDIR/share/info/dir } +# +# Shows info about a template. +# info_tmpl() { local tmpl="$1" @@ -169,7 +172,7 @@ info_tmpl() exit 1 fi - run_file ${PKGFS_TEMPLATESDIR}/${tmpl}.tmpl + run_file $PKGFS_TEMPLATESDIR/$tmpl.tmpl echo " pkgfs template definitions:" echo @@ -184,17 +187,19 @@ info_tmpl() echo " short_desc: $short_desc" echo "$long_desc" echo - if [ -r "$PKGFS_DEPSDIR/$pkgname-deps.db" ]; then - pkgdepf="$PKGFS_DEPSDIR/$pkgname-deps.db" - list="$($db_cmd btree $pkgdepf deps)" + check_build_depends_tmpl $pkgname + if [ "$?" -eq 0 ]; then + local list="$($db_cmd -V btree $PKGFS_BUILD_DEPS_DB $pkgname)" echo " This package requires the following dependencies to be built:" for i in ${list}; do - [ "$i" = "deps" ] && continue echo " $i" done fi } +# +# Applies to the build directory the patches specified by a template. +# apply_tmpl_patches() { if [ -z "$PKGFS_TEMPLATESDIR" ]; then @@ -241,6 +246,10 @@ apply_tmpl_patches() fi } +# +# Checks that all required variables specified in the configuration +# file are properly working. +# check_config_vars() { local cffound= @@ -288,6 +297,9 @@ check_config_vars() done } +# +# Resets all vars used by a template. +# reset_tmpl_vars() { local TMPL_VARS="pkgname extract_sufx distfiles url configure_args \ @@ -298,13 +310,16 @@ reset_tmpl_vars() run_stuff_before_configure_file run_stuff_before_build_file \ run_stuff_before_install_file run_stuff_after_install \ make_build_target make_install_target \ - postinstall_helpers" + postinstall_helpers version" for i in ${TMPL_VARS}; do eval unset "$i" done } +# +# Checks some vars used in templates and sets $extract_cmd. +# check_tmpl_vars() { local pkg="$1" @@ -312,7 +327,7 @@ check_tmpl_vars() [ -z "$pkg" ] && return 1 - REQ_VARS="pkgname extract_sufx url build_style" + REQ_VARS="pkgname version extract_sufx url build_style" # Check if required vars weren't set. for i in ${REQ_VARS}; do @@ -325,7 +340,7 @@ check_tmpl_vars() done if [ -z "$distfiles" ]; then - dfile="$pkgname$extract_sufx" + dfile="$pkgname-$version$extract_sufx" elif [ -n "${distfiles}" ]; then dfile="$distfiles$extract_sufx" else @@ -356,6 +371,9 @@ check_tmpl_vars() esac } +# +# Verifies that a checksum of a distfile is correct. +# check_rmd160_cksum() { local file="$1" @@ -364,7 +382,7 @@ check_rmd160_cksum() [ -z "$file" ] && return 1 if [ -z "${distfiles}" ]; then - dfile="$pkgname$extract_sufx" + dfile="$pkgname-$version$extract_sufx" elif [ -n "${distfiles}" ]; then dfile="$distfiles$extract_sufx" else @@ -385,6 +403,9 @@ check_rmd160_cksum() fi } +# +# Downloads the distfiles for a template from $url. +# fetch_tmpl_sources() { local file="" @@ -393,7 +414,7 @@ fetch_tmpl_sources() [ -z "$pkgname" ] && return 1 if [ -z "$distfiles" ]; then - file="$pkgname" + file="$pkgname-$version" else file="$distfiles" fi @@ -431,11 +452,15 @@ fetch_tmpl_sources() done } +# +# Extracts contents of a distfile specified in a template into +# the build directory. +# extract_tmpl_sources() { [ -z "$pkgname" ] && return 1 - echo "==> Extracting \`$pkgname' into $PKGFS_BUILDDIR." + echo "==> Extracting \`$pkgname-$version' into $PKGFS_BUILDDIR." $extract_cmd if [ "$?" -ne 0 ]; then @@ -468,14 +493,20 @@ fixup_tmpl_libtool() fi } +# +# Configures, builds and installs a package into the destination +# directory. +# build_tmpl_sources() { - [ -z "$pkgname" ] && return 1 + local pkg="$pkgname-$version" + + [ -z "$pkgname" -o -z "$version" ] && return 1 if [ -n "$distfiles" -a -z "$wrksrc" ]; then wrksrc=$PKGFS_BUILDDIR/$distfiles elif [ -z "$wrksrc" ]; then - wrksrc=$PKGFS_BUILDDIR/$pkgname + wrksrc=$PKGFS_BUILDDIR/$pkg else wrksrc=$PKGFS_BUILDDIR/$wrksrc fi @@ -490,13 +521,13 @@ build_tmpl_sources() # Apply patches if requested by template file apply_tmpl_patches - echo "==> Building \`$pkgname' (be patient, may take a while)" + echo "==> Building \`$pkg' (be patient, may take a while)" # # For now, just set them through the environment. # LDFLAGS="-L$PKGFS_MASTERDIR/lib -Wl,-R$PKGFS_MASTERDIR/lib $LDFLAGS" - export LDFLAGS="-L$PKGFS_DESTDIR/$pkgname/lib $LDFLAGS" + export LDFLAGS="-L$PKGFS_DESTDIR/$pkg/lib $LDFLAGS" export CFLAGS="$CFLAGS $PKGFS_CFLAGS" export CXXFLAGS="$CXXFLAGS $PKGFS_CXXFLAGS" export CPPFLAGS="-I$PKGFS_MASTERDIR/include $CPPFLAGS" @@ -523,8 +554,8 @@ build_tmpl_sources() # surprises later. # ./configure --prefix="$PKGFS_MASTERDIR" \ - --mandir="$PKGFS_DESTDIR/$pkgname/man" \ - --infodir="$PKGFS_DESTDIR/$pkgname/share/info" \ + --mandir="$PKGFS_DESTDIR/$pkg/man" \ + --infodir="$PKGFS_DESTDIR/$pkg/share/info" \ --sysconfdir="$PKGFS_SYSCONFDIR" \ ${configure_args} @@ -563,7 +594,7 @@ build_tmpl_sources() fi if [ "$build_style" != "perl_module" -a "$?" -ne 0 ]; then - echo "*** ERROR building (configure state) \`$pkgname' ***" + echo "*** ERROR building (configure state) \`$pkg' ***" exit 1 fi @@ -594,7 +625,7 @@ build_tmpl_sources() # ${make_cmd} ${make_build_args} ${make_build_target} if [ "$?" -ne 0 ]; then - echo "*** ERROR building (make stage) \`$pkgname' ***" + echo "*** ERROR building (make stage) \`$pkg' ***" exit 1 fi @@ -614,9 +645,9 @@ build_tmpl_sources() # Install package via make. # ${make_cmd} ${make_install_args} ${make_install_target} \ - prefix="$PKGFS_DESTDIR/$pkgname" + prefix="$PKGFS_DESTDIR/$pkg" if [ "$?" -ne 0 ]; then - echo "*** ERROR instaling \`$pkgname' ***" + echo "*** ERROR instaling \`$pkg' ***" exit 1 fi @@ -634,7 +665,7 @@ build_tmpl_sources() # Transform pkg-config files if requested by template. # for i in ${pkgconfig_override}; do - local tmpf="$PKGFS_DESTDIR/$pkgname/lib/pkgconfig/$i" + local tmpf="$PKGFS_DESTDIR/$pkg/lib/pkgconfig/$i" [ -f "$tmpf" ] && \ [ -f $PKGFS_TMPLHELPDIR/pkg-config-transform.sh ] && \ . $PKGFS_TMPLHELPDIR/pkg-config-transform.sh @@ -642,7 +673,7 @@ build_tmpl_sources() done - echo "==> Installed \`$pkgname' into $PKGFS_DESTDIR/$pkgname." + echo "==> Installed \`$pkg' into $PKGFS_DESTDIR/$pkg." # # Once all work has been done, unset compilation vars. @@ -655,12 +686,16 @@ build_tmpl_sources() if [ -d "$wrksrc" -a -z "$dontrm_builddir" ]; then $rm_cmd -rf $wrksrc [ "$?" -eq 0 ] && \ - echo "=> Removed \`$pkgname' build directory." + echo "=> Removed \`$pkg' build directory." fi cd $PKGFS_BUILDDIR } +# +# Stows a currently installed package, i.e creates the links +# on the master directory. +# stow_tmpl() { local pkg="$1" @@ -670,11 +705,18 @@ stow_tmpl() [ -z "$pkg" ] && return 2 - if [ -r "$PKGFS_DESTDIR/$pkg/$infodir_pkg" ]; then - merge_infodir_tmpl ${pkg} + if [ -n "$stow_flag" ]; then + pkg=$PKGFS_TEMPLATESDIR/$pkg.tmpl + run_file $pkg + pkg=$pkgname-$version fi - if [ -r "$PKGFS_DESTDIR/$pkg/$infodir_pkg" -a -r "$infodir_master" ]; then + if [ -r "$PKGFS_DESTDIR/$pkg/$infodir_pkg" ]; then + merge_infodir_tmpl $pkg + fi + + if [ -r "$PKGFS_DESTDIR/$pkg/$infodir_pkg" \ + -a -r "$infodir_master" ]; then xstow_args="$xstow_args -i-file-in-dir $infodir_pkg" fi @@ -696,8 +738,8 @@ stow_tmpl() # # Run template postinstall helpers if requested. # - if [ "$pkgname" != "$pkg" ]; then - run_file $PKGFS_TEMPLATESDIR/$pkg.tmpl + if [ "$pkgname" != "${pkg%%-$version}" ]; then + run_file $PKGFS_TEMPLATESDIR/${pkg%%-$version}.tmpl fi for i in ${postinstall_helpers}; do @@ -706,6 +748,10 @@ stow_tmpl() done } +# +# Unstows a currently stowned package, i.e removes its links +# from the master directory. +# unstow_tmpl() { local pkg="$1" @@ -715,39 +761,39 @@ unstow_tmpl() exit 1 fi - local tmppkg="${pkg%-[0-9]*}" - if [ "$tmppkg" = "xstow" ]; then - echo "*** INFO: You aren't allowed to unstow \`$xstow_version'." + if [ "$pkg" = "xstow" ]; then + echo "*** INFO: You aren't allowed to unstow \`$pkg'." exit 1 fi + run_file $PKGFS_TEMPLATESDIR/$pkg.tmpl + $PKGFS_XSTOW_CMD -dir $PKGFS_DESTDIR -target $PKGFS_MASTERDIR \ -D -i-file-in-dir share/info/dir -ignore ${xstow_ignore_files} \ - $PKGFS_DESTDIR/$pkg + $PKGFS_DESTDIR/$pkgname-$version if [ "$?" -ne 0 ]; then exit 1 else - $rm_cmd -f $PKGFS_DESTDIR/$pkg/share/info/dir + $rm_cmd -f $PKGFS_DESTDIR/$pkgname-$version/share/info/dir echo "==> Removed \`$pkg' symlinks from master directory." fi - installed_tmpl_handler unregister $pkg + installed_tmpl_handler unregister $pkgname-$version } +# +# Recursive function that founds dependencies in all required +# packages. +# add_dependency_tolist() { - local pkgdepf="$1" - local reg_pkgdb="${PKGFS_DESTDIR}/${PKGFS_REGISTERED_PKG_DB}" + local curpkg="$1" + local reg_pkgdb="$PKGFS_DESTDIR/$PKGFS_REGISTERED_PKG_DB" - [ -z "$pkgdepf" ] && return 1 - [ -n "$prev_depf" ] && pkgdepf=${prev_depf} - - for i in $($db_cmd btree $pkgdepf deps); do - # - # Skip key - # - [ "$i" = "deps" ] && continue + [ -z "$curpkg" ] && return 1 + [ -n "$prev_pkg" ] && curpkg=$prev_pkg + for i in $($db_cmd -V btree $PKGFS_BUILD_DEPS_DB ${curpkg%-[0-9]*}); do # # origin_deps is used to only show the list of # dependencies for the origin template once. @@ -769,85 +815,81 @@ add_dependency_tolist() echo "not installed." deps_list="$i $deps_list" - [ -n "$prev_depf" ] && unset prev_depf + [ -n "$prev_pkg" ] && unset prev_pkg # # Check if dependency needs more deps. # - depdbf="$PKGFS_DEPSDIR/$i-deps.db" - if [ -r "$PKGFS_DEPSDIR/$i-deps.db" ]; then + check_build_depends_tmpl $i + if [ "$?" -eq 0 ]; then unset origin_deps - add_dependency_tolist ${depdbf} - prev_depf="$depdbf" + add_dependency_tolist $i + prev_pkg="$i" fi fi done } +# +# Installs all dependencies required by a package. +# install_dependency_tmpl() { - local pkgdepf="$1" - local tmpdepf="$pkgdepf" - local tmppkgname= + local pkg="$1" deps_list= origin_deps=yes - [ -z "$pkgdepf" ] && return 1 + [ -z "$pkg" ] && return 1 doing_deps=true - tmp_pkgn=${pkgdepf%%-deps.db} - echo "==> Required dependencies for $(basename $tmp_pkgn):" + echo "==> Required dependencies for $(basename $pkg):" - add_dependency_tolist $pkgdepf + add_dependency_tolist $pkg for i in ${deps_list}; do # skip dup deps check_installed_tmpl $i [ "$?" -eq 0 ] && continue echo "=> Installing dependency: $i" - install_tmpl $i + install_tmpl ${i%-[0-9]*} done unset deps_list unset origin_deps } +# +# Installs and stows the "xstow" package. +# install_xstow_tmpl() { [ -x "$PKGFS_XSTOW_CMD" ] && return 0 reset_tmpl_vars - run_file "$PKGFS_TEMPLATESDIR/$xstow_version.tmpl" - check_tmpl_vars ${xstow_version} + run_file "$PKGFS_TEMPLATESDIR/xstow.tmpl" + check_tmpl_vars $pkgname-$version fetch_tmpl_sources extract_tmpl_sources build_tmpl_sources - PKGFS_XSTOW_CMD="$PKGFS_DESTDIR/$xstow_version/bin/xstow" - stow_tmpl $xstow_version - $sed_cmd -e "s|PKGFS_XSTOW_.*|PKGFS_XSTOW_CMD=$PKGFS_MASTERDIR/bin/xstow|" \ - $path_fixed > $path_fixed.in && \ - $mv_cmd $path_fixed.in $path_fixed + PKGFS_XSTOW_CMD="$PKGFS_DESTDIR/$pkgname-$version/bin/xstow" + stow_tmpl $pkgname-$version # # Continue with origin package that called us. # - run_file ${origin_tmpl} + run_file $origin_tmpl } +# +# Registers or unregisters a package from the db file. +# installed_tmpl_handler() { local action="$1" local pkg="$2" [ -z "$action" -o -z "$pkg" ] && return 1 - # - # This function is called every time a package has been stowned - # or unstowned. - # There's a db(3) btree database file in - # PKGFS_DESTDIR/PKGFS_REGISTER_PKG_DB that stores which package - # is installed and stowned. - # if [ "$action" = "register" ]; then - $db_cmd -w btree ${PKGFS_DESTDIR}/${PKGFS_REGISTERED_PKG_DB} \ + $db_cmd -w btree $PKGFS_DESTDIR/$PKGFS_REGISTERED_PKG_DB \ $pkg stowned if [ "$?" -ne 0 ]; then echo -n "*** ERROR: couldn't register stowned \`$pkg'" @@ -855,7 +897,7 @@ installed_tmpl_handler() exit 1 fi elif [ "$action" = "unregister" ]; then - $db_cmd -d btree ${PKGFS_DESTDIR}/${PKGFS_REGISTERED_PKG_DB} $pkg + $db_cmd -d btree $PKGFS_DESTDIR/$PKGFS_REGISTERED_PKG_DB $pkg if [ "$?" -ne 0 ]; then echo -n "*** ERROR: \`$pkg' stowned not registered " echo "in db file? ***" @@ -866,10 +908,14 @@ installed_tmpl_handler() fi } +# +# Checks the registered pkgs db file and returns 0 if pkg is installed, +# otherwise returns 1. +# check_installed_tmpl() { local pkg="$1" - local db_file="${PKGFS_DESTDIR}/${PKGFS_REGISTERED_PKG_DB}" + local db_file="$PKGFS_DESTDIR/$PKGFS_REGISTERED_PKG_DB" [ -z "$pkg" ] && return 1 @@ -877,8 +923,27 @@ check_installed_tmpl() return $? } +# +# Checks the build depends db file and returns 0 if pkg has dependencies, +# otherwise returns 1. +# +check_build_depends_tmpl() +{ + local pkg="$1" + + [ -z $pkg ] && return 1 + [ ! -r $PKGFS_BUILD_DEPS_DB ] && return 1 + + $db_cmd -V btree $PKGFS_BUILD_DEPS_DB ${pkg%-[0-9]*} 2>&1 >/dev/null + return $? +} + +# +# Installs a pkg by reading its build template file. +# install_tmpl() { + local pkg= cur_tmpl="$PKGFS_TEMPLATESDIR/$1.tmpl" if [ -z "$cur_tmpl" -o ! -f "$cur_tmpl" ]; then echo -n "*** ERROR: invalid template file '$cur_tmpl'," @@ -887,14 +952,15 @@ install_tmpl() fi reset_tmpl_vars - run_file ${cur_tmpl} + run_file $cur_tmpl + pkg="$1-$version" # # If we are the originator package save the path this template in # other var for future use. # if [ -z "$origin_tmpl" ]; then - origin_tmpl=${path_fixed} + origin_tmpl=$path_fixed fi # @@ -905,23 +971,22 @@ install_tmpl() # # Check vars for current template. # - check_tmpl_vars ${pkgname} + check_tmpl_vars $pkg # - # Handle required dependency for this template iff it - # is not installed and if we are being invoked by a dependency. + # Install dependencies required by this package. # - local pkgdepf="$PKGFS_DEPSDIR/$pkgname-deps.db" - if [ -r "$pkgdepf" -a -z "$doing_deps" ]; then - install_dependency_tmpl ${pkgdepf} + check_build_depends_tmpl $pkg + if [ "$?" -eq 0 -a -z "$doing_deps" ]; then + install_dependency_tmpl $pkg # # At this point all required deps are installed, and # only remaining is the origin template; install it. # unset doing_deps reset_tmpl_vars - run_file ${origin_tmpl} - check_tmpl_vars ${pkgname} + run_file $origin_tmpl + check_tmpl_vars $pkgname-$version fi if [ -n "$only_build" ]; then @@ -939,10 +1004,12 @@ install_tmpl() # # Do not stow the pkg if requested. # - [ -z "$only_install" ] && stow_tmpl ${pkgname} - + [ -z "$only_install" ] && stow_tmpl $pkg } +# +# Lists all currently installed packages. +# list_tmpls() { local reg_pkgdb="$PKGFS_DESTDIR/$PKGFS_REGISTERED_PKG_DB" @@ -956,12 +1023,15 @@ list_tmpls() # Skip stowned value [ "$i" = "stowned" ] && continue # Run file to get short_desc and print something useful - run_file ${PKGFS_TEMPLATESDIR}/$i.tmpl + run_file ${PKGFS_TEMPLATESDIR}/${i%-[0-9]*}.tmpl echo "$i $short_desc" reset_tmpl_vars done } +# +# Removes a currently installed package (unstow + removed from destdir). +# remove_tmpl() { local pkg="$1" @@ -971,13 +1041,20 @@ remove_tmpl() exit 1 fi - if [ ! -d "$PKGFS_DESTDIR/$pkg" ]; then + if [ ! -f "$PKGFS_TEMPLATESDIR/$pkg.tmpl" ]; then + echo "*** ERROR: cannot find template file ***" + exit 1 + fi + + run_file $PKGFS_TEMPLATESDIR/$pkg.tmpl + + if [ ! -d "$PKGFS_DESTDIR/$pkg-$version" ]; then echo "*** ERROR: cannot find package on $PKGFS_DESTDIR ***" exit 1 fi - unstow_tmpl ${pkg} - $rm_cmd -rf $PKGFS_DESTDIR/$pkg + unstow_tmpl $pkg-$version + $rm_cmd -rf $PKGFS_DESTDIR/$pkg-$version return "$?" } @@ -1047,6 +1124,7 @@ remove) remove_tmpl "$2" ;; stow) + stow_flag=yes stow_tmpl "$2" ;; unstow) diff --git a/templates/MesaLib-7.2-fix-dri-build.diff b/templates/MesaLib-fix-dri-build.diff similarity index 100% rename from templates/MesaLib-7.2-fix-dri-build.diff rename to templates/MesaLib-fix-dri-build.diff diff --git a/templates/MesaLib-7.2.tmpl b/templates/MesaLib.tmpl similarity index 90% rename from templates/MesaLib-7.2.tmpl rename to templates/MesaLib.tmpl index 6a26fffb713..94d1cf02b4d 100755 --- a/templates/MesaLib-7.2.tmpl +++ b/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 diff --git a/templates/atk-1.24.0.tmpl b/templates/atk.tmpl similarity index 93% rename from templates/atk-1.24.0.tmpl rename to templates/atk.tmpl index 51862e1b7b9..6206b0bfba3 100755 --- a/templates/atk-1.24.0.tmpl +++ b/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 diff --git a/templates/bigreqsproto-1.0.2.tmpl b/templates/bigreqsproto.tmpl similarity index 83% rename from templates/bigreqsproto-1.0.2.tmpl rename to templates/bigreqsproto.tmpl index c531eef59aa..b65a9a81695 100755 --- a/templates/bigreqsproto-1.0.2.tmpl +++ b/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 diff --git a/templates/cairo-1.7.6-doc-public-Makefile-in.diff b/templates/cairo-doc-public-Makefile-in.diff similarity index 100% rename from templates/cairo-1.7.6-doc-public-Makefile-in.diff rename to templates/cairo-doc-public-Makefile-in.diff diff --git a/templates/cairo-1.7.6.tmpl b/templates/cairo.tmpl similarity index 94% rename from templates/cairo-1.7.6.tmpl rename to templates/cairo.tmpl index 8c53b507a6b..4af350a434e 100755 --- a/templates/cairo-1.7.6.tmpl +++ b/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 diff --git a/templates/compositeproto-0.4.tmpl b/templates/compositeproto.tmpl similarity index 83% rename from templates/compositeproto-0.4.tmpl rename to templates/compositeproto.tmpl index 08dcfd5db0a..4652162f1ba 100755 --- a/templates/compositeproto-0.4.tmpl +++ b/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 diff --git a/templates/curl-7.18.0.tmpl b/templates/curl.tmpl similarity index 92% rename from templates/curl-7.18.0.tmpl rename to templates/curl.tmpl index 1ac1bf135b3..02540f169a6 100755 --- a/templates/curl-7.18.0.tmpl +++ b/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 diff --git a/templates/damageproto-1.1.0.tmpl b/templates/damageproto.tmpl similarity index 85% rename from templates/damageproto-1.1.0.tmpl rename to templates/damageproto.tmpl index 9f5c02f6906..0e080ecc05f 100755 --- a/templates/damageproto-1.1.0.tmpl +++ b/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 diff --git a/templates/dmxproto-2.2.2.tmpl b/templates/dmxproto.tmpl similarity index 85% rename from templates/dmxproto-2.2.2.tmpl rename to templates/dmxproto.tmpl index b094e46ab25..19ad59e6781 100755 --- a/templates/dmxproto-2.2.2.tmpl +++ b/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 diff --git a/templates/evieext-1.0.2.tmpl b/templates/evieext.tmpl similarity index 84% rename from templates/evieext-1.0.2.tmpl rename to templates/evieext.tmpl index 23f4b8c7d9e..1add4f0ac17 100755 --- a/templates/evieext-1.0.2.tmpl +++ b/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 diff --git a/templates/expat-2.0.1.tmpl b/templates/expat.tmpl similarity index 88% rename from templates/expat-2.0.1.tmpl rename to templates/expat.tmpl index 20bab666c43..24f56afdb67 100755 --- a/templates/expat-2.0.1.tmpl +++ b/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 diff --git a/templates/fixesproto-4.0.tmpl b/templates/fixesproto.tmpl similarity index 83% rename from templates/fixesproto-4.0.tmpl rename to templates/fixesproto.tmpl index 6dbf1307b92..2e69e729316 100755 --- a/templates/fixesproto-4.0.tmpl +++ b/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 diff --git a/templates/fontcacheproto-0.1.2.tmpl b/templates/fontcacheproto.tmpl similarity index 82% rename from templates/fontcacheproto-0.1.2.tmpl rename to templates/fontcacheproto.tmpl index ce7a65dc4d4..de3c0d99474 100755 --- a/templates/fontcacheproto-0.1.2.tmpl +++ b/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 diff --git a/templates/fontconfig-2.6.0-Makefile-fc-cache.diff b/templates/fontconfig-Makefile-fc-cache.diff similarity index 100% rename from templates/fontconfig-2.6.0-Makefile-fc-cache.diff rename to templates/fontconfig-Makefile-fc-cache.diff diff --git a/templates/fontconfig-2.6.0.tmpl b/templates/fontconfig.tmpl similarity index 95% rename from templates/fontconfig-2.6.0.tmpl rename to templates/fontconfig.tmpl index f931356b3c8..accaa2690a5 100755 --- a/templates/fontconfig-2.6.0.tmpl +++ b/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 diff --git a/templates/fontsproto-2.0.2.tmpl b/templates/fontsproto.tmpl similarity index 83% rename from templates/fontsproto-2.0.2.tmpl rename to templates/fontsproto.tmpl index 141d214ab0f..9852b128b7f 100755 --- a/templates/fontsproto-2.0.2.tmpl +++ b/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 diff --git a/templates/freetype2-2.3.7.tmpl b/templates/freetype2.tmpl similarity index 84% rename from templates/freetype2-2.3.7.tmpl rename to templates/freetype2.tmpl index d1eb171ef60..2b07bef6020 100755 --- a/templates/freetype2-2.3.7.tmpl +++ b/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" diff --git a/templates/git-1.6.0.2.tmpl b/templates/git.tmpl similarity index 94% rename from templates/git-1.6.0.2.tmpl rename to templates/git.tmpl index 19be8b892fb..f77abc725d6 100755 --- a/templates/git-1.6.0.2.tmpl +++ b/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 diff --git a/templates/glib-2.18.1-fix-statfs-netbsd.diff b/templates/glib-fix-statfs-netbsd.diff similarity index 100% rename from templates/glib-2.18.1-fix-statfs-netbsd.diff rename to templates/glib-fix-statfs-netbsd.diff diff --git a/templates/glib-2.18.1.tmpl b/templates/glib.tmpl similarity index 88% rename from templates/glib-2.18.1.tmpl rename to templates/glib.tmpl index 31d69e74a33..4b409db3745 100755 --- a/templates/glib-2.18.1.tmpl +++ b/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 diff --git a/templates/glitz-0.5.6.tmpl b/templates/glitz.tmpl similarity index 93% rename from templates/glitz-0.5.6.tmpl rename to templates/glitz.tmpl index 49b45d9d487..599c73a262e 100755 --- a/templates/glitz-0.5.6.tmpl +++ b/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 diff --git a/templates/glproto-1.4.9.tmpl b/templates/glproto.tmpl similarity index 83% rename from templates/glproto-1.4.9.tmpl rename to templates/glproto.tmpl index 90aac01ba6a..ee35fa39ca8 100755 --- a/templates/glproto-1.4.9.tmpl +++ b/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 diff --git a/templates/gmake-3.81.tmpl b/templates/gmake.tmpl similarity index 82% rename from templates/gmake-3.81.tmpl rename to templates/gmake.tmpl index 149bea1afed..efacca29ef0 100755 --- a/templates/gmake-3.81.tmpl +++ b/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 diff --git a/templates/gtk+-2.14.3-tests-Makefile-in.diff b/templates/gtk+-tests-Makefile-in.diff similarity index 100% rename from templates/gtk+-2.14.3-tests-Makefile-in.diff rename to templates/gtk+-tests-Makefile-in.diff diff --git a/templates/gtk+-2.14.3.tmpl b/templates/gtk+.tmpl similarity index 94% rename from templates/gtk+-2.14.3.tmpl rename to templates/gtk+.tmpl index a7fbec167f7..2af6ab2c908 100755 --- a/templates/gtk+-2.14.3.tmpl +++ b/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 diff --git a/templates/inputproto-1.4.4.tmpl b/templates/inputproto.tmpl similarity index 84% rename from templates/inputproto-1.4.4.tmpl rename to templates/inputproto.tmpl index 1b8a68c79b5..7983c893ddc 100755 --- a/templates/inputproto-1.4.4.tmpl +++ b/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 diff --git a/templates/intltool-0.40.4.tmpl b/templates/intltool.tmpl similarity index 93% rename from templates/intltool-0.40.4.tmpl rename to templates/intltool.tmpl index 9510176bb8a..28da8d830cf 100755 --- a/templates/intltool-0.40.4.tmpl +++ b/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 diff --git a/templates/irssi-0.8.12.tmpl b/templates/irssi.tmpl similarity index 92% rename from templates/irssi-0.8.12.tmpl rename to templates/irssi.tmpl index c5fed2e7f2e..1a5f998736e 100755 --- a/templates/irssi-0.8.12.tmpl +++ b/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. diff --git a/templates/jasper-1.900.1.tmpl b/templates/jasper.tmpl similarity index 91% rename from templates/jasper-1.900.1.tmpl rename to templates/jasper.tmpl index e594660fe62..bae457b9518 100755 --- a/templates/jasper-1.900.1.tmpl +++ b/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 diff --git a/templates/jpeg-6b-makefile-cfg.diff b/templates/jpeg-makefile-cfg.diff similarity index 100% rename from templates/jpeg-6b-makefile-cfg.diff rename to templates/jpeg-makefile-cfg.diff diff --git a/templates/jpeg-6b.tmpl b/templates/jpeg.tmpl similarity index 94% rename from templates/jpeg-6b.tmpl rename to templates/jpeg.tmpl index d61adf61871..c930b0a3449 100755 --- a/templates/jpeg-6b.tmpl +++ b/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 diff --git a/templates/kbproto-1.0.3.tmpl b/templates/kbproto.tmpl similarity index 85% rename from templates/kbproto-1.0.3.tmpl rename to templates/kbproto.tmpl index 6d59b34648d..343f6831129 100755 --- a/templates/kbproto-1.0.3.tmpl +++ b/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 diff --git a/templates/libICE-1.0.4.tmpl b/templates/libICE.tmpl similarity index 87% rename from templates/libICE-1.0.4.tmpl rename to templates/libICE.tmpl index f95b3213e15..d438e31a31a 100755 --- a/templates/libICE-1.0.4.tmpl +++ b/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 diff --git a/templates/libSM-1.1.0.tmpl b/templates/libSM.tmpl similarity index 87% rename from templates/libSM-1.1.0.tmpl rename to templates/libSM.tmpl index 71ca98de329..57d1e2e5f84 100755 --- a/templates/libSM-1.1.0.tmpl +++ b/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 diff --git a/templates/libX11-1.1.5.tmpl b/templates/libX11.tmpl similarity index 91% rename from templates/libX11-1.1.5.tmpl rename to templates/libX11.tmpl index 503d948f432..e058529dc05 100755 --- a/templates/libX11-1.1.5.tmpl +++ b/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 diff --git a/templates/libXau-1.0.4.tmpl b/templates/libXau.tmpl similarity index 86% rename from templates/libXau-1.0.4.tmpl rename to templates/libXau.tmpl index 726dbba7b02..029cf9fda4a 100755 --- a/templates/libXau-1.0.4.tmpl +++ b/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 diff --git a/templates/libXaw-1.0.4.tmpl b/templates/libXaw.tmpl similarity index 87% rename from templates/libXaw-1.0.4.tmpl rename to templates/libXaw.tmpl index 1b6d489d7b1..66492688ac7 100755 --- a/templates/libXaw-1.0.4.tmpl +++ b/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 diff --git a/templates/libXdamage-1.1.1.tmpl b/templates/libXdamage.tmpl similarity index 81% rename from templates/libXdamage-1.1.1.tmpl rename to templates/libXdamage.tmpl index bf0169c2bf0..aa3193d4668 100755 --- a/templates/libXdamage-1.1.1.tmpl +++ b/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 diff --git a/templates/libXdmcp-1.0.2.tmpl b/templates/libXdmcp.tmpl similarity index 86% rename from templates/libXdmcp-1.0.2.tmpl rename to templates/libXdmcp.tmpl index 5b286ac5099..e333ef70492 100755 --- a/templates/libXdmcp-1.0.2.tmpl +++ b/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 diff --git a/templates/libXext-1.0.4.tmpl b/templates/libXext.tmpl similarity index 85% rename from templates/libXext-1.0.4.tmpl rename to templates/libXext.tmpl index d8606d9f515..374c0062d91 100755 --- a/templates/libXext-1.0.4.tmpl +++ b/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 diff --git a/templates/libXfixes-4.0.3.tmpl b/templates/libXfixes.tmpl similarity index 90% rename from templates/libXfixes-4.0.3.tmpl rename to templates/libXfixes.tmpl index 2823c83a30e..772b7d28453 100755 --- a/templates/libXfixes-4.0.3.tmpl +++ b/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 diff --git a/templates/libXfont-1.3.3.tmpl b/templates/libXfont.tmpl similarity index 83% rename from templates/libXfont-1.3.3.tmpl rename to templates/libXfont.tmpl index b10c8174054..3a4716fd7ea 100755 --- a/templates/libXfont-1.3.3.tmpl +++ b/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 diff --git a/templates/libXft-2.1.13.tmpl b/templates/libXft.tmpl similarity index 93% rename from templates/libXft-2.1.13.tmpl rename to templates/libXft.tmpl index 7e2edc56056..a6a736a832e 100755 --- a/templates/libXft-2.1.13.tmpl +++ b/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 diff --git a/templates/libXi-1.1.3.tmpl b/templates/libXi.tmpl similarity index 88% rename from templates/libXi-1.1.3.tmpl rename to templates/libXi.tmpl index 05b98fb3e82..93730f6e4ba 100755 --- a/templates/libXi-1.1.3.tmpl +++ b/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 diff --git a/templates/libXinerama-1.0.3.tmpl b/templates/libXinerama.tmpl similarity index 83% rename from templates/libXinerama-1.0.3.tmpl rename to templates/libXinerama.tmpl index 9883b8a5812..c1c2f3fb5a6 100755 --- a/templates/libXinerama-1.0.3.tmpl +++ b/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 diff --git a/templates/libXmu-1.0.4.tmpl b/templates/libXmu.tmpl similarity index 90% rename from templates/libXmu-1.0.4.tmpl rename to templates/libXmu.tmpl index 8810c5ed2f8..a2f1ac43562 100755 --- a/templates/libXmu-1.0.4.tmpl +++ b/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 diff --git a/templates/libXp-1.0.0.tmpl b/templates/libXp.tmpl similarity index 88% rename from templates/libXp-1.0.0.tmpl rename to templates/libXp.tmpl index c55af501cf9..852f1aae167 100755 --- a/templates/libXp-1.0.0.tmpl +++ b/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 diff --git a/templates/libXpm-3.5.7.tmpl b/templates/libXpm.tmpl similarity index 86% rename from templates/libXpm-3.5.7.tmpl rename to templates/libXpm.tmpl index a0096c34aad..98ff5cabad2 100755 --- a/templates/libXpm-3.5.7.tmpl +++ b/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 diff --git a/templates/libXrandr-1.2.3.tmpl b/templates/libXrandr.tmpl similarity index 90% rename from templates/libXrandr-1.2.3.tmpl rename to templates/libXrandr.tmpl index 6ce3c2f8286..2f818f5d4f3 100755 --- a/templates/libXrandr-1.2.3.tmpl +++ b/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 diff --git a/templates/libXrender-0.9.4.tmpl b/templates/libXrender.tmpl similarity index 91% rename from templates/libXrender-0.9.4.tmpl rename to templates/libXrender.tmpl index c24ae0fb092..b64e6672d10 100755 --- a/templates/libXrender-0.9.4.tmpl +++ b/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 diff --git a/templates/libXt-1.0.5.tmpl b/templates/libXt.tmpl similarity index 90% rename from templates/libXt-1.0.5.tmpl rename to templates/libXt.tmpl index 156fdd25f0a..226a075e497 100755 --- a/templates/libXt-1.0.5.tmpl +++ b/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 diff --git a/templates/libXxf86misc-1.0.1.tmpl b/templates/libXxf86misc.tmpl similarity index 86% rename from templates/libXxf86misc-1.0.1.tmpl rename to templates/libXxf86misc.tmpl index b422ce5d7df..fb9ce542838 100755 --- a/templates/libXxf86misc-1.0.1.tmpl +++ b/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 diff --git a/templates/libXxf86vm-1.0.2.tmpl b/templates/libXxf86vm.tmpl similarity index 88% rename from templates/libXxf86vm-1.0.2.tmpl rename to templates/libXxf86vm.tmpl index ab3f7168211..4e5a023491c 100755 --- a/templates/libXxf86vm-1.0.2.tmpl +++ b/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 diff --git a/templates/libdrm-2.3.1.tmpl b/templates/libdrm.tmpl similarity index 86% rename from templates/libdrm-2.3.1.tmpl rename to templates/libdrm.tmpl index 931c8577e94..ef564fd9d65 100755 --- a/templates/libdrm-2.3.1.tmpl +++ b/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 diff --git a/templates/libfontenc-1.0.4.tmpl b/templates/libfontenc.tmpl similarity index 83% rename from templates/libfontenc-1.0.4.tmpl rename to templates/libfontenc.tmpl index 466e8433e88..97fbd5f0ff2 100755 --- a/templates/libfontenc-1.0.4.tmpl +++ b/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 diff --git a/templates/libidn-1.9.tmpl b/templates/libidn.tmpl similarity index 95% rename from templates/libidn-1.9.tmpl rename to templates/libidn.tmpl index 3cc3c4de306..d44d697f810 100755 --- a/templates/libidn-1.9.tmpl +++ b/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 diff --git a/templates/libpciaccess-0.10.3-src-common-interface.diff b/templates/libpciaccess-src-common-interface.diff similarity index 100% rename from templates/libpciaccess-0.10.3-src-common-interface.diff rename to templates/libpciaccess-src-common-interface.diff diff --git a/templates/libpciaccess-0.10.3.tmpl b/templates/libpciaccess.tmpl similarity index 82% rename from templates/libpciaccess-0.10.3.tmpl rename to templates/libpciaccess.tmpl index 782a872b80a..7cd6d9236b3 100755 --- a/templates/libpciaccess-0.10.3.tmpl +++ b/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 diff --git a/templates/libpng-1.2.32-runstuff-before-build.sh b/templates/libpng-runstuff-before-build.sh similarity index 100% rename from templates/libpng-1.2.32-runstuff-before-build.sh rename to templates/libpng-runstuff-before-build.sh diff --git a/templates/libpng-1.2.32.tmpl b/templates/libpng.tmpl similarity index 93% rename from templates/libpng-1.2.32.tmpl rename to templates/libpng.tmpl index 355c45b7f18..74aa24aa4e8 100755 --- a/templates/libpng-1.2.32.tmpl +++ b/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 diff --git a/templates/libtool-2.2.6a-fix-ltmain.sh.diff b/templates/libtool-fix-ltmain.sh.diff similarity index 100% rename from templates/libtool-2.2.6a-fix-ltmain.sh.diff rename to templates/libtool-fix-ltmain.sh.diff diff --git a/templates/libtool-2.2.6a.tmpl b/templates/libtool.tmpl similarity index 66% rename from templates/libtool-2.2.6a.tmpl rename to templates/libtool.tmpl index 9c3422c79b0..8e17a15ec0a 100755 --- a/templates/libtool-2.2.6a.tmpl +++ b/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" diff --git a/templates/libxkbfile-1.0.5.tmpl b/templates/libxkbfile.tmpl similarity index 80% rename from templates/libxkbfile-1.0.5.tmpl rename to templates/libxkbfile.tmpl index 6e9870dd3d0..4590c65fd25 100755 --- a/templates/libxkbfile-1.0.5.tmpl +++ b/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 diff --git a/templates/libxkbui-1.0.2.tmpl b/templates/libxkbui.tmpl similarity index 82% rename from templates/libxkbui-1.0.2.tmpl rename to templates/libxkbui.tmpl index 2c67085ced2..14722827778 100755 --- a/templates/libxkbui-1.0.2.tmpl +++ b/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 diff --git a/templates/libxml2-2.7.1.tmpl b/templates/libxml2.tmpl similarity index 82% rename from templates/libxml2-2.7.1.tmpl rename to templates/libxml2.tmpl index 63310e93609..94d84edd635 100755 --- a/templates/libxml2-2.7.1.tmpl +++ b/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 diff --git a/templates/mc-4.6.1.tmpl b/templates/mc.tmpl similarity index 95% rename from templates/mc-4.6.1.tmpl rename to templates/mc.tmpl index 1c026a03d30..8d83aeef4c7 100755 --- a/templates/mc-4.6.1.tmpl +++ b/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 diff --git a/templates/pango-1.22.0-docs-Makefile-in.diff b/templates/pango-docs-Makefile-in.diff similarity index 100% rename from templates/pango-1.22.0-docs-Makefile-in.diff rename to templates/pango-docs-Makefile-in.diff diff --git a/templates/pango-1.22.0.tmpl b/templates/pango.tmpl similarity index 95% rename from templates/pango-1.22.0.tmpl rename to templates/pango.tmpl index aacb4767319..976e0e091ec 100755 --- a/templates/pango-1.22.0.tmpl +++ b/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 diff --git a/templates/pcre-7.8.tmpl b/templates/pcre.tmpl similarity index 92% rename from templates/pcre-7.8.tmpl rename to templates/pcre.tmpl index 227deda9157..c246a74dbb1 100755 --- a/templates/pcre-7.8.tmpl +++ b/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 diff --git a/templates/pekwm-0.1.7.tmpl b/templates/pekwm.tmpl similarity index 91% rename from templates/pekwm-0.1.7.tmpl rename to templates/pekwm.tmpl index bf0cfe6c1fa..5b94f7eab39 100755 --- a/templates/pekwm-0.1.7.tmpl +++ b/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 diff --git a/templates/perl-XML-Parser-2.36.tmpl b/templates/perl-XML-Parser.tmpl similarity index 82% rename from templates/perl-XML-Parser-2.36.tmpl rename to templates/perl-XML-Parser.tmpl index 915d6204f96..3bf659d2130 100755 --- a/templates/perl-XML-Parser-2.36.tmpl +++ b/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 diff --git a/templates/perl-5.10.0-dont-hardcode-rpath.diff b/templates/perl-dont-hardcode-rpath.diff similarity index 100% rename from templates/perl-5.10.0-dont-hardcode-rpath.diff rename to templates/perl-dont-hardcode-rpath.diff diff --git a/templates/perl-runstuff-after-install.sh b/templates/perl-runstuff-after-install.sh index 61283c9d685..8c652e3e00c 100755 --- a/templates/perl-runstuff-after-install.sh +++ b/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 diff --git a/templates/perl-runstuff-before-build.sh b/templates/perl-runstuff-before-build.sh index d7e1d9c1c05..0486687dba5 100755 --- a/templates/perl-runstuff-before-build.sh +++ b/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 diff --git a/templates/perl-5.10.0.tmpl b/templates/perl.tmpl similarity index 91% rename from templates/perl-5.10.0.tmpl rename to templates/perl.tmpl index 90e0092636d..c0e6a9d1fb6 100755 --- a/templates/perl-5.10.0.tmpl +++ b/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" diff --git a/templates/pixman-0.12.0.tmpl b/templates/pixman.tmpl similarity index 84% rename from templates/pixman-0.12.0.tmpl rename to templates/pixman.tmpl index 860cd371c2f..997365ceb40 100755 --- a/templates/pixman-0.12.0.tmpl +++ b/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 diff --git a/templates/pkg-config-0.23.tmpl b/templates/pkg-config.tmpl similarity index 87% rename from templates/pkg-config-0.23.tmpl rename to templates/pkg-config.tmpl index 1c67d22b6e8..6a5a6becdab 100755 --- a/templates/pkg-config-0.23.tmpl +++ b/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 diff --git a/templates/printproto-1.0.4.tmpl b/templates/printproto.tmpl similarity index 84% rename from templates/printproto-1.0.4.tmpl rename to templates/printproto.tmpl index 1d6635b0581..4ada592cb0c 100755 --- a/templates/printproto-1.0.4.tmpl +++ b/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 diff --git a/templates/python-2.5.2-fix-bluetooth.diff b/templates/python-fix-bluetooth.diff similarity index 100% rename from templates/python-2.5.2-fix-bluetooth.diff rename to templates/python-fix-bluetooth.diff diff --git a/templates/python-2.5.2-fix-build.diff b/templates/python-fix-build.diff similarity index 100% rename from templates/python-2.5.2-fix-build.diff rename to templates/python-fix-build.diff diff --git a/templates/python-2.5.2-fix-curses-module.diff b/templates/python-fix-curses-module.diff similarity index 100% rename from templates/python-2.5.2-fix-curses-module.diff rename to templates/python-fix-curses-module.diff diff --git a/templates/python-2.5.2-fix-mremap.diff b/templates/python-fix-mremap.diff similarity index 100% rename from templates/python-2.5.2-fix-mremap.diff rename to templates/python-fix-mremap.diff diff --git a/templates/python-2.5.2.tmpl b/templates/python.tmpl similarity index 79% rename from templates/python-2.5.2.tmpl rename to templates/python.tmpl index 641b128dfb9..46d2df2bca8 100755 --- a/templates/python-2.5.2.tmpl +++ b/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" diff --git a/templates/randrproto-1.2.2.tmpl b/templates/randrproto.tmpl similarity index 83% rename from templates/randrproto-1.2.2.tmpl rename to templates/randrproto.tmpl index 3fef517cc45..70028819d8d 100755 --- a/templates/randrproto-1.2.2.tmpl +++ b/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 diff --git a/templates/recordproto-1.13.2.tmpl b/templates/recordproto.tmpl similarity index 83% rename from templates/recordproto-1.13.2.tmpl rename to templates/recordproto.tmpl index 80f312b7d33..fe0c10d9834 100755 --- a/templates/recordproto-1.13.2.tmpl +++ b/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 diff --git a/templates/renderproto-0.9.3.tmpl b/templates/renderproto.tmpl similarity index 83% rename from templates/renderproto-0.9.3.tmpl rename to templates/renderproto.tmpl index 9adf2fe0240..732fb8f634d 100755 --- a/templates/renderproto-0.9.3.tmpl +++ b/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 diff --git a/templates/resourceproto-1.0.2.tmpl b/templates/resourceproto.tmpl similarity index 82% rename from templates/resourceproto-1.0.2.tmpl rename to templates/resourceproto.tmpl index af989f9f705..a2f434fc423 100755 --- a/templates/resourceproto-1.0.2.tmpl +++ b/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 diff --git a/templates/ruby-1.8.7-p72.tmpl b/templates/ruby.tmpl similarity index 90% rename from templates/ruby-1.8.7-p72.tmpl rename to templates/ruby.tmpl index b461d7b1665..594fd260328 100755 --- a/templates/ruby-1.8.7-p72.tmpl +++ b/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 diff --git a/templates/scrnsaverproto-1.1.0.tmpl b/templates/scrnsaverproto.tmpl similarity index 82% rename from templates/scrnsaverproto-1.1.0.tmpl rename to templates/scrnsaverproto.tmpl index ec2c5b17f07..e3dd74111ce 100755 --- a/templates/scrnsaverproto-1.1.0.tmpl +++ b/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 diff --git a/templates/tiff-3.8.2.tmpl b/templates/tiff.tmpl similarity index 93% rename from templates/tiff-3.8.2.tmpl rename to templates/tiff.tmpl index b6b2d3313b9..10a8d0ccbf4 100755 --- a/templates/tiff-3.8.2.tmpl +++ b/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 diff --git a/templates/trapproto-3.4.3.tmpl b/templates/trapproto.tmpl similarity index 83% rename from templates/trapproto-3.4.3.tmpl rename to templates/trapproto.tmpl index 31a85a8766a..9aa6c4988f5 100755 --- a/templates/trapproto-3.4.3.tmpl +++ b/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 diff --git a/templates/unzip-5.52-fix-unzipsfx.diff b/templates/unzip-fix-unzipsfx.diff similarity index 100% rename from templates/unzip-5.52-fix-unzipsfx.diff rename to templates/unzip-fix-unzipsfx.diff diff --git a/templates/unzip-5.52.tmpl b/templates/unzip.tmpl similarity index 95% rename from templates/unzip-5.52.tmpl rename to templates/unzip.tmpl index 9a2a8ad2b6a..35f6606f1ef 100755 --- a/templates/unzip-5.52.tmpl +++ b/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/ diff --git a/templates/util-macros-1.1.6.tmpl b/templates/util-macros.tmpl similarity index 82% rename from templates/util-macros-1.1.6.tmpl rename to templates/util-macros.tmpl index 03a76f92b0c..ae923714040 100755 --- a/templates/util-macros-1.1.6.tmpl +++ b/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 diff --git a/templates/videoproto-2.2.2.tmpl b/templates/videoproto.tmpl similarity index 83% rename from templates/videoproto-2.2.2.tmpl rename to templates/videoproto.tmpl index 3f0c8b9d0c7..b61c06b6457 100755 --- a/templates/videoproto-2.2.2.tmpl +++ b/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 diff --git a/templates/vim-7.2.tmpl b/templates/vim.tmpl similarity index 90% rename from templates/vim-7.2.tmpl rename to templates/vim.tmpl index a6803676df8..89352fbf5dd 100755 --- a/templates/vim-7.2.tmpl +++ b/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 diff --git a/templates/xcmiscproto-1.1.2.tmpl b/templates/xcmiscproto.tmpl similarity index 84% rename from templates/xcmiscproto-1.1.2.tmpl rename to templates/xcmiscproto.tmpl index fffaa79dc16..b0d8d4215c5 100755 --- a/templates/xcmiscproto-1.1.2.tmpl +++ b/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 diff --git a/templates/xextproto-7.0.3.tmpl b/templates/xextproto.tmpl similarity index 85% rename from templates/xextproto-7.0.3.tmpl rename to templates/xextproto.tmpl index eefd35d0d65..0942a834796 100755 --- a/templates/xextproto-7.0.3.tmpl +++ b/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 diff --git a/templates/xf86bigfontproto-1.1.2.tmpl b/templates/xf86bigfontproto.tmpl similarity index 83% rename from templates/xf86bigfontproto-1.1.2.tmpl rename to templates/xf86bigfontproto.tmpl index 48b78cd2d70..f558b8b4f91 100755 --- a/templates/xf86bigfontproto-1.1.2.tmpl +++ b/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 diff --git a/templates/xf86dgaproto-2.0.3.tmpl b/templates/xf86dgaproto.tmpl similarity index 82% rename from templates/xf86dgaproto-2.0.3.tmpl rename to templates/xf86dgaproto.tmpl index 90d5ee45505..dce95d36010 100755 --- a/templates/xf86dgaproto-2.0.3.tmpl +++ b/templates/xf86dgaproto.tmpl @@ -1,5 +1,6 @@ -# Template build file for 'xf86dgaproto-2.0.3'. -pkgname=xf86dgaproto-2.0.3 +# Template build file for 'xf86dgaproto'. +pkgname=xf86dgaproto +version=2.0.3 extract_sufx=".tar.bz2" url=http://xorg.freedesktop.org/releases/individual/proto build_style=gnu_configure diff --git a/templates/xf86driproto-2.0.4.tmpl b/templates/xf86driproto.tmpl similarity index 87% rename from templates/xf86driproto-2.0.4.tmpl rename to templates/xf86driproto.tmpl index 37381fc66a8..c64ccc270a0 100755 --- a/templates/xf86driproto-2.0.4.tmpl +++ b/templates/xf86driproto.tmpl @@ -1,5 +1,6 @@ -# Template build file for 'xf86driproto-2.0.4'. -pkgname=xf86driproto-2.0.4 +# Template build file for 'xf86driproto'. +pkgname=xf86driproto +version=2.0.4 extract_sufx=".tar.bz2" url=http://xorg.freedesktop.org/releases/individual/proto build_style=gnu_configure diff --git a/templates/xf86miscproto-0.9.2.tmpl b/templates/xf86miscproto.tmpl similarity index 83% rename from templates/xf86miscproto-0.9.2.tmpl rename to templates/xf86miscproto.tmpl index cc66cc75e97..25626573b96 100755 --- a/templates/xf86miscproto-0.9.2.tmpl +++ b/templates/xf86miscproto.tmpl @@ -1,5 +1,6 @@ -# Template build file for 'xf86miscproto-0.9.2'. -pkgname=xf86miscproto-0.9.2 +# Template build file for 'xf86miscproto'. +pkgname=xf86miscproto +version=0.9.2 extract_sufx=".tar.bz2" url=http://xorg.freedesktop.org/releases/individual/proto build_style=gnu_configure diff --git a/templates/xf86vidmodeproto-2.2.2.tmpl b/templates/xf86vidmodeproto.tmpl similarity index 82% rename from templates/xf86vidmodeproto-2.2.2.tmpl rename to templates/xf86vidmodeproto.tmpl index 46040f9bcaa..f7fb27065a7 100755 --- a/templates/xf86vidmodeproto-2.2.2.tmpl +++ b/templates/xf86vidmodeproto.tmpl @@ -1,5 +1,6 @@ -# Template build file for 'xf86vidmodeproto-2.2.2'. -pkgname=xf86vidmodeproto-2.2.2 +# Template build file for 'xf86vidmodeproto'. +pkgname=xf86vidmodeproto +version=2.2.2 extract_sufx=".tar.bz2" url=http://xorg.freedesktop.org/releases/individual/proto build_style=gnu_configure diff --git a/templates/xineramaproto-1.1.2.tmpl b/templates/xineramaproto.tmpl similarity index 82% rename from templates/xineramaproto-1.1.2.tmpl rename to templates/xineramaproto.tmpl index 1a588e0a894..add1e06c561 100755 --- a/templates/xineramaproto-1.1.2.tmpl +++ b/templates/xineramaproto.tmpl @@ -1,5 +1,6 @@ -# Template build file for 'xineramaproto-1.1.2'. -pkgname=xineramaproto-1.1.2 +# Template build file for 'xineramaproto'. +pkgname=xineramaproto +version=1.1.2 extract_sufx=".tar.bz2" url=http://xorg.freedesktop.org/releases/individual/proto build_style=gnu_configure diff --git a/templates/xkbcomp-1.0.5.tmpl b/templates/xkbcomp.tmpl similarity index 83% rename from templates/xkbcomp-1.0.5.tmpl rename to templates/xkbcomp.tmpl index b27499ebd9e..532bae2b7e4 100755 --- a/templates/xkbcomp-1.0.5.tmpl +++ b/templates/xkbcomp.tmpl @@ -1,5 +1,6 @@ -# Template build file for 'xkbcomp-1.0.5'. -pkgname=xkbcomp-1.0.5 +# Template build file for 'xkbcomp'. +pkgname=xkbcomp +version=1.0.5 extract_sufx=".tar.bz2" url=http://xorg.freedesktop.org/releases/individual/app build_style=gnu_configure diff --git a/templates/xkeyboard-config-1.3.tmpl b/templates/xkeyboard-config.tmpl similarity index 89% rename from templates/xkeyboard-config-1.3.tmpl rename to templates/xkeyboard-config.tmpl index f670c1a348f..03677f053be 100755 --- a/templates/xkeyboard-config-1.3.tmpl +++ b/templates/xkeyboard-config.tmpl @@ -1,5 +1,6 @@ -# Template build file for 'xkeyboard-config-1.3'. -pkgname=xkeyboard-config-1.3 +# Template build file for 'xkeyboard-config'. +pkgname=xkeyboard-config +version=1.3 extract_sufx=".tar.bz2" url=http://xlibs.freedesktop.org/xkbdesc build_style=gnu_configure diff --git a/templates/xorg-server-1.5.1.tmpl b/templates/xorg-server.tmpl similarity index 86% rename from templates/xorg-server-1.5.1.tmpl rename to templates/xorg-server.tmpl index c3dee1aac59..dfcc627c6ce 100755 --- a/templates/xorg-server-1.5.1.tmpl +++ b/templates/xorg-server.tmpl @@ -1,5 +1,6 @@ -# Template build file for 'xorg-server-1.5.1'. -pkgname=xorg-server-1.5.1 +# Template build file for 'xorg-server'. +pkgname=xorg-server +version=1.5.1 extract_sufx=".tar.bz2" url=http://xorg.freedesktop.org/releases/individual/xserver build_style=gnu_configure diff --git a/templates/xproto-7.0.13.tmpl b/templates/xproto.tmpl similarity index 85% rename from templates/xproto-7.0.13.tmpl rename to templates/xproto.tmpl index aa6007327d1..7442f2ddc8a 100755 --- a/templates/xproto-7.0.13.tmpl +++ b/templates/xproto.tmpl @@ -1,5 +1,6 @@ -# Template file for 'xproto-7.0.13' -pkgname=xproto-7.0.13 +# Template file for 'xproto' +pkgname=xproto +version=7.0.13 extract_sufx=".tar.bz2" url=http://xorg.freedesktop.org/releases/individual/proto build_style=gnu_configure diff --git a/templates/xstow-0.6.1-unstable.tmpl b/templates/xstow.tmpl similarity index 86% rename from templates/xstow-0.6.1-unstable.tmpl rename to templates/xstow.tmpl index 35233c5270a..1f05651221f 100755 --- a/templates/xstow-0.6.1-unstable.tmpl +++ b/templates/xstow.tmpl @@ -1,5 +1,6 @@ -# Template build file for 'xstow-0.6.1-unstable'. -pkgname=xstow-0.6.1-unstable +# Template build file for 'xstow'. +pkgname=xstow +version=0.6.1-unstable extract_sufx=".tar.bz2" url=http://kent.dl.sourceforge.net/sourceforge/xstow build_style=gnu_configure diff --git a/templates/xtrans-1.2.1.tmpl b/templates/xtrans.tmpl similarity index 88% rename from templates/xtrans-1.2.1.tmpl rename to templates/xtrans.tmpl index 3cf5fef670c..b2522c204ce 100755 --- a/templates/xtrans-1.2.1.tmpl +++ b/templates/xtrans.tmpl @@ -1,5 +1,6 @@ -# Template file for 'xtrans-1.2.1' -pkgname=xtrans-1.2.1 +# Template file for 'xtrans' +pkgname=xtrans +version=1.2.1 extract_sufx=".tar.bz2" url=http://xorg.freedesktop.org/releases/individual/lib build_style=gnu_configure