[pkgsrc/trunk]: pkgsrc/graphics/netpbm Do not build fiasco on Darwin-8.x, whe...

[minskim <minskim%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a5b14eba10b7
branches:  trunk
changeset: 496493:a5b14eba10b7
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Thu Jun 30 15:58:59 2005 +0000

description:
Do not build fiasco on Darwin-8.x, where it causes a bus error.  This
should be OK since the netpbm Makefile has the following:

  # Fiasco has some special requirements that make it fail to compile on
  # some systems, and since it isn't very important, just set this to "N"
  # and skip it on those systems unless you want to debug it and fix it.
  BUILD_FIASCO = Y

diffstat:

 graphics/netpbm/Makefile         |   9 ++++++++-
 graphics/netpbm/distinfo         |   4 ++--
 graphics/netpbm/patches/patch-aa |  13 +++++++++++--
 3 files changed, 21 insertions(+), 5 deletions(-)

diffs (60 lines):

diff -r 6bd2d3eb5530 -r a5b14eba10b7 graphics/netpbm/Makefile
--- a/graphics/netpbm/Makefile  Thu Jun 30 15:43:33 2005 +0000
+++ b/graphics/netpbm/Makefile  Thu Jun 30 15:58:59 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.116 2005/06/30 14:55:13 adam Exp $
+# $NetBSD: Makefile,v 1.117 2005/06/30 15:58:59 minskim Exp $
 
 DISTNAME=      netpbm-10.26.11
 CATEGORIES=    graphics
@@ -41,6 +41,13 @@
                        editor/pnmmargin        editor/ppmquantall      \
                        other/ppmtomap
 
+.include "../../mk/bsd.prefs.mk"
+
+# Fiasco fails to compile on Darwin-8.x.
+.if !empty(MACHINE_PLATFORM:MDarwin-8.*-*)
+MAKE_ENV+=     BUILD_FIASCO=N
+.endif
+
 pre-configure:
        ${CP} ${WRKSRC}/Makefile.config.in ${WRKSRC}/Makefile.config
 
diff -r 6bd2d3eb5530 -r a5b14eba10b7 graphics/netpbm/distinfo
--- a/graphics/netpbm/distinfo  Thu Jun 30 15:43:33 2005 +0000
+++ b/graphics/netpbm/distinfo  Thu Jun 30 15:58:59 2005 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.36 2005/06/30 14:55:13 adam Exp $
+$NetBSD: distinfo,v 1.37 2005/06/30 15:58:59 minskim Exp $
 
 SHA1 (netpbm-10.26.11.tgz) = 85dc3002c2fd9f43be2ed8517e94d126e2961f1b
 RMD160 (netpbm-10.26.11.tgz) = cf0c6abd134f757b1ffbc8598cfc9f1d1d5f550f
 Size (netpbm-10.26.11.tgz) = 2538375 bytes
-SHA1 (patch-aa) = f3f7861b0e0e3f812861643afe916c40277f4944
+SHA1 (patch-aa) = 92a760abe800648e76a3468d1e145b51022c01aa
 SHA1 (patch-ab) = ebab5f2ec96539058a8fbd79bf7867d1a49e02fd
 SHA1 (patch-ac) = 07f109139bf30da22b05d00189cbb7b4a5f8f05a
 SHA1 (patch-ae) = 33a5be2843dd85b530f5e6ba496cd0380cd5edd1
diff -r 6bd2d3eb5530 -r a5b14eba10b7 graphics/netpbm/patches/patch-aa
--- a/graphics/netpbm/patches/patch-aa  Thu Jun 30 15:43:33 2005 +0000
+++ b/graphics/netpbm/patches/patch-aa  Thu Jun 30 15:58:59 2005 +0000
@@ -1,7 +1,16 @@
-$NetBSD: patch-aa,v 1.30 2005/02/17 11:36:01 adam Exp $
+$NetBSD: patch-aa,v 1.31 2005/06/30 15:58:59 minskim Exp $
 
---- Makefile.config.in.orig    2005-01-13 03:50:04.000000000 +0000
+--- Makefile.config.in.orig    2005-01-12 21:50:04.000000000 -0600
 +++ Makefile.config.in
+@@ -24,7 +24,7 @@ DEFAULT_TARGET = nonmerge
+ # and skip it on those systems unless you want to debug it and fix it.
+ # OpenBSD:
+ #BUILD_FIASCO = N
+-BUILD_FIASCO = Y
++BUILD_FIASCO?= Y
+ 
+ # The following are commands for the build process to use.  These values
+ # do not get built into anything.
 @@ -33,7 +33,7 @@ BUILD_FIASCO = Y
  #CC = gcc
  # Note that 'cc' is usually an alias for whatever is the main compiler