8 files changed, 83 insertions, 259 deletions

diff --git a/devel/imake-4/Makefile b/devel/imake-4/Makefile
index ce6f9e55dde7..e5a116b1f1c7 100644
--- a/devel/imake-4/Makefile
+++ b/devel/imake-4/Makefile
@@ -6,16 +6,11 @@
 #
 
 PORTNAME=	imake
-PORTVERSION=	4.2.0
-PORTREVISION=	1
+PORTVERSION=	4.3.0
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_XFREE} \
-		ftp://psych.psy.uq.oz.au/pub/X11R5/:wrap \
-		ftp://ftp.internat.FreeBSD.org/pub/FreeBSD/X11-Crypto/:wrap \
-		ftp://ftp3.za.FreeBSD.org/pub/FreeBSD/X11-Crypto/:wrap
+MASTER_SITES=	${MASTER_SITE_XFREE}
 MASTER_SITE_SUBDIR=	${PORTVERSION}
-DISTFILES=	X${PORTVERSION:S/.//g}src-1.tgz
-EXTRACT_ONLY=	X${PORTVERSION:S/.//g}src-1.tgz
+DISTFILES=	X430src-1.tgz X430src-3.tgz
 
 MAINTAINER=	anholt@freebsd.org
 COMMENT=	Imake and other utilities from XFree86
@@ -38,18 +33,17 @@ DIST_SUBDIR=	xc
 WRKSRC=		${WRKDIR}/xc/config
 MTREE_FILE=	/etc/mtree/BSD.x11-4.dist
 PATCH_DIST_ARGS=	--force -d ${WRKDIR} --forward --quiet -E ${PATCH_DIST_STRIP} 2>/dev/null || true
-EXTRACT_AFTER_ARGS=	| ${TAR} -xf - xc/Imakefile \
-			xc/Makefile \
-			xc/config \
-			xc/include \
-			xc/extras \
-			xc/programs/Xserver/hw/xfree86/xf86Version.h
-MAN1=		imake.1 \
+MAN1=		ccmakedep.1 \
+		cleanlinks.1 \
+		gccmakedep.1 \
+		imake.1 \
 		lndir.1 \
 		makedepend.1 \
 		makeg.1 \
 		makestrs.1 \
+		mergelib.1 \
 		mkdirhier.1 \
+		mkhtmlindex.1 \
 		pswrap.1 \
 		revpath.1 \
 		rman.1 \
@@ -57,81 +51,19 @@ MAN1=		imake.1 \
 MANCOMPRESSED=	yes
 SCRIPTS_ENV+=	OSVERSION=${OSVERSION} \
 		HasSecureRPC=${HasSecureRPC} \
-		HasXdmAuth=${HasXdmAuth} \
-		HasPam=${HasPam} \
-		BuildPexExt=${BuildPexExt} \
-		BuildXinerama=${BuildXinerama} \
-		BuildXIE=${BuildXIE} \
 		BuildAoutLibraries=${BuildAoutLibraries} \
-		ForceNormalLib=${ForceNormalLib} \
 		DebuggableLibraries=${DebuggableLibraries} \
-		JoystickSupport=${JoystickSupport} \
 		InstallXdmConfig=${InstallXdmConfig} \
 		InstallXinitConfig=${InstallXinitConfig} \
-		InstallAppDefFiles=${InstallAppDefFiles} \
-		ExtendedInputDevices=${ExtendedInputDevices} \
-		Build75DpiFonts=${Build75DpiFonts}  \
-		Build100DpiFonts=${Build100DpiFonts} \
-		BuildSpeedoFonts=${BuildSpeedoFonts} \
-		BuildType1Fonts=${BuildType1Fonts} \
-		BuildCIDFonts=${BuildCIDFonts} \
-		BuildTTFonts=${BuildTTFonts}
+		InstallAppDefFiles=${InstallAppDefFiles}
 INSTALL_TARGET=	install install.man
-# ---
-# User Config:
-# All variables are the same as Imake config macros.
-# For more details, see ${WRKDIR}/xc/config/cf/README.
-# Following will write to ${PREFIX}/lib/X11/config/xf86site.def,
-# and all of XFree86-4-* ports will use them as default value.
-# Of course, you can override them (at your own risk ;-).
-# Read scripts/configure for more details.
-# ---
+
 HasSecureRPC?=		YES
-HasXdmAuth?=		YES
-HasPam?=		YES
-BuildPexExt?=		YES
-BuildXinerama?=		YES
-BuildXIE?=		YES
 BuildAoutLibraries?=	NO
-ForceNormalLib?=	YES
 DebuggableLibraries?=	NO
-JoystickSupport?=	YES
 InstallXdmConfig?=	YES
 InstallXinitConfig?=	YES
 InstallAppDefFiles?=	YES
-Build75DpiFonts?=	YES
-Build100DpiFonts?=	YES
-BuildSpeedoFonts?=	YES
-BuildType1Fonts?=	YES
-BuildCIDFonts?=		YES
-BuildTTFonts?=		YES
-# ---
-# Undocumented variables:
-# ExtendedInputDevices: if you want to support some extended input device,
-#                       such as wacom tablets, set YES.
-#                       if NO, only mouse device will be supported.
-ExtendedInputDevices?=	YES
-# ---
-# Unconfigurable variables:
-# BuildXF86Setup=NO   : XF86Setup is now broken ;-(
-#
-# BuildFontServer     : if you want to use xfs, then do not install its ports.
-# BuildFonts          : if you don't need fonts, then do not install its ports.
-# BuildCyrillicFonts  : install ${PORTSDIR}/x11-fonts/XFree86-4-fontCyrillic
-# BuildLatin2Fonts    : install ${PORTSDIR}/x11-fonts/XFree86-4-fontLatin2
-#             [Note1] all of loadable modules (such as speedo, type1)
-#                      will be compiled/installed as default.
-#             [Note2] default/traditional X11 fonts are corrected under
-#                     ${PORTSDIR}/x11-fonts/XFree86-4-fontDefaultBitmaps.
-#
-# XF86CardDrivers     : XFree86-4-* ports try to support many devices.
-# XInputDrivers       : So if you want to config them, edit manualy.
-#
-# NothingOutsideProjectRoot=YES : any ports will not install to /etc/ dir.
-#             This means config files will be installed to ${PREFIX}/lib/X11.
-#             It's a traditional place ;-)
-# InstallXserverSetUID=NO : use Xwrapper.
-# End of XFree86 configrations
 
 post-install:
 	@${MKHTMLINDEX} ${PREFIX}/lib/X11/doc/html
diff --git a/devel/imake-4/distinfo b/devel/imake-4/distinfo
index 4766fc3aff79..d9453237ab57 100644
--- a/devel/imake-4/distinfo
+++ b/devel/imake-4/distinfo
@@ -1,2 +1,2 @@
-MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f
-MD5 (xc/Wraphelp.c) = IGNORE
+MD5 (xc/X430src-1.tgz) = 4f241a4f867363f40efa2b00dca292af
+MD5 (xc/X430src-3.tgz) = b82a0443e1b7bf860e4343e6b6766cb6
diff --git a/devel/imake-4/files/patch-freetype b/devel/imake-4/files/patch-freetype
index 6bb066df1760..aecdd09fd35b 100644
--- a/devel/imake-4/files/patch-freetype
+++ b/devel/imake-4/files/patch-freetype
@@ -1,11 +1,11 @@
---- cf/X11.tmpl.orig	Sat Jun  2 07:21:30 2001
-+++ cf/X11.tmpl	Fri Jun  8 00:44:19 2001
-@@ -2453,7 +2453,7 @@
- FREETYPE2DIR = Freetype2Dir
- FREETYPE2LIBDIR = Freetype2LibDir
- FREETYPE2INCDIR = Freetype2IncDir
+--- cf/X11.tmpl.orig	Tue Feb 25 13:57:52 2003
++++ cf/X11.tmpl	Sun Mar  2 21:07:54 2003
+@@ -3029,7 +3029,7 @@
+ #endif /* else BuildFreetype2Library */
+ 
+ #if BuildFreetype2Library || HasFreetype2
 -FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR)
 +FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR) -I$(FREETYPE2DIR)/include
