Enclosed diff brings cppunit to 1.14.0. Overview on changes can be found at https://cgit.freedesktop.org/libreoffice/cppunit/tree/NEWS.
This update is actually from giovanni@ [0], and includes some input from sthen@ and me. Changes to the port: - Bump major of SHARED_LIBS as symbols have been removed - Updated HOMEPAGE and MASTER_SITES - Removed base-gcc from COMPILER. This update needs C++11 Tests: - Regression test passes - Build tested all consumers, including libreoffice, and ran 'make test' on some of the smaller ones BTW, it seems that libreoffice is currently _not_ using cppunit from ports although it is listed as BDEP: configure:24201: checking which cppunit to use configure:24302: result: internal Comments/OK? [0] https://marc.info/?l=openbsd-ports&m=157444225202584&w=2 diff --git Makefile Makefile index b9723aafdd7..0878e966577 100644 --- Makefile +++ Makefile @@ -2,25 +2,22 @@ COMMENT= c++ unit testing framework -DISTNAME= cppunit-1.12.1 -REVISION = 4 +DISTNAME= cppunit-1.14.0 -SHARED_LIBS += cppunit 3.0 # .1.0 +SHARED_LIBS += cppunit 4.0 # 1.14.0 CATEGORIES= devel -# XXX dead. Switch to newer releases at -# https://freedesktop.org/wiki/Software/cppunit/ ? -HOMEPAGE= http://cppunit.sourceforge.net/ +HOMEPAGE= https://www.freedesktop.org/wiki/Software/cppunit/ # LGPLv2.1 PERMIT_PACKAGE= Yes WANTLIB= c m ${COMPILER_LIBCXX} -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cppunit/} +MASTER_SITES= https://dev-www.libreoffice.org/src/ -COMPILER = base-clang ports-gcc base-gcc +COMPILER = base-clang ports-gcc USE_GMAKE= Yes diff --git distinfo distinfo index a0869eaec88..b37b399fac8 100644 --- distinfo +++ distinfo @@ -1,2 +1,2 @@ -SHA256 (cppunit-1.12.1.tar.gz) = rCigTI5skhfZELCucSKDLSjZkX+maLzJ4LiwmstOpEo= -SIZE (cppunit-1.12.1.tar.gz) = 762803 +SHA256 (cppunit-1.14.0.tar.gz) = PVaYadJ7SIYCEMdYxPMTCCEDpeWCGadmm1K/0p1nR4A= +SIZE (cppunit-1.14.0.tar.gz) = 959716 diff --git patches/patch-Makefile_in patches/patch-Makefile_in index 58d53f248d2..02bda14216a 100644 --- patches/patch-Makefile_in +++ patches/patch-Makefile_in @@ -1,12 +1,13 @@ $OpenBSD: patch-Makefile_in,v 1.1 2008/10/24 14:49:44 jasper Exp $ ---- Makefile.in.orig Sun Oct 19 23:43:08 2008 -+++ Makefile.in Sun Oct 19 23:43:11 2008 -@@ -231,7 +231,7 @@ top_builddir = @top_builddir@ +Index: Makefile.in +--- Makefile.in.orig ++++ Makefile.in +@@ -385,7 +385,7 @@ top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ - AUTOMAKE_OPTIONS = 1.4 - ACLOCAL_AMFLAGS = -I config + ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = src include examples doc +SUBDIRS = src include examples - pkgconfigdatadir = $(libdir)/pkgconfig - pkgconfigdata_DATA = cppunit.pc - bin_SCRIPTS = cppunit-config + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = cppunit.pc + doc_DATA = \ diff --git patches/patch-src_cppunit_Makefile_in patches/patch-src_cppunit_Makefile_in index dd6c4cabd13..0410c349726 100644 --- patches/patch-src_cppunit_Makefile_in +++ patches/patch-src_cppunit_Makefile_in @@ -1,13 +1,14 @@ $OpenBSD: patch-src_cppunit_Makefile_in,v 1.2 2008/10/24 14:49:44 jasper Exp $ ---- src/cppunit/Makefile.in.orig Wed Feb 20 06:59:55 2008 -+++ src/cppunit/Makefile.in Sun Oct 19 23:03:52 2008 -@@ -299,8 +299,7 @@ libcppunit_la_SOURCES = \ +Index: src/cppunit/Makefile.in +--- src/cppunit/Makefile.in.orig ++++ src/cppunit/Makefile.in +@@ -446,8 +446,7 @@ libcppunit_la_SOURCES = \ Win32DynamicLibraryManager.cpp libcppunit_la_LDFLAGS = \ - -no-undefined -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ -- -release $(LT_RELEASE) +- -release $(LT_RELEASE) $(LIBADD_DL) + -no-undefined -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) + libcppunit_la_LIBADD = $(LIBADD_DL) all: all-am - diff --git pkg/PLIST pkg/PLIST index 64890cb17e3..a8f51eda0af 100644 --- pkg/PLIST +++ pkg/PLIST @@ -1,6 +1,5 @@ @comment $OpenBSD: PLIST,v 1.3 2015/03/16 18:07:39 naddy Exp $ @bin bin/DllPlugInTester -bin/cppunit-config include/cppunit/ include/cppunit/AdditionalMessage.h include/cppunit/Asserter.h @@ -67,33 +66,27 @@ include/cppunit/plugin/PlugInParameters.h include/cppunit/plugin/TestPlugIn.h include/cppunit/plugin/TestPlugInDefaultImpl.h include/cppunit/portability/ -include/cppunit/portability/CppUnitDeque.h -include/cppunit/portability/CppUnitMap.h -include/cppunit/portability/CppUnitSet.h -include/cppunit/portability/CppUnitStack.h -include/cppunit/portability/CppUnitVector.h include/cppunit/portability/FloatingPoint.h include/cppunit/portability/Stream.h include/cppunit/tools/ include/cppunit/tools/Algorithm.h +include/cppunit/tools/StringHelper.h include/cppunit/tools/StringTools.h include/cppunit/tools/XmlDocument.h include/cppunit/tools/XmlElement.h include/cppunit/ui/ -include/cppunit/ui/mfc/ -include/cppunit/ui/mfc/MfcTestRunner.h -include/cppunit/ui/mfc/TestRunner.h -include/cppunit/ui/qt/ -include/cppunit/ui/qt/Config.h -include/cppunit/ui/qt/QtTestRunner.h -include/cppunit/ui/qt/TestRunner.h include/cppunit/ui/text/ include/cppunit/ui/text/TestRunner.h include/cppunit/ui/text/TextTestRunner.h -lib/libcppunit.a +@static-lib lib/libcppunit.a lib/libcppunit.la @lib lib/libcppunit.so.${LIBcppunit_VERSION} lib/pkgconfig/cppunit.pc -@man man/man1/cppunit-config.1 -share/aclocal/ -share/aclocal/cppunit.m4 +share/doc/cppunit/ +share/doc/cppunit/AUTHORS +share/doc/cppunit/BUGS +share/doc/cppunit/CodingGuideLines.txt +share/doc/cppunit/FAQ +share/doc/cppunit/INSTALL +share/doc/cppunit/INSTALL-WIN32.txt +share/doc/cppunit/INSTALL-unix
