head 1.8; access; symbols pkgsrc-2026Q1:1.8.0.192 pkgsrc-2026Q1-base:1.8 pkgsrc-2025Q4:1.8.0.190 pkgsrc-2025Q4-base:1.8 pkgsrc-2025Q3:1.8.0.188 pkgsrc-2025Q3-base:1.8 pkgsrc-2025Q2:1.8.0.186 pkgsrc-2025Q2-base:1.8 pkgsrc-2025Q1:1.8.0.184 pkgsrc-2025Q1-base:1.8 pkgsrc-2024Q4:1.8.0.182 pkgsrc-2024Q4-base:1.8 pkgsrc-2024Q3:1.8.0.180 pkgsrc-2024Q3-base:1.8 pkgsrc-2024Q2:1.8.0.178 pkgsrc-2024Q2-base:1.8 pkgsrc-2024Q1:1.8.0.176 pkgsrc-2024Q1-base:1.8 pkgsrc-2023Q4:1.8.0.174 pkgsrc-2023Q4-base:1.8 pkgsrc-2023Q3:1.8.0.172 pkgsrc-2023Q3-base:1.8 pkgsrc-2023Q2:1.8.0.170 pkgsrc-2023Q2-base:1.8 pkgsrc-2023Q1:1.8.0.168 pkgsrc-2023Q1-base:1.8 pkgsrc-2022Q4:1.8.0.166 pkgsrc-2022Q4-base:1.8 pkgsrc-2022Q3:1.8.0.164 pkgsrc-2022Q3-base:1.8 pkgsrc-2022Q2:1.8.0.162 pkgsrc-2022Q2-base:1.8 pkgsrc-2022Q1:1.8.0.160 pkgsrc-2022Q1-base:1.8 pkgsrc-2021Q4:1.8.0.158 pkgsrc-2021Q4-base:1.8 pkgsrc-2021Q3:1.8.0.156 pkgsrc-2021Q3-base:1.8 pkgsrc-2021Q2:1.8.0.154 pkgsrc-2021Q2-base:1.8 pkgsrc-2021Q1:1.8.0.152 pkgsrc-2021Q1-base:1.8 pkgsrc-2020Q4:1.8.0.150 pkgsrc-2020Q4-base:1.8 pkgsrc-2020Q3:1.8.0.148 pkgsrc-2020Q3-base:1.8 pkgsrc-2020Q2:1.8.0.144 pkgsrc-2020Q2-base:1.8 pkgsrc-2020Q1:1.8.0.124 pkgsrc-2020Q1-base:1.8 pkgsrc-2019Q4:1.8.0.146 pkgsrc-2019Q4-base:1.8 pkgsrc-2019Q3:1.8.0.142 pkgsrc-2019Q3-base:1.8 pkgsrc-2019Q2:1.8.0.140 pkgsrc-2019Q2-base:1.8 pkgsrc-2019Q1:1.8.0.138 pkgsrc-2019Q1-base:1.8 pkgsrc-2018Q4:1.8.0.136 pkgsrc-2018Q4-base:1.8 pkgsrc-2018Q3:1.8.0.134 pkgsrc-2018Q3-base:1.8 pkgsrc-2018Q2:1.8.0.132 pkgsrc-2018Q2-base:1.8 pkgsrc-2018Q1:1.8.0.130 pkgsrc-2018Q1-base:1.8 pkgsrc-2017Q4:1.8.0.128 pkgsrc-2017Q4-base:1.8 pkgsrc-2017Q3:1.8.0.126 pkgsrc-2017Q3-base:1.8 pkgsrc-2017Q2:1.8.0.122 pkgsrc-2017Q2-base:1.8 pkgsrc-2017Q1:1.8.0.120 pkgsrc-2017Q1-base:1.8 pkgsrc-2016Q4:1.8.0.118 pkgsrc-2016Q4-base:1.8 pkgsrc-2016Q3:1.8.0.116 pkgsrc-2016Q3-base:1.8 pkgsrc-2016Q2:1.8.0.114 pkgsrc-2016Q2-base:1.8 pkgsrc-2016Q1:1.8.0.112 pkgsrc-2016Q1-base:1.8 pkgsrc-2015Q4:1.8.0.110 pkgsrc-2015Q4-base:1.8 pkgsrc-2015Q3:1.8.0.108 pkgsrc-2015Q3-base:1.8 pkgsrc-2015Q2:1.8.0.106 pkgsrc-2015Q2-base:1.8 pkgsrc-2015Q1:1.8.0.104 pkgsrc-2015Q1-base:1.8 pkgsrc-2014Q4:1.8.0.102 pkgsrc-2014Q4-base:1.8 pkgsrc-2014Q3:1.8.0.100 pkgsrc-2014Q3-base:1.8 pkgsrc-2014Q2:1.8.0.98 pkgsrc-2014Q2-base:1.8 pkgsrc-2014Q1:1.8.0.96 pkgsrc-2014Q1-base:1.8 pkgsrc-2013Q4:1.8.0.94 pkgsrc-2013Q4-base:1.8 pkgsrc-2013Q3:1.8.0.92 pkgsrc-2013Q3-base:1.8 pkgsrc-2013Q2:1.8.0.90 pkgsrc-2013Q2-base:1.8 pkgsrc-2013Q1:1.8.0.88 pkgsrc-2013Q1-base:1.8 pkgsrc-2012Q4:1.8.0.86 pkgsrc-2012Q4-base:1.8 pkgsrc-2012Q3:1.8.0.84 pkgsrc-2012Q3-base:1.8 pkgsrc-2012Q2:1.8.0.82 pkgsrc-2012Q2-base:1.8 pkgsrc-2012Q1:1.8.0.80 pkgsrc-2012Q1-base:1.8 pkgsrc-2011Q4:1.8.0.78 pkgsrc-2011Q4-base:1.8 pkgsrc-2011Q3:1.8.0.76 pkgsrc-2011Q3-base:1.8 pkgsrc-2011Q2:1.8.0.74 pkgsrc-2011Q2-base:1.8 pkgsrc-2011Q1:1.8.0.72 pkgsrc-2011Q1-base:1.8 pkgsrc-2010Q4:1.8.0.70 pkgsrc-2010Q4-base:1.8 pkgsrc-2010Q3:1.8.0.68 pkgsrc-2010Q3-base:1.8 pkgsrc-2010Q2:1.8.0.66 pkgsrc-2010Q2-base:1.8 pkgsrc-2010Q1:1.8.0.64 pkgsrc-2010Q1-base:1.8 pkgsrc-2009Q4:1.8.0.62 pkgsrc-2009Q4-base:1.8 pkgsrc-2009Q3:1.8.0.60 pkgsrc-2009Q3-base:1.8 pkgsrc-2009Q2:1.8.0.58 pkgsrc-2009Q2-base:1.8 pkgsrc-2009Q1:1.8.0.56 pkgsrc-2009Q1-base:1.8 pkgsrc-2008Q4:1.8.0.54 pkgsrc-2008Q4-base:1.8 pkgsrc-2008Q3:1.8.0.52 pkgsrc-2008Q3-base:1.8 cube-native-xorg:1.8.0.50 cube-native-xorg-base:1.8 pkgsrc-2008Q2:1.8.0.48 pkgsrc-2008Q2-base:1.8 cwrapper:1.8.0.46 pkgsrc-2008Q1:1.8.0.44 pkgsrc-2008Q1-base:1.8 pkgsrc-2007Q4:1.8.0.42 pkgsrc-2007Q4-base:1.8 pkgsrc-2007Q3:1.8.0.40 pkgsrc-2007Q3-base:1.8 pkgsrc-2007Q2:1.8.0.38 pkgsrc-2007Q2-base:1.8 pkgsrc-2007Q1:1.8.0.36 pkgsrc-2007Q1-base:1.8 pkgsrc-2006Q4:1.8.0.34 pkgsrc-2006Q4-base:1.8 pkgsrc-2006Q3:1.8.0.32 pkgsrc-2006Q3-base:1.8 pkgsrc-2006Q2:1.8.0.30 pkgsrc-2006Q2-base:1.8 pkgsrc-2006Q1:1.8.0.28 pkgsrc-2006Q1-base:1.8 pkgsrc-2005Q4:1.8.0.26 pkgsrc-2005Q4-base:1.8 pkgsrc-2005Q3:1.8.0.24 pkgsrc-2005Q3-base:1.8 pkgsrc-2005Q2:1.8.0.22 pkgsrc-2005Q2-base:1.8 pkgsrc-2005Q1:1.8.0.20 pkgsrc-2005Q1-base:1.8 pkgsrc-2004Q4:1.8.0.18 pkgsrc-2004Q4-base:1.8 pkgsrc-2004Q3:1.8.0.16 pkgsrc-2004Q3-base:1.8 pkgsrc-2004Q2:1.8.0.14 pkgsrc-2004Q2-base:1.8 pkgsrc-2004Q1:1.8.0.12 pkgsrc-2004Q1-base:1.8 pkgsrc-2003Q4:1.8.0.10 pkgsrc-2003Q4-base:1.8 netbsd-1-6-1:1.8.0.6 netbsd-1-6-1-base:1.8 netbsd-1-6:1.8.0.8 netbsd-1-6-RELEASE-base:1.8 pkgviews:1.8.0.4 pkgviews-base:1.8 buildlink2:1.8.0.2 buildlink2-base:1.8 netbsd-1-5-PATCH003:1.8 netbsd-1-5-PATCH001:1.7 netbsd-1-5-RELEASE:1.3 netbsd-1-4-PATCH003:1.3 netbsd-1-4-PATCH002:1.3 comdex-fall-1999:1.3 netbsd-1-4-PATCH001:1.3 netbsd-1-4-RELEASE:1.3 netbsd-1-3-PATCH003:1.3 FreeBSD-current-1998-06-05:1.1.1.1 FREEBSD:1.1.1; locks; strict; comment @# @; 1.8 date 2001.09.22.18.07.15; author mycroft; state Exp; branches; next 1.7; 1.7 date 2001.03.20.15.57.22; author wiz; state Exp; branches; next 1.6; 1.6 date 2001.03.16.15.24.54; author dmcmahill; state Exp; branches; next 1.5; 1.5 date 2000.11.13.14.34.41; author abs; state Exp; branches; next 1.4; 1.4 date 2000.11.10.16.57.25; author abs; state Exp; branches; next 1.3; 1.3 date 98.08.07.11.11.03; author agc; state Exp; branches; next 1.2; 1.2 date 98.08.03.20.54.48; author tron; state Exp; branches; next 1.1; 1.1 date 98.06.09.16.36.39; author agc; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 98.06.09.16.36.39; author agc; state Exp; branches; next ; desc @@ 1.8 log @UseRgbTxt should be YES, since this is what we use with both XF86 3 and XF86 4. @ text @$NetBSD: patch-ab,v 1.7 2001/03/20 15:57:22 wiz Exp $ Sync this with what we shipped with NetBSD-1.5 with the exception that HasXdmAuth is set to NO (since vnc doesn't have the Wraphelp.c file). This fixes problems on pmax, alpha, and maybe others. --- Xvnc/config/cf/NetBSD.cf.orig Sat Jul 26 06:30:39 1997 +++ Xvnc/config/cf/NetBSD.cf Sat Sep 22 17:59:51 2001 @@@@ -2,9 +2,37 @@@@ -XCOMM platform: $XFree86: xc/config/cf/NetBSD.cf,v 3.49.2.9 1997/07/26 06:30:39 dawes Exp $ +XCOMM platform: $XFree86: xc/config/cf/NetBSD.cf,v 3.49.2.13 1999/10/12 17:18:20 hohndel Exp $ + +XCOMM +XCOMM This file currently contains support for: +XCOMM +XCOMM NetBSD/i386 client/server +XCOMM NetBSD/sparc client/server +XCOMM NetBSD/sparc64 client/server +XCOMM NetBSD/sun3 client/server +XCOMM NetBSD/hp300 client +XCOMM NetBSD/mac68k client/server +XCOMM NetBSD/pmax client/server +XCOMM NetBSD/amiga client/server +XCOMM NetBSD/alpha client/server +XCOMM NetBSD/arm32 client/server +XCOMM NetBSD/atari client/server +XCOMM NetBSD/vax client/server +XCOMM NetBSD/pc532 client +XCOMM NetBSD/x68k client/server +XCOMM NetBSD/macppc client/server +XCOMM NetBSD/hpcmips client/server +XCOMM NetBSD/next68k client +XCOMM NetBSD/prep client +XCOMM NetBSD/news68k client +XCOMM NetBSD/cobalt client +XCOMM NetBSD/sgimips client +XCOMM NetBSD/luna68k client +XCOMM + #ifndef OSName #define OSName DefaultOSName OSBinaryType #endif @@@@ -14,24 +42,34 @@@@ #ifndef OSMinorVersion #define OSMinorVersion DefaultOSMinorVersion #endif +/* XXX this does not deal with patches, but, patches should not affect it */ +/* 1 = A, 2 = B, 3 = C, 4 = D, 5 = E, ... */ #ifndef OSTeenyVersion #define OSTeenyVersion DefaultOSTeenyVersion #endif #ifndef OSVendor -#define OSVendor /**/ +#define OSVendor The NetBSD Foundation, Inc. #endif XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion) /* + * Enable support for "xdmauth" authentification. + */ +#ifndef HasXdmAuth +#define HasXdmAuth NO +#endif + +/* * C library features */ #if ((OSMajorVersion > 1) || \ (OSMajorVersion == 1 && OSMinorVersion > 2) || \ (OSMajorVersion == 1 && OSMinorVersion == 2 && OSTeenyVersion > 1)) -# define HasPoll YES +# define HasPoll YES #endif + #define HasNdbm YES #define HasPutenv YES #define HasSnprintf YES @@@@ -61,7 +99,20 @@@@ (OSMajorVersion == 1 && OSMinorVersion == 2 && OSTeenyVersion < 2)) # define HasDlsymBug YES #endif -/* Mkstemp is there since 1.2 (at least) */ + +/* + * The USB HID library came after 1.4 + */ +#if ((OSMajorVersion == 1 && OSMinorVersion > 4) || \ + (OSMajorVersion == 1 && OSMinorVersion == 4 && OSTeenyVersion > 8)) +# define HasUsbLib YES +#endif + + +#if OSMajorVersion >= 1 +# define LexCmd lex -l +#endif + #if (!(OSMajorVersion == 0 || \ (OSMajorVersion == 1 && OSMinorVersion < 2))) #define HasMkstemp YES @@@@ -85,6 +136,7 @@@@ #define NeedVarargsPrototypes YES #define NeedWidePrototypes NO +#define HasMktemp NO #define MkdirHierCmd mkdir -p #define CppCmd /usr/libexec/cpp @@@@ -96,13 +148,15 @@@@ #define CcCmd gcc #if defined(UseInstalled) && (!defined(XF86LinkKit) || !XF86LinkKit) #define DefaultCCOptions /**/ +#elif defined(arm32Architecture) +#define DefaultCCOptions -ansi -Dasm=__asm -fsigned-char -fomit-frame-pointer #else #define DefaultCCOptions -ansi -Dasm=__asm #endif #define GccGasOption -DGCCUSESGAS #define AsmDefines -DUSE_GAS - + /* UseElfFormat defaults to YES if __ELF__ set */ #ifndef UseElfFormat # ifdef __ELF__ @@@@ -114,60 +168,234 @@@@ #endif /* + * Make sure the binaries know where to look for the shared libaries. + * NOTE: This is done in bsdLib.rules for ELF libraries! + */ +#if (OSMajorVersion == 1 && OSMinorVersion >= 2) || OSMajorVersion > 1 +# if !defined(UseElfFormat) || UseElfFormat == NO +# define ExtraLoadFlags -R$(USRLIBDIR) +# endif +#endif + +/* * Dynamic loading supported starting in 1.0 on a.out platforms, * and on all ELF platforms. - * - * XXX May not be correct on NetBSD/pmax (ELF, but might not have - * working shared libs). */ #if ((OSMajorVersion > 0) && \ !defined(AlphaArchitecture) && !defined(MipsArchitecture)) || \ UseElfFormat # ifndef BuildDynamicLoading -# define BuildDynamicLoading YES +# define BuildDynamicLoading YES +# endif +# ifndef ForceNormalLib +# define ForceNormalLib YES # endif #endif #if UseElfFormat -#define DlLibrary -rdynamic /* no -ldl yet */ +# define DlLibrary -rdynamic /* no -ldl yet */ #else -#define DlLibrary /**/ +# define DlLibrary /**/ #endif +/* The GCC strength-reduce bug is fixed for NetBSD 1.3 and later */ #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 +# endif +# endif # define OptimizedCDebugFlags DefaultGcc2i386Opt # if OSMajorVersion < 1 # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DXNO_SYSCONF # else # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME # endif -# if OSMajorVersion == 1 && OSMinorVersion >= 1 || OSMajorVersion >= 2 -# define ServerExtraSysLibs -li386 DlLibrary -# endif -#else -# define OptimizedCDebugFlags -O2 -# if defined(SparcArchitecture) || defined(AlphaArchitecture) -# define ServerOSDefines -DDDXOSINIT -# else -# define ServerOSDefines /**/ -# endif # if BuildDynamicLoading -# define ServerExtraSysLibs DlLibrary +# define ServerExtraSysLibs -li386 DlLibrary # else # define ServerExtraSysLibs /**/ # endif -#endif -#ifdef i386Architecture # define ServerExtraDefines GccGasOption XFree86ServerDefines # ifndef XFree86ConsoleDefines # define XFree86ConsoleDefines -DPCCONS_SUPPORT -DPCVT_SUPPORT # endif #else -# if defined(AlphaArchitecture) -# define ServerExtraDefines GccGasOption -D_XSERVER64 +# if defined(m68kArchitecture) && OSMajorVersion == 1 && OSMinorVersion <= 3 +# define OptimizedCDebugFlags -O # else -# define ServerExtraDefines GccGasOption +# define OptimizedCDebugFlags -O2 +# endif +#endif + +/* + * On mips, all libs are compiled with ABIcalls, not just sharedlibs. + * Disable MIPS specific code which was not used and tested. + */ +#if defined(MipsArchitecture) +# define SeparateSharedCompile NO +# undef MipsArchitecture +#endif + +#if defined(SparcArchitecture) +# define ServerOSDefines -DDDXOSINIT +# if defined(Sparc64Architecture) +# define ServerExtraDefines GccGasOption -D_XSERVER64 +# else +# define ServerExtraDefines GccGasOption +# endif +# define PexDynamicModule NO +# define XieDynamicModule NO +#endif + +#if defined(Sun3Architecture) +# define ServerOSDefines -DDDXOSINIT +# define ServerExtraDefines GccGasOption -D__sun3__ +# define PexDynamicModule NO +# define XieDynamicModule NO +#endif + +#if defined(hp300Architecture) +# define BuildServer NO /* XXX */ +# define ServerOSDefines -DDDXOSINIT +# define ServerExtraDefines GccGasOption +# define PexDynamicModule NO +# define XieDynamicModule NO +#endif + +#if defined(mac68kArchitecture) +# define ServerOSDefines -DDDXOSINIT +# define ServerExtraDefines GccGasOption -D__mac68k__ +# define PexDynamicModule NO +# define XieDynamicModule NO +#endif + +#if defined(AlphaArchitecture) +# define BuildServer YES +# define ServerOSDefines -DDDXOSINIT +# define ServerExtraDefines GccGasOption -D_XSERVER64 +# define PexDynamicModule NO +# define XieDynamicModule NO +# undef OptimizedCDebugFlags /* XXX ??? */ +# define OptimizedCDebugFlags /* XXX ??? */ +#endif + +#if defined(amigaArchitecture) +# define ServerOSDefines -DDDXOSINIT +# define ServerExtraDefines GccGasOption -D__amiga__ +# define PexDynamicModule NO +# define XieDynamicModule NO +# define XserverNeedsSetUID YES +#endif + +#if defined(arm32Architecture) +# define BuildServer YES +# define ServerOSDefines -DDDXOSINIT -DDDXTIME +# define ServerExtraDefines GccGasOption XFree86ServerDefines +# ifndef XFree86ConsoleDefines +# define XFree86ConsoleDefines -DPCCONS_SUPPORT # endif +# define PexDynamicModule NO +# define XieDynamicModule NO +#endif + +#if defined(atariArchitecture) +# define BuildServer YES +# define ServerOSDefines -DDDXOSINIT +# define ServerExtraDefines GccGasOption XFree86ServerDefines -D__atari__ +# define PexDynamicModule NO +# define XieDynamicModule NO +#endif + +#if defined(VaxArchitecture) +# define BuildServer NO +# define ServerExtraDefines GccGasOption +# define PexDynamicModule NO +# define XieDynamicModule NO +#endif + +#if defined(pc532Architecture) +# define BuildServer NO +# define ServerOSDefines -DDDXOSINIT +# define ServerExtraDefines GccGasOption +# define PexDynamicModule NO +# define XieDynamicModule NO +#endif + +#if defined(x68kArchitecture) +# define BuildServer YES +# define ServerOSDefines -DDDXOSINIT +# define ServerExtraDefines GccGasOption -D__x68k__ +# define PexDynamicModule NO +# define XieDynamicModule NO +# define XserverNeedsSetUID YES +#endif + +#if defined(macppcArchitecture) +# define ServerOSDefines -DDDXOSINIT +# define ServerExtraDefines GccGasOption -D__macppc__ +# define PexDynamicModule NO +# define XieDynamicModule NO +# define XkbServerDefines -DXKB_ALWAYS_USES_SOFT_REPEAT +#endif + +#if defined(pmaxArchitecture) +# define PexDynamicModule NO +# define XieDynamicModule NO +#endif + +#if defined(hpcmipsArchitecture) +# define ServerOSDefines -DDDXOSINIT +# define BuildServer YES +# define PexDynamicModule NO +# define XieDynamicModule NO +# define ServerExtraDefines -DSTATIC_COLOR +# define XserverNeedsSetUID YES +#endif + +#if defined(next68kArchitecture) +# define BuildServer NO +# define PexDynamicModule NO +# define XieDynamicModule NO +#endif + +#if defined(prepArchitecture) +# define BuildServer NO +# define PexDynamicModule NO +# define XieDynamicModule NO +#endif + +#if defined(news68kArchitecture) +# define BuildServer NO +# define PexDynamicModule NO +# define XieDynamicModule NO +#endif + +#if defined(cobaltArchitecture) +# define BuildServer NO +# define PexDynamicModule NO +# define XieDynamicModule NO +#endif + +#if defined(sgimipsArchitecture) +# define BuildServer NO +# define PexDynamicModule NO +# define XieDynamicModule NO +#endif + +#if defined(luna68kArchitecture) +# define BuildServer NO +# define PexDynamicModule NO +# define XieDynamicModule NO +#endif + +#ifndef OptimizedCDebugFlags +# define OptimizedCDebugFlags -O2 +#endif + +#ifndef PositionIndependentCFlags +# define PositionIndependentCFlags -fPIC #endif #define StandardDefines -DCSRG_BASED @@@@ -177,7 +405,18 @@@@ #define ExtraLibraries /**/ #endif #ifndef UseGnuMalloc +/* + * There is no way to map 1.4J correctly to OS*Version, so 'J' is mapped + * to OSTeenyVersion == 10. This should be save since there will never a + * release for 1.4.10. + */ +# if ((OSMajorVersion > 1) || \ + (OSMajorVersion == 1 && OSMinorVersion > 4) || \ + (OSMajorVersion == 1 && OSMinorVersion == 4 && OSTeenyVersion >= 10)) +# define UseGnuMalloc NO +# else # define UseGnuMalloc YES +# endif #endif #ifndef GnuMallocLibrary #define GnuMallocLibrary -lgnumalloc @@@@ -191,6 +430,13 @@@@ #endif #endif +/* 1.4R and later has setusercontext() */ +# if ((OSMajorVersion > 1) || \ + (OSMajorVersion == 1 && OSMinorVersion > 4) || \ + (OSMajorVersion == 1 && OSMinorVersion == 4 && OSTeenyVersion >= 18)) +#define HasSetUserContext YES +#endif + #define AdmDir /var/log /* @@@@ -200,8 +446,17 @@@@ #define StripInstalledPrograms YES #define CompressAllFonts YES #define GzipFontCompression YES -#define DefaultUserPath /bin:/usr/bin:/usr/local/bin:$(BINDIR) -#define DefaultSystemPath /sbin:/usr/sbin:/bin:/usr/bin:$(BINDIR) +#define DefaultUserPath /usr/bin:/bin:/usr/pkg/bin:$(BINDIR):/usr/local/bin +#define DefaultSystemPath /usr/bin:/bin:/usr/sbin:/sbin:/usr/pkg/bin:/usr/pkg/sbin:$(BINDIR):/usr/local/bin:/usr/local/sbin + +#define InstPgmFlags -s -m 0555 -o root -g wheel +#define InstBinFlags -m 0555 -o root -g wheel +#define InstUidFlags -m 4511 -o root -g wheel +#define InstLibFlags -m 0444 -o root -g wheel +#define InstIncFlags -m 0444 -o root -g wheel +#define InstManFlags -m 0444 -o root -g wheel +#define InstDatFlags -m 0444 -o root -g wheel +#define InstKmemFlags -m 2555 -o root -g kmem #ifdef InstallCmd # undef InstallCmd @@@@ -212,11 +467,23 @@@@ # define ExtraFilesToClean *.core #endif +#ifdef arm32Architecture +/* + * NetBSD's default .SUFFIXES target places .s at a higher priority + * than .c. This breaks architectures which use the .c versions of + * various files in the XFree86 server tree for which there are also + * .s versions. Default to the basic .SUFFIXES list specified in + * SUSv2 (without the SCCS-related suffixes) plus .cxx for Motif.rules. + */ +.SUFFIXES: +.SUFFIXES: .o .c .y .l .a .sh .f .cxx +#endif + /* * Documentation formatting */ -#define NeqnCmd neqn -Tlatin1 -#define NroffCmd nroff -Tlatin1 +#define NeqnCmd neqn -Tascii +#define NroffCmd nroff -Tascii #define EqnCmd eqn -Tps #define TroffCmd groff -Tps @@@@ -264,7 +531,10 @@@@ -@@if [ -f file.0 ]; \ @@@@\ then \ @@@@\ $(INSTALL) -c $(INSTMANFLAGS) file.0 $(DESTDIR)destdir/dest.0; \@@@@\ - fi + fi @@@@\ + @@@@\ +clean:: @@@@\ + $(RM) file.0 #define InstallGenManPageLong(file,destdir,dest,suffix) @@@@\ InstallManPageLong(file,destdir,dest) @@@@ -281,7 +551,16 @@@@ done #define InstallMultipleMan(list,dest) @@@@\ - InstallMultipleManSuffix(list,dest,man) + MakeDir($(DESTDIR)dest) @@@@\ + case '${MFLAGS}' in *[i]*) set +e;; esac; \ @@@@\ + for i in list; do \ @@@@\ + (set -x; \ @@@@\ + MNAME=`echo $$i | cut -f1 -d.`; \ @@@@\ + cat $$i | $(NEQN) | $(TBL) | $(NROFF) $(MANMACROS) | $(COL) >/tmp/$$$$.man; \ @@@@\ + $(INSTALL) -c $(INSTMANFLAGS) /tmp/$$$$.man $(DESTDIR)dest/$${MNAME}.0; \ @@@@\ + $(RM) /tmp/$$$$.man); \ @@@@\ + done + #define InstallManPageAliases(file,destdir,aliases) @@@@\ install.man:: @@@@\ @@@@ -299,13 +578,10 @@@@ /* * Shared libraries supported starting in 1.0 on a.out platforms, * and on all ELF platforms. - * - * XXX May not be correct on NetBSD/pmax (ELF, but might not have - * working shared libs). */ #if ((OSMajorVersion > 0) && \ - !defined(AlphaArchitecture) && !defined(MipsArchitecture)) || \ - UseElfFormat + !defined(AlphaArchitecture) && !defined(MipsArchitecture)) \ + || UseElfFormat # ifndef HasSharedLibraries # define HasSharedLibraries YES # endif @@@@ -327,51 +603,179 @@@@ #include #endif /* HasSharedLibraries */ -#ifdef i386Architecture +#if defined(i386Architecture) || defined(arm32Architecture) || \ + defined(atariArchitecture) # include -#endif /* - * Definitions for the SUN server on NetBSD/sparc + * XXX The DynamicModuleTarget macro in xf86.rules does NOT work properly + * XXX on ELF systems. This macro should be moved into bsdLib.rules, since + * XXX it depends on how shlibs are built on that platform. + * XXX + * XXX The following overrides DynamicModuleTarget so it should work on + * XXX ELF and a.out. + */ +/* + * DynamicModuleTarget - build a module to be dynamically loaded + */ +# undef DynamicModuleTarget +# define DynamicModuleTarget(module,modlist) @@@@\ +AllTarget(module) @@@@\ + @@@@\ +module: modlist @@@@\ + RemoveFile($@@) @@@@\ + $(CC) -nostdlib -o $@@ -Wl,-Bshareable -R$(USRLIBDIR) modlist @@@@\ + @@@@\ +clean:: @@@@\ + RemoveFile(module) + +#endif /* i386Architecture || arm32Architecture || atariArchitecture */ + +/* + * NetBSD always uses the XFree86 contrib distribution. */ -#ifdef SparcArchitecture +#undef XF86Contrib +#define XF86Contrib YES + +/* + * Definitions for the SUN server on NetBSD/sparc or NetBSD/sun3 + */ +#if defined(SparcArchitecture) || defined(Sun3Architecture) #ifndef Xsun24Server +#if defined(SparcArchitecture) +#define Xsun24Server YES +#else #define Xsun24Server NO #endif +#endif #ifndef XsunServer #define XsunServer YES #endif #ifndef XsunMonoServer #define XsunMonoServer YES #endif -#ifndef BuildScreenSaverLibrary -#define BuildScreenSaverLibrary YES #endif + /* - * XFree86 uses its own (more portable) database routines to speed up - * the RGB database lookups - * However, if you want to use ndbm anyway, you can set that to NO in - * site.def + * Definitions for the NetBSD/mac68k server. */ -#ifndef UseRgbTxt -#define UseRgbTxt YES +#ifdef mac68kArchitecture +# ifndef Xmac68kServer +# define Xmac68kServer YES +# endif #endif + +/* + * Definitions for the NetBSD/vax server. + */ +#ifdef VaxArchitecture +# define XvaxMonoServer YES +# if HasGcc +# define BuildPexExt XvaxMonoServer +# else +# define BuildPex NO /* compiler runs out of table space */ +# define BuildXInputLib NO /* compiler runs out of table space */ +# endif +# define HasSaberC NO +# define UnalignedReferencesAllowed YES /* if arbitrary deref is okay */ #endif /* - * Definition for compiling on MIPS machines + * Definitions for the NetBSD/amiga server. */ -#ifdef MipsArchitecture -#define PositionIndependentCFlags -#define SharedLibraryLoadFlags -x -shared --whole-archive -soname `echo $@@ | -sed 's/\.[0-9]*$$//'` -#define SharedXtReqs $(XLIBONLY) $(SMLIB) $(ICELIB) -#define SharedXmuReqs $(LDPRELIB) $(XTOOLONLYLIB) $(XONLYLIB) $(EXTENSIONLIB) +#ifdef amigaArchitecture +# ifndef XamigaCCmono +# define XamigaCCmono NO +# endif +# ifndef XamigaCCcolor +# define XamigaCCcolor YES +# endif +# ifndef XamigaGfxCardSupport +# define XamigaGfxCardSupport YES +# endif +# ifndef XamigaRetinaZ3Support +# define XamigaRetinaZ3Support YES +# endif +# ifndef XamigaCl5426Server +# define XamigaCl5426Server YES +# endif +# ifndef XamigaCV64Support +# define XamigaCV64Support YES +# endif +/* + * You need XamigaGfxCardSupport if you enable XamigaCl5426Server, + * XamigaRetinaZ3Support or XamigaCV64Support and you can't use XamigaCCmono + * if you enable XamigaCCcolor. + * Don't change the next 10 lines !!!!!!!!! + */ +# if (XamigaCl5426Server || XamigaCV64Support || XamigaRetinaZ3Support) \ + && !XamigaGfxCardSupport +# undef XamigaGfxCardSupport +# define XamigaGfxCardSupport YES +# endif +# if XamigaCCcolor +# undef XamigaCCmono +# define XamigaCCmono NO +# endif +#endif + +/* + * Definitions for the NetBSD/alpha X server. + */ +#if defined(AlphaArchitecture) +# define XalphaNetBSDServer YES +#ifndef XkbServerDefines +#define XkbServerDefines -DXKB_ALWAYS_USES_SOFT_REPEAT +#endif #endif /* - * Definition for compiling on Alpha machines + * Definitions for the NetBSD/arm32 VIDC20 X server. */ -#ifdef AlphaArchitecture -#define BuildServer NO +#if defined(arm32Architecture) +# define Xarm32VIDCServer YES +#endif + +/* + * Definitions for the NetBSD/x68k X server. + */ +#if defined(x68kArchitecture) +# define X68kServer YES +#endif + +/* + * Definitions for the NetBSD/macppc X server. + */ +#if defined(macppcArchitecture) +# define XmacppcServer YES +#endif + +/* + * Definitions for the NetBSD/pmax X server. + */ +#if defined(pmaxArchitecture) +# define XpmaxServer YES +#endif + +/* + * Definitions for the NetBSD/hpcmips X server. + */ +#if defined(hpcmipsArchitecture) +# define XhpcServer YES +#endif + + +#ifndef BuildScreenSaverLibrary +#define BuildScreenSaverLibrary YES +#endif + +#ifndef XkbServerDefines +#define XkbServerDefines -DXKB_ALWAYS_USES_SOFT_REPEAT +#endif + +/* + * We use rgb.txt with XFree86, so we must use it here to be compatible. + */ +#ifndef UseRgbTxt +#define UseRgbTxt YES #endif @ 1.7 log @Fix i386 (and possibly atari and arm32) after last fix :) @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.6 2001/03/16 15:24:54 dmcmahill Exp $ d7 5 a11 3 --- Xvnc/config/cf/NetBSD.cf.orig Sat Jul 26 02:30:39 1997 +++ Xvnc/config/cf/NetBSD.cf Wed Mar 14 13:46:28 2001 @@@@ -4,5 +5,33 @@@@ d46 5 a50 1 @@@@ -16,2 +45,4 @@@@ d55 4 a58 1 @@@@ -22,3 +53,3 @@@@ d63 2 a64 1 @@@@ -27,2 +58,9 @@@@ d74 3 a76 1 @@@@ -32,4 +70,5 @@@@ d83 5 a87 1 @@@@ -63,3 +102,16 @@@@ d105 5 a109 1 @@@@ -87,2 +139,3 @@@@ d113 5 a117 1 @@@@ -98,2 +151,4 @@@@ d122 4 a125 1 @@@@ -104,3 +159,3 @@@@ d130 5 a134 1 @@@@ -116,7 +171,14 @@@@ d152 3 a154 1 @@@@ -126,3 +188,6 @@@@ d162 2 a163 1 @@@@ -131,8 +196,15 @@@@ d181 4 a184 1 @@@@ -143,14 +215,4 @@@@ d200 1 a200 1 @@@@ -158,4 +220,2 @@@@ d205 3 a207 1 @@@@ -165,6 +225,6 @@@@ d216 3 a218 3 # endif @@@@ -172,2 +232,171 @@@@ d285 1 a285 1 +# endif d386 2 a387 2 +#endif + d389 3 a391 1 @@@@ -179,3 +415,14 @@@@ d406 5 a410 1 @@@@ -193,2 +440,9 @@@@ d420 5 a424 1 @@@@ -202,4 +456,13 @@@@ d440 5 a444 1 @@@@ -214,2 +477,14 @@@@ d459 1 a459 1 @@@@ -217,4 +492,4 @@@@ d466 5 a470 1 @@@@ -266,3 +541,6 @@@@ d478 5 a482 1 @@@@ -283,3 +561,12 @@@@ d496 5 a500 1 @@@@ -301,9 +588,6 @@@@ d512 5 a516 1 @@@@ -329,13 +613,47 @@@@ d551 2 a552 1 + */ d558 1 a558 2 */ -#ifdef SparcArchitecture d568 4 a571 1 @@@@ -346,14 +664,96 @@@@ d590 1 a590 1 +#endif d605 4 a608 3 +#endif + +/* d610 7 a616 1 + */ d661 4 a664 3 +#endif + +/* d666 3 a668 1 + */ d678 1 a678 1 #endif d685 3 a687 4 #endif @@@@ -361,10 +761,6 @@@@ /* - * Definition for compiling on MIPS machines d689 1 a689 7 */ -#ifdef MipsArchitecture -#define PositionIndependentCFlags -#define SharedLibraryLoadFlags -x -shared --whole-archive -soname `echo $@@ | -sed 's/\.[0-9]*$$//'` -#define SharedXtReqs $(XLIBONLY) $(SMLIB) $(ICELIB) -#define SharedXmuReqs $(LDPRELIB) $(XTOOLONLYLIB) $(XONLYLIB) $(EXTENSIONLIB) d692 3 a694 4 #endif @@@@ -372,6 +768,25 @@@@ /* - * Definition for compiling on Alpha machines d696 1 a696 3 */ -#ifdef AlphaArchitecture -#define BuildServer NO d711 1 a711 4 + * XFree86 uses its own (more portable) database routines to speed up + * the RGB database lookups + * However, if you want to use ndbm anyway, you can set that to NO in + * site.def d714 1 a714 1 +#define UseRgbTxt NO @ 1.6 log @Sync the NetBSD.cf config file with what we shipped with NetBSD-1.5 with the exception that HasXdmAuth is set to NO (since vnc doesn't have the Wraphelp.c file). This fixes problems on pmax, alpha, and maybe others. This closes PR 10108 @ text @d1 1 a1 1 $NetBSD$ d178 1 a178 1 @@@@ -172,2 +232,178 @@@@ a186 7 +#endif + +/* + * XXX always build XKBuilib, override xfree86.cf + */ +#if defined(arm32Architecture) || defined(i386Architecture) || defined(atariArchitecture) +# define BuildXKBuilib YES @ 1.5 log @Fix build on ELF sparc systems but testing on __ELF__ or SVR4, not just SVR4 @ text @d3 117 a119 4 --- Xvnc/config/cf/NetBSD.cf.orig Sat Jul 26 07:30:39 1997 +++ Xvnc/config/cf/NetBSD.cf @@@@ -373,5 +373,5 @@@@ * Definition for compiling on Alpha machines d121 510 a630 1 #ifdef AlphaArchitecture d632 21 a652 1 +#define BuildServer YES @ 1.4 log @Split out vncviwer into its own package. Depend on it @ text @@ 1.3 log @Add NetBSD RCS Ids. @ text @d3 9 a11 20 *** Imakefile.orig Mon May 18 06:18:46 1998 --- Imakefile Tue Jul 28 14:57:53 1998 *************** *** 9,16 **** make all @@echo "" @@echo Built $(SUBDIRS). ! @@echo 'To build Xvnc, do "cd Xvnc", followed by "make World"' ! @@echo "" MakeSubdirs($(SUBDIRS)) DependSubdirs($(SUBDIRS)) --- 9,15 ---- make all @@echo "" @@echo Built $(SUBDIRS). ! (cd Xvnc && make World) MakeSubdirs($(SUBDIRS)) DependSubdirs($(SUBDIRS)) @ 1.2 log @Update VNC to version 3.3.2 using patches supplied by Jeff Rizzo in PR pkg/5868. @ text @d1 2 @ 1.1 log @Initial revision @ text @d1 9 a9 112 --- /dev/null Fri Jun 5 15:30:38 1998 +++ Xvnc/config/NetBSD.cf Fri Jun 5 15:36:14 1998 @@@@ -0,0 +1,101 @@@@ +XCOMM platform: $XFree86: xc/config/cf/NetBSD.cf,v 3.49.2.9 1997/07/26 06:30:39 dawes Exp $ + +#ifndef OSName +#define OSName NetBSD 1.3 +#endif +#ifndef OSVendor +#define OSVendor The NetBSD Foundation, Inc. +#endif +#ifndef OSMajorVersion +#define OSMajorVersion 1 +#endif +#ifndef OSMinorVersion +#define OSMinorVersion 3 +#endif +#ifndef OSTeenyVersion +#define OSTeenyVersion 0 +#endif + +XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion) + +#define HasPutenv YES +#define HasBSD44Sockets YES + +#define CppCmd /usr/libexec/cpp -traditional +#define PreProcessCmd /usr/libexec/cpp -traditional +#undef InstallCmd +#define InstallCmd /usr/bin/install + +#define UseGas YES +#ifndef GccUsesGas +# define GccUsesGas YES +#endif + +#ifndef AsmDefines +# define AsmDefines -DUSE_GAS +#endif + +#if GccUsesGas +# define GccGasOption -DGCCUSESGAS +#else +# define GccGasOption /**/ +#endif + +#ifndef HasGcc2 +# define HasGcc2 YES +#endif + +#define MkdirHierCmd mkdir -p + +#define CcCmd gcc +#ifndef DefaultCCOptions +#define DefaultCCOptions -pipe +#endif + +#ifdef i386Architecture +#define OptimizedCDebugFlags -m486 -O2 -fno-strength-reduce +#else +#define OptimizedCDebugFlags -O2 +#endif + +#if OSMajorVersion >= 1 +#define ServerOSDefines XFree86ServerOSDefines +#define XawI18nDefines -DUSE_XWCHAR_STRING +#define HasMakefileSafeInclude YES +#define IncludeMakefile(file) @@@@# dependencies are in .depend +#define DependFileName .depend +#ifndef ExtraLibraries +#define ExtraLibraries -lz +#endif +#else +#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DXNO_SYSCONF +#define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC +#ifndef ExtraLibraries +#define ExtraLibraries /**/ +#endif +#endif + +#define ServerExtraDefines GccGasOption XFree86ServerDefines + +#define StandardDefines -DCSRG_BASED + +#define TroffCmd groff -Tps +#define SetTtyGroup YES +#define HasNdbm YES +#define HasShm YES +#define HasWChar32 YES + +#define HasLibCrypt YES + +#define AvoidNullMakeCommand YES + +#define BuildServer YES +#define XF86SVGAServer NO +#define XvncServer YES +#define ProjectRoot /usr/X11R6 + +#include + +#ifdef i386Architecture +#include +#endif --- Xvnc/lib/font/Type1/t1funcs.c 1998/06/05 15:02:02 1.1 +++ Xvnc/lib/font/Type1/t1funcs.c 1998/06/05 15:02:29 @@@@ -84,6 +84,8 @@@@ from the X Consortium. */ + +#include d11 10 a20 2 #include #ifdef _XOPEN_SOURCE @ 1.1.1.1 log @Initial import of vnc 3.3.1, which displays X11 and Win32 desktops on remote X11/Win32/Java displays, into the NetBSD packages collection. Taken from the FreeBSD port, but modified slightly to find correct paths. @ text @@