From c6338fb9030c0779048c919320057d05153c926f Mon Sep 17 00:00:00 2001
From: joerg <joerg@pkgsrc.org>
Date: Mon, 9 Jan 2006 20:02:02 +0000
Subject: Add DragonFly support.

---
 ham/7plus/distinfo         |  6 ++++--
 ham/7plus/patches/patch-aa | 41 +++++++++++++++++++++++++++++++++-----
 ham/7plus/patches/patch-ab | 13 ++++++++++++
 ham/7plus/patches/patch-ac | 49 ++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 102 insertions(+), 7 deletions(-)
 create mode 100644 ham/7plus/patches/patch-ab
 create mode 100644 ham/7plus/patches/patch-ac

diff --git a/ham/7plus/distinfo b/ham/7plus/distinfo
index ec9f9dbe830..3689c5f742a 100644
--- a/ham/7plus/distinfo
+++ b/ham/7plus/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2005/02/22 21:06:06 agc Exp $
+$NetBSD: distinfo,v 1.5 2006/01/09 20:02:02 joerg Exp $
 
 SHA1 (7pl225sr.tgz) = 9c393e8f6968d24ec469fbca45ade65a5c6d52fc
 RMD160 (7pl225sr.tgz) = 23fe71c10ab4e006c49c7b0e7fbf96d498b2ccf7
@@ -6,4 +6,6 @@ Size (7pl225sr.tgz) = 65122 bytes
 SHA1 (7pl210mg.tgz) = 7acc708cabf8d166f74bd398940fb71aac2c7495
 RMD160 (7pl210mg.tgz) = ffaf7b5dd4c55fb847a6b5fd87cdfaecf904e53e
 Size (7pl210mg.tgz) = 31095 bytes
-SHA1 (patch-aa) = 73efc40a0dc294fdce0abc52dd8810c8d2ff9ba6
+SHA1 (patch-aa) = 62fa52455c8225cbd4465bbd5e1565e7eaae3421
+SHA1 (patch-ab) = 818828c9c0303d8efbd519b857f8d162f6496985
+SHA1 (patch-ac) = 286a5f9f8bf7066948735e646e8138e820f84a68
diff --git a/ham/7plus/patches/patch-aa b/ham/7plus/patches/patch-aa
index eda24353a44..3c894b2c163 100644
--- a/ham/7plus/patches/patch-aa
+++ b/ham/7plus/patches/patch-aa
@@ -1,8 +1,17 @@
-$NetBSD: patch-aa,v 1.1 2004/08/02 21:12:48 minskim Exp $
+$NetBSD: patch-aa,v 1.2 2006/01/09 20:02:02 joerg Exp $
 
---- 7plus.h.orig	2000-01-10 09:03:02.000000000 -0600
+--- 7plus.h.orig	2000-01-10 15:03:02.000000000 +0000
 +++ 7plus.h
-@@ -225,6 +225,12 @@
+@@ -207,7 +207,7 @@
+ 
+ 
+ #ifdef __unix__
+- #if defined(__i386__) && !defined(__NetBSD__)
++ #if defined(__i386__) && !defined(__NetBSD__) && !defined(__DragonFly__)
+    #ifndef SYSV
+     #define SYSV
+    #endif
+@@ -225,9 +225,15 @@
    #include <string.h>
    #include <linux/limits.h>
    #include <sys/ioctl.h>
@@ -14,13 +23,35 @@ $NetBSD: patch-aa,v 1.1 2004/08/02 21:12:48 minskim Exp $
 +  #endif
   #endif /* __linux__ */
  
-  #ifdef __NetBSD__
+- #ifdef __NetBSD__
++ #if defined(__NetBSD__) || defined(__DragonFly__)
+   #define _HAVE_STRSTR
+   #define _HAVE_RENAME
+   #define _HAVE_GMTIME
+@@ -251,7 +257,7 @@
+   #include <termio.h>
+   struct termio sg[2];
+  #else
+-  #ifdef __NetBSD__
++  #if defined(__NetBSD__) || defined(__DragonFly__)
+     #include <unistd.h>
+     #include <termios.h>
+     struct termios sg[2];
+@@ -262,7 +268,7 @@
+  #endif /* SYSV */
+ 
+ /* assumed limits (hope reasonable !!! DF6NL) */
+- #if defined(__linux__) || defined(__NetBSD__)
++ #if defined(__linux__) || defined(__NetBSD__) || defined(__DragonFly__)
+   #define MAXPATH  PATH_MAX             /* defined in linux/limits.h DL5MLO */
+   #define MAXFILE  NAME_MAX
+   #define MAXEXT   NAME_MAX             /* you can a.asdfasdfasdfasfa */
 @@ -343,7 +349,7 @@
  
  /** shorthands for unsigned types **/
  typedef unsigned char byte;  /* 8bit unsigned char */
 -#ifdef __unix__
