Stupid autohell is stupid...

The situation is this: even when we --disable-gtk-doc, if gtk-doc is actually installed at configure stage, tools like gtkdoc-rebase will be picked up and run during the install target. That is bad because the gtk-doc package may have been removed by then, especially during dpb(1) bulks (we explicitely disable support for it so why should it stay...). So for now, let's add the following env to configure whenever we use --disable-gtk-doc, until a bettersolution is found... CONFIGURE_ENV +=ac_cv_path_GTKDOC_CHECK="" \ ac_cv_path_GTKDOC_REBASE="" \ ac_cv_path_GTKDOC_MKPDF=""
2012-09-21 14:48:05 +00:00 · 2012-09-21 14:48:05 +00:00 · ef5cb32a0f
commit ef5cb32a0f
parent 141ad145f0
29 changed files with 204 additions and 29 deletions
--- a/audio/libcanberra/Makefile
+++ b/audio/libcanberra/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.35 2012/08/25 17:10:58 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.36 2012/09/21 14:48:05 ajacoutot Exp $

 SHARED_ONLY=	Yes

@ -102,6 +102,12 @@ CONFIGURE_ARGS= 	${CONFIGURE_SHARED} \
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib"

+# If one of these tools is found at configure stage, it might be used,
+# no matter whether we use --disable-gtk-doc or not.
+CONFIGURE_ENV +=ac_cv_path_GTKDOC_CHECK="" \
+		ac_cv_path_GTKDOC_REBASE="" \
+		ac_cv_path_GTKDOC_MKPDF=""
+
 pre-configure:
 	cp ${FILESDIR}/sndio.c ${WRKSRC}/src
 	${SUBST_CMD} ${WRKSRC}/src/sound-theme-spec.c \
--- a/devel/glib2/Makefile
+++ b/devel/glib2/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.185 2012/09/21 13:16:49 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.186 2012/09/21 14:48:05 ajacoutot Exp $

 COMMENT=		general-purpose utility library

@ -70,6 +70,12 @@ CONFIGURE_ARGS=		${CONFIGURE_SHARED} \
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib"

+# If one of these tools is found at configure stage, it might be used,
+# no matter whether we use --disable-gtk-doc or not.
+CONFIGURE_ENV +=ac_cv_path_GTKDOC_CHECK="" \
+		ac_cv_path_GTKDOC_REBASE="" \
+		ac_cv_path_GTKDOC_MKPDF=""
+
 ### kqueue(2) backend ##################################################
 # https://bugzilla.gnome.org/show_bug.cgi?id=679793
 AUTOMAKE_VERSION=	1.11
--- a/geo/geoclue/Makefile
+++ b/geo/geoclue/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2012/09/21 14:01:54 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.18 2012/09/21 14:48:05 ajacoutot Exp $

 COMMENT=		modular geoinformation service on top of D-Bus

@ -41,4 +41,10 @@ CONFIGURE_ARGS=		${CONFIGURE_SHARED} \
 CONFIGURE_ENV=          CPPFLAGS="-I${LOCALBASE}/include" \
                        LDFLAGS="-L${LOCALBASE}/lib"

+# If one of these tools is found at configure stage, it might be used,
+# no matter whether we use --disable-gtk-doc or not.
+CONFIGURE_ENV +=ac_cv_path_GTKDOC_CHECK="" \
+		ac_cv_path_GTKDOC_REBASE="" \
+		ac_cv_path_GTKDOC_MKPDF=""
+
 .include <bsd.port.mk>
--- a/graphics/colord-gtk/Makefile
+++ b/graphics/colord-gtk/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2012/08/04 14:59:04 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.2 2012/09/21 14:48:05 ajacoutot Exp $

 COMMENT=	GTK+ support library for colord

@ -49,6 +49,12 @@ CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
 		--enable-introspection \
 		--disable-gtk-doc

+# If one of these tools is found at configure stage, it might be used,
+# no matter whether we use --disable-gtk-doc or not.
+CONFIGURE_ENV +=ac_cv_path_GTKDOC_CHECK="" \
+		ac_cv_path_GTKDOC_REBASE="" \
+		ac_cv_path_GTKDOC_MKPDF=""
+
 pre-configure:
 	perl -pi -e 's,-Wclobbered,,g;' \
 		-e 's,-Wempty-body,,g;' \
