Make X11 dependency explicit. Use X11BASE for include and link pathes.

Add DragonFly support.

4 files changed, 62 insertions, 32 deletions

diff --git a/graphics/radiance/Makefile b/graphics/radiance/Makefile
index f2e2796ea31..8796319da19 100644
--- a/graphics/radiance/Makefile
+++ b/graphics/radiance/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/02/18 21:27:57 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2006/02/26 21:26:32 joerg Exp $
 #
 
 DISTNAME=	rad3R6P1
@@ -36,6 +36,9 @@ PLIST_SUBST+=	USE_GL="@comment "
 .elif ${OPSYS} == "FreeBSD"
 PKGSRC_ARCH=	8
 PLIST_SUBST+=	USE_GL="@comment "
+.elif ${OPSYS} == "DragonFly"
+PKGSRC_ARCH=	12
+PLIST_SUBST+=	USE_GL="@comment "
 .elif ${OPSYS} == "Linux"
 PLIST_SUBST+=	USE_GL="@comment "
 PKGSRC_ARCH=	6
@@ -81,4 +84,5 @@ do-install:
 
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../x11/tk/buildlink3.mk"
+.include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/radiance/distinfo b/graphics/radiance/distinfo
index 7a500452e86..d26a2440268 100644
--- a/graphics/radiance/distinfo
+++ b/graphics/radiance/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2006/02/18 21:27:57 wiz Exp $
+$NetBSD: distinfo,v 1.7 2006/02/26 21:26:32 joerg Exp $
 
 SHA1 (rad3R6P1.tar.gz) = 71f46abd1c30be282a93237fa0c162d3bf0b1f99
 RMD160 (rad3R6P1.tar.gz) = 3bcf40518a57cdb5455264c83a3e206b67b3d1fa
@@ -6,8 +6,8 @@ Size (rad3R6P1.tar.gz) = 7115997 bytes
 SHA1 (rad3R6P1supp.tar.gz) = 8a13227eae507a7a4947a49b6aa741c95198ed4e
 RMD160 (rad3R6P1supp.tar.gz) = 9581a9f979044399e528114875c818b1de2f54ae
 Size (rad3R6P1supp.tar.gz) = 4632166 bytes
-SHA1 (patch-aa) = a80bd880e1b293240e9a5d712dc318a9fdc1d272
-SHA1 (patch-ab) = 5d06bcf2216ed084a757724045391bfbe05d56d2
+SHA1 (patch-aa) = 9a1a89d66d60bb99d00c1cc9f76942126903c80e
+SHA1 (patch-ab) = 051d127e149280d127619d646dc8981b124e575e
 SHA1 (patch-ac) = 2d0eb6a263c4d4c088397a8dbeebc01219c624f1
 SHA1 (patch-ad) = f3f7c68305964965851c9caeca53f0e534014085
 SHA1 (patch-ae) = eaeba41315973013676bf400e5acff29ff61946a
diff --git a/graphics/radiance/patches/patch-aa b/graphics/radiance/patches/patch-aa
index e40960fd3db..a988180291c 100644
--- a/graphics/radiance/patches/patch-aa
+++ b/graphics/radiance/patches/patch-aa
@@ -1,10 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2005/02/17 00:38:37 jschauma Exp $
+$NetBSD: patch-aa,v 1.4 2006/02/26 21:26:32 joerg Exp $
 
-Make this script run non-interactively.
-
---- makeall.orig	2003-12-14 12:24:09.000000000 -0500
-+++ makeall	2005-02-15 17:41:37.000000000 -0500
-@@ -36,17 +36,10 @@
+--- makeall.orig	2003-12-14 17:24:09.000000000 +0000
++++ makeall
+@@ -36,17 +36,10 @@ You must first answer the following ques
  
  _EOF_
  if ( ! $?EDITOR ) then
@@ -23,7 +21,7 @@ Make this script run non-interactively.
  (echo $idir) >/dev/null
  if ( $status ) then
  	goto again1
