summaryrefslogtreecommitdiff
path: root/devel/tmake/patches
diff options
context:
space:
mode:
authordmcmahill <dmcmahill@pkgsrc.org>2001-04-25 14:55:59 +0000
committerdmcmahill <dmcmahill@pkgsrc.org>2001-04-25 14:55:59 +0000
commit1f1744e997278fe0bf570474bf4b1812815942ab (patch)
tree13cebdccd544241a04b5492185e7f8718522b856 /devel/tmake/patches
parent758cdb7951d8d5d9281ae352e39355484d49a337 (diff)
downloadpkgsrc-1f1744e997278fe0bf570474bf4b1812815942ab.tar.gz
initial import of tmake-1.7
from pkg/DESCR: tmake is an easy-to-use tool from Trolltech to create and maintain makefiles for software projects. It can be a painful task to manage makefiles manually, especially if you develop for more than one platform or use more than one compiler. tmake automates and streamlines this process and lets you spend your valuable time on writing code, not makefiles. Our main motivation for developing tmake was that we spent far too much time maintaining makefiles for Qt, our cross-platform GUI toolkit. Qt supports around 15 flavors of Unix, Microsoft Windows, and around 15 different C++ compilers. We looked at GNU autoconf, but it was Unix-specific and not flexible enough in our opinion. Our makefile system also had to deal with Qt meta object compiler (moc) issues. The moc program extracts meta information from C++ files and generates a C++ file with data tables etc. It takes extra work to add makefile rules for the moc and wanted to automate this task.
Diffstat (limited to 'devel/tmake/patches')
-rw-r--r--devel/tmake/patches/patch-aa23
-rw-r--r--devel/tmake/patches/patch-ab32
-rw-r--r--devel/tmake/patches/patch-ac13
3 files changed, 68 insertions, 0 deletions
diff --git a/devel/tmake/patches/patch-aa b/devel/tmake/patches/patch-aa
new file mode 100644
index 00000000000..02d685d0805
--- /dev/null
+++ b/devel/tmake/patches/patch-aa
@@ -0,0 +1,23 @@
+$NetBSD: patch-aa,v 1.1.1.1 2001/04/25 14:55:59 dmcmahill Exp $
+
+--- lib/netbsd-g++/tmake.conf.orig Thu Sep 7 02:21:26 2000
++++ lib/netbsd-g++/tmake.conf Wed Apr 25 10:04:11 2001
+@@ -26,12 +26,12 @@
+ TMAKE_CXXFLAGS_YACC = $$TMAKE_CFLAGS_YACC
+
+-TMAKE_INCDIR =
+-TMAKE_LIBDIR =
+-TMAKE_INCDIR_X11 = /usr/X11R6/include
+-TMAKE_LIBDIR_X11 = /usr/X11R6/lib
++TMAKE_INCDIR = @LOCALBASE@/include
++TMAKE_LIBDIR = @LOCALBASE@/lib
++TMAKE_INCDIR_X11 = @X11BASE@/include
++TMAKE_LIBDIR_X11 = @X11BASE@/lib
+ TMAKE_INCDIR_QT = $(QTDIR)/include
+ TMAKE_LIBDIR_QT = $(QTDIR)/lib
+-TMAKE_INCDIR_OPENGL = /usr/X11R6/include
+-TMAKE_LIBDIR_OPENGL = /usr/X11R6/lib
++TMAKE_INCDIR_OPENGL = @GLBASE@/include
++TMAKE_LIBDIR_OPENGL = @GLBASE@/lib
+
+ TMAKE_LINK = g++
diff --git a/devel/tmake/patches/patch-ab b/devel/tmake/patches/patch-ab
new file mode 100644
index 00000000000..692bc2435e1
--- /dev/null
+++ b/devel/tmake/patches/patch-ab
@@ -0,0 +1,32 @@
+$NetBSD: patch-ab,v 1.1.1.1 2001/04/25 14:55:59 dmcmahill Exp $
+
+--- lib/unix/generic.t.orig Sun Dec 3 21:26:06 2000
++++ lib/unix/generic.t Wed Apr 25 09:24:19 2001
+@@ -32,5 +32,5 @@
+ }
+ if ( Project("TMAKE_LIBDIR") ) {
+- Project('TMAKE_LIBDIR_FLAGS *= -L$$TMAKE_LIBDIR');
++ Project('TMAKE_LIBDIR_FLAGS *= -Wl,-R$$TMAKE_LIBDIR -L$$TMAKE_LIBDIR');
+ }
+ if ( Config("qt") || Config("opengl") ) {
+@@ -65,5 +65,5 @@
+ Project("TMAKE_LIB_FLAG")) ) {
+ Project("TMAKE_LIBDIR_QT") &&
+- Project('TMAKE_LIBDIR_FLAGS *= -L$$TMAKE_LIBDIR_QT');
++ Project('TMAKE_LIBDIR_FLAGS *= -Wl,-R$$TMAKE_LIBDIR_QT -L$$TMAKE_LIBDIR_QT');
+ if (Config("thread") && Project("TMAKE_LIBS_QT_THREAD")) {
+ Project('TMAKE_LIBS *= $$TMAKE_LIBS_QT_THREAD');
+@@ -76,5 +76,5 @@
+ AddIncludePath(Project("TMAKE_INCDIR_OPENGL"));
+ Project("TMAKE_LIBDIR_OPENGL") &&
+- Project('TMAKE_LIBDIR_FLAGS *= -L$$TMAKE_LIBDIR_OPENGL');
++ Project('TMAKE_LIBDIR_FLAGS *= -Wl,-R$$TMAKE_LIBDIR_OPENGL -L$$TMAKE_LIBDIR_OPENGL');
+ Project('TMAKE_LIBS *= $$TMAKE_LIBS_OPENGL');
+ }
+@@ -84,5 +84,5 @@
+ if ( Config("x11lib") ) {
+ Project("TMAKE_LIBDIR_X11") &&
+- Project('TMAKE_LIBDIR_FLAGS *= -L$$TMAKE_LIBDIR_X11');
++ Project('TMAKE_LIBDIR_FLAGS *= -Wl,-R$$TMAKE_LIBDIR_X11 -L$$TMAKE_LIBDIR_X11');
+ Project('TMAKE_LIBS *= $$TMAKE_LIBS_X11');
+ }
diff --git a/devel/tmake/patches/patch-ac b/devel/tmake/patches/patch-ac
new file mode 100644
index 00000000000..b4378f74719
--- /dev/null
+++ b/devel/tmake/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1.1.1 2001/04/25 14:55:59 dmcmahill Exp $
+
+--- bin/tmake.orig Thu Dec 21 18:38:41 2000
++++ bin/tmake Wed Apr 25 10:53:46 2001
+@@ -1,2 +1,2 @@
+-#!/usr/bin/perl
++#!@PERL5@
+ ############################################################################
+@@ -68,3 +68,3 @@
+
+-$project{"TMAKEPATH"} = $ENV{"TMAKEPATH"} . ";" . $ENV{"HOME"} . "/.tmake/";
++$project{"TMAKEPATH"} = $ENV{"TMAKEPATH"} . ";" . $ENV{"HOME"} . "/.tmake/;@TMAKEPATH@";
+