Initial import of imake-4.3.0, from pkgsrc-wip.

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.

17 files changed, 556 insertions, 0 deletions

diff --git a/x11/imake/DESCR b/x11/imake/DESCR
new file mode 100644
index 00000000000..febbd1f19a1
--- /dev/null
+++ b/x11/imake/DESCR
@@ -0,0 +1,3 @@
+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
new file mode 100644
index 00000000000..69240997b6b
--- /dev/null
+++ b/x11/imake/Makefile
@@ -0,0 +1,63 @@
+# $NetBSD: Makefile,v 1.1.1.1 2004/01/24 08:43:27 xtraeme Exp $
+
+DISTNAME=	${DISTFILES}
+PKGNAME=	imake-${XF_VER}
+CATEGORIES=	x11
+MASTER_SITES=	${MASTER_SITE_XFREE}
+DISTFILES=	X430src-1.tgz X430src-3.tgz
+
+MAINTAINER=	xfree86@blef.org
+HOMEPAGE=	http://www.xfree86.org/
+COMMENT=	Imake and other utilities from XFree86
+
+USE_BUILDLINK2=	YES
+
+INSTALL_TARGET=	install install.man
+
+NO_XFREE86_TARGETS=	# defined
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "Linux"
+DEPENDS+=	bison-[0-9]*:../../devel/bison
+DEPENDS+=	flex-[0-9]*:../../devel/flex
+USE_GNU_TOOLS+=	make
+.endif
+
+.include "../../wip/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@|${PREFIX}|g" \
+		-e "s|@BLNK@|${BUILDLINK_DIR}|g" \
+		-e "s|@LOCALBASE@|${LOCALBASE}|g " \
+		-e "s|@LDFLAGS@|${LDFLAGS}|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/imake/PLIST.FreeBSD b/x11/imake/PLIST.FreeBSD
new file mode 100644
index 00000000000..7f899dcc8f5
--- /dev/null
+++ b/x11/imake/PLIST.FreeBSD
@@ -0,0 +1,16 @@
+@comment $NetBSD: PLIST.FreeBSD,v 1.1.1.1 2004/01/24 08:43:27 xtraeme Exp $
+man/man1/ccmakedep.1.gz
+man/man1/cleanlinks.1.gz
+man/man1/gccmakedep.1.gz
+man/man1/imake.1.gz
+man/man1/lndir.1.gz
+man/man1/makedepend.1.gz
+man/man1/makeg.1.gz
+man/man1/makestrs.1.gz
+man/man1/mergelib.1.gz
+man/man1/mkdirhier.1.gz
+man/man1/mkhtmlindex.1.gz
+man/man1/pswrap.1.gz
+man/man1/revpath.1.gz
+man/man1/rman.1.gz
+man/man1/xmkmf.1.gz
diff --git a/x11/imake/PLIST.Linux b/x11/imake/PLIST.Linux
new file mode 100644
index 00000000000..c475cc1d2d2
--- /dev/null
+++ b/x11/imake/PLIST.Linux
@@ -0,0 +1,16 @@
+@comment $NetBSD: PLIST.Linux,v 1.1.1.1 2004/01/24 08:43:25 xtraeme Exp $
+man/man1/ccmakedep.1x
+man/man1/cleanlinks.1x
+man/man1/gccmakedep.1x
+man/man1/imake.1x
+man/man1/lndir.1x
+man/man1/makedepend.1x
+man/man1/makeg.1x
+man/man1/makestrs.1x
+man/man1/mergelib.1x
+man/man1/mkdirhier.1x
+man/man1/mkhtmlindex.1x
+man/man1/pswrap.1x
+man/man1/revpath.1x
+man/man1/rman.1x
+man/man1/xmkmf.1x
diff --git a/x11/imake/PLIST.NetBSD b/x11/imake/PLIST.NetBSD
new file mode 100644
index 00000000000..4055289f8f6
--- /dev/null
+++ b/x11/imake/PLIST.NetBSD
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST.NetBSD,v 1.1.1.1 2004/01/24 08:43:27 xtraeme Exp $
+man/cat1/imake.0
diff --git a/x11/imake/PLIST.common b/x11/imake/PLIST.common
new file mode 100644
index 00000000000..3f5322c87ef
--- /dev/null
+++ b/x11/imake/PLIST.common
@@ -0,0 +1,122 @@
+@comment $NetBSD: PLIST.common,v 1.1.1.1 2004/01/24 08:43:26 xtraeme Exp $
+bin/ccmakedep
+bin/cleanlinks
+bin/gccmakedep
+bin/imake
+bin/lndir
+bin/makedepend
+bin/makeg
+bin/makestrs
+bin/mergelib
+bin/mkdirhier
+bin/mkhtmlindex
+bin/pswrap
+bin/revpath
+bin/rman
+bin/xmkmf
+lib/X11/config/Amoeba.cf
+lib/X11/config/DGUX.cf
+lib/X11/config/FreeBSD.cf
+lib/X11/config/Imake.cf
+lib/X11/config/Imake.rules
+lib/X11/config/Imake.tmpl
+lib/X11/config/Library.tmpl
+lib/X11/config/Mips.cf
+lib/X11/config/Motif.rules
+lib/X11/config/Motif.tmpl
+lib/X11/config/NetBSD.cf
+lib/X11/config/Oki.cf
+lib/X11/config/OpenBSD.cf
+lib/X11/config/QNX4.cf
+lib/X11/config/QNX4.rules
+lib/X11/config/Server.tmpl
+lib/X11/config/ServerLib.tmpl
+lib/X11/config/Threads.tmpl
+lib/X11/config/Win32.cf
+lib/X11/config/Win32.rules
+lib/X11/config/WinLib.tmpl
+lib/X11/config/X11.rules
+lib/X11/config/X11.tmpl
+lib/X11/config/apollo.cf
+lib/X11/config/bsd.cf
+lib/X11/config/bsdLib.rules
+lib/X11/config/bsdLib.tmpl
+lib/X11/config/bsdi.cf
+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/darwinLib.rules
+lib/X11/config/darwinLib.tmpl
+lib/X11/config/date.def
+lib/X11/config/fujitsu.cf
+lib/X11/config/generic.cf
+lib/X11/config/gnu.cf
+lib/X11/config/gnuLib.rules
+lib/X11/config/gnuLib.tmpl
+lib/X11/config/host.def
+lib/X11/config/hp.cf
+lib/X11/config/hpLib.rules
+lib/X11/config/hpLib.tmpl
+lib/X11/config/ibm.cf
+lib/X11/config/ibmLib.rules
+lib/X11/config/ibmLib.tmpl
+lib/X11/config/isc.cf
+lib/X11/config/linux.cf
+lib/X11/config/lnxLib.rules
+lib/X11/config/lnxLib.tmpl
+lib/X11/config/lnxdoc.rules
+lib/X11/config/lnxdoc.tmpl
+lib/X11/config/luna.cf
+lib/X11/config/lynx.cf
+lib/X11/config/macII.cf
+lib/X11/config/mach.cf
+lib/X11/config/minix.cf
+lib/X11/config/moto.cf
+lib/X11/config/ncr.cf
+lib/X11/config/nec.cf
+lib/X11/config/necLib.rules
+lib/X11/config/necLib.tmpl
+lib/X11/config/noop.rules
+lib/X11/config/nto.cf
+lib/X11/config/nto.rules
+lib/X11/config/oldlib.rules
+lib/X11/config/os2.cf
+lib/X11/config/os2.rules
+lib/X11/config/os2Lib.rules
+lib/X11/config/os2Lib.tmpl
+lib/X11/config/osf1.cf
+lib/X11/config/osfLib.rules
+lib/X11/config/osfLib.tmpl
+lib/X11/config/pegasus.cf
+lib/X11/config/sco.cf
+lib/X11/config/sco5.cf
+lib/X11/config/scoLib.rules
+lib/X11/config/sequent.cf
+lib/X11/config/sgi.cf
+lib/X11/config/sgiLib.rules
+lib/X11/config/sgiLib.tmpl
+lib/X11/config/site.def
+lib/X11/config/sony.cf
+lib/X11/config/sun.cf
+lib/X11/config/sunLib.rules
+lib/X11/config/sunLib.tmpl
+lib/X11/config/sv3Lib.rules
+lib/X11/config/sv3Lib.tmpl
+lib/X11/config/sv4Lib.rules
+lib/X11/config/sv4Lib.tmpl
+lib/X11/config/svr3.cf
+lib/X11/config/svr4.cf
+lib/X11/config/ultrix.cf
+lib/X11/config/usl.cf
+lib/X11/config/version.def
+lib/X11/config/x386.cf
+lib/X11/config/xf86.rules
+lib/X11/config/xf86.tmpl
+lib/X11/config/xf86site.def
+lib/X11/config/xfree86.cf
+@dirrm lib/X11/config
diff --git a/x11/imake/distinfo b/x11/imake/distinfo
new file mode 100644
index 00000000000..c8fde85cb48
--- /dev/null
+++ b/x11/imake/distinfo
@@ -0,0 +1,14 @@
+$NetBSD: distinfo,v 1.1.1.1 2004/01/24 08:43:26 xtraeme Exp $
+
+SHA1 (X430src-1.tgz) = 3aaf219e8c2d3eb299f150bd4a2554a84a19354b
+Size (X430src-1.tgz) = 10993622 bytes
+SHA1 (X430src-3.tgz) = a11e619ba0b628d9e2e39e838379658b3b347f66
+Size (X430src-3.tgz) = 12366363 bytes
+SHA1 (patch-aa) = 554472267b9a5bc6614b11c6688325c1fd7ffc0e
+SHA1 (patch-ab) = f9da29ae63b2adc563df4230ce8daa9fc75ad8ca
+SHA1 (patch-ac) = 103e9e0400dd5a25738065cf1bb3c34e3b65f8b1
+SHA1 (patch-ad) = dc2cd430ed18f950e32e55a262de845e905199ad
+SHA1 (patch-ae) = 8a2032645c204d07ed9a7d501fc929ebe022d741
+SHA1 (patch-af) = ae90c06b50d5d8b84054cc66beec0d0e3049d0aa
+SHA1 (patch-ag) = 32e12b0470daa93964ba489ce650f5ffb1317b0c
+SHA1 (patch-ah) = bec3d071020c9354c7f1203d0467343b32298518
diff --git a/x11/imake/files/host.def b/x11/imake/files/host.def
new file mode 100644
index 00000000000..19a9d8d25d2
--- /dev/null
+++ b/x11/imake/files/host.def
@@ -0,0 +1,10 @@
+/*
+ * $NetBSD: host.def,v 1.1.1.1 2004/01/24 08:43:29 xtraeme Exp $
+ *
+ * XFree86 packages for pkgsrc system
+ *
+ */ 
+
+#define ProjectRoot @PREFIX@
+#define BuildHtmlManPages NO
+#define MakeCmd @MAKE@
diff --git a/x11/imake/files/xf86site.def b/x11/imake/files/xf86site.def
new file mode 100644
index 00000000000..efca8390803
--- /dev/null
+++ b/x11/imake/files/xf86site.def
@@ -0,0 +1,25 @@
+/*
+ * $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
new file mode 100644
index 00000000000..f21fa88ea90
--- /dev/null
+++ b/x11/imake/patches/patch-aa
@@ -0,0 +1,14 @@
+$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
new file mode 100644
index 00000000000..4cf9c0cdcef
--- /dev/null
+++ b/x11/imake/patches/patch-ab
@@ -0,0 +1,23 @@
+$NetBSD: patch-ab,v 1.1.1.1 2004/01/24 08:43:27 xtraeme Exp $
+
+--- include/Imakefile.orig	2003-07-03 14:43:15.000000000 +0200
++++ include/Imakefile	2003-07-03 14:44:23.000000000 +0200
+@@ -15,7 +15,7 @@
+ DPSDIR = DPS
+ #endif
+ 
+-SUBDIRS = bitmaps extensions fonts $(GLXDIR) $(DPSDIR)
++SUBDIRS = 
+ 
+ #ifdef Win32Architecture
+ EXTRA_HEADERS = Xw32defs.h Xwinsock.h
+@@ -50,9 +50,6 @@
+ 
+ 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
new file mode 100644
index 00000000000..cd6c5eb981a
--- /dev/null
+++ b/x11/imake/patches/patch-ac
@@ -0,0 +1,53 @@
+$NetBSD: patch-ac,v 1.1.1.1 2004/01/24 08:43:27 xtraeme Exp $
+
+--- config/cf/FreeBSD.cf.in.orig	2003-07-21 09:25:49.000000000 +0000
++++ config/cf/FreeBSD.cf.in	2003-07-21 09:28:10.000000000 +0000
+@@ -161,15 +161,10 @@
+  *
+  *    ld: warning: libXThrStub.so.6, needed by libX11.so, not found
+  */
+-#if BuildThreadStubLibrary && (!defined(UseInstalledX11) || !UseInstalledX11)
+-# define CcCmd			$(CLIENTENVSETUP) cc
+-# define CplusplusCmd		$(CLIENTENVSETUP) c++
+-#else
+-# define CcCmd			cc
+-# define CplusplusCmd		c++
+-#endif
++# define CcCmd			@@PKGSRC_CC@@
++# define CplusplusCmd		@@PKGSRC_CXX@@
+ 
+-#define CppCmd			/usr/bin/cpp
++#define CppCmd			@@PKGSRC_CPP@@
+ #define PreProcessCmd		CppCmd
+ #define StandardCppOptions	-traditional
+ #define StandardCppDefines	/**/
+@@ -177,7 +172,7 @@
+ #if defined(UseInstalled)
+ #define DefaultCCOptions	/**/
+ #else
+-#define DefaultCCOptions	-ansi -pedantic -Dasm=__asm GccWarningOptions
++#define DefaultCCOptions	-ansi -Dasm=__asm GccWarningOptions
+ #endif
+ #endif
+ #ifndef ExtraLibraries
+@@ -482,18 +477,9 @@
+ #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
+-#endif
+-#endif
+ 
+-#ifdef i386Architecture
+-# define OptimizedCDebugFlags DefaultGcc2i386Opt
+-#else
+-# define OptimizedCDebugFlags -O
+-#endif
++#define DefaultGcc2i386Opt
++#define OptimizedCDebugFlags  @@PKGSRC_CFLAGS@@
+ 
+ #ifndef PreIncDir
+ # define PreIncDir	/usr/include
diff --git a/x11/imake/patches/patch-ad b/x11/imake/patches/patch-ad
new file mode 100644
index 00000000000..ea5cc81c2ff
--- /dev/null
+++ b/x11/imake/patches/patch-ad
@@ -0,0 +1,85 @@
+$NetBSD: patch-ad,v 1.1.1.1 2004/01/24 08:43:28 xtraeme Exp $
+
+--- config/cf/NetBSD.cf.in.orig	2003-07-21 09:42:40.000000000 +0000
++++ config/cf/NetBSD.cf.in	2003-07-21 09:47:58.000000000 +0000
+@@ -89,22 +89,28 @@
+ 
+ #define HasVarRun		YES
+ #define HasVarDb		YES
++#define HasShadowPasswd         NO
+ 
+ #define InstallXloadSetGID	NO
+ 
+-/* Defines for using the GNU pth thread library -- experimental */
++#ifndef NetBSDThreads
++# define NetBSDThreads          YES
++#endif
+ 
+-#ifdef NetBSDPth
+-#define PthreadHLocation	-I/usr/local/include /* where is pthread.h? */
+-#define LibPthreadLocation	-L/usr/local/lib /* where is libpthread? */
+-#define HasThreadSafeAPI	NO
+-#define	HasPosixThreads		YES
+-#define SystemMTDefines		-D_REENTRANT PthreadHLocation
+-#define ThreadsLibraries	LibPthreadLocation -Wl,-rpath,/usr/local/lib -lpthread
+-#define SharedX11Reqs		ThreadsLibraries
++#if NetBSDThreads && \
++    ((OSMajorVersion > 1) || \
++     (OSMajorVersion == 1 && OSMinorVersion > 6) || \
++     (OSMajorVersion == 1 && OSMinorVersion == 6 && OSTeenyVersion >= 13))
++
++# define HasPosixThreads        YES
++# define ThreadedX              YES
++# define HasThreadSafeAPI       YES
++# define ThreadsLibraries       -lpthread
++# define LibraryMTDefines       -DUSE_NBSD_THREADLIB
++# define SystemMTDefines        -D_REENTRANT
++# define MTSafeAPIDefines       -DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI
+ #else 
+-#define HasPosixThreads		NO
+-#define ThreadedX		NO
++# define ThreadedX NO
+ #endif
+ 
+ /*
+@@ -122,8 +128,7 @@
+ 
+ #define MkdirHierCmd		mkdir -p
+ 
+-#undef CcCmd
+-#define CcCmd 			gcc
++#define CcCmd 			@@PKGSRC_CC@@
+ #ifndef DefaultCCOptions
+ #if defined(UseInstalled)
+ #define DefaultCCOptions 	/**/
+@@ -143,7 +148,7 @@
+ #define UseGccMakeDepend	YES
+ #endif
+ 
+-#define CppCmd			cpp
++#define CppCmd			@@PKGSRC_CPP@@
+ #define StandardCppOptions	-traditional
+ #define StandardCppDefines	/**/
+ #define PreProcessCmd   	CcCmd -E
+@@ -191,10 +196,10 @@
+ # 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
++#   define DefaultGcc2i386OpT
+ #  endif
+ # endif
+-# define OptimizedCDebugFlags 	DefaultGcc2i386Opt
++# define OptimizedCDebugFlags   @@PKGSRC_CFLAGS@@
+ # if OSMajorVersion < 1
+ #  define ServerOSDefines	XFree86ServerOSDefines -DXNO_SYSCONF
+ # else
+@@ -204,7 +209,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/imake/patches/patch-ae b/x11/imake/patches/patch-ae
new file mode 100644
index 00000000000..09dbede361d
--- /dev/null
+++ b/x11/imake/patches/patch-ae
@@ -0,0 +1,15 @@
+$NetBSD: patch-ae,v 1.1.1.1 2004/01/24 08:43:28 xtraeme Exp $
+
+--- extras/rman/rman.c.orig	Tue Jul 15 23:53:53 2003
++++ extras/rman/rman.c	Tue Jul 15 23:44:21 2003
+@@ -4104,6 +4104,9 @@
+ 	     }
+ 	   }
+ 	   break;
++	 case 0:
++	   /* ignore */
++	   break;
+ 	 default:		/* unknown escaped character */
+ 	   sputchar(*p++);
+ 	 }
+
diff --git a/x11/imake/patches/patch-af b/x11/imake/patches/patch-af
new file mode 100644
index 00000000000..76c7ecb47cf
--- /dev/null
+++ b/x11/imake/patches/patch-af
@@ -0,0 +1,12 @@
+$NetBSD: patch-af,v 1.1.1.1 2004/01/24 08:43:28 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-ag b/x11/imake/patches/patch-ag
new file mode 100644
index 00000000000..5e9bcf9ff25
--- /dev/null
+++ b/x11/imake/patches/patch-ag
@@ -0,0 +1,42 @@
+$NetBSD: patch-ag,v 1.1.1.1 2004/01/24 08:43:29 xtraeme Exp $
+
+--- config/cf/X11.tmpl.orig	2003-07-25 21:13:11.000000000 +0200
++++ config/cf/X11.tmpl	2003-07-25 21:14:34.000000000 +0200
+@@ -167,7 +167,7 @@
+ #define MaxUCSChar		0x3200
+ #endif
+ #ifndef DerivedUCSFonts
+-#define DerivedUCSFonts		HasPerl5
++#define DerivedUCSFonts		YES
+ #endif
+ /* These primarily control generation of derived 8-bit fonts. */
+ #ifndef BuildUCSFonts
+@@ -1591,7 +1591,7 @@
+ # else
+       MKHTMLINDEX = $(SHELL) $(CONFIGSRC)/util/mkhtmlindex.sh
+ # endif
+-          UCS2ANY = $(FONTSRC)/util/ucs2any.pl
++          UCS2ANY = $(FONTSRC)/util/ucs2any
+       BDFTRUNCATE = $(FONTSRC)/util/bdftruncate.pl
+      UCSMAPPREFIX = $(FONTSRC)/util/map-
+ #endif
+@@ -3797,18 +3797,16 @@
+ 
+ 
+ #ifndef MakeBdfFontFromUCSMaster
+-#if HasPerl5
+ #define MakeBdfFontFromUCSMaster(font,enc)				@@\
+ includes:: font-enc.bdf							@@\
+ 									@@\
+ font-enc.bdf: font.bdf $(UCS2ANY)					@@\
+ 	RemoveFile($@)							@@\
+-	RunPerlScript($(UCS2ANY),font.bdf $(UCSMAPPREFIX)enc enc)	@@\
++	$(UCS2ANY) font.bdf $(UCSMAPPREFIX)enc enc			@@\
+ 									@@\
+ clean::									@@\
+ 	RemoveFile(font-enc.bdf)
+ #endif
+-#endif
+ 
+ #ifndef MakeTruncatedUCSBdfFont
+ #if HasPerl5
diff --git a/x11/imake/patches/patch-ah b/x11/imake/patches/patch-ah
new file mode 100644
index 00000000000..9b0942c448e
--- /dev/null
+++ b/x11/imake/patches/patch-ah
@@ -0,0 +1,41 @@
+$NetBSD: patch-ah,v 1.1.1.1 2004/01/24 08:43:28 xtraeme Exp $
+
+--- config/cf/linux.cf.in.orig	2003-07-24 05:18:24.000000000 +0200
++++ config/cf/linux.cf.in	2003-07-24 05:20:54.000000000 +0200
+@@ -555,15 +555,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
+@@ -715,7 +715,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
+@@ -775,7 +774,7 @@
+ 
+ #ifdef i386Architecture
+ # ifndef OptimizedCDebugFlags
+-#  define OptimizedCDebugFlags	DefaultGcc2i386Opt
++#  define OptimizedCDebugFlags	@@PKGSRC_CFLAGS@@
+ # endif
+ # define LinuxMachineDefines	-D__i386__
+ # define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME -DPART_NET