[pkgsrc/pkgsrc-2008Q4]: pkgsrc Pullup ticket #2698 - requested by minskim

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9fe732e993d3
branches:  pkgsrc-2008Q4
changeset: 552327:9fe732e993d3
user:      tron <tron%pkgsrc.org@localhost>
date:      Sun Feb 15 11:40:45 2009 +0000

description:
Pullup ticket #2698 - requested by minskim
bison: portability fix

Revisions pulled up:
- devel/bison/Makefile                  1.69
- mk/tools/tools.Darwin.mk              1.39
---
Module Name:    pkgsrc
Committed By:   schwarz
Date:           Thu Jan 22 20:14:05 UTC 2009

Modified Files:
         pkgsrc/mk/tools: tools.Darwin.mk

Log Message:
Do not use GNU m4 shipped with the OS on systems prior to Mac OS 10.5.
10.4 shipped with gm4 1.4.2, 10.3 came with 1.4.
This is not recent enough for some packages (specifically devel/
autoconf),
so use pkgsrc's gm4 instead.
Fixes PR#40329.
---
Module Name:    pkgsrc
Committed By:   minskim
Date:           Thu Feb 12 18:43:21 UTC 2009

Modified Files:
         pkgsrc/devel/bison: Makefile

Log Message:
Bump PKGREVISION because the path to m4 was changed on Darwin<9.

The tools framework changed m4 on Darwin<9 from the native one to the
pkgsrc version last month.  bison needs a PKGREVISION bump because it
embeds the path to m4 in its binary.

diffstat:

 devel/bison/Makefile     |  3 ++-
 mk/tools/tools.Darwin.mk |  4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diffs (31 lines):

diff -r 5292192dd17d -r 9fe732e993d3 devel/bison/Makefile
--- a/devel/bison/Makefile      Fri Feb 13 09:49:49 2009 +0000
+++ b/devel/bison/Makefile      Sun Feb 15 11:40:45 2009 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.68 2008/12/12 09:08:05 wiz Exp $
+# $NetBSD: Makefile,v 1.68.2.1 2009/02/15 11:40:45 tron Exp $
 
 DISTNAME=              bison-2.4.1
+PKGREVISION=           1
 CATEGORIES=            devel
 MASTER_SITES=          ${MASTER_SITE_GNU:=bison/}
 EXTRACT_SUFX=          .tar.bz2
diff -r 5292192dd17d -r 9fe732e993d3 mk/tools/tools.Darwin.mk
--- a/mk/tools/tools.Darwin.mk  Fri Feb 13 09:49:49 2009 +0000
+++ b/mk/tools/tools.Darwin.mk  Sun Feb 15 11:40:45 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tools.Darwin.mk,v 1.38 2008/07/21 17:34:19 dbj Exp $
+# $NetBSD: tools.Darwin.mk,v 1.38.6.1 2009/02/15 11:40:45 tron Exp $
 #
 # System-supplied tools for the Darwin (Mac OS X) operating system.
 
@@ -39,8 +39,8 @@
 TOOLS_PLATFORM.ftp?=           /usr/bin/ftp
 .if empty(MACHINE_PLATFORM:MDarwin-[0-8].*-*)
 TOOLS_PLATFORM.gmake?=         /usr/bin/gnumake
+TOOLS_PLATFORM.gm4?=           /usr/bin/gm4
 .endif
-TOOLS_PLATFORM.gm4?=           /usr/bin/gm4
 TOOLS_PLATFORM.grep?=          /usr/bin/grep
 TOOLS_PLATFORM.gtar?=          /usr/bin/gnutar
 TOOLS_PLATFORM.gunzip?=                /usr/bin/gunzip -f