Update to 1.7

PR: 24343
Submitted by: MAINTAINER

5 files changed, 36 insertions, 26 deletions

diff --git a/devel/tmake/Makefile b/devel/tmake/Makefile
index f5ebcf7eaf21..ed861ef79362 100644
--- a/devel/tmake/Makefile
+++ b/devel/tmake/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	tmake
-PORTVERSION=	1.6
+PORTVERSION=	1.7
 CATEGORIES=	devel perl5
 MASTER_SITES=	ftp://ftp.trolltech.com/freebies/tmake/
 
diff --git a/devel/tmake/distinfo b/devel/tmake/distinfo
index 088763773587..59bf00407e46 100644
--- a/devel/tmake/distinfo
+++ b/devel/tmake/distinfo
@@ -1 +1 @@
-MD5 (tmake-1.6.tar.gz) = 3b4cd646041a8016a21c805be7ead09c
+MD5 (tmake-1.7.tar.gz) = a96ff22a69ec78cf930eb4f9ac8d30d9
diff --git a/devel/tmake/files/patch-aa b/devel/tmake/files/patch-aa
index db4f7b126858..67fdc0bb03c4 100644
--- a/devel/tmake/files/patch-aa
+++ b/devel/tmake/files/patch-aa
@@ -1,6 +1,6 @@
---- lib/unix/generic.t	Tue Aug 22 14:23:51 2000
-+++ lib/unix/generic.t.new	Fri Sep  1 17:08:50 2000
-@@ -201,10 +201,10 @@
+--- lib/unix/generic.t	Mon Dec  4 03:26:06 2000
++++ lib/unix/generic.t.new	Mon Jan 15 11:42:17 2001
+@@ -205,10 +205,10 @@
  
  ####### Compiler, tools and options
  
@@ -10,8 +10,8 @@
 -CXXFLAGS=	#$ Expand("TMAKE_CXXFLAGS"); ExpandGlue("DEFINES","-D"," -D","");
 +CC	?=	#$ Expand("TMAKE_CC");
 +CXX	?=	#$ Expand("TMAKE_CXX");
-+CFLAGS	?=	#$ Expand("TMAKE_CFLAGS"); ExpandGlue("DEFINES","-D"," -D","");
-+CXXFLAGS?=	#$ Expand("TMAKE_CXXFLAGS"); ExpandGlue("DEFINES","-D"," -D","");
++CFLAGS	+=	#$ Expand("TMAKE_CFLAGS"); ExpandGlue("DEFINES","-D"," -D","");
++CXXFLAGS+=	#$ Expand("TMAKE_CXXFLAGS"); ExpandGlue("DEFINES","-D"," -D","");
  INCPATH	=	#$ ExpandPath("INCPATH","-I"," -I","");
  #$ Config("staticlib") && DisableOutput();
  LINK	=	#$ Expand("TMAKE_LINK");
diff --git a/devel/tmake/files/patch-ab b/devel/tmake/files/patch-ab
index 443c1fe3dee3..c681d27654b8 100644
--- a/devel/tmake/files/patch-ab
+++ b/devel/tmake/files/patch-ab
@@ -1,5 +1,5 @@
---- 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
+--- lib/freebsd-g++/tmake.conf	Sat Nov  4 19:00:02 2000
++++ lib/freebsd-g++/tmake.conf.new	Mon Jan 15 11:44:12 2001
 @@ -31,7 +31,7 @@
  TMAKE_LIBDIR		= /usr/local/lib
  TMAKE_INCDIR_X11	= /usr/X11R6/include
@@ -9,7 +9,7 @@
  TMAKE_LIBDIR_QT		= $(QTDIR)/lib
  TMAKE_INCDIR_OPENGL	= /usr/X11R6/include
  TMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
-@@ -51,8 +51,8 @@
+@@ -51,12 +51,12 @@
  TMAKE_LIBS		=
  TMAKE_LIBS_X11		= -lXext -lX11 -lm
  TMAKE_LIBS_X11SM	= -lICE -lSM
