update to 4.1.0.

get rid of version number from comments in Makefile, pkg-comment and pkg-descr.

Reviewed by:	maintainer

7 files changed, 44 insertions, 23 deletions

diff --git a/x11/XFree86-4-clients/Makefile b/x11/XFree86-4-clients/Makefile
index 2dd1840828fc..1d639e89f53c 100644
--- a/x11/XFree86-4-clients/Makefile
+++ b/x11/XFree86-4-clients/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	XFree86-4-clients
+# New ports collection makefile for:	XFree86-clients
 # Date created:		10 Oct 1999
 # Whom:			taguchi@tohoku.iij.ad.jp
 #
@@ -6,17 +6,13 @@
 #
 
 PORTNAME=	clients
-PORTVERSION=	4.0.3
+PORTVERSION=	4.1.0
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XFREE}
-MASTER_SITE_SUBDIR=	4.0.2
+MASTER_SITE_SUBDIR=	4.1.0
 PKGNAMEPREFIX=	XFree86-
-DISTFILES=	X402src-1.tgz X402src-2.tgz
-EXTRACT_ONLY=	X402src-1.tgz
-
-PATCH_SITES=	${MASTER_SITE_XFREE:S,%SUBDIR%/source,4.0.3/patches,g}
-PATCHFILES=	4.0.2-4.0.3.diff.gz
-PATCH_DIST_STRIP=	-p1
+DISTFILES=	X410src-1.tgz X410src-2.tgz
+EXTRACT_ONLY=	X410src-1.tgz
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
 
@@ -66,7 +62,7 @@ pre-fetch:
 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=	X402src-1.tgz
+EXTRACT_ONLY=	X410src-1.tgz
 DISTFILES+=	Wraphelp.c
 IGNOREFILES=	Wraphelp.c
 .endif
@@ -78,7 +74,7 @@ IGNOREFILES=	Wraphelp.c
 post-extract:
 	( cd ${WRKDIR} && \
 	 ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
-	   ${DISTDIR}/${DIST_SUBDIR}/X402src-2.tgz \
+	   ${DISTDIR}/${DIST_SUBDIR}/X410src-2.tgz \
 	    | ${TAR} -xf - xc/fonts/util )
 
 do-configure:
diff --git a/x11/XFree86-4-clients/distinfo b/x11/XFree86-4-clients/distinfo
index f8914f6e46bf..7207b321c4db 100644
--- a/x11/XFree86-4-clients/distinfo
+++ b/x11/XFree86-4-clients/distinfo
@@ -1,4 +1,3 @@
-MD5 (xc/X402src-1.tgz) = d314c311aa4a29d74695b0e39b6d80c4
-MD5 (xc/X402src-2.tgz) = 7dc2f848c7466f6704c8dfc3492628ae
-MD5 (xc/4.0.2-4.0.3.diff.gz) = c8bb56df966dd0a51d2291bca36e0ea4
+MD5 (xc/X410src-1.tgz) = 2d4709f7106a1d65c175be445a3d3c32
+MD5 (xc/X410src-2.tgz) = beaffed1cbdb700e5fed6a5490a7f222
 MD5 (xc/Wraphelp.c) = IGNORE
diff --git a/x11/XFree86-4-clients/files/manpages b/x11/XFree86-4-clients/files/manpages
index 14c113d49973..9074e770806c 100644
--- a/x11/XFree86-4-clients/files/manpages
+++ b/x11/XFree86-4-clients/files/manpages
@@ -7,10 +7,12 @@ MAN1=	Xmark.1 \
 	bmtoa.1 \
 	cxpm.1 \
 	dga.1 \
+	dpsexec.1 \
+	dpsinfo.1 \
 	editres.1 \
-	fsinfo.1 \
 	fslsfonts.1 \
 	fstobdf.1 \
+	glxgears.1 \
 	glxinfo.1 \
 	iceauth.1 \
 	ico.1 \
@@ -31,6 +33,7 @@ MAN1=	Xmark.1 \
 	smproxy.1 \
 	startx.1 \
 	sxpm.1 \
+	texteroids.1 \
 	twm.1 \
 	viewres.1 \
 	x11perf.1 \
@@ -53,6 +56,8 @@ MAN1=	Xmark.1 \
 	xfd.1 \
 	xfindproxy.1 \
 	xfontsel.1 \
