My sincerest apologies - the formerly included 999_NetBSD.cf had one part of the patch out of order. I had already fixed it, but somehow it failed to make it into my local CVS before I sent the patches. Please find the corrected patch attached to this message, as '999_NetBSD.cf.corrected'. -- *************************************************************************** Joel Baker System Administrator - lightbearer.com lucifer@lightbearer.com http://users.lightbearer.com/lucifer/
This is an omnibus patch to add support for Debian-specific values in the NetBSD.cf file. It requires that imake be patched to generate the proper values for NetBSDDistribution, before these will be used (provided as a separate patch). Origionally written by Joel Baker <lucifer@lightbearer.com>. diff -ur xc-dist/config/cf/NetBSD.cf xc/config/cf/NetBSD.cf --- xc-dist/config/cf/NetBSD.cf 2002-10-09 03:55:29.000000000 +0000 +++ xc/config/cf/NetBSD.cf 2002-10-09 03:58:09.000000000 +0000 @@ -18,12 +18,109 @@ #define OSTeenyVersion DefaultOSTeenyVersion #endif +#ifndef NetBSDDistribution +#define NetBSDDistribution DefaultNetBSDDistribution +/* + Add "#define NetBSDDistribution NetBSD<mumble>" to your site.def or host.def. + Currently only NetBSDDebian will be autodetected. + Valid values are: + NetBSDUnknown (0) + NetBSDNative (1) + NetBSDDebian (2) +*/ +#endif + +#ifndef NetBSDDistName +# define NetBSDDistName DefaultNetBSDDistName +#endif #ifndef OSVendor #define OSVendor The NetBSD Foundation, Inc. #endif + +#ifndef NetBSDBinUtilsMajorVersion +# define NetBSDBinUtilsMajorVersion DefaultNetBSDBinUtilsMajorVersion +#endif + XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion) +/* Defines for Debian GNU/NetBSD */ + +#if NetBSDDistribution == NetBSDDebian +# ifndef DefaultGcc2OptimizeOpt +# define DefaultGcc2OptimizeOpt -O2 +# endif +# define DefaultGcc2AxpOpt DefaultGcc2OptimizeOpt +# define DefaultGcc2i386Opt DefaultGcc2OptimizeOpt +# define DefaultGcc2PpcOpt DefaultGcc2OptimizeOpt +# define SystemManDirectory /usr/share/man +# define HasPam YES +# define HasTk YES +# define TkLibDir /usr/lib +# define TkIncDir /usr/include +# define TkLibName tk8.3 +# define XF86SetupUsesStaticTk NO +# define HasTcl YES +# define TclLibDir /usr/lib +# define TclIncDir /usr/include +# define TclLibName tcl8.3 +# define XF86SetupUsesStaticTcl NO +# define XAppLoadDir EtcX11Directory/app-defaults +# define XFileSearchPathDefault Concat4(EtcX11Directory/%L/%T/%N%C,%S:EtcX11Directory/%l/%T/%N%C,%S:EtcX11Directory/%T/%N%C,%S:EtcX11Directory/%L/%T/%N%S:EtcX11Directory/%l/%T/%N%S:EtcX11Directory/%T/%N%S):Concat4($(LIBDIR)/%L/%T/%N%C,%S:$(LIBDIR)/%l/%T/%N%C,%S:$(LIBDIR)/%T/%N%C,%S:$(LIBDIR)/%L/%T/%N%S:$(LIBDIR)/%l/%T/%N%S:$(LIBDIR)/%T/%N%S) +/* the relative symlink created by this rule causes problems for us */ +# if InstallAppDefFiles +# define InstallAppDefaultsLong(file,class) @@\ +InstallNamedTarget(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class) +# else +# define InstallAppDefaultsLong(file,class) @@\ +InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class) +# endif /* InstallAppDefFiles */ + +# define SharedLibXdmGreet NO +# define LinkGLToUsrInclude NO +# define LinkGLToUsrLib NO +# define SharedLibFont NO +# define HasZlib YES +# define SharedLibGlu YES +# define NormalLibGlu YES +# define FSUseSyslog YES + +/* + * + */ +# define DebianMaintainer "xfree86@packages.debian.org" +/* + * + */ + +# ifdef DebianMaintainer +# ifndef XFree86CustomVersion +# define XFree86CustomVersion "Debian" +# endif +# ifndef BuilderEMailAddr +# define BuilderEMailAddr "debian-x@lists.debian.org" +# endif +# define XFree86Devel YES +# define BuildAllSpecsDocs YES +# define InstallXinitConfig YES +# define InstallXdmConfig YES +# define InstallFSConfig YES +# define DebuggableLibraries YES +# define ForceNormalLib YES +# define BuildSpecsDocs YES +# define SpecsDocDirs CTEXT GL ICCCM X11 Xext Xv i18n xterm +# define BuildRman NO +# define BuildHtmlManPages NO +# define ProjectManSuffix x + +/* we build-depend on libfreetype6-dev (FreeType 2.x) */ +# define BuildFreetype2Library NO +# define HasFreetype2 YES +# define HasXdmAuth YES +# define HasLatex YES +# endif /* DebianMaintainer */ +#endif /* NetBSDDebian */ + /* * C library features */ @@ -83,8 +180,13 @@ #define HasUsableFileMmap YES +#if NetBSDDistribution == NetBSDDebian +#define HasVarRun YES +#define VarDbDirectory $(VARDIR)/lib +#else /* Debian */ #define HasVarRun YES #define HasVarDb YES +#endif /* Debian */ #define InstallXloadSetGID NO @@ -174,6 +276,8 @@ #if UseElfFormat #define DlLibrary -rdynamic /* no -ldl yet */ +#define HasPlugin YES +#define VendorHasX11R6_3libXext YES #else #define DlLibrary /**/ #endif @@ -286,6 +390,10 @@ /* NetBSD doesn't have gperf in the base install */ #define DontRebuildGperfOutput YES +#if NetBSDDistribution == NetBSDDebian +#define HasPerl YES +#endif + /* * NetBSD doesn't have perl in default system * you may override this in host.def if you installed perl from the packages @@ -305,7 +413,13 @@ /* * Make & install Features */ + +#if NetBSDDistribution == NetBSDDebian +#define HasBsdMake NO +#else #define HasBsdMake YES +#endif + #define CompressAllFonts YES #define GzipFontCompression YES #define DefaultUserPath /bin:/usr/bin:/usr/pkg/bin:/usr/local/bin:$(BINDIR) @@ -396,6 +510,8 @@ @@\ .EXEC: +#if NetBSDDistribution != NetBSDDebian /* Debian uses ProjectManSuffix */ + /* * Man pages need to be formatted when installed, so override the default * imake rules. @@ -487,6 +603,8 @@ @@\ InstallManPageAliasesBase(file,destdir,aliases) +#endif /* Debian */ + /* * Shared libraries supported starting in 1.0 on a.out platforms, * and on all ELF platforms.
Attachment:
pgpw5zZOB6n0j.pgp
Description: PGP signature