XFree86 4.2.0 Stage 2: XFree86-4-* miniport upgrades

	[1] Upgrade to 4.2.0.
	[2] Allow Wraphelp.c to be fetched by default, set HasXdmAuth=YES
	    by default.

Submitted by:	[1] sf, taguchi@tohoku.iij.ad.jp
Approved by:	[2] core

5 files changed, 22 insertions, 64 deletions

diff --git a/devel/imake-4/Makefile b/devel/imake-4/Makefile
index 0d5b91e43fe5..cf6366593b33 100644
--- a/devel/imake-4/Makefile
+++ b/devel/imake-4/Makefile
@@ -6,16 +6,23 @@
 #
 
 PORTNAME=	imake
-PORTVERSION=	4.1.0
-PORTREVISION=	2
+PORTVERSION=	4.2.0
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_XFREE}
-MASTER_SITE_SUBDIR=	4.1.0
-DISTFILES=	X410src-1.tgz
+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_SITE_SUBDIR=	${PORTVERSION}
+EXTRACT_ONLY=	X${PORTVERSION:S/.//g}src-1.tgz
+DISTFILES=	X${PORTVERSION:S/.//g}src-1.tgz Wraphelp.c:wrap
+IGNOREFILES=	Wraphelp.c
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
 
 PREFIX?=	${X11BASE}
+
+.include <bsd.port.pre.mk>
+
 DIST_SUBDIR=	xc
 WRKSRC=		${WRKDIR}/xc/config
 MTREE_FILE=	/etc/mtree/BSD.x11-4.dist
@@ -116,26 +123,7 @@ ExtendedInputDevices?=	YES
 # InstallXserverSetUID=NO : use Xwrapper.
 # End of XFree86 configrations
 
-.include <bsd.port.pre.mk>
-
-.if ${HasXdmAuth} == YES
-.if defined(USA_RESIDENT) && ${USA_RESIDENT} == YES
-.if !exists(${DISTDIR}/${DIST_SUBDIR}/Wraphelp.c)
-pre-everything::
-	@${ECHO_MSG} "You don't have Wraphelp.c: HasXdmAuth disabled."
-HasXdmAuth=	NO
-.else
-pre-everything::
-	@${ECHO_MSG} "Assuming that you have fetched a USA-Legal Wraphelp.c."
-.endif	# ! having Wraphelp.c
-.else
-MASTER_SITES+=	ftp://psych.psy.uq.oz.au/pub/X11R5/ \
-		ftp://ftp.internat.freebsd.org/pub/FreeBSD/X11-Crypto/ \
-		ftp://ftp3.za.freebsd.org/pub/FreeBSD/X11-Crypto/
-EXTRACT_ONLY=	X410src-1.tgz
-DISTFILES+=	Wraphelp.c
-IGNOREFILES=	Wraphelp.c
-.endif	# USA_RESIDENT
-.endif	# HasXdmAuth
+post-install:
+	@${MKHTMLINDEX} ${PREFIX}/lib/X11/doc/html
 
 .include <bsd.port.post.mk>
diff --git a/devel/imake-4/distinfo b/devel/imake-4/distinfo
index 942f997451ad..4766fc3aff79 100644
--- a/devel/imake-4/distinfo
+++ b/devel/imake-4/distinfo
@@ -1,2 +1,2 @@
-MD5 (xc/X410src-1.tgz) = 2d4709f7106a1d65c175be445a3d3c32
+MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f
 MD5 (xc/Wraphelp.c) = IGNORE
diff --git a/devel/imake-4/files/patch-h b/devel/imake-4/files/patch-h
index 3d093aaebfa2..ec57f029eeb9 100644
--- a/devel/imake-4/files/patch-h
+++ b/devel/imake-4/files/patch-h
@@ -1,6 +1,6 @@
---- cf/Imake.rules.orig	Fri Apr 27 06:27:48 2001
-+++ cf/Imake.rules	Mon Jun  4 19:56:42 2001
-@@ -1388,7 +1388,7 @@
+--- cf/Imake.rules.orig	Tue Dec 18 05:00:37 2001
++++ cf/Imake.rules	Mon Jan 21 02:34:48 2002
+@@ -1399,7 +1399,7 @@
  dest.suffix.html: file.$(MANNEWSUFFIX) RmanCmdDependency		@@\
  	RemoveFiles(dest.suffix.html dest.suffix-html)			@@\
  	RunProgram(RMAN,$(RMANOPTIONS) < file.$(MANNEWSUFFIX) \		@@\
@@ -9,16 +9,16 @@
  									@@\
  install.man:: dest.suffix.html						@@\
  	MakeDir($(DESTDIR)$(DOCHTMLDIR))				@@\
-@@ -1624,7 +1624,7 @@
+@@ -1644,7 +1644,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`; \		@@\
+ 		sed -e 's:^/::' -e 's:[^/.][^/]*:..:'g -e 's:/\.$$::'`; \ @@\
  	  cd Concat($(DESTDIR),opath/cdir); \				@@\
  	  if [ -d rdir -a ! -h rdir ]; then \ 				@@\
-@@ -1671,7 +1671,7 @@
+@@ -1691,7 +1691,7 @@
  	MakeDir(Concat($(DESTDIR),npath))				@@\
  	@MakeFlagsToShellFlags(i,set +e); \				@@\
  	if [ -d Concat($(DESTDIR),opath) ]; then \			@@\
diff --git a/devel/imake-4/files/patch-t01 b/devel/imake-4/files/patch-t01
deleted file mode 100644
index ce994b4f2ce5..000000000000
--- a/devel/imake-4/files/patch-t01
+++ /dev/null
@@ -1,31 +0,0 @@
---- imake/imake.c.ORIG	Mon Dec 18 14:54:34 2000
-+++ imake/imake.c	Mon Dec 18 14:55:25 2000
-@@ -399,7 +399,7 @@
- int
- main(int argc, char *argv[])
- {
--	FILE	*tmpfd;
-+	FILE	*tmpfd = (FILE *)NULL;
- 	char	makeMacro[ BUFSIZ ];
- 	char	makefileMacro[ BUFSIZ ];
- 
-@@ -1208,6 +1208,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");
diff --git a/devel/imake-4/pkg-plist b/devel/imake-4/pkg-plist
index aafcc5dfda8a..89d6ba8ace3c 100644
--- a/devel/imake-4/pkg-plist
+++ b/devel/imake-4/pkg-plist
@@ -120,6 +120,7 @@ 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