From f19cb223c7e4e41281b968950d530d7e41d66d0c Mon Sep 17 00:00:00 2001
From: espie <espie@openbsd.org>
Date: Sun, 6 Jun 2004 11:49:08 +0000
Subject: [PATCH] move the automake inter-dependencies to another file. checked
 by naddy@ on a full build. idea okay'ed by naddy and pvalchev.

---
 infrastructure/mk/automake.dep | 31 +++++++++++++++++++++++++++++++
 infrastructure/mk/bsd.port.mk  | 19 ++++++++++++++++++-
 infrastructure/mk/gnu.port.mk  | 20 ++------------------
 3 files changed, 51 insertions(+), 19 deletions(-)
 create mode 100644 infrastructure/mk/automake.dep

diff --git a/infrastructure/mk/automake.dep b/infrastructure/mk/automake.dep
new file mode 100644
index 00000000000..6c3ef184d1f
--- /dev/null
+++ b/infrastructure/mk/automake.dep
@@ -0,0 +1,31 @@
+# $OpenBSD: automake.dep,v 1.1 2004/06/06 11:49:08 espie Exp $
+configure configure.ac
+configure configure.in
+/Makefile.in /Makefile.am
+/Makefile.in configure.in
+/Makefile.in configure.ac
+/Makefile.in aclocal.m4
+aclocal.m4 configure.in
+aclocal.m4 configure.ac
+aclocal.m4 acinclude.m4
+config.h.in configure.in
+config.h.in configure.ac
+config.h.in aclocal.m4
+configure configure.in
+configure configure.ac
+configure aclocal.m4
+stamp-h.in configure.in
+stamp-h.in configure.ac
+stamp-h.in aclocal.m4
+stamp-h.in acconfig.h
+# kde files
+acinclude.m4 admin/cvs.sh
+configure.in admin/cvs.sh
+/Makefile.am admin/cvs.sh
+subdirs admin/cvs.sh
+/Makefile.am subdirs
+configure.files subdirs
+configure.in configure.files
+acinclude.m4 admin/libtool.m4.in
+acinclude.m4 admin/acinclude.m4.in
+acinclude.m4 libltdl/ltdl.m4
diff --git a/infrastructure/mk/bsd.port.mk b/infrastructure/mk/bsd.port.mk
index 82c02bae4d7..c392e247774 100644
--- a/infrastructure/mk/bsd.port.mk
+++ b/infrastructure/mk/bsd.port.mk
@@ -1,6 +1,6 @@
 #-*- mode: Makefile; tab-width: 4; -*-
 # ex:ts=4 sw=4 filetype=make:
-#	$OpenBSD: bsd.port.mk,v 1.616 2004/06/01 21:06:29 jolan Exp $
+#	$OpenBSD: bsd.port.mk,v 1.617 2004/06/06 11:49:08 espie Exp $
 #	$FreeBSD: bsd.port.mk,v 1.264 1996/12/25 02:27:44 imp Exp $
 #	$NetBSD: bsd.port.mk,v 1.62 1998/04/09 12:47:02 hubertf Exp $
 #
@@ -1105,6 +1105,7 @@ _LIB_DEP2= ${LIB_DEPENDS}
 
 README_NAME?=	${TEMPLATES}/README.port
 
+REORDER_DEPENDENCIES?=
 ###
 ### end of variable setup. Only targets now
 ###
@@ -1638,6 +1639,22 @@ ${_PATCH_COOKIE}: ${_EXTRACT_COOKIE}
 	@${MOD${_m:U}_post-patch}
 .  endif
 .endfor
+.if !empty(REORDER_DEPENDENCIES)
+	sed -e '/^#/d' ${REORDER_DEPENDENCIES} | \
+	  tsort -r|while read f; do \
+	    cd ${WRKSRC}; \
+		case $$f in \
+		/*) \
+			find . -name $${f#/} -print| while read i; \
+				do echo "Touching $$i"; touch $$i; done \
+			;; \
+		*) \
+			if test -e $$f ; then \
+				echo "Touching $$f"; touch $$f; \
+			fi \
+			;; \
+		esac; done
+.endif
 .if ${PATCH_CHECK_ONLY:L} != "yes"
 	@${_MAKE_COOKIE} $@
 .endif
diff --git a/infrastructure/mk/gnu.port.mk b/infrastructure/mk/gnu.port.mk
index 9f6f12207be..3a607abc6b9 100644
--- a/infrastructure/mk/gnu.port.mk
+++ b/infrastructure/mk/gnu.port.mk
@@ -1,6 +1,6 @@
 #-*- mode: Fundamental; tab-width: 4; -*-
 # ex:ts=4 sw=4 filetype=make:
-# $OpenBSD: gnu.port.mk,v 1.18 2004/05/05 11:17:22 espie Exp $
+# $OpenBSD: gnu.port.mk,v 1.19 2004/06/06 11:49:08 espie Exp $
 #	Based on bsd.port.mk, originally by Jordan K. Hubbard.
 #	This file is in the public domain.
 
@@ -59,11 +59,6 @@ CONFIGURE_ARGS+=	--sysconfdir='${SYSCONFDIR}'
 
 REGRESS_TARGET?=	check
 
-# Files to touch in order...
-MODGNU_AUTOCONF_FILES?= /Makefile.am configure.files configure.in configure.ac \
-	acinclude.m4 aclocal.m4 acconfig.h stamp-h.in \
-	config.h.in /Makefile.in configure
-
 # internal stuff to run on each directory.
 MODGNU_post-patch= for d in ${AUTOCONF_DIR}; do cd $$d; ${_MODGNU_loop} done;
 _MODGNU_loop=
@@ -82,18 +77,7 @@ _MODGNU_loop+= echo "Running autoheader-${AUTOCONF_VERSION} in $$d";
 _MODGNU_loop+= ${_SYSTRACE_CMD} ${SETENV} ${AUTOCONF_ENV} ${AUTOHEADER};
 .    endif
 .    if !${CONFIGURE_STYLE:L:Mautomake}
-_MODGNU_loop+= for f in ${MODGNU_AUTOCONF_FILES}; do \
-		case $$f in \
-		/*) \
-			find . -name $${f\#/} -print| while read i; \
-				do echo "Touching $$i"; touch $$i; done \
-			;; \
-		*) \
-			if test -e $$f ; then \
-				echo "Touching $$f"; touch $$f; \
-			fi \
-			;; \
-		esac; done; 
+REORDER_DEPENDENCIES+=${PORTSDIR}/infrastructure/mk/automake.dep
 .    endif
 .  endif
 .  endif