From 535d2128e5a274f45bbffa7990deae15b2757b37 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 9 Feb 2009 16:02:42 +0100 Subject: [PATCH] Another set of changes for X11 related pkgs. --HG-- extra : convert_revision : 25c37e03bcec3ec8d52cc67fb6f7df9ec2e075c3 --- ...config-Makefile-fc-cache.diff => install.diff} | 0 templates/fontconfig/template | 13 ++++++------- templates/helpers/fontconfig-update.sh | 4 ++-- templates/libXaw/template | 3 +-- templates/libXcursor/template | 13 +++++++------ templates/libXdamage/template | 11 ++++++----- templates/libXext/template | 2 +- templates/libXfixes/template | 11 ++++++----- templates/libXfont/template | 12 +++++++----- templates/libXft/template | 12 ++++++------ templates/libXmu/template | 2 +- templates/libXpm/template | 2 +- templates/libXrender/template | 11 ++++++----- templates/libXt/template | 3 +-- templates/libfontenc/template | 10 +++++----- templates/libpciaccess/template | 15 +++++++-------- 16 files changed, 63 insertions(+), 61 deletions(-) rename templates/fontconfig/{fontconfig-Makefile-fc-cache.diff => install.diff} (100%) 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/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/libXaw/template b/templates/libXaw/template index ce45abbeb40..59461a58ac7 100644 --- a/templates/libXaw/template +++ b/templates/libXaw/template @@ -11,7 +11,6 @@ long_desc=" This libXaw is from the modular Xorg X11." -shared_deps="libX11-1.1 libICE-1.0 libSM-1.1 libXext-1.0 libXt-1.0 - libXmu-1.0 libXpm-3.5 libXau-1.0 libXdmcp-1.0 e2fsprogs-1.41" +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/libXext/template b/templates/libXext/template index b4cfbdc0cb5..2bbe5e35af5 100644 --- a/templates/libXext/template +++ b/templates/libXext/template @@ -9,6 +9,6 @@ long_desc=" This package contains the X Extension library from the modular X.org X11 project." -shared_deps="libX11-1.1 libXau-1.0 libXdmcp-1.0" +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 f8592b2f7fb..7fd0bd7fdb0 100644 --- a/templates/libXmu/template +++ b/templates/libXmu/template @@ -16,6 +16,6 @@ long_desc=" 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 - libXau-1.0 libXdmcp-1.0 e2fsprogs-1.41" + 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 7d300b2f038..7a8fa159e02 100644 --- a/templates/libXpm/template +++ b/templates/libXpm/template @@ -11,7 +11,7 @@ long_desc=" This libXpm is from the modular Xorg X11." -shared_deps="libX11-1.1 libXau-1.0 libXdmcp-1.0" +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 b34f3e50d13..4769cf1afdd 100644 --- a/templates/libXt/template +++ b/templates/libXt/template @@ -13,7 +13,6 @@ long_desc=" This is from the modular X.org project." -shared_deps="libSM-1.0 libICE-1.0 libX11-1.1 libXau-1.0 libXdmcp-1.0 - e2fsprogs-1.41" +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"