editors/manedit: Add __DragonFly__ macros to fix build

5 files changed, 53 insertions, 12 deletions

diff --git a/editors/manedit/distinfo b/editors/manedit/distinfo
index 060e8a4ea92..997a4d1d2f2 100644
--- a/editors/manedit/distinfo
+++ b/editors/manedit/distinfo
@@ -1,12 +1,13 @@
-$NetBSD: distinfo,v 1.9 2007/12/27 17:26:52 joerg Exp $
+$NetBSD: distinfo,v 1.10 2011/12/08 06:49:41 marino Exp $
 
 SHA1 (manedit-0.8.1.tar.bz2) = 0b1705383840598ae7ced22ce5eb7f111008885b
 RMD160 (manedit-0.8.1.tar.bz2) = 17d378fad7a0dbe8d7b4c09b334dfc0768b0932e
 Size (manedit-0.8.1.tar.bz2) = 514226 bytes
 SHA1 (patch-aa) = b6b2443fca5fcab3367c49a011945b36a771ac74
-SHA1 (patch-ab) = f676d624b6df1474e69f829cee45bd5b4f76d63a
-SHA1 (patch-ac) = d88728e2932270b320c07be7fc5a327c0b8650d2
-SHA1 (patch-ad) = 56d64a76684534bde76ed2fda13bcd94b00cb125
+SHA1 (patch-ab) = a49685e0c136d4a9bcf10d512cc7dc318154c6c7
+SHA1 (patch-ac) = e210778d1e6f26611a8aaac769498ed05f6c1465
+SHA1 (patch-ad) = 1948c0940930a9c4e703c7087763f330e5c443c1
 SHA1 (patch-ae) = 418b0d379626b7eb6176ba15e7c228e985262005
 SHA1 (patch-af) = 8ff383b82b3813778aefa0e5ec72a76246089fbc
 SHA1 (patch-ag) = dc191e1b997da98b1d51a3c9f4ff3540598955f2
+SHA1 (patch-include_os.h) = 649f7995bcec2a7e6eafd2ebe5b74ab147be3a5f
diff --git a/editors/manedit/patches/patch-ab b/editors/manedit/patches/patch-ab
index 843a6ade80b..e0ef433d45d 100644
--- a/editors/manedit/patches/patch-ab
+++ b/editors/manedit/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.5 2007/10/14 07:49:54 rillig Exp $
+$NetBSD: patch-ab,v 1.6 2011/12/08 06:49:41 marino Exp $
 
 --- config.h.orig	Mon Dec 30 00:43:48 2002
 +++ config.h	Mon Dec 30 00:42:47 2002
@@ -7,7 +7,7 @@ $NetBSD: patch-ab,v 1.5 2007/10/14 07:49:54 rillig Exp $
   *	%p = optional parameters
   */
 -#if !defined(__FreeBSD__)
-+#if !defined(__FreeBSD__) && !defined(__NetBSD__)
++#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__)
  #define MEDIT_CMD_MANPAGE_TO_OUTPUT	(PREFIX "/bin/man %p %f")
  #else
  #define MEDIT_CMD_MANPAGE_TO_OUTPUT	(PREFIX "/bin/manwrap %p %f")
diff --git a/editors/manedit/patches/patch-ac b/editors/manedit/patches/patch-ac
index c8d35083937..705561e183d 100644
--- a/editors/manedit/patches/patch-ac
+++ b/editors/manedit/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.4 2007/10/14 07:49:54 rillig Exp $
+$NetBSD: patch-ac,v 1.5 2011/12/08 06:49:41 marino Exp $
 
 --- pref.c.orig	2007-02-11 09:00:00.000000000 +0100
 +++ pref.c	2007-10-14 09:27:47.000000000 +0200
@@ -7,7 +7,7 @@ $NetBSD: patch-ac,v 1.4 2007/10/14 07:49:54 rillig Exp $
  	     */
  
 -#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
  	    text[0] = "/usr/share/man";
  #else
  	    text[0] = "/usr/man";