+	xfsinfo.1 \
+	xftcache.1 \
 	xfwp.1 \
 	xgamma.1 \
 	xgc.1 \
@@ -71,6 +76,7 @@ MAN1=	Xmark.1 \
 	xmag.1 \
 	xman.1 \
 	xmessage.1 \
+	xmh.1 \
 	xmodmap.1 \
 	xon.1 \
 	xprop.1 \
diff --git a/x11/XFree86-4-clients/pkg-comment b/x11/XFree86-4-clients/pkg-comment
index 98276b17a4c4..7f9288c4e2cf 100644
--- a/x11/XFree86-4-clients/pkg-comment
+++ b/x11/XFree86-4-clients/pkg-comment
@@ -1 +1 @@
-X11R6.4/XFree86-4.0 Client environments
+X11R6.4/XFree86-4 Client environments
diff --git a/x11/XFree86-4-clients/pkg-descr b/x11/XFree86-4-clients/pkg-descr
index 8dbac99e617f..c66c30be1cb5 100644
--- a/x11/XFree86-4-clients/pkg-descr
+++ b/x11/XFree86-4-clients/pkg-descr
@@ -1,4 +1,4 @@
-This package contains XFree86-4.0 Client Environments.
+This package contains XFree86-4 Client Environments.
 xterm, ico, twm, oclock and other client programs are
 included this package. Also library files and resource
 files are included.
diff --git a/x11/XFree86-4-clients/pkg-plist b/x11/XFree86-4-clients/pkg-plist
index bacda37e4438..949019aaa5c9 100644
--- a/x11/XFree86-4-clients/pkg-plist
+++ b/x11/XFree86-4-clients/pkg-plist
@@ -8,10 +8,12 @@ bin/bitmap
 bin/bmtoa
 bin/cxpm
 bin/dga
+bin/dpsexec
+bin/dpsinfo
 bin/editres
-bin/fsinfo
 bin/fslsfonts
 bin/fstobdf
+bin/glxgears
 bin/glxinfo
 bin/iceauth
 bin/ico
@@ -32,6 +34,7 @@ bin/showrgb
 bin/smproxy
 bin/startx
 bin/sxpm
+bin/texteroids
 bin/twm
 bin/ucs2any.pl
 bin/viewres
@@ -55,6 +58,8 @@ bin/xf86cfg
 bin/xfd
 bin/xfindproxy
 bin/xfontsel
+bin/xfsinfo
+bin/xftcache
 bin/xfwp
 bin/xgamma
 bin/xgc
@@ -76,6 +81,7 @@ bin/xlsfonts
 bin/xmag
 bin/xman
 bin/xmessage
+bin/xmh
 bin/xmodmap
 bin/xon
 bin/xprop
@@ -106,6 +112,8 @@ include/X11/bitmaps/RotateRight
 include/X11/bitmaps/Stipple
 include/X11/bitmaps/Term
 include/X11/bitmaps/Up
+include/X11/bitmaps/black6
+include/X11/bitmaps/box6
 include/X11/bitmaps/ldblarrow
 include/X11/bitmaps/rdblarrow
 lib/X11/XErrorDB
@@ -140,9 +148,12 @@ lib/X11/app-defaults/Xgc
 lib/X11/app-defaults/Xmag
 lib/X11/app-defaults/Xman
 lib/X11/app-defaults/Xmessage
+lib/X11/app-defaults/Xmh
 lib/X11/app-defaults/Xvidtune
 lib/X11/doc/html/manindex1.html
 lib/X11/doc/html/manindex3.html
+lib/X11/etc/xterm.termcap
+lib/X11/etc/xterm.terminfo
 lib/X11/fonts/util/map-ISO8859-1
 lib/X11/fonts/util/map-ISO8859-2
 lib/X11/fonts/util/map-ISO8859-3
@@ -255,7 +266,8 @@ lib/X11/xkb/keymap/macintosh
 lib/X11/xkb/keymap/sgi/be
 lib/X11/xkb/keymap/sgi/bg
 lib/X11/xkb/keymap/sgi/ca
-lib/X11/xkb/keymap/sgi/cs
+lib/X11/xkb/keymap/sgi/cz
+lib/X11/xkb/keymap/sgi/cz_qwerty
 lib/X11/xkb/keymap/sgi/de
 lib/X11/xkb/keymap/sgi/de_CH
 lib/X11/xkb/keymap/sgi/dk
