1 files changed, 20 insertions, 50 deletions
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)