--- a/graphics/colord/Makefile
+++ b/graphics/colord/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2012/08/04 15:00:16 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.16 2012/09/21 14:48:05 ajacoutot Exp $

 COMMENT=	device color profile management daemon

@ -53,6 +53,12 @@ CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
 		--with-daemon-user=_colord \
 		--disable-sane # needs gudev, libgusb

+# If one of these tools is found at configure stage, it might be used,
+# no matter whether we use --disable-gtk-doc or not.
+CONFIGURE_ENV +=ac_cv_path_GTKDOC_CHECK="" \
+		ac_cv_path_GTKDOC_REBASE="" \
+		ac_cv_path_GTKDOC_MKPDF=""
+
 FAKE_FLAGS=	sysconfdir="${PREFIX}/share/examples/colord"

 pre-configure:
--- a/graphics/gegl/Makefile
+++ b/graphics/gegl/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.37 2012/06/06 07:58:57 giovanni Exp $
+# $OpenBSD: Makefile,v 1.38 2012/09/21 14:48:05 ajacoutot Exp $

 SHARED_ONLY=	Yes

@ -88,6 +88,12 @@ CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
 		--without-libv4l \
 		--without-libspiro

+# If one of these tools is found at configure stage, it might be used,
+# no matter whether we use --disable-gtk-doc or not.
+CONFIGURE_ENV +=ac_cv_path_GTKDOC_CHECK="" \
+		ac_cv_path_GTKDOC_REBASE="" \
+		ac_cv_path_GTKDOC_MKPDF=""
+
 # XXX https://bugzilla.gnome.org/show_bug.cgi?id=673580
 #BUILD_DEPENDS += lang/vala \
 #		devel/gobject-introspection
--- a/inputmethods/ibus/Makefile
+++ b/inputmethods/ibus/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.27 2012/06/15 08:32:16 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.28 2012/09/21 14:48:05 ajacoutot Exp $

 SHARED_ONLY =	Yes

@ -60,4 +60,10 @@ CONFIGURE_ARGS = --enable-introspection \
 CONFIGURE_ENV =	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"

+# If one of these tools is found at configure stage, it might be used,
+# no matter whether we use --disable-gtk-doc or not.
+CONFIGURE_ENV +=ac_cv_path_GTKDOC_CHECK="" \
+		ac_cv_path_GTKDOC_REBASE="" \
+		ac_cv_path_GTKDOC_MKPDF=""
+
 .include <bsd.port.mk>
--- a/multimedia/gstreamer-0.10/Makefile.inc
+++ b/multimedia/gstreamer-0.10/Makefile.inc
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.23 2012/09/06 12:37:57 ajacoutot Exp $
+# $OpenBSD: Makefile.inc,v 1.24 2012/09/21 14:48:06 ajacoutot Exp $

 # Most frequent usage of the GStreamer packages:
 # core          base library
@ -71,6 +71,12 @@ CONFIGURE_ARGS +=	${CONFIGURE_SHARED} \
 			--disable-valgrind \
 			--disable-static

+# If one of these tools is found at configure stage, it might be used,
+# no matter whether we use --disable-gtk-doc or not.
+CONFIGURE_ENV +=ac_cv_path_GTKDOC_CHECK="" \
+		ac_cv_path_GTKDOC_REBASE="" \
+		ac_cv_path_GTKDOC_MKPDF=""
+
 CPPFLAGS +=		-I${LOCALBASE}/include \
 			-I${LOCALBASE}/include/libpng \
 			-I${X11BASE}/include
--- a/multimedia/gstreamer1/Makefile.inc
+++ b/multimedia/gstreamer1/Makefile.inc
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.1 2012/09/06 12:57:49 ajacoutot Exp $
+# $OpenBSD: Makefile.inc,v 1.2 2012/09/21 14:48:06 ajacoutot Exp $

 # Most frequent usage of the GStreamer packages:
 # core		base library
@ -74,6 +74,12 @@ CONFIGURE_ARGS +=	${CONFIGURE_SHARED} \
 			--disable-valgrind \
 			--disable-static

+# If one of these tools is found at configure stage, it might be used,
+# no matter whether we use --disable-gtk-doc or not.
+CONFIGURE_ENV +=ac_cv_path_GTKDOC_CHECK="" \
+		ac_cv_path_GTKDOC_REBASE="" \
+		ac_cv_path_GTKDOC_MKPDF=""
+
 CPPFLAGS +=		-I${LOCALBASE}/include \
 			-I${LOCALBASE}/include/libpng \
 			-I${X11BASE}/include
