From 7938c8e91741003d9b87347311f36c6c9cc24dea Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Thu, 11 Nov 2010 15:19:51 +0000
Subject: removed a bunch of duplicates postgresql samba cups libmng
 xorg-utils-macro java

---
 abs/core/cups/PKGBUILD                             |  113 --
 abs/core/cups/cups                                 |   38 -
 abs/core/cups/cups-avahi.patch                     | 1088 --------------------
 abs/core/cups/cups.install                         |   11 -
 abs/core/cups/cups.logrotate                       |    8 -
 abs/core/cups/cups.pam                             |    3 -
 abs/core/libmng/PKGBUILD                           |   25 -
 abs/core/python-pycurl/PKGBUILD                    |   20 -
 abs/core/recordproto/PKGBUILD                      |   19 -
 abs/core/samba/PKGBUILD                            |  139 ---
 abs/core/samba/__changelog                         |    1 -
 abs/core/samba/heimdal.patch                       |   33 -
 abs/core/samba/no-clients.patch                    |   31 -
 abs/core/samba/samba                               |   51 -
 abs/core/samba/samba-3.0.21a-ntlmssp.patch         |   13 -
 abs/core/samba/samba.conf.d                        |    7 -
 abs/core/samba/samba.logrotate                     |    9 -
 abs/core/samba/samba.pam                           |    3 -
 abs/core/samba/swat.xinetd                         |   10 -
 abs/core/xorg-util-macros/PKGBUILD                 |   23 -
 abs/extra/java-sun/PKGBUILD                        |  123 ---
 abs/extra/java-sun/java-control-panel.desktop      |   12 -
 .../java-monitoring-and-management-console.desktop |    9 -
 abs/extra/java-sun/java-policy-settings.desktop    |   10 -
 abs/extra/java-sun/java-visualvm.desktop           |   11 -
 abs/extra/java-sun/java-web-start.desktop          |   13 -
 abs/extra/java-sun/jdk.install                     |   11 -
 abs/extra/java-sun/jdk.profile                     |    4 -
 abs/extra/java-sun/jre.install                     |   22 -
 abs/extra/java-sun/jre.profile                     |    4 -
 abs/extra/libdvdread/DVDFileStat.patch             |  238 -----
 abs/extra/libdvdread/PKGBUILD                      |   36 -
 abs/extra/perl-dbd-mysql/PKGBUILD                  |   30 -
 abs/extra/postgresql-libs/PKGBUILD                 |  136 ---
 abs/extra/postgresql-libs/build.patch              |   11 -
 abs/extra/postgresql-libs/postgresql               |   59 --
 abs/extra/postgresql-libs/postgresql.confd         |    5 -
 abs/extra/postgresql-libs/postgresql.logrotate     |    4 -
 abs/extra/postgresql-libs/postgresql.pam           |    3 -
 39 files changed, 2386 deletions(-)
 delete mode 100644 abs/core/cups/PKGBUILD
 delete mode 100755 abs/core/cups/cups
 delete mode 100644 abs/core/cups/cups-avahi.patch
 delete mode 100644 abs/core/cups/cups.install
 delete mode 100644 abs/core/cups/cups.logrotate
 delete mode 100644 abs/core/cups/cups.pam
 delete mode 100644 abs/core/libmng/PKGBUILD
 delete mode 100644 abs/core/python-pycurl/PKGBUILD
 delete mode 100644 abs/core/recordproto/PKGBUILD
 delete mode 100644 abs/core/samba/PKGBUILD
 delete mode 100644 abs/core/samba/__changelog
 delete mode 100644 abs/core/samba/heimdal.patch
 delete mode 100644 abs/core/samba/no-clients.patch
 delete mode 100755 abs/core/samba/samba
 delete mode 100644 abs/core/samba/samba-3.0.21a-ntlmssp.patch
 delete mode 100644 abs/core/samba/samba.conf.d
 delete mode 100644 abs/core/samba/samba.logrotate
 delete mode 100644 abs/core/samba/samba.pam
 delete mode 100644 abs/core/samba/swat.xinetd
 delete mode 100644 abs/core/xorg-util-macros/PKGBUILD
 delete mode 100644 abs/extra/java-sun/PKGBUILD
 delete mode 100644 abs/extra/java-sun/java-control-panel.desktop
 delete mode 100644 abs/extra/java-sun/java-monitoring-and-management-console.desktop
 delete mode 100644 abs/extra/java-sun/java-policy-settings.desktop
 delete mode 100644 abs/extra/java-sun/java-visualvm.desktop
 delete mode 100644 abs/extra/java-sun/java-web-start.desktop
 delete mode 100644 abs/extra/java-sun/jdk.install
 delete mode 100644 abs/extra/java-sun/jdk.profile
 delete mode 100644 abs/extra/java-sun/jre.install
 delete mode 100644 abs/extra/java-sun/jre.profile
 delete mode 100644 abs/extra/libdvdread/DVDFileStat.patch
 delete mode 100644 abs/extra/libdvdread/PKGBUILD
 delete mode 100644 abs/extra/perl-dbd-mysql/PKGBUILD
 delete mode 100644 abs/extra/postgresql-libs/PKGBUILD
 delete mode 100644 abs/extra/postgresql-libs/build.patch
 delete mode 100755 abs/extra/postgresql-libs/postgresql
 delete mode 100644 abs/extra/postgresql-libs/postgresql.confd
 delete mode 100644 abs/extra/postgresql-libs/postgresql.logrotate
 delete mode 100644 abs/extra/postgresql-libs/postgresql.pam

