From 0c7c8dd0cf0f931f2b04a1452c656c4f10f600e3 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Sat, 19 Jun 2004 05:51:45 +0000 Subject: - Install the server setuid by default. The x11/wrapper/files/wrapper.c code is already in the server. I can't even imagine a situation where running an X server (which is run as root, mind you) is ok, while having a setuid X server with arguments and environment checking ala wrapper.c is not. But put an option in anyway. - Include the SERVER_PATCHES define needed for the new server ports. --- x11-servers/xorg-server/Makefile.inc | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'x11-servers/xorg-server/Makefile.inc') diff --git a/x11-servers/xorg-server/Makefile.inc b/x11-servers/xorg-server/Makefile.inc index a2a51d9857a0..3aab6d3616f6 100644 --- a/x11-servers/xorg-server/Makefile.inc +++ b/x11-servers/xorg-server/Makefile.inc @@ -39,6 +39,17 @@ CF_PATCHES= ${PORTSDIR}/x11-servers/xorg-server/files/patch-FreeBSD.cf \ ${PORTSDIR}/x11-servers/xorg-server/files/patch-X11.rules \ ${PORTSDIR}/x11-servers/xorg-server/files/patch-X11.tmpl +SERVER_PATCHES= ${PORTSDIR}/x11-servers/xorg-server/files/patch-Xserver-Imakefile \ + ${PORTSDIR}/x11-servers/xorg-server/files/patch-bus-Imakefile \ + ${PORTSDIR}/x11-servers/xorg-server/files/patch-fb-renderfixes.diff \ + ${PORTSDIR}/x11-servers/xorg-server/files/patch-kernel-Imakefile \ + ${PORTSDIR}/x11-servers/xorg-server/files/patch-loadmod.c \ + ${PORTSDIR}/x11-servers/xorg-server/files/patch-man-Imakefile \ + ${PORTSDIR}/x11-servers/xorg-server/files/patch-os-Imakefile \ + ${PORTSDIR}/x11-servers/xorg-server/files/patch-savage-pci-id \ + ${PORTSDIR}/x11-servers/xorg-server/files/patch-xf86sym.c \ + ${PORTSDIR}/x11-servers/xorg-server/files/patch-xkbout.c + .if !target(do-configure) do-configure: @cp ${X11BASE}/lib/X11/config/version.def ${WRKSRC}/config/cf -- cgit v1.2.3