diff options
author | dholland <dholland@pkgsrc.org> | 2015-10-17 22:34:21 +0000 |
---|---|---|
committer | dholland <dholland@pkgsrc.org> | 2015-10-17 22:34:21 +0000 |
commit | 1ef8fa72d1f415557f2ae2911c0cc61054f9c334 (patch) | |
tree | 0bc3973fd1172e9a1803dac5e36f575c7b8ee55c /graphics/radiance | |
parent | bb47b40ae23bead00dfb3c168e3ed3ba8f4905a4 (diff) | |
download | pkgsrc-1ef8fa72d1f415557f2ae2911c0cc61054f9c334.tar.gz |
Improve the plop message generated when the OS isn't recognized.
Diffstat (limited to 'graphics/radiance')
-rw-r--r-- | graphics/radiance/distinfo | 4 | ||||
-rw-r--r-- | graphics/radiance/patches/patch-aa | 14 |
2 files changed, 10 insertions, 8 deletions
diff --git a/graphics/radiance/distinfo b/graphics/radiance/distinfo index 2550e0f0cb1..52ddbde2606 100644 --- a/graphics/radiance/distinfo +++ b/graphics/radiance/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.16 2012/12/27 00:23:21 dholland Exp $ +$NetBSD: distinfo,v 1.17 2015/10/17 22:34:21 dholland Exp $ SHA1 (rad3R6P1.tar.gz) = 71f46abd1c30be282a93237fa0c162d3bf0b1f99 RMD160 (rad3R6P1.tar.gz) = 3bcf40518a57cdb5455264c83a3e206b67b3d1fa @@ -6,7 +6,7 @@ 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) = d417dbb99bebaa99e71e2ccfbf2db0d47777b0c8 +SHA1 (patch-aa) = 2c684bc56fa13792de9135b63c8de1c060a5996c SHA1 (patch-ab) = a2a6172a3f4c97251c52709dcb4f0ed5231c7b17 SHA1 (patch-ac) = 44ea632411e9db9caa6873588ce44413820eb77b SHA1 (patch-ad) = f3f7c68305964965851c9caeca53f0e534014085 diff --git a/graphics/radiance/patches/patch-aa b/graphics/radiance/patches/patch-aa index eb3ffd27cb2..54fd500eecd 100644 --- a/graphics/radiance/patches/patch-aa +++ b/graphics/radiance/patches/patch-aa @@ -1,12 +1,12 @@ -$NetBSD: patch-aa,v 1.6 2011/10/03 02:53:39 dholland Exp $ +$NetBSD: patch-aa,v 1.7 2015/10/17 22:34:21 dholland Exp $ csh programming considered harmful. note that this is now a sh script, but I can't patch the #! line because there's an rcsid in the way. ---- makeall.orig 2003-12-14 12:24:09.000000000 -0500 -+++ makeall 2009-04-29 00:37:35.000000000 -0400 +--- makeall.orig 2003-12-14 17:24:09.000000000 +0000 ++++ makeall @@ -3,27 +3,27 @@ # # Make all the Radiance programs @@ -43,7 +43,7 @@ because there's an rcsid in the way. cat << _EOF_ `cat src/rt/VERSION` INSTALLATION -@@ -35,183 +35,166 @@ this script. You can type ^C (followed +@@ -35,183 +35,167 @@ this script. You can type ^C (followed You must first answer the following questions. _EOF_ @@ -348,6 +348,7 @@ because there's an rcsid in the way. - set arch=other - breaksw -default: +- echo "Illegal choice\!" + read FOO + case "$FOO" in + y*|Y*) extras="CC=gcc";; @@ -361,8 +362,9 @@ because there's an rcsid in the way. + arch=IBMPC + ;; + *) - echo "Illegal choice\!" ++ echo "Illegal architecture choice\!" echo "Installation aborted." ++ echo "(You must set PKGSRC_ARCH in the pkgsrc makefile.)" exit 1 - breaksw -endsw @@ -377,7 +379,7 @@ because there's an rcsid in the way. "OPT=$opt" \ "MACH=$mach" \ ARCH=$arch "COMPAT=$compat" \ -@@ -222,71 +205,47 @@ exec make "SPECIAL=$special" \ +@@ -222,71 +206,47 @@ exec make "SPECIAL=$special" \ _EOF_ chmod 755 $rmake chmod 644 src/*/Rmakefile src/rt/devtable.c |