head 1.5; access; symbols pkgsrc-2013Q2:1.5.0.38 pkgsrc-2013Q2-base:1.5 pkgsrc-2012Q4:1.5.0.36 pkgsrc-2012Q4-base:1.5 pkgsrc-2011Q4:1.5.0.34 pkgsrc-2011Q4-base:1.5 pkgsrc-2011Q2:1.5.0.32 pkgsrc-2011Q2-base:1.5 pkgsrc-2009Q4:1.5.0.30 pkgsrc-2009Q4-base:1.5 pkgsrc-2008Q4:1.5.0.28 pkgsrc-2008Q4-base:1.5 pkgsrc-2008Q3:1.5.0.26 pkgsrc-2008Q3-base:1.5 cube-native-xorg:1.5.0.24 cube-native-xorg-base:1.5 pkgsrc-2008Q2:1.5.0.22 pkgsrc-2008Q2-base:1.5 pkgsrc-2008Q1:1.5.0.20 pkgsrc-2008Q1-base:1.5 pkgsrc-2007Q4:1.5.0.18 pkgsrc-2007Q4-base:1.5 pkgsrc-2007Q3:1.5.0.16 pkgsrc-2007Q3-base:1.5 pkgsrc-2007Q2:1.5.0.14 pkgsrc-2007Q2-base:1.5 pkgsrc-2007Q1:1.5.0.12 pkgsrc-2007Q1-base:1.5 pkgsrc-2006Q4:1.5.0.10 pkgsrc-2006Q4-base:1.5 pkgsrc-2006Q3:1.5.0.8 pkgsrc-2006Q3-base:1.5 pkgsrc-2006Q2:1.5.0.6 pkgsrc-2006Q2-base:1.5 pkgsrc-2006Q1:1.5.0.4 pkgsrc-2006Q1-base:1.5 pkgsrc-2005Q4:1.5.0.2 pkgsrc-2005Q4-base:1.5 pkgsrc-2005Q3:1.4.0.2 pkgsrc-2005Q3-base:1.4 pkgsrc-2005Q2:1.3.0.12 pkgsrc-2005Q2-base:1.3 pkgsrc-2005Q1:1.3.0.10 pkgsrc-2005Q1-base:1.3 pkgsrc-2004Q4:1.3.0.8 pkgsrc-2004Q4-base:1.3 pkgsrc-2004Q3:1.3.0.6 pkgsrc-2004Q3-base:1.3 pkgsrc-2004Q2:1.3.0.4 pkgsrc-2004Q2-base:1.3 pkgsrc-2004Q1:1.3.0.2 pkgsrc-2004Q1-base:1.3 pkgsrc-2003Q4:1.2.0.4 pkgsrc-2003Q4-base:1.2 netbsd-1-6-1:1.2.0.2 netbsd-1-6-1-base:1.2 netbsd-1-6:1.1.0.8 netbsd-1-6-RELEASE-base:1.1 pkgviews:1.1.0.4 pkgviews-base:1.1 buildlink2-base:1.1 buildlink2:1.1.0.2; locks; strict; comment @# @; 1.5 date 2005.12.12.19.55.41; author joerg; state dead; branches; next 1.4; 1.4 date 2005.06.27.14.08.15; author wiz; state Exp; branches; next 1.3; 1.3 date 2004.03.16.23.59.42; author danw; state Exp; branches; next 1.2; 1.2 date 2002.08.25.18.40.41; author jlam; state Exp; branches; next 1.1; 1.1 date 2002.06.22.04.38.32; author jlam; state Exp; branches 1.1.2.1; next ; 1.1.2.1 date 2002.06.22.04.38.32; author jlam; state dead; branches; next 1.1.2.2; 1.1.2.2 date 2002.06.23.19.06.44; author jlam; state Exp; branches; next ; desc @@ 1.5 log @Update OpenMotif to 2.2.3. Too many changes to list here, but most importantly no more imake usage. @ text @$NetBSD: patch-as,v 1.4 2005/06/27 14:08:15 wiz Exp $ --- config/cf/Imake.cf.orig Sat Mar 13 21:19:59 2004 +++ config/cf/Imake.cf @@@@ -73,6 +73,9 @@@@ # if defined(__sparc__) || defined(sparc) # define SparcArchitecture # undef sparc +# if defined(__sparc64__) +# define Sparc64Architecture +# endif # endif # ifdef mips # define MipsArchitecture @@@@ -129,6 +132,9 @@@@ # if defined(__sparc__) || defined(sparc) # define SparcArchitecture # undef sparc +# if defined(__sparc64__) +# define Sparc64Architecture +# endif # endif # ifdef mips # define MipsArchitecture @@@@ -150,7 +155,21 @@@@ # endif #endif /* NetBSD */ -#ifdef __FreeBSD__ +#ifdef __DragonFly__ +# define MacroIncludeFile +# define MacroFile DragonFly.cf +# undef __DragonFly__ +# ifdef __i386__ +# define i386BsdArchitecture +# define i386Architecture +# undef i386 +# endif +# ifdef __amd64__ +# define AMD64Architecture +# undef __amd64__ +# undef __x86_64__ +# endif +#elif defined __FreeBSD__ # define MacroIncludeFile # define MacroFile FreeBSD.cf # undef __FreeBSD__ @@@@ -721,6 +743,21 @@@@ #endif #endif /* QNX/Neutrino */ +#if defined(__APPLE__) +# undef __APPLE__ +# define MacroIncludeFile +# define MacroFile darwin.cf +# define DarwinArchitecture +# ifdef __ppc__ +# define PpcDarwinArchitecture +# undef __ppc__ +# endif +# ifdef __i386__ +# define i386DarwinArchitecture +# undef __i386__ +# endif +#endif + #ifndef MacroIncludeFile XCOMM WARNING: Imake.cf not configured; guessing at definitions!!! XCOMM This might mean that BOOTSTRAPCFLAGS was not set when building imake. @ 1.4 log @Add DragonFly support (untested). Provided by Jörg Sonnenberger in PR 30258. While here, clean up pkglint warnings. @ text @d1 1 a1 1 $NetBSD: patch-as,v 1.3 2004/03/16 23:59:42 danw Exp $ @ 1.3 log @add darwin support @ text @d1 1 a1 1 $NetBSD$ d5 1 a5 1 @@@@ -73,6 +73,9 @@@@ XCOMM $XFree86: xc/config/cf/Imake.cf,v d15 1 a15 1 @@@@ -129,6 +132,9 @@@@ XCOMM $XFree86: xc/config/cf/Imake.cf,v d25 24 a48 2 @@@@ -720,6 +726,21 @@@@ XCOMM $XFree86: xc/config/cf/Imake.cf,v #endif d51 1 a51 1 + d66 1 a66 1 d69 1 @ 1.2 log @Merge changes in packages from the buildlink2 branch that have buildlink2.mk files back into the main trunk. This provides sufficient buildlink2 infrastructure to start merging other packages from the buildlink2 branch that have already been converted to use the buildlink2 framework. @ text @d1 1 a1 1 $NetBSD: patch-as,v 1.1.2.1 2002/06/23 19:06:44 jlam Exp $ d3 1 a3 1 --- config/cf/Imake.cf.orig Sat Jun 22 00:09:11 2002 d5 1 a5 1 @@@@ -73,6 +73,9 @@@@ d15 1 a15 1 @@@@ -129,6 +132,9 @@@@ d25 22 @ 1.1 log @Workaround a gcc codegen bug on sparc64 (surprise, surprise) by using no optimization on sparc64. Fix from pkg/15477 by Lloyd Parkes . @ text @d1 1 a1 1 $NetBSD$ @ 1.1.2.1 log @file patch-as was added on branch buildlink2 on 2002-06-23 19:06:44 +0000 @ text @d1 24 @ 1.1.2.2 log @Merge from pkgsrc-current to buildlink2 branch. @ text @a0 24 $NetBSD: patch-as,v 1.1.2.1 2002/06/23 19:06:44 jlam Exp $ --- config/cf/Imake.cf.orig Sat Jun 22 00:09:11 2002 +++ config/cf/Imake.cf @@@@ -73,6 +73,9 @@@@ # if defined(__sparc__) || defined(sparc) # define SparcArchitecture # undef sparc +# if defined(__sparc64__) +# define Sparc64Architecture +# endif # endif # ifdef mips # define MipsArchitecture @@@@ -129,6 +132,9 @@@@ # if defined(__sparc__) || defined(sparc) # define SparcArchitecture # undef sparc +# if defined(__sparc64__) +# define Sparc64Architecture +# endif # endif # ifdef mips # define MipsArchitecture @