Updated to version 1.1.4.

Pkgsrc changes:
  - Removed patches patch-aa, patch-ab and patch-ac (integrated upstream).
  - Added explicit version requirements for glib and zlib.
  - HOMEPAGE and MASTER_SITES had moved to a different location.

Changes since version 1.1.1:
============================
** Changes since version 1.1.3

* Add an implementation of xdp_generator_free() for users of the
  libxdelta API.  Previously there were no such users of the 1.x API,
  but Elliot Lee <sopwith@redhat.com> has written a program for
  providing delta operations on RPM files.  See http://@@@

* The man page now documents return values.

** Changes since version 1.1.2

* Correct error message format for the case when gzread fails trying
  to automatically decompress a corrupted GZIP file.  The situation
  itself--corrupt GZIP files--should be dealt with the -p (--pristine)
  option, which disables GZIP file recognition.  Reported by Ben
  Escoto.

* Apply a patch from Klaus Dittrich for building on HPUX with the
  native compiler.  There is now a script called "contrib/build_hpux".

** Changes since version 1.1.1

* This code release is a distant fork of the 2.0 release.  It will
  hopefully be replaced.

* When 'patch' supplies its default TO file name recorded in the
  delta, it still generates a unique file name to avoid overwriting an
  existing copy.  Use the 'xdelta info' command to see what file names
  are contained in the delta.

* The code for writing patches to stdout was broken in the case where
  gzip compression is used.  Writing patches to stdout has therefore
  been disabled.  The problem is a limitation in the gzdopen/gzwrite
  functions provided by zlib--you cannot determine how many bytes have
  been written to the file descriptor without dup-ing the FD
  beforehand and then lseek-ing afterwards, which does not work
  correctly if the output file is not seekable.

* By default, Xdelta uses a hard-coded 16 byte block size.  If you're
  working with large files, try #undef XDELTA_HARDCODE_SIZE in
  xdelta.h then use -s BLOCKSIZE (--blocksize=BLOCKSIZE), which should
  be a power of 2.

* New test program in the 'test' subdirectory, which runs comparisons
  against "diff --rcs -a" and also verifies the "xdelta patch"
  command.

* Incorporate DJGPP patches from Richard Dawe <richdawe@bigfoot.com>.
  You can find his versions directly at:

      ftp://ftp.simtel.net/pub/simtelnet/gnu/djgpp/v2apps/xdlt112b.zip
      ftp://ftp.simtel.net/pub/simtelnet/gnu/djgpp/v2apps/xdlt112s.zip

* Updated xdelta(1) man page.

* Updated autoconf (2.50), automake (1.4-p4), libtool (1.4) scripts,
  which includes updated config.guess and config.sub scripts.

* Correct some backward compatibility issues: strcmp() was not being
  tested == 0 for formats older than 1.0.4.

* Update GLIB version requirement, now 1.2.8.

* We really need support for 64bit file sizes...  perhaps the next
  version?

6 files changed, 11 insertions, 108 deletions

diff --git a/devel/xdelta/Makefile b/devel/xdelta/Makefile
index 7708ced44d0..5752ea4ab3f 100644
--- a/devel/xdelta/Makefile
+++ b/devel/xdelta/Makefile
@@ -1,17 +1,18 @@
-# $NetBSD: Makefile,v 1.33 2008/06/20 01:09:17 joerg Exp $
+# $NetBSD: Makefile,v 1.34 2008/11/08 18:50:56 heinz Exp $
 #
 
-DISTNAME=		xdelta-1.1.1
-PKGREVISION=		3
+DISTNAME=		xdelta-1.1.4
 CATEGORIES=		devel
-MASTER_SITES=		ftp://ftp.xcf.berkeley.edu/pub/xdelta/
+MASTER_SITES=		http://xdelta.googlecode.com/files/
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.xcf.berkeley.edu/~jmacd/xdelta.html
+HOMEPAGE=		http://xdelta.org/
 COMMENT=		Enhanced diff that works on binary files
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+BUILDLINK_API_DEPENDS.glib+=	glib>=1.2.8
+BUILDLINK_API_DEPENDS.zlib+=	zlib>=1.1.3
 USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake
 GNU_CONFIGURE=		yes
diff --git a/devel/xdelta/PLIST b/devel/xdelta/PLIST
index 26b519bea5a..d61073cddfd 100644
--- a/devel/xdelta/PLIST
+++ b/devel/xdelta/PLIST
@@ -1,12 +1,10 @@
-@comment $NetBSD: PLIST,v 1.7 2006/03/31 05:37:09 jlam Exp $
-bin/edsio-comp
+@comment $NetBSD: PLIST,v 1.8 2008/11/08 18:50:56 heinz Exp $
 bin/xdelta
 bin/xdelta-config
 include/edsio.h
 include/edsio_edsio.h
 include/xd_edsio.h
 include/xdelta.h
-info/xdelta.info
 lib/libedsio.la
 lib/libxdelta.la
 man/man1/xdelta.1
diff --git a/devel/xdelta/distinfo b/devel/xdelta/distinfo
index 954ba133016..5d1381c9ef5 100644
--- a/devel/xdelta/distinfo
+++ b/devel/xdelta/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.6 2007/11/07 12:28:59 rillig Exp $
+$NetBSD: distinfo,v 1.7 2008/11/08 18:50:56 heinz Exp $
 
