Needs BSD_MAKE_ENV.

Replaced two patches with one file in files/, to keep the code readable.

4 files changed, 22 insertions, 71 deletions

diff --git a/devel/avltree/Makefile b/devel/avltree/Makefile
index 45612b7b0cd..84100467080 100644
--- a/devel/avltree/Makefile
+++ b/devel/avltree/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/07/17 21:29:38 grant Exp $
+# $NetBSD: Makefile,v 1.7 2006/10/22 07:12:14 rillig Exp $
 
 DISTNAME=	avltree-1.1
 CATEGORIES=	devel
@@ -10,5 +10,11 @@ COMMENT=	In-memory index w/ binary and string keys and key counts
 
 MANCOMPRESSED_IF_MANZ=	yes
 INSTALL_TARGET=	includes install
+MAKE_ENV+=	${BSD_MAKE_ENV}
+
+INSTALLATION_DIRS=	${PKGMANDIR}/cat3 ${PKGMANDIR}/man3
+
+post-extract:
+	cp -f ${FILESDIR}/Makefile ${WRKSRC}/
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/avltree/files/Makefile b/devel/avltree/files/Makefile
new file mode 100644
index 00000000000..5de590c71ad
--- /dev/null
+++ b/devel/avltree/files/Makefile
@@ -0,0 +1,15 @@
+# $NetBSD: Makefile,v 1.1 2006/10/22 07:12:14 rillig Exp $
+#
+
+LIB=		avltree
+SRCS=		avltree.c
+
+SHLIB_MAJOR=	1
+SHLIB_MINOR=	1
+
+MAN=		avltree.3
+INCS=		avltree.h
+
+NOLINT=		yes
+
+.include <bsd.lib.mk>
diff --git a/devel/avltree/patches/patch-aa b/devel/avltree/patches/patch-aa
deleted file mode 100644
index 046f9421a7c..00000000000
--- a/devel/avltree/patches/patch-aa
+++ /dev/null
@@ -1,62 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2002/08/11 09:21:58 agc Exp $
-
---- Makefile.orig	Thu Jan 13 21:04:47 2000
-+++ Makefile
-@@ -1,46 +1,16 @@
--# makefile for:		avltree
--# version:		1.1
--# Date created:		13 January 2000
--# Whom:			Bill Ross <bross@nas.nasa.gov> <ross@cgl.ucsf.edu>
--#
--CC=	cc
-+LIB=	avltree
-+SRCS=	avltree.c
- 
--all:		libavltree.a
-+SHLIB_MAJOR=	1
-+SHLIB_MINOR=	1
- 
--libavltree.a:	avltree.o
--		$(AR) r  libavltree.a avltree.o
--		strip libavltree.a
-+MAN=	avltree.3
-+INCS=	avltree.h
- 
--avltree.o: 	avltree.c avltree.h
--		$(CC) -c avltree.c
-+NOLINT=	# defined
- 
--install:	libavltree.a
--		install -c libavltree.a $(PREFIX)/lib
--		install -c avltree.h $(PREFIX)/include
--		gzip -c avltree.3 > $(PREFIX)/man/man3/avltree.3.gz
-+LIBDIR=		${PREFIX}/lib
-+MANDIR=		${PREFIX}/man
-+INCSDIR=	${PREFIX}/include
- 
--##################
--# additional stuff for test, benchmark; not installed
--
--extras:		test bench1 bench2
--
--test:		test.o libavltree.a
--		$(CC) -o test test.o libavltree.a
--
--bench1:		avl_bench.o libavltree.a
--		$(CC) -o bench1 avl_bench.o libavltree.a
--
--bench2:		avl_bench.o db_avl.o
--		$(CC) -o bench2 avl_bench.o db_avl.o
--
--bench3:		avl_bench.o bp_avl.o
--		$(CC) -o bench3 avl_bench.o bp_avl.o bplus.a
--
--#
--##################
--
--clean:
--		@rm -f *.o
--
--clobber:	clean
--		@rm -f *.a test bench1 bench2 bench3 *.core
-+.include <bsd.lib.mk>
diff --git a/devel/avltree/patches/patch-ab b/devel/avltree/patches/patch-ab
deleted file mode 100644
index 485aa633baf..00000000000
--- a/devel/avltree/patches/patch-ab
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2000/10/01 11:52:24 rh Exp $
-
---- /dev/null	Sun Oct  1 13:42:37 2000
-+++ shlib_version
-@@ -0,0 +1,3 @@
-+#!/bin/sh
-+major=1
-+minor=1