Date: Sun, 23 Nov 2003 14:30:24 -0800 (PST) From: andrew morton <drewish@katherinehouse.com> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/59607: Update port: devel/cxxtest 3.0.1 -> 3.7.1 Message-ID: <200311232230.hANMUO9O090540@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/59607; it has been noted by GNATS. From: andrew morton <drewish@katherinehouse.com> To: freebsd-gnats-submit@FreeBSD.org Cc: Subject: Re: ports/59607: Update port: devel/cxxtest 3.0.1 -> 3.7.1 Date: Sun, 23 Nov 2003 14:22:52 -0800 --opJtzjQTFsWo+cga Content-Type: text/plain; charset=us-ascii Content-Disposition: inline err, okay i'm a moron (and this is my first try at a port). here's the diff instead. --opJtzjQTFsWo+cga Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="cxxtest_port.diff" diff -ur devel/cxxtest.bak/Makefile devel/cxxtest/Makefile --- devel/cxxtest.bak/Makefile Sat Nov 22 20:45:36 2003 +++ devel/cxxtest/Makefile Sat Nov 22 22:55:31 2003 @@ -6,7 +6,7 @@ # PORTNAME= cxxtest -PORTVERSION= 3.0.1 +PORTVERSION= 3.7.1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -15,7 +15,6 @@ COMMENT= A simple yet powerful JUnit/CppUnit/xUnit-like framework for C++ WRKSRC= ${WRKDIR}/${PORTNAME} -EXTRACT_SUFX = .tgz NO_BUILD= yes USE_PERL5_RUN= yes @@ -31,6 +30,8 @@ @${MKDIR} ${DOCSDIR} @${MKDIR} ${DOCSDIR}/sample @${MKDIR} ${DOCSDIR}/test + @${MKDIR} ${DOCSDIR}/test/fake + @${MKDIR} ${DOCSDIR}/test/fake/X11 ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/docs/*.html ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/docs/*.png ${DOCSDIR} @@ -44,8 +45,12 @@ ${INSTALL_DATA} ${WRKSRC}/test/*.tpl ${DOCSDIR}/test/ ${INSTALL_DATA} ${WRKSRC}/test/*.out ${DOCSDIR}/test/ ${INSTALL_DATA} ${WRKSRC}/test/test.pl ${DOCSDIR}/test/ + ${INSTALL_DATA} ${WRKSRC}/test/fake/*.h ${DOCSDIR}/test/fake/ + ${INSTALL_DATA} ${WRKSRC}/test/fake/X11/*.h ${DOCSDIR}/test/fake/X11/ @${ECHO_CMD} "* Documentation and samples have been installed in ${DOCSDIR}" - @${ECHO_CMD} "* NOTE: the makefiles provided with the samples aren't compatible with FreeBSD's make, use ${GMAKE} instead." + @${ECHO_CMD} "* Beware that the sample makefiles aren't compatible with FreeBSD's make, use ${GMAKE} instead." .endif + @${ECHO_CMD} " The CxxTest scripts have been installed into ${PREFIX}/bin/. The include files are in ${PREFIX}/include/cxxtest/ + @${ECHO_CMD} " * The obvious reminder: don't forget to add ${PREFIX}/include to your include path." .include <bsd.port.mk> diff -ur devel/cxxtest.bak/distinfo devel/cxxtest/distinfo --- devel/cxxtest.bak/distinfo Sat Nov 22 20:45:36 2003 +++ devel/cxxtest/distinfo Sat Nov 22 20:49:17 2003 @@ -1 +1 @@ -MD5 (cxxtest-3.0.1.tgz) = 1cf800ee2d7a9b3af02336655e3823fc +MD5 (cxxtest-3.7.1.tar.gz) = fb768c225d6a7b093e1622fefc424e47 diff -ur devel/cxxtest.bak/files/patch-sample-Makefile.unix devel/cxxtest/files/patch-sample-Makefile.unix --- devel/cxxtest.bak/files/patch-sample-Makefile.unix Sat Nov 22 20:45:36 2003 +++ devel/cxxtest/files/patch-sample-Makefile.unix Sun Nov 23 02:43:50 2003 @@ -1,15 +1,34 @@ ---- sample/Makefile.unix.orig Fri Aug 15 02:51:52 2003 -+++ sample/Makefile.unix Fri Aug 15 03:03:55 2003 -@@ -5,9 +5,9 @@ +--- sample/Makefile.unix.orig Sat Sep 20 07:25:49 2003 ++++ sample/Makefile.unix Sun Nov 23 02:42:12 2003 +@@ -3,23 +3,24 @@ + # + + # Change this line if you want a different compiler +-CXXC = c++ -Wall -W -Werror -I.. ++CXXC = c++ -Wall -W -I/usr/local/include + + # If you want to use python, specify USE_PYTHON=1 on the command line + ifdef USE_PYTHON +- TESTGEN = ../cxxtestgen.py ++TESTGEN = ../cxxtestgen.py + else +- TESTGEN = ../cxxtestgen.pl ++TESTGEN = ../cxxtestgen.pl + endif + # For the X11 GUI X11_FLAGS = -I/usr/X11R6/include -L/usr/X11R6/lib -lX11 --# For the Qt GUI + # For the Qt GUI -#QTDIR = /usr/lib/qt --QT_FLAGS = -I$(QTDIR)/include -L$(QTDIR)/lib -lqt -O2 -+# For the Qt 3.1 GUI -+QTDIR = /usr/X11R6 -+QT_FLAGS = -I$(QTDIR)/include -L$(QTDIR)/lib -lqt-mt -O2 +-QTLIB = -lqt-mt +-#QTLIB = -lqt +-QT_FLAGS = -I$(QTDIR)/include -L$(QTDIR)/lib $(QTLIB) -O2 ++#QTDIR = /usr/X11R6 ++#QTLIB = -lqt-mt ++#QT_FLAGS = -I$(QTDIR)/include -L$(QTDIR)/lib $(QTLIB) -O2 ++QT_FLAGS = -I/usr/X11R6/include -L/usr/X11R6/lib -lqt-mt -O2 ++ TARGETS = error_printer stdio_printer yes_no_runner file_printer aborter GUI_TARGETS = x11_runner qt_runner diff -ur devel/cxxtest.bak/pkg-plist devel/cxxtest/pkg-plist --- devel/cxxtest.bak/pkg-plist Sat Nov 22 20:45:36 2003 +++ devel/cxxtest/pkg-plist Sat Nov 22 22:15:29 2003 @@ -1,12 +1,17 @@ bin/cxxtestgen.pl bin/cxxtestgen.py -include/cxxtest/CountingTracker.h include/cxxtest/Descriptions.h +include/cxxtest/DummyDescriptions.h include/cxxtest/ErrorFormatter.h include/cxxtest/ErrorPrinter.h +include/cxxtest/Flags.h +include/cxxtest/GlobalFixture.h include/cxxtest/Gui.h +include/cxxtest/LinkedList.h include/cxxtest/ParenPrinter.h include/cxxtest/QtGui.h +include/cxxtest/RealDescriptions.h +include/cxxtest/Root.cpp include/cxxtest/SelfTest.h include/cxxtest/StdValueTraits.h include/cxxtest/StdioPrinter.h @@ -25,50 +30,96 @@ %%PORTDOCS%%%%DOCSDIR%%/index.html %%PORTDOCS%%%%DOCSDIR%%/qt.png %%PORTDOCS%%%%DOCSDIR%%/qt2.png +%%PORTDOCS%%%%DOCSDIR%%/win32.png %%PORTDOCS%%%%DOCSDIR%%/x11.png -%%PORTDOCS%%%%DOCSDIR%%/sample/aborter.tpl -%%PORTDOCS%%%%DOCSDIR%%/sample/Construct %%PORTDOCS%%%%DOCSDIR%%/sample/CreatedTest.h %%PORTDOCS%%%%DOCSDIR%%/sample/DeltaTest.h %%PORTDOCS%%%%DOCSDIR%%/sample/ExceptionTest.h -%%PORTDOCS%%%%DOCSDIR%%/sample/file_printer.tpl %%PORTDOCS%%%%DOCSDIR%%/sample/FixtureTest.h -%%PORTDOCS%%%%DOCSDIR%%/sample/Makefile %%PORTDOCS%%%%DOCSDIR%%/sample/MessageTest.h %%PORTDOCS%%%%DOCSDIR%%/sample/SelfTest.h %%PORTDOCS%%%%DOCSDIR%%/sample/SimpleTest.h %%PORTDOCS%%%%DOCSDIR%%/sample/TraitsTest.h %%PORTDOCS%%%%DOCSDIR%%/sample/yes_no_runner.cpp -%%PORTDOCS%%%%DOCSDIR%%/test/aborter.out -%%PORTDOCS%%%%DOCSDIR%%/test/aborter_no_throw.out +%%PORTDOCS%%%%DOCSDIR%%/sample/aborter.tpl +%%PORTDOCS%%%%DOCSDIR%%/sample/file_printer.tpl +%%PORTDOCS%%%%DOCSDIR%%/sample/Construct +%%PORTDOCS%%%%DOCSDIR%%/sample/Makefile +%%PORTDOCS%%%%DOCSDIR%%/test/fake/X11/Xlib.h +%%PORTDOCS%%%%DOCSDIR%%/test/fake/X11/Xutil.h +%%PORTDOCS%%%%DOCSDIR%%/test/fake/commctrl.h +%%PORTDOCS%%%%DOCSDIR%%/test/fake/qapplication.h +%%PORTDOCS%%%%DOCSDIR%%/test/fake/qglobal.h +%%PORTDOCS%%%%DOCSDIR%%/test/fake/qlabel.h +%%PORTDOCS%%%%DOCSDIR%%/test/fake/qlayout.h +%%PORTDOCS%%%%DOCSDIR%%/test/fake/qmessagebox.h +%%PORTDOCS%%%%DOCSDIR%%/test/fake/qpixmap.h +%%PORTDOCS%%%%DOCSDIR%%/test/fake/qprogressbar.h +%%PORTDOCS%%%%DOCSDIR%%/test/fake/qstatusbar.h +%%PORTDOCS%%%%DOCSDIR%%/test/fake/qstring.h +%%PORTDOCS%%%%DOCSDIR%%/test/fake/qwidget.h +%%PORTDOCS%%%%DOCSDIR%%/test/fake/windows.h %%PORTDOCS%%%%DOCSDIR%%/test/AborterNoThrow.h %%PORTDOCS%%%%DOCSDIR%%/test/BadTest.h +%%PORTDOCS%%%%DOCSDIR%%/test/DeepAbort.h +%%PORTDOCS%%%%DOCSDIR%%/test/DefaultTraits.h +%%PORTDOCS%%%%DOCSDIR%%/test/DoubleCall.h %%PORTDOCS%%%%DOCSDIR%%/test/EmptySuite.h -%%PORTDOCS%%%%DOCSDIR%%/test/error.out -%%PORTDOCS%%%%DOCSDIR%%/test/good.out +%%PORTDOCS%%%%DOCSDIR%%/test/Exceptions.h +%%PORTDOCS%%%%DOCSDIR%%/test/GlobalFixtures.h %%PORTDOCS%%%%DOCSDIR%%/test/GoodSuite.h %%PORTDOCS%%%%DOCSDIR%%/test/GreenYellowRed.h +%%PORTDOCS%%%%DOCSDIR%%/test/IncludeTest.h +%%PORTDOCS%%%%DOCSDIR%%/test/Int64.h +%%PORTDOCS%%%%DOCSDIR%%/test/LessThanEquals.h +%%PORTDOCS%%%%DOCSDIR%%/test/LongLong.h +%%PORTDOCS%%%%DOCSDIR%%/test/LongTraits.h +%%PORTDOCS%%%%DOCSDIR%%/test/MaxDump.h +%%PORTDOCS%%%%DOCSDIR%%/test/SameData.h +%%PORTDOCS%%%%DOCSDIR%%/test/ThrowNoStd.h +%%PORTDOCS%%%%DOCSDIR%%/test/TraitsTest.h +%%PORTDOCS%%%%DOCSDIR%%/test/Tsm.h %%PORTDOCS%%%%DOCSDIR%%/test/gui.out -%%PORTDOCS%%%%DOCSDIR%%/test/gui_paren.out +%%PORTDOCS%%%%DOCSDIR%%/test/UserTraits.h +%%PORTDOCS%%%%DOCSDIR%%/test/VoidTraits.h +%%PORTDOCS%%%%DOCSDIR%%/test/WideCharTest.h +%%PORTDOCS%%%%DOCSDIR%%/test/ThrowNoStd.cpp +%%PORTDOCS%%%%DOCSDIR%%/test/anything.cpp +%%PORTDOCS%%%%DOCSDIR%%/test/int64.cpp +%%PORTDOCS%%%%DOCSDIR%%/test/longlong.cpp %%PORTDOCS%%%%DOCSDIR%%/test/main.cpp +%%PORTDOCS%%%%DOCSDIR%%/test/wchar.cpp +%%PORTDOCS%%%%DOCSDIR%%/test/ThrowNoStd.tpl +%%PORTDOCS%%%%DOCSDIR%%/test/UserTraits.tpl +%%PORTDOCS%%%%DOCSDIR%%/test/aborter.out +%%PORTDOCS%%%%DOCSDIR%%/test/aborter_no_throw.out +%%PORTDOCS%%%%DOCSDIR%%/test/deep.out +%%PORTDOCS%%%%DOCSDIR%%/test/default.out +%%PORTDOCS%%%%DOCSDIR%%/test/double.out +%%PORTDOCS%%%%DOCSDIR%%/test/error.out +%%PORTDOCS%%%%DOCSDIR%%/test/exceptions.out +%%PORTDOCS%%%%DOCSDIR%%/test/fixtures.out +%%PORTDOCS%%%%DOCSDIR%%/test/good.out +%%PORTDOCS%%%%DOCSDIR%%/test/gui_paren.out +%%PORTDOCS%%%%DOCSDIR%%/test/include.out +%%PORTDOCS%%%%DOCSDIR%%/test/lte.out +%%PORTDOCS%%%%DOCSDIR%%/test/int64.out +%%PORTDOCS%%%%DOCSDIR%%/test/longlong.out +%%PORTDOCS%%%%DOCSDIR%%/test/max.out %%PORTDOCS%%%%DOCSDIR%%/test/one.out %%PORTDOCS%%%%DOCSDIR%%/test/paren.out %%PORTDOCS%%%%DOCSDIR%%/test/runner.out -%%PORTDOCS%%%%DOCSDIR%%/test/test.pl +%%PORTDOCS%%%%DOCSDIR%%/test/same.out %%PORTDOCS%%%%DOCSDIR%%/test/throw.out -%%PORTDOCS%%%%DOCSDIR%%/test/ThrowNoStd.cpp -%%PORTDOCS%%%%DOCSDIR%%/test/ThrowNoStd.h -%%PORTDOCS%%%%DOCSDIR%%/test/ThrowNoStd.tpl %%PORTDOCS%%%%DOCSDIR%%/test/traits.out -%%PORTDOCS%%%%DOCSDIR%%/test/TraitsTest.h +%%PORTDOCS%%%%DOCSDIR%%/test/tsm.out %%PORTDOCS%%%%DOCSDIR%%/test/user.out -%%PORTDOCS%%%%DOCSDIR%%/test/UserTraits.h -%%PORTDOCS%%%%DOCSDIR%%/test/UserTraits.tpl -%%PORTDOCS%%%%DOCSDIR%%/test/wchar.cpp %%PORTDOCS%%%%DOCSDIR%%/test/wchar.out -%%PORTDOCS%%%%DOCSDIR%%/test/WideCharTest.h %%PORTDOCS%%%%DOCSDIR%%/test/wildcard.out -@dirrm %%PORTDOCS%%%%DOCSDIR%%/test +%%PORTDOCS%%%%DOCSDIR%%/test/test.pl +@dirrm include/cxxtest @dirrm %%PORTDOCS%%%%DOCSDIR%%/sample +@dirrm %%PORTDOCS%%%%DOCSDIR%%/test/fake/X11 +@dirrm %%PORTDOCS%%%%DOCSDIR%%/test/fake +@dirrm %%PORTDOCS%%%%DOCSDIR%%/test @dirrm %%PORTDOCS%%%%DOCSDIR%% -@dirrm include/cxxtest --opJtzjQTFsWo+cga--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200311232230.hANMUO9O090540>