From f1775e5c5ff6defd7596a6746bf5d2c37c29ba37 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 23 Apr 2010 13:35:28 +0200 Subject: [PATCH] libXfont: move so symlink into main pkg. --HG-- extra : convert_revision : 7fa161082128f3333de22e736f84acb1fbc011f0 --- srcpkgs/libXfont/libXfont-devel.template | 3 ++- srcpkgs/libXfont/template | 12 ++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/srcpkgs/libXfont/libXfont-devel.template b/srcpkgs/libXfont/libXfont-devel.template index 2cb67c7e90..1a57928826 100644 --- a/srcpkgs/libXfont/libXfont-devel.template +++ b/srcpkgs/libXfont/libXfont-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 libXfont do_install() @@ -12,6 +14,5 @@ do_install() mkdir -p ${DESTDIR}/usr/lib 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 } diff --git a/srcpkgs/libXfont/template b/srcpkgs/libXfont/template index 8709d88b8f..3099aa3ec9 100644 --- a/srcpkgs/libXfont/template +++ b/srcpkgs/libXfont/template @@ -1,6 +1,7 @@ # Template build file for 'libXfont'. pkgname=libXfont version=1.4.1 +revision=1 distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2" build_style=gnu_configure configure_args="--disable-devel-docs" @@ -12,12 +13,15 @@ long_desc=" X.org X11 project." subpackages="$pkgname-devel" +Add_dependency run glibc +Add_dependency run zlib +Add_dependency run freetype +Add_dependency run libfontenc Add_dependency build pkg-config Add_dependency build xproto Add_dependency build xtrans Add_dependency build fontcacheproto Add_dependency build fontsproto -Add_dependency full glibc -Add_dependency full zlib -Add_dependency full freetype -Add_dependency full libfontenc +Add_dependency build zlib-devel +Add_dependency build freetype-devel +Add_dependency build libfontenc-devel