- FREETYPE2LIB = -L$(FREETYPE2LIBDIR) -lfreetype
  FREETYPE2DEFINES = -DFREETYPE2
  #endif
+ 
diff --git a/devel/imake-4/files/patch-imake.c b/devel/imake-4/files/patch-imake.c
new file mode 100644
index 000000000000..f8117c91e000
--- /dev/null
+++ b/devel/imake-4/files/patch-imake.c
@@ -0,0 +1,22 @@
+--- imake/imake.c.orig	Tue Dec 17 04:21:38 2002
++++ imake/imake.c	Sat Jan  4 15:57:23 2003
+@@ -1384,6 +1384,19 @@
+ 	  name = &uts_name;
+       }
+ #endif
++# ifdef __FreeBSD__
++       /* Hack for FreeBSD ports "Cross Version" compiling system. */
++       {
++	 char *e;
++	 if ((e = getenv("OSREL")) != NULL && 
++	     strlen(name->sysname) + strlen(e) + 1 < SYS_NMLN) {
++	  strcpy(name->release, e);
++	  strcpy(name->version, name->sysname);
++	  strcat(name->version, " ");
++	  strcat(name->version, e);
++	 }
++       }
++# endif
+ 
+ #  if defined DEFAULT_OS_NAME
+ #   if defined CROSSCOMPILE
diff --git a/devel/imake-4/files/patch-imake::imake.c b/devel/imake-4/files/patch-imake::imake.c
deleted file mode 100644
index c44270e175c0..000000000000
--- a/devel/imake-4/files/patch-imake::imake.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- imake/imake.c	2002/05/10 23:41:31	1.1
-+++ imake/imake.c	2002/05/10 23:42:02
-@@ -1161,7 +1161,7 @@
- get_gcc_incdir(FILE *inFile)
- {
-   static char* gcc_path[] = {
--#if defined(linux) || defined(__OpenBSD__) || defined (__GNU__)
-+#if defined(linux) || defined(__OpenBSD__) || defined (__GNU__) || defined(__FreeBSD__)
-     "/usr/bin/cc",	/* for Linux PostIncDir */
- #endif
-     "/usr/local/bin/gcc",
diff --git a/devel/imake-4/files/patch-xthreads b/devel/imake-4/files/patch-xthreads
deleted file mode 100644
index f4bb8d98b3b9..000000000000
--- a/devel/imake-4/files/patch-xthreads
+++ /dev/null
@@ -1,25 +0,0 @@
---- cf/FreeBSD.cf.orig	Thu Jun  7 16:25:47 2001
-+++ cf/FreeBSD.cf	Thu Jun  7 16:28:30 2001
-@@ -80,7 +80,6 @@
- /*
-  * math.h uses _REENTRANT and stdio.h uses _THREAD_SAFE, so define both.
-  */
--# define SystemMTDefines	-D_REENTRANT -D_THREAD_SAFE
- /*
-  * FreeBSD has tread-safe api but no getpwnam_r yet.
-  */
-@@ -91,8 +90,12 @@
- # else
- #  define BuildThreadStubLibrary  YES 
- #  define NeedUIThrStubs          YES 
--#  define ThreadsCompileFlags	-pthread
--#  define ThreadsLibraries 	-pthread
-+#  if (OSRelVersion >= 500016)
-+#   define ThreadsLibraries 	-lc_r
-+#  else
-+#   define SystemMTDefines	-D_REENTRANT -D_THREAD_SAFE
-+#   define ThreadsLibraries 	-pthread
-+#  endif
- #  define SharedX11Reqs		$(LDPRELIB) $(XTHRSTUBLIB)
- #  define SharedXtReqs		$(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB) $(XTHRSTUBLIB)
- # endif
diff --git a/devel/imake-4/pkg-plist b/devel/imake-4/pkg-plist
index 89d6ba8ace3c..1dede5a1bb0c 100644
--- a/devel/imake-4/pkg-plist
+++ b/devel/imake-4/pkg-plist
@@ -49,6 +49,9 @@ 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
@@ -115,13 +118,18 @@ lib/X11/config/xf86.rules
 lib/X11/config/xf86.tmpl
 lib/X11/config/xf86site.def
 lib/X11/config/xfree86.cf
+lib/X11/doc/html/ccmakedep.1.html
+lib/X11/doc/html/cleanlinks.1.html
+lib/X11/doc/html/gccmakedep.1.html
 lib/X11/doc/html/imake.1.html
 lib/X11/doc/html/lndir.1.html
 lib/X11/doc/html/makedepend.1.html
 lib/X11/doc/html/makeg.1.html
 lib/X11/doc/html/makestrs.1.html
 lib/X11/doc/html/manindex1.html
+lib/X11/doc/html/mergelib.1.html
 lib/X11/doc/html/mkdirhier.1.html
+lib/X11/doc/html/mkhtmlindex.1.html
 lib/X11/doc/html/pswrap.1.html
 lib/X11/doc/html/revpath.1.html
 lib/X11/doc/html/rman.1.html
diff --git a/devel/imake-4/scripts/configure b/devel/imake-4/scripts/configure
index 9dd35d5a285c..e62fd36171bf 100644
--- a/devel/imake-4/scripts/configure
+++ b/devel/imake-4/scripts/configure
@@ -11,144 +11,44 @@ isyes() {
     fi
 }
 
-configure () {
 rm -f $F
 
 echo "/*" >> $F
-echo "/* Followins are generated by FreeBSD imake-4/XFree86-4-* ports system." >> $F
+echo "/* The following was generated by FreeBSD imake-4/XFree86-4-* ports system." >> $F
 echo " */" >> $F
-if [ $OSVERSION -ge 300000 -a X$HasSecureRPC != "X" ]; then
-    echo "#ifndef HasSecureRPC"                 >> $F
-    echo "#define HasSecureRPC $HasSecureRPC" >> $F
-    echo "#endif"                               >> $F
-fi
-if [ X$HasXdmAuth != "X" ]; then
-    echo "#ifndef HasXdmAuth"               >> $F
-    echo "#define HasXdmAuth $HasXdmAuth" >> $F
-    echo "#endif"                           >> $F
-fi
-if [ $OSVERSION -ge 310000 -a X$HasPam != "X" ]; then
-    echo "#ifndef HasPam"                       >> $F
-    echo "#define HasPam $HasPam"             >> $F
-    echo "#endif"                               >> $F
-fi
-if [ X$BuildPexExt != "X" ]; then
-    echo "#ifndef BuildPexExt"                  >> $F
-    echo "#define BuildPexExt $BuildPexExt"   >> $F
-    echo "#endif"                               >> $F
-fi
-if [ X$BuildXinerama != "X" ]; then
-    echo "#ifndef BuildXinerama"                  >> $F
-    echo "#define BuildXinerama $BuildXinerama" >> $F
-    echo "#endif"                                 >> $F
-fi
-if [ X$BuildXIE != "X" ]; then
-    echo "#ifndef BuildXIE"                       >> $F
-    echo "#define BuildXIE $BuildXIE"           >> $F
-    echo "#endif"                                 >> $F
-fi
-if [ X$BuildAoutLibraries != "X" ]; then
-    echo "#ifndef BuildAoutLibraries"             >> $F
-    echo "#define BuildAoutLibraries $BuildAoutLibraries" >> $F
-    echo "#endif"                                 >> $F
-fi
-if [ X$ForceNormalLib != "X" ]; then
-    echo "#ifndef ForceNormalLib"                   >> $F
-    echo "#define ForceNormalLib $ForceNormalLib" >> $F
-    echo "#endif"                                   >> $F
-fi
+echo "#ifndef HasSecureRPC"			>> $F
+echo "#define HasSecureRPC $HasSecureRPC"	>> $F
+echo "#endif"					>> $F
+echo "#ifndef BuildAoutLibraries"		>> $F
+echo "#define BuildAoutLibraries $BuildAoutLibraries" >> $F
+echo "#endif"					>> $F
 isyes $DebuggableLibraries
 if [ $ret = YES -a $OSVERSION -ge 400000 ]; then
-    echo "#ifndef DebuggableLibraries"      >> $F
-    echo "#define DebuggableLibraries $ret" >> $F
-    echo "#endif"                           >> $F
-fi
-if [ X$JoystickSupport != "X" ]; then
-    echo "#ifndef JoystickSupport"                    >> $F
-    echo "#define JoystickSupport $JoystickSupport" >> $F
-    echo "#endif"                                     >> $F
-fi
-if [ X$InstallXdmConfig != "X" ]; then
-    echo "#ifndef InstallXdmConfig"                     >> $F
-    echo "#define InstallXdmConfig $InstallXdmConfig" >> $F
-    echo "#endif"                                       >> $F
-fi
-if [ X$InstallXinitConfig != "X" ]; then
-    echo "#ifndef InstallXinitConfig"                       >> $F
-    echo "#define InstallXinitConfig $InstallXinitConfig" >> $F
-    echo "#endif"                                           >> $F
-fi
-if [ X$InstallAppDefFiles != "X" ]; then
-    echo "#ifndef InstallAppDefFiles"                       >> $F
-    echo "#define InstallAppDefFiles $InstallAppDefFiles" >> $F
-    echo "#endif"                                           >> $F
-fi
-if [ X$ExtendedInputDevices = XYES ]; then
-    echo "#define XInputDrivers mouse digitaledge dynapro elo2300 \
-				elographics magellan \
-				microtouch mutouch spaceorb summa \
-				wacom void citron"  >> $F
-else
-    echo "#define XInputDrivers mouse" >> $F
-fi
-if [ X$Build75DpiFonts != "X" ]; then
-    echo "#ifndef Build75DpiFonts"                       >> $F
-    echo "#define Build75DpiFonts $Build75DpiFonts"      >> $F
-    echo "#endif"                                        >> $F
-fi
-if [ X$Build100DpiFonts != "X" ]; then
-    echo "#ifndef Build100DpiFonts"                       >> $F
-    echo "#define Build100DpiFonts $Build100DpiFonts"      >> $F
-    echo "#endif"                                        >> $F
-fi
-if [ X$BuildSpeedoFonts != "X" ]; then
-    echo "#ifndef BuildSpeedoFonts"                       >> $F
-    echo "#define BuildSpeedoFonts $BuildSpeedoFonts"      >> $F
-    echo "#endif"                                        >> $F
-fi
-if [ X$BuildType1Fonts != "X" ]; then
-    echo "#ifndef BuildType1Fonts"                       >> $F
-    echo "#define BuildType1Fonts $BuildType1Fonts"      >> $F
-    echo "#endif"                                        >> $F
-fi
-if [ X$BuildCIDFonts != "X" ]; then
-    echo "#ifndef BuildCIDFonts"                     >> $F
-    echo "#define BuildCIDFonts $BuildCIDFonts"      >> $F
-    echo "#endif"                                    >> $F
-fi
-if [ X$BuildTTFonts != "X" ]; then
-    echo "#ifndef BuildTTFonts"                    >> $F
-    echo "#define BuildTTFonts $BuildTTFonts"      >> $F
-    echo "#endif"                                  >> $F
-fi
-
-echo "#define BuildXF86Setup NO" >> $F
-echo "#define HasFreetype2 YES" >> $F
-echo "#define Freetype2Dir ${LOCALBASE}" >> $F
-cat >> $F <<EOF
-#ifndef XF86CardDrivers
-#ifdef i386Architecture
-#define XF86CardDrivers         mga glint nv tga s3virge sis rendition \
-                                neomagic i740 tdfx savage \
-                                cirrus vmware tseng trident chips apm \
-                                GlideDriver fbdev i128 \
-                                ati AgpGartDrivers DevelDrivers ark cyrix \
-				siliconmotion \
-				vesa vga XF86OSCardDrivers XF86ExtraCardDrivers
-#else
-#ifdef AlphaArchitecture
-#define XF86CardDrivers         mga tdfx glint s3virge rendition tga \
-				savage nv DevelDrivers siliconmotion vga \
-				XF86OSCardDrivers XF86ExtraCardDrivers
-#endif
-#endif
-#endif
-EOF
-    # Never install something to outside ${X11BASE}!!
-    echo "#define NothingOutsideProjectRoot YES" >> $F
-}
-
-configure
+    echo "#ifndef DebuggableLibraries"		>> $F
+    echo "#define DebuggableLibraries $ret"	>> $F
+    echo "#endif"				>> $F
+fi
+echo "#ifndef InstallXdmConfig"			>> $F
+echo "#define InstallXdmConfig $InstallXdmConfig" >> $F
+echo "#endif"					>> $F
+echo "#ifndef InstallXinitConfig"		>> $F
+echo "#define InstallXinitConfig $InstallXinitConfig" >> $F
+echo "#endif"					>> $F
+echo "#ifndef InstallAppDefFiles"		>> $F
+echo "#define InstallAppDefFiles $InstallAppDefFiles" >> $F
+echo "#endif"					>> $F
+echo "#define HasXdmAuth YES"			>> $F
+echo "#define BuildXF86Setup NO"		>> $F
+echo "#define HasFreetype2 YES"			>> $F
+echo "#define Freetype2Dir ${LOCALBASE}"	>> $F
+echo "#define HasExpat YES"			>> $F
+echo "#define ExpatDir ${LOCALBASE}"		>> $F
+echo "#define HasFontconfig YES"		>> $F
+echo "#define FontconfigDir ${PREFIX}"		>> $F
+echo "#define HasLibpng YES"			>> $F
+echo "#define LibpngDir ${LOCALBASE}"		>> $F
+# Never install something to outside ${X11BASE}
+echo "#define NothingOutsideProjectRoot YES"	>> $F
 
 cat $F >> ${WRKDIR}/xc/config/cf/xf86site.def
 
@@ -156,5 +56,6 @@ echo "#define ProjectRoot ${PREFIX}" > ${WRKDIR}/xc/config/cf/host.def
 
 cd ${WRKDIR}/xc
 touch config/cf/version.def
+touch config/cf/date.def
 make Makefile.boot
 make -f xmakefile SUBDIRS="include config" VerifyOS version.def Makefiles includes