* minimalize patch-aa, pass variables as MAKE_FLAGS.

* require bdb.
* add user-destdir installation support.

3 files changed, 65 insertions, 59 deletions

diff --git a/mail/drac/Makefile b/mail/drac/Makefile
index 7f014a889cf..69056fde3e5 100644
--- a/mail/drac/Makefile
+++ b/mail/drac/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2010/02/25 15:08:02 joerg Exp $
+# $NetBSD: Makefile,v 1.19 2010/03/07 13:30:48 obache Exp $
 #
 
 DISTNAME=	drac
@@ -11,16 +11,52 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://mail.cc.umanitoba.ca/drac/
 COMMENT=	Dynamic Relay Authorization Control
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}
 DIST_SUBDIR=	${PKGNAME_NOREV}
 
-MAKE_ENV+=	MKDIR=${MKDIR:Q}
-MAKE_ENV+=	INSTALL=${INSTALL:Q}
-MAKE_ENV+=	RANLIB=${RANLIB:Q}
-MAKE_ENV+=	EBIN="${LOCALBASE}/libexec"
-MAKE_ENV+=	MAN="${LOCALBASE}/man/man"
-MAKE_ENV+=	EXAMPLES="${LOCALBASE}/share/examples/drac"
+MAKE_FLAGS+=	RANLIB=${RANLIB:Q}
+MAKE_FLAGS+=	EBIN=${PREFIX}/libexec
+MAKE_FLAGS+=	MAN=${PREFIX}/${PKGMANDIR}/man
+MAKE_FLAGS+=	MANADM=8
+MAKE_FLAGS+=	BDB_LIBS=${BDB_LIBS:Q}
 
 INSTALLATION_DIRS=	include lib libexec ${PKGMANDIR}/man3 ${PKGMANDIR}/man8
+INSTALLATION_DIRS+=	share/examples/drac
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "NetBSD" || ${OPSYS} == "Linux"
+RPCGENFLAGS=	-I -C
+.elif ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly" || ${OPSYS} == "OpenBSD"
+RPCGENFLAGS=	-C
+.elif ${OPSYS} == "SunOS" || ${OPSYS} == "BSDOS" || ${OPSYS} == "AIX"
+RPCGENFLAGS=	# empty
+.else
+RPCGENFLAGS=	# empty
+.endif
+MAKE_FLAGS+=	RPCGENFLAGS=${RPCGENFLAGS:Q}
+
+CFLAGS.SunOS=	-DTI_RPC -DFCNTL_LOCK -DSYSINFO
+CFLAGS.BSDOS=	-DSOCK_RPC -DFCNTL_LOCK -DGETHOST
+CFLAGS.IRIX=	-DSOCK_RPC -DFCNTL_LOCK -DGETHOST
+CFLAGS.NetBSD=	-DSOCK_RPC -DFCNTL_LOCK -DGETHOST -DDASH_C
+CFLAGS.FreeBSD=	-DSOCK_RPC -DFLOCK_LOCK -DGETHOST -DDASH_C
+CFLAGS.OpenBSD=	-DSOCK_RPC -DFLOCK_LOCK -DGETHOST -DDASH_C
+CFLAGS.Dragonfly=	-DSOCK_RPC -DFLOCK_LOCK -DGETHOST -DDASH_C
+CFLAGS.Linux=	-DSOCK_RPC -DFCNTL_LOCK -DGETHOST -DDASH_C
+CFLAGS.AIX=	-DD_BSD -DBSD_INCLUDES -DSOCK_RPC -DFCNTL_LOCK -DGETHOST -DDEBUG
+LIBS.SunOS=	-lnsl
+
+INSTALL_TARGET=	install install-man
+
+post-install:
+.for e in README INSTALL testing.c dracd-setup dracd.allow-sample
+	${INSTALL_DATA} ${WRKSRC}/${e} ${DESTDIR}${PREFIX}/share/examples/drac
+.endfor
+	${INSTALL_DATA} ${WRKSRC}/drac.h ${DESTDIR}${PREFIX}/include
+	${INSTALL_LIB} ${WRKSRC}/libdrac.a ${DESTDIR}${PREFIX}/lib
 
+.include "../../mk/bdb.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/drac/distinfo b/mail/drac/distinfo
index e159c39e1c3..7729e03ff06 100644
--- a/mail/drac/distinfo
+++ b/mail/drac/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2005/02/24 09:59:21 agc Exp $
+$NetBSD: distinfo,v 1.6 2010/03/07 13:30:48 obache Exp $
 
 SHA1 (drac-1.12/drac.tar.Z) = 2434e7f238ee1212c742705d3653dedec64266f5
 RMD160 (drac-1.12/drac.tar.Z) = b2a485c554e8d97a6defe0046bb9c485c6014a54
 Size (drac-1.12/drac.tar.Z) = 20705 bytes