@@ -274,6 +286,8 @@ lib/X11/xkb/keymap/sgi/pl
 lib/X11/xkb/keymap/sgi/pt
 lib/X11/xkb/keymap/sgi/ru
 lib/X11/xkb/keymap/sgi/se
+lib/X11/xkb/keymap/sgi/sk
+lib/X11/xkb/keymap/sgi/sk_qwerty
 lib/X11/xkb/keymap/sgi/th
 lib/X11/xkb/keymap/sgi/us
 lib/X11/xkb/keymap/sony
@@ -306,12 +320,12 @@ lib/X11/xkb/symbols/az
 lib/X11/xkb/symbols/be
 lib/X11/xkb/symbols/bg
 lib/X11/xkb/symbols/br
+lib/X11/xkb/symbols/by
 lib/X11/xkb/symbols/ca
 lib/X11/xkb/symbols/ca_enhanced
-lib/X11/xkb/symbols/cs
-lib/X11/xkb/symbols/cs_qwerty
 lib/X11/xkb/symbols/ctrl
-lib/X11/xkb/symbols/czsk
+lib/X11/xkb/symbols/cz
+lib/X11/xkb/symbols/cz_qwerty
 lib/X11/xkb/symbols/de
 lib/X11/xkb/symbols/de_CH
 lib/X11/xkb/symbols/digital/lk
@@ -321,6 +335,7 @@ lib/X11/xkb/symbols/digital/vt
 lib/X11/xkb/symbols/dk
 lib/X11/xkb/symbols/dvorak
 lib/X11/xkb/symbols/ee
+lib/X11/xkb/symbols/el
 lib/X11/xkb/symbols/en_US
 lib/X11/xkb/symbols/es
 lib/X11/xkb/symbols/fi
@@ -329,9 +344,9 @@ lib/X11/xkb/symbols/fr_CH
 lib/X11/xkb/symbols/fujitsu/jp
 lib/X11/xkb/symbols/fujitsu/us
 lib/X11/xkb/symbols/gb
-lib/X11/xkb/symbols/gr
 lib/X11/xkb/symbols/group
 lib/X11/xkb/symbols/hp/us
+lib/X11/xkb/symbols/hr
 lib/X11/xkb/symbols/hu
 lib/X11/xkb/symbols/hu_US
 lib/X11/xkb/symbols/il
@@ -346,6 +361,7 @@ lib/X11/xkb/symbols/lock
 lib/X11/xkb/symbols/lt
 lib/X11/xkb/symbols/lt_p
 lib/X11/xkb/symbols/lt_std
+lib/X11/xkb/symbols/lv
 lib/X11/xkb/symbols/macintosh/de
 lib/X11/xkb/symbols/macintosh/de_CH
 lib/X11/xkb/symbols/macintosh/dk
@@ -372,6 +388,8 @@ lib/X11/xkb/symbols/ru
 lib/X11/xkb/symbols/se
 lib/X11/xkb/symbols/sgi/jp
 lib/X11/xkb/symbols/si
+lib/X11/xkb/symbols/sk
+lib/X11/xkb/symbols/sk_qwerty
 lib/X11/xkb/symbols/sony/us
 lib/X11/xkb/symbols/sr
 lib/X11/xkb/symbols/sun/se
@@ -390,6 +408,7 @@ lib/X11/xkb/types/basic
 lib/X11/xkb/types/cancel
 lib/X11/xkb/types/complete
 lib/X11/xkb/types/default
+lib/X11/xkb/types/extra
 lib/X11/xkb/types/iso9995
 lib/X11/xkb/types/mousekeys
 lib/X11/xkb/types/nocancel
diff --git a/x11/XFree86-4-clients/scripts/configure b/x11/XFree86-4-clients/scripts/configure
index 082d6ae1f6cf..3e9586fbad85 100644
--- a/x11/XFree86-4-clients/scripts/configure
+++ b/x11/XFree86-4-clients/scripts/configure
@@ -101,5 +101,6 @@ configure () {
     cp -f $LOCALDEF $HOSTDEF
 }
 
+cp ${X11BASE}/lib/X11/config/version.def ${WRKSRC}/config/cf
 configure
 exit 0