? tmake.diff Index: Makefile =================================================================== RCS file: /home/pcvs/ports/devel/tmake/Makefile,v retrieving revision 1.12 diff -u -u -r1.12 Makefile --- Makefile 21 Feb 2003 11:23:02 -0000 1.12 +++ Makefile 17 May 2003 14:58:01 -0000 @@ -7,7 +7,7 @@ PORTNAME= tmake PORTVERSION= 1.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel perl5 MASTER_SITES= ftp://ftp.trolltech.com/freebies/tmake/ @@ -15,10 +15,16 @@ COMMENT= Extremely portable perl-based make utility USE_PERL5= yes -USE_QT_VER= 2 NO_BUILD= yes TMAKE_BIN= progen tmake +post-patch: + @${RM} -f ${WRKSRC}/lib/freebsd-g++/tmake.conf.orig + @${CP} -Rp ${WRKSRC}/lib/freebsd-g++ ${WRKSRC}/lib/freebsd-qt3-g++ + @${RM} -f ${WRKSRC}/lib/freebsd-qt3-g++/tmake.conf + @${CP} ${FILESDIR}/tmake.conf-qt3 \ + ${WRKSRC}/lib/freebsd-qt3-g++/tmake.conf + do-install: @${MKDIR} ${PREFIX}/share/tmake @cd ${WRKSRC}/lib; tar cf - * | (cd ${PREFIX}/share/tmake && tar xf -) @@ -29,7 +35,8 @@ post-install: @${ECHO} @${ECHO} "Make sure to set your TMAKEPATH environment variable" - @${ECHO} "to ${PREFIX}/share/tmake/freebsd-g++." + @${ECHO} "to ${PREFIX}/share/tmake/freebsd-g++ for QT2, or" + @${ECHO} "${PREFIX}/share/tmake/freebsd-qt3-g++ for QT3." @${ECHO} .include Index: pkg-plist =================================================================== RCS file: /home/pcvs/ports/devel/tmake/pkg-plist,v retrieving revision 1.5 diff -u -u -r1.5 pkg-plist --- pkg-plist 16 Jan 2001 13:26:39 -0000 1.5 +++ pkg-plist 17 May 2003 14:58:01 -0000 @@ -20,7 +20,10 @@ 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/freebsd-qt3-g++/app.t +share/tmake/freebsd-qt3-g++/lib.t +share/tmake/freebsd-qt3-g++/subdirs.t +share/tmake/freebsd-qt3-g++/tmake.conf share/tmake/hpux-acc/app.t share/tmake/hpux-acc/lib.t share/tmake/hpux-acc/subdirs.t @@ -207,6 +210,7 @@ @dirrm share/tmake/aix-xlc @dirrm share/tmake/bsdi-g++ @dirrm share/tmake/dgux-g++ +@dirrm share/tmake/freebsd-qt3-g++ @dirrm share/tmake/freebsd-g++ @dirrm share/tmake/hpux-acc @dirrm share/tmake/hpux-cc Index: files/tmake.conf-qt3 =================================================================== RCS file: files/tmake.conf-qt3 diff -N files/tmake.conf-qt3 --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/tmake.conf-qt3 17 May 2003 14:58:01 -0000 @@ -0,0 +1,66 @@ +# +# $Id: tmake.conf,v 1.17 1999/07/28 15:21:38 hanord Exp $ +# +# tmake configuration for freebsd-g++ +# + +TEMPLATE = app +CONFIG = qt warn_on release + +TMAKE_CC = gcc +TMAKE_CFLAGS = -pipe +TMAKE_CFLAGS_WARN_ON = -Wall -W +TMAKE_CFLAGS_WARN_OFF = +TMAKE_CFLAGS_RELEASE = +TMAKE_CFLAGS_DEBUG = -g +TMAKE_CFLAGS_SHLIB = -fPIC +TMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses +TMAKE_CFLAGS_THREAD = -pthread -D_THREAD_SAFE + +TMAKE_CXX = g++ +TMAKE_CXXFLAGS = $$TMAKE_CFLAGS +TMAKE_CXXFLAGS_WARN_ON = $$TMAKE_CFLAGS_WARN_ON +TMAKE_CXXFLAGS_WARN_OFF = $$TMAKE_CFLAGS_WARN_OFF +TMAKE_CXXFLAGS_RELEASE = $$TMAKE_CFLAGS_RELEASE +TMAKE_CXXFLAGS_DEBUG = $$TMAKE_CFLAGS_DEBUG +TMAKE_CXXFLAGS_SHLIB = $$TMAKE_CFLAGS_SHLIB +TMAKE_CXXFLAGS_YACC = $$TMAKE_CFLAGS_YACC +TMAKE_CXXFLAGS_THREAD = $$TMAKE_CFLAGS_THREAD + +TMAKE_INCDIR = /usr/local/include +TMAKE_LIBDIR = /usr/local/lib +TMAKE_INCDIR_X11 = /usr/X11R6/include +TMAKE_LIBDIR_X11 = /usr/X11R6/lib +TMAKE_INCDIR_QT = $(QTDIR)/include +TMAKE_LIBDIR_QT = $(QTDIR)/lib +TMAKE_INCDIR_OPENGL = /usr/X11R6/include +TMAKE_LIBDIR_OPENGL = /usr/X11R6/lib + +TMAKE_LINK = g++ +TMAKE_LINK_SHLIB = g++ +TMAKE_LFLAGS = +TMAKE_LFLAGS_RELEASE = +TMAKE_LFLAGS_DEBUG = +TMAKE_LFLAGS_SHLIB = -shared +TMAKE_LFLAGS_THREAD = -pthread +TMAKE_RPATH = -Wl,-rpath, + +# soname does not work on fbsd 2.x +#TMAKE_LFLAGS_SONAME = -Wl,-soname + +TMAKE_LIBS = +TMAKE_LIBS_X11 = -lXext -lX11 -lm +TMAKE_LIBS_X11SM = -lICE -lSM +TMAKE_LIBS_QT = -lqtgl +TMAKE_LIBS_QT_THREAD = -lqt-mt +TMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu +TMAKE_LIBS_THREAD = + +TMAKE_MOC = $(QTDIR)/bin/moc +TMAKE_UIC = $(QTDIR)/bin/uic + +TMAKE_AR = ar cqs +TMAKE_RANLIB = + +TMAKE_TAR = tar -cf +TMAKE_GZIP = gzip -9f