--- a/multimedia/ogmrip/Makefile
+++ b/multimedia/ogmrip/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2012/06/27 10:46:00 pascal Exp $
+# $OpenBSD: Makefile,v 1.3 2012/09/21 14:48:06 ajacoutot Exp $

 SHARED_ONLY =		Yes

@ -68,6 +68,12 @@ CONFIGURE_STYLE =	gnu
 CONFIGURE_ARGS =	${CONFIGURE_SHARED} \
 			--disable-gtk-doc

+# If one of these tools is found at configure stage, it might be used,
+# no matter whether we use --disable-gtk-doc or not.
+CONFIGURE_ENV +=ac_cv_path_GTKDOC_CHECK="" \
+		ac_cv_path_GTKDOC_REBASE="" \
+		ac_cv_path_GTKDOC_MKPDF=""
+
 MODGCONF2_SCHEMAS_DIR =	ogmrip

 NO_REGRESS =		Yes
--- a/net/libpcapnav/Makefile
+++ b/net/libpcapnav/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2011/09/21 17:20:56 jasper Exp $
+# $OpenBSD: Makefile,v 1.9 2012/09/21 14:48:06 ajacoutot Exp $

 COMMENT=	library for navigating to arbitrary packets in a trace file

@ -22,4 +22,10 @@ USE_LIBTOOL=		Yes
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--disable-gtk-doc --with-html-dir=${PREFIX}/share/doc/libpcapnav

+# If one of these tools is found at configure stage, it might be used,
+# no matter whether we use --disable-gtk-doc or not.
+CONFIGURE_ENV +=ac_cv_path_GTKDOC_CHECK="" \
+		ac_cv_path_GTKDOC_REBASE="" \
+		ac_cv_path_GTKDOC_MKPDF=""
+
 .include <bsd.port.mk>
--- a/net/loudmouth/Makefile
+++ b/net/loudmouth/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.18 2012/09/01 14:36:58 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.19 2012/09/21 14:48:06 ajacoutot Exp $

 COMMENT=		lightweight Jabber client library

@ -35,4 +35,10 @@ CONFIGURE_ARGS+=	${CONFIGURE_SHARED} \
 			--with-check=${LOCALBASE} \
 			--with-ssl=openssl

+# If one of these tools is found at configure stage, it might be used,
+# no matter whether we use --disable-gtk-doc or not.
+CONFIGURE_ENV +=ac_cv_path_GTKDOC_CHECK="" \
+		ac_cv_path_GTKDOC_REBASE="" \
+		ac_cv_path_GTKDOC_MKPDF=""
+
 .include <bsd.port.mk>
--- a/net/telepathy/telepathy-farstream/Makefile
+++ b/net/telepathy/telepathy-farstream/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2012/08/29 17:50:55 jasper Exp $
+# $OpenBSD: Makefile,v 1.6 2012/09/21 14:48:06 ajacoutot Exp $

 COMMENT=		flexible communications framework, farstream component

@ -24,4 +24,10 @@ CONFIGURE_ARGS=		${CONFIGURE_SHARED} \
 			--disable-gtk-doc \
 			--enable-python

+# If one of these tools is found at configure stage, it might be used,
+# no matter whether we use --disable-gtk-doc or not.
+CONFIGURE_ENV +=ac_cv_path_GTKDOC_CHECK="" \
+		ac_cv_path_GTKDOC_REBASE="" \
+		ac_cv_path_GTKDOC_MKPDF=""
+
 .include <bsd.port.mk>
--- a/net/telepathy/telepathy-gabble/Makefile
+++ b/net/telepathy/telepathy-gabble/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.52 2012/08/29 17:50:55 jasper Exp $
+# $OpenBSD: Makefile,v 1.53 2012/09/21 14:48:06 ajacoutot Exp $

 COMMENT=		flexible communications framework, xmpp component

@ -36,4 +36,10 @@ CONFIGURE_ARGS=		--with-ca-certificates=/etc/ssl/cert.pem \

 MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/lib/ext/wocky

