head 1.4; access; symbols pkgsrc-2013Q2:1.4.0.38 pkgsrc-2013Q2-base:1.4 pkgsrc-2012Q4:1.4.0.36 pkgsrc-2012Q4-base:1.4 pkgsrc-2011Q4:1.4.0.34 pkgsrc-2011Q4-base:1.4 pkgsrc-2011Q2:1.4.0.32 pkgsrc-2011Q2-base:1.4 pkgsrc-2009Q4:1.4.0.30 pkgsrc-2009Q4-base:1.4 pkgsrc-2008Q4:1.4.0.28 pkgsrc-2008Q4-base:1.4 pkgsrc-2008Q3:1.4.0.26 pkgsrc-2008Q3-base:1.4 cube-native-xorg:1.4.0.24 cube-native-xorg-base:1.4 pkgsrc-2008Q2:1.4.0.22 pkgsrc-2008Q2-base:1.4 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.2.0.12 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.10 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.8 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.6 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.4 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.2 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.1.1.1.0.2 pkgsrc-2004Q1-base:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.4 date 2005.10.10.17.27.17; author reed; state dead; branches; next 1.3; 1.3 date 2005.10.09.05.11.32; author reed; state Exp; branches; next 1.2; 1.2 date 2004.03.28.22.06.16; author xtraeme; state Exp; branches; next 1.1; 1.1 date 2004.01.24.08.43.28; author xtraeme; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2004.01.24.08.43.28; author xtraeme; state Exp; branches; next ; desc @@ 1.4 log @x11/imake was moved and renamed to x11/XFree86-imake. So remove x11/imake. @ text @$NetBSD: patch-ad,v 1.3 2005/10/09 05:11:32 reed Exp $ --- config/cf/NetBSD.cf.in.orig 2003-11-20 08:18:18.000000000 -0800 +++ config/cf/NetBSD.cf.in 2005-10-08 19:20:49.000000000 -0700 @@@@ -143,7 +143,7 @@@@ #define MkdirHierCmd mkdir -p #undef CcCmd -#define CcCmd gcc +#define CcCmd @@@@PKGSRC_CC@@@@ #ifndef DefaultCCOptions #if defined(UseInstalled) #define DefaultCCOptions /**/ @@@@ -159,7 +159,7 @@@@ #endif #endif -#define CppCmd cpp +#define CppCmd @@@@PKGSRC_CPP@@@@ #define StandardCppOptions -traditional #define StandardCppDefines /**/ #define PreProcessCmd CcCmd -E @@@@ -208,13 +208,7 @@@@ #define HasWeakSymbols UseElfFormat #ifdef i386Architecture -# ifndef DefaultGcc2i386Opt -# if OSMajorVersion > 1 || (OSMajorVersion == 1 && OSMinorVersion > 2) - /* The GCC strength-reduce bug is fixed for NetBSD 1.3 and later */ -# define DefaultGcc2i386Opt -O2 GccAliasingArgs -# endif -# endif -# define OptimizedCDebugFlags DefaultGcc2i386Opt +# define OptimizedCDebugFlags @@@@PKGSRC_CFLAGS@@@@ # if OSMajorVersion < 1 # define ServerOSDefines XFree86ServerOSDefines -DXNO_SYSCONF # else @@@@ -224,7 +218,7 @@@@ # define ServerExtraSysLibs -li386 # endif #else -# define OptimizedCDebugFlags -O2 +# define OptimizedCDebugFlags @@@@PKGSRC_CFLAGS@@@@ # if defined(SparcArchitecture) # define ServerOSDefines -DDDXOSINIT # elif defined(AlphaArchitecture) @@@@ -465,9 +459,7 @@@@ file.0:: file.$(MANNEWSUFFIX) @@@@\ @@if [ -f file.$(MANNEWSUFFIX) ]; \ @@@@\ then \ @@@@\ - cat file.$(MANNEWSUFFIX) | $(NEQN) | $(TBL) | $(NROFF) $(MANMACROS) | $(COL) >/tmp/$$$$.man; \ @@@@\ - cp /tmp/$$$$.man file.0; \ @@@@\ - $(RM) /tmp/$$$$.man; \ @@@@\ + cat file.$(MANNEWSUFFIX) | $(NEQN) | $(TBL) | $(NROFF) $(MANMACROS) | $(COL) > file.0; \ @@@@\ fi @@@@\ @@@@\ install.man:: @@@@\ @ 1.3 log @Add more to patch-ad. This is from XFree86 CVS: xc/config/cf/NetBSD.cf,v 3.128 141. Avoid /tmp files in NetBSD.cf's man page creation (Jeremy C. Reed). Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD$ @ 1.2 log @Upgrade XFree86 packages to 4.4.0. To see a full list of changes, please review: http://xfree86.org/4.4.0/RELNOTES.html These packages has been tested under NetBSD 1.6/-current, FreeBSD 4.x/5.x, and GNU/Linux (i386) by Jeremy C. Reed, Michal Pasternak and myself. @ text @d3 2 a4 2 --- config/cf/NetBSD.cf.in.orig 2004-03-03 07:53:38.000000000 +0000 +++ config/cf/NetBSD.cf.in 2004-03-03 07:54:59.000000000 +0000 d47 11 @ 1.1 log @Initial revision @ text @d3 3 a5 44 --- config/cf/NetBSD.cf.in.orig 2003-07-21 09:42:40.000000000 +0000 +++ config/cf/NetBSD.cf.in 2003-07-21 09:47:58.000000000 +0000 @@@@ -89,22 +89,28 @@@@ #define HasVarRun YES #define HasVarDb YES +#define HasShadowPasswd NO #define InstallXloadSetGID NO -/* Defines for using the GNU pth thread library -- experimental */ +#ifndef NetBSDThreads +# define NetBSDThreads YES +#endif -#ifdef NetBSDPth -#define PthreadHLocation -I/usr/local/include /* where is pthread.h? */ -#define LibPthreadLocation -L/usr/local/lib /* where is libpthread? */ -#define HasThreadSafeAPI NO -#define HasPosixThreads YES -#define SystemMTDefines -D_REENTRANT PthreadHLocation -#define ThreadsLibraries LibPthreadLocation -Wl,-rpath,/usr/local/lib -lpthread -#define SharedX11Reqs ThreadsLibraries +#if NetBSDThreads && \ + ((OSMajorVersion > 1) || \ + (OSMajorVersion == 1 && OSMinorVersion > 6) || \ + (OSMajorVersion == 1 && OSMinorVersion == 6 && OSTeenyVersion >= 13)) + +# define HasPosixThreads YES +# define ThreadedX YES +# define HasThreadSafeAPI YES +# define ThreadsLibraries -lpthread +# define LibraryMTDefines -DUSE_NBSD_THREADLIB +# define SystemMTDefines -D_REENTRANT +# define MTSafeAPIDefines -DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI #else -#define HasPosixThreads NO -#define ThreadedX NO +# define ThreadedX NO #endif /* @@@@ -122,8 +128,7 @@@@ d8 1 a8 1 -#undef CcCmd d14 2 a15 2 @@@@ -143,7 +148,7 @@@@ #define UseGccMakeDepend YES d23 10 a32 8 @@@@ -191,10 +196,10 @@@@ # ifndef DefaultGcc2i386Opt # if OSMajorVersion > 1 || (OSMajorVersion == 1 && OSMinorVersion > 2) /* The GCC strength-reduce bug is fixed for NetBSD 1.3 and later */ -# define DefaultGcc2i386Opt -O2 +# define DefaultGcc2i386OpT # endif # endif d34 1 a34 1 +# define OptimizedCDebugFlags @@@@PKGSRC_CFLAGS@@@@ d38 1 a38 1 @@@@ -204,7 +209,7 @@@@ @ 1.1.1.1 log @Initial import of imake-4.3.0, from pkgsrc-wip. The imake package provides various utilities, such as imake, lndir, mkdirhier, xmkmf, and others. These utilities are from XFree86, although an X server and X libraries are not needed. @ text @@