-SHA1 (xdelta-1.1.1.tar.gz) = 47dd23ab2ffbe3effa47889148905bd5f7dd0b67
-RMD160 (xdelta-1.1.1.tar.gz) = ae49badb09ea27634aba1812e56a242978fd7858
-Size (xdelta-1.1.1.tar.gz) = 295398 bytes
-SHA1 (patch-aa) = fa412dd5111f630f76aa6daa39483a00b689d2cd
-SHA1 (patch-ab) = 342dcb9229e62a0239459e2c3d4419409ba58137
-SHA1 (patch-ac) = 5909069f4a4397fd696f6041d50ca63198cf3ddb
+SHA1 (xdelta-1.1.4.tar.gz) = 7cfc3e4ea6b27d199de02906beb6c80a04facb91
+RMD160 (xdelta-1.1.4.tar.gz) = 394a1e46a48328eed951fccb7b4b16b1feb682cc
+Size (xdelta-1.1.4.tar.gz) = 423529 bytes
diff --git a/devel/xdelta/patches/patch-aa b/devel/xdelta/patches/patch-aa
deleted file mode 100644
index b8dd751136e..00000000000
--- a/devel/xdelta/patches/patch-aa
+++ /dev/null
@@ -1,63 +0,0 @@
-$NetBSD: patch-aa,v 1.7 2004/01/29 10:41:17 cjep Exp $
---- xd_edsio.c	2004/01/22 23:08:49	1.1
-+++ xd_edsio.c	2004/01/22 23:11:04
-@@ -220,8 +220,7 @@
-     for (i = 0; i < obj->index_len; i += 1)
-       {
-         print_spaces (indent_spaces);
--        g_print ("%d:
--", i);
-+        g_print ("%d:\n", i);
-         print_spaces (indent_spaces);
-       serializeio_print_xdeltachecksum_obj (& (obj->index[i]), indent_spaces + 2);
-       print_spaces (indent_spaces);
-@@ -505,8 +504,7 @@
-     for (i = 0; i < obj->source_info_len; i += 1)
-       {
-         print_spaces (indent_spaces);
--        g_print ("%d:
--", i);
-+        g_print ("%d:\n", i);
-         print_spaces (indent_spaces);
-       serializeio_print_xdeltasourceinfo_obj ((obj->source_info[i]), indent_spaces + 2);
-       print_spaces (indent_spaces);
-@@ -522,8 +520,7 @@
-     for (i = 0; i < obj->inst_len; i += 1)
-       {
-         print_spaces (indent_spaces);
--        g_print ("%d:
--", i);
-+        g_print ("%d:\n", i);
-         print_spaces (indent_spaces);
-       serializeio_print_xdeltainstruction_obj (& (obj->inst[i]), indent_spaces + 2);
-       print_spaces (indent_spaces);
-@@ -916,8 +913,7 @@
-     for (i = 0; i < obj->index_len; i += 1)
-       {
-         print_spaces (indent_spaces);
--        g_print ("%d:
--", i);
-+        g_print ("%d:\n", i);
-         print_spaces (indent_spaces);
-       serializeio_print_rsyncindexelt_obj (& (obj->index[i]), indent_spaces + 2);
-       print_spaces (indent_spaces);
-@@ -1195,8 +1191,7 @@
-     for (i = 0; i < obj->source_info_len; i += 1)
-       {
-         print_spaces (indent_spaces);
--        g_print ("%d:
--", i);
-+        g_print ("%d:\n", i);
-         print_spaces (indent_spaces);
-       serializeio_print_version0sourceinfo_obj ((obj->source_info[i]), indent_spaces + 2);
-       print_spaces (indent_spaces);
-@@ -1212,8 +1207,7 @@
-     for (i = 0; i < obj->inst_len; i += 1)
-       {
-         print_spaces (indent_spaces);
--        g_print ("%d:
--", i);
-+        g_print ("%d:\n", i);
-         print_spaces (indent_spaces);
-       serializeio_print_version0instruction_obj (& (obj->inst[i]), indent_spaces + 2);
-       print_spaces (indent_spaces);
diff --git a/devel/xdelta/patches/patch-ab b/devel/xdelta/patches/patch-ab
deleted file mode 100644
index 7ac75ccc020..00000000000
--- a/devel/xdelta/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2007/11/07 12:28:59 rillig Exp $
-
-default.c:297: error: invalid lvalue in assignment
-
---- libedsio/default.c.orig	1999-04-01 12:15:30.000000000 +0200
-+++ libedsio/default.c	2007-11-07 13:25:06.000000000 +0100
-@@ -294,7 +294,7 @@ serializeio_source_alloc (SerialSource* 
- 
-       source->alloc_buf = source->alloc_buf_orig;
- 
--      ALIGN_8 ((long)source->alloc_buf);
-+      ALIGN_8 (*(long*)&source->alloc_buf);
-     }
- 
-   if (len+source->alloc_pos > source->alloc_total)
diff --git a/devel/xdelta/patches/patch-ac b/devel/xdelta/patches/patch-ac
deleted file mode 100644
index 14c0002b99f..00000000000
--- a/devel/xdelta/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2007/11/07 12:28:59 rillig Exp $
-
-xdmain.c:1390: error: static declaration of 'xd_handle_table' follows non-static declaration
-
---- xdmain.c.orig	1999-04-10 02:56:00.000000000 +0200
-+++ xdmain.c	2007-11-07 13:26:28.000000000 +0100
-@@ -49,7 +49,7 @@
- 
- #include "xdelta.h"
- 
--extern HandleFuncTable xd_handle_table;
-+static HandleFuncTable xd_handle_table;
- 
- #define XD_PAGE_SIZE (1<<20)
-