+# If one of these tools is found at configure stage, it might be used,
+# no matter whether we use --disable-gtk-doc or not.
+CONFIGURE_ENV +=ac_cv_path_GTKDOC_CHECK="" \
+		ac_cv_path_GTKDOC_REBASE="" \
+		ac_cv_path_GTKDOC_MKPDF=""
+
 .include <bsd.port.mk>
--- a/net/telepathy/telepathy-glib/Makefile
+++ b/net/telepathy/telepathy-glib/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.46 2012/08/29 18:27:53 jasper Exp $
+# $OpenBSD: Makefile,v 1.47 2012/09/21 14:48:06 ajacoutot Exp $

 COMMENT=		flexible communications framework, glib bindings

@ -30,4 +30,10 @@ CONFIGURE_ARGS+=	${CONFIGURE_SHARED} \
 			--enable-vala-bindings
 #CONFIGURE_ARGS+=	--enable-backtrace (add -llibexecinfo)

+# If one of these tools is found at configure stage, it might be used,
+# no matter whether we use --disable-gtk-doc or not.
+CONFIGURE_ENV +=ac_cv_path_GTKDOC_CHECK="" \
+		ac_cv_path_GTKDOC_REBASE="" \
+		ac_cv_path_GTKDOC_MKPDF=""
+
 .include <bsd.port.mk>
--- a/net/telepathy/telepathy-mission-control/Makefile
+++ b/net/telepathy/telepathy-mission-control/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.35 2012/08/29 18:27:53 jasper Exp $
+# $OpenBSD: Makefile,v 1.36 2012/09/21 14:48:06 ajacoutot Exp $

 COMMENT=		abstraction layer between apps and connection managers

@ -31,4 +31,10 @@ CONFIGURE_ARGS+=	${CONFIGURE_SHARED} \
 			--enable-mcclient-so6 \
 			--with-connectivity=no

+# If one of these tools is found at configure stage, it might be used,
+# no matter whether we use --disable-gtk-doc or not.
+CONFIGURE_ENV +=ac_cv_path_GTKDOC_CHECK="" \
+		ac_cv_path_GTKDOC_REBASE="" \
+		ac_cv_path_GTKDOC_MKPDF=""
+
 .include <bsd.port.mk>
--- a/print/poppler/Makefile
+++ b/print/poppler/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.66 2012/09/02 15:21:17 kili Exp $
+# $OpenBSD: Makefile,v 1.67 2012/09/21 14:48:06 ajacoutot Exp $

 COMMENT-main=	PDF rendering library
 COMMENT-qt=	qt interface to PDF rendering library
@ -105,6 +105,12 @@ CONFIGURE_ARGS+= --disable-gtk-doc \
 CONFIGURE_ENV+= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng" \
 		LDFLAGS="-L${LOCALBASE}/lib"

+# If one of these tools is found at configure stage, it might be used,
+# no matter whether we use --disable-gtk-doc or not.
+CONFIGURE_ENV +=ac_cv_path_GTKDOC_CHECK="" \
+		ac_cv_path_GTKDOC_REBASE="" \
+		ac_cv_path_GTKDOC_MKPDF=""
+
 USE_LIBTOOL=	Yes
 USE_GMAKE=	Yes

--- a/productivity/rubrica2/Makefile
+++ b/productivity/rubrica2/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2011/11/03 22:21:21 jasper Exp $
+# $OpenBSD: Makefile,v 1.15 2012/09/21 14:48:06 ajacoutot Exp $

 SHARED_ONLY=	Yes

@ -48,6 +48,12 @@ CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
 CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" \
 		CPPFLAGS="-I${LOCALBASE}/include"

+# If one of these tools is found at configure stage, it might be used,
+# no matter whether we use --disable-gtk-doc or not.
+CONFIGURE_ENV +=ac_cv_path_GTKDOC_CHECK="" \
+		ac_cv_path_GTKDOC_REBASE="" \
+		ac_cv_path_GTKDOC_MKPDF=""
+
 RUN_DEPENDS=	devel/desktop-file-utils \
 		misc/shared-mime-info \
 		x11/gnome/icon-theme
--- a/security/gnutls/Makefile
+++ b/security/gnutls/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.61 2012/09/20 17:49:10 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.62 2012/09/21 14:48:06 ajacoutot Exp $

 # XXX check why our getopt_long(3) fails the configure test
 # + rm patch-gl_unistd_in_h
