Index: head/mail/drac/Makefile
===================================================================
--- head/mail/drac/Makefile	(revision 77466)
+++ head/mail/drac/Makefile	(revision 77467)
@@ -1,65 +1,63 @@
 # New ports collection makefile for:	drac
 # Date created:			07 January 2001
 # Whom:				Anders Nordby <anders@fix.no>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	drac
-PORTVERSION= 	1.11
-PORTREVISION=	2
+PORTVERSION= 	1.12
+#PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.cc.umanitoba.ca/src/ \
 		http://atreides.freenix.no/~anders/ \
 		ftp://totem.fix.no/pub/mirrors/misc/
 DISTNAME=	${PORTNAME}
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Dynamic Relay Authorization Control, a pop-before-smtp implementation
 
 .if defined(WITH_POSTFIX_DB3)
 LIB_DEPENDS+=	db3.3:${PORTSDIR}/databases/db3
 .endif
 
 NO_WRKSUBDIR=	yes
 USE_REINPLACE=	yes
 
 MAN3=		dracauth.3
 MAN1=		rpc.dracd.1
 
 .include <bsd.port.pre.mk>
 .if ${OSVERSION} >= 500018
 MAKE_ARGS+=	-DWITH_TI_RPC
 .endif
 
 pre-everything::
 	@${ECHO} "============================================================="
 	@${ECHO} "For databases compatible with other MTAs than sendmail, use:"
 	@${ECHO}
 	@${ECHO} "WITH_POSTFIX=yes	(Postfix)"
 	@${ECHO} "WITH_POSTFIX_DB3=yes	(Postfix with DB3 database maps)"
 	@${ECHO} "WITH_EXIM=yes		(Exim)"
 	@${ECHO}
 	@${ECHO} "Define WITH_FOREGROUND to make the rpc.dracd daemon stay in"
 	@${ECHO} "foreground instead of detaching itself. This breaks the"
 	@${ECHO} "startup script."
 	@${ECHO} "============================================================="
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/rpc.dracd.1m
 
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/rpc.dracd ${PREFIX}/sbin/
 	@${INSTALL_DATA} ${WRKSRC}/drac.h ${PREFIX}/include/
 	@${INSTALL_DATA} ${WRKSRC}/libdrac.a ${PREFIX}/lib/
 .if !defined(NOPORTDOCS)
 	@${INSTALL_MAN} ${WRKSRC}/dracauth.3 ${PREFIX}/man/man3/
 	@${INSTALL_MAN} ${WRKSRC}/rpc.dracd.1m ${PREFIX}/man/man1/rpc.dracd.1
 .endif
-	@if [ ! -f ${PREFIX}/etc/rc.d/dracd.sh.sample ]; then \
-		${ECHO} "Installing ${PREFIX}/etc/rc.d/dracd.sh.sample startup file."; \
-		${INSTALL_SCRIPT} -m 751 ${FILESDIR}/dracd.sh ${PREFIX}/etc/rc.d/dracd.sh.sample; \
-	fi
+	@${ECHO_MSG} "Installing ${PREFIX}/etc/rc.d/dracd.sh startup file."
+	@${INSTALL_SCRIPT} ${FILESDIR}/dracd.sh ${PREFIX}/etc/rc.d/dracd.sh
 
 .include <bsd.port.post.mk>

Property changes on: head/mail/drac/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.12
\ No newline at end of property
+1.13
\ No newline at end of property
Index: head/mail/drac/distinfo
===================================================================
--- head/mail/drac/distinfo	(revision 77466)
+++ head/mail/drac/distinfo	(revision 77467)
@@ -1 +1 @@
-MD5 (drac.tar.Z) = 0b714b32c06b4ebd1779add6c8221248
+MD5 (drac.tar.Z) = fadaee589bf1dd9067222d58637d5fe4

Property changes on: head/mail/drac/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property
Index: head/mail/drac/files/dracd.sh
===================================================================
--- head/mail/drac/files/dracd.sh	(revision 77466)
+++ head/mail/drac/files/dracd.sh	(revision 77467)
@@ -1,20 +1,34 @@
 #!/bin/sh
 
-if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
-    echo "$0: Cannot determine the PREFIX" >&2
-    exit 1
+if ! PREFIX=$(/bin/expr $0 : "\(/.*\)/etc/rc\.d/${0##*/}\$"); then
+	echo "$0: Cannot determine the PREFIX" >&2
+	exit 64
 fi
 
+if [ -r /etc/defaults/rc.conf ]; then
+	. /etc/defaults/rc.conf
+	source_rc_confs
+elif [ -r /etc/rc.conf ]; then
+	. /etc/rc.conf
+fi
+
 case "$1" in
 start)
-	[ -x ${PREFIX}/sbin/rpc.dracd ] && ${PREFIX}/sbin/rpc.dracd && echo -n ' dracd'
+	case ${dracd_enable:-NO} in
+	[Yy][Ee][Ss])
+		${dracd_program:-${PREFIX}/sbin/rpc.dracd} ${drac_flags} && echo -n ' dracd'
+		;;
+	esac
 	;;
 stop)
