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.

8 files changed, 285 insertions, 0 deletions

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