@ -59,6 +59,12 @@ CONFIGURE_ARGS += --without-tpm
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"

+# If one of these tools is found at configure stage, it might be used,
+# no matter whether we use --disable-gtk-doc or not.
+CONFIGURE_ENV +=ac_cv_path_GTKDOC_CHECK="" \
+		ac_cv_path_GTKDOC_REBASE="" \
+		ac_cv_path_GTKDOC_MKPDF=""
+
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gnutls
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/gnutls
--- a/security/libtasn1/Makefile
+++ b/security/libtasn1/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2012/07/05 06:21:04 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.17 2012/09/21 14:48:06 ajacoutot Exp $

 COMMENT=		Abstract Syntax Notation One structure parser library

@ -24,4 +24,10 @@ CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS=		${CONFIGURE_SHARED} \
 			--disable-gtk-doc

+# If one of these tools is found at configure stage, it might be used,
+# no matter whether we use --disable-gtk-doc or not.
+CONFIGURE_ENV +=ac_cv_path_GTKDOC_CHECK="" \
+		ac_cv_path_GTKDOC_REBASE="" \
+		ac_cv_path_GTKDOC_MKPDF=""
+
 .include <bsd.port.mk>
--- a/security/p11-kit/Makefile
+++ b/security/p11-kit/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2012/08/19 11:10:43 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.13 2012/09/21 14:48:06 ajacoutot Exp $

 COMMENT=	library for loading and enumurating of PKCS\#11 modules

@ -32,6 +32,12 @@ CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
 # no translation yet
 CONFIGURE_ARGS += --disable-nls

+# If one of these tools is found at configure stage, it might be used,
+# no matter whether we use --disable-gtk-doc or not.
+CONFIGURE_ENV +=ac_cv_path_GTKDOC_CHECK="" \
+		ac_cv_path_GTKDOC_REBASE="" \
+		ac_cv_path_GTKDOC_MKPDF=""
+
 FAKE_FLAGS=	exampledir=${PREFIX}/share/examples/p11-kit/pkcs11

 ### https://bugs.freedesktop.org/show_bug.cgi?id=53706 ###
--- a/sysutils/polkit/Makefile
+++ b/sysutils/polkit/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.35 2012/09/19 13:03:58 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.36 2012/09/21 14:48:06 ajacoutot Exp $

 COMMENT=	framework for granting privileged operations to users

@ -63,6 +63,12 @@ CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
 		--with-os-type=openbsd \
 		--with-authfw=bsdauth

+# If one of these tools is found at configure stage, it might be used,
+# no matter whether we use --disable-gtk-doc or not.
+CONFIGURE_ENV +=ac_cv_path_GTKDOC_CHECK="" \
+		ac_cv_path_GTKDOC_REBASE="" \
+		ac_cv_path_GTKDOC_MKPDF=""
+
 USE_GMAKE=	Yes
 USE_GROFF=	Yes

--- a/sysutils/upower/Makefile
+++ b/sysutils/upower/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.20 2012/09/04 09:06:12 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.21 2012/09/21 14:48:06 ajacoutot Exp $

 ONLY_FOR_ARCHS =${APM_ARCHS}

@ -33,6 +33,13 @@ CONFIGURE_ARGS +=	${CONFIGURE_SHARED} \

 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
+
+# If one of these tools is found at configure stage, it might be used,
+# no matter whether we use --disable-gtk-doc or not.
+CONFIGURE_ENV +=ac_cv_path_GTKDOC_CHECK="" \
+		ac_cv_path_GTKDOC_REBASE="" \
+		ac_cv_path_GTKDOC_MKPDF=""
+
 FAKE_FLAGS =	sysconfdir=${PREFIX}/share/examples/upower

 USE_GMAKE =	Yes
--- a/textproc/gtkspell/Makefile
+++ b/textproc/gtkspell/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.38 2012/04/11 09:10:09 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.39 2012/09/21 14:48:06 ajacoutot Exp $

 COMMENT=	gtk+2 spelling checker
 DISTNAME=	gtkspell-2.0.16
@ -44,4 +44,10 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
 		--disable-gtk-doc

+# If one of these tools is found at configure stage, it might be used,
+# no matter whether we use --disable-gtk-doc or not.
+CONFIGURE_ENV +=ac_cv_path_GTKDOC_CHECK="" \
+		ac_cv_path_GTKDOC_REBASE="" \
+		ac_cv_path_GTKDOC_MKPDF=""
+
 .include <bsd.port.mk>
