Update to 1.12. Changes in this version:

	o Added support for DB 4.1.x
	o Included Makefile settings for AIX (David Barroso Berrueta)

Fixes PR pkg/20449 by Dave Burgess.

4 files changed, 35 insertions, 33 deletions

diff --git a/mail/drac/Makefile b/mail/drac/Makefile
index 2f79badaa1a..ce852ca6a63 100644
--- a/mail/drac/Makefile
+++ b/mail/drac/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2002/09/25 19:45:00 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2003/03/09 12:25:53 jmmv Exp $
 #
 
 DISTNAME=	drac
-PKGNAME=	drac-1.11
+PKGNAME=	drac-1.12
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.cc.umanitoba.ca/src/
 EXTRACT_SUFX=   .tar.Z
@@ -15,4 +15,11 @@ DIST_SUBDIR=	${PKGNAME_NOREV}
 WRKSRC=		${WRKDIR}
 USE_BUILDLINK2=	YES
 
+MAKE_ENV+=	MKDIR="${MKDIR}"
+MAKE_ENV+=	INSTALL="${INSTALL}"
+MAKE_ENV+=	RANLIB="${RANLIB}"
+MAKE_ENV+=	EBIN="${LOCALBASE}/libexec"
+MAKE_ENV+=	MAN="${LOCALBASE}/man/man"
+MAKE_ENV+=	EXAMPLES="${LOCALBASE}/share/examples/drac"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/drac/PLIST b/mail/drac/PLIST
index abd9c48e1ba..b14e80e2355 100644
--- a/mail/drac/PLIST
+++ b/mail/drac/PLIST
@@ -1,12 +1,12 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:59:50 zuntum Exp $
-libexec/rpc.dracd
+@comment $NetBSD: PLIST,v 1.2 2003/03/09 12:25:53 jmmv Exp $
 include/drac.h
 lib/libdrac.a
+libexec/rpc.dracd
 man/man3/dracauth.3
 man/man8/rpc.dracd.8
-share/examples/drac/README
 share/examples/drac/INSTALL
-share/examples/drac/testing.c
+share/examples/drac/README
 share/examples/drac/dracd-setup
 share/examples/drac/dracd.allow-sample
+share/examples/drac/testing.c
 @dirrm share/examples/drac
diff --git a/mail/drac/distinfo b/mail/drac/distinfo
index 0c8b2978e85..63507d7b651 100644
--- a/mail/drac/distinfo
+++ b/mail/drac/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2002/09/25 19:40:38 wiz Exp $
+$NetBSD: distinfo,v 1.4 2003/03/09 12:25:53 jmmv Exp $
 
-SHA1 (drac-1.11/drac.tar.Z) = dcf77aafd0f46685d5309e81d552d64c7f7fea06
-Size (drac-1.11/drac.tar.Z) = 19736 bytes
-SHA1 (patch-aa) = 042e88ebea7e589df1c515266d2e6dcb58c5e52f
+SHA1 (drac-1.12/drac.tar.Z) = 2434e7f238ee1212c742705d3653dedec64266f5
+Size (drac-1.12/drac.tar.Z) = 20705 bytes
+SHA1 (patch-aa) = fb56b4681f131a379f42f449bccbd826a0e97e6f
diff --git a/mail/drac/patches/patch-aa b/mail/drac/patches/patch-aa
index 47772beb740..b2566e6cc33 100644
--- a/mail/drac/patches/patch-aa
+++ b/mail/drac/patches/patch-aa
@@ -1,23 +1,19 @@
-$NetBSD: patch-aa,v 1.2 2002/09/25 19:40:38 wiz Exp $
+$NetBSD: patch-aa,v 1.3 2003/03/09 12:25:53 jmmv Exp $
 
---- Makefile.orig	Mon Nov 20 16:35:16 2000
+--- Makefile.orig	2003-01-12 20:45:12.000000000 +0000
 +++ Makefile
-@@ -5,9 +5,11 @@
+@@ -5,10 +5,6 @@
  
  # Paths
  
 -INSTALL = /usr/ucb/install
 -EBIN = /usr/local/sbin
 -MAN = /usr/local/man/man
-+MKDIR = /bin/mkdir
-+INSTALL = /usr/bin/install
-+EBIN = $(LOCALBASE)/libexec
-+MAN = $(LOCALBASE)/man/man
-+EXAMPLES = $(LOCALBASE)/share/examples/drac
- 
+-
  # OS-Dependant settings
  
-@@ -33,24 +35,28 @@ MAN = /usr/local/man/man
+ # Choose one of this pair...
+@@ -33,26 +29,22 @@ MAN = /usr/local/man/man
  # -DCIDR_KEY	# keys in CIDR format
  # -DTERM_KD	# keys and data nul-terminated
  
@@ -25,25 +21,21 @@ $NetBSD: patch-aa,v 1.2 2002/09/25 19:40:38 wiz Exp $
 +DEFS = -DSOCK_RPC -DFCNTL_LOCK -DGETHOST -DDASH_C
  
  # Compiler flags 
- CC = cc
+-CC = cc
 -RANLIB = :
--CFLAGS = $(DEFS) -g -I/usr/local/src/db/db-3.1.17/build_unix
-+RANLIB = ranlib
-+#CFLAGS = $(DEFS) -g -I/usr/local/src/db/db-3.1.17/build_unix
+-CFLAGS = $(DEFS) -g -I/usr/local/src/db/db-4.1.25/build_unix
++CFLAGS += $(DEFS)
+ #CFLAGS = $(DEFS) -g -I/usr/local/src/db/db-3.1.17/build_unix
  #CFLAGS = $(DEFS) -g -I/usr/local/src/db/db-2.4.14/Unix
  #CFLAGS = $(DEFS) -g -I/usr/local/src/db/db.1.85/PORT/sunos.5.2/include
--LDLIBS = -L/usr/local/src/db/db-3.1.17/build_unix -lnsl -ldb
-+CFLAGS= $(DEFS)
-+#LDLIBS = -L/usr/local/src/db/db-3.1.17/build_unix -lnsl -ldb
+-LDLIBS = -L/usr/local/src/db/db-4.1.25/build_unix -lnsl -ldb-4.1
+ #LDLIBS = -L/usr/local/src/db/db-3.1.17/build_unix -lnsl -ldb
  #LDLIBS = -L/usr/local/src/db/db-2.4.14/Unix -lnsl -ldb
  #LDLIBS = -L/usr/local/src/db/db.1.85/PORT/sunos.5.2 -lnsl -ldb
 -TSTLIBS = -L. -ldrac -lnsl
 -RPCGENFLAGS = 
-+LDLIBS =
-+#TSTLIBS = -L. -ldrac -lnsl
+-#RPCGENFLAGS = -C
 +TSTLIBS = -L. -ldrac
-+#RPCGENFLAGS = 
- #RPCGENFLAGS = -C
 +RPCGENFLAGS = -I -C
  
  # Man sections
@@ -53,9 +45,12 @@ $NetBSD: patch-aa,v 1.2 2002/09/25 19:40:38 wiz Exp $
  
  ## Nothing to change after this point
  
-@@ -119,8 +125,13 @@ tar: $(PACKAGE)
+@@ -119,10 +111,15 @@ clean:
+ tar: $(PACKAGE)
+ 	tar cf drac.tar $(PACKAGE)
  
- install: $(SERVER)
+-install: $(SERVER)
++install: $(SERVER) $(SERVER).1m dracauth.3
  	$(INSTALL) -c -o bin -g bin -m 0755 $(SERVER) $(EBIN)
 -
 -install-man: $(SERVER).1m dracauth.3