diff options
| author | lesi <lesi@FreeBSD.org> | 2005-06-15 10:40:03 +0800 |
|---|---|---|
| committer | lesi <lesi@FreeBSD.org> | 2005-06-15 10:40:03 +0800 |
| commit | ecf40d2a6837b577969dd569157afeaf4ab4fa83 (patch) | |
| tree | b68b5534754d7d526398bac500532d65e8823573 /x11-servers | |
| parent | 4e3306ebebda9d068a5b2af721a79204736773b2 (diff) | |
| download | freebsd-ports-gnome-ecf40d2a6837b577969dd569157afeaf4ab4fa83.tar.gz freebsd-ports-gnome-ecf40d2a6837b577969dd569157afeaf4ab4fa83.tar.zst freebsd-ports-gnome-ecf40d2a6837b577969dd569157afeaf4ab4fa83.zip | |
Upgrade to XFree86 4.5.0.
Ports changes:
- Drop dependency on x11/wrapper. X server already contains this code
(programs/Xserver/os/utils.c rev. 3.58).
- Install default SecurityPolicy with XFree86-4-libraries, thus avoiding
plists and who-owns-what complications between different fooServer ports.
Copy default file to real one if that doesn't exist and remove both upon
uninstall if they are the same.
- Revert change to Imake.rules rev. 3.132 in devel/imake-4 port, since
couple of ports break with this change
(devel/imake-4/files/patch-Imake.rules)
- Add grehans patches for PPC [1]
- Several of directories that were previously in /etc/mtree/BSD.x11-4.dist
were moved to respective ports pkg-plists
PR: [1] 78345, 78346, 78348, 78352, 78353, 78354, 78355, 78356
Diffstat (limited to 'x11-servers')
49 files changed, 412 insertions, 1120 deletions
diff --git a/x11-servers/XFree86-4-FontServer/Makefile b/x11-servers/XFree86-4-FontServer/Makefile index f22c37422b54..9f7ef72d4ece 100644 --- a/x11-servers/XFree86-4-FontServer/Makefile +++ b/x11-servers/XFree86-4-FontServer/Makefile @@ -6,15 +6,14 @@ # PORTNAME= FontServer -PORTVERSION= 4.4.0 -PORTREVISION= 2 +PORTVERSION= 4.5.0 CATEGORIES= x11-servers x11-fonts MASTER_SITES= ${MASTER_SITE_XFREE} MASTER_SITE_SUBDIR= ${PORTVERSION} PKGNAMEPREFIX= XFree86- -DISTFILES= XFree86-4.4.0-src-1.tgz \ - XFree86-4.4.0-src-2.tgz \ - XFree86-4.4.0-src-3.tgz +DISTFILES= XFree86-${PORTVERSION}-src-1.tgz \ + XFree86-${PORTVERSION}-src-2.tgz \ + XFree86-${PORTVERSION}-src-3.tgz MAINTAINER= x11@FreeBSD.org COMMENT= XFree86-4 font server diff --git a/x11-servers/XFree86-4-FontServer/distinfo b/x11-servers/XFree86-4-FontServer/distinfo index ba2d5d81e5e3..5cb3430994ae 100644 --- a/x11-servers/XFree86-4-FontServer/distinfo +++ b/x11-servers/XFree86-4-FontServer/distinfo @@ -1,6 +1,6 @@ -MD5 (xc/XFree86-4.4.0-src-1.tgz) = 97cea3d9e1197dde32ca34e3b6086469 -SIZE (xc/XFree86-4.4.0-src-1.tgz) = 11760814 -MD5 (xc/XFree86-4.4.0-src-2.tgz) = b9b6c74a03e314569e01d5fd4ff59523 -SIZE (xc/XFree86-4.4.0-src-2.tgz) = 5745538 -MD5 (xc/XFree86-4.4.0-src-3.tgz) = 703404f48d3a15f58389a879d47c769d -SIZE (xc/XFree86-4.4.0-src-3.tgz) = 11239253 +MD5 (xc/XFree86-4.5.0-src-1.tgz) = 6c0fcf8069c13d068276016bbf6ad712 +SIZE (xc/XFree86-4.5.0-src-1.tgz) = 10507331 +MD5 (xc/XFree86-4.5.0-src-2.tgz) = cc296c71cbe58edc3ffdec1084e58f4c +SIZE (xc/XFree86-4.5.0-src-2.tgz) = 5826556 +MD5 (xc/XFree86-4.5.0-src-3.tgz) = c0ad630bfec4545857c2877b3e2dcbeb +SIZE (xc/XFree86-4.5.0-src-3.tgz) = 12086763 diff --git a/x11-servers/XFree86-4-FontServer/pkg-plist b/x11-servers/XFree86-4-FontServer/pkg-plist index 498ae0096911..fa422c54fa19 100644 --- a/x11-servers/XFree86-4-FontServer/pkg-plist +++ b/x11-servers/XFree86-4-FontServer/pkg-plist @@ -2,3 +2,4 @@ bin/xfs etc/rc.d/xfs.sh lib/X11/fs/config.default +@dirrm lib/X11/fs diff --git a/x11-servers/XFree86-4-FontServer/scripts/configure b/x11-servers/XFree86-4-FontServer/scripts/configure index 2fe7598d1330..3daedd35e4ea 100644 --- a/x11-servers/XFree86-4-FontServer/scripts/configure +++ b/x11-servers/XFree86-4-FontServer/scripts/configure @@ -36,6 +36,7 @@ for i in BuildFonts \ XnestServer \ XVirtualFramebufferServer \ XprtServer \ + XdmxServer \ LibHeaders \ ForceNormalLib \ XTrueTypeInstallCConvHeaders diff --git a/x11-servers/XFree86-4-NestServer/Makefile b/x11-servers/XFree86-4-NestServer/Makefile index 729bad199bc6..b03e4a24d354 100644 --- a/x11-servers/XFree86-4-NestServer/Makefile +++ b/x11-servers/XFree86-4-NestServer/Makefile @@ -6,41 +6,28 @@ # PORTNAME= NestServer -PORTVERSION= 4.4.0 -PORTREVISION= 1 +PORTVERSION= 4.5.0 CATEGORIES= x11-servers -MASTER_SITES= ${MASTER_SITE_XFREE:S/$/:x/} \ - ${MASTER_SITE_LOCAL:S/$/:local/} -MASTER_SITE_SUBDIR= ${PORTVERSION}/:x \ - anholt/:local +MASTER_SITES= ${MASTER_SITE_XFREE} +MASTER_SITE_SUBDIR= ${PORTVERSION} PKGNAMEPREFIX= XFree86- -DISTFILES= XFree86-4.4.0-src-1.tgz:x \ - XFree86-4.4.0-src-2.tgz:x \ - XFree86-4.4.0-src-3.tgz:x \ - Wraphelp2.gz:local -EXTRACT_ONLY= XFree86-4.4.0-src-1.tgz \ - XFree86-4.4.0-src-2.tgz \ - XFree86-4.4.0-src-3.tgz +DISTFILES= XFree86-${PORTVERSION}-src-1.tgz \ + XFree86-${PORTVERSION}-src-2.tgz \ + XFree86-${PORTVERSION}-src-3.tgz MAINTAINER= x11@FreeBSD.org COMMENT= XFree86-4 nested X server -CONFLICTS= xorg-nestserver-* +CONFLICTS= xorg-nestserver-[0-9]* MAN1= Xnest.1 -EXTRA_PATCHES+= ${FILESDIR}/patch-programs::Xserver::Xext::Imakefile +PLIST_FILES= bin/Xnest + XBUILD_DIRS= lib/font lib/lbxutil lib/Xdmcp lib/Xau programs/Xserver XINCLUDE_DIRS= lib/xkbfile lib/xtrans XINSTALL_DIRS= programs/Xserver XINSTALL_MAN_DIRS= programs/Xserver/hw/xnest -post-extract: - ${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/Wraphelp2.gz > \ - ${WRKSRC}/lib/Xdmcp/Wraphelp.c - -post-install: - @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL - .include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc" .include <bsd.port.pre.mk> .if ${X_WINDOW_SYSTEM:L} != xfree86-4 diff --git a/x11-servers/XFree86-4-NestServer/distinfo b/x11-servers/XFree86-4-NestServer/distinfo index edbe3d91944d..5cb3430994ae 100644 --- a/x11-servers/XFree86-4-NestServer/distinfo +++ b/x11-servers/XFree86-4-NestServer/distinfo @@ -1,8 +1,6 @@ -MD5 (xc/XFree86-4.4.0-src-1.tgz) = 97cea3d9e1197dde32ca34e3b6086469 -SIZE (xc/XFree86-4.4.0-src-1.tgz) = 11760814 -MD5 (xc/XFree86-4.4.0-src-2.tgz) = b9b6c74a03e314569e01d5fd4ff59523 -SIZE (xc/XFree86-4.4.0-src-2.tgz) = 5745538 -MD5 (xc/XFree86-4.4.0-src-3.tgz) = 703404f48d3a15f58389a879d47c769d -SIZE (xc/XFree86-4.4.0-src-3.tgz) = 11239253 -MD5 (xc/Wraphelp2.gz) = bd1910492087442288d885412e2e5535 -SIZE (xc/Wraphelp2.gz) = 3376 +MD5 (xc/XFree86-4.5.0-src-1.tgz) = 6c0fcf8069c13d068276016bbf6ad712 +SIZE (xc/XFree86-4.5.0-src-1.tgz) = 10507331 +MD5 (xc/XFree86-4.5.0-src-2.tgz) = cc296c71cbe58edc3ffdec1084e58f4c +SIZE (xc/XFree86-4.5.0-src-2.tgz) = 5826556 +MD5 (xc/XFree86-4.5.0-src-3.tgz) = c0ad630bfec4545857c2877b3e2dcbeb +SIZE (xc/XFree86-4.5.0-src-3.tgz) = 12086763 diff --git a/x11-servers/XFree86-4-NestServer/files/patch-programs::Xserver::Xext::Imakefile b/x11-servers/XFree86-4-NestServer/files/patch-programs::Xserver::Xext::Imakefile deleted file mode 100644 index 350e13eebafb..000000000000 --- a/x11-servers/XFree86-4-NestServer/files/patch-programs::Xserver::Xext::Imakefile +++ /dev/null @@ -1,11 +0,0 @@ ---- programs/Xserver/Xext/Imakefile.orig Mon May 10 01:50:48 2004 -+++ programs/Xserver/Xext/Imakefile Mon May 10 01:53:00 2004 -@@ -160,7 +160,7 @@ - LinkSourceFile(modinit.h,extmod) - - #if BuildXCSecurity && InstallSecurityConfig --InstallNonExecFile(SecurityPolicy,$(SERVERCONFIGDIR)) -+InstallNamedNonExec(SecurityPolicy,SecurityPolicy.default-NestServer,$(SERVERCONFIGDIR)) - #endif - - DependTarget() diff --git a/x11-servers/XFree86-4-NestServer/pkg-plist b/x11-servers/XFree86-4-NestServer/pkg-plist deleted file mode 100644 index d30d2d29dd1e..000000000000 --- a/x11-servers/XFree86-4-NestServer/pkg-plist +++ /dev/null @@ -1,2 +0,0 @@ -bin/Xnest -lib/X11/xserver/SecurityPolicy.default-NestServer diff --git a/x11-servers/XFree86-4-NestServer/scripts/configure b/x11-servers/XFree86-4-NestServer/scripts/configure index 63f1ce26feed..a5a5dfc2c9e5 100644 --- a/x11-servers/XFree86-4-NestServer/scripts/configure +++ b/x11-servers/XFree86-4-NestServer/scripts/configure @@ -36,8 +36,10 @@ for i in BuildFonts \ BuildFontServer \ XVirtualFramebufferServer \ XprtServer \ + XdmxServer \ LibHeaders \ ForceNormalLib \ + InstallSecurityConfig \ XTrueTypeInstallCConvHeaders do \ echo "#define $i NO" >> $LOCALDEF diff --git a/x11-servers/XFree86-4-PrintServer/Makefile b/x11-servers/XFree86-4-PrintServer/Makefile index 5a912a7d39c0..f8dafbf7cf26 100644 --- a/x11-servers/XFree86-4-PrintServer/Makefile +++ b/x11-servers/XFree86-4-PrintServer/Makefile @@ -6,21 +6,14 @@ # PORTNAME= PrintServer -PORTVERSION= 4.4.0 -PORTREVISION= 1 +PORTVERSION= 4.5.0 CATEGORIES= x11-servers -MASTER_SITES= ${MASTER_SITE_XFREE:S/$/:x/} \ - ${MASTER_SITE_LOCAL:S/$/:local/} -MASTER_SITE_SUBDIR= ${PORTVERSION}/:x \ - anholt/:local +MASTER_SITES= ${MASTER_SITE_XFREE} +MASTER_SITE_SUBDIR= ${PORTVERSION} PKGNAMEPREFIX= XFree86- -DISTFILES= XFree86-4.4.0-src-1.tgz:x \ - XFree86-4.4.0-src-2.tgz:x \ - XFree86-4.4.0-src-3.tgz:x \ - Wraphelp2.gz:local -EXTRACT_ONLY= XFree86-4.4.0-src-1.tgz \ - XFree86-4.4.0-src-2.tgz \ - XFree86-4.4.0-src-3.tgz +DISTFILES= XFree86-${PORTVERSION}-src-1.tgz \ + XFree86-${PORTVERSION}-src-2.tgz \ + XFree86-${PORTVERSION}-src-3.tgz MAINTAINER= x11@FreeBSD.org COMMENT= XFree86-4 print server @@ -32,10 +25,6 @@ XBUILD_DIRS= lib/font lib/lbxutil lib/Xdmcp lib/Xau programs/Xserver XINCLUDE_DIRS= lib/xkbfile lib/xtrans XINSTALL_DIRS= programs/Xserver -post-extract: - ${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/Wraphelp2.gz > \ - ${WRKSRC}/lib/Xdmcp/Wraphelp.c - do-install: $(INSTALL_PROGRAM) ${WRKSRC}/programs/Xserver/Xprt ${PREFIX}/bin/Xprt diff --git a/x11-servers/XFree86-4-PrintServer/distinfo b/x11-servers/XFree86-4-PrintServer/distinfo index edbe3d91944d..5cb3430994ae 100644 --- a/x11-servers/XFree86-4-PrintServer/distinfo +++ b/x11-servers/XFree86-4-PrintServer/distinfo @@ -1,8 +1,6 @@ -MD5 (xc/XFree86-4.4.0-src-1.tgz) = 97cea3d9e1197dde32ca34e3b6086469 -SIZE (xc/XFree86-4.4.0-src-1.tgz) = 11760814 -MD5 (xc/XFree86-4.4.0-src-2.tgz) = b9b6c74a03e314569e01d5fd4ff59523 -SIZE (xc/XFree86-4.4.0-src-2.tgz) = 5745538 -MD5 (xc/XFree86-4.4.0-src-3.tgz) = 703404f48d3a15f58389a879d47c769d -SIZE (xc/XFree86-4.4.0-src-3.tgz) = 11239253 -MD5 (xc/Wraphelp2.gz) = bd1910492087442288d885412e2e5535 -SIZE (xc/Wraphelp2.gz) = 3376 +MD5 (xc/XFree86-4.5.0-src-1.tgz) = 6c0fcf8069c13d068276016bbf6ad712 +SIZE (xc/XFree86-4.5.0-src-1.tgz) = 10507331 +MD5 (xc/XFree86-4.5.0-src-2.tgz) = cc296c71cbe58edc3ffdec1084e58f4c +SIZE (xc/XFree86-4.5.0-src-2.tgz) = 5826556 +MD5 (xc/XFree86-4.5.0-src-3.tgz) = c0ad630bfec4545857c2877b3e2dcbeb +SIZE (xc/XFree86-4.5.0-src-3.tgz) = 12086763 diff --git a/x11-servers/XFree86-4-PrintServer/scripts/configure b/x11-servers/XFree86-4-PrintServer/scripts/configure index 2dafb5a3dc33..4891f552f098 100644 --- a/x11-servers/XFree86-4-PrintServer/scripts/configure +++ b/x11-servers/XFree86-4-PrintServer/scripts/configure @@ -36,6 +36,7 @@ for i in BuildFonts \ BuildFontServer \ XnestServer \ XVirtualFramebufferServer \ + XdmxServer \ LibHeaders \ ForceNormalLib \ XTrueTypeInstallCConvHeaders diff --git a/x11-servers/XFree86-4-Server/Makefile b/x11-servers/XFree86-4-Server/Makefile index 5afd4211fa10..e9f1b2d4a7ea 100644 --- a/x11-servers/XFree86-4-Server/Makefile +++ b/x11-servers/XFree86-4-Server/Makefile @@ -6,21 +6,14 @@ # PORTNAME= Server -PORTVERSION= 4.4.0 -PORTREVISION= 7 +PORTVERSION= 4.5.0 CATEGORIES= x11-servers -MASTER_SITES= ${MASTER_SITE_XFREE:S/$/:x/} \ - ${MASTER_SITE_LOCAL:S/$/:local/} -MASTER_SITE_SUBDIR= ${PORTVERSION}/:x \ - anholt/:local +MASTER_SITES= ${MASTER_SITE_XFREE} +MASTER_SITE_SUBDIR= ${PORTVERSION} PKGNAMEPREFIX= XFree86- -DISTFILES= XFree86-4.4.0-src-1.tgz:x \ - XFree86-4.4.0-src-2.tgz:x \ - XFree86-4.4.0-src-3.tgz:x \ - Wraphelp2.gz:local -EXTRACT_ONLY= XFree86-4.4.0-src-1.tgz \ - XFree86-4.4.0-src-2.tgz \ - XFree86-4.4.0-src-3.tgz +DISTFILES= XFree86-${PORTVERSION}-src-1.tgz \ + XFree86-${PORTVERSION}-src-2.tgz \ + XFree86-${PORTVERSION}-src-3.tgz MAINTAINER= x11@FreeBSD.org COMMENT= XFree86-4 X server and related programs @@ -32,13 +25,17 @@ PATCHDIR= ${MASTERDIR}/files .for pf in patch-Imake.rules patch-Imake.tmpl \ patch-X11.tmpl patch-Xcursor-Imakefile \ - patch-amd64 patch-c2 patch-dri-Imakefile \ + patch-c2 \ patch-f patch-imake.c \ patch-texteroids patch-xditview-Imakefile patch-xdm \ patch-xdm_session.c patch-xf86.tmpl \ - patch-xterm-Imakefile patch-z05 patch-z14 \ - patch-z15 patch-z30 patch-z32 patch-z34 patch-z35 \ - patch-z41 patch-z44 patch-z45 + patch-xterm-Imakefile patch-z14 \ + patch-z15 patch-z34 patch-z35 \ + patch-z45 \ + patch-lib_GL_GL_Imakefile \ + patch-lib_GL_mesa_drivers_dri_Imakefile \ + patch-lib_GL_mesa_drivers_osmesa_Imakefile \ + patch-programs_Xserver_GL_dri_Imakefile # patch-startx EXTRA_PATCHES+= ${.CURDIR}/../../x11/XFree86-4-libraries/files/${pf} @@ -149,6 +146,12 @@ PLIST_SUB+= IA64_NA="@comment " PLIST_SUB+= IA64_NA="" .endif +.if ${ARCH} == powerpc +PLIST_SUB+= PPC_NA="@comment " +.else +PLIST_SUB+= PPC_NA="" +.endif + .if ${ARCH} == sparc64 PLIST_SUB+= SPARC64_NA="@comment " PLIST_SUB+= SPARC64="" @@ -158,10 +161,8 @@ PLIST_SUB+= SPARC64="@comment " PLIST_SUB+= SPARC64_NA="" MAN4+= glint.4x \ mga.4x \ - rendition.4x \ s3virge.4x \ savage.4x \ - siliconmotion.4x \ tdfx.4x \ vga.4x .endif @@ -194,17 +195,16 @@ PLIST_SUB+= AMD64_I386="" PLIST_SUB+= AMD64_I386="@comment " .endif -post-extract:: - ${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/Wraphelp2.gz > \ - ${WRKSRC}/lib/Xdmcp/Wraphelp.c - @${MKDIR} ${WRKDIR}/drmsource +.if ${ARCH} != powerpc && ${ARCH} != sparc64 +MAN4+= rendition.4x \ + siliconmotion.4x +.endif post-build: @${RM} -f ${PKGMESSAGE} @${CAT} ${.CURDIR}/pkg-message >> ${PKGMESSAGE} post-install:: - @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL @${SED} -e s,/usr/X11R6,${PREFIX}, ${PKGMESSAGE} @if [ -f ${PREFIX}/bin/Xwrapper-4 ] ; then \ ${LN} -sf Xwrapper-4 ${PREFIX}/bin/X; \ diff --git a/x11-servers/XFree86-4-Server/distinfo b/x11-servers/XFree86-4-Server/distinfo index edbe3d91944d..5cb3430994ae 100644 --- a/x11-servers/XFree86-4-Server/distinfo +++ b/x11-servers/XFree86-4-Server/distinfo @@ -1,8 +1,6 @@ -MD5 (xc/XFree86-4.4.0-src-1.tgz) = 97cea3d9e1197dde32ca34e3b6086469 -SIZE (xc/XFree86-4.4.0-src-1.tgz) = 11760814 -MD5 (xc/XFree86-4.4.0-src-2.tgz) = b9b6c74a03e314569e01d5fd4ff59523 -SIZE (xc/XFree86-4.4.0-src-2.tgz) = 5745538 -MD5 (xc/XFree86-4.4.0-src-3.tgz) = 703404f48d3a15f58389a879d47c769d -SIZE (xc/XFree86-4.4.0-src-3.tgz) = 11239253 -MD5 (xc/Wraphelp2.gz) = bd1910492087442288d885412e2e5535 -SIZE (xc/Wraphelp2.gz) = 3376 +MD5 (xc/XFree86-4.5.0-src-1.tgz) = 6c0fcf8069c13d068276016bbf6ad712 +SIZE (xc/XFree86-4.5.0-src-1.tgz) = 10507331 +MD5 (xc/XFree86-4.5.0-src-2.tgz) = cc296c71cbe58edc3ffdec1084e58f4c +SIZE (xc/XFree86-4.5.0-src-2.tgz) = 5826556 +MD5 (xc/XFree86-4.5.0-src-3.tgz) = c0ad630bfec4545857c2877b3e2dcbeb +SIZE (xc/XFree86-4.5.0-src-3.tgz) = 12086763 diff --git a/x11-servers/XFree86-4-Server/files/patch-FreeBSD.cf b/x11-servers/XFree86-4-Server/files/patch-FreeBSD.cf index bcbd69901253..01fcb12d6134 100644 --- a/x11-servers/XFree86-4-Server/files/patch-FreeBSD.cf +++ b/x11-servers/XFree86-4-Server/files/patch-FreeBSD.cf @@ -1,6 +1,6 @@ ---- config/cf/FreeBSD.cf.orig Sat Nov 1 20:38:01 2003 -+++ config/cf/FreeBSD.cf Tue Nov 11 20:47:11 2003 -@@ -172,11 +172,11 @@ +--- config/cf/FreeBSD.cf.orig Thu Mar 3 03:32:17 2005 ++++ config/cf/FreeBSD.cf Wed Mar 23 10:41:03 2005 +@@ -234,11 +234,11 @@ * ld: warning: libXThrStub.so.6, needed by libX11.so, not found */ #if BuildThreadStubLibrary && (!defined(UseInstalledX11) || !UseInstalledX11) @@ -16,7 +16,17 @@ #endif #define CppCmd /usr/bin/cpp -@@ -393,18 +393,8 @@ +@@ -470,6 +470,9 @@ + #define AsVISOption -Av9a + #define AsOutputArchSize 64 + #endif ++#ifdef PpcArchitecture ++#define XF86INT10_BUILD X86INT10_STUB ++#endif + + #define StandardDefines -DCSRG_BASED + +@@ -491,18 +494,8 @@ #define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC #endif diff --git a/x11-servers/XFree86-4-Server/files/patch-Imake.cf b/x11-servers/XFree86-4-Server/files/patch-Imake.cf new file mode 100644 index 000000000000..cdda9ca19f79 --- /dev/null +++ b/x11-servers/XFree86-4-Server/files/patch-Imake.cf @@ -0,0 +1,18 @@ + +--- patch-Imake.cf begins here --- +--- config/cf/Imake.cf.orig Wed Jan 19 20:53:39 2005 ++++ config/cf/Imake.cf Wed Jan 19 20:55:09 2005 +@@ -282,6 +282,10 @@ + # undef __amd64__ + # undef __x86_64__ + # endif ++# ifdef __powerpc__ ++# define PpcArchitecture ++# undef __powerpc__ ++# endif + #endif /* __FreeBSD__ */ + + /* Systems based on kernel of FreeBSD */ +--- patch-Imake.cf ends here --- + + diff --git a/x11-servers/XFree86-4-Server/files/patch-Pci.h b/x11-servers/XFree86-4-Server/files/patch-Pci.h new file mode 100644 index 000000000000..ece4cf51dbc4 --- /dev/null +++ b/x11-servers/XFree86-4-Server/files/patch-Pci.h @@ -0,0 +1,16 @@ + +--- patch-Pci.h begins here --- +--- programs/Xserver/hw/xfree86/os-support/bus/Pci.h.orig Thu Jan 20 06:51:21 2005 ++++ programs/Xserver/hw/xfree86/os-support/bus/Pci.h Thu Jan 20 06:52:09 2005 +@@ -285,7 +285,7 @@ + # define ARCH_PCI_INIT linuxPciInit + # define INCLUDE_XF86_MAP_PCI_MEM + # define INCLUDE_XF86_NO_DOMAIN /* Needs kernel work to remove */ +-# elif defined(__OpenBSD__) ++# elif defined(__FreeBSD__) || defined(__OpenBSD__) + # define ARCH_PCI_INIT freebsdPciInit + # define INCLUDE_XF86_MAP_PCI_MEM + # define INCLUDE_XF86_NO_DOMAIN +--- patch-Pci.h ends here --- + + diff --git a/x11-servers/XFree86-4-Server/files/patch-Xext-saver.c b/x11-servers/XFree86-4-Server/files/patch-Xext-saver.c deleted file mode 100644 index ca124eacf985..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-Xext-saver.c +++ /dev/null @@ -1,43 +0,0 @@ -Index: programs/Xserver/Xext/saver.c -=================================================================== -RCS file: /cvs/xc/programs/Xserver/Xext/saver.c,v -retrieving revision 3.8 -retrieving revision 3.8.2.1 -diff -u -u -r3.8 -r3.8.2.1 ---- programs/Xserver/Xext/saver.c 17 Nov 2003 22:20:26 -0000 3.8 -+++ programs/Xserver/Xext/saver.c 2 Mar 2004 19:39:48 -0000 3.8.2.1 -@@ -27,7 +27,7 @@ - * Author: Keith Packard, MIT X Consortium - */ - --/* $XFree86: xc/programs/Xserver/Xext/saver.c,v 3.8 2003/11/17 22:20:26 dawes Exp $ */ -+/* $XFree86: xc/programs/Xserver/Xext/saver.c,v 3.8.2.1 2004/03/02 19:39:48 dawes Exp $ */ - - #define NEED_REPLIES - #define NEED_EVENTS -@@ -810,7 +810,7 @@ - DepthPtr pDepth; - WindowOptPtr ancwopt; - unsigned long *pVlist; -- unsigned long *values = 0; -+ unsigned long *values = 0, *save = 0; - unsigned long tmask, imask; - unsigned long val; - Pixmap pixID; -@@ -938,6 +938,7 @@ - ret = BadAlloc; - goto bail; - } -+ save = values; - pAttr->screen = pScreen; - pAttr->client = client; - pAttr->x = stuff->x; -@@ -1166,7 +1167,7 @@ - bail: - CheckScreenPrivate (pScreen); - xfree (pAttr); -- xfree (values); -+ xfree (save); - return ret; - } - diff --git a/x11-servers/XFree86-4-Server/files/patch-alpha_video.c b/x11-servers/XFree86-4-Server/files/patch-alpha_video.c deleted file mode 100644 index fdb7cbd95a5b..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-alpha_video.c +++ /dev/null @@ -1,13 +0,0 @@ -$FreeBSD: /tmp/pcvs/ports/x11-servers/XFree86-4-Server/files/Attic/patch-alpha_video.c,v 1.3 2004-08-10 01:29:21 marcus Exp $ - ---- programs/Xserver/hw/xfree86/os-support/bsd/alpha_video.c.orig Wed Feb 25 11:04:10 2004 -+++ programs/Xserver/hw/xfree86/os-support/bsd/alpha_video.c Wed Feb 25 11:04:50 2004 -@@ -483,7 +483,7 @@ - writeSparse32(int Value, pointer Base, register unsigned long Offset); - - #ifdef __FreeBSD__ --extern int sysarch(int, char *); -+extern int sysarch(int, void *); - #endif - - struct parms { diff --git a/x11-servers/XFree86-4-Server/files/patch-atimobility b/x11-servers/XFree86-4-Server/files/patch-atimobility deleted file mode 100644 index b263a250ad5b..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-atimobility +++ /dev/null @@ -1,76 +0,0 @@ -diff -ruN ../../orig/xc/programs/Xserver/hw/xfree86/drivers/ati/atimode.c ./programs/Xserver/hw/xfree86/drivers/ati/atimode.c ---- ../../orig/xc/programs/Xserver/hw/xfree86/drivers/ati/atimode.c Wed Jan 12 13:01:31 2005 -+++ ./programs/Xserver/hw/xfree86/drivers/ati/atimode.c Fri Feb 4 07:52:01 2005 -@@ -1,4 +1,4 @@ --/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atimode.c,v 1.20 2004/12/31 16:07:06 tsi Exp $ */ -+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atimode.c,v 1.20tsi Exp $ */ - /* - * Copyright 2000 through 2005 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org - * -@@ -646,7 +646,7 @@ - SetBits(pMode->CrtcVDisplay, CRTC_V_DISP); - pATIHW->crtc_v_sync_strt_wid = - SetBits(pMode->CrtcVSyncStart, CRTC_V_SYNC_STRT) | -- SetBits(pMode->CrtcVSyncEnd, CRTC_V_SYNC_WID); -+ SetBits(pMode->CrtcVSyncEnd, CRTC_V_SYNC_END_VGA); - if (pMode->Flags & V_NVSYNC) - pATIHW->crtc_v_sync_strt_wid |= CRTC_V_SYNC_POL; - } -diff -ruN ../../orig/xc/programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c ./programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c ---- ../../orig/xc/programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c Wed Jan 12 13:01:31 2005 -+++ ./programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c Fri Feb 4 07:52:01 2005 -@@ -1,4 +1,4 @@ --/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c,v 1.79 2004/12/31 16:07:06 tsi Exp $ */ -+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c,v 1.79tsi Exp $ */ - /* - * Copyright 1999 through 2005 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org - * -@@ -1900,10 +1900,10 @@ - VDisplay = GetBits(pATIHW->crtc_v_total_disp, CRTC_V_DISP); - VSyncStart = - GetBits(pATIHW->crtc_v_sync_strt_wid, CRTC_V_SYNC_STRT); -- VSyncEnd = (VSyncStart & ~MaxBits(CRTC_V_SYNC_WID)) | -- GetBits(pATIHW->crtc_v_sync_strt_wid, CRTC_V_SYNC_WID); -+ VSyncEnd = (VSyncStart & ~MaxBits(CRTC_V_SYNC_END_VGA)) | -+ GetBits(pATIHW->crtc_v_sync_strt_wid, CRTC_V_SYNC_END_VGA); - if (VSyncStart > VSyncEnd) -- VSyncEnd += MaxBits(CRTC_V_SYNC_WID) + 1; -+ VSyncEnd += MaxBits(CRTC_V_SYNC_END_VGA) + 1; - VTotal = GetBits(pATIHW->crtc_v_total_disp, CRTC_V_TOTAL); - - VBlankStart = (VDisplay & ~0x03FFU) | -@@ -2175,7 +2175,7 @@ - if ((pATIHW->horz_stretching & - (HORZ_STRETCH_EN | AUTO_HORZ_RATIO)) != - (HORZ_STRETCH_EN | AUTO_HORZ_RATIO)) -- xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING, -+ xf86DrvMsgVerb(pScreenInfo->scrnIndex, X_WARNING, 4, - "Inconsistent panel horizontal dimension:" - " %d and %d.\n", pATI->LCDHorizontal, HDisplay); - HDisplay = pATI->LCDHorizontal; -@@ -2191,7 +2191,7 @@ - { - if (!(pATIHW->vert_stretching & VERT_STRETCH_EN) || - !(pATIHW->ext_vert_stretch & AUTO_VERT_RATIO)) -- xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING, -+ xf86DrvMsgVerb(pScreenInfo->scrnIndex, X_WARNING, 4, - "Inconsistent panel vertical dimension: %d and %d.\n", - pATI->LCDVertical, VDisplay); - VDisplay = pATI->LCDVertical; -diff -ruN ../../orig/xc/programs/Xserver/hw/xfree86/drivers/ati/atiregs.h ./programs/Xserver/hw/xfree86/drivers/ati/atiregs.h ---- ../../orig/xc/programs/Xserver/hw/xfree86/drivers/ati/atiregs.h Wed Jan 12 13:01:32 2005 -+++ ./programs/Xserver/hw/xfree86/drivers/ati/atiregs.h Fri Feb 4 07:52:01 2005 -@@ -1,4 +1,4 @@ --/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atiregs.h,v 1.26 2004/12/31 16:07:07 tsi Exp $ */ -+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atiregs.h,v 1.26tsi Exp $ */ - /* - * Copyright 1994 through 2005 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org - * -@@ -551,6 +551,7 @@ - #define CRTC_V_SYNC_STRT 0x000007fful - /* ? 0x0000f800ul */ - #define CRTC_V_SYNC_WID 0x001f0000ul -+#define CRTC_V_SYNC_END_VGA 0x000f0000ul - #define CRTC_V_SYNC_POL 0x00200000ul - /* ? 0xffc00000ul */ - #define CRTC_VLINE_CRNT_VLINE IOPortTag(0x04u, 0x04u) diff --git a/x11-servers/XFree86-4-Server/files/patch-bus_Imakefile b/x11-servers/XFree86-4-Server/files/patch-bus_Imakefile new file mode 100644 index 000000000000..0e80a054d0ef --- /dev/null +++ b/x11-servers/XFree86-4-Server/files/patch-bus_Imakefile @@ -0,0 +1,21 @@ + +--- patch-bus-Imakefile begins here --- +--- programs/Xserver/hw/xfree86/os-support/bus/Imakefile.orig Thu Jan 20 03:43:03 2005 ++++ programs/Xserver/hw/xfree86/os-support/bus/Imakefile Thu Jan 20 03:46:40 2005 +@@ -66,6 +66,13 @@ + PCIDRVRSRC = netbsdPci.c + PCIDRVROBJ = netbsdPci.o + ++#elif defined(FreeBSDArchitecture) && defined(PpcArchitecture) ++ ++XCOMM FreeBSD/PowerPC PCI driver (using /dev/pci) ++ ++PCIDRVRSRC = freebsdPci.c ++PCIDRVROBJ = freebsdPci.o ++ + #elif defined(PpcArchitecture) + + XCOMM PowerPC PCI drivers +--- patch-bus-Imakefile ends here --- + + diff --git a/x11-servers/XFree86-4-Server/files/patch-compiler.h b/x11-servers/XFree86-4-Server/files/patch-compiler.h new file mode 100644 index 000000000000..cab042675d88 --- /dev/null +++ b/x11-servers/XFree86-4-Server/files/patch-compiler.h @@ -0,0 +1,16 @@ + +--- patch-compiler.h begins here --- +--- programs/Xserver/hw/xfree86/common/compiler.h.orig Fri Jan 21 03:19:16 2005 ++++ programs/Xserver/hw/xfree86/common/compiler.h Fri Jan 21 03:20:03 2005 +@@ -1068,7 +1068,7 @@ + # define write_mem_barrier() /* NOP */ + # endif /* __arm32__ */ + +-# elif (defined(Lynx) || defined(linux) || defined(__OpenBSD__) || defined(__NetBSD__)) && defined(__powerpc__) ++# elif (defined(Lynx) || defined(linux) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__)) && defined(__powerpc__) + + # ifndef MAP_FAILED + # define MAP_FAILED ((void *)-1) +--- patch-compiler.h ends here --- + + diff --git a/x11-servers/XFree86-4-Server/files/patch-drm_Imakefile b/x11-servers/XFree86-4-Server/files/patch-drm_Imakefile new file mode 100644 index 000000000000..08e8d9ab4756 --- /dev/null +++ b/x11-servers/XFree86-4-Server/files/patch-drm_Imakefile @@ -0,0 +1,15 @@ +--- programs/Xserver/hw/xfree86/os-support/bsd/drm/Imakefile.orig Thu Feb 24 16:37:48 2005 ++++ programs/Xserver/hw/xfree86/os-support/bsd/drm/Imakefile Thu Feb 24 16:38:50 2005 +@@ -125,6 +125,7 @@ + $(LN) $${UP}$(DRMBSDDIR)/$$i/Makefile $(DRM_COPY_DIR)/$$i); \ + done + ++/* + INSTALL_LIST = $(INSTALL_SHARED) $(INSTALL_BSD) + InstallMultiple($(INSTALL_LIST),$(DRMBSDINSTSRCDIR)) + +@@ -138,3 +139,4 @@ + $(DESTDIR)$(DRMBSDINSTSRCDIR)/$$i); \ + done + ++*/ diff --git a/x11-servers/XFree86-4-Server/files/patch-elfloader.c b/x11-servers/XFree86-4-Server/files/patch-elfloader.c new file mode 100644 index 000000000000..7013d0a33b28 --- /dev/null +++ b/x11-servers/XFree86-4-Server/files/patch-elfloader.c @@ -0,0 +1,82 @@ +--- programs/Xserver/hw/xfree86/loader/elfloader.c.orig Mon Mar 28 19:12:53 2005 ++++ programs/Xserver/hw/xfree86/loader/elfloader.c Mon Mar 28 19:22:51 2005 +@@ -203,6 +203,7 @@ + #if defined (__alpha__) || \ + defined (__ia64__) || \ + defined (__AMD64__) || \ ++ defined (__amd64__) || \ + (defined (__sparc__) && \ + (defined (__arch64__) || \ + defined (__sparcv9))) +@@ -294,7 +295,8 @@ + defined(__alpha__) || \ + defined(__sparc__) || \ + defined(__ia64__) || \ +- defined(__AMD64__) ++ defined(__AMD64__) || \ ++ defined(__amd64__) + typedef Elf_Rela Elf_Rel_t; + #else + typedef Elf_Rel Elf_Rel_t; +@@ -488,7 +490,8 @@ + defined(__alpha__) || \ + defined(__sparc__) || \ + defined(__ia64__) || \ +- defined(__AMD64__) ++ defined(__AMD64__) || \ ++ defined(__amd64__) + ELFDEBUG(", r_addend 0x%lx", rel->r_addend); + # endif + ELFDEBUG("\n"); +@@ -524,6 +527,7 @@ + #if defined(__alpha__) || \ + defined(__ia64__) || \ + defined(__AMD64__) || \ ++ defined(__amd64__) || \ + (defined(__sparc__) && \ + (defined(__arch64__) || \ + defined(__sparcv9))) +@@ -548,6 +552,7 @@ + #if defined(__alpha__) || \ + defined(__ia64__) || \ + defined(__AMD64__) || \ ++ defined(__amd64__) || \ + (defined(__sparc__) && \ + (defined(__arch64__) || \ + defined(__sparcv9))) +@@ -603,6 +608,7 @@ + #if defined(__alpha__) || \ + defined(__ia64__) || \ + defined(__AMD64__) || \ ++ defined(__amd64__) || \ + (defined(__sparc__) && \ + (defined(__arch64__) || \ + defined(__sparcv9))) +@@ -1263,7 +1269,7 @@ + unsigned long *dest64; + unsigned short *dest16; + #endif +-#if defined(__AMD64__) ++#if defined(__AMD64__) || defined(__amd64__) + unsigned long *dest64; + int *dest32s; + #endif +@@ -1281,7 +1287,8 @@ + defined(__alpha__) || \ + defined(__sparc__) || \ + defined(__ia64__) || \ +- defined(__AMD64__) ++ defined(__AMD64__) || \ ++ defined(__amd64__) + ELFDEBUG("%lx", rel->r_addend); + # endif + ELFDEBUG("\n"); +@@ -1340,7 +1347,7 @@ + + break; + #endif /* i386 */ +-#if defined(__AMD64__) ++#if defined(__AMD64__) || defined(__amd64__) + case R_X86_64_32: + dest32 = (unsigned int *)(secp + rel->r_offset); + # ifdef ELFDEBUG diff --git a/x11-servers/XFree86-4-Server/files/patch-loader.c b/x11-servers/XFree86-4-Server/files/patch-loader.c new file mode 100644 index 000000000000..f68744ce35fc --- /dev/null +++ b/x11-servers/XFree86-4-Server/files/patch-loader.c @@ -0,0 +1,13 @@ +--- programs/Xserver/hw/xfree86/loader/loader.c.orig Tue Feb 22 06:58:18 2005 ++++ programs/Xserver/hw/xfree86/loader/loader.c Tue Feb 22 06:59:09 2005 +@@ -552,8 +552,8 @@ + FatalError("\n_LoaderFileToMem() read() failed: %s\n", + strerror(errno)); + +-# if (defined(linux) || defined(__NetBSD__) || defined(__OpenBSD__)) \ +- && defined(__powerpc__) ++# if (defined(linux) || defined(__NetBSD__) || defined(__OpenBSD__) \ ++ || defined(__FreeBSD__)) && defined(__powerpc__) + /* + * Keep the instruction cache in sync with changes in the + * main memory. diff --git a/x11-servers/XFree86-4-Server/files/patch-mouse.c b/x11-servers/XFree86-4-Server/files/patch-mouse.c new file mode 100644 index 000000000000..6aba3f5627b1 --- /dev/null +++ b/x11-servers/XFree86-4-Server/files/patch-mouse.c @@ -0,0 +1,18 @@ + +--- patch-mouse.c begins here --- +--- programs/Xserver/hw/xfree86/input/mouse/mouse.c.orig Sat Jan 29 06:57:55 2005 ++++ programs/Xserver/hw/xfree86/input/mouse/mouse.c Sat Jan 29 06:59:03 2005 +@@ -1501,8 +1501,8 @@ + + case PROT_SYSMOUSE: /* sysmouse */ + buttons = (~pBuf[0]) & 0x07; +- dx = (char)(pBuf[1]) + (char)(pBuf[3]); +- dy = - ((char)(pBuf[2]) + (char)(pBuf[4])); ++ dx = (signed char)(pBuf[1]) + (signed char)(pBuf[3]); ++ dy = - ((signed char)(pBuf[2]) + (signed char)(pBuf[4])); + /* FreeBSD sysmouse sends additional data bytes */ + if (pMse->protoPara[4] >= 8) { + /* +--- patch-mouse.c ends here --- + + diff --git a/x11-servers/XFree86-4-Server/files/patch-os-support_Imakefile b/x11-servers/XFree86-4-Server/files/patch-os-support_Imakefile new file mode 100644 index 000000000000..c418e5cad535 --- /dev/null +++ b/x11-servers/XFree86-4-Server/files/patch-os-support_Imakefile @@ -0,0 +1,15 @@ + +--- patch-support-Imakefile begins here --- +--- programs/Xserver/hw/xfree86/os-support/Imakefile.orig Thu Jan 20 03:30:38 2005 ++++ programs/Xserver/hw/xfree86/os-support/Imakefile Thu Jan 20 03:31:37 2005 +@@ -15,6 +15,7 @@ + (defined(SunArchitecture) && defined(SparcArchitecture)) || \ + (defined(KFreeBSDArchitecture) && defined(AlphaArchitecture)) || \ + (defined(KFreeBSDArchitecture) && defined(Sparc64Architecture)) || \ ++ (defined(KFreeBSDArchitecture) && defined(PpcArchitecture)) || \ + (defined(KNetBSDArchitecture) && defined(AlphaArchitecture)) || \ + (defined(KNetBSDArchitecture) && defined(PpcArchitecture)) || \ + (defined(KNetBSDArchitecture) && defined(SparcArchitecture)) || \ +--- patch-support-Imakefile ends here --- + + diff --git a/x11-servers/XFree86-4-Server/files/patch-programs::Xserver::Xext::Imakefile b/x11-servers/XFree86-4-Server/files/patch-programs::Xserver::Xext::Imakefile deleted file mode 100644 index d004ae77d6f4..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-programs::Xserver::Xext::Imakefile +++ /dev/null @@ -1,11 +0,0 @@ ---- programs/Xserver/Xext/Imakefile.orig Mon May 10 01:50:48 2004 -+++ programs/Xserver/Xext/Imakefile Mon May 10 01:53:00 2004 -@@ -160,7 +160,7 @@ - LinkSourceFile(modinit.h,extmod) - - #if BuildXCSecurity && InstallSecurityConfig --InstallNonExecFile(SecurityPolicy,$(SERVERCONFIGDIR)) -+InstallNamedNonExec(SecurityPolicy,SecurityPolicy.default-Server,$(SERVERCONFIGDIR)) - #endif - - DependTarget() diff --git a/x11-servers/XFree86-4-Server/files/patch-programs::Xserver::hw::xfree86::XF98Conf.cpp b/x11-servers/XFree86-4-Server/files/patch-programs::Xserver::hw::xfree86::XF98Conf.cpp deleted file mode 100644 index 3e045c448c60..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-programs::Xserver::hw::xfree86::XF98Conf.cpp +++ /dev/null @@ -1,52 +0,0 @@ -Index: programs/Xserver/hw/xfree86/XF98Conf.cpp -=================================================================== -RCS file: /cvs/xc/programs/Xserver/hw/xfree86/XF98Conf.cpp,v -retrieving revision 1.4 -retrieving revision 1.5 -diff -u -r1.4 -r1.5 ---- programs/Xserver/hw/xfree86/XF98Conf.cpp 13 Feb 2004 23:58:34 -0000 1.4 -+++ programs/Xserver/hw/xfree86/XF98Conf.cpp 8 Jun 2004 01:28:55 -0000 1.5 -@@ -1,4 +1,4 @@ --XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/XF98Conf.cpp,v 1.4 2004/02/13 23:58:34 dawes Exp $ -+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/XF98Conf.cpp,v 1.5 2004/06/08 01:28:55 dawes Exp $ - XCOMM - XCOMM Copyright (c) 1994-1998 by The XFree86 Project, Inc. - XCOMM All rights reserved. -@@ -480,6 +480,20 @@ - - EndSection - -+Section "Monitor" -+ Identifier "Aile TFT LCD" -+ VendorName "NEC" -+ ModelName "La13" -+ HorizSync 33.0-82.0 -+ VertRefresh 55.0-90.0 -+ -+XCOMM fH=46.9,fV=75.0 -+ ModeLine "800x600" 49.50 800 836 920 1056 600 601 604 625 -+ -+XCOMM fH=53.7,fV=85.1 -+ ModeLine "800x600H" 56.30 800 836 920 1048 600 601 604 631 -+EndSection -+ - XCOMM ********************************************************************** - XCOMM Graphics device section - XCOMM ********************************************************************** -@@ -508,6 +522,16 @@ - XCOMM VideoRam 2048 - Endsection - -+Section "Device" -+ Identifier "CLGD7555" -+ VendorName "Cirrus Logic" -+ BoardName "CLGD 7555" -+ Driver "cirrus" -+XCOMM Option "sw cursor" "on" -+XCOMM BusID "PCI:0:3:0" -+XCOMM VideoRam 2048 -+EndSection -+ - XCOMM ********************************************************************** - XCOMM Screen sections. - XCOMM ********************************************************************** diff --git a/x11-servers/XFree86-4-Server/files/patch-programs::Xserver::hw::xfree86::common::xf86Events.c b/x11-servers/XFree86-4-Server/files/patch-programs::Xserver::hw::xfree86::common::xf86Events.c deleted file mode 100644 index 83fba24a3a2d..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-programs::Xserver::hw::xfree86::common::xf86Events.c +++ /dev/null @@ -1,73 +0,0 @@ ---- programs/Xserver/hw/xfree86/common/xf86Events.c.orig Tue Sep 21 19:22:14 2004 -+++ programs/Xserver/hw/xfree86/common/xf86Events.c Tue Sep 21 19:23:55 2004 -@@ -467,7 +467,7 @@ - #if defined(SYSCONS_SUPPORT) || defined(PCVT_SUPPORT) || defined(WSCONS_SUPPORT) - static Bool first_time = TRUE; - #endif --#if defined(__sparc__) && defined(__linux__) -+#if defined(__sparc__) && (defined(__linux__) || defined(__FreeBSD__)) - static int kbdSun = -1; - #endif - /* Disable any keyboard processing while in suspend */ -@@ -483,7 +483,7 @@ - } - #endif - --#if defined (__sparc__) && defined(__linux__) -+#if defined(__sparc__) && (defined(__linux__) || defined(__FreeBSD__)) - if (kbdSun == -1) { - if ((xf86Info.xkbmodel && !strcmp(xf86Info.xkbmodel, "sun")) - || (xf86Info.xkbrules && !strcmp(xf86Info.xkbrules, "sun"))) -@@ -493,7 +493,7 @@ - } - if (kbdSun) - goto special; --#endif /* __sparc__ && __linux__ */ -+#endif /* __sparc__ && (__linux__ || __FreeBSD__) */ - - #ifdef __linux__ - if (xf86Info.kbdCustomKeycodes) { -@@ -543,7 +543,7 @@ - } - } else - #endif /* i386 && SVR4 */ -- { -+ if (!xf86IsPc98()) { - switch (scanCode) { - case 0x59: scanCode = KEY_0x59; break; - case 0x5a: scanCode = KEY_0x5A; break; -@@ -655,10 +655,12 @@ - * they need to get the same key code as the base key on the same - * physical keyboard key. - */ -- if (scanCode == KEY_SysReqest) -- scanCode = KEY_Print; -- else if (scanCode == KEY_Break) -- scanCode = KEY_Pause; -+ if (!xf86IsPc98()) { -+ if (scanCode == KEY_SysReqest) -+ scanCode = KEY_Print; -+ else if (scanCode == KEY_Break) -+ scanCode = KEY_Pause; -+ } - #endif - - /* -@@ -695,7 +697,7 @@ - } - } - #endif --#if defined (__sparc__) && defined(__linux__) -+#if defined(__sparc__) && (defined(__linux__) || defined(__FreeBSD__)) - special: - if (kbdSun) { - switch (scanCode) { -@@ -729,7 +731,7 @@ - */ - scanCode--; - } --#endif /* defined (__sparc__) && defined(__linux__) */ -+#endif /* __sparc__ && (__linux__ || __FreeBSD__) */ - - #ifdef XKB - if ((xf86Info.ddxSpecialKeys == SKWhenNeeded && diff --git a/x11-servers/XFree86-4-Server/files/patch-programs::Xserver::hw::xfree86::common::xf86PciInfo.h b/x11-servers/XFree86-4-Server/files/patch-programs::Xserver::hw::xfree86::common::xf86PciInfo.h deleted file mode 100644 index a04a88012204..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-programs::Xserver::hw::xfree86::common::xf86PciInfo.h +++ /dev/null @@ -1,22 +0,0 @@ -Index: programs/Xserver/hw/xfree86/common/xf86PciInfo.h -=================================================================== -RCS file: /cvs/xc/programs/Xserver/hw/xfree86/common/xf86PciInfo.h,v -retrieving revision 1.159 -retrieving revision 1.160 -diff -u -r1.159 -r1.160 ---- programs/Xserver/hw/xfree86/common/xf86PciInfo.h 22 Mar 2004 17:01:14 -0000 1.159 -+++ programs/Xserver/hw/xfree86/common/xf86PciInfo.h 8 Jun 2004 01:28:56 -0000 1.160 -@@ -1,4 +1,4 @@ --/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86PciInfo.h,v 1.159 2004/03/22 17:01:14 tsi Exp $ */ -+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86PciInfo.h,v 1.160 2004/06/08 01:28:56 dawes Exp $ */ - - /* - * Copyright (c) 1995-2003 by The XFree86 Project, Inc. -@@ -317,6 +317,7 @@ - /* Cirrus Logic */ - #define PCI_CHIP_GD7548 0x0038 - #define PCI_CHIP_GD7555 0x0040 -+#define PCI_CHIP_GD7556 0x004C - #define PCI_CHIP_GD5430 0x00A0 - #define PCI_CHIP_GD5434_4 0x00A4 - #define PCI_CHIP_GD5434_8 0x00A8 diff --git a/x11-servers/XFree86-4-Server/files/patch-programs::Xserver::hw::xfree86::common::xf86fbman.c b/x11-servers/XFree86-4-Server/files/patch-programs::Xserver::hw::xfree86::common::xf86fbman.c deleted file mode 100644 index 54a57504a4bc..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-programs::Xserver::hw::xfree86::common::xf86fbman.c +++ /dev/null @@ -1,17 +0,0 @@ ---- programs/Xserver/hw/xfree86/common/xf86fbman.c.orig Sat Aug 28 13:14:32 2004 -+++ programs/Xserver/hw/xfree86/common/xf86fbman.c Sat Aug 28 13:16:03 2004 -@@ -1115,12 +1115,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/XFree86-4-Server/files/patch-programs::Xserver::hw::xfree86::doc::Japanese::README98 b/x11-servers/XFree86-4-Server/files/patch-programs::Xserver::hw::xfree86::doc::Japanese::README98 deleted file mode 100644 index 0501d529b0fe..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-programs::Xserver::hw::xfree86::doc::Japanese::README98 +++ /dev/null @@ -1,62 +0,0 @@ -Index: programs/Xserver/hw/xfree86/doc/Japanese/README98 -=================================================================== -RCS file: /cvs/xc/programs/Xserver/hw/xfree86/doc/Japanese/README98,v -retrieving revision 1.4 -retrieving revision 1.5 -diff -u -r1.4 -r1.5 ---- programs/Xserver/hw/xfree86/doc/Japanese/README98 20 Jun 2000 20:07:58 -0000 1.4 -+++ programs/Xserver/hw/xfree86/doc/Japanese/README98 8 Jun 2004 01:28:56 -0000 1.5 -@@ -1,6 +1,6 @@ - XFree86 PC98 Dependent Information - The XFree86 Project Inc. and X98 CORE TEAM 著 -- 2000 年 6 月 20 日 -+ 2004 年 6 月 6 日 - - このドキュメントでは、PC98 固有の事項について解説します。PC/AT 互換機 - と共通の事項については、共通のドキュメントを参照して下さい。 -@@ -11,7 +11,7 @@ - イル名: XFree86) されており、従来のボード / チップセット毎のサーバもな - くなりました。また、各ドライバはすべて SVGA ベースで、XF86_S3 ベースの - ドライバはありません。現在のところ、PC98 で動作しているのは、mga、 -- apm、glint、trident ドライバのみです。Millennium、Mystique、 -+ apm、glint、trident、cirrus ドライバのみです。Millennium、Mystique、 - VoodooRUSH、Permedia2、TGUI968x(いずれも PCI) のボードをお持ちの方以外 - は、3.3 ベース (ex. 3.3.6) の環境を御利用下さい。現状 4.0 では EGC や - PEGC すら利用できません。開発メンバが非常に少なくなっているので、開発 -@@ -43,6 +43,7 @@ - ------------- ----------------------------------------------- ------- - NEC MGA Millennium/Mystique XFree86 - NEC Trident TGUI968x(X-Mate,ValueStar 等) XFree86 -+ NEC Cirrus Logic CLGD755x (Aile 等) XFree86 - - 3. 共通事項 - -@@ -274,6 +275,28 @@ - README.trident は現時点 (4.0) では 3.3.6 用の内容であり、これに記載さ - れている Option の多くは使用できないので注意して下さい。 - -+ 4.5. cirrus ドライバ -+ -+ NEC の内蔵アクセラレータ (Cirrus Logic CLGD755x) で動作するドライバです。 -+ -+ 4.5.1. XF86Config の設定 -+ -+ XF86Config.98 内に記されたオプションを指定できます。 -+ 通常は特に何も指定する必要無い筈です。 -+ -+ 4.5.2. 報告されている問題 -+ -+ o ログに MMIO および I2C に関連したエラー ("(EE)" で示される) が -+ 出ますが、これは実際には警告レベルで動作には関係ないようです。 -+ -+ 4.5.3. その他 -+ -+ o まだ十分なテストが行われていないので動作レポートをお願いします。 -+ -+ 4.5.4. 関連 -+ -+ XFree86 man page, cirrus man page -+ - 5. 各 OS 毎の注意事項 - - 5.1. FreeBSD(98) での注意事項 diff --git a/x11-servers/XFree86-4-Server/files/patch-programs::Xserver::hw::xfree86::doc::VideoBoard98 b/x11-servers/XFree86-4-Server/files/patch-programs::Xserver::hw::xfree86::doc::VideoBoard98 deleted file mode 100644 index 56a6c5ea6e96..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-programs::Xserver::hw::xfree86::doc::VideoBoard98 +++ /dev/null @@ -1,45 +0,0 @@ -Index: programs/Xserver/hw/xfree86/doc/VideoBoard98 -=================================================================== -RCS file: /cvs/xc/programs/Xserver/hw/xfree86/doc/VideoBoard98,v -retrieving revision 1.5 -retrieving revision 1.6 -diff -u -r1.5 -r1.6 ---- programs/Xserver/hw/xfree86/doc/VideoBoard98 20 Jun 2000 20:07:58 -0000 1.5 -+++ programs/Xserver/hw/xfree86/doc/VideoBoard98 8 Jun 2004 01:28:56 -0000 1.6 -@@ -156,9 +156,9 @@ - |PC9821Nb7/C,D |CLGD7543 | B/I | B/I |1| X | | - |PC9821Nb10 |CLGD7548 | B/I | B/I |1| X | | - |PC9821Nx/3,C7 |Cyber9320 | B/I | B/I |1| X | | --|PC9821Nr12 |CLGD7555 | B/I | B/I |2| X | | --|PC9821Nr13/D10 |CLGD7555 | B/I | B/I |2| X | | --|PC9821Nr13/D14,S14 |CLGD7556 | B/I | B/I |2| X | | -+|PC9821Nr12 |CLGD7555 | B/I | B/I |2| o? |O| -+|PC9821Nr13/D10 |CLGD7555 | B/I | B/I |2| o? |O| -+|PC9821Nr13/D14,S14 |CLGD7556 | B/I | B/I |2| o? |O| - |PC9821Nr15 |Cyber9385 | B/I | B/I |2| X | | - |PC9821Nr150 |Cyber9385 | B/I | B/I |2| X | | - |PC9821Nr150/S20 |Cyber9385-1 | B/I | B/I |2| X | | -@@ -169,12 +169,12 @@ - |PC9821Lt2 |Cyber9320 | B/I | B/I |1| X | | - |PC9821La7 |Cyber9320 | B/I | B/I |1| X | | - |PC9821La10 |Cyber9320 | B/I | B/I |1| X | | --|PC9821La13 |CLGD7555 | B/I | B/I |2| X | | -+|PC9821La13 |CLGD7555 | B/I | B/I |2| o |O| - +------------------------+---------------+-------+--------+-+-------+-+ --|PC9821Ls12 |CLGD7555 | B/I | B/I |2| X | | --|PC9821Ls13 |CLGD7555 | B/I | B/I |2| X | | --|PC9821Ls13 |CLGD7556 | B/I | B/I |2| X | | --|PC9821Ls150 |CLGD7555 | B/I | B/I |2| X | | -+|PC9821Ls12 |CLGD7555 | B/I | B/I |2| o? |O| -+|PC9821Ls13 |CLGD7555 | B/I | B/I |2| o? |O| -+|PC9821Ls13 |CLGD7556 | B/I | B/I |2| o? |O| -+|PC9821Ls150 |CLGD7555 | B/I | B/I |2| o? |O| - +------------------------+---------------+-------+--------+-+-------+-+ - - -@@ -384,4 +384,4 @@ - |WinFrame928 |S3-928 | | |2| X | | - +------------------------+---------------+-------+--------+-+-------+-+ - --/* $XFree86: xc/programs/Xserver/hw/xfree86/doc/VideoBoard98,v 1.5 2000/06/20 20:07:58 dawes Exp $ */ -+/* $XFree86: xc/programs/Xserver/hw/xfree86/doc/VideoBoard98,v 1.6 2004/06/08 01:28:56 dawes Exp $ */ diff --git a/x11-servers/XFree86-4-Server/files/patch-programs::Xserver::hw::xfree86::drivers::cirrus::alp_driver.c b/x11-servers/XFree86-4-Server/files/patch-programs::Xserver::hw::xfree86::drivers::cirrus::alp_driver.c deleted file mode 100644 index a73295241a0a..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-programs::Xserver::hw::xfree86::drivers::cirrus::alp_driver.c +++ /dev/null @@ -1,170 +0,0 @@ -Index: programs/Xserver/hw/xfree86/drivers/cirrus/alp_driver.c -=================================================================== -RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_driver.c,v -retrieving revision 1.36 -retrieving revision 1.37 -diff -u -r1.36 -r1.37 ---- programs/Xserver/hw/xfree86/drivers/cirrus/alp_driver.c 7 Nov 2003 22:49:58 -0000 1.36 -+++ programs/Xserver/hw/xfree86/drivers/cirrus/alp_driver.c 8 Jun 2004 01:28:56 -0000 1.37 -@@ -11,7 +11,7 @@ - * Guy DESBIEF - */ - --/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_driver.c,v 1.36 2003/11/07 22:49:58 dawes Exp $ */ -+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_driver.c,v 1.37 2004/06/08 01:28:56 dawes Exp $ */ - - /* All drivers should typically include these */ - #include "xf86.h" -@@ -109,6 +109,9 @@ - static void AlpDisplayPowerManagementSet(ScrnInfoPtr pScrn, - int PowerManagementMode, int flags); - -+static void PC98CIRRUS755xEnable(ScrnInfoPtr pScrn); -+static void PC98CIRRUS755xDisable(ScrnInfoPtr pScrn); -+ - /* - * This is intentionally screen-independent. It indicates the binding - * choice made in the first PreInit. -@@ -143,6 +146,8 @@ - static int gd5446_MaxClocks[] = { 135100, 135100, 85500, 85500, 0 }; - static int gd5480_MaxClocks[] = { 135100, 200000, 200000, 135100, 135100 }; - static int gd7548_MaxClocks[] = { 80100, 80100, 80100, 80100, 80100 }; -+static int gd7555_MaxClocks[] = { 80100, 80100, 80100, 80100, 80100 }; -+static int gd7556_MaxClocks[] = { 80100, 80100, 80100, 80100, 80100 }; - - /* - * List of symbols from other modules that this module references. This -@@ -453,6 +458,11 @@ - break; - } - break; -+ -+ case PCI_CHIP_GD7555: -+ case PCI_CHIP_GD7556: -+ videoram = 2048; /* for PC-9821 La13 etc. */ -+ break; - } - - /* UNMap the Alp memory and MMIO areas */ -@@ -567,7 +577,7 @@ - pCir->PciInfo->device, - pCir->PciInfo->func); - -- if (xf86LoadSubModule(pScrn, "int10")) { -+ if (!xf86IsPc98() && xf86LoadSubModule(pScrn, "int10")) { - xf86LoaderReqSymLists(int10Symbols,NULL); - xf86DrvMsg(pScrn->scrnIndex,X_INFO,"initializing int10\n"); - pInt = xf86InitInt10(pCir->pEnt->index); -@@ -653,6 +663,16 @@ - - from = X_DEFAULT; - pCir->HWCursor = FALSE; -+ -+ switch (pCir->Chipset) { -+ case PCI_CHIP_GD7555: -+ case PCI_CHIP_GD7556: -+ pCir->HWCursor = TRUE; -+ break; -+ default: -+ break; -+ } -+ - if (xf86GetOptValBool(pCir->Options, OPTION_HW_CURSOR, &pCir->HWCursor)) - from = X_CONFIG; - -@@ -939,6 +959,12 @@ - case PCI_CHIP_GD7548: - p = gd7548_MaxClocks; - break; -+ case PCI_CHIP_GD7555: -+ p = gd7555_MaxClocks; -+ break; -+ case PCI_CHIP_GD7556: -+ p = gd7556_MaxClocks; -+ break; - } - if (!p) - return FALSE; -@@ -1425,6 +1451,9 @@ - - vgaHWProtect(pScrn, FALSE); - -+ if (xf86IsPc98()) -+ PC98CIRRUS755xEnable(pScrn); -+ - return TRUE; - } - -@@ -1843,6 +1872,9 @@ - - AlpRestore(pScrn); - vgaHWLock(hwp); -+ -+ if (xf86IsPc98()) -+ PC98CIRRUS755xDisable(pScrn); - } - - -@@ -1880,6 +1912,9 @@ - - pScrn->vtSema = FALSE; - -+ if (xf86IsPc98()) -+ PC98CIRRUS755xDisable(pScrn); -+ - pScreen->CloseScreen = pCir->CloseScreen; - return (*pScreen->CloseScreen)(scrnIndex, pScreen); - } -@@ -2142,3 +2177,52 @@ - box.y2 - pScrn->virtualY); - } - } -+ -+static void -+PC98CIRRUS755xEnable(ScrnInfoPtr pScrn) /* enter_aile() */ -+{ -+ unsigned int index,data; -+ vgaHWPtr hwp = VGAHWPTR(pScrn); -+ -+ outb(0xfac, 0x02); -+ -+ outb(0x68, 0x0e); -+ outb(0x6a, 0x07); -+ outb(0x6a, 0x8f); -+ outb(0x6a, 0x06); -+ -+ outw(VGA_SEQ_INDEX, 0x1206); /* unlock cirrus special */ -+ -+ index = hwp->IOBase + VGA_CRTC_INDEX_OFFSET; -+ data = hwp->IOBase + VGA_CRTC_DATA_OFFSET; -+ outb(index, 0x3c); -+ outb(data, inb(data) & 0xef); -+ outb(index, 0x1a); -+ outb(data, inb(data) & 0xf3); -+} -+ -+static void -+PC98CIRRUS755xDisable(ScrnInfoPtr pScrn) /* leave_aile() */ -+{ -+ unsigned int index,data; -+ vgaHWPtr hwp = VGAHWPTR(pScrn); -+ -+ outw(VGA_SEQ_INDEX, 0x1206); /* unlock cirrus special */ -+ -+ index = hwp->IOBase + VGA_CRTC_INDEX_OFFSET; -+ data = hwp->IOBase + VGA_CRTC_DATA_OFFSET; -+ outb(index, 0x3c); -+ outb(data, 0x71); -+ outb(index, 0x1a); -+ outb(data, inb(data) | 0x0c); -+ -+ outb(0xfac,0x00); -+ -+ outb(0x68, 0x0f); -+ outb(0x6a, 0x07); -+ outb(0x6a, 0x8e); -+ outb(0x6a, 0x21); -+ outb(0x6a, 0x69); -+ outb(0x6a, 0x06); -+} -+ diff --git a/x11-servers/XFree86-4-Server/files/patch-programs::Xserver::hw::xfree86::drivers::cirrus::cir_driver.c b/x11-servers/XFree86-4-Server/files/patch-programs::Xserver::hw::xfree86::drivers::cirrus::cir_driver.c deleted file mode 100644 index a8cb1622a194..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-programs::Xserver::hw::xfree86::drivers::cirrus::cir_driver.c +++ /dev/null @@ -1,35 +0,0 @@ -Index: programs/Xserver/hw/xfree86/drivers/cirrus/cir_driver.c -=================================================================== -RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/cirrus/cir_driver.c,v -retrieving revision 1.69 -retrieving revision 1.70 -diff -u -r1.69 -r1.70 ---- programs/Xserver/hw/xfree86/drivers/cirrus/cir_driver.c 18 Jun 2003 16:17:38 -0000 1.69 -+++ programs/Xserver/hw/xfree86/drivers/cirrus/cir_driver.c 8 Jun 2004 01:28:56 -0000 1.70 -@@ -11,7 +11,7 @@ - * Guy DESBIEF - */ - --/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/cir_driver.c,v 1.69 2003/06/18 16:17:38 eich Exp $ */ -+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/cir_driver.c,v 1.70 2004/06/08 01:28:56 dawes Exp $ */ - - /* All drivers should typically include these */ - #include "xf86.h" -@@ -86,6 +86,8 @@ - { PCI_CHIP_GD5464BD, "CL-GD5464BD" }, - { PCI_CHIP_GD5465, "CL-GD5465" }, - { PCI_CHIP_GD7548, "CL-GD7548" }, -+ { PCI_CHIP_GD7555, "CL-GD7555" }, -+ { PCI_CHIP_GD7556, "CL-GD7556" }, - {-1, NULL } - }; - -@@ -103,6 +105,8 @@ - { PCI_CHIP_GD5464BD,PCI_CHIP_GD5464BD, RES_SHARED_VGA }, - { PCI_CHIP_GD5465, PCI_CHIP_GD5465, RES_SHARED_VGA }, - { PCI_CHIP_GD7548, PCI_CHIP_GD7548, RES_SHARED_VGA }, -+ { PCI_CHIP_GD7555, PCI_CHIP_GD7555, RES_SHARED_VGA }, -+ { PCI_CHIP_GD7556, PCI_CHIP_GD7556, RES_SHARED_VGA }, - { -1, -1, RES_UNDEFINED} - }; - diff --git a/x11-servers/XFree86-4-Server/files/patch-programs::Xserver::hw::xfree86::os-support::linux::drm::xf86drmCompat.c b/x11-servers/XFree86-4-Server/files/patch-programs::Xserver::hw::xfree86::os-support::linux::drm::xf86drmCompat.c deleted file mode 100644 index ec83bfd67322..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-programs::Xserver::hw::xfree86::os-support::linux::drm::xf86drmCompat.c +++ /dev/null @@ -1,28 +0,0 @@ ---- programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmCompat.c.orig Tue Aug 24 17:38:16 2004 -+++ programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmCompat.c Tue Aug 24 17:39:32 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/XFree86-4-Server/files/patch-programs::Xserver::hw::xfree86::xf86config::xf86config.c b/x11-servers/XFree86-4-Server/files/patch-programs::Xserver::hw::xfree86::xf86config::xf86config.c deleted file mode 100644 index 2181a8372bea..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-programs::Xserver::hw::xfree86::xf86config::xf86config.c +++ /dev/null @@ -1,12 +0,0 @@ ---- programs/Xserver/hw/xfree86/xf86config/xf86config.c.orig Fri Nov 14 02:40:24 2003 -+++ programs/Xserver/hw/xfree86/xf86config/xf86config.c Thu Nov 4 00:15:33 2004 -@@ -838,8 +838,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" -+"in the manual of your monitor.\n" - "\n"; - - static char *hsyncintro_text = diff --git a/x11-servers/XFree86-4-Server/files/patch-radeon_driver.c b/x11-servers/XFree86-4-Server/files/patch-radeon_driver.c deleted file mode 100644 index 70d910dd4cba..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-radeon_driver.c +++ /dev/null @@ -1,186 +0,0 @@ -Index: programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c -=================================================================== -RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c,v -retrieving revision 1.118 -retrieving revision 1.119 -diff -u -u -r1.118 -r1.119 ---- programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c 26 Feb 2004 04:25:29 -0000 1.118 -+++ programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c 3 Mar 2004 18:11:43 -0000 1.119 -@@ -1,4 +1,4 @@ --/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c,v 1.118 2004/02/26 04:25:29 martin Exp $ */ -+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c,v 1.119 2004/03/03 18:11:43 dawes Exp $ */ - /* - * Copyright 2000 ATI Technologies Inc., Markham, Ontario, and - * VA Linux Systems Inc., Fremont, California. -@@ -7031,12 +7031,79 @@ - RADEONFreeRec(pScrn); - } - -+/* -+ * Powering done DAC, needed for DPMS problem with ViewSonic P817 (or its variant). -+ * -+ * Note for current DAC mapping when calling this function: -+ * For most of cards: -+ * single CRT: Driver doesn't change the existing CRTC->DAC mapping, -+ * CRTC1 could be driving either DAC or both DACs. -+ * CRT+CRT: CRTC1->TV DAC, CRTC2->Primary DAC -+ * DFP/LCD+CRT: CRTC2->TV DAC, CRTC2->Primary DAC. -+ * Some boards have two DACs reversed or don't even have a primary DAC, -+ * this is reflected in pRADEONEnt->ReversedDAC. And radeon 7200 doesn't -+ * have a second DAC. -+ * It's kind of messy, we'll need to redo DAC mapping part some day. -+ */ -+static void RADEONDacPowerSet(ScrnInfoPtr pScrn, Bool IsOn, Bool IsPrimaryDAC) -+{ -+ RADEONInfoPtr info = RADEONPTR(pScrn); -+ unsigned char *RADEONMMIO = info->MMIO; -+ -+ if (IsPrimaryDAC) { -+ CARD32 dac_cntl; -+ CARD32 dac_macro_cntl = 0; -+ dac_cntl = INREG(RADEON_DAC_CNTL); -+ if ((!info->IsMobility) || (info->ChipFamily == CHIP_FAMILY_RV350)) -+ dac_macro_cntl = INREG(RADEON_DAC_MACRO_CNTL); -+ if (IsOn) { -+ dac_cntl &= ~RADEON_DAC_PDWN; -+ dac_macro_cntl &= ~(RADEON_DAC_PDWN_R | -+ RADEON_DAC_PDWN_G | -+ RADEON_DAC_PDWN_B); -+ } else { -+ dac_cntl |= RADEON_DAC_PDWN; -+ dac_macro_cntl |= (RADEON_DAC_PDWN_R | -+ RADEON_DAC_PDWN_G | -+ RADEON_DAC_PDWN_B); -+ } -+ OUTREG(RADEON_DAC_CNTL, dac_cntl); -+ if ((!info->IsMobility) || (info->ChipFamily == CHIP_FAMILY_RV350)) -+ OUTREG(RADEON_DAC_MACRO_CNTL, dac_macro_cntl); -+ } else { -+ if (info->ChipFamily != CHIP_FAMILY_R200) { -+ CARD32 tv_dac_cntl = INREG(RADEON_TV_DAC_CNTL); -+ if (IsOn) { -+ tv_dac_cntl &= ~(RADEON_TV_DAC_RDACPD | -+ RADEON_TV_DAC_GDACPD | -+ RADEON_TV_DAC_BDACPD | -+ RADEON_TV_DAC_BGSLEEP); -+ } else { -+ tv_dac_cntl |= (RADEON_TV_DAC_RDACPD | -+ RADEON_TV_DAC_GDACPD | -+ RADEON_TV_DAC_BDACPD | -+ RADEON_TV_DAC_BGSLEEP); -+ } -+ OUTREG(RADEON_TV_DAC_CNTL, tv_dac_cntl); -+ } else { -+ CARD32 fp2_gen_cntl = INREG(RADEON_FP2_GEN_CNTL); -+ if (IsOn) { -+ fp2_gen_cntl |= RADEON_FP2_DV0_EN; -+ } else { -+ fp2_gen_cntl &= ~RADEON_FP2_DV0_EN; -+ } -+ OUTREG(RADEON_FP2_GEN_CNTL, fp2_gen_cntl); -+ } -+ } -+} -+ - /* Sets VESA Display Power Management Signaling (DPMS) Mode */ - static void RADEONDisplayPowerManagementSet(ScrnInfoPtr pScrn, - int PowerManagementMode, - int flags) - { - RADEONInfoPtr info = RADEONPTR(pScrn); -+ RADEONEntPtr pRADEONEnt = RADEONEntPriv(pScrn); - unsigned char *RADEONMMIO = info->MMIO; - - #ifdef XF86DRI -@@ -7055,8 +7122,6 @@ - RADEON_CRTC2_VSYNC_DIS | - RADEON_CRTC2_HSYNC_DIS); - -- /* TODO: additional handling for LCD ? */ -- - switch (PowerManagementMode) { - case DPMSModeOn: - /* Screen: On; HSync: On, VSync: On */ -@@ -7123,13 +7188,19 @@ - if (info->ChipFamily >= CHIP_FAMILY_R200) { - OUTREGP (RADEON_FP2_GEN_CNTL, RADEON_FP2_DV0_EN, ~RADEON_FP2_DV0_EN); - } -+ } else if (info->DisplayType == MT_CRT) { -+ RADEONDacPowerSet(pScrn, TRUE, !pRADEONEnt->ReversedDAC); - } - } else { -- if ((info->Clone) && (info->CloneType == MT_DFP)) { -- OUTREGP (RADEON_FP2_GEN_CNTL, 0, ~RADEON_FP2_BLANK_EN); -- OUTREGP (RADEON_FP2_GEN_CNTL, RADEON_FP2_ON, ~RADEON_FP2_ON); -- if (info->ChipFamily >= CHIP_FAMILY_R200) { -- OUTREGP (RADEON_FP2_GEN_CNTL, RADEON_FP2_DV0_EN, ~RADEON_FP2_DV0_EN); -+ if (info->Clone) { -+ if (info->CloneType == MT_DFP) { -+ OUTREGP (RADEON_FP2_GEN_CNTL, 0, ~RADEON_FP2_BLANK_EN); -+ OUTREGP (RADEON_FP2_GEN_CNTL, RADEON_FP2_ON, ~RADEON_FP2_ON); -+ if (info->ChipFamily >= CHIP_FAMILY_R200) { -+ OUTREGP (RADEON_FP2_GEN_CNTL, RADEON_FP2_DV0_EN, ~RADEON_FP2_DV0_EN); -+ } -+ } else if (info->CloneType == MT_CRT) { -+ RADEONDacPowerSet(pScrn, TRUE, !pRADEONEnt->ReversedDAC); - } - } - if (info->DisplayType == MT_DFP) { -@@ -7140,6 +7211,14 @@ - OUTREGP (RADEON_LVDS_GEN_CNTL, RADEON_LVDS_BLON, ~RADEON_LVDS_BLON); - usleep (info->PanelPwrDly * 1000); - OUTREGP (RADEON_LVDS_GEN_CNTL, RADEON_LVDS_ON, ~RADEON_LVDS_ON); -+ } else if (info->DisplayType == MT_CRT) { -+ if ((pRADEONEnt->HasSecondary) || info->Clone) { -+ RADEONDacPowerSet(pScrn, TRUE, pRADEONEnt->ReversedDAC); -+ } else { -+ RADEONDacPowerSet(pScrn, TRUE, TRUE); -+ if (info->HasCRTC2) -+ RADEONDacPowerSet(pScrn, TRUE, FALSE); -+ } - } - } - } else if ((PowerManagementMode == DPMSModeOff) || -@@ -7152,13 +7231,19 @@ - if (info->ChipFamily >= CHIP_FAMILY_R200) { - OUTREGP (RADEON_FP2_GEN_CNTL, 0, ~RADEON_FP2_DV0_EN); - } -+ } else if (info->DisplayType == MT_CRT) { -+ RADEONDacPowerSet(pScrn, FALSE, !pRADEONEnt->ReversedDAC); - } - } else { -- if ((info->Clone) && (info->CloneType == MT_DFP)) { -- OUTREGP (RADEON_FP2_GEN_CNTL, RADEON_FP2_BLANK_EN, ~RADEON_FP2_BLANK_EN); -- OUTREGP (RADEON_FP2_GEN_CNTL, 0, ~RADEON_FP2_ON); -- if (info->ChipFamily >= CHIP_FAMILY_R200) { -- OUTREGP (RADEON_FP2_GEN_CNTL, 0, ~RADEON_FP2_DV0_EN); -+ if (info->Clone) { -+ if(info->CloneType == MT_DFP) { -+ OUTREGP (RADEON_FP2_GEN_CNTL, RADEON_FP2_BLANK_EN, ~RADEON_FP2_BLANK_EN); -+ OUTREGP (RADEON_FP2_GEN_CNTL, 0, ~RADEON_FP2_ON); -+ if (info->ChipFamily >= CHIP_FAMILY_R200) { -+ OUTREGP (RADEON_FP2_GEN_CNTL, 0, ~RADEON_FP2_DV0_EN); -+ } -+ } else if (info->CloneType == MT_CRT) { -+ RADEONDacPowerSet(pScrn, FALSE, !pRADEONEnt->ReversedDAC); - } - } - if (info->DisplayType == MT_DFP) { -@@ -7179,6 +7264,17 @@ - if (info->IsMobility || info->IsIGP) { - OUTPLL(RADEON_PIXCLKS_CNTL, tmpPixclksCntl); - } -+ } else if (info->DisplayType == MT_CRT) { -+ if ((pRADEONEnt->HasSecondary) || info->Clone) { -+ RADEONDacPowerSet(pScrn, FALSE, pRADEONEnt->ReversedDAC); -+ } else { -+ /* single CRT, turning both DACs off, we don't really know -+ * which DAC is actually connected. -+ */ -+ RADEONDacPowerSet(pScrn, FALSE, TRUE); -+ if (info->HasCRTC2) /* don't apply this to old radeon (singel CRTC) card */ -+ RADEONDacPowerSet(pScrn, FALSE, FALSE); -+ } - } - } - } diff --git a/x11-servers/XFree86-4-Server/files/patch-radeon_reg.h b/x11-servers/XFree86-4-Server/files/patch-radeon_reg.h deleted file mode 100644 index c8a912487b43..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-radeon_reg.h +++ /dev/null @@ -1,31 +0,0 @@ -Index: programs/Xserver/hw/xfree86/drivers/ati/radeon_reg.h -=================================================================== -RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_reg.h,v -retrieving revision 1.32 -retrieving revision 1.33 -diff -u -u -r1.32 -r1.33 ---- programs/Xserver/hw/xfree86/drivers/ati/radeon_reg.h 19 Feb 2004 22:38:12 -0000 1.32 -+++ programs/Xserver/hw/xfree86/drivers/ati/radeon_reg.h 3 Mar 2004 18:11:45 -0000 1.33 -@@ -1,4 +1,4 @@ --/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_reg.h,v 1.32 2004/02/19 22:38:12 tsi Exp $ */ -+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_reg.h,v 1.33 2004/03/03 18:11:45 dawes Exp $ */ - /* - * Copyright 2000 ATI Technologies Inc., Markham, Ontario, and - * VA Linux Systems Inc., Fremont, California. -@@ -401,11 +401,16 @@ - # define RADEON_DAC_FORCE_DATA_SEL_MASK (3 << 6) - # define RADEON_DAC_FORCE_DATA_MASK 0x0003ff00 - # define RADEON_DAC_FORCE_DATA_SHIFT 8 -+#define RADEON_DAC_MACRO_CNTL 0x0d04 -+# define RADEON_DAC_PDWN_R (1 << 16) -+# define RADEON_DAC_PDWN_G (1 << 17) -+# define RADEON_DAC_PDWN_B (1 << 18) - #define RADEON_TV_DAC_CNTL 0x088c - # define RADEON_TV_DAC_STD_MASK 0x0300 - # define RADEON_TV_DAC_RDACPD (1 << 24) - # define RADEON_TV_DAC_GDACPD (1 << 25) - # define RADEON_TV_DAC_BDACPD (1 << 26) -+# define RADEON_TV_DAC_BGSLEEP (1 << 26) - #define RADEON_DISP_HW_DEBUG 0x0d14 - # define RADEON_CRT2_DISP1_SEL (1 << 5) - #define RADEON_DISP_OUTPUT_CNTL 0x0d64 diff --git a/x11-servers/XFree86-4-Server/files/patch-trident_driver.c b/x11-servers/XFree86-4-Server/files/patch-trident_driver.c new file mode 100644 index 000000000000..5a062e416351 --- /dev/null +++ b/x11-servers/XFree86-4-Server/files/patch-trident_driver.c @@ -0,0 +1,17 @@ +Index: programs/Xserver/hw/xfree86/drivers/trident/trident_driver.c +=================================================================== +RCS file: /usr/local/repos/xfree86/xc/programs/Xserver/hw/xfree86/drivers/trident/trident_driver.c,v +retrieving revision 1.193 +retrieving revision 1.194 +diff -u -r1.193 -r1.194 +--- programs/Xserver/hw/xfree86/drivers/trident/trident_driver.c 18 Feb 2005 02:55:10 -0000 1.193 ++++ programs/Xserver/hw/xfree86/drivers/trident/trident_driver.c 30 Apr 2005 17:04:00 -0000 1.194 +@@ -2606,7 +2606,7 @@ + TRIDENTPtr pTrident = TRIDENTPTR(pScrn); + TRIDENTRegPtr tridentReg; + +- WAITFORVSYNC; ++ if (!xf86IsPc98()) WAITFORVSYNC; + + TridentFindClock(pScrn,mode->Clock); + diff --git a/x11-servers/XFree86-4-Server/files/patch-trident_video.c b/x11-servers/XFree86-4-Server/files/patch-trident_video.c new file mode 100644 index 000000000000..776d1ded68b5 --- /dev/null +++ b/x11-servers/XFree86-4-Server/files/patch-trident_video.c @@ -0,0 +1,19 @@ +Index: programs/Xserver/hw/xfree86/drivers/trident/trident_video.c +=================================================================== +RCS file: /usr/local/repos/xfree86/xc/programs/Xserver/hw/xfree86/drivers/trident/trident_video.c,v +retrieving revision 1.47 +retrieving revision 1.48 +diff -u -r1.47 -r1.48 +--- programs/Xserver/hw/xfree86/drivers/trident/trident_video.c 29 Mar 2004 16:25:22 -0000 1.47 ++++ programs/Xserver/hw/xfree86/drivers/trident/trident_video.c 30 Apr 2005 17:04:00 -0000 1.48 +@@ -1307,6 +1307,8 @@ + * full vblank has passed. + * - Alan. + */ +- WAITFORVSYNC; +- WAITFORVSYNC; ++ if (!xf86IsPc98()) { ++ WAITFORVSYNC; ++ WAITFORVSYNC; ++ } + } diff --git a/x11-servers/XFree86-4-Server/pkg-plist b/x11-servers/XFree86-4-Server/pkg-plist index f56b79fee502..f519e7233fba 100644 --- a/x11-servers/XFree86-4-Server/pkg-plist +++ b/x11-servers/XFree86-4-Server/pkg-plist @@ -3,16 +3,16 @@ bin/XFree86 bin/getconfig bin/getconfig.pl bin/gtf -%%SPARC64_NA%%bin/inb -%%SPARC64_NA%%bin/inl -%%SPARC64_NA%%bin/inw -%%SPARC64_NA%%bin/ioport +%%PPC_NA%%%%SPARC64_NA%%bin/inb +%%PPC_NA%%%%SPARC64_NA%%bin/inl +%%PPC_NA%%%%SPARC64_NA%%bin/inw +%%PPC_NA%%%%SPARC64_NA%%bin/ioport bin/kbd_mode bin/mmapr bin/mmapw -%%SPARC64_NA%%bin/outb -%%SPARC64_NA%%bin/outl -%%SPARC64_NA%%bin/outw +%%PPC_NA%%%%SPARC64_NA%%bin/outb +%%PPC_NA%%%%SPARC64_NA%%bin/outl +%%PPC_NA%%%%SPARC64_NA%%bin/outw bin/pcitweak %%I386%%bin/scanpci bin/xf86cfg @@ -39,85 +39,52 @@ lib/X11/Options lib/X11/XF86Config.98 lib/X11/XF86Config.eg lib/X11/app-defaults/XF86Cfg -lib/X11/doc/BUILD -lib/X11/doc/BugReport -lib/X11/doc/DESIGN -lib/X11/doc/Install -lib/X11/doc/Japanese/README98 -lib/X11/doc/Japanese/README98.1st -lib/X11/doc/LICENSE -lib/X11/doc/README -lib/X11/doc/README.DECtga -lib/X11/doc/README.DRI -lib/X11/doc/README.DRIcomp -lib/X11/doc/README.I128 -lib/X11/doc/README.SiS -lib/X11/doc/README.XKB-Config -lib/X11/doc/README.XKB-Enhancing -lib/X11/doc/README.apm -lib/X11/doc/README.ati -lib/X11/doc/README.chips -lib/X11/doc/README.cyrix -lib/X11/doc/README.dps -lib/X11/doc/README.fonts -lib/X11/doc/README.i740 -lib/X11/doc/README.i810 -lib/X11/doc/README.mouse -lib/X11/doc/README.newport -lib/X11/doc/README.r128 -lib/X11/doc/README.rapidaccess -lib/X11/doc/README.rendition -lib/X11/doc/README.s3virge -lib/X11/doc/RELNOTES -lib/X11/doc/Versions -lib/X11/doc/VideoBoard98 +share/doc/XFree86/BUILD +share/doc/XFree86/BugReport +share/doc/XFree86/DESIGN +share/doc/XFree86/Install +share/doc/XFree86/Japanese/README98 +share/doc/XFree86/Japanese/README98.1st +share/doc/XFree86/LICENSE +share/doc/XFree86/README +share/doc/XFree86/README.DECtga +share/doc/XFree86/README.DRI +share/doc/XFree86/README.DRIcomp +share/doc/XFree86/README.I128 +share/doc/XFree86/README.SiS +share/doc/XFree86/README.XKB-Config +share/doc/XFree86/README.XKB-Enhancing +share/doc/XFree86/README.apm +share/doc/XFree86/README.ati +share/doc/XFree86/README.chips +share/doc/XFree86/README.cyrix +share/doc/XFree86/README.dps +share/doc/XFree86/README.fonts +share/doc/XFree86/README.i740 +share/doc/XFree86/README.i810 +share/doc/XFree86/README.mouse +share/doc/XFree86/README.newport +share/doc/XFree86/README.r128 +share/doc/XFree86/README.rapidaccess +share/doc/XFree86/README.rendition +share/doc/XFree86/README.s3virge +share/doc/XFree86/RELNOTES +share/doc/XFree86/Versions +share/doc/XFree86/VideoBoard98 lib/X11/etc/Xinstall.sh lib/X11/etc/sun.termcap lib/X11/etc/sun.terminfo lib/X11/etc/xmodmap.std lib/X11/getconfig/cfg.sample lib/X11/getconfig/xfree86.cfg -lib/X11/xserver/SecurityPolicy.default-Server -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 lib/modules/drivers/atimisc_drv.o %%AMD64_I386%%lib/modules/drivers/chips_drv.o -%%SPARC64_NA%%lib/modules/drivers/cirrus_alpine.o -%%SPARC64_NA%%lib/modules/drivers/cirrus_drv.o -%%SPARC64_NA%%lib/modules/drivers/cirrus_laguna.o +%%PPC_NA%%%%SPARC64_NA%%lib/modules/drivers/cirrus_alpine.o +%%PPC_NA%%%%SPARC64_NA%%lib/modules/drivers/cirrus_drv.o +%%PPC_NA%%%%SPARC64_NA%%lib/modules/drivers/cirrus_laguna.o %%AMD64_I386%%lib/modules/drivers/cyrix_drv.o %%AMD64%%lib/modules/drivers/dummy_drv.o %%AMD64%%lib/modules/drivers/fbdev_drv.o @@ -131,16 +98,16 @@ lib/modules/drivers/atimisc_drv.o lib/modules/drivers/nv_drv.o lib/modules/drivers/r128_drv.o lib/modules/drivers/radeon_drv.o -%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/rendition_drv.o +%%PPC_NA%%%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/rendition_drv.o lib/modules/drivers/riva128.o %%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/s3_drv.o %%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/s3virge_drv.o %%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/savage_drv.o -%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/siliconmotion_drv.o +%%PPC_NA%%%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/siliconmotion_drv.o %%AMD64_I386%%lib/modules/drivers/sis_drv.o %%SPARC64%%lib/modules/drivers/sunffb_drv.o %%SPARC64_NA%%lib/modules/drivers/tdfx_drv.o -%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/tga_drv.o +%%PPC_NA%%%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/tga_drv.o %%AMD64_I386%%lib/modules/drivers/trident_drv.o %%AMD64_I386%%lib/modules/drivers/tseng_drv.o %%AMD64_I386%%lib/modules/drivers/vesa_drv.o @@ -200,7 +167,16 @@ lib/modules/libxf4bpp.a lib/modules/libxf8_16bpp.a lib/modules/libxf8_32bpp.a %%SPARC64%%lib/modules/libxf8_32wid.a -%%SPARC64_NA%%lib/modules/v10002d.uc -%%SPARC64_NA%%lib/modules/v20002d.uc +%%PPC_NA%%%%SPARC64_NA%%lib/modules/v10002d.uc +%%PPC_NA%%%%SPARC64_NA%%lib/modules/v20002d.uc +@dirrm lib/X11/etc @dirrm lib/X11/getconfig -@unexec rmdir %D/lib/X11/doc/Japanese 2>/dev/null || true +@dirrm lib/modules/drivers +@dirrm lib/modules/extensions +@dirrm lib/modules/fonts +@dirrm lib/modules/freebsd +@dirrm lib/modules/input +@unexec rmdir %D/include/X11/pixmaps 2>/dev/null || true +@unexec rmdir %D/lib/modules 2>/dev/null || true +@unexec rmdir %D/share/doc/XFree86/Japanese 2>/dev/null || true +@unexec rmdir %D/share/doc/XFree86 2>/dev/null || true diff --git a/x11-servers/XFree86-4-Server/scripts/configure b/x11-servers/XFree86-4-Server/scripts/configure index cae9a5090e8a..c4c87848d3e9 100644 --- a/x11-servers/XFree86-4-Server/scripts/configure +++ b/x11-servers/XFree86-4-Server/scripts/configure @@ -32,7 +32,6 @@ echo "#define XInputDrivers mouse keyboard digitaledge dynapro elo2300 \ wacom void citron" >> $LOCALDEF echo "#define BuildXF86DRI ${BuildXF86DRI}" >> $LOCALDEF echo "#define BuildXF86DRM NO" >> $LOCALDEF -echo "#define InstSrcDir $WRKDIR/drmsource" >> $LOCALDEF echo "#define HasGlide3 YES" >> $LOCALDEF # Install driver manpages as foo.4x so they can easily be accesed by @@ -55,9 +54,11 @@ for i in \ BuildFontServer \ XVirtualFramebufferServer \ XprtServer \ + BuildDmx \ LibHeaders \ LibInstall \ ForceNormalLib \ + InstallSecurityConfig \ XTrueTypeInstallCConvHeaders do \ echo "#define $i NO" >> $LOCALDEF diff --git a/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile b/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile index bf8ca6d64c2e..c2029f3b5e93 100644 --- a/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile +++ b/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile @@ -6,45 +6,28 @@ # PORTNAME= VirtualFramebufferServer -PORTVERSION= 4.4.0 -PORTREVISION= 1 +PORTVERSION= 4.5.0 CATEGORIES= x11-servers -MASTER_SITES= ${MASTER_SITE_XFREE:S/$/:x/} \ - ${MASTER_SITE_LOCAL:S/$/:local/} -MASTER_SITE_SUBDIR= ${PORTVERSION}/:x \ - anholt/:local +MASTER_SITES= ${MASTER_SITE_XFREE} +MASTER_SITE_SUBDIR= ${PORTVERSION} PKGNAMEPREFIX= XFree86- -DISTFILES= XFree86-4.4.0-src-1.tgz:x \ - XFree86-4.4.0-src-2.tgz:x \ - XFree86-4.4.0-src-3.tgz:x \ - Wraphelp2.gz:local -EXTRACT_ONLY= XFree86-4.4.0-src-1.tgz \ - XFree86-4.4.0-src-2.tgz \ - XFree86-4.4.0-src-3.tgz +DISTFILES= XFree86-${PORTVERSION}-src-1.tgz \ + XFree86-${PORTVERSION}-src-2.tgz \ + XFree86-${PORTVERSION}-src-3.tgz MAINTAINER= x11@FreeBSD.org COMMENT= XFree86-4 virtual framebuffer server -CONFLICTS= xorg-vfbserver-* - -RUN_DEPENDS= ${FONT}:${PORTSDIR}/x11-fonts/XFree86-4-fontDefaultBitmaps - -FONT= ${X11BASE}/lib/X11/fonts/misc/cursor.pcf.gz +CONFLICTS= xorg-vfbserver-[0-9]* MAN1= Xvfb.1 -EXTRA_PATCHES+= ${FILESDIR}/patch-programs::Xserver::Xext::Imakefile +PLIST_FILES= bin/Xvfb + XBUILD_DIRS= lib/font lib/lbxutil/ lib/Xdmcp lib/Xau programs/Xserver XINCLUDE_DIRS= lib/xkbfile lib/xtrans XINSTALL_DIRS= programs/Xserver XINSTALL_MAN_DIRS= programs/Xserver/hw/vfb -post-extract: - ${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/Wraphelp2.gz > \ - ${WRKSRC}/lib/Xdmcp/Wraphelp.c - -post-install: - @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL - .include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc" .include <bsd.port.pre.mk> .if ${X_WINDOW_SYSTEM:L} != xfree86-4 diff --git a/x11-servers/XFree86-4-VirtualFramebufferServer/distinfo b/x11-servers/XFree86-4-VirtualFramebufferServer/distinfo index edbe3d91944d..5cb3430994ae 100644 --- a/x11-servers/XFree86-4-VirtualFramebufferServer/distinfo +++ b/x11-servers/XFree86-4-VirtualFramebufferServer/distinfo @@ -1,8 +1,6 @@ -MD5 (xc/XFree86-4.4.0-src-1.tgz) = 97cea3d9e1197dde32ca34e3b6086469 -SIZE (xc/XFree86-4.4.0-src-1.tgz) = 11760814 -MD5 (xc/XFree86-4.4.0-src-2.tgz) = b9b6c74a03e314569e01d5fd4ff59523 -SIZE (xc/XFree86-4.4.0-src-2.tgz) = 5745538 -MD5 (xc/XFree86-4.4.0-src-3.tgz) = 703404f48d3a15f58389a879d47c769d -SIZE (xc/XFree86-4.4.0-src-3.tgz) = 11239253 -MD5 (xc/Wraphelp2.gz) = bd1910492087442288d885412e2e5535 -SIZE (xc/Wraphelp2.gz) = 3376 +MD5 (xc/XFree86-4.5.0-src-1.tgz) = 6c0fcf8069c13d068276016bbf6ad712 +SIZE (xc/XFree86-4.5.0-src-1.tgz) = 10507331 +MD5 (xc/XFree86-4.5.0-src-2.tgz) = cc296c71cbe58edc3ffdec1084e58f4c +SIZE (xc/XFree86-4.5.0-src-2.tgz) = 5826556 +MD5 (xc/XFree86-4.5.0-src-3.tgz) = c0ad630bfec4545857c2877b3e2dcbeb +SIZE (xc/XFree86-4.5.0-src-3.tgz) = 12086763 diff --git a/x11-servers/XFree86-4-VirtualFramebufferServer/files/patch-programs::Xserver::Xext::Imakefile b/x11-servers/XFree86-4-VirtualFramebufferServer/files/patch-programs::Xserver::Xext::Imakefile deleted file mode 100644 index 557654663de4..000000000000 --- a/x11-servers/XFree86-4-VirtualFramebufferServer/files/patch-programs::Xserver::Xext::Imakefile +++ /dev/null @@ -1,11 +0,0 @@ ---- programs/Xserver/Xext/Imakefile.orig Mon May 10 01:50:48 2004 -+++ programs/Xserver/Xext/Imakefile Mon May 10 01:53:00 2004 -@@ -160,7 +160,7 @@ - LinkSourceFile(modinit.h,extmod) - - #if BuildXCSecurity && InstallSecurityConfig --InstallNonExecFile(SecurityPolicy,$(SERVERCONFIGDIR)) -+InstallNamedNonExec(SecurityPolicy,SecurityPolicy.default-VFBServer,$(SERVERCONFIGDIR)) - #endif - - DependTarget() diff --git a/x11-servers/XFree86-4-VirtualFramebufferServer/pkg-plist b/x11-servers/XFree86-4-VirtualFramebufferServer/pkg-plist deleted file mode 100644 index e81bbc131be4..000000000000 --- a/x11-servers/XFree86-4-VirtualFramebufferServer/pkg-plist +++ /dev/null @@ -1,2 +0,0 @@ -bin/Xvfb -lib/X11/xserver/SecurityPolicy.default-VFBServer diff --git a/x11-servers/XFree86-4-VirtualFramebufferServer/scripts/configure b/x11-servers/XFree86-4-VirtualFramebufferServer/scripts/configure index 159baea5aff2..1882084a1b9e 100644 --- a/x11-servers/XFree86-4-VirtualFramebufferServer/scripts/configure +++ b/x11-servers/XFree86-4-VirtualFramebufferServer/scripts/configure @@ -37,8 +37,10 @@ for i in BuildFonts \ BuildFontServer \ XnestServer \ XprtServer \ + XdmxServer \ LibHeaders \ ForceNormalLib \ + InstallSecurityConfig \ XTrueTypeInstallCConvHeaders do \ echo "#define $i NO" >> $LOCALDEF |