Index: Makefile =================================================================== --- Makefile (revision 380162) +++ Makefile (working copy) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= cutter -PORTVERSION= 1.2.2 -PORTREVISION= 2 +PORTVERSION= 1.2.4 CATEGORIES= devel MASTER_SITES= SF @@ -19,10 +18,9 @@ USES= gettext gmake libtool pathfix pkgconfig USE_GNOME= intlhack glib20 gtk20 USE_LDCONFIG= yes -WANT_GSTREAMER= yes INSTALL_TARGET= install-strip -OPTIONS_DEFINE= GOFFICE GSTREAMER SOUP LCOV +OPTIONS_DEFINE= GOFFICE SOUP LCOV GOFFICE_DESC= GOffice support SOUP_DESC= libsoup support LCOV_DESC= Force dependency on lcov @@ -42,15 +40,6 @@ PLIST_SUB+= GOFFICE="@comment " .endif -.if ${PORT_OPTIONS:MGSTREAMER} -CONFIGURE_ARGS+=--enable-gstreamer -USE_GSTREAMER=yes -PLIST_SUB+= GST="" GST_VERSION="${GST_VERSION}" -.else -CONFIGURE_ARGS+=--disable-gstreamer -PLIST_SUB+= GST="@comment " -.endif - .if ${PORT_OPTIONS:MLCOV} RUN_DEPENDS+= lcov:${PORTSDIR}/devel/lcov .endif @@ -57,7 +46,7 @@ .if ${PORT_OPTIONS:MSOUP} CONFIGURE_ARGS+=--enable-libsoup -LIB_DEPENDS+= libsoup-2.so:${PORTSDIR}/devel/libsoup +LIB_DEPENDS+= libsoup-2.4.so:${PORTSDIR}/devel/libsoup PLIST_SUB+= SOUP="" .else CONFIGURE_ARGS+=--disable-libsoup Index: distinfo =================================================================== --- distinfo (revision 380162) +++ distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (cutter-1.2.2.tar.gz) = 3eb5ed399e7f1a0f09da622535e23074af5eaf3198339c4f4e07cc98f7eaa37b -SIZE (cutter-1.2.2.tar.gz) = 2625075 +SHA256 (cutter-1.2.4.tar.gz) = b917a5b67b1d5f24458db5ab177dc11d23b47f04f9cb7eef757f456483c629c6 +SIZE (cutter-1.2.4.tar.gz) = 2523951 Index: files/patch-test_run-test.sh =================================================================== --- files/patch-test_run-test.sh (revision 380162) +++ files/patch-test_run-test.sh (working copy) @@ -1,11 +0,0 @@ - -$FreeBSD$ - ---- test/run-test.sh.orig -+++ test/run-test.sh -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/bin/sh - - BASE_DIR="`dirname $0`" - export BASE_DIR Index: pkg-plist =================================================================== --- pkg-plist (revision 380162) +++ pkg-plist (working copy) @@ -24,8 +24,9 @@ include/cutter/cutter/cut-file-stream-reader.h include/cutter/cutter/cut-helper.h include/cutter/cutter/cut-iterated-test.h -include/cutter/cutter/cut-listener-utils.h include/cutter/cutter/cut-listener.h +include/cutter/cutter/cut-loader-customizer-factory-builder.h +include/cutter/cutter/cut-loader-customizer.h include/cutter/cutter/cut-logger.h include/cutter/cutter/cut-macros.h include/cutter/cutter/cut-main.h @@ -99,17 +100,18 @@ %%SOUP%%include/cutter/soupcutter/soupcut-assertions.h %%SOUP%%include/cutter/soupcutter/soupcut-client.h %%SOUP%%include/cutter/soupcutter/soupcut-server.h +lib/cutter/module/factory/loader-customizer/cpp-integration-factory.so lib/cutter/module/factory/report/pdf_factory.so lib/cutter/module/factory/report/xml_factory.so lib/cutter/module/factory/stream/xml_factory.so lib/cutter/module/factory/ui/console_factory.so lib/cutter/module/factory/ui/gtk_factory.so +lib/cutter/module/loader-customizer/cpp-integration.so lib/cutter/module/report/pdf.so lib/cutter/module/report/xml.so lib/cutter/module/stream/xml.so lib/cutter/module/ui/console.so lib/cutter/module/ui/gtk.so -%%GST%%lib/gstreamer-%%GST_VERSION%%/libgstcuttertest.so lib/libcppcutter.so lib/libcppcutter.so.0 lib/libcppcutter.so.0.1.0 @@ -120,7 +122,8 @@ lib/libgdkcutter-pixbuf.so.0 lib/libgdkcutter-pixbuf.so.0.1.0 %%SOUP%%lib/libsoupcutter.so -%%SOUP%%lib/libsoupcutter.so.1 +%%SOUP%%lib/libsoupcutter.so.0 +%%SOUP%%lib/libsoupcutter.so.0.1.0 libdata/pkgconfig/cppcutter.pc libdata/pkgconfig/cutter.pc libdata/pkgconfig/gcutter.pc @@ -140,7 +143,6 @@ %%DATADIR%%/license/lgpl-3.txt %%DATADIR%%/stack/Makefile.am %%DATADIR%%/stack/autogen.sh -%%DATADIR%%/stack/config/keep-me %%DATADIR%%/stack/configure.ac %%DATADIR%%/stack/src/Makefile.am %%DATADIR%%/stack/src/stack.c @@ -235,10 +237,6 @@ %%DOCSDIR%%/install-to-ubuntu.html %%DOCSDIR%%/install.html %%DOCSDIR%%/introduction.html -%%DOCSDIR%%/ja/GCutEgg.html -%%DOCSDIR%%/ja/GCutEventLoop.html -%%DOCSDIR%%/ja/GCutProcess.html -%%DOCSDIR%%/ja/SoupCutClient.html %%DOCSDIR%%/ja/api-index-0.3.xml %%DOCSDIR%%/ja/api-index-0.8.xml %%DOCSDIR%%/ja/api-index-0.9.xml @@ -262,18 +260,23 @@ %%DOCSDIR%%/ja/api-index-deprecated.xml %%DOCSDIR%%/ja/api-index-full.xml %%DOCSDIR%%/ja/colorized-diff.png -%%DOCSDIR%%/ja/command.html %%DOCSDIR%%/ja/cppcut-assertions.xml +%%DOCSDIR%%/ja/cppcut-iterated-test.xml %%DOCSDIR%%/ja/cppcut-macros.xml +%%DOCSDIR%%/ja/cppcut-test-iterator.xml +%%DOCSDIR%%/ja/cppcut-test-methods.xml +%%DOCSDIR%%/ja/cppcut-test.xml %%DOCSDIR%%/ja/cppcutter.xml %%DOCSDIR%%/ja/cut-assertions.xml %%DOCSDIR%%/ja/cut-config.xml %%DOCSDIR%%/ja/cut-console-diff-writer.xml %%DOCSDIR%%/ja/cut-console.xml -%%DOCSDIR%%/ja/cut-diff.html %%DOCSDIR%%/ja/cut-experimental.xml %%DOCSDIR%%/ja/cut-features.xml +%%DOCSDIR%%/ja/cut-glib-compatible.xml %%DOCSDIR%%/ja/cut-helper.xml +%%DOCSDIR%%/ja/cut-loader-customizer-factory-builder.xml +%%DOCSDIR%%/ja/cut-loader-customizer.xml %%DOCSDIR%%/ja/cut-logger.xml %%DOCSDIR%%/ja/cut-multi-process.xml %%DOCSDIR%%/ja/cut-string-diff-writer.xml @@ -280,42 +283,9 @@ %%DOCSDIR%%/ja/cut-test-utils.xml %%DOCSDIR%%/ja/cut-types.xml %%DOCSDIR%%/ja/cut-version.xml -%%DOCSDIR%%/ja/cutter-Assertion-Utilities-for-GEnum-and-GFlags.html -%%DOCSDIR%%/ja/cutter-Assertion-Utilities-for-GError.html -%%DOCSDIR%%/ja/cutter-Assertion-Utilities-for-GHashTable.html -%%DOCSDIR%%/ja/cutter-Assertion-Utilities-for-GList.html -%%DOCSDIR%%/ja/cutter-Assertion-Utilities-for-GObject.html -%%DOCSDIR%%/ja/cutter-Assertion-Utilities-for-GString.html -%%DOCSDIR%%/ja/cutter-Assertion-Utilities-for-GValue.html -%%DOCSDIR%%/ja/cutter-Assertion-writing-helper.html -%%DOCSDIR%%/ja/cutter-Assertions-for-HTTP-client-and-server.html -%%DOCSDIR%%/ja/cutter-Assertions-with-C++-support.html -%%DOCSDIR%%/ja/cutter-Assertions-with-GLib-support.html -%%DOCSDIR%%/ja/cutter-Assertions-with-gdk-pixbuf-support.html -%%DOCSDIR%%/ja/cutter-Assertions.html -%%DOCSDIR%%/ja/cutter-Available-features.html -%%DOCSDIR%%/ja/cutter-Convenience-HTTP-server-API.html -%%DOCSDIR%%/ja/cutter-Convenience-test-data-API.html -%%DOCSDIR%%/ja/cutter-CppCutter.html -%%DOCSDIR%%/ja/cutter-Cutter.html -%%DOCSDIR%%/ja/cutter-Experimental.html -%%DOCSDIR%%/ja/cutter-GCutGLibEventLoop.html -%%DOCSDIR%%/ja/cutter-GCutter.html -%%DOCSDIR%%/ja/cutter-GdkCutter-Pixbuf.html -%%DOCSDIR%%/ja/cutter-Multi-Process.html -%%DOCSDIR%%/ja/cutter-Object-inspection-functions.html -%%DOCSDIR%%/ja/cutter-SoupCutter.html -%%DOCSDIR%%/ja/cutter-Test-Utilities-with-GLib-support.html -%%DOCSDIR%%/ja/cutter-Test-Utilities.html -%%DOCSDIR%%/ja/cutter-Types-for-GLib-support.html -%%DOCSDIR%%/ja/cutter-Types.html -%%DOCSDIR%%/ja/cutter-Version-Information.html -%%DOCSDIR%%/ja/cutter.devhelp2 -%%DOCSDIR%%/ja/cutter.html %%DOCSDIR%%/ja/cutter.xml %%DOCSDIR%%/ja/dark-circle.png %%DOCSDIR%%/ja/diff-dark-and-nested-circle.png -%%DOCSDIR%%/ja/features.html %%DOCSDIR%%/ja/gcut-assertions-helper.xml %%DOCSDIR%%/ja/gcut-assertions.xml %%DOCSDIR%%/ja/gcut-data-helper.xml @@ -344,72 +314,13 @@ %%DOCSDIR%%/ja/gdkcut-pixbuf-assertions.xml %%DOCSDIR%%/ja/gdkcut-pixbuf.xml %%DOCSDIR%%/ja/gdkcutter-pixbuf.xml -%%DOCSDIR%%/ja/home.png -%%DOCSDIR%%/ja/index-0-3.html -%%DOCSDIR%%/ja/index-0-4.html -%%DOCSDIR%%/ja/index-0-5.html -%%DOCSDIR%%/ja/index-0-6.html -%%DOCSDIR%%/ja/index-0-7.html -%%DOCSDIR%%/ja/index-0-8.html -%%DOCSDIR%%/ja/index-0-9.html -%%DOCSDIR%%/ja/index-1-0-1.html -%%DOCSDIR%%/ja/index-1-0-2.html -%%DOCSDIR%%/ja/index-1-0-3.html -%%DOCSDIR%%/ja/index-1-0-4.html -%%DOCSDIR%%/ja/index-1-0-5.html -%%DOCSDIR%%/ja/index-1-0-6.html -%%DOCSDIR%%/ja/index-1-0-7.html -%%DOCSDIR%%/ja/index-1-0-8.html -%%DOCSDIR%%/ja/index-1-0-9.html -%%DOCSDIR%%/ja/index-1-0.html -%%DOCSDIR%%/ja/index-1-1-0.html -%%DOCSDIR%%/ja/index-1-1-1.html -%%DOCSDIR%%/ja/index-1-1-2.html -%%DOCSDIR%%/ja/index-1-1-3.html -%%DOCSDIR%%/ja/index-1-1-4.html -%%DOCSDIR%%/ja/index-1-1-5.html -%%DOCSDIR%%/ja/index-1-1-6.html -%%DOCSDIR%%/ja/index-1-1-7.html -%%DOCSDIR%%/ja/index-1-1-8.html -%%DOCSDIR%%/ja/index-1-1-9.html -%%DOCSDIR%%/ja/index-1-2-0.html -%%DOCSDIR%%/ja/index-all.html -%%DOCSDIR%%/ja/index-deprecated.html -%%DOCSDIR%%/ja/index.html -%%DOCSDIR%%/ja/index.sgml -%%DOCSDIR%%/ja/install-to-centos.html -%%DOCSDIR%%/ja/install-to-cygwin.html -%%DOCSDIR%%/ja/install-to-debian.html -%%DOCSDIR%%/ja/install-to-fedora.html -%%DOCSDIR%%/ja/install-to-freebsd.html -%%DOCSDIR%%/ja/install-to-mac-os-x.html -%%DOCSDIR%%/ja/install-to-others.html -%%DOCSDIR%%/ja/install-to-solaris.html -%%DOCSDIR%%/ja/install-to-ubuntu.html -%%DOCSDIR%%/ja/install.html -%%DOCSDIR%%/ja/introduction.html -%%DOCSDIR%%/ja/left.png %%DOCSDIR%%/ja/nested-circle.png -%%DOCSDIR%%/ja/news.html -%%DOCSDIR%%/ja/overview.html -%%DOCSDIR%%/ja/readme.html -%%DOCSDIR%%/ja/reference.html -%%DOCSDIR%%/ja/release.html -%%DOCSDIR%%/ja/right.png %%DOCSDIR%%/ja/soupcut-assertions-helper.xml %%DOCSDIR%%/ja/soupcut-assertions.xml %%DOCSDIR%%/ja/soupcut-client.xml %%DOCSDIR%%/ja/soupcut-server.xml %%DOCSDIR%%/ja/soupcutter.xml -%%DOCSDIR%%/ja/start.html -%%DOCSDIR%%/ja/style.css -%%DOCSDIR%%/ja/travis-ci-integration.html -%%DOCSDIR%%/ja/travis-ci.html -%%DOCSDIR%%/ja/tutorial.html -%%DOCSDIR%%/ja/up.png -%%DOCSDIR%%/ja/users.html -%%DOCSDIR%%/ja/writing-assertion.html -%%DOCSDIR%%/ja/writing-test.html +%%DOCSDIR%%/left-insensitive.png %%DOCSDIR%%/left.png %%DOCSDIR%%/nested-circle.png %%DOCSDIR%%/news.html @@ -416,7 +327,9 @@ %%DOCSDIR%%/overview.html %%DOCSDIR%%/readme.html %%DOCSDIR%%/reference.html +%%DOCSDIR%%/release-howto.html %%DOCSDIR%%/release.html +%%DOCSDIR%%/right-insensitive.png %%DOCSDIR%%/right.png %%DOCSDIR%%/start.html %%DOCSDIR%%/style.css @@ -423,6 +336,7 @@ %%DOCSDIR%%/travis-ci-integration.html %%DOCSDIR%%/travis-ci.html %%DOCSDIR%%/tutorial.html +%%DOCSDIR%%/up-insensitive.png %%DOCSDIR%%/up.png %%DOCSDIR%%/users.html %%DOCSDIR%%/writing-assertion.html