From f107e67c8fbf55983eda6e41985fa6fded5e4292 Mon Sep 17 00:00:00 2001
From: espie <espie@openbsd.org>
Date: Tue, 25 Feb 2003 00:23:07 +0000
Subject: [PATCH] fix for qt 3.1 use kde module (switch to qt mt)

---
 misc/ktail/Makefile                         | 17 ++++++-----------
 misc/ktail/patches/patch-ktail_cmdlinedlg_h | 13 +++++++++++++
 misc/ktail/patches/patch-ktail_filterdlg_h  | 13 +++++++++++++
 misc/ktail/patches/patch-ktail_logoptdlg_h  | 13 +++++++++++++
 misc/ktail/patches/patch-ktail_removedlg_h  | 13 +++++++++++++
 5 files changed, 58 insertions(+), 11 deletions(-)
 create mode 100644 misc/ktail/patches/patch-ktail_cmdlinedlg_h
 create mode 100644 misc/ktail/patches/patch-ktail_filterdlg_h
 create mode 100644 misc/ktail/patches/patch-ktail_logoptdlg_h
 create mode 100644 misc/ktail/patches/patch-ktail_removedlg_h

diff --git a/misc/ktail/Makefile b/misc/ktail/Makefile
index fa1cdae249b..96fb57ce6da 100644
--- a/misc/ktail/Makefile
+++ b/misc/ktail/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2003/01/19 03:22:56 brad Exp $
-
-BROKEN=		"does not compile with Qt 3.1 and up"
+# $OpenBSD: Makefile,v 1.8 2003/02/25 00:23:07 espie Exp $
 
 COMMENT=	"file monitor"
 
@@ -21,19 +19,16 @@ EXTRACT_SUFX=	.tar.bz2
 
 LIB_DEPENDS=	kdecore.4,DCOP,kdefx,kdesu,kdeui,kio::x11/kde/libs3
 
-MODULES=	qt3
+MODULES=	kde
 
 MAKE_ENV=	${CONFIGURE_ENV}
-MAKE_FLAGS=	CXXLD='--tag CXX ${CXX} -L${MODQT_LIBDIR}'
+MAKE_FLAGS=	${MODKDE_MAKE_FLAGS}
 
 USE_X11=	Yes
 USE_GMAKE=	Yes
 CONFIGURE_STYLE= gnu
-MODGNU_CONFIG_GUESS_DIRS=	${WRKSRC}/admin
-CONFIGURE_ARGS=  ${MODQT_CONFIGURE_ARGS}
-CONFIGURE_ARGS+= --enable-final --disable-mt
-CONFIGURE_ARGS+= --with-extra-libs=${LOCALBASE}/lib
-CONFIGURE_ARGS+= --with-extra-includes=${LOCALBASE}/include
-CONFIGURE_ENV=  KDEDIR=${LOCALBASE} 
+MODGNU_CONFIG_GUESS_DIRS=	${MODKDE_CONFIG_GUESS_DIRS}
+CONFIGURE_ARGS=  ${MODKDE_CONFIGURE_ARGS}
+CONFIGURE_ENV=  ${MODKDE_CONFIGURE_ENV}
 
 .include <bsd.port.mk>
diff --git a/misc/ktail/patches/patch-ktail_cmdlinedlg_h b/misc/ktail/patches/patch-ktail_cmdlinedlg_h
new file mode 100644
index 00000000000..ad22681a105
--- /dev/null
+++ b/misc/ktail/patches/patch-ktail_cmdlinedlg_h
@@ -0,0 +1,13 @@
+$OpenBSD: patch-ktail_cmdlinedlg_h,v 1.1 2003/02/25 00:23:08 espie Exp $
+--- ktail/cmdlinedlg.h.orig	Tue Jan 21 11:55:20 2003
++++ ktail/cmdlinedlg.h	Tue Jan 21 11:55:49 2003
+@@ -37,6 +37,9 @@ protected:
+     QGridLayout* CmdLineDlgLayout;
+     QVBoxLayout* Layout1;
+     QHBoxLayout* Layout2;
++
++private:
++    void languageChange(void);
+ };
+ 
+ #endif // CMDLINEDLG_H
diff --git a/misc/ktail/patches/patch-ktail_filterdlg_h b/misc/ktail/patches/patch-ktail_filterdlg_h
new file mode 100644
index 00000000000..00656d28085
--- /dev/null
+++ b/misc/ktail/patches/patch-ktail_filterdlg_h
@@ -0,0 +1,13 @@
+$OpenBSD: patch-ktail_filterdlg_h,v 1.1 2003/02/25 00:23:08 espie Exp $
+--- ktail/filterdlg.h.orig	Tue Jan 21 11:55:20 2003
++++ ktail/filterdlg.h	Tue Jan 21 11:55:47 2003
+@@ -42,6 +42,9 @@ protected:
+     QGridLayout* FilterDlgLayout;
+     QHBoxLayout* Layout2;
+     QGridLayout* GroupBox1Layout;
++
++private:
++    void languageChange(void);
+ };
+ 
+ #endif // FILTERDLG_H
diff --git a/misc/ktail/patches/patch-ktail_logoptdlg_h b/misc/ktail/patches/patch-ktail_logoptdlg_h
new file mode 100644
index 00000000000..0da5c647965
--- /dev/null
+++ b/misc/ktail/patches/patch-ktail_logoptdlg_h
@@ -0,0 +1,13 @@
+$OpenBSD: patch-ktail_logoptdlg_h,v 1.1 2003/02/25 00:23:08 espie Exp $
+--- ktail/logoptdlg.h.orig	Tue Jan 21 11:55:20 2003
++++ ktail/logoptdlg.h	Tue Jan 21 11:55:44 2003
+@@ -43,6 +43,9 @@ protected:
+     QVBoxLayout* Layout3;
+     QGridLayout* GroupBox1Layout;
+     QHBoxLayout* Layout2;
++
++private:
++    void languageChange(void);
+ };
+ 
+ #endif // LOGOPTDLG_H
diff --git a/misc/ktail/patches/patch-ktail_removedlg_h b/misc/ktail/patches/patch-ktail_removedlg_h
new file mode 100644
index 00000000000..3e42c78a692
--- /dev/null
+++ b/misc/ktail/patches/patch-ktail_removedlg_h
@@ -0,0 +1,13 @@
+$OpenBSD: patch-ktail_removedlg_h,v 1.1 2003/02/25 00:23:08 espie Exp $
+--- ktail/removedlg.h.orig	Tue Jan 21 11:55:20 2003
++++ ktail/removedlg.h	Tue Jan 21 11:55:41 2003
+@@ -37,6 +37,9 @@ public:
+ protected:
+     QGridLayout* RemoveDlgLayout;
+     QHBoxLayout* Layout3;
++
++private:
++    void languageChange(void);
+ };
+ 
+ #endif // REMOVEDLG_H