6 files changed, 44 insertions, 28 deletions

diff --git a/devel/tmake/Makefile b/devel/tmake/Makefile
index bef73be8db0c..339cd43732b6 100644
--- a/devel/tmake/Makefile
+++ b/devel/tmake/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	tmake
-PORTVERSION=	1.4
+PORTVERSION=	1.5
 CATEGORIES=	devel perl5
-MASTER_SITES=	ftp://ftp.troll.no/freebies/tmake/
+MASTER_SITES=	ftp://ftp.trolltech.com/freebies/tmake/
 
 MAINTAINER=	jesse@cs.uni-magdeburg.de
 
diff --git a/devel/tmake/distinfo b/devel/tmake/distinfo
index 5d13531ba2e6..f01d806f2921 100644
--- a/devel/tmake/distinfo
+++ b/devel/tmake/distinfo
@@ -1 +1 @@
-MD5 (tmake-1.4.tar.gz) = 6e5c13829a085ed8ae1b525ea1bbb54a
+MD5 (tmake-1.5.tar.gz) = c706b883ca291c53acdd55a770a9864c
diff --git a/devel/tmake/files/patch-aa b/devel/tmake/files/patch-aa
index 5724ace3eab4..adc6e9a308ea 100644
--- a/devel/tmake/files/patch-aa
+++ b/devel/tmake/files/patch-aa
@@ -1,6 +1,6 @@
---- lib/unix/generic.t	Fri Apr  7 16:18:05 2000
-+++ lib/unix/generic.t.new	Sun May 14 13:51:52 2000
-@@ -156,10 +156,10 @@
+--- lib/unix/generic.t	Fri Aug  4 16:57:53 2000
++++ lib/unix/generic.t.new	Wed Aug  9 10:54:22 2000
+@@ -203,10 +203,10 @@
  
  ####### Compiler, tools and options
  
diff --git a/devel/tmake/files/patch-ab b/devel/tmake/files/patch-ab
index 3f832ecf72a4..a3b08c87b86d 100644
--- a/devel/tmake/files/patch-ab
+++ b/devel/tmake/files/patch-ab
@@ -1,11 +1,11 @@
---- lib/freebsd-g++/tmake.conf	Fri Apr  7 16:18:05 2000
-+++ lib/freebsd-g++/tmake.conf.new	Sun May 14 13:52:46 2000
-@@ -29,7 +29,7 @@
- TMAKE_LIBDIR		=
+--- lib/freebsd-g++/tmake.conf	Fri Aug  4 15:22:35 2000
++++ lib/freebsd-g++/tmake.conf.new	Wed Aug  9 10:55:59 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/X11/qt
++TMAKE_INCDIR_QT		= $(QTDIR)/include/qt
  TMAKE_LIBDIR_QT		= $(QTDIR)/lib
  TMAKE_INCDIR_OPENGL	= /usr/X11R6/include
  TMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
diff --git a/devel/tmake/pkg-descr b/devel/tmake/pkg-descr
index 8aeea38eed22..1b542a7b9de1 100644
--- a/devel/tmake/pkg-descr
+++ b/devel/tmake/pkg-descr
@@ -4,7 +4,7 @@ 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.
 
-WWW: http://www.troll.no/freebies/tmake.html
+WWW: http://www.trolltech.com/products/download/freebies/tmake.html
 
 - Roland
 jesse@cs.uni-magdeburg.de
diff --git a/devel/tmake/pkg-plist b/devel/tmake/pkg-plist
index b308e27a96b9..9ce5b1004e06 100644
--- a/devel/tmake/pkg-plist
+++ b/devel/tmake/pkg-plist
@@ -21,10 +21,6 @@ share/tmake/freebsd-g++/lib.t
 share/tmake/freebsd-g++/subdirs.t
 share/tmake/freebsd-g++/tmake.conf
 share/tmake/freebsd-g++/tmake.conf.orig
-share/tmake/gnu-g++/app.t
-share/tmake/gnu-g++/lib.t
-share/tmake/gnu-g++/subdirs.t
-share/tmake/gnu-g++/tmake.conf
 share/tmake/hpux-acc/app.t
 share/tmake/hpux-acc/lib.t
 share/tmake/hpux-acc/subdirs.t
@@ -45,6 +41,10 @@ share/tmake/hpux-o64/app.t
 share/tmake/hpux-o64/lib.t
 share/tmake/hpux-o64/subdirs.t
 share/tmake/hpux-o64/tmake.conf
+share/tmake/hurd-g++/app.t
+share/tmake/hurd-g++/lib.t
+share/tmake/hurd-g++/subdirs.t
+share/tmake/hurd-g++/tmake.conf
 share/tmake/irix-64/app.t
 share/tmake/irix-64/lib.t
 share/tmake/irix-64/subdirs.t
