Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 20 Sep 2000 13:15:43 -0500 (CDT)
From:      Trenton Schulz <twschulz@gloria.cord.edu>
To:        libh@freebsd.org
Subject:   static Qt2 libh patch
Message-ID:  <Pine.BSI.4.10.10009201310580.22733-200000@gloria.cord.edu>

index | next in thread | raw e-mail

[-- Attachment #1 --]
This is similar to my last patch, except now I was able to get a 
static version of libh built with Qt 2.  This is the resulting patch.  
To build a static version of qt22
I believe you must pass -DWANT_STATIC to the port when building it.

Anyway, the static version is much faster.  Let me know if this works well.

-- 
Trenton Schulz
twschulz@cord.edu

[-- Attachment #2 --]
diff -ur libh/Makefile.inc libh.qt2/Makefile.inc
--- libh/Makefile.inc	Sat Sep  9 12:42:37 2000
+++ libh.qt2/Makefile.inc	Sun Sep 17 23:55:10 2000
@@ -4,7 +4,7 @@
 MAJOR_VERSION=0
 MINOR_VERSION=0
 
-QTINCLUDE?=	/usr/X11R6/include/X11/qt
+QTINCLUDE?=	/usr/X11R6/include/qt2
 TVINCLUDE?=	/usr/local/include
 
 TCLVERSION=	8.3
@@ -17,7 +17,7 @@
 SHLIB_MINOR=	0
 
 .if !defined(NOQT)
-CFLAGS+=	-I$(QTINCLUDE) -DQt
+CFLAGS+=	-I$(QTINCLUDE) -DUSE_Qt
 UI_SRC+=	HuiQt.cc HuiQt.cd.cc HuiQtNew.cc HuiQt.m.cc
 .endif
 
diff -ur libh/bin/tclh/Makefile libh.qt2/bin/tclh/Makefile
--- libh/bin/tclh/Makefile	Fri Jun 30 10:57:36 2000
+++ libh.qt2/bin/tclh/Makefile	Mon Sep 18 11:50:06 2000
@@ -33,7 +33,7 @@
 .if defined(NOSHARED)
 LDADD+=		-lstdc++ -ldisk -lfetch -lz -lcom_err
 .if !defined(NOQT)
-LDADD+=		-L/usr/X11R6/lib -lqt -lX11 -lXext
+LDADD+=		-L/usr/X11R6/lib -lqt2 -lX11 -lXext -lSM -ljpeg -lpng -lICE -lz
 .endif
 .if !defined(NOTVISION)
 LDADD+=		-ltvision -lncurses
diff -ur libh/lib/hui/Hui.cc libh.qt2/lib/hui/Hui.cc
--- libh/lib/hui/Hui.cc	Mon Jul 17 14:42:35 2000
+++ libh.qt2/lib/hui/Hui.cc	Sun Sep 17 23:55:10 2000
@@ -8,7 +8,7 @@
 #include "Hui.hh"
 #endif
 
-#ifdef Qt
+#ifdef USE_Qt
 #ifndef HuiQtNew_hh
 #include "HuiQtNew.hh"
 #endif
@@ -58,7 +58,7 @@
 
 Pointer<Hui> Hui::open( Type type )
 {
-#ifdef Qt
+#ifdef USE_Qt
 	if ( type == tAuto ) {
 		if ( getenv( "DISPLAY" ) )
 			type = tGraphics;
@@ -81,7 +81,7 @@
 #endif
 		break;
 	case tGraphics:
-#ifdef Qt
+#ifdef USE_Qt
 		{
 		char* argv[] = { (char*)"Error:", (char*)"-geometry", (char*)"+0+0" /*"500x300"*/ };
 		hui = newHuiQt( sizeof( argv ) / sizeof( argv[0] ), argv );
diff -ur libh/lib/hui/HuiQt.cc libh.qt2/lib/hui/HuiQt.cc
--- libh/lib/hui/HuiQt.cc	Sat Sep  9 10:47:48 2000
+++ libh.qt2/lib/hui/HuiQt.cc	Sun Sep 17 23:55:10 2000
@@ -696,7 +696,7 @@
 string HuiQt::ToplevelWidget::title() const
 {
 	if ( qwidget() )
-		return qwidget()->caption();
+		return static_cast<const char*>(qwidget()->caption());
 	else
 		return string();
 
@@ -755,33 +755,33 @@
 };
 
 static KeyCode keyCode[] = {
-	{ "CTRL-A", CTRL + Key_A }, { "CTRL-B", CTRL + Key_B }, { "CTRL-C", CTRL + Key_C }, { "CTRL-D", CTRL + Key_D }, { "CTRL-E", CTRL + Key_E },
-	{ "CTRL-F", CTRL + Key_F }, { "CTRL-G", CTRL + Key_G }, { "CTRL-H", CTRL + Key_H }, { "CTRL-I", CTRL + Key_I }, { "CTRL-J", CTRL + Key_J },
-	{ "CTRL-K", CTRL + Key_K }, { "CTRL-L", CTRL + Key_L }, { "CTRL-M", CTRL + Key_M }, { "CTRL-N", CTRL + Key_N }, { "CTRL-O", CTRL + Key_O },
-	{ "CTRL-P", CTRL + Key_P }, { "CTRL-Q", CTRL + Key_Q }, { "CTRL-R", CTRL + Key_R }, { "CTRL-S", CTRL + Key_S }, { "CTRL-T", CTRL + Key_T },
-	{ "CTRL-U", CTRL + Key_U }, { "CTRL-V", CTRL + Key_V }, { "CTRL-W", CTRL + Key_W }, { "CTRL-X", CTRL + Key_X }, { "CTRL-Y", CTRL + Key_Y },
-	{ "CTRL-Z", CTRL + Key_Z }, { "ESC", Key_Escape }, { "ALT-SPACE", ALT + Key_Space }, { "CTRL-INS", CTRL + Key_Insert }, { "SHIFT-INS", SHIFT + Key_Insert },
-	{ "CTRL-DEL", CTRL + Key_Delete }, { "SHIFT-DEL", SHIFT + Key_Delete }, { "BACKSPACE", Key_Backspace }, { "CTRL-BACKSPACE", CTRL + Key_Backspace }, { "SHIFT-TAB", SHIFT + Key_Tab },
-	{ "TAB", Key_Tab }, { "ALT-Q", ALT + Key_Q }, { "ALT-W", ALT + Key_W }, { "ALT-E", ALT + Key_E }, { "ALT-R", ALT + Key_R },
-	{ "ALT-T", ALT + Key_T }, { "ALT-Y", ALT + Key_Y }, { "ALT-U", ALT + Key_U }, { "ALT-I", ALT + Key_I }, { "ALT-O", ALT + Key_O },
-	{ "ALT-P", ALT + Key_P }, { "CTRL-ENTER", CTRL + Key_Enter }, { "ENTER", Key_Enter }, { "ALT-A", ALT + Key_A }, { "ALT-S", ALT + Key_S },
-	{ "ALT-D", ALT + Key_D }, { "ALT-F", ALT + Key_F }, { "ALT-G", ALT + Key_G }, { "ALT-H", ALT + Key_H }, { "ALT-J", ALT + Key_J },
-	{ "ALT-K", ALT + Key_K }, { "ALT-L", ALT + Key_L }, { "ALT-Z", ALT + Key_Z }, { "ALT-X", ALT + Key_X }, { "ALT-C", ALT + Key_C },
-	{ "ALT-V", ALT + Key_V }, { "ALT-B", ALT + Key_B }, { "ALT-N", ALT + Key_N }, { "ALT-M", ALT + Key_M }, { "F1", Key_F1 },
-	{ "F2", Key_F2 }, { "F3", Key_F3 }, { "F4", Key_F4 }, { "F5", Key_F5 }, { "F6", Key_F6 }, { "F7", Key_F7 }, { "F8", Key_F8 },
-	{ "F9", Key_F9 }, { "F10", Key_F10 }, { "HOME", Key_Home }, { "UP", Key_Up }, { "PGUP", Key_PageUp }, { "GRAYMINUS", Key_Minus },
-	{ "LEFT", Key_Left }, { "RIGHT", Key_Right }, { "GRAYPLUS", Key_Plus }, { "END", Key_End }, { "DOWN", Key_Down },
-	{ "PGDN", Key_PageDown }, { "INS", Key_Insert }, { "DEL", Key_Delete }, { "SHIFT-F1", SHIFT + Key_F1 }, { "SHIFT-F2", SHIFT + Key_F2 },
-	{ "SHIFT-F3", SHIFT + Key_F3 }, { "SHIFT-F4", SHIFT + Key_F4 }, { "SHIFT-F5", SHIFT + Key_F5 }, { "SHIFT-F6", SHIFT + Key_F6 }, { "SHIFT-F7", SHIFT + Key_F7 },
-	{ "SHIFT-F8", SHIFT + Key_F8 }, { "SHIFT-F9", SHIFT + Key_F9 }, { "SHIFT-F10", SHIFT + Key_F10 }, { "CTRL-F1", CTRL + Key_F1 }, { "CTRL-F2", CTRL + Key_F2 },
-	{ "CTRL-F3", CTRL + Key_F3 }, { "CTRL-F4", CTRL + Key_F4 }, { "CTRL-F5", CTRL + Key_F5 }, { "CTRL-F6", CTRL + Key_F6 }, { "CTRL-F7", CTRL + Key_F7 },
-	{ "CTRL-F8", CTRL + Key_F8 }, { "CTRL-F9", CTRL + Key_F9 }, { "CTRL-F10", CTRL + Key_F10 }, { "ALT-F1", ALT + Key_F1 }, { "ALT-F2", ALT + Key_F2 },
-	{ "ALT-F3", ALT + Key_F3 }, { "ALT-F4", ALT + Key_F4 }, { "ALT-F5", ALT + Key_F5 }, { "ALT-F6", ALT + Key_F6 }, { "ALT-F7", ALT + Key_F7 },
-	{ "ALT-F8", ALT + Key_F8 }, { "ALT-F9", ALT + Key_F9 }, { "ALT-F10", ALT + Key_F10 }, { "CTRL-PRTSC", CTRL + Key_SysReq }, { "CTRL-LEFT", CTRL + Key_Left },
-	{ "CTRL-RIGHT", CTRL + Key_Right }, { "CTRL-END", CTRL + Key_End }, { "CTRL-PGDN", CTRL + Key_PageDown }, { "CTRL-HOME", CTRL + Key_Home }, { "ALT-1", ALT + Key_1 },
-	{ "ALT-2", ALT + Key_2 }, { "ALT-3", ALT + Key_3 }, { "ALT-4", ALT + Key_4 }, { "ALT-5", ALT + Key_5 }, { "ALT-6", ALT + Key_6 },
-	{ "ALT-7", ALT + Key_7 }, { "ALT-8", ALT + Key_8 }, { "ALT-9", ALT + Key_9 }, { "ALT-0", ALT + Key_0 }, { "ALT-MINUS", ALT + Key_Minus },
-	{ "ALT-EQUAL", ALT + Key_Equal }, { "CTRL-PGUP", CTRL + Key_PageUp }, { "ALT-BACKSPACE", ALT + Key_Backspace },
+	{ "CTRL-A", Qt::CTRL + Qt::Key_A }, { "CTRL-B", Qt::CTRL + Qt::Key_B }, { "CTRL-C", Qt::CTRL + Qt::Key_C }, { "CTRL-D", Qt::CTRL + Qt::Key_D }, { "CTRL-E", Qt::CTRL + Qt::Key_E },
+	{ "CTRL-F", Qt::CTRL + Qt::Key_F }, { "CTRL-G", Qt::CTRL + Qt::Key_G }, { "CTRL-H", Qt::CTRL + Qt::Key_H }, { "CTRL-I", Qt::CTRL + Qt::Key_I }, { "CTRL-J", Qt::CTRL + Qt::Key_J },
+	{ "CTRL-K", Qt::CTRL + Qt::Key_K }, { "CTRL-L", Qt::CTRL + Qt::Key_L }, { "CTRL-M", Qt::CTRL + Qt::Key_M }, { "CTRL-N", Qt::CTRL + Qt::Key_N }, { "CTRL-O", Qt::CTRL + Qt::Key_O },
+	{ "CTRL-P", Qt::CTRL + Qt::Key_P }, { "CTRL-Q", Qt::CTRL + Qt::Key_Q }, { "CTRL-R", Qt::CTRL + Qt::Key_R }, { "CTRL-S", Qt::CTRL + Qt::Key_S }, { "CTRL-T", Qt::CTRL + Qt::Key_T },
+	{ "CTRL-U", Qt::CTRL + Qt::Key_U }, { "CTRL-V", Qt::CTRL + Qt::Key_V }, { "CTRL-W", Qt::CTRL + Qt::Key_W }, { "CTRL-X", Qt::CTRL + Qt::Key_X }, { "CTRL-Y", Qt::CTRL + Qt::Key_Y },
+	{ "CTRL-Z", Qt::CTRL + Qt::Key_Z }, { "ESC", Qt::Key_Escape }, { "ALT-SPACE", Qt::ALT+ Qt::Key_Space }, { "CTRL-INS", Qt::CTRL + Qt::Key_Insert }, { "SHIFT-INS", Qt::SHIFT + Qt::Key_Insert },
+	{ "CTRL-DEL", Qt::CTRL + Qt::Key_Delete }, { "SHIFT-DEL", Qt::SHIFT + Qt::Key_Delete }, { "BACKSPACE", Qt::Key_Backspace }, { "CTRL-BACKSPACE", Qt::CTRL + Qt::Key_Backspace }, { "SHIFT-TAB", Qt::SHIFT + Qt::Key_Tab },
+	{ "TAB", Qt::Key_Tab }, { "ALT-Q", Qt::ALT+ Qt::Key_Q }, { "ALT-W", Qt::ALT+ Qt::Key_W }, { "ALT-E", Qt::ALT+ Qt::Key_E }, { "ALT-R", Qt::ALT+ Qt::Key_R },
+	{ "ALT-T", Qt::ALT+ Qt::Key_T }, { "ALT-Y", Qt::ALT+ Qt::Key_Y }, { "ALT-U", Qt::ALT+ Qt::Key_U }, { "ALT-I", Qt::ALT+ Qt::Key_I }, { "ALT-O", Qt::ALT+ Qt::Key_O },
+	{ "ALT-P", Qt::ALT+ Qt::Key_P }, { "CTRL-ENTER", Qt::CTRL + Qt::Key_Enter }, { "ENTER", Qt::Key_Enter }, { "ALT-A", Qt::ALT+ Qt::Key_A }, { "ALT-S", Qt::ALT+ Qt::Key_S },
+	{ "ALT-D", Qt::ALT+ Qt::Key_D }, { "ALT-F", Qt::ALT+ Qt::Key_F }, { "ALT-G", Qt::ALT+ Qt::Key_G }, { "ALT-H", Qt::ALT+ Qt::Key_H }, { "ALT-J", Qt::ALT+ Qt::Key_J },
+	{ "ALT-K", Qt::ALT+ Qt::Key_K }, { "ALT-L", Qt::ALT+ Qt::Key_L }, { "ALT-Z", Qt::ALT+ Qt::Key_Z }, { "ALT-X", Qt::ALT+ Qt::Key_X }, { "ALT-C", Qt::ALT+ Qt::Key_C },
+	{ "ALT-V", Qt::ALT+ Qt::Key_V }, { "ALT-B", Qt::ALT+ Qt::Key_B }, { "ALT-N", Qt::ALT+ Qt::Key_N }, { "ALT-M", Qt::ALT+ Qt::Key_M }, { "F1", Qt::Key_F1 },
+	{ "F2", Qt::Key_F2 }, { "F3", Qt::Key_F3 }, { "F4", Qt::Key_F4 }, { "F5", Qt::Key_F5 }, { "F6", Qt::Key_F6 }, { "F7", Qt::Key_F7 }, { "F8", Qt::Key_F8 },
+	{ "F9", Qt::Key_F9 }, { "F10", Qt::Key_F10 }, { "HOME", Qt::Key_Home }, { "UP", Qt::Key_Up }, { "PGUP", Qt::Key_PageUp }, { "GRAYMINUS", Qt::Key_Minus },
+	{ "LEFT", Qt::Key_Left }, { "RIGHT", Qt::Key_Right }, { "GRAYPLUS", Qt::Key_Plus }, { "END", Qt::Key_End }, { "DOWN", Qt::Key_Down },
+	{ "PGDN", Qt::Key_PageDown }, { "INS", Qt::Key_Insert }, { "DEL", Qt::Key_Delete }, { "SHIFT-F1", Qt::SHIFT + Qt::Key_F1 }, { "SHIFT-F2", Qt::SHIFT + Qt::Key_F2 },
+	{ "SHIFT-F3", Qt::SHIFT + Qt::Key_F3 }, { "SHIFT-F4", Qt::SHIFT + Qt::Key_F4 }, { "SHIFT-F5", Qt::SHIFT + Qt::Key_F5 }, { "SHIFT-F6", Qt::SHIFT + Qt::Key_F6 }, { "SHIFT-F7", Qt::SHIFT + Qt::Key_F7 },
+	{ "SHIFT-F8", Qt::SHIFT + Qt::Key_F8 }, { "SHIFT-F9", Qt::SHIFT + Qt::Key_F9 }, { "SHIFT-F10", Qt::SHIFT + Qt::Key_F10 }, { "CTRL-F1", Qt::CTRL + Qt::Key_F1 }, { "CTRL-F2", Qt::CTRL + Qt::Key_F2 },
+	{ "CTRL-F3", Qt::CTRL + Qt::Key_F3 }, { "CTRL-F4", Qt::CTRL + Qt::Key_F4 }, { "CTRL-F5", Qt::CTRL + Qt::Key_F5 }, { "CTRL-F6", Qt::CTRL + Qt::Key_F6 }, { "CTRL-F7", Qt::CTRL + Qt::Key_F7 },
+	{ "CTRL-F8", Qt::CTRL + Qt::Key_F8 }, { "CTRL-F9", Qt::CTRL + Qt::Key_F9 }, { "CTRL-F10", Qt::CTRL + Qt::Key_F10 }, { "ALT-F1", Qt::ALT+ Qt::Key_F1 }, { "ALT-F2", Qt::ALT+ Qt::Key_F2 },
+	{ "ALT-F3", Qt::ALT+ Qt::Key_F3 }, { "ALT-F4", Qt::ALT+ Qt::Key_F4 }, { "ALT-F5", Qt::ALT+ Qt::Key_F5 }, { "ALT-F6", Qt::ALT+ Qt::Key_F6 }, { "ALT-F7", Qt::ALT+ Qt::Key_F7 },
+	{ "ALT-F8", Qt::ALT+ Qt::Key_F8 }, { "ALT-F9", Qt::ALT+ Qt::Key_F9 }, { "ALT-F10", Qt::ALT+ Qt::Key_F10 }, { "CTRL-PRTSC", Qt::CTRL + Qt::Key_SysReq }, { "CTRL-LEFT", Qt::CTRL + Qt::Key_Left },
+	{ "CTRL-RIGHT", Qt::CTRL + Qt::Key_Right }, { "CTRL-END", Qt::CTRL + Qt::Key_End }, { "CTRL-PGDN", Qt::CTRL + Qt::Key_PageDown }, { "CTRL-HOME", Qt::CTRL + Qt::Key_Home }, { "ALT-1", Qt::ALT+ Qt::Key_1 },
+	{ "ALT-2", Qt::ALT+ Qt::Key_2 }, { "ALT-3", Qt::ALT+ Qt::Key_3 }, { "ALT-4", Qt::ALT+ Qt::Key_4 }, { "ALT-5", Qt::ALT+ Qt::Key_5 }, { "ALT-6", Qt::ALT+ Qt::Key_6 },
+	{ "ALT-7", Qt::ALT+ Qt::Key_7 }, { "ALT-8", Qt::ALT+ Qt::Key_8 }, { "ALT-9", Qt::ALT+ Qt::Key_9 }, { "ALT-0", Qt::ALT+ Qt::Key_0 }, { "ALT-MINUS", Qt::ALT+ Qt::Key_Minus },
+	{ "ALT-EQUAL", Qt::ALT+ Qt::Key_Equal }, { "CTRL-PGUP", Qt::CTRL + Qt::Key_PageUp }, { "ALT-BACKSPACE", Qt::ALT+ Qt::Key_Backspace },
 	{ 0, 0 }
 };
 
@@ -1003,7 +1003,7 @@
 string HuiQt::LabelWidget::text() const
 {
 	if ( mLabel )
-		return mLabel->text();
+		return static_cast<const char*>(mLabel->text());
 	else
 		return string();
 
@@ -1068,7 +1068,7 @@
 string HuiQt::ButtonWidget::text() const
 {
 	if ( mButton )
-		return mButton->text();
+		return static_cast<const char*>(mButton->text());
 	else
 		return string();
 
@@ -1127,7 +1127,7 @@
 string HuiQt::TitledWidget::title() const
 {
 	if ( qtitle() )
-		return qtitle()->text();
+		return static_cast<const char*>(qtitle()->text());
 	else
 		return string();
 
@@ -1240,7 +1240,7 @@
 string HuiQt::InputLineWidget::text() const
 {
 	if ( mInputLine )
-		return mInputLine->text();
+		return static_cast<const char*>(mInputLine->text());
 	else
 		return string();
 
@@ -1287,7 +1287,7 @@
 {
 	QButton* box = 0;
 	if ( boxes() && ( box = boxes()->find( boxno ) ) != 0 )
-		return box->text();
+		return static_cast<const char*>(box->text());
 	else
 		return string();
 
@@ -1307,7 +1307,7 @@
 string HuiQt::ButtonsGroupWidget::title() const
 {
 	if ( boxes() )
-		return boxes()->title();
+		return static_cast<const char*>(boxes()->title());
 	else
 		return string();
 
@@ -1581,7 +1581,7 @@
 	if ( mListBox ) {
 		if ( size_t( aItemNo ) >= mListBox->count() )
 			throw runtime_error( string( "ListBox itemno " ) + to_string( aItemNo ) + " is out of range 0.." + to_string( mListBox->count() - 1 ) );
-		return mListBox->text( aItemNo );
+		return static_cast<const char*>(mListBox->text( aItemNo ));
 	}
 	else
 		return string();
diff -ur libh/lib/hui/Makefile libh.qt2/lib/hui/Makefile
--- libh/lib/hui/Makefile	Sat Sep  9 10:47:48 2000
+++ libh.qt2/lib/hui/Makefile	Mon Sep 18 19:49:42 2000
@@ -10,14 +10,14 @@
 		libhui_init.cc \
 		$(UI_SRC)
 
-LDADD=		-L/usr/local/lib -lstdc++ -lgcc -lm -lqt -L/usr/X11R6/lib
-LDADD+=		-ltvision -lncurses -lX11 -L/usr/X11R6/include/X11/qt/lib
+LDADD=		-L/usr/local/lib -lstdc++ -lgcc -lm -lqt2 -L/usr/X11R6/lib
+LDADD+=		-ltvision -lncurses -lX11 
 
-CFLAGS+=	-I../common -I../../include -I../file
+CFLAGS+=	-I../common -I../../include -I../file 
 
 CLEANFILES=	HuiQt.m.cc
 
 HuiQt.m.cc: HuiQt.hh
-	moc HuiQt.hh -o HuiQt.m.cc
+	moc2 HuiQt.hh -o HuiQt.m.cc
 
 .include <bsd.lib.mk>
diff -ur libh/lib/sysinstall/CVS/Entries libh.qt2/lib/sysinstall/CVS/Entries
--- libh/lib/sysinstall/CVS/Entries	Tue Sep 19 11:52:30 2000
+++ libh.qt2/lib/sysinstall/CVS/Entries	Tue Sep 19 14:18:51 2000
@@ -48,6 +48,6 @@
 /export_db.tcl/1.2/Mon Jun  5 16:21:32 2000//
 /file_by_name.tcl/1.2/Mon Jun  5 16:21:32 2000//
 /import_db.tcl/1.2/Mon Jun  5 16:21:32 2000//
-/libhsysinstall_init.cc/1.2/Tue May 23 13:12:34 2000//
 /packagetool.tcl/1.4/Mon Jun  5 19:39:35 2000//
+/libhsysinstall_init.cc/1.2/Tue Sep 19 19:18:51 2000//
 D
diff -ur libh/lib/sysinstall/GNUmakefile libh.qt2/lib/sysinstall/GNUmakefile
--- libh/lib/sysinstall/GNUmakefile	Sat May  6 06:43:32 2000
+++ libh.qt2/lib/sysinstall/GNUmakefile	Sun Sep 17 23:55:10 2000
@@ -14,7 +14,7 @@
 
 # ----------------------------------------------------------------------
 
-INCLUDES	+= $(patsubst %,-I%,$(VPATH)) -I$(OUT) -I/usr/local/include/tcl8.2 -I/usr/X11R6/include/X11/qt
+INCLUDES	+= $(patsubst %,-I%,$(VPATH)) -I$(OUT) -I/usr/local/include/tcl8.2 -I/usr/X11R6/include/qt2
 
 DEFINES		+= $(SUBMAKE_DEFINES)
 LIBS		+= $(SUBMAKE_LIBS)
diff -ur libh/lib/tcl/Makefile libh.qt2/lib/tcl/Makefile
--- libh/lib/tcl/Makefile	Mon Jul 17 14:32:03 2000
+++ libh.qt2/lib/tcl/Makefile	Sun Sep 17 23:55:10 2000
@@ -30,7 +30,7 @@
 .endif # defined(HSYSTEM)
 
 LDADD=		-L/usr/local/lib  -L/usr/X11R6/include/X11/qt/lib \
-		-L/usr/X11R6/lib -lqt -lX11 -ltvision -lncurses  \
+		-L/usr/X11R6/lib -lqt2 -lX11 -ltvision -lncurses  \
 		-L/usr/local/lib -lstdc++ -lgcc -lm -lz -ltvision \
 		-lfetch -lcom_err -ldisk 
 
help

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?Pine.BSI.4.10.10009201310580.22733-200000>