[pkgsrc/trunk]: pkgsrc/devel/avltree Needs BSD_MAKE_ENV.

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2daee1a67fd5
branches:  trunk
changeset: 520474:2daee1a67fd5
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sun Oct 22 07:12:14 2006 +0000

description:
Needs BSD_MAKE_ENV.

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

diffstat:

 devel/avltree/Makefile         |   8 ++++-
 devel/avltree/files/Makefile   |  15 ++++++++++
 devel/avltree/patches/patch-aa |  62 ------------------------------------------
 devel/avltree/patches/patch-ab |   8 -----
 4 files changed, 22 insertions(+), 71 deletions(-)

diffs (118 lines):

diff -r f9ef5deeb8f5 -r 2daee1a67fd5 devel/avltree/Makefile
--- a/devel/avltree/Makefile    Sun Oct 22 07:01:38 2006 +0000
+++ b/devel/avltree/Makefile    Sun Oct 22 07:12:14 2006 +0000
@@ -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 @@
 
 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 -r f9ef5deeb8f5 -r 2daee1a67fd5 devel/avltree/files/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/avltree/files/Makefile      Sun Oct 22 07:12:14 2006 +0000
@@ -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 -r f9ef5deeb8f5 -r 2daee1a67fd5 devel/avltree/patches/patch-aa
--- a/devel/avltree/patches/patch-aa    Sun Oct 22 07:01:38 2006 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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@localhost> <ross%cgl.ucsf.edu@localhost>
--#
--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 -r f9ef5deeb8f5 -r 2daee1a67fd5 devel/avltree/patches/patch-ab
--- a/devel/avltree/patches/patch-ab    Sun Oct 22 07:01:38 2006 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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