diff options
author | reed <reed> | 2005-10-10 17:27:17 +0000 |
---|---|---|
committer | reed <reed> | 2005-10-10 17:27:17 +0000 |
commit | 26d4db5d1ed4c28396bf29f8abaed4d42b7c9933 (patch) | |
tree | b929bfa75e6b100aacd9858eaed8fc3f407e4c09 | |
parent | 38d7bf0fa8cf0edc611a48579e9457657d3d99ee (diff) | |
download | pkgsrc-26d4db5d1ed4c28396bf29f8abaed4d42b7c9933.tar.gz |
x11/imake was moved and renamed to x11/XFree86-imake.
So remove x11/imake.
-rw-r--r-- | x11/imake/DESCR | 3 | ||||
-rw-r--r-- | x11/imake/Makefile | 76 | ||||
-rw-r--r-- | x11/imake/PLIST | 136 | ||||
-rw-r--r-- | x11/imake/distinfo | 16 | ||||
-rw-r--r-- | x11/imake/files/host.def | 5 | ||||
-rw-r--r-- | x11/imake/files/xf86site.def | 25 | ||||
-rw-r--r-- | x11/imake/patches/patch-aa | 14 | ||||
-rw-r--r-- | x11/imake/patches/patch-ab | 32 | ||||
-rw-r--r-- | x11/imake/patches/patch-ac | 12 | ||||
-rw-r--r-- | x11/imake/patches/patch-ad | 57 | ||||
-rw-r--r-- | x11/imake/patches/patch-ae | 58 | ||||
-rw-r--r-- | x11/imake/patches/patch-af | 41 | ||||
-rw-r--r-- | x11/imake/patches/patch-ag | 28 | ||||
-rw-r--r-- | x11/imake/patches/patch-ah | 49 |
14 files changed, 0 insertions, 552 deletions
diff --git a/x11/imake/DESCR b/x11/imake/DESCR deleted file mode 100644 index febbd1f19a1..00000000000 --- a/x11/imake/DESCR +++ /dev/null @@ -1,3 +0,0 @@ -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. diff --git a/x11/imake/Makefile b/x11/imake/Makefile deleted file mode 100644 index 61ee14ea7f9..00000000000 --- a/x11/imake/Makefile +++ /dev/null @@ -1,76 +0,0 @@ -# $NetBSD: Makefile,v 1.21 2005/10/09 05:11:32 reed Exp $ - -DISTNAME= ${DISTFILES} -PKGNAME= imake-${XF_VER} -PKGREVISION= 2 -CATEGORIES= x11 -MASTER_SITES= ${MASTER_SITE_XFREE} -DISTFILES= XFree86-${XF_VER}-src-1.tgz XFree86-${XF_VER}-src-3.tgz - -MAINTAINER= xtraeme@NetBSD.org -HOMEPAGE= http://www.xfree86.org/ -COMMENT= Imake and other utilities from XFree86 - -PKG_INSTALLATION_TYPES= overwrite pkgviews - -USE_DIRS+= XFree86-1.1 -INSTALL_TARGET= install install.man -NO_XFREE86_TARGETS= yes - -.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/XFree86/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}/xf86site.def ${WRKSRC}/config/cf - @${SED} \ - -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 - -post-install: - ${_PKG_SILENT}${_PKG_DEBUG} \ - hostdef=${X11ROOT:Q}/lib/X11/config/host.def; \ - hosttmp=${WRKSRC:Q}/host.def.tmp; \ - (${SED} -e "s|\#define ProjectRoot ${X11ROOT}||" "$${hostdef}"; \ - ${ECHO} ""; \ - ${ECHO} "#ifdef BeforeVendorCF"; \ - ${ECHO} "#define ProjectRoot ${X11ROOT}"; \ - ${ECHO} "#endif"; \ - )> "$${hosttmp}"; \ - ${INSTALL_DATA} "$${hosttmp}" "$${hostdef}"; \ - ${RM} -f "$${hosttmp}" - -.include "../../mk/bsd.pkg.mk" diff --git a/x11/imake/PLIST b/x11/imake/PLIST deleted file mode 100644 index ded995a7f5a..00000000000 --- a/x11/imake/PLIST +++ /dev/null @@ -1,136 +0,0 @@ -@comment $NetBSD: PLIST,v 1.4 2004/07/21 21:42:51 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/imake/distinfo b/x11/imake/distinfo deleted file mode 100644 index 25d6f8a1f50..00000000000 --- a/x11/imake/distinfo +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: distinfo,v 1.10 2005/10/09 05:11:32 reed Exp $ - -SHA1 (XFree86-4.4.0-src-1.tgz) = 44b38a7044c82d0b2f785b0e6a935349abcb5d79 -RMD160 (XFree86-4.4.0-src-1.tgz) = 40917951f1f661bfa28450771bbe86e8f0dd2549 -Size (XFree86-4.4.0-src-1.tgz) = 11760814 bytes -SHA1 (XFree86-4.4.0-src-3.tgz) = a012694d5a5aa3df1d9a3a52363d73cf8f03326b -RMD160 (XFree86-4.4.0-src-3.tgz) = 1ffad685dc513fd39ff0d9da34ec9a577041989f -Size (XFree86-4.4.0-src-3.tgz) = 11239253 bytes -SHA1 (patch-aa) = 554472267b9a5bc6614b11c6688325c1fd7ffc0e -SHA1 (patch-ab) = ae70833052df746763d7e02fe364e851357be7fd -SHA1 (patch-ac) = ae90c06b50d5d8b84054cc66beec0d0e3049d0aa -SHA1 (patch-ad) = c50bff9b7c8e1e8d17c25579f76bf1f3cced3eda -SHA1 (patch-ae) = b34f46d715e90159df3897cf20023b58b9deff67 -SHA1 (patch-af) = a06752ee9f55e64a407fac6fbde3547fd096c71d -SHA1 (patch-ag) = 2431b04483928ddd281d37e09b2e5c6fc37895f5 -SHA1 (patch-ah) = 4545d9fd50c2a7b6f5a04da330784eaf9a5373ad diff --git a/x11/imake/files/host.def b/x11/imake/files/host.def deleted file mode 100644 index ddd18436ce4..00000000000 --- a/x11/imake/files/host.def +++ /dev/null @@ -1,5 +0,0 @@ -/* $NetBSD: host.def,v 1.3 2004/03/28 22:06:16 xtraeme Exp $ */ - -#define ProjectRoot @PREFIX@ -#define BuildHtmlManPages NO -#define MakeCmd @MAKE@ diff --git a/x11/imake/files/xf86site.def b/x11/imake/files/xf86site.def deleted file mode 100644 index efca8390803..00000000000 --- a/x11/imake/files/xf86site.def +++ /dev/null @@ -1,25 +0,0 @@ -/* - * $NetBSD: xf86site.def,v 1.1.1.1 2004/01/24 08:43:29 xtraeme Exp $ - * - * XFree86 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/imake/patches/patch-aa b/x11/imake/patches/patch-aa deleted file mode 100644 index f21fa88ea90..00000000000 --- a/x11/imake/patches/patch-aa +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2004/01/24 08:43:27 xtraeme Exp $ - ---- Imakefile.orig 2003-07-03 14:11:26.000000000 +0200 -+++ Imakefile 2003-07-03 14:11:45.000000000 +0200 -@@ -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/imake/patches/patch-ab b/x11/imake/patches/patch-ab deleted file mode 100644 index ccde24f6d00..00000000000 --- a/x11/imake/patches/patch-ab +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-ab,v 1.2 2004/07/03 04:05:13 grant Exp $ - ---- include/Imakefile.orig 2001-08-28 03:40:56.000000000 +1000 -+++ include/Imakefile -@@ -4,7 +4,7 @@ XCOMM $Xorg: Imakefile,v 1.3 2000/08/18 - - - XCOMM $XFree86: xc/include/Imakefile,v 3.29 2001/08/27 17:40:56 dawes Exp $ --#define IHaveSubdirs -+XCOMM #define IHaveSubdirs - #define PassCDebugFlags /**/ - - #if BuildGlxExt || BuildGLXLibrary -@@ -15,7 +15,7 @@ GLXDIR = GL - DPSDIR = DPS - #endif - --SUBDIRS = bitmaps extensions fonts $(GLXDIR) $(DPSDIR) -+SUBDIRS = - - #ifdef Win32Architecture - EXTRA_HEADERS = Xw32defs.h Xwinsock.h -@@ -50,9 +50,6 @@ all:: - - BuildIncludes($(HEADERS),X11,..) - --#if BuildLibraries --InstallMultipleFlags($(HEADERS),$(INCDIR)/X11,$(INSTINCFLAGS)) --#endif - MakeSubdirs($(SUBDIRS)) - DependSubdirs($(SUBDIRS)) - diff --git a/x11/imake/patches/patch-ac b/x11/imake/patches/patch-ac deleted file mode 100644 index 7693a131306..00000000000 --- a/x11/imake/patches/patch-ac +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ac,v 1.3 2004/03/28 22:06:16 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/imake/patches/patch-ad b/x11/imake/patches/patch-ad deleted file mode 100644 index 56eb6c38a07..00000000000 --- a/x11/imake/patches/patch-ad +++ /dev/null @@ -1,57 +0,0 @@ -$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:: @@\ diff --git a/x11/imake/patches/patch-ae b/x11/imake/patches/patch-ae deleted file mode 100644 index 5e237eeb666..00000000000 --- a/x11/imake/patches/patch-ae +++ /dev/null @@ -1,58 +0,0 @@ -$NetBSD: patch-ae,v 1.2 2004/03/28 22:06:16 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/imake/patches/patch-af b/x11/imake/patches/patch-af deleted file mode 100644 index 292960d3202..00000000000 --- a/x11/imake/patches/patch-af +++ /dev/null @@ -1,41 +0,0 @@ -$NetBSD: patch-af,v 1.2 2004/03/28 22:06:16 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/imake/patches/patch-ag b/x11/imake/patches/patch-ag deleted file mode 100644 index b24019cf237..00000000000 --- a/x11/imake/patches/patch-ag +++ /dev/null @@ -1,28 +0,0 @@ -$NetBSD: patch-ag,v 1.4 2004/11/07 12:57:37 markd Exp $ - ---- config/cf/sun.cf.in.orig Mon Feb 2 16:55:26 2004 -+++ config/cf/sun.cf.in Thu Nov 4 16:43:40 2004 -@@ -19,6 +19,12 @@ - #endif - XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion) - -+/* This is the XFree86 package - we want to build XFree86 on Solaris */ -+#define BuildXFree86OnSparcSunOS YES -+#define BuildThreadStubLibrary NO -+#define HasSunC NO -+#define HasGcc2 YES -+ - /* - * Compiler setup. This sun.cf file knows what options to use with - * certain compilers, including Sun C, CenterLine C, and gcc. It -@@ -224,6 +230,10 @@ - #endif - #endif - -+#define CcCmd @@PKGSRC_CC@@ -+#define CplusplusCmd @@PKGSRC_CXX@@ -+#define OptimizedCDebugFlags @@PKGSRC_CFLAGS@@ -+ - # if HasSunC && (CCompilerMajorVersion < 3) - # define BootstrapCFlags -DSVR4 - # else diff --git a/x11/imake/patches/patch-ah b/x11/imake/patches/patch-ah deleted file mode 100644 index 28f90ce7265..00000000000 --- a/x11/imake/patches/patch-ah +++ /dev/null @@ -1,49 +0,0 @@ -$NetBSD: patch-ah,v 1.4 2004/07/21 22:32:33 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 /**/ |