diff options
| author | dmcmahill <dmcmahill@pkgsrc.org> | 2003-02-05 14:26:09 +0000 |
|---|---|---|
| committer | dmcmahill <dmcmahill@pkgsrc.org> | 2003-02-05 14:26:09 +0000 |
| commit | 0dc0299303b2f050f5be0d72ab5cc2e3d4d3d5ca (patch) | |
| tree | 04941488035b0ccbcff7b5e77bb8f688bacaa2e1 /devel/libglade | |
| parent | d37e2f85520a5479f6119d1a4c374c3a4d978ca1 (diff) | |
| download | pkgsrc-0dc0299303b2f050f5be0d72ab5cc2e3d4d3d5ca.tar.gz | |
make this build without requiring a running Xserver when gtk-doc is
installed.
Diffstat (limited to 'devel/libglade')
| -rw-r--r-- | devel/libglade/Makefile | 17 | ||||
| -rw-r--r-- | devel/libglade/distinfo | 4 | ||||
| -rw-r--r-- | devel/libglade/patches/patch-ab | 17 |
3 files changed, 16 insertions, 22 deletions
diff --git a/devel/libglade/Makefile b/devel/libglade/Makefile index 69e0009afc2..2399bb90777 100644 --- a/devel/libglade/Makefile +++ b/devel/libglade/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2002/10/19 10:54:50 rh Exp $ +# $NetBSD: Makefile,v 1.43 2003/02/05 14:26:09 dmcmahill Exp $ # DISTNAME= libglade-0.17 @@ -26,26 +26,11 @@ LIBTOOL_OVERRIDE= ${WRKSRC}/libtool CPPFLAGS+= -I${BUILDLINK_PREFIX.db}/include/db2 .endif -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-configure: ${RM} ${WRKSRC}/libgladeConf.sh -pre-build: checkforx - .include "../../devel/gettext-lib/buildlink2.mk" .include "../../textproc/libxml/buildlink2.mk" .include "../../x11/gnome-libs/buildlink2.mk" diff --git a/devel/libglade/distinfo b/devel/libglade/distinfo index b29b143c9a3..08e4f17f9b6 100644 --- a/devel/libglade/distinfo +++ b/devel/libglade/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.5 2002/09/06 12:09:08 wiz Exp $ +$NetBSD: distinfo,v 1.6 2003/02/05 14:26:09 dmcmahill Exp $ SHA1 (libglade-0.17.tar.gz) = 66dbb90ffcfe80c551d2f3a296729ceab527cbc0 Size (libglade-0.17.tar.gz) = 418921 bytes SHA1 (patch-aa) = 44cbfcb19c8ecb351cde94246512da3ff062d87e -SHA1 (patch-ab) = b7832173e36810c9e5e29aace918c8169de6f5ad +SHA1 (patch-ab) = 32b2076ce818d78910f0895714ce3084a342a6d2 diff --git a/devel/libglade/patches/patch-ab b/devel/libglade/patches/patch-ab index 26defc0fa78..61f5f869937 100644 --- a/devel/libglade/patches/patch-ab +++ b/devel/libglade/patches/patch-ab @@ -1,8 +1,17 @@ -$NetBSD: patch-ab,v 1.5 2001/03/18 00:40:50 mjl Exp $ +$NetBSD: patch-ab,v 1.6 2003/02/05 14:26:10 dmcmahill Exp $ ---- doc/Makefile.in.orig Sun Mar 18 01:30:34 2001 -+++ doc/Makefile.in Sun Mar 18 01:30:56 2001 -@@ -321,8 +321,6 @@ +--- doc/Makefile.in.orig Thu Sep 6 23:14:11 2001 ++++ doc/Makefile.in +@@ -156,7 +156,7 @@ tmpl_sources = \ + tmpl/libglade-unused.sgml + + +-@HAVE_GTK_DOC_TRUE@html_stamp = html.stamp ++#@HAVE_GTK_DOC_TRUE@html_stamp = html.stamp + + noinst_DATA = $(html_stamp) + +@@ -355,8 +355,6 @@ install-data-local: echo '-- Installing '$$i ; \ $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \ done; \ |