-@@ -54,19 +47,16 @@
+@@ -54,19 +47,16 @@ endif
  set idir=$idir
  if ( "$idir" == "" ) then
  	set idir=/usr/local/bin
@@ -46,7 +44,7 @@ Make this script run non-interactively.
  	if ( $status ) then
  		echo "Cannot create subdirectory, please reenter"
  		goto again1
-@@ -84,10 +74,6 @@
+@@ -84,10 +74,6 @@ if ( "`ls -tL $rmake $0 |& head -1`" == 
  	goto gotrmake
  endif
  set newrmake
@@ -57,7 +55,7 @@ Make this script run non-interactively.
  set special=
  set arch=
  set opt=
-@@ -95,24 +81,7 @@
+@@ -95,24 +81,7 @@ set mach=
  set compat=
  set extras=
  set esuffix=
@@ -83,17 +81,35 @@ Make this script run non-interactively.
  switch ("$arch")
  case 1:			# SPARC Station
  	set arch=sun
-@@ -163,7 +132,7 @@
+@@ -163,14 +132,14 @@ case 5:			# BSDI BSD/386
  	set compat="malloc.o erf.o strcmp.o"
  	breaksw
  case 6:			# Linux
 -	set mach="-Dlinux -D_FILE_OFFSET_BITS=64 -L/usr/X11R6/lib -I/usr/include/X11 -DNOSTEREO"
-+	set mach="-Dlinux -D_FILE_OFFSET_BITS=64 -L/usr/X11R6/lib -I/usr/X11R6/include -DNOSTEREO"
++	set mach="-Dlinux -D_FILE_OFFSET_BITS=64 -L${X11BASE}/lib -I${X11BASE}/include -DNOSTEREO"
  	set opt="-O2 -DSPEED=200"
  	set arch=IBMPC
  	set compat="bmalloc.o erf.o getpagesize.o"
-@@ -181,11 +150,16 @@
- 	set mach="-DBSD -DNOSTEREO -Dfreebsd -I/usr/X11R6/include -L/usr/X11R6/lib"
+ 	set extras=CC=gcc
+ 	breaksw
+ case 7:			# MacOS X
+-	set mach="-DBSD -DNOSTEREO -Dfreebsd -I/usr/X11R6/include -L/usr/X11R6/lib"
++	set mach="-DBSD -DNOSTEREO -Dfreebsd -I${X11BASE}/include -L${X11BASE}/lib"
+ 	set opt="-O2 -DSPEED=200"
+ 	set arch=PowerPC
+ 	set compat="bmalloc.o"
+@@ -178,14 +147,19 @@ case 7:			# MacOS X
+ 	set special="ogl"
+ 	breaksw
+ case 8:			# FreeBSD
+-	set mach="-DBSD -DNOSTEREO -Dfreebsd -I/usr/X11R6/include -L/usr/X11R6/lib"
++	set mach="-DBSD -DNOSTEREO -Dfreebsd -I${X11BASE}/include -L${X11BASE}/lib"
++	set opt="-O -DSPEED=200"
++	set compat="bmalloc.o erf.o"
++	set arch=IBMPC
++	breaksw
++case 9:			# NetBSD
++	set mach="-DBSD -DNOSTEREO -Dnetbsd -I${X11BASE}/include -L${X11BASE}/lib"
  	set opt="-O -DSPEED=200"
  	set compat="bmalloc.o erf.o"
 -	set extras="CC=cc"
@@ -101,18 +117,12 @@ Make this script run non-interactively.
  	breaksw
 -case 9:			# Cygwin
 -	set mach="-Dfreebsd -L/usr/lib -L/usr/X11R6/lib -I/usr/include/X11 -I/usr/X11R6/include -DNOSTEREO"
-+case 9:			# NetBSD
-+	set mach="-DBSD -DNOSTEREO -Dnetbsd -I/usr/X11R6/include -L/usr/X11R6/lib"
-+	set opt="-O -DSPEED=200"
-+	set compat="bmalloc.o erf.o"
-+	set arch=IBMPC
-+	breaksw
 +case 10:			# Cygwin
-+	set mach="-Dfreebsd -L/usr/lib -L/usr/X11R6 -I/usr/X11R6/include -DNOSTEREO"
++	set mach="-Dfreebsd -L/usr/lib -L${X11BASE} -I${X11BASE}/include -DNOSTEREO"
  	set opt="-O2 -DSPEED=200"
  	set arch=IBMPC
  	set compat="bmalloc.o erf.o getpagesize.o"
-@@ -193,7 +167,7 @@
+@@ -193,7 +167,7 @@ case 9:			# Cygwin
  	set special="ogl"
  	set esuffix=".exe"
  	breaksw
@@ -121,7 +131,20 @@ Make this script run non-interactively.
  	set opt="-O"
  	set compat="bmalloc.o erf.o strcmp.o"
  	echo -n "Are you using the GNU C compiler [n]? "
-@@ -211,7 +185,7 @@
+@@ -202,6 +176,12 @@ case 10:			# Other
+ 	endif
+ 	set arch=other
+ 	breaksw
++case 12:			# DragonFly
++	set mach="-DBSD -DNOSTEREO -Ddragonfly -I${X11BASE}/include -L${X11BASE}/lib"
++	set opt="-O -DSPEED=200"
++	set compat="bmalloc.o erf.o"
++	set arch=IBMPC
++	breaksw
+ default:
+ 	echo "Illegal choice\!"
+ 	echo "Installation aborted."
+@@ -211,7 +191,7 @@ endsw
  source installib
  sed 's/[ 	]*$//' > $rmake << _EOF_
  #!/bin/sh
@@ -130,7 +153,7 @@ Make this script run non-interactively.
  	"OPT=$opt" \
  	"MACH=$mach" \
  	ARCH=$arch "COMPAT=$compat" \
-@@ -225,28 +199,16 @@
+@@ -225,28 +205,16 @@ chmod 644 src/*/Rmakefile src/rt/devtabl
  gotrmake:
  echo "Current rmake command is:"
  cat $rmake
@@ -160,7 +183,7 @@ Make this script run non-interactively.
  	@ errs += $status
  	popd
  end
-@@ -256,22 +218,6 @@
+@@ -256,22 +224,6 @@ else
  	echo "Done."
  endif
  cd ..
diff --git a/graphics/radiance/patches/patch-ab b/graphics/radiance/patches/patch-ab
index 9b2649c2f80..882a9404555 100644
--- a/graphics/radiance/patches/patch-ab
+++ b/graphics/radiance/patches/patch-ab
@@ -1,13 +1,16 @@
-$NetBSD: patch-ab,v 1.1.1.1 2005/02/16 22:17:33 jschauma Exp $
+$NetBSD: patch-ab,v 1.2 2006/02/26 21:26:32 joerg Exp $
 
---- src/hd/rhdisp.c.orig	2005-02-15 10:05:02.000000000 -0500
-+++ src/hd/rhdisp.c	2005-02-15 10:05:15.000000000 -0500
-@@ -22,7 +22,7 @@
+--- src/hd/rhdisp.c.orig	2004-04-10 02:54:06.000000000 +0000
++++ src/hd/rhdisp.c
+@@ -22,8 +22,10 @@ static const char	RCSid[] = "$Id: rhdisp
  #define FSIZDEF		0.125	/* default focus frame size */
  #endif
  
 -#if defined(freebsd)
 +#if defined(freebsd) || defined(netbsd)
  #define fbufcnt(f)	((f)->_r)
++#elif defined(dragonfly)
++#define fbufcnt(f)	(((struct __FILE_public *)(f))->_r)
  #elif defined(__GNUC__)
  #define fbufcnt(f)	((f)->_IO_read_end - (f)->_IO_read_ptr)
+ #else