diff options
Diffstat (limited to 'x11-servers')
| -rw-r--r-- | x11-servers/XFree86-4-Server-snap/Makefile | 165 | ||||
| -rw-r--r-- | x11-servers/XFree86-4-Server-snap/distinfo | 4 | ||||
| -rw-r--r-- | x11-servers/XFree86-4-Server-snap/files/patch-Pci.h | 13 | ||||
| -rw-r--r-- | x11-servers/XFree86-4-Server-snap/files/patch-alpha_video.c | 35 | ||||
| -rw-r--r-- | x11-servers/XFree86-4-Server-snap/files/patch-mga_driver.c | 13 | ||||
| -rw-r--r-- | x11-servers/XFree86-4-Server-snap/files/patch-r128_driver.c | 30 | ||||
| -rw-r--r-- | x11-servers/XFree86-4-Server-snap/files/patch-radeondri | 234 | ||||
| -rw-r--r-- | x11-servers/XFree86-4-Server-snap/files/patch-savage-pci-id | 87 | ||||
| -rw-r--r-- | x11-servers/XFree86-4-Server-snap/files/patch-xkbInit.c | 17 | ||||
| -rw-r--r-- | x11-servers/XFree86-4-Server-snap/pkg-descr | 4 | ||||
| -rw-r--r-- | x11-servers/XFree86-4-Server-snap/pkg-message | 5 | ||||
| -rw-r--r-- | x11-servers/XFree86-4-Server-snap/pkg-plist | 204 | ||||
| -rw-r--r-- | x11-servers/XFree86-4-Server-snap/scripts/configure | 106 |
13 files changed, 0 insertions, 917 deletions
diff --git a/x11-servers/XFree86-4-Server-snap/Makefile b/x11-servers/XFree86-4-Server-snap/Makefile deleted file mode 100644 index ab59d92ae2e5..000000000000 --- a/x11-servers/XFree86-4-Server-snap/Makefile +++ /dev/null @@ -1,165 +0,0 @@ -# New ports collection makefile for: XFree86-Server -# Date created: 10 Oct 1999 -# Whom: taguchi@tohoku.iij.ad.jp -# -# $FreeBSD$ -# - -PORTNAME= Server -PORTVERSION= 4.3.0 -PORTREVISION= 2 -CATEGORIES= x11-servers -MASTER_SITES= ${MASTER_SITE_XFREE:S/$/:x/} \ - ${MASTER_SITE_LOCAL:S/$/:local/} -MASTER_SITE_SUBDIR= ${PORTVERSION}/:x \ - anholt/:local -PKGNAMEPREFIX= XFree86- -DISTFILES= X430src-1.tgz:x \ - X430src-2.tgz:x \ - X430src-3.tgz:x \ - Wraphelp2.gz:local -EXTRACT_ONLY= X430src-1.tgz \ - X430src-2.tgz \ - X430src-3.tgz - -MAINTAINER= anholt@freebsd.org -COMMENT= XFree86-4 X server and related programs - -XFREE86_VERSION= 4 -USE_IMAKE= YES -INSTALLS_SHLIB= YES -DIST_SUBDIR= xc -WRKSRC= ${WRKDIR}/xc -PATCHDIR= ${.CURDIR}/../../x11/XFree86-4-libraries/files -.for pf in patch-savage-pci-id patch-alpha_video.c patch-Pci.h patch-radeondri \ - patch-r128_driver.c patch-mga_driver.c patch-xkbInit.c -EXTRA_PATCHES+= ${FILESDIR}/${pf} -.endfor -SCRIPTS_ENV= OSVERSION=${OSVERSION} \ - BuildXF86DRI=${BuildXF86DRI} \ - WITH_DEBUG="${WITH_DEBUG}" \ - CC="${CC}" \ - CXX="${CXX}" \ - CFLAGS="${CFLAGS}" -MAN1= XFree86.1 \ - Xserver.1 \ - gtf.1 \ - kbd_mode.1 \ - pcitweak.1 \ - xf86cfg.1 \ - xf86config.1 -MAN3= XF86VidMode.3 \ - XF86VidModeDeleteModeLine.3 \ - XF86VidModeGetAllModeLines.3 \ - XF86VidModeGetDotClocks.3 \ - XF86VidModeGetGamma.3 \ - XF86VidModeGetGammaRamp.3 \ - XF86VidModeGetGammaRampSize.3 \ - XF86VidModeGetModeLine.3 \ - XF86VidModeGetMonitor.3 \ - XF86VidModeGetPermissions.3 \ - XF86VidModeGetViewPort.3 \ - XF86VidModeLockModeSwitch.3 \ - XF86VidModeModModeLine.3 \ - XF86VidModeQueryExtension.3 \ - XF86VidModeQueryVersion.3 \ - XF86VidModeSetClientVersion.3 \ - XF86VidModeSetGamma.3 \ - XF86VidModeSetGammaRamp.3 \ - XF86VidModeSetViewPort.3 \ - XF86VidModeSwitchMode.3 \ - XF86VidModeSwitchToMode.3 \ - XF86VidModeValidateModeLine.3 -MAN4= citron.4 \ - dynapro.4 \ - elographics.4 \ - glint.4 \ - kbd.4 \ - keyboard.4 \ - mga.4 \ - microtouch.4 \ - mouse.4 \ - mutouch.4 \ - nv.4 \ - r128.4 \ - rendition.4 \ - s3virge.4 \ - savage.4 \ - siliconmotion.4 \ - tdfx.4 \ - vga.4 \ - void.4 \ - wacom.4 -MAN5= XF86Config.5 -PKGMESSAGE= ${WRKDIR}/.pkg-message -XBUILD_DIRS= lib/font lib/lbxutil lib/Xdmcp lib/Xau programs/Xserver -XINCLUDE_DIRS= lib/xkbfile lib/xtrans -XINSTALL_DIRS= lib/font programs/Xserver -XINSTALL_MAN_DIRS= programs/Xserver - -.include <bsd.port.pre.mk> - -.if ${ARCH} == i386 || ${ARCH} == alpha -BuildXF86DRI= YES -PLIST_SUB+= DRI="" -XBUILD_DIRS+= lib/XThrStub lib/X11 lib/Xext lib/GL -XINSTALL_DIRS+= lib/GL/mesa/src/drv -.else -BuildXF86DRI= NO -PLIST_SUB+= DRI="@comment " -.endif # i386 - -.if ${ARCH} == alpha -PLIST_SUB+= ALPHA_NA="@comment " -.else -PLIST_SUB+= ALPHA_NA="" -MAN1+= scanpci.1 -.endif - -.if ${ARCH} == alpha -PLIST_SUB+= IA64_NA="@comment " -.else -PLIST_SUB+= IA64_NA="" -.endif - -.if ${ARCH} == sparc64 -PLIST_SUB+= SPARC64_NA="@comment " -.else -PLIST_SUB+= SPARC64_NA="" -.endif - -.if ${ARCH} == i386 -PLIST_SUB+= I386="" -MAN4+= apm.4 \ - chips.4 \ - cirrus.4 \ - cyrix.4 \ - i128.4 \ - i740.4 \ - i810.4 \ - neomagic.4 \ - sis.4 \ - trident.4 \ - tseng.4 \ - vesa.4 \ - vmware.4 -.else -PLIST_SUB+= I386="@comment " -.endif - -post-extract:: - ${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/Wraphelp2.gz > \ - ${WRKSRC}/lib/Xdmcp/Wraphelp.c - -post-build: - @${RM} -f ${PKGMESSAGE} - @${CAT} ${.CURDIR}/pkg-message >> ${PKGMESSAGE} - -post-install:: - @${SED} -e s,/usr/X11R6,${PREFIX}, ${PKGMESSAGE} - @if [ -f ${PREFIX}/bin/Xwrapper-4 ] ; then \ - ${LN} -sf Xwrapper-4 ${PREFIX}/bin/X; \ - fi; - -.include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc" -.include <bsd.port.post.mk> diff --git a/x11-servers/XFree86-4-Server-snap/distinfo b/x11-servers/XFree86-4-Server-snap/distinfo deleted file mode 100644 index 86966f90fbd3..000000000000 --- a/x11-servers/XFree86-4-Server-snap/distinfo +++ /dev/null @@ -1,4 +0,0 @@ -MD5 (xc/X430src-1.tgz) = 4f241a4f867363f40efa2b00dca292af -MD5 (xc/X430src-2.tgz) = 844c2ee908d21dbf8911fd13115bf8b4 -MD5 (xc/X430src-3.tgz) = b82a0443e1b7bf860e4343e6b6766cb6 -MD5 (xc/Wraphelp2.gz) = bd1910492087442288d885412e2e5535 diff --git a/x11-servers/XFree86-4-Server-snap/files/patch-Pci.h b/x11-servers/XFree86-4-Server-snap/files/patch-Pci.h deleted file mode 100644 index f7286b494cea..000000000000 --- a/x11-servers/XFree86-4-Server-snap/files/patch-Pci.h +++ /dev/null @@ -1,13 +0,0 @@ ---- programs/Xserver/hw/xfree86/os-support/bus/Pci.h.orig Tue Mar 4 16:42:16 2003 -+++ programs/Xserver/hw/xfree86/os-support/bus/Pci.h Tue Mar 4 16:42:21 2003 -@@ -230,6 +230,10 @@ - # define ARCH_PCI_INIT linuxPciInit - # define INCLUDE_XF86_MAP_PCI_MEM - # define INCLUDE_XF86_NO_DOMAIN -+# elif defined(FreeBSD) -+# define ARCH_PCI_INIT freebsdPciInit -+# define INCLUDE_XF86_MAP_PCI_MEM -+# define INCLUDE_XF86_NO_DOMAIN - # endif - # define XF86SCANPCI_WRAPPER ia64ScanPCIWrapper - #elif defined(__i386__) diff --git a/x11-servers/XFree86-4-Server-snap/files/patch-alpha_video.c b/x11-servers/XFree86-4-Server-snap/files/patch-alpha_video.c deleted file mode 100644 index 741664e27713..000000000000 --- a/x11-servers/XFree86-4-Server-snap/files/patch-alpha_video.c +++ /dev/null @@ -1,35 +0,0 @@ ---- programs/Xserver/hw/xfree86/os-support/bsd/alpha_video.c.orig Tue Oct 29 15:19:13 2002 -+++ programs/Xserver/hw/xfree86/os-support/bsd/alpha_video.c Tue Mar 4 16:28:04 2003 -@@ -33,7 +33,10 @@ - #include <sys/param.h> - #ifndef __NetBSD__ - # include <sys/sysctl.h> --# else -+# ifdef __FreeBSD__ -+# include <machine/sysarch.h> -+# endif -+#else - # include <machine/sysarch.h> - #endif - #include "xf86Axp.h" -@@ -51,6 +54,8 @@ - #define MAP_FAILED ((caddr_t)-1) - #endif - -+axpDevice bsdGetAXP(void); -+ - #ifndef __NetBSD__ - extern unsigned long dense_base(void); - -@@ -260,10 +265,10 @@ - #endif /* __OpenBSD__ */ - - xf86ErrorF("\tlinear framebuffer access unavailable\n"); -+#endif - } - useDevMem = FALSE; - return; --#endif - } - - void diff --git a/x11-servers/XFree86-4-Server-snap/files/patch-mga_driver.c b/x11-servers/XFree86-4-Server-snap/files/patch-mga_driver.c deleted file mode 100644 index 13228b270c5b..000000000000 --- a/x11-servers/XFree86-4-Server-snap/files/patch-mga_driver.c +++ /dev/null @@ -1,13 +0,0 @@ ---- programs/Xserver/hw/xfree86/drivers/mga/mga_driver.c.orig Wed Jan 29 11:29:49 2003 -+++ programs/Xserver/hw/xfree86/drivers/mga/mga_driver.c Thu Mar 13 00:12:12 2003 -@@ -304,7 +304,10 @@ - "drmAgpVendorId", - "drmCommandNone", - "drmCommandWrite", -+ "drmCtlInstHandler", -+ "drmCtlUninstHandler", - "drmFreeVersion", -+ "drmGetInterruptFromBusID", - "drmGetLibVersion", - "drmGetVersion", - "drmMap", diff --git a/x11-servers/XFree86-4-Server-snap/files/patch-r128_driver.c b/x11-servers/XFree86-4-Server-snap/files/patch-r128_driver.c deleted file mode 100644 index 6274de047f4e..000000000000 --- a/x11-servers/XFree86-4-Server-snap/files/patch-r128_driver.c +++ /dev/null @@ -1,30 +0,0 @@ ---- programs/Xserver/hw/xfree86/drivers/ati/r128_driver.c.orig Tue Feb 18 17:19:41 2003 -+++ programs/Xserver/hw/xfree86/drivers/ati/r128_driver.c Thu Mar 13 00:12:12 2003 -@@ -275,6 +275,7 @@ - "drmAddMap", - "drmAgpAcquire", - "drmAgpAlloc", -+ "drmAgpBase", - "drmAgpBind", - "drmAgpDeviceId", - "drmAgpEnable", -@@ -288,8 +289,11 @@ - "drmCommandRead", - "drmCommandWrite", - "drmCommandWriteRead", -+ "drmCtlInstHandler", -+ "drmCtlUninstHandler", - "drmFreeBufs", - "drmFreeVersion", -+ "drmGetInterruptFromBusID", - "drmGetLibVersion", - "drmGetVersion", - "drmMap", -@@ -307,6 +311,7 @@ - "DRICreateInfoRec", - "DRIDestroyInfoRec", - "DRIFinishScreenInit", -+ "DRIGetDeviceInfo", - "DRIGetSAREAPrivate", - "DRILock", - "DRIQueryVersion", diff --git a/x11-servers/XFree86-4-Server-snap/files/patch-radeondri b/x11-servers/XFree86-4-Server-snap/files/patch-radeondri deleted file mode 100644 index 33d2bc6562b4..000000000000 --- a/x11-servers/XFree86-4-Server-snap/files/patch-radeondri +++ /dev/null @@ -1,234 +0,0 @@ -diff -ru -x CVS lib/GL/mesa/src/drv.orig/r200/r200_context.c lib/GL/mesa/src/drv/r200/r200_context.c ---- lib/GL/mesa/src/drv.orig/r200/r200_context.c Tue Mar 11 17:51:23 2003 -+++ lib/GL/mesa/src/drv/r200/r200_context.c Tue Mar 11 17:46:57 2003 -@@ -391,6 +391,7 @@ - */ - _tnl_destroy_pipeline( ctx ); - _tnl_install_pipeline( ctx, r200_pipeline ); -+ ctx->Driver.FlushVertices = r200FlushVertices; - - /* Try and keep materials and vertices separate: - */ -diff -ru -x CVS lib/GL/mesa/src/drv.orig/r200/r200_swtcl.c lib/GL/mesa/src/drv/r200/r200_swtcl.c ---- lib/GL/mesa/src/drv.orig/r200/r200_swtcl.c Tue Mar 11 17:51:29 2003 -+++ lib/GL/mesa/src/drv/r200/r200_swtcl.c Tue Mar 11 17:46:57 2003 -@@ -44,6 +44,7 @@ - #include "math/m_translate.h" - #include "tnl/tnl.h" - #include "tnl/t_context.h" -+#include "tnl/t_imm_exec.h" - #include "tnl/t_pipeline.h" - - #include "r200_context.h" -@@ -1220,6 +1221,14 @@ - r200ChooseVertexState( ctx ); - } - -+ -+void r200FlushVertices( GLcontext *ctx, GLuint flags ) -+{ -+ _tnl_flush_vertices( ctx, flags ); -+ -+ if (flags & FLUSH_STORED_VERTICES) -+ R200_FIREVERTICES( R200_CONTEXT( ctx ) ); -+} - - /**********************************************************************/ - /* Initialization. */ -diff -ru -x CVS lib/GL/mesa/src/drv.orig/r200/r200_swtcl.h lib/GL/mesa/src/drv/r200/r200_swtcl.h ---- lib/GL/mesa/src/drv.orig/r200/r200_swtcl.h Tue Mar 11 17:51:29 2003 -+++ lib/GL/mesa/src/drv/r200/r200_swtcl.h Tue Mar 11 17:46:57 2003 -@@ -42,6 +42,7 @@ - extern void r200InitSwtcl( GLcontext *ctx ); - extern void r200DestroySwtcl( GLcontext *ctx ); - -+extern void r200FlushVertices( GLcontext *ctx, GLuint flags ); - extern void r200ChooseRenderState( GLcontext *ctx ); - extern void r200ChooseVertexState( GLcontext *ctx ); - -diff -ru -x CVS lib/GL/mesa/src/drv.orig/r200/r200_vtxfmt.c lib/GL/mesa/src/drv/r200/r200_vtxfmt.c ---- lib/GL/mesa/src/drv.orig/r200/r200_vtxfmt.c Tue Mar 11 17:51:29 2003 -+++ lib/GL/mesa/src/drv/r200/r200_vtxfmt.c Tue Mar 11 17:47:00 2003 -@@ -38,6 +38,7 @@ - #include "r200_ioctl.h" - #include "r200_tex.h" - #include "r200_tcl.h" -+#include "r200_swtcl.h" - #include "r200_vtxfmt.h" - - #include "api_noop.h" -@@ -59,7 +60,7 @@ - - struct r200_vb vb; - --static void r200FlushVertices( GLcontext *, GLuint ); -+static void r200VtxFmtFlushVertices( GLcontext *, GLuint ); - - static void count_func( const char *name, struct dynfn *l ) - { -@@ -357,12 +358,13 @@ - fprintf(stderr, "%s from %s\n", __FUNCTION__, caller); - - if (ctx->Driver.NeedFlush) -- r200FlushVertices( ctx, ctx->Driver.NeedFlush ); -+ r200VtxFmtFlushVertices( ctx, ctx->Driver.NeedFlush ); - - if (ctx->NewState) - _mesa_update_state( ctx ); /* clear state so fell_back sticks */ - - _tnl_wakeup_exec( ctx ); -+ ctx->Driver.FlushVertices = r200FlushVertices; - - assert( rmesa->dma.flush == 0 ); - rmesa->vb.fell_back = GL_TRUE; -@@ -404,6 +406,7 @@ - prim = rmesa->vb.prim[0]; - ctx->Driver.CurrentExecPrimitive = GL_POLYGON+1; - _tnl_wakeup_exec( ctx ); -+ ctx->Driver.FlushVertices = r200FlushVertices; - - assert(rmesa->dma.flush == 0); - rmesa->vb.fell_back = GL_TRUE; -@@ -756,7 +759,7 @@ - fprintf(stderr, "reinstall (new install)\n"); - - _mesa_install_exec_vtxfmt( ctx, &rmesa->vb.vtxfmt ); -- ctx->Driver.FlushVertices = r200FlushVertices; -+ ctx->Driver.FlushVertices = r200VtxFmtFlushVertices; - ctx->Driver.NewList = r200NewList; - rmesa->vb.installed = GL_TRUE; - vb.context = ctx; -@@ -772,6 +775,7 @@ - if (rmesa->dma.flush) - rmesa->dma.flush( rmesa ); - _tnl_wakeup_exec( ctx ); -+ ctx->Driver.FlushVertices = r200FlushVertices; - rmesa->vb.installed = GL_FALSE; - vb.context = 0; - } -@@ -931,7 +935,7 @@ - return GL_TRUE; - } - --static void r200FlushVertices( GLcontext *ctx, GLuint flags ) -+static void r200VtxFmtFlushVertices( GLcontext *ctx, GLuint flags ) - { - r200ContextPtr rmesa = R200_CONTEXT( ctx ); - -diff -ru -x CVS lib/GL/mesa/src/drv.orig/radeon/radeon_context.c lib/GL/mesa/src/drv/radeon/radeon_context.c ---- lib/GL/mesa/src/drv.orig/radeon/radeon_context.c Tue Mar 11 17:51:29 2003 -+++ lib/GL/mesa/src/drv/radeon/radeon_context.c Tue Mar 11 17:47:00 2003 -@@ -382,6 +382,7 @@ - */ - _tnl_destroy_pipeline( ctx ); - _tnl_install_pipeline( ctx, radeon_pipeline ); -+ ctx->Driver.FlushVertices = radeonFlushVertices; - - /* Try and keep materials and vertices separate: - */ -diff -ru -x CVS lib/GL/mesa/src/drv.orig/radeon/radeon_swtcl.c lib/GL/mesa/src/drv/radeon/radeon_swtcl.c ---- lib/GL/mesa/src/drv.orig/radeon/radeon_swtcl.c Tue Mar 11 17:51:29 2003 -+++ lib/GL/mesa/src/drv/radeon/radeon_swtcl.c Tue Mar 11 17:47:00 2003 -@@ -45,6 +45,7 @@ - #include "math/m_translate.h" - #include "tnl/tnl.h" - #include "tnl/t_context.h" -+#include "tnl/t_imm_exec.h" - #include "tnl/t_pipeline.h" - - #include "radeon_context.h" -@@ -1133,6 +1134,14 @@ - } - } - -+ -+void radeonFlushVertices( GLcontext *ctx, GLuint flags ) -+{ -+ _tnl_flush_vertices( ctx, flags ); -+ -+ if (flags & FLUSH_STORED_VERTICES) -+ RADEON_FIREVERTICES( RADEON_CONTEXT( ctx ) ); -+} - - /**********************************************************************/ - /* Initialization. */ -diff -ru -x CVS lib/GL/mesa/src/drv.orig/radeon/radeon_swtcl.h lib/GL/mesa/src/drv/radeon/radeon_swtcl.h ---- lib/GL/mesa/src/drv.orig/radeon/radeon_swtcl.h Tue Mar 11 17:51:29 2003 -+++ lib/GL/mesa/src/drv/radeon/radeon_swtcl.h Tue Mar 11 17:47:00 2003 -@@ -43,6 +43,7 @@ - extern void radeonInitSwtcl( GLcontext *ctx ); - extern void radeonDestroySwtcl( GLcontext *ctx ); - -+extern void radeonFlushVertices( GLcontext *ctx, GLuint flags ); - extern void radeonChooseRenderState( GLcontext *ctx ); - extern void radeonChooseVertexState( GLcontext *ctx ); - -diff -ru -x CVS lib/GL/mesa/src/drv.orig/radeon/radeon_vtxfmt.c lib/GL/mesa/src/drv/radeon/radeon_vtxfmt.c ---- lib/GL/mesa/src/drv.orig/radeon/radeon_vtxfmt.c Tue Mar 11 17:51:29 2003 -+++ lib/GL/mesa/src/drv/radeon/radeon_vtxfmt.c Tue Mar 11 17:47:01 2003 -@@ -38,6 +38,7 @@ - #include "radeon_ioctl.h" - #include "radeon_tex.h" - #include "radeon_tcl.h" -+#include "radeon_swtcl.h" - #include "radeon_vtxfmt.h" - - #include "api_noop.h" -@@ -59,7 +60,7 @@ - - struct radeon_vb vb; - --static void radeonFlushVertices( GLcontext *, GLuint ); -+static void radeonVtxfmtFlushVertices( GLcontext *, GLuint ); - - static void count_func( const char *name, struct dynfn *l ) - { -@@ -336,12 +337,13 @@ - fprintf(stderr, "%s from %s\n", __FUNCTION__, caller); - - if (ctx->Driver.NeedFlush) -- radeonFlushVertices( ctx, ctx->Driver.NeedFlush ); -+ radeonVtxfmtFlushVertices( ctx, ctx->Driver.NeedFlush ); - - if (ctx->NewState) - _mesa_update_state( ctx ); /* clear state so fell_back sticks */ - - _tnl_wakeup_exec( ctx ); -+ ctx->Driver.FlushVertices = radeonFlushVertices; - - assert( rmesa->dma.flush == 0 ); - rmesa->vb.fell_back = GL_TRUE; -@@ -382,6 +384,7 @@ - prim = rmesa->vb.prim[0]; - ctx->Driver.CurrentExecPrimitive = GL_POLYGON+1; - _tnl_wakeup_exec( ctx ); -+ ctx->Driver.FlushVertices = radeonFlushVertices; - - assert(rmesa->dma.flush == 0); - rmesa->vb.fell_back = GL_TRUE; -@@ -731,7 +734,7 @@ - fprintf(stderr, "reinstall (new install)\n"); - - _mesa_install_exec_vtxfmt( ctx, &rmesa->vb.vtxfmt ); -- ctx->Driver.FlushVertices = radeonFlushVertices; -+ ctx->Driver.FlushVertices = radeonVtxfmtFlushVertices; - ctx->Driver.NewList = radeonNewList; - rmesa->vb.installed = GL_TRUE; - vb.context = ctx; -@@ -747,6 +750,7 @@ - if (rmesa->dma.flush) - rmesa->dma.flush( rmesa ); - _tnl_wakeup_exec( ctx ); -+ ctx->Driver.FlushVertices = radeonFlushVertices; - rmesa->vb.installed = GL_FALSE; - vb.context = 0; - } -@@ -905,7 +909,7 @@ - return GL_TRUE; - } - --static void radeonFlushVertices( GLcontext *ctx, GLuint flags ) -+static void radeonVtxfmtFlushVertices( GLcontext *ctx, GLuint flags ) - { - radeonContextPtr rmesa = RADEON_CONTEXT( ctx ); - diff --git a/x11-servers/XFree86-4-Server-snap/files/patch-savage-pci-id b/x11-servers/XFree86-4-Server-snap/files/patch-savage-pci-id deleted file mode 100644 index f7396543d878..000000000000 --- a/x11-servers/XFree86-4-Server-snap/files/patch-savage-pci-id +++ /dev/null @@ -1,87 +0,0 @@ ---- programs/Xserver/hw/xfree86/common/xf86PciInfo.h.savage-pci-id-fixes 2003-01-08 04:28:57.000000000 -0500 -+++ programs/Xserver/hw/xfree86/common/xf86PciInfo.h 2003-01-08 05:28:02.000000000 -0500 -@@ -457,21 +457,34 @@ - #define PCI_CHIP_TRIO64V2_DXGX 0x8901 - #define PCI_CHIP_PLATO_PX 0x8902 - #define PCI_CHIP_Trio3D 0x8904 --#define PCI_CHIP_Trio3D_2X 0x8A13 - #define PCI_CHIP_VIRGE_DXGX 0x8A01 - #define PCI_CHIP_VIRGE_GX2 0x8A10 -+#define PCI_CHIP_Trio3D_2X 0x8A13 - #define PCI_CHIP_SAVAGE3D 0x8A20 - #define PCI_CHIP_SAVAGE3D_MV 0x8A21 - #define PCI_CHIP_SAVAGE4 0x8A22 --#define PCI_CHIP_VIRGE_MX 0x8C01 --#define PCI_CHIP_VIRGE_MXPLUS 0x8C01 --#define PCI_CHIP_VIRGE_MXP 0x8C03 - #define PCI_CHIP_PROSAVAGE_PM 0x8A25 - #define PCI_CHIP_PROSAVAGE_KM 0x8A26 -+#define PCI_CHIP_VIRGE_MX 0x8C01 -+#define PCI_CHIP_VIRGE_MXPLUS 0x8C02 -+#define PCI_CHIP_VIRGE_MXP 0x8C03 - #define PCI_CHIP_SAVAGE_MX_MV 0x8C10 - #define PCI_CHIP_SAVAGE_MX 0x8C11 - #define PCI_CHIP_SAVAGE_IX_MV 0x8C12 - #define PCI_CHIP_SAVAGE_IX 0x8C13 -+#define PCI_CHIP_SUPSAV_MX128 0x8C22 -+#define PCI_CHIP_SUPSAV_MX64 0x8C24 -+#define PCI_CHIP_SUPSAV_MX64C 0x8C26 -+#define PCI_CHIP_SUPSAV_IX128SDR 0x8C2A -+#define PCI_CHIP_SUPSAV_IX128DDR 0x8C2B -+#define PCI_CHIP_SUPSAV_IX64SDR 0x8C2C -+#define PCI_CHIP_SUPSAV_IX64DDR 0x8C2D -+#define PCI_CHIP_SUPSAV_IXCSDR 0x8C2E -+#define PCI_CHIP_SUPSAV_IXCDDR 0x8C2F -+#define PCI_CHIP_S3TWISTER_P 0x8D01 -+#define PCI_CHIP_S3TWISTER_K 0x8D02 -+#define PCI_CHIP_PROSAVAGE_DDR 0x8D03 -+#define PCI_CHIP_PROSAVAGE_DDRK 0x8D04 - #define PCI_CHIP_SAVAGE2000 0x9102 - - /* ARK Logic */ ---- programs/Xserver/hw/xfree86/drivers/savage/savage_regs.h.savage-pci-id-fixes 2003-01-08 05:31:06.000000000 -0500 -+++ programs/Xserver/hw/xfree86/drivers/savage/savage_regs.h 2003-01-08 05:31:25.000000000 -0500 -@@ -3,30 +3,6 @@ - #ifndef _SAVAGE_REGS_H - #define _SAVAGE_REGS_H - --/* These are here until xf86PciInfo.h is updated. */ -- --#ifndef PCI_CHIP_S3TWISTER_P --#define PCI_CHIP_S3TWISTER_P 0x8d01 --#endif --#ifndef PCI_CHIP_S3TWISTER_K --#define PCI_CHIP_S3TWISTER_K 0x8d02 --#endif --#ifndef PCI_CHIP_SUPSAV_MX128 --#define PCI_CHIP_SUPSAV_MX128 0x8c22 --#define PCI_CHIP_SUPSAV_MX64 0x8c24 --#define PCI_CHIP_SUPSAV_MX64C 0x8c26 --#define PCI_CHIP_SUPSAV_IX128SDR 0x8c2a --#define PCI_CHIP_SUPSAV_IX128DDR 0x8c2b --#define PCI_CHIP_SUPSAV_IX64SDR 0x8c2c --#define PCI_CHIP_SUPSAV_IX64DDR 0x8c2d --#define PCI_CHIP_SUPSAV_IXCSDR 0x8c2e --#define PCI_CHIP_SUPSAV_IXCDDR 0x8c2f --#endif --#ifndef PCI_CHIP_PROSAVAGE_DDR --#define PCI_CHIP_PROSAVAGE_DDR 0x8d03 --#define PCI_CHIP_PROSAVAGE_DDRK 0x8d04 --#endif -- - #define S3_SAVAGE3D_SERIES(chip) ((chip>=S3_SAVAGE3D) && (chip<=S3_SAVAGE_MX)) - - #define S3_SAVAGE4_SERIES(chip) ((chip==S3_SAVAGE4) || (chip==S3_PROSAVAGE)) ---- programs/Xserver/hw/xfree86/drivers/savage/savage_driver.c.savage-pci-id-fixes 2003-01-08 06:28:59.000000000 -0500 -+++ programs/Xserver/hw/xfree86/drivers/savage/savage_driver.c 2003-01-08 06:33:02.000000000 -0500 -@@ -123,8 +123,8 @@ - { PCI_CHIP_SAVAGE_IX, "Savage/IX" }, - { PCI_CHIP_PROSAVAGE_PM, "ProSavage PM133" }, - { PCI_CHIP_PROSAVAGE_KM, "ProSavage KM133" }, -- { PCI_CHIP_S3TWISTER_P, "ProSavage PN133" }, -- { PCI_CHIP_S3TWISTER_K, "ProSavage KN133" }, -+ { PCI_CHIP_S3TWISTER_P, "Twister PN133" }, -+ { PCI_CHIP_S3TWISTER_K, "Twister KN133" }, - { PCI_CHIP_SUPSAV_MX128, "SuperSavage/MX 128" }, - { PCI_CHIP_SUPSAV_MX64, "SuperSavage/MX 64" }, - { PCI_CHIP_SUPSAV_MX64C, "SuperSavage/MX 64C" }, diff --git a/x11-servers/XFree86-4-Server-snap/files/patch-xkbInit.c b/x11-servers/XFree86-4-Server-snap/files/patch-xkbInit.c deleted file mode 100644 index 9b65d4c8b948..000000000000 --- a/x11-servers/XFree86-4-Server-snap/files/patch-xkbInit.c +++ /dev/null @@ -1,17 +0,0 @@ -Index: programs/Xserver/xkb/xkbInit.c -=================================================================== -RCS file: /home/ncvs/xfree/xc/programs/Xserver/xkb/xkbInit.c,v -retrieving revision 3.26 -retrieving revision 3.27 -diff -u -r3.26 -r3.27 ---- programs/Xserver/xkb/xkbInit.c 9 Feb 2003 06:29:20 -0000 3.26 -+++ programs/Xserver/xkb/xkbInit.c 17 Mar 2003 23:52:27 -0000 3.27 -@@ -713,7 +713,7 @@ - if (names->types) names->types = _XkbDupString(names->types); - if (names->compat) names->compat = _XkbDupString(names->compat); - if (names->geometry) names->geometry = _XkbDupString(names->geometry); -- if (names->symbols) names->geometry = _XkbDupString(names->symbols); -+ if (names->symbols) names->symbols = _XkbDupString(names->symbols); - - if (defs.model && defs.layout && rules) { - XkbComponentNamesRec rNames; diff --git a/x11-servers/XFree86-4-Server-snap/pkg-descr b/x11-servers/XFree86-4-Server-snap/pkg-descr deleted file mode 100644 index 2f1152683c92..000000000000 --- a/x11-servers/XFree86-4-Server-snap/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -This package contains X server and its related programs, -such as xf86config, SuperProbe, kbd_mode, and so on. - -WWW: http://www.xfree86.org/ diff --git a/x11-servers/XFree86-4-Server-snap/pkg-message b/x11-servers/XFree86-4-Server-snap/pkg-message deleted file mode 100644 index ea2e24612085..000000000000 --- a/x11-servers/XFree86-4-Server-snap/pkg-message +++ /dev/null @@ -1,5 +0,0 @@ -************************************************************************ -* To improve security, the X server is installed without an SUID bit. * -* This is suitable for use with xdm, but not with a startx script. * -* If you need to use a startx script, install the x11/wrapper package. * -************************************************************************ diff --git a/x11-servers/XFree86-4-Server-snap/pkg-plist b/x11-servers/XFree86-4-Server-snap/pkg-plist deleted file mode 100644 index efc379a420dd..000000000000 --- a/x11-servers/XFree86-4-Server-snap/pkg-plist +++ /dev/null @@ -1,204 +0,0 @@ -bin/X -bin/XFree86 -bin/gtf -bin/inb -bin/inl -bin/inw -bin/ioport -bin/kbd_mode -bin/mmapr -bin/mmapw -bin/outb -bin/outl -bin/outw -bin/pcitweak -%%ALPHA_NA%%bin/scanpci -bin/xf86cfg -bin/xf86config -include/X11/bitmaps/card.xbm -include/X11/bitmaps/down.xbm -include/X11/bitmaps/keyboard.xbm -include/X11/bitmaps/left.xbm -include/X11/bitmaps/monitor.xbm -include/X11/bitmaps/mouse.xbm -include/X11/bitmaps/narrower.xbm -include/X11/bitmaps/right.xbm -include/X11/bitmaps/shorter.xbm -include/X11/bitmaps/taller.xbm -include/X11/bitmaps/up.xbm -include/X11/bitmaps/wider.xbm -include/X11/pixmaps/card.xpm -include/X11/pixmaps/computer.xpm -include/X11/pixmaps/keyboard.xpm -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/XF86Cfg -lib/X11/doc/BUILD -lib/X11/doc/BugReport -lib/X11/doc/DESIGN -lib/X11/doc/Install -lib/X11/doc/LICENSE -lib/X11/doc/README -lib/X11/doc/README.DECtga -lib/X11/doc/README.DGA -lib/X11/doc/README.DRI -lib/X11/doc/README.DRIcomp -%%I386%%lib/X11/doc/README.I128 -%%I386%%lib/X11/doc/README.SiS -lib/X11/doc/README.XKB-Config -lib/X11/doc/README.XKB-Enhancing -%%I386%%lib/X11/doc/README.apm -lib/X11/doc/README.ati -%%I386%%lib/X11/doc/README.chips -%%I386%%lib/X11/doc/README.cyrix -lib/X11/doc/README.dps -lib/X11/doc/README.fonts -%%I386%%lib/X11/doc/README.i740 -%%I386%%lib/X11/doc/README.i810 -lib/X11/doc/README.mouse -%%I386%%lib/X11/doc/README.newport -lib/X11/doc/README.r128 -lib/X11/doc/README.rapidaccess -%%SPARC64_NA%%%%IA64_NA%%lib/X11/doc/README.rendition -%%SPARC64_NA%%%%IA64_NA%%lib/X11/doc/README.s3virge -lib/X11/doc/RELNOTES -lib/X11/doc/ServersOnly -lib/X11/doc/Status -lib/X11/doc/Versions -lib/X11/doc/VideoBoard98 -lib/X11/etc/Xinstall.sh -lib/X11/etc/sun.termcap -lib/X11/etc/sun.terminfo -lib/X11/etc/xmodmap.std -lib/X11/xserver/SecurityPolicy -lib/libXfont.a -lib/libXfont.so -lib/libXfont.so.1 -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/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_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 -%%DRI%%lib/modules/dri/gamma_dri.so -%%I386%%%%DRI%%lib/modules/dri/i810_dri.so -%%I386%%%%DRI%%lib/modules/dri/i830_dri.so -%%DRI%%lib/modules/dri/mga_dri.so -%%DRI%%lib/modules/dri/radeon_dri.so -%%DRI%%lib/modules/dri/r200_dri.so -%%DRI%%lib/modules/dri/r128_dri.so -%%DRI%%lib/modules/dri/tdfx_dri.so -%%I386%%lib/modules/drivers/apm_drv.o -%%I386%%lib/modules/drivers/ark_drv.o -lib/modules/drivers/ati_drv.o -lib/modules/drivers/atimisc_drv.o -%%I386%%lib/modules/drivers/chips_drv.o -%%I386%%lib/modules/drivers/cirrus_alpine.o -%%I386%%lib/modules/drivers/cirrus_drv.o -%%I386%%lib/modules/drivers/cirrus_laguna.o -%%I386%%lib/modules/drivers/cyrix_drv.o -%%SPARC64_NA%%lib/modules/drivers/glint_drv.o -%%I386%%lib/modules/drivers/i128_drv.o -%%I386%%lib/modules/drivers/i740_drv.o -%%I386%%lib/modules/drivers/i810_drv.o -%%SPARC64_NA%%lib/modules/drivers/mga_drv.o -%%I386%%lib/modules/drivers/neomagic_drv.o -%%I386%%lib/modules/drivers/nsc_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 -%%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 -%%I386%%lib/modules/drivers/sis_drv.o -%%SPARC64_NA%%lib/modules/drivers/tdfx_drv.o -%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/tga_drv.o -%%I386%%lib/modules/drivers/trident_drv.o -%%I386%%lib/modules/drivers/tseng_drv.o -%%I386%%lib/modules/drivers/vesa_drv.o -%%SPARC64_NA%%lib/modules/drivers/vga_drv.o -%%I386%%lib/modules/drivers/vmware_drv.o -lib/modules/extensions/libGLcore.a -lib/modules/extensions/libdbe.a -%%DRI%%lib/modules/extensions/libdri.a -lib/modules/extensions/libextmod.a -lib/modules/extensions/libglx.a -lib/modules/extensions/librecord.a -lib/modules/extensions/libxtrap.a -lib/modules/fonts/libbitmap.a -lib/modules/fonts/libfreetype.a -lib/modules/fonts/libspeedo.a -lib/modules/fonts/libtype1.a -lib/modules/fonts/libxtt.a -%%DRI%%lib/modules/freebsd/libdrm.a -lib/modules/input/citron_drv.o -lib/modules/input/digitaledge_drv.o -lib/modules/input/dynapro_drv.o -lib/modules/input/elo2300_drv.o -lib/modules/input/elographics_drv.o -lib/modules/input/kbd_drv.o -lib/modules/input/magellan_drv.o -lib/modules/input/microtouch_drv.o -lib/modules/input/mouse_drv.o -lib/modules/input/mutouch_drv.o -lib/modules/input/spaceorb_drv.o -lib/modules/input/summa_drv.o -lib/modules/input/void_drv.o -lib/modules/input/wacom_drv.o -%%ALPHA_NA%%lib/modules/libafb.a -lib/modules/libcfb.a -lib/modules/libcfb16.a -lib/modules/libcfb24.a -lib/modules/libcfb32.a -lib/modules/libddc.a -lib/modules/libfb.a -lib/modules/libi2c.a -lib/modules/libint10.a -lib/modules/liblayer.a -lib/modules/libmfb.a -lib/modules/libpcidata.a -lib/modules/librac.a -lib/modules/libramdac.a -lib/modules/libscanpci.a -lib/modules/libshadow.a -lib/modules/libshadowfb.a -lib/modules/libvbe.a -lib/modules/libvgahw.a -lib/modules/libxaa.a -lib/modules/libxf1bpp.a -lib/modules/libxf24_32bpp.a -lib/modules/libxf4bpp.a -lib/modules/libxf8_16bpp.a -lib/modules/libxf8_32bpp.a -lib/modules/v10002d.uc -lib/modules/v20002d.uc diff --git a/x11-servers/XFree86-4-Server-snap/scripts/configure b/x11-servers/XFree86-4-Server-snap/scripts/configure deleted file mode 100644 index 85ee63af6364..000000000000 --- a/x11-servers/XFree86-4-Server-snap/scripts/configure +++ /dev/null @@ -1,106 +0,0 @@ -#!/bin/sh - -# This script does the following: -# (1) cp xf86site.def, installed by imake-4 port, -# to ${WRKDIR}/xc/config/cf. -# this provides settings for the ports system. -# (2) Create a host.def for this specific port, using -# host.def as a base. - -ORIGDEF=$PREFIX/lib/X11/config/xf86site.def -DESTDEF=$WRKDIR/xc/config/cf/xf86site.def -ORIGHOSTDEF=$PREFIX/lib/X11/config/host.def -LOCALDEF=$WRKDIR/.config -HOSTDEF=$WRKDIR/xc/config/cf/host.def - -# Use original host.def as initial config file -rm -f $LOCALDEF -grep -v '#define.*ProjectRoot' $ORIGHOSTDEF >> $LOCALDEF -echo "#define ProjectRoot $PREFIX" >> $LOCALDEF - -# This is also defined in xf86site.def, but doesn't get -# picked up for some reason. -echo "#define NothingOutsideProjectRoot YES" >> $LOCALDEF - -# Now, we can use this configuration. -# Thanks, Trevor Johnson <trevor@jpj.net> -echo "#define InstallXserverSetUID NO" >> $LOCALDEF - -echo "#define XInputDrivers mouse keyboard digitaledge dynapro elo2300 \ - elographics magellan \ - microtouch mutouch spaceorb summa \ - wacom void citron" >> $LOCALDEF -echo "#define BuildXF86DRI ${BuildXF86DRI}" >> $LOCALDEF -echo "#define BuildXF86DRM NO" >> $LOCALDEF -echo "#define HasGlide3 YES" >> $LOCALDEF - -# disable some options -for i in \ - BuildFonts \ - Build75DpiFonts \ - Build100DpiFonts \ - BuildSpeedoFonts \ - BuildType1Fonts \ - BuildCIDFonts \ - BuildCyrillicFonts \ - JoystickSupport \ - XnestServer \ - BuildFontServer \ - XVirtualFramebufferServer \ - XprtServer \ - LibHeaders \ - LibInstall \ - ForceNormalLib \ - XTrueTypeInstallCConvHeaders -do \ - echo "#define $i NO" >> $LOCALDEF -done - -echo "#define BuildServer YES" >> $LOCALDEF -echo "#define LibInstallBuild YES" >> $LOCALDEF -echo "#define ModInstall YES" >> $LOCALDEF -echo "#define XF86Server YES" >> $LOCALDEF -echo "#define BuildServersOnly YES" >> $LOCALDEF -echo "#define BuildGLXLibrary YES" >> $LOCALDEF -echo "#define BuildXFree86ConfigTools YES" >> $LOCALDEF -echo "#define UseInstalledPrograms YES" >> $LOCALDEF -echo "#define StandardIncludes -I${PREFIX}/include" >> $LOCALDEF - -echo "#define FreeBSDCC ${CC}" >> $LOCALDEF -echo "#define FreeBSDCXX ${CXX}" >> $LOCALDEF -if [ X$WITH_DEBUG != X ]; then - echo "#define FreeBSDCFLAGS -g ${CFLAGS}" >> $LOCALDEF - echo "#define InstPgmFlags" >> $LOCALDEF -else - echo "#define FreeBSDCFLAGS ${CFLAGS}" >> $LOCALDEF -fi - -# We need to test cards on these architectures and see what can be added -# to the other architectures. -cat >> $LOCALDEF <<END -#if defined(i386Architecture) -# define XF86CardDrivers mga glint nv tga s3 s3virge sis rendition \ - neomagic i740 tdfx savage \ - cirrus vmware tseng trident chips apm \ - i128 nsc ati i810 ark cyrix siliconmotion \ - vesa vga -#elif defined(ia64Architecture) -# define XF86CardDrivers mga nv tdfx glint ati vga -#elif defined(AlphaArchitecture) -# define XF86CardDrivers mga glint nv tga s3 s3virge rendition \ - tdfx savage cirrus ati siliconmotion vga -#elif defined(Sparc64Architecture) -# define XF86CardDrivers nv ati sunffb -#endif -END - -echo "#define FreeBSDBuildXxserv YES" >> $LOCALDEF - -# Copy ORIGDEF to DESTDEF -rm -f $DESTDEF -cp -f $ORIGDEF $DESTDEF - -# copy generated config to host.def -cp -f $LOCALDEF $HOSTDEF - -exit 0 |