From 4c68b1d0dae9b1309d3bee940008577fb1bd0fa8 Mon Sep 17 00:00:00 2001
From: espie <espie@openbsd.org>
Date: Tue, 3 Aug 2004 09:18:38 +0000
Subject: [PATCH] Prepare for MODULES=x11/qt*

---
 infrastructure/mk/qt.port.mk    | 2 +-
 infrastructure/mk/qt2.port.mk   | 2 +-
 infrastructure/mk/qt3.port.mk   | 2 +-
 x11/qt/{files => }/qt.port.mk   | 2 +-
 x11/qt2/{files => }/qt2.port.mk | 2 +-
 x11/qt3/{files => }/qt3.port.mk | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)
 rename x11/qt/{files => }/qt.port.mk (89%)
 rename x11/qt2/{files => }/qt2.port.mk (89%)
 rename x11/qt3/{files => }/qt3.port.mk (93%)

diff --git a/infrastructure/mk/qt.port.mk b/infrastructure/mk/qt.port.mk
index 04d486b9254..0c080a4b38d 100644
--- a/infrastructure/mk/qt.port.mk
+++ b/infrastructure/mk/qt.port.mk
@@ -1 +1 @@
-.include "${PORTSDIR}/x11/qt/files/qt.port.mk"
+.include "${PORTSDIR}/x11/qt/qt.port.mk"
diff --git a/infrastructure/mk/qt2.port.mk b/infrastructure/mk/qt2.port.mk
index 3315b6bd6f5..42347bb9b21 100644
--- a/infrastructure/mk/qt2.port.mk
+++ b/infrastructure/mk/qt2.port.mk
@@ -1 +1 @@
-.include "${PORTSDIR}/x11/qt2/files/qt2.port.mk"
+.include "${PORTSDIR}/x11/qt2/qt2.port.mk"
diff --git a/infrastructure/mk/qt3.port.mk b/infrastructure/mk/qt3.port.mk
index 9f3a04f2a45..7d62b141f57 100644
--- a/infrastructure/mk/qt3.port.mk
+++ b/infrastructure/mk/qt3.port.mk
@@ -1 +1 @@
-.include "${PORTSDIR}/x11/qt3/files/qt3.port.mk"
+.include "${PORTSDIR}/x11/qt3/qt3.port.mk"
diff --git a/x11/qt/files/qt.port.mk b/x11/qt/qt.port.mk
similarity index 89%
rename from x11/qt/files/qt.port.mk
rename to x11/qt/qt.port.mk
index a298307fa76..8a0ce35623d 100644
--- a/x11/qt/files/qt.port.mk
+++ b/x11/qt/qt.port.mk
@@ -1,4 +1,4 @@
-# $OpenBSD: qt.port.mk,v 1.3 2001/10/28 12:30:14 espie Exp $
+# $OpenBSD: qt.port.mk,v 1.1 2004/08/03 09:18:39 espie Exp $
 
 # This fragment uses MODQT_* variables to make it easier to substitute
 # qt1/qt2/qt3 in a port.
diff --git a/x11/qt2/files/qt2.port.mk b/x11/qt2/qt2.port.mk
similarity index 89%
rename from x11/qt2/files/qt2.port.mk
rename to x11/qt2/qt2.port.mk
index 63f9edc5eb1..452d0ed05df 100644
--- a/x11/qt2/files/qt2.port.mk
+++ b/x11/qt2/qt2.port.mk
@@ -1,4 +1,4 @@
-# $OpenBSD: qt2.port.mk,v 1.3 2001/10/28 12:30:14 espie Exp $
+# $OpenBSD: qt2.port.mk,v 1.1 2004/08/03 09:18:39 espie Exp $
 
 # This fragment uses MODQT_* variables to make it easier to substitute
 # qt1/qt2/qt3 in a port.
diff --git a/x11/qt3/files/qt3.port.mk b/x11/qt3/qt3.port.mk
similarity index 93%
rename from x11/qt3/files/qt3.port.mk
rename to x11/qt3/qt3.port.mk
index d4b10f66b6e..f177a2cb242 100644
--- a/x11/qt3/files/qt3.port.mk
+++ b/x11/qt3/qt3.port.mk
@@ -1,4 +1,4 @@
-# $OpenBSD: qt3.port.mk,v 1.6 2003/01/06 06:22:53 espie Exp $
+# $OpenBSD: qt3.port.mk,v 1.1 2004/08/03 09:18:39 espie Exp $
 
 MODULES+=	gcc3
 MODGCC3_ARCHES+=sparc64