Make devd an option, enabled by default.

Restore the hal option.
Make devd and hal mutually exclusive, using radio buttons.

OK'd by:	bapt


git-svn-id: https://trillian.chruetertee.ch/svn/ports/trunk@1149 058c260c-8361-11dd-a0ac-aa2bafec7d09

2 files changed, 28 insertions, 7 deletions

diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile
index 0e4077c..8ead329 100644
--- a/x11-servers/xorg-server/Makefile
+++ b/x11-servers/xorg-server/Makefile
@@ -21,21 +21,27 @@ XORG_CAT=	xserver
 SLAVE_PORT?=	no
 
 OPTIONS_DEFINE=	AIGLX SUID
+OPTIONS_RADIO=	CONF
+OPTIONS_RADIO_CONF= HAL DEVD
 AIGLX_DESC=	Compile with Accelerated Indirect GLX support
 SUID_DESC=	Install the Xorg server with setuid bit set
-OPTIONS_DEFAULT=AIGLX SUID
+HAL_DESC=	Compile with HAL config support
+DEVD_DESC=	Use devd for autoconfiguration of input devices
+OPTIONS_DEFAULT=AIGLX SUID DEVD
+
+OPTIONS_EXCLUDE_sparc64=	HAL
 
 .include <bsd.port.options.mk>
 
 .if defined(WITH_NEW_XORG)
 XORG_VERSION=	1.12.4
-XORG_REVISION=	1
+XORG_REVISION=	2
 PLIST_SUB+=	OLD="@comment " NEW=""
 EXTRA_PATCHES+=	${FILESDIR}/extra-clang \
 		${FILESDIR}/extra-configure
 .else
 XORG_VERSION=	1.7.7
-XORG_REVISION=	8
+XORG_REVISION=	9
 PLIST_SUB+=	OLD="" NEW="@comment "
 EXTRA_PATCHES+=	${FILESDIR}/extra-Xext-xace.c \
 		${FILESDIR}/extra-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c \
@@ -47,9 +53,8 @@ EXTRA_PATCHES+=	${FILESDIR}/extra-Xext-xace.c \
 		${FILESDIR}/extra-Xserver-hw-xfree86-common-xf86Config.c
 .endif
 
-USES=		gmake perl5
-USE_PERL5=	build
 USE_BZIP2=	yes
+USES=		gmake
 USE_GL=		gl
 USE_XORG?=	xf86driproto glproto xdmcp x11 xkbfile xxf86misc xxf86vm xaw7 \
 		xmu xt xpm xext randrproto renderproto fixesproto damageproto \
@@ -61,10 +66,11 @@ USE_XORG?=	xf86driproto glproto xdmcp x11 xkbfile xxf86misc xxf86vm xaw7 \
 
 MAKE_JOBS_UNSAFE=	yes
 USE_OPENSSL=	yes
+USE_PERL5_BUILD=yes
 CONFIGURE_ARGS?=--disable-dmx --disable-xvfb --disable-xnest \
 		--without-xmlto --disable-docs --disable-devel-docs \
 		--localstatedir=/var --without-dtrace --disable-xephyr \
-		--enable-record=yes --enable-config-hal=no
+		--enable-record=yes
 
 .if ${SLAVE_PORT} == "no"
 SUB_FILES=	pkg-install pkg-deinstall
@@ -94,6 +100,17 @@ PLIST=		${.CURDIR}/pkg-plist
 CONFIGURE_ENV=	SHA1_LIB="-L/usr/lib -lcrypto" SHA1_CFLAGS="-I/usr/include"
 .endif
 
+.if ${PORT_OPTIONS:MHAL}
+LIB_DEPENDS+=	hal:${PORTSDIR}/sysutils/hal
+CONFIGURE_ARGS+=	--enable-config-hal=yes
+.else
+CONFIGURE_ARGS+=	--enable-config-hal=no
+.endif
+
+.if ${PORT_OPTIONS:MDEVD}
+EXTRA_PATCHES+=		extra-config_devd.c
+.endif
+
 .if ${PORT_OPTIONS:MAIGLX}
 CONFIGURE_ARGS+=	--enable-aiglx=yes
 .else
@@ -163,13 +180,17 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|@GLX_TRUE@GLXMODS =|@GLX_BOGUS@GLXMODS =|g' \
 		-e 's|^LTLIBRARIES = |LTLIBRARIES = libglx.la |g' \
 		${WRKSRC}/hw/xfree86/dixmods/Makefile.in
+.if ${PORT_OPTIONS:MDEVD}
 	@${ECHO_CMD} -e "\nint config_devd_init(void);\nvoid config_devd_fini(void);" \
 		>> ${WRKSRC}/config/config-backends.h
-
+.endif
+ 
 post-configure:
+.if ${PORT_OPTIONS:MDEVD}
 	@${REINPLACE_CMD} -e 's|config\.c|config.c devd.c|g' \
 		-e 's|config\.lo|config.lo devd.lo|g' \
 		${WRKSRC}/config/Makefile
+.endif
 
 .if ${SLAVE_PORT} == "no"
 pre-su-install:
diff --git a/x11-servers/xorg-server/files/patch-config-devd b/x11-servers/xorg-server/files/extra-config_devd.c
index f6d66a3..f6d66a3 100644
--- a/x11-servers/xorg-server/files/patch-config-devd
+++ b/x11-servers/xorg-server/files/extra-config_devd.c