@@ -20,3 +20,8 @@
  TMAKE_LIBS_OPENGL	= -lGLU -lGL -lXmu
  TMAKE_LIBS_THREAD	= 
  
+-TMAKE_MOC		= $(QTDIR)/bin/moc
++TMAKE_MOC		= $(QTDIR)/bin/moc2
+ TMAKE_UIC		= $(QTDIR)/bin/uic
+ 
+ TMAKE_AR		= ar cqs
diff --git a/devel/tmake/pkg-plist b/devel/tmake/pkg-plist
index f5c31c979dbd..f6e28fb0bb6b 100644
--- a/devel/tmake/pkg-plist
+++ b/devel/tmake/pkg-plist
@@ -49,10 +49,6 @@ share/tmake/irix-64/app.t
 share/tmake/irix-64/lib.t
 share/tmake/irix-64/subdirs.t
 share/tmake/irix-64/tmake.conf
-share/tmake/irix-dcc/app.t
-share/tmake/irix-dcc/lib.t
-share/tmake/irix-dcc/subdirs.t
-share/tmake/irix-dcc/tmake.conf
 share/tmake/irix-g++/app.t
 share/tmake/irix-g++/lib.t
 share/tmake/irix-g++/subdirs.t
@@ -93,18 +89,26 @@ share/tmake/osf1-g++/app.t
 share/tmake/osf1-g++/lib.t
 share/tmake/osf1-g++/subdirs.t
 share/tmake/osf1-g++/tmake.conf
-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/qnx-rtp-g++/app.t
+share/tmake/qnx-rtp-g++/lib.t
+share/tmake/qnx-rtp-g++/subdirs.t
+share/tmake/qnx-rtp-g++/tmake.conf
 share/tmake/qws/linux-arm-g++/app.t
 share/tmake/qws/linux-arm-g++/lib.t
 share/tmake/qws/linux-arm-g++/subdirs.t
 share/tmake/qws/linux-arm-g++/tmake.conf
+share/tmake/qws/linux-cassiopeia-g++/app.t
+share/tmake/qws/linux-cassiopeia-g++/lib.t
+share/tmake/qws/linux-cassiopeia-g++/subdirs.t
+share/tmake/qws/linux-cassiopeia-g++/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-ipaq-g++/app.t
+share/tmake/qws/linux-ipaq-g++/lib.t
+share/tmake/qws/linux-ipaq-g++/subdirs.t
+share/tmake/qws/linux-ipaq-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
@@ -113,14 +117,14 @@ 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/sco-g++/app.t
+share/tmake/sco-g++/lib.t
+share/tmake/sco-g++/subdirs.t
+share/tmake/sco-g++/tmake.conf
 share/tmake/solaris-64/app.t
 share/tmake/solaris-64/lib.t
 share/tmake/solaris-64/subdirs.t
@@ -147,9 +151,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
@@ -211,7 +215,6 @@ share/tmake/win32/subdirs.t
 @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++
 @dirrm share/tmake/irix-n32
 @dirrm share/tmake/irix-o32
@@ -222,14 +225,16 @@ share/tmake/win32/subdirs.t
 @dirrm share/tmake/openbsd-g++
 @dirrm share/tmake/osf1-cxx
 @dirrm share/tmake/osf1-g++
-@dirrm share/tmake/qnx-g++
+@dirrm share/tmake/qnx-rtp-g++
 @dirrm share/tmake/qws/linux-arm-g++
+@dirrm share/tmake/qws/linux-cassiopeia-g++
 @dirrm share/tmake/qws/linux-generic-g++
+@dirrm share/tmake/qws/linux-ipaq-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/sco-g++
 @dirrm share/tmake/solaris-64
 @dirrm share/tmake/solaris-cc-gcc
 @dirrm share/tmake/solaris-cc