diff --git a/templates/MesaLib.tmpl b/templates/MesaLib.tmpl index 86903c7346b..cdc85934931 100644 --- a/templates/MesaLib.tmpl +++ b/templates/MesaLib.tmpl @@ -3,7 +3,7 @@ pkgname=MesaLib version=7.2 wrksrc="Mesa-$version" distfiles=" -http://kent.dl.sourceforge.net/sourceforge/mesa3d/$pkgname-$version@.tar.bz2" +http://kent.dl.sourceforge.net/sourceforge/mesa3d/$pkgname-$version.tar.bz2" build_style=gnu_configure make_build_args="MKDEP=mkdep" configure_args="--with-expat=$XBPS_MASTERDIR" diff --git a/templates/atk.tmpl b/templates/atk.tmpl index 3c11f77937d..14d585d8e62 100644 --- a/templates/atk.tmpl +++ b/templates/atk.tmpl @@ -2,7 +2,7 @@ pkgname=atk version=1.24.0 distfiles=" -http://ftp.gnome.org/pub/GNOME/sources/atk/1.24/$pkgname-$version@.tar.bz2" +http://ftp.gnome.org/pub/GNOME/sources/atk/1.24/$pkgname-$version.tar.bz2" build_style=gnu_configure pkgconfig_override="atk.pc" short_desc="Set of interfaces for accessibility" diff --git a/templates/autoconf.tmpl b/templates/autoconf.tmpl index 179dbe5e3ac..c86722afbb1 100644 --- a/templates/autoconf.tmpl +++ b/templates/autoconf.tmpl @@ -1,7 +1,7 @@ # Template build file for 'autoconf'. pkgname=autoconf version=2.63 -distfiles="http://ftp.gnu.org/gnu/autoconf/$pkgname-$version@.tar.gz" +distfiles="http://ftp.gnu.org/gnu/autoconf/$pkgname-$version.tar.gz" build_style=gnu_configure short_desc="Generates automatic source code configuration scripts" maintainer="Juan RP " diff --git a/templates/automake.tmpl b/templates/automake.tmpl index cc3a14ed3c7..f8d5e0b65d4 100644 --- a/templates/automake.tmpl +++ b/templates/automake.tmpl @@ -1,7 +1,7 @@ # Template build file for 'automake'. pkgname=automake version=1.10.1 -distfiles="http://ftp.gnu.org/gnu/automake/$pkgname-$version@.tar.bz2" +distfiles="http://ftp.gnu.org/gnu/automake/$pkgname-$version.tar.bz2" build_style=gnu_configure short_desc="GNU Standards-compliant Makefile generator" maintainer="Juan RP " diff --git a/templates/babl.tmpl b/templates/babl.tmpl index 66de545c87d..40eb5a1bbb4 100644 --- a/templates/babl.tmpl +++ b/templates/babl.tmpl @@ -1,7 +1,7 @@ # Template build file for 'babl'. pkgname=babl version=0.0.22 -distfiles="ftp://ftp.gtk.org/pub/babl/0.0/$pkgname-$version@.tar.bz2" +distfiles="ftp://ftp.gtk.org/pub/babl/0.0/$pkgname-$version.tar.bz2" build_style=gnu_configure make_cmd="$XBPS_MASTERDIR/bin/gmake" pkgconfig_override="babl.pc" diff --git a/templates/bash.tmpl b/templates/bash.tmpl index b422f9364d8..69c828afea4 100644 --- a/templates/bash.tmpl +++ b/templates/bash.tmpl @@ -1,7 +1,7 @@ # Template build file for 'bash'. pkgname=bash version=3.2 -distfiles="http://ftp.gnu.org/pub/gnu/bash/$pkgname-$version@.tar.gz" +distfiles="http://ftp.gnu.org/pub/gnu/bash/$pkgname-$version.tar.gz" build_style=gnu_configure configure_args="--enable-readline --enable-progcomp --enable-process-substitution --enable-job-control --enable-history diff --git a/templates/bdftopcf.tmpl b/templates/bdftopcf.tmpl index 93c935c00ec..6ab287a11db 100644 --- a/templates/bdftopcf.tmpl +++ b/templates/bdftopcf.tmpl @@ -2,7 +2,7 @@ pkgname=bdftopcf version=1.0.1 distfiles=" -http://xorg.freedesktop.org/releases/individual/app/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/app/$pkgname-$version.tar.bz2" build_style=gnu_configure short_desc="BDF to PCF font converter for X11" maintainer="Juan RP " diff --git a/templates/bigreqsproto.tmpl b/templates/bigreqsproto.tmpl index a98961e3ab8..59f716027eb 100644 --- a/templates/bigreqsproto.tmpl +++ b/templates/bigreqsproto.tmpl @@ -2,7 +2,7 @@ pkgname=bigreqsproto version=1.0.2 distfiles=" -http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version.tar.bz2" build_style=gnu_configure pkgconfig_override="bigreqsproto.pc" short_desc="BigReqs extension headers from modular Xorg X11" diff --git a/templates/binutils.tmpl b/templates/binutils.tmpl index 3cf50734f57..5aea2910971 100644 --- a/templates/binutils.tmpl +++ b/templates/binutils.tmpl @@ -1,7 +1,7 @@ # Template file for 'binutils' pkgname=binutils version=2.18 -distfiles="http://ftp.gnu.org/gnu/binutils/$pkgname-$version@.tar.bz2" +distfiles="http://ftp.gnu.org/gnu/binutils/$pkgname-$version.tar.bz2" build_style=gnu_configure configure_args="--disable-werror --enable-shared --disable-multilib" make_install_target="tooldir=$XBPS_DESTDIR/$pkgname-$version/usr diff --git a/templates/bison.tmpl b/templates/bison.tmpl index 963d9923e1d..531548fbd96 100644 --- a/templates/bison.tmpl +++ b/templates/bison.tmpl @@ -1,7 +1,7 @@ # Template build file for 'bison'. pkgname=bison version=2.3 -distfiles="http://ftp.gnu.org/pub/gnu/bison/$pkgname-$version@.tar.bz2" +distfiles="http://ftp.gnu.org/pub/gnu/bison/$pkgname-$version.tar.bz2" build_style=gnu_configure configure_env="ac_cv_path_M4=/usr/bin/m4" short_desc="GNU yacc(1) replacement" diff --git a/templates/bzip2.tmpl b/templates/bzip2.tmpl index d04a016ca08..a9c174956db 100644 --- a/templates/bzip2.tmpl +++ b/templates/bzip2.tmpl @@ -1,7 +1,7 @@ # Template build file for 'bzip2'. pkgname=bzip2 version=1.0.5 -distfiles="http://www.bzip.org/1.0.5/$pkgname-$version@.tar.gz" +distfiles="http://www.bzip.org/1.0.5/$pkgname-$version.tar.gz" build_style=gnu_makefile make_build_target="-f Makefile-libbz2_so" make_install_args="PREFIX=$XBPS_DESTDIR/$pkgname-$version/usr" diff --git a/templates/cairo.tmpl b/templates/cairo.tmpl index 10ac8b0ff56..83e8129d28b 100644 --- a/templates/cairo.tmpl +++ b/templates/cairo.tmpl @@ -2,7 +2,7 @@ pkgname=cairo version=1.7.6 patch_files="$pkgname-doc-public-Makefile-in.diff" -distfiles="http://cairographics.org/snapshots/$pkgname-$version@.tar.gz" +distfiles="http://cairographics.org/snapshots/$pkgname-$version.tar.gz" build_style=gnu_configure make_cmd="$XBPS_MASTERDIR/bin/gmake" configure_args="--enable-glitz --enable-pdf --enable-ps" diff --git a/templates/compositeproto.tmpl b/templates/compositeproto.tmpl index 32a9d9bbe89..d87e8109743 100644 --- a/templates/compositeproto.tmpl +++ b/templates/compositeproto.tmpl @@ -2,7 +2,7 @@ pkgname=compositeproto version=0.4 distfiles=" -http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version.tar.bz2" build_style=gnu_configure pkgconfig_override="compositeproto.pc" short_desc="Composite extension headers from modular X.org" diff --git a/templates/coreutils.tmpl b/templates/coreutils.tmpl index f95b323ea4b..64dcd4ed2d6 100644 --- a/templates/coreutils.tmpl +++ b/templates/coreutils.tmpl @@ -1,7 +1,7 @@ # Template file for 'coreutils' pkgname=coreutils version=6.12 -distfiles="http://ftp.gnu.org/gnu/coreutils/$pkgname-$version@.tar.gz" +distfiles="http://ftp.gnu.org/gnu/coreutils/$pkgname-$version.tar.gz" build_style=gnu_configure configure_args="--bindir=$XBPS_DESTDIR/$pkgname-$version/bin" short_desc="The GNU core utilities" diff --git a/templates/cpio.tmpl b/templates/cpio.tmpl index 3bcd552db94..424e3897875 100644 --- a/templates/cpio.tmpl +++ b/templates/cpio.tmpl @@ -1,7 +1,7 @@ # Template file for 'cpio' pkgname=cpio version=2.9 -distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version@.tar.gz" +distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz" build_style=gnu_configure short_desc="GNU copy-in/out (cpio) with remote magnetic tape (rmt) support" maintainer="Juan RP " diff --git a/templates/curl.tmpl b/templates/curl.tmpl index c00c3e938fe..6aada807d08 100644 --- a/templates/curl.tmpl +++ b/templates/curl.tmpl @@ -1,7 +1,7 @@ # Template file for 'curl' pkgname=curl version=7.19.0 -distfiles="http://curl.haxx.se/download/$pkgname-$version@.tar.bz2" +distfiles="http://curl.haxx.se/download/$pkgname-$version.tar.bz2" build_style=gnu_configure short_desc="Client that groks URLs" maintainer="Juan RP " diff --git a/templates/damageproto.tmpl b/templates/damageproto.tmpl index 3983dfbf61b..97bba47f80c 100644 --- a/templates/damageproto.tmpl +++ b/templates/damageproto.tmpl @@ -2,7 +2,7 @@ pkgname=damageproto version=1.1.0 distfiles=" -http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version.tar.bz2" build_style=gnu_configure pkgconfig_override="damageproto.pc" short_desc="Damage extension headers from modular X.org" diff --git a/templates/dbus.tmpl b/templates/dbus.tmpl index 85dd4e53754..fb6b12cc1c9 100644 --- a/templates/dbus.tmpl +++ b/templates/dbus.tmpl @@ -1,7 +1,7 @@ # Template file for 'dbus' pkgname=dbus version=1.2.4 -distfiles="http://dbus.freedesktop.org/releases/dbus/$pkgname-$version@.tar.gz" +distfiles="http://dbus.freedesktop.org/releases/dbus/$pkgname-$version.tar.gz" build_style=gnu_configure configure_args="--disable-selinux --enable-userdb-cache --with-xml=expat --localstatedir=/var --without-x" diff --git a/templates/desktop-file-utils.tmpl b/templates/desktop-file-utils.tmpl index f55e71aee29..6fbe1660933 100644 --- a/templates/desktop-file-utils.tmpl +++ b/templates/desktop-file-utils.tmpl @@ -2,7 +2,7 @@ pkgname=desktop-file-utils version=0.15 distfiles=" -http://freedesktop.org/software/desktop-file-utils/releases/$pkgname-$version@.tar.gz" +http://freedesktop.org/software/desktop-file-utils/releases/$pkgname-$version.tar.gz" build_style=gnu_configure make_cmd="$XBPS_MASTERDIR/bin/gmake" short_desc="Utilities to manage desktop entries" diff --git a/templates/diffutils.tmpl b/templates/diffutils.tmpl index 6e9a668f3f9..131d61d2be5 100644 --- a/templates/diffutils.tmpl +++ b/templates/diffutils.tmpl @@ -1,7 +1,7 @@ # Template file for 'diffutils' pkgname=diffutils version=2.8.1 -distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version@.tar.gz" +distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz" build_style=gnu_configure short_desc="The GNU diff utilities" maintainer="Juan RP " diff --git a/templates/dmxproto.tmpl b/templates/dmxproto.tmpl index 8ac9ae486ab..210505cf580 100644 --- a/templates/dmxproto.tmpl +++ b/templates/dmxproto.tmpl @@ -2,7 +2,7 @@ pkgname=dmxproto version=2.2.2 distfiles=" -http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version.tar.bz2" build_style=gnu_configure pkgconfig_override="dmxproto.pc" short_desc="Distributed Multi-headed X protocol headers from modular X.org" diff --git a/templates/e2fsprogs.tmpl b/templates/e2fsprogs.tmpl index 4985d3232c3..a41aca1c0ca 100644 --- a/templates/e2fsprogs.tmpl +++ b/templates/e2fsprogs.tmpl @@ -2,7 +2,7 @@ pkgname=e2fsprogs version=1.41.3 distfiles=" -http://prdownloads.sourceforge.net/e2fsprogs/$pkgname-$version@.tar.gz" +http://prdownloads.sourceforge.net/e2fsprogs/$pkgname-$version.tar.gz" build_style=gnu_configure configure_args="--enable-compression --enable-htree --enable-elf-shlibs --enable-fsck --enable-e2initrd-helper --disable-rpath --bindir=/bin diff --git a/templates/encodings.tmpl b/templates/encodings.tmpl index 12ff3299452..fc961684aa8 100644 --- a/templates/encodings.tmpl +++ b/templates/encodings.tmpl @@ -2,7 +2,7 @@ pkgname=encodings version=1.0.2 distfiles=" -http://xorg.freedesktop.org/releases/individual/font/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/font/$pkgname-$version.tar.bz2" build_style=gnu_configure short_desc="X11 Font Index Generator" maintainer="Juan RP " diff --git a/templates/epdfview.tmpl b/templates/epdfview.tmpl index d642870def1..baa2c4844f8 100644 --- a/templates/epdfview.tmpl +++ b/templates/epdfview.tmpl @@ -2,7 +2,7 @@ pkgname=epdfview version=0.1.6 distfiles=" -http://trac.emma-soft.com/epdfview/chrome/site/releases/$pkgname-$version@.tar.bz2" +http://trac.emma-soft.com/epdfview/chrome/site/releases/$pkgname-$version.tar.bz2" build_style=gnu_configure ignore_files="charset.alias" short_desc="Lightweight PDF viewer using Poppler and GTK+" diff --git a/templates/evieext.tmpl b/templates/evieext.tmpl index 31dbec68384..3aa2e7091cd 100644 --- a/templates/evieext.tmpl +++ b/templates/evieext.tmpl @@ -2,7 +2,7 @@ pkgname=evieext version=1.0.2 distfiles=" -http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version.tar.bz2" build_style=gnu_configure pkgconfig_override="evieproto.pc" short_desc="EvIE extension headers" diff --git a/templates/expat.tmpl b/templates/expat.tmpl index 0e317d0146d..1920cfa679a 100644 --- a/templates/expat.tmpl +++ b/templates/expat.tmpl @@ -2,7 +2,7 @@ pkgname=expat version=2.0.1 distfiles=" -http://kent.dl.sourceforge.net/sourceforge/expat/$pkgname-$version@.tar.gz" +http://kent.dl.sourceforge.net/sourceforge/expat/$pkgname-$version.tar.gz" build_style=gnu_configure short_desc="XML parser library written in C" maintainer="Juan RP " diff --git a/templates/fakeroot.tmpl b/templates/fakeroot.tmpl index 53d701d176f..c4bbc42aa26 100644 --- a/templates/fakeroot.tmpl +++ b/templates/fakeroot.tmpl @@ -1,7 +1,7 @@ # Template file for 'fakeroot' pkgname=fakeroot version=1.10.1 -distfiles="http://ftp.de.debian.org/debian/pool/main/f/fakeroot/${pkgname}_${version}@.tar.gz" +distfiles="http://ftp.de.debian.org/debian/pool/main/f/fakeroot/${pkgname}_${version}.tar.gz" build_style=gnu_configure short_desc="Gives a fake root environment" maintainer="Juan RP " diff --git a/templates/file.tmpl b/templates/file.tmpl index f24e9aa990f..0bdda095096 100644 --- a/templates/file.tmpl +++ b/templates/file.tmpl @@ -1,7 +1,7 @@ # Template file for 'file' pkgname=file version=4.26 -distfiles="ftp://ftp.astron.com/pub/file/$pkgname-$version@.tar.gz" +distfiles="ftp://ftp.astron.com/pub/file/$pkgname-$version.tar.gz" build_style=gnu_configure no_libtool_fixup=yes short_desc="File type identification utility" diff --git a/templates/findutils.tmpl b/templates/findutils.tmpl index 18f32f5fd2b..6131dbdcc69 100644 --- a/templates/findutils.tmpl +++ b/templates/findutils.tmpl @@ -1,7 +1,7 @@ # Template file for 'findutils' pkgname=findutils version=4.4.0 -distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version@.tar.gz" +distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz" build_style=gnu_configure short_desc="The GNU Find Utilities" maintainer="Juan RP " diff --git a/templates/firefox.tmpl b/templates/firefox.tmpl index 0a47f05ecd5..e77bbd41339 100644 --- a/templates/firefox.tmpl +++ b/templates/firefox.tmpl @@ -3,7 +3,7 @@ pkgname=firefox version=3.0.3 wrksrc=mozilla distfiles=" -http://sunsite.rediris.es/pub/mozilla.org/firefox/releases/3.0.3/source/$pkgname-$version-source@.tar.bz2" +http://sunsite.rediris.es/pub/mozilla.org/firefox/releases/3.0.3/source/$pkgname-$version-source.tar.bz2" build_style=gnu_configure configure_args="--enable-default-toolkit=cairo-gtk2 --disable-dbus --disable-crashreporter --enable-xft --with-pthreads --enable-xinerama diff --git a/templates/fixesproto.tmpl b/templates/fixesproto.tmpl index 6a6c4530d18..7e1a957fb1d 100644 --- a/templates/fixesproto.tmpl +++ b/templates/fixesproto.tmpl @@ -2,7 +2,7 @@ pkgname=fixesproto version=4.0 distfiles=" -http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version.tar.bz2" build_style=gnu_configure pkgconfig_override="fixesproto.pc" short_desc="Fixes extension headers from X.org" diff --git a/templates/flex.tmpl b/templates/flex.tmpl index b6917502628..26394d9dfc8 100644 --- a/templates/flex.tmpl +++ b/templates/flex.tmpl @@ -1,7 +1,7 @@ # Template file for 'flex' pkgname=flex version=2.5.35 -distfiles="http://prdownloads.sourceforge.net/flex/$pkgname-$version@.tar.bz2" +distfiles="http://prdownloads.sourceforge.net/flex/$pkgname-$version.tar.bz2" build_style=gnu_configure configure_args="--disable-rpath" short_desc="The Fast Lexical Analyzer" diff --git a/templates/font-adobe-100dpi.tmpl b/templates/font-adobe-100dpi.tmpl index aca1adb6c47..ef76da3a729 100644 --- a/templates/font-adobe-100dpi.tmpl +++ b/templates/font-adobe-100dpi.tmpl @@ -2,7 +2,7 @@ pkgname=font-adobe-100dpi version=1.0.0 distfiles=" -http://xorg.freedesktop.org/releases/individual/font/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/font/$pkgname-$version.tar.bz2" build_style=gnu_configure make_cmd="$XBPS_MASTERDIR/bin/gmake" short_desc="Standard 100dpi Adobe PCF fonts" diff --git a/templates/font-adobe-75dpi.tmpl b/templates/font-adobe-75dpi.tmpl index 4eca105a790..df6899d9b1a 100644 --- a/templates/font-adobe-75dpi.tmpl +++ b/templates/font-adobe-75dpi.tmpl @@ -2,7 +2,7 @@ pkgname=font-adobe-75dpi version=1.0.0 distfiles=" -http://xorg.freedesktop.org/releases/individual/font/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/font/$pkgname-$version.tar.bz2" build_style=gnu_configure make_cmd="$XBPS_MASTERDIR/bin/gmake" short_desc="Standard 75pi Adobe PCF fonts" diff --git a/templates/font-adobe-utopia-100dpi.tmpl b/templates/font-adobe-utopia-100dpi.tmpl index 94c0638da0d..4889481c8cb 100644 --- a/templates/font-adobe-utopia-100dpi.tmpl +++ b/templates/font-adobe-utopia-100dpi.tmpl @@ -2,7 +2,7 @@ pkgname=font-adobe-utopia-100dpi version=1.0.1 distfiles=" -http://xorg.freedesktop.org/releases/individual/font/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/font/$pkgname-$version.tar.bz2" build_style=gnu_configure make_cmd="$XBPS_MASTERDIR/bin/gmake" short_desc="100dpi Adobe Utopia PCF fonts" diff --git a/templates/font-adobe-utopia-75dpi.tmpl b/templates/font-adobe-utopia-75dpi.tmpl index 62eac44e040..9171c057809 100644 --- a/templates/font-adobe-utopia-75dpi.tmpl +++ b/templates/font-adobe-utopia-75dpi.tmpl @@ -2,7 +2,7 @@ pkgname=font-adobe-utopia-75dpi version=1.0.1 distfiles=" -http://xorg.freedesktop.org/releases/individual/font/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/font/$pkgname-$version.tar.bz2" build_style=gnu_configure make_cmd="$XBPS_MASTERDIR/bin/gmake" short_desc="100dpi Adobe Utopia PCF fonts" diff --git a/templates/font-adobe-utopia-type1.tmpl b/templates/font-adobe-utopia-type1.tmpl index 78e192b8a2e..99b99764ebe 100644 --- a/templates/font-adobe-utopia-type1.tmpl +++ b/templates/font-adobe-utopia-type1.tmpl @@ -2,7 +2,7 @@ pkgname=font-adobe-utopia-type1 version=1.0.1 distfiles=" -http://xorg.freedesktop.org/releases/individual/font/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/font/$pkgname-$version.tar.bz2" build_style=gnu_configure make_cmd="$XBPS_MASTERDIR/bin/gmake" short_desc="Adobe Utopia Type1 fonts" diff --git a/templates/font-alias.tmpl b/templates/font-alias.tmpl index 6796677b34c..34053875021 100644 --- a/templates/font-alias.tmpl +++ b/templates/font-alias.tmpl @@ -2,7 +2,7 @@ pkgname=font-alias version=1.0.1 distfiles=" -http://xorg.freedesktop.org/releases/individual/font/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/font/$pkgname-$version.tar.bz2" build_style=gnu_configure short_desc="Standard aliases for X11 PCF fonts" maintainer="Juan RP " diff --git a/templates/font-bh-100dpi.tmpl b/templates/font-bh-100dpi.tmpl index 58e754813bd..5cbdee7c593 100644 --- a/templates/font-bh-100dpi.tmpl +++ b/templates/font-bh-100dpi.tmpl @@ -2,7 +2,7 @@ pkgname=font-bh-100dpi version=1.0.0 distfiles=" -http://xorg.freedesktop.org/releases/individual/font/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/font/$pkgname-$version.tar.bz2" build_style=gnu_configure make_cmd="$XBPS_MASTERDIR/bin/gmake" short_desc="Standard 100dpi Bigelow & Holmes PCF fonts" diff --git a/templates/font-bh-75dpi.tmpl b/templates/font-bh-75dpi.tmpl index 02d05fcd7bd..37772ae9666 100644 --- a/templates/font-bh-75dpi.tmpl +++ b/templates/font-bh-75dpi.tmpl @@ -2,7 +2,7 @@ pkgname=font-bh-75dpi version=1.0.0 distfiles=" -http://xorg.freedesktop.org/releases/individual/font/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/font/$pkgname-$version.tar.bz2" build_style=gnu_configure make_cmd="$XBPS_MASTERDIR/bin/gmake" short_desc="Standard 75dpi Bigelow & Holmes PCF fonts" diff --git a/templates/font-bh-lucidatypewriter-100dpi.tmpl b/templates/font-bh-lucidatypewriter-100dpi.tmpl index e04e9c843ba..046f3e0a97c 100644 --- a/templates/font-bh-lucidatypewriter-100dpi.tmpl +++ b/templates/font-bh-lucidatypewriter-100dpi.tmpl @@ -2,7 +2,7 @@ pkgname=font-bh-lucidatypewriter-100dpi version=1.0.0 distfiles=" -http://xorg.freedesktop.org/releases/individual/font/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/font/$pkgname-$version.tar.bz2" build_style=gnu_configure make_cmd="$XBPS_MASTERDIR/bin/gmake" short_desc="100dpi Bigelow & Holmes Lucida Typewriter PCF fonts" diff --git a/templates/font-bh-lucidatypewriter-75dpi.tmpl b/templates/font-bh-lucidatypewriter-75dpi.tmpl index 0b3839352d6..40f1cbd6238 100644 --- a/templates/font-bh-lucidatypewriter-75dpi.tmpl +++ b/templates/font-bh-lucidatypewriter-75dpi.tmpl @@ -2,7 +2,7 @@ pkgname=font-bh-lucidatypewriter-75dpi version=1.0.0 distfiles=" -http://xorg.freedesktop.org/releases/individual/font/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/font/$pkgname-$version.tar.bz2" build_style=gnu_configure make_cmd="$XBPS_MASTERDIR/bin/gmake" short_desc="75dpi Bigelow & Holmes Lucida Typewriter PCF fonts" diff --git a/templates/font-bh-ttf.tmpl b/templates/font-bh-ttf.tmpl index c1fd3a824b9..6e5229ec24c 100644 --- a/templates/font-bh-ttf.tmpl +++ b/templates/font-bh-ttf.tmpl @@ -2,7 +2,7 @@ pkgname=font-bh-ttf version=1.0.0 distfiles=" -http://xorg.freedesktop.org/releases/individual/font/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/font/$pkgname-$version.tar.bz2" build_style=gnu_configure make_cmd="$XBPS_MASTERDIR/bin/gmake" short_desc="Standard Bigelow & Holmes TrueType fonts" diff --git a/templates/font-bh-type1.tmpl b/templates/font-bh-type1.tmpl index 2535bac819c..1a06253c588 100644 --- a/templates/font-bh-type1.tmpl +++ b/templates/font-bh-type1.tmpl @@ -2,7 +2,7 @@ pkgname=font-bh-type1 version=1.0.0 distfiles=" -http://xorg.freedesktop.org/releases/individual/font/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/font/$pkgname-$version.tar.bz2" build_style=gnu_configure make_cmd="$XBPS_MASTERDIR/bin/gmake" short_desc="Standard Bigelow & Holmes Type1 fonts" diff --git a/templates/font-bitstream-100dpi.tmpl b/templates/font-bitstream-100dpi.tmpl index a34a53d327f..0ecdb0da3db 100644 --- a/templates/font-bitstream-100dpi.tmpl +++ b/templates/font-bitstream-100dpi.tmpl @@ -2,7 +2,7 @@ pkgname=font-bitstream-100dpi version=1.0.0 distfiles=" -http://xorg.freedesktop.org/releases/individual/font/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/font/$pkgname-$version.tar.bz2" build_style=gnu_configure make_cmd="$XBPS_MASTERDIR/bin/gmake" short_desc="Standard 100dpi Bitstream PCF fonts" diff --git a/templates/font-bitstream-75dpi.tmpl b/templates/font-bitstream-75dpi.tmpl index 5fb5c434481..1ff5aaf7986 100644 --- a/templates/font-bitstream-75dpi.tmpl +++ b/templates/font-bitstream-75dpi.tmpl @@ -2,7 +2,7 @@ pkgname=font-bitstream-75dpi version=1.0.0 distfiles=" -http://xorg.freedesktop.org/releases/individual/font/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/font/$pkgname-$version.tar.bz2" build_style=gnu_configure make_cmd="$XBPS_MASTERDIR/bin/gmake" short_desc="Standard 100dpi Bitstream PCF fonts" diff --git a/templates/font-bitstream-speedo.tmpl b/templates/font-bitstream-speedo.tmpl index 3fe4ee16932..ca1d3103958 100644 --- a/templates/font-bitstream-speedo.tmpl +++ b/templates/font-bitstream-speedo.tmpl @@ -2,7 +2,7 @@ pkgname=font-bitstream-speedo version=1.0.0 distfiles=" -http://xorg.freedesktop.org/releases/individual/font/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/font/$pkgname-$version.tar.bz2" build_style=gnu_configure make_cmd="$XBPS_MASTERDIR/bin/gmake" short_desc="Standard Speedo Bitstream PCF fonts" diff --git a/templates/font-bitstream-type1.tmpl b/templates/font-bitstream-type1.tmpl index 2c3f1d28065..7f258c68bf8 100644 --- a/templates/font-bitstream-type1.tmpl +++ b/templates/font-bitstream-type1.tmpl @@ -2,7 +2,7 @@ pkgname=font-bitstream-type1 version=1.0.0 distfiles=" -http://xorg.freedesktop.org/releases/individual/font/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/font/$pkgname-$version.tar.bz2" build_style=gnu_configure make_cmd="$XBPS_MASTERDIR/bin/gmake" short_desc="Standard Type1 Bitstream PCF fonts" diff --git a/templates/font-cursor-misc.tmpl b/templates/font-cursor-misc.tmpl index 4251c583b20..444995f2d8f 100644 --- a/templates/font-cursor-misc.tmpl +++ b/templates/font-cursor-misc.tmpl @@ -2,7 +2,7 @@ pkgname=font-cursor-misc version=1.0.0 distfiles=" -http://xorg.freedesktop.org/releases/individual/font/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/font/$pkgname-$version.tar.bz2" build_style=gnu_configure short_desc="Standard X11 cursors in PCF format" maintainer="Juan RP " diff --git a/templates/font-misc-misc.tmpl b/templates/font-misc-misc.tmpl index 48e10b4e893..8437372eb4b 100644 --- a/templates/font-misc-misc.tmpl +++ b/templates/font-misc-misc.tmpl @@ -2,7 +2,7 @@ pkgname=font-misc-misc version=1.0.0 distfiles=" -http://xorg.freedesktop.org/releases/individual/font/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/font/$pkgname-$version.tar.bz2" build_style=gnu_configure make_cmd="$XBPS_MASTERDIR/bin/gmake" short_desc="Standard X11 \"fixed\" PCF fonts" diff --git a/templates/font-util.tmpl b/templates/font-util.tmpl index 942913a0c61..7e4d48c39d2 100644 --- a/templates/font-util.tmpl +++ b/templates/font-util.tmpl @@ -2,7 +2,7 @@ pkgname=font-util version=1.0.1 distfiles=" -http://xorg.freedesktop.org/releases/individual/font/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/font/$pkgname-$version.tar.bz2" build_style=gnu_configure short_desc="Tools for truncating and subseting of ISO10646-1 BDF fonts" maintainer="Juan RP " diff --git a/templates/fontcacheproto.tmpl b/templates/fontcacheproto.tmpl index 4ccab01b9d3..adb3fc4e157 100644 --- a/templates/fontcacheproto.tmpl +++ b/templates/fontcacheproto.tmpl @@ -2,7 +2,7 @@ pkgname=fontcacheproto version=0.1.2 distfiles=" -http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version.tar.bz2" build_style=gnu_configure pkgconfig_override="fontcacheproto.pc" short_desc="Fontcache extension headers from X.org" diff --git a/templates/fontconfig.tmpl b/templates/fontconfig.tmpl index 9350c45ce80..b025592fcd9 100644 --- a/templates/fontconfig.tmpl +++ b/templates/fontconfig.tmpl @@ -2,7 +2,7 @@ pkgname=fontconfig version=2.6.0 patch_files="$pkgname-Makefile-fc-cache.diff" -distfiles="http://www.fontconfig.org/release/$pkgname-$version@.tar.gz" +distfiles="http://www.fontconfig.org/release/$pkgname-$version.tar.gz" build_style=gnu_configure configure_args="--with-add-fonts=$XBPS_MASTERDIR/lib/X11/fonts --enable-docs --with-default-fonts=$XBPS_MASTERDIR/lib/X11/fonts" diff --git a/templates/fontsproto.tmpl b/templates/fontsproto.tmpl index d459d640261..195e4d30d71 100644 --- a/templates/fontsproto.tmpl +++ b/templates/fontsproto.tmpl @@ -2,7 +2,7 @@ pkgname=fontsproto version=2.0.2 distfiles=" -http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version.tar.bz2" build_style=gnu_configure pkgconfig_override="fontsproto.pc" short_desc="Fonts extension headers from X.org" diff --git a/templates/freeglut.tmpl b/templates/freeglut.tmpl index 58b4a0083a4..de3331a6368 100644 --- a/templates/freeglut.tmpl +++ b/templates/freeglut.tmpl @@ -3,7 +3,7 @@ pkgname=freeglut version=2.4.0 patch_files="$pkgname-src-Makefile-in.diff" distfiles=" -http://surfnet.dl.sourceforge.net/sourceforge/freeglut/$pkgname-$version@.tar.gz" +http://surfnet.dl.sourceforge.net/sourceforge/freeglut/$pkgname-$version.tar.gz" build_style=gnu_configure configure_args="--disable-warnings" make_cmd="$XBPS_MASTERDIR/bin/gmake" diff --git a/templates/freetype2.tmpl b/templates/freetype2.tmpl index 45caab71aa4..0381271c3f0 100644 --- a/templates/freetype2.tmpl +++ b/templates/freetype2.tmpl @@ -3,7 +3,7 @@ pkgname=freetype2 version=2.3.7 wrksrc="freetype-$version" distfiles=" -http://download.savannah.gnu.org/releases/freetype/freetype-$version@.tar.bz2" +http://download.savannah.gnu.org/releases/freetype/freetype-$version.tar.bz2" build_style=gnu_configure make_cmd="$XBPS_MASTERDIR/bin/gmake" configure_env="GNUMAKE=$make_cmd" diff --git a/templates/gawk.tmpl b/templates/gawk.tmpl index af6d0c9869e..dd1e2dbb7c7 100644 --- a/templates/gawk.tmpl +++ b/templates/gawk.tmpl @@ -1,7 +1,7 @@ # Template file for 'gawk' pkgname=gawk version=3.1.6 -distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version@.tar.gz" +distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz" build_style=gnu_configure short_desc="The GNU awk utility" maintainer="Juan RP " diff --git a/templates/gcc.tmpl b/templates/gcc.tmpl index 4c80a9d1de6..0321c644e87 100644 --- a/templates/gcc.tmpl +++ b/templates/gcc.tmpl @@ -3,7 +3,7 @@ pkgname=gcc version=4.3.2 patch_files="$pkgname-fix-amd64.diff" distfiles=" -http://ftp.gnu.org/pub/gnu/gcc/$pkgname-$version/$pkgname-$version@.tar.bz2" +http://ftp.gnu.org/pub/gnu/gcc/$pkgname-$version/$pkgname-$version.tar.bz2" build_style=gnu_configure configure_args="--enable-clocale=gnu --disable-bootstrap --enable-threads=posix --enable-__cxa_atexit --disable-multilib diff --git a/templates/gdbm.tmpl b/templates/gdbm.tmpl index 607443c60f0..bd62b46f719 100644 --- a/templates/gdbm.tmpl +++ b/templates/gdbm.tmpl @@ -1,7 +1,7 @@ # Template file for 'gdbm' pkgname=gdbm version=1.8.3 -distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version@.tar.gz" +distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz" build_style=gnu_configure short_desc="GNU database routines" maintainer="Juan RP " diff --git a/templates/gegl.tmpl b/templates/gegl.tmpl index 8372c05082f..163ac448805 100644 --- a/templates/gegl.tmpl +++ b/templates/gegl.tmpl @@ -1,7 +1,7 @@ # Template build file for 'gegl'. pkgname=gegl version=0.0.20 -distfiles="ftp://ftp.gimp.org/pub/gegl/0.0/$pkgname-$version@.tar.bz2" +distfiles="ftp://ftp.gimp.org/pub/gegl/0.0/$pkgname-$version.tar.bz2" build_style=gnu_configure make_cmd="$XBPS_MASTERDIR/bin/gmake" pkgconfig_override="gegl.pc" diff --git a/templates/gettext.tmpl b/templates/gettext.tmpl index 69d17c200dd..1a24aeeee5c 100644 --- a/templates/gettext.tmpl +++ b/templates/gettext.tmpl @@ -2,7 +2,7 @@ pkgname=gettext version=0.17 distfiles=" -http://ftp.gnu.org/pub/gnu/gettext/gettext-$version@.tar.gz" +http://ftp.gnu.org/pub/gnu/gettext/gettext-$version.tar.gz" build_style=gnu_configure short_desc="Internationalized Message Handling Library and tools" maintainer="Juan RP " diff --git a/templates/gimp.tmpl b/templates/gimp.tmpl index 1342b1824d5..08b71c8c211 100644 --- a/templates/gimp.tmpl +++ b/templates/gimp.tmpl @@ -2,7 +2,7 @@ pkgname=gimp version=2.6.1 distfiles=" -http://sunsite.rediris.es/mirror/gimp/v2.6/$pkgname-$version@.tar.bz2" +http://sunsite.rediris.es/mirror/gimp/v2.6/$pkgname-$version.tar.bz2" build_style=gnu_configure configure_args="--disable-python" make_cmd="$XBPS_MASTERDIR/bin/gmake" diff --git a/templates/git.tmpl b/templates/git.tmpl index 7a02f8e7abe..7af1bbb4a45 100644 --- a/templates/git.tmpl +++ b/templates/git.tmpl @@ -2,7 +2,7 @@ pkgname=git version=1.6.0.2 distfiles=" -http://www.kernel.org/pub/software/scm/git/$pkgname-$version@.tar.bz2" +http://www.kernel.org/pub/software/scm/git/$pkgname-$version.tar.bz2" build_style=gnu_configure make_env="CURLDIR=$XBPS_MASTERDIR THREADED_DELTA_SEARCH=1" configure_args="--with-shell=/bin/sh --with-perl=$XBPS_MASTERDIR/usr/bin/perl diff --git a/templates/gkrellm.tmpl b/templates/gkrellm.tmpl index 7b90d426918..ca3e75bdddf 100644 --- a/templates/gkrellm.tmpl +++ b/templates/gkrellm.tmpl @@ -3,7 +3,7 @@ pkgname=gkrellm version=2.3.2 patch_files="$pkgname-fix-sensors.diff" distfiles=" -http://members.dslextreme.com/users/billw/gkrellm/$pkgname-$version@.tar.bz2" +http://members.dslextreme.com/users/billw/gkrellm/$pkgname-$version.tar.bz2" build_style=gnu_makefile make_cmd="$XBPS_MASTERDIR/bin/gmake" make_build_target="netbsd2" diff --git a/templates/glib.tmpl b/templates/glib.tmpl index aa7a1c971d3..c9f40b36f78 100644 --- a/templates/glib.tmpl +++ b/templates/glib.tmpl @@ -2,7 +2,7 @@ pkgname=glib version=2.18.2 distfiles=" -http://ftp.gnome.org/pub/gnome/sources/glib/2.18/$pkgname-$version@.tar.bz2" +http://ftp.gnome.org/pub/gnome/sources/glib/2.18/$pkgname-$version.tar.bz2" # Disable FAM for now and use the installed pcre package instead # of the supplied one. configure_args="--disable-fam --with-pcre=system" diff --git a/templates/glibc.tmpl b/templates/glibc.tmpl index c229f08abaa..6111618b123 100644 --- a/templates/glibc.tmpl +++ b/templates/glibc.tmpl @@ -2,7 +2,7 @@ pkgname=glibc version=2.8 wrksrc="libc" -distfiles="ftp://ftp.archlinux.org/other/glibc/$pkgname-2.8_20080828@.tar.bz2" +distfiles="ftp://ftp.archlinux.org/other/glibc/$pkgname-2.8_20080828.tar.bz2" build_style=gnu_configure configure_env="ac_cv_path_BASH_SHELL=/bin/bash" configure_script="../configure" diff --git a/templates/glitz.tmpl b/templates/glitz.tmpl index 55b531ea3d3..3b76c5e79b4 100644 --- a/templates/glitz.tmpl +++ b/templates/glitz.tmpl @@ -2,7 +2,7 @@ pkgname=glitz version=0.5.6 distfiles=" -http://cairographics.org/snapshots/$pkgname-$version@.tar.gz" +http://cairographics.org/snapshots/$pkgname-$version.tar.gz" build_style=gnu_configure configure_args="--with-x" pkgconfig_override="glitz.pc glitz-glx.pc" diff --git a/templates/glproto.tmpl b/templates/glproto.tmpl index 9cb338f93c9..ba0e0fba538 100644 --- a/templates/glproto.tmpl +++ b/templates/glproto.tmpl @@ -2,7 +2,7 @@ pkgname=glproto version=1.4.9 distfiles=" -http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version.tar.bz2" build_style=gnu_configure pkgconfig_override="glproto.pc" short_desc="GL extension headers" diff --git a/templates/gmp.tmpl b/templates/gmp.tmpl index 8322fbddb53..3580f148d1d 100644 --- a/templates/gmp.tmpl +++ b/templates/gmp.tmpl @@ -1,7 +1,7 @@ # Template build file for 'gmp' pkgname=gmp version=4.2.4 -distfiles="ftp://ftp.gmplib.org/pub/$pkgname-$version@.tar.bz2" +distfiles="ftp://ftp.gmplib.org/pub/$pkgname-$version.tar.bz2" build_style=gnu_configure short_desc="Library for arbitrary precision arithmetic" maintainer="Juan RP " diff --git a/templates/grep.tmpl b/templates/grep.tmpl index 2ad46ec29f8..d70b04070c1 100644 --- a/templates/grep.tmpl +++ b/templates/grep.tmpl @@ -1,7 +1,7 @@ # Template build file for 'grep'. pkgname=grep version=2.5.3 -distfiles="http://ftp.gnu.org/gnu/grep/$pkgname-$version@.tar.bz2" +distfiles="http://ftp.gnu.org/gnu/grep/$pkgname-$version.tar.bz2" build_style=gnu_configure configure_args="--bindir=$XBPS_DESTDIR/$pkgname-$version/bin --disable-perl-regexp" diff --git a/templates/groff.tmpl b/templates/groff.tmpl index 50aa759d927..7dfbeae05c6 100644 --- a/templates/groff.tmpl +++ b/templates/groff.tmpl @@ -1,7 +1,7 @@ # Template file for 'groff' pkgname=groff version=1.19.2 -distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version@.tar.gz" +distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz" build_style=gnu_configure configure_args="--with-appresdir=/usr/lib/X11/app-defaults" short_desc="The GNU troff text-formatting system" diff --git a/templates/gstreamer.tmpl b/templates/gstreamer.tmpl index 4362e38fb96..7426c8726a9 100644 --- a/templates/gstreamer.tmpl +++ b/templates/gstreamer.tmpl @@ -2,7 +2,7 @@ pkgname=gstreamer version=0.10.21 distfiles=" -http://gstreamer.freedesktop.org/src/gstreamer/$pkgname-$version@.tar.bz2" +http://gstreamer.freedesktop.org/src/gstreamer/$pkgname-$version.tar.bz2" build_style=gnu_configure short_desc="Core GStreamer libraries and elements" maintainer="pancake " diff --git a/templates/gtk+.tmpl b/templates/gtk+.tmpl index c17b1465071..5ad5fd69933 100644 --- a/templates/gtk+.tmpl +++ b/templates/gtk+.tmpl @@ -3,7 +3,7 @@ pkgname=gtk+ version=2.14.3 patch_files="$pkgname-tests-Makefile-in.diff" distfiles=" -http://ftp.gnome.org/pub/GNOME/sources/gtk+/2.14/$pkgname-$version@.tar.bz2" +http://ftp.gnome.org/pub/GNOME/sources/gtk+/2.14/$pkgname-$version.tar.bz2" build_style=gnu_configure configure_args="--disable-cups" make_cmd="$XBPS_MASTERDIR/bin/gmake" diff --git a/templates/gtk-sharp.tmpl b/templates/gtk-sharp.tmpl index 76fa880626c..40692996e9b 100644 --- a/templates/gtk-sharp.tmpl +++ b/templates/gtk-sharp.tmpl @@ -2,7 +2,7 @@ pkgname=gtk-sharp version=2.12.4 distfiles=" -http://ftp.gnome.org/pub/gnome/sources/gtk-sharp/2.12/$pkgname-$version@.tar.bz2" +http://ftp.gnome.org/pub/gnome/sources/gtk-sharp/2.12/$pkgname-$version.tar.bz2" build_style=gnu_configure make_cmd="$XBPS_MASTERDIR/bin/gmake" pkgconfig_override="gtk-sharp-2.0.pc gtk-dotnet-2.0.pc glib-sharp-2.0.pc diff --git a/templates/gzip.tmpl b/templates/gzip.tmpl index 050949104de..01091613573 100644 --- a/templates/gzip.tmpl +++ b/templates/gzip.tmpl @@ -1,7 +1,7 @@ # Template file for 'gzip' pkgname=gzip version=1.3.12 -distfiles="http://ftp.gnu.org/gnu/gzip/$pkgname-$version@.tar.gz" +distfiles="http://ftp.gnu.org/gnu/gzip/$pkgname-$version.tar.gz" build_style=gnu_configure short_desc="GNU compression utility (replacement for compress)" maintainer="Juan RP " diff --git a/templates/hicolor-icon-theme.tmpl b/templates/hicolor-icon-theme.tmpl index dc51a19ffdd..5401452e58b 100644 --- a/templates/hicolor-icon-theme.tmpl +++ b/templates/hicolor-icon-theme.tmpl @@ -2,7 +2,7 @@ pkgname=hicolor-icon-theme version=0.10 distfiles=" -http://icon-theme.freedesktop.org/releases/$pkgname-$version@.tar.gz" +http://icon-theme.freedesktop.org/releases/$pkgname-$version.tar.gz" build_style=gnu_configure make_cmd="$XBPS_MASTERDIR/bin/gmake" short_desc="Standard icon theme called hicolor" diff --git a/templates/iana-etc.tmpl b/templates/iana-etc.tmpl index 1eaf0cd116d..c47f1e5b0e1 100644 --- a/templates/iana-etc.tmpl +++ b/templates/iana-etc.tmpl @@ -1,7 +1,7 @@ # Template file for 'iana-etc' pkgname=iana-etc version=2.30 -distfiles="http://sethwklein.net/$pkgname-$version@.tar.bz2" +distfiles="http://sethwklein.net/$pkgname-$version.tar.bz2" build_style=gnu_makefile make_build_args="STRIP=yes" make_install_args="DESTDIR=$XBPS_DESTDIR/$pkgname-$version" diff --git a/templates/imlib2.tmpl b/templates/imlib2.tmpl index f881ed1ad77..b62fa5a5215 100644 --- a/templates/imlib2.tmpl +++ b/templates/imlib2.tmpl @@ -2,7 +2,7 @@ pkgname=imlib2 version=1.4.0 distfiles=" -http://kent.dl.sourceforge.net/sourceforge/enlightenment/$pkgname-$version@.tar.gz" +http://kent.dl.sourceforge.net/sourceforge/enlightenment/$pkgname-$version.tar.gz" build_style=gnu_configure short_desc="Image manipulation library" maintainer="Juan RP " diff --git a/templates/initramfs-tools.tmpl b/templates/initramfs-tools.tmpl index 4f372052d5c..645219f3f4a 100644 --- a/templates/initramfs-tools.tmpl +++ b/templates/initramfs-tools.tmpl @@ -3,7 +3,7 @@ pkgname=initramfs-tools version=0.92l wrksrc=$pkgname distfiles=" -http://ftp.de.debian.org/debian/pool/main/i/$pkgname/${pkgname}_${version}@.tar.gz" +http://ftp.de.debian.org/debian/pool/main/i/$pkgname/${pkgname}_${version}.tar.gz" build_style=custom-install short_desc="Tools for generating an initramfs" maintainer="Juan RP " diff --git a/templates/inputproto.tmpl b/templates/inputproto.tmpl index aa80566bbe9..077e9c2df57 100644 --- a/templates/inputproto.tmpl +++ b/templates/inputproto.tmpl @@ -2,7 +2,7 @@ pkgname=inputproto version=1.4.4 distfiles=" -http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version.tar.bz2" build_style=gnu_configure pkgconfig_override="inputproto.pc" short_desc="Input extension headers from X.org" diff --git a/templates/intltool.tmpl b/templates/intltool.tmpl index 2f02e0730a9..e94e7242854 100644 --- a/templates/intltool.tmpl +++ b/templates/intltool.tmpl @@ -2,7 +2,7 @@ pkgname=intltool version=0.40.4 distfiles=" -http://ftp.gnome.org/pub/GNOME/sources/intltool/0.40/$pkgname-$version@.tar.bz2" +http://ftp.gnome.org/pub/GNOME/sources/intltool/0.40/$pkgname-$version.tar.bz2" build_style=gnu_configure make_cmd="$XBPS_MASTERDIR/bin/gmake" short_desc="Toolbox for internationalisation" diff --git a/templates/irssi.tmpl b/templates/irssi.tmpl index f26bd604cfb..62aa74b2715 100644 --- a/templates/irssi.tmpl +++ b/templates/irssi.tmpl @@ -1,7 +1,7 @@ # Template build file for 'irssi' pkgname=irssi version=0.8.12 -distfiles="http://www.irssi.org/files/$pkgname-$version@.tar.bz2" +distfiles="http://www.irssi.org/files/$pkgname-$version.tar.bz2" # We need this to get some perl paths. . $XBPS_TMPLHELPDIR/perl-module.sh configure_args="--with-proxy --with-perl-lib=$PERL_SITELIBEXP" diff --git a/templates/iso-codes.tmpl b/templates/iso-codes.tmpl index a1db9645a90..eb3e804e473 100644 --- a/templates/iso-codes.tmpl +++ b/templates/iso-codes.tmpl @@ -3,7 +3,7 @@ pkgname=iso-codes version=3.3 patch_files="$pkgname-fix-pkgconfig.diff" distfiles=" -ftp://pkg-isocodes.alioth.debian.org/pub/pkg-isocodes/$pkgname-$version@.tar.bz2" +ftp://pkg-isocodes.alioth.debian.org/pub/pkg-isocodes/$pkgname-$version.tar.bz2" build_style=gnu_configure make_cmd="$XBPS_MASTERDIR/bin/gmake" pkgconfig_override="iso-codes.pc" diff --git a/templates/jasper.tmpl b/templates/jasper.tmpl index 8d10189079d..bffef9167f3 100644 --- a/templates/jasper.tmpl +++ b/templates/jasper.tmpl @@ -2,7 +2,7 @@ pkgname=jasper version=1.900.1 distfiles=" -http://www.ece.uvic.ca/~mdadams/jasper/software/$pkgname-$version@.zip" +http://www.ece.uvic.ca/~mdadams/jasper/software/$pkgname-$version.zip" build_style=gnu_configure configure_args="--enable-shared --without-x --disable-opengl" short_desc="Software-based reference implementation of the JPEG-2000 codec" diff --git a/templates/jpeg.tmpl b/templates/jpeg.tmpl index 1adbdf11bed..0508ac01715 100644 --- a/templates/jpeg.tmpl +++ b/templates/jpeg.tmpl @@ -4,7 +4,7 @@ version=6.0b wrksrc=$pkgname-6b patch_files="$pkgname-makefile-cfg.diff" distfiles=" -ftp://ftp.fu-berlin.de/unix/graphics/jpeg/jpegsrc.v6b@.tar.gz" +ftp://ftp.fu-berlin.de/unix/graphics/jpeg/jpegsrc.v6b.tar.gz" build_style=gnu_configure make_install_target="install install-lib" configure_args="--enable-shared --enable-static" diff --git a/templates/kbd.tmpl b/templates/kbd.tmpl index 870c11c3346..81775bc57a0 100644 --- a/templates/kbd.tmpl +++ b/templates/kbd.tmpl @@ -1,7 +1,7 @@ # Template file for 'kbd' pkgname=kbd version=1.12 -distfiles="http://www.kernel.org/pub/linux/utils/kbd/$pkgname-$version@.tar.bz2" +distfiles="http://www.kernel.org/pub/linux/utils/kbd/$pkgname-$version.tar.bz2" build_style=configure configure_args="--datadir=/usr/share --mandir=/usr/share/man" make_install_args="DESTDIR=$XBPS_DESTDIR/$pkgname-$version diff --git a/templates/kbproto.tmpl b/templates/kbproto.tmpl index 0ccd29d7056..3d35293d242 100644 --- a/templates/kbproto.tmpl +++ b/templates/kbproto.tmpl @@ -2,7 +2,7 @@ pkgname=kbproto version=1.0.3 distfiles=" -http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version.tar.bz2" build_style=gnu_configure pkgconfig_override="kbproto.pc" short_desc="KB extension headers from X.org" diff --git a/templates/kernel-headers.tmpl b/templates/kernel-headers.tmpl index 5cc1748785e..ded080ae122 100644 --- a/templates/kernel-headers.tmpl +++ b/templates/kernel-headers.tmpl @@ -2,7 +2,7 @@ pkgname=kernel-headers version=2.6.27.3 wrksrc="linux-$version" -distfiles="http://www.kernel.org/pub/linux/kernel/v2.6/linux-$version@.tar.bz2" +distfiles="http://www.kernel.org/pub/linux/kernel/v2.6/linux-$version.tar.bz2" build_style=only-install make_install_target=" INSTALL_HDR_PATH=$XBPS_DESTDIR/$pkgname-$version/usr diff --git a/templates/kernel26.tmpl b/templates/kernel26.tmpl index 5e5e68ac2f3..92dd09aec57 100644 --- a/templates/kernel26.tmpl +++ b/templates/kernel26.tmpl @@ -2,7 +2,7 @@ pkgname=kernel26 version=2.6.27.3 wrksrc="linux-$version" -distfiles="http://www.kernel.org/pub/linux/kernel/v2.6/linux-$version@.tar.bz2" +distfiles="http://www.kernel.org/pub/linux/kernel/v2.6/linux-$version.tar.bz2" build_style=gnu_makefile make_build_target="bzImage modules" make_install_target="modules_install diff --git a/templates/klibc.tmpl b/templates/klibc.tmpl index 9c218f5e939..802a05ee7df 100644 --- a/templates/klibc.tmpl +++ b/templates/klibc.tmpl @@ -2,7 +2,7 @@ pkgname=klibc version=1.5.14 distfiles=" -http://www.kernel.org/pub/linux/libs/klibc/Testing/klibc-$version@.tar.bz2" +http://www.kernel.org/pub/linux/libs/klibc/Testing/klibc-$version.tar.bz2" build_style=gnu_makefile make_install_target="INSTALLROOT=$XBPS_DESTDIR/$pkgname-$version install" short_desc="Minimal libc subset for use with initramfs" diff --git a/templates/lcms.tmpl b/templates/lcms.tmpl index eda332367de..2328ac769a7 100644 --- a/templates/lcms.tmpl +++ b/templates/lcms.tmpl @@ -1,7 +1,7 @@ # Template build file for 'lcms'. pkgname=lcms version=1.17 -distfiles="http://www.littlecms.com/$pkgname-$version@.tar.gz" +distfiles="http://www.littlecms.com/$pkgname-$version.tar.gz" build_style=gnu_configure pkgconfig_override="lcms.pc" short_desc="Light Color Management System -- a color management library" diff --git a/templates/less.tmpl b/templates/less.tmpl index b541eaa4c5f..6f62acb6109 100644 --- a/templates/less.tmpl +++ b/templates/less.tmpl @@ -2,7 +2,7 @@ pkgname=less version=4.24 wrksrc="$pkgname-424" -distfiles="http://www.greenwoodsoftware.com/less/$pkgname-424@.tar.gz" +distfiles="http://www.greenwoodsoftware.com/less/$pkgname-424.tar.gz" build_style=gnu_configure short_desc="Pager program similar to more(1)" maintainer="Juan RP " diff --git a/templates/libICE.tmpl b/templates/libICE.tmpl index d8a109e8ed2..0b8eebbdb7f 100644 --- a/templates/libICE.tmpl +++ b/templates/libICE.tmpl @@ -2,7 +2,7 @@ pkgname=libICE version=1.0.4 distfiles=" -http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version.tar.bz2" build_style=gnu_configure pkgconfig_override="ice.pc" short_desc="Inter Client Exchange (ICE) library for X" diff --git a/templates/libIDL.tmpl b/templates/libIDL.tmpl index 7600232da10..765d889bbcd 100644 --- a/templates/libIDL.tmpl +++ b/templates/libIDL.tmpl @@ -2,7 +2,7 @@ pkgname=libIDL version=0.8.11 distfiles=" -http://ftp.gnome.org/pub/gnome/sources/libIDL/0.8/$pkgname-$version@.tar.bz2" +http://ftp.gnome.org/pub/gnome/sources/libIDL/0.8/$pkgname-$version.tar.bz2" build_style=gnu_configure configure_env="HAVE_YACC=yes" pkgconfig_override="libIDL-2.0.pc" diff --git a/templates/libSM.tmpl b/templates/libSM.tmpl index e9e5b21b8cc..89279c1721c 100644 --- a/templates/libSM.tmpl +++ b/templates/libSM.tmpl @@ -2,7 +2,7 @@ pkgname=libSM version=1.1.0 distfiles=" -http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version.tar.bz2" build_style=gnu_configure configure_args="--without-libuuid" pkgconfig_override="sm.pc" diff --git a/templates/libX11.tmpl b/templates/libX11.tmpl index c86ba18e5ae..98d6ad5da2b 100644 --- a/templates/libX11.tmpl +++ b/templates/libX11.tmpl @@ -2,7 +2,7 @@ pkgname=libX11 version=1.1.5 distfiles=" -http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version.tar.bz2" build_style=gnu_configure pkgconfig_override="x11.pc" make_cmd="$XBPS_MASTERDIR/bin/gmake" diff --git a/templates/libXau.tmpl b/templates/libXau.tmpl index 35a6abacf7e..79e7a7bd478 100644 --- a/templates/libXau.tmpl +++ b/templates/libXau.tmpl @@ -2,7 +2,7 @@ pkgname=libXau version=1.0.4 distfiles=" -http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version.tar.bz2" build_style=gnu_configure pkgconfig_override="xau.pc" short_desc="Authorization Protocol for X from X.org" diff --git a/templates/libXaw.tmpl b/templates/libXaw.tmpl index 82cc540e3dd..3d4bf5a5547 100644 --- a/templates/libXaw.tmpl +++ b/templates/libXaw.tmpl @@ -2,7 +2,7 @@ pkgname=libXaw version=1.0.4 distfiles=" -http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version.tar.bz2" build_style=gnu_configure pkgconfig_override="xaw6.pc xaw7.pc xaw8.pc" short_desc="X Athena Widgets Library from modular Xorg X11" diff --git a/templates/libXcursor.tmpl b/templates/libXcursor.tmpl index 7aa92de62eb..3e8beb8342e 100644 --- a/templates/libXcursor.tmpl +++ b/templates/libXcursor.tmpl @@ -2,7 +2,7 @@ pkgname=libXcursor extract_sufx=".tar.bz2" distfiles=" -http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version.tar.bz2" build_style=gnu_configure pkgconfig_override="xcursor.pc" short_desc="Client-side cursor loading library for X" diff --git a/templates/libXdamage.tmpl b/templates/libXdamage.tmpl index 2916458bd19..1e60dd10f3d 100644 --- a/templates/libXdamage.tmpl +++ b/templates/libXdamage.tmpl @@ -2,7 +2,7 @@ pkgname=libXdamage version=1.1.1 distfiles=" -http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version.tar.bz2" build_style=gnu_configure pkgconfig_override="xdamage.pc" short_desc="Xdamage extension (Library)" diff --git a/templates/libXdmcp.tmpl b/templates/libXdmcp.tmpl index 639aae53654..f863479c2ab 100644 --- a/templates/libXdmcp.tmpl +++ b/templates/libXdmcp.tmpl @@ -2,7 +2,7 @@ pkgname=libXdmcp version=1.0.2 distfiles=" -http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version.tar.bz2" build_style=gnu_configure pkgconfig_override="xdmcp.pc" short_desc="X Display Manager Control Protocol library from X.org" diff --git a/templates/libXext.tmpl b/templates/libXext.tmpl index 0b8fb3d5cf9..2154119f447 100644 --- a/templates/libXext.tmpl +++ b/templates/libXext.tmpl @@ -2,7 +2,7 @@ pkgname=libXext version=1.0.4 distfiles=" -http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version.tar.bz2" build_style=gnu_configure configure_args="--disable-malloc0returnsnull" pkgconfig_override="xext.pc" diff --git a/templates/libXfixes.tmpl b/templates/libXfixes.tmpl index ab7cdab4083..5a6d994b55f 100644 --- a/templates/libXfixes.tmpl +++ b/templates/libXfixes.tmpl @@ -2,7 +2,7 @@ pkgname=libXfixes version=4.0.3 distfiles=" -http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version.tar.bz2" build_style=gnu_configure pkgconfig_override="xfixes.pc" short_desc="Xfixes library and extension of X RandR from modular X.org" diff --git a/templates/libXfont.tmpl b/templates/libXfont.tmpl index 582003fd16b..92af09a983e 100644 --- a/templates/libXfont.tmpl +++ b/templates/libXfont.tmpl @@ -2,7 +2,7 @@ pkgname=libXfont version=1.3.3 distfiles=" -http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version.tar.bz2" build_style=gnu_configure pkgconfig_override="xfont.pc" short_desc="X font Library" diff --git a/templates/libXft.tmpl b/templates/libXft.tmpl index 8965e2c2e3a..185eb101b49 100644 --- a/templates/libXft.tmpl +++ b/templates/libXft.tmpl @@ -2,7 +2,7 @@ pkgname=libXft version=2.1.13 distfiles=" -http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version.tar.bz2" build_style=gnu_configure make_cmd="$XBPS_MASTERDIR/bin/gmake" pkgconfig_override="xft.pc" diff --git a/templates/libXi.tmpl b/templates/libXi.tmpl index 59f90137467..7a76f2210c3 100644 --- a/templates/libXi.tmpl +++ b/templates/libXi.tmpl @@ -2,7 +2,7 @@ pkgname=libXi version=1.1.3 distfiles=" -http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version.tar.bz2" build_style=gnu_configure configure_args="--disable-malloc0returnsnull" pkgconfig_override="xi.pc" diff --git a/templates/libXinerama.tmpl b/templates/libXinerama.tmpl index 64d9d3efb60..ab1d49875e9 100644 --- a/templates/libXinerama.tmpl +++ b/templates/libXinerama.tmpl @@ -2,7 +2,7 @@ pkgname=libXinerama version=1.0.3 distfiles=" -http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version.tar.bz2" build_style=gnu_configure configure_args="--disable-malloc0returnsnull" pkgconfig_override="xinerama.pc" diff --git a/templates/libXmu.tmpl b/templates/libXmu.tmpl index 7bee515edc0..c3fe9cfb26e 100644 --- a/templates/libXmu.tmpl +++ b/templates/libXmu.tmpl @@ -2,7 +2,7 @@ pkgname=libXmu version=1.0.4 distfiles=" -http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version.tar.bz2" build_style=gnu_configure pkgconfig_override="xmu.pc xmuu.pc" short_desc="X Miscellaneous Utilities library" diff --git a/templates/libXp.tmpl b/templates/libXp.tmpl index 589c0cf2b84..a8ce27d6fb1 100644 --- a/templates/libXp.tmpl +++ b/templates/libXp.tmpl @@ -2,7 +2,7 @@ pkgname=libXp version=1.0.0 distfiles=" -http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version.tar.bz2" build_style=gnu_configure pkgconfig_override="xp.pc" short_desc="X Print Service Extension Library" diff --git a/templates/libXpm.tmpl b/templates/libXpm.tmpl index a3dcea34374..04f19227b0e 100644 --- a/templates/libXpm.tmpl +++ b/templates/libXpm.tmpl @@ -2,7 +2,7 @@ pkgname=libXpm version=3.5.7 distfiles=" -http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version.tar.bz2" build_style=gnu_configure pkgconfig_override="xpm.pc" short_desc="X PixMap Library from modular Xorg X11" diff --git a/templates/libXrandr.tmpl b/templates/libXrandr.tmpl index 31792d805d9..67e4d6cca9a 100644 --- a/templates/libXrandr.tmpl +++ b/templates/libXrandr.tmpl @@ -2,7 +2,7 @@ pkgname=libXrandr version=1.2.3 distfiles=" -http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version.tar.bz2" build_style=gnu_configure configure_args="--disable-malloc0returnsnull" pkgconfig_override="xrandr.pc" diff --git a/templates/libXrender.tmpl b/templates/libXrender.tmpl index 6005be14f7b..db89cdc4cc3 100644 --- a/templates/libXrender.tmpl +++ b/templates/libXrender.tmpl @@ -2,7 +2,7 @@ pkgname=libXrender version=0.9.4 distfiles=" -http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version.tar.bz2" build_style=gnu_configure pkgconfig_override="xrender.pc" short_desc="X Render Library" diff --git a/templates/libXt.tmpl b/templates/libXt.tmpl index 10077d246fd..69d69ddaad2 100644 --- a/templates/libXt.tmpl +++ b/templates/libXt.tmpl @@ -2,7 +2,7 @@ pkgname=libXt version=1.0.5 distfiles=" -http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version.tar.bz2" build_style=gnu_configure configure_args="--disable-malloc0returnsnull" pkgconfig_override="xt.pc" diff --git a/templates/libXv.tmpl b/templates/libXv.tmpl index f08ea9705c8..95c21fe105b 100644 --- a/templates/libXv.tmpl +++ b/templates/libXv.tmpl @@ -2,7 +2,7 @@ pkgname=libXv version=1.0.4 distfiles=" -http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version.tar.bz2" build_style=gnu_configure make_cmd="$XBPS_MASTERDIR/bin/gmake" pkgconfig_override="xv.pc" diff --git a/templates/libXvMC.tmpl b/templates/libXvMC.tmpl index 46ff99a7423..bbb7236e003 100644 --- a/templates/libXvMC.tmpl +++ b/templates/libXvMC.tmpl @@ -2,7 +2,7 @@ pkgname=libXvMC version=1.0.4 distfiles=" -http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version.tar.bz2" build_style=gnu_configure make_cmd="$XBPS_MASTERDIR/bin/gmake" pkgconfig_override="xvmc.pc" diff --git a/templates/libXxf86misc.tmpl b/templates/libXxf86misc.tmpl index c09deb6090a..e76620b66d5 100644 --- a/templates/libXxf86misc.tmpl +++ b/templates/libXxf86misc.tmpl @@ -2,7 +2,7 @@ pkgname=libXxf86misc version=1.0.1 distfiles=" -http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version.tar.bz2" build_style=gnu_configure pkgconfig_override="xxf86misc.pc" short_desc="Library for the XFree86-Misc X extension" diff --git a/templates/libXxf86vm.tmpl b/templates/libXxf86vm.tmpl index 0e43ed4cb95..e5354e30bb2 100644 --- a/templates/libXxf86vm.tmpl +++ b/templates/libXxf86vm.tmpl @@ -2,7 +2,7 @@ pkgname=libXxf86vm version=1.0.2 distfiles=" -http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version.tar.bz2" build_style=gnu_configure pkgconfig_override="xxf86vm.pc" short_desc="Library for the XFree86-VidMode X extension" diff --git a/templates/libart.tmpl b/templates/libart.tmpl index 231c90a3a6d..2669b25d507 100644 --- a/templates/libart.tmpl +++ b/templates/libart.tmpl @@ -3,7 +3,7 @@ pkgname=libart version=2.3.20 wrksrc="libart_lgpl-$version" distfiles=" -http://ftp.gnome.org/pub/GNOME/sources/libart_lgpl/2.3/libart_lgpl-$version@.tar.bz2" +http://ftp.gnome.org/pub/GNOME/sources/libart_lgpl/2.3/libart_lgpl-$version.tar.bz2" build_style=gnu_configure make_cmd="$XBPS_MASTERDIR/bin/gmake" pkgconfig_override="libart-2.0.pc" diff --git a/templates/libdrm.tmpl b/templates/libdrm.tmpl index 12ab80eef86..e3e58fd190f 100644 --- a/templates/libdrm.tmpl +++ b/templates/libdrm.tmpl @@ -2,7 +2,7 @@ pkgname=libdrm version=2.3.1 distfiles=" -http://dri.freedesktop.org/libdrm/$pkgname-$version@.tar.bz2" +http://dri.freedesktop.org/libdrm/$pkgname-$version.tar.bz2" build_style=gnu_configure pkgconfig_override="libdrm.pc" short_desc="Userspace interface to kernel DRM services" diff --git a/templates/libexif.tmpl b/templates/libexif.tmpl index 3c46de11a32..237c8e5a4c4 100644 --- a/templates/libexif.tmpl +++ b/templates/libexif.tmpl @@ -2,7 +2,7 @@ pkgname=libexif version=0.6.16 distfiles=" -http://kent.dl.sourceforge.net/sourceforge/libexif/$pkgname-$version@.tar.bz2" +http://kent.dl.sourceforge.net/sourceforge/libexif/$pkgname-$version.tar.bz2" build_style=gnu_configure configure_env="ac_cv_path_DOXYGEN=false" make_cmd="$XBPS_MASTERDIR/bin/gmake" diff --git a/templates/libfontenc.tmpl b/templates/libfontenc.tmpl index 4476cf0290c..84b14ae05ec 100644 --- a/templates/libfontenc.tmpl +++ b/templates/libfontenc.tmpl @@ -2,7 +2,7 @@ pkgname=libfontenc version=1.0.4 distfiles=" -http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version.tar.bz2" build_style=gnu_configure pkgconfig_override="fontenc.pc" short_desc="The fontenc Library from X.org" diff --git a/templates/libgcrypt.tmpl b/templates/libgcrypt.tmpl index 917063e0a93..fe949baa659 100644 --- a/templates/libgcrypt.tmpl +++ b/templates/libgcrypt.tmpl @@ -2,7 +2,7 @@ pkgname=libgcrypt version=1.4.3 distfiles=" -ftp://ftp.gnupg.org/gcrypt/libgcrypt/$pkgname-$version@.tar.bz2" +ftp://ftp.gnupg.org/gcrypt/libgcrypt/$pkgname-$version.tar.bz2" build_style=gnu_configure make_cmd="$XBPS_MASTERDIR/bin/gmake" short_desc="GNU cryptographic library" diff --git a/templates/libglade.tmpl b/templates/libglade.tmpl index ba92049809e..1a39d7ac23e 100644 --- a/templates/libglade.tmpl +++ b/templates/libglade.tmpl @@ -2,7 +2,7 @@ pkgname=libglade version=2.6.3 distfiles=" -http://ftp.gnome.org/pub/GNOME/sources/libglade/2.6/$pkgname-$version@.tar.bz2" +http://ftp.gnome.org/pub/GNOME/sources/libglade/2.6/$pkgname-$version.tar.bz2" build_style=gnu_configure configure_args="--without-xml-catalog" make_cmd="$XBPS_MASTERDIR/bin/gmake" diff --git a/templates/libgpg-error.tmpl b/templates/libgpg-error.tmpl index 94b24f3902d..19483466ab8 100644 --- a/templates/libgpg-error.tmpl +++ b/templates/libgpg-error.tmpl @@ -2,7 +2,7 @@ pkgname=libgpg-error version=1.6 distfiles=" -ftp://ftp.gnupg.org/gcrypt/libgpg-error/$pkgname-$version@.tar.bz2" +ftp://ftp.gnupg.org/gcrypt/libgpg-error/$pkgname-$version.tar.bz2" build_style=gnu_configure make_cmd="$XBPS_MASTERDIR/bin/gmake" short_desc="Definitions of common error values for all GnuPG components" diff --git a/templates/libidn.tmpl b/templates/libidn.tmpl index 59f6bb149fe..0f3d41f3f57 100644 --- a/templates/libidn.tmpl +++ b/templates/libidn.tmpl @@ -1,7 +1,7 @@ # Template file for 'libidn' pkgname=libidn version=1.10 -distfiles="http://ftp.gnu.org/gnu/libidn/$pkgname-$version@.tar.gz" +distfiles="http://ftp.gnu.org/gnu/libidn/$pkgname-$version.tar.gz" build_style=gnu_configure configure_args="--disable-csharp --disable-java" short_desc="Internationalized Domain Names command line tool" diff --git a/templates/libpciaccess.tmpl b/templates/libpciaccess.tmpl index 43f0f3d06ac..683bb56fd77 100644 --- a/templates/libpciaccess.tmpl +++ b/templates/libpciaccess.tmpl @@ -3,7 +3,7 @@ pkgname=libpciaccess version=0.10.3 patch_files="$pkgname-netbsd-support.diff" distfiles=" -http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version.tar.bz2" build_style=gnu_configure make_cmd="$XBPS_MASTERDIR/bin/gmake" pkgconfig_override="pciaccess.pc" diff --git a/templates/libpng.tmpl b/templates/libpng.tmpl index d6382161baa..9af7030d709 100644 --- a/templates/libpng.tmpl +++ b/templates/libpng.tmpl @@ -2,7 +2,7 @@ pkgname=libpng version=1.2.32 distfiles=" -ftp://ftp.fu-berlin.de/unix/graphics/png/src/$pkgname-$version@.tar.bz2" +ftp://ftp.fu-berlin.de/unix/graphics/png/src/$pkgname-$version.tar.bz2" build_style=gnu_configure make_cmd="$XBPS_MASTERDIR/bin/gmake" pkgconfig_override="libpng.pc" diff --git a/templates/libtool.tmpl b/templates/libtool.tmpl index f9b5d8df178..78a32185a3c 100644 --- a/templates/libtool.tmpl +++ b/templates/libtool.tmpl @@ -2,7 +2,7 @@ pkgname=libtool version=2.2.6a wrksrc="$pkgname-2.2.6" -distfiles="http://ftp.gnu.org/pub/gnu/libtool/$pkgname-$version@.tar.gz" +distfiles="http://ftp.gnu.org/pub/gnu/libtool/$pkgname-$version.tar.gz" build_style=gnu_configure short_desc="Generic library support" maintainer="Juan RP " diff --git a/templates/libungif.tmpl b/templates/libungif.tmpl index dd83785426b..43fd664fc25 100644 --- a/templates/libungif.tmpl +++ b/templates/libungif.tmpl @@ -2,7 +2,7 @@ pkgname=libungif version=4.1.4 distfiles=" -http://kent.dl.sourceforge.net/sourceforge/giflib/$pkgname-$version@.tar.bz2" +http://kent.dl.sourceforge.net/sourceforge/giflib/$pkgname-$version.tar.bz2" build_style=gnu_configure configure_args="--without-x" configure_env="ac_cv_lib_X11_main=no" diff --git a/templates/libwmf.tmpl b/templates/libwmf.tmpl index 7d04645e33a..53598a7dd69 100644 --- a/templates/libwmf.tmpl +++ b/templates/libwmf.tmpl @@ -2,7 +2,7 @@ pkgname=libwmf version=0.2.8.4 distfiles=" -http://kent.dl.sourceforge.net/sourceforge/wvware/$pkgname-$version@.tar.gz" +http://kent.dl.sourceforge.net/sourceforge/wvware/$pkgname-$version.tar.gz" build_style=gnu_configure configure_args=" --with-sysfontmap=$XBPS_MASTERDIR/share/fonts/fontmap diff --git a/templates/libxkbfile.tmpl b/templates/libxkbfile.tmpl index b6f1a9cef8e..1fe8d38234c 100644 --- a/templates/libxkbfile.tmpl +++ b/templates/libxkbfile.tmpl @@ -2,7 +2,7 @@ pkgname=libxkbfile version=1.0.5 distfiles=" -http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version.tar.bz2" build_style=gnu_configure pkgconfig_override="xkbfile.pc" short_desc="The xkbfile Library from modular X.org" diff --git a/templates/libxkbui.tmpl b/templates/libxkbui.tmpl index 59fc4eb9ea6..3f7696decd7 100644 --- a/templates/libxkbui.tmpl +++ b/templates/libxkbui.tmpl @@ -2,7 +2,7 @@ pkgname=libxkbui version=1.0.2 distfiles=" -http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version.tar.bz2" build_style=gnu_configure pkgconfig_override="xkbui.pc" short_desc="xkbui library from modular x.org" diff --git a/templates/libxml2.tmpl b/templates/libxml2.tmpl index c015016a54e..e1f5e7ae9ba 100644 --- a/templates/libxml2.tmpl +++ b/templates/libxml2.tmpl @@ -1,7 +1,7 @@ # Template build file for 'libxml2'. pkgname=libxml2 version=2.7.2 -distfiles="http://xmlsoft.org/sources/$pkgname-$version@.tar.gz" +distfiles="http://xmlsoft.org/sources/$pkgname-$version.tar.gz" build_style=gnu_configure make_cmd="$XBPS_MASTERDIR/bin/gmake" pkgconfig_override="libxml-2.0.pc" diff --git a/templates/libxslt.tmpl b/templates/libxslt.tmpl index 9b85c65ccf8..82cf498c633 100644 --- a/templates/libxslt.tmpl +++ b/templates/libxslt.tmpl @@ -1,7 +1,7 @@ # Template build file for 'libxslt'. pkgname=libxslt version=1.1.24 -distfiles="ftp://xmlsoft.org/libxslt/$pkgname-$version@.tar.gz" +distfiles="ftp://xmlsoft.org/libxslt/$pkgname-$version.tar.gz" build_style=gnu_configure make_cmd="$XBPS_MASTERDIR/bin/gmake" pkgconfig_override="libxslt.pc libexslt.pc" diff --git a/templates/linux-pam.tmpl b/templates/linux-pam.tmpl index 92e8b4385f8..6664a15fcd8 100644 --- a/templates/linux-pam.tmpl +++ b/templates/linux-pam.tmpl @@ -3,7 +3,7 @@ pkgname=linux-pam version=1.0.2 wrksrc="Linux-PAM-$version" distfiles=" -http://www.kernel.org/pub/linux/libs/pam/library/Linux-PAM-$version@.tar.bz2" +http://www.kernel.org/pub/linux/libs/pam/library/Linux-PAM-$version.tar.bz2" build_style=gnu_configure configure_args="--disable-selinux --libdir=/lib --includedir=/usr/include --docdir=/usr/share/doc/pam --enable-securedir=/lib/security diff --git a/templates/lzma-utils.tmpl b/templates/lzma-utils.tmpl index e57f38b36b6..73079e38b6b 100644 --- a/templates/lzma-utils.tmpl +++ b/templates/lzma-utils.tmpl @@ -2,7 +2,7 @@ pkgname=lzma-utils version=4.32.7 wrksrc="lzma-$version" -distfiles="http://tukaani.org/lzma/lzma-$version@.tar.gz" +distfiles="http://tukaani.org/lzma/lzma-$version.tar.gz" build_style=gnu_configure short_desc="LZMA compression and decompression utilities" maintainer="Juan RP " diff --git a/templates/m4.tmpl b/templates/m4.tmpl index 3ea384a97df..96d92d5d8d7 100644 --- a/templates/m4.tmpl +++ b/templates/m4.tmpl @@ -1,7 +1,7 @@ # Template build file for 'm4'. pkgname=m4 version=1.4.12 -distfiles="http://ftp.gnu.org/gnu/m4/$pkgname-$version@.tar.bz2" +distfiles="http://ftp.gnu.org/gnu/m4/$pkgname-$version.tar.bz2" build_style=gnu_configure configure_args="-enable-changeword" short_desc="GNU version of UNIX m4 macro language processor" diff --git a/templates/make.tmpl b/templates/make.tmpl index 848fa6a9755..5ed5fa1a5bb 100644 --- a/templates/make.tmpl +++ b/templates/make.tmpl @@ -1,7 +1,7 @@ # Template build file for 'make' pkgname=make version=3.81 -distfiles="http://ftp.gnu.org/pub/gnu/make/$pkgname-$version@.tar.bz2" +distfiles="http://ftp.gnu.org/pub/gnu/make/$pkgname-$version.tar.bz2" build_style=gnu_configure short_desc="The GNU make system" maintainer="Juan RP " diff --git a/templates/man-db.tmpl b/templates/man-db.tmpl index ed18c6c4e88..3c870d41cf8 100644 --- a/templates/man-db.tmpl +++ b/templates/man-db.tmpl @@ -2,7 +2,7 @@ pkgname=man-db version=2.5.2 distfiles=" -http://download.savannah.gnu.org/releases/man-db/$pkgname-$version@.tar.gz" +http://download.savannah.gnu.org/releases/man-db/$pkgname-$version.tar.gz" build_style=gnu_configure configure_args="--with-db=gdbm --with-pager=less --with-gzip=/usr/bin/gzip --with-bzip2=/usr/bin/bzip2 --disable-rpath --enable-threads=posix" diff --git a/templates/man-pages.tmpl b/templates/man-pages.tmpl index 2b4c5b8c990..afcf002cc65 100644 --- a/templates/man-pages.tmpl +++ b/templates/man-pages.tmpl @@ -2,7 +2,7 @@ pkgname=man-pages version=3.11 distfiles=" -http://www.kernel.org/pub/linux/docs/manpages/Archive/$pkgname-$version@.tar.bz2" +http://www.kernel.org/pub/linux/docs/manpages/Archive/$pkgname-$version.tar.bz2" build_style=only-install make_install_target="all prefix=$XBPS_DESTDIR/$pkgname-$version/usr" short_desc="Linux Documentation Project manual pages" diff --git a/templates/mc.tmpl b/templates/mc.tmpl index b80e4f28322..e1eb0445e7a 100644 --- a/templates/mc.tmpl +++ b/templates/mc.tmpl @@ -2,7 +2,7 @@ pkgname=mc version=4.6.1 distfiles=" -http://www.ibiblio.org/pub/Linux/utils/file/managers/mc/$pkgname-$version@.tar.gz" +http://www.ibiblio.org/pub/Linux/utils/file/managers/mc/$pkgname-$version.tar.gz" build_style=gnu_configure # Override datadir to get the correct directory. configure_args="--without-ext2undel --with-screen=mcslang diff --git a/templates/mkfontdir.tmpl b/templates/mkfontdir.tmpl index f36f72986b1..7237b5c7ed7 100644 --- a/templates/mkfontdir.tmpl +++ b/templates/mkfontdir.tmpl @@ -2,7 +2,7 @@ pkgname=mkfontdir version=1.0.4 distfiles=" -http://xorg.freedesktop.org/releases/individual/app/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/app/$pkgname-$version.tar.bz2" build_style=gnu_configure short_desc="X11 Font Index Generator" maintainer="Juan RP " diff --git a/templates/mkfontscale.tmpl b/templates/mkfontscale.tmpl index 7f9548a60f4..ce409d84a03 100644 --- a/templates/mkfontscale.tmpl +++ b/templates/mkfontscale.tmpl @@ -2,7 +2,7 @@ pkgname=mkfontscale version=1.0.5 distfiles=" -http://xorg.freedesktop.org/releases/individual/app/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/app/$pkgname-$version.tar.bz2" build_style=gnu_configure make_cmd="$XBPS_MASTERDIR/bin/gmake" short_desc="X11 Scalable Font Index Generator" diff --git a/templates/mng.tmpl b/templates/mng.tmpl index aebdc8fa3c9..ae06255d23b 100644 --- a/templates/mng.tmpl +++ b/templates/mng.tmpl @@ -2,7 +2,7 @@ pkgname=mng version=1.0.10 wrksrc="libmng-$version" -distfiles="http://www.libmng.com/download/libmng-$version@.tar.bz2" +distfiles="http://www.libmng.com/download/libmng-$version.tar.bz2" build_style=gnu_configure make_cmd="$XBPS_MASTERDIR/bin/gmake" short_desc="Multiple-image Network Graphics (MNG) reference library" diff --git a/templates/module-init-tools.tmpl b/templates/module-init-tools.tmpl index e030cb15fe3..926a459bee6 100644 --- a/templates/module-init-tools.tmpl +++ b/templates/module-init-tools.tmpl @@ -2,7 +2,7 @@ pkgname=module-init-tools version=3.5 distfiles=" -http://www.kernel.org/pub/linux/utils/kernel/$pkgname/$pkgname-$version@.tar.bz2" +http://www.kernel.org/pub/linux/utils/kernel/$pkgname/$pkgname-$version.tar.bz2" build_style=gnu_configure configure_args="--enable-zlib --bindir=$XBPS_DESTDIR/$pkgname-$version/sbin --sbindir=$XBPS_DESTDIR/$pkgname-$version/sbin" diff --git a/templates/mono-addins.tmpl b/templates/mono-addins.tmpl index 021505fe930..9974d2c20e2 100644 --- a/templates/mono-addins.tmpl +++ b/templates/mono-addins.tmpl @@ -2,7 +2,7 @@ pkgname=mono-addins version=0.3.1 distfiles=" -http://ftp.novell.com/pub/mono/sources/mono-addins/$pkgname-$version@.tar.bz2" +http://ftp.novell.com/pub/mono/sources/mono-addins/$pkgname-$version.tar.bz2" build_style=gnu_configure pkgconfig_override="mono-addins.pc mono-addins-setup.pc mono-addins-gui.pc" make_cmd="$XBPS_MASTERDIR/bin/gmake" diff --git a/templates/mono.tmpl b/templates/mono.tmpl index 7b44bd99134..12138841658 100644 --- a/templates/mono.tmpl +++ b/templates/mono.tmpl @@ -1,7 +1,7 @@ # Template build file for 'mono'. pkgname=mono version=2.0 -distfiles="http://ftp.novell.com/pub/mono/sources/mono/$pkgname-$version@.tar.bz2" +distfiles="http://ftp.novell.com/pub/mono/sources/mono/$pkgname-$version.tar.bz2" tar_override_cmd="$XBPS_MASTERDIR/bin/gtar" build_style=gnu_configure configure_args="--with-icu=yes --with-preview=yes --with-libgdiplus=installed diff --git a/templates/monodevelop.tmpl b/templates/monodevelop.tmpl index 3e4e6d62f2d..8fd4ab35622 100644 --- a/templates/monodevelop.tmpl +++ b/templates/monodevelop.tmpl @@ -1,7 +1,7 @@ # Template build file for 'monodevelop'. pkgname=monodevelop version=1.9 -distfiles="http://go-mono.com/sources/monodevelop/$pkgname-$version@.tar.bz2" +distfiles="http://go-mono.com/sources/monodevelop/$pkgname-$version.tar.bz2" tar_override_cmd="$XBPS_MASTERDIR/bin/gtar" build_style=gnu_configure make_cmd="$XBPS_MASTERDIR/bin/gmake" diff --git a/templates/monodoc.tmpl b/templates/monodoc.tmpl index 47dc47be6a8..a717d2deee2 100644 --- a/templates/monodoc.tmpl +++ b/templates/monodoc.tmpl @@ -2,7 +2,7 @@ pkgname=monodoc version=2.0 distfiles=" -http://ftp.novell.com/pub/mono/sources/monodoc/$pkgname-$version@.zip" +http://ftp.novell.com/pub/mono/sources/monodoc/$pkgname-$version.zip" build_style=gnu_configure make_cmd="$XBPS_MASTERDIR/bin/gmake" pkgconfig_override="monodoc.pc" diff --git a/templates/mpfr.tmpl b/templates/mpfr.tmpl index 09162b324fb..b91f1edfd8e 100644 --- a/templates/mpfr.tmpl +++ b/templates/mpfr.tmpl @@ -1,7 +1,7 @@ # Template build file for 'mpfr' pkgname=mpfr version=2.3.2 -distfiles="http://www.mpfr.org/mpfr-current/$pkgname-$version@.tar.bz2" +distfiles="http://www.mpfr.org/mpfr-current/$pkgname-$version.tar.bz2" build_style=gnu_configure short_desc="Library for multiple-precision floating-point computations" maintainer="Juan RP " diff --git a/templates/nasm.tmpl b/templates/nasm.tmpl index 26c3f9216d9..808def70521 100644 --- a/templates/nasm.tmpl +++ b/templates/nasm.tmpl @@ -2,7 +2,7 @@ pkgname=nasm version=2.05 distfiles=" -http://www.nasm.us/pub/nasm/releasebuilds/$version/$pkgname-$version@.tar.bz2" +http://www.nasm.us/pub/nasm/releasebuilds/$version/$pkgname-$version.tar.bz2" build_style=gnu_configure short_desc="The Netwide Assembler" maintainer="Juan RP " diff --git a/templates/ncurses.tmpl b/templates/ncurses.tmpl index a2d136eefd3..e7a9f23a30e 100644 --- a/templates/ncurses.tmpl +++ b/templates/ncurses.tmpl @@ -1,7 +1,7 @@ # Template build file for 'ncurses'. pkgname=ncurses version=5.6 -distfiles="http://ftp.gnu.org/pub/gnu/ncurses/$pkgname-$version@.tar.gz" +distfiles="http://ftp.gnu.org/pub/gnu/ncurses/$pkgname-$version.tar.gz" build_style=gnu_configure configure_args="--with-shared" make_install_args="ticdir=$XBPS_DESTDIR/$pkgname-$version/usr/share/terminfo" diff --git a/templates/openssl.tmpl b/templates/openssl.tmpl index 3dc6c142823..c41aeb36afc 100644 --- a/templates/openssl.tmpl +++ b/templates/openssl.tmpl @@ -1,7 +1,7 @@ # Template file for 'openssl' pkgname=openssl version=0.9.8i -distfiles="http://www.openssl.org/source/$pkgname-$version@.tar.gz" +distfiles="http://www.openssl.org/source/$pkgname-$version.tar.gz" build_style=configure configure_script="./Configure" configure_args="--prefix=/usr diff --git a/templates/pango.tmpl b/templates/pango.tmpl index c11eb7d10b8..05607ddc551 100644 --- a/templates/pango.tmpl +++ b/templates/pango.tmpl @@ -3,7 +3,7 @@ pkgname=pango version=1.22.0 patch_files="$pkgname-docs-Makefile-in.diff" distfiles=" -http://ftp.gnome.org/pub/GNOME/sources/pango/1.22/$pkgname-$version@.tar.bz2" +http://ftp.gnome.org/pub/GNOME/sources/pango/1.22/$pkgname-$version.tar.bz2" build_style=gnu_configure make_cmd="$XBPS_MASTERDIR/bin/gmake" pkgconfig_override="pango.pc pangocairo.pc pangoft2.pc pangox.pc pangoxft.pc" diff --git a/templates/patch.tmpl b/templates/patch.tmpl index a94e8169601..916aff5c3f9 100644 --- a/templates/patch.tmpl +++ b/templates/patch.tmpl @@ -1,7 +1,7 @@ # Template file for 'patch' pkgname=patch version=2.5.4 -distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version@.tar.gz" +distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz" build_style=gnu_configure short_desc="Patch files using diff output" maintainer="Juan RP " diff --git a/templates/pcre.tmpl b/templates/pcre.tmpl index 3201d480f77..efaa381c70d 100644 --- a/templates/pcre.tmpl +++ b/templates/pcre.tmpl @@ -2,7 +2,7 @@ pkgname=pcre version=7.8 distfiles=" -http://kent.dl.sourceforge.net/sourceforge/pcre/$pkgname-$version@.tar.bz2" +http://kent.dl.sourceforge.net/sourceforge/pcre/$pkgname-$version.tar.bz2" build_style=gnu_configure configure_args="--enable-utf8 --enable-unicode-properties" short_desc="Perl Compatible Regular Expressions" diff --git a/templates/pekwm.tmpl b/templates/pekwm.tmpl index 8ce6d637da3..c1ced03f204 100644 --- a/templates/pekwm.tmpl +++ b/templates/pekwm.tmpl @@ -2,7 +2,7 @@ pkgname=pekwm version=0.1.7 distfiles=" -http://www.pekwm.org/projects/3/files/$pkgname-$version@.tar.bz2" +http://www.pekwm.org/projects/3/files/$pkgname-$version.tar.bz2" build_style=gnu_configure make_cmd="$XBPS_MASTERDIR/bin/gmake" short_desc="Window manager based on aewm++" diff --git a/templates/perl-XML-Parser.tmpl b/templates/perl-XML-Parser.tmpl index d703ffdf8a2..089bf55dbfb 100644 --- a/templates/perl-XML-Parser.tmpl +++ b/templates/perl-XML-Parser.tmpl @@ -3,7 +3,7 @@ pkgname=perl-XML-Parser version=2.36 wrksrc="XML-Parser-$version" distfiles=" -http://cpan.perl.org/modules/by-module/XML/XML-Parser-$version@.tar.gz" +http://cpan.perl.org/modules/by-module/XML/XML-Parser-$version.tar.gz" build_style=perl_module make_build_args="EXPATLIBPATH=$XBPS_MASTERDIR/lib EXPATINCPATH=$XBPS_MASTERDIR/include" diff --git a/templates/perl.tmpl b/templates/perl.tmpl index 439478bd31f..10e3a067449 100644 --- a/templates/perl.tmpl +++ b/templates/perl.tmpl @@ -1,7 +1,7 @@ # Template build file for 'perl'. pkgname=perl version=5.10.0 -distfiles="http://www.cpan.org/src/$pkgname-$version@.tar.gz" +distfiles="http://www.cpan.org/src/$pkgname-$version.tar.gz" configure_script="./Configure" configure_args="-Dusethreads -des -Dprefix=$XBPS_DESTDIR/$pkgname-$version/usr -Duselargefiles -Uusesfio -Dinstallstyle=lib/perl5 -Uinstallusrbinperl" diff --git a/templates/pixman.tmpl b/templates/pixman.tmpl index 2ff53beb508..38e13375098 100644 --- a/templates/pixman.tmpl +++ b/templates/pixman.tmpl @@ -2,7 +2,7 @@ pkgname=pixman version=0.12.0 distfiles=" -http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version.tar.bz2" build_style=gnu_configure pkgconfig_override="pixman-1.pc" short_desc="Library of low-level pixel manipulation routines" diff --git a/templates/pkg-config.tmpl b/templates/pkg-config.tmpl index 281d8d5a50a..fa6db23163f 100644 --- a/templates/pkg-config.tmpl +++ b/templates/pkg-config.tmpl @@ -2,7 +2,7 @@ pkgname=pkg-config version=0.23 distfiles=" -http://pkgconfig.freedesktop.org/releases/$pkgname-$version@.tar.gz" +http://pkgconfig.freedesktop.org/releases/$pkgname-$version.tar.gz" build_style=gnu_configure configure_args="--disable-threads" short_desc="System for managing library compile/link flags" diff --git a/templates/poppler.tmpl b/templates/poppler.tmpl index 13ad4e25a86..23a52b13a2f 100644 --- a/templates/poppler.tmpl +++ b/templates/poppler.tmpl @@ -2,7 +2,7 @@ pkgname=poppler version=0.10.0 distfiles=" -http://poppler.freedesktop.org/$pkgname-$version@.tar.gz" +http://poppler.freedesktop.org/$pkgname-$version.tar.gz" build_style=gnu_configure make_cmd="$XBPS_MASTERDIR/bin/gmake" configure_args="--enable-zlib --disable-poppler-qt --disable-poppler-qt4 diff --git a/templates/printproto.tmpl b/templates/printproto.tmpl index 9ed1941e470..6f2241b0d92 100644 --- a/templates/printproto.tmpl +++ b/templates/printproto.tmpl @@ -2,7 +2,7 @@ pkgname=printproto version=1.0.4 distfiles=" -http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version.tar.bz2" build_style=gnu_configure pkgconfig_override="printproto.pc" short_desc="Print extension headers from X.org" diff --git a/templates/procps.tmpl b/templates/procps.tmpl index 5d379e9e9fe..8328725f278 100644 --- a/templates/procps.tmpl +++ b/templates/procps.tmpl @@ -1,7 +1,7 @@ # Template file for 'procps' pkgname=procps version=3.2.7 -distfiles="http://procps.sourceforge.net/$pkgname-$version@.tar.gz" +distfiles="http://procps.sourceforge.net/$pkgname-$version.tar.gz" build_style=gnu_makefile make_install_args="DESTDIR=$XBPS_DESTDIR/$pkgname-$version" short_desc="The /proc file system utilities" diff --git a/templates/proplib.tmpl b/templates/proplib.tmpl index 03609f24f2f..b67e2302b4c 100644 --- a/templates/proplib.tmpl +++ b/templates/proplib.tmpl @@ -1,7 +1,7 @@ # Template file for 'proplib' pkgname=proplib version=0.1 -distfiles="http://portableproplib.googlecode.com/files/$pkgname-$version@.tar.gz" +distfiles="http://portableproplib.googlecode.com/files/$pkgname-$version.tar.gz" build_style=gnu_configure short_desc="Portable Property container object library" maintainer="Juan RP " diff --git a/templates/python.tmpl b/templates/python.tmpl index e91121ee252..f1de61a9e96 100644 --- a/templates/python.tmpl +++ b/templates/python.tmpl @@ -3,7 +3,7 @@ pkgname=python version=2.5.2 wrksrc="Python-$version" distfiles=" -http://www.python.org/ftp/python/$version/Python-$version@.tar.bz2" +http://www.python.org/ftp/python/$version/Python-$version.tar.bz2" configure_args="--with-threads --enable-shared" build_style=gnu_configure short_desc="Interpreted, interactive, object-oriented programming language" diff --git a/templates/randrproto.tmpl b/templates/randrproto.tmpl index 733254b6d5b..79abefb7384 100644 --- a/templates/randrproto.tmpl +++ b/templates/randrproto.tmpl @@ -2,7 +2,7 @@ pkgname=randrproto version=1.2.2 distfiles=" -http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version.tar.bz2" build_style=gnu_configure pkgconfig_override="randrproto.pc" short_desc="Randr extension headers from modular X.org" diff --git a/templates/recordproto.tmpl b/templates/recordproto.tmpl index ed392f9bb6c..8f955578ad5 100644 --- a/templates/recordproto.tmpl +++ b/templates/recordproto.tmpl @@ -2,7 +2,7 @@ pkgname=recordproto version=1.13.2 distfiles=" -http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version.tar.bz2" build_style=gnu_configure pkgconfig_override="recordproto.pc" short_desc="Record extension headers from X.org" diff --git a/templates/renderproto.tmpl b/templates/renderproto.tmpl index 77b7444e077..26fdc9c6250 100644 --- a/templates/renderproto.tmpl +++ b/templates/renderproto.tmpl @@ -2,7 +2,7 @@ pkgname=renderproto version=0.9.3 distfiles=" -http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version.tar.bz2" build_style=gnu_configure pkgconfig_override="renderproto.pc" short_desc="Render extension headers from modular X.org" diff --git a/templates/resourceproto.tmpl b/templates/resourceproto.tmpl index cebcd4d6500..2a1ff547181 100644 --- a/templates/resourceproto.tmpl +++ b/templates/resourceproto.tmpl @@ -2,7 +2,7 @@ pkgname=resourceproto version=1.0.2 distfiles=" -http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version.tar.bz2" build_style=gnu_configure pkgconfig_override="resourceproto.pc" short_desc="Resource extension headers from X.org" diff --git a/templates/ruby.tmpl b/templates/ruby.tmpl index 52055ee7904..387f0d2e5f5 100644 --- a/templates/ruby.tmpl +++ b/templates/ruby.tmpl @@ -2,7 +2,7 @@ pkgname=ruby version=1.8.7-p72 distfiles=" -ftp://ftp.ruby-lang.org/pub/ruby/1.8/$pkgname-$version@.tar.bz2" +ftp://ftp.ruby-lang.org/pub/ruby/1.8/$pkgname-$version.tar.bz2" build_style=gnu_configure # Override --exec-prefix to install it into the correct location. configure_args="--enable-pthread --enable-shared diff --git a/templates/scrnsaverproto.tmpl b/templates/scrnsaverproto.tmpl index 08480f32c5b..da0ecf380ec 100644 --- a/templates/scrnsaverproto.tmpl +++ b/templates/scrnsaverproto.tmpl @@ -2,7 +2,7 @@ pkgname=scrnsaverproto version=1.1.0 distfiles=" -http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version.tar.bz2" build_style=gnu_configure pkgconfig_override="scrnsaverproto.pc" short_desc="ScrnSaver extension headers from X.org" diff --git a/templates/sed.tmpl b/templates/sed.tmpl index be3976feb29..ed5ca4349c2 100644 --- a/templates/sed.tmpl +++ b/templates/sed.tmpl @@ -1,7 +1,7 @@ # Template file for 'sed' pkgname=sed version=4.1.5 -distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version@.tar.gz" +distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz" build_style=gnu_configure configure_args="--bindir=$XBPS_DESTDIR/$pkgname-$version/bin" short_desc="The GNU stream editor" diff --git a/templates/shared-mime-info.tmpl b/templates/shared-mime-info.tmpl index 6b42ae438f2..07700fd1308 100644 --- a/templates/shared-mime-info.tmpl +++ b/templates/shared-mime-info.tmpl @@ -3,7 +3,7 @@ pkgname=shared-mime-info version=0.51 patch_files="$pkgname-fix-pkgconfig.diff" distfiles=" -http://people.freedesktop.org/~hadess/$pkgname-$version@.tar.bz2" +http://people.freedesktop.org/~hadess/$pkgname-$version.tar.bz2" build_style=gnu_configure configure_args="--disable-update-mimedb" make_cmd="$XBPS_MASTERDIR/bin/gmake" diff --git a/templates/sqlite.tmpl b/templates/sqlite.tmpl index bb008f69135..c500b86ad99 100644 --- a/templates/sqlite.tmpl +++ b/templates/sqlite.tmpl @@ -1,7 +1,7 @@ # Template build file for 'sqlite'. pkgname=sqlite version=3.6.4 -distfiles="http://sqlite.org/$pkgname-$version@.tar.gz" +distfiles="http://sqlite.org/$pkgname-$version.tar.gz" build_style=gnu_configure configure_args="--disable-tcl --enable-load-extension --with-readline-inc=" make_cmd="$XBPS_MASTERDIR/bin/gmake" diff --git a/templates/sudo.tmpl b/templates/sudo.tmpl index 2c2857825ba..9f18d656c44 100644 --- a/templates/sudo.tmpl +++ b/templates/sudo.tmpl @@ -2,7 +2,7 @@ pkgname=sudo version=1.6.9p17 patch_files="$pkgname-Makefile-in.diff" -distfiles="http://www.courtesan.com/sudo/dist/$pkgname-$version@.tar.gz" +distfiles="http://www.courtesan.com/sudo/dist/$pkgname-$version.tar.gz" build_style=gnu_configure configure_args="--disable-root-mailer" short_desc="Allow others to run commands as root" diff --git a/templates/sylpheed.tmpl b/templates/sylpheed.tmpl index f74d0a20f7e..482f637ecaa 100644 --- a/templates/sylpheed.tmpl +++ b/templates/sylpheed.tmpl @@ -3,7 +3,7 @@ pkgname=sylpheed version=2.6.0beta1 patch_files="$pkgname-fix-latest-gtk.diff" distfiles=" -http://sylpheed.sraoss.jp/sylpheed/v2.6beta/$pkgname-$version@.tar.bz2" +http://sylpheed.sraoss.jp/sylpheed/v2.6beta/$pkgname-$version.tar.bz2" build_style=gnu_configure configure_args="--disable-compface --disable-gtkspell --disable-gpgme" diff --git a/templates/sysklogd.tmpl b/templates/sysklogd.tmpl index 3bcceee0e25..886c80b1bab 100644 --- a/templates/sysklogd.tmpl +++ b/templates/sysklogd.tmpl @@ -2,7 +2,7 @@ pkgname=sysklogd version=1.5 distfiles=" -http://www.infodrom.org/projects/sysklogd/download/$pkgname-$version@.tar.gz" +http://www.infodrom.org/projects/sysklogd/download/$pkgname-$version.tar.gz" build_style=gnu_makefile make_install_target="prefix=$XBPS_DESTDIR/$pkgname-$version install" short_desc="Kernel and system logging daemons" diff --git a/templates/syslinux.tmpl b/templates/syslinux.tmpl index 86e2d071373..79e1831d971 100644 --- a/templates/syslinux.tmpl +++ b/templates/syslinux.tmpl @@ -2,7 +2,7 @@ pkgname=syslinux version=3.72 distfiles=" -http://www.kernel.org/pub/linux/utils/boot/syslinux/$pkgname-$version@.tar.bz2" +http://www.kernel.org/pub/linux/utils/boot/syslinux/$pkgname-$version.tar.bz2" build_style=gnu_makefile make_install_args="INSTALLROOT=$XBPS_DESTDIR/$pkgname-$version" short_desc="A boot loader for the Linux operating system" diff --git a/templates/tar.tmpl b/templates/tar.tmpl index de40f5f315b..d85184073e2 100644 --- a/templates/tar.tmpl +++ b/templates/tar.tmpl @@ -1,7 +1,7 @@ # Template build file for 'tar'. pkgname=tar version=1.20 -distfiles="http://ftp.gnu.org/gnu/tar/$pkgname-$version@.tar.bz2" +distfiles="http://ftp.gnu.org/gnu/tar/$pkgname-$version.tar.bz2" build_style=gnu_configure short_desc="The GNU tape archiver with remote magnetic tape support" maintainer="Juan RP " diff --git a/templates/texinfo.tmpl b/templates/texinfo.tmpl index 4eff7266a0a..cbef12c1241 100644 --- a/templates/texinfo.tmpl +++ b/templates/texinfo.tmpl @@ -2,7 +2,7 @@ pkgname=texinfo version=4.13a wrksrc="$pkgname-4.13" -distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version@.tar.gz" +distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz" build_style=gnu_configure short_desc="The GNU Documentation System" maintainer="Juan RP " diff --git a/templates/tiff.tmpl b/templates/tiff.tmpl index bcfe12cd748..4875595af03 100644 --- a/templates/tiff.tmpl +++ b/templates/tiff.tmpl @@ -1,7 +1,7 @@ # Template build file for 'tiff'. pkgname=tiff version=3.8.2 -distfiles="http://libtiff.maptools.org/dl/$pkgname-$version@.tar.gz" +distfiles="http://libtiff.maptools.org/dl/$pkgname-$version.tar.gz" build_style=gnu_configure configure_args="--enable-rpath --enable-cxx --without-x" short_desc="Library and tools for reading and writing TIFF data files" diff --git a/templates/trapproto.tmpl b/templates/trapproto.tmpl index f622a139c50..ce36456a581 100644 --- a/templates/trapproto.tmpl +++ b/templates/trapproto.tmpl @@ -2,7 +2,7 @@ pkgname=trapproto version=3.4.3 distfiles=" -http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version.tar.bz2" build_style=gnu_configure pkgconfig_override="trapproto.pc" short_desc="Trap extension headers" diff --git a/templates/udev.tmpl b/templates/udev.tmpl index 34588608514..a34579a3021 100644 --- a/templates/udev.tmpl +++ b/templates/udev.tmpl @@ -3,7 +3,7 @@ pkgname=udev version=1.30 wrksrc="udev-130" distfiles=" -http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev-130@.tar.bz2" +http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev-130.tar.bz2" build_style=gnu_configure configure_args="--without-selinux" make_install_args="sbindir=$XBPS_DESTDIR/$pkgname-$version/sbin" diff --git a/templates/upstart.tmpl b/templates/upstart.tmpl index 4ea980832be..5f26cd3f6c8 100644 --- a/templates/upstart.tmpl +++ b/templates/upstart.tmpl @@ -1,7 +1,7 @@ # Template file for 'upstart' pkgname=upstart version=0.5.0 -distfiles="http://upstart.ubuntu.com/download/0.5/$pkgname-$version@.tar.bz2" +distfiles="http://upstart.ubuntu.com/download/0.5/$pkgname-$version.tar.bz2" build_style=gnu_configure configure_args="--disable-rpath --exec-prefix=/ --enable-threading" make_install_args="sbindir=$XBPS_DESTDIR/$pkgname-$version/sbin" diff --git a/templates/util-linux.tmpl b/templates/util-linux.tmpl index c698137c898..d6b95c822cf 100644 --- a/templates/util-linux.tmpl +++ b/templates/util-linux.tmpl @@ -1,7 +1,7 @@ # Template file for 'util-linux' pkgname=util-linux version=2.12r -distfiles="http://www.kernel.org/pub/linux/utils/util-linux/$pkgname-$version@.tar.bz2" +distfiles="http://www.kernel.org/pub/linux/utils/util-linux/$pkgname-$version.tar.bz2" build_style=gnu_configure CFLAGS="-I/usr/include" make_install_args="ETC_DIR=$XBPS_DESTDIR/$pkgname-$version/etc diff --git a/templates/util-macros.tmpl b/templates/util-macros.tmpl index 7b2fd35b401..defdd4018d1 100644 --- a/templates/util-macros.tmpl +++ b/templates/util-macros.tmpl @@ -2,7 +2,7 @@ pkgname=util-macros version=1.1.6 distfiles=" -http://xorg.freedesktop.org/releases/individual/util/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/util/$pkgname-$version.tar.bz2" build_style=gnu_configure short_desc="Xorg autotool macros" maintainer="Juan RP " diff --git a/templates/videoproto.tmpl b/templates/videoproto.tmpl index e9b677af3b4..530eb41756c 100644 --- a/templates/videoproto.tmpl +++ b/templates/videoproto.tmpl @@ -2,7 +2,7 @@ pkgname=videoproto version=2.2.2 distfiles=" -http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version.tar.bz2" build_style=gnu_configure pkgconfig_override="videoproto.pc" short_desc="Video extension headers from modular X.org X11" diff --git a/templates/vim.tmpl b/templates/vim.tmpl index 85a3a25da04..6c2953455eb 100644 --- a/templates/vim.tmpl +++ b/templates/vim.tmpl @@ -2,7 +2,7 @@ pkgname=vim version=7.2 wrksrc=vim72 -distfiles="ftp://ftp.vim.org/pub/vim/unix/$pkgname-$version@.tar.bz2" +distfiles="ftp://ftp.vim.org/pub/vim/unix/$pkgname-$version.tar.bz2" build_style=gnu_configure short_desc="Vim editor (vi clone)" maintainer="Juan RP " diff --git a/templates/wget.tmpl b/templates/wget.tmpl index e7c35a10431..a191c093a69 100644 --- a/templates/wget.tmpl +++ b/templates/wget.tmpl @@ -1,7 +1,7 @@ # Template file for 'wget' pkgname=wget version=1.11.4 -distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version@.tar.gz" +distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz" build_style=gnu_configure short_desc="The GNU wget utility" maintainer="pancake " diff --git a/templates/xauth.tmpl b/templates/xauth.tmpl index a7b18a1e73b..2c1a3f74a7d 100644 --- a/templates/xauth.tmpl +++ b/templates/xauth.tmpl @@ -2,7 +2,7 @@ pkgname=xauth version=1.0.3 distfiles=" -http://xorg.freedesktop.org/releases/individual/app/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/app/$pkgname-$version.tar.bz2" build_style=gnu_configure make_cmd="$XBPS_MASTERDIR/bin/gmake" short_desc="X authentication utility" diff --git a/templates/xcmiscproto.tmpl b/templates/xcmiscproto.tmpl index 03126095a34..6083bc0c104 100644 --- a/templates/xcmiscproto.tmpl +++ b/templates/xcmiscproto.tmpl @@ -2,7 +2,7 @@ pkgname=xcmiscproto version=1.1.2 distfiles=" -http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version.tar.bz2" build_style=gnu_configure short_desc="XCMisc extension headers from X.org" pkgconfig_override="xcmiscproto.pc" diff --git a/templates/xextproto.tmpl b/templates/xextproto.tmpl index 38be2c959e4..8c3e1cd5d63 100644 --- a/templates/xextproto.tmpl +++ b/templates/xextproto.tmpl @@ -2,7 +2,7 @@ pkgname=xextproto version=7.0.3 distfiles=" -http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version.tar.bz2" build_style=gnu_configure pkgconfig_override="xextproto.pc" short_desc="XExt extension headers from X.org" diff --git a/templates/xf86-input-joystick.tmpl b/templates/xf86-input-joystick.tmpl index 2aca40ad700..45124247575 100644 --- a/templates/xf86-input-joystick.tmpl +++ b/templates/xf86-input-joystick.tmpl @@ -2,7 +2,7 @@ pkgname=xf86-input-joystick version=1.3.3 distfiles=" -http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$version.tar.bz2" build_style=gnu_configure make_cmd="$XBPS_MASTERDIR/bin/gmake" short_desc="Joystick Input driver for Modular X.org" diff --git a/templates/xf86-input-keyboard.tmpl b/templates/xf86-input-keyboard.tmpl index be3117054c8..2687c9111c4 100644 --- a/templates/xf86-input-keyboard.tmpl +++ b/templates/xf86-input-keyboard.tmpl @@ -2,7 +2,7 @@ pkgname=xf86-input-keyboard version=1.3.1 distfiles=" -http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$version.tar.bz2" build_style=gnu_configure make_cmd="$XBPS_MASTERDIR/bin/gmake" short_desc="Modular Xorg keyboard driver" diff --git a/templates/xf86-input-mouse.tmpl b/templates/xf86-input-mouse.tmpl index 56fa28d6c17..fde5b195e12 100644 --- a/templates/xf86-input-mouse.tmpl +++ b/templates/xf86-input-mouse.tmpl @@ -2,7 +2,7 @@ pkgname=xf86-input-mouse version=1.3.0 distfiles=" -http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$version.tar.bz2" build_style=gnu_configure make_cmd="$XBPS_MASTERDIR/bin/gmake" short_desc="Modular Xorg mouse driver" diff --git a/templates/xf86-input-vmmouse.tmpl b/templates/xf86-input-vmmouse.tmpl index 9c8dbcd8966..721ffd363bb 100644 --- a/templates/xf86-input-vmmouse.tmpl +++ b/templates/xf86-input-vmmouse.tmpl @@ -2,7 +2,7 @@ pkgname=xf86-input-vmmouse version=12.5.1 distfiles=" -http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$version.tar.bz2" build_style=gnu_configure make_cmd="$XBPS_MASTERDIR/bin/gmake" short_desc="Modular Xorg VMware virtual mouse driver" diff --git a/templates/xf86-video-ati.tmpl b/templates/xf86-video-ati.tmpl index 2d500725fa4..a12cc8a3246 100644 --- a/templates/xf86-video-ati.tmpl +++ b/templates/xf86-video-ati.tmpl @@ -2,7 +2,7 @@ pkgname=xf86-video-ati version=6.9.0 distfiles=" -http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$version.tar.bz2" build_style=gnu_configure configure_args="--enable-dri" make_cmd="$XBPS_MASTERDIR/bin/gmake" diff --git a/templates/xf86-video-intel.tmpl b/templates/xf86-video-intel.tmpl index 195e54dc5f4..daabc8a0106 100644 --- a/templates/xf86-video-intel.tmpl +++ b/templates/xf86-video-intel.tmpl @@ -2,7 +2,7 @@ pkgname=xf86-video-intel version=2.4.2 distfiles=" -http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$version.tar.bz2" build_style=gnu_configure configure_args="--enable-dri" make_cmd="$XBPS_MASTERDIR/bin/gmake" diff --git a/templates/xf86-video-radeonhd.tmpl b/templates/xf86-video-radeonhd.tmpl index ac48a6eb850..db9e4fdb523 100644 --- a/templates/xf86-video-radeonhd.tmpl +++ b/templates/xf86-video-radeonhd.tmpl @@ -2,7 +2,7 @@ pkgname=xf86-video-radeonhd version=1.2.1 distfiles=" -http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$version.tar.bz2" build_style=gnu_configure make_cmd="$XBPS_MASTERDIR/bin/gmake" short_desc="Modular X.org driver for Radeon HD series" diff --git a/templates/xf86-video-vmware.tmpl b/templates/xf86-video-vmware.tmpl index c7eda8973aa..9b6d466a719 100644 --- a/templates/xf86-video-vmware.tmpl +++ b/templates/xf86-video-vmware.tmpl @@ -2,7 +2,7 @@ pkgname=xf86-video-vmware version=10.16.4 distfiles=" -http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$version.tar.bz2" build_style=gnu_configure make_cmd="$XBPS_MASTERDIR/bin/gmake" short_desc="Modular Xorg VMware virtual video driver" diff --git a/templates/xf86bigfontproto.tmpl b/templates/xf86bigfontproto.tmpl index 688b9ad3471..b4dadf29986 100644 --- a/templates/xf86bigfontproto.tmpl +++ b/templates/xf86bigfontproto.tmpl @@ -2,7 +2,7 @@ pkgname=xf86bigfontproto version=1.1.2 distfiles=" -http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version.tar.bz2" build_style=gnu_configure pkgconfig_override="xf86bigfontproto.pc" short_desc="XF86BigFont extension headers from X.org" diff --git a/templates/xf86dgaproto.tmpl b/templates/xf86dgaproto.tmpl index a1280250202..ccf7d06d435 100644 --- a/templates/xf86dgaproto.tmpl +++ b/templates/xf86dgaproto.tmpl @@ -2,7 +2,7 @@ pkgname=xf86dgaproto version=2.0.3 distfiles=" -http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version.tar.bz2" build_style=gnu_configure pkgconfig_override="xf86dgaproto.pc" short_desc="XF86DGA extension headers" diff --git a/templates/xf86driproto.tmpl b/templates/xf86driproto.tmpl index 52242113aac..a7f180d4c6d 100644 --- a/templates/xf86driproto.tmpl +++ b/templates/xf86driproto.tmpl @@ -2,7 +2,7 @@ pkgname=xf86driproto version=2.0.4 distfiles=" -http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version.tar.bz2" build_style=gnu_configure pkgconfig_override="xf86driproto.pc" short_desc="XF86DRI extension headers from modular X.org" diff --git a/templates/xf86miscproto.tmpl b/templates/xf86miscproto.tmpl index cf413d7f0ab..a0e4ec74da7 100644 --- a/templates/xf86miscproto.tmpl +++ b/templates/xf86miscproto.tmpl @@ -2,7 +2,7 @@ pkgname=xf86miscproto version=0.9.2 distfiles=" -http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version.tar.bz2" build_style=gnu_configure pkgconfig_override="xf86miscproto.pc" short_desc="XF86Misc extension headers from modular X.org" diff --git a/templates/xf86vidmodeproto.tmpl b/templates/xf86vidmodeproto.tmpl index 29e2966bc2a..f9d3b509974 100644 --- a/templates/xf86vidmodeproto.tmpl +++ b/templates/xf86vidmodeproto.tmpl @@ -2,7 +2,7 @@ pkgname=xf86vidmodeproto version=2.2.2 distfiles=" -http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version.tar.bz2" build_style=gnu_configure pkgconfig_override="xf86vidmodeproto.pc" short_desc="XF86VidMode extension headers from modular X.org" diff --git a/templates/xineramaproto.tmpl b/templates/xineramaproto.tmpl index deef36f9ea6..1b375e356c2 100644 --- a/templates/xineramaproto.tmpl +++ b/templates/xineramaproto.tmpl @@ -2,7 +2,7 @@ pkgname=xineramaproto version=1.1.2 distfiles=" -http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version.tar.bz2" build_style=gnu_configure pkgconfig_override="xineramaproto.pc" short_desc="Xinerama extension headers from X.org" diff --git a/templates/xinit.tmpl b/templates/xinit.tmpl index d5b038d8eb8..e93be2f3c24 100644 --- a/templates/xinit.tmpl +++ b/templates/xinit.tmpl @@ -2,7 +2,7 @@ pkgname=xinit version=1.1.0 distfiles=" -http://xorg.freedesktop.org/releases/individual/app/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/app/$pkgname-$version.tar.bz2" build_style=gnu_configure make_cmd="$XBPS_MASTERDIR/bin/gmake" short_desc="X init program" diff --git a/templates/xkbcomp.tmpl b/templates/xkbcomp.tmpl index 8063a99e945..150815b6063 100644 --- a/templates/xkbcomp.tmpl +++ b/templates/xkbcomp.tmpl @@ -2,7 +2,7 @@ pkgname=xkbcomp version=1.0.5 distfiles=" -http://xorg.freedesktop.org/releases/individual/app/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/app/$pkgname-$version.tar.bz2" build_style=gnu_configure short_desc="XKBD keymap compiler" checksum=09af0ab2c714066846ede7317564b658623d3c9e diff --git a/templates/xkeyboard-config.tmpl b/templates/xkeyboard-config.tmpl index 0ace5a03f4c..351f42ed4d8 100644 --- a/templates/xkeyboard-config.tmpl +++ b/templates/xkeyboard-config.tmpl @@ -2,7 +2,7 @@ pkgname=xkeyboard-config version=1.4 distfiles=" -http://xlibs.freedesktop.org/xkbdesc/$pkgname-$version@.tar.bz2" +http://xlibs.freedesktop.org/xkbdesc/$pkgname-$version.tar.bz2" build_style=gnu_configure configure_args="--with-xkb-rules-symlink=xfree86,xorg --enable-compat-rules" diff --git a/templates/xmlcatmgr.tmpl b/templates/xmlcatmgr.tmpl index 48c0de93f35..6148b66b96e 100644 --- a/templates/xmlcatmgr.tmpl +++ b/templates/xmlcatmgr.tmpl @@ -2,7 +2,7 @@ pkgname=xmlcatmgr version=2.2 distfiles=" -http://kent.dl.sourceforge.net/sourceforge/xmlcatmgr/$pkgname-$version@.tar.gz" +http://kent.dl.sourceforge.net/sourceforge/xmlcatmgr/$pkgname-$version.tar.gz" build_style=gnu_configure short_desc="XML and SGML catalog manager" maintainer="Juan RP " diff --git a/templates/xorg-server.tmpl b/templates/xorg-server.tmpl index 338cf8c1b1d..42200c855fe 100644 --- a/templates/xorg-server.tmpl +++ b/templates/xorg-server.tmpl @@ -2,7 +2,7 @@ pkgname=xorg-server version=1.5.1 distfiles=" -http://xorg.freedesktop.org/releases/individual/xserver/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/xserver/$pkgname-$version.tar.bz2" build_style=gnu_configure configure_args="--with-xkb-path=$XBPS_MASTERDIR/share/X11/xkb --with-xkb-output=$XBPS_MASTERDIR/var/db/xkb --enable-install-setuid diff --git a/templates/xprop.tmpl b/templates/xprop.tmpl index a781238be39..052ce06ddc7 100644 --- a/templates/xprop.tmpl +++ b/templates/xprop.tmpl @@ -2,7 +2,7 @@ pkgname=xprop version=1.0.4 distfiles=" -http://xorg.freedesktop.org/releases/individual/app/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/app/$pkgname-$version.tar.bz2" build_style=gnu_configure make_cmd="$XBPS_MASTERDIR/bin/gmake" short_desc="Property displayer for X" diff --git a/templates/xproto.tmpl b/templates/xproto.tmpl index bf0d35e7ecc..c5f4fbd06d0 100644 --- a/templates/xproto.tmpl +++ b/templates/xproto.tmpl @@ -2,7 +2,7 @@ pkgname=xproto version=7.0.13 distfiles=" -http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version.tar.bz2" build_style=gnu_configure short_desc="X protocol and ancillary headers from Xorg X11" pkgconfig_override="xproto.pc" diff --git a/templates/xrandr.tmpl b/templates/xrandr.tmpl index aeccf0d4284..b16132bdd49 100644 --- a/templates/xrandr.tmpl +++ b/templates/xrandr.tmpl @@ -2,7 +2,7 @@ pkgname=xrandr version=1.2.3 distfiles=" -http://xorg.freedesktop.org/releases/individual/app/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/app/$pkgname-$version.tar.bz2" build_style=gnu_configure short_desc="Primitive command line interface to RandR extension" maintainer="Juan RP " diff --git a/templates/xset.tmpl b/templates/xset.tmpl index 353e43c26b7..56a46f332ad 100644 --- a/templates/xset.tmpl +++ b/templates/xset.tmpl @@ -2,7 +2,7 @@ pkgname=xset version=1.0.4 distfiles=" -http://xorg.freedesktop.org/releases/individual/app/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/app/$pkgname-$version.tar.bz2" build_style=gnu_configure make_cmd="$XBPS_MASTERDIR/bin/gmake" short_desc="X11 user preferences utility" diff --git a/templates/xsetroot.tmpl b/templates/xsetroot.tmpl index 07e7fb41aa4..255117c3f39 100644 --- a/templates/xsetroot.tmpl +++ b/templates/xsetroot.tmpl @@ -2,7 +2,7 @@ pkgname=xsetroot version=1.0.2 distfiles=" -http://xorg.freedesktop.org/releases/individual/app/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/app/$pkgname-$version.tar.bz2" build_style=gnu_configure make_cmd="$XBPS_MASTERDIR/bin/gmake" short_desc="X root window parameter setting program" diff --git a/templates/xstow.tmpl b/templates/xstow.tmpl index ae4b4c32621..7963fb156f6 100644 --- a/templates/xstow.tmpl +++ b/templates/xstow.tmpl @@ -2,7 +2,7 @@ pkgname=xstow version=0.6.1-unstable distfiles=" -http://kent.dl.sourceforge.net/sourceforge/xstow/$pkgname-$version@.tar.bz2" +http://kent.dl.sourceforge.net/sourceforge/xstow/$pkgname-$version.tar.bz2" build_style=gnu_configure short_desc="Replacement of GNU Stow written in C++" maintainer="Juan RP " diff --git a/templates/xtrans.tmpl b/templates/xtrans.tmpl index 45e6b6647f2..2415dc42f5e 100644 --- a/templates/xtrans.tmpl +++ b/templates/xtrans.tmpl @@ -2,7 +2,7 @@ pkgname=xtrans version=1.2.1 distfiles=" -http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version@.tar.bz2" +http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version.tar.bz2" build_style=gnu_configure pkgconfig_override="xtrans.pc" short_desc="Network API translation layer to insulate X" diff --git a/templates/zlib.tmpl b/templates/zlib.tmpl index af91fb1d704..1a544565551 100644 --- a/templates/zlib.tmpl +++ b/templates/zlib.tmpl @@ -1,7 +1,7 @@ # Template build file for 'zlib' pkgname=zlib version=1.2.3 -distfiles="http://www.zlib.net/$pkgname-$version@.tar.bz2" +distfiles="http://www.zlib.net/$pkgname-$version.tar.bz2" build_style=configure CFLAGS="-fPIC -DPIC" configure_args="-s" diff --git a/xbps.sh b/xbps.sh index 9e8c6920499..f017812fbd3 100755 --- a/xbps.sh +++ b/xbps.sh @@ -368,9 +368,23 @@ extract_distfiles() fi for f in ${distfiles}; do + if [[ "$f" == *.tar.bz2 ]]; then + cursufx=".tar.bz2" + elif [[ "$f" == *.tbz ]]; then + cursufx=".tbz" + elif [[ "$f" == *.tar.gz ]]; then + cursufx=".tar.gz" + elif [[ "$f" == *.tgz ]]; then + cursufx=".tgz" + elif [[ "$f" == *.tar ]]; then + cursufx=".tar" + elif [[ "$f" == *.zip ]]; then + cursufx=".zip" + else + msg_error "unknown distfile suffix" + fi + curfile=$(basename $f) - cursufx=${curfile##*@} - curfile=$(basename $curfile|sed 's|@||g') if [ $count -gt 1 ]; then lwrksrc="$wrksrc/${curfile%$cursufx}"