summaryrefslogtreecommitdiffstats
path: root/abs/core/xorg-fonts-100dpi
diff options
context:
space:
mode:
authorJames Meyer <james.meyer@operamail.com>2012-08-07 19:12:33 (GMT)
committerJames Meyer <james.meyer@operamail.com>2012-08-07 19:12:33 (GMT)
commit22ea84ac6f7d6bee05c12e3bff8672fbad753ea3 (patch)
treed5089aa3b2779c672338075fcb0935752b1e1544 /abs/core/xorg-fonts-100dpi
parentfd255056dd9f3aa7f2d61c71497fc98039497907 (diff)
downloadlinhes_pkgbuild-22ea84ac6f7d6bee05c12e3bff8672fbad753ea3.zip
linhes_pkgbuild-22ea84ac6f7d6bee05c12e3bff8672fbad753ea3.tar.gz
linhes_pkgbuild-22ea84ac6f7d6bee05c12e3bff8672fbad753ea3.tar.bz2
Xorg update part1
Diffstat (limited to 'abs/core/xorg-fonts-100dpi')
-rw-r--r--abs/core/xorg-fonts-100dpi/PKGBUILD25
-rw-r--r--abs/core/xorg-fonts-100dpi/xfonts.install5
2 files changed, 16 insertions, 14 deletions
diff --git a/abs/core/xorg-fonts-100dpi/PKGBUILD b/abs/core/xorg-fonts-100dpi/PKGBUILD
index 514311a..aae5499 100644
--- a/abs/core/xorg-fonts-100dpi/PKGBUILD
+++ b/abs/core/xorg-fonts-100dpi/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 71678 2010-03-08 11:58:02Z jgc $
+# $Id: PKGBUILD 150386 2012-02-17 11:05:50Z allan $
# Maintainer: Alexander Baldeck <alexander@archlinux.org>
# Contributor: Jan de Groot <jgc@archlinux.org>
pkgname=xorg-fonts-100dpi
pkgver=1.0.1
pkgrel=4
pkgdesc="X.org 100dpi fonts"
-arch=(any)
+arch=('any')
url="http://xorg.freedesktop.org/"
license=('custom')
depends=('xorg-fonts-encodings' 'xorg-fonts-alias' 'xorg-font-utils' 'fontconfig')
@@ -24,20 +24,27 @@ md5sums=('c754c3f4a5e08442bf6972b9466625ed'
build() {
cd "${srcdir}"
- install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-
for dir in font-*-100dpi*; do
if [ -d "${dir}" ]; then
pushd ${dir}
./configure --prefix=/usr \
--with-fontdir=/usr/share/fonts/100dpi
- make || return 1
- make DESTDIR="${pkgdir}" install || return 1
-
- install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.${dir%-100dpi-*}" || return 1
+ make
popd
fi
done
- rm -f "${pkgdir}"/usr/share/fonts/100dpi/fonts.*
}
+package() {
+ cd "${srcdir}"
+ install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+ for dir in font-*-100dpi*; do
+ if [ -d "${dir}" ]; then
+ pushd ${dir}
+ make DESTDIR="${pkgdir}" install
+ install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.${dir%-100dpi-*}"
+ popd
+ fi
+ done
+ rm -f "${pkgdir}"/usr/share/fonts/100dpi/fonts.*
+}
diff --git a/abs/core/xorg-fonts-100dpi/xfonts.install b/abs/core/xorg-fonts-100dpi/xfonts.install
index 9400b64..5c5e8a2 100644
--- a/abs/core/xorg-fonts-100dpi/xfonts.install
+++ b/abs/core/xorg-fonts-100dpi/xfonts.install
@@ -13,8 +13,3 @@ post_upgrade() {
post_remove() {
post_install $1
}
-
-op=$1
-shift
-
-$op $*