-+#if defined(__unix__) && !defined(__linux__)
++#if defined(__unix__) && !defined(__linux__) && !defined(__DragonFly__)
   #ifdef __vax__
     typedef u_long ulong;
   #endif
diff --git a/ham/7plus/patches/patch-ab b/ham/7plus/patches/patch-ab
new file mode 100644
index 00000000000..d3856c762b4
--- /dev/null
+++ b/ham/7plus/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2006/01/09 20:02:02 joerg Exp $
+
+--- 7plus.c.orig	2006-01-09 19:56:29.000000000 +0000
++++ 7plus.c
+@@ -264,7 +264,7 @@ const char *help[] = {
+  #define EXMPL "dh0:/pr/"
+ #endif
+ 
+-#if defined(__linux__) || defined(__NetBSD__)
++#if defined(__linux__) || defined(__NetBSD__) || defined(__DragonFly__)
+  #undef EXMPL
+  #define EXMPL "/pr/"
+ #endif
diff --git a/ham/7plus/patches/patch-ac b/ham/7plus/patches/patch-ac
new file mode 100644
index 00000000000..96ede8f71cf
--- /dev/null
+++ b/ham/7plus/patches/patch-ac
@@ -0,0 +1,49 @@
+$NetBSD: patch-ac,v 1.1 2006/01/09 20:02:02 joerg Exp $
+
+--- utils.c.orig	2006-01-09 19:56:59.000000000 +0000
++++ utils.c
+@@ -1591,7 +1591,7 @@ void fnsplit(char *pth, char *dr, char *
+ 
+   strcpy(tmp,pth);
+ 
+-#if (defined (__MWERKS__) || defined (__linux__) || defined (__NETBSD__))
++#if (defined (__MWERKS__) || defined (__linux__) || defined (__NETBSD__)) || defined(__DragonFly__)
+     /* Ignore drive on systems that don't have drives. */
+     p = tmp;
+     drv[0] = EOS;
+@@ -1729,7 +1729,7 @@ int strnicmp (const char *s1, const char
+ 
+ #ifndef _HAVE_GETCH
+ 
+- #if defined(SYSV) || defined(__EMX__) || defined(__NetBSD__)/* use ioctl() */
++ #if defined(SYSV) || defined(__EMX__) || defined(__NetBSD__) || defined(__DragonFly__) /* use ioctl() */
+   #define _IOCTL_
+  #endif
+ 
+@@ -1769,7 +1769,7 @@ int strnicmp (const char *s1, const char
+    {
+      first = 0;
+     #ifdef _IOCTL_
+-     #ifdef __NetBSD__
++     #if defined(__NetBSD__) || defined(__DragonFly__)
+       (void) ioctl(fd, TIOCGETA, (char *) &sg[OFF]);
+      #else
+       (void) ioctl(fd, TCGETA, (char *) &sg[OFF]);
+@@ -1795,7 +1795,7 @@ int strnicmp (const char *s1, const char
+    }
+ 
+   #ifdef _IOCTL_
+-   #ifdef __NetBSD__
++   #if defined(__NetBSD__) || defined(__DragonFly__)
+     (void) ioctl(fd, TIOCSETAW, (char *) &sg[ON]);
+    #else
+     (void) ioctl(fd, TCSETAW, (char *) &sg[ON]);
+@@ -1807,7 +1807,7 @@ int strnicmp (const char *s1, const char
+    read(fd, &c, 1);
+ 
+   #ifdef _IOCTL_
+-   #ifdef __NetBSD__
++   #if defined(__NetBSD__) || defined(__DragonFly__)
+     (void) ioctl(fd, TIOCSETAW, (char *) &sg[OFF]);
+    #else
+     (void) ioctl(fd, TCSETAW, (char *) &sg[OFF]);
-- 
cgit v1.2.3