aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--x11-servers/xephyr/Makefile3
-rw-r--r--x11-servers/xephyr/distinfo6
-rw-r--r--x11-servers/xorg-dmx/Makefile9
-rw-r--r--x11-servers/xorg-dmx/distinfo6
-rw-r--r--x11-servers/xorg-nestserver/Makefile3
-rw-r--r--x11-servers/xorg-nestserver/distinfo6
-rw-r--r--x11-servers/xorg-server/Makefile3
-rw-r--r--x11-servers/xorg-server/distinfo6
-rw-r--r--x11-servers/xorg-server/files/patch-configure24
-rw-r--r--x11-servers/xorg-server/pkg-plist1
-rw-r--r--x11-servers/xorg-vfbserver/Makefile3
-rw-r--r--x11-servers/xorg-vfbserver/distinfo6
12 files changed, 35 insertions, 41 deletions
diff --git a/x11-servers/xephyr/Makefile b/x11-servers/xephyr/Makefile
index e9d84e5de57c..23d73f8c7955 100644
--- a/x11-servers/xephyr/Makefile
+++ b/x11-servers/xephyr/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xephyr
-PORTVERSION= 1.6.0
-#PORTREVISION= 1
+PORTVERSION= 1.6.1
CATEGORIES= x11-servers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-servers/xephyr/distinfo b/x11-servers/xephyr/distinfo
index 0455188e73b0..34f82e5da28d 100644
--- a/x11-servers/xephyr/distinfo
+++ b/x11-servers/xephyr/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/xserver/xorg-server-1.6.0.tar.bz2) = aafe73f5807ce8bb534727ecb72467c7
-SHA256 (xorg/xserver/xorg-server-1.6.0.tar.bz2) = 81a9a02b621e8a3e0bae1ad1b5dd6706a3fdcdbe766d75e1670ab5b3f0d32812
-SIZE (xorg/xserver/xorg-server-1.6.0.tar.bz2) = 4655422
+MD5 (xorg/xserver/xorg-server-1.6.1.tar.bz2) = ed0878bf32a24d4948c3b8a122a39eff
+SHA256 (xorg/xserver/xorg-server-1.6.1.tar.bz2) = 0edbaa994797cb7944a4129d33b634ad99164b21ec32355d56996a178d38bfcf
+SIZE (xorg/xserver/xorg-server-1.6.1.tar.bz2) = 4636802
diff --git a/x11-servers/xorg-dmx/Makefile b/x11-servers/xorg-dmx/Makefile
index 70c837f76cba..a1162857fe04 100644
--- a/x11-servers/xorg-dmx/Makefile
+++ b/x11-servers/xorg-dmx/Makefile
@@ -6,9 +6,8 @@
#
PORTNAME= xorg-dmx
-PORTVERSION= 1.6.0
+PORTVERSION= 1.6.1
PORTEPOCH= 1
-#PORTREVISION= 1
CATEGORIES= x11-servers
MAINTAINER= x11@FreeBSD.org
@@ -29,7 +28,7 @@ USE_XORG= x11 xf86driproto glproto randrproto renderproto fixesproto \
xineramaproto xinerama evieproto xkbfile xfont fontenc xkbui \
xxf86misc xxf86vm xaw7 xmu xpm xext xrender xfixes xi dmxproto \
xau dmx xtst xres pixman xtrans
-
+
USE_OPENSSL= yes
CONFIGURE_ARGS= --disable-xvfb --disable-xorg --disable-xnest \
--enable-dmx --localstatedir=/var --without-dtrace
@@ -39,7 +38,7 @@ MAN1= Xdmx.1 dmxtodmx.1 vdltodmx.1 xdmxconfig.1
do-install:
cd ${WRKSRC}/hw/dmx; ${MAKE} install
-OPTIONS= HAL "Compile with HAL config support" on
+OPTIONS= HAL "Compile with HAL config support" on
.include <bsd.port.pre.mk>
@@ -51,7 +50,7 @@ CONFIGURE_ENV= SHA1_LIB="-L/usr/lib -lcrypto" SHA1_CFLAGS="-I/usr/include"
.endif
.if !defined(WITHOUT_HAL)
-LIB_DEPENDS+= hal.1:${PORTSDIR}/sysutils/hal
+LIB_DEPENDS+= hal.1:${PORTSDIR}/sysutils/hal
CONFIGURE_ARGS+= --enable-config-hal=yes
.else
CONFIGURE_ARGS+= --enable-config-hal=no
diff --git a/x11-servers/xorg-dmx/distinfo b/x11-servers/xorg-dmx/distinfo
index 0455188e73b0..34f82e5da28d 100644
--- a/x11-servers/xorg-dmx/distinfo
+++ b/x11-servers/xorg-dmx/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/xserver/xorg-server-1.6.0.tar.bz2) = aafe73f5807ce8bb534727ecb72467c7
-SHA256 (xorg/xserver/xorg-server-1.6.0.tar.bz2) = 81a9a02b621e8a3e0bae1ad1b5dd6706a3fdcdbe766d75e1670ab5b3f0d32812
-SIZE (xorg/xserver/xorg-server-1.6.0.tar.bz2) = 4655422
+MD5 (xorg/xserver/xorg-server-1.6.1.tar.bz2) = ed0878bf32a24d4948c3b8a122a39eff
+SHA256 (xorg/xserver/xorg-server-1.6.1.tar.bz2) = 0edbaa994797cb7944a4129d33b634ad99164b21ec32355d56996a178d38bfcf
+SIZE (xorg/xserver/xorg-server-1.6.1.tar.bz2) = 4636802
diff --git a/x11-servers/xorg-nestserver/Makefile b/x11-servers/xorg-nestserver/Makefile
index f7a4d17bafab..51706df7e0f8 100644
--- a/x11-servers/xorg-nestserver/Makefile
+++ b/x11-servers/xorg-nestserver/Makefile
@@ -6,9 +6,8 @@
#
PORTNAME= xorg-nestserver
-PORTVERSION= 1.6.0
+PORTVERSION= 1.6.1
PORTEPOCH= 1
-#PORTREVISION= 1
CATEGORIES= x11-servers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-servers/xorg-nestserver/distinfo b/x11-servers/xorg-nestserver/distinfo
index 0455188e73b0..34f82e5da28d 100644
--- a/x11-servers/xorg-nestserver/distinfo
+++ b/x11-servers/xorg-nestserver/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/xserver/xorg-server-1.6.0.tar.bz2) = aafe73f5807ce8bb534727ecb72467c7
-SHA256 (xorg/xserver/xorg-server-1.6.0.tar.bz2) = 81a9a02b621e8a3e0bae1ad1b5dd6706a3fdcdbe766d75e1670ab5b3f0d32812
-SIZE (xorg/xserver/xorg-server-1.6.0.tar.bz2) = 4655422
+MD5 (xorg/xserver/xorg-server-1.6.1.tar.bz2) = ed0878bf32a24d4948c3b8a122a39eff
+SHA256 (xorg/xserver/xorg-server-1.6.1.tar.bz2) = 0edbaa994797cb7944a4129d33b634ad99164b21ec32355d56996a178d38bfcf
+SIZE (xorg/xserver/xorg-server-1.6.1.tar.bz2) = 4636802
diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile
index 292bf58c383d..2fbc7970ae7d 100644
--- a/x11-servers/xorg-server/Makefile
+++ b/x11-servers/xorg-server/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xorg-server
-PORTVERSION= 1.6.0
-#PORTREVISION= 1
+PORTVERSION= 1.6.1
PORTEPOCH= 1
CATEGORIES= x11-servers
MASTER_SITES= http://xorg.freedesktop.org/releases/individual/xserver/
diff --git a/x11-servers/xorg-server/distinfo b/x11-servers/xorg-server/distinfo
index 0455188e73b0..34f82e5da28d 100644
--- a/x11-servers/xorg-server/distinfo
+++ b/x11-servers/xorg-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/xserver/xorg-server-1.6.0.tar.bz2) = aafe73f5807ce8bb534727ecb72467c7
-SHA256 (xorg/xserver/xorg-server-1.6.0.tar.bz2) = 81a9a02b621e8a3e0bae1ad1b5dd6706a3fdcdbe766d75e1670ab5b3f0d32812
-SIZE (xorg/xserver/xorg-server-1.6.0.tar.bz2) = 4655422
+MD5 (xorg/xserver/xorg-server-1.6.1.tar.bz2) = ed0878bf32a24d4948c3b8a122a39eff
+SHA256 (xorg/xserver/xorg-server-1.6.1.tar.bz2) = 0edbaa994797cb7944a4129d33b634ad99164b21ec32355d56996a178d38bfcf
+SIZE (xorg/xserver/xorg-server-1.6.1.tar.bz2) = 4636802
diff --git a/x11-servers/xorg-server/files/patch-configure b/x11-servers/xorg-server/files/patch-configure
index b22c59911065..0b726bcdf922 100644
--- a/x11-servers/xorg-server/files/patch-configure
+++ b/x11-servers/xorg-server/files/patch-configure
@@ -1,20 +1,20 @@
---- configure.orig 2009-04-02 20:48:06.000000000 -0500
-+++ configure 2009-04-02 20:52:17.000000000 -0500
-@@ -30559,7 +30559,7 @@
+--- configure.orig 2009-04-15 12:10:15.000000000 -0500
++++ configure 2009-04-15 12:12:37.000000000 -0500
+@@ -22386,7 +22386,7 @@
+ DRI2=yes
+ ;;
esac
-
-
--if test "x$DRI2" == xyes; then
-+if test "x$DRI2" = xyes; then
+- if test "x$DRI2" == xyes; then
++ if test "x$DRI2" = xyes; then
DRI2_TRUE=
DRI2_FALSE='#'
else
-@@ -30741,7 +30741,7 @@
+@@ -22565,7 +22565,7 @@
+ DRI2_AIGLX=no
+ fi
fi
-
-
--if test "x$DRI2_AIGLX" == xyes; then
-+if test "x$DRI2_AIGLX" = xyes; then
+- if test "x$DRI2_AIGLX" == xyes; then
++ if test "x$DRI2_AIGLX" = xyes; then
DRI2_AIGLX_TRUE=
DRI2_AIGLX_FALSE='#'
else
diff --git a/x11-servers/xorg-server/pkg-plist b/x11-servers/xorg-server/pkg-plist
index fe98ace6368a..a3c972d26027 100644
--- a/x11-servers/xorg-server/pkg-plist
+++ b/x11-servers/xorg-server/pkg-plist
@@ -210,7 +210,6 @@ lib/xorg/protocol.txt
libdata/pkgconfig/xorg-server.pc
share/aclocal/xorg-server.m4
@dirrm include/xorg
-@dirrm lib/xorg/modules/fonts
@dirrm lib/xorg/modules/extensions
@dirrm lib/xorg/modules/linux
@dirrm lib/xorg/modules/multimedia
diff --git a/x11-servers/xorg-vfbserver/Makefile b/x11-servers/xorg-vfbserver/Makefile
index 41efca4b6c5c..a2f86313759d 100644
--- a/x11-servers/xorg-vfbserver/Makefile
+++ b/x11-servers/xorg-vfbserver/Makefile
@@ -6,9 +6,8 @@
#
PORTNAME= xorg-vfbserver
-PORTVERSION= 1.6.0
+PORTVERSION= 1.6.1
PORTEPOCH= 1
-#PORTREVISION= 1
CATEGORIES= x11-servers
MAINTAINER= x11@FreeBSD.org
diff --git a/x11-servers/xorg-vfbserver/distinfo b/x11-servers/xorg-vfbserver/distinfo
index 0455188e73b0..34f82e5da28d 100644
--- a/x11-servers/xorg-vfbserver/distinfo
+++ b/x11-servers/xorg-vfbserver/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/xserver/xorg-server-1.6.0.tar.bz2) = aafe73f5807ce8bb534727ecb72467c7
-SHA256 (xorg/xserver/xorg-server-1.6.0.tar.bz2) = 81a9a02b621e8a3e0bae1ad1b5dd6706a3fdcdbe766d75e1670ab5b3f0d32812
-SIZE (xorg/xserver/xorg-server-1.6.0.tar.bz2) = 4655422
+MD5 (xorg/xserver/xorg-server-1.6.1.tar.bz2) = ed0878bf32a24d4948c3b8a122a39eff
+SHA256 (xorg/xserver/xorg-server-1.6.1.tar.bz2) = 0edbaa994797cb7944a4129d33b634ad99164b21ec32355d56996a178d38bfcf
+SIZE (xorg/xserver/xorg-server-1.6.1.tar.bz2) = 4636802
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 13:39:51 +0000