From 5751c7c025377af6d7db1dd29b8dd6acc5e35e73 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 22 Apr 2010 21:43:53 +0200 Subject: [PATCH] libXft: move so symlink into main pkg. --HG-- extra : convert_revision : 05a5418447d0586d30cb7154b57d45c4bf86a0c9 --- srcpkgs/libXft/libXft-devel.template | 3 ++- srcpkgs/libXft/template | 15 ++++++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/srcpkgs/libXft/libXft-devel.template b/srcpkgs/libXft/libXft-devel.template index 2750fb6114..db8f2dc81d 100644 --- a/srcpkgs/libXft/libXft-devel.template +++ b/srcpkgs/libXft/libXft-devel.template @@ -5,6 +5,8 @@ long_desc="${long_desc} This package contains files for development, headers, static libs, etc." +revision=1 + Add_dependency run libXft do_install() @@ -13,7 +15,6 @@ do_install() mv ${SRCPKGDESTDIR}/usr/bin ${DESTDIR}/usr mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr mv ${SRCPKGDESTDIR}/usr/lib/lib*.*a ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/lib/lib*.so ${DESTDIR}/usr/lib mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib mv ${SRCPKGDESTDIR}/usr/share ${DESTDIR}/usr } diff --git a/srcpkgs/libXft/template b/srcpkgs/libXft/template index 8f989e198e..e61f637797 100644 --- a/srcpkgs/libXft/template +++ b/srcpkgs/libXft/template @@ -1,6 +1,7 @@ # Template build file for 'libXft'. pkgname=libXft version=2.1.14 +revision=1 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2" build_style=gnu_configure short_desc="Library for configuring and customizing font access" @@ -19,10 +20,14 @@ long_desc=" environment." subpackages="$pkgname-devel" +Add_dependency run glibc +Add_dependency run libX11 +Add_dependency run libXrender +Add_dependency run freetype +Add_dependency run fontconfig Add_dependency build pkg-config Add_dependency build xproto -Add_dependency full glibc -Add_dependency full libX11 -Add_dependency full libXrender -Add_dependency full freetype -Add_dependency full fontconfig +Add_dependency build libX11-devel +Add_dependency build libXrender-devel +Add_dependency build freetype-devel +Add_dependency build fontconfig-devel