-	killall rpc.dracd >/dev/null 2>&1 && echo -n ' dracd'
+	case ${dracd_enable:-NO} in
+	[Yy][Ee][Ss])
+		/usr/bin/killall rpc.dracd >/dev/null 2>&1 && echo -n ' dracd'
+	esac
 	;;
 *)
 	echo "Usage: `basename $0` {start|stop}" >&2
 	;;
 esac
 
 exit 0

Property changes on: head/mail/drac/files/dracd.sh
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property
Index: head/mail/drac/files/patch-aa
===================================================================
--- head/mail/drac/files/patch-aa	(revision 77466)
+++ head/mail/drac/files/patch-aa	(revision 77467)
@@ -1,63 +1,66 @@
---- Makefile.orig	Mon Nov 20 16:35:16 2000
-+++ Makefile	Wed Jan  2 22:39:40 2002
+--- Makefile.orig	Mon Jan 13 05:45:12 2003
++++ Makefile	Wed Mar 26 08:58:22 2003
 @@ -5,9 +5,10 @@
  
  # Paths
  
 -INSTALL = /usr/ucb/install
 -EBIN = /usr/local/sbin
 -MAN = /usr/local/man/man
-+INSTALL = install
++INSTALL? = install
 +EBIN = ${PREFIX}/sbin
 +MAN = ${PREFIX}/man/man
 +ETC_DIR = ${PREFIX}/etc
  
  # OS-Dependant settings
  
-@@ -33,20 +34,40 @@
+@@ -33,22 +34,42 @@
  # -DCIDR_KEY	# keys in CIDR format
  # -DTERM_KD	# keys and data nul-terminated
  
 -DEFS = -DTI_RPC -DFCNTL_LOCK -DSYSINFO
 +.if defined(WITH_TI_RPC)
-+RPCFLAGS=	-DTI_RPC
++DEFS+=	-DTI_RPC
 +.else
-+RPCFLAGS=	-DSOCK_RPC
++DEFS+=	-DSOCK_RPC
 +.endif
 +
 +.if defined(WITH_POSTFIX) || defined(WITH_POSTFIX_DB3)
-+DEFS=	$(RPCFLAGS) -DFLOCK_LOCK -DGETHOST -DDASH_C -DTERM_KD
++DEFS+=	-DFLOCK_LOCK -DGETHOST -DDASH_C -DTERM_KD
 +.elif defined(WITH_EXIM)
-+DEFS=	$(RPCFLAGS) -DFLOCK_LOCK -DGETHOST -DDASH_C -DTERM_KD -DREQ_HASH -DCIDR_KEY
++DEFS+=	-DFLOCK_LOCK -DGETHOST -DDASH_C -DTERM_KD -DREQ_HASH -DCIDR_KEY
 +.else
-+DEFS=	$(RPCFLAGS) -DFLOCK_LOCK -DGETHOST -DDASH_C 
++DEFS+=	-DFLOCK_LOCK -DGETHOST -DDASH_C
 +.endif
 +.if defined(WITH_FOREGROUND)
 +DEFS+=	-DRPC_SVC_FG
 +.endif
  
  # Compiler flags 
- CC = cc
+-CC = cc
++CC? = cc
  RANLIB = :
--CFLAGS = $(DEFS) -g -I/usr/local/src/db/db-3.1.17/build_unix
-+CFLAGS = $(DEFS) -g -I${PREFIX}/include -DDBFILE=\"$(ETC_DIR)/dracd.db\" -DALFILE=\"$(ETC_DIR)/dracd.allow\"
+-CFLAGS = $(DEFS) -g -I/usr/local/src/db/db-4.1.25/build_unix
++CFLAGS+= $(DEFS) -g -I${PREFIX}/include -DDBFILE=\"$(ETC_DIR)/dracd.db\" -DALFILE=\"$(ETC_DIR)/dracd.allow\"
+ #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
-+LDLIBS =
+-LDLIBS = -L/usr/local/src/db/db-4.1.25/build_unix -lnsl -ldb-4.1
++LDLIBS = 
+ #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 = 
 +RPCGENFLAGS = -C -I
 +
 +.if defined(WITH_POSTFIX_DB3)
 +CFLAGS+=	-I${LOCALBASE}/include/db3
 +LDLIBS+=	-L${LOCALBASE}/lib -ldb3
 +.endif
  
  # Man sections
  MANLIB = 3

Property changes on: head/mail/drac/files/patch-aa
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.5
\ No newline at end of property
+1.6
\ No newline at end of property
Index: head/mail/drac/pkg-plist
===================================================================
--- head/mail/drac/pkg-plist	(revision 77466)
+++ head/mail/drac/pkg-plist	(revision 77467)
@@ -1,4 +1,4 @@
 sbin/rpc.dracd
 include/drac.h
 lib/libdrac.a
-etc/rc.d/dracd.sh.sample
+etc/rc.d/dracd.sh

Property changes on: head/mail/drac/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.2
\ No newline at end of property
+1.3
\ No newline at end of property