From owner-freebsd-ports Sun Apr 29 12:52:50 2001
Delivered-To: freebsd-ports@hub.freebsd.org
Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21])
by hub.freebsd.org (Postfix) with ESMTP id BA9AA37B43E
for <freebsd-ports@hub.freebsd.org>; Sun, 29 Apr 2001 12:52:44 -0700 (PDT)
(envelope-from gnats@FreeBSD.org)
Received: (from gnats@localhost)
by freefall.freebsd.org (8.11.1/8.11.1) id f3TJqiC54129;
Sun, 29 Apr 2001 12:52:44 -0700 (PDT)
(envelope-from gnats)
Date: Sun, 29 Apr 2001 12:52:44 -0700 (PDT)
Message-Id: <200104291952.f3TJqiC54129@freefall.freebsd.org>
To: freebsd-ports@FreeBSD.org
Cc:
From: Anders Nordby <anders@fix.no>
Subject: Re: ports/26545: Fix port: mail/drac
Reply-To: Anders Nordby <anders@fix.no>
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org
The following reply was made to PR ports/26545; it has been noted by GNATS.
From: Anders Nordby <anders@fix.no>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Re: ports/26545: Fix port: mail/drac
Date: Sun, 29 Apr 2001 21:51:39 +0200
Uh. Use this instead. This will make the port use the new TI_RPC code in
-current instead of rpcgen -b.
This patch can also be downloaded from
http://anders.fix.no/ports/archives/drac.diffs.3.
diff -Nur drac.old/Makefile drac/Makefile
--- drac.old/Makefile Fri Feb 9 21:32:36 2001
+++ drac/Makefile Sun Apr 29 20:33:21 2001
@@ -21,6 +21,11 @@
MAN3= dracauth.3
MAN1= rpc.dracd.1
+.include <bsd.port.pre.mk>
+.if ${OSVERSION} >= 500018
+MAKE_ARGS+= -DWITH_TI_RPC
+.endif
+
post-patch:
@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/rpc.dracd.1m
@${ECHO} "================================================================================"
@@ -37,4 +42,4 @@
@${INSTALL_MAN} ${WRKSRC}/rpc.dracd.1m ${PREFIX}/man/man1/rpc.dracd.1
.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -Nur drac.old/files/patch-aa drac/files/patch-aa
--- drac.old/files/patch-aa Fri Feb 9 21:32:37 2001
+++ drac/files/patch-aa Sun Apr 29 20:41:03 2001
@@ -1,5 +1,5 @@
---- Makefile.old Mon Nov 20 16:35:16 2000
-+++ Makefile Sun Jan 14 20:06:47 2001
+--- Makefile.orig Mon Nov 20 16:35:16 2000
++++ Makefile Sun Apr 29 20:38:47 2001
@@ -5,9 +5,10 @@
# Paths
@@ -14,17 +14,23 @@
# OS-Dependant settings
-@@ -33,20 +34,26 @@
+@@ -33,20 +34,32 @@
# -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
++.else
++RPCFLAGS= -DSOCK_RPC
++.endif
++
+.if defined(WITH_POSTFIX)
-+DEFS= -DSOCK_RPC -DFLOCK_LOCK -DGETHOST -DDASH_C -DTERM_KD
++DEFS= $(RPCFLAGS) -DFLOCK_LOCK -DGETHOST -DDASH_C -DTERM_KD
+.elif defined(WITH_EXIM)
-+DEFS= -DSOCK_RPC -DFLOCK_LOCK -DGETHOST -DDASH_C -DTERM_KD -DREQ_HASH -DCIDR_KEY
++DEFS= $(RPCFLAGS) -DFLOCK_LOCK -DGETHOST -DDASH_C -DTERM_KD -DREQ_HASH -DCIDR_KEY
+.else
-+DEFS= -DSOCK_RPC -DFLOCK_LOCK -DGETHOST -DDASH_C
++DEFS= $(RPCFLAGS) -DFLOCK_LOCK -DGETHOST -DDASH_C
+.endif
# Compiler flags
diff -Nur drac.old/files/patch-ac drac/files/patch-ac
--- drac.old/files/patch-ac Fri Feb 9 21:32:37 2001
+++ drac/files/patch-ac Sun Apr 29 20:42:16 2001
@@ -1,12 +1,20 @@
---- rpc.dracd.c.old Sun Jan 14 20:53:02 2001
-+++ rpc.dracd.c Sun Jan 14 20:53:10 2001
-@@ -36,9 +36,6 @@
+--- rpc.dracd.c.orig Tue Nov 21 05:22:05 2000
++++ rpc.dracd.c Sun Apr 29 20:41:31 2001
+@@ -8,7 +8,6 @@
+ #include <errno.h>
+ #include <syslog.h>
+ #ifdef TI_RPC
+-#include <netdir.h>
+ #include <netconfig.h>
+ #endif
+ #include <stdlib.h>
+@@ -35,9 +34,6 @@
+ #define DB_VERSION_MAJOR 1
#endif
#include "drac.h"
-
+-
-#define DBFILE "/etc/mail/dracd.db"
-#define ALFILE "/etc/mail/dracd.allow"
--
+
struct net_def {
struct net_def *nd_next;
- struct in_addr nd_mask;
diff -Nur drac.old/pkg-descr drac/pkg-descr
--- drac.old/pkg-descr Fri Feb 9 21:32:37 2001
+++ drac/pkg-descr Sun Apr 29 20:34:25 2001
@@ -9,3 +9,5 @@
The POP and SMTP servers can be on different hosts.
WWW: http://mail.cc.umanitoba.ca/drac/
+
+- Anders Nordby <anders@fix.no>
--
Anders.
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message