- Update to 3.9.1

PR:		ports/63902
Submitted by:	andrew morton <drewish@katherinehouse.com> (maintainer)

4 files changed, 13 insertions, 123 deletions

diff --git a/devel/cxxtest/Makefile b/devel/cxxtest/Makefile
index 8d43e0f0b6d4..016c3c173fec 100644
--- a/devel/cxxtest/Makefile
+++ b/devel/cxxtest/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	cxxtest
-PORTVERSION=	3.7.1
+PORTVERSION=	3.9.1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -19,8 +19,8 @@ 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 \
+EXAMPLES=	sample/*.cpp sample/*.h sample/*.tpl sample/Construct \
+		sample/Makefile.unix sample/gui/GreenYellowRed.h
 
 do-install:
 # scripts
@@ -34,15 +34,13 @@ do-install:
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
 	@${ECHO_MSG} "* Documentation has been installed in ${DOCSDIR}"
 .endif
-	@${MKDIR} ${EXAMPLESDIR}/test
+	@${MKDIR} ${EXAMPLESDIR}
 	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} "* Beware that the sample makefiles aren't compatible with FreeBSD's make,"
+	@${ECHO_MSG} "* use ${GMAKE} instead."
 	@${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 1ac8dbb8b5e8..da05e0c1ba4e 100644
--- a/devel/cxxtest/distinfo
+++ b/devel/cxxtest/distinfo
@@ -1 +1,2 @@
-MD5 (cxxtest-3.7.1.tar.gz) = fb768c225d6a7b093e1622fefc424e47
+MD5 (cxxtest-3.9.1.tar.gz) = e301a46cf06a17ce5a9c285dc45e244d
+SIZE (cxxtest-3.9.1.tar.gz) = 104619
diff --git a/devel/cxxtest/files/patch-sample-Makefile.unix b/devel/cxxtest/files/patch-sample-Makefile.unix
deleted file mode 100644
index 615064ad32e9..000000000000
--- a/devel/cxxtest/files/patch-sample-Makefile.unix
+++ /dev/null
@@ -1,34 +0,0 @@
---- 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
--#QTDIR = /usr/lib/qt
--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 9c0bfc53668d..09d3a8c9d5c5 100644
--- a/devel/cxxtest/pkg-plist
+++ b/devel/cxxtest/pkg-plist
@@ -1,4 +1,3 @@
-@comment $FreeBSD$
 bin/cxxtestgen.pl
 bin/cxxtestgen.py
 include/cxxtest/Descriptions.h
@@ -14,10 +13,11 @@ include/cxxtest/QtGui.h
 include/cxxtest/RealDescriptions.h
 include/cxxtest/Root.cpp
 include/cxxtest/SelfTest.h
+include/cxxtest/StdString.h
 include/cxxtest/StdValueTraits.h
+include/cxxtest/StdioFilePrinter.h
 include/cxxtest/StdioPrinter.h
 include/cxxtest/TeeListener.h
-include/cxxtest/TeeRunner.h
 include/cxxtest/TestListener.h
 include/cxxtest/TestRunner.h
 include/cxxtest/TestSuite.h
@@ -40,90 +40,15 @@ include/cxxtest/YesNoRunner.h
 %%EXAMPLESDIR%%/DeltaTest.h
 %%EXAMPLESDIR%%/ExceptionTest.h
 %%EXAMPLESDIR%%/FixtureTest.h
+%%EXAMPLESDIR%%/GreenYellowRed.h
+%%EXAMPLESDIR%%/GuiWait.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%%/only.tpl
 %%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%%