@@ -73,10 +73,10 @@ share/tmake/linux-g++/app.t
 share/tmake/linux-g++/lib.t
 share/tmake/linux-g++/subdirs.t
 share/tmake/linux-g++/tmake.conf
-share/tmake/linux-qws-g++/app.t
-share/tmake/linux-qws-g++/lib.t
-share/tmake/linux-qws-g++/subdirs.t
-share/tmake/linux-qws-g++/tmake.conf
+share/tmake/linux-kcc/app.t
+share/tmake/linux-kcc/lib.t
+share/tmake/linux-kcc/subdirs.t
+share/tmake/linux-kcc/tmake.conf
 share/tmake/netbsd-g++/app.t
 share/tmake/netbsd-g++/lib.t
 share/tmake/netbsd-g++/subdirs.t
@@ -97,14 +97,26 @@ share/tmake/qnx-g++/app.t
 share/tmake/qnx-g++/lib.t
 share/tmake/qnx-g++/subdirs.t
 share/tmake/qnx-g++/tmake.conf
-share/tmake/reliant-cds/app.t
-share/tmake/reliant-cds/lib.t
-share/tmake/reliant-cds/subdirs.t
-share/tmake/reliant-cds/tmake.conf
+share/tmake/qws/linux-generic-g++/app.t
+share/tmake/qws/linux-generic-g++/lib.t
+share/tmake/qws/linux-generic-g++/subdirs.t
+share/tmake/qws/linux-generic-g++/tmake.conf
+share/tmake/qws/linux-mips-g++/app.t
+share/tmake/qws/linux-mips-g++/lib.t
+share/tmake/qws/linux-mips-g++/subdirs.t
+share/tmake/qws/linux-mips-g++/tmake.conf
+share/tmake/qws/linux-x86-g++/app.t
+share/tmake/qws/linux-x86-g++/lib.t
+share/tmake/qws/linux-x86-g++/subdirs.t
+share/tmake/qws/linux-x86-g++/tmake.conf
 share/tmake/sco-g++/app.t
 share/tmake/sco-g++/lib.t
 share/tmake/sco-g++/subdirs.t
 share/tmake/sco-g++/tmake.conf
+share/tmake/reliant-cds/app.t
+share/tmake/reliant-cds/lib.t
+share/tmake/reliant-cds/subdirs.t
+share/tmake/reliant-cds/tmake.conf
 share/tmake/solaris-64/app.t
 share/tmake/solaris-64/lib.t
 share/tmake/solaris-64/subdirs.t
@@ -131,9 +143,9 @@ share/tmake/ultrix-g++/subdirs.t
 share/tmake/ultrix-g++/tmake.conf
 share/tmake/unix/app.t
 share/tmake/unix/generic.t
+share/tmake/unix/generic.t.orig
 share/tmake/unix/lib.t
 share/tmake/unix/subdirs.t
-share/tmake/unix/generic.t.orig
 share/tmake/unixware-g++/app.t
 share/tmake/unixware-g++/lib.t
 share/tmake/unixware-g++/subdirs.t
@@ -188,12 +200,12 @@ share/tmake/win32/subdirs.t
 @dirrm share/tmake/bsdi-g++
 @dirrm share/tmake/dgux-g++
 @dirrm share/tmake/freebsd-g++
-@dirrm share/tmake/gnu-g++
 @dirrm share/tmake/hpux-acc
 @dirrm share/tmake/hpux-cc
 @dirrm share/tmake/hpux-g++
 @dirrm share/tmake/hpux-n64
 @dirrm share/tmake/hpux-o64
+@dirrm share/tmake/hurd-g++
 @dirrm share/tmake/irix-64
 @dirrm share/tmake/irix-dcc
 @dirrm share/tmake/irix-g++
@@ -201,14 +213,18 @@ share/tmake/win32/subdirs.t
 @dirrm share/tmake/irix-o32
 @dirrm share/tmake/linux-cxx
 @dirrm share/tmake/linux-g++
-@dirrm share/tmake/linux-qws-g++
+@dirrm share/tmake/linux-kcc
 @dirrm share/tmake/netbsd-g++
 @dirrm share/tmake/openbsd-g++
 @dirrm share/tmake/osf1-cxx
 @dirrm share/tmake/osf1-g++
 @dirrm share/tmake/qnx-g++
-@dirrm share/tmake/reliant-cds
+@dirrm share/tmake/qws/linux-generic-g++
+@dirrm share/tmake/qws/linux-mips-g++
+@dirrm share/tmake/qws/linux-x86-g++
+@dirrm share/tmake/qws
 @dirrm share/tmake/sco-g++
+@dirrm share/tmake/reliant-cds
 @dirrm share/tmake/solaris-64
 @dirrm share/tmake/solaris-cc-gcc
 @dirrm share/tmake/solaris-cc