4 files changed, 147 insertions, 76 deletions

diff --git a/devel/cxxtest/Makefile b/devel/cxxtest/Makefile
index 22e891490fea..8d43e0f0b6d4 100644
--- a/devel/cxxtest/Makefile
+++ b/devel/cxxtest/Makefile
@@ -6,46 +6,43 @@
 #
 
 PORTNAME=	cxxtest
-PORTVERSION=	3.0.1
+PORTVERSION=	3.7.1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	drewish@katherinehouse.com
-COMMENT=	A simple yet powerful JUnit/CppUnit/xUnit-like framework for C++
+COMMENT=	Simple and powerful JUnit/CppUnit/xUnit-like framework for C++
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
-EXTRACT_SUFX =	.tgz
 NO_BUILD=	yes
 USE_PERL5_RUN=	yes
 
+DOCS=		README TODO docs/*.html docs/*.png
+EXAMPLES=	sample/*.cpp sample/*.h sample/*.tpl \
+	  	sample/Construct sample/Makefile.unix \
+
 do-install:
 # scripts
 	@${MKDIR} ${PREFIX}/include/cxxtest
 	${INSTALL_DATA} ${WRKSRC}/cxxtest/* ${PREFIX}/include/cxxtest/
 	${INSTALL_SCRIPT} ${WRKSRC}/cxxtestgen.pl ${PREFIX}/bin/
 	${INSTALL_SCRIPT} ${WRKSRC}/cxxtestgen.py ${PREFIX}/bin/
-
 # docs and examples (minus the win ddk stuff)
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	@${MKDIR} ${DOCSDIR}/sample
-	@${MKDIR} ${DOCSDIR}/test
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/docs/*.html ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/docs/*.png ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/sample/*.h ${DOCSDIR}/sample/
-	${INSTALL_DATA} ${WRKSRC}/sample/*.cpp ${DOCSDIR}/sample/
-	${INSTALL_DATA} ${WRKSRC}/sample/*.tpl ${DOCSDIR}/sample/
-	${INSTALL_DATA} ${WRKSRC}/sample/Construct ${DOCSDIR}/sample/
-	${INSTALL_DATA} ${WRKSRC}/sample/Makefile.unix ${DOCSDIR}/sample/Makefile
-	${INSTALL_DATA} ${WRKSRC}/test/*.h ${DOCSDIR}/test/
-	${INSTALL_DATA} ${WRKSRC}/test/*.cpp ${DOCSDIR}/test/
-	${INSTALL_DATA} ${WRKSRC}/test/*.tpl ${DOCSDIR}/test/
-	${INSTALL_DATA} ${WRKSRC}/test/*.out ${DOCSDIR}/test/
-	${INSTALL_DATA} ${WRKSRC}/test/test.pl ${DOCSDIR}/test/
-	@${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."
+	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
+	@${ECHO_MSG} "* Documentation has been installed in ${DOCSDIR}"
 .endif
+	@${MKDIR} ${EXAMPLESDIR}/test
+	cd ${WRKSRC} && ${INSTALL_DATA} ${EXAMPLES} ${EXAMPLESDIR}
+	cd ${WRKSRC}/test && ${TAR} -cf - * | \
+		(cd ${EXAMPLESDIR}/test && ${TAR} -xf -)
+	@${ECHO_MSG} "* Samples have been installed in ${EXAMPLESDIR}"
+	@${ECHO_MSG} "* Beware that the sample makefiles aren't compatible with FreeBSD's make,"
+	@${ECHO_MSG} "* use ${GMAKE} instead."
+	@${ECHO_MSG} "* The CxxTest scripts have been installed into ${PREFIX}/bin/."
+	@${ECHO_MSG} "* The include files are in ${PREFIX}/include/cxxtest/"
+	@${ECHO_MSG} "* The obvious reminder: don't forget to add ${PREFIX}/include to your include path."
 
 .include <bsd.port.mk>
diff --git a/devel/cxxtest/distinfo b/devel/cxxtest/distinfo
index 521109e8acf7..1ac8dbb8b5e8 100644
--- a/devel/cxxtest/distinfo
+++ b/devel/cxxtest/distinfo
@@ -1 +1 @@
-MD5 (cxxtest-3.0.1.tgz) = 1cf800ee2d7a9b3af02336655e3823fc
+MD5 (cxxtest-3.7.1.tar.gz) = fb768c225d6a7b093e1622fefc424e47
diff --git a/devel/cxxtest/files/patch-sample-Makefile.unix b/devel/cxxtest/files/patch-sample-Makefile.unix
index b512ebe8d29a..615064ad32e9 100644
--- a/devel/cxxtest/files/patch-sample-Makefile.unix
+++ b/devel/cxxtest/files/patch-sample-Makefile.unix
@@ -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 --git a/devel/cxxtest/pkg-plist b/devel/cxxtest/pkg-plist
index c75564fa2f0a..9c0bfc53668d 100644
--- a/devel/cxxtest/pkg-plist
+++ b/devel/cxxtest/pkg-plist
@@ -1,12 +1,18 @@
+@comment $FreeBSD$
 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
@@ -21,54 +27,103 @@ include/cxxtest/Win32Gui.h
 include/cxxtest/X11Gui.h
 include/cxxtest/YesNoRunner.h
 %%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%%%DOCSDIR%%/guide.html
 %%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%%/test/AborterNoThrow.h
-%%PORTDOCS%%%%DOCSDIR%%/test/BadTest.h
-%%PORTDOCS%%%%DOCSDIR%%/test/EmptySuite.h
-%%PORTDOCS%%%%DOCSDIR%%/test/error.out
-%%PORTDOCS%%%%DOCSDIR%%/test/good.out
-%%PORTDOCS%%%%DOCSDIR%%/test/GoodSuite.h
-%%PORTDOCS%%%%DOCSDIR%%/test/GreenYellowRed.h
-%%PORTDOCS%%%%DOCSDIR%%/test/gui.out
-%%PORTDOCS%%%%DOCSDIR%%/test/gui_paren.out
-%%PORTDOCS%%%%DOCSDIR%%/test/main.cpp
-%%PORTDOCS%%%%DOCSDIR%%/test/one.out
-%%PORTDOCS%%%%DOCSDIR%%/test/paren.out
-%%PORTDOCS%%%%DOCSDIR%%/test/runner.out
-%%PORTDOCS%%%%DOCSDIR%%/test/test.pl
-%%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/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
-@dirrm %%PORTDOCS%%%%DOCSDIR%%/sample
-@dirrm %%PORTDOCS%%%%DOCSDIR%%
+%%PORTDOCS%%@dirrm %%PORTDOCS%%%%DOCSDIR%%
+%%EXAMPLESDIR%%/Construct
+%%EXAMPLESDIR%%/CreatedTest.h
+%%EXAMPLESDIR%%/DeltaTest.h
+%%EXAMPLESDIR%%/ExceptionTest.h
+%%EXAMPLESDIR%%/FixtureTest.h
+%%EXAMPLESDIR%%/Makefile.unix
+%%EXAMPLESDIR%%/MessageTest.h
+%%EXAMPLESDIR%%/SelfTest.h
+%%EXAMPLESDIR%%/SimpleTest.h
+%%EXAMPLESDIR%%/TraitsTest.h
+%%EXAMPLESDIR%%/aborter.tpl
+%%EXAMPLESDIR%%/file_printer.tpl
+%%EXAMPLESDIR%%/test/AborterNoThrow.h
+%%EXAMPLESDIR%%/test/BadTest.h
+%%EXAMPLESDIR%%/test/DeepAbort.h
+%%EXAMPLESDIR%%/test/DefaultTraits.h
+%%EXAMPLESDIR%%/test/DoubleCall.h
+%%EXAMPLESDIR%%/test/EmptySuite.h
+%%EXAMPLESDIR%%/test/Exceptions.h
+%%EXAMPLESDIR%%/test/GlobalFixtures.h
+%%EXAMPLESDIR%%/test/GoodSuite.h
+%%EXAMPLESDIR%%/test/GreenYellowRed.h
+%%EXAMPLESDIR%%/test/IncludeTest.h
+%%EXAMPLESDIR%%/test/Int64.h
+%%EXAMPLESDIR%%/test/LessThanEquals.h
+%%EXAMPLESDIR%%/test/LongLong.h
+%%EXAMPLESDIR%%/test/LongTraits.h
+%%EXAMPLESDIR%%/test/MaxDump.h
+%%EXAMPLESDIR%%/test/SameData.h
+%%EXAMPLESDIR%%/test/ThrowNoStd.cpp
+%%EXAMPLESDIR%%/test/ThrowNoStd.h
+%%EXAMPLESDIR%%/test/ThrowNoStd.tpl
+%%EXAMPLESDIR%%/test/TraitsTest.h
+%%EXAMPLESDIR%%/test/Tsm.h
+%%EXAMPLESDIR%%/test/UserTraits.h
+%%EXAMPLESDIR%%/test/UserTraits.tpl
+%%EXAMPLESDIR%%/test/VoidTraits.h
+%%EXAMPLESDIR%%/test/WideCharTest.h
+%%EXAMPLESDIR%%/test/aborter.out
+%%EXAMPLESDIR%%/test/aborter_no_throw.out
+%%EXAMPLESDIR%%/test/anything.cpp
+%%EXAMPLESDIR%%/test/cxxtest/DummyGui.h
+%%EXAMPLESDIR%%/test/deep.out
+%%EXAMPLESDIR%%/test/default.out
+%%EXAMPLESDIR%%/test/double.out
+%%EXAMPLESDIR%%/test/error.out
+%%EXAMPLESDIR%%/test/exceptions.out
+%%EXAMPLESDIR%%/test/fake/X11/Xlib.h
+%%EXAMPLESDIR%%/test/fake/X11/Xutil.h
+%%EXAMPLESDIR%%/test/fake/commctrl.h
+%%EXAMPLESDIR%%/test/fake/qapplication.h
+%%EXAMPLESDIR%%/test/fake/qglobal.h
+%%EXAMPLESDIR%%/test/fake/qlabel.h
+%%EXAMPLESDIR%%/test/fake/qlayout.h
+%%EXAMPLESDIR%%/test/fake/qmessagebox.h
+%%EXAMPLESDIR%%/test/fake/qpixmap.h
+%%EXAMPLESDIR%%/test/fake/qprogressbar.h
+%%EXAMPLESDIR%%/test/fake/qstatusbar.h
+%%EXAMPLESDIR%%/test/fake/qstring.h
+%%EXAMPLESDIR%%/test/fake/qwidget.h
+%%EXAMPLESDIR%%/test/fake/windows.h
+%%EXAMPLESDIR%%/test/fixtures.out
+%%EXAMPLESDIR%%/test/good.out
+%%EXAMPLESDIR%%/test/gui.out
+%%EXAMPLESDIR%%/test/gui_paren.out
+%%EXAMPLESDIR%%/test/include.out
+%%EXAMPLESDIR%%/test/int64.cpp
+%%EXAMPLESDIR%%/test/int64.out
+%%EXAMPLESDIR%%/test/longlong.cpp
+%%EXAMPLESDIR%%/test/longlong.out
+%%EXAMPLESDIR%%/test/lte.out
+%%EXAMPLESDIR%%/test/main.cpp
+%%EXAMPLESDIR%%/test/max.out
+%%EXAMPLESDIR%%/test/one.out
+%%EXAMPLESDIR%%/test/paren.out
+%%EXAMPLESDIR%%/test/runner.out
+%%EXAMPLESDIR%%/test/same.out
+%%EXAMPLESDIR%%/test/test.pl
+%%EXAMPLESDIR%%/test/throw.out
+%%EXAMPLESDIR%%/test/traits.out
+%%EXAMPLESDIR%%/test/tsm.out
+%%EXAMPLESDIR%%/test/user.out
+%%EXAMPLESDIR%%/test/wchar.cpp
+%%EXAMPLESDIR%%/test/wchar.out
+%%EXAMPLESDIR%%/test/wildcard.out
+%%EXAMPLESDIR%%/yes_no_runner.cpp
 @dirrm include/cxxtest
+@dirrm %%EXAMPLESDIR%%/test/fake/X11
+@dirrm %%EXAMPLESDIR%%/test/fake
+@dirrm %%EXAMPLESDIR%%/test/cxxtest
+@dirrm %%EXAMPLESDIR%%/test
+@dirrm %%EXAMPLESDIR%%