diff --git a/abs/core/cups/PKGBUILD b/abs/core/cups/PKGBUILD
deleted file mode 100644
index 5d59113..0000000
--- a/abs/core/cups/PKGBUILD
+++ /dev/null
@@ -1,113 +0,0 @@
-# $Id: PKGBUILD 87481 2010-08-14 10:36:21Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-
-pkgbase="cups"
-pkgname=('libcups' 'cups')
-pkgver=1.4.4
-pkgrel=3
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.cups.org/"
-makedepends=('libtiff>=3.9.2-2' 'libpng>=1.4.0'  'acl' 'openslp' 'pam' 'xdg-utils' 'heimdal>=1.3.1' 'gnutls>=2.8.3' 'poppler>=0.12.3'
-             'xinetd' 'gzip' 'autoconf' 'php' 'libusb' 'dbus-core' 'avahi'  'hicolor-icon-theme')
-source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2
-	cups-avahi.patch
-	http://www.cups.org/strfiles/3595/str3595.patch
-        cups cups.logrotate cups.pam)
-#options=('!emptydirs')
-md5sums=('8776403ad60fea9e85eab9c04d88560d'
-         'fce500e3e6e244f5b77fe8eaad87e022'
-         '0dd7329fc956d63a72085553171d62a2'
-         '5c85b7d8d2ddd02c2c64955cebbf55ea'
-         'f861b18f4446c43918c8643dcbbd7f6d'
-         '96f82c38f3f540b53f3e5144900acf17')
-
-build() {
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  # Avahi support in the dnssd backend. patch from Fedora
-  patch -Np1 -i ${srcdir}/cups-avahi.patch || return 1
-  
-  # fix  Brother HL-1440 failing with msg "Unable to write 8192 bytes to printer!" (http://bugs.archlinux.org/task/18167)
-  patch -Np0 -i ${srcdir}/str3595.patch || return 1
-  
-  # Rebuild configure script for --enable-avahi.
-  aclocal -I config-scripts
-  autoconf -I config-scripts
-
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-     --with-logdir=/var/log/cups -with-docdir=/usr/share/cups/doc \
-     --with-cups-user=daemon --with-cups-group=lp --enable-pam=yes \
-     --disable-ldap --libdir=/usr/lib --enable-raw-printing \
-     --enable-dbus --with-dbusdir=/etc/dbus-1 --enable-ssl=yes --enable-gnutls --disable-threads --enable-avahi\
-     --with-php=/usr/bin/php-cgi --with-pdftops=pdftops --with-optim="$CFLAGS"
-  make || return 1
-}
-
-package_libcups() {
-pkgdesc="The CUPS Printing System - client libraries and headers"
-depends=('gnutls>=2.8.3' 'libtiff>=3.9.2-2' 'libpng>=1.4.0' 'heimdal>=1.3.1' 'avahi')
-
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  make BUILDROOT=${pkgdir} install-headers install-libs || return 1
-  # put this into the libs pkg to make other software find the libs(no pkg-config file included)
-  mkdir -p ${pkgdir}/usr/bin
-  install -m755 ${srcdir}/${pkgbase}-${pkgver}/cups-config ${pkgdir}/usr/bin/cups-config
-}
-
-package_cups() {
-pkgdesc="The CUPS Printing System - deamon package"
-install=cups.install
-backup=(etc/cups/cupsd.conf
-        etc/cups/mime.convs
-        etc/cups/mime.types
-        etc/cups/snmp.conf
-        etc/cups/printers.conf
-        etc/cups/classes.conf
-        etc/cups/client.conf
-        etc/cups/subscriptions.conf
-        etc/dbus-1/system.d/cups.conf
-        etc/logrotate.d/cups
-        etc/pam.d/cups
-        etc/xinetd.d/cups-lpd)
-depends=('acl' 'openslp' 'pam' "libcups>=${pkgver}" 'xdg-utils' 'poppler>=0.12.3' 'libusb' 'dbus-core' 'hicolor-icon-theme')
-optdepends=('php: for included phpcups.so module')
-
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  make BUILDROOT=${pkgdir} install-data install-exec || return 1
-
-  # this one we ship in the libcups pkg
-  rm -f ${pkgdir}/usr/bin/cups-config
-
-  # kill the sysv stuff
-  rm -rf ${pkgdir}/etc/rc*.d
-  rm -rf ${pkgdir}/etc/init.d
-  install -D -m755 ../cups ${pkgdir}/etc/rc.d/cups
-  install -D -m644 ../cups.logrotate ${pkgdir}/etc/logrotate.d/cups
-  install -D -m644 ../cups.pam ${pkgdir}/etc/pam.d/cups
-  
-  # fix perms on /var/spool and /etc
-  chmod 755 ${pkgdir}/var/spool
-  chmod 755 ${pkgdir}/etc
-  
-  # serial backend needs to run as root (http://bugs.archlinux.org/task/20396)
-  chmod 700 ${pkgdir}/usr/lib/cups/backend/serial
-
-  # install ssl directory where to store the certs, solves some samba issues
-  install -dm700 -g lp ${pkgdir}/etc/cups/ssl
-  install -dm511 -g lp ${pkgdir}/var/run/cups/certs 
-
-  # install some more configuration files that will get filled by cupsd
-  touch ${pkgdir}/etc/cups/printers.conf
-  touch ${pkgdir}/etc/cups/classes.conf
-  touch ${pkgdir}/etc/cups/client.conf
-  echo "# see 'man client.conf'" >> ${pkgdir}/etc/cups/client.conf
-  echo "ServerName /var/run/cups/cups.sock #  alternative: ServerName hostname-or-ip-address[:port] of a remote server" >> ${pkgdir}/etc/cups/client.conf
-  touch ${pkgdir}/etc/cups/subscriptions.conf 
-  chgrp lp ${pkgdir}/etc/cups/{printers.conf,classes.conf,client.conf,subscriptions.conf}
-  
-  # fix .desktop file
-  sed -i 's|^Exec=htmlview http://localhost:631/|Exec=xdg-open http://localhost:631/|g' ${pkgdir}/usr/share/applications/cups.desktop
-  
-  # compress some driver files, adopted from Fedora
-  find ${pkgdir}/usr/share/cups/model -name "*.ppd" | xargs gzip -n9f
-}
diff --git a/abs/core/cups/cups b/abs/core/cups/cups
deleted file mode 100755
index 4afaf5a..0000000
--- a/abs/core/cups/cups
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/cupsd`
-case "$1" in
-  start)
-    stat_busy "Starting CUPS Daemon"
-    [ -z "$PID" ] && /usr/sbin/cupsd
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      echo $(pidof -o %PPID -x /usr/sbin/cupsd) > /var/run/cups.pid
-      add_daemon cups
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping CUPS Daemon"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm /var/run/cups.pid
-      rm_daemon cups
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/abs/core/cups/cups-avahi.patch b/abs/core/cups/cups-avahi.patch
deleted file mode 100644
index 9783cd4..0000000
--- a/abs/core/cups/cups-avahi.patch
+++ /dev/null
@@ -1,1088 +0,0 @@
-diff -up cups-1.4.0/backend/dnssd.c.avahi cups-1.4.0/backend/dnssd.c
---- cups-1.4.0/backend/dnssd.c.avahi	2009-08-07 23:27:12.000000000 +0100
-+++ cups-1.4.0/backend/dnssd.c	2009-09-04 14:57:04.730388833 +0100
-@@ -22,6 +22,7 @@
-  *   exec_backend()          - Execute the backend that corresponds to the
-  *                             resolved service name.
-  *   get_device()            - Create or update a device.
-+*    find_device()
-  *   query_callback()        - Process query data.
-  *   sigterm_handler()       - Handle termination signals...
-  *   unquote()               - Unquote a name string.
-@@ -33,7 +34,18 @@
- 
- #include "backend-private.h"
- #include <cups/array.h>
--#include <dns_sd.h>
-+#ifdef HAVE_DNSSD
-+#  include <dns_sd.h>
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+#  include <avahi-client/client.h>
-+#  include <avahi-client/lookup.h>
-+#  include <avahi-common/simple-watch.h>
-+#  include <avahi-common/domain.h>
-+#  include <avahi-common/error.h>
-+#  include <avahi-common/malloc.h>
-+#define kDNSServiceMaxDomainName AVAHI_DOMAIN_NAME_MAX
-+#endif /* HAVE_AVAHI */
- 
- 
- /*
-@@ -52,7 +64,12 @@ typedef enum
- 
- typedef struct
- {
-+#ifdef HAVE_DNSSD
-   DNSServiceRef	ref;			/* Service reference for resolve */
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+  int		resolved;		/* Did we resolve the device? */
-+#endif /* HAVE_AVAHI */
-   char		*name,			/* Service name */
- 		*domain,		/* Domain name */
- 		*fullName,		/* Full name */
-@@ -64,6 +81,20 @@ typedef struct
- 		sent;			/* Did we list the device? */
- } cups_device_t;
- 
-+typedef struct
-+{
-+  char key[256];
-+  char value[256];
-+
-+#ifdef HAVE_DNSSD
-+  const uint8_t *data;
-+  const uint8_t *datanext;
-+  const uint8_t *dataend;
-+#else /* HAVE_AVAHI */
-+  AvahiStringList *txt;
-+#endif /* HAVE_DNSSD */
-+} cups_txt_records_t;
-+
- 
- /*
-  * Local globals...
-@@ -77,6 +108,7 @@ static int		job_canceled = 0;
-  * Local functions...
-  */
- 
-+#ifdef HAVE_DNSSD
- static void		browse_callback(DNSServiceRef sdRef,
- 			                DNSServiceFlags flags,
- 				        uint32_t interfaceIndex,
-@@ -92,12 +124,6 @@ static void		browse_local_callback(DNSSe
- 					      const char *regtype,
- 					      const char *replyDomain,
- 					      void *context);
--static int		compare_devices(cups_device_t *a, cups_device_t *b);
--static void		exec_backend(char **argv);
--static cups_device_t	*get_device(cups_array_t *devices,
--			            const char *serviceName,
--			            const char *regtype,
--				    const char *replyDomain);
- static void		query_callback(DNSServiceRef sdRef,
- 			               DNSServiceFlags flags,
- 				       uint32_t interfaceIndex,
-@@ -106,9 +132,111 @@ static void		query_callback(DNSServiceRe
- 				       uint16_t rrclass, uint16_t rdlen,
- 				       const void *rdata, uint32_t ttl,
- 				       void *context);
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+static void		avahi_client_callback (AvahiClient *client,
-+					       AvahiClientState state,
-+					       void *context);
-+static void		avahi_browse_callback (AvahiServiceBrowser *browser,
-+					       AvahiIfIndex interface,
-+					       AvahiProtocol protocol,
-+					       AvahiBrowserEvent event,
-+					       const char *serviceName,
-+					       const char *regtype,
-+					       const char *replyDomain,
-+					       AvahiLookupResultFlags flags,
-+					       void *context);
-+#endif /* HAVE_AVAHI */
-+
-+static cups_device_t *	find_device (cups_array_t *devices,
-+				     cups_txt_records_t *txt,
-+				     cups_device_t *dkey);
-+static int		compare_devices(cups_device_t *a, cups_device_t *b);
-+static void		exec_backend(char **argv);
-+static cups_device_t	*get_device(cups_array_t *devices,
-+			            const char *serviceName,
-+			            const char *regtype,
-+				    const char *replyDomain);
- static void		sigterm_handler(int sig);
- static void		unquote(char *dst, const char *src, size_t dstsize);
- 
-+#ifdef HAVE_AVAHI
-+static AvahiSimplePoll *simple_poll = NULL;
-+static int avahi_got_callback;
-+#endif /* HAVE_AVAHI */
-+
-+
-+/*
-+ * cups_txt_records_t access functions
-+ */
-+static cups_txt_records_t *
-+next_txt_record (cups_txt_records_t *txt)
-+{
-+#ifdef HAVE_DNSSD
-+  txt->data = txt->datanext;
-+#else /* HAVE_AVAHI */
-+  txt->txt = avahi_string_list_get_next (txt->txt);
-+  if (txt->txt == NULL)
-+    return NULL;
-+#endif /* HAVE_DNSSD */
-+
-+  return txt;
-+}
-+
-+static int
-+parse_txt_record_pair (cups_txt_records_t *txt)
-+{
-+#ifdef HAVE_DNSSD
-+  uint8_t	datalen;
-+  uint8_t	*data = txt->data;
-+  char		*ptr;
-+
-+ /*
-+  * Read a key/value pair starting with an 8-bit length.  Since the
-+  * length is 8 bits and the size of the key/value buffers is 256, we
-+  * don't need to check for overflow...
-+  */
-+
-+  datalen = *data++;
-+  if (!datalen || (data + datalen) >= txt->dataend)
-+    return NULL;
-+  txt->datanext = data + datalen;
-+
-+  for (ptr = txt->key; data < txt->datanext && *data != '='; data ++)
-+    *ptr++ = *data;
-+  *ptr = '\0';
-+
-+  if (data < txt->datanext && *data == '=')
-+  {
-+    data++;
-+
-+    if (data < datanext)
-+      memcpy (txt->value, data, txt->datanext - data);
-+    value[txt->datanext - data] = '\0';
-+  }
-+  else
-+    return 1;
-+#else /* HAVE_AVAHI */
-+  char *key, *value;
-+  size_t len;
-+  avahi_string_list_get_pair (txt->txt, &key, &value, &len);
-+  if (len > sizeof (txt->value) - 1)
-+    len = sizeof (txt->value) - 1;
-+
-+  memcpy (txt->value, value, len);
-+  txt->value[len] = '\0';
-+  len = strlen (key);
-+  if (len > sizeof (txt->key) - 1)
-+    len = sizeof (txt->key) - 1;
-+
-+  memcpy (txt->key, key, len);
-+  txt->key[len] = '\0';
-+  avahi_free (key);
-+  avahi_free (value);
-+#endif /* HAVE_AVAHI */
-+
-+  return 0;
-+}
- 
- /*
-  * 'main()' - Browse for printers.
-@@ -119,6 +247,13 @@ main(int  argc,				/* I - Number of comm
-      char *argv[])			/* I - Command-line arguments */
- {
-   const char	*name;			/* Backend name */
-+  cups_array_t	*devices;		/* Device array */
-+  cups_device_t	*device;		/* Current device */
-+  char		uriName[1024];		/* Unquoted fullName for URI */
-+#ifdef HAVE_DNSSD
-+  int		fd;			/* Main file descriptor */
-+  fd_set	input;			/* Input set for select() */
-+  struct timeval timeout;		/* Timeout for select() */
-   DNSServiceRef	main_ref,		/* Main service reference */
- 		fax_ipp_ref,		/* IPP fax service reference */
- 		ipp_ref,		/* IPP service reference */
-@@ -130,12 +265,11 @@ main(int  argc,				/* I - Number of comm
- 		pdl_datastream_ref,	/* AppSocket service reference */
- 		printer_ref,		/* LPD service reference */
- 		riousbprint_ref;	/* Remote IO service reference */
--  int		fd;			/* Main file descriptor */
--  fd_set	input;			/* Input set for select() */
--  struct timeval timeout;		/* Timeout for select() */
--  cups_array_t	*devices;		/* Device array */
--  cups_device_t	*device;		/* Current device */
--  char		uriName[1024];		/* Unquoted fullName for URI */
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+  AvahiClient	*client;
-+  int		error;
-+#endif /* HAVE_AVAHI */
- #if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
-   struct sigaction action;		/* Actions for POSIX signals */
- #endif /* HAVE_SIGACTION && !HAVE_SIGSET */
-@@ -194,6 +328,49 @@ main(int  argc,				/* I - Number of comm
-   * Browse for different kinds of printers...
-   */
- 
-+#ifdef HAVE_AVAHI
-+  if ((simple_poll = avahi_simple_poll_new ()) == NULL)
-+  {
-+    perror ("ERROR: Unable to create avahi simple poll object");
-+    return (1);
-+  }
-+
-+  client = avahi_client_new (avahi_simple_poll_get (simple_poll),
-+			     0, avahi_client_callback, NULL, &error);
-+  if (!client)
-+  {
-+    perror ("ERROR: Unable to create avahi client");
-+    return (1);
-+  }
-+
-+  avahi_service_browser_new (client, AVAHI_IF_UNSPEC,
-+			     AVAHI_PROTO_UNSPEC,
-+			     "_fax-ipp._tcp", NULL, 0,
-+			     avahi_browse_callback, devices);
-+  avahi_service_browser_new (client, AVAHI_IF_UNSPEC,
-+			     AVAHI_PROTO_UNSPEC,
-+			     "_ipp._tcp", NULL, 0,
-+			     avahi_browse_callback, devices);
-+  avahi_service_browser_new (client, AVAHI_IF_UNSPEC,
-+			     AVAHI_PROTO_UNSPEC,
-+			     "_ipp-tls._tcp", NULL, 0,
-+			     avahi_browse_callback, devices);
-+  avahi_service_browser_new (client, AVAHI_IF_UNSPEC,
-+			     AVAHI_PROTO_UNSPEC,
-+			     "_pdl-datastream._tcp",
-+			     NULL, 0,
-+			     avahi_browse_callback,
-+			     devices);
-+  avahi_service_browser_new (client, AVAHI_IF_UNSPEC,
-+			     AVAHI_PROTO_UNSPEC,
-+			     "_printer._tcp", NULL, 0,
-+			     avahi_browse_callback, devices);
-+  avahi_service_browser_new (client, AVAHI_IF_UNSPEC,
-+			     AVAHI_PROTO_UNSPEC,
-+			     "_riousbprint._tcp", NULL, 0,
-+			     avahi_browse_callback, devices);
-+#endif /* HAVE_AVAHI */
-+#ifdef HAVE_DNSSD
-   if (DNSServiceCreateConnection(&main_ref) != kDNSServiceErr_NoError)
-   {
-     perror("ERROR: Unable to create service connection");
-@@ -245,6 +422,7 @@ main(int  argc,				/* I - Number of comm
-   riousbprint_ref = main_ref;
-   DNSServiceBrowse(&riousbprint_ref, kDNSServiceFlagsShareConnection, 0,
-                    "_riousbprint._tcp", NULL, browse_callback, devices);
-+#endif /* HAVE_DNSSD */
- 
-  /*
-   * Loop until we are killed...
-@@ -252,6 +430,9 @@ main(int  argc,				/* I - Number of comm
- 
-   while (!job_canceled)
-   {
-+    int announce = 0;
-+
-+#ifdef HAVE_DNSSD
-     FD_ZERO(&input);
-     FD_SET(fd, &input);
- 
-@@ -271,11 +452,35 @@ main(int  argc,				/* I - Number of comm
-     }
-     else
-     {
-+      announce = 1;
-+    }
-+#else /* HAVE_AVAHI */
-+    int r;
-+    avahi_got_callback = 0;
-+    r = avahi_simple_poll_iterate (simple_poll, 1);
-+    if (r != 0 && r != EINTR)
-+    {
-+     /*
-+      * We've been told to exit the loop.  Perhaps the connection to
-+      * avahi failed.
-+      */
-+
-+      break;
-+    }
-+
-+    if (avahi_got_callback)
-+      announce = 1;
-+#endif /* HAVE_DNSSD */
-+
-+    if (announce)
-+    {
-      /*
-       * Announce any devices we've found...
-       */
- 
-+#ifdef HAVE_DNSSD
-       DNSServiceErrorType status;	/* DNS query status */
-+#endif /* HAVE_DNSSD */
-       cups_device_t *best;		/* Best matching device */
-       char	device_uri[1024];	/* Device URI */
-       int	count;			/* Number of queries */
-@@ -285,6 +490,7 @@ main(int  argc,				/* I - Number of comm
-                best = NULL, count = 0;
-            device;
- 	   device = (cups_device_t *)cupsArrayNext(devices))
-+#ifdef HAVE_DNSSD
-         if (!device->ref && !device->sent)
- 	{
- 	 /*
-@@ -313,14 +519,23 @@ main(int  argc,				/* I - Number of comm
- 	      count ++;
-           }
- 	}
--	else if (!device->sent)
-+	else
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+	if (!device->resolved)
-+	  continue;
-+        else
-+#endif /* HAVE_AVAHI */
-+	if (!device->sent)
- 	{
-+#ifdef HAVE_DNSSD
- 	 /*
- 	  * Got the TXT records, now report the device...
- 	  */
- 
- 	  DNSServiceRefDeallocate(device->ref);
- 	  device->ref = 0;
-+#endif /* HAVE_DNSSD */
- 
-           if (!best)
- 	    best = device;
-@@ -372,6 +587,7 @@ main(int  argc,				/* I - Number of comm
-  * 'browse_callback()' - Browse devices.
-  */
- 
-+#ifdef HAVE_DNSSD
- static void
- browse_callback(
-     DNSServiceRef       sdRef,		/* I - Service reference */
-@@ -405,12 +621,14 @@ browse_callback(
- 
-   get_device((cups_array_t *)context, serviceName, regtype, replyDomain);
- }
-+#endif /* HAVE_DNSSD */
- 
- 
- /*
-  * 'browse_local_callback()' - Browse local devices.
-  */
- 
-+#ifdef HAVE_DNSSD
- static void
- browse_local_callback(
-     DNSServiceRef       sdRef,		/* I - Service reference */
-@@ -456,6 +674,7 @@ browse_local_callback(
- 	  device->fullName);
-   device->sent = 1;
- }
-+#endif /* HAVE_DNSSD */
- 
- 
- /*
-@@ -528,6 +747,32 @@ exec_backend(char **argv)		/* I - Comman
-   exit(CUPS_BACKEND_STOP);
- }
- 
-+static int
-+device_type (const char *regtype)
-+{
-+#ifdef HAVE_AVAHI
-+  if (!strcmp(regtype, "_ipp._tcp") ||
-+      !strcmp(regtype, "_ipp-tls._tcp"))
-+    return (CUPS_DEVICE_IPP);
-+  else if (!strcmp(regtype, "_fax-ipp._tcp"))
-+    return (CUPS_DEVICE_FAX_IPP);
-+  else if (!strcmp(regtype, "_printer._tcp"))
-+    return (CUPS_DEVICE_PDL_DATASTREAM);
-+#else
-+  if (!strcmp(regtype, "_ipp._tcp.") ||
-+      !strcmp(regtype, "_ipp-tls._tcp."))
-+    return (CUPS_DEVICE_IPP);
-+  else if (!strcmp(regtype, "_fax-ipp._tcp."))
-+    return (CUPS_DEVICE_FAX_IPP);
-+  else if (!strcmp(regtype, "_printer._tcp."))
-+    return (CUPS_DEVICE_PRINTER);
-+  else if (!strcmp(regtype, "_pdl-datastream._tcp."))
-+    return (CUPS_DEVICE_PDL_DATASTREAM);
-+#endif /* HAVE_AVAHI */
-+
-+  return (CUPS_DEVICE_RIOUSBPRINT);
-+}
-+
- 
- /*
-  * 'get_device()' - Create or update a device.
-@@ -550,18 +795,7 @@ get_device(cups_array_t *devices,	/* I -
-   */
- 
-   key.name = (char *)serviceName;
--
--  if (!strcmp(regtype, "_ipp._tcp.") ||
--      !strcmp(regtype, "_ipp-tls._tcp."))
--    key.type = CUPS_DEVICE_IPP;
--  else if (!strcmp(regtype, "_fax-ipp._tcp."))
--    key.type = CUPS_DEVICE_FAX_IPP;
--  else if (!strcmp(regtype, "_printer._tcp."))
--    key.type = CUPS_DEVICE_PRINTER;
--  else if (!strcmp(regtype, "_pdl-datastream._tcp."))
--    key.type = CUPS_DEVICE_PDL_DATASTREAM;
--  else
--    key.type = CUPS_DEVICE_RIOUSBPRINT;
-+  key.type = device_type (regtype);
- 
-   for (device = cupsArrayFind(devices, &key);
-        device;
-@@ -581,8 +815,14 @@ get_device(cups_array_t *devices,	/* I -
-         free(device->domain);
- 	device->domain = strdup(replyDomain);
- 
-+#ifdef HAVE_DNSSD
- 	DNSServiceConstructFullName(fullName, device->name, regtype,
- 	                            replyDomain);
-+#else /* HAVE_AVAHI */
-+	avahi_service_name_join (fullName, kDNSServiceMaxDomainName,
-+				 serviceName, regtype, replyDomain);
-+#endif /* HAVE_DNSSD */
-+
- 	free(device->fullName);
- 	device->fullName = strdup(fullName);
-       }
-@@ -602,6 +842,9 @@ get_device(cups_array_t *devices,	/* I -
-   device->domain   = strdup(replyDomain);
-   device->type     = key.type;
-   device->priority = 50;
-+#ifdef HAVE_AVAHI
-+  device->resolved = 0;
-+#endif /* HAVE_AVAHI */
- 
-   cupsArrayAdd(devices, device);
- 
-@@ -609,7 +852,13 @@ get_device(cups_array_t *devices,	/* I -
-   * Set the "full name" of this service, which is used for queries...
-   */
- 
-+#ifdef HAVE_DNSSD
-   DNSServiceConstructFullName(fullName, serviceName, regtype, replyDomain);
-+#else /* HAVE_AVAHI */
-+  avahi_service_name_join (fullName, kDNSServiceMaxDomainName,
-+			   serviceName, regtype, replyDomain);
-+#endif /* HAVE_DNSSD */
-+
-   device->fullName = strdup(fullName);
- 
-   return (device);
-@@ -620,6 +869,7 @@ get_device(cups_array_t *devices,	/* I -
-  * 'query_callback()' - Process query data.
-  */
- 
-+#ifdef HAVE_DNSSD
- static void
- query_callback(
-     DNSServiceRef       sdRef,		/* I - Service reference */
-@@ -639,7 +889,7 @@ query_callback(
- 		*ptr;			/* Pointer into string */
-   cups_device_t	dkey,			/* Search key */
- 		*device;		/* Device */
--
-+  cups_txt_records_t txt;
- 
-   fprintf(stderr, "DEBUG2: query_callback(sdRef=%p, flags=%x, "
-                   "interfaceIndex=%d, errorCode=%d, fullName=\"%s\", "
-@@ -673,84 +923,212 @@ query_callback(
-   if ((ptr = strstr(name, "._")) != NULL)
-     *ptr = '\0';
- 
--  if (strstr(fullName, "_ipp._tcp.") ||
--      strstr(fullName, "_ipp-tls._tcp."))
--    dkey.type = CUPS_DEVICE_IPP;
--  else if (strstr(fullName, "_fax-ipp._tcp."))
--    dkey.type = CUPS_DEVICE_FAX_IPP;
--  else if (strstr(fullName, "_printer._tcp."))
--    dkey.type = CUPS_DEVICE_PRINTER;
--  else if (strstr(fullName, "_pdl-datastream._tcp."))
--    dkey.type = CUPS_DEVICE_PDL_DATASTREAM;
-+  dkey.type = device_type (fullName);
-+
-+  txt.data = rdata;
-+  txt.dataend = rdata + rdlen;
-+  device = find_device ((cups_array_t *) context, &txt, &dkey);
-+  if (!device)
-+    fprintf(stderr, "DEBUG: Ignoring TXT record for \"%s\"...\n", fullName);
-+}
-+#endif /* HAVE_DNSSD */
-+
-+#ifdef HAVE_AVAHI
-+static void
-+avahi_client_callback(AvahiClient *client,
-+		      AvahiClientState state,
-+		      void *context)
-+{
-+ /*
-+  * If the connection drops, quit.
-+  */
-+
-+  if (state == AVAHI_CLIENT_FAILURE)
-+  {
-+    fprintf (stderr, "ERROR: Avahi connection failed\n");
-+    avahi_simple_poll_quit (simple_poll);
-+  }
-+}
-+
-+static void
-+avahi_query_callback(AvahiServiceResolver *resolver,
-+		     AvahiIfIndex interface,
-+		     AvahiProtocol protocol,
-+		     AvahiResolverEvent event,
-+		     const char *name,
-+		     const char *type,
-+		     const char *domain,
-+		     const char *host_name,
-+		     const AvahiAddress *address,
-+		     uint16_t port,
-+		     AvahiStringList *txt,
-+		     AvahiLookupResultFlags flags,
-+		     void *context)
-+{
-+  AvahiClient		*client;
-+  cups_device_t		key,
-+			*device;
-+  char			uqname[1024],
-+			*ptr;
-+  cups_txt_records_t	txtr;
-+
-+  client = avahi_service_resolver_get_client (resolver);
-+  if (event != AVAHI_RESOLVER_FOUND)
-+  {
-+    if (event == AVAHI_RESOLVER_FAILURE)
-+    {
-+      fprintf (stderr, "ERROR: %s\n",
-+	       avahi_strerror (avahi_client_errno (client)));
-+    }
-+
-+    avahi_service_resolver_free (resolver);
-+    return;
-+  }
-+
-+ /*
-+  * Set search key for device.
-+  */
-+
-+  key.name = uqname;
-+  unquote (uqname, name, sizeof (uqname));
-+  if ((ptr = strstr(name, "._")) != NULL)
-+    *ptr = '\0';
-+
-+  key.domain = (char *) domain;
-+  key.type = device_type (type);
-+
-+ /*
-+  * Find the device and the the TXT information.
-+  */
-+
-+  txtr.txt = txt;
-+  device = find_device ((cups_array_t *) context, &txtr, &key);
-+  if (device)
-+  {
-+   /*
-+    * Let the main loop know to announce the device.
-+    */
-+
-+    device->resolved = 1;
-+    avahi_got_callback = 1;
-+  }
-   else
--    dkey.type = CUPS_DEVICE_RIOUSBPRINT;
-+    fprintf (stderr, "DEBUG: Ignoring TXT record for \"%s\"...\n", name);
-+
-+  avahi_service_resolver_free (resolver);
-+}
-+
-+static void
-+avahi_browse_callback(AvahiServiceBrowser *browser,
-+		      AvahiIfIndex interface,
-+		      AvahiProtocol protocol,
-+		      AvahiBrowserEvent event,
-+		      const char *name,
-+		      const char *type,
-+		      const char *domain,
-+		      AvahiLookupResultFlags flags,
-+		      void *context)
-+{
-+  AvahiClient *client = avahi_service_browser_get_client (browser);
-+
-+  switch (event)
-+  {
-+  case AVAHI_BROWSER_FAILURE:
-+    fprintf (stderr, "ERROR: %s\n",
-+	     avahi_strerror (avahi_client_errno (client)));
-+    avahi_simple_poll_quit (simple_poll);
-+    return;
-+
-+  case AVAHI_BROWSER_NEW:
-+   /*
-+    * This object is new on the network.
-+    */
-+
-+    if (flags & AVAHI_LOOKUP_RESULT_LOCAL)
-+    {
-+     /*
-+      * This comes from the local machine so ignore it.
-+      */
-+
-+      fprintf (stderr, "DEBUG: ignoring local service %s\n", name);
-+    }
-+    else
-+    {
-+     /*
-+      * Create a device entry for it if it doesn't yet exist.
-+      */
-+
-+      get_device ((cups_array_t *)context, name, type, domain);
-+
-+     /*
-+      * Now look for a TXT entry.
-+      */
-+
-+      if (avahi_service_resolver_new (client, interface, protocol,
-+				      name, type, domain,
-+				      AVAHI_PROTO_UNSPEC, 0,
-+				      avahi_query_callback, context) == NULL)
-+      {
-+	fprintf (stderr, "ERROR: failed to resolve service %s: %s\n",
-+		 name, avahi_strerror (avahi_client_errno (client)));
-+      }
-+    }
-+
-+    break;
- 
--  for (device = cupsArrayFind(devices, &dkey);
-+  case AVAHI_BROWSER_REMOVE:
-+  case AVAHI_BROWSER_ALL_FOR_NOW:
-+  case AVAHI_BROWSER_CACHE_EXHAUSTED:
-+    break;
-+  }  
-+}
-+#endif /* HAVE_AVAHI */
-+
-+static cups_device_t *
-+find_device (cups_array_t *devices,
-+	     cups_txt_records_t *txt,
-+	     cups_device_t *dkey)
-+{
-+  cups_device_t	*device;
-+  char		*ptr;
-+
-+  for (device = cupsArrayFind(devices, dkey);
-        device;
-        device = cupsArrayNext(devices))
-   {
--    if (strcasecmp(device->name, dkey.name) ||
--        strcasecmp(device->domain, dkey.domain))
-+    if (strcasecmp(device->name, dkey->name) ||
-+        strcasecmp(device->domain, dkey->domain))
-     {
-       device = NULL;
-       break;
-     }
--    else if (device->type == dkey.type)
-+    else if (device->type == dkey->type)
-     {
-      /*
-       * Found it, pull out the priority and make and model from the TXT
-       * record and save it...
-       */
- 
--      const uint8_t	*data,		/* Pointer into data */
--			*datanext,	/* Next key/value pair */
--			*dataend;	/* End of entire TXT record */
--      uint8_t		datalen;	/* Length of current key/value pair */
--      char		key[256],	/* Key string */
--			value[256],	/* Value string */
--			make_and_model[512],
-+      char		make_and_model[512],
- 				      	/* Manufacturer and model */
- 			model[256],	/* Model */
--			device_id[2048];/* 1284 device ID */
--
-+			device_id[2048]; /* 1284 device ID */
- 
-       device_id[0]      = '\0';
-       make_and_model[0] = '\0';
- 
-       strcpy(model, "Unknown");
- 
--      for (data = rdata, dataend = data + rdlen;
--           data < dataend;
--           data = datanext)
-+      for (;;)
-       {
--       /*
--        * Read a key/value pair starting with an 8-bit length.  Since the
--	* length is 8 bits and the size of the key/value buffers is 256, we
--	* don't need to check for overflow...
--	*/
--
--        datalen = *data++;
--
--        if (!datalen || (data + datalen) >= dataend)
--	  break;
--
--        datanext = data + datalen;
-+	char *key;
-+	char *value;
- 
--        for (ptr = key; data < datanext && *data != '='; data ++)
--	  *ptr++ = *data;
--	*ptr = '\0';
--
--	if (data < datanext && *data == '=')
--	{
--	  data ++;
--
--	  if (data < datanext)
--	    memcpy(value, data, datanext - data);
--	  value[datanext - data] = '\0';
--	}
--	else
--	  continue;
-+	if (parse_txt_record_pair (txt))
-+	  goto next;
- 
-+	key = txt->key;
-+	value = txt->value;
-         if (!strncasecmp(key, "usb_", 4))
- 	{
- 	 /*
-@@ -805,6 +1183,10 @@ query_callback(
- 	  if (device->type == CUPS_DEVICE_PRINTER)
- 	    device->sent = 1;
- 	}
-+
-+      next:
-+	if (next_txt_record (txt) == NULL)
-+	  break;
-       }
- 
-       if (device->device_id)
-@@ -854,11 +1236,9 @@ query_callback(
-     }
-   }
- 
--  if (!device)
--    fprintf(stderr, "DEBUG: Ignoring TXT record for \"%s\"...\n", fullName);
-+  return device;
- }
- 
--
- /*
-  * 'sigterm_handler()' - Handle termination signals...
-  */
-diff -up cups-1.4.0/config.h.in.avahi cups-1.4.0/config.h.in
---- cups-1.4.0/config.h.in.avahi	2009-06-10 16:51:21.000000000 +0100
-+++ cups-1.4.0/config.h.in	2009-09-04 14:57:04.733388405 +0100
-@@ -336,6 +336,13 @@
- 
- 
- /*
-+ * Do we have Avahi for DNS Service Discovery?
-+ */
-+
-+#undef HAVE_AVAHI
-+
-+
-+/*
-  * Do we have <sys/ioctl.h>?
-  */
- 
-diff -up cups-1.4.0/config-scripts/cups-dnssd.m4.avahi cups-1.4.0/config-scripts/cups-dnssd.m4
---- cups-1.4.0/config-scripts/cups-dnssd.m4.avahi	2009-02-10 17:05:35.000000000 +0000
-+++ cups-1.4.0/config-scripts/cups-dnssd.m4	2009-09-04 14:57:04.731388902 +0100
-@@ -27,6 +27,21 @@ AC_ARG_WITH(dnssd-includes, [  --with-dn
- DNSSDLIBS=""
- DNSSD_BACKEND=""
- 
-+AC_ARG_ENABLE(avahi, [  --enable-avahi          turn on DNS Service Discovery support, default=no],
-+	      [if test x$enable_avahi = xyes; then
-+		       AC_MSG_CHECKING(for Avahi)
-+		       if $PKGCONFIG --exists avahi-client; then
-+			       AC_MSG_RESULT(yes)
-+			       CFLAGS="$CFLAGS `$PKGCONFIG --cflags avahi-client`"
-+			       DNSSDLIBS="`$PKGCONFIG --libs avahi-client`"
-+			       DNSSD_BACKEND="dnssd"
-+			       AC_DEFINE(HAVE_AVAHI)
-+			       enable_dnssd=no
-+		       else
-+			       AC_MSG_RESULT(no)
-+		       fi
-+	       fi])
-+
- if test x$enable_dnssd != xno; then
- 	AC_CHECK_HEADER(dns_sd.h, [
- 		case "$uname" in
-diff -up cups-1.4.0/cups/http-support.c.avahi cups-1.4.0/cups/http-support.c
---- cups-1.4.0/cups/http-support.c.avahi	2009-06-12 01:21:58.000000000 +0100
-+++ cups-1.4.0/cups/http-support.c	2009-09-04 14:57:04.736398674 +0100
-@@ -55,6 +55,11 @@
- #  include <dns_sd.h>
- #  include <poll.h>
- #endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+#  include <avahi-client/client.h>
-+#  include <avahi-client/lookup.h>
-+#  include <avahi-common/simple-watch.h>
-+#endif /* HAVE_AVAHI */
- 
- 
- /*
-@@ -121,6 +126,24 @@ static void		resolve_callback(DNSService
- 					 void *context);
- #endif /* HAVE_DNSSD */
- 
-+#ifdef HAVE_AVAHI
-+static void	avahi_resolve_uri_client_cb(AvahiClient *client,
-+					    AvahiClientState state,
-+					    void *simple_poll);
-+static void	avahi_resolve_uri_resolver_cb(AvahiServiceResolver *resolver,
-+					      AvahiIfIndex interface,
-+					      AvahiProtocol protocol,
-+					      AvahiResolverEvent event,
-+					      const char *name,
-+					      const char *type,
-+					      const char *domain,
-+					      const char *host_name,
-+					      const AvahiAddress *address,
-+					      uint16_t port,
-+					      AvahiStringList *txt,
-+					      AvahiLookupResultFlags flags,
-+					      void *context);
-+#endif /* HAVE_AVAHI */
- 
- /*
-  * 'httpAssembleURI()' - Assemble a uniform resource identifier from its
-@@ -1349,15 +1372,26 @@ _httpResolveURI(
- 
-   if (strstr(hostname, "._tcp"))
-   {
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-+    char		*regtype,	/* Pointer to type in hostname */
-+			*domain;	/* Pointer to domain in hostname */
- #ifdef HAVE_DNSSD
-     DNSServiceRef	ref,		/* DNS-SD master service reference */
- 			domainref,	/* DNS-SD service reference for domain */
- 			localref;	/* DNS-SD service reference for .local */
-     int			domainsent = 0;	/* Send the domain resolve? */
--    char		*regtype,	/* Pointer to type in hostname */
--			*domain;	/* Pointer to domain in hostname */
-     _http_uribuf_t	uribuf;		/* URI buffer */
-     struct pollfd	polldata;	/* Polling data */
-+#else /* HAVE_AVAHI */
-+    AvahiSimplePoll	*simple_poll;
-+    AvahiClient		*client;
-+    int			error;
-+    struct
-+    {
-+      AvahiSimplePoll	*poll;
-+      _http_uribuf_t	uribuf;
-+    } user_data;
-+#endif /* HAVE_DNSSD */
- 
- 
-     if (logit)
-@@ -1395,8 +1429,13 @@ _httpResolveURI(
-     if (domain)
-       *domain++ = '\0';
- 
-+#ifdef HAVE_DNSSD
-     uribuf.buffer  = resolved_uri;
-     uribuf.bufsize = resolved_size;
-+#else
-+    user_data.uribuf.buffer = resolved_uri;
-+    user_data.uribuf.bufsize = resolved_size;
-+#endif
- 
-     resolved_uri[0] = '\0';
- 
-@@ -1411,6 +1450,7 @@ _httpResolveURI(
- 
-     uri = NULL;
- 
-+#ifdef HAVE_DNSSD
-     if (DNSServiceCreateConnection(&ref) == kDNSServiceErr_NoError)
-     {
-       localref = ref;
-@@ -1486,6 +1526,36 @@ _httpResolveURI(
- 
-       DNSServiceRefDeallocate(ref);
-     }
-+#else /* HAVE_AVAHI */
-+    if ((simple_poll = avahi_simple_poll_new ()) != NULL)
-+    {
-+      if ((client = avahi_client_new (avahi_simple_poll_get (simple_poll),
-+				      0, avahi_resolve_uri_client_cb,
-+				      &simple_poll, &error)) != NULL)
-+      {
-+	user_data.poll = simple_poll;
-+	if (avahi_service_resolver_new (client, AVAHI_IF_UNSPEC,
-+					AVAHI_PROTO_UNSPEC, hostname,
-+					regtype, domain, AVAHI_PROTO_UNSPEC, 0,
-+					avahi_resolve_uri_resolver_cb,
-+					&user_data) != NULL)
-+	{
-+	  avahi_simple_poll_loop (simple_poll);
-+
-+	 /*
-+	  * Collect the result.
-+	  */
-+
-+	  if (resolved_uri[0])
-+	    uri = resolved_uri;
-+	}
-+
-+	avahi_client_free (client);
-+      }
-+
-+      avahi_simple_poll_free (simple_poll);
-+    }
-+#endif /* HAVE_DNSSD */
- 
-     if (logit)
-     {
-@@ -1497,13 +1567,13 @@ _httpResolveURI(
-       fputs("STATE: -connecting-to-device\n", stderr);
-     }
- 
--#else
-+#else /* HAVE_DNSSD || HAVE_AVAHI */
-    /*
-     * No DNS-SD support...
-     */
- 
-     uri = NULL;
--#endif /* HAVE_DNSSD */
-+#endif /* HAVE_DNSSD || HAVE_AVAHI */
- 
-     if (logit && !uri)
-       _cupsLangPuts(stderr, _("Unable to find printer!\n"));
-@@ -1708,6 +1778,105 @@ resolve_callback(
- }
- #endif /* HAVE_DNSSD */
- 
-+#ifdef HAVE_AVAHI
-+static void
-+avahi_resolve_uri_client_cb (AvahiClient *client,
-+			     AvahiClientState state,
-+			     void *simple_poll)
-+{
-+  DEBUG_printf(("avahi_resolve_uri_client_callback(client=%p, state=%d, "
-+		"simple_poll=%p)\n", client, state, simple_poll));
-+
-+  /*
-+   * If the connection drops, quit.
-+   */
-+
-+  if (state == AVAHI_CLIENT_FAILURE)
-+    avahi_simple_poll_quit (simple_poll);
-+}
-+
-+static void
-+avahi_resolve_uri_resolver_cb (AvahiServiceResolver *resolver,
-+			       AvahiIfIndex interface,
-+			       AvahiProtocol protocol,
-+			       AvahiResolverEvent event,
-+			       const char *name,
-+			       const char *type,
-+			       const char *domain,
-+			       const char *host_name,
-+			       const AvahiAddress *address,
-+			       uint16_t port,
-+			       AvahiStringList *txt,
-+			       AvahiLookupResultFlags flags,
-+			       void *context)
-+{
-+  const char		*scheme;	/* URI scheme */
-+  char			rp[256];	/* Remote printer */
-+  AvahiStringList	*pair;
-+  char			*value;
-+  size_t		valueLen = 0;
-+  char			addr[AVAHI_ADDRESS_STR_MAX];
-+  struct
-+  {
-+    AvahiSimplePoll	*poll;
-+    _http_uribuf_t	uribuf;
-+  }		*poll_uribuf = context;
-+
-+  DEBUG_printf(("avahi_resolve_uri_resolver_callback(resolver=%p, "
-+		"interface=%d, protocol=%d, event=%d, name=\"%s\", "
-+		"type=\"%s\", domain=\"%s\", host_name=\"%s\", address=%p, "
-+		"port=%d, txt=%p, flags=%d, context=%p)\n",
-+		resolver, interface, protocol, event, name, type, domain,
-+		host_name, address, port, txt, flags, context));
-+
-+  if (event != AVAHI_RESOLVER_FOUND)
-+  {
-+    avahi_service_resolver_free (resolver);
-+    avahi_simple_poll_quit (poll_uribuf->poll);
-+    return;
-+  }
-+
-+ /*
-+  * Figure out the scheme from the full name...
-+  */
-+
-+  if (strstr(type, "_ipp."))
-+    scheme = "ipp";
-+  else if (strstr(type, "_printer."))
-+    scheme = "lpd";
-+  else if (strstr(type, "_pdl-datastream."))
-+    scheme = "socket";
-+  else
-+    scheme = "riousbprint";
-+
-+ /*
-+  * Extract the "remote printer key from the TXT record...
-+  */
-+
-+  if ((pair = avahi_string_list_find (txt, "rp")) != NULL)
-+  {
-+    avahi_string_list_get_pair (pair, NULL, &value, &valueLen);
-+    rp[0] = '/';
-+    memcpy (rp + 1, value, valueLen);
-+    rp[valueLen + 1] = '\0';
-+  }
-+  else
-+    rp[0] = '\0';
-+
-+ /*
-+  * Assemble the final device URI...
-+  */
-+
-+  avahi_address_snprint (addr, AVAHI_ADDRESS_STR_MAX, address);
-+  httpAssembleURI(HTTP_URI_CODING_ALL, poll_uribuf->uribuf.buffer,
-+		  poll_uribuf->uribuf.bufsize, scheme, NULL,
-+		  addr, port, rp);
-+  DEBUG_printf(("avahi_resolve_uri_resolver_callback: Resolved URI is \"%s\"\n",
-+		poll_uribuf->uribuf.buffer));
-+  avahi_simple_poll_quit (poll_uribuf->poll);
-+}
-+#endif /* HAVE_AVAHI */
-+
- 
- /*
-  * End of "$Id: http-support.c 8705 2009-06-12 00:21:58Z mike $".
diff --git a/abs/core/cups/cups.install b/abs/core/cups/cups.install
deleted file mode 100644
index 97fda5a..0000000
--- a/abs/core/cups/cups.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/abs/core/cups/cups.logrotate b/abs/core/cups/cups.logrotate
deleted file mode 100644
index 9c49bbd..0000000
--- a/abs/core/cups/cups.logrotate
+++ /dev/null
@@ -1,8 +0,0 @@
-/var/log/cups/*log {
-   missingok
-   notifempty
-   delaycompress
-   postrotate
-      /bin/kill -HUP `cat /var/run/cups.pid 2>/dev/null` 2>/dev/null || true
-   endscript
-}
diff --git a/abs/core/cups/cups.pam b/abs/core/cups/cups.pam
deleted file mode 100644
index 53724d1..0000000
--- a/abs/core/cups/cups.pam
+++ /dev/null
@@ -1,3 +0,0 @@
-auth		required	pam_unix.so
-account		required	pam_unix.so
-session		required	pam_unix.so
diff --git a/abs/core/libmng/PKGBUILD b/abs/core/libmng/PKGBUILD
deleted file mode 100644
index dc3958a..0000000
--- a/abs/core/libmng/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id$
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Maintainer: judd <jvinet@zeroflux.org>
-pkgname=libmng
-pkgver=1.0.10
-pkgrel=3
-pkgdesc="A collection of routines used to create and manipulate MNG format graphics files"
-arch=('i686' 'x86_64')
-url="http://www.libmng.com/"
-license=('custom')
-depends=('zlib' 'libjpeg>=7')
-options=(!libtool)
-source=(http://dl.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('a464ae7d679781beebdf7440d144b7bd')
-
-build() {
-  cd $startdir/src/$pkgname-$pkgver
-  ln -s makefiles/configure.in .
-  ln -s makefiles/Makefile.am .
-  autoreconf --force --install
-  ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR=$startdir/pkg install
-  install -D -m644 LICENSE $startdir/pkg/usr/share/licenses/$pkgname/LICENSE
-}
diff --git a/abs/core/python-pycurl/PKGBUILD b/abs/core/python-pycurl/PKGBUILD
deleted file mode 100644
index 3d17877..0000000
--- a/abs/core/python-pycurl/PKGBUILD
+++ /dev/null
@@ -1,20 +0,0 @@
-# $Id: PKGBUILD 82 2009-07-17 19:56:55Z aaron $
-# Maintainer: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> 
-# Contributor: kontrast <kontr4st@gmail.com> 
-pkgname=python-pycurl
-pkgver=7.19.0
-pkgrel=3
-pkgdesc="A Python interface to libcurl"
-arch=('i686' 'x86_64')
-url="http://pycurl.sourceforge.net"
-license=('GPL')
-depends=('python' 'curl>=7.19.0')
-replaces=('pycurl')
-provides=('pycurl')
-source=(http://pycurl.sourceforge.net/download/pycurl-$pkgver.tar.gz)
-md5sums=('919d58fe37e69fe87ce4534d8b6a1c7b')
-
-build() {
-  cd $srcdir/pycurl-$pkgver
-  python setup.py install --curl-config=/usr/bin/curl-config --prefix $pkgdir/usr || return 1
-}
diff --git a/abs/core/recordproto/PKGBUILD b/abs/core/recordproto/PKGBUILD
deleted file mode 100644
index c71b2de..0000000
--- a/abs/core/recordproto/PKGBUILD
+++ /dev/null
@@ -1,19 +0,0 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
-#Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=recordproto
-pkgver=1.13.2
-pkgrel=1
-pkgdesc="X11 Record extension wire protocol"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-source=(${url}/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('0ed4706564a34fc2aff724aa16d3ff00')
-sha1sums=('833ef2bc4b084281f85eeba5d4ba03441bd3a534')
-
-build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR=${startdir}/pkg install || return 1
-}
diff --git a/abs/core/samba/PKGBUILD b/abs/core/samba/PKGBUILD
deleted file mode 100644
index 44996c6..0000000
--- a/abs/core/samba/PKGBUILD
+++ /dev/null
@@ -1,139 +0,0 @@
-# $Id: PKGBUILD 64318 2010-01-19 19:31:39Z tpowa $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-pkgbase=samba
-pkgname=('smbclient' 'samba')
-pkgver=3.4.5
-# We use the 'A' to fake out pacman's version comparators.  Samba chooses
-# to append 'a','b',etc to their subsequent releases, which pamcan
-# misconstrues as alpha, beta, etc.  Bad samba!
-_realver=3.4.5
-pkgrel=3
-arch=(i686 x86_64)
-url="http://www.samba.org"
-license=('GPL3')
-makedepends=('db>=4.7' 'popt' 'libcups' 'acl' 'libldap' 'libcap>=2.16' 'heimdal>=1.2-1' 'pam'  'gnutls>=2.4.1' 'talloc' 'tdb')
-options=(!makeflags)
-source=(http://us1.samba.org/samba/ftp/stable/${pkgbase}-${_realver}.tar.gz
-        samba samba.logrotate 
-        swat.xinetd 
-        samba.pam 
-        samba.conf.d)
-### UNINSTALL dmapi package before building!!!
-
-build() {
-  cd ${srcdir}/${pkgbase}-${_realver}/source3
-  ./configure --prefix=/usr \
-              --libdir=/usr/lib/ \
-              --localstatedir=/var \
-              --with-configdir=/etc/samba \
-              --with-lockdir=/var/cache/samba \
-              --with-piddir=/var/run/samba \
-              --with-fhs \
-              --with-pam \
-              --with-pam_smbpass \
-              --with-pammodulesdir=/lib/security \
-              --with-ads \
-              --with-acl-support \
-              --with-cifsmount \
-              --with-libsmbclient \
-              --with-syslog \
-              --enable-external-libtalloc \
-              --disable-dnssd \
-              --disable-avahi \
-              --without-libtdb  --disable-fam
-  make || return 1
-}
-
-package_smbclient () {
-pkgdesc="Tools to access a server's filespace and printers via SMB"
-depends=('readline>=5.0.00' 'popt' 'libldap>=2.4.11-1' 'libcap>=2.16' 'heimdal>=1.2-1' 'db>=4.7' 'e2fsprogs' 'tdb' 'talloc')
-  cd ${srcdir}/${pkgbase}-${_realver}/source3
-  mkdir -p ${pkgdir}/usr/bin ${pkgdir}/sbin ${pkgdir}/usr/lib
-  install -m755 bin/{smbclient,rpcclient,smbspool,smbtree,smbcacls,smbcquotas,smbget,net,nmblookup} ${pkgdir}/usr/bin/
-  install -m755 bin/{mount.cifs,umount.cifs} ${pkgdir}/sbin/
-  for i in libnetapi* libwbclient* libsmbclient*;do
-      cp  -a bin/${i}*.so* ${pkgdir}/usr/lib/
-  done
-  install -m755 script/smbtar ${pkgdir}/usr/bin/
-  mkdir -p ${pkgdir}/usr/lib/cups/backend
-  ln -sf /usr/bin/smbspool ${pkgdir}/usr/lib/cups/backend/smb
-  mkdir -p ${pkgdir}/usr/include
-  install -m644 include/libsmbclient.h ${pkgdir}/usr/include/
-  install -m644 lib/netapi/netapi.h ${pkgdir}/usr/include/
-  mkdir -p ${pkgdir}/usr/share/man/man{1,7,8}
-  for man in smbspool \
-      umount.cifs mount.cifs net; do
-      install -m644 ../docs/manpages/${man}.8 ${pkgdir}/usr/share/man/man8/
-  done
-  for man in rpcclient smbcacls smbclient smbcquotas smbget \
-      smbtree smbtar nmblookup; do
-      install -m644 ../docs/manpages/${man}.1 ${pkgdir}/usr/share/man/man1/
-  done
-  install -m644 ../docs/manpages/libsmbclient.7 ${pkgdir}/usr/share/man/man7/
-}
-
-package_samba () {
-pkgdesc="Tools to access a server's filespace and printers via SMB"
-backup=(etc/logrotate.d/samba 
-        etc/pam.d/samba 
-        etc/samba/smb.conf
-        etc/xinetd.d/swat
-        etc/conf.d/samba)
-depends=('db>=4.7' 'popt' 'libcups' 'acl' 'libldap' "smbclient>=$pkgver" 'libcap>=2.16' 'heimdal>=1.2-1' 'pam' 'fam' 'gnutls>=2.4.1' 'e2fsprogs' 'tdb' 'talloc')
-  cd ${srcdir}/samba-${_realver}/source3
-  mkdir -p ${pkgdir}/var/log/samba
-  mkdir -p ${pkgdir}/etc/samba/private
-  chmod 700 ${pkgdir}/etc/samba/private
-  make DESTDIR=${pkgdir} install || return 1
-  chmod 644 ${pkgdir}/usr/include/*.h
-  rm -rf ${pkgdir}/usr/var
-  (cd script; cp installbin.sh i; cat i | sed 's/\/sbin\///' > installbin.sh)
-  install -D -m755 ../../samba ${pkgdir}/etc/rc.d/samba
-  install -D -m644 ../../samba.conf.d ${pkgdir}/etc/conf.d/samba
-  mkdir -p ${pkgdir}/etc/samba
-  cat ../examples/smb.conf.default | \
-    sed 's|log file = .*$|log file = /var/log/samba/log.%m|g' >${pkgdir}/etc/samba/smb.conf.default
-  install -D -m644 ../../samba.logrotate ${pkgdir}/etc/logrotate.d/samba
-  install -D -m644 ../../swat.xinetd ${pkgdir}/etc/xinetd.d/swat
-  install -D -m644 ../../samba.pam ${pkgdir}/etc/pam.d/samba
-  # spool directory
-  install -d -m1777 ${pkgdir}/var/spool/samba
-  sed -i 's|/usr/spool/samba|/var/spool/samba|g' ${pkgdir}/etc/samba/smb.conf.default
-  # fix logrotate
-  sed -i -e 's|log.%m|%m.log|g' ${pkgdir}/etc/samba/smb.conf.default
-  # nsswitch libraries
-  install -D -m755 ${srcdir}/samba-${_realver}/nsswitch/libnss_wins.so ${pkgdir}/lib/libnss_wins.so
-  ln -s libnss_wins.so ${pkgdir}/lib/libnss_wins.so.2
-  install -D -m755 ${srcdir}/samba-${_realver}/nsswitch/libnss_winbind.so ${pkgdir}/lib/libnss_winbind.so
-  # remove conflict files of smbclient
-  for man in libsmbclient smbspool \
-      umount.cifs mount.cifs net; do
-      rm -f ${pkgdir}/usr/share/man/man8/${man}.8
-  done
-  for i in libnetapi* libwbclient* libsmbclient*;do
-      rm -f ${pkgdir}/usr/lib/$i
-  done
-  for bin in net \
-      nmblookup rpcclient smbcacls smbclient \
-      smbcquotas smbget smbspool smbtar smbtree; do
-      rm -f ${pkgdir}/usr/bin/$bin
-  done
-  rm -f ${pkgdir}/usr/include/netapi.h
-  for man in rpcclient smbcacls smbclient smbcquotas \
-      smbtree smbtar nmblookup smbget; do
-      rm -f ${pkgdir}/usr/share/man/man1/${man}.1
-  done
-  rm -f ${pkgdir}/usr/share/man/man7/libsmbclient.7
-  rm -f ${pkgdir}/usr/include/libsmbclient.h
-  # remove conflict files of tdb
-  rm -f ${pkgdir}/usr/bin/{tdbbackup,tdbdump,tdbtool}
-  # copy ldap example
-  install -D -m644 ${srcdir}/samba-${_realver}/examples/LDAP/samba.schema ${pkgdir}/usr/share/doc/samba/examples/LDAP/samba.schema
-}
-md5sums=('8e8a484782f2b7716b6c6bd9a7d2bf71'
-         'e93533fa2296c07c1f645dfdd373657f'
-         '5697da77590ec092cc8a883bae06093c'
-         'a4bbfa39fee95bba2e7ad6b535fae7e6'
-         '96f82c38f3f540b53f3e5144900acf17'
-         'f2f2e348acd1ccb566e95fa8a561b828')
diff --git a/abs/core/samba/__changelog b/abs/core/samba/__changelog
deleted file mode 100644
index 8af7e88..0000000
--- a/abs/core/samba/__changelog
+++ /dev/null
@@ -1 +0,0 @@
-remove fam support
\ No newline at end of file
diff --git a/abs/core/samba/heimdal.patch b/abs/core/samba/heimdal.patch
deleted file mode 100644
index 5338c37..0000000
--- a/abs/core/samba/heimdal.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Submitted By:            Randy McMurchy <randy_at_linuxfromscratch_dot_org>
-Date:                    2005-09-21
-Initial Package Version: 3.0.20
-Upstream Status:         Not submitted (it is not an upstream Samba issue)
-Origin:                  Randy McMurchy
-Description:             Fixes an issue if you have Heimdal installed as
-                         Heimdal uses reserved C++ words and the Samba headers
-                         now look for these conflicts. This patch comments out
-                         the check for C++ reserved words. Heimdal is aware of
-                         the issue
-
-$LastChangedBy: randy $
-$Date: 2005/09/29 18:25:12 $
-
-
---- samba-3.0.20-orig/source/include/includes.h	2005-07-28 13:19:49.000000000 +0000
-+++ samba-3.0.20/source/include/includes.h	2005-09-04 13:45:01.000000000 +0000
-@@ -25,6 +25,7 @@
- #include "config.h"
- #endif
- 
-+/*
- #ifndef __cplusplus
- #define class #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
- #define private #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
-@@ -36,6 +37,7 @@
- #define delete #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
- #define friend #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
- #endif
-+*/
- 
- #include "local.h"
- 
diff --git a/abs/core/samba/no-clients.patch b/abs/core/samba/no-clients.patch
deleted file mode 100644
index e06da8d..0000000
--- a/abs/core/samba/no-clients.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -Naur samba-3.0.23-orig/source/Makefile.in samba-3.0.23/source/Makefile.in
---- samba-3.0.23-orig/source/Makefile.in	2006-07-10 09:27:55.000000000 -0700
-+++ samba-3.0.23/source/Makefile.in	2006-07-11 14:34:39.000000000 -0700
-@@ -138,14 +138,10 @@
- 
- ROOT_SBIN_PROGS = @CIFSMOUNT_PROGS@
- 
--BIN_PROGS1 = bin/smbclient@EXEEXT@ bin/net@EXEEXT@ bin/smbspool@EXEEXT@ \
--	bin/testparm@EXEEXT@ bin/smbstatus@EXEEXT@ bin/smbget@EXEEXT@
--BIN_PROGS2 = bin/smbcontrol@EXEEXT@ bin/smbtree@EXEEXT@ bin/tdbbackup@EXEEXT@ \
--	bin/nmblookup@EXEEXT@ bin/pdbedit@EXEEXT@ bin/tdbdump@EXEEXT@ \
--	bin/tdbtool@EXEEXT@
--BIN_PROGS3 = bin/smbpasswd@EXEEXT@ bin/rpcclient@EXEEXT@ bin/smbcacls@EXEEXT@ \
--	bin/profiles@EXEEXT@ bin/ntlm_auth@EXEEXT@ bin/sharesec@EXEEXT@ \
--	bin/smbcquotas@EXEEXT@ bin/eventlogadm@EXEEXT@
-+BIN_PROGS1 = bin/testparm@EXEEXT@ bin/smbstatus@EXEEXT@
-+BIN_PROGS2 = bin/smbcontrol@EXEEXT@ bin/tdbbackup@EXEEXT@ bin/pdbedit@EXEEXT@
-+BIN_PROGS3 = bin/smbpasswd@EXEEXT@ bin/profiles@EXEEXT@ bin/ntlm_auth@EXEEXT@ \
-+	bin/eventlogadm@EXEEXT@
- BIN_PROGS4 = bin/ldbedit@EXEEXT@ bin/ldbsearch@EXEEXT@ bin/ldbadd@EXEEXT@ \
- 	bin/ldbdel@EXEEXT@ bin/ldbmodify@EXEEXT@ bin/ldbrename@EXEEXT@
- 
-@@ -160,7 +156,7 @@
- 
- PAM_MODULES = @PAM_MODULES@
- 
--SCRIPTS = $(srcdir)/script/smbtar $(builddir)/script/findsmb
-+SCRIPTS = $(builddir)/script/findsmb
- 
- VFS_MODULES = @VFS_MODULES@
- PDB_MODULES = @PDB_MODULES@
diff --git a/abs/core/samba/samba b/abs/core/samba/samba
deleted file mode 100755
index bc7d527..0000000
--- a/abs/core/samba/samba
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-[ -f /etc/conf.d/samba ] && . /etc/conf.d/samba
-
-[ -z "$SAMBA_DAEMONS" ] && SAMBA_DAEMONS=(smbd nmbd)
-
-case "$1" in
-	start)
-		rc=0
-		stat_busy "Starting Samba Server"
-		for d in ${SAMBA_DAEMONS[@]}; do
-			PID=`pidof -o %PPID /usr/sbin/$d`
-			[ -z "$PID" ] && /usr/sbin/$d -D
-			rc=$(($rc+$?))
-		done
-		if [ $rc -gt 0 ]; then
-			stat_fail
-		else
-			add_daemon samba
-			stat_done
-		fi
-	;;
-	stop)
-		rc=0
-		stat_busy "Stopping Samba Server"
-		for d in ${SAMBA_DAEMONS[@]}; do
-			PID=`pidof -o %PPID /usr/sbin/$d`
-			[ -z "$PID" ] || kill $PID &> /dev/null
-			rc=$(($rc+$?))
-		done
-		if [ $rc -gt 0 ]; then
-			stat_fail
-		else
-			rm /var/run/samba/smbd.pid &>/dev/null
-			rm /var/run/samba/nmbd.pid &>/dev/null
-			rm /var/run/samba/winbindd.pid &>/dev/null
-			rm_daemon samba
-			stat_done
-		fi
-	;;
-	restart)
-		$0 stop
-		sleep 1
-		$0 start
-	;;
-	*)
-		echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/abs/core/samba/samba-3.0.21a-ntlmssp.patch b/abs/core/samba/samba-3.0.21a-ntlmssp.patch
deleted file mode 100644
index 6b65449..0000000
--- a/abs/core/samba/samba-3.0.21a-ntlmssp.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- ntlmssp.c.old	Fri Jan 13 15:33:50 2006
-+++ ntlmssp.c	Fri Jan 13 15:33:16 2006
-@@ -399,8 +399,9 @@
- 			ntlmssp_state->session_key.data[6] = 0x38;
- 			ntlmssp_state->session_key.data[7] = 0xb0;
- 		}
--		ntlmssp_state->session_key.length = 8;
-+      /*		ntlmssp_state->session_key.length = 8; */
- 	}
-+
- }
- 
- /**
diff --git a/abs/core/samba/samba.conf.d b/abs/core/samba/samba.conf.d
deleted file mode 100644
index 8721f95..0000000
--- a/abs/core/samba/samba.conf.d
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Configuration for the samba init script
-#
-
-# space separated list of daemons to launch
-SAMBA_DAEMONS=(smbd nmbd)
-#SAMBA_DAEMONS=(smbd nmbd winbindd)
diff --git a/abs/core/samba/samba.logrotate b/abs/core/samba/samba.logrotate
deleted file mode 100644
index 581f4c3..0000000
--- a/abs/core/samba/samba.logrotate
+++ /dev/null
@@ -1,9 +0,0 @@
-/var/log/samba/log.smbd /var/log/samba/log.nmbd /var/log/samba/*.log {
-   notifempty
-   missingok
-   sharedscripts
-   copytruncate
-   postrotate
-      /bin/kill -HUP `cat /var/run/samba/*.pid 2>/dev/null` 2>/dev/null || true
-   endscript
-}
diff --git a/abs/core/samba/samba.pam b/abs/core/samba/samba.pam
deleted file mode 100644
index 53724d1..0000000
--- a/abs/core/samba/samba.pam
+++ /dev/null
@@ -1,3 +0,0 @@
-auth		required	pam_unix.so
-account		required	pam_unix.so
-session		required	pam_unix.so
diff --git a/abs/core/samba/swat.xinetd b/abs/core/samba/swat.xinetd
deleted file mode 100644
index 2e62a82..0000000
--- a/abs/core/samba/swat.xinetd
+++ /dev/null
@@ -1,10 +0,0 @@
-service swat
-{
-        socket_type             = stream
-        wait                    = no
-        user                    = root
-        server                  = /usr/sbin/swat
-        log_on_success  += HOST DURATION
-        log_on_failure  += HOST
-        disable                 = yes
-}
diff --git a/abs/core/xorg-util-macros/PKGBUILD b/abs/core/xorg-util-macros/PKGBUILD
deleted file mode 100644
index 3ca4dfa..0000000
--- a/abs/core/xorg-util-macros/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# $Id: PKGBUILD 85383 2010-07-12 17:45:37Z jgc $
-#Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xorg-util-macros
-pkgver=1.10.0
-pkgrel=1
-pkgdesc="X.Org Autotools macros"
-arch=(any)
-license=('custom')
-url="http://xorg.freedesktop.org/"
-source=(${url}/releases/individual/util/util-macros-${pkgver}.tar.bz2)
-sha1sums=('01bd26de7f76907ad502b430a5d18f64a896dc81')
-
-build() {
-  cd "${srcdir}/util-macros-${pkgver}"
-  ./configure --prefix=/usr
-  make
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/lib"
-  mv "${pkgdir}/usr/share/pkgconfig" "${pkgdir}/usr/lib/"
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/abs/extra/java-sun/PKGBUILD b/abs/extra/java-sun/PKGBUILD
deleted file mode 100644
index b348f0d..0000000
--- a/abs/extra/java-sun/PKGBUILD
+++ /dev/null
@@ -1,123 +0,0 @@
-# $Id: PKGBUILD 22893 2010-07-31 09:47:07Z ibiru $
-# Contributor: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org>
-# Contributor: Jason Chu <jason@archlinux.org>
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
-# Contributor: Guillaume ALAUX <Guillaume at alaux dot net>
-
-pkgname=('jre' 'jdk')
-pkgbase=java-sun
-pkgver=6u21
-pkgrel=1
-pkgdesc="Sun/Oracle's implementation of tha Java 6 specification"
-arch=('i686' 'x86_64')
-	[ "$CARCH" = "i686" ]   && _arch=i586
-	[ "$CARCH" = "x86_64" ] && _arch=amd64
-url="http://java.sun.com"
-license=('custom')
-makedepends=('java-runtime')
-source=(http://download.java.net/dlj/binaries/jdk-${pkgver}-dlj-linux-${_arch}.bin
-	https://jdk-distros.dev.java.net/source/browse/*checkout*/jdk-distros/trunk/utils/construct.sh
-	jdk.profile
-	java-control-panel.desktop
-	java-monitoring-and-management-console.desktop
-	java-policy-settings.desktop
-	java-visualvm.desktop
-	java-web-start.desktop
-	jre.profile)
-
-[ "$CARCH" = "i686" ]   && md5sums=('b3fbbe55bafedb3f8f93e91d4e809390'
-				'94065b612df0046d9ae758943f9f6a75'
-				'7aaac9ec3e440b92361c6561ac00424a'
-				'e4d814c0f310d77ed6990c731bccd0fb'
-				'4bc2b0be93f76ed07b471e3c89eb5a8a'
-				'8e3cec7ab641ec449cabd068be583f5c'
-				'9ba148ebabce8ed3351b813a9a66b6e5'
-				'568451cf45fc8c7adb83a222a61ca2c6'
-				'50b4f5ac4129097461d246645d73a622')
-[ "$CARCH" = "x86_64" ] && md5sums=('7961051f95c014a9b94ffe3e95ea66e6'
-				'94065b612df0046d9ae758943f9f6a75'
-				'7aaac9ec3e440b92361c6561ac00424a'
-				'e4d814c0f310d77ed6990c731bccd0fb'
-				'4bc2b0be93f76ed07b471e3c89eb5a8a'
-				'8e3cec7ab641ec449cabd068be583f5c'
-				'9ba148ebabce8ed3351b813a9a66b6e5'
-				'568451cf45fc8c7adb83a222a61ca2c6'
-				'50b4f5ac4129097461d246645d73a622')
-
-build() {
-  cd ${srcdir}
-  mkdir unbundle-jdk
-  cd unbundle-jdk
-  sh ../jdk-${pkgver}-dlj-linux-$_arch.bin --accept-license
-  cd ..
-  sh construct.sh unbundle-jdk linux-jdk linux-jre
-}
-
-package_jre() {
-  pkgdesc="Sun/Oracle's Java Runtime Environment"
-  depends=('glibc' 'libxtst')
-  provides=('j2re' 'java-runtime=6')
-  conflicts=('j2re' 'java-runtime')
-  replaces=('j2re')
-  install='jre.install'
-
-  cd ${srcdir}
-
-  mkdir -p ${pkgdir}/opt/java
-  cp -R linux-jdk/jre ${pkgdir}/opt/java
-
-  install -Dm755 ${srcdir}/jre.profile ${pkgdir}/etc/profile.d/jre.sh
-
-  mkdir -p ${pkgdir}/usr/lib/mozilla/plugins
-
-  if [ "$CARCH" = "i686" ]; then
-    ln -s /opt/java/jre/lib/i386/libnpjp2.so ${pkgdir}/usr/lib/mozilla/plugins
-  else ln -s /opt/java/jre/lib/amd64/libnpjp2.so ${pkgdir}/usr/lib/mozilla/plugins
-  fi
-
-  mkdir -p ${pkgdir}/usr/share/licenses/jre
-  cp ${pkgdir}/opt/java/jre/COPYRIGHT ${pkgdir}/usr/share/licenses/jre
-  cp ${pkgdir}/opt/java/jre/LICENSE ${pkgdir}/usr/share/licenses/jre
-  cp ${pkgdir}/opt/java/jre/THIRDPARTYLICENSEREADME.txt ${pkgdir}/usr/share/licenses/jre
-
-  # Fix system prefs folder (FS#18872)
-  install -dm755 ${pkgdir}/etc/.java/.systemPrefs
-}
-
-package_jdk() {
-  pkgdesc="Sun/Oracle's Java Development Kit"
-  depends=('glibc' 'jre')
-  provides=('java-environment=6' 'j2sdk')
-  conflicts=('java-environment' 'j2sdk')
-  replaces=('j2sdk')
-  install='jdk.install'
-
-  cd ${srcdir}
-
-  #copy icon
-  install -Dm644 ${srcdir}/linux-jdk/jre/lib/desktop/icons/hicolor/48x48/apps/sun-java.png \
-  		 ${pkgdir}/usr/share/pixmaps/java.png
-
-  rm -rf linux-jdk/jre
-  mkdir -p ${pkgdir}/opt
-  mv linux-jdk ${pkgdir}/opt/java
-
-  install -D -m755 ${srcdir}/jdk.profile ${pkgdir}/etc/profile.d/jdk.sh
-
-  mkdir -p ${pkgdir}/usr/share/licenses/jdk
-  cp ${pkgdir}/opt/java/COPYRIGHT ${pkgdir}/usr/share/licenses/jdk
-  cp ${pkgdir}/opt/java/LICENSE ${pkgdir}/usr/share/licenses/jdk
-  cp ${pkgdir}/opt/java/THIRDPARTYLICENSEREADME.txt ${pkgdir}/usr/share/licenses/jdk
-
-  #desktop entries
-  install -Dm644 ${srcdir}/java-control-panel.desktop \
-  		 ${pkgdir}/usr/share/applications/java-control-panel.desktop
-  install -Dm644 ${srcdir}/java-monitoring-and-management-console.desktop \
-  		 ${pkgdir}/usr/share/applications/java-monitoring-and-management-console.desktop
-  install -Dm644 ${srcdir}/java-policy-settings.desktop \
-  		 ${pkgdir}/usr/share/applications/java-policy-settings.desktop
-  install -Dm644 ${srcdir}/java-visualvm.desktop \
-  		 ${pkgdir}/usr/share/applications/java-visualvm.desktop
-  install -Dm644 ${srcdir}/java-web-start.desktop \
-  		 ${pkgdir}/usr/share/applications/java-web-start.desktop
-}
diff --git a/abs/extra/java-sun/java-control-panel.desktop b/abs/extra/java-sun/java-control-panel.desktop
deleted file mode 100644
index 476e04a..0000000
--- a/abs/extra/java-sun/java-control-panel.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Exec=/opt/java/bin/jcontrol
-GenericName[cs]=Nastavení prostředí Java
-GenericName=Java Environment Settings
-Icon=java
-Name[cs]=Nastavení Javy
-Name=Java Control Panel
-Path=
-StartupNotify=true
-Terminal=false
-Type=Application
-Categories=Settings;Java;
diff --git a/abs/extra/java-sun/java-monitoring-and-management-console.desktop b/abs/extra/java-sun/java-monitoring-and-management-console.desktop
deleted file mode 100644
index c0e1e59..0000000
--- a/abs/extra/java-sun/java-monitoring-and-management-console.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Exec=/opt/java/bin/jconsole
-Icon=java
-Name[cs]=Konzole monitorování a správy prostředí Java
-Name=Java Monitoring and Management Console
-StartupNotify=true
-Terminal=false
-Type=Application
-Categories=Development;Java;
diff --git a/abs/extra/java-sun/java-policy-settings.desktop b/abs/extra/java-sun/java-policy-settings.desktop
deleted file mode 100644
index 1009301..0000000
--- a/abs/extra/java-sun/java-policy-settings.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Exec=/opt/java/bin/policytool
-Icon=java
-Name[cs]=Nastavení politiky Java aplikací
-Name=Java Policy Settings
-Path=
-StartupNotify=true
-Terminal=false
-Type=Application
-Categories=Settings;Java;
diff --git a/abs/extra/java-sun/java-visualvm.desktop b/abs/extra/java-sun/java-visualvm.desktop
deleted file mode 100644
index 8aa9527..0000000
--- a/abs/extra/java-sun/java-visualvm.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Exec=/opt/java/bin/jvisualvm
-GenericName[cs]=Nástroj pro monitorování a sledování výkonu Java aplikací
-GenericName=Java Monitoring and Performance Monitoring Tool
-Icon=java
-Name=Java VisualVM
-Path=
-StartupNotify=true
-Terminal=false
-Type=Application
-Categories=Development;Java;
diff --git a/abs/extra/java-sun/java-web-start.desktop b/abs/extra/java-sun/java-web-start.desktop
deleted file mode 100644
index 573ddc0..0000000
--- a/abs/extra/java-sun/java-web-start.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Exec=/opt/java/bin/javaws -viewer
-GenericName[cs]=Spravovat a spouštět aplikace Java Web Start
-GenericName=Manage and run Java Web Start Applications
-Icon=java
-MimeType=application/x-java-jnlp-file;
-Name[cs]=Java Web Start
-Name=Java Web Start
-Path=
-StartupNotify=true
-Terminal=false
-Type=Application
-Categories=Network;Java;
diff --git a/abs/extra/java-sun/jdk.install b/abs/extra/java-sun/jdk.install
deleted file mode 100644
index ae439b1..0000000
--- a/abs/extra/java-sun/jdk.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_upgrade() {
-	post_install $1
-}
-
-post_install() {
-   echo "The jdk package is licensed software."
-	echo "You MUST read and agree to the license stored in"
-	echo "/opt/java/LICENSE before using it."
-
-}
-
diff --git a/abs/extra/java-sun/jdk.profile b/abs/extra/java-sun/jdk.profile
deleted file mode 100644
index 9bee9a7..0000000
--- a/abs/extra/java-sun/jdk.profile
+++ /dev/null
@@ -1,4 +0,0 @@
-export J2SDKDIR=/opt/java
-export PATH=$PATH:/opt/java/bin
-export JAVA_HOME=/opt/java
-export DERBY_HOME=/opt/java/db
diff --git a/abs/extra/java-sun/jre.install b/abs/extra/java-sun/jre.install
deleted file mode 100644
index 41e698f..0000000
--- a/abs/extra/java-sun/jre.install
+++ /dev/null
@@ -1,22 +0,0 @@
-post_upgrade() {
-	post_install $1
-}
-
-post_install() {
-   echo "The jre package is licensed software."
-	echo "You MUST read and agree to the license stored in"
-	echo "/opt/java/jre/LICENSE before using it."
-	if [ -f /etc/mailcap ] ; then
-		sed -e '/application\/x-java-jnlp-file/d' -i /etc/mailcap
-	fi
-	echo 'application/x-java-jnlp-file;/opt/java/jre/bin/javaws %s' >>/etc/mailcap
-}
-
-post_remove() {
-	mailcap=$(grep -v 'application/x-java-jnlp-file' /etc/mailcap)
-	if [ "$mailcap" != "" ] ; then
-		sed -e '/application\/x-java-jnlp-file/d' -i /etc/mailcap
-	else
-		rm /etc/mailcap
-	fi
-}
diff --git a/abs/extra/java-sun/jre.profile b/abs/extra/java-sun/jre.profile
deleted file mode 100644
index af3e373..0000000
--- a/abs/extra/java-sun/jre.profile
+++ /dev/null
@@ -1,4 +0,0 @@
-export PATH=$PATH:/opt/java/jre/bin
-if [ ! -f /etc/profile.d/jdk.sh ]; then
-        export JAVA_HOME=/opt/java/jre
-fi
diff --git a/abs/extra/libdvdread/DVDFileStat.patch b/abs/extra/libdvdread/DVDFileStat.patch
deleted file mode 100644
index 04d06f7..0000000
--- a/abs/extra/libdvdread/DVDFileStat.patch
+++ /dev/null
@@ -1,238 +0,0 @@
-diff -pruN libdvdread-4.1.3/src/dvd_reader.c libdvdread-4.1.3.new/src/dvd_reader.c
---- libdvdread-4.1.3/src/dvd_reader.c   2008-09-06 23:55:51.000000000 +0200
-+++ libdvdread-4.1.3.new/src/dvd_reader.c       2009-02-28 01:36:20.000000000 +0100
-@@ -889,6 +889,187 @@ void DVDCloseFile( dvd_file_t *dvd_file 
-     }
- }
- 
-+static int DVDFileStatVOBUDF(dvd_reader_t *dvd, int title, 
-+                             int menu, dvd_stat_t *statbuf)
-+{
-+  char filename[ MAX_UDF_FILE_NAME_LEN ];
-+  uint32_t size;
-+  off_t tot_size;
-+  off_t parts_size[9];
-+  int nr_parts = 0;
-+  int n;
-+ 
-+  if( title == 0 ) {
-+    sprintf( filename, "/VIDEO_TS/VIDEO_TS.VOB" );
-+  } else {
-+    sprintf( filename, "/VIDEO_TS/VTS_%02d_%d.VOB", title, menu ? 0 : 1 );
-+  }
-+  if(!UDFFindFile( dvd, filename, &size )) {
-+    return -1;
-+  }
-+  tot_size = size;
-+  nr_parts = 1;
-+  parts_size[0] = size;
-+
-+  if( !menu ) {
-+    int cur;
-+
-+    for( cur = 2; cur < 10; cur++ ) {
-+      sprintf( filename, "/VIDEO_TS/VTS_%02d_%d.VOB", title, cur );
-+      if( !UDFFindFile( dvd, filename, &size ) ) {
-+        break;
-+      }
-+      parts_size[nr_parts] = size;
-+      tot_size += size;
-+      nr_parts++;
-+    }
-+  }
-+  
-+  statbuf->size = tot_size;
-+  statbuf->nr_parts = nr_parts;
-+  for(n = 0; n < nr_parts; n++) {
-+    statbuf->parts_size[n] = parts_size[n];
-+  }
-+  return 0;
-+}
-+
-+
-+static int DVDFileStatVOBPath( dvd_reader_t *dvd, int title,
-+                                       int menu, dvd_stat_t *statbuf )
-+{
-+  char filename[ MAX_UDF_FILE_NAME_LEN ];
-+  char full_path[ PATH_MAX + 1 ];
-+  struct stat fileinfo;
-+  off_t tot_size;
-+  off_t parts_size[9];
-+  int nr_parts = 0;
-+  int n;
-+
-+ 
-+    
-+  if( title == 0 ) {
-+    sprintf( filename, "VIDEO_TS.VOB" );
-+  } else {
-+    sprintf( filename, "VTS_%02d_%d.VOB", title, menu ? 0 : 1 );
-+  }
-+  if( !findDVDFile( dvd, filename, full_path ) ) {
-+    return -1;
-+  }
-+  
-+  if( stat( full_path, &fileinfo ) < 0 ) {
-+    fprintf( stderr, "libdvdread: Can't stat() %s.\n", filename );
-+    return -1;
-+  }
-+  
-+
-+  tot_size = fileinfo.st_size;
-+  nr_parts = 1;
-+  parts_size[0] = fileinfo.st_size;
-+
-+  if( !menu ) {
-+    int cur;
-+    
-+    for( cur = 2; cur < 10; cur++ ) {
-+
-+      sprintf( filename, "VTS_%02d_%d.VOB", title, cur );
-+      if( !findDVDFile( dvd, filename, full_path ) ) {
-+        break;
-+      }
-+
-+      if( stat( full_path, &fileinfo ) < 0 ) {
-+        fprintf( stderr, "libdvdread: Can't stat() %s.\n", filename );
-+        break;
-+      }
-+      
-+      parts_size[nr_parts] = fileinfo.st_size;
-+      tot_size += parts_size[nr_parts];
-+      nr_parts++;
-+    }
-+  }
-+
-+  statbuf->size = tot_size;
-+  statbuf->nr_parts = nr_parts;
-+  for(n = 0; n < nr_parts; n++) {
-+    statbuf->parts_size[n] = parts_size[n];
-+  }
-+  return 0;
-+}
-+
-+
-+int DVDFileStat(dvd_reader_t *dvd, int titlenum, 
-+                dvd_read_domain_t domain, dvd_stat_t *statbuf)
-+{
-+  char filename[ MAX_UDF_FILE_NAME_LEN ];
-+  char full_path[ PATH_MAX + 1 ];
-+  struct stat fileinfo;
-+  uint32_t size;
-+
-+  /* Check arguments. */
-+  if( dvd == NULL || titlenum < 0 ) {
-+    errno = EINVAL;
-+    return -1;
-+  }
-+
-+  switch( domain ) {
-+  case DVD_READ_INFO_FILE:
-+    if( titlenum == 0 ) {
-+      sprintf( filename, "/VIDEO_TS/VIDEO_TS.IFO" );
-+    } else {
-+      sprintf( filename, "/VIDEO_TS/VTS_%02i_0.IFO", titlenum );
-+    }
-+    break;
-+  case DVD_READ_INFO_BACKUP_FILE:
-+    if( titlenum == 0 ) {
-+      sprintf( filename, "/VIDEO_TS/VIDEO_TS.BUP" );
-+    } else {
-+      sprintf( filename, "/VIDEO_TS/VTS_%02i_0.BUP", titlenum );
-+    }
-+    break;
-+  case DVD_READ_MENU_VOBS:
-+    if( dvd->isImageFile ) {
-+      return DVDFileStatVOBUDF( dvd, titlenum, 1, statbuf );
-+    } else {
-+      return DVDFileStatVOBPath( dvd, titlenum, 1, statbuf );
-+    }
-+    break;
-+  case DVD_READ_TITLE_VOBS:
-+    if( titlenum == 0 ) {
-+      return -1;
-+    }
-+    if( dvd->isImageFile ) {
-+      return DVDFileStatVOBUDF( dvd, titlenum, 0, statbuf );
-+    } else {
-+      return DVDFileStatVOBPath( dvd, titlenum, 0, statbuf );
-+    }
-+    break;
-+  default:
-+    fprintf( stderr, "libdvdread: Invalid domain for file stat.\n" );
-+    errno = EINVAL;
-+    return -1;
-+  }
-+  
-+  if( dvd->isImageFile ) {
-+    if( UDFFindFile( dvd, filename, &size ) ) {
-+      statbuf->size = size;
-+      statbuf->nr_parts = 1;
-+      statbuf->parts_size[0] = size;
-+      return 0;
-+    }
-+  } else {
-+    if( findDVDFile( dvd, filename, full_path ) )  {
-+      if( stat( full_path, &fileinfo ) < 0 ) {
-+        fprintf( stderr, "libdvdread: Can't stat() %s.\n", filename );
-+      } else {
-+        statbuf->size = fileinfo.st_size;
-+        statbuf->nr_parts = 1;
-+        statbuf->parts_size[0] = statbuf->size;
-+        return 0;
-+      }
-+    }
-+  }
-+  return -1;
-+}
-+
- /* Internal, but used from dvd_udf.c */
- int UDFReadBlocksRaw( dvd_reader_t *device, uint32_t lb_number,
-                         size_t block_count, unsigned char *data,
-diff -pruN libdvdread-4.1.3/src/dvd_reader.h libdvdread-4.1.3.new/src/dvd_reader.h
---- libdvdread-4.1.3/src/dvd_reader.h   2008-09-06 23:55:51.000000000 +0200
-+++ libdvdread-4.1.3.new/src/dvd_reader.h       2009-02-28 01:36:49.000000000 +0100
-@@ -115,6 +115,42 @@ typedef enum {
- } dvd_read_domain_t;
- 
- /**
-+ *
-+ */
-+typedef struct {
-+  off_t size;          /**< Total size of file in bytes */
-+  int nr_parts;        /**< Number of file parts */
-+  off_t parts_size[9]; /**< Size of each part in bytes */
-+} dvd_stat_t;
-+
-+/**
-+ * Stats a file on the DVD given the title number and domain.
-+ * The information about the file is stored in a dvd_stat_t
-+ * which contains information about the size of the file and
-+ * the number of parts in case of a multipart file and the respective
-+ * sizes of the parts.
-+ * A multipart file is for instance VTS_02_1.VOB, VTS_02_2.VOB, VTS_02_3.VOB
-+ * The size of VTS_02_1.VOB will be stored in stat->parts_size[0],
-+ * VTS_02_2.VOB in stat->parts_size[1], ...
-+ * The total size (sum of all parts) is stored in stat->size and
-+ * stat->nr_parts will hold the number of parts.
-+ * Only DVD_READ_TITLE_VOBS (VTS_??_[1-9].VOB) can be multipart files.
-+ * 
-+ * This function is only of use if you want to get the size of each file
-+ * in the filesystem. These sizes are not needed to use any other
-+ * functions in libdvdread. 
-+ *
-+ * @param dvd  A dvd read handle.
-+ * @param titlenum Which Video Title Set should be used, VIDEO_TS is 0.
-+ * @param domain Which domain. 
-+ * @param stat Pointer to where the result is stored.
-+ * @return If successful 0, otherwise -1.
-+ *
-+ * int DVDFileStat(dvd, titlenum, domain, stat);
-+ */
-+int DVDFileStat(dvd_reader_t *, int, dvd_read_domain_t, dvd_stat_t *);
-+  
-+/**
-  * Opens a file on the DVD given the title number and domain.
-  *
-  * If the title number is 0, the video manager information is opened
-
diff --git a/abs/extra/libdvdread/PKGBUILD b/abs/extra/libdvdread/PKGBUILD
deleted file mode 100644
index edbdaa4..0000000
--- a/abs/extra/libdvdread/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 80196 2010-05-13 15:59:09Z andrea $
-# Maintainer:
-# Contributor: Thomas Baechler <thomas@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=libdvdread
-pkgver=4.1.3
-pkgrel=2
-pkgdesc="Provides a simple foundation for reading DVD video disks"
-arch=(i686 x86_64)
-url="http://www.mplayerhq.hu/MPlayer/releases/dvdnav/"
-license=('GPL')
-depends=('glibc')
-makedepends=('libdvdcss')
-optdepends=('libdvdcss: for decoding encrypted DVDs')
-options=('!libtool')
-source=("http://www.mplayerhq.hu/MPlayer/releases/dvdnav/${pkgname}-${pkgver}.tar.bz2"
-        'DVDFileStat.patch')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # http://lists.mplayerhq.hu/pipermail/dvdnav-discuss/2009-February/000986.html (FS#19324)
-  patch -Np1 -i ${srcdir}/DVDFileStat.patch || return 1
-
-  ./autogen.sh --prefix=/usr || return 1
-  make || return 1
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install || return 1
-}
-
-md5sums=('6dc068d442c85a3cdd5ad3da75f6c6e8'
-         '140d02afbf66bfbf034549157ed4f7ad')
diff --git a/abs/extra/perl-dbd-mysql/PKGBUILD b/abs/extra/perl-dbd-mysql/PKGBUILD
deleted file mode 100644
index c53aac7..0000000
--- a/abs/extra/perl-dbd-mysql/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 82506 2010-06-12 19:27:47Z kevin $
-# Maintainer: Kevin Piche <kevin@archlinux.org>
-# Contributor: Eric Johnson <eric@coding-zone.com>
-
-pkgname=perl-dbd-mysql
-_realname=DBD-mysql
-pkgver=4.018
-pkgrel=1
-pkgdesc="Perl/CPAN DBD::mysql module for interacting with MySQL via DBD"
-arch=(i686 x86_64)
-license=('GPL' 'PerlArtistic')
-url="http://search.cpan.org/dist/${_realname}/"
-depends=('libmysqlclient' 'perl-dbi' 'perl>=5.10.0')
-makedepends=('mysql')
-options=(!emptydirs)
-source=(http://search.cpan.org/CPAN/authors/id/C/CA/CAPTTOFU/${_realname}-${pkgver}.tar.gz)
-
-build() {
-  cd ${srcdir}/${_realname}-${pkgver}
-
-  # install module in vendor directories.
-  perl Makefile.PL INSTALLDIRS=vendor || return 1
-  make  || return 1
-  make install DESTDIR=${pkgdir} || return 1
-
-  # remove perllocal.pod and .packlist
-  find ${pkgdir} -name perllocal.pod -delete
-  find ${pkgdir} -name .packlist -delete
-}
-md5sums=('d1d4ee2f20910d6491d1b6216471b2f1')
diff --git a/abs/extra/postgresql-libs/PKGBUILD b/abs/extra/postgresql-libs/PKGBUILD
deleted file mode 100644
index 14ba9f8..0000000
--- a/abs/extra/postgresql-libs/PKGBUILD
+++ /dev/null
@@ -1,136 +0,0 @@
-# $Id: PKGBUILD 98184 2010-11-04 14:55:39Z dan $
-# Maintainer: Douglas Soares de Andrade <douglas@archlinux.org>
-
-pkgbase=postgresql
-pkgname=('postgresql-libs' 'postgresql-docs' 'postgresql')
-pkgver=9.0.1
-pkgrel=2.1
-arch=('i686' 'x86_64')
-url="http://www.postgresql.org"
-license=('BSD')
-makedepends=('libxml2' 'python2' 'perl')
-source=(ftp://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2 \
-        postgresql postgresql.confd build.patch postgresql.pam postgresql.logrotate)
-
-build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-
-  # patch to remove regress/test make target (won't build with it present)
-  patch -Np1 -i ../build.patch
-
-  # configure
-  ./configure --prefix=/usr --mandir=/usr/share/man --with-libxml \
-  --with-openssl --with-perl \
-  --with-python PYTHON=/usr/bin/python2 --with-pam \
-  --with-system-tzdata=/usr/share/zoneinfo --enable-nls \
-  --datadir=/usr/share/postgresql --enable-thread-safety
-
-  sed -i -e '/interfaces/d' src/Makefile
-
-  # build
-  make world
-
-  # build libs
-  for dir in src/interfaces src/bin/pg_config; do
-    pushd ${dir}
-    make
-    popd
-  done
-}
-
-package_postgresql-libs() {
-  pkgdesc="Libraries for use with PostgreSQL"
-  depends=('openssl>=1.0.0')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-
-  # install license
-  install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-
-  # install libs
-  for dir in src/interfaces src/bin/pg_config; do
-    pushd ${dir}
-    make DESTDIR="${pkgdir}" install
-    popd
-  done
-
-  install -D -m644 doc/src/sgml/man1/pg_config.1 "${pkgdir}/usr/share/man/man1/pg_config.1"
-
-  cd src/include
-
-  mkdir -p "${pkgdir}"/usr/include/{libpq,postgresql/internal/libpq}
-
-  # these headers are needed by the public headers of the interfaces
-  install -m644 pg_config.h "${pkgdir}/usr/include/"
-  install -m644 pg_config_os.h "${pkgdir}/usr/include/"
-  install -m644 postgres_ext.h "${pkgdir}/usr/include/"
-  install -m644 libpq/libpq-fs.h "${pkgdir}/usr/include/libpq/"
-  install -m644 pg_config_manual.h "${pkgdir}/usr/include/"
-
-  # these headers are needed by the not-so-public headers of the interfaces
-  install -m644 c.h "${pkgdir}/usr/include/postgresql/internal/"
-  install -m644 port.h "${pkgdir}/usr/include/postgresql/internal/"
-  install -m644 postgres_fe.h "${pkgdir}/usr/include/postgresql/internal/"
-  install -m644 libpq/pqcomm.h "${pkgdir}/usr/include/postgresql/internal/libpq/"
-}
-
-package_postgresql-docs() {
-  pkgdesc="HTML documentation for PostgreSQL"
-  options=(docs)
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-
-  # install license
-  install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-
-  make -C doc/src/sgml DESTDIR="${pkgdir}" install-html
-  chown -R root:root "${pkgdir}/usr/share/doc/postgresql/html/"
-}
-
-package_postgresql() {
-  pkgdesc="A sophisticated object-relational DBMS"
-  backup=('etc/conf.d/postgresql' 'etc/pam.d/postgresql' 'etc/logrotate.d/postgresql')
-  depends=("postgresql-libs>=${pkgver}" 'libxml2' 'readline>=6.0')
-  optdepends=('python2: for PL/Python support'
-              'perl: for PL/Perl support')
-  provides=('postgresql-client')
-  conflicts=('postgresql-client')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-
-  # install
-  make DESTDIR="${pkgdir}" install
-  make -C contrib DESTDIR="${pkgdir}" install
-  make -C doc/src/sgml DESTDIR="${pkgdir}" install-man
-  # we don't want this, it is in the -libs package
-  make -C src/bin/pg_config DESTDIR="${pkgdir}" uninstall
-  rm "${pkgdir}/usr/share/man/man1/pg_config.1"
-
-  # install license
-  install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgbase}/LICENSE"
-
-  # clean up unneeded installed items
-  rm -rf "${pkgdir}/usr/include/postgresql/internal"
-  rm -rf "${pkgdir}/usr/include/libpq"
-  find "${pkgdir}/usr/include" -maxdepth 1 -type f -execdir rm {} +
-
-  # install launch script
-  install -D -m755 "${srcdir}/postgresql" "${pkgdir}/etc/rc.d/postgresql"
-
-  # install conf file
-  install -D -m644 ${srcdir}/postgresql.confd \
-    "${pkgdir}/etc/conf.d/postgresql"
-
-  install -D -m644 ${srcdir}/postgresql.pam \
-    "${pkgdir}/etc/pam.d/postgresql"
-
-  install -D -m644 ${srcdir}/postgresql.logrotate \
-    "${pkgdir}/etc/logrotate.d/postgresql"
-}
-
-md5sums=('57ba57e43cfe29e16dacbf5789be98d1'
-         '4153ac0ef4a77e709385b0a13e1c0fad'
-         'd63a05943cf0a2726aa2070f3033c569'
-         '4d74f4227dc5e12bf95b3490758d86c9'
-         '96f82c38f3f540b53f3e5144900acf17'
-         'd28e443f9f65a5712c52018b84e27137')
diff --git a/abs/extra/postgresql-libs/build.patch b/abs/extra/postgresql-libs/build.patch
deleted file mode 100644
index c8f665d..0000000
--- a/abs/extra/postgresql-libs/build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur postgresql-8.2.3-orig/src/Makefile postgresql-8.2.3/src/Makefile
---- postgresql-8.2.3-orig/src/Makefile	2006-06-22 16:50:35.000000000 -0700
-+++ postgresql-8.2.3/src/Makefile	2007-03-05 10:46:24.000000000 -0800
-@@ -23,7 +23,6 @@
- 	$(MAKE) -C bin $@
- 	$(MAKE) -C pl $@
- 	$(MAKE) -C makefiles $@
--	$(MAKE) -C test/regress $@
- 
- install: install-local
- 
diff --git a/abs/extra/postgresql-libs/postgresql b/abs/extra/postgresql-libs/postgresql
deleted file mode 100755
index b00289e..0000000
--- a/abs/extra/postgresql-libs/postgresql
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/postgresql
-
-case "$1" in
-  start)
-    stat_busy "Starting PostgreSQL"
-    # initialization
-    if [ ! `egrep '^postgres:' /etc/group` ]; then
-      stat_busy "Adding postgres group"
-      groupadd -g 88 postgres
-      stat_done
-    fi
-    if [ ! `egrep '^postgres:' /etc/passwd` ]; then
-      stat_busy "Adding postgres user"
-      useradd -u 88 -g postgres -d $PGROOT -s /bin/bash postgres
-      [ -d $PGROOT ] && chown -R postgres.postgres $PGROOT
-      stat_done
-    fi
-    if [ ! -d $PGROOT ]; then
-      mkdir -p $PGROOT/data && chown -R postgres.postgres $PGROOT
-      su - postgres -c "/usr/bin/initdb $INITOPTS -D $PGROOT/data"
-    fi
-    if [ ! -e /var/log/postgresql.log ]; then
-      touch /var/log/postgresql.log
-      chown postgres /var/log/postgresql.log
-    fi
-    # start the process
-    su - postgres -c \
-     "/usr/bin/pg_ctl -D $PGROOT/data -l /var/log/postgresql.log -W start"
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon postgresql
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping PostgreSQL"
-    su - postgres -c \
-      "/usr/bin/pg_ctl -D $PGROOT/data -l /var/log/postgresql.log -w stop"  
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon postgresql
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/abs/extra/postgresql-libs/postgresql.confd b/abs/extra/postgresql-libs/postgresql.confd
deleted file mode 100644
index 5f8fa03..0000000
--- a/abs/extra/postgresql-libs/postgresql.confd
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Parameters to be passed to postgresql
-#
-PGROOT="/var/lib/postgres"
-INITOPTS="--locale $LANG"
diff --git a/abs/extra/postgresql-libs/postgresql.logrotate b/abs/extra/postgresql-libs/postgresql.logrotate
deleted file mode 100644
index 9c36918..0000000
--- a/abs/extra/postgresql-libs/postgresql.logrotate
+++ /dev/null
@@ -1,4 +0,0 @@
-/var/log/postgresql.log {
-   copytruncate
-   missingok
-}
diff --git a/abs/extra/postgresql-libs/postgresql.pam b/abs/extra/postgresql-libs/postgresql.pam
deleted file mode 100644
index 53724d1..0000000
--- a/abs/extra/postgresql-libs/postgresql.pam
+++ /dev/null
@@ -1,3 +0,0 @@
-auth		required	pam_unix.so
-account		required	pam_unix.so
-session		required	pam_unix.so
-- 
cgit v0.12


From 0af61fff16a2d09ac00f89517fde6d80b0958b7e Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Thu, 11 Nov 2010 19:17:21 +0000
Subject: opensp: first import, needed for iputils

---
 abs/extra/opensp/PKGBUILD | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 abs/extra/opensp/PKGBUILD

diff --git a/abs/extra/opensp/PKGBUILD b/abs/extra/opensp/PKGBUILD
new file mode 100644
index 0000000..1f79263
--- /dev/null
+++ b/abs/extra/opensp/PKGBUILD
@@ -0,0 +1,29 @@
+# $Id: PKGBUILD 27689 2009-02-24 21:08:28Z eric $
+# Maintainer: dorphell <dorphell@archlinux.org>
+# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
+
+pkgname=opensp
+pkgver=1.5.2
+pkgrel=1
+pkgdesc="A library and a set of tools for validating, parsing and manipulating SGML and XML documents."
+arch=('i686' 'x86_64')
+url="http://openjade.sourceforge.net/"
+license=('BSD')
+depends=('gcc-libs')
+makedepends=('xmlto' 'docbook-xsl')
+options=('!libtool')
+source=(http://download.sourceforge.net/openjade/OpenSP-$pkgver.tar.gz)
+md5sums=('670b223c5d12cee40c9137be86b6c39b')
+
+build() {
+  cd $srcdir/OpenSP-$pkgver
+  ./configure --prefix=/usr --mandir=/usr/share/man \
+     --disable-nls \
+     --enable-http \
+     --enable-default-catalog=/etc/sgml/catalog:/etc/xml/catalog \
+     --enable-default-search-path=/usr/share/sgml:/usr/share/xml \
+     --enable-xml-messages || return 1
+  make || return 1
+  make DESTDIR=$pkgdir install || return 1
+  install -D -m644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
+}
-- 
cgit v0.12


From 0d33e2df6be1857b57d4d59a2ae3e314cb19ce62 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Thu, 11 Nov 2010 19:31:51 +0000
Subject: forgot this file

---
 abs/core/libxslt/ChangeLog |  9 ---------
 abs/core/libxslt/PKGBUILD  | 30 ++++++++++++++++++------------
 2 files changed, 18 insertions(+), 21 deletions(-)
 delete mode 100644 abs/core/libxslt/ChangeLog

diff --git a/abs/core/libxslt/ChangeLog b/abs/core/libxslt/ChangeLog
deleted file mode 100644
index ccd5848..0000000
--- a/abs/core/libxslt/ChangeLog
+++ /dev/null
@@ -1,9 +0,0 @@
-2008-05-31  Eric Belanger  <eric@archlinux.org>
-
-	* libxslt 1.1.24-1
-	* Upstream update
-
-2008-05-01  Eric Belanger  <eric@archlinux.org>
-
-	* libxslt 1.1.23-1
-	* Upstream update
diff --git a/abs/core/libxslt/PKGBUILD b/abs/core/libxslt/PKGBUILD
index 9a598b0..c956c0f 100644
--- a/abs/core/libxslt/PKGBUILD
+++ b/abs/core/libxslt/PKGBUILD
@@ -1,25 +1,31 @@
-# $Id: PKGBUILD 2322 2008-05-31 21:12:21Z eric $
+# $Id: PKGBUILD 87866 2010-08-18 15:17:10Z ibiru $
 # Maintainer: Eric Belanger <eric@archlinux.org>
 # Contributor: John Proctor <jproctor@prium.net>
 
 pkgname=libxslt
-pkgver=1.1.24
-pkgrel=1
+pkgver=1.1.26
+pkgrel=2
 pkgdesc="XML stylesheet transformation library"
 arch=('i686' 'x86_64')
 url="http://xmlsoft.org/XSLT/"
 license=('custom')
-depends=('libxml2>=2.6.30' 'libgcrypt')
-makedepends=('python>=2.5')
+depends=('libxml2>=2.7.7' 'libgcrypt>=1.4.6')
+makedepends=('python2')
 options=('!libtool')
 source=(ftp://xmlsoft.org/libxslt/${pkgname}-${pkgver}.tar.gz)
-md5sums=('e83ec5d27fc4c10c6f612879bea9a153')
-sha1sums=('b5402e24abff5545ed76f6a55049cbebc664bd58')
+md5sums=('e61d0364a30146aaa3001296f853b2b9')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR=${startdir}/pkg install || return 1
-  install -D -m644 COPYING ${startdir}/pkg/usr/share/licenses/${pkgname}/COPYING || return 1
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --with-python=/usr/bin/python2.7
+  make
+  make DESTDIR="${pkgdir}" install
+
+  for f in pyxsltproc.py extfunc.py exslt.py extelem.py basic.py; do
+      sed -e 's|#!/usr/bin/python|#!/usr/bin/python2|' \
+          -i ${pkgdir}/usr/share/doc/libxslt-python-1.1.26/examples/${f}
+  done
+
+  install -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
 }
-- 
cgit v0.12


From dc6316bb2c16e117a41a773c70d72ea1765a7048 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Thu, 11 Nov 2010 19:32:40 +0000
Subject: iputils: updated to 2010214

---
 abs/core/iputils/PKGBUILD                          | 53 +++++++++-------------
 .../iputils/iputils-20070202-no-open-max.patch     | 16 -------
 abs/core/iputils/permission-fix.patch              | 15 ++++++
 3 files changed, 36 insertions(+), 48 deletions(-)
 delete mode 100644 abs/core/iputils/iputils-20070202-no-open-max.patch
 create mode 100644 abs/core/iputils/permission-fix.patch

diff --git a/abs/core/iputils/PKGBUILD b/abs/core/iputils/PKGBUILD
index 341158b..1b62cda 100644
--- a/abs/core/iputils/PKGBUILD
+++ b/abs/core/iputils/PKGBUILD
@@ -1,38 +1,37 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
+# $Id: PKGBUILD 82625 2010-06-15 04:22:56Z allan $
 # Maintainer: Aaron Griffin <aaron@archlinux.org>
 
 pkgname=iputils
-pkgver=20070202
+pkgver=20100214
 _traceroutever=1.4a12
-pkgrel=13
+pkgrel=2
 pkgdesc="IP Configuration Utilities (and Ping)"
 arch=(i686 x86_64)
 license=('GPL')
-url="ftp://ftp.inr.ac.ru/ip-routing/"
+url="http://www.linuxfoundation.org/en/Net:Iputils"
 groups=('base')
 depends=('glibc')
-makedepends=('jade')
+makedepends=('opensp' 'libxslt' 'docbook-xsl')
 conflicts=('netkit-base' 'arping' 'netkit-tftpd' 'traceroute')
 replaces=('netkit-base' 'traceroute')
 source=(http://www.skbuff.net/iputils/$pkgname-s$pkgver.tar.bz2
         ftp://ftp.ee.lbl.gov/traceroute-$_traceroutever.tar.gz
-	iputils-20070202-no-open-max.patch)
+	permission-fix.patch)
 options=(!makeflags)
-md5sums=('1d38fb3cfc2b71496e43cf646bfc1d6e'
+md5sums=('37596c8b3eed537294e77464b9804726'
          '964d599ef696efccdeebe7721cd4828d'
-	 'a2cbc0174dd883f68297aa7f3e7c4f5c')
+         '66109966cad06e425bb12a78bab85b70')
 
 build()
 {
   #build iptuils
-  cd $startdir/src/$pkgname-s$pkgver
-  patch -Np1 -i ../iputils-20070202-no-open-max.patch || return 1
+  cd $srcdir/$pkgname-s$pkgver
   make KERNEL_INCLUDE=/usr/include || return 1   # for i686
   for i in arping clockdiff rarpd rdisc tftpd tracepath tracepath6; do
-    install -D -m755 $i $startdir/pkg/usr/sbin/$i
+    install -D -m755 $i $pkgdir/usr/sbin/$i
   done
   for i in ping ping6 traceroute6; do
-    install -D -m4755 $i $startdir/pkg/bin/$i
+    install -D -m4755 $i $pkgdir/bin/$i
   done
 
   msg ":: building docs"
@@ -42,31 +41,21 @@ build()
   cd doc
   for file in *.sgml; do
       xf=${file/.sgml/.xml}
-      sx -xlower -xno-nl-in-tag $file > $xf
+      osx -xlower -xno-nl-in-tag $file > $xf || true
       sed -i "s|<refname>\(.*\), \(.*\)</refname>|<refname>\1</refname>, <refname>\2</refname>|g" $xf
-      xsltproc /usr/share/xml/docbook/xsl-stylesheets-1.73.1/manpages/docbook.xsl $xf
+      xsltproc /usr/share/xml/docbook/xsl-stylesheets-1.76.0/manpages/docbook.xsl $xf
   done
 
-  mkdir -p $startdir/pkg/usr/man/man8
+  mkdir -p $pkgdir/usr/share/man/man8
   install -m644 arping.8 clockdiff.8 ping.8 ping6.8 rarpd.8 rdisc.8 \
-                    tftpd.8 tracepath.8 tracepath6.8 traceroute6 \
-                    $startdir/pkg/usr/man/man8/
-  #make man
-  #for i in arping clockdiff ping rarpd rdisc tftpd tracepath traceroute6; do
-  #  install -D -m644 $i.8 $startdir/pkg/usr/man/man8/$i.8
-  #done
+                    tftpd.8 tracepath.8 tracepath6.8 traceroute6.8 \
+                    $pkgdir/usr/share/man/man8/
 
   # build traceroute
   # this is combined in this package because it's awkward as a separate package
-  cd ${startdir}/src/traceroute-$_traceroutever
-  ./configure --prefix=/usr --sbindir=/bin
-  #if [ "${CARCH}" = "x86_64" ]; then
-    make CFLAGS="${CFLAGS} -Ilinux-include/" || return 1
-  #else
-  #  make || return 1
-  #fi
-  make DESTDIR=${startdir}/pkg install install-man
-
-  chmod 4775 ${startdir}/pkg/bin/traceroute
+  cd ${srcdir}/traceroute-$_traceroutever
+  patch -Np1 -i ../permission-fix.patch || return 1
+  ./configure --prefix=/usr --sbindir=/bin --mandir=/usr/share/man
+  make CFLAGS="${CFLAGS} -Ilinux-include/" || return 1
+  make DESTDIR=${pkgdir} install install-man
 }
-
diff --git a/abs/core/iputils/iputils-20070202-no-open-max.patch b/abs/core/iputils/iputils-20070202-no-open-max.patch
deleted file mode 100644
index 5013ba4..0000000
--- a/abs/core/iputils/iputils-20070202-no-open-max.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-the OPEN_MAX define has been removed in newer kernel headers so use the
-proper method of getting the value dynamically
-
-http://bugs.gentoo.org/195861
-
---- a/rdisc.c
-+++ b/rdisc.c
-@@ -247,7 +247,7 @@ void do_fork(void)
- 	if ((pid=fork()) != 0)
- 		exit(0);
- 
--	for (t = 0; t < OPEN_MAX; t++)
-+	for (t = 0; t < sysconf(_SC_OPEN_MAX); t++)
- 		if (t != s)
- 			close(t);
- 
diff --git a/abs/core/iputils/permission-fix.patch b/abs/core/iputils/permission-fix.patch
new file mode 100644
index 0000000..c47636f
--- /dev/null
+++ b/abs/core/iputils/permission-fix.patch
@@ -0,0 +1,15 @@
+--- traceroute-1.4a12/Makefile.in.old	2000-11-23 21:05:29.000000000 +0100
++++ traceroute-1.4a12/Makefile.in	2008-09-27 20:04:30.000000000 +0200
+@@ -90,10 +90,10 @@
+ 	sed -e 's/.*/char version[] = "&";/' $(srcdir)/VERSION > $@
+ 
+ install: force
+-	$(INSTALL) -m 4555 -o root -g bin traceroute $(DESTDIR)$(BINDEST)
++	$(INSTALL) -m 4555 -o root -g root traceroute $(DESTDIR)$(BINDEST)
+ 
+ install-man: force
+-	$(INSTALL) -m 444 -o bin -g bin traceroute.8 $(DESTDIR)$(MANDEST)/man8
++	$(INSTALL) -m 644 -o root -g root traceroute.8 $(DESTDIR)$(MANDEST)/man8
+ 
+ lint: $(GENSRC) force
+ 	lint -hbxn $(SRC) | \
-- 
cgit v0.12


From 4e6451b131978edd02bcea8719728b2671fffa66 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Thu, 11 Nov 2010 19:32:56 +0000
Subject: docbook_xsl: removed stray __changelog

---
 abs/extra/docbook-xsl/__changelog | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 abs/extra/docbook-xsl/__changelog

diff --git a/abs/extra/docbook-xsl/__changelog b/abs/extra/docbook-xsl/__changelog
deleted file mode 100644
index a8b9cb0..0000000
--- a/abs/extra/docbook-xsl/__changelog
+++ /dev/null
@@ -1 +0,0 @@
-update to 1.76.0
-- 
cgit v0.12


From 4820707a36b714c27815b97d1b3bf03e05f32398 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Thu, 11 Nov 2010 19:37:36 +0000
Subject: startup-notification: updated to .10

---
 abs/extra/startup-notification/PKGBUILD | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/abs/extra/startup-notification/PKGBUILD b/abs/extra/startup-notification/PKGBUILD
index 0d65123..2421bfc 100644
--- a/abs/extra/startup-notification/PKGBUILD
+++ b/abs/extra/startup-notification/PKGBUILD
@@ -1,19 +1,20 @@
-# $Id: PKGBUILD 21429 2008-12-13 03:30:02Z eric $
+# $Id: PKGBUILD 36029 2009-04-19 18:23:54Z jgc $
 # Maintainer: dorphell <dorphell@archlinux.org>
 pkgname=startup-notification
-pkgver=0.9
+pkgver=0.10
 pkgrel=1
 pkgdesc="Monitor and display application startup"
 arch=(i686 x86_64)
-depends=('libx11' 'libsm')
+license=('LGPL')
+depends=('libx11' 'libsm' 'xcb-util>=0.3.4')
 options=('!libtool')
 url="http://www.freedesktop.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('624b42f1fac5a12c543a079e2cd3b366')
+source=(http://www.freedesktop.org/software/startup-notification/releases/${pkgname}-${pkgver}.tar.gz)
+md5sums=('bca0ed1c74bc4e483ea2ed12a5717354')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc || return 1
   make || return 1
-  make DESTDIR=${startdir}/pkg install
+  make DESTDIR="${pkgdir}" install || return 1
 }
-- 
cgit v0.12


From ab86de51cef4abf29bd52879f713e0f60d7a4021 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Thu, 11 Nov 2010 19:37:50 +0000
Subject: libgtop: updated to 2.28.2

---
 abs/extra/libgtop/PKGBUILD | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/abs/extra/libgtop/PKGBUILD b/abs/extra/libgtop/PKGBUILD
index da34a59..a602fbe 100644
--- a/abs/extra/libgtop/PKGBUILD
+++ b/abs/extra/libgtop/PKGBUILD
@@ -1,28 +1,25 @@
-# $Id: PKGBUILD 35522 2009-04-13 20:24:53Z jgc $
+# $Id: PKGBUILD 91991 2010-09-28 16:33:41Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libgtop
-pkgver=2.26.1
+pkgver=2.28.2
 pkgrel=1
 pkgdesc="A library that read information about processes and the running system"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('LGPL')
-depends=('glib2>=2.20.1' 'libxau' 'texinfo')
+depends=('glib2>=2.26' 'libxau' 'texinfo')
+makedepends=('intltool')
 install=libgtop.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.26/${pkgname}-${pkgver}.tar.bz2)
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.28/${pkgname}-${pkgver}.tar.bz2)
 options=('!libtool')
 url="http://www.gnome.org/"
