head 1.5; access; symbols pkgsrc-2014Q3:1.4.0.76 pkgsrc-2014Q3-base:1.4 pkgsrc-2014Q2:1.4.0.74 pkgsrc-2014Q2-base:1.4 pkgsrc-2014Q1:1.4.0.72 pkgsrc-2014Q1-base:1.4 pkgsrc-2013Q4:1.4.0.70 pkgsrc-2013Q4-base:1.4 pkgsrc-2013Q3:1.4.0.68 pkgsrc-2013Q3-base:1.4 pkgsrc-2013Q2:1.4.0.66 pkgsrc-2013Q2-base:1.4 pkgsrc-2013Q1:1.4.0.64 pkgsrc-2013Q1-base:1.4 pkgsrc-2012Q4:1.4.0.62 pkgsrc-2012Q4-base:1.4 pkgsrc-2012Q3:1.4.0.60 pkgsrc-2012Q3-base:1.4 pkgsrc-2012Q2:1.4.0.58 pkgsrc-2012Q2-base:1.4 pkgsrc-2012Q1:1.4.0.56 pkgsrc-2012Q1-base:1.4 pkgsrc-2011Q4:1.4.0.54 pkgsrc-2011Q4-base:1.4 pkgsrc-2011Q3:1.4.0.52 pkgsrc-2011Q3-base:1.4 pkgsrc-2011Q2:1.4.0.50 pkgsrc-2011Q2-base:1.4 pkgsrc-2011Q1:1.4.0.48 pkgsrc-2011Q1-base:1.4 pkgsrc-2010Q4:1.4.0.46 pkgsrc-2010Q4-base:1.4 pkgsrc-2010Q3:1.4.0.44 pkgsrc-2010Q3-base:1.4 pkgsrc-2010Q2:1.4.0.42 pkgsrc-2010Q2-base:1.4 pkgsrc-2010Q1:1.4.0.40 pkgsrc-2010Q1-base:1.4 pkgsrc-2009Q4:1.4.0.38 pkgsrc-2009Q4-base:1.4 pkgsrc-2009Q3:1.4.0.36 pkgsrc-2009Q3-base:1.4 pkgsrc-2009Q2:1.4.0.34 pkgsrc-2009Q2-base:1.4 pkgsrc-2009Q1:1.4.0.32 pkgsrc-2009Q1-base:1.4 pkgsrc-2008Q4:1.4.0.30 pkgsrc-2008Q4-base:1.4 pkgsrc-2008Q3:1.4.0.28 pkgsrc-2008Q3-base:1.4 cube-native-xorg:1.4.0.26 cube-native-xorg-base:1.4 pkgsrc-2008Q2:1.4.0.24 pkgsrc-2008Q2-base:1.4 cwrapper:1.4.0.22 pkgsrc-2008Q1:1.4.0.20 pkgsrc-2008Q1-base:1.4 pkgsrc-2007Q4:1.4.0.18 pkgsrc-2007Q4-base:1.4 pkgsrc-2007Q3:1.4.0.16 pkgsrc-2007Q3-base:1.4 pkgsrc-2007Q2:1.4.0.14 pkgsrc-2007Q2-base:1.4 pkgsrc-2007Q1:1.4.0.12 pkgsrc-2007Q1-base:1.4 pkgsrc-2006Q4:1.4.0.10 pkgsrc-2006Q4-base:1.4 pkgsrc-2006Q3:1.4.0.8 pkgsrc-2006Q3-base:1.4 pkgsrc-2006Q2:1.4.0.6 pkgsrc-2006Q2-base:1.4 pkgsrc-2006Q1:1.4.0.4 pkgsrc-2006Q1-base:1.4 pkgsrc-2005Q4:1.4.0.2 pkgsrc-2005Q4-base:1.4 pkgsrc-2005Q3:1.3.0.4 pkgsrc-2005Q3-base:1.3 pkgsrc-2005Q2:1.3.0.2 pkgsrc-2005Q2-base:1.3 pkgsrc-2005Q1:1.1.0.10 pkgsrc-2005Q1-base:1.1 pkgsrc-2004Q4:1.1.0.8 pkgsrc-2004Q4-base:1.1 pkgsrc-2004Q3:1.1.0.6 pkgsrc-2004Q3-base:1.1 pkgsrc-2004Q2:1.1.0.4 pkgsrc-2004Q2-base:1.1 pkgsrc-2004Q1:1.1.0.2 pkgsrc-2004Q1-base:1.1; locks; strict; comment @# @; 1.5 date 2014.10.01.19.07.08; author joerg; state dead; branches; next 1.4; commitid 9W0AgDRSu2HwZwSx; 1.4 date 2005.12.02.22.59.40; author joerg; state Exp; branches; next 1.3; 1.3 date 2005.05.08.03.14.35; author minskim; state Exp; branches; next 1.2; 1.2 date 2005.04.05.15.22.11; author minskim; state Exp; branches; next 1.1; 1.1 date 2004.02.21.07.09.50; author xtraeme; state Exp; branches; next ; desc @@ 1.5 log @Retire devel/nbitools, an ancient fork of NetBSD's imake version from xsrc. @ text @$NetBSD: patch-ah,v 1.4 2005/12/02 22:59:40 joerg Exp $ --- config/imake/imakemdep.h.orig 2002-02-12 13:36:00.000000000 -0600 +++ config/imake/imakemdep.h @@@@ -234,6 +234,11 @@@@ in this Software without prior written a * If use cc -E but want a different compiler, define DEFAULT_CC. * If the cpp you need is not in /lib/cpp, define DEFAULT_CPP. */ + +#if defined(__APPLE__) +#define DEFAULT_CPP "/usr/bin/cpp" +#define DEFAULT_CC "cc" +#endif #ifdef hpux #define USE_CC_E #endif @@@@ -253,7 +258,7 @@@@ in this Software without prior written a #if defined(sun) && (defined(SVR4) || defined(__svr4__) || defined(__SVR4) || defined(__sol__)) #define DEFAULT_CPP "/usr/ccs/lib/cpp" #endif -#ifdef __bsdi__ +#if defined(__bsdi__) || defined(__APPLE__) #define DEFAULT_CPP "/usr/bin/cpp" #endif #ifdef __uxp__ @@@@ -268,7 +273,7 @@@@ in this Software without prior written a #if defined(__386BSD__) || defined(__OpenBSD__) #define DEFAULT_CPP "/usr/libexec/cpp" #endif -#if defined(__FreeBSD__) || defined(__NetBSD__) +#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) #define USE_CC_E #endif #if defined(__sgi) && defined(__ANSI_CPP__) @@@@ -326,7 +331,7 @@@@ char *cpp_argv[ARGUMENTS] = { "-Uunix", /* remove unix symbol so that filename unix.c okay */ #endif #endif -#if defined(__386BSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(MACH) || defined(linux) || defined(__GNU__) +#if defined(__386BSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(MACH) || defined(linux) || defined(__GNU__) || defined(__DragonFly__) # ifdef __i386__ "-D__i386__", # endif @@@@ -639,6 +644,12 @@@@ char *cpp_argv[ARGUMENTS] = { # define DEFAULT_OS_MINOR_REV "v %*d.%1s" # define DEFAULT_OS_TEENY_REV "v %*d.%*c%[.0-9]" # define DEFAULT_OS_NAME "srvm %[^\n]" +# elif defined(__APPLE__) +/* uname -v returns "x.yz" or "x.y.z", e.g. "2.02" or "2.1.2". */ +# define DEFAULT_OS_MAJOR_REV "r %[0-9]" +# define DEFAULT_OS_MINOR_REV "r %*d.%[0-9]" +# define DEFAULT_OS_TEENY_REV "r %*d.%*d.%[0-9]" /* this will just get 0 */ +# define DEFAULT_OS_NAME "s %[^\n]" #elif defined(__osf__) /* uname -r returns "Wx.y", e.g. "V3.2" or "T4.0" */ # define DEFAULT_OS_MAJOR_REV "r %*[^0-9]%[0-9]" @@@@ -662,14 +673,14 @@@@ char *cpp_argv[ARGUMENTS] = { # define DEFAULT_OS_MINOR_REV "r %*d.%[0-9]" # define DEFAULT_OS_TEENY_REV "v %[0-9]" /* # define DEFAULT_OS_NAME "srm %[^\n]" */ /* Not useful on ISC */ -#elif defined(__FreeBSD__) || defined(__OpenBSD__) +#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) /* BSD/OS too? */ /* uname -r returns "x.y[.z]-mumble", e.g. "2.1.5-RELEASE" or "2.2-0801SNAP" */ # define DEFAULT_OS_MAJOR_REV "r %[0-9]" # define DEFAULT_OS_MINOR_REV "r %*d.%[0-9]" # define DEFAULT_OS_TEENY_REV "r %*d.%*d.%[0-9]" # define DEFAULT_OS_NAME "srm %[^\n]" -# if defined(__FreeBSD__) +# if defined(__FreeBSD__) || defined(__DragonFly__) /* Use an alternate way to find the teeny version for -STABLE, -SNAP versions */ # define DEFAULT_OS_TEENY_REV_FROB(buf, size) \ do { \ @@@@ -974,6 +985,9 @@@@ struct symtab predefs[] = { #ifdef __FreeBSD__ {"__FreeBSD__", "1"}, #endif +#ifdef __DragonFly__ + {"__DragonFly__", "1"}, +#endif #ifdef __OpenBSD__ {"__OpenBSD__", "1"}, #endif @ 1.4 log @Add DragonFly support. Bump revision due to PLIST change. @ text @d1 1 a1 1 $NetBSD: patch-ah,v 1.3 2005/05/08 03:14:35 minskim Exp $ @ 1.3 log @Apply patches provided by MOCHIDA Shuji in PR pkg/29889 to teach nbitools more about Darwin. @ text @d1 1 a1 1 $NetBSD$ d26 18 d57 27 @ 1.2 log @Correct a preprocessor directive to make this package build on Darwin. Patch provided by MOCHIDA Shuji in PR pkg/29889. @ text @d1 1 a1 1 $NetBSD: patch-ah,v 1.1 2004/02/21 07:09:50 xtraeme Exp $ d3 15 a17 3 --- config/imake/imakemdep.h.orig 2004-02-21 08:06:05.000000000 +0100 +++ config/imake/imakemdep.h 2004-02-21 08:06:50.000000000 +0100 @@@@ -253,7 +253,7 @@@@ d26 13 @ 1.1 log @Fix location of CPP when using MacOSX, and include and others as well to fix building, patches provided by Hiramatu Yosifumi in PR pkg/24348. @ text @d1 1 a1 1 $NetBSD$ d10 1 a10 1 +#ifdef __bsdi__ || defined(__APPLE__) @