diff options
| author | rh <rh> | 2002-09-30 00:01:15 +0000 |
|---|---|---|
| committer | rh <rh> | 2002-09-30 00:01:15 +0000 |
| commit | 9b44cb0374824c841c673dbaf852be273976546f (patch) | |
| tree | dc871bbef29954e261c13807c2691111ba414f5a /mail/evolution | |
| parent | 21c94e1b8c6c308fed4b2168ad2553eb77cf171f (diff) | |
| download | pkgsrc-9b44cb0374824c841c673dbaf852be273976546f.tar.gz | |
The build process requires a valid X server, so check if DISPLAY is set
before building. Problem pointed out by Jared McNeill in private email.
On systems w/ Xvfb, create a virtual display, because that's all that's
needed for building.
Bump PKGREVISION.
Diffstat (limited to 'mail/evolution')
| -rw-r--r-- | mail/evolution/Makefile | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile index 07ad30af95d..7f6955e5133 100644 --- a/mail/evolution/Makefile +++ b/mail/evolution/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.23 2002/09/10 16:06:44 wiz Exp $ +# $NetBSD: Makefile,v 1.24 2002/09/30 00:01:15 rh Exp $ DISTNAME= evolution-1.0.8 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= mail time gnome MASTER_SITES= ${MASTER_SITE_GNOME:=stable/sources/evolution/} EXTRACT_SUFX= .tar.bz2 @@ -54,6 +54,25 @@ pre-configure: ${MV} $$i.fixed $$i ; \ done +.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/buildlink.mk" .include "../../sysutils/gnome-vfs/buildlink.mk" .include "../../devel/gettext-lib/buildlink.mk" |