- upgrade to xdelta 1.1.1

- change maintainer to ports@openbsd.org

misc/xdelta/Makefile

@@ -1,16 +1,20 @@
-# $OpenBSD: Makefile,v 1.2 1999/10/06 20:47:02 rohee Exp $
+# $OpenBSD: Makefile,v 1.3 1999/12/10 04:02:17 brad Exp $
 # $FreeBSD: Makefile,v 1.10 1998/09/03 00:05:11 jmacd Exp $
-#
-DISTNAME=	xdelta-0.23
+
+DISTNAME=	xdelta-1.1.1
 CATEGORIES=	misc
-
-MAINTAINER=	hannah@mamba.pond.sub.org
-
 MASTER_SITES=	ftp://ftp.xcf.berkeley.edu/pub/xdelta/
 
-BUILD_DEPENDS=  ${PREFIX}/lib/libgdbm.a:${PORTSDIR}/databases/gdbm
+NEED_VERSION=	1.73
+
+MAINTAINER=	ports@openbsd.org
+
+LIB_DEPENDS=	gdbm.2:${PORTSDIR}/databases/gdbm \
+		glib.1.2:${PORTSDIR}/devel/glib
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	CC='gcc -O3 -I${PREFIX}/include' LDFLAGS='-L${PREFIX}/lib'
+CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
+CONFIGURE_ARGS+= --enable-static
+CONFIGURE_ENV=	GLIB_CONFIG="${LOCALBASE}/bin/glib-config"
 
 .include <bsd.port.mk>

misc/xdelta/files/md5

@@ -1,3 +1,3 @@
-MD5 (xdelta-0.23.tar.gz) = feb1c7a066025cba0bbca05c1dd68e60
-RMD160 (xdelta-0.23.tar.gz) = d0a9eea68573dca31d5eaf192a5bbc90d81bc8be
-SHA1 (xdelta-0.23.tar.gz) = 43e99bdc5f532e704f07083eb9865cca06fae01f
+MD5 (xdelta-1.1.1.tar.gz) = eb648e2ac0f281f6bd286860178892ad
+RMD160 (xdelta-1.1.1.tar.gz) = ae49badb09ea27634aba1812e56a242978fd7858
+SHA1 (xdelta-1.1.1.tar.gz) = 47dd23ab2ffbe3effa47889148905bd5f7dd0b67

misc/xdelta/patches/patch-aa

@@ -0,0 +1,43 @@
+--- ltmain.sh.orig	Thu Dec  9 17:55:27 1999
++++ ltmain.sh	Thu Dec  9 17:55:42 1999
+@@ -3326,40 +3326,6 @@
+     # Exit here if they wanted silent mode.
+     test "$show" = : && exit 0
+ 
+-    echo "----------------------------------------------------------------------"
+-    echo "Libraries have been installed in:"
+-    for libdir in $libdirs; do
+-      echo "   $libdir"
+-    done
+-    echo
+-    echo "If you ever happen to want to link against installed libraries"
+-    echo "in a given directory, LIBDIR, you must either use libtool, and"
+-    echo "specify the full pathname of the library, or use \`-LLIBDIR'"
+-    echo "flag during linking and do at least one of the following:"
+-    if test -n "$shlibpath_var"; then
+-      echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
+-      echo "     during execution"
+-    fi
+-    if test -n "$runpath_var"; then
+-      echo "   - add LIBDIR to the \`$runpath_var' environment variable"
+-      echo "     during linking"
+-    fi
+-    if test -n "$hardcode_libdir_flag_spec"; then
+-      libdir=LIBDIR
+-      eval flag=\"$hardcode_libdir_flag_spec\"
+-
+-      echo "   - use the \`$flag' linker flag"
+-    fi
+-    if test -n "$admincmds"; then
+-      echo "   - have your system administrator run these commands:$admincmds"
+-    fi
+-    if test -f /etc/ld.so.conf; then
+-      echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
+-    fi
+-    echo
+-    echo "See any operating system documentation about shared libraries for"
+-    echo "more information, such as the ld(1) and ld.so(8) manual pages."
+-    echo "----------------------------------------------------------------------"
+     exit 0
+     ;;
+ 

misc/xdelta/patches/patch-ab

@@ -0,0 +1,10 @@
+--- ltconfig.orig	Fri Apr  9 20:58:53 1999
++++ ltconfig	Thu Dec  9 18:18:15 1999
+@@ -1796,6 +1796,7 @@
+   library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
+   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+   shlibpath_var=LD_LIBRARY_PATH
++  deplibs_check_method='pass_all'
+   ;;
+ 
+ os2*)

misc/xdelta/patches/patch-ac

@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Thu Dec  9 18:18:46 1999
++++ Makefile.in	Thu Dec  9 18:19:18 1999
+@@ -106,7 +106,7 @@
+ m4datadir = $(datadir)/aclocal
+ m4data_DATA = xdelta.m4
+ 
+-libxdelta_la_LDFLAGS = -version-info 2:0:0
++libxdelta_la_LDFLAGS = -version-info 11:1:0
+ 
+ SER_OUT = xd_edsio.h xd_edsio.c
+ 

misc/xdelta/pkg/PLIST

@@ -1,8 +1,19 @@
-man/man1/xdelta.1
-lib/libxdelta.so.0.22.0
-lib/libxdelta.la
-lib/libxdelta.a
+bin/edsio-comp
 bin/xdelta
+bin/xdelta-config
+include/edsio.h
+include/edsio_edsio.h
+include/xd_edsio.h
 include/xdelta.h
-include/xdeltaconfig.h
-include/fakeglib.h
+@unexec install-info --delete %D/info/xdelta.info %D/info/dir
+info/xdelta.info
+@exec install-info %D/info/xdelta.info %D/info/dir
+lib/libedsio.a
+lib/libedsio.la
+lib/libedsio.so.0.0
+lib/libxdelta.a
+lib/libxdelta.la
+lib/libxdelta.so.11.1
+@exec /sbin/ldconfig -m %B
+man/man1/xdelta.1
+share/aclocal/xdelta.m4

misc/xdelta/pkg/PLIST.noshared

@@ -0,0 +1,16 @@
+bin/edsio-comp
+bin/xdelta
+bin/xdelta-config
+include/edsio.h
+include/edsio_edsio.h
+include/xd_edsio.h
+include/xdelta.h
+@unexec install-info --delete %D/info/xdelta.info %D/info/dir
+info/xdelta.info
+@exec install-info %D/info/xdelta.info %D/info/dir
+lib/libedsio.a
+lib/libedsio.la
+lib/libxdelta.a
+lib/libxdelta.la
+man/man1/xdelta.1
+share/aclocal/xdelta.m4