Index: devel/imake-4/distinfo =================================================================== --- devel/imake-4/distinfo (.../vendor/ports) (revision 277) +++ devel/imake-4/distinfo (.../xfree-exp) (revision 277) @@ -1,6 +1,6 @@ -MD5 (xc/XFree86-4.5.0-src-1.tgz) = 6c0fcf8069c13d068276016bbf6ad712 -SHA256 (xc/XFree86-4.5.0-src-1.tgz) = 0e9fb93a0db5f7f4f78e951d559fae36a0fb0e24683a9918dff7ffee766e0aae -SIZE (xc/XFree86-4.5.0-src-1.tgz) = 10507331 -MD5 (xc/XFree86-4.5.0-src-3.tgz) = c0ad630bfec4545857c2877b3e2dcbeb -SHA256 (xc/XFree86-4.5.0-src-3.tgz) = 2719f8055955dce293f2a8a846514d3908fa05b9d053c59b4fe1e09470a054df -SIZE (xc/XFree86-4.5.0-src-3.tgz) = 12086763 +MD5 (xc/XFree86-4.6.0-src-1.tgz) = 6c05f3486f088d01584f4517540e8d18 +SHA256 (xc/XFree86-4.6.0-src-1.tgz) = c724603239ccb446d524613e5dbfb690b6260a2648ffa8e6643ae770a9ac9a54 +SIZE (xc/XFree86-4.6.0-src-1.tgz) = 10448753 +MD5 (xc/XFree86-4.6.0-src-3.tgz) = 05450997f1876098d791a4cf9db21af8 +SHA256 (xc/XFree86-4.6.0-src-3.tgz) = 95c754a0b124792f1ac6f2c18eaf2cf4fe394e52c3b9a82234fe2436fdc92dc2 +SIZE (xc/XFree86-4.6.0-src-3.tgz) = 12542143 Index: devel/imake-4/files/patch-Imakefile =================================================================== --- devel/imake-4/files/patch-Imakefile (.../vendor/ports) (revision 277) +++ devel/imake-4/files/patch-Imakefile (.../xfree-exp) (revision 277) @@ -1,10 +1,10 @@ ---- ../Imakefile Wed Mar 24 19:16:46 2004 -+++ ../Imakefile Wed Mar 24 19:17:07 2004 -@@ -30,8 +30,7 @@ +--- ../Imakefile.orig Wed May 10 15:23:36 2006 ++++ ../Imakefile Wed May 10 15:23:59 2006 +@@ -27,8 +27,7 @@ + MEMLEAKDIR = util/memleak #endif - #endif -- SUBDIRS = include config lib $(NLSSUBDIR) \ +- SUBDIRS = include config lib $(NLSSUBDIR) $(MEMLEAKDIR) \ - programs $(FONTSDIR) $(DOCSDIR) + SUBDIRS = include config LNINSTALLDIRS = lib Index: devel/imake-4/scripts/configure =================================================================== --- devel/imake-4/scripts/configure (.../vendor/ports) (revision 277) +++ devel/imake-4/scripts/configure (.../xfree-exp) (revision 277) @@ -60,4 +60,5 @@ touch config/cf/version.def touch config/cf/date.def env MAKEFLAGS="CC=${CC}" make Makefile.boot -env MAKEFLAGS="CC=${CC}" make -f xmakefile VerifyOS version.def Makefiles includes +env MAKEFLAGS="CC=${CC}" make -f xmakefile VerifyOS version.def Makefiles +cd ${WRKDIR}/xc/include && make includes Index: devel/imake-4/Makefile =================================================================== --- devel/imake-4/Makefile (.../vendor/ports) (revision 277) +++ devel/imake-4/Makefile (.../xfree-exp) (revision 277) @@ -6,12 +6,13 @@ # PORTNAME= imake -PORTVERSION= 4.5.0 +PORTVERSION= 4.6.0 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_XFREE} MASTER_SITE_SUBDIR= ${PORTVERSION} DISTFILES= XFree86-${PORTVERSION}-src-1.tgz \ XFree86-${PORTVERSION}-src-3.tgz +EXTRACT_ONLY= XFree86-${PORTVERSION}-src-1.tgz MAINTAINER= x11@FreeBSD.org COMMENT= Imake and other utilities from XFree86 @@ -71,6 +72,13 @@ InstallXinitConfig?= YES InstallAppDefFiles?= YES +post-extract: + (cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \ + ${DISTDIR}/${DIST_SUBDIR}/XFree86-${PORTVERSION}-src-3.tgz \ + ${EXTRACT_AFTER_ARGS} \ + xc/programs/Xserver/hw/xfree86/xf86Version.h \ + xc/programs/Xserver/hw/xfree86/xf86Date.h) + pre-configure: @${REINPLACE_CMD} -e 's|%%PTHREAD_CFLAGS%%|${PTHREAD_CFLAGS}|g ; \ s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g' \ Index: graphics/xfree86-dri/distinfo =================================================================== --- graphics/xfree86-dri/distinfo (.../vendor/ports) (revision 277) +++ graphics/xfree86-dri/distinfo (.../xfree-exp) (revision 277) @@ -1,9 +1,9 @@ -MD5 (xc/XFree86-4.5.0-src-1.tgz) = 6c0fcf8069c13d068276016bbf6ad712 -SHA256 (xc/XFree86-4.5.0-src-1.tgz) = 0e9fb93a0db5f7f4f78e951d559fae36a0fb0e24683a9918dff7ffee766e0aae -SIZE (xc/XFree86-4.5.0-src-1.tgz) = 10507331 -MD5 (xc/XFree86-4.5.0-src-2.tgz) = cc296c71cbe58edc3ffdec1084e58f4c -SHA256 (xc/XFree86-4.5.0-src-2.tgz) = a50120da18c6caeb151094fa2ab7afc618821c72d3cedf6842f3636880839a09 -SIZE (xc/XFree86-4.5.0-src-2.tgz) = 5826556 -MD5 (xc/XFree86-4.5.0-src-3.tgz) = c0ad630bfec4545857c2877b3e2dcbeb -SHA256 (xc/XFree86-4.5.0-src-3.tgz) = 2719f8055955dce293f2a8a846514d3908fa05b9d053c59b4fe1e09470a054df -SIZE (xc/XFree86-4.5.0-src-3.tgz) = 12086763 +MD5 (xc/XFree86-4.6.0-src-1.tgz) = 6c05f3486f088d01584f4517540e8d18 +SHA256 (xc/XFree86-4.6.0-src-1.tgz) = c724603239ccb446d524613e5dbfb690b6260a2648ffa8e6643ae770a9ac9a54 +SIZE (xc/XFree86-4.6.0-src-1.tgz) = 10448753 +MD5 (xc/XFree86-4.6.0-src-2.tgz) = f084d12aa734c9cd83e8d2a3a4eb3e32 +SHA256 (xc/XFree86-4.6.0-src-2.tgz) = e6cf843da16bd4b696e92038a67ea51a4c0e42b58b0bd84314fc61440aeb5d4f +SIZE (xc/XFree86-4.6.0-src-2.tgz) = 5878680 +MD5 (xc/XFree86-4.6.0-src-3.tgz) = 05450997f1876098d791a4cf9db21af8 +SHA256 (xc/XFree86-4.6.0-src-3.tgz) = 95c754a0b124792f1ac6f2c18eaf2cf4fe394e52c3b9a82234fe2436fdc92dc2 +SIZE (xc/XFree86-4.6.0-src-3.tgz) = 12542143 Index: graphics/xfree86-dri/Makefile =================================================================== --- graphics/xfree86-dri/Makefile (.../vendor/ports) (revision 277) +++ graphics/xfree86-dri/Makefile (.../xfree-exp) (revision 277) @@ -6,7 +6,7 @@ # PORTNAME= xfree86-dri -PORTVERSION= 4.5.0 +PORTVERSION= 4.6.0 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_XFREE} MASTER_SITE_SUBDIR= ${PORTVERSION} Index: x11-fonts/XFree86-4-fontDefaultBitmaps/distinfo =================================================================== --- x11-fonts/XFree86-4-fontDefaultBitmaps/distinfo (.../vendor/ports) (revision 277) +++ x11-fonts/XFree86-4-fontDefaultBitmaps/distinfo (.../xfree-exp) (revision 277) @@ -1,6 +1,6 @@ -MD5 (xc/XFree86-4.5.0-src-1.tgz) = 6c0fcf8069c13d068276016bbf6ad712 -SHA256 (xc/XFree86-4.5.0-src-1.tgz) = 0e9fb93a0db5f7f4f78e951d559fae36a0fb0e24683a9918dff7ffee766e0aae -SIZE (xc/XFree86-4.5.0-src-1.tgz) = 10507331 -MD5 (xc/XFree86-4.5.0-src-4.tgz) = 217bb03a07cf94561b35815ce257c159 -SHA256 (xc/XFree86-4.5.0-src-4.tgz) = 1c9d8aaf7a924b51c759190b3ffb780179936b53866e8bd529f92bf0aab39c8f -SIZE (xc/XFree86-4.5.0-src-4.tgz) = 12328580 +MD5 (xc/XFree86-4.6.0-src-1.tgz) = 6c05f3486f088d01584f4517540e8d18 +SHA256 (xc/XFree86-4.6.0-src-1.tgz) = c724603239ccb446d524613e5dbfb690b6260a2648ffa8e6643ae770a9ac9a54 +SIZE (xc/XFree86-4.6.0-src-1.tgz) = 10448753 +MD5 (xc/XFree86-4.6.0-src-4.tgz) = 102ed22d33bd31a5853cb5addb51d7c9 +SHA256 (xc/XFree86-4.6.0-src-4.tgz) = 90063bf72386ed9feb057a6fbf4e3cbc114829a50b465843504e4711f104d829 +SIZE (xc/XFree86-4.6.0-src-4.tgz) = 12344051 Index: x11-fonts/XFree86-4-fontDefaultBitmaps/Makefile =================================================================== --- x11-fonts/XFree86-4-fontDefaultBitmaps/Makefile (.../vendor/ports) (revision 277) +++ x11-fonts/XFree86-4-fontDefaultBitmaps/Makefile (.../xfree-exp) (revision 277) @@ -6,8 +6,7 @@ # PORTNAME= fontDefaultBitmaps -PORTVERSION= 4.5.0 -PORTREVISION= 1 +PORTVERSION= 4.6.0 CATEGORIES= x11-fonts MASTER_SITES= ${MASTER_SITE_XFREE} MASTER_SITE_SUBDIR= ${PORTVERSION} Index: x11-fonts/XFree86-4-fontScalable/distinfo =================================================================== --- x11-fonts/XFree86-4-fontScalable/distinfo (.../vendor/ports) (revision 277) +++ x11-fonts/XFree86-4-fontScalable/distinfo (.../xfree-exp) (revision 277) @@ -1,6 +1,6 @@ -MD5 (xc/XFree86-4.5.0-src-4.tgz) = 217bb03a07cf94561b35815ce257c159 -SHA256 (xc/XFree86-4.5.0-src-4.tgz) = 1c9d8aaf7a924b51c759190b3ffb780179936b53866e8bd529f92bf0aab39c8f -SIZE (xc/XFree86-4.5.0-src-4.tgz) = 12328580 -MD5 (xc/XFree86-4.5.0-src-5.tgz) = 598ce329eb06b8189f92704a5698253c -SHA256 (xc/XFree86-4.5.0-src-5.tgz) = 2752688c8cb2be2f549aa9a4cbf03c8a2237ba91256a7d03f962a2d437a63734 -SIZE (xc/XFree86-4.5.0-src-5.tgz) = 4386592 +MD5 (xc/XFree86-4.6.0-src-4.tgz) = 102ed22d33bd31a5853cb5addb51d7c9 +SHA256 (xc/XFree86-4.6.0-src-4.tgz) = 90063bf72386ed9feb057a6fbf4e3cbc114829a50b465843504e4711f104d829 +SIZE (xc/XFree86-4.6.0-src-4.tgz) = 12344051 +MD5 (xc/XFree86-4.6.0-src-5.tgz) = f66708c7ff882e4ca232896266fbf92f +SHA256 (xc/XFree86-4.6.0-src-5.tgz) = dd35b2e75a802eba4c0287221cd7b6f82792f24250eb8cc924c2e877b73694c0 +SIZE (xc/XFree86-4.6.0-src-5.tgz) = 4386400 Index: x11-fonts/XFree86-4-fontScalable/files/patch-scaled::TTF::Imakefile =================================================================== --- x11-fonts/XFree86-4-fontScalable/files/patch-scaled::TTF::Imakefile (.../vendor/ports) (revision 277) +++ x11-fonts/XFree86-4-fontScalable/files/patch-scaled::TTF::Imakefile (.../xfree-exp) (revision 277) @@ -1,18 +1,18 @@ ---- scaled/TTF/Imakefile.orig Tue Apr 20 08:55:17 2004 -+++ scaled/TTF/Imakefile Tue Apr 20 08:56:04 2004 +--- scaled/TTF/Imakefile.orig Sat Mar 25 01:45:51 2006 ++++ scaled/TTF/Imakefile Sat Mar 25 01:46:23 2006 @@ -8,7 +8,7 @@ - VERAFONTS = Vera.ttf VeraBI.ttf VeraBd.ttf VeraMoBI.ttf VeraMoBd.ttf \ - VeraMoIt.ttf VeraMono.ttf VeraSe.ttf VeraSeBd.ttf + VERAFONTS = Vera.ttf VeraBI.ttf VeraBd.ttf VeraIt.ttf VeraMoBI.ttf \ + VeraMoBd.ttf VeraMoIt.ttf VeraMono.ttf VeraSe.ttf VeraSeBd.ttf -FONTS = $(LUXIFONTS) $(VERAFONTS) +FONTS = $(LUXIFONTS) OBJS = $(FONTS) FONTINSTDIR = $(FONTDIR)/TTF -@@ -30,15 +30,4 @@ - MakeSubdirs($(SUBDIRS)) - DependSubdirs($(SUBDIRS)) - #endif +@@ -21,15 +21,4 @@ + InstallFonts($(FONTINSTDIR)) + InstallEncodingsDir($(ENCODINGSSRC),$(FONTINSTDIR)) + InstallFcCache($(FONTINSTDIR)) - -LinkSourceFile(Vera.ttf,$(VERASRCDIR)) -LinkSourceFile(VeraBI.ttf,$(VERASRCDIR)) Index: x11-fonts/XFree86-4-fontScalable/Makefile =================================================================== --- x11-fonts/XFree86-4-fontScalable/Makefile (.../vendor/ports) (revision 277) +++ x11-fonts/XFree86-4-fontScalable/Makefile (.../xfree-exp) (revision 277) @@ -6,8 +6,7 @@ # PORTNAME= fontScalable -PORTVERSION= 4.5.0 -PORTREVISION= 1 +PORTVERSION= 4.6.0 CATEGORIES= x11-fonts MASTER_SITES= ${MASTER_SITE_XFREE} MASTER_SITE_SUBDIR= ${PORTVERSION} Index: x11-fonts/XFree86-4-font75dpi/distinfo =================================================================== --- x11-fonts/XFree86-4-font75dpi/distinfo (.../vendor/ports) (revision 277) +++ x11-fonts/XFree86-4-font75dpi/distinfo (.../xfree-exp) (revision 277) @@ -1,3 +1,3 @@ -MD5 (xc/XFree86-4.5.0-src-4.tgz) = 217bb03a07cf94561b35815ce257c159 -SHA256 (xc/XFree86-4.5.0-src-4.tgz) = 1c9d8aaf7a924b51c759190b3ffb780179936b53866e8bd529f92bf0aab39c8f -SIZE (xc/XFree86-4.5.0-src-4.tgz) = 12328580 +MD5 (xc/XFree86-4.6.0-src-4.tgz) = 102ed22d33bd31a5853cb5addb51d7c9 +SHA256 (xc/XFree86-4.6.0-src-4.tgz) = 90063bf72386ed9feb057a6fbf4e3cbc114829a50b465843504e4711f104d829 +SIZE (xc/XFree86-4.6.0-src-4.tgz) = 12344051 Index: x11-fonts/XFree86-4-font75dpi/Makefile =================================================================== --- x11-fonts/XFree86-4-font75dpi/Makefile (.../vendor/ports) (revision 277) +++ x11-fonts/XFree86-4-font75dpi/Makefile (.../xfree-exp) (revision 277) @@ -6,8 +6,7 @@ # PORTNAME= font75dpi -PORTVERSION= 4.5.0 -PORTREVISION= 1 +PORTVERSION= 4.6.0 CATEGORIES= x11-fonts MASTER_SITES= ${MASTER_SITE_XFREE} MASTER_SITE_SUBDIR= ${PORTVERSION} Index: x11-fonts/XFree86-4-fontEncodings/distinfo =================================================================== --- x11-fonts/XFree86-4-fontEncodings/distinfo (.../vendor/ports) (revision 277) +++ x11-fonts/XFree86-4-fontEncodings/distinfo (.../xfree-exp) (revision 277) @@ -1,3 +1,3 @@ -MD5 (xc/XFree86-4.5.0-src-4.tgz) = 217bb03a07cf94561b35815ce257c159 -SHA256 (xc/XFree86-4.5.0-src-4.tgz) = 1c9d8aaf7a924b51c759190b3ffb780179936b53866e8bd529f92bf0aab39c8f -SIZE (xc/XFree86-4.5.0-src-4.tgz) = 12328580 +MD5 (xc/XFree86-4.6.0-src-4.tgz) = 102ed22d33bd31a5853cb5addb51d7c9 +SHA256 (xc/XFree86-4.6.0-src-4.tgz) = 90063bf72386ed9feb057a6fbf4e3cbc114829a50b465843504e4711f104d829 +SIZE (xc/XFree86-4.6.0-src-4.tgz) = 12344051 Index: x11-fonts/XFree86-4-fontEncodings/Makefile =================================================================== --- x11-fonts/XFree86-4-fontEncodings/Makefile (.../vendor/ports) (revision 277) +++ x11-fonts/XFree86-4-fontEncodings/Makefile (.../xfree-exp) (revision 277) @@ -6,8 +6,7 @@ # PORTNAME= fontEncodings -PORTVERSION= 4.5.0 -PORTREVISION= 1 +PORTVERSION= 4.6.0 CATEGORIES= x11-fonts MASTER_SITES= ${MASTER_SITE_XFREE} MASTER_SITE_SUBDIR= ${PORTVERSION} Index: x11-fonts/XFree86-4-fontCyrillic/distinfo =================================================================== --- x11-fonts/XFree86-4-fontCyrillic/distinfo (.../vendor/ports) (revision 277) +++ x11-fonts/XFree86-4-fontCyrillic/distinfo (.../xfree-exp) (revision 277) @@ -1,3 +1,3 @@ -MD5 (xc/XFree86-4.5.0-src-4.tgz) = 217bb03a07cf94561b35815ce257c159 -SHA256 (xc/XFree86-4.5.0-src-4.tgz) = 1c9d8aaf7a924b51c759190b3ffb780179936b53866e8bd529f92bf0aab39c8f -SIZE (xc/XFree86-4.5.0-src-4.tgz) = 12328580 +MD5 (xc/XFree86-4.6.0-src-4.tgz) = 102ed22d33bd31a5853cb5addb51d7c9 +SHA256 (xc/XFree86-4.6.0-src-4.tgz) = 90063bf72386ed9feb057a6fbf4e3cbc114829a50b465843504e4711f104d829 +SIZE (xc/XFree86-4.6.0-src-4.tgz) = 12344051 Index: x11-fonts/XFree86-4-fontCyrillic/Makefile =================================================================== --- x11-fonts/XFree86-4-fontCyrillic/Makefile (.../vendor/ports) (revision 277) +++ x11-fonts/XFree86-4-fontCyrillic/Makefile (.../xfree-exp) (revision 277) @@ -6,8 +6,7 @@ # PORTNAME= fontCyrillic -PORTVERSION= 4.5.0 -PORTREVISION= 1 +PORTVERSION= 4.6.0 CATEGORIES= x11-fonts MASTER_SITES= ${MASTER_SITE_XFREE} MASTER_SITE_SUBDIR= ${PORTVERSION} Index: x11-fonts/XFree86-4-font100dpi/distinfo =================================================================== --- x11-fonts/XFree86-4-font100dpi/distinfo (.../vendor/ports) (revision 277) +++ x11-fonts/XFree86-4-font100dpi/distinfo (.../xfree-exp) (revision 277) @@ -1,3 +1,3 @@ -MD5 (xc/XFree86-4.5.0-src-4.tgz) = 217bb03a07cf94561b35815ce257c159 -SHA256 (xc/XFree86-4.5.0-src-4.tgz) = 1c9d8aaf7a924b51c759190b3ffb780179936b53866e8bd529f92bf0aab39c8f -SIZE (xc/XFree86-4.5.0-src-4.tgz) = 12328580 +MD5 (xc/XFree86-4.6.0-src-4.tgz) = 102ed22d33bd31a5853cb5addb51d7c9 +SHA256 (xc/XFree86-4.6.0-src-4.tgz) = 90063bf72386ed9feb057a6fbf4e3cbc114829a50b465843504e4711f104d829 +SIZE (xc/XFree86-4.6.0-src-4.tgz) = 12344051 Index: x11-fonts/XFree86-4-font100dpi/Makefile =================================================================== --- x11-fonts/XFree86-4-font100dpi/Makefile (.../vendor/ports) (revision 277) +++ x11-fonts/XFree86-4-font100dpi/Makefile (.../xfree-exp) (revision 277) @@ -6,8 +6,7 @@ # PORTNAME= font100dpi -PORTVERSION= 4.5.0 -PORTREVISION= 1 +PORTVERSION= 4.6.0 CATEGORIES= x11-fonts MASTER_SITES= ${MASTER_SITE_XFREE} MASTER_SITE_SUBDIR= ${PORTVERSION} Index: x11-servers/XFree86-4-FontServer/distinfo =================================================================== --- x11-servers/XFree86-4-FontServer/distinfo (.../vendor/ports) (revision 277) +++ x11-servers/XFree86-4-FontServer/distinfo (.../xfree-exp) (revision 277) @@ -1,9 +1,9 @@ -MD5 (xc/XFree86-4.5.0-src-1.tgz) = 6c0fcf8069c13d068276016bbf6ad712 -SHA256 (xc/XFree86-4.5.0-src-1.tgz) = 0e9fb93a0db5f7f4f78e951d559fae36a0fb0e24683a9918dff7ffee766e0aae -SIZE (xc/XFree86-4.5.0-src-1.tgz) = 10507331 -MD5 (xc/XFree86-4.5.0-src-2.tgz) = cc296c71cbe58edc3ffdec1084e58f4c -SHA256 (xc/XFree86-4.5.0-src-2.tgz) = a50120da18c6caeb151094fa2ab7afc618821c72d3cedf6842f3636880839a09 -SIZE (xc/XFree86-4.5.0-src-2.tgz) = 5826556 -MD5 (xc/XFree86-4.5.0-src-3.tgz) = c0ad630bfec4545857c2877b3e2dcbeb -SHA256 (xc/XFree86-4.5.0-src-3.tgz) = 2719f8055955dce293f2a8a846514d3908fa05b9d053c59b4fe1e09470a054df -SIZE (xc/XFree86-4.5.0-src-3.tgz) = 12086763 +MD5 (xc/XFree86-4.6.0-src-1.tgz) = 6c05f3486f088d01584f4517540e8d18 +SHA256 (xc/XFree86-4.6.0-src-1.tgz) = c724603239ccb446d524613e5dbfb690b6260a2648ffa8e6643ae770a9ac9a54 +SIZE (xc/XFree86-4.6.0-src-1.tgz) = 10448753 +MD5 (xc/XFree86-4.6.0-src-2.tgz) = f084d12aa734c9cd83e8d2a3a4eb3e32 +SHA256 (xc/XFree86-4.6.0-src-2.tgz) = e6cf843da16bd4b696e92038a67ea51a4c0e42b58b0bd84314fc61440aeb5d4f +SIZE (xc/XFree86-4.6.0-src-2.tgz) = 5878680 +MD5 (xc/XFree86-4.6.0-src-3.tgz) = 05450997f1876098d791a4cf9db21af8 +SHA256 (xc/XFree86-4.6.0-src-3.tgz) = 95c754a0b124792f1ac6f2c18eaf2cf4fe394e52c3b9a82234fe2436fdc92dc2 +SIZE (xc/XFree86-4.6.0-src-3.tgz) = 12542143 Index: x11-servers/XFree86-4-FontServer/Makefile =================================================================== --- x11-servers/XFree86-4-FontServer/Makefile (.../vendor/ports) (revision 277) +++ x11-servers/XFree86-4-FontServer/Makefile (.../xfree-exp) (revision 277) @@ -6,8 +6,7 @@ # PORTNAME= FontServer -PORTVERSION= 4.5.0 -PORTREVISION= 1 +PORTVERSION= 4.6.0 CATEGORIES= x11-servers x11-fonts MASTER_SITES= ${MASTER_SITE_XFREE} MASTER_SITE_SUBDIR= ${PORTVERSION} Index: x11-servers/XFree86-4-NestServer/distinfo =================================================================== --- x11-servers/XFree86-4-NestServer/distinfo (.../vendor/ports) (revision 277) +++ x11-servers/XFree86-4-NestServer/distinfo (.../xfree-exp) (revision 277) @@ -1,9 +1,9 @@ -MD5 (xc/XFree86-4.5.0-src-1.tgz) = 6c0fcf8069c13d068276016bbf6ad712 -SHA256 (xc/XFree86-4.5.0-src-1.tgz) = 0e9fb93a0db5f7f4f78e951d559fae36a0fb0e24683a9918dff7ffee766e0aae -SIZE (xc/XFree86-4.5.0-src-1.tgz) = 10507331 -MD5 (xc/XFree86-4.5.0-src-2.tgz) = cc296c71cbe58edc3ffdec1084e58f4c -SHA256 (xc/XFree86-4.5.0-src-2.tgz) = a50120da18c6caeb151094fa2ab7afc618821c72d3cedf6842f3636880839a09 -SIZE (xc/XFree86-4.5.0-src-2.tgz) = 5826556 -MD5 (xc/XFree86-4.5.0-src-3.tgz) = c0ad630bfec4545857c2877b3e2dcbeb -SHA256 (xc/XFree86-4.5.0-src-3.tgz) = 2719f8055955dce293f2a8a846514d3908fa05b9d053c59b4fe1e09470a054df -SIZE (xc/XFree86-4.5.0-src-3.tgz) = 12086763 +MD5 (xc/XFree86-4.6.0-src-1.tgz) = 6c05f3486f088d01584f4517540e8d18 +SHA256 (xc/XFree86-4.6.0-src-1.tgz) = c724603239ccb446d524613e5dbfb690b6260a2648ffa8e6643ae770a9ac9a54 +SIZE (xc/XFree86-4.6.0-src-1.tgz) = 10448753 +MD5 (xc/XFree86-4.6.0-src-2.tgz) = f084d12aa734c9cd83e8d2a3a4eb3e32 +SHA256 (xc/XFree86-4.6.0-src-2.tgz) = e6cf843da16bd4b696e92038a67ea51a4c0e42b58b0bd84314fc61440aeb5d4f +SIZE (xc/XFree86-4.6.0-src-2.tgz) = 5878680 +MD5 (xc/XFree86-4.6.0-src-3.tgz) = 05450997f1876098d791a4cf9db21af8 +SHA256 (xc/XFree86-4.6.0-src-3.tgz) = 95c754a0b124792f1ac6f2c18eaf2cf4fe394e52c3b9a82234fe2436fdc92dc2 +SIZE (xc/XFree86-4.6.0-src-3.tgz) = 12542143 Index: x11-servers/XFree86-4-NestServer/Makefile =================================================================== --- x11-servers/XFree86-4-NestServer/Makefile (.../vendor/ports) (revision 277) +++ x11-servers/XFree86-4-NestServer/Makefile (.../xfree-exp) (revision 277) @@ -6,7 +6,7 @@ # PORTNAME= NestServer -PORTVERSION= 4.5.0 +PORTVERSION= 4.6.0 CATEGORIES= x11-servers MASTER_SITES= ${MASTER_SITE_XFREE} MASTER_SITE_SUBDIR= ${PORTVERSION} Index: x11-servers/XFree86-4-VirtualFramebufferServer/distinfo =================================================================== --- x11-servers/XFree86-4-VirtualFramebufferServer/distinfo (.../vendor/ports) (revision 277) +++ x11-servers/XFree86-4-VirtualFramebufferServer/distinfo (.../xfree-exp) (revision 277) @@ -1,9 +1,9 @@ -MD5 (xc/XFree86-4.5.0-src-1.tgz) = 6c0fcf8069c13d068276016bbf6ad712 -SHA256 (xc/XFree86-4.5.0-src-1.tgz) = 0e9fb93a0db5f7f4f78e951d559fae36a0fb0e24683a9918dff7ffee766e0aae -SIZE (xc/XFree86-4.5.0-src-1.tgz) = 10507331 -MD5 (xc/XFree86-4.5.0-src-2.tgz) = cc296c71cbe58edc3ffdec1084e58f4c -SHA256 (xc/XFree86-4.5.0-src-2.tgz) = a50120da18c6caeb151094fa2ab7afc618821c72d3cedf6842f3636880839a09 -SIZE (xc/XFree86-4.5.0-src-2.tgz) = 5826556 -MD5 (xc/XFree86-4.5.0-src-3.tgz) = c0ad630bfec4545857c2877b3e2dcbeb -SHA256 (xc/XFree86-4.5.0-src-3.tgz) = 2719f8055955dce293f2a8a846514d3908fa05b9d053c59b4fe1e09470a054df -SIZE (xc/XFree86-4.5.0-src-3.tgz) = 12086763 +MD5 (xc/XFree86-4.6.0-src-1.tgz) = 6c05f3486f088d01584f4517540e8d18 +SHA256 (xc/XFree86-4.6.0-src-1.tgz) = c724603239ccb446d524613e5dbfb690b6260a2648ffa8e6643ae770a9ac9a54 +SIZE (xc/XFree86-4.6.0-src-1.tgz) = 10448753 +MD5 (xc/XFree86-4.6.0-src-2.tgz) = f084d12aa734c9cd83e8d2a3a4eb3e32 +SHA256 (xc/XFree86-4.6.0-src-2.tgz) = e6cf843da16bd4b696e92038a67ea51a4c0e42b58b0bd84314fc61440aeb5d4f +SIZE (xc/XFree86-4.6.0-src-2.tgz) = 5878680 +MD5 (xc/XFree86-4.6.0-src-3.tgz) = 05450997f1876098d791a4cf9db21af8 +SHA256 (xc/XFree86-4.6.0-src-3.tgz) = 95c754a0b124792f1ac6f2c18eaf2cf4fe394e52c3b9a82234fe2436fdc92dc2 +SIZE (xc/XFree86-4.6.0-src-3.tgz) = 12542143 Index: x11-servers/XFree86-4-VirtualFramebufferServer/Makefile =================================================================== --- x11-servers/XFree86-4-VirtualFramebufferServer/Makefile (.../vendor/ports) (revision 277) +++ x11-servers/XFree86-4-VirtualFramebufferServer/Makefile (.../xfree-exp) (revision 277) @@ -6,7 +6,7 @@ # PORTNAME= VirtualFramebufferServer -PORTVERSION= 4.5.0 +PORTVERSION= 4.6.0 CATEGORIES= x11-servers MASTER_SITES= ${MASTER_SITE_XFREE} MASTER_SITE_SUBDIR= ${PORTVERSION} Index: x11-servers/XFree86-4-PrintServer/distinfo =================================================================== --- x11-servers/XFree86-4-PrintServer/distinfo (.../vendor/ports) (revision 277) +++ x11-servers/XFree86-4-PrintServer/distinfo (.../xfree-exp) (revision 277) @@ -1,9 +1,9 @@ -MD5 (xc/XFree86-4.5.0-src-1.tgz) = 6c0fcf8069c13d068276016bbf6ad712 -SHA256 (xc/XFree86-4.5.0-src-1.tgz) = 0e9fb93a0db5f7f4f78e951d559fae36a0fb0e24683a9918dff7ffee766e0aae -SIZE (xc/XFree86-4.5.0-src-1.tgz) = 10507331 -MD5 (xc/XFree86-4.5.0-src-2.tgz) = cc296c71cbe58edc3ffdec1084e58f4c -SHA256 (xc/XFree86-4.5.0-src-2.tgz) = a50120da18c6caeb151094fa2ab7afc618821c72d3cedf6842f3636880839a09 -SIZE (xc/XFree86-4.5.0-src-2.tgz) = 5826556 -MD5 (xc/XFree86-4.5.0-src-3.tgz) = c0ad630bfec4545857c2877b3e2dcbeb -SHA256 (xc/XFree86-4.5.0-src-3.tgz) = 2719f8055955dce293f2a8a846514d3908fa05b9d053c59b4fe1e09470a054df -SIZE (xc/XFree86-4.5.0-src-3.tgz) = 12086763 +MD5 (xc/XFree86-4.6.0-src-1.tgz) = 6c05f3486f088d01584f4517540e8d18 +SHA256 (xc/XFree86-4.6.0-src-1.tgz) = c724603239ccb446d524613e5dbfb690b6260a2648ffa8e6643ae770a9ac9a54 +SIZE (xc/XFree86-4.6.0-src-1.tgz) = 10448753 +MD5 (xc/XFree86-4.6.0-src-2.tgz) = f084d12aa734c9cd83e8d2a3a4eb3e32 +SHA256 (xc/XFree86-4.6.0-src-2.tgz) = e6cf843da16bd4b696e92038a67ea51a4c0e42b58b0bd84314fc61440aeb5d4f +SIZE (xc/XFree86-4.6.0-src-2.tgz) = 5878680 +MD5 (xc/XFree86-4.6.0-src-3.tgz) = 05450997f1876098d791a4cf9db21af8 +SHA256 (xc/XFree86-4.6.0-src-3.tgz) = 95c754a0b124792f1ac6f2c18eaf2cf4fe394e52c3b9a82234fe2436fdc92dc2 +SIZE (xc/XFree86-4.6.0-src-3.tgz) = 12542143 Index: x11-servers/XFree86-4-PrintServer/Makefile =================================================================== --- x11-servers/XFree86-4-PrintServer/Makefile (.../vendor/ports) (revision 277) +++ x11-servers/XFree86-4-PrintServer/Makefile (.../xfree-exp) (revision 277) @@ -6,7 +6,7 @@ # PORTNAME= PrintServer -PORTVERSION= 4.5.0 +PORTVERSION= 4.6.0 CATEGORIES= x11-servers MASTER_SITES= ${MASTER_SITE_XFREE} MASTER_SITE_SUBDIR= ${PORTVERSION} Index: x11-servers/XFree86-4-Server/distinfo =================================================================== --- x11-servers/XFree86-4-Server/distinfo (.../vendor/ports) (revision 277) +++ x11-servers/XFree86-4-Server/distinfo (.../xfree-exp) (revision 277) @@ -1,9 +1,9 @@ -MD5 (xc/XFree86-4.5.0-src-1.tgz) = 6c0fcf8069c13d068276016bbf6ad712 -SHA256 (xc/XFree86-4.5.0-src-1.tgz) = 0e9fb93a0db5f7f4f78e951d559fae36a0fb0e24683a9918dff7ffee766e0aae -SIZE (xc/XFree86-4.5.0-src-1.tgz) = 10507331 -MD5 (xc/XFree86-4.5.0-src-2.tgz) = cc296c71cbe58edc3ffdec1084e58f4c -SHA256 (xc/XFree86-4.5.0-src-2.tgz) = a50120da18c6caeb151094fa2ab7afc618821c72d3cedf6842f3636880839a09 -SIZE (xc/XFree86-4.5.0-src-2.tgz) = 5826556 -MD5 (xc/XFree86-4.5.0-src-3.tgz) = c0ad630bfec4545857c2877b3e2dcbeb -SHA256 (xc/XFree86-4.5.0-src-3.tgz) = 2719f8055955dce293f2a8a846514d3908fa05b9d053c59b4fe1e09470a054df -SIZE (xc/XFree86-4.5.0-src-3.tgz) = 12086763 +MD5 (xc/XFree86-4.6.0-src-1.tgz) = 6c05f3486f088d01584f4517540e8d18 +SHA256 (xc/XFree86-4.6.0-src-1.tgz) = c724603239ccb446d524613e5dbfb690b6260a2648ffa8e6643ae770a9ac9a54 +SIZE (xc/XFree86-4.6.0-src-1.tgz) = 10448753 +MD5 (xc/XFree86-4.6.0-src-2.tgz) = f084d12aa734c9cd83e8d2a3a4eb3e32 +SHA256 (xc/XFree86-4.6.0-src-2.tgz) = e6cf843da16bd4b696e92038a67ea51a4c0e42b58b0bd84314fc61440aeb5d4f +SIZE (xc/XFree86-4.6.0-src-2.tgz) = 5878680 +MD5 (xc/XFree86-4.6.0-src-3.tgz) = 05450997f1876098d791a4cf9db21af8 +SHA256 (xc/XFree86-4.6.0-src-3.tgz) = 95c754a0b124792f1ac6f2c18eaf2cf4fe394e52c3b9a82234fe2436fdc92dc2 +SIZE (xc/XFree86-4.6.0-src-3.tgz) = 12542143 Index: x11-servers/XFree86-4-Server/files/patch-CAN-2005-2495 =================================================================== --- x11-servers/XFree86-4-Server/files/patch-CAN-2005-2495 (.../vendor/ports) (revision 277) +++ x11-servers/XFree86-4-Server/files/patch-CAN-2005-2495 (.../xfree-exp) (revision 277) @@ -1,312 +0,0 @@ -Index: programs/Xserver/afb/afbpixmap.c -=================================================================== -RCS file: /cvs/xc/programs/Xserver/afb/afbpixmap.c,v -retrieving revision 3.1 -retrieving revision 3.1.20.1 -diff -u -r3.1 -r3.1.20.1 ---- programs/Xserver/afb/afbpixmap.c 3 Jun 1997 14:11:07 -0000 3.1 -+++ programs/Xserver/afb/afbpixmap.c 18 Sep 2005 00:20:57 -0000 3.1.20.1 -@@ -76,6 +76,9 @@ - int datasize; - int paddedWidth; - -+ if ((width > MAXSHORT) || (height > MAXSHORT)) -+ return NullPixmap; -+ - paddedWidth = BitmapBytePad(width); - datasize = height * paddedWidth * depth; - pPixmap = AllocatePixmap(pScreen, datasize); -Index: programs/Xserver/cfb/cfbpixmap.c -=================================================================== -RCS file: /cvs/xc/programs/Xserver/cfb/cfbpixmap.c,v -retrieving revision 1.5 -retrieving revision 1.5.8.1 -diff -u -r1.5 -r1.5.8.1 ---- programs/Xserver/cfb/cfbpixmap.c 14 Dec 2001 19:59:23 -0000 1.5 -+++ programs/Xserver/cfb/cfbpixmap.c 18 Sep 2005 00:20:57 -0000 1.5.8.1 -@@ -73,6 +72,9 @@ - int datasize; - int paddedWidth; - -+ if ((width > MAXSHORT) || (height > MAXSHORT)) -+ return NullPixmap; -+ - paddedWidth = PixmapBytePad(width, depth); - datasize = height * paddedWidth; - pPixmap = AllocatePixmap(pScreen, datasize); -Index: programs/Xserver/dix/pixmap.c -=================================================================== -RCS file: /cvs/xc/programs/Xserver/dix/pixmap.c,v -retrieving revision 3.5 -retrieving revision 3.5.8.1 -diff -u -r3.5 -r3.5.8.1 ---- programs/Xserver/dix/pixmap.c 14 Dec 2001 19:59:32 -0000 3.5 -+++ programs/Xserver/dix/pixmap.c 18 Sep 2005 00:20:58 -0000 3.5.8.1 -@@ -126,7 +125,9 @@ - unsigned size; - int i; - -- pPixmap = (PixmapPtr)xalloc(pScreen->totalPixmapSize + pixDataSize); -+ if (((unsigned)(-1) - pScreen->totalPixmapSize) < (unsigned)pixDataSize) -+ return NullPixmap; -+ pPixmap = xalloc(pScreen->totalPixmapSize + (unsigned)pixDataSize); - if (!pPixmap) - return NullPixmap; - ppriv = (DevUnion *)(pPixmap + 1); -@@ -144,7 +145,7 @@ - ppriv->ptr = (pointer)NULL; - } - #else -- pPixmap = (PixmapPtr)xalloc(sizeof(PixmapRec) + pixDataSize); -+ pPixmap = xalloc(sizeof(PixmapRec) + (unsigned)pixDataSize); - #endif - return pPixmap; - } -Index: programs/Xserver/fb/fbpixmap.c -=================================================================== -RCS file: /cvs/xc/programs/Xserver/fb/fbpixmap.c,v -retrieving revision 1.11 -retrieving revision 1.11.6.1 -diff -u -r1.11 -r1.11.6.1 ---- programs/Xserver/fb/fbpixmap.c 16 Sep 2002 18:05:34 -0000 1.11 -+++ programs/Xserver/fb/fbpixmap.c 18 Sep 2005 00:20:58 -0000 1.11.6.1 -@@ -37,6 +37,9 @@ - int adjust; - int base; - -+ if ((width > MAXSHORT) || (height > MAXSHORT)) -+ return NullPixmap; -+ - paddedWidth = ((width * bpp + FB_MASK) >> FB_SHIFT) * sizeof (FbBits); - datasize = height * paddedWidth; - #ifdef PIXPRIV -Index: programs/Xserver/hw/xfree86/xaa/xaaInit.c -=================================================================== -RCS file: /cvs/xc/programs/Xserver/hw/xfree86/xaa/xaaInit.c,v -retrieving revision 1.35 -retrieving revision 1.35.10.1 -diff -u -r1.35 -r1.35.10.1 ---- programs/Xserver/hw/xfree86/xaa/xaaInit.c 19 Jul 2001 18:50:16 -0000 1.35 -+++ programs/Xserver/hw/xfree86/xaa/xaaInit.c 18 Sep 2005 00:20:59 -0000 1.35.10.1 -@@ -479,8 +479,12 @@ - ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; - XAAPixmapPtr pPriv; - PixmapPtr pPix = NULL; -- int size = w * h; -+ int size; -+ -+ if ((w > MAXSHORT) || (h > MAXSHORT)) -+ return NullPixmap; - -+ size = w * h; - if (!infoRec->offscreenDepthsInitialized) - XAAInitializeOffscreenDepths (pScreen); - -Index: programs/Xserver/hw/xfree86/xf4bpp/ppcPixmap.c -=================================================================== -RCS file: /cvs/xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPixmap.c,v -retrieving revision 1.5 -retrieving revision 1.5.14.1 -diff -u -r1.5 -r1.5.14.1 ---- programs/Xserver/hw/xfree86/xf4bpp/ppcPixmap.c 27 Apr 2000 16:26:49 -0000 1.5 -+++ programs/Xserver/hw/xfree86/xf4bpp/ppcPixmap.c 18 Sep 2005 00:21:00 -0000 1.5.14.1 -@@ -89,8 +89,8 @@ - - TRACE(("xf4bppCreatePixmap(pScreen=0x%x, width=%d, height=%d, depth=%d)\n", pScreen, width, height, depth)) ; - -- if ( depth > 8 ) -- return (PixmapPtr) NULL ; -+ if ((depth > 8) || (width > MAXSHORT) || (height > MAXSHORT)) -+ return NullPixmap; - - size = PixmapBytePad(width, depth); - pPixmap = AllocatePixmap (pScreen, (height * size)); -Index: programs/Xserver/ilbm/ilbmpixmap.c -=================================================================== -RCS file: /cvs/xc/programs/Xserver/ilbm/ilbmpixmap.c,v -retrieving revision 3.0 -retrieving revision 3.0.26.1 -diff -u -r3.0 -r3.0.26.1 ---- programs/Xserver/ilbm/ilbmpixmap.c 18 Aug 1996 01:54:01 -0000 3.0 -+++ programs/Xserver/ilbm/ilbmpixmap.c 18 Sep 2005 00:21:00 -0000 3.0.26.1 -@@ -78,6 +78,9 @@ - int datasize; - int paddedWidth; - -+ if ((width > MAXSHORT) || (height > MAXSHORT)) -+ return NullPixmap; -+ - paddedWidth = BitmapBytePad(width); - datasize = height * paddedWidth * depth; - pPixmap = AllocatePixmap(pScreen, datasize); -Index: programs/Xserver/iplan2p4/iplpixmap.c -=================================================================== -RCS file: /cvs/xc/programs/Xserver/iplan2p4/iplpixmap.c,v -retrieving revision 3.1 -retrieving revision 3.1.8.1 -diff -u -r3.1 -r3.1.8.1 ---- programs/Xserver/iplan2p4/iplpixmap.c 17 Dec 2001 20:00:46 -0000 3.1 -+++ programs/Xserver/iplan2p4/iplpixmap.c 18 Sep 2005 00:21:00 -0000 3.1.8.1 -@@ -76,8 +76,12 @@ - PixmapPtr pPixmap; - int datasize; - int paddedWidth; -- int ipad=INTER_PLANES*2 - 1; -+ int ipad; - -+ if ((width > MAXSHORT) || (height > MAXSHORT)) -+ return NullPixmap; -+ -+ ipad = INTER_PLANES*2 - 1; - paddedWidth = PixmapBytePad(width, depth); - paddedWidth = (paddedWidth + ipad) & ~ipad; - datasize = height * paddedWidth; -Index: programs/Xserver/mfb/mfbpixmap.c -=================================================================== -RCS file: /cvs/xc/programs/Xserver/mfb/mfbpixmap.c,v -retrieving revision 1.2 -retrieving revision 1.2.8.1 -diff -u -r1.2 -r1.2.8.1 ---- programs/Xserver/mfb/mfbpixmap.c 14 Dec 2001 20:00:10 -0000 1.2 -+++ programs/Xserver/mfb/mfbpixmap.c 18 Sep 2005 00:21:00 -0000 1.2.8.1 -@@ -44,7 +45,6 @@ - SOFTWARE. - - ******************************************************************/ --/* $Xorg: mfbpixmap.c,v 1.4 2001/02/09 02:05:19 xorgcvs Exp $ */ - - /* pixmap management - written by drewry, september 1986 -@@ -75,8 +75,9 @@ - int datasize; - int paddedWidth; - -- if (depth != 1) -+ if ((depth != 1) || (width > MAXSHORT) || (height > MAXSHORT)) - return NullPixmap; -+ - paddedWidth = BitmapBytePad(width); - datasize = height * paddedWidth; - pPixmap = AllocatePixmap(pScreen, datasize); -Index: programs/Xserver/os/utils.c -=================================================================== -RCS file: /cvs/xc/programs/Xserver/os/utils.c,v -retrieving revision 3.102 -retrieving revision 3.102.2.1 -diff -u -r3.102 -r3.102.2.1 ---- programs/Xserver/os/utils.c 3 Feb 2005 02:01:14 -0000 3.102 -+++ programs/Xserver/os/utils.c 18 Sep 2005 00:21:00 -0000 3.102.2.1 -@@ -1243,19 +1243,19 @@ - void * - Xalloc(unsigned long amount) - { -- register pointer ptr; -- -- if ((long)amount <= 0) -- return NULL; -+ pointer ptr; - - /* aligned extra on long word boundary */ - amount = (amount + (sizeof(long) - 1)) & ~(sizeof(long) - 1); -+ -+ if ((long)amount <= 0) -+ return NULL; - #ifdef MEMBUG - if (!Must_have_memory && Memory_fail && - ((random() % MEM_FAIL_SCALE) < Memory_fail)) - return NULL; - #endif -- if ((ptr = (pointer)malloc(amount))) { -+ if ((ptr = malloc(amount))) { - return ptr; - } - if (Must_have_memory) -@@ -1273,12 +1273,16 @@ - { - register pointer ptr; - -- if ((long)amount <= 0) -- return NULL; -+ if (amount == 0) -+ return NULL; - - /* aligned extra on long word boundary */ - amount = (amount + (sizeof(long) - 1)) & ~(sizeof(long) - 1); -- ptr = (pointer)malloc(amount); -+ -+ if ((long)amount <= 0) -+ FatalError("Bad request for memory"); -+ -+ ptr = malloc(amount); - if (!ptr) - FatalError("Out of memory"); - -@@ -1292,11 +1296,11 @@ - void * - Xcalloc(unsigned long amount) - { -- unsigned long *ret; -+ pointer ret; - -- ret = Xalloc (amount); -+ ret = Xalloc(amount); - if (ret) -- bzero ((void *) ret, (int) amount); -+ bzero (ret, (int) amount); - return ret; - } - -@@ -1307,13 +1311,17 @@ - void * - XNFcalloc(unsigned long amount) - { -- unsigned long *ret; -+ pointer ret; - -- ret = Xalloc (amount); -- if (ret) -- bzero ((char *) ret, (int) amount); -- else if ((long)amount > 0) -+ if (amount == 0) -+ return NULL; -+ -+ ret = Xalloc(amount); -+ if (!ret) - FatalError("Out of memory"); -+ -+ bzero (ret, (int) amount); -+ - return ret; - } - -@@ -1336,10 +1344,12 @@ - return NULL; - } - amount = (amount + (sizeof(long) - 1)) & ~(sizeof(long) - 1); -+ if ((long)amount <= 0) -+ return NULL; - if (ptr) -- ptr = (pointer)realloc((char *)ptr, amount); -+ ptr = realloc(ptr, amount); - else -- ptr = (pointer)malloc(amount); -+ ptr = malloc(amount); - if (ptr) - return ptr; - if (Must_have_memory) -@@ -1355,12 +1365,12 @@ - void * - XNFrealloc(pointer ptr, unsigned long amount) - { -- if (( ptr = (pointer)Xrealloc( ptr, amount ) ) == NULL) -+ if ((ptr = Xrealloc(ptr, amount)) == NULL) - { -- if ((long)amount > 0) -+ if (amount != 0) - FatalError( "Out of memory" ); - } -- return ((unsigned long *)ptr); -+ return ptr; - } - - /***************** Index: x11-servers/XFree86-4-Server/files/patch-HALlib_bindings.c =================================================================== --- x11-servers/XFree86-4-Server/files/patch-HALlib_bindings.c (.../vendor/ports) (revision 277) +++ x11-servers/XFree86-4-Server/files/patch-HALlib_bindings.c (.../xfree-exp) (revision 277) @@ -1,27 +0,0 @@ -Index: programs/Xserver/hw/xfree86/drivers/mga/HALlib/binding.h -=================================================================== -RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/mga/HALlib/binding.h,v -retrieving revision 1.6 -retrieving revision 1.7 -diff -u -r1.6 -r1.7 ---- programs/Xserver/hw/xfree86/drivers/mga/HALlib/binding.h 31 Mar 2004 16:37:09 -0000 1.6 -+++ programs/Xserver/hw/xfree86/drivers/mga/HALlib/binding.h 26 Apr 2005 00:56:44 -0000 1.7 -@@ -210,6 +210,8 @@ - #define MGAMODEINFO_FORCE_PITCH (1L << 5) - #define MGAMODEINFO_FORCE_DISPLAYORG (1L << 6) - #define MGAMODEINFO_TV (1L << 7) -+#define MGAMODEINFO_FLATPANEL1 (1L << 8) -+#define MGAMODEINFO_FLATPANEL2 (1L << 9) - #define MGAMODEINFO_TESTONLY 0x80000000 - - /* Cable Type */ -@@ -243,7 +245,8 @@ - ULONG MGAGetBOARDHANDLESize(void); - ULONG MGASetTVStandard(LPBOARDHANDLE pBoard, ULONG ulTVStandard); - ULONG MGASetTVCableType(LPBOARDHANDLE pBoard, ULONG ulCableType); --ULONG MGASetDisplayStart(LPBOARDHANDLE pBoard, ULONG ulX, ULONG ulY, ULONG ulCrtc); -+ULONG MGAForceFlatPanel(LPBOARDHANDLE pBoard); -+ULONG HALSetDisplayStart(LPBOARDHANDLE pBoard, ULONG ulX, ULONG ulY, ULONG ulCrtc); - - #if defined(__cplusplus) - } Index: x11-servers/XFree86-4-Server/files/patch-mga_driver.c =================================================================== --- x11-servers/XFree86-4-Server/files/patch-mga_driver.c (.../vendor/ports) (revision 277) +++ x11-servers/XFree86-4-Server/files/patch-mga_driver.c (.../xfree-exp) (revision 277) @@ -1,35 +0,0 @@ -Index: programs/Xserver/hw/xfree86/drivers/mga/mga_driver.c -=================================================================== -RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/mga/mga_driver.c,v -retrieving revision 1.250 -retrieving revision 1.251 -diff -u -r1.250 -r1.251 ---- programs/Xserver/hw/xfree86/drivers/mga/mga_driver.c 18 Feb 2005 02:55:08 -0000 1.250 -+++ programs/Xserver/hw/xfree86/drivers/mga/mga_driver.c 26 Apr 2005 00:56:43 -0000 1.251 -@@ -401,7 +401,7 @@ - "MGASetVgaMode", - "MGAValidateMode", - "MGAValidateVideoParameters", -- "MGASetDisplayStart", -+ "HALSetDisplayStart", - NULL - }; - #endif -@@ -3644,7 +3644,7 @@ - MGAAdjustGranularity(pScrn,&x,&y); - pMga->HALGranularityOffX = pMga->HALGranularityOffX - x; - pMga->HALGranularityOffY = pMga->HALGranularityOffY - y; -- MGASetDisplayStart(pMga->pBoard,x,y,0); -+ HALSetDisplayStart(pMga->pBoard,x,y,0); - ); - #endif - MGA_NOT_HAL( -@@ -3692,7 +3692,7 @@ - #ifdef USEMGAHAL - MGA_HAL( - MGAAdjustGranularity(pScrn,&x,&y); -- MGASetDisplayStart(pMga->pBoard,x,y,1); -+ HALSetDisplayStart(pMga->pBoard,x,y,1); - ); - #endif - MGA_NOT_HAL( Index: x11-servers/XFree86-4-Server/files/patch-trident_driver.c =================================================================== --- x11-servers/XFree86-4-Server/files/patch-trident_driver.c (.../vendor/ports) (revision 277) +++ x11-servers/XFree86-4-Server/files/patch-trident_driver.c (.../xfree-exp) (revision 277) @@ -1,17 +0,0 @@ -Index: programs/Xserver/hw/xfree86/drivers/trident/trident_driver.c -=================================================================== -RCS file: /usr/local/repos/xfree86/xc/programs/Xserver/hw/xfree86/drivers/trident/trident_driver.c,v -retrieving revision 1.193 -retrieving revision 1.194 -diff -u -r1.193 -r1.194 ---- programs/Xserver/hw/xfree86/drivers/trident/trident_driver.c 18 Feb 2005 02:55:10 -0000 1.193 -+++ programs/Xserver/hw/xfree86/drivers/trident/trident_driver.c 30 Apr 2005 17:04:00 -0000 1.194 -@@ -2606,7 +2606,7 @@ - TRIDENTPtr pTrident = TRIDENTPTR(pScrn); - TRIDENTRegPtr tridentReg; - -- WAITFORVSYNC; -+ if (!xf86IsPc98()) WAITFORVSYNC; - - TridentFindClock(pScrn,mode->Clock); - Index: x11-servers/XFree86-4-Server/files/patch-elfloader.c =================================================================== --- x11-servers/XFree86-4-Server/files/patch-elfloader.c (.../vendor/ports) (revision 277) +++ x11-servers/XFree86-4-Server/files/patch-elfloader.c (.../xfree-exp) (revision 277) @@ -1,82 +0,0 @@ ---- programs/Xserver/hw/xfree86/loader/elfloader.c.orig Mon Mar 28 19:12:53 2005 -+++ programs/Xserver/hw/xfree86/loader/elfloader.c Mon Mar 28 19:22:51 2005 -@@ -203,6 +203,7 @@ - #if defined (__alpha__) || \ - defined (__ia64__) || \ - defined (__AMD64__) || \ -+ defined (__amd64__) || \ - (defined (__sparc__) && \ - (defined (__arch64__) || \ - defined (__sparcv9))) -@@ -294,7 +295,8 @@ - defined(__alpha__) || \ - defined(__sparc__) || \ - defined(__ia64__) || \ -- defined(__AMD64__) -+ defined(__AMD64__) || \ -+ defined(__amd64__) - typedef Elf_Rela Elf_Rel_t; - #else - typedef Elf_Rel Elf_Rel_t; -@@ -488,7 +490,8 @@ - defined(__alpha__) || \ - defined(__sparc__) || \ - defined(__ia64__) || \ -- defined(__AMD64__) -+ defined(__AMD64__) || \ -+ defined(__amd64__) - ELFDEBUG(", r_addend 0x%lx", rel->r_addend); - # endif - ELFDEBUG("\n"); -@@ -524,6 +527,7 @@ - #if defined(__alpha__) || \ - defined(__ia64__) || \ - defined(__AMD64__) || \ -+ defined(__amd64__) || \ - (defined(__sparc__) && \ - (defined(__arch64__) || \ - defined(__sparcv9))) -@@ -548,6 +552,7 @@ - #if defined(__alpha__) || \ - defined(__ia64__) || \ - defined(__AMD64__) || \ -+ defined(__amd64__) || \ - (defined(__sparc__) && \ - (defined(__arch64__) || \ - defined(__sparcv9))) -@@ -603,6 +608,7 @@ - #if defined(__alpha__) || \ - defined(__ia64__) || \ - defined(__AMD64__) || \ -+ defined(__amd64__) || \ - (defined(__sparc__) && \ - (defined(__arch64__) || \ - defined(__sparcv9))) -@@ -1263,7 +1269,7 @@ - unsigned long *dest64; - unsigned short *dest16; - #endif --#if defined(__AMD64__) -+#if defined(__AMD64__) || defined(__amd64__) - unsigned long *dest64; - int *dest32s; - #endif -@@ -1281,7 +1287,8 @@ - defined(__alpha__) || \ - defined(__sparc__) || \ - defined(__ia64__) || \ -- defined(__AMD64__) -+ defined(__AMD64__) || \ -+ defined(__amd64__) - ELFDEBUG("%lx", rel->r_addend); - # endif - ELFDEBUG("\n"); -@@ -1340,7 +1347,7 @@ - - break; - #endif /* i386 */ --#if defined(__AMD64__) -+#if defined(__AMD64__) || defined(__amd64__) - case R_X86_64_32: - dest32 = (unsigned int *)(secp + rel->r_offset); - # ifdef ELFDEBUG Index: x11-servers/XFree86-4-Server/files/patch-trident_video.c =================================================================== --- x11-servers/XFree86-4-Server/files/patch-trident_video.c (.../vendor/ports) (revision 277) +++ x11-servers/XFree86-4-Server/files/patch-trident_video.c (.../xfree-exp) (revision 277) @@ -1,19 +0,0 @@ -Index: programs/Xserver/hw/xfree86/drivers/trident/trident_video.c -=================================================================== -RCS file: /usr/local/repos/xfree86/xc/programs/Xserver/hw/xfree86/drivers/trident/trident_video.c,v -retrieving revision 1.47 -retrieving revision 1.48 -diff -u -r1.47 -r1.48 ---- programs/Xserver/hw/xfree86/drivers/trident/trident_video.c 29 Mar 2004 16:25:22 -0000 1.47 -+++ programs/Xserver/hw/xfree86/drivers/trident/trident_video.c 30 Apr 2005 17:04:00 -0000 1.48 -@@ -1307,6 +1307,8 @@ - * full vblank has passed. - * - Alan. - */ -- WAITFORVSYNC; -- WAITFORVSYNC; -+ if (!xf86IsPc98()) { -+ WAITFORVSYNC; -+ WAITFORVSYNC; -+ } - } Index: x11-servers/XFree86-4-Server/files/patch-FreeBSD.cf =================================================================== --- x11-servers/XFree86-4-Server/files/patch-FreeBSD.cf (.../vendor/ports) (revision 277) +++ x11-servers/XFree86-4-Server/files/patch-FreeBSD.cf (.../xfree-exp) (revision 277) @@ -1,9 +1,9 @@ ---- config/cf/FreeBSD.cf.orig Thu Mar 3 03:32:17 2005 -+++ config/cf/FreeBSD.cf Wed Mar 23 10:41:03 2005 -@@ -234,11 +234,11 @@ +--- config/cf/FreeBSD.cf.orig Mon Jun 27 04:10:54 2005 ++++ config/cf/FreeBSD.cf Mon Jun 27 04:13:13 2005 +@@ -233,11 +233,11 @@ * ld: warning: libXThrStub.so.6, needed by libX11.so, not found */ - #if BuildThreadStubLibrary && (!defined(UseInstalledX11) || !UseInstalledX11) + #if NeedThreadStubLibrary && (!defined(UseInstalledX11) || !UseInstalledX11) -# define CcCmd $(CLIENTENVSETUP) cc -# define CplusplusCmd $(CLIENTENVSETUP) c++ +# define CcCmd $(CLIENTENVSETUP) FreeBSDCC @@ -16,17 +16,17 @@ #endif #define CppCmd /usr/bin/cpp -@@ -470,6 +470,9 @@ +@@ -469,6 +469,9 @@ #define AsVISOption -Av9a #define AsOutputArchSize 64 #endif +#ifdef PpcArchitecture -+#define XF86INT10_BUILD X86INT10_STUB ++#define XF86INT10_BUILD X86INT10_STUB +#endif #define StandardDefines -DCSRG_BASED -@@ -491,18 +494,8 @@ +@@ -490,18 +493,8 @@ #define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC #endif @@ -42,8 +42,8 @@ -#else -# define OptimizedCDebugFlags -O -#endif -+#define DefaultGcc2i386Opt -+#define OptimizedCDebugFlags FreeBSDCFLAGS ++#define DefaultGcc2i386Opt ++#define OptimizedCDebugFlags FreeBSDCFLAGS #ifndef PreIncDir # define PreIncDir /usr/include Index: x11-servers/XFree86-4-Server/files/patch-bsdResource.c =================================================================== --- x11-servers/XFree86-4-Server/files/patch-bsdResource.c (.../vendor/ports) (revision 277) +++ x11-servers/XFree86-4-Server/files/patch-bsdResource.c (.../xfree-exp) (revision 277) @@ -1,15 +1,15 @@ ---- programs/Xserver/hw/xfree86/os-support/bsd/bsdResource.c.orig Fri Apr 23 21:54:07 2004 -+++ programs/Xserver/hw/xfree86/os-support/bsd/bsdResource.c Tue May 17 00:48:36 2005 +--- programs/Xserver/hw/xfree86/os-support/bsd/bsdResource.c.orig Fri Jul 8 18:26:25 2005 ++++ programs/Xserver/hw/xfree86/os-support/bsd/bsdResource.c Fri Jul 8 18:31:19 2005 @@ -18,7 +18,7 @@ #ifdef INCLUDE_XF86_NO_DOMAIN --#if defined(__alpha__) || defined(__sparc64__) || defined(__amd64__) -+#if defined(__alpha__) || defined(__amd64__) +-#if defined(__alpha__) || defined(__sparc64__) || defined(__amd64__) || \ ++#if defined(__alpha__) || defined(__amd64__) || \ + defined(__x86_64__) resPtr - xf86BusAccWindowsFromOS(void) -@@ -112,7 +112,7 @@ +@@ -113,7 +113,7 @@ return ret; } @@ -18,7 +18,7 @@ resPtr xf86BusAccWindowsFromOS(void) -@@ -123,7 +123,11 @@ +@@ -124,7 +124,11 @@ RANGE(range, 0x00000000, 0xffffffff, ResExcMemBlock); ret = xf86AddResToList(ret, &range, -1); @@ -30,7 +30,7 @@ ret = xf86AddResToList(ret, &range, -1); return ret; } -@@ -137,7 +141,11 @@ +@@ -138,7 +142,11 @@ RANGE(range, 0x00000000, 0xffffffff, ResExcMemBlock); ret = xf86AddResToList(ret, &range, -1); @@ -42,11 +42,11 @@ ret = xf86AddResToList(ret, &range, -1); return ret; } -@@ -153,7 +161,11 @@ +@@ -154,7 +162,11 @@ RANGE(range, 0x00000000, 0xffffffff, ResExcMemBlock); ret = xf86AddResToList(ret, &range, -1); -+#if defined(__sparc__) || defined(__sparc64__) ++#if defined(__sparc__) || defined(__sparc64__) + RANGE(range, 0x00000000, 0x00ffffff, ResExcIoBlock); +#else RANGE(range, 0x00000000, 0x0000ffff, ResExcIoBlock); @@ -54,7 +54,7 @@ ret = xf86AddResToList(ret, &range, -1); return ret; } -@@ -175,7 +187,11 @@ +@@ -176,7 +188,11 @@ ret = xf86AddResToList(ret, &range, -1); RANGE(range, 0x00000000, 0x00000000, ResExcIoBlock); ret = xf86AddResToList(ret, &range, -1); Index: x11-servers/XFree86-4-Server/scripts/configure =================================================================== --- x11-servers/XFree86-4-Server/scripts/configure (.../vendor/ports) (revision 277) +++ x11-servers/XFree86-4-Server/scripts/configure (.../xfree-exp) (revision 277) @@ -26,10 +26,6 @@ # Thanks, Trevor Johnson echo "#define InstallXserverSetUID NO" >> $LOCALDEF -echo "#define XInputDrivers mouse keyboard digitaledge dynapro elo2300 \ - elographics magellan \ - microtouch mutouch spaceorb summa \ - wacom void citron" >> $LOCALDEF echo "#define BuildXF86DRI ${BuildXF86DRI}" >> $LOCALDEF echo "#define BuildXF86DRM NO" >> $LOCALDEF echo "#define HasGlide3 YES" >> $LOCALDEF @@ -49,6 +45,8 @@ BuildCIDFonts \ BuildCyrillicFonts \ BuildHtmlManPages \ + UseMemLeak \ + UseStackTrace \ JoystickSupport \ XnestServer \ BuildFontServer \ @@ -86,25 +84,6 @@ echo "#define FreeBSDCFLAGS ${CFLAGS}" >> $LOCALDEF fi -# We need to test cards on these architectures and see what can be added -# to the other architectures. -cat >> $LOCALDEF <> $LOCALDEF # Copy ORIGDEF to DESTDEF Index: x11-servers/XFree86-4-Server/pkg-plist =================================================================== --- x11-servers/XFree86-4-Server/pkg-plist (.../vendor/ports) (revision 277) +++ x11-servers/XFree86-4-Server/pkg-plist (.../xfree-exp) (revision 277) @@ -79,6 +79,7 @@ lib/X11/getconfig/xfree86.cfg %%AMD64_I386%%lib/modules/drivers/apm_drv.o %%AMD64_I386%%lib/modules/drivers/ark_drv.o +lib/modules/drivers/aspeed_drv.o lib/modules/drivers/ati_drv.o lib/modules/drivers/atimisc_drv.o %%AMD64_I386%%lib/modules/drivers/chips_drv.o @@ -114,6 +115,7 @@ %%SPARC64_NA%%lib/modules/drivers/vga_drv.o %%I386%%lib/modules/drivers/via_drv.o %%I386%%lib/modules/drivers/vmware_drv.o +lib/modules/drivers/xgi_drv.o lib/modules/extensions/libGLcore.a lib/modules/extensions/libdbe.a %%DRI%%lib/modules/extensions/libdri.a @@ -127,18 +129,28 @@ lib/modules/fonts/libtype1.a lib/modules/fonts/libxtt.a %%DRI%%lib/modules/freebsd/libdrm.a +lib/modules/input/acecad_drv.o +lib/modules/input/calcomp_drv.o lib/modules/input/citron_drv.o lib/modules/input/digitaledge_drv.o +lib/modules/input/dmc_drv.o lib/modules/input/dynapro_drv.o -lib/modules/input/elo2300_drv.o +@comment lib/modules/input/elo2300_drv.o lib/modules/input/elographics_drv.o +lib/modules/input/fpit_drv.o +lib/modules/input/hyperpen_drv.o +lib/modules/input/js_x_drv.o lib/modules/input/kbd_drv.o lib/modules/input/magellan_drv.o +lib/modules/input/magictouch_drv.o lib/modules/input/microtouch_drv.o lib/modules/input/mouse_drv.o lib/modules/input/mutouch_drv.o +lib/modules/input/palmax_drv.o +lib/modules/input/penmount_drv.o lib/modules/input/spaceorb_drv.o lib/modules/input/summa_drv.o +lib/modules/input/tek4957_drv.o lib/modules/input/void_drv.o lib/modules/input/wacom_drv.o %%I386%%lib/modules/libafb.a Index: x11-servers/XFree86-4-Server/Makefile =================================================================== --- x11-servers/XFree86-4-Server/Makefile (.../vendor/ports) (revision 277) +++ x11-servers/XFree86-4-Server/Makefile (.../xfree-exp) (revision 277) @@ -6,8 +6,7 @@ # PORTNAME= Server -PORTVERSION= 4.5.0 -PORTREVISION= 3 +PORTVERSION= 4.6.0 CATEGORIES= x11-servers MASTER_SITES= ${MASTER_SITE_XFREE} MASTER_SITE_SUBDIR= ${PORTVERSION} @@ -25,7 +24,7 @@ PATCHDIR= ${MASTERDIR}/files .for pf in patch-Imake.rules patch-Imake.tmpl \ - patch-X11.tmpl patch-Xcursor-Imakefile \ + patch-X11.tmpl \ patch-c2 \ patch-f patch-imake.c \ patch-texteroids patch-xditview-Imakefile patch-xdm \ @@ -76,19 +75,27 @@ XF86VidModeSwitchToMode.3 \ XF86VidModeValidateModeLine.3 MAN4= citron.4x \ + dmc.4x \ dynapro.4x \ elographics.4x \ fbdevhw.4x \ + fpit.4x \ + js_x.4x \ kbd.4x \ keyboard.4x \ + magictouch.4x \ microtouch.4x \ mouse.4x \ mutouch.4x \ nv.4x \ + palmax.4x \ + penmount.4x \ r128.4x \ radeon.4x \ + tek4957.4x \ void.4x \ - wacom.4x + wacom.4x \ + xgi.4x MAN5= XF86Config.5 \ getconfig.5 XBUILD_DIRS= lib/font lib/lbxutil lib/Xdmcp lib/Xau programs/Xserver Index: x11/XFree86-4-libraries/distinfo =================================================================== --- x11/XFree86-4-libraries/distinfo (.../vendor/ports) (revision 277) +++ x11/XFree86-4-libraries/distinfo (.../xfree-exp) (revision 277) @@ -1,9 +1,9 @@ -MD5 (xc/XFree86-4.5.0-src-1.tgz) = 6c0fcf8069c13d068276016bbf6ad712 -SHA256 (xc/XFree86-4.5.0-src-1.tgz) = 0e9fb93a0db5f7f4f78e951d559fae36a0fb0e24683a9918dff7ffee766e0aae -SIZE (xc/XFree86-4.5.0-src-1.tgz) = 10507331 -MD5 (xc/XFree86-4.5.0-src-2.tgz) = cc296c71cbe58edc3ffdec1084e58f4c -SHA256 (xc/XFree86-4.5.0-src-2.tgz) = a50120da18c6caeb151094fa2ab7afc618821c72d3cedf6842f3636880839a09 -SIZE (xc/XFree86-4.5.0-src-2.tgz) = 5826556 -MD5 (xc/XFree86-4.5.0-src-3.tgz) = c0ad630bfec4545857c2877b3e2dcbeb -SHA256 (xc/XFree86-4.5.0-src-3.tgz) = 2719f8055955dce293f2a8a846514d3908fa05b9d053c59b4fe1e09470a054df -SIZE (xc/XFree86-4.5.0-src-3.tgz) = 12086763 +MD5 (xc/XFree86-4.6.0-src-1.tgz) = 6c05f3486f088d01584f4517540e8d18 +SHA256 (xc/XFree86-4.6.0-src-1.tgz) = c724603239ccb446d524613e5dbfb690b6260a2648ffa8e6643ae770a9ac9a54 +SIZE (xc/XFree86-4.6.0-src-1.tgz) = 10448753 +MD5 (xc/XFree86-4.6.0-src-2.tgz) = f084d12aa734c9cd83e8d2a3a4eb3e32 +SHA256 (xc/XFree86-4.6.0-src-2.tgz) = e6cf843da16bd4b696e92038a67ea51a4c0e42b58b0bd84314fc61440aeb5d4f +SIZE (xc/XFree86-4.6.0-src-2.tgz) = 5878680 +MD5 (xc/XFree86-4.6.0-src-3.tgz) = 05450997f1876098d791a4cf9db21af8 +SHA256 (xc/XFree86-4.6.0-src-3.tgz) = 95c754a0b124792f1ac6f2c18eaf2cf4fe394e52c3b9a82234fe2436fdc92dc2 +SIZE (xc/XFree86-4.6.0-src-3.tgz) = 12542143 Index: x11/XFree86-4-libraries/files/patch-Xcursor-Imakefile =================================================================== --- x11/XFree86-4-libraries/files/patch-Xcursor-Imakefile (.../vendor/ports) (revision 277) +++ x11/XFree86-4-libraries/files/patch-Xcursor-Imakefile (.../xfree-exp) (revision 277) @@ -1,11 +0,0 @@ ---- lib/Xcursor/Imakefile.orig Tue May 13 14:34:23 2003 -+++ lib/Xcursor/Imakefile Tue May 13 14:34:34 2003 -@@ -69,8 +69,6 @@ - RemoveFile($@) - sh config-subst $(SUBSTVARS) < xcursor.pc.in > $@ - --InstallNonExecFile(xcursor.pc,$(USRLIBDIR)/pkgconfig) -- - clean:: - RemoveFile(xcursor.pc) - Index: x11/XFree86-4-libraries/files/patch-xdm =================================================================== --- x11/XFree86-4-libraries/files/patch-xdm (.../vendor/ports) (revision 277) +++ x11/XFree86-4-libraries/files/patch-xdm (.../xfree-exp) (revision 277) @@ -1,15 +1,14 @@ ---- programs/xdm/config/Imakefile.orig Tue Apr 20 20:42:01 2004 -+++ programs/xdm/config/Imakefile Sun May 9 22:37:08 2004 -@@ -5,7 +5,7 @@ +--- programs/xdm/config/Imakefile.orig Wed Mar 22 19:32:25 2006 ++++ programs/xdm/config/Imakefile Wed Mar 22 19:34:09 2006 +@@ -1,6 +1,6 @@ + XCOMM $XFree86: xc/programs/xdm/config/Imakefile,v 1.18 2006/01/09 15:01:05 dawes Exp $ - XCOMM $XFree86: xc/programs/xdm/config/Imakefile,v 1.15 2004/01/09 00:25:25 dawes Exp $ - -SERVERSTYPE = XdmServersType +SERVERSTYPE = ws all:: Xservers.ws xdm-config Xservers Xresources -@@ -34,6 +34,8 @@ +@@ -29,6 +29,8 @@ XDMPIDDIR = $(XDMDIR) #endif @@ -18,7 +17,7 @@ #if defined(OpenBSDArchitecture) || defined(NetBSDArchitecture) || defined(FreeBSDArchitecture) || defined(DarwinArchitecture) SU = "su -m" #else -@@ -47,15 +49,15 @@ +@@ -42,15 +44,15 @@ LinkFile(Xservers,Xservers.$(SERVERSTYPE)) #if InstallXdmConfig Index: x11/XFree86-4-libraries/files/patch-programs_Xserver_GL_dri_Imakefile =================================================================== --- x11/XFree86-4-libraries/files/patch-programs_Xserver_GL_dri_Imakefile (.../vendor/ports) (revision 277) +++ x11/XFree86-4-libraries/files/patch-programs_Xserver_GL_dri_Imakefile (.../xfree-exp) (revision 277) @@ -1,11 +1,11 @@ ---- programs/Xserver/GL/dri/Imakefile.orig Sun Jan 23 01:48:51 2005 -+++ programs/Xserver/GL/dri/Imakefile Sun Jan 23 01:49:41 2005 -@@ -59,7 +59,7 @@ +--- programs/Xserver/GL/dri/Imakefile.orig Wed Mar 22 18:51:38 2006 ++++ programs/Xserver/GL/dri/Imakefile Wed Mar 22 18:51:59 2006 +@@ -58,7 +58,7 @@ + OBJS = xf86dri.o dri.o $(MOBJ) - INCLUDES = -I$(SERVERSRC)/include -I$(INCLUDESRC) -I$(XINCLUDESRC) \ - -I$(EXTINCSRC) -I$(MESASRCDIR)/include \ + INCLUDES = -I$(SERVERSRC)/include -I$(MESASRCDIR)/include \ - -I$(XF86OSSRC) -I$(XF86COMSRC) \ + -I$(XF86OSSRC) -I$(XF86OSSRC)/bus -I$(XF86COMSRC) \ -I../include -I../glx -I$(LIBSRC)/GL/include \ - -I$(SERVERSRC)/mi -I$(FONTINCSRC) \ - -I$(DRMSRCDIR)/shared + -I$(SERVERSRC)/mi -I$(DRMINCLUDESDIR) + DEFINES = $(GLX_DEFINES) Index: x11/XFree86-4-libraries/files/patch-FreeBSD.cf =================================================================== --- x11/XFree86-4-libraries/files/patch-FreeBSD.cf (.../vendor/ports) (revision 277) +++ x11/XFree86-4-libraries/files/patch-FreeBSD.cf (.../xfree-exp) (revision 277) @@ -1,6 +1,6 @@ ---- config/cf/FreeBSD.cf.orig Thu Apr 8 05:39:06 2004 -+++ config/cf/FreeBSD.cf Thu Apr 8 06:04:59 2004 -@@ -108,14 +108,14 @@ +--- config/cf/FreeBSD.cf.orig Mon Jun 27 01:02:40 2005 ++++ config/cf/FreeBSD.cf Mon Jun 27 01:02:46 2005 +@@ -153,14 +153,14 @@ # endif # define HasPosixThreads YES # define ThreadedX YES @@ -15,10 +15,10 @@ -# define ThreadsLibraries -lpthread +# define ThreadsLibraries %%PTHREAD_LIBS%% # else + # define NeedThreadStubLibrary YES # if OSRelVersion >= 500043 - # define BuildThreadStubLibrary NO -@@ -125,10 +125,10 @@ - # define NeedUIThrStubs YES +@@ -169,10 +169,10 @@ + # define NeedUIThrStubs YES # endif # if (OSRelVersion >= 500016) -# define ThreadsLibraries -lc_r @@ -28,12 +28,12 @@ -# define ThreadsLibraries -pthread +# define ThreadsLibraries %%PTHREAD_LIBS%% # endif - # define SharedX11Reqs $(LDPRELIB) $(XTHRSTUBLIB) - # define SharedXtReqs $(LDPRELIB) $(XONLYLIB) $(SMLIB) $(ICELIB) $(XTHRSTUBLIB) -@@ -187,11 +187,11 @@ + # if NeedUIThrStubs + # define SharedX11Reqs $(LDPRELIB) $(XTHRSTUBLIB) +@@ -233,11 +233,11 @@ * ld: warning: libXThrStub.so.6, needed by libX11.so, not found */ - #if BuildThreadStubLibrary && (!defined(UseInstalledX11) || !UseInstalledX11) + #if NeedThreadStubLibrary && (!defined(UseInstalledX11) || !UseInstalledX11) -# define CcCmd $(CLIENTENVSETUP) cc -# define CplusplusCmd $(CLIENTENVSETUP) c++ +# define CcCmd $(CLIENTENVSETUP) FreeBSDCC @@ -46,7 +46,7 @@ #endif #define CppCmd /usr/bin/cpp -@@ -354,7 +354,7 @@ +@@ -405,7 +405,7 @@ #ifndef LibraryRpathLoadFlags # if UseRpath # if UseElfFormat @@ -55,7 +55,7 @@ # else # define LibraryRpathLoadFlags -R $(USRLIBDIRPATH) # endif -@@ -439,18 +439,8 @@ +@@ -490,18 +490,8 @@ #define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC #endif Index: x11/XFree86-4-libraries/files/patch-lib_X11_Imakefile =================================================================== --- x11/XFree86-4-libraries/files/patch-lib_X11_Imakefile (.../vendor/ports) (revision 277) +++ x11/XFree86-4-libraries/files/patch-lib_X11_Imakefile (.../xfree-exp) (revision 277) @@ -1,15 +1,15 @@ ---- lib/X11/Imakefile.orig Sun Jan 9 02:58:04 2005 -+++ lib/X11/Imakefile Sun Jan 9 02:59:57 2005 -@@ -10,7 +10,7 @@ +--- lib/X11/Imakefile.orig Wed Mar 22 18:40:26 2006 ++++ lib/X11/Imakefile Wed Mar 22 18:42:52 2006 +@@ -4,7 +4,7 @@ HEADERS = Xlib.h Xresource.h Xutil.h cursorfont.h Xlibint.h \ Xcms.h Xlocale.h XKBlib.h --#if BuildServersOnly && !XnestServer && !BuildGLXLibrary && !BuildClients && !XdmxServer -+#if BuildServersOnly && !XnestServer && !BuildGLXLibrary && !BuildClients && !XdmxServer && !FreeBSDBuildXxserv +-#if (BuildServersOnly || !BuildX11Lib) && !XnestServer && !BuildGLXLibrary && !BuildClients && !XdmxServer ++#if (BuildServersOnly || !BuildX11Lib) && !XnestServer && !BuildGLXLibrary && !BuildClients && !XdmxServer && !FreeBSDBuildXxserv all:: depend:: -@@ -1043,8 +1043,10 @@ +@@ -1039,8 +1039,10 @@ #if InstallXcmsTxt InstallNonExecFile(Xcms.txt,$(LIBDIR)) #endif Index: x11/XFree86-4-libraries/scripts/configure =================================================================== --- x11/XFree86-4-libraries/scripts/configure (.../vendor/ports) (revision 277) +++ x11/XFree86-4-libraries/scripts/configure (.../xfree-exp) (revision 277) @@ -57,6 +57,16 @@ echo "#define FreeBSDBuildXbin NO" >> $LOCALDEF echo "#define UseInstalledPrograms YES" >> $LOCALDEF +# Use installed pswrap(1) +#XXX should use X11BASE/bin/pswrap +echo "#define PsWrap /usr/X11R6/bin/pswrap" >> $LOCALDEF +echo "#define PsWrapDependency /**/" >> $LOCALDEF +echo "PSWRAP = PsWrap" >> $LOCALDEF + +#XXX temporary disable BuildWindowsWMLibrary here +#XXX this probably got into X11.tmpl rev. 1.280 by mistake +echo "#define BuildAppleWMLibrary NO" >> $LOCALDEF + # Copy ORIGDEF to DESTDEF rm -f $DESTDEF cp -f $ORIGDEF $DESTDEF Index: x11/XFree86-4-libraries/pkg-plist =================================================================== --- x11/XFree86-4-libraries/pkg-plist (.../vendor/ports) (revision 277) +++ x11/XFree86-4-libraries/pkg-plist (.../xfree-exp) (revision 277) @@ -192,6 +192,8 @@ include/X11/Xresource.h include/X11/Xthreads.h include/X11/Xutil.h +include/X11/Xw32defs.h +include/X11/Xwinsock.h include/X11/ap_keysym.h include/X11/bitmaps/1x1 include/X11/bitmaps/2x2 @@ -357,22 +359,21 @@ include/X11/extensions/xtestext1.h include/X11/extensions/xteststr.h include/X11/extensions/xtrapbits.h -include/X11/extensions/xtrapddmi.h include/X11/extensions/xtrapdi.h include/X11/extensions/xtrapemacros.h include/X11/extensions/xtraplib.h include/X11/extensions/xtraplibp.h -include/X11/extensions/xtrapproto.h include/X11/fonts/FS.h include/X11/fonts/FSlib.h include/X11/fonts/FSproto.h +include/X11/fonts/font.h include/X11/fonts/fontenc.h +include/X11/fonts/fontproto.h +include/X11/fonts/fontstruct.h include/X11/fonts/fsmasks.h include/X11/keysym.h include/X11/keysymdef.h include/X11/xpm.h -include/xf86Optrec.h -include/xf86Parser.h lib/X11/XErrorDB lib/X11/XKeysymDB lib/X11/Xcms.txt @@ -647,7 +648,6 @@ lib/libpsres.a lib/libpsres.so lib/libpsres.so.1 -lib/libxf86config.a lib/libxkbfile.a lib/libxkbfile.so lib/libxkbfile.so.1 Index: x11/XFree86-4-libraries/Makefile =================================================================== --- x11/XFree86-4-libraries/Makefile (.../vendor/ports) (revision 277) +++ x11/XFree86-4-libraries/Makefile (.../xfree-exp) (revision 277) @@ -6,7 +6,7 @@ # PORTNAME= libraries -PORTVERSION= 4.5.0 +PORTVERSION= 4.6.0 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XFREE} MASTER_SITE_SUBDIR= ${PORTVERSION} Index: x11/XFree86-4-manuals/distinfo =================================================================== --- x11/XFree86-4-manuals/distinfo (.../vendor/ports) (revision 277) +++ x11/XFree86-4-manuals/distinfo (.../xfree-exp) (revision 277) @@ -1,3 +1,3 @@ -MD5 (xc/XFree86-4.5.0-src-1.tgz) = 6c0fcf8069c13d068276016bbf6ad712 -SHA256 (xc/XFree86-4.5.0-src-1.tgz) = 0e9fb93a0db5f7f4f78e951d559fae36a0fb0e24683a9918dff7ffee766e0aae -SIZE (xc/XFree86-4.5.0-src-1.tgz) = 10507331 +MD5 (xc/XFree86-4.6.0-src-1.tgz) = 6c05f3486f088d01584f4517540e8d18 +SHA256 (xc/XFree86-4.6.0-src-1.tgz) = c724603239ccb446d524613e5dbfb690b6260a2648ffa8e6643ae770a9ac9a54 +SIZE (xc/XFree86-4.6.0-src-1.tgz) = 10448753 Index: x11/XFree86-4-manuals/Makefile =================================================================== --- x11/XFree86-4-manuals/Makefile (.../vendor/ports) (revision 277) +++ x11/XFree86-4-manuals/Makefile (.../xfree-exp) (revision 277) @@ -6,7 +6,7 @@ # PORTNAME= manuals -PORTVERSION= 4.5.0 +PORTVERSION= 4.6.0 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XFREE} MASTER_SITE_SUBDIR= ${PORTVERSION} @@ -39,8 +39,7 @@ imake -DUseInstalled ${PROJECTROOT} -I${CFGDIR} \ -DTOPDIR=../.. -DCURDIR=.; \ ${MAKE} Makefiles CONFIGDIR=${CFGDIR} ; \ - ${MAKE} includes ; \ - ${MAKE} depend) + ${MAKE} includes) .include Index: x11/XFree86-4-clients/distinfo =================================================================== --- x11/XFree86-4-clients/distinfo (.../vendor/ports) (revision 277) +++ x11/XFree86-4-clients/distinfo (.../xfree-exp) (revision 277) @@ -1,12 +1,12 @@ -MD5 (xc/XFree86-4.5.0-src-1.tgz) = 6c0fcf8069c13d068276016bbf6ad712 -SHA256 (xc/XFree86-4.5.0-src-1.tgz) = 0e9fb93a0db5f7f4f78e951d559fae36a0fb0e24683a9918dff7ffee766e0aae -SIZE (xc/XFree86-4.5.0-src-1.tgz) = 10507331 -MD5 (xc/XFree86-4.5.0-src-2.tgz) = cc296c71cbe58edc3ffdec1084e58f4c -SHA256 (xc/XFree86-4.5.0-src-2.tgz) = a50120da18c6caeb151094fa2ab7afc618821c72d3cedf6842f3636880839a09 -SIZE (xc/XFree86-4.5.0-src-2.tgz) = 5826556 -MD5 (xc/XFree86-4.5.0-src-3.tgz) = c0ad630bfec4545857c2877b3e2dcbeb -SHA256 (xc/XFree86-4.5.0-src-3.tgz) = 2719f8055955dce293f2a8a846514d3908fa05b9d053c59b4fe1e09470a054df -SIZE (xc/XFree86-4.5.0-src-3.tgz) = 12086763 -MD5 (xc/XFree86-4.5.0-src-4.tgz) = 217bb03a07cf94561b35815ce257c159 -SHA256 (xc/XFree86-4.5.0-src-4.tgz) = 1c9d8aaf7a924b51c759190b3ffb780179936b53866e8bd529f92bf0aab39c8f -SIZE (xc/XFree86-4.5.0-src-4.tgz) = 12328580 +MD5 (xc/XFree86-4.6.0-src-1.tgz) = 6c05f3486f088d01584f4517540e8d18 +SHA256 (xc/XFree86-4.6.0-src-1.tgz) = c724603239ccb446d524613e5dbfb690b6260a2648ffa8e6643ae770a9ac9a54 +SIZE (xc/XFree86-4.6.0-src-1.tgz) = 10448753 +MD5 (xc/XFree86-4.6.0-src-2.tgz) = f084d12aa734c9cd83e8d2a3a4eb3e32 +SHA256 (xc/XFree86-4.6.0-src-2.tgz) = e6cf843da16bd4b696e92038a67ea51a4c0e42b58b0bd84314fc61440aeb5d4f +SIZE (xc/XFree86-4.6.0-src-2.tgz) = 5878680 +MD5 (xc/XFree86-4.6.0-src-3.tgz) = 05450997f1876098d791a4cf9db21af8 +SHA256 (xc/XFree86-4.6.0-src-3.tgz) = 95c754a0b124792f1ac6f2c18eaf2cf4fe394e52c3b9a82234fe2436fdc92dc2 +SIZE (xc/XFree86-4.6.0-src-3.tgz) = 12542143 +MD5 (xc/XFree86-4.6.0-src-4.tgz) = 102ed22d33bd31a5853cb5addb51d7c9 +SHA256 (xc/XFree86-4.6.0-src-4.tgz) = 90063bf72386ed9feb057a6fbf4e3cbc114829a50b465843504e4711f104d829 +SIZE (xc/XFree86-4.6.0-src-4.tgz) = 12344051 Index: x11/XFree86-4-clients/files/patch-programs::fonttosfnt::read.c =================================================================== --- x11/XFree86-4-clients/files/patch-programs::fonttosfnt::read.c (.../vendor/ports) (revision 277) +++ x11/XFree86-4-clients/files/patch-programs::fonttosfnt::read.c (.../xfree-exp) (revision 277) @@ -1,11 +0,0 @@ ---- programs/fonttosfnt/read.c.orig Fri Apr 9 22:31:49 2004 -+++ programs/fonttosfnt/read.c Fri Apr 9 22:32:24 2004 -@@ -28,7 +28,7 @@ - #include FT_BDF_H - #include "X11/Xos.h" - #include "fonttosfnt.h" --#include "fontenc.h" -+#include "X11/fonts/fontenc.h" - - #define FLOOR2(x, y) ((x) >= 0 ? (x) / (y) : -(((-(x)) + (y) - 1) / (y))) - #define CEIL2(x, y) (FLOOR2((x) + (y) - 1, (y))) Index: x11/XFree86-4-clients/scripts/configure =================================================================== --- x11/XFree86-4-clients/scripts/configure (.../vendor/ports) (revision 277) +++ x11/XFree86-4-clients/scripts/configure (.../xfree-exp) (revision 277) @@ -70,6 +70,7 @@ echo "#define PreloadSetup" >> $LOCALDEF echo "#define UseInstalledPrograms YES" >> $LOCALDEF echo "#define UseInstalledLibraries YES" >> $LOCALDEF +echo "#define UseRgbTxt YES" >> $LOCALDEF # Copy ORIGDEF to DESTDEF rm -f $DESTDEF Index: x11/XFree86-4-clients/pkg-plist =================================================================== --- x11/XFree86-4-clients/pkg-plist (.../vendor/ports) (revision 277) +++ x11/XFree86-4-clients/pkg-plist (.../xfree-exp) (revision 277) @@ -16,6 +16,7 @@ bin/bitmap bin/bmtoa bin/cxpm +bin/dbedizzy bin/dga bin/dpsexec bin/dpsinfo @@ -540,6 +541,7 @@ lib/X11/xkb/symbols/digital/vt lib/X11/xkb/symbols/dk lib/X11/xkb/symbols/dvorak +lib/X11/xkb/symbols/dvorak_intl lib/X11/xkb/symbols/ee lib/X11/xkb/symbols/el lib/X11/xkb/symbols/en_US @@ -621,6 +623,7 @@ lib/X11/xkb/symbols/pc/dev lib/X11/xkb/symbols/pc/dk lib/X11/xkb/symbols/pc/dvorak +lib/X11/xkb/symbols/pc/dvorak_intl lib/X11/xkb/symbols/pc/dz lib/X11/xkb/symbols/pc/ee lib/X11/xkb/symbols/pc/el @@ -646,6 +649,7 @@ lib/X11/xkb/symbols/pc/it lib/X11/xkb/symbols/pc/iu lib/X11/xkb/symbols/pc/kan +lib/X11/xkb/symbols/pc/kh lib/X11/xkb/symbols/pc/ky lib/X11/xkb/symbols/pc/la lib/X11/xkb/symbols/pc/lat Index: x11/XFree86-4-clients/Makefile =================================================================== --- x11/XFree86-4-clients/Makefile (.../vendor/ports) (revision 277) +++ x11/XFree86-4-clients/Makefile (.../xfree-exp) (revision 277) @@ -6,8 +6,7 @@ # PORTNAME= clients -PORTVERSION= 4.5.0 -PORTREVISION= 3 +PORTVERSION= 4.6.0 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XFREE} MASTER_SITE_SUBDIR= ${PORTVERSION} @@ -41,7 +40,6 @@ XINSTALL_MAN_DIRS= programs .for pf in patch-bdftruncate.pl patch-ucs2any.pl \ - patch-programs::fonttosfnt::read.c \ patch-programs::Imakefile EXTRA_PATCHES+= ${FILESDIR}/${pf} .endfor Index: x11/XFree86-4-documents/distinfo =================================================================== --- x11/XFree86-4-documents/distinfo (.../vendor/ports) (revision 277) +++ x11/XFree86-4-documents/distinfo (.../xfree-exp) (revision 277) @@ -1,6 +1,6 @@ -MD5 (xc/XFree86-4.5.0-src-1.tgz) = 6c0fcf8069c13d068276016bbf6ad712 -SHA256 (xc/XFree86-4.5.0-src-1.tgz) = 0e9fb93a0db5f7f4f78e951d559fae36a0fb0e24683a9918dff7ffee766e0aae -SIZE (xc/XFree86-4.5.0-src-1.tgz) = 10507331 -MD5 (xc/XFree86-4.5.0-src-6.tgz) = f75cf36c1170c15c5e0de757667151d4 -SHA256 (xc/XFree86-4.5.0-src-6.tgz) = 1219b5934579fc7284953f59e48a71ce48fc75289103247405d15b9519681d59 -SIZE (xc/XFree86-4.5.0-src-6.tgz) = 3257406 +MD5 (xc/XFree86-4.6.0-src-1.tgz) = 6c05f3486f088d01584f4517540e8d18 +SHA256 (xc/XFree86-4.6.0-src-1.tgz) = c724603239ccb446d524613e5dbfb690b6260a2648ffa8e6643ae770a9ac9a54 +SIZE (xc/XFree86-4.6.0-src-1.tgz) = 10448753 +MD5 (xc/XFree86-4.6.0-src-6.tgz) = 4ef4fda3940658f0bd53873e2579d1fa +SHA256 (xc/XFree86-4.6.0-src-6.tgz) = dd68fe86bbcbcab72d75432a6dd73b372dd7994427a77c1d560f73190757f53f +SIZE (xc/XFree86-4.6.0-src-6.tgz) = 3185917 Index: x11/XFree86-4-documents/files/patch-Imakefile =================================================================== --- x11/XFree86-4-documents/files/patch-Imakefile (.../vendor/ports) (revision 277) +++ x11/XFree86-4-documents/files/patch-Imakefile (.../xfree-exp) (revision 277) @@ -1,15 +1,15 @@ ---- Imakefile.orig Wed Feb 2 17:35:34 2005 -+++ Imakefile Wed Feb 2 17:36:07 2005 +--- Imakefile.orig Mon Jun 27 03:36:14 2005 ++++ Imakefile Mon Jun 27 03:38:01 2005 @@ -8,7 +8,7 @@ #else SUBDIRS = BDF CTEXT FSProtocol GL ICCCM ICE PM Render SM X11 XDMCP \ XIM XLFD XProtocol Xaw Xext Xi Xmu Xserver Xt Xv XvMC \ -- i18n programs rstart test xfs xterm xtrans +- i18n programs rstart xfs xterm xtrans + i18n rstart xfs xterm xtrans #endif AllTarget(specindex.html) -@@ -21,6 +21,4 @@ +@@ -20,6 +20,4 @@ #endif CppRawFileTarget(specindex.html,specindex.cpp,$(SPECINDEXDEFS),NullParameter) Index: x11/XFree86-4-documents/Makefile =================================================================== --- x11/XFree86-4-documents/Makefile (.../vendor/ports) (revision 277) +++ x11/XFree86-4-documents/Makefile (.../xfree-exp) (revision 277) @@ -6,7 +6,7 @@ # PORTNAME= documents -PORTVERSION= 4.5.0 +PORTVERSION= 4.6.0 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XFREE} MASTER_SITE_SUBDIR= ${PORTVERSION} @@ -32,8 +32,7 @@ imake -DUseInstalled ${PROJECTROOT} -I. -I${PREFIX}/lib/X11/config \ -DTOPDIR=../.. -DCURDIR=.; \ ${MAKE} Makefiles ; \ - ${MAKE} includes ; \ - ${MAKE} depend) + ${MAKE} includes) .include .if ${X_WINDOW_SYSTEM:L} != xfree86-4 Index: x11/XFree86-4/Makefile =================================================================== --- x11/XFree86-4/Makefile (.../vendor/ports) (revision 277) +++ x11/XFree86-4/Makefile (.../xfree-exp) (revision 277) @@ -6,7 +6,7 @@ # PORTNAME= XFree86 -PORTVERSION= 4.5.0 +PORTVERSION= 4.6.0 PORTEPOCH= 1 CATEGORIES= x11 MASTER_SITES= # none