Date: Friday, February 24, 2012 @ 08:49:47 Author: allan Revision: 151037
archrelease: copy trunk to extra-i686, extra-x86_64 Added: xorg-xfs/repos/extra-i686/PKGBUILD (from rev 151035, xorg-xfs/trunk/PKGBUILD) xorg-xfs/repos/extra-i686/xfs.rc (from rev 151035, xorg-xfs/trunk/xfs.rc) xorg-xfs/repos/extra-x86_64/PKGBUILD (from rev 151036, xorg-xfs/trunk/PKGBUILD) xorg-xfs/repos/extra-x86_64/xfs.rc (from rev 151036, xorg-xfs/trunk/xfs.rc) Deleted: xorg-xfs/repos/extra-i686/PKGBUILD xorg-xfs/repos/extra-i686/xfs.rc xorg-xfs/repos/extra-x86_64/PKGBUILD xorg-xfs/repos/extra-x86_64/xfs.rc -----------------------+ extra-i686/PKGBUILD | 128 ++++++++++++++++++++++++------------------------ extra-i686/xfs.rc | 92 +++++++++++++++++----------------- extra-x86_64/PKGBUILD | 128 ++++++++++++++++++++++++------------------------ extra-x86_64/xfs.rc | 92 +++++++++++++++++----------------- 4 files changed, 220 insertions(+), 220 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2012-02-24 13:49:22 UTC (rev 151036) +++ extra-i686/PKGBUILD 2012-02-24 13:49:47 UTC (rev 151037) @@ -1,64 +0,0 @@ -# $Id$ -# Maintainer: Alexander Baldeck <alexan...@archlinux.org> -# Contributor: Jan de Groot <j...@archlinux.org> - -pkgname=xorg-xfs -pkgver=1.1.1 -pkgrel=1 -pkgdesc="X.Org X11 xfs font server" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -backup=('etc/X11/fs/config') -depends=('xorg-font-utils' 'libxfont>=1.4.0' 'libfs>=1.0.2' 'libx11>=1.2.2') -makedepends=('pkgconfig' 'xtrans') -source=(${url}/releases/individual/app/xfs-${pkgver}.tar.bz2 - ${url}/releases/individual/app/xfsinfo-1.0.3.tar.bz2 - ${url}/releases/individual/app/fslsfonts-1.0.3.tar.bz2 - ${url}/releases/individual/app/fstobdf-1.0.4.tar.bz2 - ${url}/releases/individual/app/showfont-1.0.3.tar.bz2 - xfs.rc) -md5sums=('e02c6cae689c082b8c98a421df8f8670' - 'aae6fa48b5c2ce9186a5ff4ccc14a1d4' - '9b50d967ac6d4bae9bffb62a5e527a50' - 'fc1f42aac16d6b76c79a1a3a0fb6a53b' - '50b466ab6ed4a5b8df5abf1ef844309a' - '251f5447f64151e9bb096ebc9f999c3f') - -build() { - cd "${srcdir}" - pushd xfs-${pkgver} - ./configure --prefix=/usr --sysconfdir=/etc - make configdir=/etc/X11/fs - popd - - for i in xfsinfo-* fslsfonts-* fstobdf-* showfont-*; do - if [ -d "${i}" ]; then - pushd "${i}" - ./configure --prefix=/usr - make - popd - fi - done -} - -package() { - cd "${srcdir}" - pushd xfs-${pkgver} - make configdir=/etc/X11/fs DESTDIR="${pkgdir}" install - sed -i -e 's|/lib/X11/|/share/|g' "${pkgdir}/etc/X11/fs/config" - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.xfs" - popd - - for i in xfsinfo-* fslsfonts-* fstobdf-* showfont-*; do - if [ -d "${i}" ]; then - pushd "${i}" - make DESTDIR="${pkgdir}" install - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.${i%-*}" - popd - fi - done - install -m755 -d "${pkgdir}/etc/rc.d" - install -m755 "${srcdir}/xfs.rc" "${pkgdir}/etc/rc.d/xfs" -} Copied: xorg-xfs/repos/extra-i686/PKGBUILD (from rev 151035, xorg-xfs/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2012-02-24 13:49:47 UTC (rev 151037) @@ -0,0 +1,64 @@ +# $Id$ +# Maintainer: Alexander Baldeck <alexan...@archlinux.org> +# Contributor: Jan de Groot <j...@archlinux.org> + +pkgname=xorg-xfs +pkgver=1.1.1 +pkgrel=2 +pkgdesc="X.Org X11 xfs font server" +arch=('i686' 'x86_64') +url="http://xorg.freedesktop.org/" +license=('custom') +backup=('etc/X11/fs/config') +depends=('xorg-font-utils' 'libxfont>=1.4.0' 'libfs>=1.0.2' 'libx11>=1.2.2') +makedepends=('pkgconfig' 'xtrans') +source=(${url}/releases/individual/app/xfs-${pkgver}.tar.bz2 + ${url}/releases/individual/app/xfsinfo-1.0.3.tar.bz2 + ${url}/releases/individual/app/fslsfonts-1.0.3.tar.bz2 + ${url}/releases/individual/app/fstobdf-1.0.4.tar.bz2 + ${url}/releases/individual/app/showfont-1.0.3.tar.bz2 + xfs.rc) +md5sums=('e02c6cae689c082b8c98a421df8f8670' + 'aae6fa48b5c2ce9186a5ff4ccc14a1d4' + '9b50d967ac6d4bae9bffb62a5e527a50' + 'fc1f42aac16d6b76c79a1a3a0fb6a53b' + '50b466ab6ed4a5b8df5abf1ef844309a' + '251f5447f64151e9bb096ebc9f999c3f') + +build() { + cd "${srcdir}" + pushd xfs-${pkgver} + ./configure --prefix=/usr --sysconfdir=/etc + make configdir=/etc/X11/fs + popd + + for i in xfsinfo-* fslsfonts-* fstobdf-* showfont-*; do + if [ -d "${i}" ]; then + pushd "${i}" + ./configure --prefix=/usr + make + popd + fi + done +} + +package() { + cd "${srcdir}" + pushd xfs-${pkgver} + make configdir=/etc/X11/fs DESTDIR="${pkgdir}" install + sed -i -e 's|/lib/X11/|/share/|g' "${pkgdir}/etc/X11/fs/config" + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.xfs" + popd + + for i in xfsinfo-* fslsfonts-* fstobdf-* showfont-*; do + if [ -d "${i}" ]; then + pushd "${i}" + make DESTDIR="${pkgdir}" install + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.${i%-*}" + popd + fi + done + install -m755 -d "${pkgdir}/etc/rc.d" + install -m755 "${srcdir}/xfs.rc" "${pkgdir}/etc/rc.d/xfs" +} Deleted: extra-i686/xfs.rc =================================================================== --- extra-i686/xfs.rc 2012-02-24 13:49:22 UTC (rev 151036) +++ extra-i686/xfs.rc 2012-02-24 13:49:47 UTC (rev 151037) @@ -1,46 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/bin/xfs` -case "$1" in - start) - stat_busy "Starting X.Org fontserver" - if [ -z "$PID" ]; then - /usr/bin/xfs -daemon &> /dev/null - fi - if [ ! -z "$PID" -o $? -gt 0 ]; then - stat_fail - else - add_daemon xfs - stat_done - fi - ;; - stop) - stat_busy "Stopping X.Org fontserver" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon xfs - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - reload) - stat_busy "Reloading X.Org fontserver configuration" - [ ! -z "$PID" ] && kill -HUP $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - ;; - *) - echo "usage: $0 {start|stop|restart|reload}" -esac Copied: xorg-xfs/repos/extra-i686/xfs.rc (from rev 151035, xorg-xfs/trunk/xfs.rc) =================================================================== --- extra-i686/xfs.rc (rev 0) +++ extra-i686/xfs.rc 2012-02-24 13:49:47 UTC (rev 151037) @@ -0,0 +1,46 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/bin/xfs` +case "$1" in + start) + stat_busy "Starting X.Org fontserver" + if [ -z "$PID" ]; then + /usr/bin/xfs -daemon &> /dev/null + fi + if [ ! -z "$PID" -o $? -gt 0 ]; then + stat_fail + else + add_daemon xfs + stat_done + fi + ;; + stop) + stat_busy "Stopping X.Org fontserver" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon xfs + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + reload) + stat_busy "Reloading X.Org fontserver configuration" + [ ! -z "$PID" ] && kill -HUP $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + stat_done + fi + ;; + *) + echo "usage: $0 {start|stop|restart|reload}" +esac Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2012-02-24 13:49:22 UTC (rev 151036) +++ extra-x86_64/PKGBUILD 2012-02-24 13:49:47 UTC (rev 151037) @@ -1,64 +0,0 @@ -# $Id$ -# Maintainer: Alexander Baldeck <alexan...@archlinux.org> -# Contributor: Jan de Groot <j...@archlinux.org> - -pkgname=xorg-xfs -pkgver=1.1.1 -pkgrel=1 -pkgdesc="X.Org X11 xfs font server" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -backup=('etc/X11/fs/config') -depends=('xorg-font-utils' 'libxfont>=1.4.0' 'libfs>=1.0.2' 'libx11>=1.2.2') -makedepends=('pkgconfig' 'xtrans') -source=(${url}/releases/individual/app/xfs-${pkgver}.tar.bz2 - ${url}/releases/individual/app/xfsinfo-1.0.3.tar.bz2 - ${url}/releases/individual/app/fslsfonts-1.0.3.tar.bz2 - ${url}/releases/individual/app/fstobdf-1.0.4.tar.bz2 - ${url}/releases/individual/app/showfont-1.0.3.tar.bz2 - xfs.rc) -md5sums=('e02c6cae689c082b8c98a421df8f8670' - 'aae6fa48b5c2ce9186a5ff4ccc14a1d4' - '9b50d967ac6d4bae9bffb62a5e527a50' - 'fc1f42aac16d6b76c79a1a3a0fb6a53b' - '50b466ab6ed4a5b8df5abf1ef844309a' - '251f5447f64151e9bb096ebc9f999c3f') - -build() { - cd "${srcdir}" - pushd xfs-${pkgver} - ./configure --prefix=/usr --sysconfdir=/etc - make configdir=/etc/X11/fs - popd - - for i in xfsinfo-* fslsfonts-* fstobdf-* showfont-*; do - if [ -d "${i}" ]; then - pushd "${i}" - ./configure --prefix=/usr - make - popd - fi - done -} - -package() { - cd "${srcdir}" - pushd xfs-${pkgver} - make configdir=/etc/X11/fs DESTDIR="${pkgdir}" install - sed -i -e 's|/lib/X11/|/share/|g' "${pkgdir}/etc/X11/fs/config" - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.xfs" - popd - - for i in xfsinfo-* fslsfonts-* fstobdf-* showfont-*; do - if [ -d "${i}" ]; then - pushd "${i}" - make DESTDIR="${pkgdir}" install - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.${i%-*}" - popd - fi - done - install -m755 -d "${pkgdir}/etc/rc.d" - install -m755 "${srcdir}/xfs.rc" "${pkgdir}/etc/rc.d/xfs" -} Copied: xorg-xfs/repos/extra-x86_64/PKGBUILD (from rev 151036, xorg-xfs/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2012-02-24 13:49:47 UTC (rev 151037) @@ -0,0 +1,64 @@ +# $Id$ +# Maintainer: Alexander Baldeck <alexan...@archlinux.org> +# Contributor: Jan de Groot <j...@archlinux.org> + +pkgname=xorg-xfs +pkgver=1.1.1 +pkgrel=2 +pkgdesc="X.Org X11 xfs font server" +arch=('i686' 'x86_64') +url="http://xorg.freedesktop.org/" +license=('custom') +backup=('etc/X11/fs/config') +depends=('xorg-font-utils' 'libxfont>=1.4.0' 'libfs>=1.0.2' 'libx11>=1.2.2') +makedepends=('pkgconfig' 'xtrans') +source=(${url}/releases/individual/app/xfs-${pkgver}.tar.bz2 + ${url}/releases/individual/app/xfsinfo-1.0.3.tar.bz2 + ${url}/releases/individual/app/fslsfonts-1.0.3.tar.bz2 + ${url}/releases/individual/app/fstobdf-1.0.4.tar.bz2 + ${url}/releases/individual/app/showfont-1.0.3.tar.bz2 + xfs.rc) +md5sums=('e02c6cae689c082b8c98a421df8f8670' + 'aae6fa48b5c2ce9186a5ff4ccc14a1d4' + '9b50d967ac6d4bae9bffb62a5e527a50' + 'fc1f42aac16d6b76c79a1a3a0fb6a53b' + '50b466ab6ed4a5b8df5abf1ef844309a' + '251f5447f64151e9bb096ebc9f999c3f') + +build() { + cd "${srcdir}" + pushd xfs-${pkgver} + ./configure --prefix=/usr --sysconfdir=/etc + make configdir=/etc/X11/fs + popd + + for i in xfsinfo-* fslsfonts-* fstobdf-* showfont-*; do + if [ -d "${i}" ]; then + pushd "${i}" + ./configure --prefix=/usr + make + popd + fi + done +} + +package() { + cd "${srcdir}" + pushd xfs-${pkgver} + make configdir=/etc/X11/fs DESTDIR="${pkgdir}" install + sed -i -e 's|/lib/X11/|/share/|g' "${pkgdir}/etc/X11/fs/config" + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.xfs" + popd + + for i in xfsinfo-* fslsfonts-* fstobdf-* showfont-*; do + if [ -d "${i}" ]; then + pushd "${i}" + make DESTDIR="${pkgdir}" install + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.${i%-*}" + popd + fi + done + install -m755 -d "${pkgdir}/etc/rc.d" + install -m755 "${srcdir}/xfs.rc" "${pkgdir}/etc/rc.d/xfs" +} Deleted: extra-x86_64/xfs.rc =================================================================== --- extra-x86_64/xfs.rc 2012-02-24 13:49:22 UTC (rev 151036) +++ extra-x86_64/xfs.rc 2012-02-24 13:49:47 UTC (rev 151037) @@ -1,46 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/bin/xfs` -case "$1" in - start) - stat_busy "Starting X.Org fontserver" - if [ -z "$PID" ]; then - /usr/bin/xfs -daemon &> /dev/null - fi - if [ ! -z "$PID" -o $? -gt 0 ]; then - stat_fail - else - add_daemon xfs - stat_done - fi - ;; - stop) - stat_busy "Stopping X.Org fontserver" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon xfs - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - reload) - stat_busy "Reloading X.Org fontserver configuration" - [ ! -z "$PID" ] && kill -HUP $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - ;; - *) - echo "usage: $0 {start|stop|restart|reload}" -esac Copied: xorg-xfs/repos/extra-x86_64/xfs.rc (from rev 151036, xorg-xfs/trunk/xfs.rc) =================================================================== --- extra-x86_64/xfs.rc (rev 0) +++ extra-x86_64/xfs.rc 2012-02-24 13:49:47 UTC (rev 151037) @@ -0,0 +1,46 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/bin/xfs` +case "$1" in + start) + stat_busy "Starting X.Org fontserver" + if [ -z "$PID" ]; then + /usr/bin/xfs -daemon &> /dev/null + fi + if [ ! -z "$PID" -o $? -gt 0 ]; then + stat_fail + else + add_daemon xfs + stat_done + fi + ;; + stop) + stat_busy "Stopping X.Org fontserver" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon xfs + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + reload) + stat_busy "Reloading X.Org fontserver configuration" + [ ! -z "$PID" ] && kill -HUP $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + stat_done + fi + ;; + *) + echo "usage: $0 {start|stop|restart|reload}" +esac