diff options
| -rw-r--r-- | devel/cppunit/Makefile | 10 | ||||
| -rw-r--r-- | devel/cppunit/PLIST | 23 | ||||
| -rw-r--r-- | devel/cppunit/distinfo | 13 | ||||
| -rw-r--r-- | devel/cppunit/patches/patch-configure | 45 | ||||
| -rw-r--r-- | devel/cppunit/patches/patch-doc_Makefile.in | 8 |
5 files changed, 21 insertions, 78 deletions
diff --git a/devel/cppunit/Makefile b/devel/cppunit/Makefile index 86690cc1d12..168c86453c0 100644 --- a/devel/cppunit/Makefile +++ b/devel/cppunit/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.25 2013/11/29 16:52:12 wiz Exp $ +# $NetBSD: Makefile,v 1.26 2017/04/19 12:20:08 wiz Exp $ -DISTNAME= cppunit-1.13.2 +DISTNAME= cppunit-1.14.0 CATEGORIES= devel MASTER_SITES= http://dev-www.libreoffice.org/src/ @@ -16,12 +16,6 @@ GNU_CONFIGURE= yes PKGCONFIG_OVERRIDE= cppunit.pc.in -SUBST_CLASSES+= rpath -SUBST_SED.rpath= -e s';-L@libdir@;${COMPILER_RPATH_FLAG}@libdir@ -L@libdir@;g' -SUBST_FILES.rpath= cppunit-config.in -SUBST_STAGE.rpath= pre-configure -SUBST_MESSAGE.rpath= Adding rpath to cppunit-config. - .include "options.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/cppunit/PLIST b/devel/cppunit/PLIST index 7650a2c3feb..e5838d19d78 100644 --- a/devel/cppunit/PLIST +++ b/devel/cppunit/PLIST @@ -1,6 +1,5 @@ -@comment $NetBSD: PLIST,v 1.15 2013/08/15 10:26:32 gsutre Exp $ +@comment $NetBSD: PLIST,v 1.16 2017/04/19 12:20:08 wiz Exp $ bin/DllPlugInTester -bin/cppunit-config include/cppunit/AdditionalMessage.h include/cppunit/Asserter.h include/cppunit/BriefTestProgressListener.h @@ -62,28 +61,24 @@ include/cppunit/plugin/PlugInManager.h include/cppunit/plugin/PlugInParameters.h include/cppunit/plugin/TestPlugIn.h include/cppunit/plugin/TestPlugInDefaultImpl.h -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/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/mfc/MfcTestRunner.h -include/cppunit/ui/mfc/TestRunner.h -include/cppunit/ui/qt/Config.h -include/cppunit/ui/qt/QtTestRunner.h -include/cppunit/ui/qt/TestRunner.h include/cppunit/ui/text/TestRunner.h include/cppunit/ui/text/TextTestRunner.h lib/libcppunit.la lib/pkgconfig/cppunit.pc -man/man1/cppunit-config.1 -share/aclocal/cppunit.m4 +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 ${PLIST.doc}share/doc/cppunit/html/FAQ ${PLIST.doc}share/doc/cppunit/html/_additional_message_8cpp.html ${PLIST.doc}share/doc/cppunit/html/_additional_message_8cpp__incl.map diff --git a/devel/cppunit/distinfo b/devel/cppunit/distinfo index bd520d57b35..6f79a7411d7 100644 --- a/devel/cppunit/distinfo +++ b/devel/cppunit/distinfo @@ -1,8 +1,7 @@ -$NetBSD: distinfo,v 1.11 2015/12/08 11:02:25 jperkin Exp $ +$NetBSD: distinfo,v 1.12 2017/04/19 12:20:08 wiz Exp $ -SHA1 (cppunit-1.13.2.tar.gz) = 0eaf8bb1dcf4d16b12bec30d0732370390d35e6f -RMD160 (cppunit-1.13.2.tar.gz) = 2a86e06409b53b3477842354b21dd17fc4943b09 -SHA512 (cppunit-1.13.2.tar.gz) = 8f4be569f321d577cec31931f49f4df143bc94e283605509b6ea50c60690aa91a2aed940e7eebd4b2413a4218f9a6c3978d312d8e587eab040283c6563846ecd -Size (cppunit-1.13.2.tar.gz) = 953596 bytes -SHA1 (patch-configure) = 467518999a6bbf1f18ce8b11edd9922f5ccbd09f -SHA1 (patch-doc_Makefile.in) = 2cbff40694ef13088f7deafcbc0d91078d4e4c88 +SHA1 (cppunit-1.14.0.tar.gz) = 3eba38567bad4e300f76c764f91a7301bacc716d +RMD160 (cppunit-1.14.0.tar.gz) = 9d2bec93f3cee98b95430b60d801f5ed886688aa +SHA512 (cppunit-1.14.0.tar.gz) = 4ea1da423c6f7ab37e4144689f593396829ce74d43872d6b10709c1ad5fbda4ee945842f7e9803592520ef81ac713e95a3fe130295bf048cd32a605d1959882e +Size (cppunit-1.14.0.tar.gz) = 959716 bytes +SHA1 (patch-doc_Makefile.in) = 6de58f4996211fb6d3fc44b22e0b743cd80c6944 diff --git a/devel/cppunit/patches/patch-configure b/devel/cppunit/patches/patch-configure deleted file mode 100644 index a75344461c6..00000000000 --- a/devel/cppunit/patches/patch-configure +++ /dev/null @@ -1,45 +0,0 @@ -$NetBSD: patch-configure,v 1.1 2015/12/08 11:02:25 jperkin Exp $ - -Use $as_echo to ensure \1 etc are supported. - ---- configure.orig 2013-11-11 04:41:53.000000000 +0000 -+++ configure -@@ -19087,23 +19087,23 @@ $as_echo X/* automatically generated */ - q - } - s/.*/./; q' -- echo '#ifndef '$ac_prefix_conf_DEF >$ac_prefix_conf_OUT -- echo '#define '$ac_prefix_conf_DEF' 1' >>$ac_prefix_conf_OUT -- echo ' ' >>$ac_prefix_conf_OUT -- echo /'*' $ac_prefix_conf_OUT. Generated automatically at end of configure. '*'/ >>$ac_prefix_conf_OUT -+ $as_echo '#ifndef '$ac_prefix_conf_DEF >$ac_prefix_conf_OUT -+ $as_echo '#define '$ac_prefix_conf_DEF' 1' >>$ac_prefix_conf_OUT -+ $as_echo ' ' >>$ac_prefix_conf_OUT -+ $as_echo /'*' $ac_prefix_conf_OUT. Generated automatically at end of configure. '*'/ >>$ac_prefix_conf_OUT - -- echo 's/#undef *\([A-Z_]\)/#undef '$ac_prefix_conf_UPP'_\1/' >conftest.sed -- echo 's/#undef *\([a-z]\)/#undef '$ac_prefix_conf_LOW'_\1/' >>conftest.sed -- echo 's/#define *\([A-Z_][A-Za-z0-9_]*\)\(.*\)/#ifndef '$ac_prefix_conf_UPP"_\\1 \\" >>conftest.sed -- echo '#define '$ac_prefix_conf_UPP"_\\1 \\2 \\" >>conftest.sed -- echo '#endif/' >>conftest.sed -- echo 's/#define *\([a-z][A-Za-z0-9_]*\)\(.*\)/#ifndef '$ac_prefix_conf_LOW"_\\1 \\" >>conftest.sed -- echo '#define '$ac_prefix_conf_LOW"_\\1 \\2 \\" >>conftest.sed -- echo '#endif/' >>conftest.sed -+ $as_echo 's/#undef *\([A-Z_]\)/#undef '$ac_prefix_conf_UPP'_\1/' >conftest.sed -+ $as_echo 's/#undef *\([a-z]\)/#undef '$ac_prefix_conf_LOW'_\1/' >>conftest.sed -+ $as_echo 's/#define *\([A-Z_][A-Za-z0-9_]*\)\(.*\)/#ifndef '$ac_prefix_conf_UPP"_\\1 \\" >>conftest.sed -+ $as_echo '#define '$ac_prefix_conf_UPP"_\\1 \\2 \\" >>conftest.sed -+ $as_echo '#endif/' >>conftest.sed -+ $as_echo 's/#define *\([a-z][A-Za-z0-9_]*\)\(.*\)/#ifndef '$ac_prefix_conf_LOW"_\\1 \\" >>conftest.sed -+ $as_echo '#define '$ac_prefix_conf_LOW"_\\1 \\2 \\" >>conftest.sed -+ $as_echo '#endif/' >>conftest.sed - sed -f conftest.sed $ac_prefix_conf_INP >>$ac_prefix_conf_OUT -- echo ' ' >>$ac_prefix_conf_OUT -- echo '/*' $ac_prefix_conf_DEF '*/' >>$ac_prefix_conf_OUT -- echo '#endif' >>$ac_prefix_conf_OUT -+ $as_echo ' ' >>$ac_prefix_conf_OUT -+ $as_echo '/*' $ac_prefix_conf_DEF '*/' >>$ac_prefix_conf_OUT -+ $as_echo '#endif' >>$ac_prefix_conf_OUT - else - as_fn_error $? "input file $ac_prefix_conf_IN does not exist, skip generating $ac_prefix_conf_OUT" "$LINENO" 5 - fi diff --git a/devel/cppunit/patches/patch-doc_Makefile.in b/devel/cppunit/patches/patch-doc_Makefile.in index 1071a4c61ff..39743c7906a 100644 --- a/devel/cppunit/patches/patch-doc_Makefile.in +++ b/devel/cppunit/patches/patch-doc_Makefile.in @@ -1,10 +1,10 @@ -$NetBSD: patch-doc_Makefile.in,v 1.2 2015/12/08 11:02:25 jperkin Exp $ +$NetBSD: patch-doc_Makefile.in,v 1.3 2017/04/19 12:20:08 wiz Exp $ Install docs in $docdir. ---- doc/Makefile.in.orig 2013-11-11 04:41:52.000000000 +0000 +--- doc/Makefile.in.orig 2017-04-19 12:16:20.675089478 +0000 +++ doc/Makefile.in -@@ -50,7 +50,7 @@ PRE_UNINSTALL = : +@@ -88,7 +88,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ @@ -12,4 +12,4 @@ Install docs in $docdir. +@DOC_TRUE@am__append_1 = $(docdir)/html @DOC_TRUE@am__append_2 = $(static_pages) html/index.html subdir = doc - DIST_COMMON = $(srcdir)/Doxyfile.in $(srcdir)/Makefile.am \ + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |