aboutsummaryrefslogtreecommitdiff
path: root/devel/imake-4
diff options
context:
space:
mode:
authorFUJISHIMA Satsuki <sf@FreeBSD.org>2001-03-25 23:04:52 +0000
committerFUJISHIMA Satsuki <sf@FreeBSD.org>2001-03-25 23:04:52 +0000
commit984a75e189f8032fdc9c22cb74ee524c9c5f229b (patch)
tree9d805fa2f35da750e77d677f6098022710d037b6 /devel/imake-4
parent142f65210852bc655ce7e4c7c22b2623ec78ba6a (diff)
downloadports-984a75e189f8032fdc9c22cb74ee524c9c5f229b.tar.gz
ports-984a75e189f8032fdc9c22cb74ee524c9c5f229b.zip
Notes
Diffstat (limited to 'devel/imake-4')
-rw-r--r--devel/imake-4/Makefile102
-rw-r--r--devel/imake-4/distinfo3
-rw-r--r--devel/imake-4/files/patch-c9
-rw-r--r--devel/imake-4/files/patch-c28
-rw-r--r--devel/imake-4/files/patch-d14
-rw-r--r--devel/imake-4/files/patch-h16
-rw-r--r--devel/imake-4/files/patch-i11
-rw-r--r--devel/imake-4/files/patch-t0115
-rw-r--r--devel/imake-4/files/patch-xthreads101
-rw-r--r--devel/imake-4/pkg-plist4
-rw-r--r--devel/imake-4/scripts/configure150
11 files changed, 340 insertions, 93 deletions
diff --git a/devel/imake-4/Makefile b/devel/imake-4/Makefile
index 3b1f5a591bd4..da29f8857634 100644
--- a/devel/imake-4/Makefile
+++ b/devel/imake-4/Makefile
@@ -6,23 +6,21 @@
#
PORTNAME= imake
-PORTVERSION= 4.0.1
+PORTVERSION= 4.0.3
CATEGORIES= devel
-MASTER_SITES= ftp://ftp.xfree86.org/pub/XFree86/${PORTVERSION}/source/ \
- ftp://ftp.freesoftware.com/pub/XFree86/${PORTVERSION}/source/ \
- ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-${PORTVERSION}/source/ \
- ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/${PORTVERSION}/source/ \
- ftp://sunsite.doc.ic.ac.uk/packages/XFree86/${PORTVERSION}/source/
-DISTFILES= X401src-1.tgz
+MASTER_SITES= ${MASTER_SITE_XFREE}
+DISTFILES= X402src-1.tgz
-MAINTAINER= taguchi@tohoku.iij.ad.jp
+PATCH_SITES= ${MASTER_SITE_XFREE:S,%SUBDIR%/source,4.0.3/patches,g}
+PATCHFILES= 4.0.2-4.0.3.diff.gz
-#MANUAL_PACKAGE_BUILD= installs/removes files also in the XFree86 port
+MAINTAINER= taguchi@tohoku.iij.ad.jp
PREFIX?= ${X11BASE}
DIST_SUBDIR= xc
WRKSRC= ${WRKDIR}/xc/config
MTREE_FILE= /etc/mtree/BSD.x11-4.dist
+PATCH_DIST_ARGS= --force -d ${WRKDIR} --forward --quiet -E ${PATCH_DIST_STRIP} 2>/dev/null || true
EXTRACT_AFTER_ARGS= | ${TAR} -xf - xc/Imakefile \
xc/Makefile \
xc/config \
@@ -39,28 +37,82 @@ MAN1= imake.1 \
rman.1 \
xmkmf.1
MANCOMPRESSED= yes
-INSTALL_TARGET= install install.man
-# Followings are configration variables for XFree86 Systems.
-HasSecureRPC?= YES
-HasXdmAuth?= YES
-HasPam?= YES
-BuildPexExt?= YES
-BuildXinerama?= YES
-BuildXIE?= YES
-BuildAoutLibraries?= NO
-# End of XFree86 configrations
SCRIPTS_ENV+= OSVERSION=${OSVERSION} \
- PREFIX=${PREFIX} \
- X11BASE=${X11BASE} \
- WRKDIR=${WRKDIR} \
- DISTDIR=${DISTDIR} \
- FILESDIR=${FILESDIR} \
HasSecureRPC=${HasSecureRPC} \
HasXdmAuth=${HasXdmAuth} \
HasPam=${HasPam} \
BuildPexExt=${BuildPexExt} \
BuildXinerama=${BuildXinerama} \
BuildXIE=${BuildXIE} \
- BuildAoutLibraries=${BuildAoutLibraries}
+ BuildAoutLibraries=${BuildAoutLibraries} \
+ ForceNormalLib=${ForceNormalLib} \
+ DebuggableLibraries=${DebuggableLibraries} \
+ JoystickSupport=${JoystickSupport} \
+ InstallXdmConfig=${InstallXdmConfig} \
+ InstallXinitConfig=${InstallXinitConfig} \
+ InstallAppDefFiles=${InstallAppDefFiles} \
+ ExtendedInputDevices=${ExtendedInputDevices} \
+ Build75DpiFonts=${Build75DpiFonts} \
+ Build100DpiFonts=${Build100DpiFonts} \
+ BuildSpeedoFonts=${BuildSpeedoFonts} \
+ BuildType1Fonts=${BuildType1Fonts} \
+ BuildCIDFonts=${BuildCIDFonts} \
+ BuildTTFonts=${BuildTTFonts}
+INSTALL_TARGET= install install.man
+# ---
+# User Config:
+# All variables are same as Imake config macros.
+# For more details, see ${WRKDIR}/xc/config/cf/README.
+# Followings will write to ${PFEFIX}/lib/X11/config/xf86site.def,
+# and all of XFree86-4-* ports will use them as default value.
+# Offcause, you can override them (at your own risk ;-).
+# Read scripts/configure for more details.
+# ---
+HasSecureRPC?= YES
+HasXdmAuth?= YES
+HasPam?= YES
+BuildPexExt?= YES
+BuildXinerama?= YES
+BuildXIE?= YES
+BuildAoutLibraries?= NO
+ForceNormalLib?= YES
+DebuggableLibraries?= NO
+JoystickSupport?= YES
+InstallXdmConfig?= YES
+InstallXinitConfig?= YES
+InstallAppDefFiles?= YES
+Build75DpiFonts?= YES
+Build100DpiFonts?= YES
+BuildSpeedoFonts?= YES
+BuildType1Fonts?= YES
+BuildCIDFonts?= YES
+BuildTTFonts?= YES
+# ---
+# Undocumented variables:
+# ExtendedInputDevices: if you want to support some extended input device,
+# such as wacom tablets, set YES.
+# if NO, only mouse device will be supported.
+ExtendedInputDevices?= YES
+# ---
+# Unconfigurable variables:
+# BuildXF86Setup=NO : XF86Setup is now broken ;-(
+#
+# BuildFontServer : if you want to use xfs, then do not install its ports.
+# BuildFonts : if you don't need fonts, then do not install its ports.
+# BuildCyrillicFonts : install ${PORTSDIR}/x11-fonts/XFree86-4-fontCyrillic
+# BuildLatin2Fonts : install ${PORTSDIR}/x11-fonts/XFree86-4-fontLatin2
+# [Note1] all of loadable modules (such as speedo, type1)
+# will be compiled/installed as default.
+# [Note2] default/traditional X11 fonts are corrected under
+# ${PORTSDIR}/x11-fonts/XFree86-4-fontDefaultBitmaps.
+#
+# XF86CardDrivers : XFree86-4-* ports try to support many devices.
+# XInputDrivers : So if you want to config them, edit manualy.
+#
+# NothingOutsideProjectRoot=YES : any ports will not install to /etc/ dir.
+# This means config files will be installed to ${PREFIX}/lib/X11.
+# It's a traditional place ;-)
+# InstallXserverSetUID=NO : use Xwrapper.
+# End of XFree86 configrations
.include <bsd.port.mk>
diff --git a/devel/imake-4/distinfo b/devel/imake-4/distinfo
index e9125a5f32c4..073d54832d2d 100644
--- a/devel/imake-4/distinfo
+++ b/devel/imake-4/distinfo
@@ -1 +1,2 @@
-MD5 (xc/X401src-1.tgz) = b2ad4a077ac7c09d85e6a0fc0728a536
+MD5 (xc/X402src-1.tgz) = d314c311aa4a29d74695b0e39b6d80c4
+MD5 (xc/4.0.2-4.0.3.diff.gz) = c8bb56df966dd0a51d2291bca36e0ea4
diff --git a/devel/imake-4/files/patch-c b/devel/imake-4/files/patch-c
index 22623f1c32cf..f5b0ae491d7c 100644
--- a/devel/imake-4/files/patch-c
+++ b/devel/imake-4/files/patch-c
@@ -1,6 +1,6 @@
---- cf/Imake.tmpl.orig Tue Jun 27 09:55:44 2000
-+++ cf/Imake.tmpl Wed Sep 6 13:31:04 2000
-@@ -1385,7 +1385,7 @@
+--- cf/Imake.tmpl.orig Tue Dec 5 10:16:28 2000
++++ cf/Imake.tmpl Tue Dec 5 10:39:48 2000
+@@ -1425,7 +1425,7 @@
CXXOPTIONS = CplusplusOptions
CXXINCLUDES = $(INCLUDES) $(TOP_INCLUDES) $(CXXEXTRA_INCLUDES)
CXXDEFINES = $(CXXINCLUDES) $(CXXSTD_DEFINES) $(THREADS_CXXDEFINES) $(CXXEXTRA_DEFINES) $(DEFINES)
@@ -9,12 +9,11 @@
#endif
COMPRESS = CompressCmd
GZIPCMD = GzipCmd
-@@ -1574,7 +1574,8 @@
+@@ -1616,7 +1616,7 @@
*/
ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(STD_INCLUDES)
ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(EXTRA_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES)
- CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES)
-+ SYSCFLAGS := $(CFLAGS) $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES)
+ CFLAGS += $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES)
LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES)
LDPRELIB = LdPreLib
diff --git a/devel/imake-4/files/patch-c2 b/devel/imake-4/files/patch-c2
new file mode 100644
index 000000000000..89ebb285a674
--- /dev/null
+++ b/devel/imake-4/files/patch-c2
@@ -0,0 +1,8 @@
+--- cf/Library.tmpl Wed Oct 13 00:20:41 1999
++++ cf/Library.tmpl Thu Dec 21 09:22:14 2000
+@@ -69,3 +69,3 @@
+ CLIBDEBUGFLAGS = LibraryDebugOpt
+- CFLAGS = $(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES)
++ CFLAGS += $(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES)
+ # if defined(LargePICTable) && LargePICTable && defined(LargePositionIndependentCFlags)
+
diff --git a/devel/imake-4/files/patch-d b/devel/imake-4/files/patch-d
index 39662846e4ec..27ec6db7e147 100644
--- a/devel/imake-4/files/patch-d
+++ b/devel/imake-4/files/patch-d
@@ -1,14 +1,6 @@
---- cf/FreeBSD.cf.orig Sun Jun 25 03:15:53 2000
-+++ cf/FreeBSD.cf Sun Jul 16 18:22:14 2000
-@@ -351,19 +356,22 @@
- #else
- #define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DXNO_SYSCONF
- #define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC
-+#endif
-+#ifndef HasPam
-+#define HasPam YES
- #endif
-
+--- cf/FreeBSD.cf~ Tue Dec 5 10:16:28 2000
++++ cf/FreeBSD.cf Tue Dec 5 10:45:42 2000
+@@ -371,14 +371,14 @@
/* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */
#ifndef DefaultGcc2i386Opt
#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 1) || (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 5)
diff --git a/devel/imake-4/files/patch-h b/devel/imake-4/files/patch-h
index c33c3c04b737..89b9f99e3e86 100644
--- a/devel/imake-4/files/patch-h
+++ b/devel/imake-4/files/patch-h
@@ -1,26 +1,24 @@
---- cf/Imake.rules.orig Sun Jun 18 03:39:14 2000
-+++ cf/Imake.rules Fri Sep 1 13:33:50 2000
-@@ -1297,8 +1297,8 @@
- @@\
+--- cf/Imake.rules~ Tue Dec 5 10:16:28 2000
++++ cf/Imake.rules Tue Dec 5 11:01:00 2000
+@@ -1303,7 +1303,7 @@
dest.suffix.html: file.man RmanCmdDependency @@\
RemoveFiles(dest.suffix.html dest.suffix-html) @@\
-- RunProgram(RMAN,$(RMANOPTIONS) < file.man > dest.suffix-html) &&\ @@\
+ RunProgram(RMAN,$(RMANOPTIONS) < file.man > dest.suffix-html) && \ @@\
- $(MV) dest.suffix-html $@ @@\
-+ RunProgram(RMAN,$(RMANOPTIONS) < file.man > dest.suffix-html) && \ @@\
+ $(MV) dest.suffix-html dest.suffix.html @@\
@@\
install.man:: dest.suffix.html @@\
MakeDir($(DESTDIR)$(DOCHTMLDIR)) @@\
-@@ -1533,7 +1533,7 @@
+@@ -1539,7 +1539,7 @@
MakeDir(Concat($(DESTDIR),npath/mdir)) @@\
@MakeFlagsToShellFlags(i,set +e); \ @@\
if [ -d Concat($(DESTDIR),opath/cdir) ]; then \ @@\
- RELPATH=`echo opath/cdir | \ @@\
-+ RELPATH=`cd opath/cdir; pwd | \ @@\
++ RELPATH=`cd opath/cdir; pwd | \ @@\
sed -e 's:^.::' -e 's:[^/.][^/]*:..:'g`; \ @@\
cd Concat($(DESTDIR),opath/cdir); \ @@\
if [ -d rdir -a ! -h rdir ]; then \ @@\
-@@ -1580,7 +1580,7 @@
+@@ -1586,7 +1586,7 @@
MakeDir(Concat($(DESTDIR),npath)) @@\
@MakeFlagsToShellFlags(i,set +e); \ @@\
if [ -d Concat($(DESTDIR),opath) ]; then \ @@\
diff --git a/devel/imake-4/files/patch-i b/devel/imake-4/files/patch-i
deleted file mode 100644
index 9234130815ef..000000000000
--- a/devel/imake-4/files/patch-i
+++ /dev/null
@@ -1,11 +0,0 @@
---- cf/Library.tmpl~ Wed Oct 13 13:20:41 1999
-+++ cf/Library.tmpl Wed Sep 6 13:32:03 2000
-@@ -67,7 +67,7 @@
- STD_DEFINES = LibraryDefines $(PROJECT_DEFINES)
- CDEBUGFLAGS = LibraryCDebugFlags
- CLIBDEBUGFLAGS = LibraryDebugOpt
-- CFLAGS = $(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES)
-+ CFLAGS = $(SYSCFLAGS) $(CLIBDEBUGFLAGS)
- # if defined(LargePICTable) && LargePICTable && defined(LargePositionIndependentCFlags)
- PICFLAGS = LargePositionIndependentCFlags
- # endif
diff --git a/devel/imake-4/files/patch-t01 b/devel/imake-4/files/patch-t01
index 6d605f8e3696..ce994b4f2ce5 100644
--- a/devel/imake-4/files/patch-t01
+++ b/devel/imake-4/files/patch-t01
@@ -1,6 +1,15 @@
---- imake/imake.c~ Thu Jun 15 04:36:17 2000
-+++ imake/imake.c Thu Sep 28 13:58:02 2000
-@@ -1184,6 +1184,19 @@
+--- imake/imake.c.ORIG Mon Dec 18 14:54:34 2000
++++ imake/imake.c Mon Dec 18 14:55:25 2000
+@@ -399,7 +399,7 @@
+ int
+ main(int argc, char *argv[])
+ {
+- FILE *tmpfd;
++ FILE *tmpfd = (FILE *)NULL;
+ char makeMacro[ BUFSIZ ];
+ char makefileMacro[ BUFSIZ ];
+
+@@ -1208,6 +1208,19 @@
if (uname(&name) < 0)
LogFatal("Cannot invoke uname", "");
diff --git a/devel/imake-4/files/patch-xthreads b/devel/imake-4/files/patch-xthreads
new file mode 100644
index 000000000000..0be90302ebd7
--- /dev/null
+++ b/devel/imake-4/files/patch-xthreads
@@ -0,0 +1,101 @@
+--- ../include/Xos_r.h.orig Sat Mar 24 16:49:23 2001
++++ ../include/Xos_r.h Sat Mar 24 16:49:25 2001
+@@ -245,7 +245,7 @@
+
+ /* NetBSD, at least, is missing several of the unixware passwd fields. */
+
+-#if defined(__NetBSD__) || defined(__OpenBSD__)
++#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__)
+ __inline__ void _Xpw_copyPasswd(_Xgetpwparams p)
+ {
+ memcpy(&(p).pws, (p).pwp, sizeof(struct passwd));
+@@ -412,7 +412,7 @@
+ /* UnixWare 2.0, or other systems with thread support but no _r API. */
+ /* WARNING: The h_addr_list and s_aliases values are *not* copied! */
+
+-#if defined(__NetBSD__)
++#if defined(__NetBSD__) || defined(__FreeBSD__)
+ #include <sys/param.h>
+ #endif
+
+--- cf/FreeBSD.cf.orig Sat Mar 24 16:49:25 2001
++++ cf/FreeBSD.cf Sat Mar 24 16:49:49 2001
+@@ -66,6 +66,41 @@
+ #define InstallXloadSetGID YES
+ #endif
+
++/*
++ * Multi-thread safe libs
++ */
++/* 2.2.7 and later has libc_r (POSIX threads) */
++#if OSMajorVersion == 2 && OSMinorVersion == 2 && OSTeenyVersion >= 7 || \
++ OSMajorVersion >= 3
++# ifndef HasLibPthread
++# define HasLibPthread NO
++# endif
++# define HasPosixThreads YES
++# define ThreadedX YES
++/*
++ * math.h uses _REENTRANT and stdio.h uses _THREAD_SAFE, so define both.
++ */
++# define SystemMTDefines -D_REENTRANT -D_THREAD_SAFE
++/*
++ * FreeBSD has tread-safe api but no getpwnam_r yet.
++ */
++# define HasThreadSafeAPI YES
++# define MTSafeAPIDefines -DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI
++# if HasLibPthread
++# define ThreadsLibraries -lpthread
++# else
++# define BuildThreadStubLibrary YES
++# define NeedUIThrStubs YES
++# if (OSRelVersion >= 500016)
++# define ThreadsLibraries -lc_r
++# else
++# define ThreadsLibraries -pthread
++# endif
++# define SharedX11Reqs $(LDPRELIB) $(XTHRSTUBLIB)
++# define SharedXtReqs $(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB) $(XTHRSTUBLIB)
++# endif
++#endif
++
+ #define AvoidNullMakeCommand YES
+ #define StripInstalledPrograms YES
+ #define CompressAllFonts YES
+@@ -97,7 +132,23 @@
+ #endif
+ #endif
+
+-#define CcCmd cc
++/*
++ * Add an LD_LIBRARY_PATH environment variable, defined by $(CLIENTENVSETUP),
++ * when building X to avoid that for each client ld give the message
++ *
++ * ld: warning: libXThrStub.so.6, needed by libX11.so, not found
++ */
++#if BuildThreadStubLibrary && !UseInstalled
++# define CcCmd $(CLIENTENVSETUP) cc
++# define CplusplusCmd $(CLIENTENVSETUP) c++
++#else
++# define CcCmd cc
++# define CplusplusCmd c++
++#endif
++
++#define CppCmd /usr/bin/cpp
++#define PreProcessCmd CppCmd
++#define StandardCppOptions -traditional
+ #define CppCmd /usr/bin/cpp
+ #define PreProcessCmd CppCmd
+ #define StandardCppOptions -traditional
+--- cf/bsdLib.tmpl.orig Tue Aug 29 03:43:49 2000
++++ cf/bsdLib.tmpl Sat Mar 24 16:49:25 2001
+@@ -47,7 +47,9 @@
+ #define SharedX11Reqs
+ #endif
+ #define SharedOldXReqs $(LDPRELIB) $(XLIBONLY)
++#ifndef SharedXtReqs
+ #define SharedXtReqs $(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB)
++#endif
+ #define SharedXawReqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB)
+ #define SharedXaw6Reqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XLIB)
+ #define SharedXmuReqs $(LDPRELIB) $(XTOOLLIB) $(XLIB)
diff --git a/devel/imake-4/pkg-plist b/devel/imake-4/pkg-plist
index 7dfb6d74bd8d..7cb86b0a10de 100644
--- a/devel/imake-4/pkg-plist
+++ b/devel/imake-4/pkg-plist
@@ -43,6 +43,10 @@ lib/X11/config/cde.rules
lib/X11/config/cde.tmpl
lib/X11/config/convex.cf
lib/X11/config/cray.cf
+lib/X11/config/cygwin.cf
+lib/X11/config/cygwin.rules
+lib/X11/config/cygwin.tmpl
+lib/X11/config/darwin.cf
lib/X11/config/fujitsu.cf
lib/X11/config/generic.cf
lib/X11/config/gnu.cf
diff --git a/devel/imake-4/scripts/configure b/devel/imake-4/scripts/configure
index 42dd8dc1b055..634ecb077ed5 100644
--- a/devel/imake-4/scripts/configure
+++ b/devel/imake-4/scripts/configure
@@ -1,55 +1,149 @@
#!/bin/sh
# configuration scripts for imake/XFree86
-F=${WRKDIR}/.config
+F=$WRKDIR/.config
+
+isyes() {
+ if [ X$1 = XYES -o X$1 = XYes -o X$1 = Xyes -o X$1 = XY -o X$1 = Xy ]; then
+ ret=YES
+ else
+ ret=$1
+ fi
+}
configure () {
rm -f $F
-if [ ${OSVERSION} -ge 300000 -a X${HasSecureRPC} != "X" ]; then
- echo "#define HasSecureRPC ${HasSecureRPC}" >> $F
+echo "/*" >> $F
+echo "/* Followins are generated by FreeBSD imake-4/XFree86-4-* ports system." >> $F
+echo " */" >> $F
+if [ $OSVERSION -ge 300000 -a X$HasSecureRPC != "X" ]; then
+ echo "#ifndef HasSecureRPC" >> $F
+ echo "#define HasSecureRPC $HasSecureRPC" >> $F
+ echo "#endif" >> $F
+fi
+if [ X$HasXdmAuth != "X" ]; then
+ if [ -f $WRKDIR/xc/lib/Xdmcp/Wraphelp.c -o -f $DISTDIR/xc/Wraphelp.c ]; then
+ echo "#ifndef HasXdmAuth" >> $F
+ echo "#define HasXdmAuth $HasXdmAuth" >> $F
+ echo "#endif" >> $F
+ fi
+fi
+if [ $OSVERSION -ge 310000 -a X$HasPam != "X" ]; then
+ echo "#ifndef HasPam" >> $F
+ echo "#define HasPam $HasPam" >> $F
+ echo "#endif" >> $F
+fi
+if [ X$BuildPexExt != "X" ]; then
+ echo "#ifndef BuildPexExt" >> $F
+ echo "#define BuildPexExt $BuildPexExt" >> $F
+ echo "#endif" >> $F
+fi
+if [ X$BuildXinerama != "X" ]; then
+ echo "#ifndef BuildXinerama" >> $F
+ echo "#define BuildXinerama $BuildXinerama" >> $F
+ echo "#endif" >> $F
+fi
+if [ X$BuildXIE != "X" ]; then
+ echo "#ifndef BuildXIE" >> $F
+ echo "#define BuildXIE $BuildXIE" >> $F
+ echo "#endif" >> $F
+fi
+if [ X$BuildAoutLibraries != "X" ]; then
+ echo "#ifndef BuildAoutLibraries" >> $F
+ echo "#define BuildAoutLibraries $BuildAoutLibraries" >> $F
+ echo "#endif" >> $F
+fi
+if [ X$ForceNormalLib != "X" ]; then
+ echo "#ifndef ForceNormalLib" >> $F
+ echo "#define ForceNormalLib $ForceNormalLib" >> $F
+ echo "#endif" >> $F
+fi
+isyes $DebuggableLibraries
+if [ $ret = YES -a $OSVERSION -ge 400000 ]; then
+ echo "#ifndef DebuggableLibraries" >> $F
+ echo "#define DebuggableLibraries $ret" >> $F
+ echo "#endif" >> $F
fi
-if [ X${HasXdmAuth} != "X" ]; then
- echo "#define HasXdmAuth ${HasXdmAuth}" >> $F
+if [ X$JoystickSupport != "X" ]; then
+ echo "#ifndef JoystickSupport" >> $F
+ echo "#define JoystickSupport $JoystickSupport" >> $F
+ echo "#endif" >> $F
fi
-if [ X${HasPam} != "X" ]; then
- echo "#define HasPam ${HasPam}" >> $F
+if [ X$InstallXdmConfig != "X" ]; then
+ echo "#ifndef InstallXdmConfig" >> $F
+ echo "#define InstallXdmConfig $InstallXdmConfig" >> $F
+ echo "#endif" >> $F
fi
-if [ X${BuildPexExt} != "X" ]; then
- echo "#define BuildPexExt ${BuildPexExt}" >> $F
+if [ X$InstallXinitConfig != "X" ]; then
+ echo "#ifndef InstallXinitConfig" >> $F
+ echo "#define InstallXinitConfig $InstallXinitConfig" >> $F
+ echo "#endif" >> $F
fi
-if [ X${BuildXinerama} != "X" ]; then
- echo "#define BuildXinerama ${BuildXinerama}" >> $F
+if [ X$InstallAppDefFiles != "X" ]; then
+ echo "#ifndef InstallAppDefFiles" >> $F
+ echo "#define InstallAppDefFiles $InstallAppDefFiles" >> $F
+ echo "#endif" >> $F
fi
-if [ X${BuildXIE} != "X" ]; then
- echo "#define BuildXIE ${BuildXIE}" >> $F
+if [ X$ExtendedInputDevices = XYES ]; then
+ echo "#define XInputDrivers mouse digitaledge dynapro elo2300 \
+ elographics magellan \
+ microtouch mutouch spaceorb summa \
+ wacom void citron" >> $F
+else
+ echo "#define XInputDrivers mouse" >> $F
fi
-if [ X${BuildAoutLibraries} != "X" ]; then
- echo "#define BuildAoutLibraries ${BuildAoutLibraries}" >> $F
+if [ X$Build75DpiFonts != "X" ]; then
+ echo "#ifndef Build75DpiFonts" >> $F
+ echo "#define Build75DpiFonts $Build75DpiFonts" >> $F
+ echo "#endif" >> $F
+fi
+if [ X$Build100DpiFonts != "X" ]; then
+ echo "#ifndef Build100DpiFonts" >> $F
+ echo "#define Build100DpiFonts $Build100DpiFonts" >> $F
+ echo "#endif" >> $F
+fi
+if [ X$BuildSpeedoFonts != "X" ]; then
+ echo "#ifndef BuildSpeedoFonts" >> $F
+ echo "#define BuildSpeedoFonts $BuildSpeedoFonts" >> $F
+ echo "#endif" >> $F
+fi
+if [ X$BuildType1Fonts != "X" ]; then
+ echo "#ifndef BuildType1Fonts" >> $F
+ echo "#define BuildType1Fonts $BuildType1Fonts" >> $F
+ echo "#endif" >> $F
+fi
+if [ X$BuildCIDFonts != "X" ]; then
+ echo "#ifndef BuildCIDFonts" >> $F
+ echo "#define BuildCIDFonts $BuildCIDFonts" >> $F
+ echo "#endif" >> $F
+fi
+if [ X$BuildTTFonts != "X" ]; then
+ echo "#ifndef BuildTTFonts" >> $F
+ echo "#define BuildTTFonts $BuildTTFonts" >> $F
+ echo "#endif" >> $F
fi
+echo "#define BuildXF86Setup NO" >> $F
cat >> $F <<EOF
#ifndef XF86CardDrivers
#ifdef i386Architecture
#define XF86CardDrivers mga glint nv tga s3virge sis rendition \
- neomagic i740 tdfx \
+ neomagic i740 tdfx savage \
cirrus tseng trident chips apm \
- GlideDriver fbdev \
- ati r128 AgpGartDrivers cyrix \
- vga XF86OSCardDrivers XF86ExtraCardDrivers
+ GlideDriver fbdev i128 \
+ ati AgpGartDrivers DevelDrivers ark cyrix \
+ siliconmotion \
+ vesa vga XF86OSCardDrivers XF86ExtraCardDrivers
#else
-#define XF86CardDrivers mga glint nv tga s3virge sis rendition \
- neomagic i740 tdfx \
- cirrus tseng trident chips apm \
- GlideDriver fbdev \
- ati r128 cyrix \
- vga XF86OSCardDrivers XF86ExtraCardDrivers
+#ifdef AlphaArchitecture
+#define XF86CardDrivers mga tdfx glint s3virge rendition tga \
+ savage nv DevelDrivers siliconmotion vga \
+ XF86OSCardDrivers XF86xtraCardDrivers
+#endif
#endif
#endif
EOF
-echo "#define XInputDrivers mouse dynapro elo2300 elographics magellan \
- microtouch mutouch spaceorb wacom" >> $F
-
# Never install something to outside ${X11BASE}!!
echo "#define NothingOutsideProjectRoot YES" >> $F
}