diff --git a/devel/cutter/Makefile b/devel/cutter/Makefile index 36ea3833452e9..3e598a2060fff 100644 --- a/devel/cutter/Makefile +++ b/devel/cutter/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.35 2014/01/01 11:52:11 wiz Exp $ +# $NetBSD: Makefile,v 1.36 2014/02/08 12:14:32 obache Exp $ # -DISTNAME= cutter-1.2.2 -PKGREVISION= 11 +DISTNAME= cutter-1.2.3 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cutter/} @@ -29,10 +28,14 @@ TEST_TARGET= check .include "options.mk" .include "../../mk/compiler.mk" -# XXX: PR#lib/39986? -.if !empty(PKGSRC_COMPILER:Mgcc) +# PR#lib/39986 +.if !empty(CC_VERSION:Mgcc*) && !empty(MACHINE_PLATFORM:MNetBSD-[0-5].*-*) LDFLAGS.NetBSD+= -lgcc_s .endif +# needed to use C code with C++ exception +.if !empty(CC_VERSION:Mgcc*) || !empty(CC_VERSION:Mclang*) +CFLAGS+= -fexceptions +.endif BUILDLINK_API_DEPENDS.glib2+= glib2>=2.16.0 .include "../../devel/glib2/buildlink3.mk" diff --git a/devel/cutter/PLIST b/devel/cutter/PLIST index 8f7eef81dcd9b..9e86c8ce00a05 100644 --- a/devel/cutter/PLIST +++ b/devel/cutter/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.8 2012/12/23 07:46:25 obache Exp $ +@comment $NetBSD: PLIST,v 1.9 2014/02/08 12:14:32 obache Exp $ bin/cut-diff bin/cutter include/cutter/cppcutter.h @@ -25,8 +25,9 @@ include/cutter/cutter/cut-features.h 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 @@ -100,11 +101,13 @@ ${PLIST.soup}include/cutter/soupcutter/soupcut-assertions-helper.h ${PLIST.soup}include/cutter/soupcutter/soupcut-assertions.h ${PLIST.soup}include/cutter/soupcutter/soupcut-client.h ${PLIST.soup}include/cutter/soupcutter/soupcut-server.h +lib/cutter/module/factory/loader-customizer/cpp-integration-factory.la ${PLIST.pdf}lib/cutter/module/factory/report/pdf_factory.la lib/cutter/module/factory/report/xml_factory.la lib/cutter/module/factory/stream/xml_factory.la lib/cutter/module/factory/ui/console_factory.la ${PLIST.gtk}lib/cutter/module/factory/ui/gtk_factory.la +lib/cutter/module/loader-customizer/cpp-integration.la ${PLIST.pdf}lib/cutter/module/report/pdf.la ${PLIST.gtk}lib/cutter/module/ui/gtk.la lib/cutter/module/report/xml.la @@ -134,7 +137,6 @@ share/cutter/license/fdl-1.3.txt share/cutter/license/lgpl-3.txt share/cutter/stack/Makefile.am share/cutter/stack/autogen.sh -share/cutter/stack/config/keep-me share/cutter/stack/configure.ac share/cutter/stack/src/Makefile.am share/cutter/stack/src/stack.c @@ -258,7 +260,11 @@ share/gtk-doc/html/cutter/ja/api-index-full.xml share/gtk-doc/html/cutter/ja/colorized-diff.png share/gtk-doc/html/cutter/ja/command.html share/gtk-doc/html/cutter/ja/cppcut-assertions.xml +share/gtk-doc/html/cutter/ja/cppcut-iterated-test.xml share/gtk-doc/html/cutter/ja/cppcut-macros.xml +share/gtk-doc/html/cutter/ja/cppcut-test-iterator.xml +share/gtk-doc/html/cutter/ja/cppcut-test-methods.xml +share/gtk-doc/html/cutter/ja/cppcut-test.xml share/gtk-doc/html/cutter/ja/cppcutter.xml share/gtk-doc/html/cutter/ja/cut-assertions.xml share/gtk-doc/html/cutter/ja/cut-config.xml @@ -267,7 +273,10 @@ share/gtk-doc/html/cutter/ja/cut-console.xml share/gtk-doc/html/cutter/ja/cut-diff.html share/gtk-doc/html/cutter/ja/cut-experimental.xml share/gtk-doc/html/cutter/ja/cut-features.xml +share/gtk-doc/html/cutter/ja/cut-glib-compatible.xml share/gtk-doc/html/cutter/ja/cut-helper.xml +share/gtk-doc/html/cutter/ja/cut-loader-customizer-factory-builder.xml +share/gtk-doc/html/cutter/ja/cut-loader-customizer.xml share/gtk-doc/html/cutter/ja/cut-logger.xml share/gtk-doc/html/cutter/ja/cut-multi-process.xml share/gtk-doc/html/cutter/ja/cut-string-diff-writer.xml @@ -388,6 +397,7 @@ share/gtk-doc/html/cutter/ja/news.html share/gtk-doc/html/cutter/ja/overview.html share/gtk-doc/html/cutter/ja/readme.html share/gtk-doc/html/cutter/ja/reference.html +share/gtk-doc/html/cutter/ja/release-howto.html share/gtk-doc/html/cutter/ja/release.html share/gtk-doc/html/cutter/ja/right.png share/gtk-doc/html/cutter/ja/soupcut-assertions-helper.xml @@ -410,6 +420,7 @@ share/gtk-doc/html/cutter/news.html share/gtk-doc/html/cutter/overview.html share/gtk-doc/html/cutter/readme.html share/gtk-doc/html/cutter/reference.html +share/gtk-doc/html/cutter/release-howto.html share/gtk-doc/html/cutter/release.html share/gtk-doc/html/cutter/right.png share/gtk-doc/html/cutter/start.html diff --git a/devel/cutter/distinfo b/devel/cutter/distinfo index 13089570e8f66..6d4e43157381a 100644 --- a/devel/cutter/distinfo +++ b/devel/cutter/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.8 2012/12/23 07:46:25 obache Exp $ +$NetBSD: distinfo,v 1.9 2014/02/08 12:14:32 obache Exp $ -SHA1 (cutter-1.2.2.tar.gz) = ce33471d343af21488ad0f36c8ed4f4ab3f6cd72 -RMD160 (cutter-1.2.2.tar.gz) = 9a585e71038567cd338f629bdb267041db7738d2 -Size (cutter-1.2.2.tar.gz) = 2625075 bytes +SHA1 (cutter-1.2.3.tar.gz) = 97446319f0a4892433912ab91633b6e0ffa2d09c +RMD160 (cutter-1.2.3.tar.gz) = 6768179a09c655a1bb9a64df7be55d2350622b57 +Size (cutter-1.2.3.tar.gz) = 2704032 bytes diff --git a/devel/cutter/options.mk b/devel/cutter/options.mk index d5980cc95c263..3af2080e61442 100644 --- a/devel/cutter/options.mk +++ b/devel/cutter/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2011/02/13 12:59:51 obache Exp $ +# $NetBSD: options.mk,v 1.3 2014/02/08 12:14:32 obache Exp $ # PKG_OPTIONS_VAR= PKG_OPTIONS.cutter @@ -33,7 +33,7 @@ CONFIGURE_ARGS+= --disable-goffice ### gstreamer support ### .if !empty(PKG_OPTIONS:Mgstreamer) -.include "../../multimedia/gstreamer0.10/buildlink3.mk" +.include "../../multimedia/gstreamer1/buildlink3.mk" CONFIGURE_ARGS+= --enable-gstreamer PLIST.gst= yes .else