aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--x11-servers/xorg-server/Makefile18
1 files changed, 7 insertions, 11 deletions
diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile
index aada4cf66bbc..ceda2a9b6cbb 100644
--- a/x11-servers/xorg-server/Makefile
+++ b/x11-servers/xorg-server/Makefile
@@ -41,16 +41,21 @@ CONFIGURE_ARGS= --with-mesa-source=${WRKDIR}/Mesa-7.0.1 \
.if !defined(WITHOUT_HAL)
LIB_DEPENDS+= hal.1:${PORTSDIR}/sysutils/hal
+CONFIGURE_ARGS+= --enable-config-hal
.else
CONFIGURE_ARGS+= --disable-config-hal
.endif
.if !defined(WITHOUT_AIGLX)
CONFIGURE_ARGS+= --enable-aiglx=yes
+.else
+CONFIGURE_ARGS+= --disable-aiglx=yes
.endif
.if !defined(NO_SUID_XSERVER) || ${NO_SUID_XSERVER} == NO
CONFIGURE_ARGS+=--enable-install-setuid
+.else
+CONFIGURE_ARGS+=--disable-install-setuid
.endif
MAN1= Xorg.1 \
@@ -64,7 +69,8 @@ MAN4= exa.4 \
MAN5= xorg.conf.5 \
SecurityPolicy.5
-NOT_FOR_ARCHS= ia64
+NOT_FOR_ARCHS= ia64 alpha
+
.include <bsd.port.pre.mk>
.if ${ARCH} == alpha
@@ -109,14 +115,4 @@ pre-everything::
@${ECHO_MSG} "NO_SUID_XSERVER=YES in /etc/make.conf."
.endif
-#post-patch:
-# ${ECHO_CMD} "XXX - Remove post-patch target!"
-# ${REINPLACE_CMD} -e 's|pixman|pixman-1|' ${WRKSRC}/configure
-# ${REINPLACE_CMD} -e 's|pixman/pixman.h|pixman.h|' \
-# ${WRKSRC}/fb/fb.h \
-# ${WRKSRC}/include/miscstruct.h \
-# ${WRKSRC}/mi/miregion.c \
-# ${WRKSRC}/render/picture.h
-# ${CP} ${FILESDIR}/GL-glx-glxbyteorder.h ${WRKSRC}/GL/glx/glxbyteorder.h
-
.include <bsd.port.post.mk>