Add imake based on XFree86-4.0.

Submitted by:	taguchi@tohoku.iij.ad.jp

8 files changed, 223 insertions, 82 deletions

diff --git a/devel/Makefile b/devel/Makefile
index 9358005e7e7f..8ff3c8a33323 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -80,6 +80,7 @@
     SUBDIR += idle
     SUBDIR += ilu
     SUBDIR += imake
+    SUBDIR += imake-4
     SUBDIR += jam
     SUBDIR += kdbg
     SUBDIR += kdbg-i18n
diff --git a/devel/imake-4/Makefile b/devel/imake-4/Makefile
index 027aedbbf4ba..62e1fd749da4 100644
--- a/devel/imake-4/Makefile
+++ b/devel/imake-4/Makefile
@@ -6,33 +6,52 @@
 #
 
 PORTNAME= 	imake
-PORTVERSION= 	1.0
+PORTVERSION= 	4.0
 CATEGORIES=	devel
-MASTER_SITES=	ftp://ftp.xfree86.org/pub/XFree86/3.3.6/source/ \
-		ftp://ftp.freesoftware.com/pub/XFree86/3.3.6/source/ \
-		ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-3.3.6/source/ \
-		ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/3.3.6/source/ \
-		ftp://sunsite.doc.ic.ac.uk/packages/XFree86/3.3.6/source/
-DISTNAME=	X336src-1
-EXTRACT_SUFX=	.tgz
+MASTER_SITES=	ftp://ftp.xfree86.org/pub/XFree86/4.0/source/ \
+		ftp://ftp.freesoftware.com/pub/XFree86/4.0/source/ \
+		ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-4.0/source/ \
+		ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/4.0/source/ \
+		ftp://sunsite.doc.ic.ac.uk/packages/XFree86/4.0/source/
+DISTFILES=	X400src-1.tgz
 
-MAINTAINER=	max@FreeBSD.org
+MAINTAINER=	taguchi@tohoku.iij.ad.jp
 
 MANUAL_PACKAGE_BUILD=	installs/removes files also in the XFree86 port
 
-PREFIX=		${X11BASE}
+PREFIX?=	${X11BASE}
 DIST_SUBDIR=	xc
 WRKSRC=		${WRKDIR}/xc/config
-MAN1=		imake.1 lndir.1 makedepend.1 xmkmf.1 makestrs.1 \
-		makeg.1 mkdirhier.1
+MTREE_FILE=	/etc/mtree/BSD.x11.dist
+.if !defined(NO_INSTALL_MANPAGES)
+MAN1=		imake.1 lndir.1 makedepend.1 makeg.1 makestrs.1 \
+		mkdirhier.1 pswrap.1 revpath.1 xmkmf.1
 MANCOMPRESSED=	yes
 INSTALL_TARGET=	install install.man
-MTREE_FILE=	/etc/mtree/BSD.x11.dist
-
-do-configure:
-	@${ECHO} > ${WRKSRC}/cf/host.def
-	@(cd ${WRKDIR}/xc; \
-	  ${MAKE} Makefile.boot ; \
-	  ${MAKE} -f xmakefile SUBDIRS="include config" VerifyOS Makefiles includes)
+.else
+INSTALL_TARGET=	install
+.endif
+# 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}
 
 .include <bsd.port.mk>
