Update to 4.0.1. Remove libraries from -clients. Try to extract

only what each port needs.  Other miscellaneous bug fixes.

Submitted by:	maintainer

6 files changed, 48 insertions, 35 deletions

diff --git a/devel/imake-4/Makefile b/devel/imake-4/Makefile
index 62e1fd749da4..8e1b38829194 100644
--- a/devel/imake-4/Makefile
+++ b/devel/imake-4/Makefile
@@ -6,26 +6,39 @@
 #
 
 PORTNAME= 	imake
-PORTVERSION= 	4.0
+PORTVERSION= 	4.0.1
 CATEGORIES=	devel
-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
+MASTER_SITES=	ftp://ftp.xfree86.org/pub/XFree86/${PORTVERSION}/source/ \
+		ftp://ftp.freesoftware.com/pub/XFree86/${PORTVERSION}/source/ \
+		ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-${PORTVERSION}/source/ \
+		ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/${PORTVERSION}/source/ \
+		ftp://sunsite.doc.ic.ac.uk/packages/XFree86/${PORTVERSION}/source/
+DISTFILES=	X401src-1.tgz
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
 
-MANUAL_PACKAGE_BUILD=	installs/removes files also in the XFree86 port
+#MANUAL_PACKAGE_BUILD=	installs/removes files also in the XFree86 port
 
 PREFIX?=	${X11BASE}
 DIST_SUBDIR=	xc
 WRKSRC=		${WRKDIR}/xc/config
-MTREE_FILE=	/etc/mtree/BSD.x11.dist
+MTREE_FILE=	/etc/mtree/BSD.x11-4.dist
+EXTRACT_AFTER_ARGS=	| ${TAR} -xf - xc/Imakefile \
+			xc/Makefile \
+			xc/config \
+			xc/include \
+			xc/extras
 .if !defined(NO_INSTALL_MANPAGES)
-MAN1=		imake.1 lndir.1 makedepend.1 makeg.1 makestrs.1 \
-		mkdirhier.1 pswrap.1 revpath.1 xmkmf.1
+MAN1=		imake.1 \
+		lndir.1 \
+		makedepend.1 \
+		makeg.1 \
+		makestrs.1 \
+		mkdirhier.1 \
+		pswrap.1 \
+		revpath.1 \
+		rman.1 \
+		xmkmf.1
 MANCOMPRESSED=	yes
 INSTALL_TARGET=	install install.man
 .else
diff --git a/devel/imake-4/distinfo b/devel/imake-4/distinfo
index 32a647072af5..e9125a5f32c4 100644
--- a/devel/imake-4/distinfo
+++ b/devel/imake-4/distinfo
@@ -1 +1 @@
-MD5 (xc/X400src-1.tgz) = a93f407ee0dd7ed806a97370c2ae637d
+MD5 (xc/X401src-1.tgz) = b2ad4a077ac7c09d85e6a0fc0728a536
diff --git a/devel/imake-4/files/patch-c b/devel/imake-4/files/patch-c
index e11377023f74..7c9208e18a55 100644
--- a/devel/imake-4/files/patch-c
+++ b/devel/imake-4/files/patch-c
@@ -1,6 +1,6 @@
---- cf/Imake.tmpl~	Tue Feb 22 02:42:26 2000
-+++ cf/Imake.tmpl	Tue Feb 22 03:11:21 2000
-@@ -1282,7 +1282,7 @@
+--- cf/Imake.tmpl.orig	Tue Jun 27 09:55:44 2000
++++ cf/Imake.tmpl	Sun Jul 16 18:19:54 2000
+@@ -1385,7 +1385,7 @@
         CXXOPTIONS = CplusplusOptions
        CXXINCLUDES = $(INCLUDES) $(TOP_INCLUDES) $(CXXEXTRA_INCLUDES) 
         CXXDEFINES = $(CXXINCLUDES) $(CXXSTD_DEFINES) $(THREADS_CXXDEFINES) $(CXXEXTRA_DEFINES) $(DEFINES)
@@ -9,7 +9,7 @@
  #endif
           COMPRESS = CompressCmd
            GZIPCMD = GzipCmd
-@@ -1469,7 +1469,7 @@
+@@ -1574,7 +1574,7 @@
   */
        ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(STD_INCLUDES)
         ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(EXTRA_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES)
diff --git a/devel/imake-4/files/patch-d b/devel/imake-4/files/patch-d
index 3cbdc25d510c..cd1d11320f68 100644
--- a/devel/imake-4/files/patch-d
+++ b/devel/imake-4/files/patch-d
@@ -1,6 +1,6 @@
---- 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 @@
+--- cf/FreeBSD.cf.orig	Sun Jun 25 03:15:53 2000
++++ cf/FreeBSD.cf	Sun Jul 16 18:22:14 2000
+@@ -356,14 +356,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)
@@ -17,14 +17,3 @@
  #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
index c3f02dccd53b..5402148c0b11 100644
--- a/devel/imake-4/files/patch-h
+++ b/devel/imake-4/files/patch-h
@@ -1,6 +1,6 @@
---- 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 @@
+--- cf/Imake.rules.orig	Sun Jun 18 03:39:14 2000
++++ cf/Imake.rules	Sun Jul 16 18:47:58 2000
+@@ -1533,7 +1533,7 @@
  	MakeDir(Concat($(DESTDIR),npath/mdir))				@@\
  	@MakeFlagsToShellFlags(i,set +e); \				@@\
  	if [ -d Concat($(DESTDIR),opath/cdir) ]; then \			@@\
@@ -9,7 +9,7 @@
  		sed -e 's:^.::' -e 's:[^/.][^/]*:..:'g`; \		@@\
  	  cd Concat($(DESTDIR),opath/cdir); \				@@\
  	  if [ -d rdir -a ! -h rdir ]; then \ 				@@\
-@@ -1484,7 +1484,7 @@
+@@ -1580,7 +1580,7 @@
  	MakeDir(Concat($(DESTDIR),npath))				@@\
  	@MakeFlagsToShellFlags(i,set +e); \				@@\
  	if [ -d Concat($(DESTDIR),opath) ]; then \			@@\
@@ -18,4 +18,3 @@
  		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 ce92b57e2de1..7dfb6d74bd8d 100644
--- a/devel/imake-4/pkg-plist
+++ b/devel/imake-4/pkg-plist
@@ -6,8 +6,10 @@ 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
@@ -106,3 +108,13 @@ lib/X11/config/xf86.rules
 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/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