diff options
| author | Will Andrews <will@FreeBSD.org> | 2000-10-29 18:02:11 +0000 |
|---|---|---|
| committer | Will Andrews <will@FreeBSD.org> | 2000-10-29 18:02:11 +0000 |
| commit | e8fecd222350a29a3c002916e3a97257372a9164 (patch) | |
| tree | 2efe2f6057c06986a81ab80e07b2cf63e7e19514 /devel/tmake | |
| parent | Update to 1.1. (diff) | |
Fix tmake to use QT2 since that's what it's intended to be used with.
PR: 22390
Submitted by: MAINTAINER
Notes
Notes:
svn path=/head/; revision=34409
Diffstat (limited to 'devel/tmake')
| -rw-r--r-- | devel/tmake/Makefile | 1 | ||||
| -rw-r--r-- | devel/tmake/files/patch-ab | 17 |
2 files changed, 15 insertions, 3 deletions
diff --git a/devel/tmake/Makefile b/devel/tmake/Makefile index d477e79fd8cf..f5ebcf7eaf21 100644 --- a/devel/tmake/Makefile +++ b/devel/tmake/Makefile @@ -13,6 +13,7 @@ MASTER_SITES= ftp://ftp.trolltech.com/freebies/tmake/ MAINTAINER= jesse@cs.uni-magdeburg.de USE_PERL5= yes +USE_QT2= yes NO_BUILD= yes TMAKE_BIN= progen tmake diff --git a/devel/tmake/files/patch-ab b/devel/tmake/files/patch-ab index 2493a88d737f..443c1fe3dee3 100644 --- a/devel/tmake/files/patch-ab +++ b/devel/tmake/files/patch-ab @@ -1,11 +1,22 @@ ---- lib/freebsd-g++/tmake.conf Wed Aug 23 18:03:32 2000 -+++ lib/freebsd-g++/tmake.conf.new Fri Sep 1 17:09:54 2000 +--- lib/freebsd-g++/tmake.conf.orig Wed Aug 23 18:03:32 2000 ++++ lib/freebsd-g++/tmake.conf Sun Oct 29 10:03:53 2000 @@ -31,7 +31,7 @@ TMAKE_LIBDIR = /usr/local/lib TMAKE_INCDIR_X11 = /usr/X11R6/include TMAKE_LIBDIR_X11 = /usr/X11R6/lib -TMAKE_INCDIR_QT = $(QTDIR)/include -+TMAKE_INCDIR_QT = $(QTDIR)/include/qt ++TMAKE_INCDIR_QT = $(QTDIR)/include/qt2 TMAKE_LIBDIR_QT = $(QTDIR)/lib TMAKE_INCDIR_OPENGL = /usr/X11R6/include TMAKE_LIBDIR_OPENGL = /usr/X11R6/lib +@@ -51,8 +51,8 @@ + TMAKE_LIBS = + TMAKE_LIBS_X11 = -lXext -lX11 -lm + TMAKE_LIBS_X11SM = -lICE -lSM +-TMAKE_LIBS_QT = -lqt +-TMAKE_LIBS_QT_THREAD = -lqt-mt ++TMAKE_LIBS_QT = -lqt2 ++TMAKE_LIBS_QT_THREAD = -lqt2-mt + TMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu + TMAKE_LIBS_THREAD = + |