devel/imake-4:
  Maintainer:	anholt@freebsd.org
  Changes: Makefile pkg-plist files/patch-imake::imake.c scripts/configure
  Adds   : files/patch-cf::FreeBSD.cf
  Removes: files/patch-d files/patch-xthreads

--- /usr/ports.ref/devel/imake-4/Makefile	Sun Sep 15 21:23:56 2002
+++ devel/imake-4/Makefile	Sun Sep 15 21:43:35 2002
@@ -54,6 +54,7 @@
 		rman.1 \
 		xmkmf.1
 MANCOMPRESSED=	yes
+XFREE86_HTML_MAN=	yes
 SCRIPTS_ENV+=	OSVERSION=${OSVERSION} \
 		HasSecureRPC=${HasSecureRPC} \
 		HasXdmAuth=${HasXdmAuth} \
@@ -131,6 +132,10 @@
 #             It's a traditional place ;-)
 # InstallXserverSetUID=NO : use Xwrapper.
 # End of XFree86 configrations
+
+pre-patch:
+	@${PERL} -pi -e 's|\#\!/usr/bin/perl|\#\!${PERL}|g ' \
+		${WRKSRC}/util/mkhtmlindex.pl
 
 post-install:
 	@${MKHTMLINDEX} ${PREFIX}/lib/X11/doc/html
--- /usr/ports.ref/devel/imake-4/files/patch-cf::FreeBSD.cf	Thu Jan  1 02:00:00 1970
+++ devel/imake-4/files/patch-cf::FreeBSD.cf	Wed Jul  3 22:00:24 2002
@@ -0,0 +1,33 @@
+--- cf/FreeBSD.cf.orig	Wed Jun 26 15:44:29 2002
++++ cf/FreeBSD.cf	Wed Jun 26 16:21:18 2002
+@@ -91,8 +90,11 @@
+ # else
+ #  define BuildThreadStubLibrary  YES 
+ #  define NeedUIThrStubs          YES 
+-#  define ThreadsCompileFlags	-pthread
+-#  define ThreadsLibraries 	-pthread
++#  if (OSRelVersion >= 500016)
++#   define ThreadsLibraries 	-lc_r
++#  else
++#   define ThreadsLibraries 	-pthread
++#  endif
+ #  define SharedX11Reqs		$(LDPRELIB) $(XTHRSTUBLIB)
+ #  define SharedXtReqs		$(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB) $(XTHRSTUBLIB)
+ # endif
+@@ -371,14 +371,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
--- /usr/ports.ref/devel/imake-4/files/patch-d	Tue Jun 12 16:59:11 2001
+++ devel/imake-4/files/patch-d	Wed Jun 26 22:01:35 2002
@@ -1,19 +0,0 @@
---- cf/FreeBSD.cf.orig	Fri May  4 05:12:35 2001
-+++ cf/FreeBSD.cf	Mon Jun  4 19:31:27 2001
-@@ -444,14 +444,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
--- /usr/ports.ref/devel/imake-4/files/patch-imake::imake.c	Wed May 22 16:29:16 2002
+++ devel/imake-4/files/patch-imake::imake.c	Wed Jul  3 22:07:07 2002
@@ -12,3 +12,23 @@
      "/usr/bin/cc",	/* for Linux PostIncDir */
  #endif
      "/usr/local/bin/gcc",
+@@ -1207,6 +1207,19 @@
+ 	if (uname(&name) < 0)
+ 		LogFatal("Cannot invoke uname", "");
+ 
++# 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	    
+ # ifdef DEFAULT_OS_NAME
+ 	parse_utsname(&name, DEFAULT_OS_NAME, buf, 
+ 		      "Bad DEFAULT_OS_NAME syntax %s");
--- /usr/ports.ref/devel/imake-4/files/patch-xthreads	Tue Jun 12 16:59:11 2001
+++ devel/imake-4/files/patch-xthreads	Wed Jun 26 22:02:08 2002
@@ -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
--- /usr/ports.ref/devel/imake-4/pkg-plist	Thu Apr  4 11:27:05 2002
+++ devel/imake-4/pkg-plist	Wed Jul  3 22:23:02 2002
@@ -115,14 +115,3 @@
 lib/X11/config/xf86.tmpl
 lib/X11/config/xf86site.def
 lib/X11/config/xfree86.cf
-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/mkdirhier.1.html
-lib/X11/doc/html/pswrap.1.html
-lib/X11/doc/html/revpath.1.html
-lib/X11/doc/html/rman.1.html
-lib/X11/doc/html/xmkmf.1.html
--- /usr/ports.ref/devel/imake-4/scripts/configure	Sat Dec 15 04:58:33 2001
+++ devel/imake-4/scripts/configure	Wed Jul  3 22:10:42 2002
@@ -15,7 +15,7 @@
 rm -f $F
 
 echo "/*" >> $F
-echo "/* Followins are generated by FreeBSD imake-4/XFree86-4-* ports system." >> $F
+echo "/* The following are 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