4 files changed, 18 insertions, 20 deletions

diff --git a/x11/XFree86-4-documents/Makefile b/x11/XFree86-4-documents/Makefile
index 86a60191804c..86667fce008a 100644
--- a/x11/XFree86-4-documents/Makefile
+++ b/x11/XFree86-4-documents/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	documents
-PORTVERSION=	4.1.0
+PORTVERSION=	4.2.0
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XFREE}
-MASTER_SITE_SUBDIR=	4.1.0
+MASTER_SITE_SUBDIR=	${PORTVERSION}
 PKGNAMEPREFIX=	XFree86-
-DISTFILES=	X410src-1.tgz X410src-2.tgz X410src-3.tgz
-EXTRACT_ONLY=	X410src-2.tgz X410src-3.tgz
+DISTFILES=	X${PORTVERSION:S/.//g}src-1.tgz X${PORTVERSION:S/.//g}src-2.tgz X${PORTVERSION:S/.//g}src-3.tgz
+EXTRACT_ONLY=	X${PORTVERSION:S/.//g}src-2.tgz X${PORTVERSION:S/.//g}src-3.tgz
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
 
@@ -27,7 +27,7 @@ INSTALL_TARGET=		install install.man
 post-extract:
 	(cd ${WRKDIR} && \
 	 ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
-		${DISTDIR}/${DIST_SUBDIR}/X410src-1.tgz \
+		${DISTDIR}/${DIST_SUBDIR}/X${PORTVERSION:S/.//g}src-1.tgz \
 		${EXTRACT_AFTER_ARGS} xc/doc)
 
 do-configure:
diff --git a/x11/XFree86-4-documents/distinfo b/x11/XFree86-4-documents/distinfo
index 5baf520e703d..d7c5b11ece6f 100644
--- a/x11/XFree86-4-documents/distinfo
+++ b/x11/XFree86-4-documents/distinfo
@@ -1,3 +1,3 @@
-MD5 (xc/X410src-1.tgz) = 2d4709f7106a1d65c175be445a3d3c32
-MD5 (xc/X410src-2.tgz) = beaffed1cbdb700e5fed6a5490a7f222
-MD5 (xc/X410src-3.tgz) = f94e42cd5c5e31a702ec64bfdc017a7d
+MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f
+MD5 (xc/X420src-2.tgz) = dae33268a9f2735b9678a81fb23e8d3e
+MD5 (xc/X420src-3.tgz) = 560899e175a02ab592185b69756f539e
diff --git a/x11/XFree86-4-documents/files/patch-04 b/x11/XFree86-4-documents/files/patch-04
index 503766c8ccbf..1617019619d0 100644
--- a/x11/XFree86-4-documents/files/patch-04
+++ b/x11/XFree86-4-documents/files/patch-04
@@ -1,12 +1,9 @@
---- specs/Imakefile.orig	Sat Dec 16 15:39:49 2000
-+++ specs/Imakefile	Wed Dec 20 17:51:49 2000
-@@ -7,9 +7,9 @@
- #if defined(SpecsDocDirs) && !BuildAllSpecsDocs
- SUBDIRS = SpecsDocDirs
+--- specs/Imakefile.orig	Thu Jan 17 03:36:00 2002
++++ specs/Imakefile	Mon Jan 21 03:13:38 2002
+@@ -13,7 +13,7 @@
  #else
--SUBDIRS = BDF CTEXT FSProtocol GL ICCCM ICE PEX5 PM Render SM X11 XDMCP \
-+SUBDIRS = BDF CTEXT FSProtocol GL ICCCM ICE PM Render SM X11 XDMCP \
- 	  XIM XLFD XProtocol Xaw Xext Xi Xmu Xserver Xt Xv \
+ SUBDIRS = BDF CTEXT FSProtocol GL ICCCM ICE /*PEX5*/ PM Render SM X11 XDMCP \
+ 	  XIM XLFD XProtocol Xaw Xext Xi Xmu Xserver Xt Xv XvMC \
 -          i18n programs rstart xfs xterm xtrans
 +          i18n rstart xfs xterm xtrans
  #endif
diff --git a/x11/XFree86-4-documents/pkg-plist b/x11/XFree86-4-documents/pkg-plist
index d301717da810..049e2b85662a 100644
--- a/x11/XFree86-4-documents/pkg-plist
+++ b/x11/XFree86-4-documents/pkg-plist
@@ -1,15 +1,15 @@
 lib/X11/doc/DPMS.TXT
 lib/X11/doc/DPMSLib.TXT
 lib/X11/doc/ICElib.TXT
-lib/X11/doc/INSTALL.TXT
+lib/X11/doc/INSTALL-X.org.TXT
 lib/X11/doc/LocaleDB.TXT
 lib/X11/doc/PM_spec.TXT
 lib/X11/doc/PostScript/DPMS.PS
 lib/X11/doc/PostScript/DPMSLib.PS
 lib/X11/doc/PostScript/ICElib.PS
-lib/X11/doc/PostScript/INSTALL.PS
+lib/X11/doc/PostScript/INSTALL-X.org.PS
 lib/X11/doc/PostScript/LocaleDB.PS
-lib/X11/doc/PostScript/RELNOTES.PS
+lib/X11/doc/PostScript/RELNOTES-X.org.PS
 lib/X11/doc/PostScript/SMlib.PS
 lib/X11/doc/PostScript/XIMTransport.PS
 lib/X11/doc/PostScript/XiLib.PS
@@ -49,13 +49,14 @@ lib/X11/doc/PostScript/xmu.PS
 lib/X11/doc/PostScript/xsmp.PS
 lib/X11/doc/PostScript/xtest.PS
 lib/X11/doc/PostScript/xtestlib.PS
-lib/X11/doc/RELNOTES.TXT
+lib/X11/doc/RELNOTES-X.org.TXT
 lib/X11/doc/SMlib.TXT
 lib/X11/doc/XIMTransport.TXT
 lib/X11/doc/XiLib.TXT
 lib/X11/doc/XiPorting.TXT
 lib/X11/doc/XiProtocol.TXT
 lib/X11/doc/Xtrans.TXT
+lib/X11/doc/XvMC_API.TXT
 lib/X11/doc/appgroup.TXT
 lib/X11/doc/bdf.TXT
 lib/X11/doc/bigreq.TXT