From 40b3c07678b56450b71f6ecc55d328d34b11eca4 Mon Sep 17 00:00:00 2001
From: matthieu <matthieu@openbsd.org>
Date: Wed, 8 Aug 2012 21:54:33 +0000
Subject: [PATCH] Don't touch the xserver autotools files a 2nd time in kdrive.
 This causes a rebuild of xserver during make release (configure becomes more
 recent than config.status again).

---
 kdrive/Makefile.bsd-wrapper | 3 ++-
 share/mk/bsd.xorg.mk        | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/kdrive/Makefile.bsd-wrapper b/kdrive/Makefile.bsd-wrapper
index d3b89f7ce..9e589a345 100644
--- a/kdrive/Makefile.bsd-wrapper
+++ b/kdrive/Makefile.bsd-wrapper
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.14 2012/06/10 13:21:32 matthieu Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.15 2012/08/08 21:54:33 matthieu Exp $
 
 .include <bsd.xconf.mk>
 
 _SRCDIR= ${.CURDIR}/../xserver
+NO_REORDER=yes
 
 XKB_PATH=	${X11BASE}/share/X11/xkb
 XKB_RULES=	base
diff --git a/share/mk/bsd.xorg.mk b/share/mk/bsd.xorg.mk
index 3be292267..545ae9c81 100644
--- a/share/mk/bsd.xorg.mk
+++ b/share/mk/bsd.xorg.mk
@@ -1,4 +1,4 @@
-# $OpenBSD: bsd.xorg.mk,v 1.43 2012/08/05 18:08:05 matthieu Exp $ -*- makefile  -*-
+# $OpenBSD: bsd.xorg.mk,v 1.44 2012/08/08 21:54:33 matthieu Exp $ -*- makefile  -*-
 #
 # Copyright © 2006,2012 Matthieu Herrb
 #
@@ -155,6 +155,7 @@ config.status:
 .if defined(XENOCARA_RERUN_AUTOCONF) && ${XENOCARA_RERUN_AUTOCONF:L} == "yes"
 	cd ${_SRCDIR}; ${AUTOTOOLS_ENV} exec autoreconf -v --install --force
 .else
+.if !defined(NO_REORDER)
 	@sed -e '/^#/d' ${REORDER_DEPENDENCIES} | \
 	  tsort -r|while read f; do \
 	    cd ${_SRCDIR}; \
@@ -169,6 +170,7 @@ config.status:
 			fi \
 			;; \
 		esac; done
+.endif
 .endif
 	${CONFIGURE_ENV} PATH=$(XENOCARA_PATH) \
 		exec sh ${_SRCDIR}/configure --prefix=${X11BASE} \