[Midnightbsd-cvs] mports [21572] trunk/x11-servers/xorg-server: change plist setup

[laffer1 at midnightbsd.org]

Revision: 21572
          http://svnweb.midnightbsd.org/mports/?rev=21572
Author:   laffer1
Date:     2016-08-12 13:30:11 -0400 (Fri, 12 Aug 2016)
Log Message:
-----------
change plist setup

Modified Paths:
--------------
    trunk/x11-servers/xorg-server/Makefile
    trunk/x11-servers/xorg-server/pkg-plist

Modified: trunk/x11-servers/xorg-server/Makefile
===================================================================
--- trunk/x11-servers/xorg-server/Makefile	2016-08-12 17:18:13 UTC (rev 21571)
+++ trunk/x11-servers/xorg-server/Makefile	2016-08-12 17:30:11 UTC (rev 21572)
@@ -103,6 +103,8 @@
 .endif
 
 .if ${PORT_OPTIONS:MSUID}
+PLIST_SUB+=	NOSUID="@comment "
+
 pre-everything::
 	@${ECHO_MSG} "By default, the X Server installs as a set-user-id root binary. When run by"
 	@${ECHO_MSG} "a normal user, it checks arguments and environment as done in the x11/wrapper"
@@ -110,6 +112,10 @@
 	@${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} "xorg-server_UNSET=SUID in /etc/make.conf."
+
+
+.else
+PLIST_SUB+=	NOSUID="" SUID="@comment "
 .endif
 
 post-patch:

Modified: trunk/x11-servers/xorg-server/pkg-plist
===================================================================
--- trunk/x11-servers/xorg-server/pkg-plist	2016-08-12 17:18:13 UTC (rev 21571)
+++ trunk/x11-servers/xorg-server/pkg-plist	2016-08-12 17:30:11 UTC (rev 21572)
@@ -1,11 +1,6 @@
 bin/X
-%%SUID%%@owner root
-%%SUID%%@group wheel
-%%SUID%%@mode 4555
-bin/Xorg
-%%SUID%%@owner root
-%%SUID%%@group wheel
-%%SUID%%@mode
+%%SUID%%@(,,4555) bin/Xorg
+%%NO_SUID%%bin/Xorg
 bin/cvt
 bin/gtf
 include/xorg/BT.h