-SHA1 (patch-aa) = fb56b4681f131a379f42f449bccbd826a0e97e6f
+SHA1 (patch-aa) = b4f3316c4273df33fdf86e05d0b4cffec0aa3d39
diff --git a/mail/drac/patches/patch-aa b/mail/drac/patches/patch-aa
index b2566e6cc33..6d117379943 100644
--- a/mail/drac/patches/patch-aa
+++ b/mail/drac/patches/patch-aa
@@ -1,67 +1,37 @@
-$NetBSD: patch-aa,v 1.3 2003/03/09 12:25:53 jmmv Exp $
+$NetBSD: patch-aa,v 1.4 2010/03/07 13:30:48 obache Exp $
 
 --- Makefile.orig	2003-01-12 20:45:12.000000000 +0000
 +++ Makefile
-@@ -5,10 +5,6 @@
- 
- # Paths
- 
--INSTALL = /usr/ucb/install
--EBIN = /usr/local/sbin
--MAN = /usr/local/man/man
--
- # OS-Dependant settings
- 
- # 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
- 
--DEFS = -DTI_RPC -DFCNTL_LOCK -DSYSINFO
-+DEFS = -DSOCK_RPC -DFCNTL_LOCK -DGETHOST -DDASH_C
- 
+@@ -38,15 +38,16 @@ DEFS = -DTI_RPC -DFCNTL_LOCK -DSYSINFO
  # Compiler flags 
--CC = cc
--RANLIB = :
+ CC = cc
+ RANLIB = :
 -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-4.1.25/build_unix
  #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-4.1.25/build_unix -lnsl -ldb-4.1
++#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 = 
--#RPCGENFLAGS = -C
-+TSTLIBS = -L. -ldrac
-+RPCGENFLAGS = -I -C
- 
- # Man sections
- MANLIB = 3
--MANADM = 1m
-+MANADM = 8
- 
- ## Nothing to change after this point
++LDLIBS = $(LIBS) ${BDB_LIBS}
++TSTLIBS = -L. -ldrac $(LIBS)
+ RPCGENFLAGS = 
+ #RPCGENFLAGS = -C
  
-@@ -119,10 +111,15 @@ clean:
- tar: $(PACKAGE)
+@@ -120,9 +121,8 @@ tar: $(PACKAGE)
  	tar cf drac.tar $(PACKAGE)
  
--install: $(SERVER)
-+install: $(SERVER) $(SERVER).1m dracauth.3
- 	$(INSTALL) -c -o bin -g bin -m 0755 $(SERVER) $(EBIN)
--
--install-man: $(SERVER).1m dracauth.3
- 	$(INSTALL) -c -m 0444 $(SERVER).1m $(MAN)$(MANADM)/$(SERVER).$(MANADM)
- 	$(INSTALL) -c -m 0444 dracauth.3 $(MAN)$(MANLIB)/dracauth.$(MANLIB)
+ install: $(SERVER)
+-	$(INSTALL) -c -o bin -g bin -m 0755 $(SERVER) $(EBIN)
++	$(BSD_INSTALL_PROGRAM) $(SERVER) $(DESTDIR)$(EBIN)
+ 
+ install-man: $(SERVER).1m dracauth.3
+-	$(INSTALL) -c -m 0444 $(SERVER).1m $(MAN)$(MANADM)/$(SERVER).$(MANADM)
+-	$(INSTALL) -c -m 0444 dracauth.3 $(MAN)$(MANLIB)/dracauth.$(MANLIB)
 -
-+	$(MKDIR) -p $(EXAMPLES)
-+	$(INSTALL) -c -m 0444 README $(EXAMPLES)/README
-+	$(INSTALL) -c -m 0444 INSTALL $(EXAMPLES)/INSTALL
-+	$(INSTALL) -c -m 0444 testing.c $(EXAMPLES)/testing.c
-+	$(INSTALL) -c -m 0444 dracd-setup $(EXAMPLES)/dracd-setup
-+	$(INSTALL) -c -m 0444 dracd.allow-sample $(EXAMPLES)/dracd.allow-sample
-+	$(INSTALL) -c -m 0444 drac.h $(LOCALBASE)/include/drac.h
-+	$(INSTALL) -c -m 0444 libdrac.a $(LOCALBASE)/lib/libdrac.a
++	$(BSD_INSTALL_MAN) $(SERVER).1m $(DESTDIR)$(MAN)$(MANADM)/$(SERVER).$(MANADM)
++	$(BSD_INSTALL_MAN) dracauth.3 $(DESTDIR)$(MAN)$(MANLIB)/dracauth.$(MANLIB)