@@ -16,7 +16,7 @@ $NetBSD: patch-ac,v 1.4 2007/10/14 07:49:54 rillig Exp $
  	    gtk_clist_append(GTK_CLIST(w), text);
  
 -#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
  	    text[0] = LOCALBASE "/man";
  #else
  	    text[0] = "/usr/local/man";
@@ -25,7 +25,7 @@ $NetBSD: patch-ac,v 1.4 2007/10/14 07:49:54 rillig Exp $
  	    gtk_clist_append(GTK_CLIST(w), text);
  
 -#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
  	    text[0] = X11BASE"/man";
  #else
  	    text[0] = "/usr/X11R6/man";
diff --git a/editors/manedit/patches/patch-ad b/editors/manedit/patches/patch-ad
index 4efe218fca3..52db75d4ef2 100644
--- a/editors/manedit/patches/patch-ad
+++ b/editors/manedit/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.4 2007/10/14 07:49:54 rillig Exp $
+$NetBSD: patch-ad,v 1.5 2011/12/08 06:49:42 marino Exp $
 
 --- prefcb.c.orig	Mon Dec 30 00:47:35 2002
 +++ prefcb.c	Mon Dec 30 00:47:46 2002
@@ -7,7 +7,7 @@ $NetBSD: patch-ad,v 1.4 2007/10/14 07:49:54 rillig Exp $
  	PDialogAddPromptWithBrowse(
  	    NULL, "Path:",
 -#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || defined (__NetBSD__)
++#if defined(__FreeBSD__) || defined (__NetBSD__) || defined(__DragonFly__)
  	    "/usr/share/man",
  #else
  	    "/usr/man",
diff --git a/editors/manedit/patches/patch-include_os.h b/editors/manedit/patches/patch-include_os.h
new file mode 100644
index 00000000000..a060bc5339c
--- /dev/null
+++ b/editors/manedit/patches/patch-include_os.h
@@ -0,0 +1,40 @@
+$NetBSD: patch-include_os.h,v 1.1 2011/12/08 06:49:42 marino Exp $
+
+--- ../include/os.h.orig	2007-02-11 08:00:00.000000000 +0000
++++ ../include/os.h
+@@ -16,7 +16,7 @@
+ 
+ #include <limits.h>
+ 
+-#if defined(__linux__) || defined(__FreeBSD__)
++#if defined(__linux__) || defined(__FreeBSD__) || defined(__DragonFly__)
+ # include <paths.h>
+ #endif
+ 
+@@ -52,7 +52,7 @@
+ # define _PATH_DEVNULL		"/dev/null"
+ #endif
+ 
+-#if !defined(_AIX) && !defined(__FreeBSD__) && !defined(__NetBSD__)
++#if !defined(_AIX) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__)
+ # ifndef _PATH_MAILDIR
+ #  define _PATH_MAILDIR		"/var/spool/mail"
+ # endif
+@@ -245,7 +245,7 @@
+ /* Bit types still not defined? */
+ #if !defined(__BIT_TYPES_DEFINED__) && !defined(WIN32) && !defined(__hpux)
+ //#define __BIT_TYPES_DEFINED__ Dan S: Multiple declaration problem.
+-#ifndef __FreeBSD__
++#if !defined(__FreeBSD__) && !defined(__DragonFly__)
+ 
+ // typedef char			int8_t;  Dan S: multiple declaration problem.
+ typedef unsigned char           u_int8_t;
+@@ -266,7 +266,7 @@ typedef unsigned long long      u_int64_
+ 
+ # endif	/* __GNUC__ >= 2 */
+ 
+-#endif	/* __FreeBSD__ */
++#endif	/* __FreeBSD__ __DragonFly__*/
+ #endif	/* __BIT_TYPES_DEFINED__ */
+ 
+