diff options
author | xtraeme <xtraeme> | 2004-07-29 04:49:51 +0000 |
---|---|---|
committer | xtraeme <xtraeme> | 2004-07-29 04:49:51 +0000 |
commit | ab0c887983fc5bf404476a131d906df04a17687f (patch) | |
tree | 43f3fe1a9e1c9a2f3b1a41ba7f7c29b5a7054f56 /x11/xorg-imake | |
parent | 35a2f9fe0cca4783738bc0db0c76df7ed90ffff7 (diff) | |
download | pkgsrc-ab0c887983fc5bf404476a131d906df04a17687f.tar.gz |
Initial import of xorg-imake-6.7.0.
The xorg-imake package provides various utilities, such as imake, lndir,
mkdirhier, xmkmf, and others. These utilities are from X.org, although
an X server and X libraries are not needed.
Diffstat (limited to 'x11/xorg-imake')
-rw-r--r-- | x11/xorg-imake/DESCR | 3 | ||||
-rw-r--r-- | x11/xorg-imake/Makefile | 66 | ||||
-rw-r--r-- | x11/xorg-imake/PLIST | 136 | ||||
-rw-r--r-- | x11/xorg-imake/distinfo | 13 | ||||
-rw-r--r-- | x11/xorg-imake/files/host.def | 5 | ||||
-rw-r--r-- | x11/xorg-imake/files/xorgsite.def | 25 | ||||
-rw-r--r-- | x11/xorg-imake/patches/patch-aa | 14 | ||||
-rw-r--r-- | x11/xorg-imake/patches/patch-ab | 12 | ||||
-rw-r--r-- | x11/xorg-imake/patches/patch-ac | 46 | ||||
-rw-r--r-- | x11/xorg-imake/patches/patch-ad | 58 | ||||
-rw-r--r-- | x11/xorg-imake/patches/patch-ae | 41 | ||||
-rw-r--r-- | x11/xorg-imake/patches/patch-af | 14 | ||||
-rw-r--r-- | x11/xorg-imake/patches/patch-ag | 49 |
13 files changed, 482 insertions, 0 deletions
diff --git a/x11/xorg-imake/DESCR b/x11/xorg-imake/DESCR new file mode 100644 index 00000000000..992f3691726 --- /dev/null +++ b/x11/xorg-imake/DESCR @@ -0,0 +1,3 @@ +The xorg-imake package provides various utilities, such as imake, lndir, +mkdirhier, xmkmf, and others. These utilities are from X.org, although +an X server and X libraries are not needed. diff --git a/x11/xorg-imake/Makefile b/x11/xorg-imake/Makefile new file mode 100644 index 00000000000..9986487072c --- /dev/null +++ b/x11/xorg-imake/Makefile @@ -0,0 +1,66 @@ +# $NetBSD: Makefile,v 1.1.1.1 2004/07/29 04:49:52 xtraeme Exp $ + +DISTNAME= ${DISTFILES} +PKGNAME= xorg-imake-${XORG_VER} +CATEGORIES= x11 +MASTER_SITES= ${MASTER_SITE_XORG} +DISTFILES= X11R6.7.0-src1.tar.gz X11R6.7.0-src3.tar.gz + +MAINTAINER= xtraeme@NetBSD.org +HOMEPAGE= http://www.x.org/ +COMMENT= Imake and other utilities from X.org + +PKG_INSTALLATION_TYPES= overwrite pkgviews + +CONFLICTS+= imake-[0-9]* + +USE_BUILDLINK3= yes +INSTALL_TARGET= install install.man +NO_XORG_TARGETS= # defined + +.include "../../mk/bsd.prefs.mk" + +.if ${OPSYS} == "Linux" +DEPENDS+= bison-[0-9]*:../../devel/bison +DEPENDS+= flex-[0-9]*:../../devel/flex +PLIST_SUBST+= LNDIR= +.elif ${OPSYS} == "OpenBSD" +PLIST_SUBST+= LNDIR="@comment " +.else +PLIST_SUBST+= LNDIR= +.endif + +.include "../../meta-pkgs/xorg/Makefile.common" + +post-extract: +.for F in ${SYSTEMS} + @${MV} ${WRKSRC}/config/cf/${F}.cf \ + ${WRKSRC}/config/cf/${F}.cf.in +.endfor +.undef F + +pre-configure: +.for F in ${SYSTEMS} + @${SED} -e "s|@@PKGSRC_CC@@|${CC}|g" \ + -e "s|@@PKGSRC_CPP@@|${CPP}|g" \ + -e "s|@@PKGSRC_CXX@@|${CXX}|g" \ + -e "s|@@PKGSRC_CFLAGS@@|${CFLAGS}|g" \ + ${WRKSRC}/config/cf/${F}.cf.in > \ + ${WRKSRC}/config/cf/${F}.cf +.endfor +.undef F + +do-build: + @${TOUCH} ${WRKSRC}/config/cf/version.def + @${TOUCH} ${WRKSRC}/config/cf/date.def + @${CP} ${FILESDIR}/xorgsite.def ${WRKSRC}/config/cf + @${SED} -e "s|@PREFIX@|${X11ROOT}|g" \ + -e "s|@PREFIX@|${X11ROOT}|g" \ + -e "s|@BLNK@|${BUILDLINK_DIR}|g" \ + -e "s|@LOCALBASE@|${LOCALBASE}|g " \ + -e "s|@MAKE@|${MAKE_PROGRAM}|" ${FILESDIR}/host.def > \ + ${WRKSRC}/config/cf/host.def + cd ${WRKSRC} && ${MAKE} Makefile.boot && \ + ${MAKE_PROGRAM} -f xmakefile VerifyOS version.def Makefiles includes + +.include "../../mk/bsd.pkg.mk" diff --git a/x11/xorg-imake/PLIST b/x11/xorg-imake/PLIST new file mode 100644 index 00000000000..a6f620f208c --- /dev/null +++ b/x11/xorg-imake/PLIST @@ -0,0 +1,136 @@ +@comment $NetBSD: PLIST,v 1.1.1.1 2004/07/29 04:49:52 xtraeme Exp $ +${X11ROOT_PREFIX}/bin/ccmakedep +${X11ROOT_PREFIX}/bin/cleanlinks +${X11ROOT_PREFIX}/bin/gccmakedep +${X11ROOT_PREFIX}/bin/imake +${LNDIR}${X11ROOT_PREFIX}/bin/lndir +${X11ROOT_PREFIX}/bin/makedepend +${X11ROOT_PREFIX}/bin/makeg +${X11ROOT_PREFIX}/bin/makestrs +${X11ROOT_PREFIX}/bin/mergelib +${X11ROOT_PREFIX}/bin/mkdirhier +${X11ROOT_PREFIX}/bin/mkhtmlindex +${X11ROOT_PREFIX}/bin/pswrap +${X11ROOT_PREFIX}/bin/revpath +${X11ROOT_PREFIX}/bin/rman +${X11ROOT_PREFIX}/bin/xmkmf +${X11ROOT_PREFIX}/lib/X11/config/Amoeba.cf +${X11ROOT_PREFIX}/lib/X11/config/DGUX.cf +${X11ROOT_PREFIX}/lib/X11/config/FreeBSD.cf +${X11ROOT_PREFIX}/lib/X11/config/Imake.cf +${X11ROOT_PREFIX}/lib/X11/config/Imake.rules +${X11ROOT_PREFIX}/lib/X11/config/Imake.tmpl +${X11ROOT_PREFIX}/lib/X11/config/Library.tmpl +${X11ROOT_PREFIX}/lib/X11/config/Mips.cf +${X11ROOT_PREFIX}/lib/X11/config/Motif.rules +${X11ROOT_PREFIX}/lib/X11/config/Motif.tmpl +${X11ROOT_PREFIX}/lib/X11/config/NetBSD.cf +${X11ROOT_PREFIX}/lib/X11/config/Oki.cf +${X11ROOT_PREFIX}/lib/X11/config/OpenBSD.cf +${X11ROOT_PREFIX}/lib/X11/config/QNX4.cf +${X11ROOT_PREFIX}/lib/X11/config/QNX4.rules +${X11ROOT_PREFIX}/lib/X11/config/Server.tmpl +${X11ROOT_PREFIX}/lib/X11/config/ServerLib.tmpl +${X11ROOT_PREFIX}/lib/X11/config/Threads.tmpl +${X11ROOT_PREFIX}/lib/X11/config/Win32.cf +${X11ROOT_PREFIX}/lib/X11/config/Win32.rules +${X11ROOT_PREFIX}/lib/X11/config/WinLib.tmpl +${X11ROOT_PREFIX}/lib/X11/config/X11.rules +${X11ROOT_PREFIX}/lib/X11/config/X11.tmpl +${X11ROOT_PREFIX}/lib/X11/config/apollo.cf +${X11ROOT_PREFIX}/lib/X11/config/bsd.cf +${X11ROOT_PREFIX}/lib/X11/config/bsdLib.rules +${X11ROOT_PREFIX}/lib/X11/config/bsdLib.tmpl +${X11ROOT_PREFIX}/lib/X11/config/bsdi.cf +${X11ROOT_PREFIX}/lib/X11/config/cde.rules +${X11ROOT_PREFIX}/lib/X11/config/cde.tmpl +${X11ROOT_PREFIX}/lib/X11/config/convex.cf +${X11ROOT_PREFIX}/lib/X11/config/cray.cf +${X11ROOT_PREFIX}/lib/X11/config/cygwin.cf +${X11ROOT_PREFIX}/lib/X11/config/cygwin.rules +${X11ROOT_PREFIX}/lib/X11/config/cygwin.tmpl +${X11ROOT_PREFIX}/lib/X11/config/darwin.cf +${X11ROOT_PREFIX}/lib/X11/config/darwinLib.rules +${X11ROOT_PREFIX}/lib/X11/config/darwinLib.tmpl +${X11ROOT_PREFIX}/lib/X11/config/date.def +${X11ROOT_PREFIX}/lib/X11/config/fujitsu.cf +${X11ROOT_PREFIX}/lib/X11/config/generic.cf +${X11ROOT_PREFIX}/lib/X11/config/gnu.cf +${X11ROOT_PREFIX}/lib/X11/config/gnuLib.rules +${X11ROOT_PREFIX}/lib/X11/config/gnuLib.tmpl +${X11ROOT_PREFIX}/lib/X11/config/host.def +${X11ROOT_PREFIX}/lib/X11/config/hp.cf +${X11ROOT_PREFIX}/lib/X11/config/hpLib.rules +${X11ROOT_PREFIX}/lib/X11/config/hpLib.tmpl +${X11ROOT_PREFIX}/lib/X11/config/ibm.cf +${X11ROOT_PREFIX}/lib/X11/config/ibmLib.rules +${X11ROOT_PREFIX}/lib/X11/config/ibmLib.tmpl +${X11ROOT_PREFIX}/lib/X11/config/isc.cf +${X11ROOT_PREFIX}/lib/X11/config/linux.cf +${X11ROOT_PREFIX}/lib/X11/config/lnxLib.rules +${X11ROOT_PREFIX}/lib/X11/config/lnxLib.tmpl +${X11ROOT_PREFIX}/lib/X11/config/lnxdoc.rules +${X11ROOT_PREFIX}/lib/X11/config/lnxdoc.tmpl +${X11ROOT_PREFIX}/lib/X11/config/luna.cf +${X11ROOT_PREFIX}/lib/X11/config/lynx.cf +${X11ROOT_PREFIX}/lib/X11/config/macII.cf +${X11ROOT_PREFIX}/lib/X11/config/mach.cf +${X11ROOT_PREFIX}/lib/X11/config/minix.cf +${X11ROOT_PREFIX}/lib/X11/config/moto.cf +${X11ROOT_PREFIX}/lib/X11/config/ncr.cf +${X11ROOT_PREFIX}/lib/X11/config/nec.cf +${X11ROOT_PREFIX}/lib/X11/config/necLib.rules +${X11ROOT_PREFIX}/lib/X11/config/necLib.tmpl +${X11ROOT_PREFIX}/lib/X11/config/noop.rules +${X11ROOT_PREFIX}/lib/X11/config/nto.cf +${X11ROOT_PREFIX}/lib/X11/config/nto.rules +${X11ROOT_PREFIX}/lib/X11/config/oldlib.rules +${X11ROOT_PREFIX}/lib/X11/config/os2.cf +${X11ROOT_PREFIX}/lib/X11/config/os2.rules +${X11ROOT_PREFIX}/lib/X11/config/os2Lib.rules +${X11ROOT_PREFIX}/lib/X11/config/os2Lib.tmpl +${X11ROOT_PREFIX}/lib/X11/config/osf1.cf +${X11ROOT_PREFIX}/lib/X11/config/osfLib.rules +${X11ROOT_PREFIX}/lib/X11/config/osfLib.tmpl +${X11ROOT_PREFIX}/lib/X11/config/pegasus.cf +${X11ROOT_PREFIX}/lib/X11/config/sco.cf +${X11ROOT_PREFIX}/lib/X11/config/sco5.cf +${X11ROOT_PREFIX}/lib/X11/config/scoLib.rules +${X11ROOT_PREFIX}/lib/X11/config/sequent.cf +${X11ROOT_PREFIX}/lib/X11/config/sgi.cf +${X11ROOT_PREFIX}/lib/X11/config/sgiLib.rules +${X11ROOT_PREFIX}/lib/X11/config/sgiLib.tmpl +${X11ROOT_PREFIX}/lib/X11/config/site.def +${X11ROOT_PREFIX}/lib/X11/config/sony.cf +${X11ROOT_PREFIX}/lib/X11/config/sun.cf +${X11ROOT_PREFIX}/lib/X11/config/sunLib.rules +${X11ROOT_PREFIX}/lib/X11/config/sunLib.tmpl +${X11ROOT_PREFIX}/lib/X11/config/sv3Lib.rules +${X11ROOT_PREFIX}/lib/X11/config/sv3Lib.tmpl +${X11ROOT_PREFIX}/lib/X11/config/sv4Lib.rules +${X11ROOT_PREFIX}/lib/X11/config/sv4Lib.tmpl +${X11ROOT_PREFIX}/lib/X11/config/svr3.cf +${X11ROOT_PREFIX}/lib/X11/config/svr4.cf +${X11ROOT_PREFIX}/lib/X11/config/ultrix.cf +${X11ROOT_PREFIX}/lib/X11/config/usl.cf +${X11ROOT_PREFIX}/lib/X11/config/version.def +${X11ROOT_PREFIX}/lib/X11/config/x386.cf +${X11ROOT_PREFIX}/lib/X11/config/xf86.rules +${X11ROOT_PREFIX}/lib/X11/config/xf86.tmpl +${X11ROOT_PREFIX}/lib/X11/config/xf86site.def +${X11ROOT_PREFIX}/lib/X11/config/xfree86.cf +${IMAKE_MANTOOLS}${X11ROOT_PREFIX}/${MAN_DIR}/ccmakedep.${MAN_SUFFIX} +${IMAKE_MANTOOLS}${X11ROOT_PREFIX}/${MAN_DIR}/cleanlinks.${MAN_SUFFIX} +${IMAKE_MANTOOLS}${X11ROOT_PREFIX}/${MAN_DIR}/gccmakedep.${MAN_SUFFIX} +${IMAKE_MANTOOLS}${X11ROOT_PREFIX}/${MAN_DIR}/imake.${MAN_SUFFIX} +${IMAKE_MANTOOLS}${X11ROOT_PREFIX}/${MAN_DIR}/lndir.${MAN_SUFFIX} +${IMAKE_MANTOOLS}${X11ROOT_PREFIX}/${MAN_DIR}/makedepend.${MAN_SUFFIX} +${IMAKE_MANTOOLS}${X11ROOT_PREFIX}/${MAN_DIR}/makeg.${MAN_SUFFIX} +${IMAKE_MANTOOLS}${X11ROOT_PREFIX}/${MAN_DIR}/makestrs.${MAN_SUFFIX} +${IMAKE_MANTOOLS}${X11ROOT_PREFIX}/${MAN_DIR}/mergelib.${MAN_SUFFIX} +${IMAKE_MANTOOLS}${X11ROOT_PREFIX}/${MAN_DIR}/mkdirhier.${MAN_SUFFIX} +${IMAKE_MANTOOLS}${X11ROOT_PREFIX}/${MAN_DIR}/mkhtmlindex.${MAN_SUFFIX} +${IMAKE_MANTOOLS}${X11ROOT_PREFIX}/${MAN_DIR}/pswrap.${MAN_SUFFIX} +${IMAKE_MANTOOLS}${X11ROOT_PREFIX}/${MAN_DIR}/revpath.${MAN_SUFFIX} +${IMAKE_MANTOOLS}${X11ROOT_PREFIX}/${MAN_DIR}/rman.${MAN_SUFFIX} +${IMAKE_MANTOOLS}${X11ROOT_PREFIX}/${MAN_DIR}/xmkmf.${MAN_SUFFIX} diff --git a/x11/xorg-imake/distinfo b/x11/xorg-imake/distinfo new file mode 100644 index 00000000000..8c880c043ef --- /dev/null +++ b/x11/xorg-imake/distinfo @@ -0,0 +1,13 @@ +$NetBSD: distinfo,v 1.1.1.1 2004/07/29 04:49:52 xtraeme Exp $ + +SHA1 (X11R6.7.0-src1.tar.gz) = 14f282cee9dc1ff6ebc34d834892599b53195f8b +Size (X11R6.7.0-src1.tar.gz) = 30039655 bytes +SHA1 (X11R6.7.0-src3.tar.gz) = 4234d68bd9484baaaf29f5c58f432edb732b6451 +Size (X11R6.7.0-src3.tar.gz) = 10855793 bytes +SHA1 (patch-aa) = f8d35ceb67df85ca04d9567d66bf99c5d292d322 +SHA1 (patch-ab) = ae90c06b50d5d8b84054cc66beec0d0e3049d0aa +SHA1 (patch-ac) = 90584e5732fb882f431afd69f6fd1c26c9d22bee +SHA1 (patch-ad) = b34f46d715e90159df3897cf20023b58b9deff67 +SHA1 (patch-ae) = a06752ee9f55e64a407fac6fbde3547fd096c71d +SHA1 (patch-af) = 178d556fa11818420cd685308cf179ee5f6f7dac +SHA1 (patch-ag) = 4545d9fd50c2a7b6f5a04da330784eaf9a5373ad diff --git a/x11/xorg-imake/files/host.def b/x11/xorg-imake/files/host.def new file mode 100644 index 00000000000..52ea855510e --- /dev/null +++ b/x11/xorg-imake/files/host.def @@ -0,0 +1,5 @@ +/* $NetBSD*/ + +#define ProjectRoot @PREFIX@ +#define BuildHtmlManPages NO +#define MakeCmd @MAKE@ diff --git a/x11/xorg-imake/files/xorgsite.def b/x11/xorg-imake/files/xorgsite.def new file mode 100644 index 00000000000..82f5d611690 --- /dev/null +++ b/x11/xorg-imake/files/xorgsite.def @@ -0,0 +1,25 @@ +/* + * $NetBSD: xorgsite.def,v 1.1.1.1 2004/07/29 04:49:52 xtraeme Exp $ + * + * X.org packages for pkgsrc system + * + */ + +#ifndef HasSecureRPC +#define HasSecureRPC YES +#endif +#ifndef BuildAoutLibraries +#define BuildAoutLibraries NO +#endif +#ifndef InstallXdmConfig +#define InstallXdmConfig YES +#endif +#ifndef InstallXinitConfig +#define InstallXinitConfig YES +#endif +#ifndef InstallAppDefFiles +#define InstallAppDefFiles YES +#endif +#define HasXdmAuth YES +#define BuildXF86Setup NO +#define NothingOutsideProjectRoot YES diff --git a/x11/xorg-imake/patches/patch-aa b/x11/xorg-imake/patches/patch-aa new file mode 100644 index 00000000000..cc1179cdaef --- /dev/null +++ b/x11/xorg-imake/patches/patch-aa @@ -0,0 +1,14 @@ +$NetBSD: patch-aa,v 1.1.1.1 2004/07/29 04:49:52 xtraeme Exp $ + +--- Imakefile Wed Mar 24 19:16:46 2004 ++++ Imakefile Wed Mar 24 19:17:07 2004 +@@ -30,8 +30,7 @@ + #endif + #endif + +- SUBDIRS = include config lib $(NLSSUBDIR) \ +- programs $(FONTSDIR) $(DOCSDIR) ++ SUBDIRS = include config + LNINSTALLDIRS = lib + + #if HasParallelMake diff --git a/x11/xorg-imake/patches/patch-ab b/x11/xorg-imake/patches/patch-ab new file mode 100644 index 00000000000..5c7c6954e60 --- /dev/null +++ b/x11/xorg-imake/patches/patch-ab @@ -0,0 +1,12 @@ +$NetBSD: patch-ab,v 1.1.1.1 2004/07/29 04:49:53 xtraeme Exp $ + +--- config/pswrap/Imakefile.orig 2003-07-24 01:45:49.000000000 +0200 ++++ config/pswrap/Imakefile 2003-07-24 01:46:00.000000000 +0200 +@@ -4,7 +4,6 @@ + DEFINES = -DXENVIRONMENT + DEPLIBS = + YFLAGS = -d +-EXTRA_LIBRARIES = LexLib + + SRCS = main.c pswdict.c pswfile.c \ + systemnames.c psw.c pswstring.c pswsemantics.c diff --git a/x11/xorg-imake/patches/patch-ac b/x11/xorg-imake/patches/patch-ac new file mode 100644 index 00000000000..f5d2a5486c7 --- /dev/null +++ b/x11/xorg-imake/patches/patch-ac @@ -0,0 +1,46 @@ +$NetBSD: patch-ac,v 1.1.1.1 2004/07/29 04:49:52 xtraeme Exp $ + +--- 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 +@@ -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) diff --git a/x11/xorg-imake/patches/patch-ad b/x11/xorg-imake/patches/patch-ad new file mode 100644 index 00000000000..78c5e12abf3 --- /dev/null +++ b/x11/xorg-imake/patches/patch-ad @@ -0,0 +1,58 @@ +$NetBSD: patch-ad,v 1.1.1.1 2004/07/29 04:49:52 xtraeme Exp $ + +--- config/cf/FreeBSD.cf.in.orig 2004-03-03 07:40:43.000000000 +0000 ++++ config/cf/FreeBSD.cf.in 2004-03-03 07:44:05.000000000 +0000 +@@ -190,11 +190,11 @@ + # define CcCmd $(CLIENTENVSETUP) cc + # define CplusplusCmd $(CLIENTENVSETUP) c++ + #else +-# define CcCmd cc +-# define CplusplusCmd c++ ++# define CcCmd @@PKGSRC_CC@@ ++# define CplusplusCmd @@PKGSRC_CXX@@ + #endif + +-#define CppCmd /usr/bin/cpp ++#define CppCmd @@PKGSRC_CPP@@ + #define PreProcessCmd CppCmd + #define StandardCppOptions -traditional + #define StandardCppDefines /**/ +@@ -207,7 +207,7 @@ + #else + #define NoSystemWarn + #endif +-#define DefaultCCOptions -ansi -pedantic NoSystemWarn -Dasm=__asm \ ++#define DefaultCCOptions -ansi NoSystemWarn -Dasm=__asm \ + GccWarningOptions + #endif + #endif +@@ -439,18 +439,8 @@ + #define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC + #endif + +-/* 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) +-#define DefaultGcc2i386Opt -O2 GccAliasingArgs +-#endif +-#endif +- +-#ifdef i386Architecture +-# define OptimizedCDebugFlags DefaultGcc2i386Opt +-#else +-# define OptimizedCDebugFlags -O +-#endif ++#define DefaultGcc2i386Opt ++#define OptimizedCDebugFlags @@PKGSRC_CFLAGS@@ + + #ifndef PreIncDir + # define PreIncDir /usr/include +@@ -476,7 +466,7 @@ + * Compress manual pages + */ + #ifndef CompressManPages +-# define CompressManPages YES ++# define CompressManPages NO + #endif + + #if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 1) diff --git a/x11/xorg-imake/patches/patch-ae b/x11/xorg-imake/patches/patch-ae new file mode 100644 index 00000000000..b9dc07f9499 --- /dev/null +++ b/x11/xorg-imake/patches/patch-ae @@ -0,0 +1,41 @@ +$NetBSD: patch-ae,v 1.1.1.1 2004/07/29 04:49:52 xtraeme Exp $ + +--- config/cf/linux.cf.in.orig 2004-03-03 07:44:42.000000000 +0000 ++++ config/cf/linux.cf.in 2004-03-03 07:46:51.000000000 +0000 +@@ -549,15 +549,15 @@ + # if defined (i386Architecture) && ((GccMajorVersion >3) \ + || ((GccMajorVersion == 3) && (GccMinorVersion >= 1))) + # ifndef CcCmd +-# define CcCmd gcc -m32 ++# define CcCmd @@PKGSRC_CC@@ + # endif + # ifndef CplusplusCmd +-# define CplusplusCmd c++ -m32 ++# define CplusplusCmd @@PKGSRC_CXX@@ + # endif + # endif + # ifndef CcCmd +-# define CcCmd gcc +-# define CplusplusCmd c++ ++# define CcCmd @@PKGSRC_CC@@ ++# define CplusplusCmd @@PKGSRC_CXX@@ + # endif + # ifndef AsCmd + # define AsCmd CcCmd -c -x assembler +@@ -721,7 +721,6 @@ + #define YaccCmd bison -y + #define LexCmd flex -l + #define HasFlex YES +-#define LexLib -lfl + #define PreProcessCmd CcCmd -E + #define PostIncDir DefaultGccIncludeDir + #define LdCombineFlags -r +@@ -791,7 +790,7 @@ + + #ifdef i386Architecture + # ifndef OptimizedCDebugFlags +-# define OptimizedCDebugFlags DefaultGcc2i386Opt ++# define OptimizedCDebugFlags @@PKGSRC_CFLAGS@@ + # endif + # define LinuxMachineDefines -D__i386__ + # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME diff --git a/x11/xorg-imake/patches/patch-af b/x11/xorg-imake/patches/patch-af new file mode 100644 index 00000000000..3fa2e0d1cc5 --- /dev/null +++ b/x11/xorg-imake/patches/patch-af @@ -0,0 +1,14 @@ +$NetBSD: patch-af,v 1.1.1.1 2004/07/29 04:49:52 xtraeme Exp $ + +--- config/cf/sun.cf.orig 2004-02-02 14:55:26.000000000 +1100 ++++ config/cf/sun.cf +@@ -19,6 +19,9 @@ XCOMM platform: $XFree86: xc/config/cf/ + #endif + XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion) + ++/* This is the XFree86 package - we want to build XFree86 on Solaris */ ++#define BuildXFree86OnSparcSunOS YES ++ + /* + * Compiler setup. This sun.cf file knows what options to use with + * certain compilers, including Sun C, CenterLine C, and gcc. It diff --git a/x11/xorg-imake/patches/patch-ag b/x11/xorg-imake/patches/patch-ag new file mode 100644 index 00000000000..33f3915b104 --- /dev/null +++ b/x11/xorg-imake/patches/patch-ag @@ -0,0 +1,49 @@ +$NetBSD: patch-ag,v 1.1.1.1 2004/07/29 04:49:53 xtraeme Exp $ + +--- config/cf/OpenBSD.cf.in.orig 2004-07-22 00:18:37.000000000 +0200 ++++ config/cf/OpenBSD.cf.in 2004-07-22 00:19:48.000000000 +0200 +@@ -162,7 +162,7 @@ + #define MkdirHierCmd mkdir -p + + #ifndef CppCmd +-#define CppCmd /usr/libexec/cpp ++#define CppCmd @@PKGSRC_CPP@@ + #endif + #define StandardCppOptions -traditional + #define StandardCppDefines /**/ +@@ -170,10 +170,10 @@ + #define PreIncDir DefaultGccIncludeDir + + #ifndef CcCmd +-#define CcCmd cc ++#define CcCmd @@PKGSRC_CC@@ + #endif + #ifndef AsCmd +-#define AsCmd cc -c -x assembler ++#define AsCmd @@PKGSRC_CC@@ -c -x assembler + #endif + #ifndef DefaultCCOptions + #if defined(UseInstalled) +@@ -226,7 +226,6 @@ + + #define HasBsdMake YES + +-#define BuildCyrillicFonts YES + #define GzipFontCompression YES + #define DefaultUserPath /bin:/usr/bin:/usr/local/bin:$(BINDIR) + #define DefaultSystemPath /sbin:/usr/sbin:/bin:/usr/bin:$(BINDIR) +@@ -481,13 +480,7 @@ + # endif + + +-# ifndef DefaultGcc2i386Opt +-# if (OSMajorVersion == 2 && OSMinorVersion >= 3) || OSMajorVersion > 2 +- /* The GCC strength-reduce bug is fixed for OpenBSD 2.3 and later */ +-# define DefaultGcc2i386Opt -O2 GccAliasingArgs +-# endif +-# endif +-# define OptimizedCDebugFlags DefaultGcc2i386Opt ++# define OptimizedCDebugFlags @@PKGSRC_CFLAGS@@ + # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME + # define ServerExtraSysLibs -li386 + # define LdPostLib /**/ |