diff options
| author | Eric Anholt <anholt@FreeBSD.org> | 2004-12-23 01:35:49 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@FreeBSD.org> | 2004-12-23 01:35:49 +0000 |
| commit | c90ee83f03de6ce87bf86a6daf09a0010f59c46d (patch) | |
| tree | 589d40624d0cb825807bd5fe7f399d8769657bb1 /x11-servers | |
| parent | 51e87664b4189e288b48026b85579b9a4be3df5e (diff) | |
| download | ports-c90ee83f03de6ce87bf86a6daf09a0010f59c46d.tar.gz ports-c90ee83f03de6ce87bf86a6daf09a0010f59c46d.zip | |
Notes
Diffstat (limited to 'x11-servers')
53 files changed, 1137 insertions, 1227 deletions
diff --git a/x11-servers/XFree86-4-FontServer/scripts/configure b/x11-servers/XFree86-4-FontServer/scripts/configure index d7ff8bbdbfec..fb6e7475f125 100644 --- a/x11-servers/XFree86-4-FontServer/scripts/configure +++ b/x11-servers/XFree86-4-FontServer/scripts/configure @@ -31,6 +31,7 @@ for i in BuildFonts \ BuildCIDFonts \ BuildCyrillicFonts \ BuildLatin2Fonts \ + BuildHtmlManPages \ XF86Server \ XnestServer \ XVirtualFramebufferServer \ diff --git a/x11-servers/XFree86-4-NestServer/scripts/configure b/x11-servers/XFree86-4-NestServer/scripts/configure index 8fc815ae2bc3..63f1ce26feed 100644 --- a/x11-servers/XFree86-4-NestServer/scripts/configure +++ b/x11-servers/XFree86-4-NestServer/scripts/configure @@ -31,6 +31,7 @@ for i in BuildFonts \ BuildCIDFonts \ BuildCyrillicFonts \ BuildLatin2Fonts \ + BuildHtmlManPages \ XF86Server \ BuildFontServer \ XVirtualFramebufferServer \ diff --git a/x11-servers/XFree86-4-PrintServer/scripts/configure b/x11-servers/XFree86-4-PrintServer/scripts/configure index 9d48ed85c7eb..2dafb5a3dc33 100644 --- a/x11-servers/XFree86-4-PrintServer/scripts/configure +++ b/x11-servers/XFree86-4-PrintServer/scripts/configure @@ -31,6 +31,7 @@ for i in BuildFonts \ BuildCIDFonts \ BuildCyrillicFonts \ BuildLatin2Fonts \ + BuildHtmlManPages \ XF86Server \ BuildFontServer \ XnestServer \ diff --git a/x11-servers/XFree86-4-Server/scripts/configure b/x11-servers/XFree86-4-Server/scripts/configure index 6cb146e0a8f5..56650d6df900 100644 --- a/x11-servers/XFree86-4-Server/scripts/configure +++ b/x11-servers/XFree86-4-Server/scripts/configure @@ -44,6 +44,7 @@ for i in \ BuildType1Fonts \ BuildCIDFonts \ BuildCyrillicFonts \ + BuildHtmlManPages \ JoystickSupport \ XnestServer \ BuildFontServer \ diff --git a/x11-servers/XFree86-4-VirtualFramebufferServer/scripts/configure b/x11-servers/XFree86-4-VirtualFramebufferServer/scripts/configure index 337ae27342e8..159baea5aff2 100644 --- a/x11-servers/XFree86-4-VirtualFramebufferServer/scripts/configure +++ b/x11-servers/XFree86-4-VirtualFramebufferServer/scripts/configure @@ -32,6 +32,7 @@ for i in BuildFonts \ BuildCIDFonts \ BuildCyrillicFonts \ BuildLatin2Fonts \ + BuildHtmlManPages \ XF86Server \ BuildFontServer \ XnestServer \ diff --git a/x11-servers/xorg-fontserver/Makefile b/x11-servers/xorg-fontserver/Makefile index 633aa5e3b32c..05a37a85afd4 100644 --- a/x11-servers/xorg-fontserver/Makefile +++ b/x11-servers/xorg-fontserver/Makefile @@ -6,13 +6,12 @@ # PORTNAME= xorg-fontserver -PORTVERSION= 6.7.0 +PORTVERSION= 6.8.1 CATEGORIES= x11-servers -MASTER_SITES= http://freedesktop.org/~xorg/X11R6.7.0/src/ \ - ${MASTER_SITE_XORG} -MASTER_SITE_SUBDIR= R6.7/tars -DISTFILES= X11R6.7.0-src1.tar.gz \ - X11R6.7.0-src2.tar.gz +MASTER_SITES= ${MASTER_SITE_XORG} +MASTER_SITE_SUBDIR= X11R${PORTVERSION}/tars +DISTFILES= X11R${PORTVERSION}-src1.tar.gz \ + X11R${PORTVERSION}-src2.tar.gz MAINTAINER= x11@FreeBSD.org COMMENT= X font server from X.Org diff --git a/x11-servers/xorg-fontserver/distinfo b/x11-servers/xorg-fontserver/distinfo index 5407fad4d658..dd8c450c9273 100644 --- a/x11-servers/xorg-fontserver/distinfo +++ b/x11-servers/xorg-fontserver/distinfo @@ -1,4 +1,4 @@ -MD5 (xorg/X11R6.7.0-src1.tar.gz) = 22465263bae7a2e9f5ad77e172cf1ab5 -SIZE (xorg/X11R6.7.0-src1.tar.gz) = 30039655 -MD5 (xorg/X11R6.7.0-src2.tar.gz) = 6ef4e8f7647a28f080c10ea1bcf01f79 -SIZE (xorg/X11R6.7.0-src2.tar.gz) = 5739983 +MD5 (xorg/X11R6.8.1-src1.tar.gz) = e352319d423391ff2c03bb7f81fe8d2b +SIZE (xorg/X11R6.8.1-src1.tar.gz) = 30562401 +MD5 (xorg/X11R6.8.1-src2.tar.gz) = 6ba36becf1133c61a88c92e1d60c19ed +SIZE (xorg/X11R6.8.1-src2.tar.gz) = 5808949 diff --git a/x11-servers/xorg-fontserver/pkg-plist b/x11-servers/xorg-fontserver/pkg-plist index 745bd3781c4d..ce88bda544d2 100644 --- a/x11-servers/xorg-fontserver/pkg-plist +++ b/x11-servers/xorg-fontserver/pkg-plist @@ -1,2 +1,3 @@ bin/xfs +@unexec if cmp -s %D/lib/X11/fs/config.default %D/lib/X11/fs/config; then rm -f %D/lib/X11/fs/config; fi lib/X11/fs/config.default diff --git a/x11-servers/xorg-nestserver/Makefile b/x11-servers/xorg-nestserver/Makefile index 384393fb3a59..7bdc061a8c92 100644 --- a/x11-servers/xorg-nestserver/Makefile +++ b/x11-servers/xorg-nestserver/Makefile @@ -6,12 +6,12 @@ # PORTNAME= xorg-nestserver -PORTVERSION= 6.7.0 +PORTVERSION= 6.8.1 CATEGORIES= x11-servers -MASTER_SITES= http://freedesktop.org/~xorg/X11R6.7.0/src/ \ - ${MASTER_SITE_XORG} -DISTFILES= X11R6.7.0-src1.tar.gz \ - X11R6.7.0-src3.tar.gz +MASTER_SITES= ${MASTER_SITE_XORG} +MASTER_SITE_SUBDIR= X11R${PORTVERSION}/tars +DISTFILES= X11R${PORTVERSION}-src1.tar.gz \ + X11R${PORTVERSION}-src3.tar.gz MAINTAINER= x11@FreeBSD.org COMMENT= Nesting X server from X.Org @@ -22,7 +22,7 @@ EXTRA_PATCHES= ${CF_PATCHES} ${SERVER_PATCHES} USE_XLIB= yes -XBUILD_DIRS= lib/font programs/Xserver +XBUILD_DIRS= lib/font programs/Xserver/miext/damage programs/Xserver XINCLUDE_DIRS= lib/xtrans XMAN_DIRS= programs/Xserver/hw/xnest diff --git a/x11-servers/xorg-nestserver/distinfo b/x11-servers/xorg-nestserver/distinfo index b9025936ccb4..62c1647dc07b 100644 --- a/x11-servers/xorg-nestserver/distinfo +++ b/x11-servers/xorg-nestserver/distinfo @@ -1,4 +1,4 @@ -MD5 (xorg/X11R6.7.0-src1.tar.gz) = 22465263bae7a2e9f5ad77e172cf1ab5 -SIZE (xorg/X11R6.7.0-src1.tar.gz) = 30039655 -MD5 (xorg/X11R6.7.0-src3.tar.gz) = 4c7144786522bbce383b21ace72bf669 -SIZE (xorg/X11R6.7.0-src3.tar.gz) = 10855793 +MD5 (xorg/X11R6.8.1-src1.tar.gz) = e352319d423391ff2c03bb7f81fe8d2b +SIZE (xorg/X11R6.8.1-src1.tar.gz) = 30562401 +MD5 (xorg/X11R6.8.1-src3.tar.gz) = 8578e566e909e7c40300f44b6f0e88d3 +SIZE (xorg/X11R6.8.1-src3.tar.gz) = 10014808 diff --git a/x11-servers/xorg-nestserver/scripts/configure b/x11-servers/xorg-nestserver/scripts/configure index bd755d6c6e17..b3d181fc51d9 100644 --- a/x11-servers/xorg-nestserver/scripts/configure +++ b/x11-servers/xorg-nestserver/scripts/configure @@ -6,6 +6,7 @@ rm -f $LOCALDEF echo "#define BuildServer YES" >> $LOCALDEF echo "#define BuildServersOnly YES" >> $LOCALDEF echo "#define XprtServer NO" >> $LOCALDEF +echo "#define BuildXprint NO" >> $LOCALDEF echo "#define XnestServer YES" >> $LOCALDEF echo "#define XorgServer NO" >> $LOCALDEF echo "#define XVirtualFramebufferServer NO" >> $LOCALDEF diff --git a/x11-servers/xorg-printserver/Makefile b/x11-servers/xorg-printserver/Makefile index 6a6e8a904edd..e0eff898c59d 100644 --- a/x11-servers/xorg-printserver/Makefile +++ b/x11-servers/xorg-printserver/Makefile @@ -6,13 +6,12 @@ # PORTNAME= xorg-printserver -PORTVERSION= 6.7.0 +PORTVERSION= 6.8.1 CATEGORIES= x11-servers -MASTER_SITES= http://freedesktop.org/~xorg/X11R6.7.0/src/ \ - ${MASTER_SITE_XORG} -MASTER_SITE_SUBDIR= R6.7/tars -DISTFILES= X11R6.7.0-src1.tar.gz \ - X11R6.7.0-src3.tar.gz +MASTER_SITES= ${MASTER_SITE_XORG} +MASTER_SITE_SUBDIR= X11R${PORTVERSION}/tars +DISTFILES= X11R${PORTVERSION}-src1.tar.gz \ + X11R${PORTVERSION}-src3.tar.gz MAINTAINER= x11@FreeBSD.org COMMENT= X Print server from X.Org @@ -27,6 +26,8 @@ XBUILD_DIRS= lib/font programs/Xserver XINCLUDE_DIRS= lib/xtrans XMAN_DIRS= programs/Xserver +MAN7= Xprint.7 + .include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc" .include <bsd.port.pre.mk> .if ${X_WINDOW_SYSTEM:L} != xorg diff --git a/x11-servers/xorg-printserver/distinfo b/x11-servers/xorg-printserver/distinfo index b9025936ccb4..62c1647dc07b 100644 --- a/x11-servers/xorg-printserver/distinfo +++ b/x11-servers/xorg-printserver/distinfo @@ -1,4 +1,4 @@ -MD5 (xorg/X11R6.7.0-src1.tar.gz) = 22465263bae7a2e9f5ad77e172cf1ab5 -SIZE (xorg/X11R6.7.0-src1.tar.gz) = 30039655 -MD5 (xorg/X11R6.7.0-src3.tar.gz) = 4c7144786522bbce383b21ace72bf669 -SIZE (xorg/X11R6.7.0-src3.tar.gz) = 10855793 +MD5 (xorg/X11R6.8.1-src1.tar.gz) = e352319d423391ff2c03bb7f81fe8d2b +SIZE (xorg/X11R6.8.1-src1.tar.gz) = 30562401 +MD5 (xorg/X11R6.8.1-src3.tar.gz) = 8578e566e909e7c40300f44b6f0e88d3 +SIZE (xorg/X11R6.8.1-src3.tar.gz) = 10014808 diff --git a/x11-servers/xorg-printserver/pkg-plist b/x11-servers/xorg-printserver/pkg-plist index 0646e79271d4..9903b9835f79 100644 --- a/x11-servers/xorg-printserver/pkg-plist +++ b/x11-servers/xorg-printserver/pkg-plist @@ -1 +1,890 @@ bin/Xprt +etc/rc.d/xprint +lib/X11/xserver/C/print/Xprinters +lib/X11/xserver/C/print/attributes/document +lib/X11/xserver/C/print/attributes/job +lib/X11/xserver/C/print/attributes/printer +lib/X11/xserver/C/print/ddx-config/raster/pcl +lib/X11/xserver/C/print/ddx-config/raster/postscript +lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/AvantGarde-Book.pmf +lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/AvantGarde-BookOblique.pmf +lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/AvantGarde-Demi.pmf +lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/AvantGarde-DemiOblique.pmf +lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/Courier-Bold.pmf +lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/Courier-BoldOblique.pmf +lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/Courier-Oblique.pmf +lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/Courier.pmf +lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/Helvetica-Bold.pmf +lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/Helvetica-BoldOblique.pmf +lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/Helvetica-Oblique.pmf +lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/Helvetica.pmf +lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/LubalinGraph-Book.pmf +lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/LubalinGraph-BookOblique.pmf +lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/LubalinGraph-Demi.pmf +lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/LubalinGraph-DemiOblique.pmf +lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/NewCenturySchlbk-Bold.pmf +lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/NewCenturySchlbk-BoldItalic.pmf +lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/NewCenturySchlbk-Italic.pmf +lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/NewCenturySchlbk-Roman.pmf +lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/Souvenir-Demi.pmf +lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/Souvenir-DemiItalic.pmf +lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/Souvenir-Light.pmf +lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/Souvenir-LightItalic.pmf +lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/Symbol.pmf +lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/Times-Bold.pmf +lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/Times-BoldItalic.pmf +lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/Times-Italic.pmf +lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/Times-Roman.pmf +lib/X11/xserver/C/print/models/CANONC3200-PS/fonts/ZapfDingbats.pmf +lib/X11/xserver/C/print/models/CANONC3200-PS/model-config +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00051.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00052.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00053.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00054.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00055.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00056.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00057.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00058.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00059.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00060.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00061.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00062.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00063.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00064.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00065.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00066.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00067.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00068.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00069.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00070.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00071.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00072.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00073.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00074.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00075.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00076.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00077.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00079.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00080.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00081.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00082.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00083.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00084.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00085.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00086.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00087.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00088.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00089.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00090.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00091.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00092.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00093.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00094.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/README +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/fonts.alias +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/fonts.dir +lib/X11/xserver/C/print/models/HPDJ1600C/fonts/lpr0ye1a.pmf +lib/X11/xserver/C/print/models/HPDJ1600C/model-config +lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/AvantGarde-Book.pmf +lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/AvantGarde-BookOblique.pmf +lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/AvantGarde-Demi.pmf +lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/AvantGarde-DemiOblique.pmf +lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/Courier-Bold.pmf +lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/Courier-BoldOblique.pmf +lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/Courier-Oblique.pmf +lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/Courier.pmf +lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/Helvetica-Bold.pmf +lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/Helvetica-BoldOblique.pmf +lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/Helvetica-Oblique.pmf +lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/Helvetica.pmf +lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/LubalinGraph-Book.pmf +lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/LubalinGraph-BookOblique.pmf +lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/LubalinGraph-Demi.pmf +lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/LubalinGraph-DemiOblique.pmf +lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/NewCenturySchlbk-Bold.pmf +lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/NewCenturySchlbk-BoldItalic.pmf +lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/NewCenturySchlbk-Italic.pmf +lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/NewCenturySchlbk-Roman.pmf +lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/Souvenir-Demi.pmf +lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/Souvenir-DemiItalic.pmf +lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/Souvenir-Light.pmf +lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/Souvenir-LightItalic.pmf +lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/Symbol.pmf +lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/Times-Bold.pmf +lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/Times-BoldItalic.pmf +lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/Times-Italic.pmf +lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/Times-Roman.pmf +lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts/ZapfDingbats.pmf +lib/X11/xserver/C/print/models/HPLJ4050-PS/model-config +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00051.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00052.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00053.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00054.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00055.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00056.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00057.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00058.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00059.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00060.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00061.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00062.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00063.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00064.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00065.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00066.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00067.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00068.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00069.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00070.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00071.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00072.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00073.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00074.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00075.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00076.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00077.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00079.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00080.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00081.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00082.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00083.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00084.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00085.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00086.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00087.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00088.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00089.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00090.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00091.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00092.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00093.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00094.pmf +lib/X11/xserver/C/print/models/HPLJ4family/fonts/README +lib/X11/xserver/C/print/models/HPLJ4family/fonts/fonts.alias +lib/X11/xserver/C/print/models/HPLJ4family/fonts/fonts.dir +lib/X11/xserver/C/print/models/HPLJ4family/fonts/lpr0ye1a.pmf +lib/X11/xserver/C/print/models/HPLJ4family/model-config +lib/X11/xserver/C/print/models/PSdefault/fonts/AvantGarde-Book.pmf +lib/X11/xserver/C/print/models/PSdefault/fonts/AvantGarde-BookOblique.pmf +lib/X11/xserver/C/print/models/PSdefault/fonts/AvantGarde-Demi.pmf +lib/X11/xserver/C/print/models/PSdefault/fonts/AvantGarde-DemiOblique.pmf +lib/X11/xserver/C/print/models/PSdefault/fonts/Courier-Bold.pmf +lib/X11/xserver/C/print/models/PSdefault/fonts/Courier-BoldOblique.pmf +lib/X11/xserver/C/print/models/PSdefault/fonts/Courier-Oblique.pmf +lib/X11/xserver/C/print/models/PSdefault/fonts/Courier.pmf +lib/X11/xserver/C/print/models/PSdefault/fonts/Helvetica-Bold.pmf +lib/X11/xserver/C/print/models/PSdefault/fonts/Helvetica-BoldOblique.pmf +lib/X11/xserver/C/print/models/PSdefault/fonts/Helvetica-Oblique.pmf +lib/X11/xserver/C/print/models/PSdefault/fonts/Helvetica.pmf +lib/X11/xserver/C/print/models/PSdefault/fonts/LubalinGraph-Book.pmf +lib/X11/xserver/C/print/models/PSdefault/fonts/LubalinGraph-BookOblique.pmf +lib/X11/xserver/C/print/models/PSdefault/fonts/LubalinGraph-Demi.pmf +lib/X11/xserver/C/print/models/PSdefault/fonts/LubalinGraph-DemiOblique.pmf +lib/X11/xserver/C/print/models/PSdefault/fonts/NewCenturySchlbk-Bold.pmf +lib/X11/xserver/C/print/models/PSdefault/fonts/NewCenturySchlbk-BoldItalic.pmf +lib/X11/xserver/C/print/models/PSdefault/fonts/NewCenturySchlbk-Italic.pmf +lib/X11/xserver/C/print/models/PSdefault/fonts/NewCenturySchlbk-Roman.pmf +lib/X11/xserver/C/print/models/PSdefault/fonts/Souvenir-Demi.pmf +lib/X11/xserver/C/print/models/PSdefault/fonts/Souvenir-DemiItalic.pmf +lib/X11/xserver/C/print/models/PSdefault/fonts/Souvenir-Light.pmf +lib/X11/xserver/C/print/models/PSdefault/fonts/Souvenir-LightItalic.pmf +lib/X11/xserver/C/print/models/PSdefault/fonts/Symbol.pmf +lib/X11/xserver/C/print/models/PSdefault/fonts/Times-Bold.pmf +lib/X11/xserver/C/print/models/PSdefault/fonts/Times-BoldItalic.pmf +lib/X11/xserver/C/print/models/PSdefault/fonts/Times-Italic.pmf +lib/X11/xserver/C/print/models/PSdefault/fonts/Times-Roman.pmf +lib/X11/xserver/C/print/models/PSdefault/fonts/ZapfDingbats.pmf +lib/X11/xserver/C/print/models/PSdefault/model-config +lib/X11/xserver/C/print/models/PSspooldir/fonts +lib/X11/xserver/C/print/models/PSspooldir/model-config +lib/X11/xserver/C/print/models/PSspooldir/spooltodir.sh +lib/X11/xserver/C/print/models/SPSPARC2/fonts/Courier-Bold.pmf +lib/X11/xserver/C/print/models/SPSPARC2/fonts/Courier-BoldOblique.pmf +lib/X11/xserver/C/print/models/SPSPARC2/fonts/Courier-Oblique.pmf +lib/X11/xserver/C/print/models/SPSPARC2/fonts/Courier.pmf +lib/X11/xserver/C/print/models/SPSPARC2/fonts/Helvetica-Bold.pmf +lib/X11/xserver/C/print/models/SPSPARC2/fonts/Helvetica-BoldOblique.pmf +lib/X11/xserver/C/print/models/SPSPARC2/fonts/Helvetica-Oblique.pmf +lib/X11/xserver/C/print/models/SPSPARC2/fonts/Helvetica.pmf +lib/X11/xserver/C/print/models/SPSPARC2/fonts/Symbol.pmf +lib/X11/xserver/C/print/models/SPSPARC2/fonts/Times-Bold.pmf +lib/X11/xserver/C/print/models/SPSPARC2/fonts/Times-BoldItalic.pmf +lib/X11/xserver/C/print/models/SPSPARC2/fonts/Times-Italic.pmf +lib/X11/xserver/C/print/models/SPSPARC2/fonts/Times-Roman.pmf +lib/X11/xserver/C/print/models/SPSPARC2/model-config +lib/X11/xserver/POSIX +lib/X11/xserver/README +lib/X11/xserver/SecurityPolicy +lib/X11/xserver/af_ZA +lib/X11/xserver/af_ZA.iso88591 +lib/X11/xserver/ar +lib/X11/xserver/ar_AE +lib/X11/xserver/ar_AE.iso88596 +lib/X11/xserver/ar_AE.utf8 +lib/X11/xserver/ar_BH +lib/X11/xserver/ar_BH.iso88596 +lib/X11/xserver/ar_BH.utf8 +lib/X11/xserver/ar_DZ +lib/X11/xserver/ar_DZ.iso88596 +lib/X11/xserver/ar_DZ.utf8 +lib/X11/xserver/ar_EG +lib/X11/xserver/ar_EG.ISO8859-6 +lib/X11/xserver/ar_EG.UTF-8 +lib/X11/xserver/ar_EG.iso88596 +lib/X11/xserver/ar_EG.utf8 +lib/X11/xserver/ar_IN.utf8 +lib/X11/xserver/ar_IQ +lib/X11/xserver/ar_IQ.iso88596 +lib/X11/xserver/ar_IQ.utf8 +lib/X11/xserver/ar_JO +lib/X11/xserver/ar_JO.iso88596 +lib/X11/xserver/ar_JO.utf8 +lib/X11/xserver/ar_KW +lib/X11/xserver/ar_KW.iso88596 +lib/X11/xserver/ar_KW.utf8 +lib/X11/xserver/ar_LB +lib/X11/xserver/ar_LB.iso88596 +lib/X11/xserver/ar_LB.utf8 +lib/X11/xserver/ar_LY +lib/X11/xserver/ar_LY.iso88596 +lib/X11/xserver/ar_LY.utf8 +lib/X11/xserver/ar_MA +lib/X11/xserver/ar_MA.iso88596 +lib/X11/xserver/ar_MA.utf8 +lib/X11/xserver/ar_OM +lib/X11/xserver/ar_OM.iso88596 +lib/X11/xserver/ar_OM.utf8 +lib/X11/xserver/ar_QA +lib/X11/xserver/ar_QA.iso88596 +lib/X11/xserver/ar_QA.utf8 +lib/X11/xserver/ar_SA +lib/X11/xserver/ar_SA.iso88596 +lib/X11/xserver/ar_SA.utf8 +lib/X11/xserver/ar_SD +lib/X11/xserver/ar_SD.iso88596 +lib/X11/xserver/ar_SD.utf8 +lib/X11/xserver/ar_SY +lib/X11/xserver/ar_SY.iso88596 +lib/X11/xserver/ar_SY.utf8 +lib/X11/xserver/ar_TN +lib/X11/xserver/ar_TN.iso88596 +lib/X11/xserver/ar_TN.utf8 +lib/X11/xserver/ar_YE +lib/X11/xserver/ar_YE.iso88596 +lib/X11/xserver/ar_YE.utf8 +lib/X11/xserver/be_BY +lib/X11/xserver/be_BY.cp1251 +lib/X11/xserver/be_BY.utf8 +lib/X11/xserver/bg_BG +lib/X11/xserver/bg_BG.ISO8859-5 +lib/X11/xserver/bg_BG.cp1251 +lib/X11/xserver/bg_BG.utf8 +lib/X11/xserver/bokmal +lib/X11/xserver/br_FR +lib/X11/xserver/br_FR.iso88591 +lib/X11/xserver/bs_BA +lib/X11/xserver/bs_BA.iso88592 +lib/X11/xserver/ca +lib/X11/xserver/ca.ISO8859-1 +lib/X11/xserver/ca.ISO8859-15 +lib/X11/xserver/ca_ES +lib/X11/xserver/ca_ES.ISO8859-1 +lib/X11/xserver/ca_ES.ISO8859-15 +lib/X11/xserver/ca_ES.iso88591 +lib/X11/xserver/ca_ES.iso885915@euro +lib/X11/xserver/ca_ES.utf8 +lib/X11/xserver/ca_ES@euro +lib/X11/xserver/catalan +lib/X11/xserver/croatian +lib/X11/xserver/cs_CZ +lib/X11/xserver/cs_CZ.ISO8859-2 +lib/X11/xserver/cs_CZ.iso88592 +lib/X11/xserver/cs_CZ.utf8 +lib/X11/xserver/cy_GB +lib/X11/xserver/cy_GB.iso885914 +lib/X11/xserver/cz +lib/X11/xserver/cz.ISO8859-2 +lib/X11/xserver/czech +lib/X11/xserver/da +lib/X11/xserver/da.ISO8859-1 +lib/X11/xserver/da.ISO8859-15 +lib/X11/xserver/da_DK +lib/X11/xserver/da_DK.ISO8859-1 +lib/X11/xserver/da_DK.ISO8859-15 +lib/X11/xserver/da_DK.iso88591 +lib/X11/xserver/da_DK.iso885915 +lib/X11/xserver/da_DK.utf8 +lib/X11/xserver/danish +lib/X11/xserver/dansk +lib/X11/xserver/de +lib/X11/xserver/de.ISO8859-1 +lib/X11/xserver/de.ISO8859-15 +lib/X11/xserver/de.UTF-8 +lib/X11/xserver/de_AT +lib/X11/xserver/de_AT.ISO8859-1 +lib/X11/xserver/de_AT.ISO8859-15 +lib/X11/xserver/de_AT.iso88591 +lib/X11/xserver/de_AT.iso885915@euro +lib/X11/xserver/de_AT.utf8 +lib/X11/xserver/de_AT@euro +lib/X11/xserver/de_BE +lib/X11/xserver/de_BE.iso88591 +lib/X11/xserver/de_BE.iso885915@euro +lib/X11/xserver/de_BE@euro +lib/X11/xserver/de_CH +lib/X11/xserver/de_CH.ISO8859-1 +lib/X11/xserver/de_CH.iso88591 +lib/X11/xserver/de_CH.utf8 +lib/X11/xserver/de_DE +lib/X11/xserver/de_DE.ISO8859-1 +lib/X11/xserver/de_DE.ISO8859-15 +lib/X11/xserver/de_DE.UTF-8 +lib/X11/xserver/de_DE.iso88591 +lib/X11/xserver/de_DE.iso885915@euro +lib/X11/xserver/de_DE.utf8 +lib/X11/xserver/de_DE@euro +lib/X11/xserver/de_LU +lib/X11/xserver/de_LU.iso88591 +lib/X11/xserver/de_LU.iso885915@euro +lib/X11/xserver/de_LU.utf8 +lib/X11/xserver/de_LU@euro +lib/X11/xserver/deutsch +lib/X11/xserver/el_GR +lib/X11/xserver/el_GR.ISO8859-7 +lib/X11/xserver/el_GR.ISO8859-7@euro +lib/X11/xserver/el_GR.iso88597 +lib/X11/xserver/el_GR.utf8 +lib/X11/xserver/en_AU +lib/X11/xserver/en_AU.ISO8859-1 +lib/X11/xserver/en_AU.iso88591 +lib/X11/xserver/en_AU.utf8 +lib/X11/xserver/en_BW +lib/X11/xserver/en_BW.iso88591 +lib/X11/xserver/en_CA +lib/X11/xserver/en_CA.ISO8859-1 +lib/X11/xserver/en_CA.iso88591 +lib/X11/xserver/en_CA.utf8 +lib/X11/xserver/en_DK +lib/X11/xserver/en_DK.iso88591 +lib/X11/xserver/en_GB +lib/X11/xserver/en_GB.ISO8859-1 +lib/X11/xserver/en_GB.ISO8859-15 +lib/X11/xserver/en_GB.iso88591 +lib/X11/xserver/en_GB.iso885915 +lib/X11/xserver/en_GB.utf8 +lib/X11/xserver/en_HK +lib/X11/xserver/en_HK.iso88591 +lib/X11/xserver/en_IE +lib/X11/xserver/en_IE.ISO8859-1 +lib/X11/xserver/en_IE.ISO8859-15 +lib/X11/xserver/en_IE.iso88591 +lib/X11/xserver/en_IE.iso885915@euro +lib/X11/xserver/en_IE.utf8 +lib/X11/xserver/en_IE@euro +lib/X11/xserver/en_IN +lib/X11/xserver/en_IN.utf8 +lib/X11/xserver/en_NZ +lib/X11/xserver/en_NZ.ISO8859-1 +lib/X11/xserver/en_NZ.iso88591 +lib/X11/xserver/en_NZ.utf8 +lib/X11/xserver/en_PH +lib/X11/xserver/en_PH.iso88591 +lib/X11/xserver/en_SG +lib/X11/xserver/en_SG.iso88591 +lib/X11/xserver/en_US.ISO8859-1 +lib/X11/xserver/en_US.ISO8859-15 +lib/X11/xserver/en_US.UTF-8 +lib/X11/xserver/en_US.iso88591 +lib/X11/xserver/en_US.iso885915 +lib/X11/xserver/en_US.utf8 +lib/X11/xserver/en_US/print/Xprinters +lib/X11/xserver/en_US/print/attributes/document +lib/X11/xserver/en_US/print/attributes/job +lib/X11/xserver/en_US/print/attributes/printer +lib/X11/xserver/en_US/print/ddx-config +lib/X11/xserver/en_US/print/models +lib/X11/xserver/en_ZA +lib/X11/xserver/en_ZA.iso88591 +lib/X11/xserver/en_ZA.utf8 +lib/X11/xserver/en_ZW +lib/X11/xserver/en_ZW.iso88591 +lib/X11/xserver/es_AR +lib/X11/xserver/es_AR.ISO8859-1 +lib/X11/xserver/es_AR.iso88591 +lib/X11/xserver/es_AR.utf8 +lib/X11/xserver/es_BO +lib/X11/xserver/es_BO.ISO8859-1 +lib/X11/xserver/es_BO.iso88591 +lib/X11/xserver/es_BO.utf8 +lib/X11/xserver/es_CL +lib/X11/xserver/es_CL.ISO8859-1 +lib/X11/xserver/es_CL.iso88591 +lib/X11/xserver/es_CL.utf8 +lib/X11/xserver/es_CO +lib/X11/xserver/es_CO.ISO8859-1 +lib/X11/xserver/es_CO.iso88591 +lib/X11/xserver/es_CO.utf8 +lib/X11/xserver/es_CR +lib/X11/xserver/es_CR.ISO8859-1 +lib/X11/xserver/es_CR.iso88591 +lib/X11/xserver/es_CR.utf8 +lib/X11/xserver/es_DO +lib/X11/xserver/es_DO.iso88591 +lib/X11/xserver/es_DO.utf8 +lib/X11/xserver/es_EC +lib/X11/xserver/es_EC.ISO8859-1 +lib/X11/xserver/es_EC.iso88591 +lib/X11/xserver/es_EC.utf8 +lib/X11/xserver/es_ES +lib/X11/xserver/es_ES.ISO8859-1 +lib/X11/xserver/es_ES.ISO8859-15 +lib/X11/xserver/es_ES.UTF-8 +lib/X11/xserver/es_ES.iso88591 +lib/X11/xserver/es_ES.iso885915@euro +lib/X11/xserver/es_ES.utf8 +lib/X11/xserver/es_ES@euro +lib/X11/xserver/es_GT +lib/X11/xserver/es_GT.ISO8859-1 +lib/X11/xserver/es_GT.iso88591 +lib/X11/xserver/es_GT.utf8 +lib/X11/xserver/es_HN +lib/X11/xserver/es_HN.iso88591 +lib/X11/xserver/es_HN.utf8 +lib/X11/xserver/es_MX +lib/X11/xserver/es_MX.ISO8859-1 +lib/X11/xserver/es_MX.iso88591 +lib/X11/xserver/es_MX.utf8 +lib/X11/xserver/es_NI +lib/X11/xserver/es_NI.ISO8859-1 +lib/X11/xserver/es_NI.iso88591 +lib/X11/xserver/es_NI.utf8 +lib/X11/xserver/es_PA +lib/X11/xserver/es_PA.ISO8859-1 +lib/X11/xserver/es_PA.iso88591 +lib/X11/xserver/es_PA.utf8 +lib/X11/xserver/es_PE +lib/X11/xserver/es_PE.ISO8859-1 +lib/X11/xserver/es_PE.iso88591 +lib/X11/xserver/es_PE.utf8 +lib/X11/xserver/es_PR +lib/X11/xserver/es_PR.iso88591 +lib/X11/xserver/es_PR.utf8 +lib/X11/xserver/es_PY +lib/X11/xserver/es_PY.ISO8859-1 +lib/X11/xserver/es_PY.iso88591 +lib/X11/xserver/es_PY.utf8 +lib/X11/xserver/es_SV +lib/X11/xserver/es_SV.ISO8859-1 +lib/X11/xserver/es_SV.iso88591 +lib/X11/xserver/es_SV.utf8 +lib/X11/xserver/es_US +lib/X11/xserver/es_US.iso88591 +lib/X11/xserver/es_UY +lib/X11/xserver/es_UY.ISO8859-1 +lib/X11/xserver/es_UY.iso88591 +lib/X11/xserver/es_UY.utf8 +lib/X11/xserver/es_VE +lib/X11/xserver/es_VE.ISO8859-1 +lib/X11/xserver/es_VE.iso88591 +lib/X11/xserver/es_VE.utf8 +lib/X11/xserver/et_EE +lib/X11/xserver/et_EE.ISO8859-15 +lib/X11/xserver/et_EE.iso88591 +lib/X11/xserver/et_EE.utf8 +lib/X11/xserver/eu_ES +lib/X11/xserver/eu_ES.iso88591 +lib/X11/xserver/eu_ES.iso885915@euro +lib/X11/xserver/eu_ES@euro +lib/X11/xserver/fa_IR.utf8 +lib/X11/xserver/fi_FI +lib/X11/xserver/fi_FI.ISO8859-1 +lib/X11/xserver/fi_FI.ISO8859-15 +lib/X11/xserver/fi_FI.UTF-8 +lib/X11/xserver/fi_FI.iso88591 +lib/X11/xserver/fi_FI.iso885915@euro +lib/X11/xserver/fi_FI.utf8 +lib/X11/xserver/fi_FI@euro +lib/X11/xserver/fo_FO +lib/X11/xserver/fo_FO.iso88591 +lib/X11/xserver/fo_FO.utf8 +lib/X11/xserver/fr_BE +lib/X11/xserver/fr_BE.ISO8859-1 +lib/X11/xserver/fr_BE.ISO8859-15 +lib/X11/xserver/fr_BE.UTF-8 +lib/X11/xserver/fr_BE.iso88591 +lib/X11/xserver/fr_BE.iso885915@euro +lib/X11/xserver/fr_BE.utf8 +lib/X11/xserver/fr_BE@euro +lib/X11/xserver/fr_CA +lib/X11/xserver/fr_CA.ISO8859-1 +lib/X11/xserver/fr_CA.iso88591 +lib/X11/xserver/fr_CA.utf8 +lib/X11/xserver/fr_CH +lib/X11/xserver/fr_CH.ISO8859-1 +lib/X11/xserver/fr_CH.iso88591 +lib/X11/xserver/fr_CH.utf8 +lib/X11/xserver/fr_FR +lib/X11/xserver/fr_FR.ISO8859-1 +lib/X11/xserver/fr_FR.ISO8859-15 +lib/X11/xserver/fr_FR.UTF-8 +lib/X11/xserver/fr_FR.iso88591 +lib/X11/xserver/fr_FR.iso885915@euro +lib/X11/xserver/fr_FR.utf8 +lib/X11/xserver/fr_FR@euro +lib/X11/xserver/fr_LU +lib/X11/xserver/fr_LU.iso88591 +lib/X11/xserver/fr_LU.iso885915@euro +lib/X11/xserver/fr_LU.utf8 +lib/X11/xserver/fr_LU@euro +lib/X11/xserver/ga_IE +lib/X11/xserver/ga_IE.iso88591 +lib/X11/xserver/ga_IE.iso885915@euro +lib/X11/xserver/ga_IE.utf8 +lib/X11/xserver/ga_IE@euro +lib/X11/xserver/gl_ES +lib/X11/xserver/gl_ES.iso88591 +lib/X11/xserver/gl_ES.iso885915@euro +lib/X11/xserver/gl_ES.utf8 +lib/X11/xserver/gl_ES@euro +lib/X11/xserver/gv_GB +lib/X11/xserver/gv_GB.iso88591 +lib/X11/xserver/he +lib/X11/xserver/he_IL +lib/X11/xserver/he_IL.ISO8859-8 +lib/X11/xserver/he_IL.UTF-8 +lib/X11/xserver/he_IL.iso88598 +lib/X11/xserver/he_IL.utf8 +lib/X11/xserver/hebrew +lib/X11/xserver/hi_IN.UTF-8 +lib/X11/xserver/hi_IN.utf8 +lib/X11/xserver/hr_HR +lib/X11/xserver/hr_HR.ISO8859-2 +lib/X11/xserver/hr_HR.iso88592 +lib/X11/xserver/hr_HR.utf8 +lib/X11/xserver/hu_HU +lib/X11/xserver/hu_HU.ISO8859-2 +lib/X11/xserver/hu_HU.iso88592 +lib/X11/xserver/hu_HU.utf8 +lib/X11/xserver/id_ID +lib/X11/xserver/id_ID.iso88591 +lib/X11/xserver/id_ID.utf8 +lib/X11/xserver/is_IS +lib/X11/xserver/is_IS.ISO8859-1 +lib/X11/xserver/is_IS.iso88591 +lib/X11/xserver/is_IS.utf8 +lib/X11/xserver/it +lib/X11/xserver/it.ISO8859-1 +lib/X11/xserver/it.ISO8859-15 +lib/X11/xserver/it.UTF-8 +lib/X11/xserver/it_CH +lib/X11/xserver/it_CH.iso88591 +lib/X11/xserver/it_CH.utf8 +lib/X11/xserver/it_IT +lib/X11/xserver/it_IT.ISO8859-1 +lib/X11/xserver/it_IT.ISO8859-15 +lib/X11/xserver/it_IT.UTF-8 +lib/X11/xserver/it_IT.iso88591 +lib/X11/xserver/it_IT.iso885915@euro +lib/X11/xserver/it_IT.utf8 +lib/X11/xserver/it_IT@euro +lib/X11/xserver/italian +lib/X11/xserver/iw_IL +lib/X11/xserver/iw_IL.iso88598 +lib/X11/xserver/ja +lib/X11/xserver/ja_JP +lib/X11/xserver/ja_JP.EUC +lib/X11/xserver/ja_JP.PCK +lib/X11/xserver/ja_JP.UTF-8 +lib/X11/xserver/ja_JP.eucJP +lib/X11/xserver/ja_JP.eucjp +lib/X11/xserver/ja_JP.sjis +lib/X11/xserver/ja_JP.ujis +lib/X11/xserver/ja_JP.utf8 +lib/X11/xserver/japan +lib/X11/xserver/japanese +lib/X11/xserver/japanese.euc +lib/X11/xserver/japanese.sjis +lib/X11/xserver/ka_GE +lib/X11/xserver/ka_GE.georgianps +lib/X11/xserver/kl_GL +lib/X11/xserver/kl_GL.iso88591 +lib/X11/xserver/kl_GL.utf8 +lib/X11/xserver/ko +lib/X11/xserver/ko.UTF-8 +lib/X11/xserver/ko_KR +lib/X11/xserver/ko_KR.EUC +lib/X11/xserver/ko_KR.EUC@dict +lib/X11/xserver/ko_KR.UTF-8 +lib/X11/xserver/ko_KR.UTF-8@dict +lib/X11/xserver/ko_KR.euckr +lib/X11/xserver/ko_KR.utf8 +lib/X11/xserver/korean +lib/X11/xserver/korean.euc +lib/X11/xserver/kw_GB +lib/X11/xserver/kw_GB.iso88591 +lib/X11/xserver/lithuanian +lib/X11/xserver/lt +lib/X11/xserver/lt.ISO8859-13 +lib/X11/xserver/lt_LT +lib/X11/xserver/lt_LT.ISO8859-13 +lib/X11/xserver/lt_LT.iso885913 +lib/X11/xserver/lt_LT.utf8 +lib/X11/xserver/lv +lib/X11/xserver/lv.ISO8859-13 +lib/X11/xserver/lv_LV +lib/X11/xserver/lv_LV.ISO8859-13 +lib/X11/xserver/lv_LV.iso885913 +lib/X11/xserver/lv_LV.utf8 +lib/X11/xserver/mi_NZ +lib/X11/xserver/mi_NZ.iso885913 +lib/X11/xserver/mk_MK +lib/X11/xserver/mk_MK.ISO8859-5 +lib/X11/xserver/mk_MK.iso88595 +lib/X11/xserver/mk_MK.utf8 +lib/X11/xserver/mr_IN.utf8 +lib/X11/xserver/ms_MY +lib/X11/xserver/ms_MY.iso88591 +lib/X11/xserver/mt_MT +lib/X11/xserver/mt_MT.iso88593 +lib/X11/xserver/nb_NO +lib/X11/xserver/nb_NO.ISO-8859-1 +lib/X11/xserver/nl +lib/X11/xserver/nl.ISO8859-1 +lib/X11/xserver/nl.ISO8859-15 +lib/X11/xserver/nl_BE +lib/X11/xserver/nl_BE.ISO8859-1 +lib/X11/xserver/nl_BE.ISO8859-15 +lib/X11/xserver/nl_BE.iso88591 +lib/X11/xserver/nl_BE.iso885915@euro +lib/X11/xserver/nl_BE.utf8 +lib/X11/xserver/nl_BE@euro +lib/X11/xserver/nl_NL +lib/X11/xserver/nl_NL.ISO8859-1 +lib/X11/xserver/nl_NL.ISO8859-15 +lib/X11/xserver/nl_NL.iso88591 +lib/X11/xserver/nl_NL.iso885915@euro +lib/X11/xserver/nl_NL.utf8 +lib/X11/xserver/nl_NL@euro +lib/X11/xserver/nn_NO +lib/X11/xserver/nn_NO.iso88591 +lib/X11/xserver/no +lib/X11/xserver/no.ISO8859-1 +lib/X11/xserver/no_NO +lib/X11/xserver/no_NO.ISO8859-1@bokmal +lib/X11/xserver/no_NO.ISO8859-1@nynorsk +lib/X11/xserver/no_NO.iso88591 +lib/X11/xserver/no_NO.utf8 +lib/X11/xserver/norwegian +lib/X11/xserver/oc_FR +lib/X11/xserver/oc_FR.iso88591 +lib/X11/xserver/pl_PL +lib/X11/xserver/pl_PL.ISO8859-2 +lib/X11/xserver/pl_PL.UTF-8 +lib/X11/xserver/pl_PL.iso88592 +lib/X11/xserver/pl_PL.utf8 +lib/X11/xserver/polish +lib/X11/xserver/portuguese +lib/X11/xserver/pt +lib/X11/xserver/pt.ISO8859-1 +lib/X11/xserver/pt.ISO8859-15 +lib/X11/xserver/pt_BR +lib/X11/xserver/pt_BR.ISO8859-1 +lib/X11/xserver/pt_BR.UTF-8 +lib/X11/xserver/pt_BR.iso88591 +lib/X11/xserver/pt_BR.utf8 +lib/X11/xserver/pt_PT +lib/X11/xserver/pt_PT.ISO8859-1 +lib/X11/xserver/pt_PT.ISO8859-15 +lib/X11/xserver/pt_PT.iso88591 +lib/X11/xserver/pt_PT.iso885915@euro +lib/X11/xserver/pt_PT.utf8 +lib/X11/xserver/pt_PT@euro +lib/X11/xserver/ro_RO +lib/X11/xserver/ro_RO.ISO8859-2 +lib/X11/xserver/ro_RO.iso88592 +lib/X11/xserver/ro_RO.utf8 +lib/X11/xserver/romanian +lib/X11/xserver/ru +lib/X11/xserver/ru.ISO8859-5 +lib/X11/xserver/ru.UTF-8 +lib/X11/xserver/ru.ansi1251 +lib/X11/xserver/ru.koi8-r +lib/X11/xserver/ru_RU +lib/X11/xserver/ru_RU.ANSI1251 +lib/X11/xserver/ru_RU.ISO8859-5 +lib/X11/xserver/ru_RU.KOI8-R +lib/X11/xserver/ru_RU.UTF-8 +lib/X11/xserver/ru_RU.iso88595 +lib/X11/xserver/ru_RU.koi8r +lib/X11/xserver/ru_RU.utf8 +lib/X11/xserver/ru_SU +lib/X11/xserver/ru_UA +lib/X11/xserver/ru_UA.koi8u +lib/X11/xserver/russian +lib/X11/xserver/se_NO +lib/X11/xserver/se_NO.utf8 +lib/X11/xserver/sh +lib/X11/xserver/sh.ISO8859-2 +lib/X11/xserver/sh_BA.ISO8859-2@bosnia +lib/X11/xserver/sh_YU +lib/X11/xserver/sh_YU.iso88592 +lib/X11/xserver/sh_YU.utf8 +lib/X11/xserver/sk +lib/X11/xserver/sk.ISO8859-2 +lib/X11/xserver/sk_SK +lib/X11/xserver/sk_SK.ISO8859-2 +lib/X11/xserver/sk_SK.iso88592 +lib/X11/xserver/sk_SK.utf8 +lib/X11/xserver/sl_SI +lib/X11/xserver/sl_SI.ISO8859-2 +lib/X11/xserver/sl_SI.iso88592 +lib/X11/xserver/sl_SI.utf8 +lib/X11/xserver/slovak +lib/X11/xserver/slovene +lib/X11/xserver/slovenian +lib/X11/xserver/spanish +lib/X11/xserver/sq_AL +lib/X11/xserver/sq_AL.ISO8859-2 +lib/X11/xserver/sq_AL.iso88591 +lib/X11/xserver/sq_AL.utf8 +lib/X11/xserver/sr_SP +lib/X11/xserver/sr_SP.ISO8859-5 +lib/X11/xserver/sr_YU +lib/X11/xserver/sr_YU.ISO8859-5 +lib/X11/xserver/sr_YU.iso88592 +lib/X11/xserver/sr_YU.iso88595@cyrillic +lib/X11/xserver/sr_YU.utf8 +lib/X11/xserver/sr_YU@cyrillic +lib/X11/xserver/su +lib/X11/xserver/su.ISO8859-1 +lib/X11/xserver/sv +lib/X11/xserver/sv.ISO8859-1 +lib/X11/xserver/sv.ISO8859-15 +lib/X11/xserver/sv.UTF-8 +lib/X11/xserver/sv_FI +lib/X11/xserver/sv_FI.iso88591 +lib/X11/xserver/sv_FI.iso885915@euro +lib/X11/xserver/sv_FI.utf8 +lib/X11/xserver/sv_FI@euro +lib/X11/xserver/sv_SE +lib/X11/xserver/sv_SE.ISO8859-1 +lib/X11/xserver/sv_SE.ISO8859-15 +lib/X11/xserver/sv_SE.UTF-8 +lib/X11/xserver/sv_SE.iso88591 +lib/X11/xserver/sv_SE.iso885915 +lib/X11/xserver/sv_SE.utf8 +lib/X11/xserver/swedish +lib/X11/xserver/ta_IN +lib/X11/xserver/ta_IN.utf8 +lib/X11/xserver/te_IN +lib/X11/xserver/te_IN.utf8 +lib/X11/xserver/tg_TJ +lib/X11/xserver/tg_TJ.koi8t +lib/X11/xserver/th +lib/X11/xserver/th_TH +lib/X11/xserver/th_TH.ISO8859-11 +lib/X11/xserver/th_TH.TIS620 +lib/X11/xserver/th_TH.UTF-8 +lib/X11/xserver/th_TH.tis620 +lib/X11/xserver/th_TH.utf8 +lib/X11/xserver/thai +lib/X11/xserver/tl_PH +lib/X11/xserver/tl_PH.iso88591 +lib/X11/xserver/tr +lib/X11/xserver/tr.ISO8859-9 +lib/X11/xserver/tr_TR +lib/X11/xserver/tr_TR.ISO8859-9 +lib/X11/xserver/tr_TR.UTF-8 +lib/X11/xserver/tr_TR.iso88599 +lib/X11/xserver/tr_TR.utf8 +lib/X11/xserver/turkish +lib/X11/xserver/uk_UA +lib/X11/xserver/uk_UA.koi8u +lib/X11/xserver/uk_UA.utf8 +lib/X11/xserver/ur_PK +lib/X11/xserver/ur_PK.utf8 +lib/X11/xserver/uz_UZ +lib/X11/xserver/uz_UZ.iso88591 +lib/X11/xserver/vi_VN +lib/X11/xserver/vi_VN.tcvn +lib/X11/xserver/vi_VN.utf8 +lib/X11/xserver/wa_BE +lib/X11/xserver/wa_BE.iso88591 +lib/X11/xserver/wa_BE.iso885915@euro +lib/X11/xserver/wa_BE@euro +lib/X11/xserver/yi_US +lib/X11/xserver/yi_US.cp1255 +lib/X11/xserver/zh +lib/X11/xserver/zh.GBK +lib/X11/xserver/zh.UTF-8 +lib/X11/xserver/zh_CN +lib/X11/xserver/zh_CN.EUC +lib/X11/xserver/zh_CN.EUC@pinyin +lib/X11/xserver/zh_CN.EUC@radical +lib/X11/xserver/zh_CN.EUC@stroke +lib/X11/xserver/zh_CN.GB18030 +lib/X11/xserver/zh_CN.GB18030@pinyin +lib/X11/xserver/zh_CN.GB18030@radical +lib/X11/xserver/zh_CN.GB18030@stroke +lib/X11/xserver/zh_CN.GBK +lib/X11/xserver/zh_CN.GBK@pinyin +lib/X11/xserver/zh_CN.GBK@radical +lib/X11/xserver/zh_CN.GBK@stroke +lib/X11/xserver/zh_CN.UTF-8 +lib/X11/xserver/zh_CN.UTF-8@pinyin +lib/X11/xserver/zh_CN.UTF-8@radical +lib/X11/xserver/zh_CN.UTF-8@stroke +lib/X11/xserver/zh_CN.gb18030 +lib/X11/xserver/zh_CN.gb2312 +lib/X11/xserver/zh_CN.gbk +lib/X11/xserver/zh_CN.utf8 +lib/X11/xserver/zh_HK +lib/X11/xserver/zh_HK.BIG5HK +lib/X11/xserver/zh_HK.BIG5HK@radical +lib/X11/xserver/zh_HK.BIG5HK@stroke +lib/X11/xserver/zh_HK.UTF-8 +lib/X11/xserver/zh_HK.UTF-8@radical +lib/X11/xserver/zh_HK.UTF-8@stroke +lib/X11/xserver/zh_HK.big5hkscs +lib/X11/xserver/zh_HK.utf8 +lib/X11/xserver/zh_TW +lib/X11/xserver/zh_TW.BIG5 +lib/X11/xserver/zh_TW.BIG5@pinyin +lib/X11/xserver/zh_TW.BIG5@radical +lib/X11/xserver/zh_TW.BIG5@stroke +lib/X11/xserver/zh_TW.BIG5@zhuyin +lib/X11/xserver/zh_TW.EUC +lib/X11/xserver/zh_TW.EUC@pinyin +lib/X11/xserver/zh_TW.EUC@radical +lib/X11/xserver/zh_TW.EUC@stroke +lib/X11/xserver/zh_TW.EUC@zhuyin +lib/X11/xserver/zh_TW.UTF-8 +lib/X11/xserver/zh_TW.UTF-8@pinyin +lib/X11/xserver/zh_TW.UTF-8@radical +lib/X11/xserver/zh_TW.UTF-8@stroke +lib/X11/xserver/zh_TW.UTF-8@zhuyin +lib/X11/xserver/zh_TW.big5 +lib/X11/xserver/zh_TW.euctw +lib/X11/xserver/zh_TW.utf8 +@dirrm lib/X11/xserver/C/print/attributes +@dirrm lib/X11/xserver/C/print/ddx-config/raster +@dirrm lib/X11/xserver/C/print/ddx-config +@dirrm lib/X11/xserver/C/print/models/PSdefault/fonts +@dirrm lib/X11/xserver/C/print/models/PSdefault +@dirrm lib/X11/xserver/C/print/models/SPSPARC2/fonts +@dirrm lib/X11/xserver/C/print/models/SPSPARC2 +@dirrm lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts +@dirrm lib/X11/xserver/C/print/models/HPLJ4050-PS +@dirrm lib/X11/xserver/C/print/models/CANONC3200-PS/fonts +@dirrm lib/X11/xserver/C/print/models/CANONC3200-PS +@dirrm lib/X11/xserver/C/print/models/PSspooldir +@dirrm lib/X11/xserver/C/print/models/HPDJ1600C/fonts +@dirrm lib/X11/xserver/C/print/models/HPDJ1600C +@dirrm lib/X11/xserver/C/print/models/HPLJ4family/fonts +@dirrm lib/X11/xserver/C/print/models/HPLJ4family +@dirrm lib/X11/xserver/C/print/models +@dirrm lib/X11/xserver/C/print +@dirrm lib/X11/xserver/en_US/print/attributes +@dirrm lib/X11/xserver/en_US/print +@dirrm lib/X11/xserver/en_US +@dirrm lib/X11/xserver/C diff --git a/x11-servers/xorg-server-snap/Makefile b/x11-servers/xorg-server-snap/Makefile index f69043a31cc9..cf6cfb301ca3 100644 --- a/x11-servers/xorg-server-snap/Makefile +++ b/x11-servers/xorg-server-snap/Makefile @@ -5,16 +5,13 @@ # $FreeBSD$ # -PORTNAME= server -PORTVERSION= 6.7.0 -PORTREVISION= 9 +PORTNAME= xorg-server +PORTVERSION= 6.8.1 CATEGORIES= x11-servers -MASTER_SITES= http://freedesktop.org/~xorg/X11R6.7.0/src/ \ - ${MASTER_SITE_XORG} -MASTER_SITE_SUBDIR= R6.7/tars -PKGNAMEPREFIX= xorg- -DISTFILES= X11R6.7.0-src1.tar.gz \ - X11R6.7.0-src3.tar.gz +MASTER_SITES= ${MASTER_SITE_XORG} +MASTER_SITE_SUBDIR= X11R6.8.1/tars +DISTFILES= X11R${PORTVERSION}-src1.tar.gz \ + X11R${PORTVERSION}-src3.tar.gz MAINTAINER= x11@FreeBSD.org COMMENT= X.Org X server and related programs diff --git a/x11-servers/xorg-server-snap/Makefile.inc b/x11-servers/xorg-server-snap/Makefile.inc index 79a81701d363..7d7e1cf76d11 100644 --- a/x11-servers/xorg-server-snap/Makefile.inc +++ b/x11-servers/xorg-server-snap/Makefile.inc @@ -16,6 +16,7 @@ DIST_SUBDIR?= xorg WRKSRC?= ${WRKDIR}/xc USE_X_PREFIX?= no PREFIX?= ${X11BASE} +MTREE_FILE= /etc/mtree/BSD.x11-4.dist USE_IMAKE= YES .if defined(XMAN_DIRS) @@ -41,17 +42,10 @@ CF_PATCHES= ${PORTSDIR}/x11-servers/xorg-server/files/patch-FreeBSD.cf \ SERVER_PATCHES= ${PORTSDIR}/x11-servers/xorg-server/files/patch-Xserver-Imakefile \ ${PORTSDIR}/x11-servers/xorg-server/files/patch-alpha_video.c \ - ${PORTSDIR}/x11-servers/xorg-server/files/patch-bus-Imakefile \ - ${PORTSDIR}/x11-servers/xorg-server/files/patch-fb-renderfixes.diff \ - ${PORTSDIR}/x11-servers/xorg-server/files/patch-kernel-Imakefile \ - ${PORTSDIR}/x11-servers/xorg-server/files/patch-loadmod.c \ ${PORTSDIR}/x11-servers/xorg-server/files/patch-man-Imakefile \ ${PORTSDIR}/x11-servers/xorg-server/files/patch-os-Imakefile \ ${PORTSDIR}/x11-servers/xorg-server/files/patch-savage-pci-id \ - ${PORTSDIR}/x11-servers/xorg-server/files/patch-xf86Events.c \ - ${PORTSDIR}/x11-servers/xorg-server/files/patch-xf86fbman.c \ ${PORTSDIR}/x11-servers/xorg-server/files/patch-xf86sym.c \ - ${PORTSDIR}/x11-servers/xorg-server/files/patch-xf86drmCompat.c \ ${PORTSDIR}/x11-servers/xorg-server/files/patch-xkbout.c \ ${PORTSDIR}/x11-servers/xorg-server/files/patch-xorgconfig.c @@ -91,6 +85,5 @@ do-install: @for dir in ${XMAN_DIRS}; do \ cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${MAKE} install.man; \ done - @${MKHTMLINDEX} ${PREFIX}/lib/X11/doc/html .endif diff --git a/x11-servers/xorg-server-snap/distinfo b/x11-servers/xorg-server-snap/distinfo index 971093cb9d9e..62c1647dc07b 100644 --- a/x11-servers/xorg-server-snap/distinfo +++ b/x11-servers/xorg-server-snap/distinfo @@ -1,8 +1,4 @@ -MD5 (xorg/X11R6.7.0-src1.tar.gz) = 22465263bae7a2e9f5ad77e172cf1ab5 -SIZE (xorg/X11R6.7.0-src1.tar.gz) = 30039655 -MD5 (xorg/X11R6.7.0-src2.tar.gz) = 6ef4e8f7647a28f080c10ea1bcf01f79 -SIZE (xorg/X11R6.7.0-src2.tar.gz) = 5739983 -MD5 (xorg/X11R6.7.0-src3.tar.gz) = 4c7144786522bbce383b21ace72bf669 -SIZE (xorg/X11R6.7.0-src3.tar.gz) = 10855793 -MD5 (xorg/Wraphelp2.gz) = bd1910492087442288d885412e2e5535 -SIZE (xorg/Wraphelp2.gz) = 3376 +MD5 (xorg/X11R6.8.1-src1.tar.gz) = e352319d423391ff2c03bb7f81fe8d2b +SIZE (xorg/X11R6.8.1-src1.tar.gz) = 30562401 +MD5 (xorg/X11R6.8.1-src3.tar.gz) = 8578e566e909e7c40300f44b6f0e88d3 +SIZE (xorg/X11R6.8.1-src3.tar.gz) = 10014808 diff --git a/x11-servers/xorg-server-snap/files/patch-FreeBSD.cf b/x11-servers/xorg-server-snap/files/patch-FreeBSD.cf index c0139fdbeec7..391afe1b7cae 100644 --- a/x11-servers/xorg-server-snap/files/patch-FreeBSD.cf +++ b/x11-servers/xorg-server-snap/files/patch-FreeBSD.cf @@ -1,54 +1,44 @@ ---- config/cf/FreeBSD.cf.orig Fri Apr 2 13:47:10 2004 -+++ config/cf/FreeBSD.cf Fri May 7 17:32:47 2004 -@@ -109,7 +109,7 @@ - # endif - # define HasPosixThreads YES - # define ThreadedX YES --# define SystemMTDefines -D_REENTRANT -D_THREAD_SAFE -+# define SystemMTDefines FreeBSDPTHREAD_CFLAGS - /* - * FreeBSD has tread-safe api but no getpwnam_r yet. - */ -@@ -119,9 +119,8 @@ - # else - # define MTSafeAPIDefines -DXUSE_MTSAFE_API +--- config/cf/FreeBSD.cf.orig Sat Aug 14 17:03:36 2004 ++++ config/cf/FreeBSD.cf Sat Sep 11 15:18:01 2004 +@@ -78,6 +78,7 @@ + #define HasIssetugid YES + #define HasPoll YES + #endif ++#define BuildHtmlManPages NO + + #if OSMajorVersion >= 4 + #define HasGetIfAddrs YES +@@ -117,14 +118,8 @@ + # if (OSRelVersion < 500043) + # define NeedUIThrStubs YES # endif --# if HasLibPthread +-# if (OSRelVersion >= 502102) -# define ThreadsLibraries -lpthread +-# elif (OSRelVersion >= 500016) +-# define ThreadsLibraries -lc_r -# else +-# define ThreadsLibraries -pthread +-# endif +-# define SystemMTDefines -D_THREAD_SAFE +# define ThreadsLibraries FreeBSDPTHREAD_LIBS -+# if !HasLibPthread - # if OSRelVersion >= 500043 - # define BuildThreadStubLibrary NO - # define NeedUIThrStubs NO -@@ -130,10 +129,7 @@ - # define NeedUIThrStubs YES - # endif - # if (OSRelVersion >= 500016) --# define ThreadsLibraries -lc_r - # define SharedGLReqs $(LDPRELIBS) $(XLIB) -lc --# else --# define ThreadsLibraries -pthread - # endif - # define SharedX11Reqs $(LDPRELIB) $(XTHRSTUBLIB) - # define SharedXtReqs $(LDPRELIB) $(XONLYLIB) $(SMLIB) $(ICELIB) $(XTHRSTUBLIB) -@@ -192,11 +188,11 @@ - * ld: warning: libXThrStub.so.6, needed by libX11.so, not found - */ - #if BuildThreadStubLibrary && (!defined(UseInstalledX11) || !UseInstalledX11) --# define CcCmd $(CLIENTENVSETUP) cc --# define CplusplusCmd $(CLIENTENVSETUP) c++ -+# define CcCmd $(CLIENTENVSETUP) FreeBSDCC -+# define CplusplusCmd $(CLIENTENVSETUP) FreeBSDCXX - #else --# define CcCmd cc --# define CplusplusCmd c++ -+# define CcCmd FreeBSDCC -+# define CplusplusCmd FreeBSDCXX ++# define SystemMTDefines FreeBSDPTHREAD_CFLAGS + #endif + + /* This fixes linking C programs against libGLU on FreeBSD 3.x */ +@@ -173,10 +168,10 @@ #endif + #ifndef CcCmd +-#define CcCmd cc ++#define CcCmd FreeBSDCC + #endif + #ifndef CplusplusCmd +-#define CplusplusCmd c++ ++#define CplusplusCmd FreeBSDCXX + #endif #define CppCmd /usr/bin/cpp -@@ -359,7 +355,7 @@ + #define PreProcessCmd CppCmd +@@ -338,7 +333,7 @@ #ifndef LibraryRpathLoadFlags # if UseRpath # if UseElfFormat @@ -57,7 +47,7 @@ # else # define LibraryRpathLoadFlags -R $(USRLIBDIRPATH) # endif -@@ -452,18 +450,8 @@ +@@ -463,18 +458,8 @@ #define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC #endif diff --git a/x11-servers/xorg-server-snap/files/patch-Library.tmpl b/x11-servers/xorg-server-snap/files/patch-Library.tmpl index bbebc76c13e0..e94aae3bfc60 100644 --- a/x11-servers/xorg-server-snap/files/patch-Library.tmpl +++ b/x11-servers/xorg-server-snap/files/patch-Library.tmpl @@ -1,21 +1,21 @@ ---- config/cf/Library.tmpl.orig Mon Aug 27 10:40:55 2001 -+++ config/cf/Library.tmpl Wed Oct 16 21:53:13 2002 -@@ -300,6 +300,10 @@ +--- config/cf/Library.tmpl.orig Mon May 24 12:06:57 2004 ++++ config/cf/Library.tmpl Fri Sep 10 21:46:00 2004 +@@ -389,7 +389,7 @@ */ #ifndef MakeStringsDependency -+#if defined(UseInstalled) || defined(UseInstalledPrograms) -+#define MakeStringsDependency @@\ -+MAKESTRS = makestrs -+#else - # define MakeStringsDependency @@\ +-# ifndef UseInstalled ++# if !defined(UseInstalled) && !defined(UseInstalledPrograms) + # define MakeStringsDependency @@\ MAKESTRS = $(CONFIGSRC)/util/makestrs @@\ NoCmpScript(HostProgramTargetName($(MAKESTRS)) $(MAKESTRS).Osuf) @@\ -@@ -308,6 +312,7 @@ - cd $(CONFIGSRC)/util && $(MAKE) HostProgramTargetName(makestrs) @@\ +@@ -399,7 +399,8 @@ @@\ includes:: HostProgramTargetName($(MAKESTRS)) -+#endif + # else +-# define MakeStringsDependency /**/ ++# define MakeStringsDependency @@\ ++MAKESTRS = makestrs + # endif #endif - #ifndef ToolkitMakeStrings diff --git a/x11-servers/xorg-server-snap/files/patch-X11.tmpl b/x11-servers/xorg-server-snap/files/patch-X11.tmpl index 4e1eb1b9d227..bdd12fbbb3e2 100644 --- a/x11-servers/xorg-server-snap/files/patch-X11.tmpl +++ b/x11-servers/xorg-server-snap/files/patch-X11.tmpl @@ -1,6 +1,6 @@ ---- config/cf/X11.tmpl.orig Fri Apr 2 13:47:10 2004 -+++ config/cf/X11.tmpl Sun May 30 12:46:35 2004 -@@ -576,7 +576,7 @@ +--- config/cf/X11.tmpl.orig Fri Sep 3 09:18:18 2004 ++++ config/cf/X11.tmpl Fri Sep 10 20:29:12 2004 +@@ -616,7 +616,7 @@ #define BuildXft1Library BuildRenderLibrary #endif #ifndef UseFontconfig @@ -9,27 +9,21 @@ #endif #ifndef BuildFontconfigLibrary #define BuildFontconfigLibrary (UseFontconfig && !HasFontconfig) -@@ -1543,7 +1543,14 @@ +@@ -1606,7 +1606,7 @@ #endif #ifndef PsWrap -+#if defined(UseInstalled) || defined(UseInstalledPrograms) -+#define PsWrap pswrap -+#define PsWrapDependency /**/ -+#else - #define PsWrap $(PSWRAPSRC)/pswrap -+#define PsWrapDependency HostProgramTargetName($(PSWRAP)) -+#endif -+ PSWRAP = PsWrap - #endif - - #ifndef ResourceConfigurationManagement -@@ -1615,7 +1622,7 @@ +-# ifndef UseInstalled ++# if !defined(UseInstalled) && !defined(UseInstalledPrograms) + # define PsWrap $(PSWRAPSRC)/pswrap + # else + # define PsWrap pswrap +@@ -1683,7 +1683,7 @@ INSTAPPFLAGS = $(INSTDATFLAGS) /* XXX - this should go away - XXX */ -#if UseInstalledX11 +#if UseInstalledX11 || UseInstalledClients - RGB = $(BINDIR)/rgb - FONTC = $(BINDIR)/bdftopcf - MKFONTSCALE = $(BINDIR)/mkfontscale + RGB = $(XBINDIR)/rgb + FONTC = $(XBINDIR)/bdftopcf + MKFONTSCALE = $(XBINDIR)/mkfontscale diff --git a/x11-servers/xorg-server-snap/files/patch-bus-Imakefile b/x11-servers/xorg-server-snap/files/patch-bus-Imakefile deleted file mode 100644 index eb44640c816e..000000000000 --- a/x11-servers/xorg-server-snap/files/patch-bus-Imakefile +++ /dev/null @@ -1,18 +0,0 @@ -Index: programs/Xserver/hw/xfree86/os-support/bus/Imakefile -=================================================================== -RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/os-support/bus/Imakefile,v -retrieving revision 1.2 -diff -u -r1.2 Imakefile ---- programs/Xserver/hw/xfree86/os-support/bus/Imakefile 23 Apr 2004 19:54:08 -0000 1.2 -+++ programs/Xserver/hw/xfree86/os-support/bus/Imakefile 11 May 2004 07:58:43 -0000 -@@ -80,8 +80,8 @@ - PCIDRVRSRC = ix86Pci.c linuxPci.c - PCIDRVROBJ = ix86Pci.o linuxPci.o - --#elif defined(FreeBSDArchitecture) && defined(AlphaArchitecture) -- -+#elif defined(FreeBSDArchitecture) && \ -+ (defined(AlphaArchitecture) || defined(AMD64Architecture)) - - XCOMM generic FreeBSD PCI driver (using /dev/pci) - diff --git a/x11-servers/xorg-server-snap/files/patch-fb-renderfixes.diff b/x11-servers/xorg-server-snap/files/patch-fb-renderfixes.diff deleted file mode 100644 index 6adf66689453..000000000000 --- a/x11-servers/xorg-server-snap/files/patch-fb-renderfixes.diff +++ /dev/null @@ -1,320 +0,0 @@ -Index: programs/Xserver/fb/fbcompose.c -=================================================================== -RCS file: /cvs/xorg/xc/programs/Xserver/fb/fbcompose.c,v -retrieving revision 1.2 -diff -u -r1.2 fbcompose.c ---- programs/Xserver/fb/fbcompose.c 23 Apr 2004 19:05:14 -0000 1.2 -+++ programs/Xserver/fb/fbcompose.c 11 May 2004 22:58:12 -0000 -@@ -191,15 +191,15 @@ - a = (*msk->fetcha) (msk); - if (!a) - return 0; -- -- x = (*src->fetcha) (src); -- if (a == 0xffffffff) -- return x; -- -- m = FbInC(x,0,a,t); -- n = FbInC(x,8,a,t); -- o = FbInC(x,16,a,t); -- p = FbInC(x,24,a,t); -+ -+ x = (*src->fetch) (src) >> 24; -+ if (x == 0xff) -+ return a; -+ -+ m = FbInU(a,0,x,t); -+ n = FbInU(a,8,x,t); -+ o = FbInU(a,16,x,t); -+ p = FbInU(a,24,x,t); - return m|n|o|p; - } - -@@ -608,7 +608,7 @@ - cs = fbCombineMaskC (src, msk); - d = (*dst->fetch) (dst); - s = cs.value; -- ad = cs.alpha; -+ ad = ~cs.alpha; - as = d >> 24; - m = FbGen(s,d,0,as,FbGet8(ad,0),t,u,v); - n = FbGen(s,d,8,as,FbGet8(ad,8),t,u,v); -@@ -698,10 +698,10 @@ - s = cs.value; - ad = ~cs.alpha; - as = ~d >> 24; -- m = FbGen(s,d,0,as,ad,t,u,v); -- n = FbGen(s,d,8,as,ad,t,u,v); -- o = FbGen(s,d,16,as,ad,t,u,v); -- p = FbGen(s,d,24,as,ad,t,u,v); -+ m = FbGen(s,d,0,as,FbGet8(ad,0),t,u,v); -+ n = FbGen(s,d,8,as,FbGet8(ad,8),t,u,v); -+ o = FbGen(s,d,16,as,FbGet8(ad,16),t,u,v); -+ p = FbGen(s,d,24,as,FbGet8(ad,24),t,u,v); - (*dst->store) (dst, m|n|o|p); - } - -@@ -763,10 +763,9 @@ - FbCompositeOperand *dst) - { - CARD32 s = fbCombineMaskU (src, msk), d; --#if 0 - CARD16 sa, da; - CARD16 ad, as; -- CARD16 t; -+ CARD16 t, u, v; - CARD32 m,n,o,p; - - d = (*dst->fetch) (dst); -@@ -789,16 +788,6 @@ - p = FbGen(s,d,24,as,ad,t,u,v); - } - (*dst->store) (dst, m|n|o|p); --#else -- if ((s >> 24) == 0xff) -- (*dst->store) (dst, s); -- else -- { -- d = (*dst->fetch) (dst); -- if ((s >> 24) > (d >> 24)) -- (*dst->store) (dst, s); -- } --#endif - } - - void -@@ -831,7 +820,7 @@ - else - n = FbGen (s, d, 8, (da << 8) / sg, 0xff, t, u, v); - -- if (sr < da) -+ if (sr <= da) - o = FbAdd(s,d,16,t); - else - o = FbGen (s, d, 16, (da << 8) / sr, 0xff, t, u, v); -@@ -972,8 +961,8 @@ - FbCompSrc cs; - CARD32 s, d; - CARD32 m,n,o,p; -- CARD32 Fa; -- CARD16 Fb, t, u, v; -+ CARD32 Fa, Fb; -+ CARD16 t, u, v; - CARD32 sa; - CARD8 da; - -@@ -996,10 +985,10 @@ - Fa = m|n|o|p; - break; - case CombineAIn: -- m = fbCombineDisjointOutPart ((CARD8) (sa >> 0), da); -- n = fbCombineDisjointOutPart ((CARD8) (sa >> 8), da) << 8; -- o = fbCombineDisjointOutPart ((CARD8) (sa >> 16), da) << 16; -- p = fbCombineDisjointOutPart ((CARD8) (sa >> 24), da) << 24; -+ m = fbCombineDisjointInPart ((CARD8) (sa >> 0), da); -+ n = fbCombineDisjointInPart ((CARD8) (sa >> 8), da) << 8; -+ o = fbCombineDisjointInPart ((CARD8) (sa >> 16), da) << 16; -+ p = fbCombineDisjointInPart ((CARD8) (sa >> 24), da) << 24; - Fa = m|n|o|p; - break; - case CombineA: -@@ -1012,19 +1001,27 @@ - Fb = 0; - break; - case CombineBOut: -- Fb = fbCombineDisjointOutPart (da, sa); -+ m = fbCombineDisjointOutPart (da, (CARD8) (sa >> 0)); -+ n = fbCombineDisjointOutPart (da, (CARD8) (sa >> 8)) << 8; -+ o = fbCombineDisjointOutPart (da, (CARD8) (sa >> 16)) << 16; -+ p = fbCombineDisjointOutPart (da, (CARD8) (sa >> 24)) << 24; -+ Fb = m|n|o|p; - break; - case CombineBIn: -- Fb = fbCombineDisjointInPart (da, sa); -+ m = fbCombineDisjointInPart (da, (CARD8) (sa >> 0)); -+ n = fbCombineDisjointInPart (da, (CARD8) (sa >> 8)) << 8; -+ o = fbCombineDisjointInPart (da, (CARD8) (sa >> 16)) << 16; -+ p = fbCombineDisjointInPart (da, (CARD8) (sa >> 24)) << 24; -+ Fb = m|n|o|p; - break; - case CombineB: -- Fb = 0xff; -+ Fb = 0xffffffff; - break; - } -- m = FbGen (s,d,0,FbGet8(Fa,0),Fb,t,u,v); -- n = FbGen (s,d,8,FbGet8(Fa,8),Fb,t,u,v); -- o = FbGen (s,d,16,FbGet8(Fa,16),Fb,t,u,v); -- p = FbGen (s,d,24,FbGet8(Fa,24),Fb,t,u,v); -+ m = FbGen (s,d,0,FbGet8(Fa,0),FbGet8(Fb,0),t,u,v); -+ n = FbGen (s,d,8,FbGet8(Fa,8),FbGet8(Fb,8),t,u,v); -+ o = FbGen (s,d,16,FbGet8(Fa,16),FbGet8(Fb,16),t,u,v); -+ p = FbGen (s,d,24,FbGet8(Fa,24),FbGet8(Fb,24),t,u,v); - s = m|n|o|p; - (*dst->store) (dst, s); - } -@@ -1065,21 +1062,6 @@ - fbCombineDisjointGeneralC (src, msk, dst, CombineAOver); - } - --void --fbCombineDisjointOverReverseU (FbCompositeOperand *src, -- FbCompositeOperand *msk, -- FbCompositeOperand *dst) --{ -- fbCombineDisjointGeneralU (src, msk, dst, CombineBOver); --} -- --void --fbCombineDisjointOverReverseC (FbCompositeOperand *src, -- FbCompositeOperand *msk, -- FbCompositeOperand *dst) --{ -- fbCombineDisjointGeneralC (src, msk, dst, CombineBOver); --} - - void - fbCombineDisjointInU (FbCompositeOperand *src, -@@ -1281,8 +1263,8 @@ - FbCompSrc cs; - CARD32 s, d; - CARD32 m,n,o,p; -- CARD32 Fa; -- CARD16 Fb, t, u, v; -+ CARD32 Fa, Fb; -+ CARD16 t, u, v; - CARD32 sa; - CARD8 da; - -@@ -1305,10 +1287,10 @@ - Fa = m|n|o|p; - break; - case CombineAIn: -- m = fbCombineConjointOutPart ((CARD8) (sa >> 0), da); -- n = fbCombineConjointOutPart ((CARD8) (sa >> 8), da) << 8; -- o = fbCombineConjointOutPart ((CARD8) (sa >> 16), da) << 16; -- p = fbCombineConjointOutPart ((CARD8) (sa >> 24), da) << 24; -+ m = fbCombineConjointInPart ((CARD8) (sa >> 0), da); -+ n = fbCombineConjointInPart ((CARD8) (sa >> 8), da) << 8; -+ o = fbCombineConjointInPart ((CARD8) (sa >> 16), da) << 16; -+ p = fbCombineConjointInPart ((CARD8) (sa >> 24), da) << 24; - Fa = m|n|o|p; - break; - case CombineA: -@@ -1321,19 +1303,27 @@ - Fb = 0; - break; - case CombineBOut: -- Fb = fbCombineConjointOutPart (da, sa); -+ m = fbCombineConjointOutPart (da, (CARD8) (sa >> 0)); -+ n = fbCombineConjointOutPart (da, (CARD8) (sa >> 8)) << 8; -+ o = fbCombineConjointOutPart (da, (CARD8) (sa >> 16)) << 16; -+ p = fbCombineConjointOutPart (da, (CARD8) (sa >> 24)) << 24; -+ Fb = m|n|o|p; - break; - case CombineBIn: -- Fb = fbCombineConjointInPart (da, sa); -+ m = fbCombineConjointInPart (da, (CARD8) (sa >> 0)); -+ n = fbCombineConjointInPart (da, (CARD8) (sa >> 8)) << 8; -+ o = fbCombineConjointInPart (da, (CARD8) (sa >> 16)) << 16; -+ p = fbCombineConjointInPart (da, (CARD8) (sa >> 24)) << 24; -+ Fb = m|n|o|p; - break; - case CombineB: -- Fb = 0xff; -+ Fb = 0xffffffff; - break; - } -- m = FbGen (s,d,0,FbGet8(Fa,0),Fb,t,u,v); -- n = FbGen (s,d,8,FbGet8(Fa,8),Fb,t,u,v); -- o = FbGen (s,d,16,FbGet8(Fa,16),Fb,t,u,v); -- p = FbGen (s,d,24,FbGet8(Fa,24),Fb,t,u,v); -+ m = FbGen (s,d,0,FbGet8(Fa,0),FbGet8(Fb,0),t,u,v); -+ n = FbGen (s,d,8,FbGet8(Fa,8),FbGet8(Fb,8),t,u,v); -+ o = FbGen (s,d,16,FbGet8(Fa,16),FbGet8(Fb,16),t,u,v); -+ p = FbGen (s,d,24,FbGet8(Fa,24),FbGet8(Fb,24),t,u,v); - s = m|n|o|p; - (*dst->store) (dst, s); - } -@@ -1519,14 +1509,14 @@ - fbCombineAtopReverseU, - fbCombineXorU, - fbCombineAddU, -- fbCombineDisjointOverU, /* Saturate */ -+ fbCombineSaturateU, - 0, - 0, - fbCombineClear, - fbCombineSrcU, - fbCombineDst, - fbCombineDisjointOverU, -- fbCombineDisjointOverReverseU, -+ fbCombineSaturateU, /* DisjointOverReverse */ - fbCombineDisjointInU, - fbCombineDisjointInReverseU, - fbCombineDisjointOutU, -@@ -1566,14 +1556,14 @@ - fbCombineAtopReverseC, - fbCombineXorC, - fbCombineAddC, -- fbCombineDisjointOverC, /* Saturate */ -+ fbCombineSaturateC, - 0, - 0, - fbCombineClear, /* 0x10 */ - fbCombineSrcC, - fbCombineDst, - fbCombineDisjointOverC, -- fbCombineDisjointOverReverseC, -+ fbCombineSaturateC, /* DisjointOverReverse */ - fbCombineDisjointInC, - fbCombineDisjointInReverseC, - fbCombineDisjointOutC, -Index: programs/Xserver/fb/fbpict.c -=================================================================== -RCS file: /cvs/xorg/xc/programs/Xserver/fb/fbpict.c,v -retrieving revision 1.2 -diff -u -r1.2 fbpict.c ---- programs/Xserver/fb/fbpict.c 23 Apr 2004 19:05:14 -0000 1.2 -+++ programs/Xserver/fb/fbpict.c 12 May 2004 00:45:56 -0000 -@@ -1001,7 +1001,6 @@ - { - switch (pSrc->format) { - case PICT_a8r8g8b8: -- case PICT_x8r8g8b8: - switch (pDst->format) { - case PICT_a8r8g8b8: - case PICT_x8r8g8b8: -@@ -1016,7 +1015,6 @@ - } - break; - case PICT_a8b8g8r8: -- case PICT_x8b8g8r8: - switch (pDst->format) { - case PICT_a8b8g8r8: - case PICT_x8b8g8r8: -Index: programs/Xserver/fb/fbpict.h -=================================================================== -RCS file: /cvs/xorg/xc/programs/Xserver/fb/fbpict.h,v -retrieving revision 1.2 -diff -u -r1.2 fbpict.h ---- programs/Xserver/fb/fbpict.h 23 Apr 2004 19:05:14 -0000 1.2 -+++ programs/Xserver/fb/fbpict.h 11 May 2004 18:46:20 -0000 -@@ -333,15 +333,8 @@ - FbCompositeOperand *msk, - FbCompositeOperand *dst); - --void --fbCombineDisjointOverReverseU (FbCompositeOperand *src, -- FbCompositeOperand *msk, -- FbCompositeOperand *dst); -- --void --fbCombineDisjointOverReverseC (FbCompositeOperand *src, -- FbCompositeOperand *msk, -- FbCompositeOperand *dst); -+#define fbCombineDisjointOverReverseU fbCombineSaturateU -+#define fbCombineDisjointOverReverseC fbCombineSaturateC - - void - fbCombineDisjointInU (FbCompositeOperand *src, diff --git a/x11-servers/xorg-server-snap/files/patch-kernel-Imakefile b/x11-servers/xorg-server-snap/files/patch-kernel-Imakefile deleted file mode 100644 index ab5ca0b01406..000000000000 --- a/x11-servers/xorg-server-snap/files/patch-kernel-Imakefile +++ /dev/null @@ -1,18 +0,0 @@ ---- programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/Imakefile.orig Sun May 9 21:27:57 2004 -+++ programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/Imakefile Sun May 9 21:28:16 2004 -@@ -20,6 +20,7 @@ - @echo 'Use "make -f Makefile.bsd" to manually build the modules' - #endif - -+#if 0 - SRCS_DRM = \ - drm.h \ - drmP.h \ -@@ -130,6 +131,7 @@ - InstallNamedNonExec(radeon/Makefile,Makefile,$(DRMSRCDIR)/radeon) - InstallNamedNonExec(sis/Makefile,Makefile,$(DRMSRCDIR)/sis) - InstallNamedNonExec(tdfx/Makefile,Makefile,$(DRMSRCDIR)/tdfx) -+#endif /* 0 */ - - LinkSourceFile(drm.h,$(XF86OSSRC)/shared/drm/kernel) - LinkSourceFile(drm_sarea.h,$(XF86OSSRC)/shared/drm/kernel) diff --git a/x11-servers/xorg-server-snap/files/patch-linux.cf b/x11-servers/xorg-server-snap/files/patch-linux.cf deleted file mode 100644 index 4d6ff268910b..000000000000 --- a/x11-servers/xorg-server-snap/files/patch-linux.cf +++ /dev/null @@ -1,11 +0,0 @@ ---- config/cf/linux.cf.orig Fri May 7 15:51:10 2004 -+++ config/cf/linux.cf Fri May 7 15:51:17 2004 -@@ -747,7 +747,7 @@ - #endif - - #ifndef XF86OSCardDrivers --# define XF86OSCardDrivers v4l -+# define XF86OSCardDrivers fbdev v4l - #endif - - #ifndef OSXInputDrivers diff --git a/x11-servers/xorg-server-snap/files/patch-loadmod.c b/x11-servers/xorg-server-snap/files/patch-loadmod.c deleted file mode 100644 index ea1c4862bfe4..000000000000 --- a/x11-servers/xorg-server-snap/files/patch-loadmod.c +++ /dev/null @@ -1,10 +0,0 @@ ---- programs/Xserver/hw/xfree86/loader/loadmod.c.orig Fri May 7 18:46:10 2004 -+++ programs/Xserver/hw/xfree86/loader/loadmod.c Fri May 7 18:46:12 2004 -@@ -62,7 +62,6 @@ - #include "xf86Xinput.h" - #endif - #include "loader.h" --#include "xf86Optrec.h" - - #include <sys/types.h> - #include <regex.h> diff --git a/x11-servers/xorg-server-snap/files/patch-xf86cfg-Imakefile b/x11-servers/xorg-server-snap/files/patch-xf86cfg-Imakefile new file mode 100644 index 000000000000..5728d915fb48 --- /dev/null +++ b/x11-servers/xorg-server-snap/files/patch-xf86cfg-Imakefile @@ -0,0 +1,11 @@ +--- programs/Xserver/hw/xfree86/xf86cfg/Imakefile.orig Sat Sep 11 15:11:04 2004 ++++ programs/Xserver/hw/xfree86/xf86cfg/Imakefile Sat Sep 11 15:11:07 2004 +@@ -25,6 +25,8 @@ + SNPRINTFOBJS = snprintf.o + #endif + ++XAWLIB = -lXaw ++ + SRCS =\ + accessx.c\ + card-cfg.c\ diff --git a/x11-servers/xorg-server-snap/files/patch-xf86drmCompat.c b/x11-servers/xorg-server-snap/files/patch-xf86drmCompat.c deleted file mode 100644 index 98d4c84a0a03..000000000000 --- a/x11-servers/xorg-server-snap/files/patch-xf86drmCompat.c +++ /dev/null @@ -1,28 +0,0 @@ ---- programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmCompat.c.orig Sun Aug 22 17:35:50 2004 -+++ programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmCompat.c Sun Aug 22 17:36:11 2004 -@@ -77,8 +77,8 @@ - #include "mga_drm.h" - #include "r128_drm.h" - #include "radeon_drm.h" --#ifndef __FreeBSD__ - #include "sis_drm.h" -+#ifndef __FreeBSD__ - #include "i810_drm.h" - #include "i830_drm.h" - #endif -@@ -1012,7 +1012,6 @@ - } - } - --#ifndef __FreeBSD__ - /* SiS */ - - Bool drmSiSAgpInit(int driSubFD, int offset, int size) -@@ -1026,6 +1025,7 @@ - return 1; /* TRUE */ - } - -+#ifndef __FreeBSD__ - /* I830 */ - - Bool drmI830CleanupDma(int driSubFD) diff --git a/x11-servers/xorg-server-snap/files/patch-xf86fbman.c b/x11-servers/xorg-server-snap/files/patch-xf86fbman.c deleted file mode 100644 index 1d6fcc88f041..000000000000 --- a/x11-servers/xorg-server-snap/files/patch-xf86fbman.c +++ /dev/null @@ -1,17 +0,0 @@ ---- programs/Xserver/hw/xfree86/common/xf86fbman.c.orig Wed Nov 26 23:48:58 2003 -+++ programs/Xserver/hw/xfree86/common/xf86fbman.c Wed Sep 1 21:15:58 2004 -@@ -1095,12 +1095,10 @@ - - *size = 0; - -- if (!offman->LinearAreas) return FALSE; -- - pLink = offman->LinearAreas; -- pLinkRet = pLink; - -- if (!pLink->area) { -+ if (pLink && !pLink->area) { -+ pLinkRet = pLink; - while (pLink) { - if (pLink->free) { - if (pLink->linear.size > pLinkRet->linear.size) diff --git a/x11-servers/xorg-server-snap/files/patch-xorg.cf b/x11-servers/xorg-server-snap/files/patch-xorg.cf deleted file mode 100644 index b3f55760761f..000000000000 --- a/x11-servers/xorg-server-snap/files/patch-xorg.cf +++ /dev/null @@ -1,29 +0,0 @@ ---- config/cf/xorg.cf.orig Wed Aug 25 04:46:40 2004 -+++ config/cf/xorg.cf Wed Aug 25 04:53:17 2004 -@@ -388,7 +388,7 @@ - GlideDriver i128 NscDriver \ - ati i810 AgpGartDrivers DevelDrivers ark \ - cyrix siliconmotion via \ -- fbdev vesa vga \ -+ vesa vga \ - dummy XF86OSCardDrivers XF86ExtraCardDrivers - # endif - -@@ -485,7 +485,7 @@ - # define XF86CardDrivers mga glint nv tga s3 s3virge sis rendition \ - neomagic tdfx savage cirrus tseng trident \ - chips apm i128 ati ark cyrix siliconmotion \ -- vga dummy fbdev vesa -+ vga dummy vesa - # endif - - /* DRI tdfx driver needs Glide, which is not available for AMD64 */ -@@ -589,7 +589,7 @@ - /* Pure SBUS and PCI drivers should go first */ - # ifndef XF86CardDrivers - # define XF86CardDrivers sunffb sunleo suncg6 suncg3 suncg14 suntcx \ -- sunbw2 glint mga tdfx ati vesa vga fbdev \ -+ sunbw2 glint mga tdfx ati vesa vga \ - XF86OSCardDrivers XF86ExtraCardDrivers \ - DevelDrivers - # endif diff --git a/x11-servers/xorg-server-snap/files/patch-xorgconfig.c b/x11-servers/xorg-server-snap/files/patch-xorgconfig.c index c1391e8c1b63..650360ec75fe 100644 --- a/x11-servers/xorg-server-snap/files/patch-xorgconfig.c +++ b/x11-servers/xorg-server-snap/files/patch-xorgconfig.c @@ -1,11 +1,11 @@ ---- programs/Xserver/hw/xfree86/xf86config/xorgconfig.c.orig Wed Nov 3 20:05:48 2004 -+++ programs/Xserver/hw/xfree86/xf86config/xorgconfig.c Wed Nov 3 20:06:16 2004 -@@ -838,8 +838,7 @@ +--- programs/Xserver/hw/xfree86/xf86config/xorgconfig.c.orig Mon Nov 8 22:18:58 2004 ++++ programs/Xserver/hw/xfree86/xf86config/xorgconfig.c Mon Nov 8 22:19:22 2004 +@@ -854,8 +854,7 @@ "which is the rate at which scanlines are displayed.\n" "\n" "The valid range for horizontal sync and vertical sync should be documented\n" -"in the manual of your monitor. If in doubt, check the monitor database\n" --TREEROOTLX "/doc/Monitors to see if your monitor is there.\n" +-TREEROOTDOC "/Monitors to see if your monitor is there.\n" +"in the manual of your monitor.\n" "\n"; diff --git a/x11-servers/xorg-server-snap/pkg-plist b/x11-servers/xorg-server-snap/pkg-plist index 56a3728fbaa8..e69e46d0ec56 100644 --- a/x11-servers/xorg-server-snap/pkg-plist +++ b/x11-servers/xorg-server-snap/pkg-plist @@ -36,18 +36,23 @@ include/X11/pixmaps/monitor.xpm include/X11/pixmaps/mouse.xpm lib/X11/Cards lib/X11/Options -lib/X11/XF86Config.98 -lib/X11/XF86Config.eg lib/X11/app-defaults/XOrgCfg lib/X11/doc/BUILD lib/X11/doc/BugReport lib/X11/doc/DESIGN lib/X11/doc/Install lib/X11/doc/LICENSE +lib/X11/doc/OS2.Notes lib/X11/doc/README lib/X11/doc/README.DECtga +lib/X11/doc/README.Darwin lib/X11/doc/README.I128 +lib/X11/doc/README.LynxOS +lib/X11/doc/README.NetBSD +lib/X11/doc/README.OpenBSD +lib/X11/doc/README.SCO lib/X11/doc/README.SiS +lib/X11/doc/README.Solaris lib/X11/doc/README.XKB-Config lib/X11/doc/README.XKB-Enhancing lib/X11/doc/README.apm @@ -72,38 +77,6 @@ lib/X11/etc/xmodmap.std lib/X11/getconfig/cfg.sample lib/X11/getconfig/xorg.cfg lib/X11/xserver/SecurityPolicy -lib/modules/codeconv/libARABIC.a -lib/modules/codeconv/libARMSCII8.a -lib/modules/codeconv/libBIG5.a -lib/modules/codeconv/libBIG5HKSCS.a -lib/modules/codeconv/libDOSENCODING.a -lib/modules/codeconv/libGB18030.a -lib/modules/codeconv/libGB2312.a -lib/modules/codeconv/libGBK.a -lib/modules/codeconv/libGEORGIAN.a -lib/modules/codeconv/libISO8859_1.a -lib/modules/codeconv/libISO8859_10.a -lib/modules/codeconv/libISO8859_11.a -lib/modules/codeconv/libISO8859_13.a -lib/modules/codeconv/libISO8859_14.a -lib/modules/codeconv/libISO8859_15.a -lib/modules/codeconv/libISO8859_2.a -lib/modules/codeconv/libISO8859_3.a -lib/modules/codeconv/libISO8859_4.a -lib/modules/codeconv/libISO8859_5.a -lib/modules/codeconv/libISO8859_6.a -lib/modules/codeconv/libISO8859_7.a -lib/modules/codeconv/libISO8859_8.a -lib/modules/codeconv/libISO8859_9.a -lib/modules/codeconv/libJISX0201.a -lib/modules/codeconv/libJISX0208.a -lib/modules/codeconv/libJISX0212.a -lib/modules/codeconv/libKOI8.a -lib/modules/codeconv/libKSC5601.a -lib/modules/codeconv/libKSCJOHAB.a -lib/modules/codeconv/libMULEENCODING.a -lib/modules/codeconv/libTCVN.a -lib/modules/codeconv/libVISCII.a %%AMD64_I386%%lib/modules/drivers/apm_drv.o %%AMD64_I386%%lib/modules/drivers/ark_drv.o lib/modules/drivers/ati_drv.o @@ -155,9 +128,7 @@ lib/modules/extensions/librecord.a lib/modules/extensions/libxtrap.a lib/modules/fonts/libbitmap.a lib/modules/fonts/libfreetype.so -lib/modules/fonts/libspeedo.a lib/modules/fonts/libtype1.a -lib/modules/fonts/libxtt.a lib/modules/freebsd/libdrm.a lib/modules/input/acecad_drv.o lib/modules/input/calcomp_drv.o @@ -170,6 +141,7 @@ 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/keyboard_drv.o lib/modules/input/magellan_drv.o lib/modules/input/microtouch_drv.o lib/modules/input/mouse_drv.o @@ -181,11 +153,13 @@ 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 +%%ALPHA_NA%%lib/modules/libafb.a lib/modules/libcfb.a lib/modules/libcfb16.a lib/modules/libcfb24.a lib/modules/libcfb32.a +lib/modules/libcw.a +lib/modules/libdamage.a lib/modules/libddc.a lib/modules/libfb.a lib/modules/libi2c.a @@ -209,3 +183,4 @@ lib/modules/libxf8_32bpp.a %%SPARC64%%lib/modules/libxf8_32wid.a %%SPARC64_NA%%lib/modules/v10002d.uc %%SPARC64_NA%%lib/modules/v20002d.uc +@dirrm lib/X11/getconfig diff --git a/x11-servers/xorg-server-snap/scripts/configure b/x11-servers/xorg-server-snap/scripts/configure index 02215f320916..ba6b214f80d3 100644 --- a/x11-servers/xorg-server-snap/scripts/configure +++ b/x11-servers/xorg-server-snap/scripts/configure @@ -14,6 +14,8 @@ echo "#define LibInstall NO" >> $LOCALDEF echo "#define ForceNormalLib NO" >> $LOCALDEF echo "#define XTrueTypeInstallCConvHeaders NO" >> $LOCALDEF echo "#define BuildServer YES" >> $LOCALDEF +echo "#define BuildXprint NO" >> $LOCALDEF +echo "#define BuildLibraries NO" >> $LOCALDEF echo "#define LibInstallBuild YES" >> $LOCALDEF echo "#define ModInstall YES" >> $LOCALDEF echo "#define XF86Server NO" >> $LOCALDEF diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile index f69043a31cc9..cf6cfb301ca3 100644 --- a/x11-servers/xorg-server/Makefile +++ b/x11-servers/xorg-server/Makefile @@ -5,16 +5,13 @@ # $FreeBSD$ # -PORTNAME= server -PORTVERSION= 6.7.0 -PORTREVISION= 9 +PORTNAME= xorg-server +PORTVERSION= 6.8.1 CATEGORIES= x11-servers -MASTER_SITES= http://freedesktop.org/~xorg/X11R6.7.0/src/ \ - ${MASTER_SITE_XORG} -MASTER_SITE_SUBDIR= R6.7/tars -PKGNAMEPREFIX= xorg- -DISTFILES= X11R6.7.0-src1.tar.gz \ - X11R6.7.0-src3.tar.gz +MASTER_SITES= ${MASTER_SITE_XORG} +MASTER_SITE_SUBDIR= X11R6.8.1/tars +DISTFILES= X11R${PORTVERSION}-src1.tar.gz \ + X11R${PORTVERSION}-src3.tar.gz MAINTAINER= x11@FreeBSD.org COMMENT= X.Org X server and related programs diff --git a/x11-servers/xorg-server/Makefile.inc b/x11-servers/xorg-server/Makefile.inc index 79a81701d363..7d7e1cf76d11 100644 --- a/x11-servers/xorg-server/Makefile.inc +++ b/x11-servers/xorg-server/Makefile.inc @@ -16,6 +16,7 @@ DIST_SUBDIR?= xorg WRKSRC?= ${WRKDIR}/xc USE_X_PREFIX?= no PREFIX?= ${X11BASE} +MTREE_FILE= /etc/mtree/BSD.x11-4.dist USE_IMAKE= YES .if defined(XMAN_DIRS) @@ -41,17 +42,10 @@ CF_PATCHES= ${PORTSDIR}/x11-servers/xorg-server/files/patch-FreeBSD.cf \ SERVER_PATCHES= ${PORTSDIR}/x11-servers/xorg-server/files/patch-Xserver-Imakefile \ ${PORTSDIR}/x11-servers/xorg-server/files/patch-alpha_video.c \ - ${PORTSDIR}/x11-servers/xorg-server/files/patch-bus-Imakefile \ - ${PORTSDIR}/x11-servers/xorg-server/files/patch-fb-renderfixes.diff \ - ${PORTSDIR}/x11-servers/xorg-server/files/patch-kernel-Imakefile \ - ${PORTSDIR}/x11-servers/xorg-server/files/patch-loadmod.c \ ${PORTSDIR}/x11-servers/xorg-server/files/patch-man-Imakefile \ ${PORTSDIR}/x11-servers/xorg-server/files/patch-os-Imakefile \ ${PORTSDIR}/x11-servers/xorg-server/files/patch-savage-pci-id \ - ${PORTSDIR}/x11-servers/xorg-server/files/patch-xf86Events.c \ - ${PORTSDIR}/x11-servers/xorg-server/files/patch-xf86fbman.c \ ${PORTSDIR}/x11-servers/xorg-server/files/patch-xf86sym.c \ - ${PORTSDIR}/x11-servers/xorg-server/files/patch-xf86drmCompat.c \ ${PORTSDIR}/x11-servers/xorg-server/files/patch-xkbout.c \ ${PORTSDIR}/x11-servers/xorg-server/files/patch-xorgconfig.c @@ -91,6 +85,5 @@ do-install: @for dir in ${XMAN_DIRS}; do \ cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${MAKE} install.man; \ done - @${MKHTMLINDEX} ${PREFIX}/lib/X11/doc/html .endif diff --git a/x11-servers/xorg-server/distinfo b/x11-servers/xorg-server/distinfo index 971093cb9d9e..62c1647dc07b 100644 --- a/x11-servers/xorg-server/distinfo +++ b/x11-servers/xorg-server/distinfo @@ -1,8 +1,4 @@ -MD5 (xorg/X11R6.7.0-src1.tar.gz) = 22465263bae7a2e9f5ad77e172cf1ab5 -SIZE (xorg/X11R6.7.0-src1.tar.gz) = 30039655 -MD5 (xorg/X11R6.7.0-src2.tar.gz) = 6ef4e8f7647a28f080c10ea1bcf01f79 -SIZE (xorg/X11R6.7.0-src2.tar.gz) = 5739983 -MD5 (xorg/X11R6.7.0-src3.tar.gz) = 4c7144786522bbce383b21ace72bf669 -SIZE (xorg/X11R6.7.0-src3.tar.gz) = 10855793 -MD5 (xorg/Wraphelp2.gz) = bd1910492087442288d885412e2e5535 -SIZE (xorg/Wraphelp2.gz) = 3376 +MD5 (xorg/X11R6.8.1-src1.tar.gz) = e352319d423391ff2c03bb7f81fe8d2b +SIZE (xorg/X11R6.8.1-src1.tar.gz) = 30562401 +MD5 (xorg/X11R6.8.1-src3.tar.gz) = 8578e566e909e7c40300f44b6f0e88d3 +SIZE (xorg/X11R6.8.1-src3.tar.gz) = 10014808 diff --git a/x11-servers/xorg-server/files/patch-FreeBSD.cf b/x11-servers/xorg-server/files/patch-FreeBSD.cf index c0139fdbeec7..391afe1b7cae 100644 --- a/x11-servers/xorg-server/files/patch-FreeBSD.cf +++ b/x11-servers/xorg-server/files/patch-FreeBSD.cf @@ -1,54 +1,44 @@ ---- config/cf/FreeBSD.cf.orig Fri Apr 2 13:47:10 2004 -+++ config/cf/FreeBSD.cf Fri May 7 17:32:47 2004 -@@ -109,7 +109,7 @@ - # endif - # define HasPosixThreads YES - # define ThreadedX YES --# define SystemMTDefines -D_REENTRANT -D_THREAD_SAFE -+# define SystemMTDefines FreeBSDPTHREAD_CFLAGS - /* - * FreeBSD has tread-safe api but no getpwnam_r yet. - */ -@@ -119,9 +119,8 @@ - # else - # define MTSafeAPIDefines -DXUSE_MTSAFE_API +--- config/cf/FreeBSD.cf.orig Sat Aug 14 17:03:36 2004 ++++ config/cf/FreeBSD.cf Sat Sep 11 15:18:01 2004 +@@ -78,6 +78,7 @@ + #define HasIssetugid YES + #define HasPoll YES + #endif ++#define BuildHtmlManPages NO + + #if OSMajorVersion >= 4 + #define HasGetIfAddrs YES +@@ -117,14 +118,8 @@ + # if (OSRelVersion < 500043) + # define NeedUIThrStubs YES # endif --# if HasLibPthread +-# if (OSRelVersion >= 502102) -# define ThreadsLibraries -lpthread +-# elif (OSRelVersion >= 500016) +-# define ThreadsLibraries -lc_r -# else +-# define ThreadsLibraries -pthread +-# endif +-# define SystemMTDefines -D_THREAD_SAFE +# define ThreadsLibraries FreeBSDPTHREAD_LIBS -+# if !HasLibPthread - # if OSRelVersion >= 500043 - # define BuildThreadStubLibrary NO - # define NeedUIThrStubs NO -@@ -130,10 +129,7 @@ - # define NeedUIThrStubs YES - # endif - # if (OSRelVersion >= 500016) --# define ThreadsLibraries -lc_r - # define SharedGLReqs $(LDPRELIBS) $(XLIB) -lc --# else --# define ThreadsLibraries -pthread - # endif - # define SharedX11Reqs $(LDPRELIB) $(XTHRSTUBLIB) - # define SharedXtReqs $(LDPRELIB) $(XONLYLIB) $(SMLIB) $(ICELIB) $(XTHRSTUBLIB) -@@ -192,11 +188,11 @@ - * ld: warning: libXThrStub.so.6, needed by libX11.so, not found - */ - #if BuildThreadStubLibrary && (!defined(UseInstalledX11) || !UseInstalledX11) --# define CcCmd $(CLIENTENVSETUP) cc --# define CplusplusCmd $(CLIENTENVSETUP) c++ -+# define CcCmd $(CLIENTENVSETUP) FreeBSDCC -+# define CplusplusCmd $(CLIENTENVSETUP) FreeBSDCXX - #else --# define CcCmd cc --# define CplusplusCmd c++ -+# define CcCmd FreeBSDCC -+# define CplusplusCmd FreeBSDCXX ++# define SystemMTDefines FreeBSDPTHREAD_CFLAGS + #endif + + /* This fixes linking C programs against libGLU on FreeBSD 3.x */ +@@ -173,10 +168,10 @@ #endif + #ifndef CcCmd +-#define CcCmd cc ++#define CcCmd FreeBSDCC + #endif + #ifndef CplusplusCmd +-#define CplusplusCmd c++ ++#define CplusplusCmd FreeBSDCXX + #endif #define CppCmd /usr/bin/cpp -@@ -359,7 +355,7 @@ + #define PreProcessCmd CppCmd +@@ -338,7 +333,7 @@ #ifndef LibraryRpathLoadFlags # if UseRpath # if UseElfFormat @@ -57,7 +47,7 @@ # else # define LibraryRpathLoadFlags -R $(USRLIBDIRPATH) # endif -@@ -452,18 +450,8 @@ +@@ -463,18 +458,8 @@ #define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC #endif diff --git a/x11-servers/xorg-server/files/patch-Library.tmpl b/x11-servers/xorg-server/files/patch-Library.tmpl index bbebc76c13e0..e94aae3bfc60 100644 --- a/x11-servers/xorg-server/files/patch-Library.tmpl +++ b/x11-servers/xorg-server/files/patch-Library.tmpl @@ -1,21 +1,21 @@ ---- config/cf/Library.tmpl.orig Mon Aug 27 10:40:55 2001 -+++ config/cf/Library.tmpl Wed Oct 16 21:53:13 2002 -@@ -300,6 +300,10 @@ +--- config/cf/Library.tmpl.orig Mon May 24 12:06:57 2004 ++++ config/cf/Library.tmpl Fri Sep 10 21:46:00 2004 +@@ -389,7 +389,7 @@ */ #ifndef MakeStringsDependency -+#if defined(UseInstalled) || defined(UseInstalledPrograms) -+#define MakeStringsDependency @@\ -+MAKESTRS = makestrs -+#else - # define MakeStringsDependency @@\ +-# ifndef UseInstalled ++# if !defined(UseInstalled) && !defined(UseInstalledPrograms) + # define MakeStringsDependency @@\ MAKESTRS = $(CONFIGSRC)/util/makestrs @@\ NoCmpScript(HostProgramTargetName($(MAKESTRS)) $(MAKESTRS).Osuf) @@\ -@@ -308,6 +312,7 @@ - cd $(CONFIGSRC)/util && $(MAKE) HostProgramTargetName(makestrs) @@\ +@@ -399,7 +399,8 @@ @@\ includes:: HostProgramTargetName($(MAKESTRS)) -+#endif + # else +-# define MakeStringsDependency /**/ ++# define MakeStringsDependency @@\ ++MAKESTRS = makestrs + # endif #endif - #ifndef ToolkitMakeStrings diff --git a/x11-servers/xorg-server/files/patch-X11.tmpl b/x11-servers/xorg-server/files/patch-X11.tmpl index 4e1eb1b9d227..bdd12fbbb3e2 100644 --- a/x11-servers/xorg-server/files/patch-X11.tmpl +++ b/x11-servers/xorg-server/files/patch-X11.tmpl @@ -1,6 +1,6 @@ ---- config/cf/X11.tmpl.orig Fri Apr 2 13:47:10 2004 -+++ config/cf/X11.tmpl Sun May 30 12:46:35 2004 -@@ -576,7 +576,7 @@ +--- config/cf/X11.tmpl.orig Fri Sep 3 09:18:18 2004 ++++ config/cf/X11.tmpl Fri Sep 10 20:29:12 2004 +@@ -616,7 +616,7 @@ #define BuildXft1Library BuildRenderLibrary #endif #ifndef UseFontconfig @@ -9,27 +9,21 @@ #endif #ifndef BuildFontconfigLibrary #define BuildFontconfigLibrary (UseFontconfig && !HasFontconfig) -@@ -1543,7 +1543,14 @@ +@@ -1606,7 +1606,7 @@ #endif #ifndef PsWrap -+#if defined(UseInstalled) || defined(UseInstalledPrograms) -+#define PsWrap pswrap -+#define PsWrapDependency /**/ -+#else - #define PsWrap $(PSWRAPSRC)/pswrap -+#define PsWrapDependency HostProgramTargetName($(PSWRAP)) -+#endif -+ PSWRAP = PsWrap - #endif - - #ifndef ResourceConfigurationManagement -@@ -1615,7 +1622,7 @@ +-# ifndef UseInstalled ++# if !defined(UseInstalled) && !defined(UseInstalledPrograms) + # define PsWrap $(PSWRAPSRC)/pswrap + # else + # define PsWrap pswrap +@@ -1683,7 +1683,7 @@ INSTAPPFLAGS = $(INSTDATFLAGS) /* XXX - this should go away - XXX */ -#if UseInstalledX11 +#if UseInstalledX11 || UseInstalledClients - RGB = $(BINDIR)/rgb - FONTC = $(BINDIR)/bdftopcf - MKFONTSCALE = $(BINDIR)/mkfontscale + RGB = $(XBINDIR)/rgb + FONTC = $(XBINDIR)/bdftopcf + MKFONTSCALE = $(XBINDIR)/mkfontscale diff --git a/x11-servers/xorg-server/files/patch-bus-Imakefile b/x11-servers/xorg-server/files/patch-bus-Imakefile deleted file mode 100644 index eb44640c816e..000000000000 --- a/x11-servers/xorg-server/files/patch-bus-Imakefile +++ /dev/null @@ -1,18 +0,0 @@ -Index: programs/Xserver/hw/xfree86/os-support/bus/Imakefile -=================================================================== -RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/os-support/bus/Imakefile,v -retrieving revision 1.2 -diff -u -r1.2 Imakefile ---- programs/Xserver/hw/xfree86/os-support/bus/Imakefile 23 Apr 2004 19:54:08 -0000 1.2 -+++ programs/Xserver/hw/xfree86/os-support/bus/Imakefile 11 May 2004 07:58:43 -0000 -@@ -80,8 +80,8 @@ - PCIDRVRSRC = ix86Pci.c linuxPci.c - PCIDRVROBJ = ix86Pci.o linuxPci.o - --#elif defined(FreeBSDArchitecture) && defined(AlphaArchitecture) -- -+#elif defined(FreeBSDArchitecture) && \ -+ (defined(AlphaArchitecture) || defined(AMD64Architecture)) - - XCOMM generic FreeBSD PCI driver (using /dev/pci) - diff --git a/x11-servers/xorg-server/files/patch-fb-renderfixes.diff b/x11-servers/xorg-server/files/patch-fb-renderfixes.diff deleted file mode 100644 index 6adf66689453..000000000000 --- a/x11-servers/xorg-server/files/patch-fb-renderfixes.diff +++ /dev/null @@ -1,320 +0,0 @@ -Index: programs/Xserver/fb/fbcompose.c -=================================================================== -RCS file: /cvs/xorg/xc/programs/Xserver/fb/fbcompose.c,v -retrieving revision 1.2 -diff -u -r1.2 fbcompose.c ---- programs/Xserver/fb/fbcompose.c 23 Apr 2004 19:05:14 -0000 1.2 -+++ programs/Xserver/fb/fbcompose.c 11 May 2004 22:58:12 -0000 -@@ -191,15 +191,15 @@ - a = (*msk->fetcha) (msk); - if (!a) - return 0; -- -- x = (*src->fetcha) (src); -- if (a == 0xffffffff) -- return x; -- -- m = FbInC(x,0,a,t); -- n = FbInC(x,8,a,t); -- o = FbInC(x,16,a,t); -- p = FbInC(x,24,a,t); -+ -+ x = (*src->fetch) (src) >> 24; -+ if (x == 0xff) -+ return a; -+ -+ m = FbInU(a,0,x,t); -+ n = FbInU(a,8,x,t); -+ o = FbInU(a,16,x,t); -+ p = FbInU(a,24,x,t); - return m|n|o|p; - } - -@@ -608,7 +608,7 @@ - cs = fbCombineMaskC (src, msk); - d = (*dst->fetch) (dst); - s = cs.value; -- ad = cs.alpha; -+ ad = ~cs.alpha; - as = d >> 24; - m = FbGen(s,d,0,as,FbGet8(ad,0),t,u,v); - n = FbGen(s,d,8,as,FbGet8(ad,8),t,u,v); -@@ -698,10 +698,10 @@ - s = cs.value; - ad = ~cs.alpha; - as = ~d >> 24; -- m = FbGen(s,d,0,as,ad,t,u,v); -- n = FbGen(s,d,8,as,ad,t,u,v); -- o = FbGen(s,d,16,as,ad,t,u,v); -- p = FbGen(s,d,24,as,ad,t,u,v); -+ m = FbGen(s,d,0,as,FbGet8(ad,0),t,u,v); -+ n = FbGen(s,d,8,as,FbGet8(ad,8),t,u,v); -+ o = FbGen(s,d,16,as,FbGet8(ad,16),t,u,v); -+ p = FbGen(s,d,24,as,FbGet8(ad,24),t,u,v); - (*dst->store) (dst, m|n|o|p); - } - -@@ -763,10 +763,9 @@ - FbCompositeOperand *dst) - { - CARD32 s = fbCombineMaskU (src, msk), d; --#if 0 - CARD16 sa, da; - CARD16 ad, as; -- CARD16 t; -+ CARD16 t, u, v; - CARD32 m,n,o,p; - - d = (*dst->fetch) (dst); -@@ -789,16 +788,6 @@ - p = FbGen(s,d,24,as,ad,t,u,v); - } - (*dst->store) (dst, m|n|o|p); --#else -- if ((s >> 24) == 0xff) -- (*dst->store) (dst, s); -- else -- { -- d = (*dst->fetch) (dst); -- if ((s >> 24) > (d >> 24)) -- (*dst->store) (dst, s); -- } --#endif - } - - void -@@ -831,7 +820,7 @@ - else - n = FbGen (s, d, 8, (da << 8) / sg, 0xff, t, u, v); - -- if (sr < da) -+ if (sr <= da) - o = FbAdd(s,d,16,t); - else - o = FbGen (s, d, 16, (da << 8) / sr, 0xff, t, u, v); -@@ -972,8 +961,8 @@ - FbCompSrc cs; - CARD32 s, d; - CARD32 m,n,o,p; -- CARD32 Fa; -- CARD16 Fb, t, u, v; -+ CARD32 Fa, Fb; -+ CARD16 t, u, v; - CARD32 sa; - CARD8 da; - -@@ -996,10 +985,10 @@ - Fa = m|n|o|p; - break; - case CombineAIn: -- m = fbCombineDisjointOutPart ((CARD8) (sa >> 0), da); -- n = fbCombineDisjointOutPart ((CARD8) (sa >> 8), da) << 8; -- o = fbCombineDisjointOutPart ((CARD8) (sa >> 16), da) << 16; -- p = fbCombineDisjointOutPart ((CARD8) (sa >> 24), da) << 24; -+ m = fbCombineDisjointInPart ((CARD8) (sa >> 0), da); -+ n = fbCombineDisjointInPart ((CARD8) (sa >> 8), da) << 8; -+ o = fbCombineDisjointInPart ((CARD8) (sa >> 16), da) << 16; -+ p = fbCombineDisjointInPart ((CARD8) (sa >> 24), da) << 24; - Fa = m|n|o|p; - break; - case CombineA: -@@ -1012,19 +1001,27 @@ - Fb = 0; - break; - case CombineBOut: -- Fb = fbCombineDisjointOutPart (da, sa); -+ m = fbCombineDisjointOutPart (da, (CARD8) (sa >> 0)); -+ n = fbCombineDisjointOutPart (da, (CARD8) (sa >> 8)) << 8; -+ o = fbCombineDisjointOutPart (da, (CARD8) (sa >> 16)) << 16; -+ p = fbCombineDisjointOutPart (da, (CARD8) (sa >> 24)) << 24; -+ Fb = m|n|o|p; - break; - case CombineBIn: -- Fb = fbCombineDisjointInPart (da, sa); -+ m = fbCombineDisjointInPart (da, (CARD8) (sa >> 0)); -+ n = fbCombineDisjointInPart (da, (CARD8) (sa >> 8)) << 8; -+ o = fbCombineDisjointInPart (da, (CARD8) (sa >> 16)) << 16; -+ p = fbCombineDisjointInPart (da, (CARD8) (sa >> 24)) << 24; -+ Fb = m|n|o|p; - break; - case CombineB: -- Fb = 0xff; -+ Fb = 0xffffffff; - break; - } -- m = FbGen (s,d,0,FbGet8(Fa,0),Fb,t,u,v); -- n = FbGen (s,d,8,FbGet8(Fa,8),Fb,t,u,v); -- o = FbGen (s,d,16,FbGet8(Fa,16),Fb,t,u,v); -- p = FbGen (s,d,24,FbGet8(Fa,24),Fb,t,u,v); -+ m = FbGen (s,d,0,FbGet8(Fa,0),FbGet8(Fb,0),t,u,v); -+ n = FbGen (s,d,8,FbGet8(Fa,8),FbGet8(Fb,8),t,u,v); -+ o = FbGen (s,d,16,FbGet8(Fa,16),FbGet8(Fb,16),t,u,v); -+ p = FbGen (s,d,24,FbGet8(Fa,24),FbGet8(Fb,24),t,u,v); - s = m|n|o|p; - (*dst->store) (dst, s); - } -@@ -1065,21 +1062,6 @@ - fbCombineDisjointGeneralC (src, msk, dst, CombineAOver); - } - --void --fbCombineDisjointOverReverseU (FbCompositeOperand *src, -- FbCompositeOperand *msk, -- FbCompositeOperand *dst) --{ -- fbCombineDisjointGeneralU (src, msk, dst, CombineBOver); --} -- --void --fbCombineDisjointOverReverseC (FbCompositeOperand *src, -- FbCompositeOperand *msk, -- FbCompositeOperand *dst) --{ -- fbCombineDisjointGeneralC (src, msk, dst, CombineBOver); --} - - void - fbCombineDisjointInU (FbCompositeOperand *src, -@@ -1281,8 +1263,8 @@ - FbCompSrc cs; - CARD32 s, d; - CARD32 m,n,o,p; -- CARD32 Fa; -- CARD16 Fb, t, u, v; -+ CARD32 Fa, Fb; -+ CARD16 t, u, v; - CARD32 sa; - CARD8 da; - -@@ -1305,10 +1287,10 @@ - Fa = m|n|o|p; - break; - case CombineAIn: -- m = fbCombineConjointOutPart ((CARD8) (sa >> 0), da); -- n = fbCombineConjointOutPart ((CARD8) (sa >> 8), da) << 8; -- o = fbCombineConjointOutPart ((CARD8) (sa >> 16), da) << 16; -- p = fbCombineConjointOutPart ((CARD8) (sa >> 24), da) << 24; -+ m = fbCombineConjointInPart ((CARD8) (sa >> 0), da); -+ n = fbCombineConjointInPart ((CARD8) (sa >> 8), da) << 8; -+ o = fbCombineConjointInPart ((CARD8) (sa >> 16), da) << 16; -+ p = fbCombineConjointInPart ((CARD8) (sa >> 24), da) << 24; - Fa = m|n|o|p; - break; - case CombineA: -@@ -1321,19 +1303,27 @@ - Fb = 0; - break; - case CombineBOut: -- Fb = fbCombineConjointOutPart (da, sa); -+ m = fbCombineConjointOutPart (da, (CARD8) (sa >> 0)); -+ n = fbCombineConjointOutPart (da, (CARD8) (sa >> 8)) << 8; -+ o = fbCombineConjointOutPart (da, (CARD8) (sa >> 16)) << 16; -+ p = fbCombineConjointOutPart (da, (CARD8) (sa >> 24)) << 24; -+ Fb = m|n|o|p; - break; - case CombineBIn: -- Fb = fbCombineConjointInPart (da, sa); -+ m = fbCombineConjointInPart (da, (CARD8) (sa >> 0)); -+ n = fbCombineConjointInPart (da, (CARD8) (sa >> 8)) << 8; -+ o = fbCombineConjointInPart (da, (CARD8) (sa >> 16)) << 16; -+ p = fbCombineConjointInPart (da, (CARD8) (sa >> 24)) << 24; -+ Fb = m|n|o|p; - break; - case CombineB: -- Fb = 0xff; -+ Fb = 0xffffffff; - break; - } -- m = FbGen (s,d,0,FbGet8(Fa,0),Fb,t,u,v); -- n = FbGen (s,d,8,FbGet8(Fa,8),Fb,t,u,v); -- o = FbGen (s,d,16,FbGet8(Fa,16),Fb,t,u,v); -- p = FbGen (s,d,24,FbGet8(Fa,24),Fb,t,u,v); -+ m = FbGen (s,d,0,FbGet8(Fa,0),FbGet8(Fb,0),t,u,v); -+ n = FbGen (s,d,8,FbGet8(Fa,8),FbGet8(Fb,8),t,u,v); -+ o = FbGen (s,d,16,FbGet8(Fa,16),FbGet8(Fb,16),t,u,v); -+ p = FbGen (s,d,24,FbGet8(Fa,24),FbGet8(Fb,24),t,u,v); - s = m|n|o|p; - (*dst->store) (dst, s); - } -@@ -1519,14 +1509,14 @@ - fbCombineAtopReverseU, - fbCombineXorU, - fbCombineAddU, -- fbCombineDisjointOverU, /* Saturate */ -+ fbCombineSaturateU, - 0, - 0, - fbCombineClear, - fbCombineSrcU, - fbCombineDst, - fbCombineDisjointOverU, -- fbCombineDisjointOverReverseU, -+ fbCombineSaturateU, /* DisjointOverReverse */ - fbCombineDisjointInU, - fbCombineDisjointInReverseU, - fbCombineDisjointOutU, -@@ -1566,14 +1556,14 @@ - fbCombineAtopReverseC, - fbCombineXorC, - fbCombineAddC, -- fbCombineDisjointOverC, /* Saturate */ -+ fbCombineSaturateC, - 0, - 0, - fbCombineClear, /* 0x10 */ - fbCombineSrcC, - fbCombineDst, - fbCombineDisjointOverC, -- fbCombineDisjointOverReverseC, -+ fbCombineSaturateC, /* DisjointOverReverse */ - fbCombineDisjointInC, - fbCombineDisjointInReverseC, - fbCombineDisjointOutC, -Index: programs/Xserver/fb/fbpict.c -=================================================================== -RCS file: /cvs/xorg/xc/programs/Xserver/fb/fbpict.c,v -retrieving revision 1.2 -diff -u -r1.2 fbpict.c ---- programs/Xserver/fb/fbpict.c 23 Apr 2004 19:05:14 -0000 1.2 -+++ programs/Xserver/fb/fbpict.c 12 May 2004 00:45:56 -0000 -@@ -1001,7 +1001,6 @@ - { - switch (pSrc->format) { - case PICT_a8r8g8b8: -- case PICT_x8r8g8b8: - switch (pDst->format) { - case PICT_a8r8g8b8: - case PICT_x8r8g8b8: -@@ -1016,7 +1015,6 @@ - } - break; - case PICT_a8b8g8r8: -- case PICT_x8b8g8r8: - switch (pDst->format) { - case PICT_a8b8g8r8: - case PICT_x8b8g8r8: -Index: programs/Xserver/fb/fbpict.h -=================================================================== -RCS file: /cvs/xorg/xc/programs/Xserver/fb/fbpict.h,v -retrieving revision 1.2 -diff -u -r1.2 fbpict.h ---- programs/Xserver/fb/fbpict.h 23 Apr 2004 19:05:14 -0000 1.2 -+++ programs/Xserver/fb/fbpict.h 11 May 2004 18:46:20 -0000 -@@ -333,15 +333,8 @@ - FbCompositeOperand *msk, - FbCompositeOperand *dst); - --void --fbCombineDisjointOverReverseU (FbCompositeOperand *src, -- FbCompositeOperand *msk, -- FbCompositeOperand *dst); -- --void --fbCombineDisjointOverReverseC (FbCompositeOperand *src, -- FbCompositeOperand *msk, -- FbCompositeOperand *dst); -+#define fbCombineDisjointOverReverseU fbCombineSaturateU -+#define fbCombineDisjointOverReverseC fbCombineSaturateC - - void - fbCombineDisjointInU (FbCompositeOperand *src, diff --git a/x11-servers/xorg-server/files/patch-kernel-Imakefile b/x11-servers/xorg-server/files/patch-kernel-Imakefile deleted file mode 100644 index ab5ca0b01406..000000000000 --- a/x11-servers/xorg-server/files/patch-kernel-Imakefile +++ /dev/null @@ -1,18 +0,0 @@ ---- programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/Imakefile.orig Sun May 9 21:27:57 2004 -+++ programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/Imakefile Sun May 9 21:28:16 2004 -@@ -20,6 +20,7 @@ - @echo 'Use "make -f Makefile.bsd" to manually build the modules' - #endif - -+#if 0 - SRCS_DRM = \ - drm.h \ - drmP.h \ -@@ -130,6 +131,7 @@ - InstallNamedNonExec(radeon/Makefile,Makefile,$(DRMSRCDIR)/radeon) - InstallNamedNonExec(sis/Makefile,Makefile,$(DRMSRCDIR)/sis) - InstallNamedNonExec(tdfx/Makefile,Makefile,$(DRMSRCDIR)/tdfx) -+#endif /* 0 */ - - LinkSourceFile(drm.h,$(XF86OSSRC)/shared/drm/kernel) - LinkSourceFile(drm_sarea.h,$(XF86OSSRC)/shared/drm/kernel) diff --git a/x11-servers/xorg-server/files/patch-linux.cf b/x11-servers/xorg-server/files/patch-linux.cf deleted file mode 100644 index 4d6ff268910b..000000000000 --- a/x11-servers/xorg-server/files/patch-linux.cf +++ /dev/null @@ -1,11 +0,0 @@ ---- config/cf/linux.cf.orig Fri May 7 15:51:10 2004 -+++ config/cf/linux.cf Fri May 7 15:51:17 2004 -@@ -747,7 +747,7 @@ - #endif - - #ifndef XF86OSCardDrivers --# define XF86OSCardDrivers v4l -+# define XF86OSCardDrivers fbdev v4l - #endif - - #ifndef OSXInputDrivers diff --git a/x11-servers/xorg-server/files/patch-loadmod.c b/x11-servers/xorg-server/files/patch-loadmod.c deleted file mode 100644 index ea1c4862bfe4..000000000000 --- a/x11-servers/xorg-server/files/patch-loadmod.c +++ /dev/null @@ -1,10 +0,0 @@ ---- programs/Xserver/hw/xfree86/loader/loadmod.c.orig Fri May 7 18:46:10 2004 -+++ programs/Xserver/hw/xfree86/loader/loadmod.c Fri May 7 18:46:12 2004 -@@ -62,7 +62,6 @@ - #include "xf86Xinput.h" - #endif - #include "loader.h" --#include "xf86Optrec.h" - - #include <sys/types.h> - #include <regex.h> diff --git a/x11-servers/xorg-server/files/patch-xf86cfg-Imakefile b/x11-servers/xorg-server/files/patch-xf86cfg-Imakefile new file mode 100644 index 000000000000..5728d915fb48 --- /dev/null +++ b/x11-servers/xorg-server/files/patch-xf86cfg-Imakefile @@ -0,0 +1,11 @@ +--- programs/Xserver/hw/xfree86/xf86cfg/Imakefile.orig Sat Sep 11 15:11:04 2004 ++++ programs/Xserver/hw/xfree86/xf86cfg/Imakefile Sat Sep 11 15:11:07 2004 +@@ -25,6 +25,8 @@ + SNPRINTFOBJS = snprintf.o + #endif + ++XAWLIB = -lXaw ++ + SRCS =\ + accessx.c\ + card-cfg.c\ diff --git a/x11-servers/xorg-server/files/patch-xf86drmCompat.c b/x11-servers/xorg-server/files/patch-xf86drmCompat.c deleted file mode 100644 index 98d4c84a0a03..000000000000 --- a/x11-servers/xorg-server/files/patch-xf86drmCompat.c +++ /dev/null @@ -1,28 +0,0 @@ ---- programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmCompat.c.orig Sun Aug 22 17:35:50 2004 -+++ programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmCompat.c Sun Aug 22 17:36:11 2004 -@@ -77,8 +77,8 @@ - #include "mga_drm.h" - #include "r128_drm.h" - #include "radeon_drm.h" --#ifndef __FreeBSD__ - #include "sis_drm.h" -+#ifndef __FreeBSD__ - #include "i810_drm.h" - #include "i830_drm.h" - #endif -@@ -1012,7 +1012,6 @@ - } - } - --#ifndef __FreeBSD__ - /* SiS */ - - Bool drmSiSAgpInit(int driSubFD, int offset, int size) -@@ -1026,6 +1025,7 @@ - return 1; /* TRUE */ - } - -+#ifndef __FreeBSD__ - /* I830 */ - - Bool drmI830CleanupDma(int driSubFD) diff --git a/x11-servers/xorg-server/files/patch-xf86fbman.c b/x11-servers/xorg-server/files/patch-xf86fbman.c deleted file mode 100644 index 1d6fcc88f041..000000000000 --- a/x11-servers/xorg-server/files/patch-xf86fbman.c +++ /dev/null @@ -1,17 +0,0 @@ ---- programs/Xserver/hw/xfree86/common/xf86fbman.c.orig Wed Nov 26 23:48:58 2003 -+++ programs/Xserver/hw/xfree86/common/xf86fbman.c Wed Sep 1 21:15:58 2004 -@@ -1095,12 +1095,10 @@ - - *size = 0; - -- if (!offman->LinearAreas) return FALSE; -- - pLink = offman->LinearAreas; -- pLinkRet = pLink; - -- if (!pLink->area) { -+ if (pLink && !pLink->area) { -+ pLinkRet = pLink; - while (pLink) { - if (pLink->free) { - if (pLink->linear.size > pLinkRet->linear.size) diff --git a/x11-servers/xorg-server/files/patch-xorg.cf b/x11-servers/xorg-server/files/patch-xorg.cf deleted file mode 100644 index b3f55760761f..000000000000 --- a/x11-servers/xorg-server/files/patch-xorg.cf +++ /dev/null @@ -1,29 +0,0 @@ ---- config/cf/xorg.cf.orig Wed Aug 25 04:46:40 2004 -+++ config/cf/xorg.cf Wed Aug 25 04:53:17 2004 -@@ -388,7 +388,7 @@ - GlideDriver i128 NscDriver \ - ati i810 AgpGartDrivers DevelDrivers ark \ - cyrix siliconmotion via \ -- fbdev vesa vga \ -+ vesa vga \ - dummy XF86OSCardDrivers XF86ExtraCardDrivers - # endif - -@@ -485,7 +485,7 @@ - # define XF86CardDrivers mga glint nv tga s3 s3virge sis rendition \ - neomagic tdfx savage cirrus tseng trident \ - chips apm i128 ati ark cyrix siliconmotion \ -- vga dummy fbdev vesa -+ vga dummy vesa - # endif - - /* DRI tdfx driver needs Glide, which is not available for AMD64 */ -@@ -589,7 +589,7 @@ - /* Pure SBUS and PCI drivers should go first */ - # ifndef XF86CardDrivers - # define XF86CardDrivers sunffb sunleo suncg6 suncg3 suncg14 suntcx \ -- sunbw2 glint mga tdfx ati vesa vga fbdev \ -+ sunbw2 glint mga tdfx ati vesa vga \ - XF86OSCardDrivers XF86ExtraCardDrivers \ - DevelDrivers - # endif diff --git a/x11-servers/xorg-server/files/patch-xorgconfig.c b/x11-servers/xorg-server/files/patch-xorgconfig.c index c1391e8c1b63..650360ec75fe 100644 --- a/x11-servers/xorg-server/files/patch-xorgconfig.c +++ b/x11-servers/xorg-server/files/patch-xorgconfig.c @@ -1,11 +1,11 @@ ---- programs/Xserver/hw/xfree86/xf86config/xorgconfig.c.orig Wed Nov 3 20:05:48 2004 -+++ programs/Xserver/hw/xfree86/xf86config/xorgconfig.c Wed Nov 3 20:06:16 2004 -@@ -838,8 +838,7 @@ +--- programs/Xserver/hw/xfree86/xf86config/xorgconfig.c.orig Mon Nov 8 22:18:58 2004 ++++ programs/Xserver/hw/xfree86/xf86config/xorgconfig.c Mon Nov 8 22:19:22 2004 +@@ -854,8 +854,7 @@ "which is the rate at which scanlines are displayed.\n" "\n" "The valid range for horizontal sync and vertical sync should be documented\n" -"in the manual of your monitor. If in doubt, check the monitor database\n" --TREEROOTLX "/doc/Monitors to see if your monitor is there.\n" +-TREEROOTDOC "/Monitors to see if your monitor is there.\n" +"in the manual of your monitor.\n" "\n"; diff --git a/x11-servers/xorg-server/pkg-plist b/x11-servers/xorg-server/pkg-plist index 56a3728fbaa8..e69e46d0ec56 100644 --- a/x11-servers/xorg-server/pkg-plist +++ b/x11-servers/xorg-server/pkg-plist @@ -36,18 +36,23 @@ include/X11/pixmaps/monitor.xpm include/X11/pixmaps/mouse.xpm lib/X11/Cards lib/X11/Options -lib/X11/XF86Config.98 -lib/X11/XF86Config.eg lib/X11/app-defaults/XOrgCfg lib/X11/doc/BUILD lib/X11/doc/BugReport lib/X11/doc/DESIGN lib/X11/doc/Install lib/X11/doc/LICENSE +lib/X11/doc/OS2.Notes lib/X11/doc/README lib/X11/doc/README.DECtga +lib/X11/doc/README.Darwin lib/X11/doc/README.I128 +lib/X11/doc/README.LynxOS +lib/X11/doc/README.NetBSD +lib/X11/doc/README.OpenBSD +lib/X11/doc/README.SCO lib/X11/doc/README.SiS +lib/X11/doc/README.Solaris lib/X11/doc/README.XKB-Config lib/X11/doc/README.XKB-Enhancing lib/X11/doc/README.apm @@ -72,38 +77,6 @@ lib/X11/etc/xmodmap.std lib/X11/getconfig/cfg.sample lib/X11/getconfig/xorg.cfg lib/X11/xserver/SecurityPolicy -lib/modules/codeconv/libARABIC.a -lib/modules/codeconv/libARMSCII8.a -lib/modules/codeconv/libBIG5.a -lib/modules/codeconv/libBIG5HKSCS.a -lib/modules/codeconv/libDOSENCODING.a -lib/modules/codeconv/libGB18030.a -lib/modules/codeconv/libGB2312.a -lib/modules/codeconv/libGBK.a -lib/modules/codeconv/libGEORGIAN.a -lib/modules/codeconv/libISO8859_1.a -lib/modules/codeconv/libISO8859_10.a -lib/modules/codeconv/libISO8859_11.a -lib/modules/codeconv/libISO8859_13.a -lib/modules/codeconv/libISO8859_14.a -lib/modules/codeconv/libISO8859_15.a -lib/modules/codeconv/libISO8859_2.a -lib/modules/codeconv/libISO8859_3.a -lib/modules/codeconv/libISO8859_4.a -lib/modules/codeconv/libISO8859_5.a -lib/modules/codeconv/libISO8859_6.a -lib/modules/codeconv/libISO8859_7.a -lib/modules/codeconv/libISO8859_8.a -lib/modules/codeconv/libISO8859_9.a -lib/modules/codeconv/libJISX0201.a -lib/modules/codeconv/libJISX0208.a -lib/modules/codeconv/libJISX0212.a -lib/modules/codeconv/libKOI8.a -lib/modules/codeconv/libKSC5601.a -lib/modules/codeconv/libKSCJOHAB.a -lib/modules/codeconv/libMULEENCODING.a -lib/modules/codeconv/libTCVN.a -lib/modules/codeconv/libVISCII.a %%AMD64_I386%%lib/modules/drivers/apm_drv.o %%AMD64_I386%%lib/modules/drivers/ark_drv.o lib/modules/drivers/ati_drv.o @@ -155,9 +128,7 @@ lib/modules/extensions/librecord.a lib/modules/extensions/libxtrap.a lib/modules/fonts/libbitmap.a lib/modules/fonts/libfreetype.so -lib/modules/fonts/libspeedo.a lib/modules/fonts/libtype1.a -lib/modules/fonts/libxtt.a lib/modules/freebsd/libdrm.a lib/modules/input/acecad_drv.o lib/modules/input/calcomp_drv.o @@ -170,6 +141,7 @@ 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/keyboard_drv.o lib/modules/input/magellan_drv.o lib/modules/input/microtouch_drv.o lib/modules/input/mouse_drv.o @@ -181,11 +153,13 @@ 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 +%%ALPHA_NA%%lib/modules/libafb.a lib/modules/libcfb.a lib/modules/libcfb16.a lib/modules/libcfb24.a lib/modules/libcfb32.a +lib/modules/libcw.a +lib/modules/libdamage.a lib/modules/libddc.a lib/modules/libfb.a lib/modules/libi2c.a @@ -209,3 +183,4 @@ lib/modules/libxf8_32bpp.a %%SPARC64%%lib/modules/libxf8_32wid.a %%SPARC64_NA%%lib/modules/v10002d.uc %%SPARC64_NA%%lib/modules/v20002d.uc +@dirrm lib/X11/getconfig diff --git a/x11-servers/xorg-server/scripts/configure b/x11-servers/xorg-server/scripts/configure index 02215f320916..ba6b214f80d3 100644 --- a/x11-servers/xorg-server/scripts/configure +++ b/x11-servers/xorg-server/scripts/configure @@ -14,6 +14,8 @@ echo "#define LibInstall NO" >> $LOCALDEF echo "#define ForceNormalLib NO" >> $LOCALDEF echo "#define XTrueTypeInstallCConvHeaders NO" >> $LOCALDEF echo "#define BuildServer YES" >> $LOCALDEF +echo "#define BuildXprint NO" >> $LOCALDEF +echo "#define BuildLibraries NO" >> $LOCALDEF echo "#define LibInstallBuild YES" >> $LOCALDEF echo "#define ModInstall YES" >> $LOCALDEF echo "#define XF86Server NO" >> $LOCALDEF diff --git a/x11-servers/xorg-vfbserver/Makefile b/x11-servers/xorg-vfbserver/Makefile index f0344b3fda0e..8677424daa26 100644 --- a/x11-servers/xorg-vfbserver/Makefile +++ b/x11-servers/xorg-vfbserver/Makefile @@ -6,13 +6,12 @@ # PORTNAME= xorg-vfbserver -PORTVERSION= 6.7.0 +PORTVERSION= 6.8.1 CATEGORIES= x11-servers -MASTER_SITES= http://freedesktop.org/~xorg/X11R6.7.0/src/ \ - ${MASTER_SITE_XORG} -MASTER_SITE_SUBDIR= R6.7/tars -DISTFILES= X11R6.7.0-src1.tar.gz \ - X11R6.7.0-src3.tar.gz +MASTER_SITES= ${MASTER_SITE_XORG} +MASTER_SITE_SUBDIR= X11R${PORTVERSION}/tars +DISTFILES= X11R${PORTVERSION}-src1.tar.gz \ + X11R${PORTVERSION}-src3.tar.gz MAINTAINER= x11@FreeBSD.org COMMENT= X virtual framebuffer server from X.Org @@ -23,7 +22,7 @@ EXTRA_PATCHES= ${CF_PATCHES} ${SERVER_PATCHES} USE_XLIB= yes -XBUILD_DIRS= lib/font programs/Xserver +XBUILD_DIRS= lib/font programs/Xserver/miext/damage programs/Xserver XINCLUDE_DIRS= lib/xtrans XMAN_DIRS= programs/Xserver diff --git a/x11-servers/xorg-vfbserver/distinfo b/x11-servers/xorg-vfbserver/distinfo index b9025936ccb4..62c1647dc07b 100644 --- a/x11-servers/xorg-vfbserver/distinfo +++ b/x11-servers/xorg-vfbserver/distinfo @@ -1,4 +1,4 @@ -MD5 (xorg/X11R6.7.0-src1.tar.gz) = 22465263bae7a2e9f5ad77e172cf1ab5 -SIZE (xorg/X11R6.7.0-src1.tar.gz) = 30039655 -MD5 (xorg/X11R6.7.0-src3.tar.gz) = 4c7144786522bbce383b21ace72bf669 -SIZE (xorg/X11R6.7.0-src3.tar.gz) = 10855793 +MD5 (xorg/X11R6.8.1-src1.tar.gz) = e352319d423391ff2c03bb7f81fe8d2b +SIZE (xorg/X11R6.8.1-src1.tar.gz) = 30562401 +MD5 (xorg/X11R6.8.1-src3.tar.gz) = 8578e566e909e7c40300f44b6f0e88d3 +SIZE (xorg/X11R6.8.1-src3.tar.gz) = 10014808 diff --git a/x11-servers/xorg-vfbserver/scripts/configure b/x11-servers/xorg-vfbserver/scripts/configure index b36ded9e7e84..7ab6562143f3 100644 --- a/x11-servers/xorg-vfbserver/scripts/configure +++ b/x11-servers/xorg-vfbserver/scripts/configure @@ -6,6 +6,7 @@ rm -f $LOCALDEF echo "#define BuildServer YES" >> $LOCALDEF echo "#define BuildServersOnly YES" >> $LOCALDEF echo "#define XprtServer NO" >> $LOCALDEF +echo "#define BuildXprint NO" >> $LOCALDEF echo "#define XnestServer NO" >> $LOCALDEF echo "#define XorgServer NO" >> $LOCALDEF echo "#define XVirtualFramebufferServer YES" >> $LOCALDEF |