From c2bfc6b7d57e0ea4af453c740c750323943c4d41 Mon Sep 17 00:00:00 2001 From: jbu Date: Fri, 22 May 2015 11:47:56 +0200 Subject: [PATCH] bandwith / download times + $GNU_SITE cleanup + To reduce bandwidth and download times, packages use bz2/lzma/xz where possible. + Also use ${GNU_SITE} and ${KERNEL_SITE} where appropriate. + Clean up xlint warnings. + inetutils: update to 1.9.3 and split into subpkgs --- srcpkgs/a2ps/template | 34 ++-- srcpkgs/acct/template | 4 +- srcpkgs/autoconf/template | 4 +- srcpkgs/autogen/template | 2 +- srcpkgs/automake/template | 4 +- srcpkgs/bash/template | 4 +- srcpkgs/binutils/template | 6 +- srcpkgs/chroot-bash/template | 4 +- srcpkgs/chroot-gawk/template | 6 +- srcpkgs/chroot-grep/template | 4 +- srcpkgs/chroot-texinfo/template | 6 +- srcpkgs/coreutils/template | 6 +- srcpkgs/cpio/template | 6 +- srcpkgs/cross-aarch64-linux-gnu/template | 10 +- srcpkgs/cross-arm-linux-gnueabi/template | 12 +- srcpkgs/cross-arm-linux-gnueabihf/template | 12 +- srcpkgs/cross-i686-pc-linux-gnu/template | 14 +- srcpkgs/ddd/template | 4 +- srcpkgs/ddrescue/template | 4 +- srcpkgs/ed/template | 4 +- srcpkgs/enscript/template | 4 +- srcpkgs/findutils/template | 8 +- srcpkgs/freefont-ttf/template | 4 +- srcpkgs/gawk/template | 6 +- srcpkgs/gdb/template | 6 +- srcpkgs/gdbm/template | 4 +- srcpkgs/gperf/template | 4 +- srcpkgs/grep/template | 4 +- srcpkgs/groff/template | 4 +- srcpkgs/gsl/template | 4 +- srcpkgs/gv/template | 8 +- srcpkgs/gzip/template | 6 +- srcpkgs/help2man/template | 4 +- srcpkgs/indent/template | 6 +- srcpkgs/inetutils-dnsdomainname | 1 + srcpkgs/inetutils-ftp | 1 + srcpkgs/inetutils-hostname | 1 + srcpkgs/inetutils-ifconfig | 1 + srcpkgs/inetutils-inetd | 1 + srcpkgs/inetutils-ping | 1 + srcpkgs/inetutils-rcp | 1 + srcpkgs/inetutils-rexec | 1 + srcpkgs/inetutils-rlogin | 1 + srcpkgs/inetutils-rsh | 1 + srcpkgs/inetutils-syslog | 1 + srcpkgs/inetutils-talk | 1 + srcpkgs/inetutils-telnet | 1 + srcpkgs/inetutils-tftp | 1 + srcpkgs/inetutils-traceroute | 1 + srcpkgs/inetutils-uucpd | 1 + srcpkgs/inetutils-whois | 1 + srcpkgs/inetutils/files/rexec.xinetd | 10 + srcpkgs/inetutils/files/tftp.xinetd | 10 + srcpkgs/inetutils/files/uucp.xinetd | 10 + srcpkgs/inetutils/template | 217 +++++++++++++++++++-- srcpkgs/libcdio-paranoia/template | 6 +- srcpkgs/libcdio/template | 6 +- srcpkgs/libextractor/template | 4 +- srcpkgs/libidn/template | 4 +- srcpkgs/libtasn1/template | 4 +- srcpkgs/m4/template | 6 +- srcpkgs/mtools/template | 4 +- srcpkgs/nettle/template | 4 +- srcpkgs/parallel/template | 6 +- srcpkgs/parted/template | 4 +- srcpkgs/patch/template | 4 +- srcpkgs/readline/template | 6 +- srcpkgs/screen/template | 4 +- srcpkgs/sed/template | 6 +- srcpkgs/sharutils/template | 6 +- srcpkgs/source-highlight/template | 4 +- srcpkgs/texinfo/template | 10 +- srcpkgs/wget/template | 6 +- srcpkgs/which/template | 4 +- srcpkgs/zile/template | 4 +- 75 files changed, 404 insertions(+), 184 deletions(-) create mode 120000 srcpkgs/inetutils-dnsdomainname create mode 120000 srcpkgs/inetutils-ftp create mode 120000 srcpkgs/inetutils-hostname create mode 120000 srcpkgs/inetutils-ifconfig create mode 120000 srcpkgs/inetutils-inetd create mode 120000 srcpkgs/inetutils-ping create mode 120000 srcpkgs/inetutils-rcp create mode 120000 srcpkgs/inetutils-rexec create mode 120000 srcpkgs/inetutils-rlogin create mode 120000 srcpkgs/inetutils-rsh create mode 120000 srcpkgs/inetutils-syslog create mode 120000 srcpkgs/inetutils-talk create mode 120000 srcpkgs/inetutils-telnet create mode 120000 srcpkgs/inetutils-tftp create mode 120000 srcpkgs/inetutils-traceroute create mode 120000 srcpkgs/inetutils-uucpd create mode 120000 srcpkgs/inetutils-whois create mode 100644 srcpkgs/inetutils/files/rexec.xinetd create mode 100644 srcpkgs/inetutils/files/tftp.xinetd create mode 100644 srcpkgs/inetutils/files/uucp.xinetd diff --git a/srcpkgs/a2ps/template b/srcpkgs/a2ps/template index ca02d58884..dfa128d429 100644 --- a/srcpkgs/a2ps/template +++ b/srcpkgs/a2ps/template @@ -1,11 +1,10 @@ # Template file for 'a2ps' - pkgname="a2ps" version="4.14" -revision=2 +revision=3 build_style=gnu-configure short_desc="Any to PS filter" -maintainer="Carlo Dormeletti " +maintainer="Carlo Dormeletti " license="GPL-3" hostmakedepends="perl gperf" makedepends="ghostscript psutils groff cups" @@ -14,28 +13,27 @@ configure_args="--sysconfdir=/etc/a2ps --enable-shared --with-medium=A4" LDFLAGS="-lm" conf_files="/etc/a2ps/a2ps.cfg /etc/a2ps/a2ps-site.cfg" homepage="http://www.gnu.org/software/a2ps/" -distfiles="http://ftp.gnu.org/gnu/a2ps/a2ps-${version}.tar.gz" +distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.gz" checksum="f3ae8d3d4564a41b6e2a21f237d2f2b104f48108591e8b83497500182a3ab3a4" pre_configure() { - sed -i "s/GPERF --version |/& head -n 1 |/" ./configure - sed -i "s|/usr/local/share|/usr/share|" ./configure + sed -i "s/GPERF --version |/& head -n 1 |/" ./configure + sed -i "s|/usr/local/share|/usr/share|" ./configure } liba2ps-devel_package() { - short_desc+=" - development files" - depends="liba2ps>=${version}_${revision}" - pkg_install() { - vmove usr/include - vmove "usr/lib/*.a" - vmove "usr/lib/*.so" - } + short_desc+=" - development files" + depends="liba2ps>=${version}_${revision}" + pkg_install() { + vmove usr/include + vmove "usr/lib/*.a" + vmove "usr/lib/*.so" + } } liba2ps_package() { - short_desc+=" - library files" - pkg_install() { - vmove "usr/lib/*.so.*" - - } + short_desc+=" - library files" + pkg_install() { + vmove "usr/lib/*.so.*" + } } diff --git a/srcpkgs/acct/template b/srcpkgs/acct/template index 9a60256361..98888c1c91 100644 --- a/srcpkgs/acct/template +++ b/srcpkgs/acct/template @@ -1,13 +1,13 @@ # Template file for 'acct' pkgname=acct version=6.6.2 -revision=1 +revision=2 build_style=gnu-configure short_desc="GNU Accounting Utilities" homepage="https://www.gnu.org/software/acct/" license="GPL-3" maintainer="Juan RP " -distfiles="http://ftp.gnu.org/gnu/acct/acct-$version.tar.gz" +distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.gz" checksum=8ed47b2f893b08f0d67720880adbb48b835a826c314fa52fd52af1cee6870101 nocross=yes diff --git a/srcpkgs/autoconf/template b/srcpkgs/autoconf/template index 293f2dcbe9..c83658aa19 100644 --- a/srcpkgs/autoconf/template +++ b/srcpkgs/autoconf/template @@ -1,7 +1,7 @@ # Template build file for 'autoconf'. pkgname=autoconf version=2.69 -revision=5 +revision=6 noarch=yes build_style=gnu-configure hostmakedepends="perl m4" @@ -10,5 +10,5 @@ short_desc="Generates automatic source code configuration scripts" maintainer="Juan RP " license="GPL-2, GPL-3" homepage="http://www.gnu.org/software/autoconf" -distfiles="http://ftp.gnu.org/gnu/autoconf/$pkgname-$version.tar.xz" +distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.xz" checksum=64ebcec9f8ac5b2487125a86a7760d2591ac9e1d3dbd59489633f9de62a57684 diff --git a/srcpkgs/autogen/template b/srcpkgs/autogen/template index c9dcb10598..f89d1ef803 100644 --- a/srcpkgs/autogen/template +++ b/srcpkgs/autogen/template @@ -9,7 +9,7 @@ makedepends="guile guile-devel libxml2-devel gc-devel" depends="guile perl" short_desc="The Automated Program Generator" maintainer="Juan RP " -license="GPL3" +license="GPL-3" homepage="http://autogen.sourceforge.net/" distfiles="${GNU_SITE}/${pkgname}/rel${version}/${pkgname}-${version}.tar.gz" checksum=3cd9f81a8ae7c6865bb9bbbe16c4307a243a1373d0b315a83571cbba1fff725d diff --git a/srcpkgs/automake/template b/srcpkgs/automake/template index 80e4f3b3b7..02ab59866c 100644 --- a/srcpkgs/automake/template +++ b/srcpkgs/automake/template @@ -1,7 +1,7 @@ # Template build file for 'automake'. pkgname=automake version=1.15 -revision=2 +revision=3 noarch=yes build_style=gnu-configure hostmakedepends="perl autoconf" @@ -10,5 +10,5 @@ short_desc="GNU Standards-compliant Makefile generator" maintainer="Juan RP " license="GPL-2" homepage="http://www.gnu.org/software/automake" -distfiles="http://ftp.gnu.org/gnu/automake/${pkgname}-${version}.tar.xz" +distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.xz" checksum=9908c75aabd49d13661d6dcb1bc382252d22cc77bf733a2d55e87f2aa2db8636 diff --git a/srcpkgs/bash/template b/srcpkgs/bash/template index bfa53d3750..138d4f5e70 100644 --- a/srcpkgs/bash/template +++ b/srcpkgs/bash/template @@ -16,12 +16,12 @@ short_desc="The GNU Bourne Again Shell" maintainer="Juan RP " homepage="http://www.gnu.org/software/bash/bash.html" license="GPL-3" -distfiles="http://ftp.gnu.org/gnu/bash/bash-${_bash_distver}.tar.gz" +distfiles="${GNU_SITE}/$pkgname/$pkgname-${_bash_distver}.tar.gz" checksum=afc687a28e0e24dc21b988fa159ff9dbcf6b7caa92ade8645cc6d5605cd024d4 CFLAGS="-DSYS_BASHRC='\"/etc/bash/bashrc\"'" pre_configure() { - local url="http://ftp.gnu.org/gnu/bash/bash-${_bash_distver}-patches" + local url="${GNU_SITE}/$pkgname/$pkgname-${_bash_distver}-patches" local ver=$(echo ${_bash_distver}|sed "s|\.||g") if [ "${_bash_patchlevel}" -gt 000 ]; then diff --git a/srcpkgs/binutils/template b/srcpkgs/binutils/template index c3243dcfb5..7bfce3af8d 100644 --- a/srcpkgs/binutils/template +++ b/srcpkgs/binutils/template @@ -1,14 +1,14 @@ # Template file for 'binutils' pkgname=binutils version=2.25 -revision=3 +revision=4 bootstrap=yes short_desc="GNU binary utilities" maintainer="Juan RP " homepage="http://www.gnu.org/software/binutils/" license="GPL-3" -distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=cccf377168b41a52a76f46df18feb8f7285654b3c1bd69fc8265cb0fc6902f2d +distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.bz2" +checksum=22defc65cfa3ef2a3395faaea75d6331c6e62ea5dfacfed3e2ec17b08c882923 if [ "$CHROOT_READY" ]; then hostmakedepends="flex perl" diff --git a/srcpkgs/chroot-bash/template b/srcpkgs/chroot-bash/template index 9a00aaff13..3d261da36a 100644 --- a/srcpkgs/chroot-bash/template +++ b/srcpkgs/chroot-bash/template @@ -11,7 +11,7 @@ short_desc="The GNU Bourne Again Shell -- for xbps-src use" maintainer="Juan RP " homepage="http://www.gnu.org/software/bash/bash.html" license="GPL-3" -distfiles="http://ftp.gnu.org/gnu/bash/bash-${_bash_distver}.tar.gz" +distfiles="${GNU_SITE}/bash/bash-${_bash_distver}.tar.gz" checksum=afc687a28e0e24dc21b988fa159ff9dbcf6b7caa92ade8645cc6d5605cd024d4 broken_as_needed=yes @@ -20,7 +20,7 @@ provides="bash-${version}_${revision}" conflicts="bash>=0 dash>=0" pre_configure() { - local url="http://ftp.gnu.org/gnu/bash/bash-${_bash_distver}-patches" + local url="${GNU_SITE}/bash/bash-${_bash_distver}-patches" local ver=$(echo ${_bash_distver}|sed "s|\.||g") if [ "${_bash_patchlevel}" -gt 000 ]; then diff --git a/srcpkgs/chroot-gawk/template b/srcpkgs/chroot-gawk/template index e8d37f0189..46a789c9dc 100644 --- a/srcpkgs/chroot-gawk/template +++ b/srcpkgs/chroot-gawk/template @@ -1,7 +1,7 @@ # Template file for 'chroot-gawk' pkgname=chroot-gawk version=4.0.0 -revision=4 +revision=5 wrksrc="gawk-${version}" build_style=gnu-configure configure_args="--disable-nls --without-readline ac_cv_libsigsegv=/bin/false" @@ -9,8 +9,8 @@ short_desc="The GNU awk utility -- for xbps-src use" maintainer="Juan RP " license="GPL-3" homepage="http://www.gnu.org/directory/GNU/gawk.html" -distfiles="http://ftp.gnu.org/gnu/gawk/gawk-$version.tar.gz" -checksum=c3a7cf7d976e05c6a1d8a9b3f14fa55d4304707408ddafb1396212653ea00be5 +distfiles="${GNU_SITE}/gawk/gawk-$version.tar.xz" +checksum=abbef4dbab9db0f159c71b941fd93fd1dcb995f5e8a23396d1c2390801c46edf bootstrap=yes provides="awk-0_1" diff --git a/srcpkgs/chroot-grep/template b/srcpkgs/chroot-grep/template index c46ccaf874..59f0248e5a 100644 --- a/srcpkgs/chroot-grep/template +++ b/srcpkgs/chroot-grep/template @@ -1,7 +1,7 @@ # Build template for 'chroot-grep'. pkgname=chroot-grep version=2.21 -revision=1 +revision=2 wrksrc=grep-${version} bootstrap=yes conflicts="grep>=0" @@ -9,7 +9,7 @@ provides="grep-${version}_${revision}" build_style=gnu-configure configure_args="--disable-perl-regexp --disable-nls ac_cv_path_GREP=grep" homepage="http://www.gnu.org/software/grep/" -distfiles="http://ftp.gnu.org/gnu/grep/grep-$version.tar.xz" +distfiles="${GNU_SITE}/grep/grep-$version.tar.xz" short_desc="The GNU grep utility - for use with xbps-src" maintainer="Juan RP " license="GPL-3" diff --git a/srcpkgs/chroot-texinfo/template b/srcpkgs/chroot-texinfo/template index 8d20c25de7..ec3671cbab 100644 --- a/srcpkgs/chroot-texinfo/template +++ b/srcpkgs/chroot-texinfo/template @@ -1,7 +1,7 @@ # Template file for 'chroot-texinfo' pkgname=chroot-texinfo version=4.13a -revision=6 +revision=7 wrksrc="texinfo-4.13" bootstrap=yes hostmakedepends="ncurses-devel" @@ -12,8 +12,8 @@ short_desc="The GNU Documentation System -- for xbps-src use" maintainer="Juan RP " license="GPL-3" homepage="http://www.gnu.org/software/texinfo/" -distfiles="http://ftp.gnu.org/gnu/texinfo/texinfo-$version.tar.gz" -checksum=1303e91a1c752b69a32666a407e9fbdd6e936def4b09bc7de30f416301530d68 +distfiles="${GNU_SITE}/texinfo/texinfo-$version.tar.lzma" +checksum=6d28b0ceae866e3536142fc552e7a3bc9f84c8303119c25731b2478eef64c9e5 do_configure() { cp -f ${XBPS_CROSSPFDIR}/config.sub build-aux diff --git a/srcpkgs/coreutils/template b/srcpkgs/coreutils/template index badcf64543..339984e1d7 100644 --- a/srcpkgs/coreutils/template +++ b/srcpkgs/coreutils/template @@ -1,4 +1,4 @@ -# Template file for 'coreutils' +# Template file for 'coreutils' pkgname=coreutils version=8.23 revision=7 @@ -9,7 +9,7 @@ short_desc="The GNU core utilities" maintainer="Juan RP " homepage="http://www.gnu.org/software/coreutils" license="GPL-3" -distfiles="http://ftp.gnu.org/gnu/coreutils/${pkgname}-${version}.tar.xz" +distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.xz" checksum=ec43ca5bcfc62242accb46b7f121f6b684ee21ecd7d075059bf650ff9e37b82d build_pie=yes @@ -48,7 +48,7 @@ do_build() { if [ "$CROSS_BUILD" ]; then cp Makefile Makefile.orig sed '/src_make_prime_list/d' Makefile.orig > Makefile - depbase=`echo src/make-prime-list.o | sed 's|[^/]*$|.deps/&|;s|\.o$||'`;\ + depbase=$(echo src/make-prime-list.o | sed 's|[^/]*$|.deps/&|;s|\.o$||');\ cc -std=gnu99 -I. -I./lib -Ilib -I./lib -Isrc -I./src \ -fdiagnostics-show-option -funit-at-a-time -g -O2 -MT \ src/make-prime-list.o -MD -MP -MF $depbase.Tpo -c -o src/make-prime-list.o \ diff --git a/srcpkgs/cpio/template b/srcpkgs/cpio/template index 82a2ff4e3f..0eacb9284d 100644 --- a/srcpkgs/cpio/template +++ b/srcpkgs/cpio/template @@ -1,7 +1,7 @@ # Template file for 'cpio' pkgname=cpio version=2.11 -revision=7 +revision=8 build_pie=yes build_style=gnu-configure configure_args="gl_cv_func_stat_file_slash=yes gl_cv_func_malloc_posix=yes @@ -11,8 +11,8 @@ short_desc="GNU copy-in/out (cpio) with remote magnetic tape (rmt) support" maintainer="Juan RP " homepage="http://www.gnu.org/software/cpio/" license="GPL-3" -distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz" -checksum=601b1d774cd6e4cd39416203c91ec59dbd65dd27d79d75e1a9b89497ea643978 +distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.bz2" +checksum=bb820bfd96e74fc6ce43104f06fe733178517e7f5d1cdee553773e8eff7d5bbd post_install() { # Remove rmt that conflicts with the one from tar. diff --git a/srcpkgs/cross-aarch64-linux-gnu/template b/srcpkgs/cross-aarch64-linux-gnu/template index f484174032..32b3e690cc 100644 --- a/srcpkgs/cross-aarch64-linux-gnu/template +++ b/srcpkgs/cross-aarch64-linux-gnu/template @@ -11,16 +11,16 @@ _CROSS_SYSROOT="/usr/${_triplet}" pkgname=cross-${_triplet} version=0.19 -revision=1 +revision=2 short_desc="GNU Cross toolchain for the ${_triplet} LE target (binutils/gcc/glibc)" maintainer="Christian Neukirchen " homepage="http://www.voidlinux.eu" license="Public Domain" distfiles=" - http://ftp.gnu.org/pub/gnu/binutils/binutils-${_binutils_version}.tar.bz2 - http://ftp.gnu.org/pub/gnu/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.bz2 - http://ftp.gnu.org/gnu/glibc/glibc-${_glibc_version}.tar.xz - http://www.kernel.org/pub/linux/kernel/v3.x/linux-${_linux_version}.tar.xz" + ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.bz2 + ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.bz2 + ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz + ${KERNEL_SITE}/kernel/v3.x/linux-${_linux_version}.tar.xz" checksum="22defc65cfa3ef2a3395faaea75d6331c6e62ea5dfacfed3e2ec17b08c882923 2020c98295856aa13fda0f2f3a4794490757fc24bcca918d52cc8b4917b972dd aeeb362437965a5d3f40b151094ca79def04a115bd363fdd4a9a0c69482923b8 diff --git a/srcpkgs/cross-arm-linux-gnueabi/template b/srcpkgs/cross-arm-linux-gnueabi/template index 3484656352..4287f09d59 100644 --- a/srcpkgs/cross-arm-linux-gnueabi/template +++ b/srcpkgs/cross-arm-linux-gnueabi/template @@ -12,16 +12,16 @@ _CROSS_SYSROOT="/usr/${_triplet}" pkgname=cross-${_triplet} version=0.19 -revision=3 +revision=4 short_desc="GNU Cross toolchain for the ${_triplet} LE target (binutils/gcc/glibc)" maintainer="Juan RP " homepage="http://www.voidlinux.eu" license="Public Domain" distfiles=" - http://ftp.gnu.org/pub/gnu/binutils/binutils-${_binutils_version}.tar.bz2 - http://ftp.gnu.org/pub/gnu/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.bz2 - http://ftp.gnu.org/gnu/glibc/glibc-${_glibc_version}.tar.xz - http://www.kernel.org/pub/linux/kernel/v3.x/linux-${_linux_version}.tar.xz" + ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.bz2 + ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.bz2 + ${GNU_SITE}/glibc-${_glibc_version}.tar.xz + ${KERNEL_SITE}/kernel/v3.x/linux-${_linux_version}.tar.xz" checksum=" 22defc65cfa3ef2a3395faaea75d6331c6e62ea5dfacfed3e2ec17b08c882923 2020c98295856aa13fda0f2f3a4794490757fc24bcca918d52cc8b4917b972dd @@ -157,7 +157,7 @@ _glibc_build() { --with-headers=${_CROSS_SYSROOT}/usr/include \ --config-cache --disable-profile --enable-obsolete-rpc \ --disable-werror --enable-kernel=2.6.27 ${_fpuflags} - + make ${makejobs} make install_root=${_CROSS_SYSROOT} install diff --git a/srcpkgs/cross-arm-linux-gnueabihf/template b/srcpkgs/cross-arm-linux-gnueabihf/template index 4f9e9a54d2..0a54e42f90 100644 --- a/srcpkgs/cross-arm-linux-gnueabihf/template +++ b/srcpkgs/cross-arm-linux-gnueabihf/template @@ -12,16 +12,16 @@ _CROSS_SYSROOT="/usr/${_triplet}" pkgname=cross-${_triplet} version=0.19 -revision=3 +revision=4 short_desc="GNU Cross toolchain for the ${_triplet} LE target (binutils/gcc/glibc)" maintainer="Juan RP " homepage="http://www.voidlinux.eu" license="Public Domain" distfiles=" - http://ftp.gnu.org/pub/gnu/binutils/binutils-${_binutils_version}.tar.bz2 - http://ftp.gnu.org/pub/gnu/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.bz2 - http://ftp.gnu.org/gnu/glibc/glibc-${_glibc_version}.tar.xz - http://www.kernel.org/pub/linux/kernel/v3.x/linux-${_linux_version}.tar.xz" + ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.bz2 + ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.bz2 + ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz + ${KERNEL_SITE}/kernel/v3.x/linux-${_linux_version}.tar.xz" checksum=" 22defc65cfa3ef2a3395faaea75d6331c6e62ea5dfacfed3e2ec17b08c882923 2020c98295856aa13fda0f2f3a4794490757fc24bcca918d52cc8b4917b972dd @@ -157,7 +157,7 @@ _glibc_build() { --with-headers=${_CROSS_SYSROOT}/usr/include \ --config-cache --disable-profile --enable-obsolete-rpc \ --disable-werror --enable-kernel=2.6.27 ${_fpuflags} - + make ${makejobs} make install_root=${_CROSS_SYSROOT} install diff --git a/srcpkgs/cross-i686-pc-linux-gnu/template b/srcpkgs/cross-i686-pc-linux-gnu/template index e6fc4c420b..0280fcbb6e 100644 --- a/srcpkgs/cross-i686-pc-linux-gnu/template +++ b/srcpkgs/cross-i686-pc-linux-gnu/template @@ -11,16 +11,16 @@ _CROSS_SYSROOT="/usr/${_triplet}" pkgname=cross-${_triplet} version=0.17 -revision=1 +revision=2 short_desc="GNU Cross toolchain for the ${_triplet} target (binutils/gcc/glibc)" maintainer="Juan RP " homepage="http://www.voidlinux.eu" license="Public Domain" distfiles=" - http://ftp.gnu.org/pub/gnu/binutils/binutils-${_binutils_version}.tar.bz2 - http://ftp.gnu.org/pub/gnu/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.bz2 - http://ftp.gnu.org/gnu/glibc/glibc-${_glibc_version}.tar.xz - http://www.kernel.org/pub/linux/kernel/v3.x/linux-${_linux_version}.tar.xz" + ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.bz2 + ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.bz2 + ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz + ${KERNEL_SITE}/kernel/v3.x/linux-${_linux_version}.tar.xz" checksum=" 22defc65cfa3ef2a3395faaea75d6331c6e62ea5dfacfed3e2ec17b08c882923 2020c98295856aa13fda0f2f3a4794490757fc24bcca918d52cc8b4917b972dd @@ -156,7 +156,7 @@ _glibc_build() { --with-headers=${_CROSS_SYSROOT}/usr/include \ --config-cache --enable-obsolete-rpc \ --enable-kernel=2.6.27 ${_fpuflags} - + make ${makejobs} make install_root=${_CROSS_SYSROOT} install @@ -175,7 +175,7 @@ _gcc_build() { unset LD AS CPP export CC="gcc" CFLAGS="-Os -pipe" - # Make this link to target libs. + # Make this link to target libs. if [ ! -f .sed_subst_done ]; then sed -e "s, /lib/, ${_CROSS_SYSROOT}/lib/,g;s, /usr/lib/, ${_CROSS_SYSROOT}/usr/lib/,g" \ -i ${_CROSS_SYSROOT}/lib/libc.so ${_CROSS_SYSROOT}/lib/libpthread.so diff --git a/srcpkgs/ddd/template b/srcpkgs/ddd/template index af52e4adcd..fbbab32d63 100644 --- a/srcpkgs/ddd/template +++ b/srcpkgs/ddd/template @@ -1,12 +1,12 @@ # Template build file for 'ddd'. pkgname=ddd version=3.3.12 -revision=3 +revision=4 build_style=gnu-configure makedepends="ncurses-devel libXt-devel libXext-devel libXmu-devel lesstif-devel" short_desc="Graphical front-end for command-line debuggers" maintainer="Enno Boland " homepage="http://www.gnu.org/software/ddd" license="GPL-2" -distfiles="http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${version}.tar.gz" +distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.gz" checksum=3ad6cd67d7f4b1d6b2d38537261564a0d26aaed077bf25c51efc1474d0e8b65c diff --git a/srcpkgs/ddrescue/template b/srcpkgs/ddrescue/template index 40da68070d..3081647f22 100644 --- a/srcpkgs/ddrescue/template +++ b/srcpkgs/ddrescue/template @@ -1,14 +1,14 @@ # Template file for 'ddrescue' pkgname=ddrescue version=1.19 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="lzip" short_desc="Data recovery tool" maintainer="Juan RP " license="GPL-3" homepage="http://www.gnu.org/software/ddrescue/ddrescue.html" -distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.lz" +distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.lz" checksum=ed8d0c9d9aac80a9110e9cb0d0a91a7390d3bf9f816b67a62ca4eb140f4747b8 do_configure() { diff --git a/srcpkgs/ed/template b/srcpkgs/ed/template index 79032dd14e..6eb0f04ce9 100644 --- a/srcpkgs/ed/template +++ b/srcpkgs/ed/template @@ -1,14 +1,14 @@ # Template file for 'ed' pkgname=ed version=1.11 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="lzip" short_desc="GNU Line-oriented text editor" maintainer="Juan RP " license="GPL-3" homepage="http://www.gnu.org/software/ed/ed.html" -distfiles="http://ftp.gnu.org/gnu/ed/ed-$version.tar.lz" +distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.lz" checksum=bd146ede5f225e20946ad94ef6bdf07939313bcc41dde5d2beedcea1a147a134 do_build() { diff --git a/srcpkgs/enscript/template b/srcpkgs/enscript/template index 44bd5cf207..a8adec6de5 100644 --- a/srcpkgs/enscript/template +++ b/srcpkgs/enscript/template @@ -1,7 +1,7 @@ # Template file for 'enscript' pkgname=enscript version=1.6.6 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="perl" conf_files="/etc/enscript.cfg" @@ -9,5 +9,5 @@ short_desc="Converts text to Postscript, HTML or RTF with syntax highlighting" maintainer="Juan RP " license="GPL-3" homepage="http://git.savannah.gnu.org/cgit/enscript.git" -distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz" +distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.gz" checksum=6d56bada6934d055b34b6c90399aa85975e66457ac5bf513427ae7fc77f5c0bb diff --git a/srcpkgs/findutils/template b/srcpkgs/findutils/template index 959743ba14..2466cd0996 100644 --- a/srcpkgs/findutils/template +++ b/srcpkgs/findutils/template @@ -1,18 +1,18 @@ # Template file for 'findutils' pkgname=findutils version=4.4.2 -revision=12 +revision=13 bootstrap=yes build_pie=yes build_style=gnu-configure configure_args="--localstatedir=/var/lib/locate gl_cv_func_wcwidth_works=yes -gl_cv_header_working_fcntl_h=yes am_cv_func_working_getline=yes -gl_cv_func_gettimeofday_clobber=no ac_cv_func_working_mktime=yes" + gl_cv_header_working_fcntl_h=yes am_cv_func_working_getline=yes + gl_cv_func_gettimeofday_clobber=no ac_cv_func_working_mktime=yes" short_desc="The GNU Find Utilities" maintainer="Juan RP " license="GPL-3" homepage="http://www.gnu.org/software/findutils" -distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz" +distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.gz" checksum=434f32d171cbc0a5e72cfc5372c6fc4cb0e681f8dce566a0de5b6fccd702b62a make_dirs="/var/lib/locate 0755 root root" diff --git a/srcpkgs/freefont-ttf/template b/srcpkgs/freefont-ttf/template index a12db62675..062170060b 100644 --- a/srcpkgs/freefont-ttf/template +++ b/srcpkgs/freefont-ttf/template @@ -1,7 +1,7 @@ # Template file for 'freefont-ttf' pkgname=freefont-ttf version=20120503 -revision=5 +revision=6 noarch=yes wrksrc=freefont-${version} hostmakedepends="unzip" @@ -11,7 +11,7 @@ short_desc="Free family of scalable outline fonts" maintainer="Juan RP " homepage="http://www.nongnu.org/freefont/" license="GPL-3" -distfiles="http://ftp.gnu.org/gnu/freefont/${pkgname}-${version}.zip" +distfiles="${GNU_SITE}/${pkgname%-ttf}/${pkgname}-${version}.zip" checksum=7c85baf1bf82a1a1845d1322112bc6ca982221b484e3b3925022e25b5cae89af do_install() { diff --git a/srcpkgs/gawk/template b/srcpkgs/gawk/template index dff361a7a0..900b5e900b 100644 --- a/srcpkgs/gawk/template +++ b/srcpkgs/gawk/template @@ -1,7 +1,7 @@ # Template file for 'gawk' pkgname=gawk version=4.1.3 -revision=1 +revision=2 build_pie=yes build_style=gnu-configure configure_args="--with-readline" @@ -10,8 +10,8 @@ short_desc="The GNU awk utility" maintainer="Juan RP " license="GPL-3" homepage="http://www.gnu.org/directory/GNU/gawk.html" -distfiles="http://ftp.gnu.org/gnu/gawk/gawk-${version}.tar.gz" -checksum=524effa5b9ecd4ed940f2581c5d3c1df4e4bd7e6f768aa033c1916f47dfc6e29 +distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.xz" +checksum=ea8b53c5834ee27012fecba7273f97fca7104884975cf81ddae6f85c5581f481 lib32disabled=yes provides="awk-0_1" diff --git a/srcpkgs/gdb/template b/srcpkgs/gdb/template index ab4067c54b..65f9938b8a 100644 --- a/srcpkgs/gdb/template +++ b/srcpkgs/gdb/template @@ -1,7 +1,7 @@ # Template file for 'gdb' pkgname=gdb version=7.9.1 -revision=1 +revision=2 patch_args="-Np1" build_style=gnu-configure configure_args="--disable-werror --disable-nls --with-system-readline @@ -13,7 +13,7 @@ short_desc="The GNU Debugger" maintainer="Juan RP " homepage="http://www.gnu.org/software/gdb/" license="GPL-3" -distfiles="http://ftp.gnu.org/gnu/gdb/gdb-$version.tar.xz" +distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.xz" checksum=cd9c543a411a05b2b647dd38936034b68c2b5d6f10e0d51dc168c166c973ba40 # Package build options @@ -30,5 +30,5 @@ post_install() { [ -d ${DESTDIR}/usr/lib64 ] && rm -rf ${DESTDIR}/usr/lib64 for f in bfd configure standards; do rm -f ${DESTDIR}/usr/share/info/${f}.info* - done + done } diff --git a/srcpkgs/gdbm/template b/srcpkgs/gdbm/template index 443f2f49f5..46df1645e2 100644 --- a/srcpkgs/gdbm/template +++ b/srcpkgs/gdbm/template @@ -1,14 +1,14 @@ # Template file for 'gdbm' pkgname=gdbm version=1.11 -revision=5 +revision=6 build_style=gnu-configure configure_args="--enable-libgdbm-compat --disable-rpath" short_desc="GNU database routines" maintainer="Juan RP " license="GPL-3" homepage="http://www.gnu.org.ua/software/gdbm/" -distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz" +distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.gz" checksum=8d912f44f05d0b15a4a5d96a76f852e905d051bb88022fcdfd98b43be093e3c3 if [ "$CROSS_BUILD" ]; then diff --git a/srcpkgs/gperf/template b/srcpkgs/gperf/template index 2e95e349b3..7a31673a3b 100644 --- a/srcpkgs/gperf/template +++ b/srcpkgs/gperf/template @@ -1,11 +1,11 @@ # Template file for 'gperf' pkgname=gperf version=3.0.4 -revision=1 +revision=2 build_style=gnu-configure short_desc="Perfect hash function generator" homepage="https://www.gnu.org/software/gperf/" license="GPL-3" maintainer="Juan RP " -distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz" +distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.gz" checksum=767112a204407e62dbc3106647cf839ed544f3cf5d0f0523aaa2508623aad63e diff --git a/srcpkgs/grep/template b/srcpkgs/grep/template index 426fce1155..ad5d71bea1 100644 --- a/srcpkgs/grep/template +++ b/srcpkgs/grep/template @@ -1,7 +1,7 @@ # Template build file for 'grep'. pkgname=grep version=2.21 -revision=2 +revision=3 build_pie=yes build_style=gnu-configure makedepends="pcre-devel" @@ -10,5 +10,5 @@ short_desc="The GNU grep utility" maintainer="Juan RP " license="GPL-3" homepage="http://www.gnu.org/software/grep/" -distfiles="http://ftp.gnu.org/gnu/grep/$pkgname-$version.tar.xz" +distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.xz" checksum=5244a11c00dee8e7e5e714b9aaa053ac6cbfa27e104abee20d3c778e4bb0e5de diff --git a/srcpkgs/groff/template b/srcpkgs/groff/template index 61f21f883c..e91aac3f11 100644 --- a/srcpkgs/groff/template +++ b/srcpkgs/groff/template @@ -1,14 +1,14 @@ # Template file for 'groff' pkgname=groff version=1.22.3 -revision=2 +revision=3 hostmakedepends="perl bison" makedepends="zlib-devel" short_desc="The GNU troff text-formatting system" maintainer="Juan RP " license="GPL-2" homepage="http://www.gnu.org/software/groff/groff.html" -distfiles="http://ftp.gnu.org/gnu/groff/groff-${version}.tar.gz" +distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.gz" checksum=3a48a9d6c97750bfbd535feeb5be0111db6406ddb7bb79fc680809cda6d828a5 if [ "$CROSS_BUILD" ]; then diff --git a/srcpkgs/gsl/template b/srcpkgs/gsl/template index b8e09a1066..f4216e36cf 100644 --- a/srcpkgs/gsl/template +++ b/srcpkgs/gsl/template @@ -1,9 +1,9 @@ # Template file for 'gsl' pkgname=gsl version=1.16 -revision=1 +revision=2 build_style=gnu-configure -short_desc="The GNU Scientific Library (GSL) is a numerical library for C and C++ programmers" +short_desc="A numerical library for C and C++ programmers" maintainer="Juan RP " homepage="http://www.gnu.org/software/gsl/gsl.html" license="GPL-2" diff --git a/srcpkgs/gv/template b/srcpkgs/gv/template index cdb2c8e37b..42d5a9475a 100644 --- a/srcpkgs/gv/template +++ b/srcpkgs/gv/template @@ -1,18 +1,18 @@ # Template file for 'gv' pkgname=gv version=3.7.4 -revision=2 +revision=3 build_style=gnu-configure -maintainer="Carlo Dormeletti " +maintainer="Carlo Dormeletti " homepage="http://www.gnu.org/software/gv/" license="GPL-2" short_desc="Postscript and PDF viewer" configure_args=" --with-x --enable-backing-pixmap --enable-international --with-default-papersize=a4" hostmakedepends="pkg-config xproto" -makedepends="libX11-devel libXmu-devel libXpm-devel libXext-devel +makedepends="libX11-devel libXmu-devel libXpm-devel libXext-devel libXt-devel libICE-devel libXaw3d-devel zlib-devel bzip2-devel libXinerama-devel ghostscript" depends="ghostscript" -distfiles="http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${version}.tar.gz" +distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" checksum="2162b3b3a95481d3855b3c4e28f974617eef67824523e56e20b56f12fe201a61" diff --git a/srcpkgs/gzip/template b/srcpkgs/gzip/template index 6c43fe8696..eed8064355 100644 --- a/srcpkgs/gzip/template +++ b/srcpkgs/gzip/template @@ -1,7 +1,7 @@ # Template file for 'gzip' pkgname=gzip version=1.6 -revision=6 +revision=7 bootstrap=yes build_pie=yes build_style=gnu-configure @@ -11,8 +11,8 @@ short_desc="GNU compression utility (replacement for compress)" maintainer="Juan RP " homepage="http://www.gnu.org/software/gzip/" license="GPL-3" -distfiles="http://ftp.gnu.org/gnu/gzip/$pkgname-$version.tar.gz" -checksum=97eb83b763d9e5ad35f351fe5517e6b71521d7aac7acf3e3cacdb6b1496d8f7e +distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.xz" +checksum=37dfed1a485d53212c43b3fa2a7c7952f09bf5cd86e37121c222341ee1b27847 pre_configure() { case "$XBPS_TARGET_MACHINE" in diff --git a/srcpkgs/help2man/template b/srcpkgs/help2man/template index 3950ef93a0..57c25ec8cb 100644 --- a/srcpkgs/help2man/template +++ b/srcpkgs/help2man/template @@ -1,7 +1,7 @@ # Template file for 'help2man' pkgname=help2man version=1.46.6 -revision=1 +revision=2 lib32disabled=yes build_style=gnu-configure hostmakedepends="perl-Locale-gettext" @@ -10,5 +10,5 @@ short_desc="GNU conversion tool to create man files" maintainer="Juan RP " license="GPL-3" homepage="http://www.gnu.org/software/help2man" -distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.xz" +distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.xz" checksum=615ff5ac38369ddb3707c5fd71672ab122639fd9cf6870de172e0127ed632caf diff --git a/srcpkgs/indent/template b/srcpkgs/indent/template index d17460e1db..e853a152ea 100644 --- a/srcpkgs/indent/template +++ b/srcpkgs/indent/template @@ -1,14 +1,14 @@ # Template file for 'indent' pkgname=indent version=2.2.10 -revision=2 +revision=3 build_style=gnu-configure configure_args="--docdir=/usr/share/doc/indent" -short_desc="indent can be used to make code easier to read" +short_desc="Indent can be used to make code easier to read" maintainer="Enno Boland " homepage="http://www.gnu.org/s/indent/" license="GPL-3" -distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz" +distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.gz" checksum=8a9b41be5bfcab5d8c1be74204b10ae78789fc3deabea0775fdced8677292639 pre_configure() { diff --git a/srcpkgs/inetutils-dnsdomainname b/srcpkgs/inetutils-dnsdomainname new file mode 120000 index 0000000000..1065ac1ed5 --- /dev/null +++ b/srcpkgs/inetutils-dnsdomainname @@ -0,0 +1 @@ +inetutils \ No newline at end of file diff --git a/srcpkgs/inetutils-ftp b/srcpkgs/inetutils-ftp new file mode 120000 index 0000000000..1065ac1ed5 --- /dev/null +++ b/srcpkgs/inetutils-ftp @@ -0,0 +1 @@ +inetutils \ No newline at end of file diff --git a/srcpkgs/inetutils-hostname b/srcpkgs/inetutils-hostname new file mode 120000 index 0000000000..1065ac1ed5 --- /dev/null +++ b/srcpkgs/inetutils-hostname @@ -0,0 +1 @@ +inetutils \ No newline at end of file diff --git a/srcpkgs/inetutils-ifconfig b/srcpkgs/inetutils-ifconfig new file mode 120000 index 0000000000..1065ac1ed5 --- /dev/null +++ b/srcpkgs/inetutils-ifconfig @@ -0,0 +1 @@ +inetutils \ No newline at end of file diff --git a/srcpkgs/inetutils-inetd b/srcpkgs/inetutils-inetd new file mode 120000 index 0000000000..1065ac1ed5 --- /dev/null +++ b/srcpkgs/inetutils-inetd @@ -0,0 +1 @@ +inetutils \ No newline at end of file diff --git a/srcpkgs/inetutils-ping b/srcpkgs/inetutils-ping new file mode 120000 index 0000000000..1065ac1ed5 --- /dev/null +++ b/srcpkgs/inetutils-ping @@ -0,0 +1 @@ +inetutils \ No newline at end of file diff --git a/srcpkgs/inetutils-rcp b/srcpkgs/inetutils-rcp new file mode 120000 index 0000000000..1065ac1ed5 --- /dev/null +++ b/srcpkgs/inetutils-rcp @@ -0,0 +1 @@ +inetutils \ No newline at end of file diff --git a/srcpkgs/inetutils-rexec b/srcpkgs/inetutils-rexec new file mode 120000 index 0000000000..1065ac1ed5 --- /dev/null +++ b/srcpkgs/inetutils-rexec @@ -0,0 +1 @@ +inetutils \ No newline at end of file diff --git a/srcpkgs/inetutils-rlogin b/srcpkgs/inetutils-rlogin new file mode 120000 index 0000000000..1065ac1ed5 --- /dev/null +++ b/srcpkgs/inetutils-rlogin @@ -0,0 +1 @@ +inetutils \ No newline at end of file diff --git a/srcpkgs/inetutils-rsh b/srcpkgs/inetutils-rsh new file mode 120000 index 0000000000..1065ac1ed5 --- /dev/null +++ b/srcpkgs/inetutils-rsh @@ -0,0 +1 @@ +inetutils \ No newline at end of file diff --git a/srcpkgs/inetutils-syslog b/srcpkgs/inetutils-syslog new file mode 120000 index 0000000000..1065ac1ed5 --- /dev/null +++ b/srcpkgs/inetutils-syslog @@ -0,0 +1 @@ +inetutils \ No newline at end of file diff --git a/srcpkgs/inetutils-talk b/srcpkgs/inetutils-talk new file mode 120000 index 0000000000..1065ac1ed5 --- /dev/null +++ b/srcpkgs/inetutils-talk @@ -0,0 +1 @@ +inetutils \ No newline at end of file diff --git a/srcpkgs/inetutils-telnet b/srcpkgs/inetutils-telnet new file mode 120000 index 0000000000..1065ac1ed5 --- /dev/null +++ b/srcpkgs/inetutils-telnet @@ -0,0 +1 @@ +inetutils \ No newline at end of file diff --git a/srcpkgs/inetutils-tftp b/srcpkgs/inetutils-tftp new file mode 120000 index 0000000000..1065ac1ed5 --- /dev/null +++ b/srcpkgs/inetutils-tftp @@ -0,0 +1 @@ +inetutils \ No newline at end of file diff --git a/srcpkgs/inetutils-traceroute b/srcpkgs/inetutils-traceroute new file mode 120000 index 0000000000..1065ac1ed5 --- /dev/null +++ b/srcpkgs/inetutils-traceroute @@ -0,0 +1 @@ +inetutils \ No newline at end of file diff --git a/srcpkgs/inetutils-uucpd b/srcpkgs/inetutils-uucpd new file mode 120000 index 0000000000..1065ac1ed5 --- /dev/null +++ b/srcpkgs/inetutils-uucpd @@ -0,0 +1 @@ +inetutils \ No newline at end of file diff --git a/srcpkgs/inetutils-whois b/srcpkgs/inetutils-whois new file mode 120000 index 0000000000..1065ac1ed5 --- /dev/null +++ b/srcpkgs/inetutils-whois @@ -0,0 +1 @@ +inetutils \ No newline at end of file diff --git a/srcpkgs/inetutils/files/rexec.xinetd b/srcpkgs/inetutils/files/rexec.xinetd new file mode 100644 index 0000000000..e893f1dbab --- /dev/null +++ b/srcpkgs/inetutils/files/rexec.xinetd @@ -0,0 +1,10 @@ +service exec +{ + flags = REUSE + socket_type = stream + wait = no + user = root + server = /usr/libexec/rexecd + log_on_failure += USERID + disable = yes +} diff --git a/srcpkgs/inetutils/files/tftp.xinetd b/srcpkgs/inetutils/files/tftp.xinetd new file mode 100644 index 0000000000..72f5616ce6 --- /dev/null +++ b/srcpkgs/inetutils/files/tftp.xinetd @@ -0,0 +1,10 @@ +service tftp +{ + flags = REUSE + socket_type = stream + wait = no + user = root + server = /usr/libexec/tftpd + log_on_failure += USERID + disable = yes +} diff --git a/srcpkgs/inetutils/files/uucp.xinetd b/srcpkgs/inetutils/files/uucp.xinetd new file mode 100644 index 0000000000..bb939ecf6c --- /dev/null +++ b/srcpkgs/inetutils/files/uucp.xinetd @@ -0,0 +1,10 @@ +service uucp +{ + flags = REUSE + socket_type = stream + wait = no + user = root + server = /usr/libexec/uucpd + log_on_failure += USERID + disable = yes +} diff --git a/srcpkgs/inetutils/template b/srcpkgs/inetutils/template index 15ccf9513f..9f366bed8c 100644 --- a/srcpkgs/inetutils/template +++ b/srcpkgs/inetutils/template @@ -1,35 +1,210 @@ # Template file for 'inetutils' pkgname=inetutils -version=1.9.2 +version=1.9.3 revision=1 build_style=gnu-configure -configure_args="--without-wrap --with-pam --enable-ftp --enable-ftpd - --enable-telnet --enable-telnetd --enable-talk --enable-talkd - --enable-rlogin --enable-rlogind --enable-rsh --enable-rshd - --enable-rcp --enable-hostname --disable-rexec --disable-rexecd - --disable-tftp --disable-tftpd --disable-ping --disable-ping6 - --disable-logger --disable-syslogd --disable-inetd --disable-whois - --disable-uucpd --disable-ifconfig --disable-traceroute" -makedepends="ncurses-devel pam-devel readline-devel" +configure_args="--without-wrap --with-pam" +makedepends="pam-devel readline-devel" +depends="${pkgname}-dnsdomainname ${pkgname}-hostname ${pkgname}-ifconfig + ${pkgname}-ftp ${pkgname}-ping ${pkgname}-rcp ${pkgname}-rexec + ${pkgname}-rlogin ${pkgname}-rsh ${pkgname}-talk ${pkgname}-telnet + ${pkgname}-tftp ${pkgname}-traceroute ${pkgname}-whois ${pkgname}-inetd + ${pkgname}-syslog ${pkgname}-uucpd" short_desc="GNU network utilities" maintainer="Juan RP " license="GPL-3" homepage="http://www.gnu.org/software/inetutils" -distfiles="http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=0423ea40a160cd4630f817e247df5c08ecc625378d2bb56a0509117a36a89913 +distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.xz" +checksum=40ed8bb3d21eca5afbc9865125e9049ee524b2b0f66b388878861d436d0d773d + +subpackages="inetutils-dnsdomainname inetutils-ftp inetutils-hostname + inetutils-ifconfig inetutils-inetd inetutils-ping inetutils-rexec + inetutils-syslog inetutils-telnet inetutils-tftp inetutils-traceroute + inetutils-uucpd inetutils-whois" + +case "$XBPS_TARGET_MACHINE" in +*-musl) + # Some packages don't build on musl + ;; +*) + subpackages+=" inetutils-rcp inetutils-rlogin inetutils-rsh inetutils-talk" + ;; +esac +depends="${subpackages}" pre_configure() { sed -i 's|_GL_WARN_ON_USE (gets|//_GL_WARN_ON_USE (gets|' lib/stdio.in.h + # Create a definition to allow the ifconfig program to build properly + echo '#define PATH_PROCNET_DEV "/proc/net/dev"' >> ifconfig/system/linux.h +} +post_install() { + # Keep just usr/share/info/inetutils.info.gz + rm -r ${DESTDIR}/usr/bin + rm -r ${DESTDIR}/usr/share/man + rm -r ${DESTDIR}/usr/libexec } -post_install() { - mv ${DESTDIR}/usr/bin/hostname ${DESTDIR}/usr/bin/${pkgname}-hostname - vinstall ${FILESDIR}/dnsdomainname 755 usr/bin - echo ".so man1/hostname.1" > ${DESTDIR}/usr/share/man/man1/dnsdomainname.1 - for f in telnet talk rlogin rsh; do - vinstall ${FILESDIR}/${f}.xinetd 644 etc/xinetd.d ${f} - done - vinstall ${FILESDIR}/ftpd.service 644 usr/lib/systemd/system - mv ${DESTDIR}/usr/share/man/man1/hostname.1 \ - ${DESTDIR}/usr/share/man/man1/${pkgname}-hostname.1 +inetutils-dnsdomainname_package() { + short_desc+=" - dnsdomainname tool" + pkg_install() { + vbin src/dnsdomainname + vman man/dnsdomainname.1 + } +} +inetutils-hostname_package() { + short_desc+=" - hostname tool" + conflicts="coreutils>=0" + pkg_install() { + vbin src/hostname + vman man/hostname.1 + } +} +inetutils-ifconfig_package() { + short_desc+=" - ifconfig tool" + conflitcs="net-tools>=0" + pkg_install() { + vbin ifconfig/ifconfig + vman man/ifconfig.1 + } +} +inetutils-ftp_package() { + short_desc+=" - ftp client and server (file transfer protocol)" + pkg_install() { + vbin ftp/ftp + vman man/ftp.1 + vbin ftpd/ftpd + vman man/ftpd.8 + if [ "$build_option_systemd" ]; then + vinstall ${FILESDIR}/ftpd.service 644 usr/lib/systemd/system + fi + # TODO: write etc/inet.d/ftp.conf or add an etc/inetd.conf line + } +} +inetutils-ping_package() { + short_desc+=" - ping tool (IPv4 and IPv6)" + conflicts="iputils>=0 base-system-busybox>=0" + pkg_install() { + vbin ping/ping + vman man/ping.1 + vbin ping/ping6 + vman man/ping6.1 + } +} +inetutils-rcp_package() { + short_desc+=" - rcp client (remote copy)" + pkg_install() { + vbin src/rcp + vman man/rcp.1 + } +} +inetutils-rexec_package() { + short_desc+=" - rexec client and server (remote exec)" + pkg_install() { + vbin src/rexec + vman man/rexec.1 + vbin src/rexecd + vman man/rexecd.8 + vinstall ${FILESDIR}/rexec.xinetd 644 etc/xninet.d + # TODO: write etc/inet.d/rexec.conf or add an etc/inetd.conf line + } +} +inetutils-rlogin_package() { + short_desc+=" - rlogin client and server (remote login)" + pkg_install() { + vbin src/rlogin + vman man/rlogin.1 + vbin src/rlogind + vman man/rlogind.8 + vinstall ${FILESDIR}/rlogin.xinetd 644 etc/xninet.d + # TODO: write etc/inet.d/rlogin.conf or add an etc/inetd.conf line + } +} +inetutils-rsh_package() { + short_desc+=" - rsh client and server (remote shell)" + pkg_install() { + vbin src/rsh + vman man/rsh.1 + vbin src/rshd + vman man/rshd.8 + vinstall ${FILESDIR}/rsh.xinetd 644 etc/xninet.d + # TODO: write etc/inet.d/rsh.conf or add an etc/inetd.conf line + } +} +inetutils-talk_package() { + short_desc+=" - talk client and server" + pkg_install() { + vbin talk/talk + vman man/talk.1 + vbin talkd/talkd + vman man/talkd.8 + vinstall ${FILESDIR}/talk.xinetd 644 etc/xninet.d + # TODO: write etc/inet.d/talk.conf or add an etc/inetd.conf line + } +} +inetutils-telnet_package() { + short_desc+=" - telnet client and server" + pkg_install() { + vbin telnet/telnet + vman man/telnet.1 + vbin telnetd/telnetd + vman man/telnetd.8 + vinstall ${FILESDIR}/telnet.xinetd 644 etc/xninet.d + # TODO: write etc/inet.d/telnet.conf or add an etc/inetd.conf line + } +} +inetutils-tftp_package() { + short_desc+="- tftp client and server (trivial file transfer protocol)" + conflicts="tftp-hpa>=0" + pkg_install() { + vbin src/tftp + vman man/tftp.1 + vbin src/tftpd + vman man/tftpd.8 + vinstall ${FILESDIR}/tftp.xinetd 644 etc/xninet.d + # TODO: write etc/inet.d/tftp.conf or add an etc/inetd.conf line + } +} +inetutils-traceroute_package() { + short_desc+=" - traceroute tool" + conflicts="traceroute>=0" + pkg_install() { + vbin src/traceroute + vman man/traceroute.1 + } +} +inetutils-whois_package() { + short_desc+=" - whois tool" + conflicts="whois>=0" + pkg_install() { + vbin whois/whois + vman man/whois.1 + } +} +inetutils-inetd_package() { + short_desc+=" - inet daemon" + pkg_install() { + vbin src/inetd + vman man/inetd.8 + # TODO: Install default config files with all services disabled? + # Add config_files="/etc/inetd.conf /etc/hosts.deny /etc/hosts.allow" + } +} +inetutils-syslog_package() { + short_desc+=" - logger tool and syslog daemon" + conflicts="util-linux>=0" + pkg_install() { + vbin src/logger + vman man/logger.1 + vbin src/syslogd + vman man/syslogd.8 + } +} +inetutils-uucpd_package() { + short_desc+=" - uucpd daemon (unix to unix copy)" + pkg_install() { + vbin src/uucpd + vman man/uucpd.8 + vinstall ${FILESDIR}/uucp.xinetd 644 etc/xninet.d + # TODO: write etc/inet.d/uucp.conf or add an etc/inetd.conf line + } } diff --git a/srcpkgs/libcdio-paranoia/template b/srcpkgs/libcdio-paranoia/template index 3ca2f4e6e6..d125f66455 100644 --- a/srcpkgs/libcdio-paranoia/template +++ b/srcpkgs/libcdio-paranoia/template @@ -1,7 +1,7 @@ # Template file for 'libcdio-paranoia' pkgname=libcdio-paranoia version="10.2+0.93+1" -revision=2 +revision=3 build_style=gnu-configure configure_args="--enable-cpp-progs --disable-example-progs" hostmakedepends="automake libtool pkg-config" @@ -10,8 +10,8 @@ short_desc="CD paranoia utility/libraries from libcdio" maintainer="Juan RP " license="GPL-3" homepage="http://www.gnu.org/software/libcdio/" -distfiles="http://ftp.gnu.org/gnu/libcdio/$pkgname-$version.tar.gz" -checksum=4617792b4eb301de45b61732bdc0617447ad06b53068ae45db37695275c0dd4c +distfiles="${GNU_SITE}/libcdio/$pkgname-$version.tar.bz2" +checksum=ec1d9b1d5a28cc042f2cb33a7cc0a2b5ce5525f102bc4c15db1fac322559a493 pre_configure() { autoreconf -fi diff --git a/srcpkgs/libcdio/template b/srcpkgs/libcdio/template index bac8a94cc6..9ea0e294c5 100644 --- a/srcpkgs/libcdio/template +++ b/srcpkgs/libcdio/template @@ -1,7 +1,7 @@ # Template file for 'libcdio' pkgname=libcdio version=0.93 -revision=2 +revision=3 build_style=gnu-configure hostmakedepends="automake libtool pkg-config" makedepends="ncurses-devel libcddb-devel" @@ -9,8 +9,8 @@ short_desc="CD-ROM access library" maintainer="Juan RP " license="GPL-3" homepage="http://www.gnu.org/software/libcdio/" -distfiles="http://ftp.gnu.org/gnu/libcdio/$pkgname-$version.tar.gz" -checksum=4972cd22fd8d0e8bff922d35c7a645be0db0ab0e7b3dfaecc9cd8272429d6975 +distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.bz2" +checksum=f8276629226c7e1e74209b66ca421d09d6aec87f72f60ae9b1d3debd0a13dda8 pre_configure() { autoreconf -fi diff --git a/srcpkgs/libextractor/template b/srcpkgs/libextractor/template index abc9c3c956..12aed62377 100644 --- a/srcpkgs/libextractor/template +++ b/srcpkgs/libextractor/template @@ -1,12 +1,12 @@ # Template file for 'libextractor' pkgname=libextractor version=1.3 -revision=2 +revision=3 short_desc="Library used to extract meta data from files" maintainer="Martin Riese " license="GPL-3" homepage="http://www.gnu.org/software/libextractor/" -distfiles="http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${version}.tar.gz" +distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.gz" checksum=868ad64c9a056d6b923d451d746935bffb1ddf5d89c3eb4f67d786001a3f7b7f build_style=gnu-configure configure_args="--disable-static" diff --git a/srcpkgs/libidn/template b/srcpkgs/libidn/template index 109aabea50..8fc58a6857 100644 --- a/srcpkgs/libidn/template +++ b/srcpkgs/libidn/template @@ -1,7 +1,7 @@ # Template build file for 'libidn'. pkgname=libidn version=1.30 -revision=3 +revision=4 build_style=gnu-configure configure_args="--disable-csharp --disable-java --disable-static --enable-threads=posix" hostmakedepends="perl pkg-config automake libtool gettext-devel" @@ -9,7 +9,7 @@ short_desc="Internationalized string handling library" maintainer="Juan RP " homepage="http://www.gnu.org/software/libidn/" license="GPL-3, LGPL-2.1" -distfiles="http://ftp.gnu.org/gnu/libidn/libidn-${version}.tar.gz" +distfiles="${GNU_SITE}/libidn/libidn-${version}.tar.gz" checksum=39b9fc94d74081c185757b12e0891ce5a22db55268e7d1bb24533ff4432eb053 pre_configure() { diff --git a/srcpkgs/libtasn1/template b/srcpkgs/libtasn1/template index 9b97e0eef2..636bd1b1b9 100644 --- a/srcpkgs/libtasn1/template +++ b/srcpkgs/libtasn1/template @@ -1,14 +1,14 @@ # Template build file for 'libtasn1'. pkgname=libtasn1 version=4.5 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="perl" short_desc="ASN.1 structure parser library" maintainer="Juan RP " homepage="http://www.gnu.org/software/libtasn1/" license="GPL-3, LGPL-2.1" -distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz" +distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.gz" checksum=89b3b5dce119273431544ecb305081f3530911001bb12e5d76588907edb71bda libtasn1-devel_package() { diff --git a/srcpkgs/m4/template b/srcpkgs/m4/template index 66c086456d..729cee63fb 100644 --- a/srcpkgs/m4/template +++ b/srcpkgs/m4/template @@ -1,7 +1,7 @@ # Template build file for 'm4'. pkgname=m4 version=1.4.17 -revision=1 +revision=2 bootstrap=yes replaces="chroot-m4>=0" build_style=gnu-configure @@ -10,5 +10,5 @@ short_desc="GNU version of UNIX m4 macro language processor" homepage="https://www.gnu.org/software/m4/" license="GPL-3" maintainer="Juan RP " -distfiles="http://ftp.gnu.org/gnu/m4/$pkgname-$version.tar.bz2" -checksum=8e4e1f963932136ed45dcd5afb0c6e237e96a6fcdcd2a2fa6755040859500d70 +distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.xz" +checksum=f0543c3beb51fa6b3337d8025331591e0e18d8ec2886ed391f1aade43477d508 diff --git a/srcpkgs/mtools/template b/srcpkgs/mtools/template index 3312e10694..263ca1ff08 100644 --- a/srcpkgs/mtools/template +++ b/srcpkgs/mtools/template @@ -1,7 +1,7 @@ # Template file for 'mtools' pkgname=mtools version=4.0.18 -revision=1 +revision=2 build_style=gnu-configure makedepends="acl-devel" conf_files="/etc/mtools.conf" @@ -9,7 +9,7 @@ short_desc="A collection of utilities to access MS-DOS disks" maintainer="Juan RP " license="GPL-2" homepage="http://www.gnu.org/software/mtools" -distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.bz2" +distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.bz2" checksum=59e9cf80885399c4f229e5d87e49c0c2bfeec044e1386d59fcd0b0aead6b2f85 post_install() { diff --git a/srcpkgs/nettle/template b/srcpkgs/nettle/template index 9d021211c6..d388f5fd81 100644 --- a/srcpkgs/nettle/template +++ b/srcpkgs/nettle/template @@ -2,7 +2,7 @@ pkgname=nettle version=2.7.1 reverts=3.0_1 -revision=4 +revision=5 build_style=gnu-configure hostmakedepends="m4" makedepends="gmp-devel" @@ -11,7 +11,7 @@ short_desc="A low-level cryptographic library" maintainer="Juan RP " homepage="http://www.lysator.liu.se/~nisse/nettle/" license="GPL-2" -distfiles="http://ftp.gnu.org/gnu/nettle/nettle-${version}.tar.gz" +distfiles="${GNU_SITE}/$pkgname/$pkgname-${version}.tar.gz" checksum=bc71ebd43435537d767799e414fce88e521b7278d48c860651216e1fc6555b40 nettle-devel_package() { diff --git a/srcpkgs/parallel/template b/srcpkgs/parallel/template index 85a0939c26..a8d13bec3d 100644 --- a/srcpkgs/parallel/template +++ b/srcpkgs/parallel/template @@ -1,15 +1,15 @@ # Template file for 'parallel' pkgname=parallel version=20150322 -revision=1 +revision=2 noarch=yes build_style=gnu-configure depends="perl" short_desc="Shell tool for executing jobs in parallel" -maintainer="graysky " +maintainer="graysky " homepage="http://www.gnu.org/software/parallel/" license="GPL-3" -distfiles="http://ftp.gnu.org/gnu/parallel/parallel-${version}.tar.bz2" +distfiles="${GNU_SITE}/$pkgname/$pkgname-${version}.tar.bz2" checksum=2c00799cbbc07a57b4c1411bb9fb787ef2d2f6d1ff491093258baf4fda0a52ff pre_configure() { diff --git a/srcpkgs/parted/template b/srcpkgs/parted/template index 192fb121ce..b69539c193 100644 --- a/srcpkgs/parted/template +++ b/srcpkgs/parted/template @@ -1,7 +1,7 @@ # Template file for 'parted' pkgname=parted version=3.2 -revision=2 +revision=3 build_style=gnu-configure # parted wants off_t as 64bit type configure_args="ac_cv_sizeof_off_t=8" @@ -11,7 +11,7 @@ short_desc="The GNU Parted disk partition resizing program" homepage="http://www.gnu.org/software/parted/" license="GPL-3" maintainer="Juan RP " -distfiles="http://ftp.gnu.org/gnu/parted/parted-$version.tar.xz" +distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.xz" checksum=858b589c22297cacdf437f3baff6f04b333087521ab274f7ab677cb8c6bb78e4 libparted_package() { diff --git a/srcpkgs/patch/template b/srcpkgs/patch/template index d224ce9ee7..c93add05f4 100644 --- a/srcpkgs/patch/template +++ b/srcpkgs/patch/template @@ -1,7 +1,7 @@ # Template file for 'patch' pkgname=patch version=2.7.5 -revision=1 +revision=2 bootstrap=yes build_pie=yes build_style=gnu-configure @@ -10,5 +10,5 @@ short_desc="Patch files using diff output" maintainer="Juan RP " homepage="http://www.gnu.org/software/patch/patch.html" license="GPL-3" -distfiles="http://ftp.gnu.org/gnu/patch/patch-$version.tar.xz" +distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.xz" checksum=fd95153655d6b95567e623843a0e77b81612d502ecf78a489a4aed7867caa299 diff --git a/srcpkgs/readline/template b/srcpkgs/readline/template index 8c5b06b197..b82db9e0df 100644 --- a/srcpkgs/readline/template +++ b/srcpkgs/readline/template @@ -3,7 +3,7 @@ pkgname=readline _dist_ver=6.3 _patch_ver=008 version=${_dist_ver}.${_patch_ver} -revision=2 +revision=3 wrksrc=${pkgname}-${_dist_ver} build_style=gnu-configure configure_args="--with-curses --enable-multibyte" @@ -12,11 +12,11 @@ short_desc="The GNU Readline Library" maintainer="Juan RP " homepage="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html" license="GPL-3" -distfiles="http://ftp.gnu.org/gnu/readline/${pkgname}-${_dist_ver}.tar.gz" +distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${_dist_ver}.tar.gz" checksum=56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43 pre_configure() { - local url="http://ftp.gnu.org/gnu/$pkgname/$pkgname-${_dist_ver}-patches" + local url="${GNU_SITE}/$pkgname/$pkgname-${_dist_ver}-patches" cd ${XBPS_SRCDISTDIR}/${pkgname}-${version} if [ "${_patch_ver}" -gt 000 ]; then diff --git a/srcpkgs/screen/template b/srcpkgs/screen/template index 4810fa0123..f0367c20fe 100644 --- a/srcpkgs/screen/template +++ b/srcpkgs/screen/template @@ -1,7 +1,7 @@ # Template file for 'screen' pkgname=screen version=4.2.1 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-sys-screenrc=/etc/screenrc --enable-pam --enable-colors256 --enable-rxvt_osc --enable-telnet @@ -12,7 +12,7 @@ short_desc="GNU screen manager with VT100/ANSI terminal emulation" maintainer="Juan RP " homepage="http://www.gnu.org/s/screen/" license="GPL-3" -distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz" +distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.gz" checksum=5468545047e301d2b3579f9d9ce00466d14a7eec95ce806e3834a3d6b0b9b080 post_install() { diff --git a/srcpkgs/sed/template b/srcpkgs/sed/template index 8849f677d9..5701a35024 100644 --- a/srcpkgs/sed/template +++ b/srcpkgs/sed/template @@ -1,7 +1,7 @@ # Template file for 'sed' pkgname=sed version=4.2.2 -revision=9 +revision=10 bootstrap=yes build_pie=yes build_style=gnu-configure @@ -12,5 +12,5 @@ short_desc="The GNU stream editor" maintainer="Juan RP " license="GPL-3" homepage="http://www.gnu.org/software/sed" -distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz" -checksum=fea0a94d4b605894f3e2d5572e3f96e4413bcad3a085aae7367c2cf07908b2ff +distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.bz2" +checksum=f048d1838da284c8bc9753e4506b85a1e0cc1ea8999d36f6995bcb9460cddbd7 diff --git a/srcpkgs/sharutils/template b/srcpkgs/sharutils/template index e5af5c6caf..cd6af25f77 100644 --- a/srcpkgs/sharutils/template +++ b/srcpkgs/sharutils/template @@ -1,7 +1,7 @@ # Template file for 'sharutils' pkgname=sharutils version=4.15.1 -revision=1 +revision=2 build_pie=yes build_style=gnu-configure hostmakedepends="perl" @@ -9,5 +9,5 @@ short_desc="Makes so-called shell archives out of many files" maintainer="Juan RP " license="GPL-3" homepage="http://www.gnu.org/software/sharutils" -distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz" -checksum=cb7a0dca1f059071b51424f8ff2ee9d805f29cf26491f6494154d63f9d17d47e +distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.xz" +checksum=b92ce637dbf95a69888ba70a55ecc8b527417fee9b518316eb7c650e8e90e70a diff --git a/srcpkgs/source-highlight/template b/srcpkgs/source-highlight/template index 16cbcf2ae0..adb3b9e0de 100644 --- a/srcpkgs/source-highlight/template +++ b/srcpkgs/source-highlight/template @@ -1,7 +1,7 @@ # Template file for 'source-highlight' pkgname=source-highlight version=3.1.8 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-boost=${XBPS_CROSS_BASE}/usr --with-bash-completion=/usr/share/bash-completion/completions" @@ -10,7 +10,7 @@ short_desc="Convert source code to syntax highlighted document" maintainer="Juan RP " license="GPL-3" homepage="http://www.gnu.org/software/src-highlite/" -distfiles="http://ftp.gnu.org/gnu/src-highlite/$pkgname-$version.tar.gz" +distfiles="${GNU_SITE}/src-highlite/$pkgname-$version.tar.gz" checksum=01336a7ea1d1ccc374201f7b81ffa94d0aecb33afc7d6903ebf9fbf33a55ada3 if [ "$CROSS_BUILD" ]; then diff --git a/srcpkgs/texinfo/template b/srcpkgs/texinfo/template index e6d0a1c467..8862514758 100644 --- a/srcpkgs/texinfo/template +++ b/srcpkgs/texinfo/template @@ -1,7 +1,7 @@ # Template file for 'texinfo' pkgname=texinfo version=5.2 -revision=1 +revision=2 hostmakedepends="perl ncurses-devel" makedepends="ncurses-devel" conflicts="chroot-texinfo>=0" @@ -10,15 +10,15 @@ short_desc="The GNU Documentation System" maintainer="Juan RP " license="GPL-3" homepage="http://www.gnu.org/software/texinfo/" -distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz" -checksum=6b8ca30e9b6f093b54fe04439e5545e564c63698a806a48065c0bba16994cf74 +distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.xz" +checksum=5471ef683a64588a7cfef46ef2bdd3fbcbca89d847e10832612293f105e44eda do_configure() { ./configure ${configure_args} } do_build() { - if [ -d tools ]; then - make ${makejobs} -C tools/gnulib/lib + if [ -d tools ]; then + make ${makejobs} -C tools/gnulib/lib make ${makejobs} -C tools fi make ${makejobs} diff --git a/srcpkgs/wget/template b/srcpkgs/wget/template index 2635c0b4ba..82ef236b18 100644 --- a/srcpkgs/wget/template +++ b/srcpkgs/wget/template @@ -1,7 +1,7 @@ # Template file for 'wget' pkgname=wget version=1.16.3 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-ssl=openssl" hostmakedepends="perl pkg-config" @@ -12,8 +12,8 @@ short_desc="The GNU wget download utility" maintainer="Juan RP " homepage="http://www.gnu.org/software/wget/wget.html" license="GPL-3" -distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz" -checksum=9f1c6d09d7148c1c2d9fd0ea655dcf4dcc407deb2db32d4126251ca0245cb670 +distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.xz" +checksum=67f7b7b0f5c14db633e3b18f53172786c001e153d545cfc85d82759c5c2ffb37 post_install() { echo "ca_certificate=/etc/ssl/certs/ca-certificates.crt" >> ${DESTDIR}/etc/wgetrc diff --git a/srcpkgs/which/template b/srcpkgs/which/template index 345fd8f0c5..0bbe107cdf 100644 --- a/srcpkgs/which/template +++ b/srcpkgs/which/template @@ -1,7 +1,7 @@ # Template file for 'which' pkgname=which version=2.21 -revision=1 +revision=2 bootstrap=yes build_pie=yes build_style=gnu-configure @@ -9,5 +9,5 @@ short_desc="Displays where a particular program in your path is located" maintainer="Juan RP " homepage="http://savannah.gnu.org/projects/which" license="GPL-3" -distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz" +distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.gz" checksum=f4a245b94124b377d8b49646bf421f9155d36aa7614b6ebf83705d3ffc76eaad diff --git a/srcpkgs/zile/template b/srcpkgs/zile/template index bf332949b8..33b0a19c68 100644 --- a/srcpkgs/zile/template +++ b/srcpkgs/zile/template @@ -1,7 +1,7 @@ # Template file for 'zile' pkgname=zile version=2.4.11 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="help2man pkg-config" makedepends="acl-devel gc-devel ncurses-devel" @@ -9,5 +9,5 @@ short_desc="A small, fast, and powerful Emacs clone" maintainer="Juan RP " license="GPL-3" homepage="http://www.gnu.org/software/zile" -distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz" +distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.gz" checksum=1fd27bbddc61491b1fbb29a345d0d344734aa9e80cfa07b02892eedf831fa9cc