[Midnightbsd-cvs] mports: Makefile: Switch to OPTIONS

[laffer1 at midnightbsd.org]

Log Message:
-----------
Switch to OPTIONS

Modified Files:
--------------
    mports/x11-servers/xorg-server:
        Makefile (r1.8 -> r1.9)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/x11-servers/xorg-server/Makefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -L x11-servers/xorg-server/Makefile -L x11-servers/xorg-server/Makefile -u -r1.8 -r1.9
--- x11-servers/xorg-server/Makefile
+++ x11-servers/xorg-server/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	xorg-server
 PORTVERSION=	1.4
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	x11-servers
 MASTER_SITES=	http://xorg.freedesktop.org/releases/individual/xserver/:fdo \
@@ -22,7 +22,7 @@
 LICENSE=	x11
 
 LIB_DEPENDS=	drm:${PORTSDIR}/graphics/libdrm
-RUN_DEPENDS=	${X11BASE}/share/X11/xkb/rules/base.xml:${PORTSDIR}/x11/xkeyboard-config
+RUN_DEPENDS=	${LOCALBASE}/share/X11/xkb/rules/base.xml:${PORTSDIR}/x11/xkeyboard-config
 
 XORG_CAT=	xserver
 
@@ -37,25 +37,31 @@
 USE_PERL5_BUILD=yes
 CONFIGURE_ARGS=	--with-mesa-source=${WRKDIR}/Mesa-7.0.2 \
 		--disable-dmx --disable-xvfb --disable-xnest --disable-xprint \
-		--localstatedir=/var
+		--localstatedir=/var --without-dtrace
+
+OPTIONS=	HAL     "Compile with HAL config support" on \
+		AIGLX   "Compile with Accelerated Indirect GLX support" on \
+		SUID    "Install the Xorg server with setuid bit set" on
+
+.include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_HAL)
 LIB_DEPENDS+=	hal.1:${PORTSDIR}/sysutils/hal
-CONFIGURE_ARGS+=	--enable-config-hal
+CONFIGURE_ARGS+=	--enable-config-hal=yes
 .else
-CONFIGURE_ARGS+=	--disable-config-hal
+CONFIGURE_ARGS+=	--enable-config-hal=no
 .endif
 
 .if !defined(WITHOUT_AIGLX)
 CONFIGURE_ARGS+=	--enable-aiglx=yes
 .else
-CONFIGURE_ARGS+=	--disable-aiglx=yes
+CONFIGURE_ARGS+=	--enable-aiglx=no
 .endif
 
-.if !defined(NO_SUID_XSERVER) || ${NO_SUID_XSERVER} == NO
-CONFIGURE_ARGS+=--enable-install-setuid
+.if !defined(WITHOUT_SUID) && (!defined(NO_SUID_XSERVER) || ${NO_SUID_XSERVER} == NO)
+CONFIGURE_ARGS+=--enable-install-setuid=yes
 .else
-CONFIGURE_ARGS+=--disable-install-setuid
+CONFIGURE_ARGS+=--enable-install-setuid=no
 .endif
 
 MAN1=		Xorg.1 \
@@ -69,9 +75,6 @@
 MAN5=		xorg.conf.5 \
 		SecurityPolicy.5
 
-.include <bsd.port.pre.mk>
-
-
 .if ${ARCH} == sparc64
 PLIST_SUB+=	SPARC64=""
 PLIST_SUB+=	SPARC64_NA="@comment "
@@ -87,8 +90,7 @@
 PLIST_SUB+=	AMD64_I386_SPARC64="@comment "
 .endif
 
-
-.if !defined(NO_SUID_XSERVER) || ${NO_SUID_XSERVER} == NO
+.if !defined(WITHOUT_SUID) && (!defined(NO_SUID_XSERVER) || ${NO_SUID_XSERVER} == NO)
 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"