-md5sums=('49fe5c91a6bbc103a0a05c6854a6cc11')
+sha256sums=('49958d7da1f76b257bfd0d557d8ed2b218a5ab0d31b59fed1c32ddf2a1529f5d')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc \
-              --localstatedir=/var --disable-static \
-	      --with-libgtop-smp --with-libgtop-inodedb \
-	      --with-linux-table || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-
-  rm -f "${pkgdir}/usr/share/info/dir"
-  gzip -9nf ${pkgdir}/usr/share/info/*
+      --localstatedir=/var --disable-static \
+      --with-libgtop-smp
+  make
+  make DESTDIR="${pkgdir}" install
 }
-- 
cgit v0.12


From 9f53fe068a7c3690a54ced1804e62ae36b06f1f4 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Thu, 11 Nov 2010 19:38:31 +0000
Subject: libgksu: updated to 2.0.12

---
 abs/extra/libgksu/PKGBUILD                         |  36 ++-
 .../libgksu/libgksu-2.0.12-revert-forkpty.patch    | 359 +++++++++++++++++++++
 2 files changed, 378 insertions(+), 17 deletions(-)
 create mode 100644 abs/extra/libgksu/libgksu-2.0.12-revert-forkpty.patch

diff --git a/abs/extra/libgksu/PKGBUILD b/abs/extra/libgksu/PKGBUILD
index 5f18266..b4414d5 100644
--- a/abs/extra/libgksu/PKGBUILD
+++ b/abs/extra/libgksu/PKGBUILD
@@ -1,29 +1,31 @@
-# $Id: PKGBUILD 5570 2008-07-18 21:03:14Z jgc $
+# $Id: PKGBUILD 90625 2010-09-14 09:37:47Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libgksu
-pkgver=2.0.7
-pkgrel=1
+pkgver=2.0.12
+pkgrel=3
 pkgdesc="gksu authorization library"
 arch=(i686 x86_64)
 url="http://www.nongnu.org/gksu/index.html"
 license=(GPL)
-depends=('gnome-keyring>=2.22.3' 'libgtop>=2.22.3'
-         'libglade>=2.6.2' 'startup-notification>=0.9')
-makedepends=('gtk-doc' 'pkgconfig')
-options=('!libtool')
+depends=('libgnome-keyring>=2.30.1' 'libgtop>=2.28.1' 'startup-notification>=0.10' 'gconf>=2.28.1')
+makedepends=('gtk-doc' 'pkgconfig' 'intltool')
+options=('!libtool' '!emptydirs')
 install=libgksu.install
-source=(http://people.debian.org/~kov/gksu/${pkgname}-${pkgver}.tar.gz)
-md5sums=('2f2c6a21281370942ea2855553d3ad89')
+source=(http://people.debian.org/~kov/gksu/${pkgname}-${pkgver}.tar.gz
+        libgksu-2.0.12-revert-forkpty.patch)
+md5sums=('c7154c8806f791c10e7626ff123049d3'
+         'aebbe57e5286c654e27cf714cf3b704a')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/libgksu-2.0.12-revert-forkpty.patch"
   ./configure --prefix=/usr --sysconfdir=/etc \
-              --localstatedir=/var --disable-static || return 1
-  make || return 1
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install || return 1
-  rm -f ${startdir}/pkg/usr/lib/*.a
-  install -m755 -d ${startdir}/pkg/usr/share/gconf/schemas
-  gconf-merge-schema ${startdir}/pkg/usr/share/gconf/schemas/${pkgname}.schemas ${startdir}/pkg/etc/gconf/schemas/*.schemas || return 1
-  rm -f ${startdir}/pkg/etc/gconf/schemas/*.schemas
+      --localstatedir=/var --disable-static
+  make
+  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
+  rm -f ${pkgdir}/usr/lib/*.a
+  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
+  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain libgksu ${pkgdir}/etc/gconf/schemas/*.schemas
+  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
 }
diff --git a/abs/extra/libgksu/libgksu-2.0.12-revert-forkpty.patch b/abs/extra/libgksu/libgksu-2.0.12-revert-forkpty.patch
new file mode 100644
index 0000000..2c3a8cc
--- /dev/null
+++ b/abs/extra/libgksu/libgksu-2.0.12-revert-forkpty.patch
@@ -0,0 +1,359 @@
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN libgksu-2.0.12.orig/libgksu/libgksu.c libgksu-2.0.12/libgksu/libgksu.c
+--- libgksu-2.0.12.orig/libgksu/libgksu.c	2009-06-29 13:48:24.000000000 -0400
++++ libgksu-2.0.12/libgksu/libgksu.c	2010-01-12 07:32:10.450657456 -0500
+@@ -1,7 +1,6 @@
+ /*
+  * Gksu -- a library providing access to su functionality
+  * Copyright (C) 2004-2009 Gustavo Noronha Silva
+- * Portions Copyright (C) 2009 VMware, Inc.
+  *
+  * This library is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Lesser General Public
+@@ -56,9 +55,6 @@
+ static void
+ gksu_context_launch_complete (GksuContext *context);
+ 
+-static void
+-read_line (int fd, gchar *buffer, int n);
+-
+ GType
+ gksu_error_get_type (void)
+ {
+@@ -2009,8 +2005,6 @@ gksu_su_fuller (GksuContext *context,
+       for (i = 0 ; cmd[i] != NULL ; i++)
+ 	g_free (cmd[i]);
+       g_free(cmd);
+-
+-      _exit(1);
+     }
+   else if (pid == -1)
+     {
+@@ -2125,10 +2119,10 @@ gksu_su_fuller (GksuContext *context,
+ 	  /* drop the \n echoed on password entry if su did request
+ 	     a password */
+ 	  if (password_needed)
+-	    read_line (fdpty, buf, 255);
++	    read (fdpty, buf, 255);
+ 	  if (context->debug)
+ 	    fprintf (stderr, "DEBUG (run:post-after-pass) buf: -%s-\n", buf);
+-	  read_line (fdpty, buf, 255);
++	  read (fdpty, buf, 255);
+ 	  if (context->debug)
+ 	    fprintf (stderr, "DEBUG (run:post-after-pass) buf: -%s-\n", buf);
+ 	}
+@@ -2142,9 +2136,7 @@ gksu_su_fuller (GksuContext *context,
+ 	{
+ 	  int retval = 0;
+ 
+-	  /* Red Hat's su shows the full path to su in its error messages. */
+-	  if (!strncmp (buf, "su:", 3) ||
+-	      !strncmp (buf, "/bin/su:", 7))
++	  if (!strncmp (buf, "su", 2))
+ 	    {
+ 	      gchar **strings;
+ 
+@@ -2155,11 +2147,7 @@ gksu_su_fuller (GksuContext *context,
+ 		}
+ 
+ 	      strings = g_strsplit (buf, ":", 2);
+-
+-	      /* Red Hat and Fedora use 'incorrect password'. */
+-	      if (strings[1] &&
+-	          (g_str_has_prefix(strings[1], " Authentication failure") ||
+-	           g_str_has_prefix(strings[1], " incorrect password")))
++	      if (strings[1] && !strncmp (strings[1], " Authentication failure", 23))
+ 		{
+ 		  if (used_gnome_keyring)
+ 		    g_set_error (error, gksu_quark,
+@@ -2473,12 +2461,6 @@ gksu_sudo_fuller (GksuContext *context,
+ {
+   char **cmd;
+   char buffer[256] = {0};
+-  char *child_stderr = NULL;
+-  /* This command is used to gain a token */
+-  char *const verifycmd[] =
+-    {
+-      "/usr/bin/sudo", "-p", "GNOME_SUDO_PASS", "-v", NULL
+-    };
+   int argcount = 8;
+   int i, j;
+ 
+@@ -2489,8 +2471,9 @@ gksu_sudo_fuller (GksuContext *context,
+ 
+   pid_t pid;
+   int status;
+-  FILE *fdfile = NULL;
+-  int fdpty = -1;
++  FILE *infile, *outfile;
++  int parent_pipe[2];	/* For talking to the parent */
++  int child_pipe[2];	/* For talking to the child */
+ 
+   context->sudo_mode = TRUE;
+ 
+@@ -2565,10 +2548,6 @@ gksu_sudo_fuller (GksuContext *context,
+   cmd[argcount] = g_strdup("-S");
+   argcount++;
+ 
+-  /* Make sudo noninteractive (we should already have a token) */
+-  cmd[argcount] = g_strdup("-n");
+-  argcount++;
+-
+   /* Make sudo use next arg as prompt */
+   cmd[argcount] = g_strdup("-p");
+   argcount++;
+@@ -2647,21 +2626,26 @@ gksu_sudo_fuller (GksuContext *context,
+ 	fprintf (stderr, "cmd[%d]: %s\n", i, cmd[i]);
+     }
+ 
+-  pid = forkpty(&fdpty, NULL, NULL, NULL);
+-  if (pid == 0)
++  if ((pipe(parent_pipe)) == -1)
+     {
+-      // Child
+-      setsid();   // make us session leader
+-
+-      execv(verifycmd[0], verifycmd);
++      g_set_error (error, gksu_quark, GKSU_ERROR_PIPE,
++		   _("Error creating pipe: %s"),
++		   strerror(errno));
++      sudo_reset_xauth (context, xauth, xauth_env);
++      return FALSE;
++    }
+ 
+-      g_set_error (error, gksu_quark, GKSU_ERROR_EXEC,
+-		   _("Failed to exec new process: %s"),
++  if ((pipe(child_pipe)) == -1)
++    {
++      g_set_error (error, gksu_quark, GKSU_ERROR_PIPE,
++		   _("Error creating pipe: %s"),
+ 		   strerror(errno));
+       sudo_reset_xauth (context, xauth, xauth_env);
+       return FALSE;
+     }
+-  else if (pid == -1)
++
++  pid = fork();
++  if (pid == -1)
+     {
+       g_set_error (error, gksu_quark, GKSU_ERROR_FORK,
+ 		   _("Failed to fork new process: %s"),
+@@ -2669,26 +2653,56 @@ gksu_sudo_fuller (GksuContext *context,
+       sudo_reset_xauth (context, xauth, xauth_env);
+       return FALSE;
+     }
++  else if (pid == 0)
++    {
++      // Child
++      setsid();   // make us session leader
++      close(child_pipe[1]);
++      dup2(child_pipe[0], STDIN_FILENO);
++      dup2(parent_pipe[1], STDERR_FILENO);
+ 
++      execv(cmd[0], cmd);
++
++      g_set_error (error, gksu_quark, GKSU_ERROR_EXEC,
++		   _("Failed to exec new process: %s"),
++		   strerror(errno));
++      sudo_reset_xauth (context, xauth, xauth_env);
++      return FALSE;
++    }
+   else
+     {
+       gint counter = 0;
+       gchar *cmdline = NULL;
+-      struct termios tio;
+ 
+       // Parent
+-      fdfile = fdopen(fdpty, "w+");
++      close(parent_pipe[1]);
+ 
+-      /* make sure we notice that ECHO is turned off, if it gets
+-         turned off */
+-      tcgetattr (fdpty, &tio);
+-      for (counter = 0; (tio.c_lflag & ECHO) && counter < 15; counter++)
+-      {
+-        usleep (1000);
+-        tcgetattr (fdpty, &tio);
+-      }
++      infile = fdopen(parent_pipe[0], "r");
++      if (!infile)
++	{
++	  g_set_error (error, gksu_quark, GKSU_ERROR_PIPE,
++		       _("Error opening pipe: %s"),
++		       strerror(errno));
++	  sudo_reset_xauth (context, xauth, xauth_env);
++	  return FALSE;
++	}
+ 
+-      fcntl (fdpty, F_SETFL, O_NONBLOCK);
++      outfile = fdopen(child_pipe[1], "w");
++      if (!outfile)
++	{
++	  g_set_error (error, gksu_quark, GKSU_ERROR_PIPE,
++		       _("Error opening pipe: %s"),
++		       strerror(errno));
++	  sudo_reset_xauth (context, xauth, xauth_env);
++	  return FALSE;
++	}
++
++      /*
++	we are expecting to receive a GNOME_SUDO_PASS
++	if we don't there are two possibilities: an error
++	or a password is not needed
++      */
++      fcntl (parent_pipe[0], F_SETFL, O_NONBLOCK);
+ 
+       { /* no matter if we can read, since we're using
+ 	   O_NONBLOCK; this is just to avoid the prompt
+@@ -2697,11 +2711,11 @@ gksu_sudo_fuller (GksuContext *context,
+ 	struct timeval tv;
+ 
+ 	FD_ZERO(&rfds);
+-	FD_SET(fdpty, &rfds);
++	FD_SET(parent_pipe[0], &rfds);
+ 	tv.tv_sec = 1;
+ 	tv.tv_usec = 0;
+ 
+-	select (fdpty + 1, &rfds, NULL, NULL, &tv);
++	select (parent_pipe[0] + 1, &rfds, NULL, NULL, &tv);
+       }
+ 
+       /* Try hard to find the prompt; it may happen that we're
+@@ -2713,7 +2727,7 @@ gksu_sudo_fuller (GksuContext *context,
+ 	  if (strncmp (buffer, "GNOME_SUDO_PASS", 15) == 0)
+ 	    break;
+ 
+-	  read_line (fdpty, buffer, 256);
++	  read_line (parent_pipe[0], buffer, 256);
+ 
+ 	  if (context->debug)
+ 	    fprintf (stderr, "buffer: -%s-\n", buffer);
+@@ -2747,17 +2761,18 @@ gksu_sudo_fuller (GksuContext *context,
+ 
+ 	  usleep (1000);
+ 
+-	  write (fdpty, password, strlen(password) + 1);
+-	  write (fdpty, "\n", 1);
++	  fprintf (outfile, "%s\n", password);
++	  fclose (outfile);
+ 
+ 	  nullify_password (password);
+ 
+-	  fcntl(fdpty, F_SETFL, fcntl(fdpty, F_GETFL) & ~O_NONBLOCK);
++	  /* turn NONBLOCK off */
++	  fcntl(parent_pipe[0], F_SETFL, fcntl(parent_pipe[0], F_GETFL) & ~O_NONBLOCK);
+ 	  /* ignore the first newline that comes right after sudo receives
+ 	     the password */
+-	  fgets (buffer, 255, fdfile);
+-	  /* this is the status we are interested in */
+-	  fgets (buffer, 255, fdfile);
++	  fgets (buffer, 255, infile);
++	  /* this is the status we are interessted in */
++	  fgets (buffer, 255, infile);
+ 	}
+       else
+ 	{
+@@ -2766,7 +2781,7 @@ gksu_sudo_fuller (GksuContext *context,
+ 	    fprintf (stderr, "No password prompt found; we'll assume we don't need a password.\n");
+ 
+           /* turn NONBLOCK off, also if have no prompt */
+-          fcntl(fdpty, F_SETFL, fcntl(fdpty, F_GETFL) & ~O_NONBLOCK);
++          fcntl(parent_pipe[0], F_SETFL, fcntl(parent_pipe[0], F_GETFL) & ~O_NONBLOCK);
+ 
+ 	  should_display = gconf_client_get_bool (context->gconf_client,
+ 						  BASE_PATH "display-no-pass-info", NULL);
+@@ -2785,9 +2800,14 @@ gksu_sudo_fuller (GksuContext *context,
+ 	  fprintf (stderr, "%s", buffer);
+ 	}
+ 
+-      if (g_str_has_prefix (buffer, "Sorry, try again."))
++      if (!strcmp (buffer, "Sorry, try again.\n"))
+ 	g_set_error (error, gksu_quark, GKSU_ERROR_WRONGPASS,
+ 		     _("Wrong password."));
++      else if (!strncmp (buffer, "Sorry, user ", 12))
++	g_set_error (error, gksu_quark, GKSU_ERROR_NOT_ALLOWED,
++		     _("The underlying authorization mechanism (sudo) "
++		       "does not allow you to run this program. Contact "
++		       "the system administrator."));
+       else
+ 	{
+ 	  gchar *haystack = buffer;
+@@ -2805,10 +2825,6 @@ gksu_sudo_fuller (GksuContext *context,
+ 	    }
+ 	}
+ 
+-      /* If we have an error, let's just stop sudo right there. */
+-      if (error)
+-        close(fdpty);
+-
+       cmdline = g_strdup("sudo");
+       /* wait for the child process to end or become something other
+ 	 than sudo */
+@@ -2825,23 +2841,17 @@ gksu_sudo_fuller (GksuContext *context,
+       if (context->sn_context)
+ 	gksu_context_launch_complete (context);
+ 
++      while (read (parent_pipe[0], buffer, 255) > 0)
++	{
++	  fprintf (stderr, "%s", buffer);
++	  bzero(buffer, 256);
++	}
++
+       /* if the process is still active waitpid() on it */
+       if (pid_exited != pid)
+ 	waitpid(pid, &status, 0);
+       sudo_reset_xauth (context, xauth, xauth_env);
+ 
+-      /*
+-       * Did token acquisition succeed? If so, spawn sudo in
+-       * non-interactive mode. It should either succeed or die
+-       * immediately if you're not allowed to run the command.
+-       */
+-      if (WEXITSTATUS(status) == 0)
+-        {
+-          g_spawn_sync(NULL, cmd, NULL, 0, NULL, NULL,
+-                       NULL, &child_stderr, &status,
+-                       error);
+-        }
+-
+       if (exit_status)
+       {
+       	if (WIFEXITED(status)) {
+@@ -2853,13 +2863,6 @@ gksu_sudo_fuller (GksuContext *context,
+ 
+       if (WEXITSTATUS(status))
+ 	{
+-          if (g_str_has_prefix(child_stderr, "Sorry, user "))
+-            {
+-              g_set_error (error, gksu_quark, GKSU_ERROR_NOT_ALLOWED,
+-                           _("The underlying authorization mechanism (sudo) "
+-                             "does not allow you to run this program. Contact "
+-                             "the system administrator."));
+-            }
+ 	  if(cmdline)
+ 	    {
+ 	      /* sudo already exec()ed something else, don't report
+@@ -2868,7 +2871,6 @@ gksu_sudo_fuller (GksuContext *context,
+ 	      if (!g_str_has_suffix (cmdline, "sudo"))
+ 		{
+ 		  g_free (cmdline);
+-		  g_free (child_stderr);
+ 		  return FALSE;
+ 		}
+ 	      g_free (cmdline);
+@@ -2881,11 +2883,11 @@ gksu_sudo_fuller (GksuContext *context,
+ 	}
+     }
+ 
+-  fprintf(stderr, child_stderr);
+-  g_free(child_stderr);
+-
+   /* if error is set we have found an error condition */
+-  return (error == NULL);
++  if (error)
++    return FALSE;
++
++  return TRUE;
+ }
+ 
+ /**
-- 
cgit v0.12


From 89f4822308f3985112a7dbc62bcd68e4081e1961 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Thu, 11 Nov 2010 19:41:22 +0000
Subject: spidermonkey: recompile

---
 abs/extra/spidermonkey/PKGBUILD                    | 30 ++++++++++++----------
 abs/extra/spidermonkey/header.patch                | 12 ---------
 abs/extra/spidermonkey/spidermonkey-Makefile.patch | 22 ++++++++++++++++
 3 files changed, 39 insertions(+), 25 deletions(-)
 delete mode 100644 abs/extra/spidermonkey/header.patch
 create mode 100644 abs/extra/spidermonkey/spidermonkey-Makefile.patch

diff --git a/abs/extra/spidermonkey/PKGBUILD b/abs/extra/spidermonkey/PKGBUILD
index 3a44af3..e923cbe 100644
--- a/abs/extra/spidermonkey/PKGBUILD
+++ b/abs/extra/spidermonkey/PKGBUILD
@@ -1,27 +1,31 @@
+# $Id: PKGBUILD 55903 2009-10-15 23:18:35Z andrea $
+# Contributor: Aaron Griffin <aaron@archlinux.org>
+
 pkgname=spidermonkey
 pkgver=1.7.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Mozilla's C implementation of JavaScript."
 arch=("i686" "x86_64")
 url="http://www.mozilla.org/js/spidermonkey/"
 license=('MPL' 'GPL' 'LGPL')
 depends=('nspr')
-options=('!makeflags' 'force')
+options=('!makeflags')
 source=("http://ftp.mozilla.org/pub/mozilla.org/js/js-$pkgver.tar.gz" \
-	"spidermonkey-1.7-threadsafe.patch" "header.patch")
-md5sums=('5571134c3863686b623ebe4e6b1f6fe6' 'b2ef9be017b6aa1857354b5223975a4f')
+	"spidermonkey-1.7-threadsafe.patch" "spidermonkey-Makefile.patch")
+md5sums=('5571134c3863686b623ebe4e6b1f6fe6'
+	'b2ef9be017b6aa1857354b5223975a4f'
+	'161d4c0f2c604d15cba29dab60b1f7a7')
 
-build()
-{
-  cd $startdir/src/js/src
+build() {
+  cd "$srcdir/js/src"
+  patch -p0 < "$srcdir/spidermonkey-Makefile.patch" || return 1
+  sed -i 's|include|include/js|' rules.mk || return 1
   # fix for the lib location
   [ "$CARCH" = "x86_64" ] && (sed -i -e "s:lib64:lib:g" config.mk || return 1)
   # patch Makefile for threadsafe support with native nspr
-  patch -p2 -i $startdir/src/spidermonkey-1.7-threadsafe.patch || return 1
-  patch -p2 -i $startdir/src/header.patch || return 1
+  patch -p2 -i "$srcdir/spidermonkey-1.7-threadsafe.patch" || return 1
+  # FS#16673
+  export CFLAGS="${CFLAGS} -DJS_C_STRINGS_ARE_UTF8"
   # build - threadsafe
-  make -f Makefile.ref BUILD_OPT=1 JS_THREADSAFE=1 DIST=$startdir/pkg/usr all export || return 1
-  # install
-  mkdir -p $startdir/pkg/usr/include/js
-  mv $startdir/pkg/usr/include/*.h $startdir/pkg/usr/include/js/
+  make -f Makefile.ref BUILD_OPT=1 JS_THREADSAFE=1 DIST="$pkgdir/usr" all export || return 1
 }
diff --git a/abs/extra/spidermonkey/header.patch b/abs/extra/spidermonkey/header.patch
deleted file mode 100644
index b69caae..0000000
--- a/abs/extra/spidermonkey/header.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -aur js.orig/src/Makefile.ref js/src/Makefile.ref
---- js.orig/src/Makefile.ref	2008-07-18 21:05:37.154351682 +0800
-+++ js/src/Makefile.ref	2008-07-18 21:06:39.291061725 +0800
-@@ -188,6 +188,8 @@
- 	jsstr.h		\
- 	jsxdrapi.h	\
- 	jsxml.h		\
-+	jsutil.h	\
-+	jsprf.h		\
- 	$(NULL)
- 
- API_HFILES =		\
diff --git a/abs/extra/spidermonkey/spidermonkey-Makefile.patch b/abs/extra/spidermonkey/spidermonkey-Makefile.patch
new file mode 100644
index 0000000..abf1f31
--- /dev/null
+++ b/abs/extra/spidermonkey/spidermonkey-Makefile.patch
@@ -0,0 +1,22 @@
+*** Makefile.ref.orig	2009-02-16 09:56:29.000000000 -0600
+--- Makefile.ref	2009-02-16 09:58:59.000000000 -0600
+***************
+*** 169,184 ****
+--- 169,185 ----
+  	jstypes.h	\
+  	jsprvtd.h	\
+  	jspubtd.h	\
+  	jsregexp.h	\
+  	jsscan.h	\
+  	jsscope.h	\
+  	jsscript.h	\
+  	jsstr.h		\
++ 	jsutil.h        \
+  	jsxdrapi.h	\
+  	jsxml.h		\
+  	$(NULL)
+  
+  API_HFILES =		\
+  	jsapi.h		\
+  	jsdbgapi.h	\
+  	$(NULL)
-- 
cgit v0.12


From c103226eaf0601de087b4c1405cf0ebeb3517e29 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Thu, 11 Nov 2010 19:47:23 +0000
Subject: tcl/tk: updated to 8.5.9

---
 abs/core/tcl/PKGBUILD | 35 +++++++++++++++++++++--------------
 abs/core/tk/PKGBUILD  | 36 +++++++++++++++++++++++++-----------
 2 files changed, 46 insertions(+), 25 deletions(-)

diff --git a/abs/core/tcl/PKGBUILD b/abs/core/tcl/PKGBUILD
index bcf3ab2..acce9e8 100644
--- a/abs/core/tcl/PKGBUILD
+++ b/abs/core/tcl/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 22246 2008-12-24 10:50:10Z allan $
+# $Id: PKGBUILD 90377 2010-09-11 03:54:51Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Committer: Judd Vinet <jvinet@zeroflux.org>
 
 pkgname=tcl
-pkgver=8.5.6
+pkgver=8.5.9
 pkgrel=1
 pkgdesc="The Tcl scripting language"
 arch=('i686' 'x86_64')
+url="http://tcl.sourceforge.net/"
 license=('custom')
 depends=('glibc')
 source=(http://downloads.sourceforge.net/sourceforge/tcl/tcl${pkgver}-src.tar.gz)
-url="http://tcl.sourceforge.net/"
-md5sums=('d0b0b3ff7600ff63135c710b575265cd')
+md5sums=('8512d8db3233041dd68a81476906012a')
 
 build() {
   cd ${srcdir}/tcl${pkgver}/unix
@@ -22,20 +22,27 @@ build() {
     ./configure --prefix=/usr --mandir=/usr/share/man --enable-threads --disable-64bit
   fi
   
-  make || return 1
+  make
+}
+
+package()
+{
+  cd ${srcdir}/tcl${pkgver}/unix
+  
   make INSTALL_ROOT=${pkgdir} install install-private-headers
   ln -sf tclsh8.5 ${pkgdir}/usr/bin/tclsh
+  
   # install license
   install -Dm644 ../license.terms ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 
-  # remove buildroot traces / fixes #3602
+  # remove buildroot traces
   sed -i \
-  -e "s,^TCL_BUILD_LIB_SPEC='-L.*/unix,TCL_BUILD_LIB_SPEC='-L/usr/lib," \
-  -e "s,^TCL_SRC_DIR='.*',TCL_SRC_DIR='/usr/include'," \
-  -e "s,^TCL_BUILD_STUB_LIB_SPEC='-L.*/unix,TCL_BUILD_STUB_LIB_SPEC='-L/usr/lib," \
-  -e "s,^TCL_BUILD_STUB_LIB_PATH='.*/unix,TCL_BUILD_STUB_LIB_PATH='/usr/lib," \
-  -e "s,^TCL_LIB_FILE='libtcl8.5..TCL_DBGX..so',TCL_LIB_FILE=\"libtcl8.5\$\{TCL_DBGX\}.so\"," \
-  -e "s,^TCL_CC_SEARCH_FLAGS='\(.*\)',TCL_CC_SEARCH_FLAGS='\1:/usr/lib'," \
-  -e "s,^TCL_LD_SEARCH_FLAGS='\(.*\)',TCL_LD_SEARCH_FLAGS='\1:/usr/lib'," \
-  ${pkgdir}/usr/lib/tclConfig.sh
+    -e "s,^TCL_BUILD_LIB_SPEC='-L.*/unix,TCL_BUILD_LIB_SPEC='-L/usr/lib," \
+    -e "s,^TCL_SRC_DIR='.*',TCL_SRC_DIR='/usr/include'," \
+    -e "s,^TCL_BUILD_STUB_LIB_SPEC='-L.*/unix,TCL_BUILD_STUB_LIB_SPEC='-L/usr/lib," \
+    -e "s,^TCL_BUILD_STUB_LIB_PATH='.*/unix,TCL_BUILD_STUB_LIB_PATH='/usr/lib," \
+    -e "s,^TCL_LIB_FILE='libtcl8.5..TCL_DBGX..so',TCL_LIB_FILE=\"libtcl8.5\$\{TCL_DBGX\}.so\"," \
+    -e "s,^TCL_CC_SEARCH_FLAGS='\(.*\)',TCL_CC_SEARCH_FLAGS='\1:/usr/lib'," \
+    -e "s,^TCL_LD_SEARCH_FLAGS='\(.*\)',TCL_LD_SEARCH_FLAGS='\1:/usr/lib'," \
+    ${pkgdir}/usr/lib/tclConfig.sh
 }
diff --git a/abs/core/tk/PKGBUILD b/abs/core/tk/PKGBUILD
index 3c75949..4b18070 100644
--- a/abs/core/tk/PKGBUILD
+++ b/abs/core/tk/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 22248 2008-12-24 10:55:13Z allan $
+# $Id: PKGBUILD 90372 2010-09-11 03:52:30Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
 
 pkgname=tk
-pkgver=8.5.6
+pkgver=8.5.9
 pkgrel=1
 pkgdesc="A windowing toolkit for use with tcl"
 arch=('i686' 'x86_64')
@@ -11,10 +11,11 @@ url="http://tcl.sourceforge.net/"
 license=('custom')
 depends=("tcl=${pkgver}" 'libxss' 'libxft')
 source=(http://downloads.sourceforge.net/sourceforge/tcl/tk${pkgver}-src.tar.gz)
-md5sums=('7da2e00adddc7eed6080df904579d94e')
+md5sums=('7cdeb9feb61593f58a0ae61f2497580e')
 
 build() {
-  cd ${srcdir}/tk${pkgver}/unix  
+  cd ${srcdir}/tk${pkgver}/unix
+
   if [ "$CARCH" = "x86_64" ]; then
     ./configure --prefix=/usr --mandir=/usr/share/man --enable-threads --enable-64bit
   else
@@ -22,16 +23,29 @@ build() {
   fi
   
   make
+}
+
+package() {
+  cd ${srcdir}/tk${pkgver}/unix
+
   make INSTALL_ROOT=${pkgdir} install install-private-headers
   ln -sf wish8.5 ${pkgdir}/usr/bin/wish
+  
+  # install private headers (FS#14388)
+  cd ${srcdir}/tk${pkgver}
+  for dir in compat generic generic/ttk unix; do
+    install -dm755 ${pkgdir}/usr/include/tk-private/$dir
+    install -m644 -t ${pkgdir}/usr/include/tk-private/$dir $dir/*.h
+  done
+
   # install license
-  install -Dm644 ../license.terms ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+  install -Dm644 license.terms ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 
-  # remove buildroot traces / fixes #3602
+  # remove buildroot traces
   sed -i \
-  -e "s,^TK_BUILD_LIB_SPEC='-L.*/unix,TK_BUILD_LIB_SPEC='-L/usr/lib," \
-  -e "s,^TK_SRC_DIR='.*',TK_SRC_DIR='/usr/include'," \
-  -e "s,^TK_BUILD_STUB_LIB_SPEC='-L.*/unix,TK_BUILD_STUB_LIB_SPEC='-L/usr/lib," \
-  -e "s,^TK_BUILD_STUB_LIB_PATH='.*/unix,TK_BUILD_STUB_LIB_PATH='/usr/lib," \
-  ${pkgdir}/usr/lib/tkConfig.sh
+    -e "s,^TK_BUILD_LIB_SPEC='-L.*/unix,TK_BUILD_LIB_SPEC='-L/usr/lib," \
+    -e "s,^TK_SRC_DIR='.*',TK_SRC_DIR='/usr/include'," \
+    -e "s,^TK_BUILD_STUB_LIB_SPEC='-L.*/unix,TK_BUILD_STUB_LIB_SPEC='-L/usr/lib," \
+    -e "s,^TK_BUILD_STUB_LIB_PATH='.*/unix,TK_BUILD_STUB_LIB_PATH='/usr/lib," \
+    ${pkgdir}/usr/lib/tkConfig.sh
 }
-- 
cgit v0.12


From f009cfa0e7edf16a9dd404f87aa499ebde6ed0f0 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Thu, 11 Nov 2010 19:47:46 +0000
Subject: gd: updaed to 2.0.36

---
 abs/extra/gd/ChangeLog      | 11 +++++++++++
 abs/extra/gd/PKGBUILD       | 25 ++++++++++++++-----------
 abs/extra/gd/libpng14.patch | 12 ++++++++++++
 3 files changed, 37 insertions(+), 11 deletions(-)
 create mode 100644 abs/extra/gd/ChangeLog
 create mode 100644 abs/extra/gd/libpng14.patch

diff --git a/abs/extra/gd/ChangeLog b/abs/extra/gd/ChangeLog
new file mode 100644
index 0000000..813a49e
--- /dev/null
+++ b/abs/extra/gd/ChangeLog
@@ -0,0 +1,11 @@
+2010-01-17  Ionut Biru <ionut@archlinux.ro>
+
+	* gd 2.0.36RC1-2
+	* libpng 1.4.0/libjpeg 8 rebuild
+
+2009-10-30  Eric Belanger  <eric@archlinux.org>
+
+	* gd 2.0.36RC1-1
+	* Upstream update
+	* Added perl depends
+	* Added ChangeLog
diff --git a/abs/extra/gd/PKGBUILD b/abs/extra/gd/PKGBUILD
index 3df77a1..4580855 100644
--- a/abs/extra/gd/PKGBUILD
+++ b/abs/extra/gd/PKGBUILD
@@ -1,23 +1,26 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
+# $Id: PKGBUILD 64437 2010-01-20 12:10:30Z ibiru $
 # Maintainer: Eric Belanger <eric@archlinux.org>
 
 pkgname=gd
-pkgver=2.0.35
-pkgrel=2
+pkgver=2.0.36RC1
+pkgrel=3
 pkgdesc="Library for the dynamic creation of images by programmers"
 arch=('i686' 'x86_64')
 url="http://www.libgd.org/"
 license=('custom')
-depends=('libpng>=1.2.16' 'fontconfig>=2.4.2' 'libjpeg')
+depends=('perl' 'libpng>=1.4.0' 'fontconfig' 'libjpeg>=8')
 options=('!libtool')
-source=(http://www.libgd.org/releases/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('6c6c3dbb7bf079e0bb5fbbfd3bb8a71c')
-sha1sums=('ccf34a610abff2dbf133a20c4d2a4aa94939018a')
+source=(http://www.libgd.org/releases/${pkgname}-${pkgver}.tar.bz2 libpng14.patch)
+md5sums=('e876979ca3130623a4e7866d9579171a'
+         '7921556f4960e8d66cf4fb67ea7101b5')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --without-xpm
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  patch -Np1 -i ${srcdir}/libpng14.patch || return 1
+
+  ./configure --prefix=/usr --without-xpm || return 1
   make || return 1
-  make DESTDIR=${startdir}/pkg install
-  install -D -m644 COPYING $startdir/pkg/usr/share/licenses/$pkgname/COPYING
+  make DESTDIR="${pkgdir}" install || return 1
+  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" || return 1
 }
diff --git a/abs/extra/gd/libpng14.patch b/abs/extra/gd/libpng14.patch
new file mode 100644
index 0000000..19a3fda
--- /dev/null
+++ b/abs/extra/gd/libpng14.patch
@@ -0,0 +1,12 @@
+diff -Nur gd-2.0.36RC1.orig/gd_png.c gd-2.0.36RC1/gd_png.c
+--- gd-2.0.36RC1.orig/gd_png.c	2007-11-27 10:30:34.000000000 +0200
++++ gd-2.0.36RC1/gd_png.c	2010-01-17 17:14:11.000000000 +0200
+@@ -151,7 +151,7 @@
+ 	return NULL;
+   }
+ 
+-	if (!png_check_sig (sig, 8)) { /* bad signature */
++	if (png_sig_cmp (sig, 0, 8)) { /* bad signature */
+     	return NULL;		/* bad signature */
+ 	}
+ 
-- 
cgit v0.12


From 5665dcf3c23a6da68e08e2f08899b8f1724c545d Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Thu, 11 Nov 2010 19:48:22 +0000
Subject: giflib: no change, just a recompile

---
 abs/core/giflib/PKGBUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/abs/core/giflib/PKGBUILD b/abs/core/giflib/PKGBUILD
index ef32328..6bc0de0 100644
--- a/abs/core/giflib/PKGBUILD
+++ b/abs/core/giflib/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=giflib
 pkgver=4.1.6
-pkgrel=4
+pkgrel=3
 pkgdesc="A library for reading and writing gif images"
 url="http://sourceforge.net/projects/giflib/"
 arch=('i686' 'x86_64')
-- 
cgit v0.12


From 8014e8344b6f1a789a938fccc3b356a525ce8207 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Thu, 11 Nov 2010 19:51:34 +0000
Subject: unzip: archsync, no functional change

---
 abs/core/unzip/PKGBUILD | 50 ++++++++++++++++++++++++++++---------------------
 1 file changed, 29 insertions(+), 21 deletions(-)

diff --git a/abs/core/unzip/PKGBUILD b/abs/core/unzip/PKGBUILD
index 730beb9..77608dd 100644
--- a/abs/core/unzip/PKGBUILD
+++ b/abs/core/unzip/PKGBUILD
@@ -1,32 +1,40 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
-# Maintainer: Dan McGee <dan@archlinux.org>
+# $Id: PKGBUILD 70615 2010-02-27 15:46:11Z thayer $
+# Maintainer: Thayer Williams <thayer@archlinux.org>
+# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
+# Contributor: Robson Peixoto
 
 pkgname=unzip
-pkgver=6.00
-_pkgver=60
-pkgrel=1
+pkgver=6.0
+pkgrel=5
 pkgdesc="Unpacks .zip archives such as those made by PKZIP"
 arch=('i686' 'x86_64')
 url="http://www.info-zip.org/"
 license=('custom')
-depends=('glibc')
-source=(http://downloads.sourceforge.net/infozip/${pkgname}${_pkgver}.tar.gz)
+depends=('bzip2' 'bash')
+source=('http://downloads.sourceforge.net/infozip/unzip60.tar.gz')
+md5sums=('62b490407489521db863b523a7f86375')
 
 build() {
-  cd $startdir/src/${pkgname}${_pkgver}
+  cd ${srcdir}/${pkgname}${pkgver/./}
+
+  # set CFLAGS -- from Debian
+  export CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64 -DACORN_FTYPE_NFS \
+  -DWILD_STOP_AT_DIR -DLARGE_FILE_SUPPORT -DUNICODE_SUPPORT \
+  -DUNICODE_WCHAR -DUTF8_MAYBE_NATIVE -DNO_LCHMOD -DDATE_FORMAT=DF_YMD \
+  -DUSE_BZIP2 -DNATIVE"
+
+  # make -- from Debian
+  make -f unix/Makefile LOCAL_UNZIP="$CFLAGS" prefix=/usr LF2="" \
+  D_USE_BZ2=-DUSE_BZIP2 L_BZ2=-lbz2 unzips || return 1
 
-  export CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64"
-  if [ "${CARCH}" = "i686" ]; then
-    make -f unix/Makefile LOCAL_UNZIP="$CFLAGS" prefix=/usr linux || return 1
-  else
-    make -f unix/Makefile LOCAL_UNZIP="$CFLAGS" prefix=/usr linux_noasm || return 1
-  fi
-  make -f unix/Makefile prefix=$startdir/pkg/usr install
+  # install -- from Debian
+  make -f unix/Makefile prefix=${pkgdir}/usr INSTALL_PROGRAM="install" install || return 1
 
-  install -Dm644 LICENSE $startdir/pkg/usr/share/licenses/unzip/LICENSE
+  # install the license file
+  install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/unzip/LICENSE || return 1
+
+  # fix manpage location
+  mkdir -p ${pkgdir}/usr/share || return 1
+  mv ${pkgdir}/usr/man ${pkgdir}/usr/share/ || return 1
 }
-md5sums=('62b490407489521db863b523a7f86375'
-         '2de357c2ba84576f38b17aed87915c87'
-         'a4797a1f6e45385f5e021f9f6f2ec0fa'
-         '83c7e79de9618bf7d081dd639dd3dde1')
-md5sums=('62b490407489521db863b523a7f86375')
+
-- 
cgit v0.12

