diff --git a/archivers/libpar2/Makefile b/archivers/libpar2/Makefile index d8a82391cac..96c4a66bcb2 100644 --- a/archivers/libpar2/Makefile +++ b/archivers/libpar2/Makefile @@ -3,7 +3,7 @@ PORTNAME= libpar2 PORTVERSION= 0.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= archivers MASTER_SITES= http://launchpad.net/${PORTNAME}/trunk/${PORTVERSION}/+download/ @@ -16,11 +16,9 @@ LIB_DEPENDS= libsigc-2.0.so:devel/libsigc++20 GNU_CONFIGURE= yes -LDFLAGS+= -L${LOCALBASE}/lib -CPPFLAGS+= -I${LOCALBASE}/include - USE_LDCONFIG= yes -USES= pkgconfig libtool +USES= pkgconfig libtool localbase compiler:c++11-lang +USE_CXXSTD= c++11 OPTIONS_DEFINE= DOCS diff --git a/audio/gtkguitune/Makefile b/audio/gtkguitune/Makefile index 128f595c547..19d9d38f3bf 100644 --- a/audio/gtkguitune/Makefile +++ b/audio/gtkguitune/Makefile @@ -16,7 +16,8 @@ LICENSE= GPLv2+ WRKSRC= ${WRKDIR}/${PORTNAME} -USES= pkgconfig +USES= compiler:c++11-lang pkgconfig +USE_CXXSTD= c++11 USE_GNOME= gtkmm24 GNU_CONFIGURE= yes INSTALLS_ICONS= yes diff --git a/audio/pavucontrol/Makefile b/audio/pavucontrol/Makefile index ffbccf2cd1a..a474a684b59 100644 --- a/audio/pavucontrol/Makefile +++ b/audio/pavucontrol/Makefile @@ -15,8 +15,9 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libpulse.so:audio/pulseaudio GNU_CONFIGURE= yes -USES= gmake pkgconfig gettext tar:xz +USES= gmake pkgconfig gettext tar:xz compiler:c++11-lang USE_GNOME= glibmm intltool libsigc++20 +USE_CXXSTD= c++11 OPTIONS_SUB= yes OPTIONS_SINGLE= GTK diff --git a/audio/sooperlooper/Makefile b/audio/sooperlooper/Makefile index bcbb50b9705..33364ebae9d 100644 --- a/audio/sooperlooper/Makefile +++ b/audio/sooperlooper/Makefile @@ -12,6 +12,8 @@ COMMENT= Live audio looping sampler LICENSE= GPLv2 +BROKEN= Does not build with newer libsigc++20 + BUILD_DEPENDS= ladspa>0:audio/ladspa LIB_DEPENDS= libjack.so:audio/jack \ liblo.so:audio/liblo \ diff --git a/benchmarks/flamegraph/Makefile b/benchmarks/flamegraph/Makefile index 61ae7d206b1..b182d9762ce 100644 --- a/benchmarks/flamegraph/Makefile +++ b/benchmarks/flamegraph/Makefile @@ -3,6 +3,7 @@ PORTNAME= flamegraph PORTVERSION= g20170308 +PORTREVISION= 1 CATEGORIES= benchmarks MAINTAINER= jmd@FreeBSD.org diff --git a/biology/diamond/Makefile b/biology/diamond/Makefile index 2c0bbcd975d..aa03165f99d 100644 --- a/biology/diamond/Makefile +++ b/biology/diamond/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME= diamond -PORTVERSION= 0.8.36 -PORTREVISION= 1 +PORTVERSION= 0.8.37 +PORTREVISION= 0 DISTVERSIONPREFIX=v CATEGORIES= biology diff --git a/biology/diamond/distinfo b/biology/diamond/distinfo index 1c15a243df1..8d10684b370 100644 --- a/biology/diamond/distinfo +++ b/biology/diamond/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1486907764 -SHA256 (bbuchfink-diamond-v0.8.36_GH0.tar.gz) = 302336d88a791812c54c120d14332035fd2ba328932048fab0a13c26ffaf5a24 -SIZE (bbuchfink-diamond-v0.8.36_GH0.tar.gz) = 342916 +TIMESTAMP = 1491128175 +SHA256 (bbuchfink-diamond-v0.8.37_GH0.tar.gz) = 54dcede91053075c7a530de6e4a842a65600b0d5d9eae4b6b4ceab402ac2c7fe +SIZE (bbuchfink-diamond-v0.8.37_GH0.tar.gz) = 353131 diff --git a/comms/svxlink/Makefile b/comms/svxlink/Makefile index 1037d611def..97a707ca65d 100644 --- a/comms/svxlink/Makefile +++ b/comms/svxlink/Makefile @@ -10,6 +10,8 @@ COMMENT?= General purpose ham radio voice services LICENSE= GPLv2 +BROKEN= does not build since newer libsigc++20 + LIB_DEPENDS?= libgsm.so:audio/gsm \ libspeex.so:audio/speex \ libgpg-error.so:security/libgpg-error \ diff --git a/databases/libgdamm5/Makefile b/databases/libgdamm5/Makefile index d33bde44d27..60aa23a9208 100644 --- a/databases/libgdamm5/Makefile +++ b/databases/libgdamm5/Makefile @@ -12,7 +12,8 @@ COMMENT= C++ wrapper for libgda5 library BUILD_DEPENDS= gm4:devel/m4 -USES= gmake libtool pathfix pkgconfig tar:xz +USES= gmake libtool pathfix pkgconfig tar:xz compiler:c++11-lang +USE_CXXSTD= c++11 USE_GNOME= libgda5 glibmm GNU_CONFIGURE= yes INSTALL_TARGET= install-strip diff --git a/deskutils/pinot/Makefile b/deskutils/pinot/Makefile index e92777a7c61..f00680c287c 100644 --- a/deskutils/pinot/Makefile +++ b/deskutils/pinot/Makefile @@ -11,6 +11,8 @@ COMMENT= Personal search and metasearch for the Free Desktop LICENSE= GPLv2 +BROKEN= depends on C++11 libs while not itself being C++11 compatible + BUILD_DEPENDS= desktop-file-install:devel/desktop-file-utils \ update-mime-database:misc/shared-mime-info LIB_DEPENDS= libxapian.so:databases/xapian-core \ diff --git a/devel/desktop-file-utils/Makefile b/devel/desktop-file-utils/Makefile index 81d0c1d462f..2b7365a4c91 100644 --- a/devel/desktop-file-utils/Makefile +++ b/devel/desktop-file-utils/Makefile @@ -3,8 +3,7 @@ # $MCom: ports/trunk/devel/desktop-file-utils/Makefile 17268 2013-04-01 05:13:11Z marcus $ PORTNAME= desktop-file-utils -PORTVERSION= 0.22 -PORTREVISION= 4 +PORTVERSION= 0.23 CATEGORIES= devel MASTER_SITES= http://freedesktop.org/software/${PORTNAME}/releases/ diff --git a/devel/desktop-file-utils/distinfo b/devel/desktop-file-utils/distinfo index 6b9d574848d..24451b298c8 100644 --- a/devel/desktop-file-utils/distinfo +++ b/devel/desktop-file-utils/distinfo @@ -1,2 +1,3 @@ -SHA256 (desktop-file-utils-0.22.tar.xz) = 843532672692f98e9b2d6ae6cc8658da562dfde1606c7f33d9d227a344de56c5 -SIZE (desktop-file-utils-0.22.tar.xz) = 131028 +TIMESTAMP = 1491153510 +SHA256 (desktop-file-utils-0.23.tar.xz) = 6c094031bdec46c9f621708f919084e1cb5294e2c5b1e4c883b3e70cb8903385 +SIZE (desktop-file-utils-0.23.tar.xz) = 132000 diff --git a/devel/eris/Makefile b/devel/eris/Makefile index fe8350ab425..0a1ff9b81dd 100644 --- a/devel/eris/Makefile +++ b/devel/eris/Makefile @@ -19,5 +19,6 @@ LIB_DEPENDS= libAtlas-0.6.so:devel/atlas-devel \ GNU_CONFIGURE= yes USE_LDCONFIG= yes USES= libtool pathfix pkgconfig compiler:c++11-lib +USE_CXXSTD= c++11 .include diff --git a/devel/gconfmm26/Makefile b/devel/gconfmm26/Makefile index 45536571583..7816560d93b 100644 --- a/devel/gconfmm26/Makefile +++ b/devel/gconfmm26/Makefile @@ -16,7 +16,9 @@ LIB_DEPENDS= libglibmm-2.4.so:devel/glibmm BUILD_DEPENDS= gm4:devel/m4 \ ${LOCALBASE}/lib/libgtkmm-2.4.so.1:x11-toolkits/gtkmm24 -USES= gmake libtool:keepla pathfix pkgconfig tar:bzip2 +USES= compiler:c++11-lang gmake libtool:keepla pathfix pkgconfig \ + tar:bzip2 +USE_CXXSTD= c++11 USE_XORG= x11 USE_GNOME= gconf2 referencehack GNU_CONFIGURE= yes diff --git a/devel/glib20-reference/pkg-plist b/devel/glib20-reference/pkg-plist index f270bd060f3..efbb5193095 100644 --- a/devel/glib20-reference/pkg-plist +++ b/devel/glib20-reference/pkg-plist @@ -131,6 +131,24 @@ share/doc/gio/GVolumeMonitor.html share/doc/gio/GZlibCompressor.html share/doc/gio/GZlibDecompressor.html share/doc/gio/annotation-glossary.html +share/doc/gio/api-index-2-18.html +share/doc/gio/api-index-2-20.html +share/doc/gio/api-index-2-22.html +share/doc/gio/api-index-2-24.html +share/doc/gio/api-index-2-26.html +share/doc/gio/api-index-2-28.html +share/doc/gio/api-index-2-30.html +share/doc/gio/api-index-2-32.html +share/doc/gio/api-index-2-34.html +share/doc/gio/api-index-2-36.html +share/doc/gio/api-index-2-38.html +share/doc/gio/api-index-2-40.html +share/doc/gio/api-index-2-42.html +share/doc/gio/api-index-2-44.html +share/doc/gio/api-index-2-46.html +share/doc/gio/api-index-2-48.html +share/doc/gio/api-index-2-50.html +share/doc/gio/api-index-deprecated.html share/doc/gio/api-index-full.html share/doc/gio/application.html share/doc/gio/async.html @@ -234,6 +252,32 @@ share/doc/gio/volume_mon.html %%PORTDOCS%%%%DOCSDIR%%/Sorted_binary_tree_postorder.svg %%PORTDOCS%%%%DOCSDIR%%/Sorted_binary_tree_preorder.svg %%PORTDOCS%%%%DOCSDIR%%/annotation-glossary.html +%%PORTDOCS%%%%DOCSDIR%%/api-index-2-10.html +%%PORTDOCS%%%%DOCSDIR%%/api-index-2-12.html +%%PORTDOCS%%%%DOCSDIR%%/api-index-2-14.html +%%PORTDOCS%%%%DOCSDIR%%/api-index-2-16.html +%%PORTDOCS%%%%DOCSDIR%%/api-index-2-18.html +%%PORTDOCS%%%%DOCSDIR%%/api-index-2-2.html +%%PORTDOCS%%%%DOCSDIR%%/api-index-2-20.html +%%PORTDOCS%%%%DOCSDIR%%/api-index-2-22.html +%%PORTDOCS%%%%DOCSDIR%%/api-index-2-24.html +%%PORTDOCS%%%%DOCSDIR%%/api-index-2-26.html +%%PORTDOCS%%%%DOCSDIR%%/api-index-2-28.html +%%PORTDOCS%%%%DOCSDIR%%/api-index-2-30.html +%%PORTDOCS%%%%DOCSDIR%%/api-index-2-32.html +%%PORTDOCS%%%%DOCSDIR%%/api-index-2-34.html +%%PORTDOCS%%%%DOCSDIR%%/api-index-2-36.html +%%PORTDOCS%%%%DOCSDIR%%/api-index-2-38.html +%%PORTDOCS%%%%DOCSDIR%%/api-index-2-4.html +%%PORTDOCS%%%%DOCSDIR%%/api-index-2-40.html +%%PORTDOCS%%%%DOCSDIR%%/api-index-2-42.html +%%PORTDOCS%%%%DOCSDIR%%/api-index-2-44.html +%%PORTDOCS%%%%DOCSDIR%%/api-index-2-46.html +%%PORTDOCS%%%%DOCSDIR%%/api-index-2-48.html +%%PORTDOCS%%%%DOCSDIR%%/api-index-2-50.html +%%PORTDOCS%%%%DOCSDIR%%/api-index-2-6.html +%%PORTDOCS%%%%DOCSDIR%%/api-index-2-8.html +%%PORTDOCS%%%%DOCSDIR%%/api-index-deprecated.html %%PORTDOCS%%%%DOCSDIR%%/api-index-full.html %%PORTDOCS%%%%DOCSDIR%%/deprecated.html %%PORTDOCS%%%%DOCSDIR%%/file-name-encodings.png @@ -263,7 +307,6 @@ share/doc/gio/volume_mon.html %%PORTDOCS%%%%DOCSDIR%%/glib-File-Utilities.html %%PORTDOCS%%%%DOCSDIR%%/glib-GDateTime.html %%PORTDOCS%%%%DOCSDIR%%/glib-GTimeZone.html -%%PORTDOCS%%%%DOCSDIR%%/glib-GUuid.html %%PORTDOCS%%%%DOCSDIR%%/glib-GVariant.html %%PORTDOCS%%%%DOCSDIR%%/glib-GVariantType.html %%PORTDOCS%%%%DOCSDIR%%/glib-Glob-style-pattern-matching.html @@ -343,6 +386,28 @@ share/doc/gobject/GBinding.html share/doc/gobject/GTypeModule.html share/doc/gobject/GTypePlugin.html share/doc/gobject/annotation-glossary.html +share/doc/gobject/api-index-2-10.html +share/doc/gobject/api-index-2-12.html +share/doc/gobject/api-index-2-14.html +share/doc/gobject/api-index-2-18.html +share/doc/gobject/api-index-2-2.html +share/doc/gobject/api-index-2-22.html +share/doc/gobject/api-index-2-24.html +share/doc/gobject/api-index-2-26.html +share/doc/gobject/api-index-2-28.html +share/doc/gobject/api-index-2-30.html +share/doc/gobject/api-index-2-32.html +share/doc/gobject/api-index-2-34.html +share/doc/gobject/api-index-2-36.html +share/doc/gobject/api-index-2-38.html +share/doc/gobject/api-index-2-4.html +share/doc/gobject/api-index-2-40.html +share/doc/gobject/api-index-2-42.html +share/doc/gobject/api-index-2-44.html +share/doc/gobject/api-index-2-46.html +share/doc/gobject/api-index-2-6.html +share/doc/gobject/api-index-2-8.html +share/doc/gobject/api-index-deprecated.html share/doc/gobject/api-index-full.html share/doc/gobject/ch01s02.html share/doc/gobject/chapter-gobject.html diff --git a/devel/gnome-vfsmm/Makefile b/devel/gnome-vfsmm/Makefile index a6343a8835c..000d4533d03 100644 --- a/devel/gnome-vfsmm/Makefile +++ b/devel/gnome-vfsmm/Makefile @@ -14,7 +14,9 @@ COMMENT= C++ wrapper for gnomevfs2 library BUILD_DEPENDS= gm4:devel/m4 -USES= gmake libtool:keepla pathfix pkgconfig tar:bzip2 +USES= gmake libtool:keepla pathfix pkgconfig tar:bzip2 \ + compiler:c++11-lang +USE_CXXSTD= c++11 USE_GNOME= glibmm gnomevfs2 GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/devel/gobject-introspection/Makefile b/devel/gobject-introspection/Makefile index 7d6b2ef27c6..30818f91e87 100644 --- a/devel/gobject-introspection/Makefile +++ b/devel/gobject-introspection/Makefile @@ -2,7 +2,8 @@ # $FreeBSD$ PORTNAME= gobject-introspection -PORTVERSION= 1.52.0 +PORTVERSION= 1.50.0 +PORTEPOCH= 1 CATEGORIES= devel MASTER_SITES= GNOME DIST_SUBDIR= gnome3 diff --git a/devel/gobject-introspection/distinfo b/devel/gobject-introspection/distinfo index cd1473e2791..8774b86d809 100644 --- a/devel/gobject-introspection/distinfo +++ b/devel/gobject-introspection/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1491086172 -SHA256 (gnome3/gobject-introspection-1.52.0.tar.xz) = 9fc6d1ebce5ad98942cb21e2fe8dd67b722dcc01981840632a1b233f7d0e2c1e -SIZE (gnome3/gobject-introspection-1.52.0.tar.xz) = 1384432 +TIMESTAMP = 1491127543 +SHA256 (gnome3/gobject-introspection-1.50.0.tar.xz) = 1c6597c666f543c70ef3d7c893ab052968afae620efdc080c36657f4226337c5 +SIZE (gnome3/gobject-introspection-1.50.0.tar.xz) = 1415700 diff --git a/devel/kf5-extra-cmake-modules/Makefile b/devel/kf5-extra-cmake-modules/Makefile index d75ffd0fd8f..de3c954aaa8 100644 --- a/devel/kf5-extra-cmake-modules/Makefile +++ b/devel/kf5-extra-cmake-modules/Makefile @@ -3,6 +3,7 @@ PORTNAME= extra-cmake-modules PORTVERSION= ${KDE_FRAMEWORKS_VERSION} +PORTREVISION= 1 CATEGORIES= devel kde kde-frameworks MAINTAINER= kde@FreeBSD.org @@ -14,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING-CMAKE-SCRIPTS USES= cmake:outsource kde:5 tar:xz USE_QT5= # -DOCS_USE= QT5=help +DOCS_USE= QT5=help_build # qt5-help is only used to build a .qch file. TEST_USE= QT5=buildtools_build,linguisttools_build,qmake_build NO_ARCH= yes diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile index d05cd92e70a..38a0cfc281d 100644 --- a/devel/libbonobo/Makefile +++ b/devel/libbonobo/Makefile @@ -3,8 +3,7 @@ # $MCom: ports/trunk/devel/libbonobo/Makefile 18393 2013-04-26 21:23:07Z kwm $ PORTNAME= libbonobo -PORTVERSION= 2.32.0 -PORTREVISION?= 3 +PORTVERSION= 2.32.1 CATEGORIES= devel MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/devel/libbonobo/distinfo b/devel/libbonobo/distinfo index 1a32686d738..1cde62e8486 100644 --- a/devel/libbonobo/distinfo +++ b/devel/libbonobo/distinfo @@ -1,2 +1,3 @@ -SHA256 (gnome2/libbonobo-2.32.0.tar.bz2) = b8b8037d5e8e37f39395a2a2fba7f2fb3d5b53ecedc3d419181912b831ab1349 -SIZE (gnome2/libbonobo-2.32.0.tar.bz2) = 1373333 +TIMESTAMP = 1491153658 +SHA256 (gnome2/libbonobo-2.32.1.tar.bz2) = 9160d4f277646400d3bb6b4fa73636cc6d1a865a32b9d0760e1e9e6ee624976b +SIZE (gnome2/libbonobo-2.32.1.tar.bz2) = 1377716 diff --git a/devel/libbonobo/pkg-plist b/devel/libbonobo/pkg-plist index 01fdb366178..d8aee42e1d3 100644 --- a/devel/libbonobo/pkg-plist +++ b/devel/libbonobo/pkg-plist @@ -175,6 +175,7 @@ share/locale/ta/LC_MESSAGES/libbonobo-2.0.mo share/locale/te/LC_MESSAGES/libbonobo-2.0.mo share/locale/th/LC_MESSAGES/libbonobo-2.0.mo share/locale/tr/LC_MESSAGES/libbonobo-2.0.mo +share/locale/ug/LC_MESSAGES/libbonobo-2.0.mo share/locale/uk/LC_MESSAGES/libbonobo-2.0.mo share/locale/vi/LC_MESSAGES/libbonobo-2.0.mo share/locale/wa/LC_MESSAGES/libbonobo-2.0.mo diff --git a/devel/libglademm24/Makefile b/devel/libglademm24/Makefile index f87d2e319e2..ccffad70605 100644 --- a/devel/libglademm24/Makefile +++ b/devel/libglademm24/Makefile @@ -18,7 +18,9 @@ LIB_DEPENDS= libgtkmm-2.4.so:x11-toolkits/gtkmm24 BUILD_DEPENDS= gm4:devel/m4 USE_XORG= x11 ice -USES= gmake libtool:keepla pathfix pkgconfig tar:bzip2 +USES= compiler:c++11-lang gmake libtool:keepla pathfix pkgconfig \ + tar:bzip2 +USE_CXXSTD= c++11 USE_GNOME= libglade2 GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/devel/libreadline-java/Makefile b/devel/libreadline-java/Makefile index 20e3f050f5d..3ab86cc8447 100644 --- a/devel/libreadline-java/Makefile +++ b/devel/libreadline-java/Makefile @@ -4,7 +4,7 @@ PORTNAME= libreadline-java PORTVERSION= 0.8.0 DISTVERSIONSUFFIX= -src -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel java MASTER_SITES= SF/java-readline/java-readline/${PORTVERSION} diff --git a/devel/libreadline-java/files/patch-src_native_org__gnu__readline__Readline.c b/devel/libreadline-java/files/patch-src_native_org__gnu__readline__Readline.c index 708876b4c82..4e7ad8e9283 100644 --- a/devel/libreadline-java/files/patch-src_native_org__gnu__readline__Readline.c +++ b/devel/libreadline-java/files/patch-src_native_org__gnu__readline__Readline.c @@ -1,6 +1,6 @@ ---- src/native/org_gnu_readline_Readline.c.orig 2003-01-07 10:14:35 UTC +--- src/native/org_gnu_readline_Readline.c.orig 2017-04-02 09:52:09 UTC +++ src/native/org_gnu_readline_Readline.c -@@ -430,7 +430,7 @@ const char *java_completer(char *text, i +@@ -430,7 +430,7 @@ const char *java_completer(char *text, int state) { jtext = (*jniEnv)->NewStringUTF(jniEnv,text); if (jniMethodId == 0) { @@ -9,10 +9,26 @@ } completion = (*jniEnv)->CallObjectMethod(jniEnv, jniObject, -@@ -560,6 +560,21 @@ JNIEXPORT void JNICALL - #endif - - /* -------------------------------------------------------------------------- */ +@@ -472,11 +472,7 @@ JNIEXPORT void JNICALL Java_org_gnu_readline_Readline_ + rl_completion_entry_function = NULL; + return; + } +-#ifdef JavaEditline +- rl_completion_entry_function = (CPFunction *) java_completer; +-#else + rl_completion_entry_function = (rl_compentry_func_t *) java_completer; +-#endif + } + else { + rl_completion_entry_function = NULL; +@@ -556,6 +552,21 @@ JNIEXPORT void JNICALL + return; + } + rl_completer_word_break_characters = word_break_buffer; ++} ++#endif ++ ++/* -------------------------------------------------------------------------- */ +/* Sets/gets rl_completion_append_character */ +/* -------------------------------------------------------------------------- */ + @@ -24,10 +40,6 @@ + + rl_completion_append_character = (int)appendCharacter; + return (jchar)previous_setting; -+} -+#endif -+ -+/* -------------------------------------------------------------------------- */ - /* Convert utf8-string to ucs1-string . */ - /* -------------------------------------------------------------------------- */ + } + #endif diff --git a/devel/libwfut/Makefile b/devel/libwfut/Makefile index 2d8804dddb5..0c91116fcf7 100644 --- a/devel/libwfut/Makefile +++ b/devel/libwfut/Makefile @@ -16,6 +16,7 @@ LIB_DEPENDS= libsigc-2.0.so:devel/libsigc++20 \ CONFIGURE_ARGS+=--without-python GNU_CONFIGURE= yes USES= libtool pathfix pkgconfig compiler:c++11-lib +USE_CXXSTD= c++11 USE_LDCONFIG= yes post-patch: diff --git a/devel/obby/Makefile b/devel/obby/Makefile index 46f9cf4e903..05df53503b2 100644 --- a/devel/obby/Makefile +++ b/devel/obby/Makefile @@ -15,7 +15,8 @@ LICENSE= GPLv2 LIB_DEPENDS= libsigc-2.0.so:devel/libsigc++20 \ libnet6.so:net/net6 -USES= pathfix pkgconfig libtool +USES= pathfix pkgconfig libtool compiler:c++11-lang +USE_CXXSTD= c++11 GNU_CONFIGURE= yes USE_LDCONFIG= yes INSTALL_TARGET= install-strip diff --git a/devel/py-gdbgui/Makefile b/devel/py-gdbgui/Makefile index 4b2087a3863..a97455f06c0 100644 --- a/devel/py-gdbgui/Makefile +++ b/devel/py-gdbgui/Makefile @@ -1,7 +1,8 @@ # $FreeBSD$ PORTNAME= gdbgui -PORTVERSION= 0.7.4.0 +PORTVERSION= 0.7.5.4 +DISTVERSIONPREFIX= pyPI- CATEGORIES= devel lang python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -19,7 +20,6 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.12:www/py-flask \ USE_GITHUB= yes GH_ACCOUNT= cs01 -GH_TAGNAME= f4c605b USES= python USE_PYTHON= autoplist distutils NO_ARCH= yes diff --git a/devel/py-gdbgui/distinfo b/devel/py-gdbgui/distinfo index 82cc2074d81..9547aad5a5d 100644 --- a/devel/py-gdbgui/distinfo +++ b/devel/py-gdbgui/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1488399199 -SHA256 (cs01-gdbgui-0.7.4.0-f4c605b_GH0.tar.gz) = d3fa1b6869bfae1cdf78b5ada6e02b3fc9bfd00f664c8de56d9c404d41e414d7 -SIZE (cs01-gdbgui-0.7.4.0-f4c605b_GH0.tar.gz) = 1327065 +TIMESTAMP = 1490886725 +SHA256 (cs01-gdbgui-pyPI-0.7.5.4_GH0.tar.gz) = 0f1da6a7947fb7e209e34d318799be2aa1c24932d5a36336bc15d603e42bd31b +SIZE (cs01-gdbgui-pyPI-0.7.5.4_GH0.tar.gz) = 1333587 diff --git a/devel/py-pygdbmi/Makefile b/devel/py-pygdbmi/Makefile index ee262ab5ba7..2edec9b09b3 100644 --- a/devel/py-pygdbmi/Makefile +++ b/devel/py-pygdbmi/Makefile @@ -1,7 +1,8 @@ # $FreeBSD$ PORTNAME= pygdbmi -PORTVERSION= 0.7.3.1 +PORTVERSION= 0.7.3.3 +DISTVERSIONPREFIX= pyPI- CATEGORIES= devel lang python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -13,7 +14,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USE_GITHUB= yes GH_ACCOUNT= cs01 -GH_TAGNAME= ee66ea5 USES= python USE_PYTHON= autoplist distutils diff --git a/devel/py-pygdbmi/distinfo b/devel/py-pygdbmi/distinfo index 88bbf6cd86c..ece0a7d351b 100644 --- a/devel/py-pygdbmi/distinfo +++ b/devel/py-pygdbmi/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1488405102 -SHA256 (cs01-pygdbmi-0.7.3.1-ee66ea5_GH0.tar.gz) = c66f3ebfcc3991a4ba433e5807e2a1895b0b59272676b46ca3de1d6934ac9caa -SIZE (cs01-pygdbmi-0.7.3.1-ee66ea5_GH0.tar.gz) = 15309 +TIMESTAMP = 1490886768 +SHA256 (cs01-pygdbmi-pyPI-0.7.3.3_GH0.tar.gz) = d6079280b53a62ea90f713af26ee09982d22cc3dbe2e749441efac7bbd587778 +SIZE (cs01-pygdbmi-pyPI-0.7.3.3_GH0.tar.gz) = 16201 diff --git a/devel/py-python-engineio/Makefile b/devel/py-python-engineio/Makefile index d06edf7282d..8c177c91d8b 100644 --- a/devel/py-python-engineio/Makefile +++ b/devel/py-python-engineio/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= python-engineio -PORTVERSION= 1.2.3 +PORTVERSION= 1.3.1 CATEGORIES= devel python net MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-python-engineio/distinfo b/devel/py-python-engineio/distinfo index 5fcfa9fd2c9..79aa5bd719b 100644 --- a/devel/py-python-engineio/distinfo +++ b/devel/py-python-engineio/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1488408338 -SHA256 (python-engineio-1.2.3.tar.gz) = 9048c8a26812d0f1d513ebd9fe257eca1097762094600319856dcc1d4cc92db6 -SIZE (python-engineio-1.2.3.tar.gz) = 19352 +TIMESTAMP = 1490875740 +SHA256 (python-engineio-1.3.1.tar.gz) = cfb9f11d459e8d08e924c376737019dd5967cb1a7ec48611e25b69a948dba2a7 +SIZE (python-engineio-1.3.1.tar.gz) = 19464 diff --git a/devel/py-python-socketio/Makefile b/devel/py-python-socketio/Makefile index f43bb8a05e7..56aac060b6b 100644 --- a/devel/py-python-socketio/Makefile +++ b/devel/py-python-socketio/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= python-socketio -PORTVERSION= 1.7.1 +PORTVERSION= 1.7.4 CATEGORIES= devel python net MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-python-socketio/distinfo b/devel/py-python-socketio/distinfo index 41be1ff0788..da2455ebea2 100644 --- a/devel/py-python-socketio/distinfo +++ b/devel/py-python-socketio/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1488409587 -SHA256 (python-socketio-1.7.1.tar.gz) = d9b3c2ffe23705fa651482c1d45e55561283649686a80d3ffd9ed695de21e2fa -SIZE (python-socketio-1.7.1.tar.gz) = 23252 +TIMESTAMP = 1490875718 +SHA256 (python-socketio-1.7.4.tar.gz) = 9200ee48aec8673027fdc40b0391aa2d681ff994d93b738ebd9f0d29916f24c4 +SIZE (python-socketio-1.7.4.tar.gz) = 23298 diff --git a/devel/synfig/Makefile b/devel/synfig/Makefile index 247172b623d..b787780b3bf 100644 --- a/devel/synfig/Makefile +++ b/devel/synfig/Makefile @@ -24,7 +24,8 @@ LIB_DEPENDS= libboost_program_options.so:devel/boost-libs \ libavcodec.so:multimedia/ffmpeg \ libdv.so:multimedia/libdv -USES= iconv jpeg libtool pathfix pkgconfig +USES= compiler:c++11-lang iconv jpeg libtool pathfix pkgconfig +USE_CXXSTD= c++11 USE_GNOME= cairo glibmm libxml++26 GNU_CONFIGURE= yes CONFIGURE_ARGS= ${ICONV_CONFIGURE_ARG} diff --git a/devel/synfig/files/patch-src__synfig__main.cpp b/devel/synfig/files/patch-src__synfig__main.cpp index 45a943156be..046bd7cea9c 100644 --- a/devel/synfig/files/patch-src__synfig__main.cpp +++ b/devel/synfig/files/patch-src__synfig__main.cpp @@ -1,6 +1,6 @@ ---- src/synfig/main.cpp.orig 2015-03-28 10:15:01 UTC +--- src/synfig/main.cpp.orig 2017-04-02 22:19:06 UTC +++ src/synfig/main.cpp -@@ -198,7 +198,7 @@ synfig::Main::Main(const synfig::String& +@@ -198,7 +198,7 @@ synfig::Main::Main(const synfig::String& basepath,Prog unsigned int i; #ifdef _DEBUG @@ -9,7 +9,30 @@ std::set_terminate(__gnu_cxx::__verbose_terminate_handler); #endif #endif -@@ -490,7 +490,11 @@ synfig::get_binary_path(const String &fa +@@ -289,17 +289,17 @@ synfig::Main::Main(const synfig::String& basepath,Prog + locations.push_back(getenv("SYNFIG_MODULE_LIST")); + else + { +- locations.push_back("./"MODULE_LIST_FILENAME); ++ locations.push_back("./" MODULE_LIST_FILENAME); + if(getenv("HOME")) + locations.push_back(strprintf("%s/.local/share/synfig/%s", getenv("HOME"), MODULE_LIST_FILENAME)); + #ifdef SYSCONFDIR +- locations.push_back(SYSCONFDIR"/"MODULE_LIST_FILENAME); ++ locations.push_back(SYSCONFDIR "/" MODULE_LIST_FILENAME); + #endif + locations.push_back(prefix+ETL_DIRECTORY_SEPARATOR+"etc"+ETL_DIRECTORY_SEPARATOR+MODULE_LIST_FILENAME); +- locations.push_back("/usr/local/etc/"MODULE_LIST_FILENAME); ++ locations.push_back("/usr/local/etc/" MODULE_LIST_FILENAME); + #ifdef __APPLE__ +- locations.push_back("/Library/Frameworks/synfig.framework/Resources/"MODULE_LIST_FILENAME); +- locations.push_back("/Library/Synfig/"MODULE_LIST_FILENAME); ++ locations.push_back("/Library/Frameworks/synfig.framework/Resources/" MODULE_LIST_FILENAME); ++ locations.push_back("/Library/Synfig/" MODULE_LIST_FILENAME); + if(getenv("HOME")) + locations.push_back(strprintf("%s/Library/Synfig/%s", getenv("HOME"), MODULE_LIST_FILENAME)); + #endif +@@ -490,7 +490,11 @@ synfig::get_binary_path(const String &fallback_path) /* Read from /proc/self/exe (symlink) */ char* path2 = (char*)malloc(buf_size); @@ -21,7 +44,7 @@ while (1) { int i; -@@ -524,9 +528,10 @@ synfig::get_binary_path(const String &fa +@@ -524,9 +528,10 @@ synfig::get_binary_path(const String &fallback_path) /* path is a symlink. Continue loop and resolve this. */ strncpy(path, path2, buf_size - 1); } @@ -33,7 +56,7 @@ if (result == "") { /* readlink() or stat() failed; this can happen when the program is -@@ -568,6 +573,7 @@ synfig::get_binary_path(const String &fa +@@ -568,6 +573,7 @@ synfig::get_binary_path(const String &fallback_path) free(line); fclose(f); } diff --git a/editors/vanubi/Makefile b/editors/vanubi/Makefile index 69a7bfe5f6a..f294695bc4a 100644 --- a/editors/vanubi/Makefile +++ b/editors/vanubi/Makefile @@ -4,7 +4,7 @@ PORTNAME= vanubi PORTVERSION= 0.0.16 DISTVERSIONPREFIX= v -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= editors MAINTAINER= ports@FreeBSD.org diff --git a/editors/vanubi/files/patch-gui_main.vala b/editors/vanubi/files/patch-gui_main.vala new file mode 100644 index 00000000000..4a30529a9d3 --- /dev/null +++ b/editors/vanubi/files/patch-gui_main.vala @@ -0,0 +1,17 @@ +--- gui/main.vala.orig 2015-07-03 10:10:29 UTC ++++ gui/main.vala +@@ -35,12 +35,12 @@ namespace Vanubi.UI { + { null } + }; + +- static Regex file_pos_regex = null; ++ static GLib.Regex file_pos_regex = null; + + static construct { + try { + var file_pos = """^(?.+?)(?::(?\d+)(?::(?\d+))?)?$"""; +- file_pos_regex = new Regex (file_pos, RegexCompileFlags.CASELESS|RegexCompileFlags.OPTIMIZE); ++ file_pos_regex = new GLib.Regex (file_pos, GLib.RegexCompileFlags.CASELESS|GLib.RegexCompileFlags.OPTIMIZE); + } catch (Error e) { + error (e.message); + } diff --git a/editors/vanubi/files/patch-gui_searchbar.vala b/editors/vanubi/files/patch-gui_searchbar.vala new file mode 100644 index 00000000000..eea06698a8c --- /dev/null +++ b/editors/vanubi/files/patch-gui_searchbar.vala @@ -0,0 +1,23 @@ +--- gui/searchbar.vala.orig 2015-07-03 10:10:29 UTC ++++ gui/searchbar.vala +@@ -153,11 +153,11 @@ namespace Vanubi.UI { + // do not parse in case of any error during parsing or evaluating the expression + } + +- Regex regex = null; ++ GLib.Regex regex = null; + if (is_regex) { + try { + state.status.clear ("search"); +- regex = new Regex (p, RegexCompileFlags.OPTIMIZE, RegexMatchFlags.ANCHORED); ++ regex = new GLib.Regex (p, GLib.RegexCompileFlags.OPTIMIZE, GLib.RegexMatchFlags.ANCHORED); + } catch (Error e) { + // user still writing regex, display an error + state.status.set (e.message, "search", Status.Type.ERROR); +@@ -381,4 +381,4 @@ namespace Vanubi.UI { + return base.on_key_press_event (e); + } + } +-} +\ No newline at end of file ++} diff --git a/editors/vanubi/files/patch-gui_shellbar.vala b/editors/vanubi/files/patch-gui_shellbar.vala index 6d6bde6f454..001923fcd5a 100644 --- a/editors/vanubi/files/patch-gui_shellbar.vala +++ b/editors/vanubi/files/patch-gui_shellbar.vala @@ -1,7 +1,32 @@ Add support of vte-2.91 instead of vte-2.90 ---- gui/shellbar.vala.orig 2014-12-09 10:52:31 UTC +--- gui/shellbar.vala.orig 2015-07-03 10:10:29 UTC +++ gui/shellbar.vala +@@ -29,8 +29,8 @@ namespace Vanubi.UI { + Cancellable pty_cancellable; + bool is_first_line = true; + +- static Regex error_regex = null; +- static Regex dir_regex = null; ++ static GLib.Regex error_regex = null; ++ static GLib.Regex dir_regex = null; + + static construct { + try { +@@ -44,11 +44,11 @@ namespace Vanubi.UI { + var php_error = """^(?.+)error:.* in (?.+) on line (?\d+)\s*$"""; + // sh style + var sh_error = """^(?.+?):.*?(?\d+?):.*?:(?.*? error):"""; +- error_regex = new Regex (@"(?:$(vala_error))|(?:$(php_error))|(?:$(c_error))|(?:$(sh_error))|(?:$(java_error))", RegexCompileFlags.CASELESS|RegexCompileFlags.OPTIMIZE|RegexCompileFlags.DUPNAMES); ++ error_regex = new GLib.Regex (@"(?:$(vala_error))|(?:$(php_error))|(?:$(c_error))|(?:$(sh_error))|(?:$(java_error))", GLib.RegexCompileFlags.CASELESS|GLib.RegexCompileFlags.OPTIMIZE|GLib.RegexCompileFlags.DUPNAMES); + + // enter directory + var make_dir = """^.*Entering directory `(.+?)'.*$"""; +- dir_regex = new Regex (@"(?:$(make_dir))", RegexCompileFlags.CASELESS|RegexCompileFlags.OPTIMIZE|RegexCompileFlags.DUPNAMES); ++ dir_regex = new GLib.Regex (@"(?:$(make_dir))", GLib.RegexCompileFlags.CASELESS|GLib.RegexCompileFlags.OPTIMIZE|GLib.RegexCompileFlags.DUPNAMES); + } catch (Error e) { + error (e.message); + } @@ -146,10 +146,10 @@ namespace Vanubi.UI { } @@ -15,3 +40,16 @@ Add support of vte-2.91 instead of vte-2.90 mouse_match (term, """^.+error:"""); mouse_match (term, """^.+warning:"""); +@@ -255,10 +255,10 @@ namespace Vanubi.UI { + + private void mouse_match (Terminal t, string str) { + try { +- var regex = new Regex (str); ++ var regex = new GLib.Regex (str); + int id = t.match_add_gregex (regex, 0); + t.match_set_cursor_type (id, Gdk.CursorType.HAND2); +- } catch (RegexError e) { ++ } catch (GLib.RegexError e) { + warning (e.message); + } + } diff --git a/editors/vanubi/files/patch-libvanubi_completion.vala b/editors/vanubi/files/patch-libvanubi_completion.vala new file mode 100644 index 00000000000..c7cdb33c13a --- /dev/null +++ b/editors/vanubi/files/patch-libvanubi_completion.vala @@ -0,0 +1,16 @@ +--- libvanubi/completion.vala.orig 2015-07-03 10:10:29 UTC ++++ libvanubi/completion.vala +@@ -21,11 +21,11 @@ namespace Vanubi { + public class AbbrevCompletion { + LRU lru = new LRU (strcmp); + Annotated[] tags = null; +- Regex regex; ++ GLib.Regex regex; + + public AbbrevCompletion () { + try { +- regex = new Regex ("\\w+", RegexCompileFlags.MULTILINE | RegexCompileFlags.OPTIMIZE); ++ regex = new GLib.Regex ("\\w+", GLib.RegexCompileFlags.MULTILINE | GLib.RegexCompileFlags.OPTIMIZE); + } catch (Error e) { + warning (e.message); + } diff --git a/editors/vanubi/files/patch-libvanubi_git.vala b/editors/vanubi/files/patch-libvanubi_git.vala new file mode 100644 index 00000000000..44d6bfe27eb --- /dev/null +++ b/editors/vanubi/files/patch-libvanubi_git.vala @@ -0,0 +1,17 @@ +--- libvanubi/git.vala.orig 2015-07-03 10:10:29 UTC ++++ libvanubi/git.vala +@@ -27,12 +27,12 @@ namespace Vanubi { + + public class Git { + unowned Configuration config; +- static Regex hunk_regex; ++ static GLib.Regex hunk_regex; + static HashTable monitored = new HashTable (DataSource.hash, DataSource.equal); + + static construct { + try { +- hunk_regex = new Regex ("^@@ -(\\d+),?(\\d*) \\+(\\d+),?(\\d*) @@"); ++ hunk_regex = new GLib.Regex ("^@@ -(\\d+),?(\\d*) \\+(\\d+),?(\\d*) @@"); + } catch (Error e) { + warning (e.message); + } diff --git a/editors/vanubi/files/patch-libvanubi_util.vala b/editors/vanubi/files/patch-libvanubi_util.vala new file mode 100644 index 00000000000..dadd462746b --- /dev/null +++ b/editors/vanubi/files/patch-libvanubi_util.vala @@ -0,0 +1,37 @@ +--- libvanubi/util.vala.orig 2015-07-03 10:10:29 UTC ++++ libvanubi/util.vala +@@ -35,12 +35,12 @@ namespace Vanubi { + public int end_line; + public int end_column; + +- static Regex file_pos_regex = null; ++ static GLib.Regex file_pos_regex = null; + + static construct { + try { + var file_pos = """^(?.+?)(?::(?\d+)(?::(?\d+))?)?$"""; +- file_pos_regex = new Regex (file_pos, RegexCompileFlags.CASELESS|RegexCompileFlags.OPTIMIZE); ++ file_pos_regex = new GLib.Regex (file_pos, GLib.RegexCompileFlags.CASELESS|GLib.RegexCompileFlags.OPTIMIZE); + } catch (Error e) { + error (e.message); + } +@@ -181,15 +181,15 @@ namespace Vanubi { + + public async extern void spawn_async_with_pipes (string? working_directory, [CCode (array_length = false, array_null_terminated = true)] string[] argv, [CCode (array_length = false, array_null_terminated = true)] string[]? envp, SpawnFlags _flags, SpawnChildSetupFunc? child_setup, int io_priority, Cancellable? cancellable, out Pid child_pid, out int standard_input = null, out int standard_output = null, out int standard_error = null) throws SpawnError; + +- static Regex update_copyright_year_regex1 = null; +- static Regex update_copyright_year_regex2 = null; ++ static GLib.Regex update_copyright_year_regex1 = null; ++ static GLib.Regex update_copyright_year_regex2 = null; + + // Returns true if any copyright year has been replaced + public bool update_copyright_year (Buffer buf) { + if (update_copyright_year_regex1 == null || update_copyright_year_regex2 == null) { + try { +- update_copyright_year_regex1 = new Regex ("Copyright.*\\d\\d\\d\\d-(\\d\\d\\d\\d)", RegexCompileFlags.OPTIMIZE | RegexCompileFlags.CASELESS); +- update_copyright_year_regex2 = new Regex ("Copyright.*(\\d\\d\\d\\d)", RegexCompileFlags.OPTIMIZE | RegexCompileFlags.CASELESS); ++ update_copyright_year_regex1 = new GLib.Regex ("Copyright.*\\d\\d\\d\\d-(\\d\\d\\d\\d)", GLib.RegexCompileFlags.OPTIMIZE | GLib.RegexCompileFlags.CASELESS); ++ update_copyright_year_regex2 = new GLib.Regex ("Copyright.*(\\d\\d\\d\\d)", GLib.RegexCompileFlags.OPTIMIZE | GLib.RegexCompileFlags.CASELESS); + } catch (Error e) { + warning (e.message); + return false; diff --git a/emulators/winetricks/Makefile b/emulators/winetricks/Makefile index 739b7342028..7e348ffc5bc 100644 --- a/emulators/winetricks/Makefile +++ b/emulators/winetricks/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= winetricks -PORTVERSION= 20170326 +PORTVERSION= 20170327 CATEGORIES= emulators MAINTAINER= lifanov@FreeBSD.org diff --git a/emulators/winetricks/distinfo b/emulators/winetricks/distinfo index b307214b468..ea7cb177be7 100644 --- a/emulators/winetricks/distinfo +++ b/emulators/winetricks/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1490624935 -SHA256 (Winetricks-winetricks-20170326_GH0.tar.gz) = 77fcae75f4198bd0819cbf331f1a0b5a0deee501c7c8f3f9e25417eac7e01dc7 -SIZE (Winetricks-winetricks-20170326_GH0.tar.gz) = 191605 +TIMESTAMP = 1491170702 +SHA256 (Winetricks-winetricks-20170327_GH0.tar.gz) = ad381386be95f5f2c34a69a6d1d77f3d41d86f883b8bed7ac4699947cf13e97d +SIZE (Winetricks-winetricks-20170327_GH0.tar.gz) = 190864 diff --git a/finance/libofx/Makefile b/finance/libofx/Makefile index 78c7c83609b..57055cfd9f6 100644 --- a/finance/libofx/Makefile +++ b/finance/libofx/Makefile @@ -16,7 +16,9 @@ LIB_DEPENDS= libcurl.so:ftp/curl \ libxml++-2.6.so:textproc/libxml++26 \ libosp.so:textproc/opensp -USES= gettext-runtime gmake iconv libtool localbase pathfix pkgconfig +USES= gettext-runtime gmake iconv libtool localbase pathfix pkgconfig \ + compiler:c++11-lang +USE_CXXSTD= c++11 USE_GNOME= glib20 glibmm libsigc++20 libxml2 CONFIGURE_ARGS= --disable-doxygen --disable-dot --disable-gengetopt \ --with-opensp-includes=${LOCALBASE}/include/OpenSP \ diff --git a/games/pink-pony/Makefile b/games/pink-pony/Makefile index 344d2f29cc5..502203f4aa7 100644 --- a/games/pink-pony/Makefile +++ b/games/pink-pony/Makefile @@ -21,7 +21,8 @@ LIB_DEPENDS= libIL.so:graphics/devil \ USE_GITHUB= yes GH_ACCOUNT= ginkgo -USES= pkgconfig scons +USES= pkgconfig scons compiler:c++11-lang +USE_CXXSTD= c++11 USE_GL= gl glu USE_SDL= mixer SUB_FILES= pink-pony.sh diff --git a/graphics/cairomm/Makefile b/graphics/cairomm/Makefile index 8de17c75a6c..82af4e0337b 100644 --- a/graphics/cairomm/Makefile +++ b/graphics/cairomm/Makefile @@ -15,7 +15,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING GNU_CONFIGURE= yes USE_LDCONFIG= yes -USES= gmake libtool pathfix pkgconfig +USES= gmake libtool pathfix pkgconfig compiler:c++11-lang +USE_CXXSTD= c++11 USE_GNOME= cairo libxml++26 CONFIGURE_ENV= AUTOMAKE="${TRUE}" AUTOCONF="${TRUE}" DOXYGEN="${TRUE}" CPPFLAGS+= -I${LOCALBASE}/include diff --git a/graphics/cluttermm/Makefile b/graphics/cluttermm/Makefile index 36b433d135f..ca3a39f99b8 100644 --- a/graphics/cluttermm/Makefile +++ b/graphics/cluttermm/Makefile @@ -14,7 +14,9 @@ COMMENT= C++ interfaces for clutter LIB_DEPENDS= libclutter-1.0.so:graphics/clutter -USES+= gettext gmake libtool pathfix perl5 pkgconfig tar:xz +USES+= gettext gmake libtool pathfix perl5 pkgconfig tar:xz \ + compiler:c++11-lang +USE_CXXSTD= c++11 USE_GNOME= atkmm glib20 gtkmm30 libsigc++20 pangomm GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/graphics/goocanvasmm2/Makefile b/graphics/goocanvasmm2/Makefile index 1dccdab0812..4cd81b955a8 100644 --- a/graphics/goocanvasmm2/Makefile +++ b/graphics/goocanvasmm2/Makefile @@ -14,7 +14,8 @@ COMMENT= C++ bindings for the goocanvas widget for GTK LIB_DEPENDS= libgoocanvas-2.0.so:graphics/goocanvas2 -USES= gmake libtool pathfix pkgconfig tar:xz +USES= compiler:c++11-lang gmake libtool pathfix pkgconfig tar:xz +USE_CXXSTD= c++11 USE_GNOME= gtkmm30 GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/graphics/py-cairocffi/Makefile b/graphics/py-cairocffi/Makefile index 022504f00f7..dcd07d81df1 100644 --- a/graphics/py-cairocffi/Makefile +++ b/graphics/py-cairocffi/Makefile @@ -3,6 +3,7 @@ PORTNAME= cairocffi PORTVERSION= 0.8.0 +PORTREVISION= 1 CATEGORIES= graphics python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -17,5 +18,6 @@ BUILD_DEPENDS= ${RUN_DEPENDS} USES= python:2+ USE_PYTHON= autoplist distutils cffi +USE_GNOME= cairo .include diff --git a/graphics/rawtherapee-devel/Makefile b/graphics/rawtherapee-devel/Makefile index 9e358a32b25..56c9c56e2dc 100644 --- a/graphics/rawtherapee-devel/Makefile +++ b/graphics/rawtherapee-devel/Makefile @@ -117,11 +117,6 @@ USES+= compiler:gcc-c++11-lib .include .if ${CHOSEN_COMPILER_TYPE} == gcc -# Workaround: this needs to be late because Mk/Uses/compiler.mk tramples -# over previously set values with gcc-libc++-configure as of r432539. -# GCC 4.9 doesn't generate usable code on FreeBSD 11.0. -USE_GCC= 5+ - # work around compiler faults .if ${ARCH} == i386 CFLAGS+= -mstackrealign diff --git a/graphics/rawtherapee/Makefile b/graphics/rawtherapee/Makefile index 24a808a3ed7..7a40799a3cf 100644 --- a/graphics/rawtherapee/Makefile +++ b/graphics/rawtherapee/Makefile @@ -116,11 +116,6 @@ USES+= compiler:gcc-c++11-lib .include .if ${CHOSEN_COMPILER_TYPE} == gcc -# Workaround: this needs to be late because Mk/Uses/compiler.mk tramples -# over previously set values with gcc-libc++-configure as of r432539. -# GCC 4.9 doesn't generate usable code on FreeBSD 11.0. -USE_GCC= 5+ - # work around compiler faults .if ${ARCH} == i386 CFLAGS+= -mstackrealign diff --git a/graphics/synfigstudio/Makefile b/graphics/synfigstudio/Makefile index 66828b44000..05f275a79b8 100644 --- a/graphics/synfigstudio/Makefile +++ b/graphics/synfigstudio/Makefile @@ -15,7 +15,9 @@ BUILD_DEPENDS= etl>=0.04.19_1:devel/etl LIB_DEPENDS= libsynfig.so:devel/synfig RUN_DEPENDS= xdg-open:devel/xdg-utils -USES= desktop-file-utils gmake libtool pathfix pkgconfig shared-mime-info +USES= compiler:c++11-lang desktop-file-utils gmake libtool pathfix \ + pkgconfig shared-mime-info +USE_CXXSTD= c++11 USE_GNOME= gtkmm30 intltool GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-update-mimedb diff --git a/graphics/synfigstudio/files/patch-src_gui_dialogs_about.cpp b/graphics/synfigstudio/files/patch-src_gui_dialogs_about.cpp new file mode 100644 index 00000000000..a9fcc5dcab3 --- /dev/null +++ b/graphics/synfigstudio/files/patch-src_gui_dialogs_about.cpp @@ -0,0 +1,11 @@ +--- src/gui/dialogs/about.cpp.orig 2017-04-02 22:45:26 UTC ++++ src/gui/dialogs/about.cpp +@@ -204,7 +204,7 @@ About::About() + imagepath+=ETL_DIRECTORY_SEPARATOR; + + Gtk::Image *Logo = manage(new class Gtk::Image()); +- Logo->set(imagepath+"synfig_icon."IMAGE_EXT); ++ Logo->set(imagepath+"synfig_icon." IMAGE_EXT); + set_logo(Logo->get_pixbuf()); + + #ifdef SHOW_EXTRA_INFO diff --git a/graphics/synfigstudio/files/patch-src_gui_iconcontroller.cpp b/graphics/synfigstudio/files/patch-src_gui_iconcontroller.cpp new file mode 100644 index 00000000000..4ff7871671d --- /dev/null +++ b/graphics/synfigstudio/files/patch-src_gui_iconcontroller.cpp @@ -0,0 +1,389 @@ +--- src/gui/iconcontroller.cpp.orig 2017-04-02 22:43:26 UTC ++++ src/gui/iconcontroller.cpp +@@ -134,213 +134,213 @@ IconController::init_icons(const synfig::String& path_ + Gtk::Stock::add(stock_##name); + + // Types +- INIT_STOCK_ICON(type_bool,"type_bool_icon."IMAGE_EXT,_("Bool")); +- INIT_STOCK_ICON(type_integer,"type_integer_icon."IMAGE_EXT,_("Integer")); +- INIT_STOCK_ICON(type_angle,"type_angle_icon."IMAGE_EXT,_("Angle")); +- INIT_STOCK_ICON(type_time,"type_time_icon."IMAGE_EXT,_("Time")); +- INIT_STOCK_ICON(type_real,"type_real_icon."IMAGE_EXT,_("Real")); +- INIT_STOCK_ICON(type_vector,"type_vector_icon."IMAGE_EXT,_("Vector")); +- INIT_STOCK_ICON(type_color,"type_color_icon."IMAGE_EXT,_("Color")); +- INIT_STOCK_ICON(type_segment,"type_segment_icon."IMAGE_EXT,_("Segment")); +- INIT_STOCK_ICON(type_blinepoint,"type_splinepoint_icon."IMAGE_EXT,_("Spline Point")); +- INIT_STOCK_ICON(type_list,"type_list_icon."IMAGE_EXT,_("List")); +- INIT_STOCK_ICON(type_string,"type_string_icon."IMAGE_EXT,_("String")); +- INIT_STOCK_ICON(type_canvas,"type_canvas_icon."IMAGE_EXT,_("Canvas")); +- INIT_STOCK_ICON(type_gradient,"type_gradient_icon."IMAGE_EXT,_("Gradient")) ++ INIT_STOCK_ICON(type_bool,"type_bool_icon." IMAGE_EXT,_("Bool")); ++ INIT_STOCK_ICON(type_integer,"type_integer_icon." IMAGE_EXT,_("Integer")); ++ INIT_STOCK_ICON(type_angle,"type_angle_icon." IMAGE_EXT,_("Angle")); ++ INIT_STOCK_ICON(type_time,"type_time_icon." IMAGE_EXT,_("Time")); ++ INIT_STOCK_ICON(type_real,"type_real_icon." IMAGE_EXT,_("Real")); ++ INIT_STOCK_ICON(type_vector,"type_vector_icon." IMAGE_EXT,_("Vector")); ++ INIT_STOCK_ICON(type_color,"type_color_icon." IMAGE_EXT,_("Color")); ++ INIT_STOCK_ICON(type_segment,"type_segment_icon." IMAGE_EXT,_("Segment")); ++ INIT_STOCK_ICON(type_blinepoint,"type_splinepoint_icon." IMAGE_EXT,_("Spline Point")); ++ INIT_STOCK_ICON(type_list,"type_list_icon." IMAGE_EXT,_("List")); ++ INIT_STOCK_ICON(type_string,"type_string_icon." IMAGE_EXT,_("String")); ++ INIT_STOCK_ICON(type_canvas,"type_canvas_icon." IMAGE_EXT,_("Canvas")); ++ INIT_STOCK_ICON(type_gradient,"type_gradient_icon." IMAGE_EXT,_("Gradient")) + + // ToolBox Tools +- INIT_STOCK_ICON(normal,"tool_normal_icon."IMAGE_EXT,_("Transform Tool")); +- INIT_STOCK_ICON(polygon,"tool_polyline_icon."IMAGE_EXT,_("Polygon Tool")); +- INIT_STOCK_ICON(bline,"tool_spline_icon."IMAGE_EXT,_("Spline Tool")); +- INIT_STOCK_ICON(eyedrop,"tool_eyedrop_icon."IMAGE_EXT,_("Eyedrop Tool")); +- INIT_STOCK_ICON(fill,"tool_fill_icon."IMAGE_EXT,_("Fill Tool")); +- INIT_STOCK_ICON(draw,"tool_draw_icon."IMAGE_EXT,_("Draw Tool")); +- INIT_STOCK_ICON(lasso,"tool_cutout_icon."IMAGE_EXT,_("Cutout Tool")); +- INIT_STOCK_ICON(brush,"tool_brush_icon."IMAGE_EXT,_("Brush Tool")); +- INIT_STOCK_ICON(sketch,"tool_sketch_icon."IMAGE_EXT,_("Sketch Tool")); +- INIT_STOCK_ICON(circle,"tool_circle_icon."IMAGE_EXT,_("Circle Tool")); +- INIT_STOCK_ICON(rectangle,"tool_rectangle_icon."IMAGE_EXT,_("Rectangle Tool")); +- INIT_STOCK_ICON(smooth_move,"tool_smooth_move_icon."IMAGE_EXT,_("SmoothMove Tool")); +- INIT_STOCK_ICON(rotate,"tool_rotate_icon."IMAGE_EXT,"Rotate Tool"); +- INIT_STOCK_ICON(width,"tool_width_icon."IMAGE_EXT,_("Width Tool")); +- INIT_STOCK_ICON(scale,"tool_scale_icon."IMAGE_EXT,"Scale Tool"); +- INIT_STOCK_ICON(zoom,"tool_zoom_icon."IMAGE_EXT,_("Zoom Tool")); +- INIT_STOCK_ICON(mirror,"tool_mirror_icon."IMAGE_EXT,_("Mirror Tool")); +- INIT_STOCK_ICON(text,"tool_text_icon."IMAGE_EXT,"Text Tool"); +- INIT_STOCK_ICON(gradient,"tool_gradient_icon."IMAGE_EXT,_("Gradient Tool")); +- INIT_STOCK_ICON(star,"tool_star_icon."IMAGE_EXT,_("Star Tool")); ++ INIT_STOCK_ICON(normal,"tool_normal_icon." IMAGE_EXT,_("Transform Tool")); ++ INIT_STOCK_ICON(polygon,"tool_polyline_icon." IMAGE_EXT,_("Polygon Tool")); ++ INIT_STOCK_ICON(bline,"tool_spline_icon." IMAGE_EXT,_("Spline Tool")); ++ INIT_STOCK_ICON(eyedrop,"tool_eyedrop_icon." IMAGE_EXT,_("Eyedrop Tool")); ++ INIT_STOCK_ICON(fill,"tool_fill_icon." IMAGE_EXT,_("Fill Tool")); ++ INIT_STOCK_ICON(draw,"tool_draw_icon." IMAGE_EXT,_("Draw Tool")); ++ INIT_STOCK_ICON(lasso,"tool_cutout_icon." IMAGE_EXT,_("Cutout Tool")); ++ INIT_STOCK_ICON(brush,"tool_brush_icon." IMAGE_EXT,_("Brush Tool")); ++ INIT_STOCK_ICON(sketch,"tool_sketch_icon." IMAGE_EXT,_("Sketch Tool")); ++ INIT_STOCK_ICON(circle,"tool_circle_icon." IMAGE_EXT,_("Circle Tool")); ++ INIT_STOCK_ICON(rectangle,"tool_rectangle_icon." IMAGE_EXT,_("Rectangle Tool")); ++ INIT_STOCK_ICON(smooth_move,"tool_smooth_move_icon." IMAGE_EXT,_("SmoothMove Tool")); ++ INIT_STOCK_ICON(rotate,"tool_rotate_icon." IMAGE_EXT,"Rotate Tool"); ++ INIT_STOCK_ICON(width,"tool_width_icon." IMAGE_EXT,_("Width Tool")); ++ INIT_STOCK_ICON(scale,"tool_scale_icon." IMAGE_EXT,"Scale Tool"); ++ INIT_STOCK_ICON(zoom,"tool_zoom_icon." IMAGE_EXT,_("Zoom Tool")); ++ INIT_STOCK_ICON(mirror,"tool_mirror_icon." IMAGE_EXT,_("Mirror Tool")); ++ INIT_STOCK_ICON(text,"tool_text_icon." IMAGE_EXT,"Text Tool"); ++ INIT_STOCK_ICON(gradient,"tool_gradient_icon." IMAGE_EXT,_("Gradient Tool")); ++ INIT_STOCK_ICON(star,"tool_star_icon." IMAGE_EXT,_("Star Tool")); + // ToolBox Others +- INIT_STOCK_ICON(reset_colors,"reset_colors_icon."IMAGE_EXT,_("Reset Colors")); +- INIT_STOCK_ICON(swap_colors,"swap_colors_icon."IMAGE_EXT,_("Swap Colors")); +- INIT_STOCK_ICON(value_node,"valuenode_icon."IMAGE_EXT,_("ValueNode")); +- INIT_STOCK_ICON(valuenode_forbidanimation,"valuenode_forbidanimation_icon."IMAGE_EXT,_("ValueNode Forbid Animation")); +- INIT_STOCK_ICON(rename,"rename_icon."IMAGE_EXT,_("Rename")); +- INIT_STOCK_ICON(canvas,"canvas_icon."IMAGE_EXT,_("Canvas")); +- INIT_STOCK_ICON(canvas_new,"canvas_icon."IMAGE_EXT,_("New Canvas")); ++ INIT_STOCK_ICON(reset_colors,"reset_colors_icon." IMAGE_EXT,_("Reset Colors")); ++ INIT_STOCK_ICON(swap_colors,"swap_colors_icon." IMAGE_EXT,_("Swap Colors")); ++ INIT_STOCK_ICON(value_node,"valuenode_icon." IMAGE_EXT,_("ValueNode")); ++ INIT_STOCK_ICON(valuenode_forbidanimation,"valuenode_forbidanimation_icon." IMAGE_EXT,_("ValueNode Forbid Animation")); ++ INIT_STOCK_ICON(rename,"rename_icon." IMAGE_EXT,_("Rename")); ++ INIT_STOCK_ICON(canvas,"canvas_icon." IMAGE_EXT,_("Canvas")); ++ INIT_STOCK_ICON(canvas_new,"canvas_icon." IMAGE_EXT,_("New Canvas")); + + // Document Related Actions +- INIT_STOCK_ICON(about,"about_icon."IMAGE_EXT,_("About")); +- INIT_STOCK_ICON(new_doc,"action_doc_new_icon."IMAGE_EXT,_("New")); +- INIT_STOCK_ICON(open,"action_doc_open_icon."IMAGE_EXT,_("Open")); +- INIT_STOCK_ICON(save,"action_doc_save_icon."IMAGE_EXT,_("Save")); +- INIT_STOCK_ICON(save_as,"action_doc_saveas_icon."IMAGE_EXT,_("Save As")); +- INIT_STOCK_ICON(save_all,"action_doc_saveall_icon."IMAGE_EXT,_("Save All")); +- INIT_STOCK_ICON(redo,"action_doc_redo_icon."IMAGE_EXT,_("Redo")); +- INIT_STOCK_ICON(undo,"action_doc_undo_icon."IMAGE_EXT,_("Undo")); ++ INIT_STOCK_ICON(about,"about_icon." IMAGE_EXT,_("About")); ++ INIT_STOCK_ICON(new_doc,"action_doc_new_icon." IMAGE_EXT,_("New")); ++ INIT_STOCK_ICON(open,"action_doc_open_icon." IMAGE_EXT,_("Open")); ++ INIT_STOCK_ICON(save,"action_doc_save_icon." IMAGE_EXT,_("Save")); ++ INIT_STOCK_ICON(save_as,"action_doc_saveas_icon." IMAGE_EXT,_("Save As")); ++ INIT_STOCK_ICON(save_all,"action_doc_saveall_icon." IMAGE_EXT,_("Save All")); ++ INIT_STOCK_ICON(redo,"action_doc_redo_icon." IMAGE_EXT,_("Redo")); ++ INIT_STOCK_ICON(undo,"action_doc_undo_icon." IMAGE_EXT,_("Undo")); + + // Layers +- INIT_STOCK_ICON(layer,"layer_icon."IMAGE_EXT,_("Layer")); ++ INIT_STOCK_ICON(layer,"layer_icon." IMAGE_EXT,_("Layer")); + // Blur Layers +- INIT_STOCK_ICON(layer_blur_blur,"layer_blur_blur_icon."IMAGE_EXT,_("Blur Layer")); +- INIT_STOCK_ICON(layer_blur_motion,"layer_blur_motion_icon."IMAGE_EXT,_("Motion Blur Layer")); +- INIT_STOCK_ICON(layer_blur_radial,"layer_blur_radial_icon."IMAGE_EXT,_("Radial Blur Layer")); ++ INIT_STOCK_ICON(layer_blur_blur,"layer_blur_blur_icon." IMAGE_EXT,_("Blur Layer")); ++ INIT_STOCK_ICON(layer_blur_motion,"layer_blur_motion_icon." IMAGE_EXT,_("Motion Blur Layer")); ++ INIT_STOCK_ICON(layer_blur_radial,"layer_blur_radial_icon." IMAGE_EXT,_("Radial Blur Layer")); + // Distortion Layers +- INIT_STOCK_ICON(layer_distortion_curvewarp,"layer_distortion_curvewarp_icon."IMAGE_EXT,_("Curve Warp Layer")); +- INIT_STOCK_ICON(layer_distortion_insideout,"layer_distortion_insideout_icon."IMAGE_EXT,_("Inside Out Layer")); +- INIT_STOCK_ICON(layer_distortion_noise,"layer_distortion_noise_icon."IMAGE_EXT,_("Noise Distort Layer")); +- INIT_STOCK_ICON(layer_distortion_spherize,"layer_distortion_spherize_icon."IMAGE_EXT,_("Spherize Layer")); +- INIT_STOCK_ICON(layer_distortion_stretch,"layer_distortion_stretch_icon."IMAGE_EXT,_("Stretch Layer")); +- INIT_STOCK_ICON(layer_distortion_twirl,"layer_distortion_twirl_icon."IMAGE_EXT,_("Twirl Layer")); +- INIT_STOCK_ICON(layer_distortion_warp,"layer_distortion_warp_icon."IMAGE_EXT,_("Warp Layer")); ++ INIT_STOCK_ICON(layer_distortion_curvewarp,"layer_distortion_curvewarp_icon." IMAGE_EXT,_("Curve Warp Layer")); ++ INIT_STOCK_ICON(layer_distortion_insideout,"layer_distortion_insideout_icon." IMAGE_EXT,_("Inside Out Layer")); ++ INIT_STOCK_ICON(layer_distortion_noise,"layer_distortion_noise_icon." IMAGE_EXT,_("Noise Distort Layer")); ++ INIT_STOCK_ICON(layer_distortion_spherize,"layer_distortion_spherize_icon." IMAGE_EXT,_("Spherize Layer")); ++ INIT_STOCK_ICON(layer_distortion_stretch,"layer_distortion_stretch_icon." IMAGE_EXT,_("Stretch Layer")); ++ INIT_STOCK_ICON(layer_distortion_twirl,"layer_distortion_twirl_icon." IMAGE_EXT,_("Twirl Layer")); ++ INIT_STOCK_ICON(layer_distortion_warp,"layer_distortion_warp_icon." IMAGE_EXT,_("Warp Layer")); + // Example Layers +- INIT_STOCK_ICON(layer_example_filledrectangle,"layer_example_filledrectangle_icon."IMAGE_EXT,_("Filled Rectangle Layer")); +- INIT_STOCK_ICON(layer_example_metaballs,"layer_example_metaballs_icon."IMAGE_EXT,_("Metallballs Layer")); +- INIT_STOCK_ICON(layer_example_simplecircle,"layer_example_simplecircle_icon."IMAGE_EXT,_("Simple Circle Layer")); ++ INIT_STOCK_ICON(layer_example_filledrectangle,"layer_example_filledrectangle_icon." IMAGE_EXT,_("Filled Rectangle Layer")); ++ INIT_STOCK_ICON(layer_example_metaballs,"layer_example_metaballs_icon." IMAGE_EXT,_("Metallballs Layer")); ++ INIT_STOCK_ICON(layer_example_simplecircle,"layer_example_simplecircle_icon." IMAGE_EXT,_("Simple Circle Layer")); + // Filter Layers +- INIT_STOCK_ICON(layer_filter_clamp,"layer_filter_clamp_icon."IMAGE_EXT,_("Clamp Layer")); +- INIT_STOCK_ICON(layer_filter_colorcorrect,"layer_filter_colorcorrect_icon."IMAGE_EXT,_("Color Correct Layer")); +- INIT_STOCK_ICON(layer_filter_halftone2,"layer_filter_halftone2_icon."IMAGE_EXT,_("Halftone 2 Layer")); +- INIT_STOCK_ICON(layer_filter_halftone3,"layer_filter_halftone3_icon."IMAGE_EXT,_("Halftone 3 Layer")); +- INIT_STOCK_ICON(layer_filter_lumakey,"layer_filter_lumakey_icon."IMAGE_EXT,_("Luma Key Layer")); ++ INIT_STOCK_ICON(layer_filter_clamp,"layer_filter_clamp_icon." IMAGE_EXT,_("Clamp Layer")); ++ INIT_STOCK_ICON(layer_filter_colorcorrect,"layer_filter_colorcorrect_icon." IMAGE_EXT,_("Color Correct Layer")); ++ INIT_STOCK_ICON(layer_filter_halftone2,"layer_filter_halftone2_icon." IMAGE_EXT,_("Halftone 2 Layer")); ++ INIT_STOCK_ICON(layer_filter_halftone3,"layer_filter_halftone3_icon." IMAGE_EXT,_("Halftone 3 Layer")); ++ INIT_STOCK_ICON(layer_filter_lumakey,"layer_filter_lumakey_icon." IMAGE_EXT,_("Luma Key Layer")); + // Fractal Layers +- INIT_STOCK_ICON(layer_fractal_julia,"layer_fractal_julia_icon."IMAGE_EXT,_("Julia Set Layer")); +- INIT_STOCK_ICON(layer_fractal_mandelbrot,"layer_fractal_mandelbrot_icon."IMAGE_EXT,_("Mandelbrot Set Layer")); ++ INIT_STOCK_ICON(layer_fractal_julia,"layer_fractal_julia_icon." IMAGE_EXT,_("Julia Set Layer")); ++ INIT_STOCK_ICON(layer_fractal_mandelbrot,"layer_fractal_mandelbrot_icon." IMAGE_EXT,_("Mandelbrot Set Layer")); + // Geometry Layers +- INIT_STOCK_ICON(layer_geometry_checkerboard,"layer_geometry_checkerboard_icon."IMAGE_EXT,_("Checker Board Layer")); +- INIT_STOCK_ICON(layer_geometry_circle,"layer_geometry_circle_icon."IMAGE_EXT,_("Circle Layer")); +- INIT_STOCK_ICON(layer_geometry_outline,"layer_geometry_outline_icon."IMAGE_EXT,_("Outline Layer")); +- INIT_STOCK_ICON(layer_geometry_advanced_outline,"layer_geometry_advanced_outline_icon."IMAGE_EXT,_("Advanced Outline Layer")); +- INIT_STOCK_ICON(layer_geometry_polygon,"layer_geometry_polygon_icon."IMAGE_EXT,_("Polygon Layer")); +- INIT_STOCK_ICON(layer_geometry_rectangle,"layer_geometry_rectangle_icon."IMAGE_EXT,_("Rectangle Layer")); +- INIT_STOCK_ICON(layer_geometry_region,"layer_geometry_region_icon."IMAGE_EXT,_("Region Layer")); +- INIT_STOCK_ICON(layer_geometry_solidcolor,"layer_geometry_solidcolor_icon."IMAGE_EXT,_("Solid Color Layer")); +- INIT_STOCK_ICON(layer_geometry_star,"layer_geometry_star_icon."IMAGE_EXT,_("Star Layer")); ++ INIT_STOCK_ICON(layer_geometry_checkerboard,"layer_geometry_checkerboard_icon." IMAGE_EXT,_("Checker Board Layer")); ++ INIT_STOCK_ICON(layer_geometry_circle,"layer_geometry_circle_icon." IMAGE_EXT,_("Circle Layer")); ++ INIT_STOCK_ICON(layer_geometry_outline,"layer_geometry_outline_icon." IMAGE_EXT,_("Outline Layer")); ++ INIT_STOCK_ICON(layer_geometry_advanced_outline,"layer_geometry_advanced_outline_icon." IMAGE_EXT,_("Advanced Outline Layer")); ++ INIT_STOCK_ICON(layer_geometry_polygon,"layer_geometry_polygon_icon." IMAGE_EXT,_("Polygon Layer")); ++ INIT_STOCK_ICON(layer_geometry_rectangle,"layer_geometry_rectangle_icon." IMAGE_EXT,_("Rectangle Layer")); ++ INIT_STOCK_ICON(layer_geometry_region,"layer_geometry_region_icon." IMAGE_EXT,_("Region Layer")); ++ INIT_STOCK_ICON(layer_geometry_solidcolor,"layer_geometry_solidcolor_icon." IMAGE_EXT,_("Solid Color Layer")); ++ INIT_STOCK_ICON(layer_geometry_star,"layer_geometry_star_icon." IMAGE_EXT,_("Star Layer")); + // Gradient Layers +- INIT_STOCK_ICON(layer_gradient_conical,"layer_gradient_conical_icon."IMAGE_EXT,_("Conical Gradient Layer")); +- INIT_STOCK_ICON(layer_gradient_curve,"layer_gradient_curve_icon."IMAGE_EXT,_("Curve Gradient Layer")); +- INIT_STOCK_ICON(layer_gradient_noise,"layer_gradient_noise_icon."IMAGE_EXT,_("Noise Gradient Layer")); +- INIT_STOCK_ICON(layer_gradient_linear,"layer_gradient_linear_icon."IMAGE_EXT,_("Linear Gradient Layer")); +- INIT_STOCK_ICON(layer_gradient_radial,"layer_gradient_radial_icon."IMAGE_EXT,_("Radial Gradient Layer")); +- INIT_STOCK_ICON(layer_gradient_spiral,"layer_gradient_spiral_icon."IMAGE_EXT,_("Spiral Gradient Layer")); ++ INIT_STOCK_ICON(layer_gradient_conical,"layer_gradient_conical_icon." IMAGE_EXT,_("Conical Gradient Layer")); ++ INIT_STOCK_ICON(layer_gradient_curve,"layer_gradient_curve_icon." IMAGE_EXT,_("Curve Gradient Layer")); ++ INIT_STOCK_ICON(layer_gradient_noise,"layer_gradient_noise_icon." IMAGE_EXT,_("Noise Gradient Layer")); ++ INIT_STOCK_ICON(layer_gradient_linear,"layer_gradient_linear_icon." IMAGE_EXT,_("Linear Gradient Layer")); ++ INIT_STOCK_ICON(layer_gradient_radial,"layer_gradient_radial_icon." IMAGE_EXT,_("Radial Gradient Layer")); ++ INIT_STOCK_ICON(layer_gradient_spiral,"layer_gradient_spiral_icon." IMAGE_EXT,_("Spiral Gradient Layer")); + // Other Layers +- INIT_STOCK_ICON(layer_other_duplicate,"layer_other_duplicate_icon."IMAGE_EXT,_("Duplicate Layer")); +- INIT_STOCK_ICON(layer_other_importimage,"layer_other_importimage_icon."IMAGE_EXT,_("Import Image Layer")); +- INIT_STOCK_ICON(layer_other_pastecanvas,"layer_other_group_icon."IMAGE_EXT,_("Group Layer")); +- INIT_STOCK_ICON(layer_other_plant,"layer_other_plant_icon."IMAGE_EXT,_("Plant Layer")); +- INIT_STOCK_ICON(layer_other_stroboscope,"layer_other_stroboscope_icon."IMAGE_EXT,_("Stroboscope Layer")); +- INIT_STOCK_ICON(layer_other_supersample,"layer_other_supersample_icon."IMAGE_EXT,_("Super Sample Layer")); +- INIT_STOCK_ICON(layer_other_sound,"layer_other_sound_icon."IMAGE_EXT,_("Sound Layer")); +- INIT_STOCK_ICON(layer_other_switch,"layer_other_switch_icon."IMAGE_EXT,_("Switch Layer")); +- INIT_STOCK_ICON(layer_other_skeleton,"layer_other_skeleton_icon."IMAGE_EXT,_("Skeleton Layer")); +- INIT_STOCK_ICON(layer_other_text,"layer_other_text_icon."IMAGE_EXT,_("Text Layer")); +- INIT_STOCK_ICON(layer_other_timeloop,"layer_other_timeloop_icon."IMAGE_EXT,_("Time Loop Layer")); +- INIT_STOCK_ICON(layer_other_xorpattern,"layer_other_xorpattern_icon."IMAGE_EXT,_("XOR Pattern Layer")); ++ INIT_STOCK_ICON(layer_other_duplicate,"layer_other_duplicate_icon." IMAGE_EXT,_("Duplicate Layer")); ++ INIT_STOCK_ICON(layer_other_importimage,"layer_other_importimage_icon." IMAGE_EXT,_("Import Image Layer")); ++ INIT_STOCK_ICON(layer_other_pastecanvas,"layer_other_group_icon." IMAGE_EXT,_("Group Layer")); ++ INIT_STOCK_ICON(layer_other_plant,"layer_other_plant_icon." IMAGE_EXT,_("Plant Layer")); ++ INIT_STOCK_ICON(layer_other_stroboscope,"layer_other_stroboscope_icon." IMAGE_EXT,_("Stroboscope Layer")); ++ INIT_STOCK_ICON(layer_other_supersample,"layer_other_supersample_icon." IMAGE_EXT,_("Super Sample Layer")); ++ INIT_STOCK_ICON(layer_other_sound,"layer_other_sound_icon." IMAGE_EXT,_("Sound Layer")); ++ INIT_STOCK_ICON(layer_other_switch,"layer_other_switch_icon." IMAGE_EXT,_("Switch Layer")); ++ INIT_STOCK_ICON(layer_other_skeleton,"layer_other_skeleton_icon." IMAGE_EXT,_("Skeleton Layer")); ++ INIT_STOCK_ICON(layer_other_text,"layer_other_text_icon." IMAGE_EXT,_("Text Layer")); ++ INIT_STOCK_ICON(layer_other_timeloop,"layer_other_timeloop_icon." IMAGE_EXT,_("Time Loop Layer")); ++ INIT_STOCK_ICON(layer_other_xorpattern,"layer_other_xorpattern_icon." IMAGE_EXT,_("XOR Pattern Layer")); + // Stylize Layers +- INIT_STOCK_ICON(layer_stylize_bevel,"layer_stylize_bevel_icon."IMAGE_EXT,_("Bevel Layer")); +- INIT_STOCK_ICON(layer_stylize_shade,"layer_stylize_shade_icon."IMAGE_EXT,_("Shade Layer")); ++ INIT_STOCK_ICON(layer_stylize_bevel,"layer_stylize_bevel_icon." IMAGE_EXT,_("Bevel Layer")); ++ INIT_STOCK_ICON(layer_stylize_shade,"layer_stylize_shade_icon." IMAGE_EXT,_("Shade Layer")); + // Transform Layers +- INIT_STOCK_ICON(layer_transform_rotate,"layer_transform_rotate_icon."IMAGE_EXT,_("Rotate Layer")); +- INIT_STOCK_ICON(layer_transform_translate,"layer_transform_translate_icon."IMAGE_EXT,_("Translate Layer")); +- INIT_STOCK_ICON(layer_transform_scale,"layer_transform_scale_icon."IMAGE_EXT,_("Scale Layer")); ++ INIT_STOCK_ICON(layer_transform_rotate,"layer_transform_rotate_icon." IMAGE_EXT,_("Rotate Layer")); ++ INIT_STOCK_ICON(layer_transform_translate,"layer_transform_translate_icon." IMAGE_EXT,_("Translate Layer")); ++ INIT_STOCK_ICON(layer_transform_scale,"layer_transform_scale_icon." IMAGE_EXT,_("Scale Layer")); + +- INIT_STOCK_ICON(info,"info_icon."IMAGE_EXT,_("Info Tool")); +- INIT_STOCK_ICON(group,"set_icon."IMAGE_EXT,_("Set")); ++ INIT_STOCK_ICON(info,"info_icon." IMAGE_EXT,_("Info Tool")); ++ INIT_STOCK_ICON(group,"set_icon." IMAGE_EXT,_("Set")); + +- INIT_STOCK_ICON(grid_enable,"grid_enable_icon."IMAGE_EXT,_("Show Grid")); +- INIT_STOCK_ICON(grid_disable,"grid_disable_icon."IMAGE_EXT,_("Hide Grid")); +- INIT_STOCK_ICON(grid_snap_enable,"grid_snap_enable_icon."IMAGE_EXT,_("Enable Grid Snap")); +- INIT_STOCK_ICON(grid_snap_disable,"grid_snap_disable_icon."IMAGE_EXT,_("Disable Grid Snap")); +- INIT_STOCK_ICON(duplicate,"duplicate_icon."IMAGE_EXT,_("Duplicate")); +- INIT_STOCK_ICON(encapsulate,"group_icon."IMAGE_EXT,_("Group")); +- INIT_STOCK_ICON(select_all_child_layers,"select_all_child_layers_icon."IMAGE_EXT,_("Select All Child Layers")); ++ INIT_STOCK_ICON(grid_enable,"grid_enable_icon." IMAGE_EXT,_("Show Grid")); ++ INIT_STOCK_ICON(grid_disable,"grid_disable_icon." IMAGE_EXT,_("Hide Grid")); ++ INIT_STOCK_ICON(grid_snap_enable,"grid_snap_enable_icon." IMAGE_EXT,_("Enable Grid Snap")); ++ INIT_STOCK_ICON(grid_snap_disable,"grid_snap_disable_icon." IMAGE_EXT,_("Disable Grid Snap")); ++ INIT_STOCK_ICON(duplicate,"duplicate_icon." IMAGE_EXT,_("Duplicate")); ++ INIT_STOCK_ICON(encapsulate,"group_icon." IMAGE_EXT,_("Group")); ++ INIT_STOCK_ICON(select_all_child_layers,"select_all_child_layers_icon." IMAGE_EXT,_("Select All Child Layers")); + +- INIT_STOCK_ICON(clear_undo,"clear_undo_icon."IMAGE_EXT,_("Clear Undo Stack")); +- INIT_STOCK_ICON(clear_redo,"clear_redo_icon."IMAGE_EXT,_("Clear Redo Stack")); ++ INIT_STOCK_ICON(clear_undo,"clear_undo_icon." IMAGE_EXT,_("Clear Undo Stack")); ++ INIT_STOCK_ICON(clear_redo,"clear_redo_icon." IMAGE_EXT,_("Clear Redo Stack")); + +- INIT_STOCK_ICON(children,"library_icon."IMAGE_EXT,_("Library")); +- INIT_STOCK_ICON(curves,"graphs_icon."IMAGE_EXT,_("Graphs")); +- INIT_STOCK_ICON(keyframes,"keyframe_icon."IMAGE_EXT,_("Keyframes")); +- INIT_STOCK_ICON(meta_data,"meta_data_icon."IMAGE_EXT,_("MetaData")); +- INIT_STOCK_ICON(navigator,"navigator_icon."IMAGE_EXT,_("Navigator")); +- INIT_STOCK_ICON(timetrack,"time_track_icon."IMAGE_EXT,_("Time Track")); +- INIT_STOCK_ICON(history,"history_icon."IMAGE_EXT,_("History")); +- INIT_STOCK_ICON(palette,"palette_icon."IMAGE_EXT,_("Palette")); +- INIT_STOCK_ICON(params,"parameters_icon."IMAGE_EXT,_("Parameters")); ++ INIT_STOCK_ICON(children,"library_icon." IMAGE_EXT,_("Library")); ++ INIT_STOCK_ICON(curves,"graphs_icon." IMAGE_EXT,_("Graphs")); ++ INIT_STOCK_ICON(keyframes,"keyframe_icon." IMAGE_EXT,_("Keyframes")); ++ INIT_STOCK_ICON(meta_data,"meta_data_icon." IMAGE_EXT,_("MetaData")); ++ INIT_STOCK_ICON(navigator,"navigator_icon." IMAGE_EXT,_("Navigator")); ++ INIT_STOCK_ICON(timetrack,"time_track_icon." IMAGE_EXT,_("Time Track")); ++ INIT_STOCK_ICON(history,"history_icon." IMAGE_EXT,_("History")); ++ INIT_STOCK_ICON(palette,"palette_icon." IMAGE_EXT,_("Palette")); ++ INIT_STOCK_ICON(params,"parameters_icon." IMAGE_EXT,_("Parameters")); + +- INIT_STOCK_ICON(keyframe_lock_past_off,"keyframe_lock_past_off_icon."IMAGE_EXT,_("Past keyframes unlocked")); +- INIT_STOCK_ICON(keyframe_lock_past_on,"keyframe_lock_past_on_icon."IMAGE_EXT,_("Past keyframes locked")); +- INIT_STOCK_ICON(keyframe_lock_future_off,"keyframe_lock_future_off_icon."IMAGE_EXT,_("Future keyframes unlocked")); +- INIT_STOCK_ICON(keyframe_lock_future_on,"keyframe_lock_future_on_icon."IMAGE_EXT,_("Future keyframes locked")); ++ INIT_STOCK_ICON(keyframe_lock_past_off,"keyframe_lock_past_off_icon." IMAGE_EXT,_("Past keyframes unlocked")); ++ INIT_STOCK_ICON(keyframe_lock_past_on,"keyframe_lock_past_on_icon." IMAGE_EXT,_("Past keyframes locked")); ++ INIT_STOCK_ICON(keyframe_lock_future_off,"keyframe_lock_future_off_icon." IMAGE_EXT,_("Future keyframes unlocked")); ++ INIT_STOCK_ICON(keyframe_lock_future_on,"keyframe_lock_future_on_icon." IMAGE_EXT,_("Future keyframes locked")); + +- INIT_STOCK_ICON(animate_mode_off,"animate_mode_off_icon."IMAGE_EXT,_("Animate Mode Off")); +- INIT_STOCK_ICON(animate_mode_on,"animate_mode_on_icon."IMAGE_EXT,_("Animate Mode On")); ++ INIT_STOCK_ICON(animate_mode_off,"animate_mode_off_icon." IMAGE_EXT,_("Animate Mode Off")); ++ INIT_STOCK_ICON(animate_mode_on,"animate_mode_on_icon." IMAGE_EXT,_("Animate Mode On")); + +- INIT_STOCK_ICON(jack, "jack_icon."IMAGE_EXT, _("JACK")); ++ INIT_STOCK_ICON(jack, "jack_icon." IMAGE_EXT, _("JACK")); + +- INIT_STOCK_ICON(set_outline_color,"set_outline_color."IMAGE_EXT,_("Set as Outline")); +- INIT_STOCK_ICON(set_fill_color,"set_fill_color."IMAGE_EXT,_("Set as Fill")); ++ INIT_STOCK_ICON(set_outline_color,"set_outline_color." IMAGE_EXT,_("Set as Outline")); ++ INIT_STOCK_ICON(set_fill_color,"set_fill_color." IMAGE_EXT,_("Set as Fill")); + +- INIT_STOCK_ICON(animate_seek_begin,"animate_seek_begin_icon."IMAGE_EXT,_("Seek to Begin")); +- INIT_STOCK_ICON(animate_seek_prev_keyframe,"animate_seek_prev_keyframe_icon."IMAGE_EXT,_("Seek to Previous Keyframe")); +- INIT_STOCK_ICON(animate_seek_prev_frame,"animate_seek_prev_frame_icon."IMAGE_EXT,_("Seek to Previous Frame")); +- INIT_STOCK_ICON(animate_play,"animate_play_icon."IMAGE_EXT,_("Play")); +- INIT_STOCK_ICON(animate_stop,"animate_stop_icon."IMAGE_EXT,_("Stop")); +- INIT_STOCK_ICON(animate_pause,"animate_pause_icon."IMAGE_EXT,_("Pause")); +- INIT_STOCK_ICON(animate_seek_next_frame,"animate_seek_next_frame_icon."IMAGE_EXT,_("Seek to Next frame")); +- INIT_STOCK_ICON(animate_seek_next_keyframe,"animate_seek_next_keyframe_icon."IMAGE_EXT,_("Seek to Next Keyframe")); +- INIT_STOCK_ICON(animate_seek_end,"animate_seek_end_icon."IMAGE_EXT,_("Seek to End")); +- INIT_STOCK_ICON(animate_loop,"animate_loop_icon."IMAGE_EXT,_("Animate Loop")); ++ INIT_STOCK_ICON(animate_seek_begin,"animate_seek_begin_icon." IMAGE_EXT,_("Seek to Begin")); ++ INIT_STOCK_ICON(animate_seek_prev_keyframe,"animate_seek_prev_keyframe_icon." IMAGE_EXT,_("Seek to Previous Keyframe")); ++ INIT_STOCK_ICON(animate_seek_prev_frame,"animate_seek_prev_frame_icon." IMAGE_EXT,_("Seek to Previous Frame")); ++ INIT_STOCK_ICON(animate_play,"animate_play_icon." IMAGE_EXT,_("Play")); ++ INIT_STOCK_ICON(animate_stop,"animate_stop_icon." IMAGE_EXT,_("Stop")); ++ INIT_STOCK_ICON(animate_pause,"animate_pause_icon." IMAGE_EXT,_("Pause")); ++ INIT_STOCK_ICON(animate_seek_next_frame,"animate_seek_next_frame_icon." IMAGE_EXT,_("Seek to Next frame")); ++ INIT_STOCK_ICON(animate_seek_next_keyframe,"animate_seek_next_keyframe_icon." IMAGE_EXT,_("Seek to Next Keyframe")); ++ INIT_STOCK_ICON(animate_seek_end,"animate_seek_end_icon." IMAGE_EXT,_("Seek to End")); ++ INIT_STOCK_ICON(animate_loop,"animate_loop_icon." IMAGE_EXT,_("Animate Loop")); + +- INIT_STOCK_ICON(add_to_group,"action_add_to_set_icon."IMAGE_EXT,_("Add Layer to Set")); +- INIT_STOCK_ICON(remove_from_group,"action_remove_from_set_icon."IMAGE_EXT,_("Remove Layer from Set")); +- INIT_STOCK_ICON(set_desc,"action_set_layer_description_icon."IMAGE_EXT,_("Set Layer Description")); +- INIT_STOCK_ICON(export,"action_export_icon."IMAGE_EXT,_("Export Value Node")); +- INIT_STOCK_ICON(unexport,"action_unexport_icon."IMAGE_EXT,_("Unexport Value Node")); +- INIT_STOCK_ICON(flat_interpolation,"action_flat_interpolation_icon."IMAGE_EXT,_("Set Interpolation to Flat")); +- INIT_STOCK_ICON(interpolate_interpolation,"action_interpolate_interpolation_icon."IMAGE_EXT,_("Set Interpolation to Interpolate")); +- INIT_STOCK_ICON(peak_interpolation,"action_peak_interpolation_icon."IMAGE_EXT,_("Set Interpolation to Peak")); +- INIT_STOCK_ICON(rounded_interpolation,"action_rounded_interpolation_icon."IMAGE_EXT,_("Set Interpolation to Rounded")); +- INIT_STOCK_ICON(squared_interpolation,"action_squared_interpolation_icon."IMAGE_EXT,_("Set Interpolation to Squared")); ++ INIT_STOCK_ICON(add_to_group,"action_add_to_set_icon." IMAGE_EXT,_("Add Layer to Set")); ++ INIT_STOCK_ICON(remove_from_group,"action_remove_from_set_icon." IMAGE_EXT,_("Remove Layer from Set")); ++ INIT_STOCK_ICON(set_desc,"action_set_layer_description_icon." IMAGE_EXT,_("Set Layer Description")); ++ INIT_STOCK_ICON(export,"action_export_icon." IMAGE_EXT,_("Export Value Node")); ++ INIT_STOCK_ICON(unexport,"action_unexport_icon." IMAGE_EXT,_("Unexport Value Node")); ++ INIT_STOCK_ICON(flat_interpolation,"action_flat_interpolation_icon." IMAGE_EXT,_("Set Interpolation to Flat")); ++ INIT_STOCK_ICON(interpolate_interpolation,"action_interpolate_interpolation_icon." IMAGE_EXT,_("Set Interpolation to Interpolate")); ++ INIT_STOCK_ICON(peak_interpolation,"action_peak_interpolation_icon." IMAGE_EXT,_("Set Interpolation to Peak")); ++ INIT_STOCK_ICON(rounded_interpolation,"action_rounded_interpolation_icon." IMAGE_EXT,_("Set Interpolation to Rounded")); ++ INIT_STOCK_ICON(squared_interpolation,"action_squared_interpolation_icon." IMAGE_EXT,_("Set Interpolation to Squared")); + +- INIT_STOCK_ICON(toggle_duck_position,"duck_position_icon."IMAGE_EXT,_("Toggle position handles")); +- INIT_STOCK_ICON(toggle_duck_vertex,"duck_vertex_icon."IMAGE_EXT,_("Toggle vertex handles")); +- INIT_STOCK_ICON(toggle_duck_tangent,"duck_tangent_icon."IMAGE_EXT,_("Toggle tangent handles")); +- INIT_STOCK_ICON(toggle_duck_radius,"duck_radius_icon."IMAGE_EXT,_("Toggle radius handles")); +- INIT_STOCK_ICON(toggle_duck_width,"duck_width_icon."IMAGE_EXT,_("Toggle width handles")); +- INIT_STOCK_ICON(toggle_duck_angle,"duck_angle_icon."IMAGE_EXT,_("Toggle angle handles")); ++ INIT_STOCK_ICON(toggle_duck_position,"duck_position_icon." IMAGE_EXT,_("Toggle position handles")); ++ INIT_STOCK_ICON(toggle_duck_vertex,"duck_vertex_icon." IMAGE_EXT,_("Toggle vertex handles")); ++ INIT_STOCK_ICON(toggle_duck_tangent,"duck_tangent_icon." IMAGE_EXT,_("Toggle tangent handles")); ++ INIT_STOCK_ICON(toggle_duck_radius,"duck_radius_icon." IMAGE_EXT,_("Toggle radius handles")); ++ INIT_STOCK_ICON(toggle_duck_width,"duck_width_icon." IMAGE_EXT,_("Toggle width handles")); ++ INIT_STOCK_ICON(toggle_duck_angle,"duck_angle_icon." IMAGE_EXT,_("Toggle angle handles")); + +- INIT_STOCK_ICON(toggle_show_grid,"show_grid_icon."IMAGE_EXT,_("Toggle show grid")); +- INIT_STOCK_ICON(toggle_snap_grid,"snap_grid_icon."IMAGE_EXT,_("Toggle snap grid")); +- INIT_STOCK_ICON(toggle_show_guide,"show_guide_icon."IMAGE_EXT,_("Toggle show guide")); +- INIT_STOCK_ICON(toggle_snap_guide,"snap_guide_icon."IMAGE_EXT,_("Toggle snap guide")); ++ INIT_STOCK_ICON(toggle_show_grid,"show_grid_icon." IMAGE_EXT,_("Toggle show grid")); ++ INIT_STOCK_ICON(toggle_snap_grid,"snap_grid_icon." IMAGE_EXT,_("Toggle snap grid")); ++ INIT_STOCK_ICON(toggle_show_guide,"show_guide_icon." IMAGE_EXT,_("Toggle show guide")); ++ INIT_STOCK_ICON(toggle_snap_guide,"snap_guide_icon." IMAGE_EXT,_("Toggle snap guide")); + +- INIT_STOCK_ICON(toggle_onion_skin,"onion_skin_icon."IMAGE_EXT,_("Toggle onion skin")); ++ INIT_STOCK_ICON(toggle_onion_skin,"onion_skin_icon." IMAGE_EXT,_("Toggle onion skin")); + +- INIT_STOCK_ICON(increase_resolution,"incr_resolution_icon."IMAGE_EXT,_("Increase resolution")); +- INIT_STOCK_ICON(decrease_resolution,"decr_resolution_icon."IMAGE_EXT,_("Decrease resolution")); ++ INIT_STOCK_ICON(increase_resolution,"incr_resolution_icon." IMAGE_EXT,_("Increase resolution")); ++ INIT_STOCK_ICON(decrease_resolution,"decr_resolution_icon." IMAGE_EXT,_("Decrease resolution")); + +- INIT_STOCK_ICON(preview_options,"preview_options_icon."IMAGE_EXT,_("Preview Options Dialog")); +- INIT_STOCK_ICON(render_options,"render_options_icon."IMAGE_EXT,_("Render Options Dialog")); ++ INIT_STOCK_ICON(preview_options,"preview_options_icon." IMAGE_EXT,_("Preview Options Dialog")); ++ INIT_STOCK_ICON(render_options,"render_options_icon." IMAGE_EXT,_("Render Options Dialog")); + +- INIT_STOCK_ICON(interpolation_type_tcb,"interpolation_type_tcb_icon."IMAGE_EXT,_("TCB interpolation")); +- INIT_STOCK_ICON(interpolation_type_ease,"interpolation_type_ease_icon."IMAGE_EXT,_("Ease In/Out interpolation")); +- INIT_STOCK_ICON(interpolation_type_const,"interpolation_type_const_icon."IMAGE_EXT,_("Const interpolation")); +- INIT_STOCK_ICON(interpolation_type_linear,"interpolation_type_linear_icon."IMAGE_EXT,_("Linear interpolation")); +- INIT_STOCK_ICON(interpolation_type_clamped,"interpolation_type_clamped_icon."IMAGE_EXT,_("Clamped interpolation")); ++ INIT_STOCK_ICON(interpolation_type_tcb,"interpolation_type_tcb_icon." IMAGE_EXT,_("TCB interpolation")); ++ INIT_STOCK_ICON(interpolation_type_ease,"interpolation_type_ease_icon." IMAGE_EXT,_("Ease In/Out interpolation")); ++ INIT_STOCK_ICON(interpolation_type_const,"interpolation_type_const_icon." IMAGE_EXT,_("Const interpolation")); ++ INIT_STOCK_ICON(interpolation_type_linear,"interpolation_type_linear_icon." IMAGE_EXT,_("Linear interpolation")); ++ INIT_STOCK_ICON(interpolation_type_clamped,"interpolation_type_clamped_icon." IMAGE_EXT,_("Clamped interpolation")); + +- INIT_STOCK_ICON(utils_chain_link_on,"utils_chain_link_on_icon."IMAGE_EXT,_("Linked")); +- INIT_STOCK_ICON(utils_chain_link_off,"utils_chain_link_off_icon."IMAGE_EXT,_("Unlinked")); +- INIT_STOCK_ICON(utils_timetrack_align,"utils_timetrack_align_icon."IMAGE_EXT,"Utils Timetrack align"); ++ INIT_STOCK_ICON(utils_chain_link_on,"utils_chain_link_on_icon." IMAGE_EXT,_("Linked")); ++ INIT_STOCK_ICON(utils_chain_link_off,"utils_chain_link_off_icon." IMAGE_EXT,_("Unlinked")); ++ INIT_STOCK_ICON(utils_timetrack_align,"utils_timetrack_align_icon." IMAGE_EXT,"Utils Timetrack align"); + + INIT_STOCK_ICON_CLONE(cvs_add,"gtk-add",_("CVS Add")); + INIT_STOCK_ICON_CLONE(cvs_update,"gtk-open",_("CVS Update")); diff --git a/graphics/synfigstudio/files/patch-src_gui_splash.cpp b/graphics/synfigstudio/files/patch-src_gui_splash.cpp new file mode 100644 index 00000000000..147d9fe06eb --- /dev/null +++ b/graphics/synfigstudio/files/patch-src_gui_splash.cpp @@ -0,0 +1,23 @@ +--- src/gui/splash.cpp.orig 2017-04-02 22:54:21 UTC ++++ src/gui/splash.cpp +@@ -185,9 +185,9 @@ Splash::Splash(): + if(ran >0.499999) + number = 2; + //synfig::info("%s", strprintf("%d",number).c_str()); +- splash_image->set(imagepath+"splash_screen"+strprintf("%d",number)+"."IMAGE_EXT); ++ splash_image->set(imagepath+"splash_screen"+strprintf("%d",number)+"." IMAGE_EXT); + */ +- splash_image->set(imagepath+"splash_screen."IMAGE_EXT); ++ splash_image->set(imagepath+"splash_screen." IMAGE_EXT); + splash_image->set_alignment(0.5,0.5); + splash_image->set_padding(0,0); + +@@ -220,7 +220,7 @@ Splash::Splash(): + frame->add(*fixed); + + // Set up the parameters for this pop-up window +- set_title("Synfig Studio "VERSION); ++ set_title("Synfig Studio " VERSION); + set_modal(false); + property_window_position().set_value(Gtk::WIN_POS_CENTER); + set_resizable(false); diff --git a/irc/bitlbee/Makefile b/irc/bitlbee/Makefile index c3a8053edef..33ef63d953f 100644 --- a/irc/bitlbee/Makefile +++ b/irc/bitlbee/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= bitlbee -PORTVERSION= 3.5 -PORTREVISION= 2 +PORTVERSION= 3.5.1 CATEGORIES= irc MASTER_SITES= http://get.bitlbee.org/src/ \ LOCAL/brix diff --git a/irc/bitlbee/distinfo b/irc/bitlbee/distinfo index 505e606d951..74b0d172d4f 100644 --- a/irc/bitlbee/distinfo +++ b/irc/bitlbee/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1483980206 -SHA256 (bitlbee-3.5.tar.gz) = 549d02181ab303dfe8a219faafd7a1aea7ee642eb071b767f668782a57388319 -SIZE (bitlbee-3.5.tar.gz) = 657177 +TIMESTAMP = 1487513940 +SHA256 (bitlbee-3.5.1.tar.gz) = 9636d7fd89ebb3756c13a9a3387736ca6d56ccf66ec0580d512f07b21db0fa69 +SIZE (bitlbee-3.5.1.tar.gz) = 680351 diff --git a/multimedia/Makefile b/multimedia/Makefile index c642fe192be..83ea25b0e45 100644 --- a/multimedia/Makefile +++ b/multimedia/Makefile @@ -210,8 +210,10 @@ SUBDIR += libv4l SUBDIR += libva SUBDIR += libva-intel-driver + SUBDIR += libva-utils SUBDIR += libva-vdpau-driver SUBDIR += libvdpau + SUBDIR += libvdpau-va-gl SUBDIR += libvpx SUBDIR += libx264 SUBDIR += libxine diff --git a/multimedia/gstreamermm/Makefile b/multimedia/gstreamermm/Makefile index 4d57b790af5..4f7c2e7f0ef 100644 --- a/multimedia/gstreamermm/Makefile +++ b/multimedia/gstreamermm/Makefile @@ -13,7 +13,8 @@ COMMENT= C++ wrapper library for the multimedia library GStreamer LICENSE= LGPL21 -USES= gmake libtool pathfix pkgconfig tar:xz +USES= compiler:c++11-lang gmake libtool pathfix pkgconfig tar:xz +USE_CXXSTD= c++11 USE_GSTREAMER= theora vorbis cdparanoia gio pango USE_GNOME= gnomeprefix gtkmm24 GNU_CONFIGURE= yes diff --git a/multimedia/libva-intel-driver/Makefile b/multimedia/libva-intel-driver/Makefile index 1d72bb49377..ea924fb1ea9 100644 --- a/multimedia/libva-intel-driver/Makefile +++ b/multimedia/libva-intel-driver/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= libva-intel-driver -PORTVERSION= 1.7.3 -PORTREVISION= 2 +PORTVERSION= 1.8.0 CATEGORIES= multimedia MAINTAINER= madpilot@FreeBSD.org diff --git a/multimedia/libva-intel-driver/distinfo b/multimedia/libva-intel-driver/distinfo index 90d133fcf85..bd253b75d73 100644 --- a/multimedia/libva-intel-driver/distinfo +++ b/multimedia/libva-intel-driver/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1487846424 -SHA256 (01org-intel-vaapi-driver-1.7.3_GH0.tar.gz) = c1f02cbdf0398f096ddc91096fac6ee62267a54955f6d235d73a8ff2ea888118 -SIZE (01org-intel-vaapi-driver-1.7.3_GH0.tar.gz) = 1648659 +TIMESTAMP = 1491034980 +SHA256 (01org-intel-vaapi-driver-1.8.0_GH0.tar.gz) = 45a38641f3ddbd43d9c053bfd9cb809ecb2d5f5227f0e3c1c5a8d51dccf81b35 +SIZE (01org-intel-vaapi-driver-1.8.0_GH0.tar.gz) = 2308240 diff --git a/multimedia/libva-intel-driver/files/patch-src-i965_decoder_utils.c b/multimedia/libva-intel-driver/files/patch-src-i965_decoder_utils.c deleted file mode 100644 index ae328b331aa..00000000000 --- a/multimedia/libva-intel-driver/files/patch-src-i965_decoder_utils.c +++ /dev/null @@ -1,14 +0,0 @@ ---- src/i965_decoder_utils.c.orig 2014-12-24 00:59:48 UTC -+++ src/i965_decoder_utils.c -@@ -23,7 +23,11 @@ - - #include "sysdeps.h" - #include -+#ifdef __FreeBSD__ -+#include -+#else - #include -+#endif - - #include "intel_batchbuffer.h" - #include "intel_media.h" diff --git a/multimedia/libva-intel-driver/pkg-descr b/multimedia/libva-intel-driver/pkg-descr index 4f327bc5372..cd213d8e5b7 100644 --- a/multimedia/libva-intel-driver/pkg-descr +++ b/multimedia/libva-intel-driver/pkg-descr @@ -1,4 +1,4 @@ Libva driver for intel graphics cards with hardware accelerated features for video encode/decode. -WWW: http://cgit.freedesktop.org/vaapi/intel-driver +WWW: https://github.com/01org/intel-vaapi-driver diff --git a/multimedia/libva-utils/Makefile b/multimedia/libva-utils/Makefile new file mode 100644 index 00000000000..40bdf4043bf --- /dev/null +++ b/multimedia/libva-utils/Makefile @@ -0,0 +1,53 @@ +# $FreeBSD$ + +PORTNAME= libva-utils +PORTVERSION= 1.8.0 +CATEGORIES= multimedia + +MAINTAINER= madpilot@FreeBSD.org +COMMENT= Collection of tests and utilities for VAAPI + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/COPYING + +LIB_DEPENDS= libva.so:multimedia/libva + +USES= autoreconf gmake libtool pkgconfig tar:bzip2 +#USE_XORG= glproto pciaccess xext xfixes +#USE_GL= gl +GNU_CONFIGURE= yes + +USE_GITHUB= yes +GH_ACCOUNT= 01org + +#LDFLAGS+= -lpthread +# prevent types conflict: videodev2.h vs. drm.h +#CFLAGS+= -DHAVE_LINUX_INTEGER_TYPES + +OPTIONS_DEFINE= DEBUG + +.include + +.if ${PORT_OPTIONS:MDEBUG} +CFLAGS+= -D_DEBUG +.else +CFLAGS+= -DNDEBUG +.endif + +.include + +.if defined(STRIP) && ${STRIP} != "" +INSTALL_TARGET= install-strip +.endif + +#post-patch: .SILENT +# ${REINPLACE_CMD} -e 's|\($$libdir\)/dri|\1/va|' \ +# -e 's|$${libdir}/\(pkgconfig\)|${PREFIX}/libdata/\1|' \ +# ${WRKSRC}/configure.ac +# ${REINPLACE_CMD} -e 's/va\(info\)/\1/g' -e 's/info\.c/vainfo\.c/' \ +# ${WRKSRC}/test/vainfo/Makefile.am +# ${REINPLACE_CMD} '/^export VA_HEADER_/d' \ +# ${WRKSRC}/doc/Makefile.am +# ${REINPLACE_CMD} 's/-ldl//' ${WRKSRC}/va/Makefile.am + +.include diff --git a/multimedia/libva-utils/distinfo b/multimedia/libva-utils/distinfo new file mode 100644 index 00000000000..95aa4b5b6bf --- /dev/null +++ b/multimedia/libva-utils/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1491052388 +SHA256 (01org-libva-utils-1.8.0_GH0.tar.gz) = 2a7590c8428d0b453b004702c4c515669403cea27f9f17b2560b38da337ec943 +SIZE (01org-libva-utils-1.8.0_GH0.tar.gz) = 1011595 diff --git a/multimedia/libva-utils/pkg-descr b/multimedia/libva-utils/pkg-descr new file mode 100644 index 00000000000..7e18f24afe8 --- /dev/null +++ b/multimedia/libva-utils/pkg-descr @@ -0,0 +1,4 @@ +libva-utils is a collection of utilities and examples to exercise +VA-API in accordance with the libva project. + +WWW: https://github.com/01org/libva-utils diff --git a/multimedia/libva-utils/pkg-plist b/multimedia/libva-utils/pkg-plist new file mode 100644 index 00000000000..a2e913dc937 --- /dev/null +++ b/multimedia/libva-utils/pkg-plist @@ -0,0 +1,8 @@ +bin/avcenc +bin/h264encode +bin/vainfo +bin/jpegenc +bin/loadjpeg +bin/mpeg2vaenc +bin/mpeg2vldemo +bin/putsurface diff --git a/multimedia/libva/Makefile b/multimedia/libva/Makefile index 8e4e63b896e..305d62c3d0a 100644 --- a/multimedia/libva/Makefile +++ b/multimedia/libva/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= libva -PORTVERSION= 1.7.3 +PORTVERSION= 1.8.0 CATEGORIES= multimedia MAINTAINER= madpilot@FreeBSD.org @@ -22,7 +22,6 @@ USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= 01org -GH_TAGNAME= ${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX} LDFLAGS+= -lpthread # prevent types conflict: videodev2.h vs. drm.h @@ -48,8 +47,6 @@ post-patch: .SILENT ${REINPLACE_CMD} -e 's|\($$libdir\)/dri|\1/va|' \ -e 's|$${libdir}/\(pkgconfig\)|${PREFIX}/libdata/\1|' \ ${WRKSRC}/configure.ac - ${REINPLACE_CMD} -e 's/va\(info\)/\1/g' -e 's/info\.c/vainfo\.c/' \ - ${WRKSRC}/test/vainfo/Makefile.am ${REINPLACE_CMD} '/^export VA_HEADER_/d' \ ${WRKSRC}/doc/Makefile.am ${REINPLACE_CMD} 's/-ldl//' ${WRKSRC}/va/Makefile.am diff --git a/multimedia/libva/distinfo b/multimedia/libva/distinfo index 313ae8dd332..a2b7e179f9b 100644 --- a/multimedia/libva/distinfo +++ b/multimedia/libva/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1487845684 -SHA256 (01org-libva-1.7.3-libva-1.7.3_GH0.tar.gz) = f0f816a725007fbf3c7ed816ff71ba420696bec63ff49045e9b23d9b34ac73c8 -SIZE (01org-libva-1.7.3-libva-1.7.3_GH0.tar.gz) = 898775 +TIMESTAMP = 1491034642 +SHA256 (01org-libva-1.8.0_GH0.tar.gz) = 924ed467d50a24018428448071a311d6467e0d40dc94731e2164f9d5d61bac51 +SIZE (01org-libva-1.8.0_GH0.tar.gz) = 195261 diff --git a/multimedia/libva/files/patch-test__v4l_h264__encode__capture.cpp b/multimedia/libva/files/patch-test__v4l_h264__encode__capture.cpp deleted file mode 100644 index c2c6c6c62d2..00000000000 --- a/multimedia/libva/files/patch-test__v4l_h264__encode__capture.cpp +++ /dev/null @@ -1,38 +0,0 @@ ---- test/v4l_h264/encode/capture.cpp.orig 2016-06-21 01:29:25 UTC -+++ test/v4l_h264/encode/capture.cpp -@@ -30,6 +30,7 @@ - */ - - #include /* EXIT_FAILURE, EXIT_SUCCESS */ -+#include /* printf */ - #include - #include /* strerror() */ - #include -@@ -37,7 +38,11 @@ - #include /* low-level i/o */ - #include - #include -+#if defined __FreeBSD__ || defined __DragonFly__ -+#include -+#else - #include -+#endif - #include - #include - #include -@@ -451,10 +456,15 @@ static void init_userp (unsigned int buf - } - for (n_buffers = 0; n_buffers < 4; ++n_buffers) { - buffers[n_buffers].length = buffer_size; -+#if defined __FreeBSD__ || defined __DragonFly__ -+ if(posix_memalign(&buffers[n_buffers].start, page_size, buffer_size)) -+ { -+#else - buffers[n_buffers].start = memalign (/* boundary */ page_size, - buffer_size); - - if (!buffers[n_buffers].start) { -+#endif - std::cerr << "Out of memory\n"; - exit (EXIT_FAILURE); - } diff --git a/multimedia/libva/pkg-descr b/multimedia/libva/pkg-descr index 8af205db570..1377e3d5e27 100644 --- a/multimedia/libva/pkg-descr +++ b/multimedia/libva/pkg-descr @@ -3,4 +3,4 @@ hardware accelerated video decode/encode at various entry-points (VLD, IDCT, Motion Compensation etc.) for the prevailing coding standards today (MPEG-2, MPEG-4 ASP/H.263, MPEG-4 AVC/H.264, and VC-1/VMW3). -WWW: http://freedesktop.org/wiki/Software/vaapi +WWW: https://github.com/01org/libva diff --git a/multimedia/libva/pkg-plist b/multimedia/libva/pkg-plist index 0811d92f8e6..9c52012b3f9 100644 --- a/multimedia/libva/pkg-plist +++ b/multimedia/libva/pkg-plist @@ -1,11 +1,3 @@ -bin/vaavcenc -bin/vah264encode -bin/vainfo -bin/vajpegenc -bin/valoadjpeg -bin/vampeg2vaenc -bin/vampeg2vldemo -bin/vaputsurface include/va/va.h include/va/va_backend.h include/va/va_backend_glx.h @@ -33,19 +25,19 @@ include/va/va_vpp.h include/va/va_x11.h lib/libva-drm.so lib/libva-drm.so.1 -lib/libva-drm.so.1.3904.0 +lib/libva-drm.so.1.4000.0 lib/libva-glx.so lib/libva-glx.so.1 -lib/libva-glx.so.1.3904.0 +lib/libva-glx.so.1.4000.0 lib/libva-tpi.so lib/libva-tpi.so.1 -lib/libva-tpi.so.1.3904.0 +lib/libva-tpi.so.1.4000.0 lib/libva-x11.so lib/libva-x11.so.1 -lib/libva-x11.so.1.3904.0 +lib/libva-x11.so.1.4000.0 lib/libva.so lib/libva.so.1 -lib/libva.so.1.3904.0 +lib/libva.so.1.4000.0 lib/va/dummy_drv_video.so libdata/pkgconfig/libva-drm.pc libdata/pkgconfig/libva-glx.pc diff --git a/multimedia/libvdpau-va-gl/Makefile b/multimedia/libvdpau-va-gl/Makefile new file mode 100644 index 00000000000..dc372e04c49 --- /dev/null +++ b/multimedia/libvdpau-va-gl/Makefile @@ -0,0 +1,37 @@ +# $FreeBSD$ + +PORTNAME= libvdpau-va-gl +PORTVERSION= 0.4.2 +DISTVERSIONPREFIX= v +CATEGORIES= multimedia + +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES= 58a98e8a735f.patch:-p1 + +MAINTAINER= madpilot@FreeBSD.org +COMMENT= VDPAU driver with OpenGL/VAAPI backend + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE + +LIB_DEPENDS= libva-x11.so:multimedia/libva + +USE_GITHUB= yes +GH_ACCOUNT= i-rinat + +USES= cmake pkgconfig +USE_XORG= x11 +USE_GL= gl +LDFLAGS+= -Wl,--as-needed # Xext, ICE, SM +TEST_TARGET= check + +PLIST_FILES= lib/vdpau/libvdpau_va_gl.so lib/vdpau/libvdpau_va_gl.so.1 +# bug 217825: Convenience symlinks. On AMD prefer VDPAU from Mesa. +PLIST_FILES+= lib/vdpau/libvdpau_i915.so.1 lib/vdpau/libvdpau_i965.so.1 + +post-install: +.for f in ${PLIST_FILES:N*va_gl*:M*.so.1} + ${LN} -sf libvdpau_va_gl.so.1 ${STAGEDIR}${PREFIX}/$f +.endfor + +.include diff --git a/multimedia/libvdpau-va-gl/distinfo b/multimedia/libvdpau-va-gl/distinfo new file mode 100644 index 00000000000..9adc024f685 --- /dev/null +++ b/multimedia/libvdpau-va-gl/distinfo @@ -0,0 +1,5 @@ +TIMESTAMP = 1474986072 +SHA256 (i-rinat-libvdpau-va-gl-v0.4.2_GH0.tar.gz) = 7d9121540658eb0244859e63da171ca3869e784afbeaf202f44471275c784af4 +SIZE (i-rinat-libvdpau-va-gl-v0.4.2_GH0.tar.gz) = 119473 +SHA256 (58a98e8a735f.patch) = 0dbd7c1b2f831b74f65d42cd632f680f08b7cf9f5248e7de757df80bab599eb8 +SIZE (58a98e8a735f.patch) = 1240 diff --git a/multimedia/libvdpau-va-gl/pkg-descr b/multimedia/libvdpau-va-gl/pkg-descr new file mode 100644 index 00000000000..1e074461f93 --- /dev/null +++ b/multimedia/libvdpau-va-gl/pkg-descr @@ -0,0 +1,5 @@ +The package provides a generic VDPAU driver. It uses OpenGL under the +hood to accelerate drawing, scaling, and (if available) VA-API to +accelerate video decoding. + +WWW: https://github.com/i-rinat/libvdpau-va-gl diff --git a/net-im/xmpp-client/Makefile b/net-im/xmpp-client/Makefile index cfac7a0b5ab..19085cb6310 100644 --- a/net-im/xmpp-client/Makefile +++ b/net-im/xmpp-client/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= xmpp-client -PORTVERSION= 20160717 +PORTVERSION= 20170324 CATEGORIES= net-im MAINTAINER= cs@FreeBSD.org @@ -14,7 +14,7 @@ BUILD_DEPENDS= ${LOCALBASE}/${GO_LIBDIR}/golang.org/x/crypto/bcrypt.a:security/g USE_GITHUB= yes GH_ACCOUNT= agl -GH_TAGNAME= abbf9020393e8caae3e8996a16ce48446e31cf0e +GH_TAGNAME= 3030ad42ee2df255ffc108dc6d04893d9501c863 USES= go PLIST_FILES= bin/xmpp-client GO_PKGNAME= github.com/agl/${PORTNAME} diff --git a/net-im/xmpp-client/distinfo b/net-im/xmpp-client/distinfo index e79b9a86df7..5dd604ad8a4 100644 --- a/net-im/xmpp-client/distinfo +++ b/net-im/xmpp-client/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1470252820 -SHA256 (agl-xmpp-client-20160717-abbf9020393e8caae3e8996a16ce48446e31cf0e_GH0.tar.gz) = 29a7ed8c97d3d313d0979296728d44f94693354d5218e19f29927a1ee57b3678 -SIZE (agl-xmpp-client-20160717-abbf9020393e8caae3e8996a16ce48446e31cf0e_GH0.tar.gz) = 38832 +TIMESTAMP = 1491145506 +SHA256 (agl-xmpp-client-20170324-3030ad42ee2df255ffc108dc6d04893d9501c863_GH0.tar.gz) = 3e231f2eb50db38bc8aa235bb3c59241f6ca977bd8f5f3013a8d6295fcdcb79e +SIZE (agl-xmpp-client-20170324-3030ad42ee2df255ffc108dc6d04893d9501c863_GH0.tar.gz) = 39132 diff --git a/net/net6/Makefile b/net/net6/Makefile index 4671903bada..709548cc3ef 100644 --- a/net/net6/Makefile +++ b/net/net6/Makefile @@ -3,7 +3,7 @@ PORTNAME= net6 PORTVERSION= 1.3.14 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= net devel MASTER_SITES= http://releases.0x539.de/net6/ @@ -18,7 +18,8 @@ LIB_DEPENDS= libsigc-2.0.so:devel/libsigc++20 \ GNU_CONFIGURE= yes INSTALL_TARGET= install-strip -USES= cpe libtool pathfix pkgconfig +USES= cpe libtool pathfix pkgconfig compiler:c++11-lang +USE_CXXSTD= c++11 USE_LDCONFIG= yes CPE_VENDOR= armin_burgmeier diff --git a/net/sobby/Makefile b/net/sobby/Makefile index dbd978dab33..c8b782bbae8 100644 --- a/net/sobby/Makefile +++ b/net/sobby/Makefile @@ -17,14 +17,12 @@ LIB_DEPENDS= libsigc-2.0.so:devel/libsigc++20 \ libnet6.so:net/net6 \ libxml++-2.6.so:textproc/libxml++26 -USES= pkgconfig +USES= localbase pkgconfig compiler:c++11-lang +USE_CXXSTD= c++11 USE_GNOME= glibmm GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-zeroconf -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib - PLIST_FILES= bin/${PORTNAME} man/man1/${PORTNAME}.1.gz .include diff --git a/net/sock/Makefile b/net/sock/Makefile index 7c75d549344..5e08961f852 100644 --- a/net/sock/Makefile +++ b/net/sock/Makefile @@ -2,12 +2,19 @@ # $FreeBSD$ PORTNAME= sock -PORTVERSION= 0.3.2 +PORTVERSION= 0.4.2 CATEGORIES= net -MASTER_SITES= http://www.icir.org/christian/downloads/ +MASTER_SITES= http://www-cs-students.stanford.edu/~sjac/sock/ MAINTAINER= sjac@cs.stanford.edu -COMMENT= W. Richard Stevens' sock program +COMMENT= W. Richard Stevens' sock program plus IPv6 and SCTP + +LICENSE= WRSTEVENS +LICENSE_NAME= WRSTEVENS +LICENSE_FILE= ${WRKSRC}/COPYING +LICENSE_PERMS= dist-mirror pkg-mirror auto-accept + +USES= tar:tgz HAS_CONFIGURE= yes diff --git a/net/sock/distinfo b/net/sock/distinfo index cc8e1184b2f..9c1375f1be5 100644 --- a/net/sock/distinfo +++ b/net/sock/distinfo @@ -1,2 +1,3 @@ -SHA256 (sock-0.3.2.tar.gz) = 4ddc33767900e7cd0a4cc0f4d808638d7cfcb746c23e12274c8eba0622eee2eb -SIZE (sock-0.3.2.tar.gz) = 113640 +TIMESTAMP = 1491161724 +SHA256 (sock-0.4.2.tgz) = 42974b5f8f81c534d1e5236628658f6567ac0539c577cbc46d54b5b11d3b582c +SIZE (sock-0.4.2.tgz) = 119882 diff --git a/net/sock/files/patch-src__cliopen.c b/net/sock/files/patch-src__cliopen.c deleted file mode 100644 index 34ed1a3458f..00000000000 --- a/net/sock/files/patch-src__cliopen.c +++ /dev/null @@ -1,264 +0,0 @@ ---- src/cliopen.c.orig 2010-05-28 00:03:25 UTC -+++ src/cliopen.c -@@ -10,42 +10,107 @@ - - #include "sock.h" - -+/* -+ * Try to convert the host name as an IPv4 dotted-decimal number -+ * or an IPv6 address. -+ */ -+int convert_host_address(char *host) -+{ -+ struct in_addr inaddr; -+ char inaddr_buf[INET6_ADDRSTRLEN]; -+ -+ if (AF_INET == af_46) { -+ if (inet_pton(AF_INET, host, &inaddr) == 1) { -+ /* IPv4 dotted-decimal */ -+ servaddr4.sin_addr = inaddr; -+ -+ return (1); -+ } -+ } else { -+ if (inet_pton(AF_INET6, host, inaddr_buf) == 1) { -+ /* IPv6 address */ -+ memcpy(&servaddr6.sin6_addr, inaddr_buf, -+ sizeof(struct in6_addr)); -+ -+ return (1); -+ } -+ } -+ -+ return (0); -+} -+ -+/* -+ * Try to convert the host name as a host name string. -+ */ -+int convert_host_name(char *host) -+{ -+ struct hostent *hp; -+ -+ if (AF_INET == af_46) { -+ if ( (hp = gethostbyname2(host, AF_INET)) != NULL) { -+ /* IPv4 address */ -+ memcpy(&servaddr4.sin_addr, hp->h_addr, hp->h_length); -+ -+ return (1); -+ } -+ } else { -+ /* -+ * Fixme: This doesn't work on FreeBSD 8.4. -+ * Only an IPv4 address is returned. -+ * getaddrinfo() doesn't work either. -+ */ -+ if ( (hp = gethostbyname2(host, AF_INET6)) != NULL) { -+ /* IPv6 address */ -+ memcpy(&servaddr6.sin6_addr, hp->h_addr, hp->h_length); -+ -+ return (1); -+ } -+ } -+ -+ return (0); -+} -+ - int cliopen(char *host, char *port) - { - int fd, i, on; - char *protocol; -- struct in_addr inaddr; -+ char inaddr_buf[INET6_ADDRSTRLEN]; - struct servent *sp; -- struct hostent *hp; -+ socklen_t socklen; - - protocol = udp ? "udp" : "tcp"; - - /* initialize socket address structure */ -- bzero(&servaddr, sizeof(servaddr)); -- servaddr.sin_family = AF_INET; -+ bzero(&servaddr4, sizeof(servaddr4)); -+ servaddr4.sin_family = AF_INET; -+ -+ bzero(&servaddr6, sizeof(servaddr6)); -+ servaddr6.sin6_family = AF_INET6; - - /* see if "port" is a service name or number */ - if ( (i = atoi(port)) == 0) { - if ( (sp = getservbyname(port, protocol)) == NULL) -- err_quit("getservbyname() error for: %s/%s", port, protocol); -- -- servaddr.sin_port = sp->s_port; -- } else -- servaddr.sin_port = htons(i); -+ err_quit("getservbyname() error for: %s/%s", -+ port, protocol); -+ servaddr4.sin_port = sp->s_port; -+ servaddr6.sin6_port = sp->s_port; -+ } else { -+ servaddr4.sin_port = htons(i); -+ servaddr6.sin6_port = htons(i); -+ } - - /* -- * First try to convert the host name as a dotted-decimal number. -- * Only if that fails do we call gethostbyname(). -+ * First try to convert the host name as an IPv4 dotted-decimal number -+ * or an IPv6 address. Only if that fails do we try to convert the -+ * host name as a host name string. - */ -- -- if (inet_aton(host, &inaddr) == 1) -- servaddr.sin_addr = inaddr; /* it's dotted-decimal */ -- else if ( (hp = gethostbyname(host)) != NULL) -- bcopy(hp->h_addr, &servaddr.sin_addr, hp->h_length); -- else -- err_quit("invalid hostname: %s", host); -+ if (convert_host_address(host) != 1) { -+ if (convert_host_name(host) != 1) { -+ err_quit("invalid hostname: %s", host); -+ } -+ } - -- if ( (fd = socket(AF_INET, udp ? SOCK_DGRAM : SOCK_STREAM, 0)) < 0) -+ if ( (fd = socket(af_46, udp ? SOCK_DGRAM : SOCK_STREAM, 0)) < 0) - err_sys("socket() error"); - - if (reuseaddr) { -@@ -71,21 +136,46 @@ int cliopen(char *host, char *port) - * (and port) using -l option. Allow localip[] to be set but bindport - * to be 0. - */ -- - if (bindport != 0 || localip[0] != 0 || udp) { -- bzero(&cliaddr, sizeof(cliaddr)); -- cliaddr.sin_family = AF_INET; -- cliaddr.sin_port = htons(bindport); /* can be 0 */ -- if (localip[0] != 0) { -- if (inet_aton(localip, &cliaddr.sin_addr) == 0) -- err_quit("invalid IP address: %s", localip); -- } else -- cliaddr.sin_addr.s_addr = htonl(INADDR_ANY); /* wildcard */ -- -- if (bind(fd, (struct sockaddr *) &cliaddr, sizeof(cliaddr)) < 0) -- err_sys("bind() error"); -+ if (af_46 == AF_INET) { -+ bzero(&cliaddr4, sizeof(cliaddr4)); -+ cliaddr4.sin_family = AF_INET; -+ /* can be 0 */ -+ cliaddr4.sin_port = htons(bindport); -+ if (localip[0] != 0) { -+ if (inet_aton(localip, &cliaddr4.sin_addr) == 0) -+ err_quit("invalid IP address: %s", -+ localip); -+ } else { -+ /* wildcard */ -+ cliaddr4.sin_addr.s_addr = htonl(INADDR_ANY); -+ } -+ if (bind(fd, (struct sockaddr *) &cliaddr4, -+ sizeof(cliaddr4)) < 0) { -+ err_sys("bind() error"); -+ } -+ } else { -+ bzero(&cliaddr6, sizeof(cliaddr6)); -+ cliaddr6.sin6_len = sizeof(struct sockaddr_in6); -+ cliaddr6.sin6_family = AF_INET6; -+ /* can be 0 */ -+ cliaddr6.sin6_port = htons(bindport); -+ -+ /* Fixme: localip not implemented for IPv6 */ -+ cliaddr6.sin6_addr = in6addr_any; -+ -+ /* Fixme: Want to set IPV6_BINDANY? */ -+ -+ if (bind(fd, (struct sockaddr *) &cliaddr6, -+ sizeof(cliaddr6)) < 0) { -+ err_sys("bind() error"); -+ } -+ } - } -- -+ -+ /* Fixme: Does not work */ -+ //join_mcast_client(fd, &cliaddr4, &cliaddr6, &servaddr4, &servaddr6); -+ - /* Need to allocate buffers before connect(), since they can affect - * TCP options (window scale, etc.). - */ -@@ -96,13 +186,21 @@ int cliopen(char *host, char *port) - /* - * Connect to the server. Required for TCP, optional for UDP. - */ -- - if (udp == 0 || connectudp) { - for ( ; ; ) { -- if (connect(fd, (struct sockaddr *) &servaddr, sizeof(servaddr)) -- == 0) -+ if (AF_INET == af_46) { -+ if (connect(fd, (struct sockaddr *) &servaddr4, -+ sizeof(servaddr4)) == 0) - break; /* all OK */ -- if (errno == EINTR) /* can happen with SIGIO */ -+ } else { -+ servaddr6.sin6_len = -+ sizeof(struct sockaddr_in6); -+ servaddr6.sin6_family = AF_INET6; -+ if (connect(fd, (struct sockaddr *) &servaddr6, -+ sizeof(servaddr6)) == 0) -+ break; /* all OK */ -+ } -+ if (errno == EINTR) /* can happen with SIGIO */ - continue; - if (errno == EISCONN) /* can happen with SIGIO */ - break; -@@ -114,16 +212,38 @@ int cliopen(char *host, char *port) - /* Call getsockname() to find local address bound to socket: - TCP ephemeral port was assigned by connect() or bind(); - UDP ephemeral port was assigned by bind(). */ -- i = sizeof(cliaddr); -- if (getsockname(fd, (struct sockaddr *) &cliaddr, &i) < 0) -- err_sys("getsockname() error"); -- -- /* Can't do one fprintf() since inet_ntoa() stores -- the result in a static location. */ -- fprintf(stderr, "connected on %s.%d ", -- INET_NTOA(cliaddr.sin_addr), ntohs(cliaddr.sin_port)); -- fprintf(stderr, "to %s.%d\n", -- INET_NTOA(servaddr.sin_addr), ntohs(servaddr.sin_port)); -+ if (AF_INET == af_46) { -+ socklen = sizeof(cliaddr4); -+ if (getsockname(fd, -+ (struct sockaddr *) &cliaddr4, &socklen) < 0) { -+ err_sys("getsockname() error"); -+ } -+ /* Can't do one fprintf() since inet_ntoa() stores -+ the result in a static location. */ -+ fprintf(stderr, "connected on %s.%d ", -+ INET_NTOA(cliaddr4.sin_addr), -+ ntohs(cliaddr4.sin_port)); -+ fprintf(stderr, "to %s.%d\n", -+ INET_NTOA(servaddr4.sin_addr), -+ ntohs(servaddr4.sin_port)); -+ } else { -+ socklen = sizeof(cliaddr6); -+ if (getsockname(fd, -+ (struct sockaddr *) &cliaddr6, &socklen) < 0) { -+ err_sys("getsockname() error"); -+ } -+ -+ inet_ntop(AF_INET6, -+ &cliaddr6.sin6_addr.__u6_addr.__u6_addr8, -+ inaddr_buf, sizeof(inaddr_buf)); -+ fprintf(stderr, "connected on %s.%d ", -+ inaddr_buf, ntohs(cliaddr6.sin6_port)); -+ inet_ntop(AF_INET6, -+ &servaddr6.sin6_addr.__u6_addr.__u6_addr8, -+ inaddr_buf, sizeof(inaddr_buf)); -+ fprintf(stderr, "to %s.%d\n", -+ inaddr_buf, ntohs(servaddr6.sin6_port)); -+ } - } - - sockopts(fd, 1); /* some options get set after connect() */ diff --git a/net/sock/files/patch-src__loopudp.c b/net/sock/files/patch-src__loopudp.c deleted file mode 100644 index 01f31f7154d..00000000000 --- a/net/sock/files/patch-src__loopudp.c +++ /dev/null @@ -1,261 +0,0 @@ ---- src/loopudp.c.orig 2010-05-28 00:03:25 UTC -+++ src/loopudp.c -@@ -21,17 +21,28 @@ - void - loop_udp(int sockfd) - { -- int maxfdp1, nread, ntowrite, stdineof, clilen, servlen, flags; -+ int maxfdp1, nread, ntowrite, stdineof, clilen, flags; -+ socklen_t servlen; - fd_set rset; -- struct sockaddr_in cliaddr; /* for UDP server */ -- struct sockaddr_in servaddr; /* for UDP client */ -+ struct sockaddr_in cliaddr4; /* for IPv4 UDP server */ -+ struct sockaddr_in6 cliaddr6; /* for IPv6 UDP server */ -+ /* -+ * The original local variable servaddr, and later servaddr4 and -+ * servaddr6, were not initialized before use. Using the initialized -+ * global sockaddr structs allows the sendto() code, below, to work -+ * correctly. This was a problem with the original IPv4 code, and -+ * later the IPv6 code. -+ */ -+ //struct sockaddr_in servaddr4; /* for IPv4 UDP client */ -+ //struct sockaddr_in6 servaddr6; /* for IPv6 UDP client */ -+ char inaddr_buf[INET6_ADDRSTRLEN]; - -- struct iovec iov[1]; -- struct msghdr msg; -+ struct iovec iov[1]; -+ struct msghdr msg; - #ifdef HAVE_MSGHDR_MSG_CONTROL - #ifdef IP_RECVDSTADDR /* 4.3BSD Reno and later */ - static struct cmsghdr *cmptr = NULL; /* malloc'ed */ -- struct in_addr dstinaddr; /* for UDP server */ -+ struct in_addr dstinaddr; /* for UDP server */ - #define CONTROLLEN (sizeof(struct cmsghdr) + sizeof(struct in_addr)) - #endif /* IP_RECVDSTADDR */ - -@@ -68,8 +79,10 @@ loop_udp(int sockfd) - err_sys("shutdown() error"); - - FD_CLR(STDIN_FILENO, &rset); -- stdineof = 1; /* don't read stdin anymore */ -- continue; /* back to select() */ -+ /* don't read stdin anymore */ -+ stdineof = 1; -+ /* back to select() */ -+ continue; - } - break; /* default: stdin EOF -> done */ - } -@@ -77,23 +90,43 @@ loop_udp(int sockfd) - if (crlf) { - ntowrite = crlf_add(wbuf, writelen, rbuf, nread); - if (connectudp) { -- if (write(sockfd, wbuf, ntowrite) != ntowrite) -+ if (write(sockfd, wbuf, ntowrite) != -+ ntowrite) { - err_sys("write error"); -+ } - } else { -- if (sendto(sockfd, wbuf, ntowrite, 0, -- (struct sockaddr *) &servaddr, sizeof(servaddr)) -- != ntowrite) -- err_sys("sendto error"); -+ if (af_46 == AF_INET) { -+ if (sendto(sockfd, wbuf, ntowrite, 0, -+ (struct sockaddr *)&servaddr4, -+ sizeof(servaddr4)) != ntowrite) { -+ err_sys("sendto error"); -+ } -+ } else { -+ if (sendto(sockfd, wbuf, ntowrite, 0, -+ (struct sockaddr *)&servaddr6, -+ sizeof(servaddr6)) != ntowrite) { -+ err_sys("sendto error"); -+ } -+ } - } - } else { - if (connectudp) { - if (write(sockfd, rbuf, nread) != nread) - err_sys("write error"); - } else { -- if (sendto(sockfd, rbuf, nread, 0, -- (struct sockaddr *) &servaddr, sizeof(servaddr)) -- != nread) -- err_sys("sendto error"); -+ if (af_46 == AF_INET) { -+ if (sendto(sockfd, rbuf, nread, 0, -+ (struct sockaddr *)&servaddr4, -+ sizeof(servaddr4)) != nread) { -+ err_sys("sendto error"); -+ } -+ } else { -+ if (sendto(sockfd, rbuf, nread, 0, -+ (struct sockaddr *)&servaddr6, -+ sizeof(servaddr6)) != nread) { -+ err_sys("sendto error"); -+ } -+ } - } - } - } -@@ -101,35 +134,54 @@ loop_udp(int sockfd) - if (FD_ISSET(sockfd, &rset)) { - /* data to read from socket */ - if (server) { -- clilen = sizeof(cliaddr); --#ifndef MSG_TRUNC /* vanilla BSD sockets */ -+ if (af_46 == AF_INET) { -+ clilen = sizeof(cliaddr4); -+ } else { -+ clilen = sizeof(cliaddr6); -+ } -+ -+#ifndef MSG_TRUNC /* vanilla BSD sockets */ -+ -+ /* Fixme: Not ported for IPv6 */ -+ /* Not compiled in for FreeBSD 8.4 */ - nread = recvfrom(sockfd, rbuf, readlen, 0, -- (struct sockaddr *) &cliaddr, &clilen); -- -+ (struct sockaddr *) &cliaddr4, &clilen); -+ - #else /* 4.3BSD Reno and later; use recvmsg() to get at MSG_TRUNC flag */ -- /* Also lets us get at control information (destination address) */ -- -+ /* Also lets us get at control information (destination address) */ -+ -+ /* FreeBSD 8.4 */ - iov[0].iov_base = rbuf; - iov[0].iov_len = readlen; -- msg.msg_iov = iov; -- msg.msg_iovlen = 1; -- msg.msg_name = (caddr_t) &cliaddr; -- msg.msg_namelen = clilen; -- -+ msg.msg_iov = iov; -+ msg.msg_iovlen = 1; -+ if (af_46 == AF_INET) { -+ msg.msg_name = (caddr_t) &cliaddr4; -+ } else { -+ msg.msg_name = (caddr_t) &cliaddr6; -+ } -+ msg.msg_namelen = clilen; -+ - #ifdef HAVE_MSGHDR_MSG_CONTROL - #ifdef IP_RECVDSTADDR -+ /* FreeBSD 8.4 */ - if (cmptr == NULL && (cmptr = malloc(CONTROLLEN)) == NULL) - err_sys("malloc error for control buffer"); - -- msg.msg_control = (caddr_t) cmptr; /* for dest address */ -+ /* for dest address */ -+ msg.msg_control = (caddr_t) cmptr; - msg.msg_controllen = CONTROLLEN; - #else -- msg.msg_control = (caddr_t) 0; /* no ancillary data */ -+ /* Not used for FreeBSD 8.4 */ -+ /* no ancillary data */ -+ msg.msg_control = (caddr_t) 0; - msg.msg_controllen = 0; - #endif /* IP_RECVDSTADDR */ - #endif - #ifdef HAVE_MSGHDR_MSG_FLAGS -- msg.msg_flags = 0; /* flags returned here */ -+ /* FreeBSD 8.4 */ -+ /* flags returned here */ -+ msg.msg_flags = 0; - #endif - nread = recvmsg(sockfd, &msg, 0); - #endif /* MSG_TRUNC */ -@@ -137,22 +189,39 @@ loop_udp(int sockfd) - err_sys("datagram receive error"); - - if (verbose) { -- printf("from %s", INET_NTOA(cliaddr.sin_addr)); -+ if (af_46 == AF_INET) { -+ printf("from %s", -+ INET_NTOA(cliaddr4.sin_addr)); -+ } else { -+ inet_ntop(AF_INET6, -+ &cliaddr6.sin6_addr. -+ __u6_addr.__u6_addr8, -+ inaddr_buf, -+ sizeof(inaddr_buf)); -+ printf("from %s", inaddr_buf); -+ } - #ifdef HAVE_MSGHDR_MSG_CONTROL - #ifdef IP_RECVDSTADDR -+ /* -+ * Fixme: not ported for IPv6 -+ * Fixme: recvdstaddr fails (earlier, -+ * in setsockopt()) for IPv6 under -+ * FreeBSD 8.4 -+ */ - if (recvdstaddr) { - if (cmptr->cmsg_len != CONTROLLEN) - err_quit("control length (%d) != %d", -- cmptr->cmsg_len, CONTROLLEN); -+ cmptr->cmsg_len, CONTROLLEN); - if (cmptr->cmsg_level != IPPROTO_IP) - err_quit("control level != IPPROTO_IP"); - if (cmptr->cmsg_type != IP_RECVDSTADDR) - err_quit("control type != IP_RECVDSTADDR"); - bcopy(CMSG_DATA(cmptr), &dstinaddr, -- sizeof(struct in_addr)); -+ sizeof(struct in_addr)); - bzero(cmptr, CONTROLLEN); - -- printf(", to %s", INET_NTOA(dstinaddr)); -+ printf(", to %s", -+ INET_NTOA(dstinaddr)); - } - #endif /* IP_RECVDSTADDR */ - #endif /* HAVE_MSGHDR_MSG_CONTROL */ -@@ -178,15 +247,37 @@ loop_udp(int sockfd) - } - - } else { -- /* Must use recvfrom() for unconnected UDP client */ -- servlen = sizeof(servaddr); -- nread = recvfrom(sockfd, rbuf, readlen, 0, -- (struct sockaddr *) &servaddr, &servlen); -- if (nread < 0) -+ /* -+ * Must use recvfrom() for unconnected -+ * UDP client -+ */ -+ /* Fixme: not tested on FreeBSD 8.4 */ -+ if (af_46 == AF_INET) { -+ servlen = sizeof(servaddr4); -+ nread = recvfrom(sockfd, rbuf, readlen, -+ 0, (struct sockaddr *)&servaddr4, -+ &servlen); -+ } else { -+ servlen = sizeof(servaddr6); -+ nread = recvfrom(sockfd, rbuf, readlen, -+ 0, (struct sockaddr *)&servaddr6, -+ &servlen); -+ } -+ if (nread < 0) { - err_sys("datagram recvfrom() error"); -- -+ } - if (verbose) { -- printf("from %s", INET_NTOA(servaddr.sin_addr)); -+ if (af_46 == AF_INET) { -+ printf("from %s", -+ INET_NTOA(servaddr4.sin_addr)); -+ } else { -+ inet_ntop(AF_INET6, -+ &servaddr6.sin6_addr. -+ __u6_addr.__u6_addr8, -+ inaddr_buf, -+ sizeof(inaddr_buf)); -+ printf("from %s", inaddr_buf); -+ } - printf(": "); - fflush(stdout); - } diff --git a/net/sock/files/patch-src__main.c b/net/sock/files/patch-src__main.c deleted file mode 100644 index 971eb5473cf..00000000000 --- a/net/sock/files/patch-src__main.c +++ /dev/null @@ -1,60 +0,0 @@ ---- src/main.c.orig 2010-05-28 00:03:25 UTC -+++ src/main.c -@@ -23,9 +23,10 @@ - char *host; /* hostname or dotted-decimal string */ - char *port; - -- /* DefinE global variables */ -+ /* Define global variables */ -+int af_46 = AF_INET; /* AF_INET or AF_INET6 */ - int bindport; /* 0 or TCP or UDP port number to bind */ -- /* set by -b or -l options */ -+ /* set by -b or -l options */ - int broadcast; /* SO_BROADCAST */ - int cbreak; /* set terminal to cbreak mode */ - int chunkwrite; /* write in small chunks; not all-at-once */ -@@ -76,7 +77,8 @@ int urgwrite; /* write urgent byte af - int verbose; /* each -v increments this by 1 */ - int usewritev; /* use writev() instead of write() */ - --struct sockaddr_in cliaddr, servaddr; -+struct sockaddr_in cliaddr4, servaddr4; -+struct sockaddr_in6 cliaddr6, servaddr6; - - static void usage(const char *); - -@@ -90,13 +92,16 @@ main(int argc, char *argv[]) - usage(""); - - opterr = 0; /* don't want getopt() writing to stderr */ -- while ( (c = getopt(argc, argv, "2b:cf:g:hij:kl:n:op:q:r:st:uvw:x:y:ABCDEFG:H:IJ:KL:NO:P:Q:R:S:TU:VWX:YZ")) != -1) { -+ while ( (c = getopt(argc, argv, "26b:cf:g:hij:kl:n:op:q:r:st:uvw:x:y:ABCDEFG:H:IJ:KL:NO:P:Q:R:S:TU:VWX:YZ")) != -1) { - switch (c) { - #ifdef IP_ONESBCAST - case '2': /* use 255.255.255.255 as broadcast address */ - onesbcast = 1; - break; - #endif -+ case '6': /* use IPv6 */ -+ af_46 = AF_INET6; -+ break; - - case 'b': - bindport = atoi(optarg); -@@ -309,7 +314,7 @@ main(int argc, char *argv[]) - } - } - -- /* check for options that don't make sense */ -+ /* check for options that don't make sense */ - if (udp && halfclose) - usage("can't specify -h and -u"); - if (udp && debug) -@@ -439,6 +444,7 @@ usage(const char *msg) - #ifdef IP_ONESBCAST - " -2 IP_ONESBCAST option (255.255.255.255 for broadcast\n" - #endif -+" -6 use IPv6 instead of IPv4\n" - ); - - if (msg[0] != 0) diff --git a/net/sock/files/patch-src__multicast.c b/net/sock/files/patch-src__multicast.c deleted file mode 100644 index 475bc82fa7f..00000000000 --- a/net/sock/files/patch-src__multicast.c +++ /dev/null @@ -1,111 +0,0 @@ ---- src/multicast.c.orig 2010-05-28 00:03:25 UTC -+++ src/multicast.c -@@ -10,24 +10,96 @@ - - #include "sock.h" - -+/* -+ * Works for IPv4 and IPv6. -+ * For IPv4, the server is able to join a multicast group such as 224.0.0.1. -+ * The client is able to connect to the same multicast address and port -+ * assigned to the server. The client can then send data, which the server -+ * receives. -+ * For IPv6, the server is able to join a multicast group of the form ff02::n. -+ * The client is never able to connect to that address/port, however. -+ */ - void --join_mcast(int fd, struct sockaddr_in *sin) -+join_mcast_server(int fd, struct sockaddr_in *sin, struct sockaddr_in6 *sin6) - { - #ifdef IP_ADD_MEMBERSHIP /* only include if host supports mcasting */ -- u_long inaddr; -- struct ip_mreq mreq; -+ u_long inaddr; -+ struct ip_mreq mreq; -+ struct ipv6_mreq mreq6; - -- inaddr = sin->sin_addr.s_addr; -- if (IN_MULTICAST(inaddr) == 0) -- return; /* not a multicast address */ -+ if (af_46 == AF_INET) { -+ inaddr = sin->sin_addr.s_addr; -+ /* -+ * FreeBSD 8.4: IN_MULTICAST() test fails in the original code -+ * because it was testing inaddr with the wrong endianness. -+ * Fixed in this version of the code, at least for FreeBSD. -+ */ -+ inaddr = ntohl(inaddr); - -- mreq.imr_multiaddr.s_addr = inaddr; -- mreq.imr_interface.s_addr = htonl(INADDR_ANY); /* need way to change */ -- if (setsockopt(fd, IPPROTO_IP, IP_ADD_MEMBERSHIP, &mreq, -- sizeof(mreq)) == -1 ) -- err_sys("IP_ADD_MEMBERSHIP error"); -+ if (IN_MULTICAST(inaddr) == 0) { -+ return; /* not a multicast address */ -+ } -+ } else { -+ if (IN6_IS_ADDR_MULTICAST(&(sin6->sin6_addr)) == 0) { -+ return; /* not a multicast address */ -+ } -+ } -+ -+ if (af_46 == AF_INET) { -+ mreq.imr_multiaddr.s_addr = sin->sin_addr.s_addr; -+ /* need way to change */ -+ mreq.imr_interface.s_addr = htonl(INADDR_ANY); -+ if (setsockopt(fd, IPPROTO_IP, IP_ADD_MEMBERSHIP, &mreq, -+ sizeof(mreq)) == -1 ) { -+ err_sys("IP_ADD_MEMBERSHIP error"); -+ } -+ } else { -+ memset((char *)&mreq6, 0, sizeof(mreq6)); -+ mreq6.ipv6mr_multiaddr = sin6->sin6_addr; -+ mreq6.ipv6mr_interface = sin6->sin6_scope_id; -+ if (setsockopt(fd, IPPROTO_IPV6, IPV6_JOIN_GROUP, &mreq6, -+ sizeof(mreq6)) == -1 ) { -+ err_sys("IP_ADD_MEMBERSHIP error"); -+ } -+ } - - if (verbose) -- fprintf(stderr, "multicast group joined\n"); -+ fprintf(stderr, "multicast group joined\n"); -+#endif /* IP_ADD_MEMBERSHIP */ -+} -+ -+/* -+ * Added for IPv6. Fixme: Does not work at present. -+ * The client is currently unable to connect to the multicast address/port -+ * which was joined by the server. A function similar to this may be needed -+ * to permit that connection to be made. -+ */ -+void -+join_mcast_client(int fd, -+ struct sockaddr_in *cli_sin, struct sockaddr_in6 *cli_sin6, -+ struct sockaddr_in *serv_sin, struct sockaddr_in6 *serv_sin6) -+{ -+#ifdef IP_ADD_MEMBERSHIP /* only include if host supports mcasting */ -+ struct ipv6_mreq mreq6; -+ -+ if (af_46 == AF_INET6) { -+ if (IN6_IS_ADDR_MULTICAST(&(serv_sin6->sin6_addr)) == 0) { -+ return; /* not a multicast address */ -+ } -+ } -+ -+ if (af_46 == AF_INET6) { -+ memset((char *)&mreq6, 0, sizeof(mreq6)); -+ mreq6.ipv6mr_multiaddr = serv_sin6->sin6_addr; -+ mreq6.ipv6mr_interface = serv_sin6->sin6_scope_id; -+ if (setsockopt(fd, IPPROTO_IPV6, IPV6_JOIN_GROUP, &mreq6, -+ sizeof(mreq6)) == -1 ) { -+ err_sys("IP_ADD_MEMBERSHIP error"); -+ } -+ } -+ -+ if (verbose) { -+ fprintf(stderr, "multicast group joined\n"); -+ } - #endif /* IP_ADD_MEMBERSHIP */ - } diff --git a/net/sock/files/patch-src__servopen.c b/net/sock/files/patch-src__servopen.c deleted file mode 100644 index 321e1c7dbde..00000000000 --- a/net/sock/files/patch-src__servopen.c +++ /dev/null @@ -1,282 +0,0 @@ ---- src/servopen.c.orig 2010-05-28 00:03:25 UTC -+++ src/servopen.c -@@ -19,38 +19,67 @@ - int - servopen(char *host, char *port) - { -- int fd, newfd, i, on, pid; -- char *protocol; -+ int fd, newfd, i, on, pid; -+ char *protocol; - struct in_addr inaddr; - struct servent *sp; -+ socklen_t len; -+ char inaddr_buf[INET6_ADDRSTRLEN]; - - protocol = udp ? "udp" : "tcp"; - -- /* Initialize the socket address structure */ -- bzero(&servaddr, sizeof(servaddr)); -- servaddr.sin_family = AF_INET; -+ /* Initialize the socket address structure */ -+ bzero(&servaddr4, sizeof(servaddr4)); -+ servaddr4.sin_family = AF_INET; - -- /* Caller normally wildcards the local Internet address, meaning -- a connection will be accepted on any connected interface. -- We only allow an IP address for the "host", not a name. */ -- if (host == NULL) -- servaddr.sin_addr.s_addr = htonl(INADDR_ANY); /* wildcard */ -- else { -- if (inet_aton(host, &inaddr) == 0) -- err_quit("invalid host name for server: %s", host); -- servaddr.sin_addr = inaddr; -+ bzero(&servaddr6, sizeof(servaddr6)); -+ servaddr6.sin6_family = AF_INET6; -+ -+ /* -+ * Caller normally wildcards the local Internet address, meaning -+ * a connection will be accepted on any connected interface. -+ * We only allow an IP address for the "host", not a name. -+ */ -+ if (host == NULL) { -+ if (AF_INET == af_46) { -+ /* wildcard */ -+ servaddr4.sin_addr.s_addr = htonl(INADDR_ANY); -+ } else { -+ /* wildcard */ -+ servaddr6.sin6_addr = in6addr_any; -+ } -+ } else { -+ if (AF_INET == af_46) { -+ if (inet_pton(AF_INET, host, &inaddr) == 0) { -+ err_quit("invalid host name for server: %s", -+ host); -+ } -+ /* IPv4 address */ -+ servaddr4.sin_addr = inaddr; -+ } else { -+ if (inet_pton(AF_INET6, host, inaddr_buf) == 0) { -+ err_quit("invalid host name for server: %s", -+ host); -+ } -+ /* IPv6 address */ -+ memcpy(&servaddr6.sin6_addr, inaddr_buf, -+ sizeof(struct in6_addr)); -+ } - } - -- /* See if "port" is a service name or number */ -+ /* See if "port" is a service name or number */ - if ( (i = atoi(port)) == 0) { - if ( (sp = getservbyname(port, protocol)) == NULL) -- err_ret("getservbyname() error for: %s/%s", port, protocol); -- -- servaddr.sin_port = sp->s_port; -- } else -- servaddr.sin_port = htons(i); -+ err_ret("getservbyname() error for: %s/%s", port, -+ protocol); -+ servaddr4.sin_port = sp->s_port; -+ servaddr6.sin6_port = sp->s_port; -+ } else { -+ servaddr4.sin_port = htons(i); -+ servaddr6.sin6_port = htons(i); -+ } - -- if ( (fd = socket(AF_INET, udp ? SOCK_DGRAM : SOCK_STREAM, 0)) < 0) -+ if ( (fd = socket(af_46, udp ? SOCK_DGRAM : SOCK_STREAM, 0)) < 0) - err_sys("socket() error"); - - if (reuseaddr) { -@@ -67,28 +96,37 @@ servopen(char *host, char *port) - } - #endif - -- /* Bind our well-known port so the client can connect to us. */ -- if (bind(fd, (struct sockaddr *) &servaddr, sizeof(servaddr)) < 0) -- err_sys("can't bind local address"); -+ /* Bind our well-known port so the client can connect to us. */ -+ if (AF_INET == af_46) { -+ if (bind(fd, (struct sockaddr *) &servaddr4, -+ sizeof(servaddr4)) < 0) { -+ err_sys("can't bind local address"); -+ } -+ } else { -+ if (bind(fd, (struct sockaddr *) &servaddr6, -+ sizeof(servaddr6)) < 0) { -+ err_sys("can't bind local address"); -+ } -+ } - -- join_mcast(fd, &servaddr); -+ join_mcast_server(fd, &servaddr4, &servaddr6); - - if (udp) { - buffers(fd); - -- if (foreignip[0] != 0) { /* connect to foreignip/port# */ -- bzero(&cliaddr, sizeof(cliaddr)); -- if (inet_aton(foreignip, &cliaddr.sin_addr) == 0) -+ /* Fixme: Not ported for IPv6 */ -+ if (foreignip[0] != 0) { /* connect to foreignip/port# */ -+ bzero(&cliaddr4, sizeof(cliaddr4)); -+ if (inet_aton(foreignip, &cliaddr4.sin_addr) == 0) - err_quit("invalid IP address: %s", foreignip); -- cliaddr.sin_family = AF_INET; -- cliaddr.sin_port = htons(foreignport); -- /* connect() for datagram socket doesn't appear to allow -- wildcarding of either IP address or port number */ -+ cliaddr4.sin_family = AF_INET; -+ cliaddr4.sin_port = htons(foreignport); -+ /* connect() for datagram socket doesn't appear to allow -+ wildcarding of either IP address or port number */ - -- if (connect(fd, (struct sockaddr *) &cliaddr, sizeof(cliaddr)) -- < 0) -+ if (connect(fd, (struct sockaddr *) &cliaddr4, -+ sizeof(cliaddr4)) < 0) - err_sys("connect() error"); -- - } - - sockopts(fd, 1); -@@ -96,58 +134,108 @@ servopen(char *host, char *port) - return(fd); /* nothing else to do */ - } - -- buffers(fd); /* may set receive buffer size; must do here to get -- correct window advertised on SYN */ -+ buffers(fd); /* may set receive buffer size; must do here to -+ get correct window advertised on SYN */ - sockopts(fd, 0); /* only set some socket options for fd */ - - listen(fd, listenq); - -- if (pauselisten) -- sleep_us(pauselisten*1000); /* lets connection queue build up */ -+ if (pauselisten) { -+ /* lets connection queue build up */ -+ sleep_us(pauselisten*1000); -+ } - -- if (dofork) -- TELL_WAIT(); /* initialize synchronization primitives */ -+ if (dofork) { -+ /* initialize synchronization primitives */ -+ TELL_WAIT(); -+ } - - for ( ; ; ) { -- i = sizeof(cliaddr); -- if ( (newfd = accept(fd, (struct sockaddr *) &cliaddr, &i)) < 0) -- err_sys("accept() error"); -+ if (AF_INET == af_46) { -+ len = sizeof(cliaddr4); -+ if ( (newfd = accept(fd, (struct sockaddr *) &cliaddr4, -+ &len)) < 0) { -+ err_sys("accept() error"); -+ } -+ } else { -+ len = sizeof(cliaddr6); -+ if ( (newfd = accept(fd, (struct sockaddr *) &cliaddr6, -+ &len)) < 0) { -+ err_sys("accept() error"); -+ } -+ } - - if (dofork) { - if ( (pid = fork()) < 0) - err_sys("fork error"); - - if (pid > 0) { -- close(newfd); /* parent closes connected socket */ -- WAIT_CHILD(); /* wait for child to output to terminal */ -- continue; /* and back to for(;;) for another accept() */ -+ /* parent closes connected socket */ -+ close(newfd); -+ /* wait for child to output to terminal */ -+ WAIT_CHILD(); -+ /* and back to for(;;) for another accept() */ -+ continue; - } else { -- close(fd); /* child closes listening socket */ -+ /* child closes listening socket */ -+ close(fd); - } - } - -- /* child (or iterative server) continues here */ -+ /* child (or iterative server) continues here */ - if (verbose) { -- /* Call getsockname() to find local address bound to socket: -- local internet address is now determined (if multihomed). */ -- i = sizeof(servaddr); -- if (getsockname(newfd, (struct sockaddr *) &servaddr, &i) < 0) -- err_sys("getsockname() error"); -+ /* -+ * Call getsockname() to find local address bound -+ * to socket: local internet address is now -+ * determined (if multihomed). -+ */ -+ if (AF_INET == af_46) { -+ len = sizeof(servaddr4); -+ if (getsockname(newfd, -+ (struct sockaddr *)&servaddr4, &len) < 0) { -+ err_sys("getsockname() error"); -+ } - -- /* Can't do one fprintf() since inet_ntoa() stores -- the result in a static location. */ -- fprintf(stderr, "connection on %s.%d ", -- INET_NTOA(servaddr.sin_addr), ntohs(servaddr.sin_port)); -- fprintf(stderr, "from %s.%d\n", -- INET_NTOA(cliaddr.sin_addr), ntohs(cliaddr.sin_port)); -+ /* -+ * Can't do one fprintf() since inet_ntoa() -+ * stores the result in a static location. -+ */ -+ fprintf(stderr, "connection on %s.%d ", -+ INET_NTOA(servaddr4.sin_addr), -+ ntohs(servaddr4.sin_port)); -+ fprintf(stderr, "from %s.%d\n", -+ INET_NTOA(cliaddr4.sin_addr), -+ ntohs(cliaddr4.sin_port)); -+ } else { -+ len = sizeof(servaddr6); -+ if (getsockname(newfd, -+ (struct sockaddr *)&servaddr6, &len) < 0) { -+ err_sys("getsockname() error"); -+ } -+ inet_ntop(AF_INET6, -+ &servaddr6.sin6_addr.__u6_addr.__u6_addr8, -+ inaddr_buf, sizeof(inaddr_buf)); -+ fprintf(stderr, "connection on %s.%d ", -+ inaddr_buf, ntohs(servaddr6.sin6_port)); -+ inet_ntop(AF_INET6, -+ &cliaddr6.sin6_addr.__u6_addr.__u6_addr8, -+ inaddr_buf, sizeof(inaddr_buf)); -+ fprintf(stderr, "from %s.%d\n", -+ inaddr_buf, ntohs(cliaddr6.sin6_port)); -+ } - } - -- buffers(newfd); /* setsockopt() again, in case it didn't propagate -- from listening socket to connected socket */ -- sockopts(newfd, 1); /* can set all socket options for this socket */ -+ /* setsockopt() again, in case it didn't propagate -+ from listening socket to connected socket */ -+ buffers(newfd); - -- if (dofork) -- TELL_PARENT(getppid()); /* tell parent we're done with terminal */ -+ /* can set all socket options for this socket */ -+ sockopts(newfd, 1); -+ -+ if (dofork) { -+ /* tell parent we're done with terminal */ -+ TELL_PARENT(getppid()); -+ } - - return(newfd); - } diff --git a/net/sock/files/patch-src__sock.h b/net/sock/files/patch-src__sock.h deleted file mode 100644 index efc6c9b1121..00000000000 --- a/net/sock/files/patch-src__sock.h +++ /dev/null @@ -1,30 +0,0 @@ ---- src/sock.h.orig 2010-05-28 00:03:25 UTC -+++ src/sock.h -@@ -62,6 +62,7 @@ extern int errno; - #define max(a,b) ((a) > (b) ? (a) : (b)) - - /* declare global variables */ -+extern int af_46; - extern int bindport; - extern int broadcast; - extern int cbreak; -@@ -114,6 +115,8 @@ extern int verbose; - extern int usewritev; - - extern struct sockaddr_in cliaddr, servaddr; -+extern struct sockaddr_in cliaddr4, servaddr4; -+extern struct sockaddr_in6 cliaddr6, servaddr6; - - /* Earlier versions of gcc under SunOS 4.x have problems passing arguments - that are structs (as opposed to pointers to structs). This shows up -@@ -130,7 +133,9 @@ void buffers(int); - int cliopen(char *, char *); - int crlf_add(char *, int, const char *, int); - int crlf_strip(char *, int, const char *, int); --void join_mcast(int, struct sockaddr_in *); -+void join_mcast_server(int, struct sockaddr_in *, struct sockaddr_in6 *); -+void join_mcast_client(int, struct sockaddr_in *, struct sockaddr_in6 *, -+ struct sockaddr_in *, struct sockaddr_in6 *); - void loop_tcp(int); - void loop_udp(int); - void pattern(char *, int); diff --git a/net/sock/files/patch-src__sockopts.c b/net/sock/files/patch-src__sockopts.c deleted file mode 100644 index 2e8aebddd1e..00000000000 --- a/net/sock/files/patch-src__sockopts.c +++ /dev/null @@ -1,122 +0,0 @@ ---- src/sockopts.c.orig 2010-05-28 00:03:25 UTC -+++ src/sockopts.c -@@ -30,6 +30,13 @@ sockopts(int sockfd, int doall) - unsigned optlen; - struct linger ling; - struct timeval timer; -+ int level; -+ -+ if (AF_INET == af_46) { -+ level = IPPROTO_IP; -+ } else { -+ level = IPPROTO_IPV6; -+ } - - /* "doall" is 0 for a server's listening socket (i.e., before - accept() has returned.) Some socket options such as SO_KEEPALIVE -@@ -73,13 +80,13 @@ sockopts(int sockfd, int doall) - - #ifdef IP_TOS - if (iptos != -1 && doall == 0) { -- if (setsockopt(sockfd, IPPROTO_IP, IP_TOS, -+ if (setsockopt(sockfd, level, IP_TOS, - &iptos, sizeof(iptos)) < 0) - err_sys("IP_TOS setsockopt error"); - - option = 0; - optlen = sizeof(option); -- if (getsockopt(sockfd, IPPROTO_IP, IP_TOS, -+ if (getsockopt(sockfd, level, IP_TOS, - &option, &optlen) < 0) - err_sys("IP_TOS getsockopt error"); - if (option != iptos) -@@ -92,13 +99,13 @@ sockopts(int sockfd, int doall) - - #ifdef IP_TTL - if (ipttl != -1 && doall == 0) { -- if (setsockopt(sockfd, IPPROTO_IP, IP_TTL, -+ if (setsockopt(sockfd, level, IP_TTL, - &ipttl, sizeof(ipttl)) < 0) - err_sys("IP_TTL setsockopt error"); - - option = 0; - optlen = sizeof(option); -- if (getsockopt(sockfd, IPPROTO_IP, IP_TTL, -+ if (getsockopt(sockfd, level, IP_TTL, - &option, &optlen) < 0) - err_sys("IP_TTL getsockopt error"); - if (option != ipttl) -@@ -150,13 +157,13 @@ sockopts(int sockfd, int doall) - #ifdef IP_ONESBCAST - if (onesbcast) { - option = 1; -- if (setsockopt(sockfd, IPPROTO_IP, IP_ONESBCAST, -+ if (setsockopt(sockfd, level, IP_ONESBCAST, - &option, sizeof(option)) < 0) - err_sys("IP_ONESBCAST setsockopt error"); - - option = 0; - optlen = sizeof(option); -- if (getsockopt(sockfd, IPPROTO_IP, IP_ONESBCAST, -+ if (getsockopt(sockfd, level, IP_ONESBCAST, - &option, &optlen) < 0) - err_sys("IP_ONESBCAST getsockopt error"); - if (option == 0) -@@ -175,7 +182,7 @@ sockopts(int sockfd, int doall) - if (inet_aton(joinip, &join.imr_multiaddr) == 0) - err_quit("invalid multicast address: %s", joinip); - join.imr_interface.s_addr = htonl(INADDR_ANY); -- if (setsockopt(sockfd, IPPROTO_IP, IP_ADD_MEMBERSHIP, -+ if (setsockopt(sockfd, level, IP_ADD_MEMBERSHIP, - &join, sizeof(join)) < 0) - err_sys("IP_ADD_MEMBERSHIP setsockopt error"); - -@@ -188,12 +195,12 @@ sockopts(int sockfd, int doall) - if (mcastttl) { - u_char ttl = mcastttl; - -- if (setsockopt(sockfd, IPPROTO_IP, IP_MULTICAST_TTL, -+ if (setsockopt(sockfd, level, IP_MULTICAST_TTL, - &ttl, sizeof(ttl)) < 0) - err_sys("IP_MULTICAST_TTL setsockopt error"); - - optlen = sizeof(ttl); -- if (getsockopt(sockfd, IPPROTO_IP, IP_MULTICAST_TTL, -+ if (getsockopt(sockfd, level, IP_MULTICAST_TTL, - &ttl, &optlen) < 0) - err_sys("IP_MULTICAST_TTL getsockopt error"); - if (ttl != mcastttl) -@@ -288,7 +295,7 @@ sockopts(int sockfd, int doall) - - if (verbose) - fprintf(stderr, "SO_RCVTIMEO: %ld.%06ld\n", -- timer.tv_sec, timer.tv_usec); -+ (long)timer.tv_sec, timer.tv_usec); - #else - fprintf(stderr, "warning: SO_RCVTIMEO not supported by host\n"); - #endif -@@ -311,7 +318,7 @@ sockopts(int sockfd, int doall) - - if (verbose) - fprintf(stderr, "SO_SNDTIMEO: %ld.%06ld\n", -- timer.tv_sec, timer.tv_usec); -+ (long)timer.tv_sec, timer.tv_usec); - #else - fprintf(stderr, "warning: SO_SNDTIMEO not supported by host\n"); - #endif -@@ -320,13 +327,13 @@ sockopts(int sockfd, int doall) - if (recvdstaddr && udp) { - #ifdef IP_RECVDSTADDR - option = 1; -- if (setsockopt(sockfd, IPPROTO_IP, IP_RECVDSTADDR, -+ if (setsockopt(sockfd, level, IP_RECVDSTADDR, - &option, sizeof(option)) < 0) - err_sys("IP_RECVDSTADDR setsockopt error"); - - option = 0; - optlen = sizeof(option); -- if (getsockopt(sockfd, IPPROTO_IP, IP_RECVDSTADDR, -+ if (getsockopt(sockfd, level, IP_RECVDSTADDR, - &option, &optlen) < 0) - err_sys("IP_RECVDSTADDR getsockopt error"); - if (option == 0) diff --git a/net/sock/files/patch-src__sourceroute.c b/net/sock/files/patch-src__sourceroute.c deleted file mode 100644 index 89c0f506d46..00000000000 --- a/net/sock/files/patch-src__sourceroute.c +++ /dev/null @@ -1,16 +0,0 @@ ---- src/sourceroute.c.orig 2010-05-28 00:03:25 UTC -+++ src/sourceroute.c -@@ -88,10 +88,11 @@ sroute_set(int sockfd) - sroute_opt[1] = 3 + (sroute_cnt * 4); /* total length, incl. destination */ - - /* destination must be stored as final entry */ -- bcopy(&servaddr.sin_addr, optr, sizeof(u_long)); -+ bcopy(&servaddr4.sin_addr, optr, sizeof(u_long)); - optr += sizeof(u_long); - if (verbose) { -- fprintf(stderr, "source route to %s\n", inet_ntoa(servaddr.sin_addr)); -+ fprintf(stderr, "source route to %s\n", -+ inet_ntoa(servaddr4.sin_addr)); - fprintf(stderr, "source route size %d bytes\n", sroute_opt[1]); - } - diff --git a/net/sock/files/patch-src__sourceudp.c b/net/sock/files/patch-src__sourceudp.c deleted file mode 100644 index 88ca9a42d14..00000000000 --- a/net/sock/files/patch-src__sourceudp.c +++ /dev/null @@ -1,62 +0,0 @@ ---- src/sourceudp.c.orig 2010-05-28 00:03:25 UTC -+++ src/sourceudp.c -@@ -29,28 +29,41 @@ source_udp(int sockfd) /* TODO: use send - if (connectudp) { - if ( (n = write(sockfd, wbuf, writelen)) != writelen) { - if (ignorewerr) { -- err_ret("write returned %d, expected %d", n, writelen); -- /* also call getsockopt() to clear so_error */ -+ err_ret("write returned %d, expected %d", -+ n, writelen); -+ /* also call getsockopt() to clear so_error */ - optlen = sizeof(option); -- if (getsockopt(sockfd, SOL_SOCKET, SO_ERROR, -- &option, &optlen) < 0) -- err_sys("SO_ERROR getsockopt error"); -- } else -- err_sys("write returned %d, expected %d", n, writelen); -+ if (getsockopt(sockfd, SOL_SOCKET, -+ SO_ERROR, &option, &optlen) < 0) -+ err_sys("SO_ERROR getsockopt error"); -+ } else { -+ err_sys("write returned %d, expected %d", -+ n, writelen); -+ } - } - } else { -- if ( (n = sendto(sockfd, wbuf, writelen, 0, -- (struct sockaddr *) &servaddr, -- sizeof(struct sockaddr))) != writelen) { -- if (ignorewerr) { -- err_ret("sendto returned %d, expected %d", n, writelen); -- /* also call getsockopt() to clear so_error */ -+ if (af_46 == AF_INET) { -+ n = sendto(sockfd, wbuf, writelen, 0, -+ (struct sockaddr *) &servaddr4, -+ sizeof(servaddr4)); -+ } else { -+ n = sendto(sockfd, wbuf, writelen, 0, -+ (struct sockaddr *) &servaddr6, -+ sizeof(servaddr6)); -+ } -+ if (n != writelen) { -+ if (ignorewerr) { -+ err_ret("sendto returned %d, expected %d", -+ n, writelen); -+ /* also call getsockopt() to clear so_error */ - optlen = sizeof(option); -- if (getsockopt(sockfd, SOL_SOCKET, SO_ERROR, -- &option, &optlen) < 0) -- err_sys("SO_ERROR getsockopt error"); -- } else -- err_sys("sendto returned %d, expected %d", n, writelen); -+ if (getsockopt(sockfd, SOL_SOCKET, -+ SO_ERROR, &option, &optlen) < 0) -+ err_sys("SO_ERROR getsockopt error"); -+ } else { -+ err_sys("sendto returned %d, expected %d", -+ n, writelen); -+ } - } - } - diff --git a/net/sock/pkg-descr b/net/sock/pkg-descr index 55e8a143dca..cbfaaac1365 100644 --- a/net/sock/pkg-descr +++ b/net/sock/pkg-descr @@ -1,17 +1,21 @@ -This is a standalone version of W. Richard Stevens' "sock" program, -based on the code available for the UNIX Network Programming book. - -Adapted and reworked code for W. Richard Stevens' "sock" utility -by Christian Kreibich. - -From the author: In TCP/IP Illustrated Vol. 1, Richard Stevens used -a program called "sock" to demonstrate the many properties of TCP/IP. -Unfortunately, the book only speaks about how to use the program but -does not point to a site for downloading its sources. While sock is -contained in the code package accompanying UNIX Network Programming, -this code is also getting dated. +In TCP/IP Illustrated Vol. 1, Richard Stevens used a program called +"sock" to demonstrate the many properties of TCP/IP. This is a +standalone version, adapted and reworked by Christian Kreibich. The program can be used to generate TCP or UDP packets for testing various network features. It runs as either client or server. -WWW: http://www.icir.org/christian/sock.html +This FreeBSD port is built on top of the original 0.3.2 tarball from +2010, above, downloaded from the icir.org webpage. + +Version 0.4.2 of sock supports IPv6, SCTP and those socket options: +- IPv6: + o hop limit + o multicast hop limit + o disable/enable header flow label + o header traffic class + o don't fragment +- IPv4: + o don't fragment + +WWW: http://www-cs-students.stanford.edu/~sjac/sock_info.html diff --git a/print/hplip/Makefile b/print/hplip/Makefile index 141b8875ebe..0db6933ee43 100644 --- a/print/hplip/Makefile +++ b/print/hplip/Makefile @@ -39,44 +39,56 @@ CONFIGURE_ARGS= --with-cupsbackenddir=${PREFIX}/libexec/cups/backend \ CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib -OPTIONS_DEFINE= DOCS FAX SNMP SCAN X11 XSANE -OPTIONS_DEFAULT= SNMP SCAN X11 QT5 +OPTIONS_DEFINE= DOCS FAX SCAN SNMP X11 XSANE OPTIONS_RADIO= GUI OPTIONS_RADIO_GUI= QT4 QT5 -OPTIONS_SUB= yes # FAX SNMP SCAN X11 QT4 QT5 +OPTIONS_DEFAULT= QT5 SCAN SNMP X11 +OPTIONS_SUB= yes + +DOCS_CONFIGURE_ENABLE= doc-build FAX_DESC= PC Send Fax support FAX_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}reportlab>=0:print/py-reportlab FAX_CONFIGURE_ENABLE= fax-build -SNMP_DESC= Network/JetDirect support -SNMP_USES= ssl -SNMP_LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp -SNMP_CONFIGURE_ENABLE= network-build - SCAN_DESC= Scanning support SCAN_LIB_DEPENDS= libsane.so:graphics/sane-backends SCAN_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow SCAN_CONFIGURE_ENABLE= scan-build +SNMP_DESC= Network/JetDirect support +SNMP_USES= ssl +SNMP_LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp +SNMP_CONFIGURE_ENABLE= network-build + X11_DESC= Graphical User Interface (Qt) X11_CONFIGURE_ENABLE= gui-build -QT4_USES= pyqt:4 -QT4_USE= PYQT=core_run,dbussupport_run,gui_run -QT4_CONFIGURE_ENABLE= qt4 -QT4_IMPLIES= X11 - -QT5_USES= pyqt:5 -QT5_USE= PYQT=core_run,dbussupport_run,gui_run,widgets_run -QT5_CONFIGURE_ENABLE= qt5 -QT5_IMPLIES= X11 - XSANE_DESC= Install XSane for scanning (implies SCAN) XSANE_IMPLIES= SCAN XSANE_RUN_DEPENDS= xsane:graphics/xsane -DOCS_CONFIGURE_ENABLE= doc-build +.include + +.if ${PORT_OPTIONS:MQT4} && ${PORT_OPTIONS:MX11} +USES+= pyqt:4 +USE_PYQT= core_run dbussupport_run gui_run +CONFIGURE_ARGS+= --enable-qt4 +.else +CONFIGURE_ARGS+= --disable-qt4 +.endif + +.if ${PORT_OPTIONS:MQT5} && ${PORT_OPTIONS:MX11} +USES+= pyqt:5 +USE_PYQT= core_run dbussupport_run gui_run widgets_run +CONFIGURE_ARGS+= --enable-qt5 +.else +CONFIGURE_ARGS+= --disable-qt5 +.endif + +.if ${PORT_OPTIONS:MX11} && ! ${PORT_OPTIONS:MQT4} && ! ${PORT_OPTIONS:MQT5} +BROKEN= The X11 option requires one of the QT4 or QT5 options +.endif post-patch: @${REINPLACE_CMD} -e 's|-ldld||g;' \ diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile index 4a67dd0769b..a0673dca37b 100644 --- a/sysutils/gnome-system-monitor/Makefile +++ b/sysutils/gnome-system-monitor/Makefile @@ -17,11 +17,10 @@ RUN_DEPENDS= gnome-icon-theme>=0:misc/gnome-icon-theme PORTSCOUT= limitw:1,even -USES= alias gettext gmake pathfix pkgconfig tar:xz +USES= alias compiler:c++11-lang gettext gmake localbase pathfix pkgconfig tar:xz +USE_CXXSTD= c++11 USE_GNOME= gtkmm30 intlhack librsvg2 libwnck3 GNU_CONFIGURE= yes -CPPFLAGS+= -I${LOCALBASE}/include -LIBS+= -L${LOCALBASE}/lib INSTALL_TARGET= install-strip GLIB_SCHEMAS= org.gnome.gnome-system-monitor.enums.xml \ diff --git a/sysutils/xorriso/Makefile b/sysutils/xorriso/Makefile index 44fc87afbe7..771100f1706 100644 --- a/sysutils/xorriso/Makefile +++ b/sysutils/xorriso/Makefile @@ -3,7 +3,7 @@ PORTNAME= xorriso PORTVERSION= 1.4.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils MASTER_SITES= http://files.libburnia-project.org/releases/ DISTNAME= libisoburn-${PORTVERSION} @@ -18,7 +18,8 @@ LIB_DEPENDS= libburn.so:devel/libburn \ libisofs.so:devel/libisofs GNU_CONFIGURE= yes -USES= gmake iconv libtool libedit pathfix pkgconfig +USES= gmake iconv libtool libedit pathfix pkgconfig shebangfix tk +SHEBANG_FILES= frontend/xorriso-tcltk USE_LDCONFIG= yes INSTALL_TARGET= install-strip diff --git a/sysutils/xorriso/files/patch-frontend_xorriso-tcltk b/sysutils/xorriso/files/patch-frontend_xorriso-tcltk deleted file mode 100644 index 8fdeb7201f3..00000000000 --- a/sysutils/xorriso/files/patch-frontend_xorriso-tcltk +++ /dev/null @@ -1,8 +0,0 @@ ---- frontend/xorriso-tcltk.orig 2017-04-02 07:56:18 UTC -+++ frontend/xorriso-tcltk -@@ -1,4 +1,4 @@ --#!/usr/bin/wish -+#!/usr/local/bin/wish - # - # xorriso-tcltk - # Copyright (C) 2012 - 2016 diff --git a/textproc/libsass/Makefile b/textproc/libsass/Makefile index dda135c295d..d87c7d08b34 100644 --- a/textproc/libsass/Makefile +++ b/textproc/libsass/Makefile @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= libsass -PORTVERSION= 3.4.3 -PORTREVISION= 1 +PORTVERSION= 3.4.4 +PORTREVISION= 0 CATEGORIES= textproc MAINTAINER= nivit@FreeBSD.org diff --git a/textproc/libsass/distinfo b/textproc/libsass/distinfo index 70c3e4a91e5..9655d4b8591 100644 --- a/textproc/libsass/distinfo +++ b/textproc/libsass/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1487432637 -SHA256 (sass-libsass-3.4.3_GH0.tar.gz) = bbeda2e1ec2d21d27fbcbd8f2e18c3f4573cc168bb8b5cd5010715db4b3e5670 -SIZE (sass-libsass-3.4.3_GH0.tar.gz) = 311505 +TIMESTAMP = 1491134524 +SHA256 (sass-libsass-3.4.4_GH0.tar.gz) = 1dc4d49a9a53b891b7e98935709e625f1d68782d87aef4304a41e6d590abb480 +SIZE (sass-libsass-3.4.4_GH0.tar.gz) = 316884 diff --git a/textproc/libxml++26/Makefile b/textproc/libxml++26/Makefile index afcd5c876fe..4b8681676e7 100644 --- a/textproc/libxml++26/Makefile +++ b/textproc/libxml++26/Makefile @@ -12,7 +12,8 @@ MASTER_SITES= GNOME MAINTAINER= bland@FreeBSD.org COMMENT= XML API for C++ -USES+= tar:xz +USES+= tar:xz compiler:c++11-lang +USE_CXXSTD= c++11 PLIST_SUB= VERSION="2.6" API_VERSION="2.6" diff --git a/textproc/py-python-slugify/Makefile b/textproc/py-python-slugify/Makefile index 6cfb44599be..e44a1f3e97d 100644 --- a/textproc/py-python-slugify/Makefile +++ b/textproc/py-python-slugify/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= python-slugify -PORTVERSION= 1.2.1 +PORTVERSION= 1.2.2 CATEGORIES= textproc python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/textproc/py-python-slugify/distinfo b/textproc/py-python-slugify/distinfo index 7d3b5c6c947..cac7f28274f 100644 --- a/textproc/py-python-slugify/distinfo +++ b/textproc/py-python-slugify/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1488355541 -SHA256 (python-slugify-1.2.1.tar.gz) = 501182ec738cc8b743ae5c76c183f4427187ef016257f062b3fa594f60916e34 -SIZE (python-slugify-1.2.1.tar.gz) = 5327 +TIMESTAMP = 1491140726 +SHA256 (python-slugify-1.2.2.tar.gz) = 5b28bed69d750d062b4b597895eebce9f7efaaba8ed4725cab756603834c0eb8 +SIZE (python-slugify-1.2.2.tar.gz) = 7524 diff --git a/textproc/py-texttable/Makefile b/textproc/py-texttable/Makefile index b0dd5be5438..f1b1ca8d95d 100644 --- a/textproc/py-texttable/Makefile +++ b/textproc/py-texttable/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= texttable -PORTVERSION= 0.8.7 +PORTVERSION= 0.8.8 CATEGORIES= textproc python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/textproc/py-texttable/distinfo b/textproc/py-texttable/distinfo index 3f8774abb69..18d56e3b40b 100644 --- a/textproc/py-texttable/distinfo +++ b/textproc/py-texttable/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1479425494 -SHA256 (texttable-0.8.7.tar.gz) = 8a38082fe822e825fde5bcf150741bdf38ef52e00a05a20c8967bcf99a8f31d2 -SIZE (texttable-0.8.7.tar.gz) = 9829 +TIMESTAMP = 1490915597 +SHA256 (texttable-0.8.8.tar.gz) = 0be1ecd6468847fc2f3b57b6c1862d8c0ae6832c037c97db502053311eff9a99 +SIZE (texttable-0.8.8.tar.gz) = 10599 diff --git a/textproc/stardict3/files/patch-dict_src_dictmanage.cpp b/textproc/stardict3/files/patch-dict_src_dictmanage.cpp new file mode 100644 index 00000000000..ca794f9ab1f --- /dev/null +++ b/textproc/stardict3/files/patch-dict_src_dictmanage.cpp @@ -0,0 +1,11 @@ +--- dict/src/dictmanage.cpp.orig 2017-04-02 22:24:23 UTC ++++ dict/src/dictmanage.cpp +@@ -77,7 +77,7 @@ static void get_all_plugin_list(std::list + std::list plugin_disable_list; + std::list plugins_dirs; + plugins_dirs.push_back(conf_dirs->get_plugin_dir()); +- for_each_file(plugins_dirs, "."G_MODULE_SUFFIX, plugin_order_list, ++ for_each_file(plugins_dirs, "." G_MODULE_SUFFIX, plugin_order_list, + plugin_disable_list, GetAllPluginList(plugin_all_list)); + } + diff --git a/textproc/stardict3/files/patch-dict_src_lib_pluginmanager.cpp b/textproc/stardict3/files/patch-dict_src_lib_pluginmanager.cpp new file mode 100644 index 00000000000..846d2c5e00c --- /dev/null +++ b/textproc/stardict3/files/patch-dict_src_lib_pluginmanager.cpp @@ -0,0 +1,20 @@ +--- dict/src/lib/pluginmanager.cpp.orig 2017-04-02 22:22:40 UTC ++++ dict/src/lib/pluginmanager.cpp +@@ -96,7 +96,7 @@ void StarDictPlugins::load(const std::string& dirpath, + { + std::list plugins_dirs; + plugins_dirs.push_back(dirpath); +- for_each_file(plugins_dirs, "."G_MODULE_SUFFIX, order_list, disable_list, PluginLoader(*this)); ++ for_each_file(plugins_dirs, "." G_MODULE_SUFFIX, order_list, disable_list, PluginLoader(*this)); + } + + void StarDictPlugins::reorder(const std::list& order_list) +@@ -184,7 +184,7 @@ void StarDictPlugins::get_plugin_list(const std::list< + std::list plugins_dirs; + plugins_dirs.push_back(plugindirpath); + std::list disable_list; +- for_each_file(plugins_dirs, "."G_MODULE_SUFFIX, order_list, disable_list, PluginInfoLoader(*this, virtualdict_pluginlist, netdict_pluginlist, specialdict_pluginlist, tts_pluginlist, parsedata_pluginlist, misc_pluginlist)); ++ for_each_file(plugins_dirs, "." G_MODULE_SUFFIX, order_list, disable_list, PluginInfoLoader(*this, virtualdict_pluginlist, netdict_pluginlist, specialdict_pluginlist, tts_pluginlist, parsedata_pluginlist, misc_pluginlist)); + + if (!virtualdict_pluginlist.empty()) { + plugin_list.push_back(std::pair >(StarDictPlugInType_VIRTUALDICT, virtualdict_pluginlist)); diff --git a/textproc/stardict3/files/patch-dict_src_lib_storage.cpp b/textproc/stardict3/files/patch-dict_src_lib_storage.cpp new file mode 100644 index 00000000000..2fa3cefd71e --- /dev/null +++ b/textproc/stardict3/files/patch-dict_src_lib_storage.cpp @@ -0,0 +1,11 @@ +--- dict/src/lib/storage.cpp.orig 2017-04-02 22:21:15 UTC ++++ dict/src/lib/storage.cpp +@@ -793,7 +793,7 @@ FileHolder Database_ResourceStorage::get_file_path(con + std::string name_pattern; // in file name encoding + if(!utf8_to_file_name(key, name_pattern)) + return FileHolder(); +- std::string::size_type pos = name_pattern.find_last_of("."DB_DIR_SEPARATOR_S); ++ std::string::size_type pos = name_pattern.find_last_of("." DB_DIR_SEPARATOR_S); + if(pos != std::string::npos) { + if(name_pattern[pos] == '.') + name_pattern = name_pattern.substr(pos); diff --git a/textproc/xmlroff/Makefile b/textproc/xmlroff/Makefile index 811640514ab..3f1fe4f642b 100644 --- a/textproc/xmlroff/Makefile +++ b/textproc/xmlroff/Makefile @@ -3,7 +3,7 @@ PORTNAME= xmlroff PORTVERSION= 0.6.2 -PORTREVISION= 6 +PORTREVISION= 7 DISTVERSIONPREFIX= v CATEGORIES= textproc diff --git a/textproc/xmlroff/files/patch-docs-Makefile.am b/textproc/xmlroff/files/patch-docs-Makefile.am index 5bff1d580db..17785cf54cf 100644 --- a/textproc/xmlroff/files/patch-docs-Makefile.am +++ b/textproc/xmlroff/files/patch-docs-Makefile.am @@ -1,4 +1,4 @@ ---- docs/Makefile.am.orig 2009-03-11 21:08:57 UTC +--- docs/Makefile.am.orig 2017-04-02 16:02:08 UTC +++ docs/Makefile.am @@ -186,7 +186,7 @@ GTKDOC_CFLAGS = \ -I$(top_builddir) @@ -18,3 +18,12 @@ xsltproc ../libfo-compat.xsl xmlroff.tmp > xmlroff.fo rm -f xmlroff.tmp +@@ -341,8 +341,6 @@ install-data-local: + echo '-- Installing '$$i ; \ + $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \ + done; \ +- echo '-- Installing $(srcdir)/html/index.sgml' ; \ +- $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \ + fi) + + # diff --git a/textproc/xmlroff/pkg-plist b/textproc/xmlroff/pkg-plist index 626f60b356b..fd427c0e7bb 100644 --- a/textproc/xmlroff/pkg-plist +++ b/textproc/xmlroff/pkg-plist @@ -77,7 +77,6 @@ share/xml/libfo-0.6.2/xmlroff.xml %%PORTDOCS%%%%DOCSDIR%%/generating-source.html %%PORTDOCS%%%%DOCSDIR%%/home.png %%PORTDOCS%%%%DOCSDIR%%/index.html -%%PORTDOCS%%%%DOCSDIR%%/index.sgml %%PORTDOCS%%%%DOCSDIR%%/interfaces.html %%PORTDOCS%%%%DOCSDIR%%/left-insensitive.png %%PORTDOCS%%%%DOCSDIR%%/left.png diff --git a/www/google-appengine/Makefile b/www/google-appengine/Makefile index c3996cdcbe6..b1a64426e95 100644 --- a/www/google-appengine/Makefile +++ b/www/google-appengine/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= google-appengine -PORTVERSION= 1.9.17 +PORTVERSION= 1.9.51 PORTREVISION= 0 CATEGORIES= www devel python MASTER_SITES= https://storage.googleapis.com/appengine-sdks/featured/ @@ -34,22 +34,16 @@ WRKSRC= ${WRKDIR}/${PORTNAME:S,-,_,} LN_OPTS= -sf GAEDATADIR= google lib new_project_template tools -GAESCRIPTS= _php_runtime.py _python_runtime.py api_server.py appcfg.py \ +GAESCRIPTS= _php_runtime.py _python_runtime.py appcfg.py \ backends_conversion.py bulkload_client.py bulkloader.py \ dev_appserver.py download_appstats.py endpointscfg.py \ - gen_protorpc.py google_sql.py php_cli.py \ - remote_api_shell.py run_tests.py wrapper_util.py + gen_protorpc.py php_cli.py remote_api_shell.py \ + run_tests.py wrapper_util.py -.include +MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.3:databases/py-MySQLdb -.if ${PORT_OPTIONS:MMYSQL} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.3:databases/py-MySQLdb -.endif -.if ${PORT_OPTIONS:MPHP} -GAEDATADIR+= php -USE_MYSQL= server -WANT_MYSQL_VER= 55 -.endif +PHP_USE= mysql=server +PHP_VARS= gaedatadir+=php want_mysql_ver=55 do-install: @${MKDIR} ${STAGEDIR}${DATADIR} diff --git a/www/google-appengine/distinfo b/www/google-appengine/distinfo index 8a224984b4c..bd3efb9784c 100644 --- a/www/google-appengine/distinfo +++ b/www/google-appengine/distinfo @@ -1,2 +1,3 @@ -SHA256 (google_appengine_1.9.17.zip) = e76511c536c66340473e3668741aeb49c4019295f5516ea5613c15415d74aa42 -SIZE (google_appengine_1.9.17.zip) = 51946140 +TIMESTAMP = 1491137478 +SHA256 (google_appengine_1.9.51.zip) = 91f011639919ed37f25e5d6f61f9797ccfea1e8753834d77612dd365d80ee914 +SIZE (google_appengine_1.9.51.zip) = 46135398 diff --git a/www/py-flask-socketio/Makefile b/www/py-flask-socketio/Makefile index 62b7758902e..cf160ec1889 100644 --- a/www/py-flask-socketio/Makefile +++ b/www/py-flask-socketio/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= Flask-SocketIO -PORTVERSION= 2.8.4 +PORTVERSION= 2.8.6 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/www/py-flask-socketio/distinfo b/www/py-flask-socketio/distinfo index 1a09e6f1794..ec4fe341202 100644 --- a/www/py-flask-socketio/distinfo +++ b/www/py-flask-socketio/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1488403055 -SHA256 (Flask-SocketIO-2.8.4.tar.gz) = b2b40c729a783ef737242701b7bba21fde061299dbe77a040d45ecd822d80fed -SIZE (Flask-SocketIO-2.8.4.tar.gz) = 13535 +TIMESTAMP = 1490875774 +SHA256 (Flask-SocketIO-2.8.6.tar.gz) = a7054b23629a2426ca9d6c3ba74134a5c9a8bc96e81facb69ae29b21ee381e53 +SIZE (Flask-SocketIO-2.8.6.tar.gz) = 13530 diff --git a/www/py-flexget/Makefile b/www/py-flexget/Makefile index 70e231ea1fd..0427284e296 100644 --- a/www/py-flexget/Makefile +++ b/www/py-flexget/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= flexget -PORTVERSION= 2.10.22 +PORTVERSION= 2.10.25 PORTEPOCH= 1 CATEGORIES= www python MASTER_SITES= CHEESESHOP diff --git a/www/py-flexget/distinfo b/www/py-flexget/distinfo index 9057026dfe9..35d6e68093f 100644 --- a/www/py-flexget/distinfo +++ b/www/py-flexget/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1490508886 -SHA256 (FlexGet-2.10.22.tar.gz) = 360c9ee826c056cd007c569df0e5bd2c1597cd4ada362272a8f547210a153eb2 -SIZE (FlexGet-2.10.22.tar.gz) = 2646890 +TIMESTAMP = 1491113688 +SHA256 (FlexGet-2.10.25.tar.gz) = 90c0c0a2fe9f24c0bff2569a5cc3b2f1683eceae2ebe3df42a40ba2c22f7cfc3 +SIZE (FlexGet-2.10.25.tar.gz) = 2647210 diff --git a/www/rtv/Makefile b/www/rtv/Makefile index 968c0b07c91..29bad30b8ea 100644 --- a/www/rtv/Makefile +++ b/www/rtv/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= rtv -PORTVERSION= 1.14.1 +PORTVERSION= 1.15.0 DISTVERSIONPREFIX= v CATEGORIES= www @@ -11,14 +11,12 @@ COMMENT= Commandline client for reddit LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}praw>=3.5.0:www/py-praw \ - ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six \ ${PYTHON_PKGNAMEPREFIX}kitchen>=1.2.4:devel/py-kitchen \ ${PYTHON_PKGNAMEPREFIX}requests>=2.11.1:www/py-requests \ ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.5.1:www/py-beautifulsoup \ ${PYTHON_PKGNAMEPREFIX}decorator>=4.0.10:devel/py-decorator \ - ${PYTHON_PKGNAMEPREFIX}mailcap_fix>=0.1.3:devel/py-mailcap-fix \ - ${PYTHON_PKGNAMEPREFIX}update_checker>=0.11:devel/py-update_checker + ${PYTHON_PKGNAMEPREFIX}mailcap_fix>=0.1.3:devel/py-mailcap-fix USE_GITHUB= yes GH_ACCOUNT= michael-lazar diff --git a/www/rtv/distinfo b/www/rtv/distinfo index 2b6447a3480..c081dbd3e8c 100644 --- a/www/rtv/distinfo +++ b/www/rtv/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1484301751 -SHA256 (michael-lazar-rtv-v1.14.1_GH0.tar.gz) = 78650214b4c50f0ba6fd0b79def5d2abd16d14dddbddc67783ffa2b985fdb2ac -SIZE (michael-lazar-rtv-v1.14.1_GH0.tar.gz) = 7136048 +TIMESTAMP = 1491007947 +SHA256 (michael-lazar-rtv-v1.15.0_GH0.tar.gz) = 795ac6b253445a1a76b246432393e6e5f12babba0360ed7caac33fca57ced891 +SIZE (michael-lazar-rtv-v1.15.0_GH0.tar.gz) = 7388732 diff --git a/www/rtv/files/patch-setup.py b/www/rtv/files/patch-setup.py index 8bb23751399..c36f5612ff5 100644 --- a/www/rtv/files/patch-setup.py +++ b/www/rtv/files/patch-setup.py @@ -1,11 +1,11 @@ ---- setup.py.orig 2017-01-13 02:49:35 UTC +--- setup.py.orig 2017-03-31 04:04:10 UTC +++ setup.py -@@ -16,7 +16,7 @@ setuptools.setup( - keywords='reddit terminal praw curses', - packages=['rtv'], - package_data={'rtv': ['templates/*']}, +@@ -22,7 +22,7 @@ setuptools.setup( + 'rtv': ['templates/*'], + 'rtv.packages.praw': ['praw.ini'], + }, - data_files=[("share/man/man1", ["rtv.1"])], + data_files=[("man/man1", ["rtv.1"])], install_requires=[ - 'praw >=3.5, <4', - 'six', + 'beautifulsoup4', + 'decorator', diff --git a/x11-clocks/buici-clock/Makefile b/x11-clocks/buici-clock/Makefile index 210920352de..8f2b77a175e 100644 --- a/x11-clocks/buici-clock/Makefile +++ b/x11-clocks/buici-clock/Makefile @@ -2,22 +2,23 @@ # $FreeBSD$ PORTNAME= buici-clock -PORTVERSION= 0.4.9.2 +PORTVERSION= 0.4.9.4 CATEGORIES= x11-clocks MASTER_SITES= DEBIAN DISTNAME= ${PORTNAME}_${PORTVERSION} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= rodrigo@FreeBSD.org COMMENT= Xlib implementation of an attractive, configurable clock LICENSE= GPLv2+ +LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libcairo.so:graphics/cairo -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} +WRKSRC= ${WRKDIR}/buici USE_XORG= x11 xext -USES= bison gmake pkgconfig +USES= tar:xz bison gmake pkgconfig GNU_CONFIGURE= yes MAKE_JOBS_UNSAFE=yes diff --git a/x11-clocks/buici-clock/distinfo b/x11-clocks/buici-clock/distinfo index 22d24ff05f0..94d6a76441f 100644 --- a/x11-clocks/buici-clock/distinfo +++ b/x11-clocks/buici-clock/distinfo @@ -1,2 +1,3 @@ -SHA256 (buici-clock_0.4.9.2.tar.gz) = 06b33420128b5ebfa4063dae0a998527c24a912aefdd69f3e9f8442b7d3a751d -SIZE (buici-clock_0.4.9.2.tar.gz) = 167987 +TIMESTAMP = 1490998659 +SHA256 (buici-clock_0.4.9.4.tar.xz) = f5138d220568e3ba5afd272c61a63e5a1a0009a6023387d2a0cbf15af9b3649f +SIZE (buici-clock_0.4.9.4.tar.xz) = 108988 diff --git a/x11-clocks/buici-clock/files/patch-xo-stats.h b/x11-clocks/buici-clock/files/patch-xo-stats.h deleted file mode 100644 index e8a2b14228a..00000000000 --- a/x11-clocks/buici-clock/files/patch-xo-stats.h +++ /dev/null @@ -1,11 +0,0 @@ ---- xo/stats.h.orig Wed Jul 12 02:06:02 2006 -+++ xo/stats.h Wed Jul 12 02:06:18 2006 -@@ -39,6 +39,8 @@ - /* ----- Includes */ - - #include -+#include -+#include - #include - #if defined (HAVE_MEMORY_H) - # include diff --git a/x11-clocks/buici-clock/files/patch-xo_Makefile.in b/x11-clocks/buici-clock/files/patch-xo_Makefile.in new file mode 100644 index 00000000000..8b07bf51df3 --- /dev/null +++ b/x11-clocks/buici-clock/files/patch-xo_Makefile.in @@ -0,0 +1,11 @@ +--- xo/Makefile.in.orig 2017-04-02 09:20:26 UTC ++++ xo/Makefile.in +@@ -61,7 +61,7 @@ CXXFLAGS=@CXXFLAGS@ + #CXXFLAGS=-${CXXFLAGS} -O2 + #CXXFLAGS=-${CXXFLAGS} -fomit-frame-pointer + CXXFLAGS_=-g @CFLAGS_W@@X_CFLAGS@ +-LFLAGS=-g @LDFLAGS@@X_LIBS@@LIBS@ -lX11 -lXext @X_EXTRA_LIBS@ ++LFLAGS=-g @LDFLAGS@@X_LIBS@ @LIBS@ -lX11 -lXext @X_EXTRA_LIBS@ + FLEX=@LEX@ + YACC=@YACC@ + diff --git a/x11-toolkits/gtkglextmm/Makefile b/x11-toolkits/gtkglextmm/Makefile index 127af570705..a694ff813c9 100644 --- a/x11-toolkits/gtkglextmm/Makefile +++ b/x11-toolkits/gtkglextmm/Makefile @@ -13,7 +13,9 @@ COMMENT= C++ wrapper for GtkGLExt LIB_DEPENDS= libgtkglext-x11-1.0.so:x11-toolkits/gtkglext \ libgtkmm-2.4.so:x11-toolkits/gtkmm24 -USES= pathfix pkgconfig gettext gmake tar:bzip2 libtool +USES= compiler:c++11-lang pathfix pkgconfig gettext gmake tar:bzip2 \ + libtool +USE_CXXSTD= c++11 GNU_CONFIGURE= yes USE_GNOME= gnomeprefix gtk20 USE_LDCONFIG= yes diff --git a/x11-toolkits/gtkmm24/Makefile b/x11-toolkits/gtkmm24/Makefile index b3bb8b87be2..7022403f96f 100644 --- a/x11-toolkits/gtkmm24/Makefile +++ b/x11-toolkits/gtkmm24/Makefile @@ -22,7 +22,9 @@ PORTSCOUT= ignore:1 BUILD_DEPENDS= gm4:devel/m4 GNU_CONFIGURE= yes -USES+= gettext gmake libtool:keepla pathfix pkgconfig +USES+= gettext gmake libtool:keepla pathfix pkgconfig \ + compiler:c++11-lang +USE_CXXSTD= gnu++11 USE_LDCONFIG= yes USE_GNOME= atkmm gtk20 pangomm CPPFLAGS+= -I${LOCALBASE}/include diff --git a/x11-toolkits/gtkmm24/files/patch-gtk_gtkmm_menushell.cc b/x11-toolkits/gtkmm24/files/patch-gtk_gtkmm_menushell.cc new file mode 100644 index 00000000000..663a44adbe3 --- /dev/null +++ b/x11-toolkits/gtkmm24/files/patch-gtk_gtkmm_menushell.cc @@ -0,0 +1,11 @@ +--- gtk/gtkmm/menushell.cc.orig 2017-04-02 16:29:30 UTC ++++ gtk/gtkmm/menushell.cc +@@ -130,7 +130,7 @@ MenuList::iterator MenuList::insert(MenuList::iterator + { + const Glib::RefPtr item = element.get_child(); + +- g_return_val_if_fail(item != 0, position); ++ g_return_val_if_fail(item, position); + g_return_val_if_fail(gparent() != 0, position); + + int pos = -1; diff --git a/x11-toolkits/gtkmm30/Makefile b/x11-toolkits/gtkmm30/Makefile index 90ff39f740a..67a6419c51e 100644 --- a/x11-toolkits/gtkmm30/Makefile +++ b/x11-toolkits/gtkmm30/Makefile @@ -20,7 +20,8 @@ PORTSCOUT= limitw:1,even BUILD_DEPENDS= gm4:devel/m4 -USES+= gettext gmake libtool pathfix pkgconfig +USES+= gettext gmake libtool pathfix pkgconfig compiler:c++11-lang +USE_CXXSTD= c++11 USE_GNOME= gtk30 glibmm cairomm atkmm pangomm GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/x11-toolkits/gtksourceviewmm3/Makefile b/x11-toolkits/gtksourceviewmm3/Makefile index faae9115da9..3a9508d382a 100644 --- a/x11-toolkits/gtksourceviewmm3/Makefile +++ b/x11-toolkits/gtksourceviewmm3/Makefile @@ -14,7 +14,8 @@ COMMENT= C++ binding of GtkSourceView3 PORTSCOUT= limitw:1,even -USES= gmake libtool:keepla pathfix pkgconfig tar:xz +USES= compiler:c++11-lang gmake libtool:keepla pathfix pkgconfig tar:xz +USE_CXXSTD= c++11 USE_LDCONFIG= yes USE_GNOME= gtksourceview3 gnomeprefix gtkmm30 GNU_CONFIGURE= yes diff --git a/x11-toolkits/libbonoboui/Makefile b/x11-toolkits/libbonoboui/Makefile index 1868c499495..7df81f07837 100644 --- a/x11-toolkits/libbonoboui/Makefile +++ b/x11-toolkits/libbonoboui/Makefile @@ -3,8 +3,7 @@ # $MCom: ports/x11-toolkits/libbonoboui/Makefile,v 1.75 2010/09/28 16:03:49 kwm Exp $ PORTNAME= libbonoboui -PORTVERSION= 2.24.4 -PORTREVISION?= 3 +PORTVERSION= 2.24.5 CATEGORIES= x11-toolkits gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome @@ -16,13 +15,12 @@ USES+= tar:bzip2 .if !defined(REFERENCE_PORT) -USES+= gettext gmake libtool:keepla pathfix pkgconfig +USES+= gettext gmake libtool:keepla localbase pathfix pkgconfig GNU_CONFIGURE= yes USE_GNOME= gnomeprefix intlhack \ libgnomecanvas libgnome referencehack USE_LDCONFIG= yes -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -lpthread -L${LOCALBASE}/lib +LDFLAGS+= -lpthread INSTALL_TARGET= install-strip .include diff --git a/x11-toolkits/libbonoboui/distinfo b/x11-toolkits/libbonoboui/distinfo index dbcaf197d7e..83c88d3c49d 100644 --- a/x11-toolkits/libbonoboui/distinfo +++ b/x11-toolkits/libbonoboui/distinfo @@ -1,2 +1,3 @@ -SHA256 (gnome/libbonoboui-2.24.4.tar.bz2) = 4b683a4a933392384267a0bf99771a99ef2ceacee22d67efe5648b894f8ba0c7 -SIZE (gnome/libbonoboui-2.24.4.tar.bz2) = 961744 +TIMESTAMP = 1491154166 +SHA256 (gnome/libbonoboui-2.24.5.tar.bz2) = fab5f2ac6c842d949861c07cb520afe5bee3dce55805151ce9cd01be0ec46fcd +SIZE (gnome/libbonoboui-2.24.5.tar.bz2) = 976250 diff --git a/x11-toolkits/libbonoboui/pkg-plist b/x11-toolkits/libbonoboui/pkg-plist index b5973832036..37688c280f0 100644 --- a/x11-toolkits/libbonoboui/pkg-plist +++ b/x11-toolkits/libbonoboui/pkg-plist @@ -130,6 +130,7 @@ share/locale/ta/LC_MESSAGES/libbonoboui-2.0.mo share/locale/te/LC_MESSAGES/libbonoboui-2.0.mo share/locale/th/LC_MESSAGES/libbonoboui-2.0.mo share/locale/tr/LC_MESSAGES/libbonoboui-2.0.mo +share/locale/ug/LC_MESSAGES/libbonoboui-2.0.mo share/locale/uk/LC_MESSAGES/libbonoboui-2.0.mo share/locale/vi/LC_MESSAGES/libbonoboui-2.0.mo share/locale/wa/LC_MESSAGES/libbonoboui-2.0.mo diff --git a/x11-toolkits/pangomm/Makefile b/x11-toolkits/pangomm/Makefile index fdd94a74ecd..b4eebafdce8 100644 --- a/x11-toolkits/pangomm/Makefile +++ b/x11-toolkits/pangomm/Makefile @@ -18,7 +18,8 @@ PORTSCOUT= limitw:1,even BUILD_DEPENDS= gm4:devel/m4 -USES+= gmake libtool pathfix pkgconfig +USES+= gmake libtool pathfix pkgconfig compiler:c++11-lang +USE_CXXSTD= c++11 USE_GNOME= cairomm glibmm pango GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/x11-toolkits/vte3/Makefile b/x11-toolkits/vte3/Makefile index cf242aa0e4a..a057dcb4915 100644 --- a/x11-toolkits/vte3/Makefile +++ b/x11-toolkits/vte3/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= vte -PORTVERSION= 0.42.4 -PORTREVISION= 2 +PORTVERSION= 0.48.1 CATEGORIES= x11-toolkits gnome MASTER_SITES= GNOME PKGNAMESUFFIX= 3 @@ -12,19 +11,21 @@ DIST_SUBDIR= gnome3 MAINTAINER= gnome@FreeBSD.org COMMENT= Terminal widget with improved accessibility and I18N support +LICENSE= LGPL21 + BUILD_DEPENDS+= vapigen:lang/vala \ - bash:shells/bash -LIB_DEPENDS= libgnutls.so:security/gnutls + bash:shells/bash \ + gperf:devel/gperf +LIB_DEPENDS= libgnutls.so:security/gnutls \ + libpcre2-8.so:devel/pcre2 PORTSCOUT= limitw:1,even -USES= bison compiler:c++0x gettext gmake gnome libtool pathfix \ - pkgconfig tar:xz +USES= bison compiler:c++0x gettext gmake gnome libtool localbase \ + pathfix pkgconfig tar:xz USE_LDCONFIG= yes GNU_CONFIGURE= yes USE_GNOME?= gtk30 intltool referencehack introspection:build -CPPFLAGS+= -I${LOCALBASE}/include -LIBS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --enable-introspection \ --disable-static \ --disable-Bsymbolic diff --git a/x11-toolkits/vte3/distinfo b/x11-toolkits/vte3/distinfo index 30adc042921..e4f85765eac 100644 --- a/x11-toolkits/vte3/distinfo +++ b/x11-toolkits/vte3/distinfo @@ -1,2 +1,3 @@ -SHA256 (gnome3/vte-0.42.4.tar.xz) = 08c88bf5c0aa1dfa3711e2e83b784fb5ea82025661f30b54e93eebd5f4bce113 -SIZE (gnome3/vte-0.42.4.tar.xz) = 928048 +TIMESTAMP = 1491154703 +SHA256 (gnome3/vte-0.48.1.tar.xz) = d3b7d6a13e6b850f3ea1c35af2746ef78039493ed4bb87cb7a36f29b260861f6 +SIZE (gnome3/vte-0.48.1.tar.xz) = 1006380 diff --git a/x11-toolkits/vte3/pkg-plist b/x11-toolkits/vte3/pkg-plist index 9c9e3c9efad..b155e4e780e 100644 --- a/x11-toolkits/vte3/pkg-plist +++ b/x11-toolkits/vte3/pkg-plist @@ -6,25 +6,31 @@ include/vte-%%VERSION%%/vte/vteenums.h include/vte-%%VERSION%%/vte/vteglobals.h include/vte-%%VERSION%%/vte/vtemacros.h include/vte-%%VERSION%%/vte/vtepty.h +include/vte-%%VERSION%%/vte/vteregex.h include/vte-%%VERSION%%/vte/vteterminal.h include/vte-%%VERSION%%/vte/vtetypebuiltins.h include/vte-%%VERSION%%/vte/vteversion.h lib/girepository-1.0/Vte-%%VERSION%%.typelib lib/libvte-%%VERSION%%.so lib/libvte-%%VERSION%%.so.0 -lib/libvte-%%VERSION%%.so.0.4200.4 +lib/libvte-%%VERSION%%.so.0.4800.1 libdata/pkgconfig/vte-%%VERSION%%.pc share/gir-1.0/Vte-%%VERSION%%.gir +share/gtk-doc/html/vte-%%VERSION%%/VteRegex.html share/gtk-doc/html/vte-%%VERSION%%/VteTerminal.html +share/gtk-doc/html/vte-%%VERSION%%/annotation-glossary.html share/gtk-doc/html/vte-%%VERSION%%/api-index-0-40.html +share/gtk-doc/html/vte-%%VERSION%%/api-index-0-44.html +share/gtk-doc/html/vte-%%VERSION%%/api-index-0-46.html +share/gtk-doc/html/vte-%%VERSION%%/api-index-0-48.html share/gtk-doc/html/vte-%%VERSION%%/api-index-deprecated.html share/gtk-doc/html/vte-%%VERSION%%/api-index-full.html share/gtk-doc/html/vte-%%VERSION%%/ch01.html share/gtk-doc/html/vte-%%VERSION%%/ch02.html share/gtk-doc/html/vte-%%VERSION%%/ch03.html +share/gtk-doc/html/vte-%%VERSION%%/ch04.html share/gtk-doc/html/vte-%%VERSION%%/home.png share/gtk-doc/html/vte-%%VERSION%%/index.html -share/gtk-doc/html/vte-%%VERSION%%/index.sgml share/gtk-doc/html/vte-%%VERSION%%/left-insensitive.png share/gtk-doc/html/vte-%%VERSION%%/left.png share/gtk-doc/html/vte-%%VERSION%%/licence.html diff --git a/x11/altyo/Makefile b/x11/altyo/Makefile index fbab7ea960d..fff3cd71598 100644 --- a/x11/altyo/Makefile +++ b/x11/altyo/Makefile @@ -4,6 +4,7 @@ PORTNAME= altyo DISTVERSIONPREFIX= debian/ DISTVERSION= 0.4_rc19 +PORTREVISION= 1 DISTVERSIONSUFFIX= -${GH_ACCOUNT}1 CATEGORIES= x11 diff --git a/x11/altyo/files/patch-altyo__terminal.vala b/x11/altyo/files/patch-altyo__terminal.vala new file mode 100644 index 00000000000..9256fe316fa --- /dev/null +++ b/x11/altyo/files/patch-altyo__terminal.vala @@ -0,0 +1,69 @@ +--- altyo_terminal.vala.orig 2016-04-19 20:55:59 UTC ++++ altyo_terminal.vala +@@ -50,7 +50,7 @@ public class TildaAuth:Object{ + //string[] commands={}; + //commands=command.split(","); + this.command=command; +- if( GLib.Regex.match_simple("^ *ssh *(,.*)?$",this.command,RegexCompileFlags.CASELESS,0) ) ++ if( GLib.Regex.match_simple("^ *ssh *(,.*)?$",this.command,GLib.RegexCompileFlags.CASELESS,0) ) + this.type="ssh"; + else + this.type="unknown"; +@@ -248,26 +248,26 @@ public class VTToggleButton : Gtk.Button + debug(" RegexEvalCallback %s %s %d",result.str,match_info.fetch(0),match_info.get_match_count()); + GLib.Regex grx; + +- if(!done[0] && Regex.match_simple(".*_REPLACE_.*",this.tab_title_regex[i+1])){ ++ if(!done[0] && GLib.Regex.match_simple(".*_REPLACE_.*",this.tab_title_regex[i+1])){ + //done[0]=true;//replace is allowed repeatedly + grx = new GLib.Regex(GLib.Regex.escape_string("_REPLACE_")); + result.append(grx.replace_literal(this.tab_title_regex[i+1],-1, 0, match_info.fetch(match_info.get_match_count()-1)) ); + return true;//stop + }else +- if(!done[1] && Regex.match_simple(".*_USER_.*",this.tab_title_regex[i+1])){ ++ if(!done[1] && GLib.Regex.match_simple(".*_USER_.*",this.tab_title_regex[i+1])){ + done[1]=true; + grx = new GLib.Regex(GLib.Regex.escape_string("_USER_")); + result.append(grx.replace_literal(this.tab_title_regex[i+1],-1, 0, match_info.fetch(match_info.get_match_count()-1)) ); + return true;//stop + }else +- if(!done[2] && Regex.match_simple(".*_HOSTNAME_.*",this.tab_title_regex[i+1])){ ++ if(!done[2] && GLib.Regex.match_simple(".*_HOSTNAME_.*",this.tab_title_regex[i+1])){ + done[2]=true; + grx = new GLib.Regex(GLib.Regex.escape_string("_HOSTNAME_")); + result.append(grx.replace_literal(this.tab_title_regex[i+1],-1, 0, match_info.fetch(match_info.get_match_count()-1)) ); + this.host_name=match_info.fetch(match_info.get_match_count()-1); + return true;//stop + }else +- if(!done[3] && Regex.match_simple(".*_PATH_.*",this.tab_title_regex[i+1])){ ++ if(!done[3] && GLib.Regex.match_simple(".*_PATH_.*",this.tab_title_regex[i+1])){ + done[3]=true; + grx = new GLib.Regex(GLib.Regex.escape_string("_PATH_")); + result.append(grx.replace_literal(this.tab_title_regex[i+1],-1, 0, match_info.fetch(match_info.get_match_count()-1)) ); +@@ -802,7 +802,7 @@ public class VTTerminal : AYTab{ + (arg == "GDK_CORE_DEVICE_EVENTS" && this.my_conf.get_boolean("workaround_if_focuslost",false) ) ){ + continue;//skip + }else +- if( !GLib.Regex.match_simple(term_exclude_vars,arg,RegexCompileFlags.CASELESS,0) ){ ++ if( !GLib.Regex.match_simple(term_exclude_vars,arg,GLib.RegexCompileFlags.CASELESS,0) ){ + unowned string val=GLib.Environment.get_variable(arg); + string s="%s=%s".printf(arg,(val!=null?val:"")); + envv+=s; +@@ -1056,7 +1056,7 @@ public class VTTerminal : AYTab{ + this.match_tags.steal_all(); + debug("url_regexps=%d",url_regexps.length); + for(int j=0;j