From 1361140a6d9f489a1d16e52f2f48b774eedef24f Mon Sep 17 00:00:00 2001
From: dholland <dholland>
Date: Mon, 14 Nov 2011 02:35:25 +0000
Subject: Disable the logic that regenerates the version information .c file,
 as it (1) uses ed and breaks on linux, and (2) contrives to generate the
 wrong version number.

---
 graphics/radiance/distinfo         |  4 ++--
 graphics/radiance/patches/patch-al | 25 +++++++++++++++++++------
 2 files changed, 21 insertions(+), 8 deletions(-)

(limited to 'graphics/radiance')

diff --git a/graphics/radiance/distinfo b/graphics/radiance/distinfo
index a2bd91b7558..9ce110279f4 100644
--- a/graphics/radiance/distinfo
+++ b/graphics/radiance/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2011/10/03 02:53:39 dholland Exp $
+$NetBSD: distinfo,v 1.12 2011/11/14 02:35:25 dholland Exp $
 
 SHA1 (rad3R6P1.tar.gz) = 71f46abd1c30be282a93237fa0c162d3bf0b1f99
 RMD160 (rad3R6P1.tar.gz) = 3bcf40518a57cdb5455264c83a3e206b67b3d1fa
@@ -17,7 +17,7 @@ SHA1 (patch-ah) = be320a6b9b8b6b2153a31ea9218eb7d41aa43b0e
 SHA1 (patch-ai) = 2e48691bea7e189c86c65c646ef71ea854f105bb
 SHA1 (patch-aj) = 5242f18c523bbebcfdd886fa20501434f07b74c0
 SHA1 (patch-ak) = 6cc99ea8f5c06e2234cdc4905631d56982404835
-SHA1 (patch-al) = 455a831b05ec0a1627fc77591b0173be5e095072
+SHA1 (patch-al) = e284f339a66ce40a5b7dca2171bce97ca6a0c2d6
 SHA1 (patch-am) = 705a3f62c5688f593fd5c5a1a71b22e4652b1c77
 SHA1 (patch-an) = d0c388a5aaea622b220e3ef4c0f52956ecca5470
 SHA1 (patch-ao) = 22e3e8f3b593bca0423390f696324f42e8b52098
diff --git a/graphics/radiance/patches/patch-al b/graphics/radiance/patches/patch-al
index 46c60b7c8d5..52fd487e610 100644
--- a/graphics/radiance/patches/patch-al
+++ b/graphics/radiance/patches/patch-al
@@ -1,7 +1,7 @@
-$NetBSD: patch-al,v 1.4 2009/04/29 05:15:14 dholland Exp $
+$NetBSD: patch-al,v 1.5 2011/11/14 02:35:25 dholland Exp $
 
---- src/rt/Rmakefile.orig	2004-10-27 19:23:48.000000000 -0400
-+++ src/rt/Rmakefile	2005-02-16 18:10:40.000000000 -0500
+--- src/rt/Rmakefile.orig	2004-10-27 23:23:48.000000000 +0000
++++ src/rt/Rmakefile
 @@ -5,9 +5,8 @@
  
  OPT = -O
@@ -13,7 +13,7 @@ $NetBSD: patch-al,v 1.4 2009/04/29 05:15:14 dholland Exp $
  MLIB = -lm
  LINT = lint
  LINTFLAGS = -DBSD
-@@ -16,21 +15,21 @@
+@@ -16,21 +15,21 @@ LINTFLAGS = -DBSD
  # The following are user-definable:
  #
  DESTDIR = .
@@ -39,7 +39,7 @@ $NetBSD: patch-al,v 1.4 2009/04/29 05:15:14 dholland Exp $
  
  #
  # Device drivers for rvu (see also devtable.c):
-@@ -130,12 +129,12 @@
+@@ -130,12 +129,12 @@ $(DEVDIR)/aed:	aed.o colortab.o tty.o de
  devmain.o tty.o editline.o $(LIBS)
  
  $(RLIB):	$(ROBJS) Version.o
@@ -56,7 +56,7 @@ $NetBSD: patch-al,v 1.4 2009/04/29 05:15:14 dholland Exp $
  
  #
  # Special compiles:
-@@ -159,7 +158,7 @@
+@@ -159,7 +158,7 @@ dielectric.o:	dielectric.c source.h
  # end of dispersion compiles.
  
  devcomm.o:	devcomm.c
@@ -65,3 +65,16 @@ $NetBSD: patch-al,v 1.4 2009/04/29 05:15:14 dholland Exp $
  
  aed.o:	aed.c
  	$(CC) $(CFLAGS) -Daed_init=dinit -c aed.c
+@@ -168,9 +167,9 @@ aed.o:	aed.c
+ # Version module:
+ #
+ 
+-Version.c:	VERSION $(RSRC) $(HEADERS)
+-	( cat VERSION ; date ; whoami ; hostname ) > Version.c
+-	ed - Version.c < verscript.ed
++#Version.c:	VERSION $(RSRC) $(HEADERS)
++#	( cat VERSION ; date ; whoami ; hostname ) > Version.c
++#	ed - Version.c < verscript.ed
+ 
+ #
+ # Include dependencies:
-- 
cgit v1.2.3