--- a/textproc/gtkspell3/Makefile
+++ b/textproc/gtkspell3/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2012/04/12 18:04:26 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.2 2012/09/21 14:48:06 ajacoutot Exp $

 COMMENT=	gtk+3 spelling checker

@ -47,4 +47,10 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
 		--disable-gtk-doc

+# If one of these tools is found at configure stage, it might be used,
+# no matter whether we use --disable-gtk-doc or not.
+CONFIGURE_ENV +=ac_cv_path_GTKDOC_CHECK="" \
+		ac_cv_path_GTKDOC_REBASE="" \
+		ac_cv_path_GTKDOC_MKPDF=""
+
 .include <bsd.port.mk>
--- a/www/webkit/Makefile
+++ b/www/webkit/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.71 2012/09/06 12:38:35 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.72 2012/09/21 14:48:06 ajacoutot Exp $

 ONLY_FOR_ARCHS=	${GCC4_ARCHS}

@ -40,6 +40,12 @@ CONFIGURE_ENV =	CPPFLAGS="-I${LOCALBASE}/include/libpng -I${LOCALBASE}/include -
 		LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib -lX11" \
 		ac_cv_path_FLEX=${LOCALBASE}/bin/gflex

+# If one of these tools is found at configure stage, it might be used,
+# no matter whether we use --disable-gtk-doc or not.
+CONFIGURE_ENV +=ac_cv_path_GTKDOC_CHECK="" \
+		ac_cv_path_GTKDOC_REBASE="" \
+		ac_cv_path_GTKDOC_MKPDF=""
+
 LIBTOOL_FLAGS =	--tag=disable-static
 CONFIGURE_ARGS+=${CONFIGURE_SHARED} \
 		--disable-static \
--- a/x11/dbus-glib/Makefile
+++ b/x11/dbus-glib/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.38 2012/09/01 14:36:58 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.39 2012/09/21 14:48:06 ajacoutot Exp $

 COMMENT=	glib bindings for dbus message system

@ -41,6 +41,12 @@ CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"

+# If one of these tools is found at configure stage, it might be used,
+# no matter whether we use --disable-gtk-doc or not.
+CONFIGURE_ENV +=ac_cv_path_GTKDOC_CHECK="" \
+		ac_cv_path_GTKDOC_REBASE="" \
+		ac_cv_path_GTKDOC_MKPDF=""
+
 FAKE_FLAGS=	completiondir="${PREFIX}/share/examples/dbus-glib"

 .include <bsd.port.mk>
--- a/x11/gtk+2/Makefile
+++ b/x11/gtk+2/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.150 2012/09/21 13:24:09 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.151 2012/09/21 14:48:06 ajacoutot Exp $

 SHARED_ONLY=	Yes

@ -88,6 +88,12 @@ CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
 		--with-xinput \
 		--disable-papi

+# If one of these tools is found at configure stage, it might be used,
+# no matter whether we use --disable-gtk-doc or not.
+CONFIGURE_ENV +=ac_cv_path_GTKDOC_CHECK="" \
+		ac_cv_path_GTKDOC_REBASE="" \
+		ac_cv_path_GTKDOC_MKPDF=""
+
 FAKE_FLAGS=	sysconfdir=${PREFIX}/share/examples/gtk+2

 pre-configure:
--- a/x11/gtk+3/Makefile
+++ b/x11/gtk+3/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.47 2012/09/21 13:20:19 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.48 2012/09/21 14:48:06 ajacoutot Exp $

 SHARED_ONLY=	Yes

@ -93,6 +93,12 @@ CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
 		--enable-introspection \
 		--with-xml-catalog=${LOCALBASE}/share/xml/catalog

+# If one of these tools is found at configure stage, it might be used,
+# no matter whether we use --disable-gtk-doc or not.
+CONFIGURE_ENV +=ac_cv_path_GTKDOC_CHECK="" \
+		ac_cv_path_GTKDOC_REBASE="" \
+		ac_cv_path_GTKDOC_MKPDF=""
+
 # Do not build gtk-update-icon-cache and other shared tools.
 CONFIGURE_ARGS += --enable-gtk2-dependency
 BUILD_DEPENDS += x11/gtk+2,-guic