diff --git a/bin/xbps-src/main.sh b/bin/xbps-src/main.sh index 20f21446a3c..a187a0de13c 100755 --- a/bin/xbps-src/main.sh +++ b/bin/xbps-src/main.sh @@ -37,7 +37,7 @@ trap "echo && exit 1" INT QUIT usage() { cat << _EOF -$progname: [-C] [-c ] +$progname: [-C] [-c ] [-u] Targets: build Build a package (fetch + extract + configure + build). @@ -68,6 +68,7 @@ Options: -C Do not remove build directory after successful installation. -c Path to global configuration file: if not specified @@XBPS_INSTALL_ETCDIR@@/xbps.conf is used. + -u Update the checksum in template file if used in 'fetch' target. _EOF exit 1 } @@ -158,10 +159,11 @@ check_config_vars() # # main() # -while getopts "Cc:" opt; do +while getopts "Cc:u" opt; do case $opt in C) dontrm_builddir=yes;; c) config_file_specified=yes; XBPS_CONFIG_FILE="$OPTARG";; + u) update_checksum=yes;; --) shift; break;; esac done @@ -220,6 +222,12 @@ build-pkg) . $XBPS_SHUTILSDIR/tmpl_funcs.sh if [ "$2" = "all" ]; then for f in $($XBPS_BIN_CMD list|awk '{print $1}'); do + version=$($XBPS_REGPKGDB_CMD version $f) + if [ ! -d $XBPS_DESTDIR/$f-$version ]; then + echo -n "Ignoring $f-$version, no destination " + echo "directory!" + continue + fi setup_tmpl $f xbps_make_binpkg reset_tmpl_vars @@ -243,7 +251,7 @@ extract|fetch|info) fi if [ "$target" = "fetch" ]; then . $XBPS_SHUTILSDIR/fetch_funcs.sh - fetch_distfiles $2 + fetch_distfiles $2 $update_checksum exit $? fi . $XBPS_SHUTILSDIR/extract_funcs.sh diff --git a/lib/depends.c b/lib/depends.c index fed81bc5a87..a7f51f195a0 100644 --- a/lib/depends.c +++ b/lib/depends.c @@ -476,9 +476,6 @@ again: prop_dictionary_get_cstring_nocopy(dict, "pkgname", &curname); prop_dictionary_get_cstring_nocopy(dict, "requiredby", &reqby); - printf("[%s] %s requiredby %s prio %u\n", - strcmp(array_key, "indirect_deps") == 0 ? "INDIRECT" : "DIRECT", - curname, reqby, maxprio); prop_array_remove(array, curidx); if (prop_array_count(array) > 0) { diff --git a/shutils/fetch_funcs.sh b/shutils/fetch_funcs.sh index b7c4f2e2a20..718fec2382c 100644 --- a/shutils/fetch_funcs.sh +++ b/shutils/fetch_funcs.sh @@ -42,12 +42,22 @@ verify_sha256_cksum() msg_normal "SHA256 checksum OK for $file." } +fetch_update_cksum() +{ + local tmpl="$XBPS_TEMPLATESDIR/$pkgname/template" + local upcmd=$(basename $XBPS_SRCDISTDIR/$1) + + sed -i -e "s|checksum.*|checksum=$(xbps-digest ${upcmd})|" $tmpl + return $? +} + # # Downloads the distfiles and verifies checksum for all them. # fetch_distfiles() { local pkg="$1" + local upcksum="$2" local dfiles= local localurl= local dfcount=0 @@ -106,6 +116,12 @@ fetch_distfiles() fi else unset localurl + + if [ -n "$upcksum" ]; then + fetch_update_cksum $f + break + fi + # # XXX duplicate code. # diff --git a/shutils/tmpl_vars.sh b/shutils/tmpl_vars.sh index cf81a8e5578..e4b8f656f7d 100644 --- a/shutils/tmpl_vars.sh +++ b/shutils/tmpl_vars.sh @@ -4,3 +4,4 @@ SOURCEFORGE_SITE="http://downloads.sourceforge.net/sourceforge" UBUNTU_SITE="http://archive.ubuntu.com/ubuntu/pool" +XORG_SITE="http://xorg.freedesktop.org/releases/individual" diff --git a/templates/bigreqsproto/template b/templates/bigreqsproto/template index 59f716027eb..7169e2695cc 100644 --- a/templates/bigreqsproto/template +++ b/templates/bigreqsproto/template @@ -1,12 +1,9 @@ -# Template file for 'bigreqsproto' pkgname=bigreqsproto version=1.0.2 -distfiles=" -http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version.tar.bz2" +distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2" build_style=gnu_configure -pkgconfig_override="bigreqsproto.pc" short_desc="BigReqs extension headers from modular Xorg X11" maintainer="Juan RP " -checksum=153bc6e44f7e41743c7a9607173fc2c52301bda4 +checksum=30da0098a24578e645193464526cc4d5c2c7fecaf476d1b9dabe68118850adee long_desc=" BigReqs extension headers from modular Xorg X11." diff --git a/templates/compositeproto/template b/templates/compositeproto/template index d87e8109743..ed05a303205 100644 --- a/templates/compositeproto/template +++ b/templates/compositeproto/template @@ -1,13 +1,10 @@ -# Template build file for 'compositeproto'. pkgname=compositeproto version=0.4 -distfiles=" -http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version.tar.bz2" +distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2" build_style=gnu_configure -pkgconfig_override="compositeproto.pc" short_desc="Composite extension headers from modular X.org" maintainer="Juan RP " -checksum=d1a90417a3aae555bdb8905bb40ab1452204e10c +checksum=6013d1ca63b2b7540f6f99977090812b899852acfbd9df123b5ebaa911e30003 long_desc=" This package provides Composite extension headers from the modular X.org X11 project." diff --git a/templates/damageproto/template b/templates/damageproto/template index 97bba47f80c..162f616940f 100644 --- a/templates/damageproto/template +++ b/templates/damageproto/template @@ -1,13 +1,10 @@ -# Template build file for 'damageproto'. pkgname=damageproto version=1.1.0 -distfiles=" -http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version.tar.bz2" +distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2" build_style=gnu_configure -pkgconfig_override="damageproto.pc" short_desc="Damage extension headers from modular X.org" maintainer="Juan RP " -checksum=03b5c7a82e71cdb81fbce9e771f9349caf7c4d34 +checksum=9d2684fac835e9cdf78befff2a58292f54db90094acbfb9f2ed5316fa30d641d long_desc=" This package contains header files and documentation for the X Damage extension of X RandR. This is from the modular X.org X11 project." diff --git a/templates/dmxproto/template b/templates/dmxproto/template index 210505cf580..539d7a993ab 100644 --- a/templates/dmxproto/template +++ b/templates/dmxproto/template @@ -1,13 +1,10 @@ -# Template build file for 'dmxproto'. pkgname=dmxproto version=2.2.2 -distfiles=" -http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version.tar.bz2" +distfiles="${XORG_SITE}/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" maintainer="Juan RP " -checksum=bee5ca279861afb9e38b6495d53087d412f417a8 +checksum=aaa6d9c9d5ec58f733ca4d7413c541413482bce666217267e5bf88442e35fce2 long_desc=" Distributed Multi-headed X protocol headers from modular X.org: \"your networked Xinerama\"." diff --git a/templates/evieext/template b/templates/evieext/template index 3aa2e7091cd..f3b0cd35844 100644 --- a/templates/evieext/template +++ b/templates/evieext/template @@ -1,13 +1,10 @@ -# Template build file for 'evieext'. pkgname=evieext version=1.0.2 -distfiles=" -http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version.tar.bz2" +distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2" build_style=gnu_configure -pkgconfig_override="evieproto.pc" short_desc="EvIE extension headers" maintainer="Juan RP " -checksum=15b04f79cbae05b39a3333695ea362d709a8042c +checksum=0b85113a9770083715927f9c7a7d0ab354c8a508a91cb6e8e11130851494d125 long_desc=" This package provides the X11 Event Interception extension (EvIE) headers from modular X.org." diff --git a/templates/fixesproto/template b/templates/fixesproto/template index 7e1a957fb1d..309b2b7ce6f 100644 --- a/templates/fixesproto/template +++ b/templates/fixesproto/template @@ -1,13 +1,10 @@ -# Template build file for 'fixesproto'. pkgname=fixesproto version=4.0 -distfiles=" -http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version.tar.bz2" +distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2" build_style=gnu_configure -pkgconfig_override="fixesproto.pc" short_desc="Fixes extension headers from X.org" maintainer="Juan RP " -checksum=fc1c2130ae89a88365cb039a5e9ffb8c6651c16e +checksum=b3fe971ccc8152db6c78da7117c31fc4cd2fcb2b6a4df3db0f8fed13d4ceb08f long_desc=" This provides the Fixes extension headers from modular X.org X11 project." diff --git a/templates/fontcacheproto/template b/templates/fontcacheproto/template index adb3fc4e157..5b2d3293613 100644 --- a/templates/fontcacheproto/template +++ b/templates/fontcacheproto/template @@ -1,13 +1,10 @@ -# Template build file for 'fontcacheproto'. pkgname=fontcacheproto version=0.1.2 -distfiles=" -http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version.tar.bz2" +distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2" build_style=gnu_configure -pkgconfig_override="fontcacheproto.pc" short_desc="Fontcache extension headers from X.org" maintainer="Juan RP " -checksum=8873d1dd45a39c42e44d7f3f7e6bd779ee40462b +checksum=48063ed49b200927376645f9ffe65faa39af84d59ba6f60f2abb2f9c6fa3d9f9 long_desc=" This package provides the Fontcache extension headers from the modular X.org X11 project." diff --git a/templates/fontconfig/fontconfig-Makefile-fc-cache.diff b/templates/fontconfig/install.diff similarity index 100% rename from templates/fontconfig/fontconfig-Makefile-fc-cache.diff rename to templates/fontconfig/install.diff diff --git a/templates/fontconfig/template b/templates/fontconfig/template index b025592fcd9..52976e54c2b 100644 --- a/templates/fontconfig/template +++ b/templates/fontconfig/template @@ -1,16 +1,11 @@ -# Template build file for 'fontconfig'. pkgname=fontconfig version=2.6.0 -patch_files="$pkgname-Makefile-fc-cache.diff" 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" -make_cmd="$XBPS_MASTERDIR/bin/gmake" -pkgconfig_override="fontconfig.pc" +configure_args="--enable-docs --with-cache-dir=/var/cache/$pkgname" short_desc="Library for configuring and customizing font access" maintainer="Juan RP " -checksum=2fea7fa3fe1757b58ce53c4225b9f8e6ec7507bf +checksum=a9a639eaa0e5666606a4657cc1494eb6df820fac7e5a2aa0c3f7e703b7c8d8a5 long_desc=" Fontconfig is a library for configuring and customizing font access. @@ -39,3 +34,7 @@ long_desc=" # Run fc-cache once installed. postinstall_helpers="fontconfig-update.sh" + +shared_deps="expat-2.0 freetype-2.3.8" +build_depends="pkg-config-0.23 ${shared_deps}" +run_depends="glibc-2.8 ${shared_deps}" diff --git a/templates/fontsproto/template b/templates/fontsproto/template index 195e4d30d71..e4a599e0f48 100644 --- a/templates/fontsproto/template +++ b/templates/fontsproto/template @@ -1,13 +1,10 @@ -# Template build file for 'fontsproto'. pkgname=fontsproto version=2.0.2 -distfiles=" -http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version.tar.bz2" +distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2" build_style=gnu_configure -pkgconfig_override="fontsproto.pc" short_desc="Fonts extension headers from X.org" maintainer="Juan RP " -checksum=ca0f656316425d4ed85a7486c7917defb2242910 +checksum=83bd547131aa11a232717a0f06d3c6cd58a0b2f6d541660bbe9ebf43073a8b7b long_desc=" This package provides the fonts extension headers from the modular X.org X11 project." diff --git a/templates/freetype2/template b/templates/freetype/template similarity index 65% rename from templates/freetype2/template rename to templates/freetype/template index 0381271c3f0..29fdb0044dd 100644 --- a/templates/freetype2/template +++ b/templates/freetype/template @@ -1,16 +1,11 @@ -# Template build file for 'freetype2'. -pkgname=freetype2 -version=2.3.7 -wrksrc="freetype-$version" +pkgname=freetype +version=2.3.8 distfiles=" -http://download.savannah.gnu.org/releases/freetype/freetype-$version.tar.bz2" +http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$version.tar.bz2" build_style=gnu_configure -make_cmd="$XBPS_MASTERDIR/bin/gmake" -configure_env="GNUMAKE=$make_cmd" -pkgconfig_override="freetype2.pc" short_desc="Font rendering engine and library API" maintainer="Juan RP " -checksum=7333507c5f42d451bf0541f007fe44165f090418 +checksum=8acd37c9160a5bdbe73ba925a4e534a5b6d164d95edd0335191c015aea5351e6 long_desc=" FreeType is a portable, high-quality software solution for digital typography. FreeType 1.3.1 was the last release of the FreeType 1 @@ -21,3 +16,6 @@ long_desc=" * Support for several font formats through loadable drivers * Even more portable * An improved anti-aliasing algorithm" + +build_depends="pkg-config-0.23" +run_depends="glibc-2.8 zlib-1.2" diff --git a/templates/gcc/template b/templates/gcc/template index 15ddd13aebc..48dc5fd6e60 100644 --- a/templates/gcc/template +++ b/templates/gcc/template @@ -18,8 +18,8 @@ long_desc=" The GNU C Compiler suite, with support for C, C++, Fortran, ObjC." base_chroot=yes -build_depends="mpfr-2.3.2 binutils-2.18" -run_depends="glibc-2.8 mpfr-2.3.2" +build_depends="gmp-4.2.4 mpfr-2.3.2 binutils-2.18" +run_depends="glibc-2.8 $build_depends" # As specified in the LFS book, disable installing libiberty. pre_configure() diff --git a/templates/glproto/template b/templates/glproto/template index ba0e0fba538..b980c2cdf28 100644 --- a/templates/glproto/template +++ b/templates/glproto/template @@ -1,12 +1,9 @@ -# Template build file for 'glproto'. pkgname=glproto version=1.4.9 -distfiles=" -http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version.tar.bz2" +distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2" build_style=gnu_configure -pkgconfig_override="glproto.pc" short_desc="GL extension headers" maintainer="Juan RP " -checksum=54c08968532bccfbd666eafc2cb4132432096d10 +checksum=69d7fb7be4f0f56bd3a67b6c8c88dc677892eb99fd1b13e166b43b39d64764a3 long_desc=" This package provides the GL extension headers from modular X.org." diff --git a/templates/helpers/fontconfig-update.sh b/templates/helpers/fontconfig-update.sh index 7191d03ed0e..b52ec8fddf9 100644 --- a/templates/helpers/fontconfig-update.sh +++ b/templates/helpers/fontconfig-update.sh @@ -3,7 +3,7 @@ # and update its list of fonts. # -if [ -x $XBPS_MASTERDIR/bin/fc-cache ]; then - $XBPS_MASTERDIR/bin/fc-cache -f +if [ -x /usr/bin/fc-cache ]; then + /usr/bin/fc-cache -f [ "$?" -eq 0 ] && echo "=> Updated fontconfig fonts cache." fi diff --git a/templates/inputproto/template b/templates/inputproto/template index 077e9c2df57..70ee24a2797 100644 --- a/templates/inputproto/template +++ b/templates/inputproto/template @@ -1,12 +1,9 @@ -# Template file for 'inputproto' pkgname=inputproto version=1.4.4 -distfiles=" -http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version.tar.bz2" +distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2" build_style=gnu_configure -pkgconfig_override="inputproto.pc" short_desc="Input extension headers from X.org" maintainer="Juan RP " -checksum=771db687cab6f2e77f36e3efd1bc4793c73b152b +checksum=63278ef492d6babb9e3efaef84a67a982e5362c51623714c9428f0384007dfe5 long_desc=" This provides the input extension headers from modular X.org X11 project." diff --git a/templates/irssi/template b/templates/irssi/template index c7d911c5568..f97f749bd78 100644 --- a/templates/irssi/template +++ b/templates/irssi/template @@ -18,4 +18,4 @@ long_desc=" conf_files="/etc/irssi.conf" build_depends="glib-2.18.2 perl-5.10.0 openssl-0.9.8i ncurses-5.6" -run_depends="glib-2.18.2 openssl-0.9.8i ncurses-5.6" +run_depends="glibc-2.8 $build_depends" diff --git a/templates/kbproto/template b/templates/kbproto/template index 3d35293d242..e68b0b37fa3 100644 --- a/templates/kbproto/template +++ b/templates/kbproto/template @@ -1,12 +1,9 @@ -# Template file for 'kbproto' pkgname=kbproto version=1.0.3 -distfiles=" -http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version.tar.bz2" +distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2" build_style=gnu_configure -pkgconfig_override="kbproto.pc" short_desc="KB extension headers from X.org" maintainer="Juan RP " -checksum=6547c6482a30c2b7feac09d71e9cc60dd97bc8b4 +checksum=7000005ebbd07a28a71477d72bcb76c47064e043a4ead26fcf4d5af394ce19df long_desc=" This provides the KB extension headers from modular X.org X11 project." diff --git a/templates/libICE/template b/templates/libICE/template index 0b8eebbdb7f..1046a3535e1 100644 --- a/templates/libICE/template +++ b/templates/libICE/template @@ -1,15 +1,15 @@ -# Template build file for 'libICE'. pkgname=libICE version=1.0.4 -distfiles=" -http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version.tar.bz2" +distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2" build_style=gnu_configure -pkgconfig_override="ice.pc" short_desc="Inter Client Exchange (ICE) library for X" maintainer="Juan RP " -checksum=cb83eafe547a04586877ffffa8d07e1dc9fcd613 +checksum=13055e2f4c645cbd135ce97a7974a5866f9ba3ed8988e686b552f55c30514f04 long_desc=" This package contains library and header files for the ICE extension for X. This is the Inter Client Exchange library. This is part of modular X.org project." + +build_depends="pkg-config-0.23 xtrans-1.2" +run_depends="glibc-2.8" diff --git a/templates/libSM/template b/templates/libSM/template index 89279c1721c..0fea3007ae8 100644 --- a/templates/libSM/template +++ b/templates/libSM/template @@ -1,14 +1,14 @@ -# Template build file for 'libSM'. pkgname=libSM version=1.1.0 -distfiles=" -http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version.tar.bz2" +distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2" build_style=gnu_configure -configure_args="--without-libuuid" -pkgconfig_override="sm.pc" short_desc="X Session Management Library" maintainer="Juan RP " -checksum=17edd4f1e931058f86ccdff17829115d2c1f5bad +checksum=7536ac382e1ff82014d3a0defba0c61b3a30984f4e5bc7707960d6debcb92a82 long_desc=" This package contains the library and header files for the X Session Management Library. This is from the modular X.org project." + +shared_deps="libICE-1.0 e2fsprogs-1.41" +build_depends="pkg-config-0.23 xtrans-1.2 ${shared_deps}" +run_depends="glibc-2.8 ${shared_deps}" diff --git a/templates/libX11/template b/templates/libX11/template index 98d6ad5da2b..400f95d1302 100644 --- a/templates/libX11/template +++ b/templates/libX11/template @@ -1,21 +1,19 @@ -# Template file for 'libX11' pkgname=libX11 version=1.1.5 -distfiles=" -http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version.tar.bz2" +distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2" build_style=gnu_configure -pkgconfig_override="x11.pc" -make_cmd="$XBPS_MASTERDIR/bin/gmake" -configure_args="--enable-man-pages=3 --without-xcb - --disable-malloc0returnsnull --enable-loadable-i18n - --datarootdir=$XBPS_DESTDIR/$pkgname-$version/share" -make_install_args=" - X11_LOCALELIBDIR=$XBPS_DESTDIR/$pkgname-$version/lib/X11/locale" +configure_args="--mandir=/usr/share/man --without-xcb" +make_install_target="install DESTDIR=$XBPS_DESTDIR/$pkgname-$version" short_desc="Base X libraries from modular Xorg X11" maintainer="Juan RP " -checksum=78567a999640851e7daba1ab44603ec099d0b619 +checksum=da9272900e41615e9c5dc25d84730b8966da6f5c8f4c40418dca2ad040fc8b82 long_desc=" This is the libX11 library that is the C binding to the X protocol. It is the foundation of practically every X Window System program out there. This is from the modular X.org X11 project." + +shared_deps="libXdmcp-1.0 libXau-1.0" +build_depends="pkg-config-0.23 xproto-7.0 xextproto-7.0 xtrans-1.2 + xcmiscproto-1.1 kbproto-1.0 bigreqsproto-1.0 inputproto-1.4 ${shared_deps}" +run_depends="glibc-2.8 ${shared_deps}" diff --git a/templates/libXau/template b/templates/libXau/template index 79e7a7bd478..5f8255d1465 100644 --- a/templates/libXau/template +++ b/templates/libXau/template @@ -1,13 +1,13 @@ -# Template file for 'libXau' pkgname=libXau version=1.0.4 -distfiles=" -http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version.tar.bz2" +distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2" build_style=gnu_configure -pkgconfig_override="xau.pc" short_desc="Authorization Protocol for X from X.org" maintainer="Juan RP " -checksum=9ca0318c62b6bcf97b8460fd89b0788b07f459ca +checksum=10d3ffa5f00d0c0a4083309ba68bdfa01dfdf912ef4cf2141e3f260b2edeb22c long_desc=" LibXau is an authorization protocol for X from the modular X.org X11 project." + +build_depends="pkg-config-0.23" +run_depends="glibc-2.8" diff --git a/templates/libXaw/template b/templates/libXaw/template index 3d4bf5a5547..59461a58ac7 100644 --- a/templates/libXaw/template +++ b/templates/libXaw/template @@ -1,15 +1,16 @@ -# Template build file for 'libXaw'. pkgname=libXaw version=1.0.4 -distfiles=" -http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version.tar.bz2" +distfiles="${XORG_SITE}/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" maintainer="Juan RP " -checksum=face40c68b49aee9aa9149b963566c39fb6425cb +checksum=11f4ab184fb8dc853fd95238d4de7b251427dd036643d11fd2a669232fa35af9 long_desc=" Xaw is the X Athena Widget Set. Xaw is a widget set based on the X Toolkit Intrinsics (Xt) Library. This libXaw is from the modular Xorg X11." + +shared_deps="libX11-1.1 libXext-1.0 libXt-1.0 libXmu-1.0 libXpm-3.5" +build_depends="pkg-config-0.23 xproto-7.0 xextproto-7.0 ${shared_deps}" +run_depends="glibc-2.8 ${shared_deps}" diff --git a/templates/libXcursor/template b/templates/libXcursor/template index 3e8beb8342e..237f92a049c 100644 --- a/templates/libXcursor/template +++ b/templates/libXcursor/template @@ -1,16 +1,17 @@ -# Template build file for 'libXcursor'. pkgname=libXcursor -extract_sufx=".tar.bz2" -distfiles=" -http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version.tar.bz2" +version=1.1.9 +distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2" build_style=gnu_configure -pkgconfig_override="xcursor.pc" short_desc="Client-side cursor loading library for X" maintainer="Juan RP " -checksum=05101fb2a6c080f0b3cc24e46d1a07a2a358708f +checksum=1dffb3542271c8ce964066d561474caec5b639d6588b257b21cfb8225a15d2b4 long_desc=" This package, libXcursor, provides the client-side cursor loading library for X. This cursor management library is a simple library designed to help locate and load cursors (from files or memory). This is from the modular X.org project." + +shared_deps="libX11-1.1 libXrender-0.9 libXfixes-4.0" +build_depends="pkg-config-0.23 ${shared_deps}" +run_depends="glibc-2.8 ${shared_deps}" diff --git a/templates/libXdamage/template b/templates/libXdamage/template index 1e60dd10f3d..60e3f59de41 100644 --- a/templates/libXdamage/template +++ b/templates/libXdamage/template @@ -1,12 +1,13 @@ -# Template build file for 'libXdamage'. pkgname=libXdamage version=1.1.1 -distfiles=" -http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version.tar.bz2" +distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2" build_style=gnu_configure -pkgconfig_override="xdamage.pc" short_desc="Xdamage extension (Library)" maintainer="Juan RP " -checksum=90de272adbd42113869a8e4d36a51e2e4e576dc9 +checksum=0102754db23952a1c3adf7881bbf191f91ca3e3d183e1b0179452bce932fae2e long_desc=" This package contains the Xdamage extension." + +shared_deps="libX11-1.1 libXfixes-4.0" +build_depends="pkg-config-0.23 damageproto-1.1 ${shared_deps}" +run_depends="glibc-2.8 ${shared_deps}" diff --git a/templates/libXdmcp/template b/templates/libXdmcp/template index f863479c2ab..08c64a6ac06 100644 --- a/templates/libXdmcp/template +++ b/templates/libXdmcp/template @@ -1,13 +1,13 @@ -# Template file for 'libXdmcp' pkgname=libXdmcp version=1.0.2 -distfiles=" -http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version.tar.bz2" +distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2" build_style=gnu_configure -pkgconfig_override="xdmcp.pc" short_desc="X Display Manager Control Protocol library from X.org" maintainer="Juan RP " -checksum=b1172f757623bd5f3671692d0ae920205404792b +checksum=f3e50c1847599145c22784a2f15818821960652ee91d21d905817fb7c10f96a8 long_desc=" This is the X Display Manager Control Protocol library. This is from the modular X.org X11 project." + +build_depends="pkg-config-0.23" +run_depends="glibc-2.8" diff --git a/templates/libXext/template b/templates/libXext/template index 2154119f447..2bbe5e35af5 100644 --- a/templates/libXext/template +++ b/templates/libXext/template @@ -1,14 +1,14 @@ -# Template build file for 'libXext'. pkgname=libXext version=1.0.4 -distfiles=" -http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version.tar.bz2" +distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2" build_style=gnu_configure -configure_args="--disable-malloc0returnsnull" -pkgconfig_override="xext.pc" short_desc="X Extension library" maintainer="Juan RP " -checksum=c13e54d388f2fa91e09b221ca91a2ee281f10bbc +checksum=2dfd8eace1cafacc87b4055c57efeb771a740e24141d3f113de58c2a9eebd21f long_desc=" This package contains the X Extension library from the modular X.org X11 project." + +shared_deps="libX11-1.1" +build_depends="pkg-config-0.23 xproto-7.0 xextproto-7.0 ${shared_deps}" +run_depends="glibc-2.8 ${shared_deps}" diff --git a/templates/libXfixes/template b/templates/libXfixes/template index 5a6d994b55f..7961e2d3d87 100644 --- a/templates/libXfixes/template +++ b/templates/libXfixes/template @@ -1,13 +1,10 @@ -# Template build file for 'libXfixes'. pkgname=libXfixes version=4.0.3 -distfiles=" -http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version.tar.bz2" +distfiles="${XORG_SITE}/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" maintainer="Juan RP " -checksum=fdc587914cc2896ec380219a285548c84f08b256 +checksum=547e093c5037c4b85ce653ce26f5bd70a97b177f9b582f5351a626d8e0a829dd long_desc=" The X Fixes Extension provides workarounds for various limitations in the core protocol. The extension is designed to hold various @@ -16,3 +13,7 @@ long_desc=" This package provides the libXFixes library from the modular X.org X11 project." + +shared_deps="libX11-1.1" +build_depends="pkg-config-0.23 xproto-7.0 fixesproto-4.0 ${shared_deps}" +run_depends="glibc-2.8 ${shared_deps}" diff --git a/templates/libXfont/template b/templates/libXfont/template index 92af09a983e..911e0a3e20b 100644 --- a/templates/libXfont/template +++ b/templates/libXfont/template @@ -1,13 +1,15 @@ -# Template build file for 'libXfont'. pkgname=libXfont version=1.3.3 -distfiles=" -http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version.tar.bz2" +distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2" build_style=gnu_configure -pkgconfig_override="xfont.pc" short_desc="X font Library" maintainer="Juan RP " -checksum=f8fba81f41043c07ffa0e014ca8758fdcef7df06 +checksum=6171e6bca4bd6333611bd9c63cccc8e8e412d876c72097f0dddc490a9df51d5a long_desc=" This package provides the X font Library from the modular X.org X11 project." + +shared_deps="libfontenc-1.0 freetype-2.3.8 zlib-1.2" +build_depends="pkg-config-0.23 fontcacheproto-0.1 xtrans-1.2 fontsproto-2.0 + ${shared_deps}" +run_depends="glibc-2.8 ${shared_deps}" diff --git a/templates/libXft/template b/templates/libXft/template index 185eb101b49..c4b87918176 100644 --- a/templates/libXft/template +++ b/templates/libXft/template @@ -1,14 +1,10 @@ -# Template build file for 'libXft'. pkgname=libXft version=2.1.13 -distfiles=" -http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version.tar.bz2" +distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2" build_style=gnu_configure -make_cmd="$XBPS_MASTERDIR/bin/gmake" -pkgconfig_override="xft.pc" short_desc="Library for configuring and customizing font access" maintainer="Juan RP " -checksum=f9cbfd6710a9999a12f49e2bb23b8061eee01e9e +checksum=ce7688258af34c14af421bcfb306d4310245b727d2417ac968b7f6b2facfde8c long_desc=" Xft (2.0) provides a client-side font API for X applications. It uses Fontconfig to select fonts and the X protocol for rendering them. When @@ -20,3 +16,7 @@ long_desc=" Xft (2.0) hides most of the underlying system details so that developers can confidently use its API to access client-side fonts in any X environment." + +shared_deps="libX11-1.1 libXrender-0.9 freetype-2.3.8 fontconfig-2.6" +build_depends="pkg-config-0.23 ${shared_deps}" +run_depends="glibc-2.8 ${shared_deps}" diff --git a/templates/libXmu/template b/templates/libXmu/template index c3fe9cfb26e..7fd0bd7fdb0 100644 --- a/templates/libXmu/template +++ b/templates/libXmu/template @@ -1,13 +1,10 @@ -# Template build file for 'libXmu'. pkgname=libXmu version=1.0.4 -distfiles=" -http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version.tar.bz2" +distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2" build_style=gnu_configure -pkgconfig_override="xmu.pc xmuu.pc" short_desc="X Miscellaneous Utilities library" maintainer="Juan RP " -checksum=d1c1b185842456f65766df89f6a370f0d679ad29 +checksum=f83c00d6ed8f4c08effa9dcc2d7f1ff6f5a753f2b9fe1babda16618c2afa18f0 long_desc=" This Xmu library contains miscellaneous utilities and is not part of the Xlib standard. It contains routines which only use public interfaces @@ -17,3 +14,8 @@ long_desc=" This also includes the Mini Xmu library that does not use Xt and Xaw. This is from the modular X.org project." + +shared_deps="libXt-1.0 libX11-1.1 libSM-1.0 libICE-1.0 libXext-1.0 + e2fsprogs-1.41" +build_depends="pkg-config-0.23 xextproto-7.0 xtrans-1.2 ${shared_deps}" +run_depends="glibc-2.8 ${shared_deps}" diff --git a/templates/libXpm/template b/templates/libXpm/template index 04f19227b0e..7a8fa159e02 100644 --- a/templates/libXpm/template +++ b/templates/libXpm/template @@ -1,15 +1,17 @@ -# Template build file for 'libXpm'. pkgname=libXpm version=3.5.7 -distfiles=" -http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version.tar.bz2" +distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2" build_style=gnu_configure -pkgconfig_override="xpm.pc" short_desc="X PixMap Library from modular Xorg X11" maintainer="Juan RP " -checksum=6bd355cb5f011b271b177d86db7f9a4e9d885ed3 +checksum=64701ae67ce5b0797307b75d8255bec3a0d371d0c50715ea618f5a68bcc92baa long_desc=" XPM (X PixMap) is a format for storing and retrieving X pixmaps to and from files. This libXpm is from the modular Xorg X11." + +shared_deps="libX11-1.1" +build_depends="pkg-config-0.23 gettext-0.17 xproto-7.0 gettext-0.17 + ${shared_deps}" +run_depends="glibc-2.8 ${shared_deps}" diff --git a/templates/libXrender/template b/templates/libXrender/template index db89cdc4cc3..dd5d8e58e10 100644 --- a/templates/libXrender/template +++ b/templates/libXrender/template @@ -1,13 +1,10 @@ -# Template build file for 'libXrender'. pkgname=libXrender version=0.9.4 -distfiles=" -http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version.tar.bz2" +distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2" build_style=gnu_configure -pkgconfig_override="xrender.pc" short_desc="X Render Library" maintainer="Juan RP " -checksum=0d9249ffe7f8347946f1c4d701bd06d52a4ab40b +checksum=5682d343dd4e7ef291a6577e956c331946ce5801d8fa076284a01b41de3017ec long_desc=" The X Rendering Extension introduces digital image composition as the foundation of a rendering model within the X Window System. Rendering @@ -19,3 +16,7 @@ long_desc=" supports the Xrender extension. This is the modular X.org X11 project version." + +shared_deps="libX11-1.1" +build_depends="pkg-config-0.23 renderproto-0.9 ${shared_deps}" +run_depends="glibc-2.8 ${shared_deps}" diff --git a/templates/libXt/template b/templates/libXt/template index 69d69ddaad2..4769cf1afdd 100644 --- a/templates/libXt/template +++ b/templates/libXt/template @@ -1,14 +1,10 @@ -# Template build file for 'libXt'. pkgname=libXt version=1.0.5 -distfiles=" -http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version.tar.bz2" +distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2" build_style=gnu_configure -configure_args="--disable-malloc0returnsnull" -pkgconfig_override="xt.pc" short_desc="X Toolkit Intrinsics library" maintainer="Juan RP " -checksum=7e5ef9e03dc860bf5b64b85a897dd1d2ae1ed0bf +checksum=43c472ada59a04428a463225cd4cd42cb81bc43eb687cc1890f2f1c81a3e9cf4 long_desc=" This is the X Toolkit Intrinsics library. Xt Intrinsics is a library of C routines (based on Xlib) used for designing user interfaces with @@ -16,3 +12,7 @@ long_desc=" windows, and interpreting resource files. This is from the modular X.org project." + +shared_deps="libSM-1.0 libICE-1.0 libX11-1.1 e2fsprogs-1.41" +build_depends="pkg-config-0.23 xproto-7.0 kbproto-1.0 ${shared_deps}" +run_depends="glibc-2.8 ${shared_deps}" diff --git a/templates/libfontenc/template b/templates/libfontenc/template index 84b14ae05ec..461f2050b3f 100644 --- a/templates/libfontenc/template +++ b/templates/libfontenc/template @@ -1,12 +1,12 @@ -# Template build file for 'libfontenc'. pkgname=libfontenc version=1.0.4 -distfiles=" -http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version.tar.bz2" +distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2" build_style=gnu_configure -pkgconfig_override="fontenc.pc" short_desc="The fontenc Library from X.org" maintainer="Juan RP " -checksum=7a20977bb2cf382a22873053be98bcc9f0e76438 +checksum=b993aa3d17e845a12a49160b5d96993059ce919c7ba902005b910b867b6258c8 long_desc=" This provides the fontenc Library from the modular X.org X11 project." + +build_depends="pkg-config-0.23 xproto-7.0" +run_depends="glibc-2.8 zlib-1.2" diff --git a/templates/libpciaccess/template b/templates/libpciaccess/template index 683bb56fd77..96c59411e81 100644 --- a/templates/libpciaccess/template +++ b/templates/libpciaccess/template @@ -1,13 +1,12 @@ -# Template build file for 'libpciaccess'. pkgname=libpciaccess version=0.10.3 -patch_files="$pkgname-netbsd-support.diff" -distfiles=" -http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version.tar.bz2" +distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2" build_style=gnu_configure -make_cmd="$XBPS_MASTERDIR/bin/gmake" -pkgconfig_override="pciaccess.pc" short_desc="PCI Access from Modular X.org" maintainer="Juan RP " -checksum=5d972b5398f96bb94b2dab7f16613ad998887ece -long_desc="..." +checksum=2f609ad3b5688ae66dcd18d7cdd1fc6b68531a2a85f89798f6cfb5eda6d680dc +long_desc=" + libpciaccess is a library for portable PCI access routines across multiple + operating systems." + +run_depends="glibc-2.8" diff --git a/templates/printproto/template b/templates/printproto/template index 6f2241b0d92..ef0f6155e33 100644 --- a/templates/printproto/template +++ b/templates/printproto/template @@ -1,13 +1,10 @@ -# Template build file for 'printproto'. pkgname=printproto version=1.0.4 -distfiles=" -http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version.tar.bz2" +distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2" build_style=gnu_configure -pkgconfig_override="printproto.pc" short_desc="Print extension headers from X.org" maintainer="Juan RP " -checksum=ab23d31e5b13fd7260f2a10d789f5d8e89bf775f +checksum=f059a93188e7143dbb6cc55e31ccf81b976776aa3023bfa57f47501fd1bfd3be long_desc=" Definitions needed by the X Print server, library, and clients. diff --git a/templates/randrproto/template b/templates/randrproto/template index 79abefb7384..694c5d1efb4 100644 --- a/templates/randrproto/template +++ b/templates/randrproto/template @@ -1,13 +1,10 @@ -# Template build file for 'randrproto'. pkgname=randrproto version=1.2.2 -distfiles=" -http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version.tar.bz2" +distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2" build_style=gnu_configure -pkgconfig_override="randrproto.pc" short_desc="Randr extension headers from modular X.org" maintainer="Juan RP " -checksum=da7b61cc37a35f8de8a046ecb753103d054f1a77 +checksum=3822e6758991be713837d15a058cba5917ce65f552f1ce60301cb388b18a2e10 long_desc=" This provides the Randr extension headers from modular X.org X11 project." diff --git a/templates/recordproto/template b/templates/recordproto/template index 8f955578ad5..e8b3ac3647f 100644 --- a/templates/recordproto/template +++ b/templates/recordproto/template @@ -1,13 +1,10 @@ -# Template build file for 'recordproto'. pkgname=recordproto version=1.13.2 -distfiles=" -http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version.tar.bz2" +distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2" build_style=gnu_configure -pkgconfig_override="recordproto.pc" short_desc="Record extension headers from X.org" maintainer="Juan RP " -checksum=472f66c64fd4d98cceb4326436fdd3fb1e68baf1 +checksum=04e77a8b14f373a1825bbe0116cd0db8b2c5dee17b34ba9bddd27e576609cff9 long_desc=" This provides the Record extension headers from modular X.org X11 project." diff --git a/templates/renderproto/template b/templates/renderproto/template index 26fdc9c6250..f4c154e9767 100644 --- a/templates/renderproto/template +++ b/templates/renderproto/template @@ -1,13 +1,10 @@ -# Template build file for 'renderproto'. pkgname=renderproto version=0.9.3 -distfiles=" -http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version.tar.bz2" +distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2" build_style=gnu_configure -pkgconfig_override="renderproto.pc" short_desc="Render extension headers from modular X.org" maintainer="Juan RP " -checksum=60326cd364e1de1c539f4b2433b25628050a6f11 +checksum=c98a08b877e98a8fa7daa04be472de7e0cb38a99593faca8b987effcea2dd45b long_desc=" This provides the Render extension headers from modular X.org X11 project." diff --git a/templates/resourceproto/template b/templates/resourceproto/template index 2a1ff547181..79ed81655f2 100644 --- a/templates/resourceproto/template +++ b/templates/resourceproto/template @@ -1,13 +1,10 @@ -# Template build file for 'resourceproto'. pkgname=resourceproto version=1.0.2 -distfiles=" -http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version.tar.bz2" +distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2" build_style=gnu_configure -pkgconfig_override="resourceproto.pc" short_desc="Resource extension headers from X.org" maintainer="Juan RP " -checksum=8b665848d4ec2ccacb243bc058268a41b96124c9 +checksum=0c33d6fceef5483001459bdc934b5831502250b27f1f4ad370ab044f8ab53487 long_desc=" This provides the Resource extension headers from modular X.org X11 project." diff --git a/templates/scrnsaverproto/template b/templates/scrnsaverproto/template index da0ecf380ec..729b3c45daf 100644 --- a/templates/scrnsaverproto/template +++ b/templates/scrnsaverproto/template @@ -1,13 +1,10 @@ -# Template build file for 'scrnsaverproto'. pkgname=scrnsaverproto version=1.1.0 -distfiles=" -http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version.tar.bz2" +distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2" build_style=gnu_configure -pkgconfig_override="scrnsaverproto.pc" short_desc="ScrnSaver extension headers from X.org" maintainer="Juan RP " -checksum=966944d272b035eb0d1f8826c411ca1ee56ab5b3 +checksum=db09abf73cc339c05c0488639731794372a4770cfca76c2645f503f9fccd478f long_desc=" This provides the ScrnSaver extension headers from modular X.org X11 project." diff --git a/templates/trapproto/template b/templates/trapproto/template index ce36456a581..2550d176cc2 100644 --- a/templates/trapproto/template +++ b/templates/trapproto/template @@ -1,12 +1,9 @@ -# Template build file for 'trapproto'. pkgname=trapproto version=3.4.3 -distfiles=" -http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version.tar.bz2" +distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2" build_style=gnu_configure -pkgconfig_override="trapproto.pc" short_desc="Trap extension headers" maintainer="Juan RP " -checksum=f4adc2687aabd0f6e69fde6949675930ad241869 +checksum=ff32a0d3bc696cadc3457be9c85e9818af2b6daa2f159188bb01aad7e932a0e1 long_desc=" This package provides the Trap extension headers from modular X.org." diff --git a/templates/videoproto/template b/templates/videoproto/template index 530eb41756c..8608af1f886 100644 --- a/templates/videoproto/template +++ b/templates/videoproto/template @@ -1,12 +1,9 @@ -# Template build file for 'videoproto'. pkgname=videoproto version=2.2.2 -distfiles=" -http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version.tar.bz2" +distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2" build_style=gnu_configure -pkgconfig_override="videoproto.pc" short_desc="Video extension headers from modular X.org X11" maintainer="Juan RP " -checksum=93916cab8323f5c4a7f79b648535858be1096a82 +checksum=ab088478830cd30c2fe34fb7f44ffd4d177af7711c225c24676d3e9e9f24780c long_desc=" Video extension headers from modular X.org X11 project." diff --git a/templates/xcmiscproto/template b/templates/xcmiscproto/template index 6083bc0c104..c329d703a9e 100644 --- a/templates/xcmiscproto/template +++ b/templates/xcmiscproto/template @@ -1,12 +1,9 @@ -# Template file for 'xcmiscproto'. pkgname=xcmiscproto version=1.1.2 -distfiles=" -http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version.tar.bz2" +distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2" build_style=gnu_configure short_desc="XCMisc extension headers from X.org" -pkgconfig_override="xcmiscproto.pc" maintainer="Juan RP " -checksum=375efab5b1ba235687cc3cfa58d33fb690f76028 +checksum=b2807e96a9d632b7bbf1782a43095de51f3feae3d2e25374d3df00c6c68792ab long_desc=" This provides the XCMisc extension headers from modular X.org project." diff --git a/templates/xextproto/template b/templates/xextproto/template index 8c3e1cd5d63..5561961df1a 100644 --- a/templates/xextproto/template +++ b/templates/xextproto/template @@ -1,12 +1,9 @@ -# Template file for 'xextproto' pkgname=xextproto version=7.0.3 -distfiles=" -http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version.tar.bz2" +distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2" build_style=gnu_configure -pkgconfig_override="xextproto.pc" short_desc="XExt extension headers from X.org" maintainer="Juan RP " -checksum=a39e2c42fec5fa7b6e5ac7517c8645dcfc1347a6 +checksum=3972428e3651c9159aff655c9c794728520c3ce3d66ac219ec5243d5d73d4db4 long_desc=" This provides the XExt extension headers from modular X.org project." diff --git a/templates/xf86bigfontproto/template b/templates/xf86bigfontproto/template index b4dadf29986..7e200b7d5a9 100644 --- a/templates/xf86bigfontproto/template +++ b/templates/xf86bigfontproto/template @@ -1,12 +1,9 @@ -# Template file for 'xf86bigfontproto' pkgname=xf86bigfontproto version=1.1.2 -distfiles=" -http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version.tar.bz2" +distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2" build_style=gnu_configure -pkgconfig_override="xf86bigfontproto.pc" short_desc="XF86BigFont extension headers from X.org" maintainer="Juan RP " -checksum=48d7bbedfaf5061e76f8207570ca547ff53f44e0 +checksum=01b475b5b27709a738db6f94ce2ded37f5db0792e8d9318069ecf1690a15f124 long_desc=" This provides the XF86BigFont extension headers from modular X.org X11 project." diff --git a/templates/xf86dgaproto/template b/templates/xf86dgaproto/template index ccf7d06d435..8c2ca53b851 100644 --- a/templates/xf86dgaproto/template +++ b/templates/xf86dgaproto/template @@ -1,12 +1,9 @@ -# Template build file for 'xf86dgaproto'. pkgname=xf86dgaproto version=2.0.3 -distfiles=" -http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version.tar.bz2" +distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2" build_style=gnu_configure -pkgconfig_override="xf86dgaproto.pc" short_desc="XF86DGA extension headers" maintainer="Juan RP " -checksum=0211e68d4c0c40f58d33b37bc0b4fe99278c5fc6 +checksum=5ac4d4a308b032727c61fd56db5a2eaadaedfbce5bc9dc504320bff9d696b002 long_desc=" This package provides the XF86DGA extension headers from modular X.org." diff --git a/templates/xf86driproto/template b/templates/xf86driproto/template index a7f180d4c6d..01e50607cad 100644 --- a/templates/xf86driproto/template +++ b/templates/xf86driproto/template @@ -1,13 +1,10 @@ -# Template build file for 'xf86driproto'. pkgname=xf86driproto version=2.0.4 -distfiles=" -http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version.tar.bz2" +distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2" build_style=gnu_configure -pkgconfig_override="xf86driproto.pc" short_desc="XF86DRI extension headers from modular X.org" maintainer="Juan RP " -checksum=d0ab74ca15d28b1b5f42852cfd24d960c481ec79 +checksum=f57da66bec8563502fe95c0e3f6ed297d9985862f5b64a5c9d3039719ac7f9da long_desc=" This provides the XF86DRI extension headers from modular X.org X11 project. diff --git a/templates/xf86miscproto/template b/templates/xf86miscproto/template index a0e4ec74da7..a1cc3e7f0fa 100644 --- a/templates/xf86miscproto/template +++ b/templates/xf86miscproto/template @@ -1,13 +1,10 @@ -# Template build file for 'xf86miscproto'. pkgname=xf86miscproto version=0.9.2 -distfiles=" -http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version.tar.bz2" +distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2" build_style=gnu_configure -pkgconfig_override="xf86miscproto.pc" short_desc="XF86Misc extension headers from modular X.org" maintainer="Juan RP " -checksum=1c780b74faf37105cc57030cf95d79e900a98979 +checksum=aaab4cbf19c73ded4785ba69cdd7ae23aaf103c7040559283f85fc1237dad6e6 long_desc=" This provides the XF86Misc extension headers from modular X.org X11 project." diff --git a/templates/xf86vidmodeproto/template b/templates/xf86vidmodeproto/template index f9d3b509974..420d0ea7144 100644 --- a/templates/xf86vidmodeproto/template +++ b/templates/xf86vidmodeproto/template @@ -1,13 +1,10 @@ -# Template build file for 'xf86vidmodeproto'. pkgname=xf86vidmodeproto version=2.2.2 -distfiles=" -http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version.tar.bz2" +distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2" build_style=gnu_configure -pkgconfig_override="xf86vidmodeproto.pc" short_desc="XF86VidMode extension headers from modular X.org" maintainer="Juan RP " -checksum=b940e671398e1e91cedd1a3ad66c3dcd6bdfeb8a +checksum=07152f990cc79ec5931989decc4a90b1919147e98ff6fcfe39507a9d3fc4d96e long_desc=" This provides the XF86VidMode extension headers from modular X.org X11 project." diff --git a/templates/xineramaproto/template b/templates/xineramaproto/template index 1b375e356c2..b991c06e7e9 100644 --- a/templates/xineramaproto/template +++ b/templates/xineramaproto/template @@ -1,13 +1,10 @@ -# Template build file for 'xineramaproto'. pkgname=xineramaproto version=1.1.2 -distfiles=" -http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version.tar.bz2" +distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2" build_style=gnu_configure -pkgconfig_override="xineramaproto.pc" short_desc="Xinerama extension headers from X.org" maintainer="Juan RP " -checksum=b51d1a9ce96b98ad1b2d2e6b28515b7ddee62ff5 +checksum=e8a62b1cafbcfc3b9fed147612ed4320233d0c9d6de30c991c2cd0c691c40910 long_desc=" This provides the Xinerama extension headers from modular X.org X11 project." diff --git a/templates/xproto/template b/templates/xproto/template index c5f4fbd06d0..17bb6b764f9 100644 --- a/templates/xproto/template +++ b/templates/xproto/template @@ -1,12 +1,9 @@ -# Template file for 'xproto' pkgname=xproto version=7.0.13 -distfiles=" -http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version.tar.bz2" +distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2" build_style=gnu_configure short_desc="X protocol and ancillary headers from Xorg X11" -pkgconfig_override="xproto.pc" maintainer="Juan RP " -checksum=24d55b70cd36dab9e5f08f7de59825c52b81beee +checksum=6f6328922d69f5de29513a5baf1d010db2a7a54cb58a7a6cbbb1b25097ecd592 long_desc=" X protocol and ancillary headers from modular Xorg X11." diff --git a/templates/xtrans/template b/templates/xtrans/template index 2415dc42f5e..eced67d25af 100644 --- a/templates/xtrans/template +++ b/templates/xtrans/template @@ -1,13 +1,10 @@ -# Template file for 'xtrans' pkgname=xtrans version=1.2.1 -distfiles=" -http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version.tar.bz2" +distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2" build_style=gnu_configure -pkgconfig_override="xtrans.pc" short_desc="Network API translation layer to insulate X" maintainer="Juan RP " -checksum=1998ba12f64cfc9563dcb20f9337e448a9e6a882 +checksum=9ff21a8d9ea524ca9b7cb6d6b4d522b4cb20b1c35edeb8995a9e9265a0df64bd long_desc=" Network API translation layer to insulate X applications and libraries from OS network vageries. This is from the modular