Install the X server without the SUID bit, remove the warning about the

possible insecurity of this, and inform users about the x11/wrapper port.

PR:		ports/22380
Submitted by:	Trevor Johnson <trevor@jpj.net>

x11/XFree86-4/Makefile

@@ -7,7 +7,7 @@
 
 PORTNAME=	XFree86
 PORTVERSION= 	4.0.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XFREE}
 MASTER_SITE_SUBDIR=	${PORTVERSION}
@@ -56,9 +56,6 @@ pre-fetch:
 .elif defined(USA_RESIDENT)
 .if ${USA_RESIDENT} == NO
 pre-fetch:
-.if !defined(BATCH) && !defined(PACKAGE_BUILDING)
-	${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-.endif
 MASTER_SITES+=	ftp://psych.psy.uq.oz.au/pub/X11R5/ \
 		ftp://ftp.internat.freebsd.org/pub/FreeBSD/X11-Crypto/ \
 		ftp://ftp3.za.freebsd.org/pub/FreeBSD/X11-Crypto/
@@ -68,9 +65,6 @@ IGNOREFILES=	Wraphelp.c
 .endif
 .if ${USA_RESIDENT} == YES
 pre-fetch:
-.if !defined(BATCH) && !defined(PACKAGE_BUILDING)
-	${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-.endif
 	@${ECHO}
 	@${ECHO} Assuming that you have fetched a USA-Legal Wraphelp.c.
 .endif
@@ -93,6 +87,7 @@ post-install:
 .ifndef DISTRIB
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 .endif
+	@${CAT} ${PKGMESSAGE}
 
 .ifdef DISTRIB
 distrib: all install

x11/XFree86-4/files/patch-config_cf_Server_tmpl

@@ -0,0 +1,11 @@
+--- config/cf/Server.tmpl.orig	Fri Feb 18 08:23:07 2000
++++ config/cf/Server.tmpl	Sat Oct 28 10:09:07 2000
+@@ -41,7 +41,7 @@
+ #ifndef SetUIDServerTarget
+ #if InstallServerSetUID
+ #define	SetUIDServerTarget(server,subdirs,objects,libs,syslibs)		@@\
+-ServerTargetWithFlags(server,subdirs,objects,libs,syslibs,$(INSTUIDFLAGS))
++ServerTargetWithFlags(server,subdirs,objects,libs,syslibs,$(INSTBINFLAGS))
+ #else
+ #define	SetUIDServerTarget ServerTarget
+ #endif

x11/XFree86-4/pkg-message

@@ -0,0 +1,5 @@
+************************************************************************
+* To improve security, the X server is installed without an SUID bit.  *
+* This is suitable for use with xdm, but not with a startx script.     *
+* If you need to use a startx script, install the x11/wrapper package. *
+************************************************************************