diff --git a/devel/imake-4/distinfo b/devel/imake-4/distinfo
index e312a348f7e4..32a647072af5 100644
--- a/devel/imake-4/distinfo
+++ b/devel/imake-4/distinfo
@@ -1 +1 @@
-MD5 (xc/X336src-1.tgz) = bbfa360d10ce91ab37f24f197a31b485
+MD5 (xc/X400src-1.tgz) = a93f407ee0dd7ed806a97370c2ae637d
diff --git a/devel/imake-4/files/patch-c b/devel/imake-4/files/patch-c
new file mode 100644
index 000000000000..e11377023f74
--- /dev/null
+++ b/devel/imake-4/files/patch-c
@@ -0,0 +1,20 @@
+--- cf/Imake.tmpl~	Tue Feb 22 02:42:26 2000
++++ cf/Imake.tmpl	Tue Feb 22 03:11:21 2000
+@@ -1282,7 +1282,7 @@
+        CXXOPTIONS = CplusplusOptions
+       CXXINCLUDES = $(INCLUDES) $(TOP_INCLUDES) $(CXXEXTRA_INCLUDES) 
+        CXXDEFINES = $(CXXINCLUDES) $(CXXSTD_DEFINES) $(THREADS_CXXDEFINES) $(CXXEXTRA_DEFINES) $(DEFINES)
+-         CXXFLAGS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(THREADS_CXXFLAGS) $(CXXDEFINES)
++         CXXFLAGS += $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(THREADS_CXXFLAGS) $(CXXDEFINES)
+ #endif
+          COMPRESS = CompressCmd
+           GZIPCMD = GzipCmd
+@@ -1469,7 +1469,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)
++           CFLAGS += $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES)
+         LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES)
+          LDPRELIB = LdPreLib
+         LDPOSTLIB = LdPostLib
diff --git a/devel/imake-4/files/patch-d b/devel/imake-4/files/patch-d
new file mode 100644
index 000000000000..3cbdc25d510c
--- /dev/null
+++ b/devel/imake-4/files/patch-d
@@ -0,0 +1,30 @@
+--- cf/FreeBSD.cf.orig	Thu Feb 17 18:09:43 2000
++++ cf/FreeBSD.cf	Sat Mar 18 19:42:06 2000
+@@ -336,14 +336,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)
+-#define DefaultGcc2i386Opt -O2
++#define DefaultGcc2i386Opt
+ #endif
+ #endif
+ 
+ #ifdef i386Architecture
+ # define OptimizedCDebugFlags DefaultGcc2i386Opt
+ #else
+-# define OptimizedCDebugFlags -O
++# define OptimizedCDebugFlags
+ #endif
+ 
+ #ifndef PreIncDir
+@@ -463,8 +463,9 @@
+ /*
+  * A hack to work around an optimisation problem with the compiler on
+  * FreeBSD 4.0-current in late 1999/early 2000.
++ * (and FreeBSD 5.0-current in early 2000)
+  */
+-#if OSMajorVersion == 4 && OSMinorVersion == 0 && OSTeenyVersion == 0
++#if (OSMajorVersion == 4 || OSMajorVersion == 5) && OSMinorVersion == 0 && OSTeenyVersion == 0
+ #define FreeBSDGccOptBug
+ #endif
+ 
diff --git a/devel/imake-4/files/patch-h b/devel/imake-4/files/patch-h
new file mode 100644
index 000000000000..c3f02dccd53b
--- /dev/null
+++ b/devel/imake-4/files/patch-h
@@ -0,0 +1,21 @@
+--- cf/Imake.rules.orig	Wed Mar  8 00:54:17 2000
++++ cf/Imake.rules	Wed Apr 12 18:00:00 2000
+@@ -1437,7 +1437,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 | \				@@\
+ 		sed -e 's:^.::' -e 's:[^/.][^/]*:..:'g`; \		@@\
+ 	  cd Concat($(DESTDIR),opath/cdir); \				@@\
+ 	  if [ -d rdir -a ! -h rdir ]; then \ 				@@\
+@@ -1484,7 +1484,7 @@
+ 	MakeDir(Concat($(DESTDIR),npath))				@@\
+ 	@MakeFlagsToShellFlags(i,set +e); \				@@\
+ 	if [ -d Concat($(DESTDIR),opath) ]; then \			@@\
+-	  RELPATH=`echo opath | \					@@\
++	  RELPATH=`cd opath; pwd | \					@@\
+ 		sed -e 's:^.::' -e 's:[^/.][^/]*:..:'g`; \		@@\
+ 	  cd Concat($(DESTDIR),opath); \				@@\
+ 	  if [ -f lfile -a ! -h lfile ]; then \ 			@@\
+
diff --git a/devel/imake-4/pkg-plist b/devel/imake-4/pkg-plist
index 3f15b5caec61..ce92b57e2de1 100644
--- a/devel/imake-4/pkg-plist
+++ b/devel/imake-4/pkg-plist
@@ -1,106 +1,108 @@
+bin/gccmakedep
+bin/imake
+bin/lndir
+bin/makedepend
+bin/makeg
+bin/makestrs
+bin/mergelib
+bin/mkdirhier
+bin/pswrap
+bin/revpath
+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/Motif.rules
-lib/X11/config/Win32.rules
-lib/X11/config/X11.rules
-lib/X11/config/bsdLib.rules
-lib/X11/config/cde.rules
-lib/X11/config/gnuLib.rules
-lib/X11/config/hpLib.rules
-lib/X11/config/ibmLib.rules
-lib/X11/config/lnxLib.rules
-lib/X11/config/lnxdoc.rules
-lib/X11/config/necLib.rules
-lib/X11/config/noop.rules
-lib/X11/config/nto.rules
-lib/X11/config/oldlib.rules
-lib/X11/config/os2.rules
-lib/X11/config/os2Lib.rules
-lib/X11/config/osfLib.rules
-lib/X11/config/scoLib.rules
-lib/X11/config/sgiLib.rules
-lib/X11/config/sunLib.rules
-lib/X11/config/QNX.rules
-lib/X11/config/sv3Lib.rules
-lib/X11/config/sv4Lib.rules
-lib/X11/config/xf86.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/bsdLib.tmpl
-lib/X11/config/cde.tmpl
-lib/X11/config/hpLib.tmpl
-lib/X11/config/gnuLib.tmpl
-lib/X11/config/ibmLib.tmpl
-lib/X11/config/lnxLib.tmpl
-lib/X11/config/lnxdoc.tmpl
-lib/X11/config/necLib.tmpl
-lib/X11/config/os2Lib.tmpl
-lib/X11/config/osfLib.tmpl
-lib/X11/config/sgiLib.tmpl
-lib/X11/config/sunLib.tmpl
-lib/X11/config/sv3Lib.tmpl
-lib/X11/config/sv4Lib.tmpl
-lib/X11/config/xf86.tmpl
-lib/X11/config/xf86site.def
-lib/X11/config/host.def
-lib/X11/config/site.def
-lib/X11/config/Imake.cf
-lib/X11/config/Amoeba.cf
-lib/X11/config/DGUX.cf
-lib/X11/config/FreeBSD.cf
-lib/X11/config/Mips.cf
-lib/X11/config/NetBSD.cf
-lib/X11/config/OpenBSD.cf
-lib/X11/config/Oki.cf
-lib/X11/config/Win32.cf
 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/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/lynx.cf
 lib/X11/config/x386.cf
