From cc958bdca1eaee0455ae1320a08d19c2477ce8de Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Mon, 14 Aug 2000 18:08:14 +0000
Subject: USE_PKGLIBTOOL -> USE_LIBTOOL. LTCONFIG_OVERRIDE saves a patch. Sort
 PLIST.

---
 devel/xdelta/Makefile         | 25 +++++++++++++------------
 devel/xdelta/files/patch-sum  |  7 +++++--
 devel/xdelta/patches/patch-aa | 20 --------------------
 devel/xdelta/pkg/PLIST        |  9 +++++----
 4 files changed, 23 insertions(+), 38 deletions(-)
 delete mode 100644 devel/xdelta/patches/patch-aa

(limited to 'devel/xdelta')

diff --git a/devel/xdelta/Makefile b/devel/xdelta/Makefile
index 77b07886f5c..1d871ee0803 100644
--- a/devel/xdelta/Makefile
+++ b/devel/xdelta/Makefile
@@ -1,19 +1,20 @@
-# $NetBSD: Makefile,v 1.14 2000/06/13 10:40:25 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2000/08/14 18:08:14 wiz Exp $
 #
 
-DISTNAME=	xdelta-0.22
-CATEGORIES=	devel
-MASTER_SITES=	ftp://www.xcf.berkeley.edu/pub/xdelta/
+DISTNAME=		xdelta-0.22
+CATEGORIES=		devel
+MASTER_SITES=		ftp://www.xcf.berkeley.edu/pub/xdelta/
 
-MAINTAINER=	root@garbled.net
-HOMEPAGE=	http://scam.XCF.Berkeley.EDU/~jmacd/xdelta.html
+MAINTAINER=		root@garbled.net
+HOMEPAGE=		http://scam.XCF.Berkeley.EDU/~jmacd/xdelta.html
 
-DEPENDS+=	glib-1.2.*:../../devel/glib
-DEPENDS+=	gdbm>=1.7.3:../../databases/gdbm
+DEPENDS+=		glib-1.2.*:../../devel/glib
+DEPENDS+=		gdbm>=1.7.3:../../databases/gdbm
 
-USE_PKGLIBTOOL=	yes
-GNU_CONFIGURE=	yes
-LDFLAGS+=	"-L${LOCALBASE}/lib"
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include"
+USE_LIBTOOL=		yes
+LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
+GNU_CONFIGURE=		yes
+LDFLAGS+=		"-L${LOCALBASE}/lib"
+CONFIGURE_ENV+=		CPPFLAGS="-I${LOCALBASE}/include"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/xdelta/files/patch-sum b/devel/xdelta/files/patch-sum
index 23c37ff210d..a14ad3f5965 100644
--- a/devel/xdelta/files/patch-sum
+++ b/devel/xdelta/files/patch-sum
@@ -1,3 +1,6 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 13:50:42 agc Exp $
+$NetBSD: patch-sum,v 1.2 2000/08/14 18:08:20 wiz Exp $
 
-MD5 (patch-aa) = b3be22b5016023673961f5a74d17d8ef
+This placeholder file is generated by the ``makepatchsum'' target
+whenever the patches directory is empty or missing. Its purpose
+is to ensure that the presence of any obsolete patches will cause
+the proper error to be emitted at build time.
diff --git a/devel/xdelta/patches/patch-aa b/devel/xdelta/patches/patch-aa
deleted file mode 100644
index 60a59f4e64a..00000000000
--- a/devel/xdelta/patches/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-aa,v 1.2 1998/10/02 14:55:03 tv Exp $
-
---- configure.orig	Fri Oct  2 10:43:32 1998
-+++ configure	Fri Oct  2 10:43:55 1998
-@@ -2244,6 +2244,7 @@
-   echo "$ac_t""no" 1>&6
- fi
- 
-+if false; then
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
- 
-@@ -2289,6 +2290,7 @@
- ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \
- $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
- || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
-+fi
- 
- echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
- echo "configure:2295: checking how to run the C preprocessor" >&5
diff --git a/devel/xdelta/pkg/PLIST b/devel/xdelta/pkg/PLIST
index a052792c6bb..fb4f184059e 100644
--- a/devel/xdelta/pkg/PLIST
+++ b/devel/xdelta/pkg/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1 1998/08/22 13:40:39 garbled Exp $
+@comment $NetBSD: PLIST,v 1.2 2000/08/14 18:08:21 wiz Exp $
 bin/xdelta
-man/man1/xdelta.1
+include/fakeglib.h
 include/xdelta.h
 include/xdeltaconfig.h
-include/fakeglib.h
-lib/libxdelta.so.0.22.0
 lib/libxdelta.a
+lib/libxdelta.la
+lib/libxdelta.so.0.22.0
+man/man1/xdelta.1
-- 
cgit v1.2.3