diff options
Diffstat (limited to 'testing')
97 files changed, 0 insertions, 3929 deletions
diff --git a/testing/alex/PKGBUILD b/testing/alex/PKGBUILD deleted file mode 100644 index d49dc3d6f..000000000 --- a/testing/alex/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 120390 2011-04-23 17:05:09Z vesa $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Vesa Kaihlavirta <vegai@iki.fi> -# Contributor: Philip Nilsson <pnilsson@nullref.se> - -pkgname=alex -pkgver=2.3.5 -pkgrel=1.2 -pkgdesc='a lexical analyser generator for Haskell' -arch=('i686' 'x86_64') -url='http://www.haskell.org/alex/' -license=('custom:BSD3') -depends=('gmp') -makedepends=('ghc=7.0.3') -source=("http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz") - -build() { - cd $srcdir/$pkgname-$pkgver - runghc Setup.lhs configure --prefix=/usr --datasubdir=$pkgname - runghc Setup.lhs build -} - -package() { - cd $srcdir/$pkgname-$pkgver - runghc Setup.lhs copy --destdir=$pkgdir - install -D -m644 LICENSE $pkgdir/usr/share/licenses/alex/BSD3 - - # doc/ contains only license which already installed into proper place - rm -rf $pkgdir/usr/share/doc -} -md5sums=('5e08c688ded0dcff98eaad6fc03a9402') diff --git a/testing/archboot/PKGBUILD b/testing/archboot/PKGBUILD deleted file mode 100644 index 9f2ddcd51..000000000 --- a/testing/archboot/PKGBUILD +++ /dev/null @@ -1,49 +0,0 @@ -# $Id: PKGBUILD 124155 2011-05-17 06:46:14Z tpowa $ -# Maintainer : Tobias Powalowski <tpowa@archlinux.org> - -pkgname=archboot -pkgver=2011.05 -pkgrel=2 -pkgdesc="Advanced, modular arch boot/install image creation utility" -arch=(i686 x86_64) -license=('GPL') -url="http://www.archlinux.org/" -depends=('mkinitcpio>=0.6.12-1' 'mksyslinux>=2010.08-1' 'mkpxelinux>=2010.08-1' 'mkisolinux>=2010.08-1' 'initscripts>=2011.05.2-1' 'subversion>=1.6.15-2' 'wget>=1.12-7' 'bash>=4.2.010-1' 'coreutils>=8.12-1' 'cryptsetup>=1.3.0-1' 'dialog>=1.1_20110302-1' 'e2fsprogs>=1.41.14-1' 'findutils>=4.4.2-3' 'gawk>=3.1.8-2' 'grep>=2.7-1' 'iputils>=20101006-1' 'jfsutils>=1.1.14-2' 'less>=443-1' 'lvm2>=2.02.85-1' 'mdadm>=3.2.1-3' 'module-init-tools>=3.12-2' 'nano>=2.2.6-1' 'ncurses>=5.9-1' 'net-tools>=1.60-14' 'gnu-netcat>=0.7.1-3' 'ntfsprogs>=2011.4.12-1' 'pcmciautils>=017-2' 'procps>=3.2.8-3' 'psmisc>=22.13-1' 'reiserfsprogs>=3.6.21-3' 'sed>=4.2.1-3' 'snarf>=7.0-4' 'syslog-ng>=3.2.4-1' 'sysvinit>=2.88-2' 'tar>=1.26-1' 'util-linux>=2.19.1-2' 'which>=2.20-4' 'kbd>=1.15.3-1' 'wireless_tools>=29-4' 'xfsprogs>=3.1.5-1' 'dnsutils>=9.8.0.P1-1' 'hdparm>=9.37-1' 'memtest86+>=4.20-1' 'inetutils>=1.8-2' 'openssh>=5.8p2-6' 'hwdetect>=2011.03-1' 'shadow>=4.1.4.3-1' 'bridge-utils>=1.4-4' 'ifenslave>=1.1.0-6' 'cpufrequtils>=008-1' 'links>=2.3pre1-1' 'tcp_wrappers>=7.6-12' 'dosfstools>=3.0.11-1' 'glibc>=2.13-5' 'linux-api-headers>=2.6.38.1-1' 'kernel26>=2.6.38.6-2' 'kernel26-lts>=2.6.32.40-1' 'xinetd>=2.3.14-6' 'kexec-tools>=2.0.2-3' 'ppp>=2.4.5-2' 'rp-pppoe>=3.10-6' 'lilo>=23.2-1' 'iptables>=1.4.10-1' 'capi4k-utils>=050718-7' 'isdn4k-utils>=3.2p1-6' 'ntfs-3g>=2011.4.12-1' 'pciutils>=3.1.7-4' 'usbutils>=002-3' 'vpnc>=0.5.3-3' 'openvpn>=2.2.0-1' 'b43-fwcutter>=014-1' 'wpa_supplicant>=0.7.3-3' 'rsync>=3.0.8-1' 'gzip>=1.4-2' 'libarchive>=2.8.4-2' 'device-mapper>=2.02.85-1' 'screen>=4.0.3-11' 'elfutils>=0.152-1' 'pam>=1.1.3-1' 'cracklib>=2.8.18-1' 'nfs-utils>=1.2.3-2' 'nfsidmap>=0.24-2' 'readline>=6.2.001-1' 'acl>=2.2.51-1' 'attr>=2.4.46-1' 'pcre>=8.12-1' 'cpio>=2.11-2' 'fuse>=2.8.5-1' 'libusb>=1.0.8-1' 'vim>=7.3.177-1' 'lzo2>=2.05-1' 'libsasl>=2.1.23-5' 'libldap>=2.4.24-1' 'gpm>=1.20.6-6' 'libevent>=2.0.11-1' 'gcc-libs>=4.6.0-5' 'sdparm>=1.06-1' 'licenses>=2.8-1' 'pptpclient>=1.7.2-3' 'ndiswrapper>=1.56-9' 'ndiswrapper-utils>=1.56-2' 'zd1211-firmware>=1.4-4' 'ipw2100-fw>=1.3-5' 'ipw2200-fw>=3.1-3' 'smbclient>=3.5.8-3' 'bittorrent>=5.2.2-4' 'dhcpcd>=5.2.12-1' 'openssl>=1.0.0.d-1' 'git>=1.7.5.1-1' 'dmraid>=1.0.0.rc16.3-1' 'linux-atm>=2.5.1-2' 'netcfg>=2.5.4-1' 'tiacx>=20080210-21' 'tiacx-firmware>=2-3' 'parted>=2.3-1' 'tzdata>=2011g-1' 'ntp>=4.2.6.p3-3' 'libgcrypt>=1.4.6-3' 'iw>=0.9.22-1' 'crda>=1.1.1-3' 'libnl>=1.1-2' 'iproute2>=2.6.38-2' 'wireless-regdb>=2010.11.24-1' 'v86d>=0.1.10-1' 'dhclient>=4.2.1.1-1' 'syslinux>=4.04-1' 'mtools>=4.0.16-1' 'fsarchiver>=0.6.12-1' 'xz>=5.0.2-1' 'libtirpc>=0.2.1-3' 'librpcsecgss>=0.19-5' 'rpcbind>=0.2.0-3' 'testdisk>=6.12-1' 'wipe>=2.3.1-1' 'ddrescue>=1.14-1' 'udev>=168-1' 'ifplugd>=0.28-7' 'wpa_actiond>=1.1-2' 'nouveau-firmware>=20091212-4' 'rfkill>=0.4-2' 'libgssglue>=0.1-4' 'mkinitcpio-nfs-utils>=0.2-1' 'gptfdisk>=0.7.1-1' 'nilfs-utils>=2.0.23-1' 'btrfs-progs-unstable>=0.19.20101006-1' 'ndiswrapper-lts>=1.56-5' 'nouveau-drm-lts>=0.0.16_20100313-5' 'linux-firmware>=20110512-2' 'iana-etc>=2.30-1' 'libusb-compat>=0.1.3-1' 'eject>=2.1.5-5' 'keyutils>=1.4-1') -optdepends=('grub2-bios: for grub2 support' - 'grub2-efi-i386: for grub2 support' - 'grub2-efi-x86_64: for grub2 support' - 'efibootmgr: for grub2 support' - 'clamav: for clamav support' -) -source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver-$pkgrel.tar.bz2 vmware-detect.c) -backup=('etc/archboot/allinone.conf' - 'etc/archboot/allinone-lts.conf' - 'etc/archboot/default.conf' - 'etc/archboot/default-ftp.conf' - 'etc/archboot/default-pxelinux.conf' - 'etc/archboot/default-ftp-pxelinux.conf' - 'etc/archboot/presets/allinone' - 'etc/archboot/presets/allinone-lts' - 'etc/archboot/presets/isolinux' - 'etc/archboot/presets/isolinux-ftp' - 'etc/archboot/presets/syslinux' - 'etc/archboot/presets/syslinux-ftp' - 'etc/archboot/presets/pxelinux' - 'etc/archboot/presets/pxelinux-ftp' -) -install=archboot.install - -### to bump the depends list use this: -#for i in $(grep ^depends= PKGBUILD | sed -e 's/depends=(//g' -e 's/)//g'); do sed -i -e "s/$(echo $i)/$(echo $i | sed -e "s/>=.*/>=$(pacman -Qi $(echo $i | sed -e "s/'//g" -e 's/>=.*//g') | grep ^Version | sed -e 's/.*: //g')'/g")/g" PKGBUILD; done - -build() -{ - cd $srcdir/$pkgname-$pkgver-$pkgrel - mv * $pkgdir/ - # vmware-detect - cd $startdir/src - gcc -o vmware-detect vmware-detect.c - install -D -m 755 vmware-detect $startdir/pkg/usr/bin/vmware-detect -} -md5sums=('e6d26e24c7491a3203421bd14e570c04' - '7e2b03463747cb22ab388e79a09fa0cb') diff --git a/testing/archboot/archboot.install b/testing/archboot/archboot.install deleted file mode 100644 index 315f97d7e..000000000 --- a/testing/archboot/archboot.install +++ /dev/null @@ -1,20 +0,0 @@ -# This is a default template for a post-install scriptlet. You can -# remove any functions you don't need (and this header). - -# arg 1: the new package version -post_install() { - cat << EOF -ARCHBOOT usage: ---------------- ---> Main config files were installed to '/etc/archboot/'. - Preset files were installed to '/etc/archboot/presets'. - Modify them to your needs. ---> Use the preset files as config file of your build tool: - mkisolinux, mksyslinux or mkpxelinux ---> For Allinone ISOs use archboot-allinone.sh -EOF -} - -post_upgrade() { - post_install $1 -} diff --git a/testing/archboot/vmware-detect.c b/testing/archboot/vmware-detect.c deleted file mode 100644 index d242a388d..000000000 --- a/testing/archboot/vmware-detect.c +++ /dev/null @@ -1,13 +0,0 @@ -#include <stdio.h> -int main() { - unsigned char idtr[6]; - asm("sidt %0" : "=m" (idtr)); - if(0xff==idtr[5]) - { - return 0; - } - else - { - return 1; - } -} diff --git a/testing/bind/127.0.0.zone b/testing/bind/127.0.0.zone deleted file mode 100644 index 509c311f6..000000000 --- a/testing/bind/127.0.0.zone +++ /dev/null @@ -1,11 +0,0 @@ -$ORIGIN 0.0.127.in-addr.arpa. - -@ 1D IN SOA localhost. root.localhost. ( - 42 ; serial (yyyymmdd##) - 3H ; refresh - 15M ; retry - 1W ; expiry - 1D ) ; minimum ttl - - 1D IN NS localhost. -1 1D IN PTR localhost. diff --git a/testing/bind/PKGBUILD b/testing/bind/PKGBUILD deleted file mode 100644 index 8df2eb03d..000000000 --- a/testing/bind/PKGBUILD +++ /dev/null @@ -1,86 +0,0 @@ -# $Id: PKGBUILD 125623 2011-05-27 08:34:32Z bisson $ -# Maintainer: Gaetan Bisson <bisson@archlinux.org> -# Contributor: judd <jvinet@zeroflux.org> -# Contributor: Mario Vazquez <mario_vazq@hotmail.com> - -pkgname=bind - -# Use a period and not a hyphen before the patch level for proper versioning. -pkgver=9.8.0.P2 -_pkgver=9.8.0-P2 -pkgrel=1 - -pkgdesc='Berkeley Internet Name Daemon (BIND) is the reference implementation of the Domain Name System (DNS) protocols' -arch=('i686' 'x86_64') -url='http://www.isc.org/software/bind/' -license=('custom:ISC') -provides=('dns-server') -backup=('etc/logrotate.d/named' - 'etc/conf.d/named' - 'etc/named.conf') -depends=('openssl' 'krb5' 'libxml2') -options=('!makeflags' '!libtool') -source=("http://ftp.isc.org/isc/bind9/${_pkgver}/${pkgname}-${_pkgver}.tar.gz" - 'root.hint::ftp://ftp.rs.internic.net/domain/db.cache' - 'so_bsdcompat.patch' - 'notools.patch' - 'named' - 'named.conf' - 'named.conf.d' - 'named.logrotate' - 'localhost.zone' - '127.0.0.zone') -sha1sums=('b3492ad11cfbf2939d9b0fb62c52c204de58679b' - 'ee52947062c1582858187716b776afa3613608fb' - 'b433ba99f23e3db305f8ce293fe4ce6d1b8d4cfb' - '17444f9d759a4bde7688bdaa304dac57a138e4c1' - '46232e9db243c6c05e170a1781d7a7f413be5d03' - '5ca7a5f2a132548a090a045a2df3acea6b35d9eb' - '7848edbfb9a848843f57c11c02b0289eefd42d00' - '9ffb5c3f72390a517aeae557e32349d5d278cb63' - '76a0d4cd1b913db177a5a375bebc47e5956866ec' - '53be0f1437ebe595240d8dbdd819939582b97fb9') - -install=install - -build() { - cd "${srcdir}/${pkgname}-${_pkgver}" - - patch -p1 -i ../so_bsdcompat.patch - patch -p1 -i ../notools.patch - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --disable-static \ - --disable-linux-caps \ - --with-openssl \ - --with-gssapi \ - --with-libxml2 \ - --with-libtool \ - --with-dlz-dlopen \ - - make -} - -package() { - cd "${srcdir}/${pkgname}-${_pkgver}" - - make DESTDIR="${pkgdir}" install - - rmdir "${pkgdir}/var/run" - install -d "${pkgdir}"/usr/share/doc/bind - install doc/arm/*.html "${pkgdir}"/usr/share/doc/bind/ - install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - - install -D -m755 ../named "${pkgdir}"/etc/rc.d/named - install -D -m644 ../named.conf.d "${pkgdir}"/etc/conf.d/named - install -D -m600 ../named.logrotate "${pkgdir}"/etc/logrotate.d/named - install -D -m640 -o 0 -g 40 ../named.conf "${pkgdir}"/etc/named.conf - - install -d -m750 -o 0 -g 40 "${pkgdir}"/var/named - install -m640 -o 0 -g 40 ../root.hint "${pkgdir}"/var/named/ - install -m640 -o 0 -g 40 ../127.0.0.zone "${pkgdir}"/var/named/ - install -m640 -o 0 -g 40 ../localhost.zone "${pkgdir}"/var/named/ -} diff --git a/testing/bind/install b/testing/bind/install deleted file mode 100644 index e3a1397cb..000000000 --- a/testing/bind/install +++ /dev/null @@ -1,21 +0,0 @@ -post_install() { - getent group named >/dev/null || groupadd -g 40 named - getent passwd named >/dev/null || useradd -u 40 -c "BIND DNS Server" -g named -d /var/named -s /bin/false named - passwd -l named &>/dev/null - - touch var/log/named.log - chown named:named var/log/named.log - - # create an rndc.key if it doesn't already exist - if [ ! -s etc/rndc.key ]; then - usr/sbin/rndc-confgen -r /dev/urandom -b 256 | head -n 5 >>etc/rndc.key - chown root:named etc/rndc.key - chmod 640 etc/rndc.key - fi -} - -pre_remove() { - getent passwd named &>/dev/null && userdel named >/dev/null - getent group named &>/dev/null && groupdel named >/dev/null - return 0 -} diff --git a/testing/bind/localhost.zone b/testing/bind/localhost.zone deleted file mode 100644 index e3ff9641c..000000000 --- a/testing/bind/localhost.zone +++ /dev/null @@ -1,10 +0,0 @@ -$ORIGIN localhost. -@ 1D IN SOA @ root ( - 42 ; serial (yyyymmdd##) - 3H ; refresh - 15M ; retry - 1W ; expiry - 1D ) ; minimum ttl - - 1D IN NS @ - 1D IN A 127.0.0.1 diff --git a/testing/bind/named b/testing/bind/named deleted file mode 100755 index 7907f9983..000000000 --- a/testing/bind/named +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/named - -[[ -d /var/run/named ]] || mkdir -p /var/run/named -chown named:named /var/run/named - -PIDFILE=/var/run/named/named.pid -PID=$(cat $PIDFILE 2>/dev/null) -readlink -q /proc/$PID/exe | grep -q '^/usr/sbin/named' || { PID=; rm $PIDFILE 2>/dev/null; } - -case "$1" in - start) - stat_busy "Starting BIND" - [ -z "$PID" ] && /usr/sbin/named ${NAMED_ARGS} - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon named - stat_done - fi - ;; - stop) - stat_busy "Stopping BIND" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon named - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - reload) - stat_busy "Reloading BIND" - [ ! -z "$PID" ] && rndc reload &>/dev/null || kill -HUP $PID &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - ;; - *) - echo "usage: $0 {start|stop|reload|restart}" -esac -exit 0 diff --git a/testing/bind/named.conf b/testing/bind/named.conf deleted file mode 100644 index 38fb12cbe..000000000 --- a/testing/bind/named.conf +++ /dev/null @@ -1,64 +0,0 @@ -// -// /etc/named.conf -// - -options { - directory "/var/named"; - pid-file "/var/run/named/named.pid"; - auth-nxdomain yes; - datasize default; -// Uncomment these to enable IPv6 connections support -// IPv4 will still work: -// listen-on-v6 { any; }; -// Add this for no IPv4: -// listen-on { none; }; - - // Default security settings. - allow-recursion { 127.0.0.1; }; - allow-transfer { none; }; - allow-update { none; }; - version none; - hostname none; - server-id none; -}; - -zone "localhost" IN { - type master; - file "localhost.zone"; - allow-transfer { any; }; -}; - -zone "0.0.127.in-addr.arpa" IN { - type master; - file "127.0.0.zone"; - allow-transfer { any; }; -}; - -zone "." IN { - type hint; - file "root.hint"; -}; - -//zone "example.org" IN { -// type slave; -// file "example.zone"; -// masters { -// 192.168.1.100; -// }; -// allow-query { any; }; -// allow-transfer { any; }; -//}; - -logging { - channel xfer-log { - file "/var/log/named.log"; - print-category yes; - print-severity yes; - print-time yes; - severity info; - }; - category xfer-in { xfer-log; }; - category xfer-out { xfer-log; }; - category notify { xfer-log; }; -}; - diff --git a/testing/bind/named.conf.d b/testing/bind/named.conf.d deleted file mode 100644 index aecbd2307..000000000 --- a/testing/bind/named.conf.d +++ /dev/null @@ -1,4 +0,0 @@ -# -# Parameters to be passed to BIND -# -NAMED_ARGS="-u named" diff --git a/testing/bind/named.logrotate b/testing/bind/named.logrotate deleted file mode 100644 index ef1a2d032..000000000 --- a/testing/bind/named.logrotate +++ /dev/null @@ -1,6 +0,0 @@ -/var/log/named.log { - missingok - postrotate - /bin/kill -HUP `cat /var/run/named/named.pid 2>/dev/null` 2>/dev/null || true - endscript -} diff --git a/testing/bind/notools.patch b/testing/bind/notools.patch deleted file mode 100644 index 0ad083a01..000000000 --- a/testing/bind/notools.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -aur old/bin/Makefile.in new/bin/Makefile.in ---- old/bin/Makefile.in 2011-05-27 10:12:59.392416094 +0200 -+++ new/bin/Makefile.in 2011-05-27 10:13:12.372521984 +0200 -@@ -19,7 +19,7 @@ - VPATH = @srcdir@ - top_srcdir = @top_srcdir@ - --SUBDIRS = named rndc dig dnssec tests tools nsupdate \ -+SUBDIRS = named rndc dnssec tests tools \ - check confgen @PKCS11_TOOLS@ - TARGETS = - diff --git a/testing/bind/so_bsdcompat.patch b/testing/bind/so_bsdcompat.patch deleted file mode 100644 index 4d7031fcc..000000000 --- a/testing/bind/so_bsdcompat.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -aur old/lib/isc/unix/socket.c new/lib/isc/unix/socket.c ---- old/lib/isc/unix/socket.c 2011-02-18 05:01:16.000000000 +0100 -+++ new/lib/isc/unix/socket.c 2011-05-27 10:12:01.685269374 +0200 -@@ -712,6 +712,8 @@ - } - #endif - -+#undef SO_BSDCOMPAT -+ - static void - socket_log(isc__socket_t *sock, isc_sockaddr_t *address, - isc_logcategory_t *category, isc_logmodule_t *module, int level, diff --git a/testing/bison/ChangeLog b/testing/bison/ChangeLog deleted file mode 100644 index 5bb22be1d..000000000 --- a/testing/bison/ChangeLog +++ /dev/null @@ -1,19 +0,0 @@ -2010-03-25 Eric Belanger <eric@archlinux.org> - - * bison 2.4.2-1 - * Upstream update - * Removed texinfo dependency in install scriptlet - * Updated license - * Added sh depends - -2008-12-11 Eric Belanger <eric@archlinux.org> - - * bison 2.4.1-1 - * Upstream update - -2008-11-08 Eric Belanger <eric@archlinux.org> - - * bison 2.4-1 - * Upstream update - * Added info file support - * Added ChangeLog diff --git a/testing/bison/PKGBUILD b/testing/bison/PKGBUILD deleted file mode 100644 index ebf2c0fc5..000000000 --- a/testing/bison/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 124065 2011-05-16 12:02:28Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Contributor: Eric Belanger <eric@archlinux.org> - -pkgname=bison -pkgver=2.5 -pkgrel=1 -pkgdesc="The GNU general-purpose parser generator" -arch=('i686' 'x86_64') -license=('GPL3') -url="http://www.gnu.org/software/bison/bison.html" -depends=('glibc' 'm4' 'sh') -groups=('base-devel') -install=bison.install -source=(ftp://ftp.gnu.org/gnu/bison/${pkgname}-${pkgver}.tar.bz2) -md5sums=('9dba20116b13fc61a0846b0058fbe004') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --datadir=/usr/share - make -} - -check() { - cd "${srcdir}/${pkgname}-${pkgver}" - make check -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/bison/bison.install b/testing/bison/bison.install deleted file mode 100644 index 0081a194f..000000000 --- a/testing/bison/bison.install +++ /dev/null @@ -1,16 +0,0 @@ -infodir=usr/share/info -file=bison.info.gz - -post_install() { - [ -x usr/bin/install-info ] || return 0 - install-info $infodir/$file $infodir/dir 2> /dev/null -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - install-info --delete $infodir/$file $infodir/dir 2> /dev/null -} diff --git a/testing/dnsutils/PKGBUILD b/testing/dnsutils/PKGBUILD deleted file mode 100644 index 12829b5d1..000000000 --- a/testing/dnsutils/PKGBUILD +++ /dev/null @@ -1,48 +0,0 @@ -# $Id: PKGBUILD 125626 2011-05-27 10:41:33Z bisson $ -# Maintainer: Gaetan Bisson <bisson@archlinux.org> -# Contributor: kevin <kevin@archlinux.org> -# Contributor: mario <mario_vazq@hotmail.com> - -pkgname=dnsutils - -# Use a period and not a hyphen before the patch level for proper versioning. -pkgver=9.8.0.P2 -_pkgver=9.8.0-P2 -pkgrel=1 - -pkgdesc='Various DNS utilities - dig host nslookup nsupdate' -arch=('i686' 'x86_64') -url='https://www.isc.org/software/bind' -license=('custom:ISC') -depends=('openssl' 'idnkit') -replaces=('bind-tools' 'host') -options=('!makeflags') -source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz" - 'tools-only.patch') -sha1sums=('b3492ad11cfbf2939d9b0fb62c52c204de58679b' - 'ac88c89e25c26d73095a3dd85e1ca1070d184ded') - -build() { - cd "${srcdir}/bind-${_pkgver}" - - patch -p1 -i ../tools-only.patch - export STD_CDEFINES='-DDIG_SIGCHASE' - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --with-openssl=yes \ - --with-idn=yes \ - --disable-linux-caps \ - - make -} - -package() { - cd "${srcdir}/bind-${_pkgver}/bin" - - make DESTDIR="${pkgdir}" install - - install -Dm644 ../COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/testing/dnsutils/tools-only.patch b/testing/dnsutils/tools-only.patch deleted file mode 100644 index b46b71f60..000000000 --- a/testing/dnsutils/tools-only.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -Naur bind-9.7.1-P2.orig/bin/Makefile.in bind-9.7.1-P2/bin/Makefile.in ---- bind-9.7.1-P2.orig/bin/Makefile.in 2009-10-05 08:07:08.000000000 -0400 -+++ bind-9.7.1-P2/bin/Makefile.in 2010-07-22 15:55:00.000000000 -0400 -@@ -19,8 +19,7 @@ - VPATH = @srcdir@ - top_srcdir = @top_srcdir@ - --SUBDIRS = named rndc dig dnssec tests tools nsupdate \ -- check confgen @PKCS11_TOOLS@ -+SUBDIRS = dig nsupdate - TARGETS = - - @BIND9_MAKE_RULES@ -diff -Naur bind-9.7.1-P2.orig/lib/Makefile.in bind-9.7.1-P2/lib/Makefile.in ---- bind-9.7.1-P2.orig/lib/Makefile.in 2007-06-19 19:47:13.000000000 -0400 -+++ bind-9.7.1-P2/lib/Makefile.in 2010-07-22 15:56:29.000000000 -0400 -@@ -23,7 +23,7 @@ - # Attempt to disable parallel processing. - .NOTPARALLEL: - .NO_PARALLEL: --SUBDIRS = isc isccc dns isccfg bind9 lwres tests -+SUBDIRS = isc dns isccfg bind9 lwres - TARGETS = - - @BIND9_MAKE_RULES@ diff --git a/testing/ghc/PKGBUILD b/testing/ghc/PKGBUILD deleted file mode 100644 index a526404af..000000000 --- a/testing/ghc/PKGBUILD +++ /dev/null @@ -1,86 +0,0 @@ -# $Id: PKGBUILD 120001 2011-04-18 09:44:35Z vesa $ -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Special note for devs looking to upgrade this package: -# ghc places a unique hash for each library when it is built. -# Libraries depend on versions specified by those hashes. -# This implies that all libraries need to be rebuilt when ghc is rebuilt. -# Also, due to dependency loop problems, haskell-ghc-paths and haddock -# do not carry version dependencies. You will have to remember to build them too. -pkgname=ghc -pkgver=7.0.3 -pkgrel=1 -pkgdesc="The Glasgow Haskell Compiler" -arch=(i686 x86_64) -url="http://www.haskell.org/ghc/" -license=("custom") -depends=('perl' 'gmp>=5.0' gcc) -makedepends=(ghc happy perl libxslt docbook-xsl) -provides=("haskell-array=0.3.0.2" - "haskell-bytestring=0.9.1.10" - "haskell-cabal=1.10.1.0" - "haskell-containers=0.4.0.0" - "haskell-directory=1.1.0.0" - "haskell-extensible-exceptions=0.1.1.2" - "haskell-filepath=1.2.0.0" - "haskell-haskell98=1.1.0.1" - "haskell-hpc=0.5.0.6" - "haskell-old-locale=1.0.0.2" - "haskell-old-time=1.0.0.6" - "haskell-pretty=1.0.1.2" - "haskell-process=1.0.1.5" - "haskell-random=1.0.0.3" - "haskell-template-haskell=2.5.0.0" - "haskell-time=1.2.0.3" - "haskell-unix=2.4.2.0" - ) -replaces=("haskell-array<0.3.0.2" - "haskell-bytestring<0.9.1.10" - "haskell-cabal<1.10.1.0" - "haskell-containers<0.4.0.0" - "haskell-directory<1.1.0.0" - "haskell-extensible-exceptions<0.1.1.2" - "haskell-filepath<1.2.0.0" - "haskell-haskell98<1.1.0.1" - "haskell-hpc<0.5.0.6" - "haskell-old-locale<1.0.0.2" - "haskell-old-time<1.0.0.6" - "haskell-pretty<1.0.1.2" - "haskell-process<1.0.1.5" - "haskell-random<1.0.0.3" - "haskell-template-haskell<2.5.0.0" - "haskell-time<1.2.0.3" - "haskell-unix<2.4.2.0" - ) - -install=ghc.install -options=(!strip) -source=("http://www.haskell.org/ghc/dist/$pkgver/ghc-$pkgver-src.tar.bz2" - build.mk) - -build() { - cd $srcdir/$pkgname-$pkgver - - cp $srcdir/build.mk mk/build.mk - - # FS#17875 - sed -i 's/INSTALL_SHELL_WRAPPER = YES/INSTALL_SHELL_WRAPPER = NO/' utils/haddock/ghc.mk - - ./configure --prefix=/usr - make -j1 || return 1 -} - -package() { - cd $srcdir/$pkgname-$pkgver - - make DESTDIR=$pkgdir install - - install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/ghc/license - install -d $pkgdir/usr/share/haskell - - rm $pkgdir/usr/bin/haddock -} - -md5sums=('946a18a0dc30437db72c0d3fdf26ca42' - '5a3e0880c80b1dcecf779ff2e63a9c0d') -md5sums=('10bc5e9ae1b581404376efb85f260ff3' - '5a3e0880c80b1dcecf779ff2e63a9c0d') diff --git a/testing/ghc/build.mk b/testing/ghc/build.mk deleted file mode 100644 index f918a0f16..000000000 --- a/testing/ghc/build.mk +++ /dev/null @@ -1,150 +0,0 @@ -# ----------------------------------------------------------------------------- -# A Sample build.mk -# -# Uncomment one of the following BuildFlavour settings to get the desired -# overall build type, and then tweak the options in the relevant section -# below. - -# Uncomment one of these to select a build profile below: - -# Full build with max optimisation (slow build) -BuildFlavour = perf - -# Fastest build (libs unoptimised): -#BuildFlavour = quickest - -# Fast build with optimised libraries: -#BuildFlavour = quick - -# Profile the stage2 compiler: -#BuildFlavour = prof - -# A development build, working on the stage 1 compiler: -#BuildFlavour = devel1 - -# A development build, working on the stage 2 compiler: -#BuildFlavour = devel2 - -GhcLibWays = v - -# -------- 1. A Performance/Distribution build-------------------------------- - -ifeq "$(BuildFlavour)" "perf" - -# perf matches the default settings, repeated here for comparison: - -SRC_HC_OPTS = -O -H64m -GhcStage1HcOpts = -O -fasm -GhcStage2HcOpts = -O2 -fasm -GhcHcOpts = -Rghc-timing -GhcLibHcOpts = -O2 -XGenerics -GhcLibWays += p - -ifeq "$(PlatformSupportsSharedLibs)" "YES" -GhcLibWays += dyn -endif - -endif - -# -------- A Fast build ------------------------------------------------------ - -ifeq "$(BuildFlavour)" "quickest" - -SRC_HC_OPTS = -H64m -O0 -fasm -GhcStage1HcOpts = -O -fasm -GhcStage2HcOpts = -O0 -fasm -GhcLibHcOpts = -O0 -fasm -SplitObjs = NO -HADDOCK_DOCS = NO -BUILD_DOCBOOK_HTML = NO -BUILD_DOCBOOK_PS = NO -BUILD_DOCBOOK_PDF = NO - -endif - -# -------- A Fast build with optimised libs ---------------------------------- - -ifeq "$(BuildFlavour)" "quick" - -SRC_HC_OPTS = -H64m -O0 -fasm -GhcStage1HcOpts = -O -fasm -GhcStage2HcOpts = -O0 -fasm -GhcLibHcOpts = -O -fasm -SplitObjs = NO -HADDOCK_DOCS = NO -BUILD_DOCBOOK_HTML = NO -BUILD_DOCBOOK_PS = NO -BUILD_DOCBOOK_PDF = NO - -endif - -# -------- Profile the stage2 compiler --------------------------------------- - -ifeq "$(BuildFlavour)" "prof" - -SRC_HC_OPTS = -H64m -O0 -fasm -GhcStage1HcOpts = -O -fasm -GhcStage2HcOpts = -O -fasm -GhcLibHcOpts = -O -fasm - -GhcLibWays += p -GhcProfiled = YES - -SplitObjs = NO -HADDOCK_DOCS = NO -BUILD_DOCBOOK_HTML = NO -BUILD_DOCBOOK_PS = NO -BUILD_DOCBOOK_PDF = NO - -endif - - -# -------- A Development build (stage 1) ------------------------------------- - -ifeq "$(BuildFlavour)" "devel1" - -SRC_HC_OPTS = -H64m -O -fasm -GhcLibHcOpts = -O -dcore-lint -GhcStage1HcOpts = -Rghc-timing -O0 -DDEBUG -GhcStage2HcOpts = -Rghc-timing -O -fasm -SplitObjs = NO -HADDOCK_DOCS = NO -BUILD_DOCBOOK_HTML = NO -BUILD_DOCBOOK_PS = NO -BUILD_DOCBOOK_PDF = NO - -endif - -# -------- A Development build (stage 2) ------------------------------------- - -ifeq "$(BuildFlavour)" "devel2" - -SRC_HC_OPTS = -H64m -O -fasm -GhcLibHcOpts = -O -dcore-lint -GhcStage1HcOpts = -Rghc-timing -O -fasm -GhcStage2HcOpts = -Rghc-timing -O0 -DDEBUG -SplitObjs = NO -HADDOCK_DOCS = NO -BUILD_DOCBOOK_HTML = NO -BUILD_DOCBOOK_PS = NO -BUILD_DOCBOOK_PDF = NO - -endif - -# ----------------------------------------------------------------------------- -# Other settings that might be useful - -# profiled RTS -#GhcRtsCcOpts = -pg -g - -# Optimised/profiled RTS -#GhcRtsCcOpts = -O2 -pg - -#GhcRtsWithFrontPanel = YES -#SRC_HC_OPTS += `gtk-config --libs` - -# NoFib settings -NoFibWays = -STRIP=: - - diff --git a/testing/ghc/ghc.install b/testing/ghc/ghc.install deleted file mode 100644 index 7d56083bc..000000000 --- a/testing/ghc/ghc.install +++ /dev/null @@ -1,19 +0,0 @@ -pkgname=ghc - -pre_upgrade() { - cat << EOF - ==> Unregistering cabalized packages... -EOF - cd /usr/share/haskell/ && (for a in *; do ghc-pkg unregister --force $a &> /dev/null; done; cd - > /dev/null ) - cat << EOF - ==> Done. -EOF - -} - -post_upgrade() { - cat << EOF - ==> All cabalized and yaourt-installed packages need to be reinstalled now. - ==> See /usr/share/haskell/ and ghc-pkg list --user for a tentative list of affected packages. -EOF -} diff --git a/testing/haddock/PKGBUILD b/testing/haddock/PKGBUILD deleted file mode 100644 index e061249d3..000000000 --- a/testing/haddock/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -# As generated by cabal2arch 0.7.6 -pkgname=haddock -pkgver=2.9.2 -pkgrel=1 -pkgdesc="Documentation-generation tool for Haskell libraries" -url="http://hackage.haskell.org/package/${pkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64') -makedepends=(alex happy) -depends=(ghc sh 'haskell-mtl' 'haskell-xhtml' 'haskell-ghc-paths') # cannot have more strict deps here -options=('strip') -source=(http://hackage.haskell.org/packages/archive/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz) -install=${pkgname}.install - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ - --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${pkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} - -md5sums=('04928e132827a1da20ace52babb43e47') diff --git a/testing/haddock/haddock.install b/testing/haddock/haddock.install deleted file mode 100644 index 278da355e..000000000 --- a/testing/haddock/haddock.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haddock -post_install() { - ${HS_DIR}/register.sh &> /dev/null - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) &> /dev/null -} -pre_upgrade() { - ${HS_DIR}/unregister.sh &> /dev/null -} -post_upgrade() { - ${HS_DIR}/register.sh &> /dev/null - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) &> /dev/null -} -pre_remove() { - ${HS_DIR}/unregister.sh &> /dev/null -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) &> /dev/null -} diff --git a/testing/haskell-cgi/PKGBUILD b/testing/haskell-cgi/PKGBUILD deleted file mode 100644 index ebee2e82e..000000000 --- a/testing/haskell-cgi/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# Maintainer: Rémy Oudompheng <remy@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -# Package generated by cabal2arch 0.7.6 -_hkgname=cgi -pkgname=haskell-cgi -pkgver=3001.1.7.4 -pkgrel=3 -pkgdesc="A library for writing CGI programs" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.0.2-2' 'haskell-mtl=2.0.1.0-2' 'haskell-network=2.3.0.2-2' 'haskell-parsec=3.1.1-2' 'haskell-xhtml=3000.2.0.1-7') -options=('strip') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install -md5sums=('0e551afc8d6f39aaa70520e31de26506') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/testing/haskell-cgi/haskell-cgi.install b/testing/haskell-cgi/haskell-cgi.install deleted file mode 100644 index 533fe4dc5..000000000 --- a/testing/haskell-cgi/haskell-cgi.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-cgi -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/testing/haskell-deepseq/PKGBUILD b/testing/haskell-deepseq/PKGBUILD deleted file mode 100644 index b89f39f8b..000000000 --- a/testing/haskell-deepseq/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -# Package generated by cabal2arch 0.7.6 -_hkgname=deepseq -pkgname=haskell-deepseq -pkgver=1.1.0.2 -pkgrel=2 -pkgdesc="Fully evaluate data structures" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=(ghc=7.0.2-2 sh) -options=('strip') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install -md5sums=('90b66480f0eb659c1db209ee703e0162') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ - --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/testing/haskell-deepseq/haskell-deepseq.install b/testing/haskell-deepseq/haskell-deepseq.install deleted file mode 100644 index 8ba51eac7..000000000 --- a/testing/haskell-deepseq/haskell-deepseq.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-deepseq -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/testing/haskell-fgl/PKGBUILD b/testing/haskell-fgl/PKGBUILD deleted file mode 100644 index 4a866601d..000000000 --- a/testing/haskell-fgl/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# Maintainer: Arch Haskell Team <arch-haskell@haskell.org> -_hkgname=fgl -pkgname=haskell-fgl -pkgver=5.4.2.3 -pkgrel=4 -pkgdesc="Martin Erwig's Functional Graph Library" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64') -makedepends=() -depends=('ghc=7.0.2-2' 'haskell-mtl=2.0.1.0-2') -options=('strip') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install -md5sums=('29ccab8bebed16a8d7346c3ed52c5d9c') -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} -md5sums=('29ccab8bebed16a8d7346c3ed52c5d9c') diff --git a/testing/haskell-fgl/haskell-fgl.install b/testing/haskell-fgl/haskell-fgl.install deleted file mode 100644 index 0da0edb7b..000000000 --- a/testing/haskell-fgl/haskell-fgl.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-fgl -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/testing/haskell-ghc-paths/PKGBUILD b/testing/haskell-ghc-paths/PKGBUILD deleted file mode 100644 index 5a744ac49..000000000 --- a/testing/haskell-ghc-paths/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# Maintainer: Arch Haskell Team <arch-haskell@haskell.org> -_hkgname=ghc-paths -pkgname=haskell-ghc-paths -pkgver=0.1.0.8 -pkgrel=4 -pkgdesc="Knowledge of GHC's installation directories" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64') -makedepends=() -depends=(ghc=7.0.2) # cannot have stricter dep here due to haddock -options=('strip') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install -md5sums=('d2b23dc563888e380588501d2ce1d82b') -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/testing/haskell-ghc-paths/haskell-ghc-paths.install b/testing/haskell-ghc-paths/haskell-ghc-paths.install deleted file mode 100644 index 4fd2c6c56..000000000 --- a/testing/haskell-ghc-paths/haskell-ghc-paths.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-ghc-paths -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/testing/haskell-glut/PKGBUILD b/testing/haskell-glut/PKGBUILD deleted file mode 100644 index a42385959..000000000 --- a/testing/haskell-glut/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# Maintainer: Arch Haskell Team <arch-haskell@haskell.org> -_hkgname=GLUT -pkgname=haskell-glut -pkgver=2.1.2.1 -pkgrel=6 -pkgdesc="A binding for the OpenGL Utility Toolkit" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64') -makedepends=() -depends=('ghc=7.0.2-2' 'haskell-opengl=2.2.3.0-6' 'freeglut') -options=('strip') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install -md5sums=('b97f476a04098701e330e86c1f89ed52') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/testing/haskell-glut/haskell-glut.install b/testing/haskell-glut/haskell-glut.install deleted file mode 100644 index 44c7cb3c1..000000000 --- a/testing/haskell-glut/haskell-glut.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-glut -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/testing/haskell-haskell-src/PKGBUILD b/testing/haskell-haskell-src/PKGBUILD deleted file mode 100644 index 8b9340c4f..000000000 --- a/testing/haskell-haskell-src/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -_hkgname=haskell-src -pkgname=haskell-haskell-src -pkgver=1.0.1.4 -pkgrel=2 -pkgdesc="Facilities for manipulating Haskell source code: an abstract syntax, lexer, parser and pretty-printer." -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.0.2-2' 'haskell-syb=0.3-2' sh) -makedepends=(happy) -options=('strip') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz) -install=${pkgname}.install -md5sums=('32d181c082393ab859e72610803bac6e') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ - --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} - diff --git a/testing/haskell-haskell-src/haskell-haskell-src.install b/testing/haskell-haskell-src/haskell-haskell-src.install deleted file mode 100644 index 03ce601bc..000000000 --- a/testing/haskell-haskell-src/haskell-haskell-src.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-haskell-src -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/testing/haskell-html/PKGBUILD b/testing/haskell-html/PKGBUILD deleted file mode 100644 index 10a04cbdf..000000000 --- a/testing/haskell-html/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -# Package generated by cabal2arch 0.7.6 -_hkgname=html -pkgname=haskell-html -pkgver=1.0.1.2 -pkgrel=9 -pkgdesc="HTML combinator library" -url="http://hackage.haskell.org/package/html" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=(ghc=7.0.2-2 sh) -options=('strip') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install -md5sums=('2a7de5a2af9a2f80d39825d6a95ee445') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/testing/haskell-html/haskell-html.install b/testing/haskell-html/haskell-html.install deleted file mode 100644 index 768297e0a..000000000 --- a/testing/haskell-html/haskell-html.install +++ /dev/null @@ -1,19 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-html -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh &> /dev/null - exit 0 -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/testing/haskell-http/PKGBUILD b/testing/haskell-http/PKGBUILD deleted file mode 100644 index 80fce6663..000000000 --- a/testing/haskell-http/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -# Package generated by cabal2arch 0.7.6 -_hkgname=HTTP -pkgname=haskell-http -pkgver=4000.1.1 -pkgrel=3 -pkgdesc="A library for client-side HTTP" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.0.2-2' sh 'haskell-network=2.3.0.2-2' 'haskell-parsec=3.1.1-2' 'haskell-mtl=2.0.1.0-2') -options=('strip') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install -md5sums=('ddf23d46c4d6dc0048c454e3d01caa57') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} - diff --git a/testing/haskell-http/haskell-http.install b/testing/haskell-http/haskell-http.install deleted file mode 100644 index fdebb1cb8..000000000 --- a/testing/haskell-http/haskell-http.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-http -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/testing/haskell-hunit/PKGBUILD b/testing/haskell-hunit/PKGBUILD deleted file mode 100644 index 634fd49f3..000000000 --- a/testing/haskell-hunit/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -_hkgname=HUnit -pkgname=haskell-hunit -pkgver=1.2.2.3 -pkgrel=2 -pkgdesc="A unit testing framework for Haskell" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=(ghc=7.0.2-2 sh) -options=('strip') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz) -install=${pkgname}.install -md5sums=('f179add502f88153e5c9fdc69056b657') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ - --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/testing/haskell-hunit/haskell-hunit.install b/testing/haskell-hunit/haskell-hunit.install deleted file mode 100644 index ceb108b5b..000000000 --- a/testing/haskell-hunit/haskell-hunit.install +++ /dev/null @@ -1,19 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-hunit -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh &> /dev/null - exit 0 -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/testing/haskell-mtl/PKGBUILD b/testing/haskell-mtl/PKGBUILD deleted file mode 100644 index ea29d2633..000000000 --- a/testing/haskell-mtl/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -_hkgname=mtl -pkgname=haskell-mtl -pkgver=2.0.1.0 -pkgrel=2 -pkgdesc="Monad transformer library" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=(ghc=7.0.2-2 sh 'haskell-transformers=0.2.2.0-2') -options=('strip') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz) -install=${pkgname}.install -md5sums=('934fa813625ef7e88a6a96a09815ff95') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ - --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} -md5sums=('934fa813625ef7e88a6a96a09815ff95') diff --git a/testing/haskell-mtl/haskell-mtl.install b/testing/haskell-mtl/haskell-mtl.install deleted file mode 100644 index 9325811e8..000000000 --- a/testing/haskell-mtl/haskell-mtl.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-mtl -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/testing/haskell-network/PKGBUILD b/testing/haskell-network/PKGBUILD deleted file mode 100644 index 685e5fe2b..000000000 --- a/testing/haskell-network/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -# Package generated by cabal2arch 0.7.6 -_hkgname=network -pkgname=haskell-network -pkgver=2.3.0.2 -pkgrel=2 -pkgdesc="Networking-related facilities" -url="http://hackage.haskell.org/package/network" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=(ghc=7.0.2-2 sh 'haskell-parsec=3.1.1-2') -options=('strip') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install -md5sums=('a739fe9b75af744cfa1c05e39d41ac1f') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/testing/haskell-network/haskell-network.install b/testing/haskell-network/haskell-network.install deleted file mode 100644 index a56c31d0a..000000000 --- a/testing/haskell-network/haskell-network.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-network -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/testing/haskell-opengl/PKGBUILD b/testing/haskell-opengl/PKGBUILD deleted file mode 100644 index a45b3f303..000000000 --- a/testing/haskell-opengl/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# Maintainer: Arch Haskell Team <arch-haskell@haskell.org> -_hkgname=OpenGL -pkgname=haskell-opengl -pkgver=2.2.3.0 -pkgrel=6 -pkgdesc="A binding for the OpenGL graphics system" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64') -makedepends=() -depends=('ghc=7.0.2-2' 'mesa') -options=('strip') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install -md5sums=('f4e3ccb471034a6a74921d4dab9dd32d') -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/testing/haskell-opengl/haskell-opengl.install b/testing/haskell-opengl/haskell-opengl.install deleted file mode 100644 index d0f3474b3..000000000 --- a/testing/haskell-opengl/haskell-opengl.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-opengl -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/testing/haskell-parallel/PKGBUILD b/testing/haskell-parallel/PKGBUILD deleted file mode 100644 index 1191611e8..000000000 --- a/testing/haskell-parallel/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -# Package generated by cabal2arch 0.7.6 -_hkgname=parallel -pkgname=haskell-parallel -pkgver=3.1.0.1 -pkgrel=3 -pkgdesc="Parallel programming library" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=(ghc=7.0.2-2 sh 'haskell-deepseq=1.1.0.2-2') -options=('strip') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz) -install=${pkgname}.install -md5sums=('591979e7897dbc09157edf73a4614957') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ - --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/testing/haskell-parallel/haskell-parallel.install b/testing/haskell-parallel/haskell-parallel.install deleted file mode 100644 index e6ec0c449..000000000 --- a/testing/haskell-parallel/haskell-parallel.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-parallel -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/testing/haskell-parsec/PKGBUILD b/testing/haskell-parsec/PKGBUILD deleted file mode 100644 index 516621979..000000000 --- a/testing/haskell-parsec/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -# As generated by cabal2arch 0.7.6 -_hkgname=parsec -pkgname=haskell-parsec -pkgver=3.1.1 -pkgrel=2 -pkgdesc="Monadic parser combinators" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=(ghc=7.0.2-2 sh 'haskell-mtl=2.0.1.0-2') -options=('strip') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install -md5sums=('3d5500847cac09f6f658db825b6c5df8') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ - --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} - diff --git a/testing/haskell-parsec/haskell-parsec.install b/testing/haskell-parsec/haskell-parsec.install deleted file mode 100644 index dfa0701b9..000000000 --- a/testing/haskell-parsec/haskell-parsec.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-parsec -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/testing/haskell-platform/PKGBUILD b/testing/haskell-platform/PKGBUILD deleted file mode 100644 index 0b6c908d2..000000000 --- a/testing/haskell-platform/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# Maintainer: Vesa Kaihlavirta <vegai@iki.fi> -pkgname=haskell-platform -pkgver=2011.2.0.0 -pkgrel=3 -pkgdesc="The Haskell Platform" -url="http://hackage.haskell.org/platform/" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.0.2-2' - 'haskell-glut=2.1.2.1-6' - 'haskell-http=4000.1.1-3' - 'haskell-hunit=1.2.2.3-2' - 'haskell-opengl=2.2.3.0-6' - 'haskell-quickcheck=2.4.0.1-3' - 'haskell-cgi=3001.1.7.4-3' - 'haskell-deepseq=1.1.0.2-2' - 'haskell-fgl=5.4.2.3-4' - 'haskell-haskell-src=1.0.1.4-2' - 'haskell-html=1.0.1.2-9' - 'haskell-mtl=2.0.1.0-2' - 'haskell-network=2.3.0.2-2' - 'haskell-parallel=3.1.0.1-3' - 'haskell-parsec=3.1.1-2' - 'haskell-regex-base=0.93.2-4' - 'haskell-regex-compat=0.93.1-4' - 'haskell-regex-posix=0.94.4-2' - 'haskell-stm=2.2.0.1-2' - 'haskell-syb=0.3-2' - 'haskell-text=0.11.0.5-2' - 'haskell-transformers=0.2.2.0-2' - 'haskell-xhtml=3000.2.0.1-7' - 'haskell-zlib=0.5.3.1-2' - 'cabal-install=0.10.2' - 'alex=2.3.5' - 'happy=1.18.6' - 'haddock=2.9.2') - -build() { - return 0 -} diff --git a/testing/haskell-quickcheck/PKGBUILD b/testing/haskell-quickcheck/PKGBUILD deleted file mode 100644 index 3da28a0cb..000000000 --- a/testing/haskell-quickcheck/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -# Package generated by cabal2arch 0.7.5 -_hkgname=QuickCheck -pkgname=haskell-quickcheck -pkgver=2.4.0.1 -pkgrel=3 -pkgdesc="Automatic testing of Haskell programs" -url="http://hackage.haskell.org/package/QuickCheck" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=(ghc=7.0.2-2 haskell-mtl=2.0.1.0-2 sh) -options=('strip') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz) -install=${pkgname}.install -md5sums=('e8c86e95fd1fa4c58fc8e53e2853db5e') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ - --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/testing/haskell-quickcheck/haskell-quickcheck.install b/testing/haskell-quickcheck/haskell-quickcheck.install deleted file mode 100644 index c9e12fadc..000000000 --- a/testing/haskell-quickcheck/haskell-quickcheck.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-quickcheck -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/testing/haskell-regex-base/PKGBUILD b/testing/haskell-regex-base/PKGBUILD deleted file mode 100644 index a28c3daa0..000000000 --- a/testing/haskell-regex-base/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -_hkgname=regex-base -pkgname=haskell-regex-base -pkgver=0.93.2 -pkgrel=4 -pkgdesc="Interface API for regex-posix,pcre,parsec,tdfa,dfa" -url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/regex-base" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=(ghc=7.0.2-2 sh 'haskell-mtl=2.0.1.0-2') -options=('strip') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz) -install=${pkgname}.install -md5sums=('e7b93b0b17eff8d3068ecb2f5d5f6ea3') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ - --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/testing/haskell-regex-base/haskell-regex-base.install b/testing/haskell-regex-base/haskell-regex-base.install deleted file mode 100644 index 3ad2fea28..000000000 --- a/testing/haskell-regex-base/haskell-regex-base.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-regex-base -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/testing/haskell-regex-compat/PKGBUILD b/testing/haskell-regex-compat/PKGBUILD deleted file mode 100644 index b0778ac42..000000000 --- a/testing/haskell-regex-compat/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -_hkgname=regex-compat -pkgname=haskell-regex-compat -pkgver=0.93.1 -pkgrel=4 -pkgdesc="Replaces and enhances Text.Regex" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=(ghc=7.0.2-2 sh 'haskell-regex-base=0.93.2-4' 'haskell-regex-posix=0.94.4-2') -options=('strip') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install -md5sums=('d6becec95ea8098cab663116fdce60a5') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ - --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/testing/haskell-regex-compat/haskell-regex-compat.install b/testing/haskell-regex-compat/haskell-regex-compat.install deleted file mode 100644 index 898c0bba1..000000000 --- a/testing/haskell-regex-compat/haskell-regex-compat.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-regex-compat -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/testing/haskell-regex-posix/PKGBUILD b/testing/haskell-regex-posix/PKGBUILD deleted file mode 100644 index 69f3773d6..000000000 --- a/testing/haskell-regex-posix/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -_hkgname=regex-posix -pkgname=haskell-regex-posix -pkgver=0.94.4 -pkgrel=2 -pkgdesc="The posix regex backend for regex-base" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=(ghc=7.0.2-2 sh 'haskell-regex-base=0.93.2-4') -options=('strip') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install -md5sums=('c28a13e8329e93a19bbb51708bf64abb') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ - --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/testing/haskell-regex-posix/haskell-regex-posix.install b/testing/haskell-regex-posix/haskell-regex-posix.install deleted file mode 100644 index 2b89fae7b..000000000 --- a/testing/haskell-regex-posix/haskell-regex-posix.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-regex-posix -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/testing/haskell-stm/PKGBUILD b/testing/haskell-stm/PKGBUILD deleted file mode 100644 index 5f3a97ed7..000000000 --- a/testing/haskell-stm/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -# Package generated by cabal2arch 0.7.5 -_hkgname=stm -pkgname=haskell-stm -pkgver=2.2.0.1 -pkgrel=2 -pkgdesc="A modular composable concurrency abstraction." -url="http://hackage.haskell.org/package/stm" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=(ghc=7.0.2-2 sh) -options=('strip') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz) -install=${pkgname}.install -md5sums=('b1cf03ed315e00c33160746feeee8682') - -build() { - cd ${srcdir}/${_hkgname}-$pkgver - runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ - --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-$pkgver - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/testing/haskell-stm/haskell-stm.install b/testing/haskell-stm/haskell-stm.install deleted file mode 100644 index 0283c2fc5..000000000 --- a/testing/haskell-stm/haskell-stm.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-stm -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/testing/haskell-syb/PKGBUILD b/testing/haskell-syb/PKGBUILD deleted file mode 100644 index f90006a56..000000000 --- a/testing/haskell-syb/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# Maintainer: Rémy Oudompheng <remy@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -_hkgname=syb -pkgname=haskell-syb -pkgver=0.3 -pkgrel=2 -pkgdesc="A library for client-side HTTP" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.0.2-2' sh) -options=('strip') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install -md5sums=('c4f6771fa32d467a029e6e813757a9fe') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr --docdir=/usr/share/doc/${pkgname} - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} - diff --git a/testing/haskell-syb/haskell-syb.install b/testing/haskell-syb/haskell-syb.install deleted file mode 100644 index 080055165..000000000 --- a/testing/haskell-syb/haskell-syb.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-syb -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/testing/haskell-text/PKGBUILD b/testing/haskell-text/PKGBUILD deleted file mode 100644 index e60891918..000000000 --- a/testing/haskell-text/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -_hkgname=text -pkgname=haskell-text -pkgver=0.11.0.5 -pkgrel=2 -pkgdesc="An efficient packed Unicode text type." -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.0.2-2' sh 'haskell-deepseq=1.1.0.2-2') -options=('strip') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install -md5sums=('516a6813a6b9061fabdc9f0c3bbb1592') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ - --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} - diff --git a/testing/haskell-text/haskell-text.install b/testing/haskell-text/haskell-text.install deleted file mode 100644 index 620db3921..000000000 --- a/testing/haskell-text/haskell-text.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-text -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/testing/haskell-transformers/PKGBUILD b/testing/haskell-transformers/PKGBUILD deleted file mode 100644 index c14b2eecc..000000000 --- a/testing/haskell-transformers/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# Maintainer: Rémy Oudompheng <remy@archlinux.org> -# $Id: PKGBUILD 115140 2011-03-17 09:11:21Z vesa $ - -_hkgname=transformers -pkgname=haskell-transformers -pkgver=0.2.2.0 -pkgrel=2 -pkgdesc="Concrete functor and monad transformers" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=(ghc=7.0.2-2 sh) -options=('strip') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz) -install=${pkgname}.install -md5sums=('3470ac66116900cd1ba84d3744474e49') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ - --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/testing/haskell-transformers/haskell-transformers.install b/testing/haskell-transformers/haskell-transformers.install deleted file mode 100644 index eec2af6e1..000000000 --- a/testing/haskell-transformers/haskell-transformers.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-transformers -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/testing/haskell-xhtml/PKGBUILD b/testing/haskell-xhtml/PKGBUILD deleted file mode 100644 index 63abbbb64..000000000 --- a/testing/haskell-xhtml/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -# Package generated by cabal2arch 0.7.6 -_hkgname=xhtml -pkgname=haskell-xhtml -pkgver=3000.2.0.1 -pkgrel=7 -pkgdesc="Combinators for producing XHTML 1.0, including the Strict, Transitional and Frameset variants." -url="http://hackage.haskell.org/package/xhtml" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=(ghc=7.0.2-2 sh) -options=('strip') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz) -install=${pkgname}.install -md5sums=('9e3e7d9c66618c5e29716f90e54363c9') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ - --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/testing/haskell-xhtml/haskell-xhtml.install b/testing/haskell-xhtml/haskell-xhtml.install deleted file mode 100644 index d03b8a053..000000000 --- a/testing/haskell-xhtml/haskell-xhtml.install +++ /dev/null @@ -1,19 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-xhtml -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh &> /dev/null - exit 0 -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/testing/haskell-zlib/PKGBUILD b/testing/haskell-zlib/PKGBUILD deleted file mode 100644 index 7aca7312b..000000000 --- a/testing/haskell-zlib/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -# Package originally generated by cabal2arch 0.7.6 -_hkgname=zlib -pkgname=haskell-zlib -pkgver=0.5.3.1 -pkgrel=2 -pkgdesc="Compression and decompression in the gzip and zlib formats" -url="http://hackage.haskell.org/package/zlib" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=(ghc=7.0.2-2 'zlib' sh) -options=('strip') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install -md5sums=('8fb2988b112e38d04a527b892f770507') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/testing/haskell-zlib/haskell-zlib.install b/testing/haskell-zlib/haskell-zlib.install deleted file mode 100644 index d387b7b65..000000000 --- a/testing/haskell-zlib/haskell-zlib.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-zlib -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/testing/iproute2/PKGBUILD b/testing/iproute2/PKGBUILD deleted file mode 100644 index de6d0365a..000000000 --- a/testing/iproute2/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# $Id: PKGBUILD 122628 2011-05-05 08:47:16Z ronald $ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Contributor: Judd Vinet <jvinet@zeroflux.org> - -pkgname=iproute2 -pkgver=2.6.38 -pkgrel=2 -pkgdesc="IP Routing Utilities" -arch=('i686' 'x86_64') -license=('GPL2') -url="http://www.linux-foundation.org/en/Net:Iproute2" -depends=('perl') -makedepends=('linux-atm') -optdepends=('linux-atm: ATM support') -provides=('iproute') -conflicts=('iproute') -replaces=('iproute') -options=('!makeflags') -backup=('etc/iproute2/ematch_map' 'etc/iproute2/rt_dsfield' 'etc/iproute2/rt_protos' \ - 'etc/iproute2/rt_realms' 'etc/iproute2/rt_scopes' 'etc/iproute2/rt_tables') -source=(http://devresources.linux-foundation.org/dev/iproute2/download/iproute2-${pkgver}.tar.bz2 - 'iproute2-fhs.patch') -sha1sums=('e9f6d457a06866a2a20a6cba6b3a039b2ec3e14a' - '2416b11252364d7a6c742eabb4a6924a75637a46') - -build() { - cd $srcdir/iproute2-${pkgver} - - # set correct fhs structure - patch -Np1 -i ${srcdir}/iproute2-fhs.patch - - ./configure - - make -} - -package() { - cd $srcdir/iproute2-${pkgver} - - make DESTDIR=$pkgdir install - - # libnetlink isn't installed, install it FS#19385 - install -Dm644 include/libnetlink.h ${pkgdir}/usr/include/libnetlink.h - install -Dm644 lib/libnetlink.a ${pkgdir}/usr/lib/libnetlink.a -} diff --git a/testing/iproute2/iproute2-fhs.patch b/testing/iproute2/iproute2-fhs.patch deleted file mode 100644 index 2608414db..000000000 --- a/testing/iproute2/iproute2-fhs.patch +++ /dev/null @@ -1,84 +0,0 @@ -diff -Naur iproute2.old/Makefile iproute2-2.6.29/Makefile ---- iproute2.old/Makefile 2009-11-11 22:05:21.251407668 +0100 -+++ iproute2-2.6.29/Makefile 2009-11-11 22:07:09.891833516 +0100 -@@ -1,11 +1,12 @@ - DESTDIR=/usr/ - ROOTDIR=$(DESTDIR) - LIBDIR=/usr/lib/ --SBINDIR=/sbin -+SBINDIR=/usr/sbin - CONFDIR=/etc/iproute2 --DOCDIR=/share/doc/iproute2 --MANDIR=/share/man -+DOCDIR=/usr/share/doc/iproute2 -+MANDIR=/usr/share/man - ARPDDIR=/var/lib/arpd -+SHAREDIR=/usr/share - - # Path to db_185.h include - DBM_INCLUDE:=$(ROOTDIR)/usr/include -diff -Naur iproute2.old/tc/tc_util.c iproute2-2.6.29/tc/tc_util.c ---- iproute2.old/tc/tc_util.c 2009-11-11 22:05:21.298076943 +0100 -+++ iproute2-2.6.29/tc/tc_util.c 2009-11-11 22:09:32.865152646 +0100 -@@ -24,8 +24,8 @@ - #include "utils.h" - #include "tc_util.h" - --#ifndef LIBDIR --#define LIBDIR "/usr/lib/" -+#ifndef SHAREDIR -+#define SHAREDIR "/usr/share" - #endif - - const char *get_tc_lib(void) -@@ -34,7 +34,7 @@ - - lib_dir = getenv("TC_LIB_DIR"); - if (!lib_dir) -- lib_dir = LIBDIR "/tc/"; -+ lib_dir = SHAREDIR "/tc/"; - - return lib_dir; - } -diff -Naur iproute2.old/netem/Makefile iproute2-2.6.35/netem/Makefile ---- iproute2.old/netem/Makefile 2010-08-06 11:30:48.640940183 +0200 -+++ iproute2-2.6.35/netem/Makefile 2010-08-06 11:32:34.210908892 +0200 -@@ -20,9 +20,9 @@ - $(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm - - install: all -- mkdir -p $(DESTDIR)$(LIBDIR)/tc -+ mkdir -p $(DESTDIR)$(SHAREDIR)/tc - for i in $(DISTDATA); \ -- do install -m 644 $$i $(DESTDIR)$(LIBDIR)/tc; \ -+ do install -m 644 $$i $(DESTDIR)$(SHAREDIR)/tc; \ - done - - clean: -diff -Naur iproute2.old/tc/Makefile iproute2-2.6.35/tc/Makefile ---- iproute2.old/tc/Makefile 2010-08-06 11:48:35.607472252 +0200 -+++ iproute2-2.6.35/tc/Makefile 2010-08-06 11:49:36.977473380 +0200 -@@ -99,18 +99,11 @@ - $(AR) rcs $@ $(TCLIB) - - install: all -- mkdir -p $(MODDESTDIR) -- install -m 0755 tc $(DESTDIR)$(SBINDIR) -- for i in $(TCSO); \ -- do install -m 755 $$i $(MODDESTDIR); \ -- done -- if [ ! -f $(MODDESTDIR)/m_ipt.so ]; then \ -- if [ -f $(MODDESTDIR)/m_xt.so ]; \ -- then ln -s m_xt.so $(MODDESTDIR)/m_ipt.so ; \ -- elif [ -f $(MODDESTDIR)/m_xt_old.so ]; \ -- then ln -s m_xt_old.so $(MODDESTDIR)/m_ipt.so ; \ -- fi; \ -- fi -+ mkdir -p $(DESTDIR)$(LIBDIR)/tc -+ install -m 0755 tc $(DESTDIR)$(SBINDIR) -+ for i in $(TCSO); \ -+ do install -m 755 $$i $(DESTDIR)$(LIBDIR)/tc; \ -+ done - - clean: - rm -f $(TCOBJ) $(TCLIB) libtc.a tc *.so emp_ematch.yacc.h; \ diff --git a/testing/less/PKGBUILD b/testing/less/PKGBUILD deleted file mode 100644 index c26ddfb00..000000000 --- a/testing/less/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 125524 2011-05-26 14:15:10Z stephane $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Contributor: judd <jvinet@zeroflux.org> - -pkgname=less -pkgver=443 -pkgrel=2 -pkgdesc="A terminal based program for viewing text files" -license=('GPL3') -arch=('i686' 'x86_64') -url="http://www.greenwoodsoftware.com/less" -groups=('base') -depends=('ncurses' 'pcre') -source=(http://www.greenwoodsoftware.com/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('47db098fb3cdaf847b3c4be05ee954fc') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure --prefix=/usr --sysconfdir=/etc --with-regex=pcre - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make prefix="${pkgdir}"/usr install - install -dm755 "${pkgdir}"/bin - mv "${pkgdir}"/usr/bin/${pkgname} "${pkgdir}"/bin -} diff --git a/testing/less/zless b/testing/less/zless deleted file mode 100644 index 93d560bc5..000000000 --- a/testing/less/zless +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -: ${PAGER=less} -export PAGER - -PATH="/usr/bin:$PATH" -export PATH - -exec zmore ${1+"$@"} diff --git a/testing/make/PKGBUILD b/testing/make/PKGBUILD deleted file mode 100644 index bba3253fc..000000000 --- a/testing/make/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# $Id: PKGBUILD 110342 2011-02-18 22:21:30Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Contributor: judd <jvinet@zeroflux.org> - -pkgname=make -pkgver=3.82 -pkgrel=3 -pkgdesc="GNU make utility to maintain groups of programs" -arch=('i686' 'x86_64') -url="http://www.gnu.org/software/make" -license=('GPL3') -groups=('base-devel') -depends=('glibc' 'sh') -install=$pkgname.install -source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2 - bug30612.patch - bug30723.patch - make-3.82-sort-blank.patch) -md5sums=('1a11100f3c63fcf5753818e59d63088f' - 'c8f496b22191f9fb9420ab14c1a19a47' - '662e6450e19a5acdaa5c9fcb8ad78dea' - '7d01a99f389d8f08dec93ed479071ee4') - - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - - # http://savannah.gnu.org/bugs/?30612 - patch -Np1 -i $srcdir/bug30612.patch - - # http://savannah.gnu.org/bugs/?30723 - patch -Np1 -i $srcdir/bug30723.patch - - # https://bugs.archlinux.org/task/22733 (fix from Fedora) - patch -Np1 -i $srcdir/make-3.82-sort-blank.patch - - ./configure --prefix=/usr - make - make check -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install -} diff --git a/testing/make/bug30612.patch b/testing/make/bug30612.patch deleted file mode 100644 index fb843bcd9..000000000 --- a/testing/make/bug30612.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff -Naur make-3.82-orig/main.c make-3.82-fix30612//main.c ---- make-3.82-orig/main.c 2010-07-19 17:10:53.000000000 +1000 -+++ make-3.82-fix30612//main.c 2010-09-23 23:33:37.908855839 +1000 -@@ -1,3 +1,4 @@ -+ - /* Argument parsing and main program of GNU Make. - Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, - 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, -@@ -1138,7 +1139,7 @@ - a macro and some compilers (MSVC) don't like conditionals in macros. */ - { - const char *features = "target-specific order-only second-expansion" -- " else-if shortest-stem undefine" -+ " else-if shortest-stem undefine oneshell" - #ifndef NO_ARCHIVES - " archives" - #endif -diff -Naur make-3.82-orig/read.c make-3.82-fix30612//read.c ---- make-3.82-orig/read.c 2010-07-13 11:20:42.000000000 +1000 -+++ make-3.82-fix30612//read.c 2010-09-23 23:30:58.018855839 +1000 -@@ -3028,7 +3028,7 @@ - { - /* This looks like the first element in an open archive group. - A valid group MUST have ')' as the last character. */ -- const char *e = p + nlen; -+ const char *e = p; - do - { - e = next_token (e); -@@ -3084,19 +3084,19 @@ - Go to the next item in the string. */ - if (flags & PARSEFS_NOGLOB) - { -- NEWELT (concat (2, prefix, tp)); -+ NEWELT (concat (2, prefix, tmpbuf)); - continue; - } - - /* If we get here we know we're doing glob expansion. - TP is a string in tmpbuf. NLEN is no longer used. - We may need to do more work: after this NAME will be set. */ -- name = tp; -+ name = tmpbuf; - - /* Expand tilde if applicable. */ -- if (tp[0] == '~') -+ if (tmpbuf[0] == '~') - { -- tildep = tilde_expand (tp); -+ tildep = tilde_expand (tmpbuf); - if (tildep != 0) - name = tildep; - } -@@ -3152,7 +3152,11 @@ - else - { - /* We got a chain of items. Attach them. */ -- (*newp)->next = found; -+ if (*newp) -+ (*newp)->next = found; -+ else -+ *newp = found; -+ - - /* Find and set the new end. Massage names if necessary. */ - while (1) diff --git a/testing/make/bug30723.patch b/testing/make/bug30723.patch deleted file mode 100644 index 84e7ebe7a..000000000 --- a/testing/make/bug30723.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur make-3.82-orig/main.c make-3.82-fix30723//main.c ---- make-3.82-orig/main.c 2010-07-19 17:10:53.000000000 +1000 -+++ make-3.82-fix30723//main.c 2010-09-23 23:34:10.932188592 +1000 -@@ -2093,7 +2093,7 @@ - const char *pv = define_makeflags (1, 1); - char *p = alloca (sizeof ("MAKEFLAGS=") + strlen (pv) + 1); - sprintf (p, "MAKEFLAGS=%s", pv); -- putenv (p); -+ putenv (allocated_variable_expand (p)); - } - - if (ISDB (DB_BASIC)) diff --git a/testing/make/make-3.82-sort-blank.patch b/testing/make/make-3.82-sort-blank.patch deleted file mode 100644 index 2e73f5b7c..000000000 --- a/testing/make/make-3.82-sort-blank.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -urp make-3.82/function.c make-3.82-pm/function.c ---- make-3.82/function.c 2010-07-13 03:20:39.000000000 +0200 -+++ make-3.82-pm/function.c 2010-10-27 01:43:27.000000000 +0200 -@@ -1138,12 +1138,12 @@ func_sort (char *o, char **argv, const c - { - char c = *(t++); - -- if (! isspace ((unsigned char)c)) -+ if (! isblank ((unsigned char)c)) - continue; - - ++wordi; - -- while (isspace ((unsigned char)*t)) -+ while (isblank ((unsigned char)*t)) - ++t; - } diff --git a/testing/make/make.install b/testing/make/make.install deleted file mode 100644 index 6cf8b0dc4..000000000 --- a/testing/make/make.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=usr/share/info -filelist=(make.info make.info-1 make.info-2) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} diff --git a/testing/mesa/LICENSE b/testing/mesa/LICENSE deleted file mode 100644 index ae33d2709..000000000 --- a/testing/mesa/LICENSE +++ /dev/null @@ -1,82 +0,0 @@ -Disclaimer - -Mesa is a 3-D graphics library with an API which is very similar to -that of OpenGL* -To the extent that Mesa utilizes the OpenGL command syntax or state -machine, it is being used with authorization from Silicon Graphics, -Inc.(SGI). However, the author does not possess an OpenGL license -from SGI, and makes no claim that Mesa is in any way a compatible -replacement for OpenGL or associated with SGI. Those who want a -licensed implementation of OpenGL should contact a licensed -vendor. - -Please do not refer to the library as MesaGL (for legal -reasons). It's just Mesa or The Mesa 3-D graphics -library - -* OpenGL is a trademark of Silicon Graphics Incorporated. - -License / Copyright Information - -The Mesa distribution consists of several components. Different copyrights -and licenses apply to different components. For example, GLUT is copyrighted -by Mark Kilgard, some demo programs are copyrighted by SGI, some of the Mesa -device drivers are copyrighted by their authors. See below for a list of -Mesa's main components and the license for each. - -The core Mesa library is licensed according to the terms of the MIT license. -This allows integration with the XFree86, Xorg and DRI projects. - -The default Mesa license is as follows: - -Copyright (C) 1999-2007 Brian Paul All Rights Reserved. - -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and associated documentation files (the "Software"), -to deal in the Software without restriction, including without limitation -the rights to use, copy, modify, merge, publish, distribute, sublicense, -and/or sell copies of the Software, and to permit persons to whom the -Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included -in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -Attention, Contributors - -When contributing to the Mesa project you must agree to the licensing terms -of the component to which you're contributing. -The following section lists the primary components of the Mesa distribution -and their respective licenses. - - -Mesa Component Licenses - -Component Location Primary Author License ----------------------------------------------------------------------------- -Main Mesa code src/mesa/ Brian Paul Mesa (MIT) - -Device drivers src/mesa/drivers/* See drivers See drivers - -Ext headers include/GL/glext.h SGI SGI Free B - include/GL/glxext.h - -GLUT src/glut/ Mark Kilgard Mark's copyright - -Mesa GLU library src/glu/mesa/ Brian Paul GNU-LGPL - -SGI GLU library src/glu/sgi/ SGI SGI Free B - -demo programs progs/demos/ various see source files - -X demos progs/xdemos/ Brian Paul see source files - -SGI demos progs/samples/ SGI SGI copyright - -RedBook demos progs/redbook/ SGI SGI copyright diff --git a/testing/mesa/PKGBUILD b/testing/mesa/PKGBUILD deleted file mode 100644 index 4c3f56ebd..000000000 --- a/testing/mesa/PKGBUILD +++ /dev/null @@ -1,377 +0,0 @@ -# $Id: PKGBUILD 125908 2011-05-31 19:03:01Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Maintainer: Andreas Radke <andyrtr@archlinux.org> - -pkgbase=mesa -pkgname=('mesa' 'libgl' 'libgles' 'libegl' 'ati-dri' 'intel-dri' 'unichrome-dri' 'mach64-dri' 'mga-dri' 'r128-dri' 'savage-dri' 'sis-dri' 'tdfx-dri' 'nouveau-dri') # 'llvm-dri') - -_git=true -#_git=false - -if [ "${_git}" = "true" ]; then - pkgver=7.10.99.git20110531 - else - pkgver=7.10.2 -fi -pkgrel=1 -arch=('i686' 'x86_64') -makedepends=('glproto>=1.4.12' 'pkgconfig' 'libdrm>=2.4.25' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.4.3' 'libxt>=1.1.1' - 'gcc-libs>=4.5' 'dri2proto=2.3' 'python2' 'libxml2' 'imake' 'llvm') -url="http://mesa3d.sourceforge.net" -license=('custom') -source=(LICENSE gnome-shell-shader-fix.patch nouveau-fix-header.patch) -if [ "${_git}" = "true" ]; then - # mesa git shot from mastee (will become 7.11) branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b1246cf13bc4e301b499a95d33e0cab26655fed5 - source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-b1246cf13bc4e301b499a95d33e0cab26655fed5.tar.bz2') - else - source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2" -) -fi -md5sums=('5c65a0fe315dd347e09b1f2826a1df5a' - '3ec78f340f9387abd7a37b195e764cbf' - '67c87b77cc2236b52a3b47dad3fbb5d4' - 'c2ff7ab905adf67a5d6c8acbbf495b12') - -build() { -if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-* - autoreconf -vfi - else - cd "${srcdir}/Mesa-${pkgver}" -fi - -if [ "${_git}" != "true" ]; then -#backport from master to fix gnome-shell shader -#https://bugs.freedesktop.org/show_bug.cgi?id=35714 -patch -Np1 -i "${srcdir}/gnome-shell-shader-fix.patch" -patch -Np1 -i "${srcdir}/nouveau-fix-header.patch" -fi - -if [ "${_git}" = "true" ]; then - ./autogen.sh --prefix=/usr \ - --with-dri-driverdir=/usr/lib/xorg/modules/dri \ - --enable-gallium-r300 \ - --enable-gallium-r600 \ - --enable-gallium-nouveau \ - --enable-gallium-llvm \ - --enable-gallium-egl \ - --enable-gallium-swrast \ - --enable-glx-tls \ - --with-driver=dri \ - --enable-xcb \ - --with-state-trackers=dri,glx,egl \ - --disable-glut \ - --enable-gles1 \ - --enable-gles2 \ - --enable-egl \ - --enable-texture-float - # --enable-gallium-svga \ - - # --enable-texture-float (enable floating-point textures and renderbuffers) - http://www.phoronix.com/scan.php?page=news_item&px=OTMzMg - #The source code to implement ARB_texture_float extension is included and can be toggled on at compile time only by those who purchased a license from SGI, or are in a country where the patent does not apply. - - #--enable-shared-dricore - http://bugs.gentoo.org/show_bug.cgi?id=357177 - - else - ./configure --prefix=/usr \ - --with-dri-driverdir=/usr/lib/xorg/modules/dri \ - --enable-gallium-radeon \ - --enable-gallium-r600 \ - --enable-gallium-nouveau \ - --enable-gallium-swrast \ - --enable-glx-tls \ - --with-driver=dri \ - --enable-xcb \ - --with-state-trackers=dri,glx \ - --disable-glut \ - --enable-gles1 \ - --enable-gles2 \ - --enable-egl \ - --disable-gallium-egl -fi - - make -} - -package_libgl() { - depends=('libdrm>=2.4.25' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1') - pkgdesc="Mesa 3-D graphics library and DRI software rasterizer" - -if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-* - else - cd "${srcdir}/Mesa-${pkgver}" -fi - install -m755 -d "${pkgdir}/usr/lib" - install -m755 -d "${pkgdir}/usr/lib/xorg/modules/extensions" - - bin/minstall lib/libGL.so* "${pkgdir}/usr/lib/" - - cd src/mesa/drivers/dri - #make -C swrast DESTDIR="${pkgdir}" install -if [ "${_git}" = "true" ]; then - make -C ${srcdir}/mesa-*/src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install - else - make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install -fi - ln -s swrastg_dri.so "${pkgdir}/usr/lib/xorg/modules/dri/swrast_dri.so" - ln -s libglx.xorg "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so" - - install -m755 -d "${pkgdir}/usr/share/licenses/libgl" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgl/" -} - -package_libgles() { - depends=('libgl') - pkgdesc="Mesa GLES libraries and headers" - -if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-* - else - cd "${srcdir}/Mesa-${pkgver}" -fi - install -m755 -d "${pkgdir}/usr/lib" - install -m755 -d "${pkgdir}/usr/lib/pkgconfig" - install -m755 -d "${pkgdir}/usr/include" - install -m755 -d "${pkgdir}/usr/include/GLES" - install -m755 -d "${pkgdir}/usr/include/GLES2" - bin/minstall lib/libGLESv* "${pkgdir}/usr/lib/" - bin/minstall src/mapi/es1api/glesv1_cm.pc "${pkgdir}/usr/lib/pkgconfig/" - bin/minstall src/mapi/es2api/glesv2.pc "${pkgdir}/usr/lib/pkgconfig/" - bin/minstall include/GLES/* "${pkgdir}/usr/include/GLES/" - bin/minstall include/GLES2/* "${pkgdir}/usr/include/GLES2/" - bin/minstall include/GLES2/* "${pkgdir}/usr/include/GLES2/" - - install -m755 -d "${pkgdir}/usr/share/licenses/libgles" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgles/" -} - -package_libegl() { - depends=('libgl') - pkgdesc="Mesa libEGL libraries and headers" - -if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-* - make -C src/gallium/targets/egl DESTDIR="${pkgdir}" install - else - cd "${srcdir}/Mesa-${pkgver}" -fi - install -m755 -d "${pkgdir}/usr/lib" - install -m755 -d "${pkgdir}/usr/lib/pkgconfig" - install -m755 -d "${pkgdir}/usr/include" - install -m755 -d "${pkgdir}/usr/include/" - install -m755 -d "${pkgdir}/usr/include/EGL" - install -m755 -d "${pkgdir}/usr/include/KHR" - install -m755 -d "${pkgdir}/usr/share" - install -m755 -d "${pkgdir}/usr/share/doc" - install -m755 -d "${pkgdir}/usr/share/doc/libegl" - bin/minstall lib/libEGL.so* "${pkgdir}/usr/lib/" -if [ "${_git}" != "true" ]; then - install -m755 -d "${pkgdir}/usr/lib/egl" - bin/minstall lib/egl/* "${pkgdir}/usr/lib/egl/" -fi - bin/minstall src/egl/main/egl.pc "${pkgdir}/usr/lib/pkgconfig/" - bin/minstall include/EGL/* "${pkgdir}/usr/include/EGL/" - bin/minstall include/KHR/khrplatform.h "${pkgdir}/usr/include/KHR/" - bin/minstall docs/egl.html "${pkgdir}/usr/share/doc/libegl/" - - install -m755 -d "${pkgdir}/usr/share/licenses/libegl" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libegl/" -} - -package_mesa() { - depends=('libgl' 'libx11>=1.4.3' 'libxt>=1.1.1' 'gcc-libs>=4.5' 'dri2proto=2.3' 'libdrm>=2.4.25' 'glproto>=1.4.12') - optdepends=('opengl-man-pages: for the OpenGL API man pages') - pkgdesc="Mesa 3-D graphics libraries and include files" - -if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-* - else - cd "${srcdir}/Mesa-${pkgver}" -fi - make DESTDIR="${pkgdir}" install - - rm -f "${pkgdir}/usr/lib/libGL.so"* - rm -f "${pkgdir}/usr/lib/libGLESv"* - rm -f "${pkgdir}/usr/lib/libEGL"* - rm -rf "${pkgdir}/usr/lib/egl" - rm -f ${pkgdir}/usr/lib/pkgconfig/{glesv1_cm.pc,glesv2.pc,egl.pc} - rm -rf "${pkgdir}/usr/lib/xorg" - rm -f "${pkgdir}/usr/include/GL/glew.h" - rm -f "${pkgdir}/usr/include/GL/glxew.h" - rm -f "${pkgdir}/usr/include/GL/wglew.h" - rm -f "${pkgdir}/usr/include/GL/glut.h" - rm -rf ${pkgdir}/usr/include/{GLES,GLES2,EGL,KHR} - - install -m755 -d "${pkgdir}/usr/share/licenses/mesa" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa/" -} - -package_ati-dri() { - depends=("libgl=${pkgver}") - pkgdesc="Mesa DRI + Gallium3D r300 drivers for AMD/ATI Radeon" - conflicts=('xf86-video-ati<6.9.0-6') - -if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-*/src/mesa/drivers/dri - else - cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" -fi - make -C radeon DESTDIR="${pkgdir}" install - make -C r200 DESTDIR="${pkgdir}" install - # classic mesa driver for R300 r300_dri.so - #make -C r300 DESTDIR="${pkgdir}" install <------- deprecated - # gallium3D driver for R300 r300_dri.so -if [ "${_git}" = "true" ]; then - make -C ${srcdir}/mesa-*/src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install - make -C ${srcdir}/mesa-*/src/gallium/targets/dri-r600 DESTDIR="${pkgdir}" install - else - make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install - make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-r600 DESTDIR="${pkgdir}" install -fi - #make -C r600 DESTDIR="${pkgdir}" install -} - -package_intel-dri() { - depends=("libgl=${pkgver}") - pkgdesc="Mesa DRI drivers for Intel" - -if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-*/src/mesa/drivers/dri - else - cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" -fi - make -C i810 DESTDIR="${pkgdir}" install - make -C i915 DESTDIR="${pkgdir}" install - make -C i965 DESTDIR="${pkgdir}" install -} - -package_unichrome-dri() { - depends=("libgl=${pkgver}") - pkgdesc="Mesa DRI drivers for S3 Graphics/VIA Unichrome" - -if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-*/src/mesa/drivers/dri - else - cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" -fi - make -C unichrome DESTDIR="${pkgdir}" install -} - -package_mach64-dri() { - depends=("libgl=${pkgver}") - pkgdesc="Mesa DRI drivers for ATI Mach64" - conflicts=('xf86-video-mach64<6.8.2') - -if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-*/src/mesa/drivers/dri - else - cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" -fi - make -C mach64 DESTDIR="${pkgdir}" install -} - -package_mga-dri() { - depends=("libgl=${pkgver}") - pkgdesc="Mesa DRI drivers for Matrox" - conflicts=('xf86-video-mga<1.4.11') - -if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-*/src/mesa/drivers/dri - else - cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" -fi - make -C mga DESTDIR="${pkgdir}" install -} - -package_r128-dri() { - depends=("libgl=${pkgver}") - pkgdesc="Mesa DRI drivers for ATI Rage128" - conflicts=('xf86-video-r128<6.8.1') - -if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-*/src/mesa/drivers/dri - else - cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" -fi - make -C r128 DESTDIR="${pkgdir}" install -} - -package_savage-dri() { - depends=("libgl=${pkgver}") - pkgdesc="Mesa DRI drivers for S3 Sraphics/VIA Savage" - conflicts=('xf86-video-savage<2.3.1') - -if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-*/src/mesa/drivers/dri - else - cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" -fi - make -C savage DESTDIR="${pkgdir}" install -} - -package_sis-dri() { - depends=("libgl=${pkgver}") - pkgdesc="Mesa DRI drivers for SiS" - conflicts=('xf86-video-sis<0.10.2') - -if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-*/src/mesa/drivers/dri - else - cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" -fi - make -C sis DESTDIR="${pkgdir}" install -} - -package_tdfx-dri() { - depends=("libgl=${pkgver}") - pkgdesc="Mesa DRI drivers for 3dfx" - conflicts=('xf86-video-tdfx<1.4.3') - -if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-*/src/mesa/drivers/dri - else - cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" -fi - make -C tdfx DESTDIR="${pkgdir}" install -} - -package_nouveau-dri() { - depends=("libgl=${pkgver}") - pkgdesc="Mesa classic DRI + Gallium3D drivers for Nouveau" - -if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-*/src/mesa/drivers/dri - else - cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" -fi - - # classic mesa driver for nv10 , nv20 nouveau_vieux_dri.so - make -C nouveau DESTDIR="${pkgdir}" install - - # gallium3D driver for nv30 - nv40 - nv50 nouveau_dri.so -if [ "${_git}" = "true" ]; then - make -C ${srcdir}/mesa-*/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install - else - make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install -fi -} - -#package_llvm-dri() { -# depends=("libgl=${pkgver}") -# pkgdesc="Mesa common LLVM support" - -#if [ "${_git}" = "true" ]; then -# cd ${srcdir}/mesa-*/src/gallium -# else -# cd "${srcdir}/Mesa-${pkgver}/src/gallium" -#fi - - # gallium llvmpipe -#if [ "${_git}" = "true" ]; then -# make -C drivers/llvmpipe DESTDIR="${pkgdir}" install -# #make -C targets/dri-swrast DESTDIR="${pkgdir}" install -# else -# make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install -#fi -#} diff --git a/testing/mesa/gnome-shell-shader-fix.patch b/testing/mesa/gnome-shell-shader-fix.patch deleted file mode 100644 index 3b3f37591..000000000 --- a/testing/mesa/gnome-shell-shader-fix.patch +++ /dev/null @@ -1,535 +0,0 @@ -From 3f625689acd570e4f14cc2ebaa43a425d13954ff Mon Sep 17 00:00:00 2001 -From: Christoph Bumiller <e0425955@student.tuwien.ac.at> -Date: Thu, 31 Mar 2011 13:49:33 +0000 -Subject: nv50: copy regalloc fixes from nvc0 - -Should fix gnome-shell's fade shader. - -Unification of the shader backend which is supposed to remove the -code duplication is still WIP. ---- -diff --git a/src/gallium/drivers/nv50/nv50_pc.h b/src/gallium/drivers/nv50/nv50_pc.h -index e6f3815..a9a3248 100644 ---- a/src/gallium/drivers/nv50/nv50_pc.h -+++ b/src/gallium/drivers/nv50/nv50_pc.h -@@ -228,6 +228,8 @@ struct nv_ref { - ubyte flags; /* not used yet */ - }; - -+#define NV_REF_FLAG_REGALLOC_PRIV (1 << 0) -+ - struct nv_basic_block; - - struct nv_instruction { -@@ -263,6 +265,15 @@ struct nv_instruction { - ubyte quadop; - }; - -+static INLINE int -+nvi_vector_size(struct nv_instruction *nvi) -+{ -+ int i; -+ assert(nvi); -+ for (i = 0; i < 4 && nvi->def[i]; ++i); -+ return i; -+} -+ - #define CFG_EDGE_FORWARD 0 - #define CFG_EDGE_BACK 1 - #define CFG_EDGE_LOOP_ENTER 2 -diff --git a/src/gallium/drivers/nv50/nv50_pc_regalloc.c b/src/gallium/drivers/nv50/nv50_pc_regalloc.c -index 39ae366..657df2c 100644 ---- a/src/gallium/drivers/nv50/nv50_pc_regalloc.c -+++ b/src/gallium/drivers/nv50/nv50_pc_regalloc.c -@@ -32,14 +32,39 @@ - #include "util/u_simple_list.h" - - #define NUM_REGISTER_FILES 4 -+#define MAX_REGISTER_COUNT 256 - - struct register_set { - struct nv_pc *pc; - - uint32_t last[NUM_REGISTER_FILES]; -- uint32_t bits[NUM_REGISTER_FILES][8]; -+ uint32_t bits[NUM_REGISTER_FILES][(MAX_REGISTER_COUNT + 31) / 32]; - }; - -+/* using OR because a set bit means occupied/unavailable, aliasing is allowed */ -+static void -+intersect_register_sets(struct register_set *dst, -+ struct register_set *src1, struct register_set *src2) -+{ -+ int i, j; -+ -+ for (i = 0; i < NUM_REGISTER_FILES; ++i) { -+ for (j = 0; j < (MAX_REGISTER_COUNT + 31) / 32; ++j) -+ dst->bits[i][j] = src1->bits[i][j] | src2->bits[i][j]; -+ } -+} -+ -+static void -+mask_register_set(struct register_set *set, uint32_t mask, uint32_t umask) -+{ -+ int i, j; -+ -+ for (i = 0; i < NUM_REGISTER_FILES; ++i) { -+ for (j = 0; j < (MAX_REGISTER_COUNT + 31) / 32; ++j) -+ set->bits[i][j] = (set->bits[i][j] | mask) & umask; -+ } -+} -+ - struct nv_pc_pass { - struct nv_pc *pc; - -@@ -61,11 +86,15 @@ ranges_coalesce(struct nv_range *range) - } - } - -+/* @return: TRUE if @new_range can be freed (i.e. was not reused) */ - static boolean - add_range_ex(struct nv_value *val, int bgn, int end, struct nv_range *new_range) - { - struct nv_range *range, **nextp = &val->livei; - -+ if (bgn == end) /* [a, a) is invalid / empty */ -+ return TRUE; -+ - for (range = val->livei; range; range = range->next) { - if (end < range->bgn) - break; /* insert before */ -@@ -251,6 +280,8 @@ reg_occupy(struct register_set *set, struct nv_value *val) - id <<= s; - m = (1 << (1 << s)) - 1; - -+ assert(s >= 0); /* XXX: remove me */ -+ - set->bits[f][id / 32] |= m << (id % 32); - - if (set->pc->max_reg[f] < id) -@@ -286,15 +317,12 @@ join_allowed(struct nv_pc_pass *ctx, struct nv_value *a, struct nv_value *b) - if (a->join->reg.id == b->join->reg.id) - return TRUE; - --#if 1 - /* either a or b or both have been assigned */ - - if (a->join->reg.id >= 0 && b->join->reg.id >= 0) - return FALSE; - else - if (b->join->reg.id >= 0) { -- if (a->join->reg.id >= 0) -- return FALSE; - val = a; - a = b; - b = val; -@@ -309,8 +337,6 @@ join_allowed(struct nv_pc_pass *ctx, struct nv_value *a, struct nv_value *b) - return FALSE; - } - return TRUE; --#endif -- return FALSE; - } - - static INLINE void -@@ -336,14 +362,14 @@ do_join_values(struct nv_pc_pass *ctx, struct nv_value *a, struct nv_value *b) - assert(b->join == a->join); - } - --static INLINE void -+static INLINE boolean - try_join_values(struct nv_pc_pass *ctx, struct nv_value *a, struct nv_value *b) - { - if (!join_allowed(ctx, a, b)) { - #ifdef NV50_RA_DEBUG_JOIN - debug_printf("cannot join %i to %i: not allowed\n", b->n, a->n); - #endif -- return; -+ return FALSE; - } - if (livei_have_overlap(a->join, b->join)) { - #ifdef NV50_RA_DEBUG_JOIN -@@ -351,10 +377,27 @@ try_join_values(struct nv_pc_pass *ctx, struct nv_value *a, struct nv_value *b) - livei_print(a); - livei_print(b); - #endif -- return; -+ return FALSE; - } - - do_join_values(ctx, a, b); -+ -+ return TRUE; -+} -+ -+static void -+join_values_nofail(struct nv_pc_pass *ctx, -+ struct nv_value *a, struct nv_value *b, boolean type_only) -+{ -+ if (type_only) { -+ assert(join_allowed(ctx, a, b)); -+ do_join_values(ctx, a, b); -+ } else { -+ boolean ok = try_join_values(ctx, a, b); -+ if (!ok) { -+ NOUVEAU_ERR("failed to coalesce values\n"); -+ } -+ } - } - - static INLINE boolean -@@ -369,20 +412,32 @@ need_new_else_block(struct nv_basic_block *b, struct nv_basic_block *p) - return (b->num_in > 1) && (n == 2); - } - -+/* Look for the @phi's operand whose definition reaches @b. */ - static int - phi_opnd_for_bb(struct nv_instruction *phi, struct nv_basic_block *b, - struct nv_basic_block *tb) - { -+ struct nv_ref *srci, *srcj; - int i, j; - -- for (j = -1, i = 0; i < 4 && phi->src[i]; ++i) { -- if (!nvbb_reachable_by(b, phi->src[i]->value->insn->bb, tb)) -+ for (j = -1, i = 0; i < 6 && phi->src[i]; ++i) { -+ srci = phi->src[i]; -+ /* if already replaced, check with original source first */ -+ if (srci->flags & NV_REF_FLAG_REGALLOC_PRIV) -+ srci = srci->value->insn->src[0]; -+ if (!nvbb_reachable_by(b, srci->value->insn->bb, NULL)) - continue; - /* NOTE: back-edges are ignored by the reachable-by check */ -- if (j < 0 || !nvbb_reachable_by(phi->src[j]->value->insn->bb, -- phi->src[i]->value->insn->bb, tb)) -+ if (j < 0 || !nvbb_reachable_by(srcj->value->insn->bb, -+ srci->value->insn->bb, NULL)) { - j = i; -+ srcj = srci; -+ } - } -+ if (j >= 0 && nvbb_reachable_by(b, phi->def[0]->insn->bb, NULL)) -+ if (!nvbb_reachable_by(srcj->value->insn->bb, -+ phi->def[0]->insn->bb, NULL)) -+ j = -1; - return j; - } - -@@ -429,16 +484,21 @@ pass_generate_phi_movs(struct nv_pc_pass *ctx, struct nv_basic_block *b) - ctx->pc->current_block = pn; - - for (i = b->phi; i && i->opcode == NV_OP_PHI; i = i->next) { -- if ((j = phi_opnd_for_bb(i, p, b)) < 0) -- continue; -- val = i->src[j]->value; -- -- if (i->src[j]->flags) { -- val = val->insn->src[0]->value; -- while (j < 4 && i->src[j]) -- ++j; -- assert(j < 4); -+ j = phi_opnd_for_bb(i, p, b); -+ -+ if (j < 0) { -+ val = i->def[0]; -+ } else { -+ val = i->src[j]->value; -+ if (i->src[j]->flags & NV_REF_FLAG_REGALLOC_PRIV) { -+ j = -1; -+ /* use original value, we already encountered & replaced it */ -+ val = val->insn->src[0]->value; -+ } - } -+ if (j < 0) /* need an additional source ? */ -+ for (j = 0; j < 5 && i->src[j] && i->src[j]->value != val; ++j); -+ assert(j < 5); - - ni = new_instruction(ctx->pc, NV_OP_MOV); - -@@ -452,7 +512,7 @@ pass_generate_phi_movs(struct nv_pc_pass *ctx, struct nv_basic_block *b) - - nv_reference(ctx->pc, &i->src[j], ni->def[0]); - -- i->src[j]->flags = 1; -+ i->src[j]->flags |= NV_REF_FLAG_REGALLOC_PRIV; - } - - if (pn != p && pn->exit) { -@@ -470,45 +530,50 @@ pass_generate_phi_movs(struct nv_pc_pass *ctx, struct nv_basic_block *b) - return 0; - } - -+#define JOIN_MASK_PHI (1 << 0) -+#define JOIN_MASK_SELECT (1 << 1) -+#define JOIN_MASK_MOV (1 << 2) -+#define JOIN_MASK_TEX (1 << 3) -+ - static int --pass_join_values(struct nv_pc_pass *ctx, int iter) -+pass_join_values(struct nv_pc_pass *ctx, unsigned mask) - { - int c, n; - - for (n = 0; n < ctx->num_insns; ++n) { -- struct nv_instruction *i = ctx->insns[n]; -+ struct nv_instruction *nvi, *i = ctx->insns[n]; - - switch (i->opcode) { - case NV_OP_PHI: -- if (iter != 2) -+ if (!(mask & JOIN_MASK_PHI)) - break; -- for (c = 0; c < 4 && i->src[c]; ++c) -- try_join_values(ctx, i->def[0], i->src[c]->value); -+ for (c = 0; c < 5 && i->src[c]; ++c) -+ join_values_nofail(ctx, i->def[0], i->src[c]->value, FALSE); - break; - case NV_OP_MOV: -- if ((iter == 2) && i->src[0]->value->insn && -- !nv_is_vector_op(i->src[0]->value->join->insn->opcode)) -+ if (!(mask & JOIN_MASK_MOV)) -+ break; -+ nvi = i->src[0]->value->join->insn; -+ if (nvi && !nv_is_vector_op(nvi->opcode)) - try_join_values(ctx, i->def[0], i->src[0]->value); - break; - case NV_OP_SELECT: -- if (iter != 1) -+ if (!(mask & JOIN_MASK_SELECT)) - break; -- for (c = 0; c < 4 && i->src[c]; ++c) { -- assert(join_allowed(ctx, i->def[0], i->src[c]->value)); -- do_join_values(ctx, i->def[0], i->src[c]->value); -- } -+ for (c = 0; c < 5 && i->src[c]; ++c) -+ join_values_nofail(ctx, i->def[0], i->src[c]->value, TRUE); - break; - case NV_OP_TEX: - case NV_OP_TXB: - case NV_OP_TXL: - case NV_OP_TXQ: -- if (iter) -+ if (!(mask & JOIN_MASK_TEX)) - break; -- for (c = 0; c < 4; ++c) { -- if (!i->src[c]) -- break; -- do_join_values(ctx, i->def[c], i->src[c]->value); -- } -+ /* This should work without conflicts because we always generate -+ * extra MOVs for the sources of a TEX. -+ */ -+ for (c = 0; c < 4 && i->src[c]; ++c) -+ join_values_nofail(ctx, i->def[c], i->src[c]->value, TRUE); - break; - default: - break; -@@ -643,15 +708,15 @@ static void collect_live_values(struct nv_basic_block *b, const int n) - { - int i; - -- if (b->out[0]) { -- if (b->out[1]) { /* what to do about back-edges ? */ -+ if (b->out[0] && b->out_kind[0] != CFG_EDGE_FAKE) { -+ if (b->out[1] && b->out_kind[1] != CFG_EDGE_FAKE) { - for (i = 0; i < n; ++i) - b->live_set[i] = b->out[0]->live_set[i] | b->out[1]->live_set[i]; - } else { - memcpy(b->live_set, b->out[0]->live_set, n * sizeof(uint32_t)); - } - } else -- if (b->out[1]) { -+ if (b->out[1] && b->out_kind[1] != CFG_EDGE_FAKE) { - memcpy(b->live_set, b->out[1]->live_set, n * sizeof(uint32_t)); - } else { - memset(b->live_set, 0, n * sizeof(uint32_t)); -@@ -770,8 +835,8 @@ insert_ordered_tail(struct nv_value *list, struct nv_value *nval) - struct nv_value *elem; - - for (elem = list->prev; -- elem != list && elem->livei->bgn > nval->livei->bgn; -- elem = elem->prev); -+ elem != list && elem->livei->bgn > nval->livei->bgn; -+ elem = elem->prev); - /* now elem begins before or at the same time as val */ - - nval->prev = elem; -@@ -780,44 +845,49 @@ insert_ordered_tail(struct nv_value *list, struct nv_value *nval) - elem->next = nval; - } - --static int --pass_linear_scan(struct nv_pc_pass *ctx, int iter) -+static void -+collect_register_values(struct nv_pc_pass *ctx, struct nv_value *head, -+ boolean assigned_only) - { -- struct nv_instruction *i; -- struct register_set f, free; -+ struct nv_value *val; - int k, n; -- struct nv_value *cur, *val, *tmp[2]; -- struct nv_value active, inactive, handled, unhandled; - -- make_empty_list(&active); -- make_empty_list(&inactive); -- make_empty_list(&handled); -- make_empty_list(&unhandled); -- -- nv50_ctor_register_set(ctx->pc, &free); -+ make_empty_list(head); - -- /* joined values should have range = NULL and thus not be added; -- * also, fixed memory values won't be added because they're not -- * def'd, just used -- */ - for (n = 0; n < ctx->num_insns; ++n) { -- i = ctx->insns[n]; -+ struct nv_instruction *i = ctx->insns[n]; - -+ /* for joined values, only the representative will have livei != NULL */ - for (k = 0; k < 4; ++k) { - if (i->def[k] && i->def[k]->livei) -- insert_ordered_tail(&unhandled, i->def[k]); -- else -- if (0 && i->def[k]) -- debug_printf("skipping def'd value %i: no livei\n", i->def[k]->n); -+ if (!assigned_only || i->def[k]->reg.id >= 0) -+ insert_ordered_tail(head, i->def[k]); - } - if (i->flags_def && i->flags_def->livei) -- insert_ordered_tail(&unhandled, i->flags_def); -+ if (!assigned_only || i->flags_def->reg.id >= 0) -+ insert_ordered_tail(head, i->flags_def); - } - -- for (val = unhandled.next; val != unhandled.prev; val = val->next) { -+ for (val = head->next; val != head->prev; val = val->next) { - assert(val->join == val); - assert(val->livei->bgn <= val->next->livei->bgn); - } -+} -+ -+static int -+pass_linear_scan(struct nv_pc_pass *ctx, int iter) -+{ -+ struct register_set f, free; -+ struct nv_value *cur, *val, *tmp[2]; -+ struct nv_value active, inactive, handled, unhandled; -+ -+ make_empty_list(&active); -+ make_empty_list(&inactive); -+ make_empty_list(&handled); -+ -+ nv50_ctor_register_set(ctx->pc, &free); -+ -+ collect_register_values(ctx, &unhandled, FALSE); - - foreach_s(cur, tmp[0], &unhandled) { - remove_from_list(cur); -@@ -854,13 +924,7 @@ pass_linear_scan(struct nv_pc_pass *ctx, int iter) - reg_occupy(&f, val); - - if (cur->reg.id < 0) { -- boolean mem = FALSE; -- -- if (nv_is_vector_op(cur->insn->opcode)) -- mem = !reg_assign(&f, &cur->insn->def[0], 4); -- else -- if (iter) -- mem = !reg_assign(&f, &cur, 1); -+ boolean mem = !reg_assign(&f, &cur, 1); - - if (mem) { - NOUVEAU_ERR("out of registers\n"); -@@ -874,6 +938,67 @@ pass_linear_scan(struct nv_pc_pass *ctx, int iter) - return 0; - } - -+/* Allocate values defined by instructions such as TEX, which have to be -+ * assigned to consecutive registers. -+ * Linear scan doesn't really work here since the values can have different -+ * live intervals. -+ */ -+static int -+pass_allocate_constrained_values(struct nv_pc_pass *ctx) -+{ -+ struct nv_value regvals, *val; -+ struct nv_instruction *i; -+ struct nv_value *defs[4]; -+ struct register_set regs[4]; -+ int n, vsize, c; -+ uint32_t mask; -+ boolean mem; -+ -+ collect_register_values(ctx, ®vals, TRUE); -+ -+ for (n = 0; n < ctx->num_insns; ++n) { -+ i = ctx->insns[n]; -+ vsize = nvi_vector_size(i); -+ if (!(vsize > 1)) -+ continue; -+ assert(vsize <= 4); -+ for (c = 0; c < vsize; ++c) -+ defs[c] = i->def[c]->join; -+ -+ if (defs[0]->reg.id >= 0) { -+ for (c = 1; c < vsize; ++c) -+ assert(defs[c]->reg.id >= 0); -+ continue; -+ } -+ -+ for (c = 0; c < vsize; ++c) { -+ nv50_ctor_register_set(ctx->pc, ®s[c]); -+ -+ foreach(val, ®vals) { -+ if (val->reg.id >= 0 && livei_have_overlap(val, defs[c])) -+ reg_occupy(®s[c], val); -+ } -+ mask = 0x11111111; -+ if (vsize == 2) /* granularity is 2 and not 4 */ -+ mask |= 0x11111111 << 2; -+ mask_register_set(®s[c], 0, mask << c); -+ -+ if (defs[c]->livei) -+ insert_ordered_tail(®vals, defs[c]); -+ } -+ for (c = 1; c < vsize; ++c) -+ intersect_register_sets(®s[0], ®s[0], ®s[c]); -+ -+ mem = !reg_assign(®s[0], &defs[0], vsize); -+ -+ if (mem) { -+ NOUVEAU_ERR("out of registers\n"); -+ abort(); -+ } -+ } -+ return 0; -+} -+ - static int - nv_pc_pass1(struct nv_pc *pc, struct nv_basic_block *root) - { -@@ -923,16 +1048,16 @@ nv_pc_pass1(struct nv_pc *pc, struct nv_basic_block *root) - livei_print(&pc->values[i]); - #endif - -- ret = pass_join_values(ctx, 0); -+ ret = pass_join_values(ctx, JOIN_MASK_PHI); - if (ret) - goto out; -- ret = pass_linear_scan(ctx, 0); -+ ret = pass_join_values(ctx, JOIN_MASK_SELECT | JOIN_MASK_TEX); - if (ret) - goto out; -- ret = pass_join_values(ctx, 1); -+ ret = pass_join_values(ctx, JOIN_MASK_MOV); - if (ret) - goto out; -- ret = pass_join_values(ctx, 2); -+ ret = pass_allocate_constrained_values(ctx); - if (ret) - goto out; - ret = pass_linear_scan(ctx, 1); --- -cgit v0.8.3-6-g21f6 diff --git a/testing/mesa/nouveau-fix-header.patch b/testing/mesa/nouveau-fix-header.patch deleted file mode 100644 index 38aa996f1..000000000 --- a/testing/mesa/nouveau-fix-header.patch +++ /dev/null @@ -1,86 +0,0 @@ -From 5c102dd94f435e97507213fbd128e50dd15f5f54 Mon Sep 17 00:00:00 2001 -From: Ben Skeggs <bskeggs@redhat.com> -Date: Mon, 20 Dec 2010 03:39:36 +0000 -Subject: nouveau: fix includes for latest libdrm - -Signed-off-by: Ben Skeggs <bskeggs@redhat.com> ---- -diff --git a/src/gallium/drivers/nouveau/nouveau_winsys.h b/src/gallium/drivers/nouveau/nouveau_winsys.h -index ab480ca..747b084 100644 ---- a/src/gallium/drivers/nouveau/nouveau_winsys.h -+++ b/src/gallium/drivers/nouveau/nouveau_winsys.h -@@ -10,7 +10,7 @@ - #include "nouveau/nouveau_grobj.h" - #include "nouveau/nouveau_notifier.h" - #include "nouveau/nouveau_resource.h" --#include "nouveau/nouveau_pushbuf.h" -+#include "nouveau/nv04_pushbuf.h" - - #ifndef NV04_PFIFO_MAX_PACKET_LEN - #define NV04_PFIFO_MAX_PACKET_LEN 2047 -diff --git a/src/gallium/drivers/nv50/nv50_surface.c b/src/gallium/drivers/nv50/nv50_surface.c -index ce48022..a99df76 100644 ---- a/src/gallium/drivers/nv50/nv50_surface.c -+++ b/src/gallium/drivers/nv50/nv50_surface.c -@@ -22,7 +22,7 @@ - - #define __NOUVEAU_PUSH_H__ - #include <stdint.h> --#include "nouveau/nouveau_pushbuf.h" -+#include "nouveau/nv04_pushbuf.h" - #include "nv50_context.h" - #include "nv50_resource.h" - #include "pipe/p_defines.h" -diff --git a/src/gallium/drivers/nvfx/nv04_2d.c b/src/gallium/drivers/nvfx/nv04_2d.c -index e0e65e7..e2fadd3 100644 ---- a/src/gallium/drivers/nvfx/nv04_2d.c -+++ b/src/gallium/drivers/nvfx/nv04_2d.c -@@ -34,11 +34,11 @@ - #include <stdio.h> - #include <stdint.h> - #include <nouveau/nouveau_device.h> --#include <nouveau/nouveau_pushbuf.h> - #include <nouveau/nouveau_channel.h> - #include <nouveau/nouveau_bo.h> - #include <nouveau/nouveau_notifier.h> - #include <nouveau/nouveau_grobj.h> -+#include <nouveau/nv04_pushbuf.h> - #include "nv04_2d.h" - - #include "nouveau/nv_object.xml.h" -diff --git a/src/gallium/drivers/nvfx/nvfx_vbo.c b/src/gallium/drivers/nvfx/nvfx_vbo.c -index 597664e..339b317 100644 ---- a/src/gallium/drivers/nvfx/nvfx_vbo.c -+++ b/src/gallium/drivers/nvfx/nvfx_vbo.c -@@ -9,8 +9,7 @@ - #include "nvfx_resource.h" - - #include "nouveau/nouveau_channel.h" -- --#include "nouveau/nouveau_pushbuf.h" -+#include "nouveau/nv04_pushbuf.h" - - static inline unsigned - util_guess_unique_indices_count(unsigned mode, unsigned indices) -diff --git a/src/mesa/drivers/dri/nouveau/nouveau_driver.h b/src/mesa/drivers/dri/nouveau/nouveau_driver.h -index 8036b18..c5ac128 100644 ---- a/src/mesa/drivers/dri/nouveau/nouveau_driver.h -+++ b/src/mesa/drivers/dri/nouveau/nouveau_driver.h -@@ -38,7 +38,6 @@ - #include <assert.h> - - #include "nouveau_device.h" --#include "nouveau_pushbuf.h" - #include "nouveau_grobj.h" - #include "nouveau_channel.h" - #include "nouveau_bo.h" -@@ -46,6 +45,7 @@ - #include "nouveau_screen.h" - #include "nouveau_state.h" - #include "nouveau_surface.h" -+#include "nv04_pushbuf.h" - - #define DRIVER_DATE "20091015" - #define DRIVER_AUTHOR "Nouveau" --- -cgit v0.8.3-6-g21f6 diff --git a/testing/pixman/PKGBUILD b/testing/pixman/PKGBUILD deleted file mode 100644 index bbc0360f6..000000000 --- a/testing/pixman/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 124049 2011-05-16 10:05:58Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Alexander Baldeck <alexander@archlinux.org> - -pkgname=pixman -pkgver=0.22.0 -pkgrel=1 -pkgdesc="Pixman library" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org" -license=('custom') -depends=('glibc') -options=('!libtool') -source=(http://xorg.freedesktop.org/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('d24ea233755d7dce9f0d93136ad99fba8d4e4fa0') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --disable-static - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} - -check() { - cd "${srcdir}/${pkgname}-${pkgver}" - make check -} diff --git a/testing/pkg-config/PKGBUILD b/testing/pkg-config/PKGBUILD deleted file mode 100644 index 95ed134c6..000000000 --- a/testing/pkg-config/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 124806 2011-05-24 14:39:31Z stephane $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Committer: Judd Vinet <jvinet@zeroflux.org> - -pkgname=pkg-config -pkgver=0.26 -pkgrel=1 -pkgdesc="A system for managing library compile/link flags" -arch=('i686' 'x86_64') -url="http://pkgconfig.freedesktop.org/wiki/" -license=('GPL') -groups=('base-devel') -depends=('glibc' 'popt' 'glib2') -provides=("pkgconfig=${pkgver}") -conflicts=('pkgconfig') -replaces=('pkgconfig') -source=(http://pkgconfig.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz) -md5sums=('47525c26a9ba7ba14bf85e01509a7234') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - # Use system popt - ./configure --prefix=/usr --with-installed-popt - - make -} - -check() { - cd "${srcdir}/${pkgname}-${pkgver}" - make check -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR=${pkgdir} install -} diff --git a/testing/pkg-config/autoconf-2.66.patch b/testing/pkg-config/autoconf-2.66.patch deleted file mode 100644 index 14cabdf9f..000000000 --- a/testing/pkg-config/autoconf-2.66.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur pkg-config-0.25-old//pkg.m4 pkg-config-0.25/pkg.m4 ---- pkg-config-0.25-old//pkg.m4 2009-12-07 06:39:02.000000000 +1000 -+++ pkg-config-0.25/pkg.m4 2010-07-15 14:44:37.466942978 +1000 -@@ -135,7 +135,7 @@ - Consider adjusting the PKG_CONFIG_PATH environment variable if you - installed software in a non-standard prefix. - --_PKG_TEXT])dnl -+_PKG_TEXT])[]dnl - ]) - elif test $pkg_failed = untried; then - AC_MSG_RESULT([no]) diff --git a/testing/sudo/PKGBUILD b/testing/sudo/PKGBUILD deleted file mode 100644 index fee69d2c1..000000000 --- a/testing/sudo/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 124889 2011-05-24 21:47:33Z eric $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> - -pkgname=sudo -_ver=1.8.1p2 -pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}} -pkgrel=1 -pkgdesc="Give certain users the ability to run some commands as root" -arch=('i686' 'x86_64') -url="http://www.sudo.ws/sudo/" -license=('custom') -depends=('glibc' 'pam') -backup=('etc/sudoers' 'etc/pam.d/sudo') -options=('!libtool' '!makeflags') -source=(ftp://ftp.sudo.ws/pub/sudo/$pkgname-$_ver.tar.gz - sudo.pam) -md5sums=('e8330f0e63b0ecb2e12b5c76922818cc' - '4e7ad4ec8f2fe6a40e12bcb2c0b256e3') - -build() { - cd "$srcdir/$pkgname-$_ver" - - ./configure --prefix=/usr --with-pam --libexecdir=/usr/lib \ - --with-env-editor --with-all-insults --with-logfac=auth - make -} - -package() { - cd "$srcdir/$pkgname-$_ver" - install -dm755 "$pkgdir/var/lib" - - make DESTDIR="$pkgdir" install - install -Dm644 "$srcdir/sudo.pam" "$pkgdir/etc/pam.d/sudo" - - install -Dm644 doc/LICENSE "$pkgdir/usr/share/licenses/sudo/LICENSE" -} diff --git a/testing/sudo/sudo.pam b/testing/sudo/sudo.pam deleted file mode 100644 index 4e586cd22..000000000 --- a/testing/sudo/sudo.pam +++ /dev/null @@ -1,3 +0,0 @@ -#%PAM-1.0 -auth required pam_unix.so -auth required pam_nologin.so diff --git a/testing/vigra/PKGBUILD b/testing/vigra/PKGBUILD deleted file mode 100644 index 400bd5898..000000000 --- a/testing/vigra/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 124225 2011-05-17 18:01:10Z andyrtr $ -# Maintainer: AndyRTR <andyrtr@archlinux.org> -# Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com> - -pkgname=vigra -pkgver=1.7.1 -pkgrel=1 -pkgdesc="Computer vision library" -arch=('i686' 'x86_64') -url="http://hci.iwr.uni-heidelberg.de/vigra/" -license=('custom:MIT') -depends=('libpng' 'libtiff' 'gcc-libs' 'sh' 'hdf5' 'fftw') -makedepends=('cmake' 'python-nose' 'doxygen' 'python-sphinx' 'boost' 'python-numpy') -optdepends=('python2: for python bindings' - 'boost-libs: for python bindings') -options=('!libtool') -source=(http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/${pkgname}-${pkgver}-src.tar.gz - vigra-1.7.1.gcc460.patch) -md5sums=('2bde208e0fd7626770169dd4fa097282' - '25ef8bc26bc38ee67e5b512d2acd0166') - -build() { - cd "${srcdir}"/${pkgname}-${pkgver} - patch -Np1 -i ${srcdir}/vigra-1.7.1.gcc460.patch - cmake -DCMAKE_INSTALL_PREFIX=/usr \ - -DWITH_VIGRANUMPY=1 \ - -DDOCINSTALL=share/doc - make -} - -package() { - cd "${srcdir}"/${pkgname}-${pkgver} - make DESTDIR="${pkgdir}" install - # license - install -D -m644 LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE -} diff --git a/testing/vigra/vigra-1.7.1.gcc460.patch b/testing/vigra/vigra-1.7.1.gcc460.patch deleted file mode 100644 index 46f194dbc..000000000 --- a/testing/vigra/vigra-1.7.1.gcc460.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -baur vigra-1.7.1.old/include/vigra/random_forest.hxx vigra-1.7.1/include/vigra/random_forest.hxx ---- vigra-1.7.1.old/include/vigra/random_forest.hxx 2010-12-03 17:40:34.000000000 +0000 -+++ vigra-1.7.1/include/vigra/random_forest.hxx 2011-01-28 00:16:32.000000000 +0000 -@@ -43,6 +43,7 @@ - #include <set> - #include <list> - #include <numeric> -+#include <stddef.h> - #include "mathutil.hxx" - #include "array_vector.hxx" - #include "sized_int.hxx" -diff -baur vigra-1.7.1.old/include/vigra/sifImport.hxx vigra-1.7.1/include/vigra/sifImport.hxx ---- vigra-1.7.1.old/include/vigra/sifImport.hxx 2010-12-03 17:40:34.000000000 +0000 -+++ vigra-1.7.1/include/vigra/sifImport.hxx 2011-01-28 00:23:31.000000000 +0000 -@@ -57,6 +57,7 @@ - #include <fstream> - #include <cstring> - #include <vector> -+#include <stddef.h> - #include "vigra/multi_array.hxx" - - namespace vigra { -diff -baur vigra-1.7.1.old/include/vigra/multi_iterator.hxx vigra-1.7.1/include/vigra/multi_iterator.hxx ---- vigra-1.7.1.old/include/vigra/multi_iterator.hxx 2010-12-03 17:40:34.000000000 +0000 -+++ vigra-1.7.1/include/vigra/multi_iterator.hxx 2011-01-28 00:23:31.000000000 +0000 -@@ -41,6 +41,7 @@ - #define VIGRA_MULTI_ITERATOR_HXX - - #include <sys/types.h> -+#include <stddef.h> - #include "tinyvector.hxx" - #include "iteratortags.hxx" - diff --git a/testing/xf86-input-wacom/70-wacom.rules b/testing/xf86-input-wacom/70-wacom.rules deleted file mode 100644 index 67e5580cc..000000000 --- a/testing/xf86-input-wacom/70-wacom.rules +++ /dev/null @@ -1,8 +0,0 @@ -ACTION!="add|change", GOTO="wacom_end" - -# Match all wacom tablets with a serial ID starting with WACf -ATTRS{id}=="WACf*" ENV{NAME}="Serial Wacom Tablet", ENV{SUBSYSTEM}="input", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1" -ATTRS{id}=="FUJ*" ENV{NAME}="Serial Wacom Tablet", ENV{SUBSYSTEM}="input", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1" - -LABEL="wacom_end" - diff --git a/testing/xf86-input-wacom/PKGBUILD b/testing/xf86-input-wacom/PKGBUILD deleted file mode 100644 index f1bf57b06..000000000 --- a/testing/xf86-input-wacom/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 124965 2011-05-25 13:01:43Z heftig $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> -# Contributor: Jan de Groot <jgc@archlinux.org> -# Contributor: M Rawash <mrawash@gmail.com> - -pkgname=xf86-input-wacom -pkgver=0.11.0 -pkgrel=1 -pkgdesc="X.Org Wacom tablet driver" -arch=('i686' 'x86_64') -url="http://linuxwacom.sourceforge.net/" -license=('GPL') -backup=('etc/X11/xorg.conf.d/50-wacom.conf') -depends=('libxi' 'libxrandr') -makedepends=('xorg-server-devel' 'libxext' 'libxi') -conflicts=('xorg-server<1.10.0') -options=(!libtool) -source=(http://downloads.sourceforge.net/project/linuxwacom/${pkgname}/${pkgname}-${pkgver}.tar.bz2 - 70-wacom.rules) -md5sums=('e0f6182cf7fba19c13f3db7e0da1baf3' - '4d3665bb2ef8a8190734640dffa4c6f7') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --with-xorg-conf-dir=/etc/X11/xorg.conf.d - make - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/lib/udev/rules.d" - install -m644 "${srcdir}/70-wacom.rules" "${pkgdir}/lib/udev/rules.d/" -} diff --git a/testing/xf86-video-ati/PKGBUILD b/testing/xf86-video-ati/PKGBUILD deleted file mode 100644 index c10416455..000000000 --- a/testing/xf86-video-ati/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 125569 2011-05-26 19:49:03Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Alexander Baldeck <alexander@archlinux.org> - -pkgname=xf86-video-ati -pkgver=6.14.2 -pkgrel=1 -pkgdesc="X.org ati video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=(libpciaccess libdrm udev pixman ati-dri) -makedepends=('xorg-server-devel' 'libdrm' 'xf86driproto' 'mesa') -conflicts=('xorg-server<1.10.0') -groups=('xorg-drivers' 'xorg') -options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -md5sums=('111ec4aef32a4298df7e38afa8bef373') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --enable-dri - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make "DESTDIR=${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/testing/xf86-video-ati/ati-fix-build-1.10.patch b/testing/xf86-video-ati/ati-fix-build-1.10.patch deleted file mode 100644 index 75980cbf3..000000000 --- a/testing/xf86-video-ati/ati-fix-build-1.10.patch +++ /dev/null @@ -1,38 +0,0 @@ -From ecfdb209afe2aafc378baab8c511f5df7b000270 Mon Sep 17 00:00:00 2001 -From: Sedat Dilek <sedat.dilek@googlemail.com> -Date: Fri, 25 Feb 2011 21:48:14 +0100 -Subject: [PATCH] UMS: Fix build against xserver 1.10-rc3 - -This issue was introduced due to last minute backout of RandR-1.4 -in xserver 1.10-rc3. - -Switch to "#ifdef RANDR_14_INTERFACE" as suggested by Keith Packard. -See also <http://lists.x.org/archives/xorg-devel/2011-February/019643.html>. - -Note: -The ddx needs a rebuild as the X video driver ABI changed to version 10.0. - -Reported-by: Alex Deucher <alexdeucher@gmail.com> -CC: Keith Packard <keithp@keithp.com> -Signed-off-by: Sedat Dilek <sedat.dilek@gmail.com> ---- - src/radeon_output.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/src/radeon_output.c b/src/radeon_output.c -index 15cef06..ccde346 100644 ---- a/src/radeon_output.c -+++ b/src/radeon_output.c -@@ -1622,7 +1622,7 @@ radeon_set_mode_for_property(xf86OutputPtr output) - xf86CrtcPtr crtc = output->crtc; - - if (crtc->enabled) { --#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,9,99,901,0) -+#ifdef RANDR_14_INTERFACE - xf86CrtcSetRec crtc_set_rec; - - crtc_set_rec.flags = (XF86CrtcSetMode | --- -1.7.1 - - |