aboutsummaryrefslogtreecommitdiffstats
path: root/x11-servers
diff options
context:
space:
mode:
authoranholt <anholt@FreeBSD.org>2003-01-24 12:14:16 +0800
committeranholt <anholt@FreeBSD.org>2003-01-24 12:14:16 +0800
commit849a0baf4243c6889f7940762432246949d0493e (patch)
tree2dddf0f6b30e425d74943b1b65fb17c6b2255be0 /x11-servers
parent3c6e0dba37f6acfc177c8e0f17c56303343607bb (diff)
downloadfreebsd-ports-gnome-849a0baf4243c6889f7940762432246949d0493e.tar.gz
freebsd-ports-gnome-849a0baf4243c6889f7940762432246949d0493e.tar.zst
freebsd-ports-gnome-849a0baf4243c6889f7940762432246949d0493e.zip
[1] Fix missing symbols in i810 driver
[2] Fix xdm on Alpha by using NetBSD's version of Wraphelp.c [3] Report buttons 7 and when using sysmouse protocol [4] Fix missing symbols in r128 driver. [5] Reset /usr/X11R6/bin/X to Xwrapper-4 after install if Xwrapper-4 exists. PR: [1] i386/44203 [2] ports/43664 [3] ports/43232
Diffstat (limited to 'x11-servers')
-rw-r--r--x11-servers/XFree86-4-NestServer/Makefile4
-rw-r--r--x11-servers/XFree86-4-NestServer/distinfo2
-rw-r--r--x11-servers/XFree86-4-PrintServer/Makefile4
-rw-r--r--x11-servers/XFree86-4-PrintServer/distinfo2
-rw-r--r--x11-servers/XFree86-4-Server-snap/Makefile13
-rw-r--r--x11-servers/XFree86-4-Server-snap/distinfo3
-rw-r--r--x11-servers/XFree86-4-Server-snap/files/patch-i810_driver.c11
-rw-r--r--x11-servers/XFree86-4-Server-snap/files/patch-r128_driver.c18
-rw-r--r--x11-servers/XFree86-4-Server/Makefile13
-rw-r--r--x11-servers/XFree86-4-Server/distinfo3
-rw-r--r--x11-servers/XFree86-4-Server/files/patch-i810_driver.c11
-rw-r--r--x11-servers/XFree86-4-Server/files/patch-r128_driver.c18
-rw-r--r--x11-servers/XFree86-4-VirtualFramebufferServer/Makefile4
-rw-r--r--x11-servers/XFree86-4-VirtualFramebufferServer/distinfo2
14 files changed, 87 insertions, 21 deletions
diff --git a/x11-servers/XFree86-4-NestServer/Makefile b/x11-servers/XFree86-4-NestServer/Makefile
index 26de8cae585a..b887b51159a6 100644
--- a/x11-servers/XFree86-4-NestServer/Makefile
+++ b/x11-servers/XFree86-4-NestServer/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= 4.2.0/:x \
anholt/:local
PKGNAMEPREFIX= XFree86-
DISTFILES= X420src-1.tgz:x \
- Wraphelp.gz:local
+ Wraphelp2.gz:local
EXTRACT_ONLY= X420src-1.tgz
PATCH_SITES= ${MASTER_SITE_LOCAL}
@@ -40,7 +40,7 @@ XINSTALL_DIRS= programs/Xserver
XINSTALL_MAN_DIRS= ${XINSTALL_DIRS}
post-extract:
- ${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/Wraphelp.gz > \
+ ${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/Wraphelp2.gz > \
${WRKSRC}/lib/Xdmcp/Wraphelp.c
.include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc"
diff --git a/x11-servers/XFree86-4-NestServer/distinfo b/x11-servers/XFree86-4-NestServer/distinfo
index e4832d764bce..fde56e7c7696 100644
--- a/x11-servers/XFree86-4-NestServer/distinfo
+++ b/x11-servers/XFree86-4-NestServer/distinfo
@@ -1,3 +1,3 @@
MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f
-MD5 (xc/Wraphelp.gz) = 7ee30e397359e8d64ab23f29aa551659
+MD5 (xc/Wraphelp2.gz) = bd1910492087442288d885412e2e5535
MD5 (xc/4.2.0-4.2.1-1-freebsd.patch.gz) = 1d4c49d7f354b307b7961e6d8e6c4274
diff --git a/x11-servers/XFree86-4-PrintServer/Makefile b/x11-servers/XFree86-4-PrintServer/Makefile
index 22196c817c28..9f018d3a61cc 100644
--- a/x11-servers/XFree86-4-PrintServer/Makefile
+++ b/x11-servers/XFree86-4-PrintServer/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= 4.2.0/:x \
anholt/:local
PKGNAMEPREFIX= XFree86-
DISTFILES= X420src-1.tgz:x \
- Wraphelp.gz:local
+ Wraphelp2.gz:local
EXTRACT_ONLY= X420src-1.tgz
PATCH_SITES= ${MASTER_SITE_LOCAL}
@@ -37,7 +37,7 @@ XINCLUDE_DIRS= lib/xkbfile lib/xtrans
XINSTALL_DIRS= programs/Xserver
post-extract:
- ${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/Wraphelp.gz > \
+ ${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/Wraphelp2.gz > \
${WRKSRC}/lib/Xdmcp/Wraphelp.c
do-install:
diff --git a/x11-servers/XFree86-4-PrintServer/distinfo b/x11-servers/XFree86-4-PrintServer/distinfo
index e4832d764bce..fde56e7c7696 100644
--- a/x11-servers/XFree86-4-PrintServer/distinfo
+++ b/x11-servers/XFree86-4-PrintServer/distinfo
@@ -1,3 +1,3 @@
MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f
-MD5 (xc/Wraphelp.gz) = 7ee30e397359e8d64ab23f29aa551659
+MD5 (xc/Wraphelp2.gz) = bd1910492087442288d885412e2e5535
MD5 (xc/4.2.0-4.2.1-1-freebsd.patch.gz) = 1d4c49d7f354b307b7961e6d8e6c4274
diff --git a/x11-servers/XFree86-4-Server-snap/Makefile b/x11-servers/XFree86-4-Server-snap/Makefile
index 551c7035aba6..d8bb093d2c22 100644
--- a/x11-servers/XFree86-4-Server-snap/Makefile
+++ b/x11-servers/XFree86-4-Server-snap/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Server
PORTVERSION= 4.2.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= x11-servers
MASTER_SITES= ${MASTER_SITE_XFREE:S/$/:x/} \
${MASTER_SITE_LOCAL:S/$/:local/}
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= 4.2.0/:x \
anholt/:local
PKGNAMEPREFIX= XFree86-
DISTFILES= X420src-1.tgz:x \
- Wraphelp.gz:local
+ Wraphelp2.gz:local
EXTRACT_ONLY= X420src-1.tgz
PATCH_SITES= ${MASTER_SITE_LOCAL}
@@ -31,7 +31,8 @@ DIST_SUBDIR= xc
WRKSRC= ${WRKDIR}/xc
PATCHDIR= ${.CURDIR}/../../x11/XFree86-4-libraries/files
.for pf in patch-text-mode.c patch-xf86Configure.c patch-xf86config.c \
- patch-mga_driver.c patch-alp_xaam.c
+ patch-i810_driver.c patch-mga_driver.c patch-r128_driver.c \
+ patch-alp_xaam.c
EXTRA_PATCHES+= ${.CURDIR}/files/${pf}
.endfor
SCRIPTS_ENV= OSVERSION=${OSVERSION} \
@@ -188,7 +189,7 @@ PLIST_SUB+= MATROX="@comment "
.endif
post-extract::
- ${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/Wraphelp.gz > \
+ ${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/Wraphelp2.gz > \
${WRKSRC}/lib/Xdmcp/Wraphelp.c
post-build:
@@ -198,6 +199,10 @@ post-build:
post-install::
@${SED} -e s,/usr/X11R6,${PREFIX}, ${PKGMESSAGE}
strip ${PREFIX}/bin/XFree86
+ @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
index bc9a0a483315..b0255761084b 100644
--- a/x11-servers/XFree86-4-Server-snap/distinfo
+++ b/x11-servers/XFree86-4-Server-snap/distinfo
@@ -1,6 +1,5 @@
MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f
-MD5 (xc/Wraphelp.gz) = 7ee30e397359e8d64ab23f29aa551659
+MD5 (xc/Wraphelp2.gz) = bd1910492087442288d885412e2e5535
MD5 (xc/freebsd-glide3headers.tar.gz) = 2bb614c909898a17c05e43e60cfb8e3b
-MD5 (xc/mgadrivers-2.0-src.tgz) = 877db503967ae837c147953dbcd8ee6d
MD5 (xc/4.2.0-4.2.1-1-freebsd.patch.gz) = 1d4c49d7f354b307b7961e6d8e6c4274
MD5 (xc/patch-nvchips.gz) = bcb190d3f2c26d993a3a3c1512cf9bc9
diff --git a/x11-servers/XFree86-4-Server-snap/files/patch-i810_driver.c b/x11-servers/XFree86-4-Server-snap/files/patch-i810_driver.c
new file mode 100644
index 000000000000..c8fce6b6a564
--- /dev/null
+++ b/x11-servers/XFree86-4-Server-snap/files/patch-i810_driver.c
@@ -0,0 +1,11 @@
+--- programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c.orig Sat Jan 11 21:08:42 2003
++++ programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c Sat Jan 11 21:08:49 2003
+@@ -177,7 +177,7 @@
+ "XAACachePlanarMonoStipple",
+ "XAACreateInfoRec",
+ "XAADestroyInfoRec",
+- "XAAFillSolidRects"
++ "XAAFillSolidRects",
+ "XAAInit",
+ "XAAOverlayFBfuncs",
+ "XAAScreenIndex",
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
new file mode 100644
index 000000000000..a308f0a01eca
--- /dev/null
+++ b/x11-servers/XFree86-4-Server-snap/files/patch-r128_driver.c
@@ -0,0 +1,18 @@
+--- programs/Xserver/hw/xfree86/drivers/ati/r128_driver.c.orig Sat Jan 11 05:45:34 2003
++++ programs/Xserver/hw/xfree86/drivers/ati/r128_driver.c Sat Jan 11 05:45:41 2003
+@@ -277,6 +277,7 @@
+ "drmAgpUnbind",
+ "drmAgpVendorId",
+ "drmAvailable",
++ "drmFreeBufs",
+ "drmFreeVersion",
+ "drmGetVersion",
+ "drmMap",
+@@ -287,6 +288,7 @@
+ "drmR128ResetCCE",
+ "drmR128StartCCE",
+ "drmR128StopCCE",
++ "drmR128TextureBlit",
+ "drmR128WaitForIdleCCE",
+ "drmR128FlushIndirectBuffer",
+ "drmScatterGatherAlloc",
diff --git a/x11-servers/XFree86-4-Server/Makefile b/x11-servers/XFree86-4-Server/Makefile
index 551c7035aba6..d8bb093d2c22 100644
--- a/x11-servers/XFree86-4-Server/Makefile
+++ b/x11-servers/XFree86-4-Server/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Server
PORTVERSION= 4.2.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= x11-servers
MASTER_SITES= ${MASTER_SITE_XFREE:S/$/:x/} \
${MASTER_SITE_LOCAL:S/$/:local/}
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= 4.2.0/:x \
anholt/:local
PKGNAMEPREFIX= XFree86-
DISTFILES= X420src-1.tgz:x \
- Wraphelp.gz:local
+ Wraphelp2.gz:local
EXTRACT_ONLY= X420src-1.tgz
PATCH_SITES= ${MASTER_SITE_LOCAL}
@@ -31,7 +31,8 @@ DIST_SUBDIR= xc
WRKSRC= ${WRKDIR}/xc
PATCHDIR= ${.CURDIR}/../../x11/XFree86-4-libraries/files
.for pf in patch-text-mode.c patch-xf86Configure.c patch-xf86config.c \
- patch-mga_driver.c patch-alp_xaam.c
+ patch-i810_driver.c patch-mga_driver.c patch-r128_driver.c \
+ patch-alp_xaam.c
EXTRA_PATCHES+= ${.CURDIR}/files/${pf}
.endfor
SCRIPTS_ENV= OSVERSION=${OSVERSION} \
@@ -188,7 +189,7 @@ PLIST_SUB+= MATROX="@comment "
.endif
post-extract::
- ${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/Wraphelp.gz > \
+ ${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/Wraphelp2.gz > \
${WRKSRC}/lib/Xdmcp/Wraphelp.c
post-build:
@@ -198,6 +199,10 @@ post-build:
post-install::
@${SED} -e s,/usr/X11R6,${PREFIX}, ${PKGMESSAGE}
strip ${PREFIX}/bin/XFree86
+ @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/distinfo b/x11-servers/XFree86-4-Server/distinfo
index bc9a0a483315..b0255761084b 100644
--- a/x11-servers/XFree86-4-Server/distinfo
+++ b/x11-servers/XFree86-4-Server/distinfo
@@ -1,6 +1,5 @@
MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f
-MD5 (xc/Wraphelp.gz) = 7ee30e397359e8d64ab23f29aa551659
+MD5 (xc/Wraphelp2.gz) = bd1910492087442288d885412e2e5535
MD5 (xc/freebsd-glide3headers.tar.gz) = 2bb614c909898a17c05e43e60cfb8e3b
-MD5 (xc/mgadrivers-2.0-src.tgz) = 877db503967ae837c147953dbcd8ee6d
MD5 (xc/4.2.0-4.2.1-1-freebsd.patch.gz) = 1d4c49d7f354b307b7961e6d8e6c4274
MD5 (xc/patch-nvchips.gz) = bcb190d3f2c26d993a3a3c1512cf9bc9
diff --git a/x11-servers/XFree86-4-Server/files/patch-i810_driver.c b/x11-servers/XFree86-4-Server/files/patch-i810_driver.c
new file mode 100644
index 000000000000..c8fce6b6a564
--- /dev/null
+++ b/x11-servers/XFree86-4-Server/files/patch-i810_driver.c
@@ -0,0 +1,11 @@
+--- programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c.orig Sat Jan 11 21:08:42 2003
++++ programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c Sat Jan 11 21:08:49 2003
+@@ -177,7 +177,7 @@
+ "XAACachePlanarMonoStipple",
+ "XAACreateInfoRec",
+ "XAADestroyInfoRec",
+- "XAAFillSolidRects"
++ "XAAFillSolidRects",
+ "XAAInit",
+ "XAAOverlayFBfuncs",
+ "XAAScreenIndex",
diff --git a/x11-servers/XFree86-4-Server/files/patch-r128_driver.c b/x11-servers/XFree86-4-Server/files/patch-r128_driver.c
new file mode 100644
index 000000000000..a308f0a01eca
--- /dev/null
+++ b/x11-servers/XFree86-4-Server/files/patch-r128_driver.c
@@ -0,0 +1,18 @@
+--- programs/Xserver/hw/xfree86/drivers/ati/r128_driver.c.orig Sat Jan 11 05:45:34 2003
++++ programs/Xserver/hw/xfree86/drivers/ati/r128_driver.c Sat Jan 11 05:45:41 2003
+@@ -277,6 +277,7 @@
+ "drmAgpUnbind",
+ "drmAgpVendorId",
+ "drmAvailable",
++ "drmFreeBufs",
+ "drmFreeVersion",
+ "drmGetVersion",
+ "drmMap",
+@@ -287,6 +288,7 @@
+ "drmR128ResetCCE",
+ "drmR128StartCCE",
+ "drmR128StopCCE",
++ "drmR128TextureBlit",
+ "drmR128WaitForIdleCCE",
+ "drmR128FlushIndirectBuffer",
+ "drmScatterGatherAlloc",
diff --git a/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile b/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile
index 8005edc950c9..a60444b285c8 100644
--- a/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile
+++ b/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= 4.2.0/:x \
anholt/:local
PKGNAMEPREFIX= XFree86-
DISTFILES= X420src-1.tgz:x \
- Wraphelp.gz:local
+ Wraphelp2.gz:local
EXTRACT_ONLY= X420src-1.tgz
PATCH_SITES= ${MASTER_SITE_LOCAL}
@@ -43,7 +43,7 @@ XINSTALL_DIRS= programs/Xserver
XINSTALL_MAN_DIRS= ${XINSTALL_DIRS}
post-extract:
- ${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/Wraphelp.gz > \
+ ${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/Wraphelp2.gz > \
${WRKSRC}/lib/Xdmcp/Wraphelp.c
.include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc"
diff --git a/x11-servers/XFree86-4-VirtualFramebufferServer/distinfo b/x11-servers/XFree86-4-VirtualFramebufferServer/distinfo
index e4832d764bce..fde56e7c7696 100644
--- a/x11-servers/XFree86-4-VirtualFramebufferServer/distinfo
+++ b/x11-servers/XFree86-4-VirtualFramebufferServer/distinfo
@@ -1,3 +1,3 @@
MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f
-MD5 (xc/Wraphelp.gz) = 7ee30e397359e8d64ab23f29aa551659
+MD5 (xc/Wraphelp2.gz) = bd1910492087442288d885412e2e5535
MD5 (xc/4.2.0-4.2.1-1-freebsd.patch.gz) = 1d4c49d7f354b307b7961e6d8e6c4274
generated by cgit (git 2.34.1) at 2024-11-24 00:57:53 +0800