DragonFly support.

5 files changed, 47 insertions, 2 deletions

diff --git a/lang/icon/Makefile b/lang/icon/Makefile
index 115035a1444..7b2627de91f 100644
--- a/lang/icon/Makefile
+++ b/lang/icon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2006/03/04 21:29:54 jlam Exp $
+# $NetBSD: Makefile,v 1.39 2006/03/19 15:57:36 joerg Exp $
 
 DISTNAME=       	icon.v942src
 PKGNAME=		icon-9.4.2
@@ -29,6 +29,9 @@ PTHREAD_OPTS+=		require native
 .  include "../../mk/pthread.buildlink3.mk"
 .  endif
 
+.elif ${OPSYS} == "DragonFly"
+NAME=	freebsd
+
 .elif ${OPSYS} == "SunOS"
 
 .  if !empty(CC_VERSION:M*gcc*)
diff --git a/lang/icon/distinfo b/lang/icon/distinfo
index e34c3640d04..d05f7e5a82e 100644
--- a/lang/icon/distinfo
+++ b/lang/icon/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2005/02/24 09:03:08 agc Exp $
+$NetBSD: distinfo,v 1.14 2006/03/19 15:57:36 joerg Exp $
 
 SHA1 (icon.v942src.tgz) = 9536e9346188deb2dc5853e03b5f7a85991314b1
 RMD160 (icon.v942src.tgz) = 7e0ec62b714c433acb23a31bad62028424f72ead
@@ -26,3 +26,6 @@ SHA1 (patch-au) = de4bba2ee4c08ab4e20ec29132b46ed17bd03de4
 SHA1 (patch-av) = c7eda8b5e28a03b13ec6f037c168fab33c1bb214
 SHA1 (patch-aw) = 32fbb57aff56ab9ddffb0ab01872dbc79d7ce654
 SHA1 (patch-ax) = 2da62632e50bf9f60b0784598e74b8a15a245d1e
+SHA1 (patch-ay) = 34186d788599e3e62fd1f27e931feb240c5aab2d
+SHA1 (patch-az) = 49785eb95d1ee006a6788e92031e0782e081ee71
+SHA1 (patch-ba) = f077eaee178fba82da8a35ab8b6a046dc4df4809
diff --git a/lang/icon/patches/patch-ay b/lang/icon/patches/patch-ay
new file mode 100644
index 00000000000..855fd70392c
--- /dev/null
+++ b/lang/icon/patches/patch-ay
@@ -0,0 +1,14 @@
+$NetBSD: patch-ay,v 1.6 2006/03/19 15:57:36 joerg Exp $
+
+--- ipl/cfuncs/fpoll.c.orig	2006-03-19 15:06:16.000000000 +0000
++++ ipl/cfuncs/fpoll.c
+@@ -65,6 +65,9 @@ int fpoll(int argc, descriptor *argv)	/*
+ #elif defined(__GLIBC__)				/* old GCC library */
+    if (f->__bufp < f->__get_limit)
+       RetArg(1);
++#elif defined(__DragonFly__)
++    if (((struct __FILE_public *)f)->_r > 0)
++      RetArg(1);
+ #elif defined(_FSTDIO)					/* new BSD library */
+    if (f->_r > 0)
+       RetArg(1);
diff --git a/lang/icon/patches/patch-az b/lang/icon/patches/patch-az
new file mode 100644
index 00000000000..7c5543a7d7a
--- /dev/null
+++ b/lang/icon/patches/patch-az
@@ -0,0 +1,13 @@
+$NetBSD: patch-az,v 1.6 2006/03/19 15:57:36 joerg Exp $
+
+--- ipl/cfuncs/mklib.sh.orig	2006-03-19 15:16:00.000000000 +0000
++++ ipl/cfuncs/mklib.sh
+@@ -21,7 +21,7 @@ case "$SYS" in
+       ld -shared -o $LIBNAME "$@";;
+    OSF*)
+       ld -shared -expect_unresolved '*' -o $LIBNAME "$@" -lc;;
+-   Linux*|BSD/OS*|OpenBSD*|NetBSD*|GNU*)
++   Linux*|BSD/OS*|OpenBSD*|NetBSD*|GNU*|DragonFly*)
+       gcc -shared -o $LIBNAME -fPIC "$@";;
+    FreeBSD*)
+       ld -Bshareable -o $LIBNAME "$@" -lc;;
diff --git a/lang/icon/patches/patch-ba b/lang/icon/patches/patch-ba
new file mode 100644
index 00000000000..dc94ebe4fd8
--- /dev/null
+++ b/lang/icon/patches/patch-ba
@@ -0,0 +1,12 @@
+$NetBSD: patch-ba,v 1.5 2006/03/19 15:57:36 joerg Exp $
+
+--- config/freebsd/Makedefs.orig	2006-03-19 15:21:42.000000000 +0000
++++ config/freebsd/Makedefs
+@@ -14,6 +14,6 @@ CFDYN = -fPIC
+ RLINK = -Wl,-E
+ RLIBS = -lm
+ TLIBS = -pthread
+-XLIBS = -L/usr/X11R6/lib -lX11
++XLIBS = -R${X11BASE}/lib -L${X11BASE}/lib -lX11
+ XPMDEFS = -DZPIPE
+ GDIR = xpm