-lib/X11/config/QNX.cf
+lib/X11/config/xf86.rules
+lib/X11/config/xf86.tmpl
+lib/X11/config/xf86site.def
 lib/X11/config/xfree86.cf
-bin/imake
-bin/makedepend
-bin/lndir
-bin/xmkmf
-bin/mkdirhier
-bin/gccmakedep
-bin/mergelib
-bin/makeg
-@dirrm lib/X11/config
diff --git a/devel/imake-4/scripts/configure b/devel/imake-4/scripts/configure
new file mode 100644
index 000000000000..05d5ae47329d
--- /dev/null
+++ b/devel/imake-4/scripts/configure
@@ -0,0 +1,48 @@
+#!/bin/sh
+# configuration scripts for imake/XFree86
+
+F=${WRKDIR}/.config
+
+configure () {
+rm -f $F
+
+if [ ${OSVERSION} -ge 300000 -a X${HasSecureRPC} != "X" ]; then
+    echo "#define HasSecureRPC ${HasSecureRPC}" >> $F
+fi
+if [ X${HasXdmAuth} != "X" ]; then
+    echo "#define HasXdmAuth ${HasXdmAuth}" >> $F
+fi
+if [ X${HasPam} != "X" ]; then
+    echo "#define HasPam ${HasPam}" >> $F
+fi
+if [ X${BuildPexExt} != "X" ]; then
+    echo "#define BuildPexExt ${BuildPexExt}" >> $F
+fi
+if [ X${BuildXinerama} != "X" ]; then
+    echo "#define BuildXinerama ${BuildXinerama}" >> $F
+fi
+if [ X${BuildXIE} != "X" ]; then
+    echo "#define BuildXIE ${BuildXIE}" >> $F
+fi
+
+cat >> $F <<EOF
+#define XF86CardDrivers         mga glint nv tga s3virge sis rendition \
+                                neomagic i740 tdfx \
+                                cirrus tseng trident chips apm \
+                                GlideDriver fbdev \
+                                ati r128 vga XF86ExtraCardDrivers
+EOF
+echo "#define XInputDrivers mouse dynapro elo2300 elographics magellan \
+	microtouch mutouch spaceorb wacom"  >> $F
+
+}
+
+configure
+
+cat $F >> ${WRKDIR}/xc/config/cf/xf86site.def
+
+echo "#define ProjectRoot ${PREFIX}" > ${WRKDIR}/xc/config/cf/host.def
+
+cd ${WRKDIR}/xc
+make Makefile.boot
+make -f xmakefile SUBDIRS="include config" VerifyOS Makefiles includes