[pkgsrc/pkgsrc-2005Q2]: pkgsrc/graphics/netpbm Pullup ticket 581 - requested ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/bcc0d6f22b26
branches:  pkgsrc-2005Q2
changeset: 495859:bcc0d6f22b26
user:      snj <snj%pkgsrc.org@localhost>
date:      Sat Jul 02 07:12:05 2005 +0000

description:
Pullup ticket 581 - requested by Min Sik KIm
portability fix for netpbm

Revisions pulled up:
- pkgsrc/graphics/netpbm/Makefile               1.117
- pkgsrc/graphics/netpbm/distinfo               1.37 via patch
- pkgsrc/graphics/netpbm/patches/patch-aa       1.31

    Module Name:     pkgsrc
    Committed By:    minskim
    Date:            Thu Jun 30 15:58:59 UTC 2005

    Modified Files:
        pkgsrc/graphics/netpbm: Makefile distinfo
        pkgsrc/graphics/netpbm/patches: patch-aa

    Log Message:
    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 da7f15d0d6bb -r bcc0d6f22b26 graphics/netpbm/Makefile
--- a/graphics/netpbm/Makefile  Sat Jul 02 07:02:17 2005 +0000
+++ b/graphics/netpbm/Makefile  Sat Jul 02 07:12:05 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.113.2.1 2005/06/25 16:05:34 salo Exp $
+# $NetBSD: Makefile,v 1.113.2.2 2005/07/02 07:12:05 snj Exp $
 
 DISTNAME=      netpbm-10.26.9
 PKGREVISION=   2
@@ -43,6 +43,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 da7f15d0d6bb -r bcc0d6f22b26 graphics/netpbm/distinfo
--- a/graphics/netpbm/distinfo  Sat Jul 02 07:02:17 2005 +0000
+++ b/graphics/netpbm/distinfo  Sat Jul 02 07:12:05 2005 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.35 2005/05/24 07:53:54 adam Exp $
+$NetBSD: distinfo,v 1.35.2.1 2005/07/02 07:12:05 snj Exp $
 
 SHA1 (netpbm-10.26.9.tgz) = 1c7e57663066f8ce46b0cf7da4e186393f98fd14
 RMD160 (netpbm-10.26.9.tgz) = 5a23d08bcf1fa0fbd12c85b83b98ae9dd0681c85
 Size (netpbm-10.26.9.tgz) = 2538187 bytes
-SHA1 (patch-aa) = f3f7861b0e0e3f812861643afe916c40277f4944
+SHA1 (patch-aa) = 92a760abe800648e76a3468d1e145b51022c01aa
 SHA1 (patch-ab) = ebab5f2ec96539058a8fbd79bf7867d1a49e02fd
 SHA1 (patch-ac) = 07f109139bf30da22b05d00189cbb7b4a5f8f05a
 SHA1 (patch-ad) = 624ee6327fa05cae52f95a2eb6f6e8a9a74f26a5
diff -r da7f15d0d6bb -r bcc0d6f22b26 graphics/netpbm/patches/patch-aa
--- a/graphics/netpbm/patches/patch-aa  Sat Jul 02 07:02:17 2005 +0000
+++ b/graphics/netpbm/patches/patch-aa  Sat Jul 02 07:12:05 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.30.4.1 2005/07/02 07:12:05 snj 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