setkey and friends are in libcipher on DragonFly.

Add some conditional parts for DragonFly.

4 files changed, 39 insertions, 7 deletions

diff --git a/comms/xisp/distinfo b/comms/xisp/distinfo
index 5b28b84a70c..3846c369b3c 100644
--- a/comms/xisp/distinfo
+++ b/comms/xisp/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.7 2005/02/23 16:05:31 agc Exp $
+$NetBSD: distinfo,v 1.8 2006/02/22 16:13:48 joerg Exp $
 
 SHA1 (xisp-2.7p1.tar.gz) = 158db1ad0f9820da33b5f51fa5110b0a9374ba2f
 RMD160 (xisp-2.7p1.tar.gz) = 47a4c6ebe0c7e5a1971f2934f7371370e7cbdfe2
 Size (xisp-2.7p1.tar.gz) = 294492 bytes
-SHA1 (patch-aa) = dee0843486005dcf4fa94acb21be032b348552ab
+SHA1 (patch-aa) = d3140e899164e6d47c63b043266d8508db27de1f
+SHA1 (patch-ab) = 19f3a0ef7fd776108d7796917019ffcc28576c8f
+SHA1 (patch-ac) = 5324b027c6bcc687bce8a91dd5e8d4c7b2acf366
diff --git a/comms/xisp/patches/patch-aa b/comms/xisp/patches/patch-aa
index 959080b681c..faedcce8aa8 100644
--- a/comms/xisp/patches/patch-aa
+++ b/comms/xisp/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.8 2004/06/07 14:47:34 minskim Exp $
+$NetBSD: patch-aa,v 1.9 2006/02/22 16:13:48 joerg Exp $
 
---- Makefile.orig	2003-06-28 09:03:03.000000000 -0500
+--- Makefile.orig	2003-06-28 14:03:03.000000000 +0000
 +++ Makefile
 @@ -12,12 +12,12 @@
  #  Compilation/installation vars (global for all following sections) |
@@ -66,7 +66,7 @@ $NetBSD: patch-aa,v 1.8 2004/06/07 14:47:34 minskim Exp $
  #
  # Debian vars (if your Debian distribution is relatively
  # old and does not use glibc2, use the lines which DO NOT
-@@ -187,25 +187,25 @@ INSTALL    = install
+@@ -187,25 +187,29 @@ INSTALL    = install
  #
  # NetBSD vars
  #-------------
@@ -103,14 +103,18 @@ $NetBSD: patch-aa,v 1.8 2004/06/07 14:47:34 minskim Exp $
 +GROUP      = dialer
 +CCFLAGS    = -Wall -O
 +EXTRADEFS  = -DMODEM_DEVICE=\"$(MODEM_PATH)\" -DHAVE_STRERROR
++.if ${OPSYS} == "DragonFly"
++EXTRALIBS  = -lcipher
++.else
 +EXTRALIBS  = -lcrypt
++.endif
 +LINKX11    = -Wl,-R$(LIBX11)
 +LINKFORMS  = -Wl,-R$(LIBFORMS) -L$(LIBFORMS) -lforms
 +INSTALL    = /usr/bin/install
  #
  # FreeBSD vars
  #-------------
-@@ -325,19 +325,19 @@ network.o: network.h network.c
+@@ -325,19 +329,19 @@ network.o: network.h network.c
  	$(CC) $(CCOPTS) -c network.c
  
  xispdial: xispdial.o $(SHAREOBJ)
@@ -133,7 +137,7 @@ $NetBSD: patch-aa,v 1.8 2004/06/07 14:47:34 minskim Exp $
  	$(EXTRALIBS) -L$(LIBX11) $(LINKFORMS) -lXpm -lX11 -lm
  
  rcio.o: rcio.h rcio.c common.h version.h
-@@ -350,7 +350,7 @@ xisp_euidaccess.o: xisp_euidaccess.c
+@@ -350,7 +354,7 @@ xisp_euidaccess.o: xisp_euidaccess.c
  	$(CC) $(CCOPTS) -c xisp_euidaccess.c
  
  xispid: xispid.c
diff --git a/comms/xisp/patches/patch-ab b/comms/xisp/patches/patch-ab
new file mode 100644
index 00000000000..84161272e80
--- /dev/null
+++ b/comms/xisp/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.3 2006/02/22 16:13:48 joerg Exp $
+
+--- network.c.orig	2006-02-22 16:05:33.000000000 +0000
++++ network.c
+@@ -89,7 +89,7 @@ char *IFAddr(char *IFName, int dest)
+  #define AddrOpen   popen("/usr/ucb/netstat -nr", "r")
+  #define AddrScanf  sscanf(routeLine, "%*s %*s %*s %*s %*s %s", IF)
+  #define AddrClose  while (fgets(routeLine,128,infofp) != NULL); pclose(infofp)
+-#elif defined(SUNOS5x) || defined(__FreeBSD__)
++#elif defined(SUNOS5x) || defined(__FreeBSD__) || defined(__DragonFly__)
+  #define AddrOpen   popen("/usr/bin/netstat -nr", "r")
+  #define AddrScanf  sscanf(routeLine, "%*s %*s %*s %*s %*s %s", IF)
+  #define AddrClose  while (fgets(routeLine,128,infofp) != NULL); pclose(infofp)
diff --git a/comms/xisp/patches/patch-ac b/comms/xisp/patches/patch-ac
new file mode 100644
index 00000000000..ff8c7dcbc33
--- /dev/null
+++ b/comms/xisp/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.3 2006/02/22 16:13:48 joerg Exp $
+
+--- xispid.c.orig	2006-02-22 16:06:00.000000000 +0000
++++ xispid.c
+@@ -42,7 +42,7 @@
+  #include <limits.h>
+ #endif
+ 
+-#if !defined(__FreeBSD__) && !defined(linux) /* setgrent() is int in FreeBSD */
++#if !defined(__FreeBSD__) && !defined(__DragonFly__) && !defined(linux) /* setgrent() is int in FreeBSD */
+ struct passwd *getpwuid();
+ struct group *getgrgid(), *getgrent();
+ uid_t getuid(), geteuid();