From b5c54aa2cf883b8a022aad6cf184c19ca570d79b Mon Sep 17 00:00:00 2001
From: dmcmahill <dmcmahill@pkgsrc.org>
Date: Thu, 13 Mar 2003 02:37:58 +0000
Subject: add --disable-gtk-doc to CONFIGURE_ARGS to allow this to build
 without an active X display.

---
 mail/evolution/Makefile | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

(limited to 'mail/evolution')

diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index ae7e46f7559..86f74a21983 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2003/02/18 14:55:59 jmmv Exp $
+# $NetBSD: Makefile,v 1.33 2003/03/13 02:37:58 dmcmahill Exp $
 
 DISTNAME=		evolution-1.2.1
 PKGREVISION=		1
@@ -39,6 +39,7 @@ REPLACE_PERL+=		libical/scripts/mkrestrictiontable.pl
 REPLACE_PERL+=		tools/csv2vcard
 REPLACE_PERL+=		tools/evolution-addressbook-clean.in
 REPLACE_PERL+=		tools/killev
+CONFIGURE_ARGS+=	--disable-gtk-doc
 CONFIGURE_ARGS+=	--with-openldap --without-static-ldap
 CONFIGURE_ARGS+=	--enable-nntp=yes
 CONFIGURE_ARGS+=	--enable-openssl=yes
@@ -61,23 +62,6 @@ pre-configure:
 
 .include "../../mk/bsd.prefs.mk"
 
-DISPLAY?=	# empty if unset
-checkforx:
-.if ${DISPLAY}=="" || ${DISPLAY_OK:!${X11BASE}/bin/xdpyinfo >/dev/null 2>&1 && ${ECHO} YES || ${ECHO} NO!} == "NO"
-.if exists(${X11BASE}/bin/Xvfb)
-	-${SETENV} XAUTHORITY= ${X11BASE}/bin/Xvfb :2 &
-DISPLAY=	':2'
-.else
-	@${ECHO} "Error: Environment variable DISPLAY must be set"
-	@${ECHO} "       and point to a connectible X server."
-	@${FALSE}
-.endif	# Xvfb
-.endif	# DISPLAY
-
-MAKE_ENV+=	DISPLAY=${DISPLAY}
-
-pre-build: checkforx
-
 .include "../../textproc/libunicode/buildlink2.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
 .include "../../sysutils/gnome-vfs/buildlink2.mk"
-- 
cgit v1.2.3