Date: Mon, 15 Jan 2001 13:00:15 +0100 (CET) From: jesse@cs.uni-magdeburg.de To: FreeBSD-gnats-submit@freebsd.org Subject: ports/24343: Update port: devel/tmake (1.6 -> 1.7) Message-ID: <200101151200.f0FC0Fx70612@arthur.cs.uni-magdeburg.de>
next in thread | raw e-mail | index | archive | help
>Number: 24343 >Category: ports >Synopsis: Update port: devel/tmake (1.6 -> 1.7) >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Jan 15 04:00:02 PST 2001 >Closed-Date: >Last-Modified: >Originator: Roland Jesse >Release: FreeBSD 4.2-STABLE i386 >Organization: Otto-von-Guericke University of Magdeburg >Environment: FreeBSD arthur.cs.uni-magdeburg.de 4.2-STABLE FreeBSD 4.2-STABLE #0: Thu Nov 23 09:45:34 CET 2000 root@arthur.cs.uni-magdeburg.de:/usr/obj/usr/src/sys/ARTHUR i386 >Description: Update of port devel/tmake from version 1.6 to version 1.7. >How-To-Repeat: >Fix: diff -ruN tmake.bak/Makefile tmake/Makefile --- tmake.bak/Makefile Mon Jan 15 11:33:56 2001 +++ tmake/Makefile Mon Jan 15 11:34:13 2001 @@ -6,7 +6,7 @@ # PORTNAME= tmake -PORTVERSION= 1.6 +PORTVERSION= 1.7 CATEGORIES= devel perl5 MASTER_SITES= ftp://ftp.trolltech.com/freebies/tmake/ diff -ruN tmake.bak/distinfo tmake/distinfo --- tmake.bak/distinfo Mon Jan 15 11:33:56 2001 +++ tmake/distinfo Mon Jan 15 11:37:48 2001 @@ -1 +1 @@ -MD5 (tmake-1.6.tar.gz) = 3b4cd646041a8016a21c805be7ead09c +MD5 (tmake-1.7.tar.gz) = a96ff22a69ec78cf930eb4f9ac8d30d9 diff -ruN tmake.bak/files/patch-aa tmake/files/patch-aa --- tmake.bak/files/patch-aa Mon Jan 15 11:33:56 2001 +++ tmake/files/patch-aa Mon Jan 15 11:42:57 2001 @@ -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 -ruN tmake.bak/files/patch-ab tmake/files/patch-ab --- tmake.bak/files/patch-ab Mon Jan 15 11:33:56 2001 +++ tmake/files/patch-ab Mon Jan 15 11:44:42 2001 @@ -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 -ruN tmake.bak/pkg-plist tmake/pkg-plist --- tmake.bak/pkg-plist Mon Jan 15 11:33:56 2001 +++ tmake/pkg-plist Mon Jan 15 11:57:35 2001 @@ -49,10 +49,6 @@ 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++/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++/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++/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 @@ @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 @@ @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 >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200101151200.f0FC0Fx70612>