[Midnightbsd-cvs] mports: x11-servers/xorg-server: Update to 1.4, xorg-server for xorg 7.3
ctriv at midnightbsd.org
ctriv at midnightbsd.org
Thu Oct 11 16:46:12 EDT 2007
Log Message:
-----------
Update to 1.4, xorg-server for xorg 7.3 Cue trumpets.
Modified Files:
--------------
mports/x11-servers/xorg-server:
Makefile (r1.3 -> r1.4)
distinfo (r1.1.1.1 -> r1.2)
pkg-plist (r1.1.1.1 -> r1.2)
mports/x11-servers/xorg-server/files:
patch-Xserver-Xext-xvmc.c (r1.1.1.1 -> r1.2)
patch-Xserver-hw-xfree86-common-xf86Config.c (r1.1.1.1 -> r1.2)
patch-Xserver-hw-xfree86-os-support-bsd-i386_video.c (r1.1.1.1 -> r1.2)
patch-Xserver-os-xprintf.c (r1.1.1.1 -> r1.2)
patch-bsdResource.c (r1.1.1.1 -> r1.2)
patch-render.c (r1.1.1.1 -> r1.2)
patch-servermd.h (r1.1.1.1 -> r1.2)
patch-xorgconf.cpp (r1.1.1.1 -> r1.2)
Removed Files:
-------------
mports/x11-servers/xorg-server/files:
patch-945GM.patch
patch-CVE-2006-0745
patch-FreeBSD.cf
patch-Imake.rules
patch-Imake.tmpl
patch-Library.tmpl
patch-X11.rules
patch-X11.tmpl
patch-Xserver-Imakefile
patch-font-FreeType-ftfuncs.c
patch-font-FreeType-ftfuncs.h
patch-font-FreeType-ftsystem.c
patch-font-bitmap-pcfread.c
patch-mitri.c
patch-sunffb-nocfb
patch-xf86.tmpl
patch-xf86Events.c
patch-xf86cfg-Imakefile
patch-xf86sym.c
mports/x11-servers/xorg-server/scripts:
configure
configure.gen
-------------- next part --------------
--- x11-servers/xorg-server/files/patch-X11.rules
+++ /dev/null
@@ -1,17 +0,0 @@
---- config/cf/X11.rules.orig Sun May 30 12:49:38 2004
-+++ config/cf/X11.rules Sun May 30 12:50:02 2004
-@@ -23,6 +23,14 @@
- # define UseInstalledX11 YES
- #endif
-
-+#ifndef UseInstalledPrograms
-+# define UseInstalledPrograms NO
-+#endif
-+
-+#ifndef UseInstalledClients
-+# define UseInstalledClients NO
-+#endif
-+
- #ifndef ImportX11
- # ifdef UseImports
- # define ImportX11 YES
Index: patch-render.c
===================================================================
RCS file: /home/cvs/mports/x11-servers/xorg-server/files/patch-render.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -Lx11-servers/xorg-server/files/patch-render.c -Lx11-servers/xorg-server/files/patch-render.c -u -r1.1.1.1 -r1.2
--- x11-servers/xorg-server/files/patch-render.c
+++ x11-servers/xorg-server/files/patch-render.c
@@ -1,5 +1,5 @@
---- programs/Xserver/render/render.c.orig Mon May 29 09:43:15 2006
-+++ programs/Xserver/render/render.c Mon May 29 09:45:02 2006
+--- render/render.c.orig Mon May 29 09:43:15 2006
++++ render/render.c Mon May 29 09:45:02 2006
@@ -1340,7 +1340,7 @@
{
if (buffer + sizeof (GlyphSet) < end)
--- x11-servers/xorg-server/files/patch-945GM.patch
+++ /dev/null
@@ -1,335 +0,0 @@
-#
-# Add support to Intel 945GM
-#
---- programs/Xserver/hw/xfree86/drivers/i810/common.h.orig Mon Jul 17 11:41:34 2006
-+++ programs/Xserver/hw/xfree86/drivers/i810/common.h Mon Jul 17 11:43:00 2006
-@@ -322,6 +322,11 @@
- #define PCI_CHIP_I945_G_BRIDGE 0x2770
- #endif
-
-+#ifndef PCI_CHIP_I945_GM
-+#define PCI_CHIP_I945_GM 0x27A2
-+#define PCI_CHIP_I945_GM_BRIDGE 0x27A0
-+#endif
-+
- #define IS_I810(pI810) (pI810->PciInfo->chipType == PCI_CHIP_I810 || \
- pI810->PciInfo->chipType == PCI_CHIP_I810_DC100 || \
- pI810->PciInfo->chipType == PCI_CHIP_I810_E)
-@@ -335,6 +340,7 @@
- #define IS_I915G(pI810) (pI810->PciInfo->chipType == PCI_CHIP_I915_G || pI810->PciInfo->chipType == PCI_CHIP_E7221_G)
- #define IS_I915GM(pI810) (pI810->PciInfo->chipType == PCI_CHIP_I915_GM)
- #define IS_I945G(pI810) (pI810->PciInfo->chipType == PCI_CHIP_I945_G)
-+#define IS_I945GM(pI810) (pI810->PciInfo->chipType == PCI_CHIP_I945_GM)
-
- #define IS_MOBILE(pI810) (IS_I830(pI810) || IS_I85X(pI810) || IS_I915GM(pI810))
-
---- programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c.orig Mon Jul 17 11:41:34 2006
-+++ programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c Mon Jul 17 11:44:09 2006
-@@ -136,6 +136,7 @@
- {PCI_CHIP_E7221_G, "E7221 (i915)"},
- {PCI_CHIP_I915_GM, "915GM"},
- {PCI_CHIP_I945_G, "945G"},
-+ {PCI_CHIP_I945_GM, "945GM"},
- {-1, NULL}
- };
-
-@@ -154,6 +155,7 @@
- {PCI_CHIP_E7221_G, PCI_CHIP_E7221_G, RES_SHARED_VGA},
- {PCI_CHIP_I915_GM, PCI_CHIP_I915_GM, RES_SHARED_VGA},
- {PCI_CHIP_I945_G, PCI_CHIP_I945_G, RES_SHARED_VGA},
-+ {PCI_CHIP_I945_GM, PCI_CHIP_I945_GM, RES_SHARED_VGA},
- {-1, -1, RES_UNDEFINED }
- };
-
-@@ -569,6 +571,7 @@
- case PCI_CHIP_E7221_G:
- case PCI_CHIP_I915_GM:
- case PCI_CHIP_I945_G:
-+ case PCI_CHIP_I945_GM:
- xf86SetEntitySharable(usedChips[i]);
-
- /* Allocate an entity private if necessary */
---- programs/Xserver/hw/xfree86/drivers/i810/i830_cursor.c.orig Mon Jul 17 11:41:34 2006
-+++ programs/Xserver/hw/xfree86/drivers/i810/i830_cursor.c Mon Jul 17 11:46:20 2006
-@@ -86,7 +86,7 @@
-
- DPRINTF(PFX, "I830InitHWCursor\n");
- /* Initialise the HW cursor registers, leaving the cursor hidden. */
-- if (IS_MOBILE(pI830) || IS_I915G(pI830) || IS_I945G(pI830)) {
-+ if (IS_MOBILE(pI830) || IS_I915G(pI830) || IS_I945G(pI830) || IS_I945GM(pI830)) {
- temp = INREG(CURSOR_A_CONTROL);
- temp &= ~(CURSOR_MODE | MCURSOR_GAMMA_ENABLE | MCURSOR_MEM_TYPE_LOCAL |
- MCURSOR_PIPE_SELECT);
-@@ -308,7 +308,7 @@
- }
-
- /* have to upload the base for the new position */
-- if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830)) {
-+ if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830) || IS_I945GM(pI830)) {
- if (pI830->CursorIsARGB)
- OUTREG(CURSOR_A_BASE, pI830->CursorMemARGB->Physical);
- else
-@@ -339,7 +339,7 @@
- pI830->CursorMemARGB->Physical, pI830->CursorMemARGB->Start);
-
- pI830->cursorOn = TRUE;
-- if (IS_MOBILE(pI830) || IS_I915G(pI830) || IS_I945G(pI830)) {
-+ if (IS_MOBILE(pI830) || IS_I915G(pI830) || IS_I945G(pI830) || IS_I945GM(pI830)) {
- temp = INREG(CURSOR_A_CONTROL);
- temp &= ~(CURSOR_MODE | MCURSOR_PIPE_SELECT);
- if (pI830->CursorIsARGB)
-@@ -387,7 +387,7 @@
- DPRINTF(PFX, "I830HideCursor\n");
-
- pI830->cursorOn = FALSE;
-- if (IS_MOBILE(pI830) || IS_I915G(pI830) || IS_I945G(pI830)) {
-+ if (IS_MOBILE(pI830) || IS_I915G(pI830) || IS_I945G(pI830) || IS_I945GM(pI830)) {
- temp = INREG(CURSOR_A_CONTROL);
- temp &= ~CURSOR_MODE;
- temp |= CURSOR_MODE_DISABLE;
---- programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c.orig Mon Jul 17 11:41:34 2006
-+++ programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c Mon Jul 17 11:49:23 2006
-@@ -196,6 +196,7 @@
- {PCI_CHIP_E7221_G, "E7221 (i915)"},
- {PCI_CHIP_I915_GM, "915GM"},
- {PCI_CHIP_I945_G, "945G"},
-+ {PCI_CHIP_I945_GM, "945GM"},
- {-1, NULL}
- };
-
-@@ -208,6 +209,7 @@
- {PCI_CHIP_E7221_G, PCI_CHIP_E7221_G, RES_SHARED_VGA},
- {PCI_CHIP_I915_GM, PCI_CHIP_I915_GM, RES_SHARED_VGA},
- {PCI_CHIP_I945_G, PCI_CHIP_I945_G, RES_SHARED_VGA},
-+ {PCI_CHIP_I945_GM, PCI_CHIP_I945_GM, RES_SHARED_VGA},
- {-1, -1, RES_UNDEFINED}
- };
-
-@@ -1323,7 +1325,7 @@
- * The GTT varying according the the FbMapSize and the popup is 4KB */
- range = (pI830->FbMapSize / (1024*1024)) + 4;
-
-- if (IS_I85X(pI830) || IS_I865G(pI830) || IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830)) {
-+ if (IS_I85X(pI830) || IS_I865G(pI830) || IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830) || IS_I945GM(pI830)) {
- switch (gmch_ctrl & I830_GMCH_GMS_MASK) {
- case I855_GMCH_GMS_STOLEN_1M:
- memsize = MB(1) - KB(range);
-@@ -1341,11 +1343,11 @@
- memsize = MB(32) - KB(range);
- break;
- case I915G_GMCH_GMS_STOLEN_48M:
-- if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))
-+ if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830) || IS_I945GM(pI830))
- memsize = MB(48) - KB(range);
- break;
- case I915G_GMCH_GMS_STOLEN_64M:
-- if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))
-+ if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830) || IS_I945GM(pI830))
- memsize = MB(64) - KB(range);
- break;
- }
-@@ -2090,6 +2092,9 @@
- case PCI_CHIP_I945_G:
- chipname = "945G";
- break;
-+ case PCI_CHIP_I945_GM:
-+ chipname = "945GM";
-+ break;
- default:
- chipname = "unknown chipset";
- break;
-@@ -2127,7 +2132,7 @@
- pI830->LinearAddr = pI830->pEnt->device->MemBase;
- from = X_CONFIG;
- } else {
-- if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830)) {
-+ if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830) || IS_I945GM(pI830)) {
- pI830->LinearAddr = pI830->PciInfo->memBase[2] & 0xF0000000;
- from = X_PROBED;
- } else if (pI830->PciInfo->memBase[1] != 0) {
-@@ -2149,7 +2154,7 @@
- pI830->MMIOAddr = pI830->pEnt->device->IOBase;
- from = X_CONFIG;
- } else {
-- if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830)) {
-+ if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830) || IS_I945GM(pI830)) {
- pI830->MMIOAddr = pI830->PciInfo->memBase[0] & 0xFFF80000;
- from = X_PROBED;
- } else if (pI830->PciInfo->memBase[1]) {
-@@ -2194,7 +2199,7 @@
- pI830->FbMapSize = 0x4000000; /* 64MB - has this been tested ?? */
- }
- } else {
-- if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830)) {
-+ if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830) || IS_I945GM(pI830)) {
- if (pI830->PciInfo->memBase[2] & 0x08000000)
- pI830->FbMapSize = 0x8000000; /* 128MB aperture */
- else
-@@ -2227,7 +2232,7 @@
- if (pI830->PciInfo->chipType == PCI_CHIP_E7221_G)
- pI830->availablePipes = 1;
- else
-- if (IS_MOBILE(pI830) || IS_I915G(pI830) || IS_I945G(pI830))
-+ if (IS_MOBILE(pI830) || IS_I915G(pI830) || IS_I945G(pI830) || IS_I945GM(pI830))
- pI830->availablePipes = 2;
- else
- pI830->availablePipes = 1;
-@@ -2872,7 +2877,7 @@
- }
-
- /* Check if the HW cursor needs physical address. */
-- if (IS_MOBILE(pI830) || IS_I915G(pI830) || IS_I945G(pI830))
-+ if (IS_MOBILE(pI830) || IS_I915G(pI830) || IS_I945G(pI830) || IS_I945GM(pI830))
- pI830->CursorNeedsPhysical = TRUE;
- else
- pI830->CursorNeedsPhysical = FALSE;
---- programs/Xserver/hw/xfree86/drivers/i810/i830_memory.c.orig Mon Jul 17 11:41:34 2006
-+++ programs/Xserver/hw/xfree86/drivers/i810/i830_memory.c Mon Jul 17 11:51:02 2006
-@@ -1239,7 +1239,7 @@
-
- i830Reg->Fence[nr] = 0;
-
-- if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))
-+ if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830) || IS_I945GM(pI830))
- fence_mask = ~I915G_FENCE_START_MASK;
- else
- fence_mask = ~I830_FENCE_START_MASK;
-@@ -1247,7 +1247,7 @@
- if (start & fence_mask) {
- xf86DrvMsg(X_WARNING, pScrn->scrnIndex,
- "SetFence: %d: start (0x%08x) is not %s aligned\n",
-- nr, start, (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830)) ? "1MB" : "512k");
-+ nr, start, (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830) || IS_I945GM(pI830)) ? "1MB" : "512k");
- return;
- }
-
-@@ -1267,7 +1267,7 @@
-
- val = (start | FENCE_X_MAJOR | FENCE_VALID);
-
-- if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830)) {
-+ if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830) || IS_I945GM(pI830)) {
- switch (size) {
- case MB(1):
- val |= I915G_FENCE_SIZE_1M;
-@@ -1328,7 +1328,7 @@
- }
- }
-
-- if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))
-+ if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830) || IS_I945GM(pI830))
- fence_pitch = pitch / 512;
- else
- fence_pitch = pitch / 128;
---- programs/Xserver/hw/xfree86/drivers/i810/i830_video.c.orig Mon Jul 17 11:41:34 2006
-+++ programs/Xserver/hw/xfree86/drivers/i810/i830_video.c Mon Jul 17 11:52:36 2006
-@@ -617,7 +617,7 @@
- adapt->nAttributes = NUM_ATTRIBUTES;
- if (pI830->Clone)
- adapt->nAttributes += CLONE_ATTRIBUTES;
-- if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))
-+ if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830) || IS_I945GM(pI830))
- adapt->nAttributes += GAMMA_ATTRIBUTES; /* has gamma */
- adapt->pAttributes = xnfalloc(sizeof(XF86AttributeRec) * adapt->nAttributes);
- /* Now copy the attributes */
-@@ -628,7 +628,7 @@
- memcpy((char*)att, (char*)CloneAttributes, sizeof(XF86AttributeRec) * CLONE_ATTRIBUTES);
- att+=CLONE_ATTRIBUTES;
- }
-- if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830)) {
-+ if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830) || IS_I945GM(pI830)) {
- memcpy((char*)att, (char*)GammaAttributes, sizeof(XF86AttributeRec) * GAMMA_ATTRIBUTES);
- att+=GAMMA_ATTRIBUTES;
- }
-@@ -688,7 +688,7 @@
- if (pI830->Clone)
- xvPipe = MAKE_ATOM("XV_PIPE");
-
-- if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830)) {
-+ if (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830) || IS_I945GM(pI830)) {
- xvGamma0 = MAKE_ATOM("XV_GAMMA0");
- xvGamma1 = MAKE_ATOM("XV_GAMMA1");
- xvGamma2 = MAKE_ATOM("XV_GAMMA2");
-@@ -806,7 +806,7 @@
- overlay->OCONFIG |= OVERLAY_PIPE_B;
- if (pPriv->overlayOK)
- OVERLAY_UPDATE;
-- } else if (attribute == xvGamma0 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))) {
-+ } else if (attribute == xvGamma0 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830) || IS_I945GM(pI830))) {
- /* Avoid video anomalies, so set gamma registers when overlay is off */
- /* We also clamp the values if they are outside the ranges */
- if (!*pI830->overlayOn) {
-@@ -815,35 +815,35 @@
- pPriv->gamma1 = pPriv->gamma0 + 0x7d;
- } else
- return BadRequest;
-- } else if (attribute == xvGamma1 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))) {
-+ } else if (attribute == xvGamma1 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830) || IS_I945GM(pI830))) {
- if (!*pI830->overlayOn) {
- pPriv->gamma1 = value;
- if (pPriv->gamma1 - pPriv->gamma0 > 0x7d)
- pPriv->gamma0 = pPriv->gamma1 - 0x7d;
- } else
- return BadRequest;
-- } else if (attribute == xvGamma2 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))) {
-+ } else if (attribute == xvGamma2 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830) || IS_I945GM(pI830))) {
- if (!*pI830->overlayOn) {
- pPriv->gamma2 = value;
- if (pPriv->gamma3 - pPriv->gamma2 > 0x7d)
- pPriv->gamma3 = pPriv->gamma2 + 0x7d;
- } else
- return BadRequest;
-- } else if (attribute == xvGamma3 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))) {
-+ } else if (attribute == xvGamma3 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830) || IS_I945GM(pI830))) {
- if (!*pI830->overlayOn) {
- pPriv->gamma3 = value;
- if (pPriv->gamma3 - pPriv->gamma2 > 0x7d)
- pPriv->gamma2 = pPriv->gamma3 - 0x7d;
- } else
- return BadRequest;
-- } else if (attribute == xvGamma4 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))) {
-+ } else if (attribute == xvGamma4 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830) || IS_I945GM(pI830))) {
- if (!*pI830->overlayOn) {
- pPriv->gamma4 = value;
- if (pPriv->gamma5 - pPriv->gamma4 > 0x7d)
- pPriv->gamma5 = pPriv->gamma4 + 0x7d;
- } else
- return BadRequest;
-- } else if (attribute == xvGamma5 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))) {
-+ } else if (attribute == xvGamma5 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830) || IS_I945GM(pI830))) {
- if (!*pI830->overlayOn) {
- pPriv->gamma5 = value;
- if (pPriv->gamma5 - pPriv->gamma4 > 0x7d)
-@@ -875,7 +875,7 @@
- attribute == xvGamma2 ||
- attribute == xvGamma3 ||
- attribute == xvGamma4 ||
-- attribute == xvGamma5) && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))) {
-+ attribute == xvGamma5) && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830) || IS_I945GM(pI830))) {
- I830UpdateGamma(pScrn);
- }
-
-@@ -895,17 +895,17 @@
- *value = pPriv->contrast;
- } else if (pI830->Clone && attribute == xvPipe) {
- *value = pPriv->pipe;
-- } else if (attribute == xvGamma0 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))) {
-+ } else if (attribute == xvGamma0 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830) || IS_I945GM(pI830))) {
- *value = pPriv->gamma0;
-- } else if (attribute == xvGamma1 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))) {
-+ } else if (attribute == xvGamma1 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830) || IS_I945GM(pI830))) {
- *value = pPriv->gamma1;
-- } else if (attribute == xvGamma2 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))) {
-+ } else if (attribute == xvGamma2 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830) || IS_I945GM(pI830))) {
- *value = pPriv->gamma2;
-- } else if (attribute == xvGamma3 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))) {
-+ } else if (attribute == xvGamma3 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830) || IS_I945GM(pI830))) {
- *value = pPriv->gamma3;
-- } else if (attribute == xvGamma4 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))) {
-+ } else if (attribute == xvGamma4 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830) || IS_I945GM(pI830))) {
- *value = pPriv->gamma4;
-- } else if (attribute == xvGamma5 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830))) {
-+ } else if (attribute == xvGamma5 && (IS_I915G(pI830) || IS_I915GM(pI830) || IS_I945G(pI830) || IS_I945GM(pI830))) {
- *value = pPriv->gamma5;
- } else if (attribute == xvColorKey) {
- *value = pPriv->colorKey;
Index: patch-servermd.h
===================================================================
RCS file: /home/cvs/mports/x11-servers/xorg-server/files/patch-servermd.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -Lx11-servers/xorg-server/files/patch-servermd.h -Lx11-servers/xorg-server/files/patch-servermd.h -u -r1.1.1.1 -r1.2
--- x11-servers/xorg-server/files/patch-servermd.h
+++ x11-servers/xorg-server/files/patch-servermd.h
@@ -1,5 +1,5 @@
---- programs/Xserver/include/servermd.h.orig Sun Jan 8 14:05:55 2006
-+++ programs/Xserver/include/servermd.h Sun Jan 8 14:06:22 2006
+--- include/servermd.h.orig Sun Jan 8 14:05:55 2006
++++ include/servermd.h Sun Jan 8 14:06:22 2006
@@ -216,7 +216,7 @@
defined(__sparc__) || defined(__mc68000__)
--- x11-servers/xorg-server/files/patch-Imake.rules
+++ /dev/null
@@ -1,67 +0,0 @@
---- config/cf/Imake.rules.orig Mon Dec 9 15:00:42 2002
-+++ config/cf/Imake.rules Mon Oct 13 17:04:19 2003
-@@ -1406,7 +1406,7 @@
- * this Imakefile is within the source tree.
- */
- #ifndef RmanDependency
--#ifdef UseInstalled
-+#if defined(UseInstalled) || defined(UseInstalledPrograms)
- #define RmanDependency() /**/
- #else
- #define RmanDependency() @@\
-@@ -1421,7 +1421,7 @@
- #endif /* RmanDependency */
-
- #ifndef RmanCmdDependency
--#ifdef UseInstalled
-+#if defined(UseInstalled) || defined(UseInstalledPrograms)
- #define RmanCmdDependency /**/
- #else
- #define RmanCmdDependency ProgramTargetName($(RMAN))
-@@ -1874,7 +1874,7 @@
- * this Imakefile is within the source tree.
- */
- #ifndef DependDependency
--#ifdef UseInstalled
-+#if defined(UseInstalled) || defined(UseInstalledPrograms)
- #define DependDependency() /**/
- #else
- #define DependDependency() @@\
-@@ -1969,7 +1969,7 @@
- * within the source tree.
- */
- #ifndef ImakeDependency
--#ifdef UseInstalled
-+#if defined(UseInstalled) || defined(UseInstalledPrograms)
- #define ImakeDependency(target) /**/
- #else
- #define ImakeDependency(target) @@\
-@@ -2066,11 +2066,18 @@
- * ProjectUnsharedLibReferences - variables for unshared libraries
- */
- #ifndef ProjectUnsharedLibReferences
-+#if defined(UseInstalledLibraries)
-+#define ProjectUnsharedLibReferences(varname,libname,libsource,buildlibdir) @@\
-+Concat3(DEP,varname,LIB) = @@\
-+Concat(varname,LIB) = LoaderLibPrefix Concat(-l,libname) @@\
-+LintLibReferences(varname,libname,libsource)
-+#else
- #define ProjectUnsharedLibReferences(varname,libname,libsource,buildlibdir) @@\
- Concat3(DEP,varname,LIB) = _UseCat($(USRLIBDIR)/,buildlibdir/,LibraryTargetName(libname)) @@\
- Concat(varname,LIB) = LoaderLibPrefix Concat(-l,libname) @@\
- LintLibReferences(varname,libname,libsource)
- #endif
-+#endif
-
- /*
- * ProjectUnsharedFontLibReferences - unshared font libraries
-@@ -3126,6 +3133,9 @@
-
- #ifdef UseInstalled
- #define ImakeSubCmdHelper $(IMAKE_CMD)
-+#elif defined(UseInstalledPrograms)
-+#define ImakeSubCmdHelper $(IMAKE) -I$(IMAKEPREFIX)$(IRULESRC) \
-+ $(IMAKE_DEFINES) $(IMAKE_WARNINGS)
- #else
- #define ImakeSubCmdHelper $(IMAKEPREFIX)$(IMAKE) -I$(IMAKEPREFIX)$(IRULESRC) \
- $(IMAKE_DEFINES) $(IMAKE_WARNINGS)
--- x11-servers/xorg-server/files/patch-xf86Events.c
+++ /dev/null
@@ -1,76 +0,0 @@
---- programs/Xserver/hw/xfree86/common/xf86Events.c.orig Sun Sep 26 04:17:42 2004
-+++ programs/Xserver/hw/xfree86/common/xf86Events.c Sun Sep 26 04:17:25 2004
-@@ -448,7 +448,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 */
-@@ -464,7 +464,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")))
-@@ -474,7 +474,7 @@
- }
- if (kbdSun)
- goto special;
--#endif /* __sparc__ && __linux__ */
-+#endif /* __sparc__ && (__linux__ || __FreeBSD__) */
-
- #ifdef __linux__
- if (xf86Info.kbdCustomKeycodes) {
-@@ -525,6 +525,7 @@
- } else
- #endif /* i386 && SVR4 */
- {
-+ if (!xf86IsPc98()) {
- switch (scanCode) {
- case 0x59: scanCode = KEY_0x59; break;
- case 0x5a: scanCode = KEY_0x5A; break;
-@@ -555,6 +556,7 @@
- case 0x75: scanCode = KEY_0x75; break;
- case 0x76: scanCode = KEY_0x76; break;
- }
-+ } /* end if (!xf86IsPc98()) */
- }
- }
-
-@@ -636,10 +638,12 @@
- * they need to get the same key code as the base key on the same
- * physical keyboard key.
- */
-+ if (!xf86IsPc98()) {
- if (scanCode == KEY_SysReqest)
- scanCode = KEY_Print;
- else if (scanCode == KEY_Break)
- scanCode = KEY_Pause;
-+ }
- #endif
-
- /*
-@@ -676,7 +680,7 @@
- }
- }
- #endif
--#if defined (__sparc__) && defined(__linux__)
-+#if defined(__sparc__) && (defined(__linux__) || defined(__FreeBSD__))
- special:
- if (kbdSun) {
- switch (scanCode) {
-@@ -710,7 +714,7 @@
- */
- scanCode--;
- }
--#endif /* defined (__sparc__) && defined(__linux__) */
-+#endif /* __sparc__ && (__linux__ || __FreeBSD__) */
-
- #ifdef XKB
- if ((xf86Info.ddxSpecialKeys == SKWhenNeeded &&
--- x11-servers/xorg-server/files/patch-mitri.c
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: render/mitri.c
-===================================================================
-RCS file: /cvs/xorg/xserver/xorg/render/mitri.c,v
-retrieving revision 1.5
-diff -u -r1.5 mitri.c
---- programs/Xserver/render/mitri.c 3 Jul 2005 07:02:08 -0000 1.5
-+++ programs/Xserver/render/mitri.c 18 Apr 2006 22:34:08 -0000
-@@ -145,7 +145,7 @@
- if (npoint < 3)
- return;
- ntri = npoint - 2;
-- tris = ALLOCATE_LOCAL (ntri & sizeof (xTriangle));
-+ tris = ALLOCATE_LOCAL (ntri * sizeof (xTriangle));
- if (!tris)
- return;
- for (tri = tris; npoint >= 3; npoint--, points++, tri++)
-@@ -177,7 +177,7 @@
- if (npoint < 3)
- return;
- ntri = npoint - 2;
-- tris = ALLOCATE_LOCAL (ntri & sizeof (xTriangle));
-+ tris = ALLOCATE_LOCAL (ntri * sizeof (xTriangle));
- if (!tris)
- return;
- first = points++;
--- x11-servers/xorg-server/files/patch-X11.tmpl
+++ /dev/null
@@ -1,79 +0,0 @@
---- X11.tmpl.orig Fri Sep 3 09:18:18 2004
-+++ config/cf/X11.tmpl Wed Dec 29 13:42:37 2004
-@@ -616,7 +616,7 @@
- #define BuildXft1Library BuildRenderLibrary
- #endif
- #ifndef UseFontconfig
--#define UseFontconfig BuildXftLibrary
-+#define UseFontconfig (BuildXftLibrary || BuildXft1Library)
- #endif
- #ifndef BuildFontconfigLibrary
- #define BuildFontconfigLibrary (UseFontconfig && !HasFontconfig)
-@@ -773,6 +773,9 @@
- #ifndef ThreadedProject
- #define ThreadedProject ThreadedX
- #endif
-+#ifndef BuildThreadStubLibrary
-+#define BuildThreadStubLibrary NO
-+#endif
- #ifndef NeedUIThrStubs
- #define NeedUIThrStubs NO
- #endif
-@@ -1606,7 +1609,7 @@
- #endif
-
- #ifndef PsWrap
--# ifndef UseInstalled
-+# if !defined(UseInstalled) && !defined(UseInstalledPrograms)
- # define PsWrap $(PSWRAPSRC)/pswrap
- # else
- # define PsWrap pswrap
-@@ -1683,7 +1686,7 @@
-
- INSTAPPFLAGS = $(INSTDATFLAGS) /* XXX - this should go away - XXX */
-
--#if UseInstalledX11
-+#if UseInstalledX11 || UseInstalledClients
- RGB = $(XBINDIR)/rgb
- FONTC = $(XBINDIR)/bdftopcf
- MKFONTSCALE = $(XBINDIR)/mkfontscale
-@@ -1843,6 +1846,39 @@
- DEPXLIBONLY = $(DEPXONLYLIB)
- XLIBONLY = $(XONLYLIB)
- LINTXONLYLIB = $(LINTXONLY)
-+
-+#if BuildThreadStubLibrary
-+#ifndef SharedLibXThrStub
-+#define SharedLibXThrStub YES
-+#endif
-+#ifndef NormalLibXThrStub
-+#define NormalLibXThrStub NO
-+#endif
-+#ifndef DebugLibXThrStub
-+#define DebugLibXThrStub NO
-+#endif
-+#ifndef ProfileLibXThrStub
-+#define ProfileLibXThrStub NO
-+#endif
-+ XTHRSTUBLIBSRC = $(LIBSRC)/XThrStub
-+#if SharedLibXThrStub
-+#ifndef SharedXThrStubRev
-+#define SharedXThrStubRev 6.1
-+#endif
-+SharedLibReferences(XTHRSTUB,XThrStub,$(XTHRSTUBLIBSRC),SOXTHRSTUBREV,SharedXThrStubRev)
-+#else
-+ProjectUnsharedLibReferences(XTHRSTUB,XThrStub,$(XTHRSTUBSRC),XBuildLibDir)
-+#endif
-+#else
-+#undef SharedLibXThrStub
-+#define SharedLibXThrStub NO
-+#undef NormalLibXThrStub
-+#define NormalLibXThrStub NO
-+#undef DebugLibXThrStub
-+#define DebugLibXThrStub NO
-+#undef ProfileLibXThrStub
-+#define ProfileLibXThrStub NO
-+#endif
-
- #if BuildScreenSaverLibrary
- #ifndef SharedLibXss
Index: patch-bsdResource.c
===================================================================
RCS file: /home/cvs/mports/x11-servers/xorg-server/files/patch-bsdResource.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -Lx11-servers/xorg-server/files/patch-bsdResource.c -Lx11-servers/xorg-server/files/patch-bsdResource.c -u -r1.1.1.1 -r1.2
--- x11-servers/xorg-server/files/patch-bsdResource.c
+++ x11-servers/xorg-server/files/patch-bsdResource.c
@@ -1,5 +1,5 @@
---- programs/Xserver/hw/xfree86/os-support/bsd/bsdResource.c.orig Fri Apr 23 21:54:07 2004
-+++ programs/Xserver/hw/xfree86/os-support/bsd/bsdResource.c Tue May 17 00:48:36 2005
+--- hw/xfree86/os-support/bsd/bsdResource.c.orig Fri Apr 23 21:54:07 2004
++++ hw/xfree86/os-support/bsd/bsdResource.c Tue May 17 00:48:36 2005
@@ -18,7 +18,7 @@
#ifdef INCLUDE_XF86_NO_DOMAIN
Index: patch-Xserver-hw-xfree86-os-support-bsd-i386_video.c
===================================================================
RCS file: /home/cvs/mports/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-i386_video.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -Lx11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-i386_video.c -Lx11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-i386_video.c -u -r1.1.1.1 -r1.2
--- x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-i386_video.c
+++ x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-i386_video.c
@@ -1,7 +1,7 @@
Index: programs/Xserver/hw/xfree86/os-support/bsd/i386_video.c
diff -u -p programs/Xserver/hw/xfree86/os-support/bsd/i386_video.c.orig programs/Xserver/hw/xfree86/os-support/bsd/i386_video.c
---- programs/Xserver/hw/xfree86/os-support/bsd/i386_video.c.orig Tue Oct 4 01:46:14 2005
-+++ programs/Xserver/hw/xfree86/os-support/bsd/i386_video.c Thu Jan 26 14:57:56 2006
+--- hw/xfree86/os-support/bsd/i386_video.c.orig Tue Oct 4 01:46:14 2005
++++ hw/xfree86/os-support/bsd/i386_video.c Thu Jan 26 14:57:56 2006
@@ -35,6 +35,7 @@
#include "xf86Priv.h"
--- x11-servers/xorg-server/files/patch-font-FreeType-ftsystem.c
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-bk,v 1.3 2006/06/01 22:44:09 tron Exp $
-
---- lib/font/FreeType/ftsystem.c.orig 2005-07-09 07:36:10.000000000 +0100
-+++ lib/font/FreeType/ftsystem.c 2006-06-01 23:21:53.000000000 +0100
-@@ -35,7 +35,6 @@
- #endif
- #include <ft2build.h>
- #include FT_CONFIG_CONFIG_H
--#include FT_INTERNAL_DEBUG_H
- #include FT_SYSTEM_H
- #include FT_ERRORS_H
- #include FT_TYPES_H
Index: patch-xorgconf.cpp
===================================================================
RCS file: /home/cvs/mports/x11-servers/xorg-server/files/patch-xorgconf.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -Lx11-servers/xorg-server/files/patch-xorgconf.cpp -Lx11-servers/xorg-server/files/patch-xorgconf.cpp -u -r1.1.1.1 -r1.2
--- x11-servers/xorg-server/files/patch-xorgconf.cpp
+++ x11-servers/xorg-server/files/patch-xorgconf.cpp
@@ -1,5 +1,5 @@
---- programs/Xserver/hw/xfree86/xorgconf.cpp.orig Fri Dec 31 14:40:27 2004
-+++ programs/Xserver/hw/xfree86/xorgconf.cpp Fri Dec 31 14:40:28 2004
+--- hw/xfree86/xorgconf.cpp.orig Fri Dec 31 14:40:27 2004
++++ hw/xfree86/xorgconf.cpp Fri Dec 31 14:40:28 2004
@@ -624,3 +624,11 @@
InputDevice "Keyboard1" "CoreKeyboard"
EndSection
Index: patch-Xserver-Xext-xvmc.c
===================================================================
RCS file: /home/cvs/mports/x11-servers/xorg-server/files/patch-Xserver-Xext-xvmc.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -Lx11-servers/xorg-server/files/patch-Xserver-Xext-xvmc.c -Lx11-servers/xorg-server/files/patch-Xserver-Xext-xvmc.c -u -r1.1.1.1 -r1.2
--- x11-servers/xorg-server/files/patch-Xserver-Xext-xvmc.c
+++ x11-servers/xorg-server/files/patch-Xserver-Xext-xvmc.c
@@ -1,7 +1,7 @@
Index: programs/Xserver/Xext/xvmc.c
diff -u -p programs/Xserver/Xext/xvmc.c.orig programs/Xserver/Xext/xvmc.c
---- programs/Xserver/Xext/xvmc.c.orig Sun Jul 3 17:53:36 2005
-+++ programs/Xserver/Xext/xvmc.c Thu Jan 26 14:22:20 2006
+--- Xext/xvmc.c.orig Sun Jul 3 17:53:36 2005
++++ Xext/xvmc.c Thu Jan 26 14:22:20 2006
@@ -24,8 +24,8 @@
#ifdef HAS_XVMCSHM
Index: patch-Xserver-os-xprintf.c
===================================================================
RCS file: /home/cvs/mports/x11-servers/xorg-server/files/patch-Xserver-os-xprintf.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -Lx11-servers/xorg-server/files/patch-Xserver-os-xprintf.c -Lx11-servers/xorg-server/files/patch-Xserver-os-xprintf.c -u -r1.1.1.1 -r1.2
--- x11-servers/xorg-server/files/patch-Xserver-os-xprintf.c
+++ x11-servers/xorg-server/files/patch-Xserver-os-xprintf.c
@@ -1,7 +1,6 @@
-Index: programs/Xserver/os/xprintf.c
diff -u -p programs/Xserver/os/xprintf.c.orig programs/Xserver/os/xprintf.c
---- programs/Xserver/os/xprintf.c.orig Sun Jul 3 17:53:52 2005
-+++ programs/Xserver/os/xprintf.c Thu Jan 26 12:47:37 2006
+--- os/xprintf.c.orig Sun Jul 3 17:53:52 2005
++++ os/xprintf.c Thu Jan 26 12:47:37 2006
@@ -39,7 +39,7 @@
# ifdef __va_copy
# define va_copy __va_copy
--- x11-servers/xorg-server/files/patch-xf86.tmpl
+++ /dev/null
@@ -1,12 +0,0 @@
---- config/cf/xf86.tmpl.orig Tue Dec 17 04:21:38 2002
-+++ config/cf/xf86.tmpl Thu Jan 2 14:10:44 2003
-@@ -19,6 +19,9 @@
- #ifdef UseInstalled
- IMAKE_CMD = $(IMAKE) -DUseInstalled -I$(TOP) -I$(IRULESRC) \
- $(IMAKE_DEFINES) $(IMAKE_WARNINGS)
-+#elif UseInstalledPrograms
-+ IMAKE_CMD = $(IMAKE) -I$(TOP) -I$(IRULESRC) \
-+ $(IMAKE_DEFINES) $(IMAKE_WARNINGS)
- #else
- IMAKE_CMD = $(IMAKE) -I$(TOP) -I$(IRULESRC) \
- $(IMAKE_DEFINES) $(IMAKE_WARNINGS)
--- x11-servers/xorg-server/files/patch-sunffb-nocfb
+++ /dev/null
@@ -1,101 +0,0 @@
---- programs/Xserver/hw/xfree86/drivers/sunffb/ffb_accel.c.orig Fri Mar 31 00:22:07 2006
-+++ programs/Xserver/hw/xfree86/drivers/sunffb/ffb_accel.c Fri Mar 31 00:35:35 2006
-@@ -43,8 +43,6 @@
- #include "ffb_rcache.h"
- #include "ffb_loops.h"
- #include "ffb_regs.h"
--#include "ffb_stip.h"
--#include "ffb_gc.h"
-
- int CreatorScreenPrivateIndex;
- int CreatorGCPrivateIndex;
---- programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dga.c.orig Fri Mar 31 00:22:07 2006
-+++ programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dga.c Fri Mar 31 00:36:08 2006
-@@ -36,7 +36,6 @@
- #include "ffb_regs.h"
- #include "ffb_rcache.h"
- #include "ffb_fifo.h"
--#include "ffb_stip.h"
- #include "ffb_loops.h"
-
- static Bool FFB_OpenFramebuffer(ScrnInfoPtr, char **, unsigned char **,
---- programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dri.c.orig Fri Mar 31 00:22:07 2006
-+++ programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dri.c Fri Mar 31 00:37:04 2006
-@@ -33,11 +33,6 @@
-
- #include "xf86PciInfo.h"
- #include "xf86Pci.h"
--#define PSZ 8
--#include "cfb.h"
--#undef PSZ
--#include "cfb16.h"
--#include "cfb32.h"
-
- #include "miline.h"
-
---- programs/Xserver/hw/xfree86/drivers/sunffb/Imakefile.orig Fri Mar 31 00:22:07 2006
-+++ programs/Xserver/hw/xfree86/drivers/sunffb/Imakefile Fri Mar 31 00:34:27 2006
-@@ -60,16 +60,10 @@
- #define FFBsObjectRule(name)
- #endif
-
--SRCS = ffb_driver.c ffb_accel.c ffb_attr.c ffb_stip.c ffb_bcopy.c \
-- ffb_cplane.c ffb_fspans.c ffb_point.c ffb_seg.c ffb_plygon.c \
-- ffb_line.c ffb_glyph.c ffb_frect.c ffb_circle.c ffb_checks.c \
-- ffb_stubs.c ffb_gc.c ffb_gspans.c ffb_sspans.c ffb_zeroarc.c \
-- ffb_cursor.c ffb_dga.c ffb_dac.c ffb_wid.c ffb_dbe.c $(DRISRCS)
--OBJS = ffb_driver.o ffb_accel.o ffb_attr.o ffb_stip.o ffb_bcopy.o \
-- ffb_cplane.o ffb_fspans.o ffb_point.o ffb_seg.o ffb_plygon.o \
-- ffb_line.o ffb_glyph.o ffb_frect.o ffb_circle.o ffb_checks.o \
-- ffb_stubs.o ffb_gc.o ffb_gspans.o ffb_sspans.o ffb_zeroarc.o \
-- ffb_cursor.o ffb_dga.o ffb_dac.o ffb_wid.o ffb_dbe.o $(VISOBJS) \
-+SRCS = ffb_driver.c ffb_accel.c ffb_attr.c \
-+ ffb_cursor.c ffb_dga.c ffb_dac.c ffb_wid.c $(DRISRCS)
-+OBJS = ffb_driver.o ffb_accel.o ffb_attr.o \
-+ ffb_cursor.o ffb_dga.o ffb_dac.o ffb_wid.o $(VISOBJS) \
- $(DRIOBJS)
-
- #if defined(XF86DriverSDK)
-@@ -107,28 +101,10 @@
- FFBCObjectRule(ffb_accel)
- FFBCObjectRule(ffb_driver)
- FFBCObjectRule(ffb_attr)
--FFBCObjectRule(ffb_stip)
--FFBCObjectRule(ffb_bcopy)
--FFBCObjectRule(ffb_cplane)
--FFBCObjectRule(ffb_fspans)
--FFBCObjectRule(ffb_point)
--FFBCObjectRule(ffb_seg)
--FFBCObjectRule(ffb_plygon)
--FFBCObjectRule(ffb_line)
--FFBCObjectRule(ffb_glyph)
--FFBCObjectRule(ffb_frect)
--FFBCObjectRule(ffb_circle)
--FFBCObjectRule(ffb_checks)
--FFBCObjectRule(ffb_stubs)
--FFBCObjectRule(ffb_gc)
--FFBCObjectRule(ffb_gspans)
--FFBCObjectRule(ffb_sspans)
--FFBCObjectRule(ffb_zeroarc)
- FFBCObjectRule(ffb_cursor)
- FFBCObjectRule(ffb_dga)
- FFBCObjectRule(ffb_dac)
- FFBCObjectRule(ffb_wid)
--FFBCObjectRule(ffb_dbe)
- FFBsObjectRule(VISmoveImage)
- FFBsObjectRule(ffb_asm)
- #if BuildXF86DRI
---- programs/Xserver/hw/xfree86/drivers/sunffb/ffb_driver.c.orig Wed Apr 19 13:13:47 2006
-+++ programs/Xserver/hw/xfree86/drivers/sunffb/ffb_driver.c Wed Apr 19 13:14:25 2006
-@@ -411,11 +411,6 @@
- xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Acceleration disabled\n");
- }
-
-- if (xf86LoadSubModule(pScrn, "xf8_32wid") == NULL) {
-- FFBFreeRec(pScrn);
-- return FALSE;
-- }
--
- if (xf86LoadSubModule(pScrn, "fb") == NULL) {
- FFBFreeRec(pScrn);
- return FALSE;
Index: patch-Xserver-hw-xfree86-common-xf86Config.c
===================================================================
RCS file: /home/cvs/mports/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-common-xf86Config.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -Lx11-servers/xorg-server/files/patch-Xserver-hw-xfree86-common-xf86Config.c -Lx11-servers/xorg-server/files/patch-Xserver-hw-xfree86-common-xf86Config.c -u -r1.1.1.1 -r1.2
--- x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-common-xf86Config.c
+++ x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-common-xf86Config.c
@@ -1,18 +1,11 @@
-Index: programs/Xserver/hw/xfree86/common/xf86Config.c
-diff -u -p programs/Xserver/hw/xfree86/common/xf86Config.c.orig programs/Xserver/hw/xfree86/common/xf86Config.c
---- programs/Xserver/hw/xfree86/common/xf86Config.c.orig Wed Dec 21 07:30:50 2005
-+++ programs/Xserver/hw/xfree86/common/xf86Config.c Thu Jan 26 15:10:39 2006
-@@ -505,8 +505,12 @@ GenerateDriverlist(char * dirname, char
- {
- #ifdef XFree86LOADER
- char **ret;
-- char *subdirs[] = { dirname, NULL };
-+ char *subdirs[2];
- static const char *patlist[] = {"(.*)_drv\\.so", "(.*)_drv\\.o", NULL};
-+
-+ subdirs[0] = dirname;
-+ subdirs[1] = NULL;
-+
- ret = LoaderListDirs(subdirs, patlist);
-
- /* fix up the probe order for video drivers */
+--- hw/xfree86/common/xf86Config.c.orig Fri Jun 23 12:32:32 2006
++++ hw/xfree86/common/xf86Config.c Fri Jun 23 12:32:46 2006
+@@ -1042,7 +1042,7 @@
+ else
+ xf86Info.estimateSizesAggressively = 0;
+
+- xf86Info.aiglx = TRUE;
++ xf86Info.aiglx = FALSE;
+ xf86Info.aiglxFrom = X_DEFAULT;
+ if (xf86GetOptValBool(FlagOptions, FLAG_AIGLX, &value)) {
+ xf86Info.aiglx = value;
--- x11-servers/xorg-server/files/patch-xf86sym.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- programs/Xserver/hw/xfree86/loader/xf86sym.c.orig Fri May 7 18:51:51 2004
-+++ programs/Xserver/hw/xfree86/loader/xf86sym.c Fri May 7 18:52:02 2004
-@@ -63,7 +63,6 @@
- #include "xf86.h"
- #include "xf86Resources.h"
- #include "xf86_OSproc.h"
--#include "xf86Parser.h"
- #include "xf86Config.h"
- #ifdef XINPUT
- # include "xf86Xinput.h"
--- x11-servers/xorg-server/files/patch-font-bitmap-pcfread.c
+++ /dev/null
@@ -1,101 +0,0 @@
---- lib/font/bitmap/pcfread.c.orig Sat Jul 9 08:36:12 2005
-+++ lib/font/bitmap/pcfread.c Thu Aug 24 21:56:56 2006
-@@ -45,6 +45,7 @@
- #endif
-
- #include <stdarg.h>
-+#include <stdint.h>
-
- void
- pcfError(const char* message, ...)
-@@ -133,6 +134,10 @@
- return (PCFTablePtr) NULL;
- count = pcfGetLSB32(file);
- if (IS_EOF(file)) return (PCFTablePtr) NULL;
-+ if (count < 0 || count > INT32_MAX / sizeof(PCFTableRec)) {
-+ pcfError("pcfReadTOC(): invalid file format\n");
-+ return NULL;
-+ }
- tables = (PCFTablePtr) xalloc(count * sizeof(PCFTableRec));
- if (!tables) {
- pcfError("pcfReadTOC(): Couldn't allocate tables (%d*%d)\n", count, sizeof(PCFTableRec));
-@@ -252,6 +257,10 @@
- if (!PCF_FORMAT_MATCH(format, PCF_DEFAULT_FORMAT))
- goto Bail;
- nprops = pcfGetINT32(file, format);
-+ if (nprops <= 0 || nprops > INT32_MAX / sizeof(FontPropRec)) {
-+ pcfError("pcfGetProperties(): invalid nprops value (%d)\n", nprops);
-+ goto Bail;
-+ }
- if (IS_EOF(file)) goto Bail;
- props = (FontPropPtr) xalloc(nprops * sizeof(FontPropRec));
- if (!props) {
-@@ -267,6 +276,13 @@
- props[i].name = pcfGetINT32(file, format);
- isStringProp[i] = pcfGetINT8(file, format);
- props[i].value = pcfGetINT32(file, format);
-+ if (props[i].name < 0
-+ || (isStringProp[i] != 0 && isStringProp[i] != 1)
-+ || (isStringProp[i] && props[i].value < 0)) {
-+ pcfError("pcfGetProperties(): invalid file format %d %d %d\n",
-+ props[i].name, isStringProp[i], props[i].value);
-+ goto Bail;
-+ }
- if (IS_EOF(file)) goto Bail;
- }
- /* pad the property array */
-@@ -282,6 +298,7 @@
- }
- if (IS_EOF(file)) goto Bail;
- string_size = pcfGetINT32(file, format);
-+ if (string_size < 0) goto Bail;
- if (IS_EOF(file)) goto Bail;
- strings = (char *) xalloc(string_size);
- if (!strings) {
-@@ -422,6 +439,10 @@
- else
- nmetrics = pcfGetINT16(file, format);
- if (IS_EOF(file)) goto Bail;
-+ if (nmetrics < 0 || nmetrics > INT32_MAX / sizeof(CharInfoRec)) {
-+ pcfError("pcfReadFont(): invalid file format\n");
-+ goto Bail;
-+ }
- metrics = (CharInfoPtr) xalloc(nmetrics * sizeof(CharInfoRec));
- if (!metrics) {
- pcfError("pcfReadFont(): Couldn't allocate metrics (%d*%d)\n", nmetrics, sizeof(CharInfoRec));
-@@ -447,7 +468,7 @@
- nbitmaps = pcfGetINT32(file, format);
- if (nbitmaps != nmetrics || IS_EOF(file))
- goto Bail;
--
-+ /* nmetrics is alreadt ok, so nbitmap also is */
- offsets = (CARD32 *) xalloc(nbitmaps * sizeof(CARD32));
- if (!offsets) {
- pcfError("pcfReadFont(): Couldn't allocate offsets (%d*%d)\n", nbitmaps, sizeof(CARD32));
-@@ -461,6 +482,7 @@
- for (i = 0; i < GLYPHPADOPTIONS; i++) {
- bitmapSizes[i] = pcfGetINT32(file, format);
- if (IS_EOF(file)) goto Bail;
-+ if (bitmapSizes[i] < 0) goto Bail;
- }
-
- sizebitmaps = bitmapSizes[PCF_GLYPH_PAD_INDEX(format)];
-@@ -536,6 +558,7 @@
- if (IS_EOF(file)) goto Bail;
- if (nink_metrics != nmetrics)
- goto Bail;
-+ /* nmetrics already checked */
- ink_metrics = (xCharInfo *) xalloc(nink_metrics * sizeof(xCharInfo));
- if (!ink_metrics) {
- pcfError("pcfReadFont(): Couldn't allocate ink_metrics (%d*%d)\n", nink_metrics, sizeof(xCharInfo));
-@@ -809,6 +832,10 @@
- else
- nmetrics = pcfGetINT16(file, format);
- if (IS_EOF(file)) goto Bail;
-+ if (nmetrics < 0 || nmetrics > INT32_MAX / sizeof(CharInfoRec)) {
-+ pcfError("pmfReadFont(): invalid file format\n");
-+ goto Bail;
-+ }
- metrics = (CharInfoPtr) xalloc(nmetrics * sizeof(CharInfoRec));
- if (!metrics) {
- pcfError("pmfReadFont(): Couldn't allocate metrics (%d*%d)\n", nmetrics, sizeof(CharInfoRec));
--- x11-servers/xorg-server/files/patch-Imake.tmpl
+++ /dev/null
@@ -1,75 +0,0 @@
---- config/cf/Imake.tmpl.orig Mon Dec 9 19:20:41 2002
-+++ config/cf/Imake.tmpl Thu Jan 2 14:34:20 2003
-@@ -237,7 +237,8 @@
-
- #ifndef RmanCmd
- #if BuildRman
--#ifdef UseInstalled /* assume BINDIR in path */
-+#if defined(UseInstalled) || defined(UseInstalledPrograms)
-+/* assume BINDIR in path */
- #define RmanCmd rman
- #else
- #define RmanCmd $(TOP)/config/util/rman
-@@ -1348,7 +1349,8 @@
- #define LoaderLibPrefix /**/
- #endif
- #ifndef ImakeCmd
--#ifdef UseInstalled /* assume BINDIR in path */
-+#if defined(UseInstalled) || defined(UseInstalledPrograms)
-+/* assume BINDIR in path */
- #define ImakeCmd imake
- #else
- #define ImakeCmd $(IMAKESRC)/imake
-@@ -1359,19 +1361,22 @@
- #endif
- #ifndef DependCmd
- #if UseGccMakeDepend
--#ifdef UseInstalled /* assume BINDIR in path */
-+#if defined(UseInstalled) || defined(UseInstalledPrograms)
-+/* assume BINDIR in path */
- #define DependCmd gccmakedep
- #else
- #define DependCmd $(DEPENDSRC)/gccmakedep
- #endif
- #elif UseCCMakeDepend
--#ifdef UseInstalled /* assume BINDIR in path */
-+#if defined(UseInstalled) || defined(UseInstalledPrograms)
-+/* assume BINDIR in path */
- #define DependCmd ccmakedep
- #else
- #define DependCmd $(DEPENDSRC)/ccmakedep
- #endif
- #else
--#ifdef UseInstalled /* assume BINDIR in path */
-+#if defined(UseInstalled) || defined(UseInstalledPrograms)
-+/* assume BINDIR in path */
- #define DependCmd makedepend
- #else
- #define DependCmd $(DEPENDSRC)/makedepend
-@@ -1398,21 +1403,23 @@
- #ifndef ExportListCmd
- # ifndef ExportListGenSource
- # define ExportListCmd /**/
--# elif !defined(UseInstalled)
-+# elif !defined(UseInstalled) && !defined(UseInstalledPrograms)
- # define ExportListCmd $(CONFIGSRC)/util/exportlistgen
- # else
- # define ExportListCmd exportlistgen
- # endif
- #endif
- #ifndef MkdirHierCmd
--#ifdef UseInstalled /* assume BINDIR in path */
-+#if defined(UseInstalled) || defined(UseInstalledPrograms)
-+/* assume BINDIR in path */
- #define MkdirHierCmd mkdirhier
- #else
- #define MkdirHierCmd $(SHELL) $(CONFIGSRC)/util/mkdirhier.sh
- #endif
- #endif
- #ifndef RevPathCmd
--#ifdef UseInstalled /* assume BINDIR in path */
-+#if defined(UseInstalled) || defined(UseInstalledPrograms)
-+/* assume BINDIR in path */
- #define RevPathCmd revpath
- #else
- #define RevPathCmd $(CONFIGSRC)/util/revpath
--- x11-servers/xorg-server/files/patch-font-FreeType-ftfuncs.c
+++ /dev/null
@@ -1,231 +0,0 @@
---- lib/font/FreeType/ftfuncs.c.orig 2005-10-23 19:32:05.000000000 +0100
-+++ lib/font/FreeType/ftfuncs.c 2006-06-01 23:21:34.000000000 +0100
-@@ -54,10 +54,7 @@
- #include FT_TYPE1_TABLES_H
- #include FT_XFREE86_H
- #include FT_BBOX_H
--#include FT_INTERNAL_TRUETYPE_TYPES_H
- #include FT_TRUETYPE_TAGS_H
--#include FT_INTERNAL_SFNT_H
--#include FT_INTERNAL_STREAM_H
- /*
- * If you want to use FT_Outline_Get_CBox instead of
- * FT_Outline_Get_BBox, define here.
-@@ -123,6 +120,46 @@
- };
-
-
-+/* read 2-byte value from a SFNT table */
-+static FT_UShort
-+sfnt_get_ushort( FT_Face face,
-+ FT_ULong table_tag,
-+ FT_ULong table_offset )
-+{
-+ FT_Byte buff[2];
-+ FT_ULong len = sizeof(buff);
-+ FT_UShort result = 0;
-+
-+ if ( !FT_Load_Sfnt_Table( face, table_tag, table_offset, buff, &len ) );
-+ result = (FT_UShort)( (buff[0] << 8) | buff[1] );
-+
-+ return result;
-+}
-+
-+#define sfnt_get_short(f,t,o) ((FT_Short)sfnt_get_ushort((f),(t),(o)))
-+
-+
-+#if 0
-+static FT_ULong
-+sfnt_get_ulong( FT_Face face,
-+ FT_ULong table_tag,
-+ FT_ULong table_offset )
-+{
-+ FT_Byte buff[4];
-+ FT_ULong len = sizeof(buff);
-+ FT_UShort result = 0;
-+
-+ if ( !FT_Load_Sfnt_Table( face, table_tag, table_offset, buff, &len );
-+ result = ((FT_ULong)buff[0] << 24) | ((FT_ULong)buff[1] << 16) |
-+ ((FT_ULong)buff[2] << 8) | (FT_ULong)buff[3];
-+
-+ return result;
-+}
-+#endif
-+
-+
-+
-+
- static int ftypeInitP = 0; /* is the engine initialised? */
- FT_Library ftypeLibrary;
-
-@@ -211,6 +248,10 @@
- if(maxp && maxp->maxContours == 0)
- face->bitmap = 1;
- }
-+
-+ face->num_hmetrics = (FT_UInt) sfnt_get_ushort( face->face,
-+ TTAG_hhea, 34 );
-+
- /* Insert face in hashtable and return it */
- face->next = faceTable[bucket];
- faceTable[bucket] = face;
-@@ -462,6 +503,29 @@
- }
-
- if( FT_IS_SFNT( face->face ) ) {
-+#if 1
-+ FT_F26Dot6 tt_char_width, tt_char_height, tt_dim_x, tt_dim_y;
-+ FT_UInt nn;
-+
-+ instance->strike_index=0xFFFFU;
-+
-+ tt_char_width = (int)(trans->scale*(1<<6) + 0.5);
-+ tt_char_height = (int)(trans->scale*(1<<6) + 0.5);
-+
-+ tt_dim_x = ( ( tt_char_width * trans->xres + (36+32*72) ) / 72 ) & -64;
-+ tt_dim_y = ( ( tt_char_height * trans->yres + (36+32*72) ) / 72 ) & -64;
-+
-+ for ( nn = 0; nn < face->face->num_fixed_sizes; nn++ )
-+ {
-+ FT_Bitmap_Size* sz = &face->face->available_sizes[nn];
-+
-+ if ( tt_dim_x == sz->x_ppem && tt_dim_y == sz->y_ppem )
-+ {
-+ instance->strike_index = nn;
-+ break;
-+ }
-+ }
-+#else
- /* See Set_Char_Sizes() in ttdriver.c */
- FT_Error err;
- TT_Face tt_face;
-@@ -486,6 +550,7 @@
- sfnt = (SFNT_Service)tt_face->sfnt;
- err = sfnt->set_sbit_strike(tt_face,tt_x_ppem,tt_y_ppem,&instance->strike_index);
- if ( err ) instance->strike_index=0xFFFFU;
-+#endif
- }
-
- /* maintain a linked list of instances */
-@@ -803,31 +868,36 @@
- * parse the htmx field in TrueType font.
- */
-
--/* from src/truetype/ttgload.c */
- static void
--tt_get_metrics( TT_HoriHeader* header,
-+tt_get_metrics( FT_Face face,
- FT_UInt idx,
-+ FT_UInt num_hmetrics,
- FT_Short* bearing,
- FT_UShort* advance )
--/* Copyright 1996-2001, 2002 by */
--/* David Turner, Robert Wilhelm, and Werner Lemberg. */
- {
-- TT_LongMetrics longs_m;
-- FT_UShort k = header->number_Of_HMetrics;
-+ /* read the metrics directly from the horizontal header, we
-+ * parse the SFNT table directly through the standard FreeType API.
-+ * this works with any version of the library and doesn't need to
-+ * peek at its internals. Maybe a bit less
-+ */
-+ FT_UInt count = num_hmetrics;
-
-- if ( k == 0 ) {
-- *bearing = *advance = 0;
-- return;
-+ if ( count == 0 )
-+ {
-+ *advance = 0;
-+ *bearing = 0;
- }
-+ else if ( idx < count )
-+ {
-+ FT_ULong offset = idx*4;
-
-- if ( idx < (FT_UInt)k ) {
-- longs_m = (TT_LongMetrics )header->long_metrics + idx;
-- *bearing = longs_m->bearing;
-- *advance = longs_m->advance;
-+ *advance = sfnt_get_ushort( face, TTAG_hmtx, offset );
-+ *bearing = sfnt_get_short ( face, TTAG_hmtx, offset+2 );
- }
-- else {
-- *bearing = ((TT_ShortMetrics*)header->short_metrics)[idx - k];
-- *advance = ((TT_LongMetrics )header->long_metrics)[k - 1].advance;
-+ else
-+ {
-+ *advance = sfnt_get_ushort( face, TTAG_hmtx, (count-1)*4 );
-+ *bearing = sfnt_get_short ( face, TTAG_hmtx, (count+idx)*2 );
- }
- }
-
-@@ -835,6 +905,7 @@
- ft_get_very_lazy_bbox( FT_UInt index,
- FT_Face face,
- FT_Size size,
-+ FT_UInt num_hmetrics,
- double slant,
- FT_Matrix *matrix,
- FT_BBox *bbox,
-@@ -842,14 +913,13 @@
- FT_Long *vertAdvance)
- {
- if ( FT_IS_SFNT( face ) ) {
-- TT_Face ttface = (TT_Face)face;
- FT_Size_Metrics *smetrics = &size->metrics;
- FT_Short leftBearing = 0;
- FT_UShort advance = 0;
- FT_Vector p0, p1, p2, p3;
-
- /* horizontal */
-- tt_get_metrics(&ttface->horizontal, index,
-+ tt_get_metrics( face, num_hmetrics, index,
- &leftBearing, &advance);
-
- #if 0
-@@ -910,7 +980,27 @@
- FT_UShort glyph_index, FT_Glyph_Metrics *metrics_return,
- int *sbitchk_incomplete_but_exist )
- {
--#if (FREETYPE_VERSION >= 2001008)
-+#if 1
-+ if ( strike_index != 0xFFFFU && ft_face->available_sizes != 0)
-+ {
-+ FT_Error error;
-+ FT_Bitmap_Size* sz = &ft_face->available_sizes[strike_index];
-+
-+ error = FT_Set_Pixel_Sizes( ft_face, sz->x_ppem/64, sz->y_ppem/64 );
-+ if ( !error )
-+ {
-+ error = FT_Load_Glyph( ft_face, glyph_index, FT_LOAD_SBITS_ONLY );
-+ if ( !error )
-+ {
-+ if ( metrics_return != NULL )
-+ *metrics_return = ft_face->glyph->metrics;
-+
-+ return 0;
-+ }
-+ }
-+ }
-+ return -1;
-+#elif (FREETYPE_VERSION >= 2001008)
- SFNT_Service sfnt;
- TT_Face face;
- FT_Error error;
-@@ -1043,6 +1133,7 @@
- if( bitmap_metrics == NULL ) {
- if ( sbitchk_incomplete_but_exist==0 && (instance->ttcap.flags & TTCAP_IS_VERY_LAZY) ) {
- if( ft_get_very_lazy_bbox( idx, face->face, instance->size,
-+ face->num_hmetrics,
- instance->ttcap.vl_slant,
- &instance->transformation.matrix,
- &bbox, &outline_hori_advance,
-@@ -1221,6 +1312,7 @@
- if( is_outline == 1 ){
- if( correct ){
- if( ft_get_very_lazy_bbox( idx, face->face, instance->size,
-+ face->num_hmetrics,
- instance->ttcap.vl_slant,
- &instance->transformation.matrix,
- &bbox, &outline_hori_advance,
--- x11-servers/xorg-server/files/patch-Library.tmpl
+++ /dev/null
@@ -1,21 +0,0 @@
---- config/cf/Library.tmpl.orig Mon May 24 12:06:57 2004
-+++ config/cf/Library.tmpl Fri Sep 10 21:46:00 2004
-@@ -389,7 +389,7 @@
- */
-
- #ifndef MakeStringsDependency
--# ifndef UseInstalled
-+# if !defined(UseInstalled) && !defined(UseInstalledPrograms)
- # define MakeStringsDependency @@\
- MAKESTRS = $(CONFIGSRC)/util/makestrs @@\
- NoCmpScript(HostProgramTargetName($(MAKESTRS)) $(MAKESTRS).Osuf) @@\
-@@ -399,7 +399,8 @@
- @@\
- includes:: HostProgramTargetName($(MAKESTRS))
- # else
--# define MakeStringsDependency /**/
-+# define MakeStringsDependency @@\
-+MAKESTRS = makestrs
- # endif
- #endif
-
--- x11-servers/xorg-server/files/patch-xf86cfg-Imakefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- programs/Xserver/hw/xfree86/xf86cfg/Imakefile.orig Sat Sep 11 15:11:04 2004
-+++ programs/Xserver/hw/xfree86/xf86cfg/Imakefile Sat Sep 11 15:11:07 2004
-@@ -25,6 +25,8 @@
- SNPRINTFOBJS = snprintf.o
- #endif
-
-+XAWLIB = -lXaw
-+
- SRCS =\
- accessx.c\
- card-cfg.c\
--- x11-servers/xorg-server/files/patch-font-FreeType-ftfuncs.h
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-bj,v 1.3 2006/06/01 22:44:09 tron Exp $
-
---- lib/font/FreeType/ftfuncs.h.orig 2005-07-07 15:59:47.000000000 +0100
-+++ lib/font/FreeType/ftfuncs.h 2006-06-01 23:21:39.000000000 +0100
-@@ -47,6 +47,7 @@
- char *filename;
- FT_Face face;
- int bitmap;
-+ FT_UInt num_hmetrics;
- struct _FTInstance *instances;
- struct _FTInstance *active_instance;
- struct _FTFace *next; /* link to next face in bucket */
--- x11-servers/xorg-server/files/patch-Xserver-Imakefile
+++ /dev/null
@@ -1,8 +0,0 @@
---- programs/Xserver/Imakefile.orig Sat May 29 14:12:45 2004
-+++ programs/Xserver/Imakefile Sat May 29 14:12:16 2004
-@@ -1095,5 +1095,3 @@
-
- DEFAULTFONTPATH = DefaultFontPath
- EXTRAMANDEFS = -D__default_font_path__="`echo $(DEFAULTFONTPATH) | sed -e 's/,/, /g'`"
--
--InstallManPage(Xserver,$(MANDIR))
--- x11-servers/xorg-server/files/patch-FreeBSD.cf
+++ /dev/null
@@ -1,323 +0,0 @@
---- config/cf/FreeBSD.cf.orig Tue May 3 21:14:57 2005
-+++ config/cf/FreeBSD.cf Sat Sep 16 21:05:54 2006
-@@ -47,19 +47,11 @@
- #define HasNdbm YES
- #define HasPutenv YES
- #define HasSnprintf YES
--#if OSMajorVersion == 3 && OSMinorVersion >= 3 || OSMajorVersion > 3
--# define HasStrlcat YES
--#endif
--#if OSMajorVersion == 4 && OSMinorVersion >= 2 || OSMajorVersion > 4
--# define HasBasename YES
--#else
--# define HasBasename NO
--#endif
-+#define HasStrlcat YES
-+#define HasBasename YES
- #define HasBSD44Sockets YES
- #define HasDlopen YES
--#if ((OSRelVersion >= 410002) && OSRelVersion < 500000) || (OSRelVersion >= 500012)
- #define HasSetProcTitle YES
--#endif
- #ifndef HasLibCrypt
- # define HasLibCrypt YES
- #endif
-@@ -78,25 +70,13 @@
- #define HasIssetugid YES
- #define HasPoll YES
- #endif
-+#define BuildHtmlManPages NO
-
--#if OSMajorVersion >= 4
- #define HasGetIfAddrs YES
--#endif
--
--/* All versions define AF_INET6. 3.x and earlier don't have IPv6 support. */
--#if OSMajorVersion < 4
--#ifndef BuildIPv6
--#define BuildIPv6 NO
--#endif
--#endif
-
- #define IPv6SocketsAlsoIPv4 NO
-
--#if (OSMajorVersion > 1)
- #define InstallXloadSetGID NO
--#else
--#define InstallXloadSetGID YES
--#endif
-
- #define HasWeakSymbols UseElfFormat
-
-@@ -104,33 +84,13 @@
- * Multi-thread safe libs
- */
- /* 2.2.7 and later has libc_r (POSIX threads) */
--#if OSMajorVersion == 2 && OSMinorVersion == 2 && OSTeenyVersion >= 7 || \
-- OSMajorVersion >= 3
--# define HasPosixThreads YES
--# define ThreadedX YES
--# define HasThreadSafeAPI YES
--# if OSRelVersion < 501000
--# define MTSafeAPIDefines -DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI
--# else
--# define MTSafeAPIDefines -DXUSE_MTSAFE_API
--# endif
--# if (OSRelVersion < 500043)
--# define NeedUIThrStubs YES
--# endif
--# if (OSRelVersion >= 502102)
--# define ThreadsLibraries -lpthread
--# elif (OSRelVersion >= 500016)
--# define ThreadsLibraries -lc_r
--# else
--# define ThreadsLibraries -pthread
--# endif
--# define SystemMTDefines -D_THREAD_SAFE
--#endif
--
--/* This fixes linking C programs against libGLU on FreeBSD 3.x */
--#if (OSMajorVersion == 3)
--#define SharedGLUReqs $(LDPRELIB) $(XLIB) $(GLXLIB) -lstdc++ -lgcc
--#endif
-+#define HasPosixThreads YES
-+#define ThreadedX YES
-+#define HasThreadSafeAPI YES
-+#define MTSafeAPIDefines -DXUSE_MTSAFE_API
-+#define BuildThreadStubLibrary NO
-+#define ThreadsLibraries FreeBSDPTHREAD_LIBS
-+#define SystemMTDefines FreeBSDPTHREAD_CFLAGS
-
- #define AvoidNullMakeCommand YES
- #define StripInstalledPrograms YES
-@@ -154,30 +114,20 @@
- #define HasFlex YES
- #endif
-
--#ifndef HasMktemp
--#if (OSMajorVersion >= 4) || (OSMajorVersion == 3 && OSMinorVersion >= 1) || \
-- (OSMajorVersion == 2 && OSMinorVersion == 2 && OSTeenyVersion >= 7)
- #define HasMktemp YES
--#else
--#define HasMktemp NO
--#endif
--#endif
-
- /*
- * 2.2.x has perl 4 by default, not perl 5.
- */
--#if (OSMajorVersion <= 2)
--#ifndef HasPerl5
--#define HasPerl5 NO
--#endif
--#endif
-
--#ifndef CcCmd
--#define CcCmd cc
--#endif
--#ifndef CplusplusCmd
--#define CplusplusCmd c++
-+#if BuildThreadStubLibrary && (!defined(UseInstalledX11) || !UseInstalledX11)
-+#define CcCmd $(CLIENTENVSETUP) FreeBSDCC
-+#define CplusplusCmd $(CLIENTENVSETUP) FreeBSDCXX
-+#else
-+#define CcCmd FreeBSDCC
-+#define CplusplusCmd FreeBSDCXX
- #endif
-+
- #define CppCmd /usr/bin/cpp
- #define PreProcessCmd CppCmd
- #define StandardCppOptions -traditional
-@@ -195,63 +145,31 @@
- GccWarningOptions
- #endif
- #endif
--#ifndef ExtraLibraries
- /* support for multi-byte locales is in libxpg4 rather than libc */
--#if (OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 2)) && \
-- !(OSMajorVersion == 4 && OSRelVersion >= 400020) && \
-- !(OSRelVersion >= 500005)
--#define ExtraLibraries -lxpg4
--#else
- #define ExtraLibraries /**/
--#endif
--#endif
--#ifndef UseGnuMalloc
--/* 2.2 doesn't really have GnuMalloc */
--#if OSMajorVersion < 2 || (OSMajorVersion == 2 && OSMinorVersion < 2)
--#define UseGnuMalloc YES
--#else
--#define UseGnuMalloc NO
--#endif
--#endif
- /* 2.2.2 and later has setusercontext() */
--#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 2) || \
-- (OSMajorVersion == 2 && OSMinorVersion == 2 && OSTeenyVersion >= 2)
- #define HasSetUserContext YES
--#endif
-
--#if OSMajorVersion >= 5 || (OSMajorVersion == 4 && OSMinorVersion >= 6)
- #define HasGetpeereid YES
--#endif
-
- /* 3.3(?) and later has support for setting MTRRs */
--#ifndef HasMTRRSupport
--#if OSMajorVersion > 3 || (OSMajorVersion == 3 && OSMinorVersion >= 3)
- #define HasMTRRSupport YES
--#else
--#define HasMTRRSupport NO
--#endif
--#endif
-
- /*
- * Drivers that don't need AGP can work with 4.0, but we don't have a
- * mechanism for specifying a subset of drivers in the OS.cf files yet.
- */
--#ifndef BuildXF86DRI
--#if OSMajorVersion >= 5 || (OSMajorVersion == 4 && OSMinorVersion >= 1)
- #define BuildXF86DRI YES
--#endif
--#endif
-
- /*
- * 4.1/i386 and 5.0/i386,alpha,ia64,amd64 have the AGP driver.
- */
- #ifndef HasAgpGart
--#if defined(i386Architecture) && \
-- (OSMajorVersion >= 5 || (OSMajorVersion == 4 && OSMinorVersion >= 1))
-+#if defined(i386Architecture)
- #define HasAgpGart YES
- #endif
- #if (defined(AlphaArchitecture) || defined(ia64Architecture) || \
-- defined(AMD64Architecture)) && (OSMajorVersion >= 5)
-+ defined(AMD64Architecture))
- #define HasAgpGart YES
- #endif
- #endif
-@@ -260,17 +178,11 @@
- * SSE and 3DNow will be autodetected, so binutils is the only
- * requirement for enabling this. By 4.2 they were all supported.
- */
--#if defined(AMD64Architecture) || defined(i386Architecture) && \
-- (OSMajorVersion >= 5 || (OSMajorVersion == 4 && OSMinorVersion >= 2))
-+#if defined(AMD64Architecture) || defined(i386Architecture)
- # define HasX86Support YES
- # define HasMMXSupport YES
- # define Has3DNowSupport YES
- # define HasSSESupport YES
--#else
--# define HasX86Support NO
--# define HasMMXSupport NO
--# define Has3DNowSupport NO
--# define HasSSESupport NO
- #endif
-
- /*
-@@ -311,8 +223,6 @@
- # define UseRpath YES
- #endif
-
--#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 2)
--
- # ifndef RpathLoadFlags
- # if UseRpath
- # if UseElfFormat
-@@ -333,12 +243,10 @@
- # endif
- # endif
-
--#endif
--
- #ifndef LibraryRpathLoadFlags
- # if UseRpath
- # if UseElfFormat
--# define LibraryRpathLoadFlags -rpath $(USRLIBDIRPATH)
-+# define LibraryRpathLoadFlags -Wl,-rpath $(USRLIBDIRPATH)
- # else
- # define LibraryRpathLoadFlags -R $(USRLIBDIRPATH)
- # endif
-@@ -359,20 +267,10 @@
- #define GnuMallocLibrary -lgnumalloc
- #endif
-
--#if (OSMajorVersion > 2) || (OSMajorVersion == 2 && OSMinorVersion >= 2) \
-- || (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 6)
--/* 2.1.6 and 2.2 have libz */
--#ifndef HasZlib
- #define HasZlib YES
--#endif
--#endif
-
- /* PAM appeared in FreeBSD 3.1 */
--#if (OSMajorVersion > 3) || (OSMajorVersion == 3 && OSMinorVersion >=1 )
--#ifndef HasPam
- #define HasPam YES
--#endif
--#endif
-
- /* There are two options for building. One is to assume that the system has
- * many of the dependencies provided by the ports tree. The other is to just
-@@ -446,10 +344,11 @@
- #ifdef PpcArchitecture
- #define XF86INT10_BUILD X86INT10_STUB
- #endif
--
-+#ifdef PpcArchitecture
-+#define XF86INT10_BUILD X86INT10_STUB
-+#endif
- #define StandardDefines -DCSRG_BASED
-
--#if OSMajorVersion > 1
- #define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
- #define XawI18nDefines -DUSE_XWCHAR_STRING
- #define HasMakefileSafeInclude YES
-@@ -462,23 +361,9 @@
- #define ForceNormalLib YES
- #endif
- #define HasMkstemp YES
--#else
--#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DXNO_SYSCONF
--#define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC
--#endif
-
--/* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */
--#ifndef DefaultGcc2i386Opt
--#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 1) || (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 5)
--#define DefaultGcc2i386Opt -O2 GccAliasingArgs
--#endif
--#endif
--
--#ifdef i386Architecture
--# define OptimizedCDebugFlags DefaultGcc2i386Opt
--#else
--# define OptimizedCDebugFlags -O
--#endif
-+#define DefaultGcc2i386Opt
-+#define OptimizedCDebugFlags FreeBSDCFLAGS
-
- #ifndef PreIncDir
- # define PreIncDir /usr/include
-@@ -507,9 +392,7 @@
- # define CompressManPages YES
- #endif
-
--#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 1)
- #define HasBsdMake YES
--#endif
-
- #ifndef StaticLibrary
- #define StaticLibrary(libpath,libname) -Wl,-Bstatic Concat(-L,libpath) Concat(-l,libname) -Wl,-Bdynamic
-@@ -561,13 +444,9 @@
-
- #ifndef HasCookieMaker
- /* Which versions have /dev/urandom? */
--#if OSMajorVersion >= 4
- #define HasCookieMaker YES
- #define MkCookieCmd \
- 'dd if=/dev/urandom bs=16 count=1 2>/dev/null | hexdump -e \\"%08x\\"'
--#else
--#define HasCookieMaker NO
--#endif
- #endif
-
- /*
--- x11-servers/xorg-server/files/patch-CVE-2006-0745
+++ /dev/null
@@ -1,20 +0,0 @@
---- programs/Xserver/hw/xfree86/common/xf86Init.c.orig 2006-03-17 23:30:10.000000000 +0200
-+++ programs/Xserver/hw/xfree86/common/xf86Init.c 2006-03-17 23:29:35.000000000 +0200
-@@ -1376,7 +1376,7 @@
- }
-
- /* First the options that are only allowed for root */
-- if (getuid() == 0 || geteuid != 0)
-+ if (getuid() == 0 || geteuid() != 0)
- {
- if (!strcmp(argv[i], "-modulepath"))
- {
-@@ -1679,7 +1679,7 @@
- }
- if (!strcmp(argv[i], "-configure"))
- {
-- if (getuid() != 0 && geteuid == 0) {
-+ if (getuid() != 0 && geteuid() == 0) {
- ErrorF("The '-configure' option can only be used by root.\n");
- exit(1);
- }
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/x11-servers/xorg-server/pkg-plist,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -Lx11-servers/xorg-server/pkg-plist -Lx11-servers/xorg-server/pkg-plist -u -r1.1.1.1 -r1.2
--- x11-servers/xorg-server/pkg-plist
+++ x11-servers/xorg-server/pkg-plist
@@ -1,207 +1,270 @@
bin/X
bin/Xorg
-bin/getconfig
-bin/getconfig.pl
+bin/cvt
bin/gtf
-%%SPARC64_NA%%%%PPC_NA%%bin/inb
-%%SPARC64_NA%%%%PPC_NA%%bin/inl
-%%SPARC64_NA%%%%PPC_NA%%bin/inw
-%%SPARC64_NA%%%%PPC_NA%%bin/ioport
-bin/kbd_mode
-bin/mmapr
-bin/mmapw
-%%SPARC64_NA%%%%PPC_NA%%bin/outb
-%%SPARC64_NA%%%%PPC_NA%%bin/outl
-%%SPARC64_NA%%%%PPC_NA%%bin/outw
+%%SPARC64_NA%%bin/inb
+%%SPARC64_NA%%bin/inl
+%%SPARC64_NA%%bin/inw
+%%SPARC64_NA%%bin/ioport
+%%SPARC64_NA%%bin/outb
+%%SPARC64_NA%%bin/outl
+%%SPARC64_NA%%bin/outw
bin/pcitweak
-%%I386%%bin/scanpci
-bin/xorgcfg
+%%AMD64_I386%%bin/scanpci
bin/xorgconfig
-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
+include/xorg/BT.h
+include/xorg/IBM.h
+include/xorg/TI.h
+include/xorg/XIstubs.h
+include/xorg/afb.h
+include/xorg/assyntax.h
+include/xorg/atKeynames.h
+include/xorg/bstore.h
+include/xorg/bstorestr.h
+include/xorg/bt829.h
+include/xorg/cfb.h
+include/xorg/cfb16.h
+include/xorg/cfb32.h
+include/xorg/cfb8_16.h
+include/xorg/cfb8_32.h
+include/xorg/cfbmap.h
+include/xorg/cfbmskbits.h
+include/xorg/cfbunmap.h
+include/xorg/closestr.h
+include/xorg/closure.h
+include/xorg/colormap.h
+include/xorg/colormapst.h
+include/xorg/compiler.h
+include/xorg/cursor.h
+include/xorg/cursorstr.h
+include/xorg/damage.h
+include/xorg/damagestr.h
+include/xorg/dbestruct.h
+include/xorg/dgaproc.h
+include/xorg/dix.h
+include/xorg/dixevents.h
+include/xorg/dixfont.h
+include/xorg/dixfontstr.h
+include/xorg/dixgrabs.h
+include/xorg/dixstruct.h
+include/xorg/dri.h
+include/xorg/dristruct.h
+include/xorg/edid.h
+include/xorg/exa.h
+include/xorg/exevents.h
+include/xorg/extension.h
+include/xorg/extinit.h
+include/xorg/extnsionst.h
+include/xorg/fb.h
+include/xorg/fbdevhw.h
+include/xorg/fboverlay.h
+include/xorg/fbpseudocolor.h
+include/xorg/fbrop.h
+include/xorg/fi1236.h
+include/xorg/fourcc.h
+include/xorg/gc.h
+include/xorg/gcstruct.h
+include/xorg/globals.h
+include/xorg/glyphstr.h
+include/xorg/hotplug.h
+include/xorg/i2c_def.h
+include/xorg/input.h
+include/xorg/inputstr.h
+include/xorg/mfb.h
+include/xorg/mfbmap.h
+include/xorg/mfbunmap.h
+include/xorg/mi.h
+include/xorg/mibank.h
+include/xorg/mibstore.h
+include/xorg/micmap.h
+include/xorg/micoord.h
+include/xorg/mifillarc.h
+include/xorg/mifpoly.h
+include/xorg/migc.h
+include/xorg/miline.h
+include/xorg/mipict.h
+include/xorg/mipointer.h
+include/xorg/mipointrst.h
+include/xorg/misc.h
+include/xorg/miscstruct.h
+include/xorg/mispans.h
+include/xorg/mistruct.h
+include/xorg/miwideline.h
+include/xorg/mizerarc.h
+include/xorg/msp3430.h
+include/xorg/opaque.h
+include/xorg/os.h
+include/xorg/picture.h
+include/xorg/picturestr.h
+include/xorg/pixmap.h
+include/xorg/pixmapstr.h
+include/xorg/property.h
+include/xorg/propertyst.h
+include/xorg/randrstr.h
+include/xorg/region.h
+include/xorg/regionstr.h
+include/xorg/renderedge.h
+include/xorg/resource.h
+include/xorg/rgb.h
+include/xorg/sarea.h
+include/xorg/screenint.h
+include/xorg/scrnintstr.h
+include/xorg/selection.h
+include/xorg/servermd.h
+include/xorg/shadow.h
+include/xorg/shadowfb.h
+include/xorg/site.h
+include/xorg/swaprep.h
+include/xorg/swapreq.h
+include/xorg/tda8425.h
+include/xorg/tda9850.h
+include/xorg/tda9885.h
+include/xorg/uda1380.h
+include/xorg/validate.h
+include/xorg/vbe.h
+include/xorg/vbeModes.h
+include/xorg/vgaHW.h
+include/xorg/wfbrename.h
+include/xorg/window.h
+include/xorg/windowstr.h
+include/xorg/xaa.h
+include/xorg/xaaWrapper.h
+include/xorg/xaalocal.h
+include/xorg/xaarop.h
+include/xorg/xf1bpp.h
+include/xorg/xf4bpp.h
+include/xorg/xf86.h
+include/xorg/xf86Crtc.h
+include/xorg/xf86Cursor.h
+include/xorg/xf86DDC.h
+include/xorg/xf86Modes.h
+include/xorg/xf86Module.h
+include/xorg/xf86OSmouse.h
+include/xorg/xf86Opt.h
+include/xorg/xf86Optrec.h
+include/xorg/xf86Parser.h
+include/xorg/xf86Pci.h
+include/xorg/xf86PciInfo.h
+include/xorg/xf86Priv.h
+include/xorg/xf86Privstr.h
+include/xorg/xf86RAC.h
+include/xorg/xf86RandR12.h
+include/xorg/xf86RamDac.h
+include/xorg/xf86Rename.h
+include/xorg/xf86Resources.h
+include/xorg/xf86Version.h
+include/xorg/xf86Xinput.h
+include/xorg/xf86_OSlib.h
+include/xorg/xf86_OSproc.h
+include/xorg/xf86_ansic.h
+include/xorg/xf86_libc.h
+include/xorg/xf86cmap.h
+include/xorg/xf86fbman.h
+include/xorg/xf86i2c.h
+include/xorg/xf86int10.h
+include/xorg/xf86sbusBus.h
+include/xorg/xf86str.h
+include/xorg/xf86xv.h
+include/xorg/xf86xvmc.h
+include/xorg/xf86xvpriv.h
+include/xorg/xisb.h
+include/xorg/xkbsrv.h
+include/xorg/xorg-server.h
+include/xorg/xorgVersion.h
+include/xorg/xvdix.h
+include/xorg/xvmcext.h
lib/X11/Cards
lib/X11/Options
-lib/X11/app-defaults/XOrgCfg
-lib/X11/doc/BUILD
-lib/X11/doc/BugReport
-lib/X11/doc/DESIGN
-lib/X11/doc/Install
-lib/X11/doc/LICENSE
-lib/X11/doc/OS2.Notes
-lib/X11/doc/README
-lib/X11/doc/README.DECtga
-lib/X11/doc/README.Darwin
-lib/X11/doc/README.I128
-lib/X11/doc/README.LynxOS
-lib/X11/doc/README.NetBSD
-lib/X11/doc/README.OpenBSD
-lib/X11/doc/README.SCO
-lib/X11/doc/README.SiS
-lib/X11/doc/README.Solaris
-lib/X11/doc/README.XKB-Config
-lib/X11/doc/README.XKB-Enhancing
-lib/X11/doc/README.apm
-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
-lib/X11/etc/Xinstall.sh
-lib/X11/etc/xmodmap.std
-lib/X11/getconfig/cfg.sample
-lib/X11/getconfig/xorg.cfg
-lib/X11/xorg.conf.eg
-lib/X11/xserver/SecurityPolicy
-%%AMD64_I386%%lib/modules/drivers/apm_drv.so
-%%AMD64_I386%%lib/modules/drivers/ark_drv.so
-lib/modules/drivers/ati_drv.so
-lib/modules/drivers/atimisc_drv.so
-%%AMD64_I386%%lib/modules/drivers/chips_drv.so
-%%SPARC64_NA%%%%PPC_NA%%lib/modules/drivers/cirrus_alpine.so
-%%SPARC64_NA%%%%PPC_NA%%lib/modules/drivers/cirrus_drv.so
-%%SPARC64_NA%%%%PPC_NA%%lib/modules/drivers/cirrus_laguna.so
-%%AMD64_I386%%lib/modules/drivers/cyrix_drv.so
-%%ALPHA_NA%%lib/modules/drivers/dummy_drv.so
-lib/modules/drivers/glint_drv.so
-%%AMD64_I386%%lib/modules/drivers/i128_drv.so
-%%I386%%lib/modules/drivers/i740_drv.so
-%%AMD64_I386%%lib/modules/drivers/i810_drv.so
-lib/modules/drivers/mga_drv.so
-%%AMD64_I386%%lib/modules/drivers/neomagic_drv.so
-%%I386%%lib/modules/drivers/nsc_drv.so
-%%SPARC64_NA%%lib/modules/drivers/nv_drv.so
-lib/modules/drivers/r128_drv.so
-lib/modules/drivers/radeon_drv.so
-%%SPARC64_NA%%%%IA64_NA%%%%PPC_NA%%lib/modules/drivers/rendition_drv.so
-%%SPARC64_NA%%lib/modules/drivers/riva128.so
-%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/s3_drv.so
-%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/s3virge_drv.so
-%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/savage_drv.so
-%%SPARC64_NA%%%%IA64_NA%%%%PPC_NA%%lib/modules/drivers/siliconmotion_drv.so
-%%AMD64_I386%%lib/modules/drivers/sis_drv.so
-%%SPARC64%%lib/modules/drivers/sunbw2_drv.so
-%%SPARC64%%lib/modules/drivers/suncg14_drv.so
-%%SPARC64%%lib/modules/drivers/suncg3_drv.so
-%%SPARC64%%lib/modules/drivers/suncg6_drv.so
-%%SPARC64%%lib/modules/drivers/sunffb_drv.so
-%%SPARC64%%lib/modules/drivers/sunleo_drv.so
-%%SPARC64%%lib/modules/drivers/suntcx_drv.so
-lib/modules/drivers/tdfx_drv.so
-%%SPARC64_NA%%%%IA64_NA%%%%PPC_NA%%lib/modules/drivers/tga_drv.so
-%%AMD64_I386%%lib/modules/drivers/trident_drv.so
-%%AMD64_I386%%lib/modules/drivers/tseng_drv.so
-%%ALPHA_NA%%%%PPC_NA%%lib/modules/drivers/vesa_drv.so
-lib/modules/drivers/vga_drv.so
-%%I386%%lib/modules/drivers/via_drv.so
-%%AMD64_I386%%lib/modules/drivers/vmware_drv.so
-lib/modules/extensions/libGLcore.so
-lib/modules/extensions/libdbe.so
-lib/modules/extensions/libdri.so
-lib/modules/extensions/libextmod.so
-lib/modules/extensions/libglx.so
-lib/modules/extensions/librecord.so
-lib/modules/extensions/libxtrap.so
-lib/modules/fonts/libbitmap.so
-lib/modules/fonts/libfreetype.so
-lib/modules/fonts/libtype1.so
-lib/modules/freebsd/libdrm.so
-lib/modules/input/acecad_drv.so
-lib/modules/input/calcomp_drv.so
-lib/modules/input/citron_drv.so
-lib/modules/input/digitaledge_drv.so
-lib/modules/input/dmc_drv.so
-lib/modules/input/dynapro_drv.so
-lib/modules/input/elographics_drv.so
-lib/modules/input/fpit_drv.so
-lib/modules/input/hyperpen_drv.so
-lib/modules/input/js_x_drv.so
-lib/modules/input/kbd_drv.so
-lib/modules/input/keyboard_drv.so
-lib/modules/input/magellan_drv.so
-lib/modules/input/microtouch_drv.so
-lib/modules/input/mouse_drv.so
-lib/modules/input/mutouch_drv.so
-lib/modules/input/palmax_drv.so
-lib/modules/input/penmount_drv.so
-lib/modules/input/spaceorb_drv.so
-lib/modules/input/summa_drv.so
-lib/modules/input/tek4957_drv.so
-lib/modules/input/void_drv.so
-lib/modules/input/wacom_drv.so
-%%ALPHA_NA%%lib/modules/libafb.so
-lib/modules/libcfb.so
-lib/modules/libcfb16.so
-%%SPARC64%%lib/modules/libcfb24.so
-lib/modules/libcfb32.so
-lib/modules/libddc.so
-lib/modules/libexa.so
-lib/modules/libfb.so
-lib/modules/libi2c.so
-lib/modules/libint10.so
-lib/modules/liblayer.so
-lib/modules/libmfb.so
-lib/modules/libpcidata.so
-lib/modules/librac.so
-lib/modules/libramdac.so
-lib/modules/libscanpci.so
-lib/modules/libshadow.so
-lib/modules/libshadowfb.so
-lib/modules/libvbe.so
-lib/modules/libvgahw.so
-lib/modules/libxaa.so
-lib/modules/libxf1bpp.so
-lib/modules/libxf4bpp.so
-lib/modules/libxf8_16bpp.so
-lib/modules/libxf8_32bpp.so
-%%SPARC64%%lib/modules/libxf8_32wid.so
-lib/modules/multimedia/bt829_drv.so
-lib/modules/multimedia/fi1236_drv.so
-lib/modules/multimedia/msp3430_drv.so
-lib/modules/multimedia/tda8425_drv.so
-lib/modules/multimedia/tda9850_drv.so
-lib/modules/multimedia/tda9885_drv.so
-lib/modules/multimedia/theatre_detect_drv.so
-lib/modules/multimedia/theatre_drv.so
-lib/modules/multimedia/theatre200_drv.so
-lib/modules/multimedia/uda1380_drv.so
-%%SPARC64_NA%%%%PPC_NA%%lib/modules/v10002d.uc
-%%SPARC64_NA%%%%PPC_NA%%lib/modules/v20002d.uc
- at dirrm lib/X11/getconfig
- at dirrm lib/modules/fonts
- at dirrm lib/modules/extensions
- at dirrm lib/modules/freebsd
- at dirrm lib/modules/drivers
- at dirrm lib/modules/input
- at dirrm lib/modules/internal
- at dirrm lib/modules/multimedia
+lib/xorg/modules/extensions/libGLcore.la
+lib/xorg/modules/extensions/libGLcore.so
+lib/xorg/modules/extensions/libdbe.la
+lib/xorg/modules/extensions/libdbe.so
+lib/xorg/modules/extensions/libdri.la
+lib/xorg/modules/extensions/libdri.so
+lib/xorg/modules/extensions/libextmod.la
+lib/xorg/modules/extensions/libextmod.so
+lib/xorg/modules/extensions/libglx.la
+lib/xorg/modules/extensions/libglx.so
+lib/xorg/modules/extensions/librecord.la
+lib/xorg/modules/extensions/librecord.so
+lib/xorg/modules/extensions/libxtrap.la
+lib/xorg/modules/extensions/libxtrap.so
+lib/xorg/modules/fonts/libfreetype.la
+lib/xorg/modules/fonts/libfreetype.so
+lib/xorg/modules/fonts/libtype1.la
+lib/xorg/modules/fonts/libtype1.so
+lib/xorg/modules/libafb.la
+lib/xorg/modules/libafb.so
+lib/xorg/modules/libcfb.la
+lib/xorg/modules/libcfb.so
+lib/xorg/modules/libcfb32.la
+lib/xorg/modules/libcfb32.so
+lib/xorg/modules/libexa.la
+lib/xorg/modules/libexa.so
+lib/xorg/modules/libfb.la
+lib/xorg/modules/libfb.so
+lib/xorg/modules/libint10.la
+lib/xorg/modules/libint10.so
+lib/xorg/modules/libmfb.la
+lib/xorg/modules/libmfb.so
+lib/xorg/modules/libpcidata.la
+lib/xorg/modules/libpcidata.so
+lib/xorg/modules/libscanpci.la
+lib/xorg/modules/libscanpci.so
+lib/xorg/modules/libshadow.la
+lib/xorg/modules/libshadow.so
+lib/xorg/modules/libshadowfb.la
+lib/xorg/modules/libshadowfb.so
+lib/xorg/modules/libvbe.la
+lib/xorg/modules/libvbe.so
+lib/xorg/modules/libvgahw.la
+lib/xorg/modules/libvgahw.so
+lib/xorg/modules/libwfb.la
+lib/xorg/modules/libwfb.so
+lib/xorg/modules/libxaa.la
+lib/xorg/modules/libxaa.so
+lib/xorg/modules/libxf1bpp.la
+lib/xorg/modules/libxf1bpp.so
+lib/xorg/modules/libxf4bpp.la
+lib/xorg/modules/libxf4bpp.so
+lib/xorg/modules/libxf8_16bpp.la
+lib/xorg/modules/libxf8_16bpp.so
+lib/xorg/modules/libxf8_32bpp.la
+lib/xorg/modules/libxf8_32bpp.so
+lib/xorg/modules/linux/libfbdevhw.la
+lib/xorg/modules/linux/libfbdevhw.so
+lib/xorg/modules/multimedia/bt829_drv.la
+lib/xorg/modules/multimedia/bt829_drv.so
+lib/xorg/modules/multimedia/fi1236_drv.la
+lib/xorg/modules/multimedia/fi1236_drv.so
+lib/xorg/modules/multimedia/msp3430_drv.la
+lib/xorg/modules/multimedia/msp3430_drv.so
+lib/xorg/modules/multimedia/tda8425_drv.la
+lib/xorg/modules/multimedia/tda8425_drv.so
+lib/xorg/modules/multimedia/tda9850_drv.la
+lib/xorg/modules/multimedia/tda9850_drv.so
+lib/xorg/modules/multimedia/tda9885_drv.la
+lib/xorg/modules/multimedia/tda9885_drv.so
+lib/xorg/modules/multimedia/uda1380_drv.la
+lib/xorg/modules/multimedia/uda1380_drv.so
+lib/xserver/SecurityPolicy
+libdata/pkgconfig/xorg-server.pc
+share/X11/xkb/compiled/README.compiled
+share/aclocal/xorg-server.m4
+ at dirrm include/xorg
+ at dirrm lib/xorg/modules/fonts
+ at dirrm lib/xorg/modules/extensions
+ at dirrm lib/xorg/modules/linux
+ at dirrm lib/xorg/modules/multimedia
+ at dirrm lib/xorg/modules
+ at dirrm lib/xorg
+ at dirrm lib/xserver
+ at dirrmtry include/X11/bitmaps
@dirrmtry include/X11/pixmaps
@dirrmtry lib/X11/doc
@dirrmtry lib/X11/etc
@dirrmtry lib/X11/xserver
- at dirrmtry lib/modules
+ at dirrmtry lib/xorg/modules
+ at dirrmtry lib/xorg
+ at dirrmtry share/X11/app-defaults
+ at dirrmtry share/X11
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/x11-servers/xorg-server/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -Lx11-servers/xorg-server/Makefile -Lx11-servers/xorg-server/Makefile -u -r1.3 -r1.4
--- x11-servers/xorg-server/Makefile
+++ x11-servers/xorg-server/Makefile
@@ -2,157 +2,93 @@
# Date created: 7 May 2004
# Whom: anholt at FreeBSD.org
#
+# $FreeBSD: ports/x11-servers/xorg-server/Makefile,v 1.46 2007/10/09 22:31:49 flz Exp $
# $MidnightBSD$
-# $FreeBSD: ports/x11-servers/xorg-server/Makefile,v 1.39 2006/08/25 21:52:48 lesi Exp $
#
PORTNAME= xorg-server
-PORTVERSION= 6.9.0
-PORTREVISION= 6
+PORTVERSION= 1.4
+PORTEPOCH= 1
CATEGORIES= x11-servers
-MASTER_SITES= ${MASTER_SITE_XORG}
-MASTER_SITE_SUBDIR= X11R${PORTVERSION}/src
-DISTFILES= X11R${PORTVERSION}-src1.tar.gz \
- X11R${PORTVERSION}-src3.tar.gz
+MASTER_SITES= http://xorg.freedesktop.org/releases/individual/xserver/:fdo \
+ ${MASTER_SITE_SOURCEFORGE:S/$/:mesa/}
+MASTER_SITE_SUBDIR=mesa3d/:mesa
+DISTFILES= xorg-server-${PORTVERSION}.tar.bz2:fdo \
+ MesaLib-7.0.1.tar.bz2:mesa
-MAINTAINER= archite at MidnightBSD.org
+MAINTAINER= ports at MidnightBSD.org
COMMENT= X.Org X server and related programs
+LICENSE=
-.if !defined(WITH_MODULAR)
-USE_XLIB= yes
-.else
-LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xdmcp.pc:${PORTSDIR}/x11/libXdmcp \
- ${X11BASE}/libdata/pkgconfig/xau.pc:${PORTSDIR}/x11/libXau
-LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \
- GL.1:${PORTSDIR}/x11/libGL
-BUILD_DEPENDS= ${X11BASE}/include/X11/extensions/XKMformat.h:${PORTSDIR}/x11/libxkbfile \
- ${LIB_PC_DEPENDS}
-RUN_DEPENDS= ${LIB_PC_DEPENDS}
-.endif
+LIB_DEPENDS= drm:${PORTSDIR}/graphics/libdrm
+RUN_DEPENDS= ${X11BASE}/share/X11/xkb/rules/base.xml:${PORTSDIR}/x11/xkeyboard-config
-CONFLICTS= XFree86-Server-*
-
-SCRIPTS_ENV= WITH_DEBUG="${WITH_DEBUG}"
-MAN1= Xorg.1 \
- getconfig.1 \
- gtf.1 \
- kbd_mode.1 \
- pcitweak.1 \
- xorgcfg.1 \
- xorgconfig.1
-MAN4= citron.4x \
- dmc.4x \
- dynapro.4x \
- elographics.4x \
- fbdevhw.4x \
- fpit.4x \
- glint.4x \
- js_x.4x \
- kbd.4x \
- keyboard.4x \
- mga.4x \
- microtouch.4x \
- mouse.4x \
- mutouch.4x \
- palmax.4x \
- penmount.4x \
- r128.4x \
- radeon.4x \
- tdfx.4x \
- tek4957.4x \
- vga.4x \
- void.4x \
- wacom.4x
-MAN5= getconfig.5 \
- xorg.conf.5
-
-XBUILD_DIRS= lib/font programs/Xserver
-XINCLUDE_DIRS= lib/xtrans
-XMAN_DIRS= programs/Xserver
+XORG_CAT= xserver
-NOT_FOR_ARCHS= ia64
-.include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc"
-.include <bsd.port.pre.mk>
+USE_XORG= xf86driproto glproto xdmcp x11 xkbfile xxf86misc xxf86vm xaw7 \
+ xmu xt xpm xext randrproto renderproto fixesproto damageproto \
+ xcmiscproto xextproto xproto xtrans xf86miscproto \
+ xf86vidmodeproto xf86bigfontproto scrnsaverproto bigreqsproto \
+ resourceproto fontsproto inputproto xf86dgaproto \
+ videoproto compositeproto trapproto recordproto xineramaproto \
+ evieproto xfont fontenc xkbui pixman
-.if ${X_WINDOW_SYSTEM:L} != xorg
-IGNORE= is part of X.Org and you have ${X_WINDOW_SYSTEM} set for X11\
- distribution. See The X Window System and Virtual Consoles chapter\
- of FAQ for more information
-.endif
+USE_PERL5_BUILD=yes
+CONFIGURE_ARGS= --with-mesa-source=${WRKDIR}/Mesa-7.0.1 \
+ --disable-dmx --disable-xvfb --disable-xnest --disable-xprint \
+ --localstatedir=/var
-.if ${ARCH} == alpha
-PLIST_SUB+= ALPHA_NA="@comment "
+.if !defined(WITHOUT_HAL)
+LIB_DEPENDS+= hal.1:${PORTSDIR}/sysutils/hal
+CONFIGURE_ARGS+= --enable-config-hal
.else
-PLIST_SUB+= ALPHA_NA=""
+CONFIGURE_ARGS+= --disable-config-hal
.endif
-.if ${ARCH} == ia64
-PLIST_SUB+= IA64_NA="@comment "
+.if !defined(WITHOUT_AIGLX)
+CONFIGURE_ARGS+= --enable-aiglx=yes
.else
-PLIST_SUB+= IA64_NA=""
+CONFIGURE_ARGS+= --disable-aiglx=yes
.endif
-
-.if ${ARCH} == powerpc
-PLIST_SUB+= PPC_NA="@comment "
-MAN4+= nv.4x
+
+.if !defined(NO_SUID_XSERVER) || ${NO_SUID_XSERVER} == NO
+CONFIGURE_ARGS+=--enable-install-setuid
.else
-PLIST_SUB+= PPC_NA=""
+CONFIGURE_ARGS+=--disable-install-setuid
.endif
+MAN1= Xorg.1 \
+ Xserver.1 \
+ cvt.1 \
+ gtf.1 \
+ pcitweak.1 \
+ xorgconfig.1
+MAN4= exa.4 \
+ fbdevhw.4
+MAN5= xorg.conf.5 \
+ SecurityPolicy.5
+
+NOT_FOR_ARCHS= ia64 alpha
+
+.include <bsd.port.pre.mk>
+
+
.if ${ARCH} == sparc64
PLIST_SUB+= SPARC64=""
PLIST_SUB+= SPARC64_NA="@comment "
-MAN4+= sunbw2.4x \
- suncg14.4x \
- suncg3.4x \
- suncg6.4x \
- sunffb.4x \
- sunleo.4x \
- suntcx.4x
.else
PLIST_SUB+= SPARC64="@comment "
PLIST_SUB+= SPARC64_NA=""
.endif
-.if ${ARCH} != powerpc && ${ARCH} != sparc64
-MAN4+= cirrus.4x \
- nv.4x \
- rendition.4x \
- s3virge.4x \
- savage.4x \
- siliconmotion.4x
-.endif
-
-.if ${ARCH} != powerpc && ${ARCH} != alpha
-MAN4+= vesa.4x
-.endif
-
-.if ${ARCH} == i386
-PLIST_SUB+= I386=""
-MAN1+= scanpci.1
-MAN4+= i740.4x \
- nsc.4x \
- via.4x
-.else
-PLIST_SUB+= I386="@comment "
-.endif
-
.if ${ARCH} == amd64 || ${ARCH} == i386
PLIST_SUB+= AMD64_I386=""
-MAN4+= apm.4x \
- chips.4x \
- cyrix.4x \
- i128.4x \
- i810.4x \
- neomagic.4x \
- sis.4x \
- trident.4x \
- tseng.4x \
- vmware.4x
+MAN1+= scanpci.1
.else
PLIST_SUB+= AMD64_I386="@comment "
.endif
+
.if !defined(NO_SUID_XSERVER) || ${NO_SUID_XSERVER} == NO
pre-everything::
@${ECHO_MSG} "By default, the X Server installs as a set-user-id root binary. When run by"
@@ -161,10 +97,6 @@
@${ECHO_MSG} "of this, but still want to run an X Server (for example using xdm/kdm/gdm,"
@${ECHO_MSG} "which will still run the server as root), you can cancel the build and set"
@${ECHO_MSG} "NO_SUID_XSERVER=YES in /etc/make.conf."
-
-SCRIPTS_ENV+= SUID_XSERVER=YES
-.else
-SCRIPTS_ENV+= SUID_XSERVER=NO
.endif
.include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/x11-servers/xorg-server/distinfo,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -Lx11-servers/xorg-server/distinfo -Lx11-servers/xorg-server/distinfo -u -r1.1.1.1 -r1.2
--- x11-servers/xorg-server/distinfo
+++ x11-servers/xorg-server/distinfo
@@ -1,6 +1,6 @@
-MD5 (xorg/X11R6.9.0-src1.tar.gz) = 9cd255a090e81e2c62637122794e6150
-SHA256 (xorg/X11R6.9.0-src1.tar.gz) = 30502fd1074ee7d782bae084c8c9b4872dcbf16dc45a2b944c6d0fc0e0c1a60c
-SIZE (xorg/X11R6.9.0-src1.tar.gz) = 33460996
-MD5 (xorg/X11R6.9.0-src3.tar.gz) = 4d5450bde835270632e004b25e45ef33
-SHA256 (xorg/X11R6.9.0-src3.tar.gz) = 6c55602a0d6476457d3cf6a1413c39d63c70ca9255749bff5502dae9414f9971
-SIZE (xorg/X11R6.9.0-src3.tar.gz) = 10872474
+MD5 (xorg/xserver/xorg-server-1.4.tar.bz2) = a06d9fe4f9f1d459ae02657f9ce64220
+SHA256 (xorg/xserver/xorg-server-1.4.tar.bz2) = 51b142df328d427143705371f139a08ff3bcd6efe0eab91f4178ca4017c0ebc2
+SIZE (xorg/xserver/xorg-server-1.4.tar.bz2) = 6179392
+MD5 (xorg/xserver/MesaLib-7.0.1.tar.bz2) = c056abd763e899114bf745c9eedbf9ad
+SHA256 (xorg/xserver/MesaLib-7.0.1.tar.bz2) = 5190ffac157882d9129d31f262339512f4a45dcf95ccdad213760a7d54d82de7
+SIZE (xorg/xserver/MesaLib-7.0.1.tar.bz2) = 3343538
--- x11-servers/xorg-server/scripts/configure.gen
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-# This script takes some of the system's imake configuration files and munges
-# them to be used in the X.Org build, and allows port configuration located in
-# $LOCALDEF to be included in the generated host.def
-
-SYSSITE=$PREFIX/lib/X11/config/xf86site.def
-BUILDSITE=$WRKDIR/xc/config/cf/xorgsite.def
-SYSHOST=$PREFIX/lib/X11/config/host.def
-LOCALDEF=$WRKDIR/.config
-BUILDHOST=$WRKDIR/xc/config/cf/host.def
-
-# Append system xf86site.def to build's xorgsite.def.
-rm -f $BUILDSITE
-cp -f $SYSSITE $BUILDSITE
-
-# Use system host.def as initial config file, setting ProjectRoot appropriately.
-rm -f $BUILDHOST
-grep -v '#define.*ProjectRoot' $SYSHOST >> $BUILDHOST
-echo "#define ProjectRoot $PREFIX" >> $BUILDHOST
-
-# Add in defines that all ports will want.
-echo "#define NothingOutsideProjectRoot YES" >> $BUILDHOST
-echo "#define FreeBSDCC ${CC}" >> $BUILDHOST
-echo "#define FreeBSDCXX ${CXX}" >> $BUILDHOST
-echo "#define FreeBSDPTHREAD_LIBS ${PTHREAD_LIBS}" >> $BUILDHOST
-echo "#define FreeBSDPTHREAD_CFLAGS ${PTHREAD_CFLAGS}" >> $BUILDHOST
-echo "#define FreeBSDCFLAGS ${CFLAGS}" >> $BUILDHOST
-
-cat ${LOCALDEF} >> ${BUILDHOST}
--- x11-servers/xorg-server/scripts/configure
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-
-LOCALDEF=$WRKDIR/.config
-
-rm -f $LOCALDEF
-echo "#define InstallXserverSetUID ${SUID_XSERVER}" >> $LOCALDEF
-echo "#define JoystickSupport NO" >> $LOCALDEF
-echo "#define BuildLBX NO" >> $LOCALDEF
-echo "#define XnestServer NO" >> $LOCALDEF
-echo "#define BuildFontServer NO" >> $LOCALDEF
-echo "#define XVirtualFramebufferServer NO" >> $LOCALDEF
-echo "#define XprtServer NO" >> $LOCALDEF
-echo "#define LibInstall NO" >> $LOCALDEF
-echo "#define ForceNormalLib NO" >> $LOCALDEF
-echo "#define XTrueTypeInstallCConvHeaders NO" >> $LOCALDEF
-echo "#define BuildServer YES" >> $LOCALDEF
-echo "#define BuildXprint NO" >> $LOCALDEF
-echo "#define BuildLibraries NO" >> $LOCALDEF
-echo "#define LibInstallBuild YES" >> $LOCALDEF
-echo "#define ModInstall YES" >> $LOCALDEF
-echo "#define XF86Server NO" >> $LOCALDEF
-echo "#define BuildServersOnly YES" >> $LOCALDEF
-echo "#define BuildGLXLibrary YES" >> $LOCALDEF
-echo "#define UseInstalledPrograms YES" >> $LOCALDEF
-echo "#define StandardIncludes -I${PREFIX}/include" >> $LOCALDEF
-echo "#define BuildXFree86ConfigTools YES" >> $LOCALDEF
-echo "#define DriverManDir \$(MANSOURCEPATH)4" >> $LOCALDEF
-echo "#define DriverManSuffix 4x" >> $LOCALDEF
-echo "#define MiscManDir \$(MANSOURCEPATH)7" >> $LOCALDEF
-echo "#define MiscManSuffix 7x" >> $LOCALDEF
-
-if [ X$WITH_DEBUG != X ]; then
- export CFLAGS="-g $CFLAGS"
- echo "#define InstPgmFlags" >> $LOCALDEF
- echo "#define MakeDllModules YES" >> $LOCALDEF
-fi
-
-sh $PORTSDIR/x11-servers/xorg-server/scripts/configure.gen
More information about the Midnightbsd-cvs
mailing list