diff --git a/astro/p5-Astro-SunTime/Makefile b/astro/p5-Astro-SunTime/Makefile index b358b693cf5..b05ad029e75 100644 --- a/astro/p5-Astro-SunTime/Makefile +++ b/astro/p5-Astro-SunTime/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Astro-SunTime -PORTVERSION= 0.05 +PORTVERSION= 0.06 CATEGORIES= astro perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -11,9 +11,7 @@ MAINTAINER= perl@FreeBSD.org COMMENT= Perl interface to calculate sunrise/sunset times LICENSE= GPLv3 - -BUILD_DEPENDS= p5-Time-modules>=0:devel/p5-Time-modules -RUN_DEPENDS:= ${BUILD_DEPENDS} +LICENSE_FILE= ${WRKSRC}/LICENSE NO_ARCH= yes USES= perl5 diff --git a/astro/p5-Astro-SunTime/distinfo b/astro/p5-Astro-SunTime/distinfo index 45f8f0596ca..43476042eca 100644 --- a/astro/p5-Astro-SunTime/distinfo +++ b/astro/p5-Astro-SunTime/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1485032249 -SHA256 (Astro-SunTime-0.05.tar.gz) = 83f3d276849107b9f4fbef20d3d2849e3c751d751cfdfa67316470e9974543a7 -SIZE (Astro-SunTime-0.05.tar.gz) = 3523 +TIMESTAMP = 1500990004 +SHA256 (Astro-SunTime-0.06.tar.gz) = b4a44fddfc055cc42ee67bfd8939354793da7512ea04f30578d42dc6a701112a +SIZE (Astro-SunTime-0.06.tar.gz) = 18891 diff --git a/audio/audacity/Makefile b/audio/audacity/Makefile index 210301a44d8..e072afc0c4a 100644 --- a/audio/audacity/Makefile +++ b/audio/audacity/Makefile @@ -22,12 +22,11 @@ BROKEN_aarch64= fails to configure: checking whether C++ compiler accepts -msse BROKEN_powerpc64= fails to build GNU_CONFIGURE= yes -USES= autoreconf compiler:gcc-c++11-lib cpe desktop-file-utils gettext-tools gmake iconv libtool pkgconfig shared-mime-info shebangfix dos2unix +USES= autoreconf compiler:c++11-lib cpe desktop-file-utils gettext-tools gmake iconv libtool pkgconfig shared-mime-info shebangfix dos2unix localbase NLS_USES= gettext-runtime NLS_CONFIGURE_ENABLE= nls NLS_CONFIGURE_WITH= libintl-prefix="${LOCALBASE}" OPTIONS_SUB= yes -USE_GCC= yes USE_WX= 3.0+ WX_COMPS= wx INSTALLS_ICONS= yes @@ -50,7 +49,6 @@ DYNLOAD_DESC= Enable dynamic loading of lame and FFmpeg LAME_DESC= Use lame for import and export support LV2_DESC= Add LV2 plug-in support MAD_DESC= Use libmad for mp2/3 decoding support -MIDI_DESC= Use portSMF for Midi support SBSMS_DESC= Use libsbsms for pitch and tempo changing SOUNDTOUCH_DESC= Use libSoundTouch for pitch and tempo changing TAGLIB_DESC= Use TagLib for metadata support @@ -60,16 +58,17 @@ VST_DESC= VST plug-in support CONFIGURE_ENV+= WX_CONFIG="${WX_CONFIG}" -CONFIGURE_ARGS+= --enable-unicode \ +CONFIGURE_ARGS+= --disable-option-checking \ + --enable-unicode \ ${ICONV_CONFIGURE_ARG} \ --with-lib-preference="local" \ --with-expat=system \ --with-libsndfile=system \ --with-libsoxr \ - --with-portaudio \ --with-midi \ - --with-widgetextra \ - --with-portmixer=yes + --with-portaudio \ + --with-portmixer=yes \ + --with-widgetextra CONFIGURE_SHELL?= ${LOCALBASE}/bin/bash @@ -130,17 +129,17 @@ VAMP_CONFIGURE_WITH= libvamp=system VAMP_LIB_DEPENDS= libvamp-hostsdk.so:audio/vamp-plugin-sdk VORBIS_CONFIGURE_WITH= libvorbis=system -VORBIS_LIB_DEPENDS= libvorbis.so:audio/libvorbis +VORBIS_LIB_DEPENDS= libvorbis.so:audio/libvorbis \ + libogg.so:audio/libogg VST_CONFIGURE_ENABLE= vst -.include - post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} + @${RM} ${STAGEDIR}${DOCSDIR}/LICENSE.txt post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} -.include +.include diff --git a/audio/audacity/files/patch-Makefile.am b/audio/audacity/files/patch-Makefile.am deleted file mode 100644 index 0951bda793a..00000000000 --- a/audio/audacity/files/patch-Makefile.am +++ /dev/null @@ -1,23 +0,0 @@ ---- Makefile.am.orig 2016-07-26 13:34:06 UTC -+++ Makefile.am -@@ -1,4 +1,4 @@ --SUBDIRS = help images lib-src po src tests -+SUBDIRS = help images include lib-src po src tests - - ACLOCAL_AMFLAGS = -I m4 - -@@ -8,14 +8,6 @@ dist_doc_DATA = LICENSE.txt README.txt - dist_pkgdata_DATA = presets/EQDefaultCurves.xml - - nobase_dist_pkgdata_DATA = \ -- include/audacity/ConfigInterface.h \ -- include/audacity/EffectAutomationParameters.h \ -- include/audacity/EffectInterface.h \ -- include/audacity/IdentInterface.h \ -- include/audacity/ImporterInterface.h \ -- include/audacity/ModuleInterface.h \ -- include/audacity/PluginInterface.h \ -- include/audacity/Types.h \ - nyquist/dspprims.lsp \ - nyquist/envelopes.lsp \ - nyquist/equalizer.lsp \ diff --git a/audio/audacity/files/patch-configure.ac b/audio/audacity/files/patch-configure.ac index 0cb6765baa6..38cc5dd206f 100644 --- a/audio/audacity/files/patch-configure.ac +++ b/audio/audacity/files/patch-configure.ac @@ -1,18 +1,24 @@ --- configure.ac.orig 2016-01-08 22:05:48 UTC +++ configure.ac -@@ -43,6 +43,7 @@ AC_CONFIG_MACRO_DIR([m4]) +@@ -235,20 +236,7 @@ + dnl Solaris builds, by defining HAVE_ALLOCA_H + AC_CHECK_HEADERS_ONCE(alloca.h) - AM_INIT_AUTOMAKE([1.9 dist-xz foreign no-dist-gzip subdir-objects -Wall -Wno-override tar-ustar]) - AM_MAINTAINER_MODE([disable]) -+AM_SILENT_RULES([yes]) +- +-dnl Enable C++ 11 support. Use gnu++11 on GCC since wxWidgets uses extensions +-if test "${ax_cv_c_compiler_vendor}" = "gnu"; then +- +- dnl GCC < 4.9 has known bugs (#1397) and can't be used +- AX_GCC_VERSION_ATLEAST(4,9,0,[gcc_ok=yes], [gcc_ok=no]) +- if test x$gcc_ok = xno; then +- AC_MSG_ERROR([Audacity requires at least GCC 4.9]) +- fi +- +- CXXFLAGS="${CXXFLAGS} --std=gnu++11" +-else +- CXXFLAGS="${CXXFLAGS} --std=c++11" +-fi ++CXXFLAGS="${CXXFLAGS} --std=c++11" - AM_GNU_GETTEXT_VERSION([0.18]) - AM_GNU_GETTEXT([external]) -@@ -690,6 +691,7 @@ AC_CONFIG_FILES([ - Makefile - help/Makefile - images/Makefile -+ include/Makefile - lib-src/Makefile - po/Makefile.in - src/audacity.desktop + dnl -------------------------------------------------------------------------- + dnl We would like warnings enabled on the builds, but different compilers need diff --git a/audio/audacity/files/patch-include_Makefile.am b/audio/audacity/files/patch-include_Makefile.am deleted file mode 100644 index 55f3706b13d..00000000000 --- a/audio/audacity/files/patch-include_Makefile.am +++ /dev/null @@ -1,24 +0,0 @@ ---- include/Makefile.am.orig 2016-07-26 13:34:07 UTC -+++ include/Makefile.am -@@ -0,0 +1,21 @@ -+ACLOCAL_AMFLAGS= -I m4 -+ -+pkginclude_HEADERS= \ -+ audacity/ConfigInterface.h \ -+ audacity/EffectAutomationParameters.h \ -+ audacity/EffectInterface.h \ -+ audacity/IdentInterface.h \ -+ audacity/ImporterInterface.h \ -+ audacity/ModuleInterface.h \ -+ audacity/PluginInterface.h \ -+ audacity/Types.h \ -+ $(NULL) -+ -+pkgdataincludedir= $(pkgdatadir)/include -+ -+install-data-local: install-data-include -+install-data-include: -+ $(MKDIR_P) "$(DESTDIR)$(pkgdataincludedir)" -+ $(LN_S) "$(pkgincludedir)" "$(DESTDIR)$(pkgdataincludedir)/" -+ -+.PHONY: install-data-include diff --git a/audio/audacity/files/patch-include_audacity_Types.h b/audio/audacity/files/patch-include_audacity_Types.h new file mode 100644 index 00000000000..40903bde4a7 --- /dev/null +++ b/audio/audacity/files/patch-include_audacity_Types.h @@ -0,0 +1,11 @@ +--- include/audacity/Types.h.orig 2017-03-13 21:02:21 UTC ++++ include/audacity/Types.h +@@ -70,7 +70,7 @@ public: + sampleCount ( int v ) : value { v } {} + sampleCount ( unsigned v ) : value { v } {} + sampleCount ( long v ) : value { v } {} +- sampleCount ( unsigned long v ) : value { v } {} ++ sampleCount ( unsigned long v ) : value { static_cast(v) } {} + + // Beware implicit conversions from floating point values! + // Otherwise the meaning of binary operators with sampleCount change diff --git a/audio/audacity/files/patch-lib-src_libnyquist_Makefile.am b/audio/audacity/files/patch-lib-src_libnyquist_Makefile.am deleted file mode 100644 index 82409cb37fb..00000000000 --- a/audio/audacity/files/patch-lib-src_libnyquist_Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ ---- lib-src/libnyquist/Makefile.am.orig 2016-07-26 13:34:06 UTC -+++ lib-src/libnyquist/Makefile.am -@@ -3,7 +3,7 @@ - # Written by Richard Ash following Gary Vaughan's Autobook - - PORTAUDIO_CFLAGS = -I${srcdir}/../portaudio-v19/include --SNDFILE_CFLAGS = -I${builddir}/../libsndfile/src -+#SNDFILE_CFLAGS = -I${builddir}/../libsndfile/src - - # tell aclocal that extra macros can be found in autotools/m4/ - ACLOCAL_AMFLAGS = -I autotools/m4 diff --git a/audio/audacity/files/patch-lib-src_libnyquist_configure.ac b/audio/audacity/files/patch-lib-src_libnyquist_configure.ac deleted file mode 100644 index dcebca89daf..00000000000 --- a/audio/audacity/files/patch-lib-src_libnyquist_configure.ac +++ /dev/null @@ -1,11 +0,0 @@ ---- lib-src/libnyquist/configure.ac.orig 2016-01-08 22:05:48 UTC -+++ lib-src/libnyquist/configure.ac -@@ -117,6 +117,8 @@ dnl Checks for typedefs, structures, and - AC_C_CONST - AC_TYPE_SIZE_T - -+AC_SUBST([SNDFILE_CFLAGS]) -+ - AC_CONFIG_FILES([Makefile]) - - AC_OUTPUT diff --git a/audio/audacity/files/patch-lib-src_portaudio-v19_bindings_cpp_configure.ac b/audio/audacity/files/patch-lib-src_portaudio-v19_bindings_cpp_configure.ac deleted file mode 100644 index 3fedd24d94b..00000000000 --- a/audio/audacity/files/patch-lib-src_portaudio-v19_bindings_cpp_configure.ac +++ /dev/null @@ -1,11 +0,0 @@ ---- lib-src/portaudio-v19/bindings/cpp/configure.ac.orig 2016-01-08 22:05:48 UTC -+++ lib-src/portaudio-v19/bindings/cpp/configure.ac -@@ -14,7 +14,7 @@ m4_define([lt_age], [0]) - - AC_INIT([PortAudioCpp], [12]) - AC_CONFIG_SRCDIR([include/portaudiocpp/PortAudioCpp.hxx]) --AM_INIT_AUTOMAKE -+AM_INIT_AUTOMAKE([subdir-objects]) - AM_MAINTAINER_MODE - - ###### Top-level directory of pacpp diff --git a/audio/audacity/files/patch-lib-src_portmixer_include_portmixer.h b/audio/audacity/files/patch-lib-src_portmixer_include_portmixer.h deleted file mode 100644 index 67c7882fe2f..00000000000 --- a/audio/audacity/files/patch-lib-src_portmixer_include_portmixer.h +++ /dev/null @@ -1,11 +0,0 @@ ---- lib-src/portmixer/include/portmixer.h.orig 2016-07-26 13:34:07 UTC -+++ lib-src/portmixer/include/portmixer.h -@@ -45,7 +45,7 @@ extern "C" - * - */ - --#include "portaudio.h" -+#include "../../portaudio-v19/include/portaudio.h" - - typedef void PxMixer; - diff --git a/audio/audacity/files/patch-lib-src_soundtouch_source_SoundTouch_Makefile.am b/audio/audacity/files/patch-lib-src_soundtouch_source_SoundTouch_Makefile.am deleted file mode 100644 index db608ea460b..00000000000 --- a/audio/audacity/files/patch-lib-src_soundtouch_source_SoundTouch_Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ ---- lib-src/soundtouch/source/SoundTouch/Makefile.am.orig 2016-07-26 13:34:06 UTC -+++ lib-src/soundtouch/source/SoundTouch/Makefile.am -@@ -32,7 +32,7 @@ libSoundTouch_la_SOURCES=AAFilter.cpp FI - - - # Compiler flags --AM_CXXFLAGS=-O3 -fcheck-new -I../../include -+AM_CXXFLAGS=-O3 -I../../include - - # Compile the files that need MMX and SSE individually. - libSoundTouch_la_LIBADD=libSoundTouchMMX.la libSoundTouchSSE.la diff --git a/audio/audacity/files/patch-m4_audacity__checklib__libsndfile.m4 b/audio/audacity/files/patch-m4_audacity__checklib__libsndfile.m4 deleted file mode 100644 index 149f7f8a599..00000000000 --- a/audio/audacity/files/patch-m4_audacity__checklib__libsndfile.m4 +++ /dev/null @@ -1,10 +0,0 @@ ---- m4/audacity_checklib_libsndfile.m4.orig 2016-01-08 22:05:48 UTC -+++ m4/audacity_checklib_libsndfile.m4 -@@ -50,6 +50,7 @@ AC_DEFUN([AUDACITY_CONFIG_LIBSNDFILE], [ - SNDFILE_LIBS='$(top_builddir)/lib-src/libsndfile/src/.libs/libsndfile.a' - AC_CONFIG_SUBDIRS([lib-src/libsndfile]) - fi -+ export SNDFILE_CFLAGS - - AC_SUBST([SNDFILE_CFLAGS]) - AC_SUBST([SNDFILE_LIBS]) diff --git a/audio/audacity/files/patch-src_Audacity.h b/audio/audacity/files/patch-src_Audacity.h new file mode 100644 index 00000000000..d12a5737dce --- /dev/null +++ b/audio/audacity/files/patch-src_Audacity.h @@ -0,0 +1,16 @@ +--- src/Audacity.h.orig 2017-06-16 13:26:40 UTC ++++ src/Audacity.h +@@ -24,13 +24,6 @@ + #ifndef __AUDACITY_H__ + #define __AUDACITY_H__ + +-// If building with GNU compiler, then must be 4.9 or later. +-// TODO: This would be much nicer as a standalone test in configure.ac +-#if !defined(__APPLE__) && defined __GNUC__ && ( __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 9)) +-#error insufficient compiler +-#endif +- +- + // We only do alpha builds and release versions. + // Most of the time we're in development, so IS_ALPHA should be defined + // to 1. diff --git a/audio/audacity/files/patch-src_AudioIO.h b/audio/audacity/files/patch-src_AudioIO.h deleted file mode 100644 index 9defe48870e..00000000000 --- a/audio/audacity/files/patch-src_AudioIO.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/AudioIO.h.orig 2016-07-26 13:34:06 UTC -+++ src/AudioIO.h -@@ -13,7 +13,7 @@ - #ifndef __AUDACITY_AUDIO_IO__ - #define __AUDACITY_AUDIO_IO__ - --#include "portaudio.h" -+#include "../lib-src/portaudio-v19/include/portaudio.h" - #include "Audacity.h" - #include "Experimental.h" - diff --git a/audio/audacity/files/patch-src_DeviceManager.cpp b/audio/audacity/files/patch-src_DeviceManager.cpp deleted file mode 100644 index dc85c4ceeaa..00000000000 --- a/audio/audacity/files/patch-src_DeviceManager.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/DeviceManager.cpp.orig 2016-07-26 13:34:06 UTC -+++ src/DeviceManager.cpp -@@ -6,7 +6,7 @@ - - ******************************************************************/ - --#include "portaudio.h" -+#include "../lib-src/portaudio-v19/include/portaudio.h" - #ifdef __WXMSW__ - #include "pa_win_wasapi.h" - #endif diff --git a/audio/audacity/files/patch-src_prefs_DevicePrefs.cpp b/audio/audacity/files/patch-src_prefs_DevicePrefs.cpp deleted file mode 100644 index a83688f3cf4..00000000000 --- a/audio/audacity/files/patch-src_prefs_DevicePrefs.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/prefs/DevicePrefs.cpp.orig 2016-07-26 13:34:06 UTC -+++ src/prefs/DevicePrefs.cpp -@@ -30,7 +30,7 @@ other settings. - #include - #include - --#include "portaudio.h" -+#include "../../lib-src/portaudio-v19/include/portaudio.h" - - #include "../AudioIO.h" - #include "../Internat.h" diff --git a/audio/audacity/pkg-plist b/audio/audacity/pkg-plist index ef44229a071..36adcdcb838 100644 --- a/audio/audacity/pkg-plist +++ b/audio/audacity/pkg-plist @@ -1,17 +1,16 @@ bin/audacity -include/audacity/ConfigInterface.h -include/audacity/EffectAutomationParameters.h -include/audacity/EffectInterface.h -include/audacity/IdentInterface.h -include/audacity/ImporterInterface.h -include/audacity/ModuleInterface.h -include/audacity/PluginInterface.h -include/audacity/Types.h man/man1/audacity.1.gz share/appdata/audacity.appdata.xml share/applications/audacity.desktop %%DATADIR%%/EQDefaultCurves.xml -%%DATADIR%%/include/audacity +%%DATADIR%%/include/audacity/ConfigInterface.h +%%DATADIR%%/include/audacity/EffectAutomationParameters.h +%%DATADIR%%/include/audacity/EffectInterface.h +%%DATADIR%%/include/audacity/IdentInterface.h +%%DATADIR%%/include/audacity/ImporterInterface.h +%%DATADIR%%/include/audacity/ModuleInterface.h +%%DATADIR%%/include/audacity/PluginInterface.h +%%DATADIR%%/include/audacity/Types.h %%DATADIR%%/nyquist/dspprims.lsp %%DATADIR%%/nyquist/envelopes.lsp %%DATADIR%%/nyquist/equalizer.lsp @@ -80,7 +79,6 @@ share/applications/audacity.desktop %%DATADIR%%/plug-ins/vocalrediso.ny %%DATADIR%%/plug-ins/vocalremover.ny %%DATADIR%%/plug-ins/vocoder.ny -%%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt share/icons/hicolor/16x16/apps/audacity.png share/icons/hicolor/22x22/apps/audacity.png share/icons/hicolor/24x24/apps/audacity.png diff --git a/audio/dsbmixer/Makefile b/audio/dsbmixer/Makefile index ca615193164..ecfcbdca828 100644 --- a/audio/dsbmixer/Makefile +++ b/audio/dsbmixer/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= dsbmixer -PORTVERSION= 1.0 +PORTVERSION= 1.1 CATEGORIES= audio MASTER_SITES= http://freeshell.de/~mk/download/ diff --git a/audio/dsbmixer/distinfo b/audio/dsbmixer/distinfo index 9251fdc26b4..e5ab0b84654 100644 --- a/audio/dsbmixer/distinfo +++ b/audio/dsbmixer/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1498603599 -SHA256 (dsbmixer-1.0.tgz) = 31e794b0f942e469ddaf62d32b2aa5a4be661d706a4a6d5234eba356bf7f9385 -SIZE (dsbmixer-1.0.tgz) = 26396 +TIMESTAMP = 1500951608 +SHA256 (dsbmixer-1.1.tgz) = 57fef13d72a542fea97a445d69560934a7e708e213b9f336f8fbb0b50374a6ec +SIZE (dsbmixer-1.1.tgz) = 27446 diff --git a/audio/libmpdclient/Makefile b/audio/libmpdclient/Makefile index d5748ee8865..549f85128fc 100644 --- a/audio/libmpdclient/Makefile +++ b/audio/libmpdclient/Makefile @@ -2,23 +2,29 @@ # $FreeBSD$ PORTNAME= libmpdclient -PORTVERSION= 2.11 +PORTVERSION= 2.13 CATEGORIES= audio MASTER_SITES= http://www.musicpd.org/download/libmpdclient/2/ MAINTAINER= gblach@FreeBSD.org COMMENT= API library for interfacing MPD -GNU_CONFIGURE= yes -USES= tar:xz gmake libtool pathfix +LICENSE= BSD3CLAUSE +LICENSE_FILE= ${WRKSRC}/COPYING + +USES= tar:xz meson USE_LDCONFIG= yes -INSTALL_TARGET= install-strip OPTIONS_DEFINE= DOCS DOXYGEN OPTIONS_SUB= yes DOXYGEN_IMPLIES= DOCS DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen -DOXYGEN_CONFIGURE_OFF= --disable-documentation -.include +.include + +.if ${PORT_OPTIONS:MDOXYGEN} +MESON_ARGS+= -Ddocumentation=true +.endif + +.include diff --git a/audio/libmpdclient/distinfo b/audio/libmpdclient/distinfo index e562ad0caa9..9aa5692c4f9 100644 --- a/audio/libmpdclient/distinfo +++ b/audio/libmpdclient/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1491344728 -SHA256 (libmpdclient-2.11.tar.xz) = 15fe693893c0d7ea3f4c35c4016fbd0332836164178b20983eec9b470846baf6 -SIZE (libmpdclient-2.11.tar.xz) = 274836 +TIMESTAMP = 1500972327 +SHA256 (libmpdclient-2.13.tar.xz) = 5115bd52bc20a707c1ecc7587e6389c17305348e2132a66cf767c62fc55ed45d +SIZE (libmpdclient-2.13.tar.xz) = 56964 diff --git a/audio/libmpdclient/pkg-plist b/audio/libmpdclient/pkg-plist index fb454e64915..661f17fe1a3 100644 --- a/audio/libmpdclient/pkg-plist +++ b/audio/libmpdclient/pkg-plist @@ -32,15 +32,15 @@ include/mpd/status.h include/mpd/sticker.h include/mpd/tag.h include/mpd/version.h -lib/libmpdclient.a lib/libmpdclient.so lib/libmpdclient.so.2 -lib/libmpdclient.so.2.0.11 +lib/libmpdclient.so.2.13 libdata/pkgconfig/libmpdclient.pc share/vala/vapi/libmpdclient.vapi +%%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/NEWS -%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/README.rst %%PORTDOCS%%%%DOXYGEN%%%%DOCSDIR%%/html/annotated.html %%PORTDOCS%%%%DOXYGEN%%%%DOCSDIR%%/html/async_8h.html %%PORTDOCS%%%%DOXYGEN%%%%DOCSDIR%%/html/async_8h_source.html @@ -80,6 +80,10 @@ share/vala/vapi/libmpdclient.vapi %%PORTDOCS%%%%DOXYGEN%%%%DOCSDIR%%/html/globals_enum.html %%PORTDOCS%%%%DOXYGEN%%%%DOCSDIR%%/html/globals_eval.html %%PORTDOCS%%%%DOXYGEN%%%%DOCSDIR%%/html/globals_func.html +%%PORTDOCS%%%%DOXYGEN%%%%DOCSDIR%%/html/globals_type.html +%%PORTDOCS%%%%DOXYGEN%%%%DOCSDIR%%/html/graph_legend.html +%%PORTDOCS%%%%DOXYGEN%%%%DOCSDIR%%/html/graph_legend.md5 +%%PORTDOCS%%%%DOXYGEN%%%%DOCSDIR%%/html/graph_legend.png %%PORTDOCS%%%%DOXYGEN%%%%DOCSDIR%%/html/idle_8h.html %%PORTDOCS%%%%DOXYGEN%%%%DOCSDIR%%/html/idle_8h_source.html %%PORTDOCS%%%%DOXYGEN%%%%DOCSDIR%%/html/index.html @@ -156,5 +160,5 @@ share/vala/vapi/libmpdclient.vapi %%PORTDOCS%%%%DOXYGEN%%%%DOCSDIR%%/html/tabs.css %%PORTDOCS%%%%DOXYGEN%%%%DOCSDIR%%/html/tag_8h.html %%PORTDOCS%%%%DOXYGEN%%%%DOCSDIR%%/html/tag_8h_source.html -%%PORTDOCS%%%%DOXYGEN%%%%DOCSDIR%%/html/version_8h.html -%%PORTDOCS%%%%DOXYGEN%%%%DOCSDIR%%/html/version_8h_source.html +%%PORTDOCS%%%%DOXYGEN%%%%DOCSDIR%%/html/socket_8h.html +%%PORTDOCS%%%%DOXYGEN%%%%DOCSDIR%%/html/socket_8h_source.html diff --git a/audio/logitechmediaserver/Makefile b/audio/logitechmediaserver/Makefile index 0c4fcff2dab..ac1d188cc01 100644 --- a/audio/logitechmediaserver/Makefile +++ b/audio/logitechmediaserver/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= logitechmediaserver -PORTVERSION= 7.9.0.g2016.09.30 -PORTREVISION= 2 +PORTVERSION= 7.9.1.g2017.07.11 CATEGORIES= audio MAINTAINER= mark@tranquillussoftware.co.uk @@ -13,21 +12,18 @@ LICENSE_NAME= Slim Devices License LICENSE_FILE= ${WRKSRC}/License.txt LICENSE_PERMS= no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell +ONLY_FOR_ARCHS= amd64 i386 + BUILD_DEPENDS= nasm:devel/nasm \ bash:shells/bash \ rsync:net/rsync LIB_DEPENDS= libgd.so:graphics/gd -USE_GITHUB= yes -GH_TUPLE= Logitech:slimserver:c835a1f \ - Logitech:slimserver-vendor:14cc392:vendor - -RESTRICTED= Contains non-redistributable firmware, documentation, and images - -USERS= ${SLIMUSER} -GROUPS= ${SLIMGROUP} USES= gettext-runtime gmake perl5 shebangfix -EXTRA_PATCHES= ${FILESDIR}/vendorpatch-CPAN_buildme.sh +USE_GITHUB= yes +GH_TUPLE= Logitech:slimserver:762b5cb \ + Logitech:slimserver-vendor:1463b00:vendor +USE_RC_SUBR= logitechmediaserver SHEBANG_FILES= Bin/darwin/check-update.pl \ Bin/dbish \ CPAN/Log/Log4perl/Layout/PatternLayout/Multiline.pm \ @@ -47,7 +43,6 @@ OPTIONS_DEFINE= APE FAAD FLAC LAME SHORTEN SOX TEST DOCS OPTIONS_DEFAULT=APE FAAD FLAX SOX TEST SHORTEN_DESC= Support Shorten input SOX_DESC= Support OGG Vorbis input via SoX (SliMP3 and SB1) - APE_RUN_DEPENDS= mac:audio/mac FAAD_RUN_DEPENDS= faad:audio/faad FLAC_RUN_DEPENDS= flac:audio/flac @@ -56,7 +51,11 @@ SHORTEN_RUN_DEPENDS= shorten:audio/shorten SOX_RUN_DEPENDS= sox:audio/sox TEST_VARS_OFF= CONTRIB_FLAGS=-t -USE_RC_SUBR= logitechmediaserver +RESTRICTED= Contains non-redistributable firmware, documentation, and images +USERS= ${SLIMUSER} +GROUPS= ${SLIMGROUP} +EXTRA_PATCHES= ${FILESDIR}/vendorpatch-CPAN_buildme.sh + DOCFILES= Changelog*.html Installation.txt License*.txt CONFFILES= convert.conf types.conf @@ -85,8 +84,6 @@ SLIMGROUP?= ${SLIMUSER} .include -ONLY_FOR_ARCHS= i386 amd64 - .if ${ARCH} == "i386" ARCHNAME= i386-freebsd-thread-multi-64int PLIST_SUB+= I386_ONLY="" @@ -103,7 +100,6 @@ PLIST_SUB+= AMD64_ONLY="@comment " do-build: cd ${WRKSRC_vendor}/CPAN && ./buildme.sh ${CONTRIB_FLAGS} - cd ${WRKSRC}/CPAN/arch && ${CP} -R 5.22 5.24 do-install: (cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${SLIMDIR}) @@ -113,7 +109,7 @@ do-install: ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${SLIMDIR}/CPAN/arch/${PERL_VER}/) (cd ${STAGEDIR}${PREFIX}/${SLIMDIR} && \ ${FIND} . -name \*.orig -delete -o -name \*.bak -delete -o -name \*.packlist -delete && \ - ${FIND} ./CPAN/arch/ -d 1 ! -name ${PERL_VER} -print0 | ${XARGS} -0 ${RM} -r -- && \ + ${FIND} ./CPAN/arch/ ! -path './CPAN/arch/${PERL_VER}*' -delete && \ ${RM} -r -- Bin/* && \ ${RM} -- ${CONFFILES} ${DOCFILES}) (cd ${STAGEDIR}${PREFIX}/${SLIMDIR}/CPAN/arch/${PERL_VER} && \ diff --git a/audio/logitechmediaserver/distinfo b/audio/logitechmediaserver/distinfo index f2d3365fda2..8fdec67cfef 100644 --- a/audio/logitechmediaserver/distinfo +++ b/audio/logitechmediaserver/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1475588350 -SHA256 (Logitech-slimserver-7.9.0.g2016.09.30-c835a1f_GH0.tar.gz) = 01f392f7a6f2c86926e6f86fa99b78d00fe47b8c90893f2c3b5fcc03f1144035 -SIZE (Logitech-slimserver-7.9.0.g2016.09.30-c835a1f_GH0.tar.gz) = 187923230 -SHA256 (Logitech-slimserver-vendor-14cc392_GH0.tar.gz) = 4256458c6c77c06eb2616b1afed851f422f5bf26f2a0c2631339ed3b14d3e385 -SIZE (Logitech-slimserver-vendor-14cc392_GH0.tar.gz) = 115661507 +TIMESTAMP = 1499890365 +SHA256 (Logitech-slimserver-7.9.1.g2017.07.11-762b5cb_GH0.tar.gz) = 7172ce75baf9f66d691e15974d38adc7ec62430e49355c12fc0d36a133f6c3e0 +SIZE (Logitech-slimserver-7.9.1.g2017.07.11-762b5cb_GH0.tar.gz) = 204891529 +SHA256 (Logitech-slimserver-vendor-1463b00_GH0.tar.gz) = 101524a0472c5976ca8696e34013efcc18ed4943b9c6838136e24c9f28a9bce6 +SIZE (Logitech-slimserver-vendor-1463b00_GH0.tar.gz) = 115661641 diff --git a/audio/logitechmediaserver/files/vendorpatch-CPAN_buildme.sh b/audio/logitechmediaserver/files/vendorpatch-CPAN_buildme.sh index ff8ef293447..c36de058f25 100644 --- a/audio/logitechmediaserver/files/vendorpatch-CPAN_buildme.sh +++ b/audio/logitechmediaserver/files/vendorpatch-CPAN_buildme.sh @@ -1,5 +1,5 @@ ---- ../slimserver-vendor-14cc392/CPAN/buildme.sh.orig 2016-08-12 21:27:39.000000000 +0800 -+++ ../slimserver-vendor-14cc392/CPAN/buildme.sh 2016-11-13 13:08:08.765866000 +0800 +--- ../slimserver-vendor-1463b00/CPAN/buildme.sh.orig 2017-06-07 14:29:20.000000000 +0100 ++++ ../slimserver-vendor-1463b00/CPAN/buildme.sh 2017-07-12 21:44:11.808290000 +0100 @@ -92,7 +92,7 @@ exit fi @@ -9,64 +9,27 @@ which $i > /dev/null if [ $? -ne 0 ] ; then echo "$i not found - please install it" -@@ -309,6 +309,19 @@ - PERL_ARCH=$BUILD/arch/5.22 - fi - -+# Path to Perl 5.24 -+if [ -x "/usr/bin/perl5.24.1" ]; then -+ PERL_524=/usr/bin/perl5.24.1 -+fi -+ -+if [ $PERL_524 ]; then -+ echo "Building with Perl 5.24 at $PERL_524" -+ PERL_BIN=$PERL_524 -+ # Install dir for 5.24 -+ PERL_BASE=$BUILD/5.24 -+ PERL_ARCH=$BUILD/arch/5.24 -+fi -+ - # try to use default perl version - if [ "$PERL_BIN" = "" ]; then - PERL_BIN=`which perl` -@@ -339,6 +352,9 @@ - "5.22") - PERL_522=$PERL_BIN - ;; -+ "5.24") -+ PERL_524=$PERL_BIN -+ ;; - *) - echo "Failed to find supported Perl version for '$PERL_BIN'" - exit -@@ -504,7 +520,7 @@ - ;; - - Class::XSAccessor) -- if [ "$PERL_516" -o "$PERL_518" -o "$PERL_520" -o "$PERL_522" ]; then -+ if [ "$PERL_516" -o "$PERL_518" -o "$PERL_520" -o "$PERL_522" -o "$PERL_524" ]; then - build_module Class-XSAccessor-1.18 - cp -pR $PERL_BASE/lib/perl5/$ARCH/Class $PERL_ARCH/ - else -@@ -520,7 +536,7 @@ - ;; - - DBI) -- if [ "$PERL_518" -o "$PERL_520" -o "$PERL_522" ]; then -+ if [ "$PERL_518" -o "$PERL_520" -o "$PERL_522" -o "$PERL_524" ]; then - build_module DBI-1.628 - cp -p $PERL_BASE/lib/perl5/$ARCH/DBI.pm $PERL_ARCH/ - cp -pR $PERL_BASE/lib/perl5/$ARCH/DBI $PERL_ARCH/ -@@ -530,7 +546,7 @@ - ;; - - DBD::SQLite) -- if [ "$PERL_518" -o "$PERL_520" -o "$PERL_522" ]; then -+ if [ "$PERL_518" -o "$PERL_520" -o "$PERL_522" -o "$PERL_524" ]; then - build_module DBI-1.628 "" 0 - else - build_module DBI-1.616 "" 0 -@@ -552,7 +568,7 @@ +@@ -556,6 +556,19 @@ + # because it takes so damn long on slow platforms + if [ ! -f build/lib/libicudata_s.a ]; then + tar_wrapper zxvf icu4c-4_6-src.tgz ++ patch << END ++--- icu/source/i18n/uspoof.cpp.orig 2017-07-12 21:35:34.014645000 +0100 +++++ icu/source/i18n/uspoof.cpp 2017-07-12 21:33:44.790884000 +0100 ++@@ -366,7 +366,7 @@ ++ // u_strToUTF8() in preflight mode is an easy way to do it. ++ U_ASSERT(position16 <= len16); ++ u_strToUTF8(NULL, 0, position, text16, position16, status); ++- if (position > 0) { +++ if (position != NULL && *position > 0) { ++ // position is the required buffer length from u_strToUTF8, which includes ++ // space for a terminating NULL, which we don't want, hence the -1. ++ *position -= 1; ++END + cd icu/source + if [ "$OS" = 'Darwin' ]; then + ICUFLAGS="$FLAGS $OSX_ARCH $OSX_FLAGS -DU_USING_ICU_NAMESPACE=0 -DU_CHARSET_IS_UTF8=1" # faster code for native UTF-8 systems +@@ -568,7 +581,7 @@ ICUOS="FreeBSD" fi CFLAGS="$ICUFLAGS" CXXFLAGS="$ICUFLAGS" LDFLAGS="$FLAGS $OSX_ARCH $OSX_FLAGS" \ @@ -75,34 +38,7 @@ $MAKE if [ $? != 0 ]; then echo "make failed" -@@ -616,7 +632,7 @@ - rm -rf DBD-SQLite-1.34_01 - else - cd .. -- if [ "$PERL_516" -o "$PERL_518" -o "$PERL_520" -o "$PERL_522" ]; then -+ if [ "$PERL_516" -o "$PERL_518" -o "$PERL_520" -o "$PERL_522" -o "$PERL_524" ]; then - build_module DBD-SQLite-1.34_01 "" 0 - fi - build_module DBD-SQLite-1.34_01 -@@ -698,7 +714,7 @@ - JSON::XS) - build_module common-sense-2.0 - -- if [ "$PERL_518" -o "$PERL_520" -o "$PERL_522" ]; then -+ if [ "$PERL_518" -o "$PERL_520" -o "$PERL_522" -o "$PERL_524" ]; then - build_module JSON-XS-2.34 - cp -pR $PERL_BASE/lib/perl5/$ARCH/JSON $PERL_ARCH/ - else -@@ -728,7 +744,7 @@ - ;; - - YAML::LibYAML) -- if [ "$PERL_516" -o "$PERL_518" -o "$PERL_520" -o "$PERL_522" ]; then -+ if [ "$PERL_516" -o "$PERL_518" -o "$PERL_520" -o "$PERL_522" -o "$PERL_524" ]; then - build_module YAML-LibYAML-0.35 "" 0 - else - build_module YAML-LibYAML-0.35 -@@ -1223,6 +1239,9 @@ +@@ -1239,6 +1252,9 @@ if [ "$ARCH" = "amd64-freebsd" -o "$ARCH" = "amd64-freebsd-thread-multi" ]; then FFOPTS="$FFOPTS --arch=x86" fi @@ -112,12 +48,3 @@ if [ "$OS" = "Darwin" ]; then SAVED_FLAGS=$FLAGS -@@ -1387,7 +1406,7 @@ - - # create our directory structure - # rsync is used to avoid copying non-binary modules or other extra stuff --if [ "$PERL_512" -o "$PERL_514" -o "$PERL_516" -o "$PERL_518" -o "$PERL_520" -o "$PERL_522" ]; then -+if [ "$PERL_512" -o "$PERL_514" -o "$PERL_516" -o "$PERL_518" -o "$PERL_520" -o "$PERL_522" -o "$PERL_524" ]; then - # Check for Perl using use64bitint and add -64int - ARCH=`$PERL_BIN -MConfig -le 'print $Config{archname}' | sed 's/gnu-//' | sed 's/^i[3456]86-/i386-/' | sed 's/armv.*?-/arm-/' ` - fi diff --git a/audio/logitechmediaserver/pkg-plist b/audio/logitechmediaserver/pkg-plist index 5cd2000052d..ef27d66cdb6 100644 --- a/audio/logitechmediaserver/pkg-plist +++ b/audio/logitechmediaserver/pkg-plist @@ -340,6 +340,8 @@ etc/newsyslog.conf.d/logitechmediaserver.conf %%SLIMDIR%%/CPAN/Net/HTTP/Methods.pm %%SLIMDIR%%/CPAN/Net/HTTP/NB.pm %%SLIMDIR%%/CPAN/Net/HTTPS.pm +%%SLIMDIR%%/CPAN/Net/IPv4Addr.pm +%%SLIMDIR%%/CPAN/Net/Ifconfig/Wrapper.pm %%SLIMDIR%%/CPAN/Net/UPnP.pm %%SLIMDIR%%/CPAN/Net/UPnP/AV/Container.pm %%SLIMDIR%%/CPAN/Net/UPnP/AV/Content.pm @@ -353,7 +355,6 @@ etc/newsyslog.conf.d/logitechmediaserver.conf %%SLIMDIR%%/CPAN/Net/UPnP/HTTPResponse.pm %%SLIMDIR%%/CPAN/Net/UPnP/QueryResponse.pm %%SLIMDIR%%/CPAN/Net/UPnP/Service.pm -%%SLIMDIR%%/CPAN/Network/IPv4Addr.pm %%SLIMDIR%%/CPAN/PAR.pm %%SLIMDIR%%/CPAN/PAR/Dist.pm %%SLIMDIR%%/CPAN/PAR/Heavy.pm @@ -780,6 +781,7 @@ etc/newsyslog.conf.d/logitechmediaserver.conf %%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/ExtUtils/CBuilder/Platform/dec_osf.pm %%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/ExtUtils/CBuilder/Platform/os2.pm %%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/HTML/Tagset.pm +%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/Image/Scale.pm %%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/JSON/XS.pm %%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/JSON/XS/Boolean.pm %%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/Module/Build.pm @@ -1922,6 +1924,7 @@ etc/newsyslog.conf.d/logitechmediaserver.conf %%SLIMDIR%%/Slim/Player/ProtocolHandlers.pm %%SLIMDIR%%/Slim/Player/Protocols/File.pm %%SLIMDIR%%/Slim/Player/Protocols/HTTP.pm +%%SLIMDIR%%/Slim/Player/Protocols/HTTPS.pm %%SLIMDIR%%/Slim/Player/Protocols/LocalFile.pm %%SLIMDIR%%/Slim/Player/Protocols/MMS.pm %%SLIMDIR%%/Slim/Player/Protocols/SqueezePlayDirect.pm @@ -2038,7 +2041,6 @@ etc/newsyslog.conf.d/logitechmediaserver.conf %%SLIMDIR%%/Slim/Plugin/Favorites/Playlist.pm %%SLIMDIR%%/Slim/Plugin/Favorites/Plugin.pm %%SLIMDIR%%/Slim/Plugin/Favorites/Settings.pm -%%SLIMDIR%%/Slim/Plugin/Favorites/SqueezeNetwork.pm %%SLIMDIR%%/Slim/Plugin/Favorites/install.xml %%SLIMDIR%%/Slim/Plugin/Favorites/strings.txt %%SLIMDIR%%/Slim/Plugin/Flickr/HTML/EN/plugins/Flickr/html/images/icon.png diff --git a/audio/xmms2-scrobbler/Makefile b/audio/xmms2-scrobbler/Makefile index 4e60e3ccfd2..cfbaaafbe39 100644 --- a/audio/xmms2-scrobbler/Makefile +++ b/audio/xmms2-scrobbler/Makefile @@ -3,7 +3,7 @@ PORTNAME= xmms2-scrobbler PORTVERSION= 0.4.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= audio MASTER_SITES= ftp://ftp.code-monkey.de/pub/${PORTNAME}/ @@ -24,7 +24,11 @@ PORTDOCS= README SUB_FILES= pkg-message -OPTIONS_DEFINE= DOCS +OPTIONS_DEFINE= APIFIX DOCS +OPTIONS_DEFAULT= APIFIX DOCS + +APIFIX_DESC= Apply fix for Last.fm API 1.x +APIFIX_EXTRA_PATCHES_ON= ${FILESDIR}/extra-patch-xmms2-scrobbler.c post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/xmms2-scrobbler diff --git a/audio/xmms2-scrobbler/files/extra-patch-xmms2-scrobbler.c b/audio/xmms2-scrobbler/files/extra-patch-xmms2-scrobbler.c new file mode 100644 index 00000000000..84380c0cf4d --- /dev/null +++ b/audio/xmms2-scrobbler/files/extra-patch-xmms2-scrobbler.c @@ -0,0 +1,196 @@ +--- src/xmms2-scrobbler.c.orig 2009-12-30 17:04:01 UTC ++++ src/xmms2-scrobbler.c +@@ -140,93 +140,126 @@ signal_handler (int sig) + keep_running = false; + } + +-static size_t +-handle_handshake_reponse (void *rawptr, size_t size, size_t nmemb, +- void *data) +-{ +- Server *server = data; +- size_t total = size * nmemb, left = total; +- char *ptr = rawptr, *newline; +- int len; ++char * get_line_from_response (char *answer, int lfpos) { ++ int lfpositions[10]; ++ int i, k, lfcounter, start, end, resultlen; + +- newline = memchr (ptr, '\n', left); +- if (!newline) { +- fprintf (stderr, "no newline (1)\n"); +- return total; +- } ++ char *result; + +- *newline = 0; ++#ifdef DEBUG ++ fprintf (stderr, "DEBUG: got string: %s\n", answer); ++#endif + +- if (strcmp (ptr, "OK")) { +- fprintf (stderr, "handshake failed\n"); +- return total; ++ /* marking the string */ ++ i = 0; ++ lfcounter = 0; ++ while (answer[i] != '\0') { ++ if (answer[i] == '\n' && lfcounter < 10) { ++ lfpositions[lfcounter] = i; ++ lfcounter++; ++#ifdef DEBUG ++ fprintf (stderr, "DEBUG: got LF location: %d\n", i); ++#endif + } ++ i++; ++ } ++ /* getting the actual line */ ++ /* getting the size of it */ + +- len = newline - ptr + 1; ++ start = lfpos - 1; ++ end = lfpos; ++#ifdef DEBUG ++ if (start >= 0) { ++ fprintf (stderr, "DEBUG: requested line starts at char no. %d and ends at %d.\n", lfpositions[start], lfpositions[end]); ++ } else { ++ fprintf (stderr, "DEBUG: requested line starts at the start of string and ends at char no. %d.\n", lfpositions[end]); ++ } ++#endif + +- left -= len; +- ptr += len; ++ if (start >= 0) { ++ resultlen = lfpositions[end] - lfpositions[start] + 1; ++ } else { ++ resultlen = lfpositions[end] + 1; ++ } ++#ifdef DEBUG ++ fprintf (stderr, "DEBUG: requested line will need %d bytes.\n", resultlen); ++#endif ++ result = malloc(resultlen); ++ bzero(result, resultlen); + +- newline = memchr (ptr, '\n', left); +- if (!newline) { +- fprintf (stderr, "no newline (1)\n"); +- return total; ++ /* bytecopying the line */ ++#ifdef DEBUG ++ if (start >= 0) { ++ fprintf (stderr, "DEBUG: copying the string from char no. %d to %d.\n", lfpositions[start], lfpositions[end]); ++ } else { ++ fprintf (stderr, "DEBUG: copying the string from the beginning to char no. %d.\n", lfpositions[end]); ++ } ++#endif ++ k = 0; ++ if (start >= 0) { ++ i = lfpositions[start]; ++ } else { ++ i = 0; ++ } ++ while (i < lfpositions[end]) { ++ /* don't copy LF themselves */ ++ if (answer[i] != '\n') { ++ result[k] = answer[i]; ++ k++; + } ++ i++; ++ } + +- *newline = 0; +- +- len = newline - ptr + 1; ++#ifdef DEBUG ++ fprintf (stderr, "DEBUG: returning string: %s\n", result); ++#endif ++ return(result); ++} + +- if (len > 255) { +- fprintf (stderr, "session ID is too long (%i characters)\n", len); +- return total; +- } ++static size_t ++handle_handshake_reponse (void *rawptr, size_t size, size_t nmemb, ++ void *data) ++{ ++ Server *server; ++ size_t total, left; ++ char *ptr, *status, *sessionid, *np_url, *subm_url; + +- strcpy (server->session_id, ptr); ++ server = data; ++ ptr = rawptr; ++ total = size * nmemb; ++ left = total; + +- left -= len; +- ptr += len; ++#ifdef DEBUG ++ fprintf (stderr, "DEBUG: got string \"%s\".\n", rawptr); ++#endif + +- /* now playing URL */ +- newline = memchr (ptr, '\n', left); +- if (!newline) { +- fprintf (stderr, "no newline (2)\n"); +- return total; ++ status = get_line_from_response(rawptr, 0); ++ ++ if (strcmp(status, "OK") != 0) { ++ fprintf (stderr, "WARNING: handshake failed: %s.\n", status); ++ return(total); + } + +- *newline = 0; +- +- len = newline - ptr + 1; +- +- if (len > 255) { +- fprintf (stderr, "now_playing URL is too long " +- "(%i characters)\n", len); +- return total; ++ sessionid = get_line_from_response(rawptr, 3); ++ if (strlen(sessionid) > 255) { ++ fprintf (stderr, "ERROR: session ID is too long (%ld characters).\n", strlen(sessionid)); ++ return(total); + } ++ strcpy (server->session_id, sessionid); + +- strcpy (server->np_url, ptr); +- +- left -= len; +- ptr += len; +- +- /* submission URL */ +- newline = memchr (ptr, '\n', left); +- if (!newline) { +- printf("no newline (3)\n"); +- return total; ++ np_url = get_line_from_response(rawptr, 6); ++ if (strlen(np_url) > 255) { ++ fprintf (stderr, "ERROR: nowplaying URL is too long (%ld characters).\n", strlen(np_url)); ++ return(total); + } ++ strcpy (server->np_url, np_url); + +- *newline = 0; +- +- len = newline - ptr + 1; +- +- if (len > 255) { +- fprintf (stderr, "submission URL is too long " +- "(%i characters)\n", len); +- return total; ++ subm_url = get_line_from_response(rawptr, 9); ++ if (strlen(sessionid) > 255) { ++ fprintf (stderr, "ERROR: submission URL is too long (%ld characters).\n", strlen(subm_url)); ++ return(total); + } +- +- strcpy (server->subm_url, ptr); ++ strcpy (server->subm_url, subm_url); + + fprintf (stderr, "got:\n'%s' '%s' '%s'\n", + server->session_id, server->np_url, server->subm_url); diff --git a/cad/linuxcnc-devel/Makefile b/cad/linuxcnc-devel/Makefile index 00b164103a7..b3c9fe517a8 100644 --- a/cad/linuxcnc-devel/Makefile +++ b/cad/linuxcnc-devel/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= linuxcnc -PORTVERSION= 20160626 -PORTREVISION= 5 +PORTVERSION= 20170708 CATEGORIES= cad PKGNAMESUFFIX= -devel @@ -12,7 +11,7 @@ COMMENT= Open Source CNC machine controller LICENSE= GPLv2 -BROKEN= fails to build, too few arguments to modbus_set_response_timeout +BROKEN_FreeBSD_10= Does not build LIB_DEPENDS= libBLT25.so:x11-toolkits/blt \ libboost_python.so:devel/boost-python-libs \ @@ -29,31 +28,38 @@ RUN_DEPENDS= bash:shells/bash \ ${LOCALBASE}/lib/Img/libtkimg1.4.6.so:graphics/libimg BUILD_DEPENDS= ${RUN_DEPENDS} +# Workaround for a clang crash on 12-CURRENT. +BUILD_DEPENDS+= clang38:lang/clang38 +CC= clang38 +CXX= clang++38 + NO_PACKAGE= Licensing conflict between LinuxCNC (GPL2) and readline (GPL3) -WRKSRC_SUBDIR= src +WRKSRC_SUBDIR= src PATCH_WRKSRC= ${WRKDIR}/linuxcnc-${GH_TAGNAME} ALL_TARGET= default GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-realtime=uspace --enable-non-distributable=yes \ CFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" \ - CXXFLAGS="-I${LOCALBASE}/include" CXX=c++ CC=cc \ + CXXFLAGS="-I${LOCALBASE}/include" CXX="${CXX}" CC="${CC}" \ --with-locale-dir="${PREFIX}/share/locale" --with-python=${PYTHON_CMD} MAKE_ENV= BUILD_VERBOSE=1 USES= autoreconf gettext gmake ncurses pkgconfig python readline shebangfix tk USE_GL= gl glu -USE_GNOME= cairo gdkpixbuf2 pygtksourceview +USE_GNOME= cairo gdkpixbuf2 libgnomeprintui pygtksourceview USE_XORG= ice sm x11 xext xft xinerama xmu xrender xscrnsaver xt USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= LinuxCNC -GH_TAGNAME= fe7b155c03fe77d6eb301bcfdc3d7c1acdea73e4 +GH_TAGNAME= 5b7929df50e0574cb1105143fffe525916d8a4c2 post-patch: - ${FIND} ${PATCH_WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} \ + ${FIND} ${PATCH_WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} -i '' \ -e 's|#!.*/bin/bash|#!${LOCALBASE}/bin/bash|' \ -e 's|#!.*/usr/bin/tclsh|#!${LOCALBASE}/bin/tclsh8.6|' \ - -e 's|#!.*/usr/bin/wish|#!${LOCALBASE}/bin/wish8.6|' + -e 's|#!.*/usr/bin/wish|#!${LOCALBASE}/bin/wish8.6|' \ + -e 's|#!.*/usr/bin/python|#!${LOCALBASE}/bin/env python2|' \ + -e 's|#!.*/usr/bin/env python|#!/usr/bin/env python2|' .include diff --git a/cad/linuxcnc-devel/distinfo b/cad/linuxcnc-devel/distinfo index 61635c00ec7..fdc79d87f63 100644 --- a/cad/linuxcnc-devel/distinfo +++ b/cad/linuxcnc-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1466926499 -SHA256 (LinuxCNC-linuxcnc-20160626-fe7b155c03fe77d6eb301bcfdc3d7c1acdea73e4_GH0.tar.gz) = f48c622e54c269569471dd89dcf888795e8e80b4cddb16040951a46f6b679c72 -SIZE (LinuxCNC-linuxcnc-20160626-fe7b155c03fe77d6eb301bcfdc3d7c1acdea73e4_GH0.tar.gz) = 24689564 +TIMESTAMP = 1499364969 +SHA256 (LinuxCNC-linuxcnc-20170708-5b7929df50e0574cb1105143fffe525916d8a4c2_GH0.tar.gz) = a2a58b70e705494faa048163ac59603378d705b4406fe3ae09d6aa8eee0585c5 +SIZE (LinuxCNC-linuxcnc-20170708-5b7929df50e0574cb1105143fffe525916d8a4c2_GH0.tar.gz) = 25331064 diff --git a/cad/linuxcnc-devel/files/patch-src_Makefile b/cad/linuxcnc-devel/files/patch-src_Makefile index d2dafd9fe7c..19eebc379d3 100644 --- a/cad/linuxcnc-devel/files/patch-src_Makefile +++ b/cad/linuxcnc-devel/files/patch-src_Makefile @@ -1,6 +1,6 @@ ---- src/Makefile.orig 2016-06-25 02:19:12 UTC -+++ src/Makefile -@@ -183,7 +183,7 @@ $(shell $(VECHO) 1>&2 Done reading depen +--- src/Makefile.orig 2017-07-08 02:09:02.000000000 +0100 ++++ src/Makefile 2017-07-06 12:52:07.633525000 +0100 +@@ -183,7 +183,7 @@ $(shell $(VECHO) 1>&2 Done reading dependencies) endif # Each directory in $(INCLUDES) is passed as a -I directory when compiling. @@ -24,7 +24,7 @@ endif # Rules to make .o (object) files -@@ -498,7 +500,7 @@ $(patsubst %,../include/%,$(wildcard *.h +@@ -501,7 +503,7 @@ $(patsubst %,../include/%,$(wildcard *.hh)): ../includ DIR=install -d -m 0755 -o root FILE=install -m 0644 -o root @@ -33,7 +33,7 @@ CONFIGFILE=install -m 0644 EXE=install -m 0755 -o root SETUID=install -m 4755 -o root -@@ -546,7 +548,7 @@ install-dirs: +@@ -549,7 +551,7 @@ install-dirs: $(DESTDIR)$(sysconfdir)/linuxcnc $(DESTDIR)$(bindir) \ $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)/linuxcnc \ $(DESTDIR)$(docsdir) $(DESTDIR)$(ncfilesdir) \ @@ -42,9 +42,9 @@ $(DESTDIR)$(tcldir)/scripts \ $(DESTDIR)$(mandir)/man1 \ $(DESTDIR)$(mandir)/man3 \ -@@ -600,15 +602,14 @@ install-kernel-indep: install-dirs - $(EXE) ../scripts/gladevcp_demo $(DESTDIR)$(bindir) +@@ -605,14 +607,13 @@ install-kernel-indep: install-dirs $(EXE) ../scripts/linuxcncmkdesktop $(DESTDIR)$(bindir) + $(EXE) ../scripts/update_ini $(DESTDIR)$(bindir) $(FILE) $(filter ../lib/%.a ../lib/%.so.0,$(TARGETS)) $(DESTDIR)$(libdir) - cp --no-dereference $(filter ../lib/%.so, $(TARGETS)) $(DESTDIR)$(libdir) - -ldconfig $(DESTDIR)$(libdir) @@ -55,13 +55,11 @@ $(TREE) $(NC_FILES) $(DESTDIR)$(ncfilesdir) $(EXE) ../nc_files/M101 $(DESTDIR)$(ncfilesdir) - $(FILE) ../tcl/TkLinuxCNC $(DESTDIR)/etc/X11/app-defaults -- $(FILE) ../app-defaults/XEmc $(DESTDIR)/etc/X11/app-defaults + $(FILE) ../tcl/TkLinuxCNC $(DESTDIR)$(prefix)/share/X11/app-defaults -+ $(FILE) ../app-defaults/XEmc $(DESTDIR)$(prefix)/share/X11/app-defaults $(FILE) Makefile.modinc $(DESTDIR)$(datadir)/linuxcnc $(EXE) $(TCL) $(DESTDIR)$(tcldir) $(FILE) ../tcl/hal.so $(DESTDIR)$(tcldir) -@@ -713,6 +714,7 @@ endif +@@ -720,6 +721,7 @@ endif # that's what kbuild seems to require EXTRA_CFLAGS := $(filter-out -ffast-math,$(RTFLAGS)) -D__MODULE__ -I$(BASEPWD) -I$(BASEPWD)/libnml/linklist \ @@ -69,24 +67,24 @@ -I$(BASEPWD)/libnml/cms -I$(BASEPWD)/libnml/rcs -I$(BASEPWD)/libnml/inifile \ -I$(BASEPWD)/libnml/os_intf -I$(BASEPWD)/libnml/nml -I$(BASEPWD)/libnml/buffer \ -I$(BASEPWD)/libnml/posemath -I$(BASEPWD)/rtapi -I$(BASEPWD)/hal \ -@@ -823,11 +825,11 @@ hal_gm-objs := hal/drivers/hal_gm.o $(MA +@@ -830,11 +832,11 @@ hal_gm-objs := hal/drivers/hal_gm.o $(MATHSTUB) obj-$(CONFIG_HAL_PPMC) += hal_ppmc.o hal_ppmc-objs := hal/drivers/hal_ppmc.o $(MATHSTUB) -obj-$(CONFIG_HOSTMOT2) += hostmot2.o hm2_test.o hm2_pci.o hm2_7i43.o hm2_7i90.o setsserial.o -ifeq ($(BUILD_SYS),uspace) --obj-$(CONFIG_HOSTMOT2) += hm2_eth.o hm2_spi.o +-obj-$(CONFIG_HOSTMOT2) += hm2_eth.o hm2_spi.o hm2_rpspi.o hal_bb_gpio.o -endif -hostmot2-objs := \ +#obj-$(CONFIG_HOSTMOT2) += hostmot2.o hm2_test.o hm2_pci.o hm2_7i43.o hm2_7i90.o setsserial.o +#ifeq ($(BUILD_SYS),uspace) -+#obj-$(CONFIG_HOSTMOT2) += hm2_eth.o hm2_spi.o ++#obj-$(CONFIG_HOSTMOT2) += hm2_eth.o hm2_spi.o hm2_rpspi.o hal_bb_gpio.o +#endif +#hostmot2-objs := \ hal/drivers/mesa-hostmot2/hostmot2.o \ hal/drivers/mesa-hostmot2/ioport.o \ hal/drivers/mesa-hostmot2/encoder.o \ -@@ -848,29 +850,29 @@ hostmot2-objs := \ +@@ -855,35 +857,35 @@ hostmot2-objs := \ hal/drivers/mesa-hostmot2/raw.o \ hal/drivers/mesa-hostmot2/bitfile.o \ $(MATHSTUB) @@ -113,6 +111,14 @@ +#hm2_spi-objs := \ hal/drivers/mesa-hostmot2/hm2_spi.o \ $(MATHSTUB) +-hm2_rpspi-objs := \ ++#hm2_rpspi-objs := \ + hal/drivers/mesa-hostmot2/hm2_rpspi.o \ + $(MATHSTUB) +-hal_bb_gpio-objs := \ ++#hal_bb_gpio-objs := \ + hal/drivers/hal_bb_gpio.o \ + $(MATHSTUB) -hm2_test-objs := \ +#hm2_test-objs := \ hal/drivers/mesa-hostmot2/hm2_test.o \ @@ -123,9 +129,9 @@ hal/drivers/mesa-hostmot2/setsserial.o \ $(MATHSTUB) -@@ -1045,13 +1047,13 @@ endif - ../rtlib/pumakins$(MODULE_EXT): $(addprefix objects/rt,$(pumakins-objs)) - ../rtlib/scarakins$(MODULE_EXT): $(addprefix objects/rt,$(scarakins-objs)) +@@ -1083,13 +1085,13 @@ endif + ../rtlib/rosekins$(MODULE_EXT): $(addprefix objects/rt,$(rosekins-objs)) + ../rtlib/scorbot-kins$(MODULE_EXT): $(addprefix objects/rt,$(scorbot-kins-objs)) ../rtlib/hal_gm$(MODULE_EXT): $(addprefix objects/rt,$(hal_gm-objs)) -../rtlib/hostmot2$(MODULE_EXT): $(addprefix objects/rt,$(hostmot2-objs)) -../rtlib/hm2_test$(MODULE_EXT): $(addprefix objects/rt,$(hm2_test-objs)) diff --git a/cad/linuxcnc-devel/files/patch-src_emc_rs274ngc_rs274ngc_pre.cc b/cad/linuxcnc-devel/files/patch-src_emc_rs274ngc_rs274ngc_pre.cc new file mode 100644 index 00000000000..2a890047c54 --- /dev/null +++ b/cad/linuxcnc-devel/files/patch-src_emc_rs274ngc_rs274ngc_pre.cc @@ -0,0 +1,15 @@ +--- src/emc/rs274ngc/rs274ngc_pre.cc.orig 2017-07-25 12:21:19.816453000 +0100 ++++ src/emc/rs274ngc/rs274ngc_pre.cc 2017-07-25 12:22:07.230714000 +0100 +@@ -1924,7 +1924,12 @@ int Interp::save_parameters(const char *filename, + } + + fflush(outfile); ++#ifdef __FreeBSD__ ++ /* No fdatasync(2) in FreeBSD 11.0. */ ++ fsync(fileno(outfile)); ++#else + fdatasync(fileno(outfile)); ++#endif + fclose(outfile); + std::string bakfile = std::string(filename) + + RS274NGC_PARAMETER_FILE_BACKUP_SUFFIX; diff --git a/cad/linuxcnc-devel/files/patch-src_rtapi_rtapi__uspace.hh b/cad/linuxcnc-devel/files/patch-src_rtapi_rtapi__uspace.hh deleted file mode 100644 index 88b352ab5da..00000000000 --- a/cad/linuxcnc-devel/files/patch-src_rtapi_rtapi__uspace.hh +++ /dev/null @@ -1,24 +0,0 @@ ---- src/rtapi/rtapi_uspace.hh.orig 2016-06-25 02:19:12 UTC -+++ src/rtapi/rtapi_uspace.hh -@@ -17,14 +17,21 @@ - */ - #ifndef RTAPI_USPACE_HH - #define RTAPI_USPACE_HH -+#ifdef __linux__ - #include -+#endif - #include - #include - - struct WithRoot - { -+#ifdef __linux__ - WithRoot() { if(!level) setfsuid(geteuid()); level++; } - ~WithRoot() { --level; if(!level) setfsuid(getuid()); } -+#else -+ WithRoot() { if(!level) level++; } -+ ~WithRoot() { --level; if(!level) seteuid(getuid()); } -+#endif - static int level; - }; - diff --git a/cad/linuxcnc-devel/files/patch-src_rtapi_uspace__common.h b/cad/linuxcnc-devel/files/patch-src_rtapi_uspace__common.h deleted file mode 100644 index 036dcde2c5a..00000000000 --- a/cad/linuxcnc-devel/files/patch-src_rtapi_uspace__common.h +++ /dev/null @@ -1,45 +0,0 @@ ---- src/rtapi/uspace_common.h.orig 2016-06-25 02:19:12 UTC -+++ src/rtapi/uspace_common.h -@@ -85,6 +85,7 @@ int rtapi_shmem_new(int key, int module_ - if(res < 0) perror("shmctl IPC_SET"); - } - -+#ifdef __linux__ - #ifdef RTAPI - if(rtapi_is_realtime()) - { -@@ -99,6 +100,7 @@ int rtapi_shmem_new(int key, int module_ - "shared memory segment not locked as requested\n"); - } - #endif -+#endif - - /* and map it into process space */ - shmem->mem = shmat(shmem->id, 0, 0); -@@ -261,7 +263,7 @@ long long rtapi_get_time(void) { - return ts.tv_sec * 1000000000LL + ts.tv_nsec; - } - --#if defined(__i386) || defined(__amd64) -+#if defined(__linux__) && (defined(__i386) || defined(__amd64)) - #define rdtscll(val) ((val) = __builtin_ia32_rdtsc()) - #else - #define rdtscll(val) ((val) = rtapi_get_time()) -@@ -327,6 +329,7 @@ int rtapi_exit(int module_id) - int rtapi_is_kernelspace() { return 0; } - static int _rtapi_is_realtime = -1; - static int detect_realtime() { -+#ifdef __linux__ - struct utsname u; - int crit1, crit2 = 0, crit3 = 0; - FILE *fd; -@@ -346,6 +349,9 @@ static int detect_realtime() { - crit3 = 1; - - return crit1 && crit2 && crit3; -+#else -+ return 0; -+#endif - } - - int rtapi_is_realtime() { diff --git a/cad/linuxcnc-devel/files/patch-src_rtapi_uspace__rtapi__app.cc b/cad/linuxcnc-devel/files/patch-src_rtapi_uspace__rtapi__app.cc deleted file mode 100644 index 7c71b2e94d3..00000000000 --- a/cad/linuxcnc-devel/files/patch-src_rtapi_uspace__rtapi__app.cc +++ /dev/null @@ -1,125 +0,0 @@ ---- src/rtapi/uspace_rtapi_app.cc.orig 2016-06-25 02:19:12 UTC -+++ src/rtapi/uspace_rtapi_app.cc -@@ -17,7 +17,9 @@ - - #include "config.h" - -+#ifdef __linux__ - #include -+#endif - #include - #include - #include -@@ -42,8 +44,13 @@ - #endif - #include - #include --#include -+#ifdef __linux__ - #include -+#endif -+#ifdef __FreeBSD__ -+#include -+#endif -+ - - #include "config.h" - -@@ -56,6 +63,10 @@ - #include /* shmget() */ - #include - -+#ifndef __linux__ -+#define cpu_set_t cpuset_t -+#endif -+ - static int rtapi_clock_nanosleep(clockid_t clock_id, int flags, - const struct timespec *prequest, struct timespec *remain, - const struct timespec *pnow); -@@ -462,7 +473,11 @@ int main(int argc, char **argv) { - "Running with fallback_uid. getuid()=%d geteuid()=%d\n", - getuid(), geteuid()); - } -+#ifdef __linux__ - setfsuid(getuid()); -+#else -+ seteuid(getuid()); -+#endif - vector args; - for(int i=1; i(malloc(PRE_ALLOC_SIZE)); - if (buf == NULL) { - rtapi_print_msg(RTAPI_MSG_WARN, "malloc(PRE_ALLOC_SIZE) failed\n"); -@@ -617,9 +634,12 @@ static void configure_memory() - - static int harden_rt() - { -+ struct sigaction sig_act = {}; -+ - if(!rtapi_is_realtime()) return -EINVAL; - - WITH_ROOT; -+#ifdef __linux__ - #if defined(__x86_64__) || defined(__i386__) - if (iopl(3) < 0) { - rtapi_print_msg(RTAPI_MSG_ERR, -@@ -629,7 +649,6 @@ static int harden_rt() - } - #endif - -- struct sigaction sig_act = {}; - // enable realtime - if (setrlimit(RLIMIT_RTPRIO, &unlimited) < 0) - { -@@ -638,18 +657,20 @@ static int harden_rt() - strerror(errno)); - return -errno; - } -+#endif /* __linux__ */ - - // enable core dumps - if (setrlimit(RLIMIT_CORE, &unlimited) < 0) - rtapi_print_msg(RTAPI_MSG_WARN, - "setrlimit: %s - core dumps may be truncated or non-existant\n", - strerror(errno)); -- -+#ifdef __linux__ - // even when setuid root - if (prctl(PR_SET_DUMPABLE, 1) < 0) - rtapi_print_msg(RTAPI_MSG_WARN, - "prctl(PR_SET_DUMPABLE) failed: no core dumps will be created - %d - %s\n", - errno, strerror(errno)); -+#endif /* __linux__ */ - - configure_memory(); - -@@ -669,6 +690,7 @@ static int harden_rt() - sigaction(SIGTERM, &sig_act, (struct sigaction *) NULL); - sigaction(SIGINT, &sig_act, (struct sigaction *) NULL); - -+#ifdef __linux__ - int fd = open("/dev/cpu_dma_latency", O_WRONLY | O_CLOEXEC); - if (fd < 0) { - rtapi_print_msg(RTAPI_MSG_WARN, "failed to open /dev/cpu_dma_latency: %s\n", strerror(errno)); -@@ -682,6 +704,7 @@ static int harden_rt() - } - // deliberately leak fd until program exit - } -+#endif /* __linux__ */ - return 0; - } - diff --git a/cad/linuxcnc-devel/pkg-plist b/cad/linuxcnc-devel/pkg-plist index 02119d2b3a7..27c08e71236 100644 --- a/cad/linuxcnc-devel/pkg-plist +++ b/cad/linuxcnc-devel/pkg-plist @@ -1,6 +1,3 @@ -share/X11/app-defaults/TkLinuxCNC -share/X11/app-defaults/XEmc -etc/rc.d/realtime bin/5axisgui bin/axis bin/axis-remote @@ -18,6 +15,7 @@ bin/hal-histogram bin/hal_input bin/hal_manualtoolchange bin/halcmd +bin/halcmd_twopass bin/halcompile bin/halmeter bin/halrmt @@ -30,17 +28,19 @@ bin/haltcl bin/halui bin/hbmgui bin/hexagui +bin/hy_gt_vfd bin/hy_vfd bin/image-to-gcode bin/inivar bin/io bin/iov2 -bin/keystick bin/latency-histogram bin/latency-plot bin/latency-test +bin/lineardelta bin/linuxcnc bin/linuxcnc_info +bin/linuxcnc_module_helper bin/linuxcnc_var bin/linuxcnclcd bin/linuxcncmkdesktop @@ -52,6 +52,7 @@ bin/max5gui bin/mb2hal bin/mdi bin/milltask +bin/mitsub_vfd bin/monitor-xhc-hb04 bin/motion-logger bin/moveoff_gui @@ -64,23 +65,29 @@ bin/pyngcgui bin/pyui bin/pyvcp bin/pyvcp_demo +bin/rotarydelta bin/rs274 bin/rtapi_app bin/scaragui bin/schedrmt +bin/scorbot-er-3 bin/sim_pin bin/simulate_probe bin/stepconf +bin/teach-in bin/thermistor bin/tooledit bin/touchy +bin/update_ini bin/vfdb_vfd bin/vfs11_vfd bin/wj200_vfd bin/xhc-hb04 bin/xhc-hb04-accels -bin/xlinuxcnc -etc/linuxcnc/rtapi.conf +bin/xyzac-trt-gui +bin/xyzbc-trt-gui +%%ETCDIR%%/rtapi.conf +etc/rc.d/realtime include/linuxcnc/_sem.h include/linuxcnc/_shm.h include/linuxcnc/_timer.h @@ -118,6 +125,7 @@ include/linuxcnc/iniaxis.hh include/linuxcnc/inifile.h include/linuxcnc/inifile.hh include/linuxcnc/inihal.hh +include/linuxcnc/inijoint.hh include/linuxcnc/initool.hh include/linuxcnc/initraj.hh include/linuxcnc/interp_base.hh @@ -175,6 +183,7 @@ include/linuxcnc/sem.hh include/linuxcnc/sendn.h include/linuxcnc/shm.hh include/linuxcnc/shmem.hh +include/linuxcnc/simple_tp.h include/linuxcnc/sincos.h include/linuxcnc/spherical_arc.h include/linuxcnc/stat_msg.hh @@ -235,10 +244,12 @@ lib/linuxcnc/modules/conv_s32_u32.so lib/linuxcnc/modules/conv_u32_bit.so lib/linuxcnc/modules/conv_u32_float.so lib/linuxcnc/modules/conv_u32_s32.so +lib/linuxcnc/modules/corexykins.so lib/linuxcnc/modules/counter.so lib/linuxcnc/modules/ddt.so lib/linuxcnc/modules/deadzone.so lib/linuxcnc/modules/debounce.so +lib/linuxcnc/modules/differential.so lib/linuxcnc/modules/edge.so lib/linuxcnc/modules/encoder.so lib/linuxcnc/modules/encoder_ratio.so @@ -246,7 +257,6 @@ lib/linuxcnc/modules/estop_latch.so lib/linuxcnc/modules/feedcomp.so lib/linuxcnc/modules/flipflop.so lib/linuxcnc/modules/gantry.so -lib/linuxcnc/modules/gantrykins.so lib/linuxcnc/modules/gearchange.so lib/linuxcnc/modules/genhexkins.so lib/linuxcnc/modules/genserkins.so @@ -268,6 +278,7 @@ lib/linuxcnc/modules/limit1.so lib/linuxcnc/modules/limit2.so lib/linuxcnc/modules/limit3.so lib/linuxcnc/modules/lincurve.so +lib/linuxcnc/modules/lineardeltakins.so lib/linuxcnc/modules/logic.so lib/linuxcnc/modules/lowpass.so lib/linuxcnc/modules/lut5.so @@ -299,12 +310,15 @@ lib/linuxcnc/modules/orient.so lib/linuxcnc/modules/pid.so lib/linuxcnc/modules/pumakins.so lib/linuxcnc/modules/pwmgen.so +lib/linuxcnc/modules/rosekins.so +lib/linuxcnc/modules/rotarydeltakins.so lib/linuxcnc/modules/rotatekins.so lib/linuxcnc/modules/sample_hold.so lib/linuxcnc/modules/sampler.so lib/linuxcnc/modules/scale.so lib/linuxcnc/modules/scarakins.so lib/linuxcnc/modules/scope_rt.so +lib/linuxcnc/modules/scorbot-kins.so lib/linuxcnc/modules/select8.so lib/linuxcnc/modules/serport.so lib/linuxcnc/modules/siggen.so @@ -340,6 +354,8 @@ lib/linuxcnc/modules/wcomp.so lib/linuxcnc/modules/weighted_sum.so lib/linuxcnc/modules/xhc_hb04_util.so lib/linuxcnc/modules/xor2.so +lib/linuxcnc/modules/xyzac-trt-kins.so +lib/linuxcnc/modules/xyzbc-trt-kins.so lib/tcltk/linuxcnc/bin/emccalib.tcl lib/tcltk/linuxcnc/bin/emcdebug.tcl lib/tcltk/linuxcnc/bin/emctesting.tcl @@ -353,7 +369,6 @@ lib/tcltk/linuxcnc/bin/tkbackplot.tcl lib/tcltk/linuxcnc/hal.so lib/tcltk/linuxcnc/linuxcnc.so lib/tcltk/linuxcnc/linuxcnc.tcl -lib/tcltk/linuxcnc/mini.tcl lib/tcltk/linuxcnc/msgs/de.msg lib/tcltk/linuxcnc/msgs/es.msg lib/tcltk/linuxcnc/msgs/fi.msg @@ -392,6 +407,8 @@ man/man1/elbpcom.1.gz man/man1/gladevcp.1.gz man/man1/gs2.1.gz man/man1/hal_input.1.gz +man/man1/hal_manualtoolchange.1.gz +man/man1/hal_parport.1.gz man/man1/halcmd.1.gz man/man1/halcompile.1.gz man/man1/halmeter.1.gz @@ -492,6 +509,7 @@ man/man3/rtapi_is.3rtapi.gz man/man3/rtapi_list.3rtapi.gz man/man3/rtapi_module_param.3rtapi.gz man/man3/rtapi_mutex.3rtapi.gz +man/man3/rtapi_open_as_root.3rtapi.gz man/man3/rtapi_outb.3rtapi.gz man/man3/rtapi_parport.3rtapi.gz man/man3/rtapi_pci.3rtapi.gz @@ -532,15 +550,19 @@ man/man9/encoder_ratio.9.gz man/man9/gantrykins.9.gz man/man9/genhexkins.9.gz man/man9/genserkins.9.gz +man/man9/gentrivkins.9.gz man/man9/gladevcp.9.gz +man/man9/hal_bb_gpio.9.gz man/man9/hm2_7i43.9.gz man/man9/hm2_7i90.9.gz man/man9/hm2_eth.9.gz man/man9/hm2_pci.9.gz +man/man9/hm2_rpspi.9.gz man/man9/hm2_spi.9.gz man/man9/hostmot2.9.gz man/man9/kins.9.gz man/man9/lcd.9.gz +man/man9/lineardeltakins.9.gz man/man9/matrix_kb.9.gz man/man9/maxkins.9.gz man/man9/motion.9.gz @@ -549,6 +571,7 @@ man/man9/opto_ac5.9.gz man/man9/pid.9.gz man/man9/pumakins.9.gz man/man9/pwmgen.9.gz +man/man9/rosekins.9.gz man/man9/rotatekins.9.gz man/man9/sampler.9.gz man/man9/scarakins.9.gz @@ -563,6 +586,7 @@ man/man9/tripodkins.9.gz man/man9/trivkins.9.gz man/man9/watchdog.9.gz man/man9/weighted_sum.9.gz +share/X11/app-defaults/TkLinuxCNC share/axis/images/axis-16x16.png share/axis/images/axis-24x24.png share/axis/images/axis-32x32.png @@ -570,21 +594,9 @@ share/axis/images/axis-48x48.png share/axis/images/axis-lathe.ngc share/axis/images/axis.ngc share/axis/images/banner.gif -share/axis/images/cba0.gif -share/axis/images/cba1.gif -share/axis/images/cbd0.gif -share/axis/images/cbd1.gif -share/axis/images/cbn0.gif -share/axis/images/cbn1.gif share/axis/images/close.gif share/axis/images/downarrow.xbm share/axis/images/leftarrow.xbm -share/axis/images/rba0.gif -share/axis/images/rba1.gif -share/axis/images/rbd0.gif -share/axis/images/rbd1.gif -share/axis/images/rbn0.gif -share/axis/images/rbn1.gif share/axis/images/resume_inhibit.gif share/axis/images/rightarrow.xbm share/axis/images/spindle_ccw.gif @@ -615,10 +627,8 @@ share/axis/images/tool_zoomout.gif share/axis/images/uparrow.xbm share/axis/tcl/accel.tcl share/axis/tcl/axis.tcl -share/axis/tcl/cb.tcl share/axis/tcl/combobox.tcl share/axis/tcl/dialog.tcl -share/axis/tcl/rb.tcl share/axis/tcl/sb.tcl share/axis/tcl/support.tcl share/doc/linuxcnc/AUTHORS @@ -745,6 +755,14 @@ share/doc/linuxcnc/examples/sample-configs/attic/demo_mazak/demo_mazak.ini share/doc/linuxcnc/examples/sample-configs/attic/demo_mazak/demo_mazak.tbl share/doc/linuxcnc/examples/sample-configs/attic/demo_mazak/tester.hal share/doc/linuxcnc/examples/sample-configs/attic/demo_mazak/tester.vcp +share/doc/linuxcnc/examples/sample-configs/attic/unclaimed/max/jogwheel.hal +share/doc/linuxcnc/examples/sample-configs/attic/unclaimed/max/max.hal +share/doc/linuxcnc/examples/sample-configs/attic/unclaimed/plasma-thc/mp1000A.hal +share/doc/linuxcnc/examples/sample-configs/attic/unclaimed/plasma-thc/mp1000A_parport.hal +share/doc/linuxcnc/examples/sample-configs/attic/unclaimed/plasma-thc/mp1000B.hal +share/doc/linuxcnc/examples/sample-configs/attic/unclaimed/plasma-thc/mp1000B_parport.hal +share/doc/linuxcnc/examples/sample-configs/attic/unclaimed/plasma-thc/stepper.hal +share/doc/linuxcnc/examples/sample-configs/attic/unclaimed/plasma-thc/thc300.hal share/doc/linuxcnc/examples/sample-configs/by_interface/README share/doc/linuxcnc/examples/sample-configs/by_interface/general_mechatronics/GM6-PCI/3-axis-servo.hal share/doc/linuxcnc/examples/sample-configs/by_interface/general_mechatronics/GM6-PCI/3-axis-servo.ini @@ -795,7 +813,6 @@ share/doc/linuxcnc/examples/sample-configs/by_interface/parport/classicladder/cl share/doc/linuxcnc/examples/sample-configs/by_interface/parport/classicladder/cl-estop/cl-estop.ini share/doc/linuxcnc/examples/sample-configs/by_interface/parport/classicladder/cl-estop/custom.hal share/doc/linuxcnc/examples/sample-configs/by_interface/parport/classicladder/cl-estop/custom_postgui.hal -share/doc/linuxcnc/examples/sample-configs/by_interface/parport/classicladder/cl-estop/emc.nml share/doc/linuxcnc/examples/sample-configs/by_interface/parport/classicladder/cl-estop/estop.clp share/doc/linuxcnc/examples/sample-configs/by_interface/parport/classicladder/cl-estop/panel.xml share/doc/linuxcnc/examples/sample-configs/by_interface/parport/classicladder/cl-estop/tool.tbl @@ -969,6 +986,12 @@ share/doc/linuxcnc/examples/sample-configs/by_machine/cooltool/stepper.tbl share/doc/linuxcnc/examples/sample-configs/by_machine/cooltool/uni-dreh-g_pinout.hal share/doc/linuxcnc/examples/sample-configs/by_machine/cooltool/uni-dreh-g_stepper.hal share/doc/linuxcnc/examples/sample-configs/by_machine/nc_files +share/doc/linuxcnc/examples/sample-configs/by_machine/scorbot-er-3/gripper.xml +share/doc/linuxcnc/examples/sample-configs/by_machine/scorbot-er-3/pyvcp.hal +share/doc/linuxcnc/examples/sample-configs/by_machine/scorbot-er-3/pyvcp.xml +share/doc/linuxcnc/examples/sample-configs/by_machine/scorbot-er-3/scorbot-er-3.hal +share/doc/linuxcnc/examples/sample-configs/by_machine/scorbot-er-3/scorbot-er-3.ini +share/doc/linuxcnc/examples/sample-configs/by_machine/scorbot-er-3/shuttlexpress-customization.hal share/doc/linuxcnc/examples/sample-configs/by_machine/sherline/README share/doc/linuxcnc/examples/sample-configs/by_machine/sherline/Sherline3Axis/README share/doc/linuxcnc/examples/sample-configs/by_machine/sherline/Sherline3Axis/Sherline3Axis_inch.ini @@ -1067,22 +1090,25 @@ share/doc/linuxcnc/examples/sample-configs/maintainer.txt share/doc/linuxcnc/examples/sample-configs/nc_files share/doc/linuxcnc/examples/sample-configs/sim/README share/doc/linuxcnc/examples/sample-configs/sim/axis/README -share/doc/linuxcnc/examples/sample-configs/sim/axis/acc_test.ini share/doc/linuxcnc/examples/sample-configs/sim/axis/axis.ini share/doc/linuxcnc/examples/sample-configs/sim/axis/axis_9axis.ini -share/doc/linuxcnc/examples/sample-configs/sim/axis/axis_foam.ini share/doc/linuxcnc/examples/sample-configs/sim/axis/axis_mm.ini share/doc/linuxcnc/examples/sample-configs/sim/axis/canterp.ini share/doc/linuxcnc/examples/sample-configs/sim/axis/canterp_example.can -share/doc/linuxcnc/examples/sample-configs/sim/axis/check_constraints.hal share/doc/linuxcnc/examples/sample-configs/sim/axis/classicladder/README share/doc/linuxcnc/examples/sample-configs/sim/axis/classicladder/classicladder.hal share/doc/linuxcnc/examples/sample-configs/sim/axis/classicladder/demo_sim_cl.clp share/doc/linuxcnc/examples/sample-configs/sim/axis/classicladder/demo_sim_cl.hal share/doc/linuxcnc/examples/sample-configs/sim/axis/classicladder/demo_sim_cl.ini share/doc/linuxcnc/examples/sample-configs/sim/axis/classicladder/demo_sim_cl.tbl -share/doc/linuxcnc/examples/sample-configs/sim/axis/foam.ngc +share/doc/linuxcnc/examples/sample-configs/sim/axis/corexy/corexy.ini +share/doc/linuxcnc/examples/sample-configs/sim/axis/corexy/corexy.txt +share/doc/linuxcnc/examples/sample-configs/sim/axis/foam/axis_foam.ini +share/doc/linuxcnc/examples/sample-configs/sim/axis/foam/foam.ngc share/doc/linuxcnc/examples/sample-configs/sim/axis/gantry.ini +share/doc/linuxcnc/examples/sample-configs/sim/axis/gantry_mm.hal +share/doc/linuxcnc/examples/sample-configs/sim/axis/gantry_mm.ini +share/doc/linuxcnc/examples/sample-configs/sim/axis/gantry_mm.tbl share/doc/linuxcnc/examples/sample-configs/sim/axis/gladevcp/README share/doc/linuxcnc/examples/sample-configs/sim/axis/gladevcp/gladevcp_panel.ini share/doc/linuxcnc/examples/sample-configs/sim/axis/gladevcp/gladevcp_tab.ini @@ -1109,12 +1135,13 @@ share/doc/linuxcnc/examples/sample-configs/sim/axis/halui_pyvcp/sim.tbl share/doc/linuxcnc/examples/sample-configs/sim/axis/halui_pyvcp/vcp.xml share/doc/linuxcnc/examples/sample-configs/sim/axis/histogram_demo.ini share/doc/linuxcnc/examples/sample-configs/sim/axis/histogram_demo.txt +share/doc/linuxcnc/examples/sample-configs/sim/axis/historical_lathe.ini share/doc/linuxcnc/examples/sample-configs/sim/axis/ini_hal_demo.ini share/doc/linuxcnc/examples/sample-configs/sim/axis/ini_hal_demo.txt share/doc/linuxcnc/examples/sample-configs/sim/axis/ini_with_includes/README -share/doc/linuxcnc/examples/sample-configs/sim/axis/ini_with_includes/axis_0.inc -share/doc/linuxcnc/examples/sample-configs/sim/axis/ini_with_includes/axis_1.inc -share/doc/linuxcnc/examples/sample-configs/sim/axis/ini_with_includes/axis_2.inc +share/doc/linuxcnc/examples/sample-configs/sim/axis/ini_with_includes/axis_x.inc +share/doc/linuxcnc/examples/sample-configs/sim/axis/ini_with_includes/axis_y.inc +share/doc/linuxcnc/examples/sample-configs/sim/axis/ini_with_includes/axis_z.inc share/doc/linuxcnc/examples/sample-configs/sim/axis/ini_with_includes/display.inc share/doc/linuxcnc/examples/sample-configs/sim/axis/ini_with_includes/emc.inc share/doc/linuxcnc/examples/sample-configs/sim/axis/ini_with_includes/emcio.inc @@ -1122,6 +1149,10 @@ share/doc/linuxcnc/examples/sample-configs/sim/axis/ini_with_includes/emcmot.inc share/doc/linuxcnc/examples/sample-configs/sim/axis/ini_with_includes/filter.inc share/doc/linuxcnc/examples/sample-configs/sim/axis/ini_with_includes/hal.inc share/doc/linuxcnc/examples/sample-configs/sim/axis/ini_with_includes/includes_demo.ini +share/doc/linuxcnc/examples/sample-configs/sim/axis/ini_with_includes/joint_0.inc +share/doc/linuxcnc/examples/sample-configs/sim/axis/ini_with_includes/joint_1.inc +share/doc/linuxcnc/examples/sample-configs/sim/axis/ini_with_includes/joint_2.inc +share/doc/linuxcnc/examples/sample-configs/sim/axis/ini_with_includes/kins.inc share/doc/linuxcnc/examples/sample-configs/sim/axis/ini_with_includes/rs274ngc.inc share/doc/linuxcnc/examples/sample-configs/sim/axis/ini_with_includes/sim.tbl share/doc/linuxcnc/examples/sample-configs/sim/axis/ini_with_includes/task.inc @@ -1145,6 +1176,25 @@ share/doc/linuxcnc/examples/sample-configs/sim/axis/iocontrolv2/toolchange-demo. share/doc/linuxcnc/examples/sample-configs/sim/axis/iocontrolv2/v2-tc.ui share/doc/linuxcnc/examples/sample-configs/sim/axis/iocontrolv2/v2_gladevcp_postgui.hal share/doc/linuxcnc/examples/sample-configs/sim/axis/iocontrolv2/v2_oword_gladevcp_postgui.hal +share/doc/linuxcnc/examples/sample-configs/sim/axis/ja_tests/xyzb_locking_indexer/README +share/doc/linuxcnc/examples/sample-configs/sim/axis/ja_tests/xyzb_locking_indexer/xyyzb.ini +share/doc/linuxcnc/examples/sample-configs/sim/axis/ja_tests/xyzb_locking_indexer/xyzb.hal +share/doc/linuxcnc/examples/sample-configs/sim/axis/ja_tests/xyzb_locking_indexer/xyzb.halshow +share/doc/linuxcnc/examples/sample-configs/sim/axis/ja_tests/xyzb_locking_indexer/xyzb.ini +share/doc/linuxcnc/examples/sample-configs/sim/axis/ja_tests/xyzx_mpg/README +share/doc/linuxcnc/examples/sample-configs/sim/axis/ja_tests/xyzx_mpg/xhc-hb04-postgui.hal +share/doc/linuxcnc/examples/sample-configs/sim/axis/ja_tests/xyzx_mpg/xhc-hb04.inc +share/doc/linuxcnc/examples/sample-configs/sim/axis/ja_tests/xyzx_mpg/xyzx-xhc-hb04.ini +share/doc/linuxcnc/examples/sample-configs/sim/axis/ja_tests/xyzx_mpg/xyzx.halshow +share/doc/linuxcnc/examples/sample-configs/sim/axis/ja_tests/xyzx_mpg/xyzx.ini +share/doc/linuxcnc/examples/sample-configs/sim/axis/ja_tests/xyzx_mpg/xyzx_base.inc +share/doc/linuxcnc/examples/sample-configs/sim/axis/ja_tests/xyzx_mpg/xyzx_jog.hal +share/doc/linuxcnc/examples/sample-configs/sim/axis/ja_tests/xz/README +share/doc/linuxcnc/examples/sample-configs/sim/axis/ja_tests/xz/xz.ini +share/doc/linuxcnc/examples/sample-configs/sim/axis/ja_tests/xz/xz.tbl +share/doc/linuxcnc/examples/sample-configs/sim/axis/ja_tests/xz/xz_both.ini +share/doc/linuxcnc/examples/sample-configs/sim/axis/ja_tests/xz/xz_both_auto.ini +share/doc/linuxcnc/examples/sample-configs/sim/axis/ja_tests/xz/xzbase.inc share/doc/linuxcnc/examples/sample-configs/sim/axis/lathe-fanucy/README share/doc/linuxcnc/examples/sample-configs/sim/axis/lathe-fanucy/lathe-fanucy.ini share/doc/linuxcnc/examples/sample-configs/sim/axis/lathe-fanucy/lathe-fanucy.tbl @@ -1155,7 +1205,10 @@ share/doc/linuxcnc/examples/sample-configs/sim/axis/lathe.ini share/doc/linuxcnc/examples/sample-configs/sim/axis/lathe.tbl share/doc/linuxcnc/examples/sample-configs/sim/axis/lathe.xml share/doc/linuxcnc/examples/sample-configs/sim/axis/lathe_postgui.hal -share/doc/linuxcnc/examples/sample-configs/sim/axis/medium.ini +share/doc/linuxcnc/examples/sample-configs/sim/axis/ldelta.ini +share/doc/linuxcnc/examples/sample-configs/sim/axis/ldelta_demo.ini +share/doc/linuxcnc/examples/sample-configs/sim/axis/ldelta_demo.txt +share/doc/linuxcnc/examples/sample-configs/sim/axis/minimal_xyz.ini share/doc/linuxcnc/examples/sample-configs/sim/axis/moveoff/1_onpause_local.ini share/doc/linuxcnc/examples/sample-configs/sim/axis/moveoff/1_onpause_local.txt share/doc/linuxcnc/examples/sample-configs/sim/axis/moveoff/2_onpause_external.ini @@ -1177,20 +1230,6 @@ share/doc/linuxcnc/examples/sample-configs/sim/axis/moveoff/moveoff.hal share/doc/linuxcnc/examples/sample-configs/sim/axis/moveoff/moveoff.halscope share/doc/linuxcnc/examples/sample-configs/sim/axis/moveoff/moveoff.halshow share/doc/linuxcnc/examples/sample-configs/sim/axis/moveoff/moveoff_base.inc -share/doc/linuxcnc/examples/sample-configs/sim/axis/moveoff/moveoff_demo2.ini -share/doc/linuxcnc/examples/sample-configs/sim/axis/moveoff/moveoff_demo2.txt -share/doc/linuxcnc/examples/sample-configs/sim/axis/moveoff/moveoff_demo3.ini -share/doc/linuxcnc/examples/sample-configs/sim/axis/moveoff/moveoff_demo3.txt -share/doc/linuxcnc/examples/sample-configs/sim/axis/moveoff/moveoff_demo4.ini -share/doc/linuxcnc/examples/sample-configs/sim/axis/moveoff/moveoff_demo4.txt -share/doc/linuxcnc/examples/sample-configs/sim/axis/moveoff/moveoff_demo4a.ini -share/doc/linuxcnc/examples/sample-configs/sim/axis/moveoff/moveoff_demo4a.txt -share/doc/linuxcnc/examples/sample-configs/sim/axis/moveoff/moveoff_demo5.ini -share/doc/linuxcnc/examples/sample-configs/sim/axis/moveoff/moveoff_demo5.txt -share/doc/linuxcnc/examples/sample-configs/sim/axis/moveoff/moveoff_demo5a.ini -share/doc/linuxcnc/examples/sample-configs/sim/axis/moveoff/moveoff_demo5a.txt -share/doc/linuxcnc/examples/sample-configs/sim/axis/moveoff/moveoff_demo6.ini -share/doc/linuxcnc/examples/sample-configs/sim/axis/moveoff/moveoff_demo6.txt share/doc/linuxcnc/examples/sample-configs/sim/axis/moveoff/moveoff_display.inc share/doc/linuxcnc/examples/sample-configs/sim/axis/moveoff/moveoff_display_6.hal share/doc/linuxcnc/examples/sample-configs/sim/axis/moveoff/moveoff_display_6.inc @@ -1206,8 +1245,8 @@ share/doc/linuxcnc/examples/sample-configs/sim/axis/moveoff/removeshort.hal share/doc/linuxcnc/examples/sample-configs/sim/axis/moveoff/sim.tbl share/doc/linuxcnc/examples/sample-configs/sim/axis/nc_files share/doc/linuxcnc/examples/sample-configs/sim/axis/ngcgui/README -share/doc/linuxcnc/examples/sample-configs/sim/axis/ngcgui/axis_resize.tcl -share/doc/linuxcnc/examples/sample-configs/sim/axis/ngcgui/fullscreen.tcl +share/doc/linuxcnc/examples/sample-configs/sim/axis/ngcgui/axis_resize.py +share/doc/linuxcnc/examples/sample-configs/sim/axis/ngcgui/fullscreen.py share/doc/linuxcnc/examples/sample-configs/sim/axis/ngcgui/gremlin_view.ui share/doc/linuxcnc/examples/sample-configs/sim/axis/ngcgui/lathe.tbl share/doc/linuxcnc/examples/sample-configs/sim/axis/ngcgui/ngcgui.ini @@ -1226,12 +1265,36 @@ share/doc/linuxcnc/examples/sample-configs/sim/axis/ngcgui/pyngcgui_gcmc.txt share/doc/linuxcnc/examples/sample-configs/sim/axis/ngcgui/pyngcgui_popupkeyboard.ui share/doc/linuxcnc/examples/sample-configs/sim/axis/ngcgui/sim.tbl share/doc/linuxcnc/examples/sample-configs/sim/axis/orphans/README +share/doc/linuxcnc/examples/sample-configs/sim/axis/orphans/acc_test.ini share/doc/linuxcnc/examples/sample-configs/sim/axis/orphans/axis_noio.ini share/doc/linuxcnc/examples/sample-configs/sim/axis/orphans/core_sim_noio.hal share/doc/linuxcnc/examples/sample-configs/sim/axis/orphans/core_sim_noiocontrol.hal share/doc/linuxcnc/examples/sample-configs/sim/axis/orphans/core_sim_test.hal share/doc/linuxcnc/examples/sample-configs/sim/axis/orphans/gladevcp_postgui.hal +share/doc/linuxcnc/examples/sample-configs/sim/axis/orphans/iocontrol-removed/core_sim_test.hal +share/doc/linuxcnc/examples/sample-configs/sim/axis/orphans/iocontrol-removed/gladevcp.hal +share/doc/linuxcnc/examples/sample-configs/sim/axis/orphans/iocontrol-removed/iocontrol-removed.ini +share/doc/linuxcnc/examples/sample-configs/sim/axis/orphans/iocontrol-removed/nc_files/tcdemo.ngc +share/doc/linuxcnc/examples/sample-configs/sim/axis/orphans/iocontrol-removed/nc_subroutines +share/doc/linuxcnc/examples/sample-configs/sim/axis/orphans/iocontrol-removed/no-iotask.nml +share/doc/linuxcnc/examples/sample-configs/sim/axis/orphans/iocontrol-removed/python/customtask.py +share/doc/linuxcnc/examples/sample-configs/sim/axis/orphans/iocontrol-removed/python/embedding.py +share/doc/linuxcnc/examples/sample-configs/sim/axis/orphans/iocontrol-removed/python/nulluserfuncs.py +share/doc/linuxcnc/examples/sample-configs/sim/axis/orphans/iocontrol-removed/python/oword.py +share/doc/linuxcnc/examples/sample-configs/sim/axis/orphans/iocontrol-removed/python/remap.py +share/doc/linuxcnc/examples/sample-configs/sim/axis/orphans/iocontrol-removed/python/sqltoolaccess.py +share/doc/linuxcnc/examples/sample-configs/sim/axis/orphans/iocontrol-removed/python/task.py +share/doc/linuxcnc/examples/sample-configs/sim/axis/orphans/iocontrol-removed/python/tooltable.py +share/doc/linuxcnc/examples/sample-configs/sim/axis/orphans/iocontrol-removed/python/toplevel.py +share/doc/linuxcnc/examples/sample-configs/sim/axis/orphans/iocontrol-removed/python/userfuncs.py +share/doc/linuxcnc/examples/sample-configs/sim/axis/orphans/iocontrol-removed/racktoolchange-noioctl.glade +share/doc/linuxcnc/examples/sample-configs/sim/axis/orphans/iocontrol-removed/racktoolchange-noioctl.ui +share/doc/linuxcnc/examples/sample-configs/sim/axis/orphans/iocontrol-removed/racktoolchange.hal +share/doc/linuxcnc/examples/sample-configs/sim/axis/orphans/iocontrol-removed/tool.tbl +share/doc/linuxcnc/examples/sample-configs/sim/axis/orphans/iocontrol-removed/tooltable.sql +share/doc/linuxcnc/examples/sample-configs/sim/axis/orphans/iocontrol-removed/tooltable.sqlite share/doc/linuxcnc/examples/sample-configs/sim/axis/orphans/iov2.hal +share/doc/linuxcnc/examples/sample-configs/sim/axis/orphans/medium.ini share/doc/linuxcnc/examples/sample-configs/sim/axis/orphans/no-iotask.nml share/doc/linuxcnc/examples/sample-configs/sim/axis/orphans/py.ini.notworking share/doc/linuxcnc/examples/sample-configs/sim/axis/orphans/pyiocontrol.ini.notworking @@ -1259,6 +1322,7 @@ share/doc/linuxcnc/examples/sample-configs/sim/axis/panelui-demo/tool.tbl share/doc/linuxcnc/examples/sample-configs/sim/axis/postgui_calib_helper.hal share/doc/linuxcnc/examples/sample-configs/sim/axis/profile_axis.ini share/doc/linuxcnc/examples/sample-configs/sim/axis/random_tc.ini +share/doc/linuxcnc/examples/sample-configs/sim/axis/rdelta.ini share/doc/linuxcnc/examples/sample-configs/sim/axis/remap/README share/doc/linuxcnc/examples/sample-configs/sim/axis/remap/cycle/README share/doc/linuxcnc/examples/sample-configs/sim/axis/remap/cycle/cycle.ini @@ -1294,28 +1358,6 @@ share/doc/linuxcnc/examples/sample-configs/sim/axis/remap/getting-started/python share/doc/linuxcnc/examples/sample-configs/sim/axis/remap/getting-started/python/toplevel.py share/doc/linuxcnc/examples/sample-configs/sim/axis/remap/getting-started/python/util.py share/doc/linuxcnc/examples/sample-configs/sim/axis/remap/getting-started/tool.tbl -share/doc/linuxcnc/examples/sample-configs/sim/axis/remap/iocontrol-removed/core_sim_test.hal -share/doc/linuxcnc/examples/sample-configs/sim/axis/remap/iocontrol-removed/gladevcp.hal -share/doc/linuxcnc/examples/sample-configs/sim/axis/remap/iocontrol-removed/iocontrol-removed.ini -share/doc/linuxcnc/examples/sample-configs/sim/axis/remap/iocontrol-removed/nc_files/tcdemo.ngc -share/doc/linuxcnc/examples/sample-configs/sim/axis/remap/iocontrol-removed/nc_subroutines -share/doc/linuxcnc/examples/sample-configs/sim/axis/remap/iocontrol-removed/no-iotask.nml -share/doc/linuxcnc/examples/sample-configs/sim/axis/remap/iocontrol-removed/python/customtask.py -share/doc/linuxcnc/examples/sample-configs/sim/axis/remap/iocontrol-removed/python/embedding.py -share/doc/linuxcnc/examples/sample-configs/sim/axis/remap/iocontrol-removed/python/nulluserfuncs.py -share/doc/linuxcnc/examples/sample-configs/sim/axis/remap/iocontrol-removed/python/oword.py -share/doc/linuxcnc/examples/sample-configs/sim/axis/remap/iocontrol-removed/python/remap.py -share/doc/linuxcnc/examples/sample-configs/sim/axis/remap/iocontrol-removed/python/sqltoolaccess.py -share/doc/linuxcnc/examples/sample-configs/sim/axis/remap/iocontrol-removed/python/task.py -share/doc/linuxcnc/examples/sample-configs/sim/axis/remap/iocontrol-removed/python/tooltable.py -share/doc/linuxcnc/examples/sample-configs/sim/axis/remap/iocontrol-removed/python/toplevel.py -share/doc/linuxcnc/examples/sample-configs/sim/axis/remap/iocontrol-removed/python/userfuncs.py -share/doc/linuxcnc/examples/sample-configs/sim/axis/remap/iocontrol-removed/racktoolchange-noioctl.glade -share/doc/linuxcnc/examples/sample-configs/sim/axis/remap/iocontrol-removed/racktoolchange-noioctl.ui -share/doc/linuxcnc/examples/sample-configs/sim/axis/remap/iocontrol-removed/racktoolchange.hal -share/doc/linuxcnc/examples/sample-configs/sim/axis/remap/iocontrol-removed/tool.tbl -share/doc/linuxcnc/examples/sample-configs/sim/axis/remap/iocontrol-removed/tooltable.sql -share/doc/linuxcnc/examples/sample-configs/sim/axis/remap/iocontrol-removed/tooltable.sqlite share/doc/linuxcnc/examples/sample-configs/sim/axis/remap/manual-toolchange-with-tool-length-switch/README share/doc/linuxcnc/examples/sample-configs/sim/axis/remap/manual-toolchange-with-tool-length-switch/gladevcp.hal share/doc/linuxcnc/examples/sample-configs/sim/axis/remap/manual-toolchange-with-tool-length-switch/manualtoolchange.glade @@ -1351,6 +1393,11 @@ share/doc/linuxcnc/examples/sample-configs/sim/axis/remap/stop-lookahead/python/ share/doc/linuxcnc/examples/sample-configs/sim/axis/remap/stop-lookahead/python/toplevel.py share/doc/linuxcnc/examples/sample-configs/sim/axis/remap/stop-lookahead/tool.tbl share/doc/linuxcnc/examples/sample-configs/sim/axis/remap/tool.tbl +share/doc/linuxcnc/examples/sample-configs/sim/axis/rose_engine/README +share/doc/linuxcnc/examples/sample-configs/sim/axis/rose_engine/rcone.ngc +share/doc/linuxcnc/examples/sample-configs/sim/axis/rose_engine/rcone_demo.ngc +share/doc/linuxcnc/examples/sample-configs/sim/axis/rose_engine/rose_engine.halshow +share/doc/linuxcnc/examples/sample-configs/sim/axis/rose_engine/rose_engine.ini share/doc/linuxcnc/examples/sample-configs/sim/axis/sim.tbl share/doc/linuxcnc/examples/sample-configs/sim/axis/sim_mm.tbl share/doc/linuxcnc/examples/sample-configs/sim/axis/simpockets.tbl @@ -1361,9 +1408,6 @@ share/doc/linuxcnc/examples/sample-configs/sim/axis/simtcl/twopass_basic.ini share/doc/linuxcnc/examples/sample-configs/sim/axis/simtcl/twopass_basic.txt share/doc/linuxcnc/examples/sample-configs/sim/axis/simtcl/twopass_compat.ini share/doc/linuxcnc/examples/sample-configs/sim/axis/simtcl/twopass_compat.txt -share/doc/linuxcnc/examples/sample-configs/sim/axis/simtcl/twopass_demo.ini -share/doc/linuxcnc/examples/sample-configs/sim/axis/simtcl/twopass_demo.tcl -share/doc/linuxcnc/examples/sample-configs/sim/axis/simtcl/twopass_demo.txt share/doc/linuxcnc/examples/sample-configs/sim/axis/spindle_orient/README share/doc/linuxcnc/examples/sample-configs/sim/axis/spindle_orient/orient.hal share/doc/linuxcnc/examples/sample-configs/sim/axis/spindle_orient/orient.ini @@ -1375,10 +1419,26 @@ share/doc/linuxcnc/examples/sample-configs/sim/axis/twopass/postgui.hal share/doc/linuxcnc/examples/sample-configs/sim/axis/twopass/sim.tbl share/doc/linuxcnc/examples/sample-configs/sim/axis/twopass/twopass.ini share/doc/linuxcnc/examples/sample-configs/sim/axis/twopass/twopass.txt -share/doc/linuxcnc/examples/sample-configs/sim/axis/vismach/5axis/5axis.ini -share/doc/linuxcnc/examples/sample-configs/sim/axis/vismach/5axis/5axis.tbl -share/doc/linuxcnc/examples/sample-configs/sim/axis/vismach/5axis/5axis_sim.hal -share/doc/linuxcnc/examples/sample-configs/sim/axis/vismach/5axis/README +share/doc/linuxcnc/examples/sample-configs/sim/axis/vismach/5axis/bridgemill/5axis.ini +share/doc/linuxcnc/examples/sample-configs/sim/axis/vismach/5axis/bridgemill/5axis.tbl +share/doc/linuxcnc/examples/sample-configs/sim/axis/vismach/5axis/bridgemill/README +share/doc/linuxcnc/examples/sample-configs/sim/axis/vismach/5axis/max5/README +share/doc/linuxcnc/examples/sample-configs/sim/axis/vismach/5axis/max5/max5.tbl +share/doc/linuxcnc/examples/sample-configs/sim/axis/vismach/5axis/max5/max5_base.inc +share/doc/linuxcnc/examples/sample-configs/sim/axis/vismach/5axis/max5/max5kins.hal +share/doc/linuxcnc/examples/sample-configs/sim/axis/vismach/5axis/max5/max5kins.ini +share/doc/linuxcnc/examples/sample-configs/sim/axis/vismach/5axis/max5/max5triv.hal +share/doc/linuxcnc/examples/sample-configs/sim/axis/vismach/5axis/max5/max5triv.ini +share/doc/linuxcnc/examples/sample-configs/sim/axis/vismach/5axis/table-rotary-tilting/README +share/doc/linuxcnc/examples/sample-configs/sim/axis/vismach/5axis/table-rotary-tilting/examples/boat-xyzac.ngc +share/doc/linuxcnc/examples/sample-configs/sim/axis/vismach/5axis/table-rotary-tilting/examples/boat-xyzbc.ngc +share/doc/linuxcnc/examples/sample-configs/sim/axis/vismach/5axis/table-rotary-tilting/examples/impeller-7bl-xyzac.ngc +share/doc/linuxcnc/examples/sample-configs/sim/axis/vismach/5axis/table-rotary-tilting/examples/test-xyzac.ngc +share/doc/linuxcnc/examples/sample-configs/sim/axis/vismach/5axis/table-rotary-tilting/examples/test-xyzbc.ngc +share/doc/linuxcnc/examples/sample-configs/sim/axis/vismach/5axis/table-rotary-tilting/xyzac-trt.ini +share/doc/linuxcnc/examples/sample-configs/sim/axis/vismach/5axis/table-rotary-tilting/xyzac-trt.tbl +share/doc/linuxcnc/examples/sample-configs/sim/axis/vismach/5axis/table-rotary-tilting/xyzbc-trt.ini +share/doc/linuxcnc/examples/sample-configs/sim/axis/vismach/5axis/table-rotary-tilting/xyzbc-trt.tbl share/doc/linuxcnc/examples/sample-configs/sim/axis/vismach/README share/doc/linuxcnc/examples/sample-configs/sim/axis/vismach/VMC_toolchange/README share/doc/linuxcnc/examples/sample-configs/sim/axis/vismach/VMC_toolchange/arm.stl @@ -1410,12 +1470,6 @@ share/doc/linuxcnc/examples/sample-configs/sim/axis/vismach/hexapod-sim/hexapod. share/doc/linuxcnc/examples/sample-configs/sim/axis/vismach/hexapod-sim/hexapod_postgui.hal share/doc/linuxcnc/examples/sample-configs/sim/axis/vismach/hexapod-sim/kinematics.hal share/doc/linuxcnc/examples/sample-configs/sim/axis/vismach/hexapod-sim/panel.xml -share/doc/linuxcnc/examples/sample-configs/sim/axis/vismach/max5kins/max5kins.hal -share/doc/linuxcnc/examples/sample-configs/sim/axis/vismach/max5kins/max5kins.ini -share/doc/linuxcnc/examples/sample-configs/sim/axis/vismach/max5triv/max5kins.tbl -share/doc/linuxcnc/examples/sample-configs/sim/axis/vismach/max5triv/max5triv.hal -share/doc/linuxcnc/examples/sample-configs/sim/axis/vismach/max5triv/max5triv.ini -share/doc/linuxcnc/examples/sample-configs/sim/axis/vismach/max5triv/max5triv.tbl share/doc/linuxcnc/examples/sample-configs/sim/axis/vismach/puma/README share/doc/linuxcnc/examples/sample-configs/sim/axis/vismach/puma/puma.ini share/doc/linuxcnc/examples/sample-configs/sim/axis/vismach/puma/puma.tbl @@ -1441,9 +1495,11 @@ share/doc/linuxcnc/examples/sample-configs/sim/axis/vismach/scara/scara_postgui. share/doc/linuxcnc/examples/sample-configs/sim/axis/vismach/scara/scara_sim_4.hal share/doc/linuxcnc/examples/sample-configs/sim/axis/xhc-hb04/README share/doc/linuxcnc/examples/sample-configs/sim/axis/xhc-hb04/inch_base.inc +share/doc/linuxcnc/examples/sample-configs/sim/axis/xhc-hb04/inch_trivkins.inc share/doc/linuxcnc/examples/sample-configs/sim/axis/xhc-hb04/layout1.inc share/doc/linuxcnc/examples/sample-configs/sim/axis/xhc-hb04/layout2.inc share/doc/linuxcnc/examples/sample-configs/sim/axis/xhc-hb04/mm_base.inc +share/doc/linuxcnc/examples/sample-configs/sim/axis/xhc-hb04/mm_trivkins.inc share/doc/linuxcnc/examples/sample-configs/sim/axis/xhc-hb04/sim.tbl share/doc/linuxcnc/examples/sample-configs/sim/axis/xhc-hb04/sim_mm.tbl share/doc/linuxcnc/examples/sample-configs/sim/axis/xhc-hb04/xhc-hb04-layout1.ini @@ -1455,10 +1511,39 @@ share/doc/linuxcnc/examples/sample-configs/sim/axis/xhc-hb04/xhc-hb04-layout2_mm share/doc/linuxcnc/examples/sample-configs/sim/gmoccapy/README share/doc/linuxcnc/examples/sample-configs/sim/gmoccapy/button.glade share/doc/linuxcnc/examples/sample-configs/sim/gmoccapy/core_sim4.hal +share/doc/linuxcnc/examples/sample-configs/sim/gmoccapy/core_sim_XYZAB.hal +share/doc/linuxcnc/examples/sample-configs/sim/gmoccapy/core_sim_XYZAC.hal +share/doc/linuxcnc/examples/sample-configs/sim/gmoccapy/core_sim_XYZCW.hal +share/doc/linuxcnc/examples/sample-configs/sim/gmoccapy/core_sim_lathe.hal share/doc/linuxcnc/examples/sample-configs/sim/gmoccapy/dro.glade +share/doc/linuxcnc/examples/sample-configs/sim/gmoccapy/gmoccapy-JA/Gantry/gantry_mm.hal +share/doc/linuxcnc/examples/sample-configs/sim/gmoccapy/gmoccapy-JA/Gantry/gantry_mm.ini +share/doc/linuxcnc/examples/sample-configs/sim/gmoccapy/gmoccapy-JA/Gantry/gmoccapy_GANTRY_sim.pref +share/doc/linuxcnc/examples/sample-configs/sim/gmoccapy/gmoccapy-JA/Gantry/tool.tbl +share/doc/linuxcnc/examples/sample-configs/sim/gmoccapy/gmoccapy-JA/scara/LinuxCNC-HAL-SIM-SCARA.pref +share/doc/linuxcnc/examples/sample-configs/sim/gmoccapy/gmoccapy-JA/scara/README +share/doc/linuxcnc/examples/sample-configs/sim/gmoccapy/gmoccapy-JA/scara/postgui.hal +share/doc/linuxcnc/examples/sample-configs/sim/gmoccapy/gmoccapy-JA/scara/scara.glade +share/doc/linuxcnc/examples/sample-configs/sim/gmoccapy/gmoccapy-JA/scara/scara.ini +share/doc/linuxcnc/examples/sample-configs/sim/gmoccapy/gmoccapy-JA/scara/scara.tbl +share/doc/linuxcnc/examples/sample-configs/sim/gmoccapy/gmoccapy-JA/scara/scara_postgui.hal +share/doc/linuxcnc/examples/sample-configs/sim/gmoccapy/gmoccapy-JA/scara/scara_sim_4.hal +share/doc/linuxcnc/examples/sample-configs/sim/gmoccapy/gmoccapy-JA/table-rotary-tilting/README +share/doc/linuxcnc/examples/sample-configs/sim/gmoccapy/gmoccapy-JA/table-rotary-tilting/examples/boat-xyzac.ngc +share/doc/linuxcnc/examples/sample-configs/sim/gmoccapy/gmoccapy-JA/table-rotary-tilting/examples/boat-xyzbc.ngc +share/doc/linuxcnc/examples/sample-configs/sim/gmoccapy/gmoccapy-JA/table-rotary-tilting/examples/impeller-7bl-xyzac.ngc +share/doc/linuxcnc/examples/sample-configs/sim/gmoccapy/gmoccapy-JA/table-rotary-tilting/examples/test-xyzac.ngc +share/doc/linuxcnc/examples/sample-configs/sim/gmoccapy/gmoccapy-JA/table-rotary-tilting/examples/test-xyzbc.ngc +share/doc/linuxcnc/examples/sample-configs/sim/gmoccapy/gmoccapy-JA/table-rotary-tilting/postgui.hal +share/doc/linuxcnc/examples/sample-configs/sim/gmoccapy/gmoccapy-JA/table-rotary-tilting/sim-xyzac-trt.pref +share/doc/linuxcnc/examples/sample-configs/sim/gmoccapy/gmoccapy-JA/table-rotary-tilting/xyzac-trt.ini +share/doc/linuxcnc/examples/sample-configs/sim/gmoccapy/gmoccapy-JA/table-rotary-tilting/xyzac-trt.tbl share/doc/linuxcnc/examples/sample-configs/sim/gmoccapy/gmoccapy.ini share/doc/linuxcnc/examples/sample-configs/sim/gmoccapy/gmoccapy2.glade share/doc/linuxcnc/examples/sample-configs/sim/gmoccapy/gmoccapy_4_axis.ini +share/doc/linuxcnc/examples/sample-configs/sim/gmoccapy/gmoccapy_XYZAB.ini +share/doc/linuxcnc/examples/sample-configs/sim/gmoccapy/gmoccapy_XYZAC.ini +share/doc/linuxcnc/examples/sample-configs/sim/gmoccapy/gmoccapy_XYZCW.ini share/doc/linuxcnc/examples/sample-configs/sim/gmoccapy/gmoccapy_lathe.ini share/doc/linuxcnc/examples/sample-configs/sim/gmoccapy/gmoccapy_lathe_imperial.ini share/doc/linuxcnc/examples/sample-configs/sim/gmoccapy/gmoccapy_left_panel.ini @@ -1502,6 +1587,7 @@ share/doc/linuxcnc/examples/sample-configs/sim/gmoccapy/pendant.hal share/doc/linuxcnc/examples/sample-configs/sim/gmoccapy/python/remap.py share/doc/linuxcnc/examples/sample-configs/sim/gmoccapy/python/stdglue.py share/doc/linuxcnc/examples/sample-configs/sim/gmoccapy/python/toplevel.py +share/doc/linuxcnc/examples/sample-configs/sim/gmoccapy/simulated_home_lathe.hal share/doc/linuxcnc/examples/sample-configs/sim/gmoccapy/spindle_sim.hal share/doc/linuxcnc/examples/sample-configs/sim/gmoccapy/tool.tbl share/doc/linuxcnc/examples/sample-configs/sim/gmoccapy/tool_sensor.glade @@ -1593,14 +1679,6 @@ share/doc/linuxcnc/examples/sample-configs/sim/hitcounter.py share/doc/linuxcnc/examples/sample-configs/sim/lathe.tbl share/doc/linuxcnc/examples/sample-configs/sim/lathe.xml share/doc/linuxcnc/examples/sample-configs/sim/lathe_postgui.hal -share/doc/linuxcnc/examples/sample-configs/sim/low_graphics/README -share/doc/linuxcnc/examples/sample-configs/sim/low_graphics/keystick.ini -share/doc/linuxcnc/examples/sample-configs/sim/low_graphics/keystick.txt -share/doc/linuxcnc/examples/sample-configs/sim/low_graphics/mini.ini -share/doc/linuxcnc/examples/sample-configs/sim/low_graphics/mini.txt -share/doc/linuxcnc/examples/sample-configs/sim/low_graphics/sim.tbl -share/doc/linuxcnc/examples/sample-configs/sim/low_graphics/xlinuxcnc.ini -share/doc/linuxcnc/examples/sample-configs/sim/low_graphics/xlinuxcnc.txt share/doc/linuxcnc/examples/sample-configs/sim/manual-example.hal share/doc/linuxcnc/examples/sample-configs/sim/manual-example.ui share/doc/linuxcnc/examples/sample-configs/sim/nc_files @@ -1622,11 +1700,17 @@ share/doc/linuxcnc/examples/sample-configs/sim/sim_mm_test.tbl share/doc/linuxcnc/examples/sample-configs/sim/simpockets.tbl share/doc/linuxcnc/examples/sample-configs/sim/test.vcp share/doc/linuxcnc/examples/sample-configs/sim/tklinuxcnc/README +share/doc/linuxcnc/examples/sample-configs/sim/tklinuxcnc/ldelta.ini share/doc/linuxcnc/examples/sample-configs/sim/tklinuxcnc/screwcompX.dat share/doc/linuxcnc/examples/sample-configs/sim/tklinuxcnc/servo_sim.ini share/doc/linuxcnc/examples/sample-configs/sim/tklinuxcnc/sim.tbl share/doc/linuxcnc/examples/sample-configs/sim/tklinuxcnc/tklinuxcnc.ini share/doc/linuxcnc/examples/sample-configs/sim/tklinuxcnc/tripod.ini +share/doc/linuxcnc/examples/sample-configs/sim/tklinuxcnc/trivkins/README +share/doc/linuxcnc/examples/sample-configs/sim/tklinuxcnc/trivkins/xz.ini +share/doc/linuxcnc/examples/sample-configs/sim/tklinuxcnc/trivkins/xz.tbl +share/doc/linuxcnc/examples/sample-configs/sim/tklinuxcnc/trivkins/xz_both.ini +share/doc/linuxcnc/examples/sample-configs/sim/tklinuxcnc/trivkins/xzbase.inc share/doc/linuxcnc/examples/sample-configs/sim/touchy/README share/doc/linuxcnc/examples/sample-configs/sim/touchy/gladevcp/README share/doc/linuxcnc/examples/sample-configs/sim/touchy/gladevcp/gladevcp-touchy.hal @@ -1642,6 +1726,7 @@ share/doc/linuxcnc/examples/sample-configs/sim/touchy/gladevcp/touchy.hal share/doc/linuxcnc/examples/sample-configs/sim/touchy/gladevcp/touchy.ini share/doc/linuxcnc/examples/sample-configs/sim/touchy/ngcgui/README share/doc/linuxcnc/examples/sample-configs/sim/touchy/ngcgui/gremlin_view.ui +share/doc/linuxcnc/examples/sample-configs/sim/touchy/ngcgui/hwsim.sh share/doc/linuxcnc/examples/sample-configs/sim/touchy/ngcgui/lathe.tbl share/doc/linuxcnc/examples/sample-configs/sim/touchy/ngcgui/pyngcgui_touchy.ini share/doc/linuxcnc/examples/sample-configs/sim/touchy/ngcgui/pyngcgui_touchy.txt @@ -1660,10 +1745,10 @@ share/doc/linuxcnc/examples/sample-configs/sim/touchy/touchy.ini share/doc/linuxcnc/examples/sample-configs/sim/touchy/touchy.txt share/doc/linuxcnc/examples/sample-configs/sim/tracking-test.hal share/doc/linuxcnc/tklinuxcnc.txt -share/doc/linuxcnc/xlinuxcnc.txt share/glade3/catalogs/hal_python.xml share/glade3/pixmaps/widget-gladevcp-calc.png share/glade3/pixmaps/widget-gladevcp-combi_dro.png +share/glade3/pixmaps/widget-gladevcp-hal_dial.png share/glade3/pixmaps/widget-gladevcp-hal_dro.png share/glade3/pixmaps/widget-gladevcp-hal_gremlin.png share/glade3/pixmaps/widget-gladevcp-hal_hbar.png @@ -1703,6 +1788,14 @@ share/gmoccapy/images/mist_off.png share/gmoccapy/images/mist_on.gif share/gmoccapy/images/pause.png share/gmoccapy/images/rabbit_jog.png +share/gmoccapy/images/ref_0.png +share/gmoccapy/images/ref_1.png +share/gmoccapy/images/ref_2.png +share/gmoccapy/images/ref_3.png +share/gmoccapy/images/ref_4.png +share/gmoccapy/images/ref_5.png +share/gmoccapy/images/ref_6.png +share/gmoccapy/images/ref_7.png share/gmoccapy/images/refa.png share/gmoccapy/images/refall.png share/gmoccapy/images/refb.png @@ -1735,6 +1828,12 @@ share/gmoccapy/images/toolaxisz.png share/gmoccapy/images/toolchange.png share/gmoccapy/images/toolpath.png share/gmoccapy/images/tools.png +share/gmoccapy/images/touchoffa_value.png +share/gmoccapy/images/touchoffb_value.png +share/gmoccapy/images/touchoffc_value.png +share/gmoccapy/images/touchoffu_value.png +share/gmoccapy/images/touchoffv_value.png +share/gmoccapy/images/touchoffw_value.png share/gmoccapy/images/touchoffwz.png share/gmoccapy/images/touchoffx.png share/gmoccapy/images/touchoffx_value.png @@ -1775,6 +1874,8 @@ share/linuxcnc/gscreen2.glade share/linuxcnc/hallib/README share/linuxcnc/hallib/axis_manualtoolchange.hal share/linuxcnc/hallib/basic_sim.tcl +share/linuxcnc/hallib/check_config.tcl +share/linuxcnc/hallib/check_xyz_constraints.hal share/linuxcnc/hallib/core_servo.hal share/linuxcnc/hallib/core_sim.hal share/linuxcnc/hallib/core_sim9.hal @@ -1787,7 +1888,9 @@ share/linuxcnc/hallib/lathe.hal share/linuxcnc/hallib/locking_indexer.hal share/linuxcnc/hallib/moveoff_external.hal share/linuxcnc/hallib/servo_sim.hal +share/linuxcnc/hallib/sim_ldelta.hal share/linuxcnc/hallib/sim_lib.tcl +share/linuxcnc/hallib/sim_rdelta.hal share/linuxcnc/hallib/sim_spindle_encoder.hal share/linuxcnc/hallib/simulated-gantry-home.hal share/linuxcnc/hallib/simulated_home.hal @@ -1795,6 +1898,7 @@ share/linuxcnc/hallib/simulated_limits.hal share/linuxcnc/hallib/tripodsim.hal share/linuxcnc/hallib/util_lib.tcl share/linuxcnc/hallib/var_show.tcl +share/linuxcnc/hallib/wheeljogpins.tcl share/linuxcnc/hallib/xhc-hb04-layout1.cfg share/linuxcnc/hallib/xhc-hb04-layout2.cfg share/linuxcnc/hallib/xhc-hb04.tcl @@ -1980,6 +2084,29 @@ share/linuxcnc/stepconf/pport2.glade share/linuxcnc/stepconf/spindle.glade share/linuxcnc/stepconf/start.glade share/linuxcnc/touchy.glade +share/locale/de/LC_MESSAGES/gmoccapy.mo +share/locale/de/LC_MESSAGES/linuxcnc.mo +share/locale/es/LC_MESSAGES/gmoccapy.mo +share/locale/es/LC_MESSAGES/linuxcnc.mo +share/locale/fi/LC_MESSAGES/linuxcnc.mo +share/locale/fr/LC_MESSAGES/gmoccapy.mo +share/locale/fr/LC_MESSAGES/linuxcnc.mo +share/locale/hu/LC_MESSAGES/gmoccapy.mo +share/locale/hu/LC_MESSAGES/linuxcnc.mo +share/locale/it/LC_MESSAGES/linuxcnc.mo +share/locale/ja/LC_MESSAGES/linuxcnc.mo +share/locale/pl/LC_MESSAGES/gmoccapy.mo +share/locale/pl/LC_MESSAGES/linuxcnc.mo +share/locale/pt_BR/LC_MESSAGES/linuxcnc.mo +share/locale/ro/LC_MESSAGES/linuxcnc.mo +share/locale/ru/LC_MESSAGES/linuxcnc.mo +share/locale/sk/LC_MESSAGES/linuxcnc.mo +share/locale/sr/LC_MESSAGES/gmoccapy.mo +share/locale/sr/LC_MESSAGES/linuxcnc.mo +share/locale/sv/LC_MESSAGES/linuxcnc.mo +share/locale/zh_CN/LC_MESSAGES/linuxcnc.mo +share/locale/zh_HK/LC_MESSAGES/linuxcnc.mo +share/locale/zh_TW/LC_MESSAGES/linuxcnc.mo /usr/local/%%PYTHON_SITELIBDIR%%/_hal.so /usr/local/%%PYTHON_SITELIBDIR%%/_togl.so /usr/local/%%PYTHON_SITELIBDIR%%/bitfile.py @@ -2009,6 +2136,7 @@ share/linuxcnc/touchy.glade /usr/local/%%PYTHON_SITELIBDIR%%/gladevcp/iconview.py /usr/local/%%PYTHON_SITELIBDIR%%/gladevcp/jogwheel.py /usr/local/%%PYTHON_SITELIBDIR%%/gladevcp/led.py +/usr/local/%%PYTHON_SITELIBDIR%%/gladevcp/macro_widget.py /usr/local/%%PYTHON_SITELIBDIR%%/gladevcp/makepins.py /usr/local/%%PYTHON_SITELIBDIR%%/gladevcp/offsetpage.glade /usr/local/%%PYTHON_SITELIBDIR%%/gladevcp/offsetpage_widget.py @@ -2038,8 +2166,10 @@ share/linuxcnc/touchy.glade /usr/local/%%PYTHON_SITELIBDIR%%/hal.py /usr/local/%%PYTHON_SITELIBDIR%%/hal_glib.py /usr/local/%%PYTHON_SITELIBDIR%%/hershey.py +/usr/local/%%PYTHON_SITELIBDIR%%/lineardeltakins.so /usr/local/%%PYTHON_SITELIBDIR%%/linux_event.py /usr/local/%%PYTHON_SITELIBDIR%%/linuxcnc.so +/usr/local/%%PYTHON_SITELIBDIR%%/linuxcnc_util.py /usr/local/%%PYTHON_SITELIBDIR%%/minigl.so /usr/local/%%PYTHON_SITELIBDIR%%/multifilebuilder.py /usr/local/%%PYTHON_SITELIBDIR%%/multifilebuilder_gtk3.py @@ -2059,6 +2189,7 @@ share/linuxcnc/touchy.glade /usr/local/%%PYTHON_SITELIBDIR%%/pyui/panelui_validate.py /usr/local/%%PYTHON_SITELIBDIR%%/pyui/widgets.py /usr/local/%%PYTHON_SITELIBDIR%%/pyvcp_widgets.py +/usr/local/%%PYTHON_SITELIBDIR%%/rotarydeltakins.so /usr/local/%%PYTHON_SITELIBDIR%%/rs274/OpenGLTk.py /usr/local/%%PYTHON_SITELIBDIR%%/rs274/__init__.py /usr/local/%%PYTHON_SITELIBDIR%%/rs274/author.py @@ -2079,32 +2210,7 @@ share/linuxcnc/touchy.glade /usr/local/%%PYTHON_SITELIBDIR%%/touchy/preferences.py /usr/local/%%PYTHON_SITELIBDIR%%/vcpparse.py /usr/local/%%PYTHON_SITELIBDIR%%/vismach.py -share/locale/de/LC_MESSAGES/gmoccapy.mo -share/locale/de/LC_MESSAGES/linuxcnc.mo -share/locale/es/LC_MESSAGES/gmoccapy.mo -share/locale/es/LC_MESSAGES/linuxcnc.mo -share/locale/fi/LC_MESSAGES/linuxcnc.mo -share/locale/fr/LC_MESSAGES/gmoccapy.mo -share/locale/fr/LC_MESSAGES/linuxcnc.mo -share/locale/hu/LC_MESSAGES/gmoccapy.mo -share/locale/hu/LC_MESSAGES/linuxcnc.mo -share/locale/it/LC_MESSAGES/linuxcnc.mo -share/locale/ja/LC_MESSAGES/linuxcnc.mo -share/locale/pl/LC_MESSAGES/gmoccapy.mo -share/locale/pl/LC_MESSAGES/linuxcnc.mo -share/locale/pt_BR/LC_MESSAGES/linuxcnc.mo -share/locale/ro/LC_MESSAGES/linuxcnc.mo -share/locale/ru/LC_MESSAGES/linuxcnc.mo -share/locale/sk/LC_MESSAGES/linuxcnc.mo -share/locale/sr/LC_MESSAGES/gmoccapy.mo -share/locale/sr/LC_MESSAGES/linuxcnc.mo -share/locale/sv/LC_MESSAGES/linuxcnc.mo -share/locale/zh_CN/LC_MESSAGES/linuxcnc.mo -share/locale/zh_HK/LC_MESSAGES/linuxcnc.mo -share/locale/zh_TW/LC_MESSAGES/linuxcnc.mo @dir lib/linuxcnc/modules/linuxcnc -@dir share/X11/app-defaults -@dir etc/rc.d @dir /usr/local/%%PYTHON_SITELIBDIR%%/gladevcp @dir /usr/local/%%PYTHON_SITELIBDIR%%/gmoccapy @dir /usr/local/%%PYTHON_SITELIBDIR%%/gscreen @@ -2115,37 +2221,3 @@ share/locale/zh_TW/LC_MESSAGES/linuxcnc.mo @dir /usr/local/%%PYTHON_SITELIBDIR%%/touchy @dir /usr/local/%%PYTHON_SITELIBDIR%% @dir /usr/local/%%PYTHON_LIBDIR%% -@dir share/locale/de/LC_MESSAGES -@dir share/locale/de -@dir share/locale/es/LC_MESSAGES -@dir share/locale/es -@dir share/locale/fi/LC_MESSAGES -@dir share/locale/fi -@dir share/locale/fr/LC_MESSAGES -@dir share/locale/fr -@dir share/locale/hu/LC_MESSAGES -@dir share/locale/hu -@dir share/locale/it/LC_MESSAGES -@dir share/locale/it -@dir share/locale/ja/LC_MESSAGES -@dir share/locale/ja -@dir share/locale/pl/LC_MESSAGES -@dir share/locale/pl -@dir share/locale/pt_BR/LC_MESSAGES -@dir share/locale/pt_BR -@dir share/locale/ro/LC_MESSAGES -@dir share/locale/ro -@dir share/locale/ru/LC_MESSAGES -@dir share/locale/ru -@dir share/locale/sk/LC_MESSAGES -@dir share/locale/sk -@dir share/locale/sr/LC_MESSAGES -@dir share/locale/sr -@dir share/locale/sv/LC_MESSAGES -@dir share/locale/sv -@dir share/locale/zh_CN/LC_MESSAGES -@dir share/locale/zh_CN -@dir share/locale/zh_HK/LC_MESSAGES -@dir share/locale/zh_HK -@dir share/locale/zh_TW/LC_MESSAGES -@dir share/locale/zh_TW diff --git a/comms/Makefile b/comms/Makefile index 20a73c41fe7..0db856eeacb 100644 --- a/comms/Makefile +++ b/comms/Makefile @@ -168,6 +168,7 @@ SUBDIR += spandsp SUBDIR += splat SUBDIR += sredird + SUBDIR += sunxi-tools SUBDIR += svxlink SUBDIR += syncterm SUBDIR += tcpser diff --git a/comms/atslog/Makefile b/comms/atslog/Makefile index 85dd1043020..743b0527529 100644 --- a/comms/atslog/Makefile +++ b/comms/atslog/Makefile @@ -10,25 +10,41 @@ MASTER_SITES= BERLIOS MAINTAINER= ports@FreeBSD.org COMMENT= Software for collecting and analyzing calls from different PBX models -OPTIONS_DEFINE= EXAMPLES LIBWRAP WWW WWWGD DOCS +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/LICENSE + +USES= perl5 shebangfix +SHEBANG_FILES= data/sql/install-sql.pl \ + include/atslogcleardb.pl.in include/atslogdb.pl.in +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --localstatedir=/var + +USE_RC_SUBR= ${PORTNAME}d +PLIST_SUB= WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}" + +SUB_FILES= pkg-message + +PORTDOCS= CHANGES ChangeLog DEINSTALL INSTALL TODO UPDATING USAGE + +OPTIONS_DEFINE= EXAMPLES LIBWRAP WWW WWWGD DOCS OPTIONS_DEFAULT= LIBWRAP MYSQL WWW WWWGD -OPTIONS_MULTI= DB +OPTIONS_MULTI= DB OPTIONS_MULTI_DB= PGSQL MYSQL +OPTIONS_SUB= yes + LIBWRAP_DESC= Enable TCP wrapper support WWW_DESC= Install web interface WWWGD_DESC= Graphic reports -GNU_CONFIGURE= yes -USES= perl5 shebangfix -USE_RC_SUBR= ${PORTNAME}d -SHEBANG_FILES= data/sql/install-sql.pl \ - include/atslogcleardb.pl.in include/atslogdb.pl.in -PORTDOCS= CHANGES ChangeLog DEINSTALL INSTALL LICENSE TODO UPDATING USAGE -SUB_FILES= pkg-message -CONFIGS= ${PORTNAME}.conf.default ${PORTNAME}.conf.default.rus -CONFIGURE_ARGS+=--localstatedir=/var -PLIST_SUB= WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}" -OPTIONS_SUB=yes +MYSQL_USES= mysql +MYSQL_BUILD_DEPENDS= p5-DBD-mysql>=0:databases/p5-DBD-mysql +MYSQL_RUN_DEPENDS= p5-DBD-mysql>=0:databases/p5-DBD-mysql + +PGSQL_USES= pgsql +PGSQL_BUILD_DEPENDS= p5-DBD-Pg>=0:databases/p5-DBD-Pg +PGSQL_RUN_DEPENDS= p5-DBD-Pg>=0:databases/p5-DBD-Pg + +LIBWRAP_CONFIGURE_OFF= --disable-libwrap .include @@ -46,22 +62,6 @@ USE_PHP+= pgsql .endif .endif -.if ${PORT_OPTIONS:MMYSQL} -USE_MYSQL= yes -BUILD_DEPENDS+= p5-DBD-mysql>=0:databases/p5-DBD-mysql -RUN_DEPENDS+= p5-DBD-mysql>=0:databases/p5-DBD-mysql -.endif - -.if ${PORT_OPTIONS:MPGSQL} -USES+= pgsql -BUILD_DEPENDS+= p5-DBD-Pg>=0:databases/p5-DBD-Pg -RUN_DEPENDS+= p5-DBD-Pg>=0:databases/p5-DBD-Pg -.endif - -.if ! ${PORT_OPTIONS:MLIBWRAP} -CONFIGURE_ARGS+=--disable-libwrap -.endif - post-patch: @${REINPLACE_CMD} -e 's|createsqltables.|${DATADIR}/sql/createsqltables.|g' \ -e 's|data.sql|${DATADIR}/sql/data.sql|' ${WRKSRC}/data/sql/install-sql.pl diff --git a/comms/sunxi-tools/Makefile b/comms/sunxi-tools/Makefile new file mode 100644 index 00000000000..747e139d9c0 --- /dev/null +++ b/comms/sunxi-tools/Makefile @@ -0,0 +1,19 @@ +# $FreeBSD$ + +PORTNAME= sunxi-tools +PORTVERSION= 1.4.2 +DISTVERSIONPREFIX= v +CATEGORIES= comms + +MAINTAINER= manu@freebsd.org +COMMENT= Tools to help hacking Allwinner devices + +LICENSE= GPLv2+ +LICENSE_FILE= ${WRKSRC}/LICENSE.md + +USE_GITHUB= yes +GH_ACCOUNT= linux-sunxi + +USES= gmake pkgconfig + +.include diff --git a/comms/sunxi-tools/distinfo b/comms/sunxi-tools/distinfo new file mode 100644 index 00000000000..0aea9fc12f1 --- /dev/null +++ b/comms/sunxi-tools/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1499609673 +SHA256 (linux-sunxi-sunxi-tools-v1.4.2_GH0.tar.gz) = 81f48014a520cb83cac4e17f5ae627a637c4d6a422b60c693c5a705c92e43822 +SIZE (linux-sunxi-sunxi-tools-v1.4.2_GH0.tar.gz) = 84090 diff --git a/comms/sunxi-tools/files/patch-Makefile b/comms/sunxi-tools/files/patch-Makefile new file mode 100644 index 00000000000..9e0ed40d773 --- /dev/null +++ b/comms/sunxi-tools/files/patch-Makefile @@ -0,0 +1,29 @@ +--- Makefile.orig 2016-11-29 13:07:51 UTC ++++ Makefile +@@ -17,7 +17,7 @@ + # along with this program. If not, see . + + CC ?= gcc +-DEFAULT_CFLAGS := -std=c99 ++DEFAULT_CFLAGS += -std=c99 + DEFAULT_CFLAGS += -Wall -Wextra -Wno-unused-result + + DEFAULT_CFLAGS += -D_POSIX_C_SOURCE=200112L +@@ -63,7 +63,7 @@ BINDIR ?= $(PREFIX)/bin + tools: $(TOOLS) $(FEXC_LINKS) + target-tools: $(TARGET_TOOLS) + +-all: tools target-tools ++all: tools + + misc: $(MISC_TOOLS) + +@@ -75,7 +75,7 @@ install-all: install-tools install-target-tools + install-tools: $(TOOLS) + install -d $(DESTDIR)$(BINDIR) + @set -ex ; for t in $^ ; do \ +- install -m0755 $$t $(DESTDIR)$(BINDIR)/$$t ; \ ++ $(BSD_INSTALL_PROGRAM) $$t $(DESTDIR)$(BINDIR)/$$t ; \ + done + @set -ex ; for l in $(FEXC_LINKS) ; do \ + ln -nfs sunxi-fexc $(DESTDIR)$(BINDIR)/$$l ; \ diff --git a/comms/sunxi-tools/pkg-descr b/comms/sunxi-tools/pkg-descr new file mode 100644 index 00000000000..06390a2f598 --- /dev/null +++ b/comms/sunxi-tools/pkg-descr @@ -0,0 +1,4 @@ +Tools to help hacking Allwinner A10 (aka sun4i) based devices and possibly +it's successors, that's why the 'x' in the package name. + +WWW: https://github.com/linux-sunxi/sunxi-tools diff --git a/comms/sunxi-tools/pkg-plist b/comms/sunxi-tools/pkg-plist new file mode 100644 index 00000000000..a8e19f6cb63 --- /dev/null +++ b/comms/sunxi-tools/pkg-plist @@ -0,0 +1,7 @@ +bin/bin2fex +bin/fex2bin +bin/sunxi-bootinfo +bin/sunxi-fel +bin/sunxi-fexc +bin/sunxi-nand-part +bin/sunxi-pio diff --git a/comms/xastir/Makefile b/comms/xastir/Makefile index d4882e818c8..b3f4e6d59de 100644 --- a/comms/xastir/Makefile +++ b/comms/xastir/Makefile @@ -3,7 +3,7 @@ PORTNAME= xastir PORTVERSION= 2.0.6 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= comms hamradio MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-stable/${PORTNAME}-${PORTVERSION} @@ -16,9 +16,10 @@ LIB_DEPENDS= libtiff.so:graphics/tiff \ libpng.so:graphics/png GNU_CONFIGURE= yes -USES= gettext gmake jpeg motif shebangfix +USES= gettext gmake jpeg motif python:run shebangfix SHEBANG_FILES= scripts/*.pl scripts/get-maptools.sh \ - scripts/gpx2shape scripts/values.pl.in + scripts/gpx2shape scripts/values.pl.in \ + scripts/Xastir_tigerpoly.py SUB_FILES= pkg-message diff --git a/databases/Makefile b/databases/Makefile index 9ae528b4bb9..e0d37b51406 100644 --- a/databases/Makefile +++ b/databases/Makefile @@ -879,6 +879,7 @@ SUBDIR += ruby-qdbm SUBDIR += ruby-tokyocabinet SUBDIR += ruby-xapian + SUBDIR += rubygem-active_model_serializers SUBDIR += rubygem-active_record_query_trace SUBDIR += rubygem-activemodel-serializers-xml SUBDIR += rubygem-activemodel4 @@ -937,6 +938,7 @@ SUBDIR += rubygem-hiredis SUBDIR += rubygem-jdbc-mysql SUBDIR += rubygem-leo_manager_client + SUBDIR += rubygem-mario-redis-lock SUBDIR += rubygem-memcache SUBDIR += rubygem-memcache-client SUBDIR += rubygem-mysql diff --git a/databases/py-psycopg2/Makefile b/databases/py-psycopg2/Makefile index 6df7f425b63..478097a7d70 100644 --- a/databases/py-psycopg2/Makefile +++ b/databases/py-psycopg2/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= psycopg2 -PORTVERSION= 2.7.2 +PORTVERSION= 2.7.3 CATEGORIES= databases python MASTER_SITES= CHEESESHOP \ http://initd.org/psycopg/tarballs/PSYCOPG-${PORTVERSION:R:S|.|-|}/ diff --git a/databases/py-psycopg2/distinfo b/databases/py-psycopg2/distinfo index e866756ac5d..1369b51d0ac 100644 --- a/databases/py-psycopg2/distinfo +++ b/databases/py-psycopg2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1500809121 -SHA256 (psycopg2-2.7.2.tar.gz) = 3767f40bb35713ccc75dbcff80bf228a75e080d6b98c78afd5fb9aa84682a9f4 -SIZE (psycopg2-2.7.2.tar.gz) = 424897 +TIMESTAMP = 1500989964 +SHA256 (psycopg2-2.7.3.tar.gz) = c9bd49848556d04093909faec017c3675efabf78c2b7f383bf7c43ba18324ac8 +SIZE (psycopg2-2.7.3.tar.gz) = 425004 diff --git a/databases/py-sqlalchemy11/Makefile b/databases/py-sqlalchemy11/Makefile index 0306c5cb07c..85a0251b3c4 100644 --- a/databases/py-sqlalchemy11/Makefile +++ b/databases/py-sqlalchemy11/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= sqlalchemy -PORTVERSION= 1.1.11 +PORTVERSION= 1.1.12 CATEGORIES= databases python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/databases/py-sqlalchemy11/distinfo b/databases/py-sqlalchemy11/distinfo index 9a2ec9c2c88..fcced6d4f74 100644 --- a/databases/py-sqlalchemy11/distinfo +++ b/databases/py-sqlalchemy11/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1497958481 -SHA256 (SQLAlchemy-1.1.11.tar.gz) = 76f76965e9a968ba3aecd2a8bc0d991cea04fd9a182e6c95c81f1551487b0211 -SIZE (SQLAlchemy-1.1.11.tar.gz) = 5197520 +TIMESTAMP = 1500989978 +SHA256 (SQLAlchemy-1.1.12.tar.gz) = d501527319f51a3d9eb639b654222c6f67287228a98ba102b1d0b598eb3266c9 +SIZE (SQLAlchemy-1.1.12.tar.gz) = 5178158 diff --git a/databases/rubygem-active_model_serializers/Makefile b/databases/rubygem-active_model_serializers/Makefile new file mode 100644 index 00000000000..15a3e923a78 --- /dev/null +++ b/databases/rubygem-active_model_serializers/Makefile @@ -0,0 +1,24 @@ +# $FreeBSD$ + +PORTNAME= active_model_serializers +PORTVERSION= 0.10.6 +CATEGORIES= databases rubygems +MASTER_SITES= RG + +MAINTAINER= jrm@FreeBSD.org +COMMENT= Conventions-based JSON generation for Rails + +LICENSE= MIT + +RUN_DEPENDS= rubygem-activemodel5>0:databases/rubygem-activemodel5 \ + rubygem-actionpack5>0:www/rubygem-actionpack5 \ + rubygem-railties5>0:www/rubygem-railties5 \ + rubygem-jsonapi-renderer>0.1:devel/rubygem-jsonapi-renderer \ + rubygem-case_transform>=0.2:textproc/rubygem-case_transform + +USES= gem +USE_RUBY= yes + +NO_ARCH= yes + +.include diff --git a/databases/rubygem-active_model_serializers/distinfo b/databases/rubygem-active_model_serializers/distinfo new file mode 100644 index 00000000000..880e0196fe7 --- /dev/null +++ b/databases/rubygem-active_model_serializers/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1501015781 +SHA256 (rubygem/active_model_serializers-0.10.6.gem) = 5acc26c2bf4fa34905671c3d36dd362220b26d818563f1be8d70fdf21f20f56c +SIZE (rubygem/active_model_serializers-0.10.6.gem) = 438784 diff --git a/databases/rubygem-active_model_serializers/pkg-descr b/databases/rubygem-active_model_serializers/pkg-descr new file mode 100644 index 00000000000..75fdc8a485c --- /dev/null +++ b/databases/rubygem-active_model_serializers/pkg-descr @@ -0,0 +1,5 @@ +This gem is an ActiveModel Serializer implementation with Rails hooks. +It provides a means to generate JSON in an object-oriented and +convention-driven manner. + +WWW: https://github.com/rails-api/active_model_serializers diff --git a/databases/rubygem-mario-redis-lock/Makefile b/databases/rubygem-mario-redis-lock/Makefile new file mode 100644 index 00000000000..f74ee5834ad --- /dev/null +++ b/databases/rubygem-mario-redis-lock/Makefile @@ -0,0 +1,20 @@ +# $FreeBSD$ + +PORTNAME= mario-redis-lock +PORTVERSION= 1.2.0 +CATEGORIES= databases rubygems +MASTER_SITES= RG + +MAINTAINER= jrm@FreeBSD.org +COMMENT= Ruby distributed lock using Redis, with emphasis in transparency + +LICENSE= MIT + +RUN_DEPENDS= rubygem-redis>=3.3.3:databases/rubygem-redis + +USES= gem +USE_RUBY= yes + +NO_ARCH= yes + +.include diff --git a/databases/rubygem-mario-redis-lock/distinfo b/databases/rubygem-mario-redis-lock/distinfo new file mode 100644 index 00000000000..6f96a360da0 --- /dev/null +++ b/databases/rubygem-mario-redis-lock/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1501012237 +SHA256 (rubygem/mario-redis-lock-1.2.0.gem) = 71284375e58a89bf5c337c44f0e7da2576cfcc762dec0cc632c992d84dddac72 +SIZE (rubygem/mario-redis-lock-1.2.0.gem) = 14336 diff --git a/databases/rubygem-mario-redis-lock/pkg-descr b/databases/rubygem-mario-redis-lock/pkg-descr new file mode 100644 index 00000000000..c05335415da --- /dev/null +++ b/databases/rubygem-mario-redis-lock/pkg-descr @@ -0,0 +1,6 @@ +This is yet another Ruby distributed lock using Redis, with an emphasis on +transparency. It requires Redis version 2.6.12 or later, because it uses the +syntax for SET introduced in that version to easily implement the robust +algorithm described in the SET command documentation. + +WWW: https://github.com/marioizquierdo/mario-redis-lock diff --git a/deskutils/growl-for-linux/Makefile b/deskutils/growl-for-linux/Makefile index ff98ccfea25..199b2015f32 100644 --- a/deskutils/growl-for-linux/Makefile +++ b/deskutils/growl-for-linux/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME= growl-for-linux -PORTVERSION= 0.8.1 -PORTREVISION= 2 +PORTVERSION= 0.8.5 +PORTREVISION= 0 CATEGORIES= deskutils MAINTAINER= nivit@FreeBSD.org @@ -13,7 +13,10 @@ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= desktop-file-install:devel/desktop-file-utils LIB_DEPENDS= libcurl.so:ftp/curl \ - libdbus-glib-1.so:devel/dbus-glib + libdbus-1.so:devel/dbus \ + libdbus-glib-1.so:devel/dbus-glib \ + libfontconfig.so:x11-fonts/fontconfig \ + libfreetype.so:print/freetype2 BROKEN_powerpc64= fails to compile: balloon.c:160: error: nested functions are disabled, use -fnested-functions to re-enable @@ -37,8 +40,9 @@ PLIST_SUB= DESKTOPDIR=${DESKTOPDIR:S,^${PREFIX}/,,} USES= autoreconf compiler:nestedfct libtool pkgconfig sqlite:3 ssl USE_GITHUB= yes -USE_GNOME= gtk20 - +USE_GNOME= cairo gdkpixbuf2 gtk20 libxml2 +USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME}/display \ + ${PREFIX}/lib/${PORTNAME}/subscribe post-patch: @${REINPLACE_CMD} '/^gol_LDADD =/s/$$/ -lgmodule-2.0/' \ ${WRKSRC}/Makefile.am diff --git a/deskutils/growl-for-linux/distinfo b/deskutils/growl-for-linux/distinfo index e031b2355e6..5b3bcffd0ed 100644 --- a/deskutils/growl-for-linux/distinfo +++ b/deskutils/growl-for-linux/distinfo @@ -1,2 +1,3 @@ -SHA256 (mattn-growl-for-linux-0.8.1_GH0.tar.gz) = 4762ca137277c48ba778e4652eb5ee354d726953c515a9fb0527b373fd2d4bf9 -SIZE (mattn-growl-for-linux-0.8.1_GH0.tar.gz) = 746865 +TIMESTAMP = 1500984019 +SHA256 (mattn-growl-for-linux-0.8.5_GH0.tar.gz) = 6af57c763d26e8bf985eb6ede5c2d2be9469c4f9254bdebcb168f0703dfb20fa +SIZE (mattn-growl-for-linux-0.8.5_GH0.tar.gz) = 842940 diff --git a/deskutils/growl-for-linux/files/patch-configure.ac b/deskutils/growl-for-linux/files/patch-configure.ac deleted file mode 100644 index f1250a736b2..00000000000 --- a/deskutils/growl-for-linux/files/patch-configure.ac +++ /dev/null @@ -1,9 +0,0 @@ ---- ./configure.ac.orig 2012-09-01 14:59:36.000000000 +0200 -+++ ./configure.ac 2012-09-01 15:00:01.000000000 +0200 -@@ -1,5 +1,5 @@ - AC_PREREQ([2.65]) --AC_INIT([growl-for-linux], [esyscmd([cat VERSION | tr -d '\n'])], [mattn.jp@gmail.com]) -+AC_INIT([growl-for-linux], esyscmd([tr -d '\n' < VERSION]), [mattn.jp@gmail.com]) - AC_CONFIG_SRCDIR([gol.c]) - AC_CONFIG_MACRO_DIR([m4]) - diff --git a/deskutils/growl-for-linux/files/patch-gol.c b/deskutils/growl-for-linux/files/patch-gol.c deleted file mode 100644 index b4a722cf371..00000000000 --- a/deskutils/growl-for-linux/files/patch-gol.c +++ /dev/null @@ -1,25 +0,0 @@ ---- gol.c.orig 2014-05-20 03:11:04.000000000 +0200 -+++ gol.c 2015-02-28 20:05:59.171972929 +0100 -@@ -1427,18 +1427,18 @@ - r-(ptr-top)-6, &aeskey, (unsigned char*) iv, AES_DECRYPT); - } - else if (!strcmp(crypt_algorythm, "DES")) { -- des_key_schedule schedule; -+ DES_key_schedule schedule; - DES_set_key_unchecked((const_DES_cblock*) &digest, &schedule); - DES_ncbc_encrypt((unsigned char*) ptr, (unsigned char*) data, - r-(ptr-top)-6, &schedule, (const_DES_cblock*) &iv, DES_DECRYPT); - } - else if (!strcmp(crypt_algorythm, "3DES")) { -- des_key_schedule schedule1, schedule2, schedule3; -+ DES_key_schedule schedule1, schedule2, schedule3; - DES_set_key_unchecked((const_DES_cblock*) (digest+ 0), &schedule1); - DES_set_key_unchecked((const_DES_cblock*) (digest+ 8), &schedule2); - DES_set_key_unchecked((const_DES_cblock*) (digest+16), &schedule3); -- des_ede3_cbc_encrypt((unsigned char*) ptr, (unsigned char*) data, -- r-(ptr-top)-6, schedule1, schedule2, schedule3, -+ DES_ede3_cbc_encrypt((unsigned char*) ptr, (unsigned char*) data, -+ r-(ptr-top)-6, &schedule1, &schedule2, &schedule3, - (const_DES_cblock*) &iv, DES_DECRYPT); - } else { - data = strdup(ptr); diff --git a/deskutils/growl-for-linux/pkg-plist b/deskutils/growl-for-linux/pkg-plist index 543f2312982..807538f69e4 100644 --- a/deskutils/growl-for-linux/pkg-plist +++ b/deskutils/growl-for-linux/pkg-plist @@ -24,7 +24,7 @@ lib/growl-for-linux/subscribe/libtweets.so lib/growl-for-linux/subscribe/libtweets.so.0 lib/growl-for-linux/subscribe/libtweets.so.0.0.0 %%DESKTOPDIR%%/gol.desktop -%%DATADIR%%/data/growl4linux.jpg %%DATADIR%%/data/icon.png +%%DATADIR%%/data/icon256.png %%DATADIR%%/data/icon_dnd.png %%DATADIR%%/data/mattn.png diff --git a/deskutils/menumaker/Makefile b/deskutils/menumaker/Makefile index de1a1db406c..455b2ea6a94 100644 --- a/deskutils/menumaker/Makefile +++ b/deskutils/menumaker/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= menumaker -PORTVERSION= 0.99.9 +PORTVERSION= 0.99.10 CATEGORIES= deskutils MASTER_SITES= SF/${PORTNAME} diff --git a/deskutils/menumaker/distinfo b/deskutils/menumaker/distinfo index 71d80c55e83..dfb27d97d88 100644 --- a/deskutils/menumaker/distinfo +++ b/deskutils/menumaker/distinfo @@ -1,2 +1,3 @@ -SHA256 (menumaker-0.99.9.tar.gz) = 653361fa8d739e0adba788f187ae2545e0a9c510fd7544c31b7fbc25e87e0e2f -SIZE (menumaker-0.99.9.tar.gz) = 177303 +TIMESTAMP = 1501021609 +SHA256 (menumaker-0.99.10.tar.gz) = 7e22db0f0d937d33bb338e03f6eac9aa549b9a790c666e519b13de39de66a4d6 +SIZE (menumaker-0.99.10.tar.gz) = 202580 diff --git a/devel/Makefile b/devel/Makefile index 58fd0fdfbc6..8e5385b4977 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -1631,6 +1631,7 @@ SUBDIR += mate-common SUBDIR += matreshka SUBDIR += maven-wrapper + SUBDIR += maven SUBDIR += maven3 SUBDIR += maven31 SUBDIR += maven33 @@ -4673,6 +4674,7 @@ SUBDIR += py-pyvalid SUBDIR += py-pyvisa SUBDIR += py-pyvisa-py + SUBDIR += py-pyxb SUBDIR += py-pyxml2obj SUBDIR += py-qpid SUBDIR += py-qserve @@ -5448,6 +5450,7 @@ SUBDIR += rubygem-json1 SUBDIR += rubygem-json_pure SUBDIR += rubygem-json_pure1 + SUBDIR += rubygem-jsonapi-renderer SUBDIR += rubygem-kafo SUBDIR += rubygem-kafo_parsers SUBDIR += rubygem-kafo_wizards diff --git a/devel/awscli/Makefile b/devel/awscli/Makefile index 60e1b34a1bd..da9f7242a4a 100644 --- a/devel/awscli/Makefile +++ b/devel/awscli/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= awscli -PORTVERSION= 1.11.117 +PORTVERSION= 1.11.123 CATEGORIES= devel MASTER_SITES= CHEESESHOP @@ -12,7 +12,7 @@ COMMENT= Universal Command Line Interface for Amazon Web Services LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}botocore>=1.5.80:devel/py-botocore \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}botocore>=1.5.86:devel/py-botocore \ ${PYTHON_PKGNAMEPREFIX}colorama>=0.2.5:devel/py-colorama \ ${PYTHON_PKGNAMEPREFIX}s3transfer>=0.1.9:net/py-s3transfer \ ${PYTHON_PKGNAMEPREFIX}docutils>=0.10:textproc/py-docutils \ diff --git a/devel/awscli/distinfo b/devel/awscli/distinfo index a4ac15e0ed4..13f5c43ac5a 100644 --- a/devel/awscli/distinfo +++ b/devel/awscli/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499406724 -SHA256 (awscli-1.11.117.tar.gz) = 6f77d8d7b990f43795c2fac6117ff56d751ef8f8e71116c5cc7f4ab16a3f4154 -SIZE (awscli-1.11.117.tar.gz) = 547259 +TIMESTAMP = 1500931988 +SHA256 (awscli-1.11.123.tar.gz) = 74808159d67c31ce00f6ef1ea7a7f15794cc9cc16d23e25689bf18c30de24c48 +SIZE (awscli-1.11.123.tar.gz) = 548760 diff --git a/devel/bullet/Makefile b/devel/bullet/Makefile index 344e8bc6b83..62cae70cc79 100644 --- a/devel/bullet/Makefile +++ b/devel/bullet/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= bullet -PORTVERSION= 2.83.7 -PORTREVISION= 2 +PORTVERSION= 2.86.1 CATEGORIES= devel MAINTAINER= acm@FreeBSD.org @@ -24,7 +23,10 @@ USE_XORG= x11 USES= cmake tar:tgz CMAKE_ARGS= -DBUILD_SHARED_LIBS:BOOL=ON \ -DINSTALL_LIBS:BOOL=ON \ - -DBUILD_BULLET2_DEMOS:BOOL=OFF + -DINSTALL_EXTRA_LIBS:BOOL=ON \ + -DBUILD_BULLET2_DEMOS:BOOL=OFF \ + -DBUILD_BULLET3_DEMOS:BOOL=OFF \ + -DBUILD_UNIT_TESTS:BOOL=OFF NOPIE_PORTS= yes diff --git a/devel/bullet/distinfo b/devel/bullet/distinfo index 1c2c9f67f8b..b25b6434ff9 100644 --- a/devel/bullet/distinfo +++ b/devel/bullet/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1472045659 -SHA256 (bulletphysics-bullet3-2.83.7_GH0.tar.gz) = 00d1d8f206ee85ffd171643ac8e72f9f4e0bf6dbf3d4ac55f4495cb168b51243 -SIZE (bulletphysics-bullet3-2.83.7_GH0.tar.gz) = 18754201 +TIMESTAMP = 1500496996 +SHA256 (bulletphysics-bullet3-2.86.1_GH0.tar.gz) = c058b2e4321ba6adaa656976c1a138c07b18fc03b29f5b82880d5d8228fbf059 +SIZE (bulletphysics-bullet3-2.86.1_GH0.tar.gz) = 26065278 diff --git a/devel/bullet/files/patch-examples_ThirdPartyLibs_Gwen_Macros.h b/devel/bullet/files/patch-examples_ThirdPartyLibs_Gwen_Macros.h new file mode 100644 index 00000000000..d11ff9daa76 --- /dev/null +++ b/devel/bullet/files/patch-examples_ThirdPartyLibs_Gwen_Macros.h @@ -0,0 +1,21 @@ +--- examples/ThirdPartyLibs/Gwen/Macros.h.orig 2017-02-17 23:43:38 UTC ++++ examples/ThirdPartyLibs/Gwen/Macros.h +@@ -4,9 +4,6 @@ + #define GWEN_MACROS_H + #include + #include +-#ifndef __APPLE__ +-#include +-#endif //__APPLE__ + #include + #include + +@@ -38,7 +35,7 @@ + #define GwenUtil_OutputDebugWideString( lpOutputString ) //wprintf( lpOutputString ) + #define GwenUtil_WideStringToFloat( _Str ) wcstof(_Str, NULL) + +-#elif defined(__linux__) ++#elif defined(__linux__) || defined(__FreeBSD__) + + #define GwenUtil_VSNPrintFSafe( _DstBuf, _DstSize, _MaxCount, _Format, _ArgList ) vsnprintf( _DstBuf, _DstSize, _Format, _ArgList ) + #define GwenUtil_VSWPrintFSafe( _DstBuf, _SizeInWords, _Format, _ArgList ) vswprintf( _DstBuf, _SizeInWords, _Format, _ArgList ) diff --git a/devel/bullet/pkg-plist b/devel/bullet/pkg-plist index eaacc354ac7..cebc9f0e934 100644 --- a/devel/bullet/pkg-plist +++ b/devel/bullet/pkg-plist @@ -151,7 +151,6 @@ include/bullet/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h include/bullet/BulletCollision/BroadphaseCollision/btDbvt.h include/bullet/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h include/bullet/BulletCollision/BroadphaseCollision/btDispatcher.h -include/bullet/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.h include/bullet/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h include/bullet/BulletCollision/BroadphaseCollision/btOverlappingPairCallback.h include/bullet/BulletCollision/BroadphaseCollision/btQuantizedBvh.h @@ -300,19 +299,23 @@ include/bullet/BulletDynamics/ConstraintSolver/btTypedConstraint.h include/bullet/BulletDynamics/ConstraintSolver/btUniversalConstraint.h include/bullet/BulletDynamics/Dynamics/btActionInterface.h include/bullet/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h +include/bullet/BulletDynamics/Dynamics/btDiscreteDynamicsWorldMt.h include/bullet/BulletDynamics/Dynamics/btDynamicsWorld.h include/bullet/BulletDynamics/Dynamics/btRigidBody.h include/bullet/BulletDynamics/Dynamics/btSimpleDynamicsWorld.h +include/bullet/BulletDynamics/Dynamics/btSimulationIslandManagerMt.h include/bullet/BulletDynamics/Featherstone/btMultiBody.h include/bullet/BulletDynamics/Featherstone/btMultiBodyConstraint.h include/bullet/BulletDynamics/Featherstone/btMultiBodyConstraintSolver.h include/bullet/BulletDynamics/Featherstone/btMultiBodyDynamicsWorld.h +include/bullet/BulletDynamics/Featherstone/btMultiBodyFixedConstraint.h include/bullet/BulletDynamics/Featherstone/btMultiBodyJointFeedback.h include/bullet/BulletDynamics/Featherstone/btMultiBodyJointLimitConstraint.h include/bullet/BulletDynamics/Featherstone/btMultiBodyJointMotor.h include/bullet/BulletDynamics/Featherstone/btMultiBodyLink.h include/bullet/BulletDynamics/Featherstone/btMultiBodyLinkCollider.h include/bullet/BulletDynamics/Featherstone/btMultiBodyPoint2Point.h +include/bullet/BulletDynamics/Featherstone/btMultiBodySliderConstraint.h include/bullet/BulletDynamics/Featherstone/btMultiBodySolverConstraint.h include/bullet/BulletDynamics/MLCPSolvers/btDantzigLCP.h include/bullet/BulletDynamics/MLCPSolvers/btDantzigSolver.h @@ -326,6 +329,13 @@ include/bullet/BulletDynamics/Vehicle/btRaycastVehicle.h include/bullet/BulletDynamics/Vehicle/btVehicleRaycaster.h include/bullet/BulletDynamics/Vehicle/btWheelInfo.h include/bullet/BulletDynamics/btBulletDynamicsCommon.h +include/bullet/BulletFileLoader/autogenerated/bullet.h +include/bullet/BulletFileLoader/bChunk.h +include/bullet/BulletFileLoader/bCommon.h +include/bullet/BulletFileLoader/bDNA.h +include/bullet/BulletFileLoader/bDefines.h +include/bullet/BulletFileLoader/bFile.h +include/bullet/BulletFileLoader/btBulletFile.h include/bullet/BulletInverseDynamics/btBulletCollisionCommon.h include/bullet/BulletSoftBody/btDefaultSoftBodySolver.h include/bullet/BulletSoftBody/btSoftBody.h @@ -336,10 +346,43 @@ include/bullet/BulletSoftBody/btSoftBodyInternals.h include/bullet/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.h include/bullet/BulletSoftBody/btSoftBodySolverVertexBuffer.h include/bullet/BulletSoftBody/btSoftBodySolvers.h +include/bullet/BulletSoftBody/btSoftMultiBodyDynamicsWorld.h include/bullet/BulletSoftBody/btSoftRigidCollisionAlgorithm.h include/bullet/BulletSoftBody/btSoftRigidDynamicsWorld.h include/bullet/BulletSoftBody/btSoftSoftCollisionAlgorithm.h include/bullet/BulletSoftBody/btSparseSDF.h +include/bullet/BulletWorldImporter/btBulletWorldImporter.h +include/bullet/BulletWorldImporter/btWorldImporter.h +include/bullet/BulletXmlWorldImporter/btBulletXmlWorldImporter.h +include/bullet/BulletXmlWorldImporter/string_split.h +include/bullet/BulletXmlWorldImporter/tinystr.h +include/bullet/BulletXmlWorldImporter/tinyxml.h +include/bullet/ConvexDecomposition/ConvexBuilder.h +include/bullet/ConvexDecomposition/ConvexDecomposition.h +include/bullet/ConvexDecomposition/bestfit.h +include/bullet/ConvexDecomposition/bestfitobb.h +include/bullet/ConvexDecomposition/cd_hull.h +include/bullet/ConvexDecomposition/cd_vector.h +include/bullet/ConvexDecomposition/cd_wavefront.h +include/bullet/ConvexDecomposition/concavity.h +include/bullet/ConvexDecomposition/fitsphere.h +include/bullet/ConvexDecomposition/float_math.h +include/bullet/ConvexDecomposition/meshvolume.h +include/bullet/ConvexDecomposition/planetri.h +include/bullet/ConvexDecomposition/raytri.h +include/bullet/ConvexDecomposition/splitplane.h +include/bullet/ConvexDecomposition/vlookup.h +include/bullet/GIMPACTUtils/btGImpactConvexDecompositionShape.h +include/bullet/HACD/hacdCircularList.h +include/bullet/HACD/hacdCircularList.inl +include/bullet/HACD/hacdGraph.h +include/bullet/HACD/hacdHACD.h +include/bullet/HACD/hacdICHull.h +include/bullet/HACD/hacdManifoldMesh.h +include/bullet/HACD/hacdVector.h +include/bullet/HACD/hacdVector.inl +include/bullet/HACD/hacdVersion.h +include/bullet/InverseDynamics/BulletInverseDynamicsUtilsCommon.h include/bullet/LinearMath/btAabbUtil2.h include/bullet/LinearMath/btAlignedAllocator.h include/bullet/LinearMath/btAlignedObjectArray.h @@ -366,6 +409,7 @@ include/bullet/LinearMath/btScalar.h include/bullet/LinearMath/btSerializer.h include/bullet/LinearMath/btSpatialAlgebra.h include/bullet/LinearMath/btStackAlloc.h +include/bullet/LinearMath/btThreads.h include/bullet/LinearMath/btTransform.h include/bullet/LinearMath/btTransformUtil.h include/bullet/LinearMath/btVector3.h @@ -374,26 +418,40 @@ include/bullet/btBulletDynamicsCommon.h lib/cmake/bullet/BulletConfig.cmake lib/cmake/bullet/UseBullet.cmake lib/libBullet2FileLoader.so -lib/libBullet2FileLoader.so.2.83 +lib/libBullet2FileLoader.so.2.86 lib/libBullet3Collision.so -lib/libBullet3Collision.so.2.83 +lib/libBullet3Collision.so.2.86 lib/libBullet3Common.so -lib/libBullet3Common.so.2.83 +lib/libBullet3Common.so.2.86 lib/libBullet3Dynamics.so -lib/libBullet3Dynamics.so.2.83 +lib/libBullet3Dynamics.so.2.86 lib/libBullet3Geometry.so -lib/libBullet3Geometry.so.2.83 +lib/libBullet3Geometry.so.2.86 lib/libBullet3OpenCL_clew.so -lib/libBullet3OpenCL_clew.so.2.83 +lib/libBullet3OpenCL_clew.so.2.86 lib/libBulletCollision.so -lib/libBulletCollision.so.2.83 +lib/libBulletCollision.so.2.86 lib/libBulletDynamics.so -lib/libBulletDynamics.so.2.83 +lib/libBulletDynamics.so.2.86 +lib/libBulletFileLoader.so +lib/libBulletFileLoader.so.2.86 lib/libBulletInverseDynamics.so -lib/libBulletInverseDynamics.so.2.83 +lib/libBulletInverseDynamics.so.2.86 +lib/libBulletInverseDynamicsUtils.so +lib/libBulletInverseDynamicsUtils.so.2.86 lib/libBulletSoftBody.so -lib/libBulletSoftBody.so.2.83 +lib/libBulletSoftBody.so.2.86 +lib/libBulletWorldImporter.so +lib/libBulletWorldImporter.so.2.86 +lib/libBulletXmlWorldImporter.so +lib/libBulletXmlWorldImporter.so.2.86 +lib/libConvexDecomposition.so +lib/libConvexDecomposition.so.2.86 +lib/libGIMPACTUtils.so +lib/libGIMPACTUtils.so.2.86 +lib/libHACD.so +lib/libHACD.so.2.86 lib/libLinearMath.so -lib/libLinearMath.so.2.83 +lib/libLinearMath.so.2.86 libdata/pkgconfig/bullet.pc @dir include/bullet/BulletInverseDynamics/details diff --git a/devel/efl/Makefile b/devel/efl/Makefile index fc489c9abe8..c4e8b27aa5e 100644 --- a/devel/efl/Makefile +++ b/devel/efl/Makefile @@ -3,7 +3,7 @@ PORTNAME= efl PORTVERSION= 1.18.4 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= devel enlightenment MASTER_SITES= http://download.enlightenment.org/rel/libs/${PORTNAME}/ DIST_SUBDIR= enlightenment diff --git a/devel/gsoap/Makefile b/devel/gsoap/Makefile index eef46dd7850..aac20ce7f1a 100644 --- a/devel/gsoap/Makefile +++ b/devel/gsoap/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gsoap -PORTVERSION= 2.8.46 +PORTVERSION= 2.8.50 CATEGORIES= devel MASTER_SITES= SF/${PORTNAME}2/gsoap-2.8 DISTNAME= ${PORTNAME}_${PORTVERSION} diff --git a/devel/gsoap/distinfo b/devel/gsoap/distinfo index cfbd7e77f9d..c4d3c87b1e1 100644 --- a/devel/gsoap/distinfo +++ b/devel/gsoap/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1495260869 -SHA256 (gsoap_2.8.46.zip) = 3083818fb42b9e7251daf21728132db15354eb8c14060c2dc6949dafbec976be -SIZE (gsoap_2.8.46.zip) = 33607528 +TIMESTAMP = 1500917106 +SHA256 (gsoap_2.8.50.zip) = d1225f297963d1336ffaa7557990a2a0c8c7700774baa107ecb5467bfc0a265a +SIZE (gsoap_2.8.50.zip) = 34688187 diff --git a/devel/gsoap/files/patch-gsoap_wsdl_Makefile.in b/devel/gsoap/files/patch-gsoap_wsdl_Makefile.in index 4184bea4b77..89406edcce8 100644 --- a/devel/gsoap/files/patch-gsoap_wsdl_Makefile.in +++ b/devel/gsoap/files/patch-gsoap_wsdl_Makefile.in @@ -1,9 +1,9 @@ ---- gsoap/wsdl/Makefile.in.orig 2017-04-08 13:59:08 UTC -+++ gsoap/wsdl/Makefile.in -@@ -314,7 +314,7 @@ SOAP_FLAGS = -SC -pwsdl -I$(srcdir) -I$( +--- gsoap/wsdl/Makefile.in.orig 2017-07-24 13:25:52.574440000 -0400 ++++ gsoap/wsdl/Makefile.in 2017-07-24 13:26:49.901559000 -0400 +@@ -315,7 +315,7 @@ SOAP_FLAGS = -SC -pwsdl -I$(srcdir) -I$(top_srcdir)/gs BUILT_SOURCES = $(SOAP_CPP_SRC) - wsdl2h_CFLAGS = $(C_DEBUG_FLAGS) $(WSDL2H_EXTRA_FLAGS) - wsdl2h_CXXFLAGS = $(C_DEBUG_FLAGS) $(WSDL2H_EXTRA_FLAGS) $(WSDL2H_IMPORTPATH) + wsdl2h_CFLAGS = $(C_DEBUG_FLAGS) $(SOAPCPP2_NO_C_LOCALE) $(WSDL2H_EXTRA_FLAGS) + wsdl2h_CXXFLAGS = $(C_DEBUG_FLAGS) $(SOAPCPP2_NO_C_LOCALE) $(WSDL2H_EXTRA_FLAGS) $(WSDL2H_IMPORTPATH) -wsdl2h_CPPFLAGS = $(AM_CPPFLAGS) $(SOAPCPP2_NONAMESPACES) -D$(platform) +wsdl2h_CPPFLAGS = $(AM_CPPFLAGS) $(SOAPCPP2_NONAMESPACES) $(WSDL2H_IMPORTPATH) -D$(platform) wsdl2h_SOURCES = wsdl2h.cpp wsdl.cpp wadl.cpp schema.cpp types.cpp service.cpp soap.cpp mime.cpp wsp.cpp bpel.cpp $(SOAP_CPP_SRC) diff --git a/devel/gsoap/pkg-plist b/devel/gsoap/pkg-plist index a1d4994feed..fdbd3268773 100644 --- a/devel/gsoap/pkg-plist +++ b/devel/gsoap/pkg-plist @@ -152,6 +152,8 @@ libdata/pkgconfig/gsoapssl.pc %%DATADIR%%/plugin/cacerts.c %%DATADIR%%/plugin/cacerts.h %%DATADIR%%/plugin/calcrest.h +%%DATADIR%%/plugin/curlapi.c +%%DATADIR%%/plugin/curlapi.h %%DATADIR%%/plugin/httpda.c %%DATADIR%%/plugin/httpda.h %%DATADIR%%/plugin/httpdatest.c diff --git a/devel/liteide/Makefile b/devel/liteide/Makefile index 421f37c48d8..255a95c6f42 100644 --- a/devel/liteide/Makefile +++ b/devel/liteide/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= liteide -PORTVERSION= 32.1 +PORTVERSION= 32.2 DISTVERSIONPREFIX= x CATEGORIES= devel editors diff --git a/devel/liteide/distinfo b/devel/liteide/distinfo index 346bd288c12..269270d77b8 100644 --- a/devel/liteide/distinfo +++ b/devel/liteide/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1500133916 -SHA256 (visualfc-liteide-x32.1_GH0.tar.gz) = 3753530fcaa2408eaf048d93d1c8a7113e1795be0176c074ab1cc86306bab4fb -SIZE (visualfc-liteide-x32.1_GH0.tar.gz) = 2365474 +TIMESTAMP = 1500472890 +SHA256 (visualfc-liteide-x32.2_GH0.tar.gz) = 36c1b9cb8632577ea89e8c955d5f94079245b99f4020d5c350bb9199df3f4a8a +SIZE (visualfc-liteide-x32.2_GH0.tar.gz) = 2559354 diff --git a/devel/liteide/files/patch-src_3rdparty_qjsonrpc_src_json_json.pri b/devel/liteide/files/patch-src_3rdparty_qjsonrpc_src_json_json.pri new file mode 100644 index 00000000000..7baeb660ab5 --- /dev/null +++ b/devel/liteide/files/patch-src_3rdparty_qjsonrpc_src_json_json.pri @@ -0,0 +1,8 @@ +--- src/3rdparty/qjsonrpc/src/json/json.pri.orig 2017-07-20 14:27:57 UTC ++++ src/3rdparty/qjsonrpc/src/json/json.pri +@@ -29,4 +29,4 @@ json.files = \ + $${PWD}/qjsonarray.h + + json.path = $${PREFIX}/include/qjsonrpc/json +-INSTALLS += json ++# INSTALLS += json diff --git a/devel/liteide/pkg-plist b/devel/liteide/pkg-plist index 73f0f090472..6ada0035d33 100644 --- a/devel/liteide/pkg-plist +++ b/devel/liteide/pkg-plist @@ -2,6 +2,7 @@ bin/liteide lib/liteide/libcolorstyle.a lib/liteide/libcplusplus.a lib/liteide/libdiff_match_pitch.a +lib/liteide/libdlvclient.a lib/liteide/libdocbrowserapi.a lib/liteide/libdocumentbrowser.a lib/liteide/libeditorutil.a @@ -31,6 +32,7 @@ lib/liteide/liblitettyapi.a lib/liteide/libmimetype.a lib/liteide/libmodelproject.a lib/liteide/libprocessex.a +lib/liteide/libqjsonrpc.a lib/liteide/libqt_browser.a lib/liteide/libqtc_editutil.a lib/liteide/libqtc_itemview.a diff --git a/devel/maven/Makefile b/devel/maven/Makefile new file mode 100644 index 00000000000..52e74283d9b --- /dev/null +++ b/devel/maven/Makefile @@ -0,0 +1,46 @@ +# Created by: JonathanChen +# $FreeBSD$ + +PORTNAME= maven +DISTVERSION= 3.5.0 +CATEGORIES= devel java +MASTER_SITES= APACHE/maven/maven-3/${DISTVERSION}/binaries +DISTNAME= apache-maven-${DISTVERSION}-bin + +MAINTAINER= jonc@chen.org.nz +COMMENT= Java project management tool + +LICENSE= APACHE20 + +RUN_DEPENDS= mvn:devel/maven-wrapper + +USES= cpe +CPE_PRODUCT= maven +CPE_VENDOR= apache + +USE_JAVA= yes +JAVA_VERSION= 1.7+ +NO_BUILD= yes +DATADIR= ${JAVASHAREDIR}/${PORTNAME} +WRKSRC= ${WRKDIR}/apache-maven-${DISTVERSION} +SUB_FILES= mvn.sh +SUB_LIST= CLASSWORLDS_JAR=plexus-classworlds-2.5.2.jar +INSTANCE_FILE= ${PORTNAME}-${PORTVERSION} +INSTANCES_DIR= etc/maven-wrapper/instances.d/ + +post-extract: + ${RM} ${WRKSRC}/bin/*.bat + ${ECHO_CMD} "${DATADIR}" > ${WRKSRC}/${INSTANCE_FILE} + +do-install: + cd ${WRKSRC} && ${FIND} . -type d -exec ${MKDIR} \ + ${STAGEDIR}${DATADIR}/{} \; + cd ${WRKSRC} && ${FIND} . -type f -not -path "\./bin/" \ + -exec ${INSTALL_DATA} {} ${STAGEDIR}${DATADIR}/{} \; + ${INSTALL_DATA} ${WRKSRC}/bin/m2.conf ${STAGEDIR}${DATADIR}/bin + ${INSTALL_SCRIPT} ${WRKDIR}/mvn.sh ${STAGEDIR}${DATADIR}/bin/mvn + @${MKDIR} ${STAGEDIR}${PREFIX}/${INSTANCES_DIR} + ${INSTALL_DATA} ${WRKSRC}/${INSTANCE_FILE} \ + ${STAGEDIR}${PREFIX}/${INSTANCES_DIR} + +.include diff --git a/devel/maven/distinfo b/devel/maven/distinfo new file mode 100644 index 00000000000..06f6966edcc --- /dev/null +++ b/devel/maven/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1500859622 +SHA256 (apache-maven-3.5.0-bin.tar.gz) = beb91419245395bd69a4a6edad5ca3ec1a8b64e41457672dc687c173a495f034 +SIZE (apache-maven-3.5.0-bin.tar.gz) = 8534562 diff --git a/devel/maven/files/mvn.sh.in b/devel/maven/files/mvn.sh.in new file mode 100644 index 00000000000..b137c948686 --- /dev/null +++ b/devel/maven/files/mvn.sh.in @@ -0,0 +1,46 @@ +#!/bin/sh +# + +if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc +fi + +if [ -f "${HOME}/.mavenrc" ] ; then + . "${HOME}/.mavenrc" +fi + +M2_HOME=${M2_HOME:-"%%DATADIR%%"} + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() +{ + local basedir=$(pwd) + local wdir=$(pwd) + while [ "$wdir" != '/' ] ; do + wdir=$(cd "$wdir/.."; pwd) + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() +{ + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-$(find_maven_basedir)} +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +JAVA_VERSION="%%JAVA_VERSION%%" exec "%%LOCALBASE%%/bin/java" $MAVEN_OPTS \ + -classpath "${M2_HOME}/boot/%%CLASSWORLDS_JAR%%" \ + "-Dclassworlds.conf=${M2_HOME}/bin/m2.conf" \ + "-Dmaven.home=${M2_HOME}" \ + "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + org.codehaus.classworlds.Launcher "$@" diff --git a/devel/maven/pkg-descr b/devel/maven/pkg-descr new file mode 100644 index 00000000000..7534bd09c0d --- /dev/null +++ b/devel/maven/pkg-descr @@ -0,0 +1,5 @@ +Apache Maven is a software project management and comprehension tool. Based on +the concept of a project object model (POM), Maven can manage a project's +build, reporting and documentation from a central piece of information. + +WWW: http://maven.apache.org/ diff --git a/devel/maven/pkg-plist b/devel/maven/pkg-plist new file mode 100644 index 00000000000..a9ffeafd743 --- /dev/null +++ b/devel/maven/pkg-plist @@ -0,0 +1,101 @@ +etc/maven-wrapper/instances.d/maven-3.5.0 +%%DATADIR%%/LICENSE +%%DATADIR%%/NOTICE +%%DATADIR%%/README.txt +%%DATADIR%%/bin/m2.conf +%%DATADIR%%/bin/mvn +%%DATADIR%%/bin/mvn.cmd +%%DATADIR%%/bin/mvnDebug +%%DATADIR%%/bin/mvnDebug.cmd +%%DATADIR%%/bin/mvnyjp +%%DATADIR%%/boot/plexus-classworlds-2.5.2.jar +%%DATADIR%%/conf/logging/simplelogger.properties +%%DATADIR%%/conf/settings.xml +%%DATADIR%%/conf/toolchains.xml +%%DATADIR%%/lib/aopalliance-1.0.jar +%%DATADIR%%/lib/cdi-api-1.0.jar +%%DATADIR%%/lib/cdi-api.license +%%DATADIR%%/lib/commons-cli-1.4.jar +%%DATADIR%%/lib/commons-cli.license +%%DATADIR%%/lib/commons-io-2.5.jar +%%DATADIR%%/lib/commons-io.license +%%DATADIR%%/lib/commons-lang3-3.5.jar +%%DATADIR%%/lib/commons-lang3.license +%%DATADIR%%/lib/ext/README.txt +%%DATADIR%%/lib/guava-20.0.jar +%%DATADIR%%/lib/guice-4.0-no_aop.jar +%%DATADIR%%/lib/jansi-1.13.jar +%%DATADIR%%/lib/jansi-native/README.txt +%%DATADIR%%/lib/jansi-native/linux32/libjansi.so +%%DATADIR%%/lib/jansi-native/linux64/libjansi.so +%%DATADIR%%/lib/jansi-native/osx/libjansi.jnilib +%%DATADIR%%/lib/jansi-native/windows32/jansi.dll +%%DATADIR%%/lib/jansi-native/windows64/jansi.dll +%%DATADIR%%/lib/javax.inject-1.jar +%%DATADIR%%/lib/jcl-over-slf4j-1.7.22.jar +%%DATADIR%%/lib/jcl-over-slf4j.license +%%DATADIR%%/lib/jsr250-api-1.0.jar +%%DATADIR%%/lib/jsr250-api.license +%%DATADIR%%/lib/maven-artifact-3.5.0.jar +%%DATADIR%%/lib/maven-artifact.license +%%DATADIR%%/lib/maven-builder-support-3.5.0.jar +%%DATADIR%%/lib/maven-builder-support.license +%%DATADIR%%/lib/maven-compat-3.5.0.jar +%%DATADIR%%/lib/maven-compat.license +%%DATADIR%%/lib/maven-core-3.5.0.jar +%%DATADIR%%/lib/maven-core.license +%%DATADIR%%/lib/maven-embedder-3.5.0.jar +%%DATADIR%%/lib/maven-embedder.license +%%DATADIR%%/lib/maven-model-3.5.0.jar +%%DATADIR%%/lib/maven-model-builder-3.5.0.jar +%%DATADIR%%/lib/maven-model-builder.license +%%DATADIR%%/lib/maven-model.license +%%DATADIR%%/lib/maven-plugin-api-3.5.0.jar +%%DATADIR%%/lib/maven-plugin-api.license +%%DATADIR%%/lib/maven-repository-metadata-3.5.0.jar +%%DATADIR%%/lib/maven-repository-metadata.license +%%DATADIR%%/lib/maven-resolver-api-1.0.3.jar +%%DATADIR%%/lib/maven-resolver-api.license +%%DATADIR%%/lib/maven-resolver-connector-basic-1.0.3.jar +%%DATADIR%%/lib/maven-resolver-connector-basic.license +%%DATADIR%%/lib/maven-resolver-impl-1.0.3.jar +%%DATADIR%%/lib/maven-resolver-impl.license +%%DATADIR%%/lib/maven-resolver-provider-3.5.0.jar +%%DATADIR%%/lib/maven-resolver-provider.license +%%DATADIR%%/lib/maven-resolver-spi-1.0.3.jar +%%DATADIR%%/lib/maven-resolver-spi.license +%%DATADIR%%/lib/maven-resolver-transport-wagon-1.0.3.jar +%%DATADIR%%/lib/maven-resolver-transport-wagon.license +%%DATADIR%%/lib/maven-resolver-util-1.0.3.jar +%%DATADIR%%/lib/maven-resolver-util.license +%%DATADIR%%/lib/maven-settings-3.5.0.jar +%%DATADIR%%/lib/maven-settings-builder-3.5.0.jar +%%DATADIR%%/lib/maven-settings-builder.license +%%DATADIR%%/lib/maven-settings.license +%%DATADIR%%/lib/maven-shared-utils-3.1.0.jar +%%DATADIR%%/lib/maven-shared-utils.license +%%DATADIR%%/lib/maven-slf4j-provider-3.5.0.jar +%%DATADIR%%/lib/maven-slf4j-provider.license +%%DATADIR%%/lib/org.eclipse.sisu.inject-0.3.3.jar +%%DATADIR%%/lib/org.eclipse.sisu.inject.license +%%DATADIR%%/lib/org.eclipse.sisu.plexus-0.3.3.jar +%%DATADIR%%/lib/org.eclipse.sisu.plexus.license +%%DATADIR%%/lib/plexus-cipher-1.7.jar +%%DATADIR%%/lib/plexus-cipher.license +%%DATADIR%%/lib/plexus-component-annotations-1.7.1.jar +%%DATADIR%%/lib/plexus-component-annotations.license +%%DATADIR%%/lib/plexus-interpolation-1.24.jar +%%DATADIR%%/lib/plexus-interpolation.license +%%DATADIR%%/lib/plexus-sec-dispatcher-1.4.jar +%%DATADIR%%/lib/plexus-sec-dispatcher.license +%%DATADIR%%/lib/plexus-utils-3.0.24.jar +%%DATADIR%%/lib/plexus-utils.license +%%DATADIR%%/lib/slf4j-api-1.7.22.jar +%%DATADIR%%/lib/slf4j-api.license +%%DATADIR%%/lib/wagon-file-2.12.jar +%%DATADIR%%/lib/wagon-file.license +%%DATADIR%%/lib/wagon-http-2.12-shaded.jar +%%DATADIR%%/lib/wagon-http.license +%%DATADIR%%/lib/wagon-provider-api-2.12.jar +%%DATADIR%%/lib/wagon-provider-api.license +%%DATADIR%%/maven-3.5.0 diff --git a/devel/p5-Devel-Cover/Makefile b/devel/p5-Devel-Cover/Makefile index 13eb9bd8d44..e5723f72c72 100644 --- a/devel/p5-Devel-Cover/Makefile +++ b/devel/p5-Devel-Cover/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Devel-Cover -PORTVERSION= 1.25 +PORTVERSION= 1.26 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/devel/p5-Devel-Cover/distinfo b/devel/p5-Devel-Cover/distinfo index c11e5eba04f..df1b0bbde76 100644 --- a/devel/p5-Devel-Cover/distinfo +++ b/devel/p5-Devel-Cover/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1494592646 -SHA256 (Devel-Cover-1.25.tar.gz) = 4880c4f60dd4589e7853dd98a26564f0ec3f15b0006a6a9567bdf4fa0803fa36 -SIZE (Devel-Cover-1.25.tar.gz) = 204888 +TIMESTAMP = 1500990016 +SHA256 (Devel-Cover-1.26.tar.gz) = 6177abce89de2f7b709d0dd300cb787da2d7eb61693b907b47125ea439579244 +SIZE (Devel-Cover-1.26.tar.gz) = 202692 diff --git a/devel/p5-MooseX-AttributeShortcuts/Makefile b/devel/p5-MooseX-AttributeShortcuts/Makefile index e0d390d8a2b..ff2350c6f1e 100644 --- a/devel/p5-MooseX-AttributeShortcuts/Makefile +++ b/devel/p5-MooseX-AttributeShortcuts/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= MooseX-AttributeShortcuts -PORTVERSION= 0.032 +PORTVERSION= 0.033 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -15,6 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= p5-Moose>=1.14:devel/p5-Moose \ p5-MooseX-Meta-TypeConstraint-Mooish>=0:devel/p5-MooseX-Meta-TypeConstraint-Mooish \ p5-MooseX-Role-Parameterized>=0:devel/p5-MooseX-Role-Parameterized \ + p5-MooseX-SemiAffordanceAccessor>=0:devel/p5-MooseX-SemiAffordanceAccessor \ p5-MooseX-Types-Common>=0:devel/p5-MooseX-Types-Common \ p5-MooseX-Types>=0:devel/p5-MooseX-Types \ p5-aliased>=0:devel/p5-aliased \ @@ -25,6 +26,7 @@ TEST_DEPENDS= p5-MooseX-Types-Path-Class>=0:devel/p5-MooseX-Types-Path-Class \ p5-Test-CheckDeps>=0.010:devel/p5-Test-CheckDeps \ p5-Test-Fatal>=0:devel/p5-Test-Fatal \ p5-Test-Moose-More>=0.018:devel/p5-Test-Moose-More \ + p5-Test-Requires>=0:devel/p5-Test-Requires \ p5-Test-Warn>=0:devel/p5-Test-Warn NO_ARCH= yes diff --git a/devel/p5-MooseX-AttributeShortcuts/distinfo b/devel/p5-MooseX-AttributeShortcuts/distinfo index dd07eb978df..ba10316e20a 100644 --- a/devel/p5-MooseX-AttributeShortcuts/distinfo +++ b/devel/p5-MooseX-AttributeShortcuts/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1497527245 -SHA256 (MooseX-AttributeShortcuts-0.032.tar.gz) = 0c5e3e39c83ee8857279d56e0f50096b6c2cab71da5db7199dea8461412eac28 -SIZE (MooseX-AttributeShortcuts-0.032.tar.gz) = 51099 +TIMESTAMP = 1500990031 +SHA256 (MooseX-AttributeShortcuts-0.033.tar.gz) = 3bc349d50bff1fbd78d493449e83d6685a5afc82c75c7f3da206a715eff1257a +SIZE (MooseX-AttributeShortcuts-0.033.tar.gz) = 52888 diff --git a/devel/py-botocore/Makefile b/devel/py-botocore/Makefile index d1b2c5a80ac..7c45f074d8f 100644 --- a/devel/py-botocore/Makefile +++ b/devel/py-botocore/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= botocore -PORTVERSION= 1.5.80 +PORTVERSION= 1.5.86 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-botocore/distinfo b/devel/py-botocore/distinfo index 62e917ec999..696bedf08ee 100644 --- a/devel/py-botocore/distinfo +++ b/devel/py-botocore/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499406571 -SHA256 (botocore-1.5.80.tar.gz) = cd96808ff204b7e7c9be62f383bd0da2bdfc6ff14c5e691a81a929788662e10f -SIZE (botocore-1.5.80.tar.gz) = 3680973 +TIMESTAMP = 1500931847 +SHA256 (botocore-1.5.86.tar.gz) = e0c8020c9b33c37b4ae09e1e9cd5b172aa1b0e331cf08d53d65ba932c56759d7 +SIZE (botocore-1.5.86.tar.gz) = 3691194 diff --git a/devel/py-django-rq/Makefile b/devel/py-django-rq/Makefile index 1965daf2d8e..eb0bb7e37c9 100644 --- a/devel/py-django-rq/Makefile +++ b/devel/py-django-rq/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= django-rq -PORTVERSION= 0.9.5 +PORTVERSION= 0.9.6 DISTVERSIONPREFIX= v CATEGORIES= devel python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -16,14 +16,14 @@ TEST_DEPENDS= redis-server:databases/redis RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=1.5:www/py-django18 \ ${PYTHON_PKGNAMEPREFIX}rq>=0.5.5:devel/py-rq -USE_GITHUB= yes -GH_ACCOUNT= ui - NO_ARCH= yes USES= python USE_PYTHON= autoplist distutils +USE_GITHUB= yes +GH_ACCOUNT= ui + TEST_TARGET= test .include diff --git a/devel/py-django-rq/distinfo b/devel/py-django-rq/distinfo index 00a375dbaa0..1b5ec6bf6b1 100644 --- a/devel/py-django-rq/distinfo +++ b/devel/py-django-rq/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1489653887 -SHA256 (ui-django-rq-v0.9.5_GH0.tar.gz) = 683ee6444f2e21b9150215930044ef4f75bb5c5376919c36a6d401305296a544 -SIZE (ui-django-rq-v0.9.5_GH0.tar.gz) = 28072 +TIMESTAMP = 1501004244 +SHA256 (ui-django-rq-v0.9.6_GH0.tar.gz) = d3db8102c1a818d58f2c703b9e3176e172b51d1e81212f3a6aab5b9f922e69eb +SIZE (ui-django-rq-v0.9.6_GH0.tar.gz) = 28823 diff --git a/devel/py-pyxb/Makefile b/devel/py-pyxb/Makefile new file mode 100644 index 00000000000..368f4583cfc --- /dev/null +++ b/devel/py-pyxb/Makefile @@ -0,0 +1,27 @@ +# Created by: Jov +# $FreeBSD$ + +PORTNAME= pyxb +PORTVERSION= 1.2.5 +CATEGORIES= devel python +MASTER_SITES= CHEESESHOP +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +DISTNAME= PyXB-${DISTVERSION} + +MAINTAINER= amutu@amutu.com +COMMENT= Python XML schema bindings + +LICENSE= APACHE20 +LICENSE_FILE= ${WRKSRC}/LICENSE + +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libxml2>0:textproc/py-libxml2 + +USES= python +USE_PYTHON= autoplist concurrent distutils + +NO_ARCH= yes + +do-test: + @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test + +.include diff --git a/devel/py-pyxb/distinfo b/devel/py-pyxb/distinfo new file mode 100644 index 00000000000..ea165c8cb44 --- /dev/null +++ b/devel/py-pyxb/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1500859900 +SHA256 (PyXB-1.2.5.tar.gz) = 4e8f62ee2cfffc37e4f40634ab9c79e0311cfaf28cf4ce5e7f4828ec56e4ff67 +SIZE (PyXB-1.2.5.tar.gz) = 8847079 diff --git a/devel/py-pyxb/pkg-descr b/devel/py-pyxb/pkg-descr new file mode 100644 index 00000000000..4b8a50400f8 --- /dev/null +++ b/devel/py-pyxb/pkg-descr @@ -0,0 +1,5 @@ +PyXB is a pure Python package that generates Python code for classes that +correspond to data structures defined by XMLSchema. In concept it is similar +to JAXB for Java and CodeSynthesis XSD for C++. + +WWW: http://pyxb.sourceforge.net diff --git a/devel/py-rwt/Makefile b/devel/py-rwt/Makefile index f23e8406ff0..4f5defe623b 100644 --- a/devel/py-rwt/Makefile +++ b/devel/py-rwt/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= rwt -PORTVERSION= 2.15.1 +PORTVERSION= 3.0 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -16,7 +16,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.15.0:devel/py-setuptools RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pip>=0:devel/py-pip NO_ARCH= yes -USE_PYTHON= distutils +USE_PYTHON= concurrent distutils USES= python .include diff --git a/devel/py-rwt/distinfo b/devel/py-rwt/distinfo index b36688b3ff9..51142176843 100644 --- a/devel/py-rwt/distinfo +++ b/devel/py-rwt/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1495052893 -SHA256 (rwt-2.15.1.tar.gz) = b0abb1c3c1621b2bb33483245a4572a109143764176cd0a0156d50b36549760a -SIZE (rwt-2.15.1.tar.gz) = 13578 +TIMESTAMP = 1500989989 +SHA256 (rwt-3.0.tar.gz) = 1830f10a733f57176a5b155dfcb8d10ea47e553a76f9dd673fe7b7fe7e0fa147 +SIZE (rwt-3.0.tar.gz) = 14444 diff --git a/devel/rubygem-aws-sdk-core/Makefile b/devel/rubygem-aws-sdk-core/Makefile index 703d36717f0..bcc71d3568d 100644 --- a/devel/rubygem-aws-sdk-core/Makefile +++ b/devel/rubygem-aws-sdk-core/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= aws-sdk-core -PORTVERSION= 2.10.15 +PORTVERSION= 2.10.16 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-aws-sdk-core/distinfo b/devel/rubygem-aws-sdk-core/distinfo index 2e22ceec4b7..c5f174d45d7 100644 --- a/devel/rubygem-aws-sdk-core/distinfo +++ b/devel/rubygem-aws-sdk-core/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1500642218 -SHA256 (rubygem/aws-sdk-core-2.10.15.gem) = 362c9d45339ec295565d78f0463ecd33545813d22483ba67e4368fd18b95366e -SIZE (rubygem/aws-sdk-core-2.10.15.gem) = 1040384 +TIMESTAMP = 1500990050 +SHA256 (rubygem/aws-sdk-core-2.10.16.gem) = 2f84c311eeae54f0a61d18b7d310eb5b69dff983f296ac9b8e62dedc90d7853e +SIZE (rubygem/aws-sdk-core-2.10.16.gem) = 1040896 diff --git a/devel/rubygem-aws-sdk-resources/Makefile b/devel/rubygem-aws-sdk-resources/Makefile index ad69fc5648b..d023e63b867 100644 --- a/devel/rubygem-aws-sdk-resources/Makefile +++ b/devel/rubygem-aws-sdk-resources/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= aws-sdk-resources -PORTVERSION= 2.10.15 +PORTVERSION= 2.10.16 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-aws-sdk-resources/distinfo b/devel/rubygem-aws-sdk-resources/distinfo index 0aab38f2a35..902b5c2b9b1 100644 --- a/devel/rubygem-aws-sdk-resources/distinfo +++ b/devel/rubygem-aws-sdk-resources/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1500642224 -SHA256 (rubygem/aws-sdk-resources-2.10.15.gem) = 8ed6bb8f56c7ac35f111fe4d297df6d1fa6dd1cba2c9081a6c2f6d3880536c33 -SIZE (rubygem/aws-sdk-resources-2.10.15.gem) = 48640 +TIMESTAMP = 1500990056 +SHA256 (rubygem/aws-sdk-resources-2.10.16.gem) = 840df332cf98f34b6d156d856b2f40cb5656d5b37c2b0288732a8a6225dbc059 +SIZE (rubygem/aws-sdk-resources-2.10.16.gem) = 48640 diff --git a/devel/rubygem-aws-sdk/Makefile b/devel/rubygem-aws-sdk/Makefile index a051914a8b7..3cbe52759bc 100644 --- a/devel/rubygem-aws-sdk/Makefile +++ b/devel/rubygem-aws-sdk/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= aws-sdk -PORTVERSION= 2.10.15 +PORTVERSION= 2.10.16 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-aws-sdk/distinfo b/devel/rubygem-aws-sdk/distinfo index c6a9611894f..1c3c6d59ea0 100644 --- a/devel/rubygem-aws-sdk/distinfo +++ b/devel/rubygem-aws-sdk/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1500642230 -SHA256 (rubygem/aws-sdk-2.10.15.gem) = a68a0bc6f8b543f79c6f21075775921ae25e3923dfa1eb670c7028f188a82371 -SIZE (rubygem/aws-sdk-2.10.15.gem) = 4608 +TIMESTAMP = 1500990061 +SHA256 (rubygem/aws-sdk-2.10.16.gem) = 3e239661be11bb136aca054c7c8091d02d5ca26b07530138a9e44e421e7409c2 +SIZE (rubygem/aws-sdk-2.10.16.gem) = 4608 diff --git a/devel/rubygem-jsonapi-renderer/Makefile b/devel/rubygem-jsonapi-renderer/Makefile new file mode 100644 index 00000000000..19b097b30cc --- /dev/null +++ b/devel/rubygem-jsonapi-renderer/Makefile @@ -0,0 +1,18 @@ +# $FreeBSD$ + +PORTNAME= jsonapi-renderer +PORTVERSION= 0.1.3 +CATEGORIES= devel rubygems +MASTER_SITES= RG + +MAINTAINER= jrm@FreeBSD.org +COMMENT= Render JSONAPI documents + +LICENSE= MIT + +USES= gem +USE_RUBY= yes + +NO_ARCH= yes + +.include diff --git a/devel/rubygem-jsonapi-renderer/distinfo b/devel/rubygem-jsonapi-renderer/distinfo new file mode 100644 index 00000000000..dc839a923a8 --- /dev/null +++ b/devel/rubygem-jsonapi-renderer/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1501014957 +SHA256 (rubygem/jsonapi-renderer-0.1.3.gem) = eb426b9122ec805168822bee64a42310740c7c90b6d3aed9848851d5db367cb3 +SIZE (rubygem/jsonapi-renderer-0.1.3.gem) = 7680 diff --git a/devel/rubygem-jsonapi-renderer/pkg-descr b/devel/rubygem-jsonapi-renderer/pkg-descr new file mode 100644 index 00000000000..9e1c9b17f2c --- /dev/null +++ b/devel/rubygem-jsonapi-renderer/pkg-descr @@ -0,0 +1,5 @@ +This gem efficiently renders JSON API documents. Given a resource that +implements a certain interface, a JSON-API-compliant hash representing the +described document is returned. + +WWW: https://github.com/jsonapi-rb/jsonapi-renderer diff --git a/devel/rubygem-mongo/Makefile b/devel/rubygem-mongo/Makefile index 816b91d407e..76ffd2f9757 100644 --- a/devel/rubygem-mongo/Makefile +++ b/devel/rubygem-mongo/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= mongo -PORTVERSION= 2.4.2 +PORTVERSION= 2.4.3 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-mongo/distinfo b/devel/rubygem-mongo/distinfo index fba5c725380..5f6553d2705 100644 --- a/devel/rubygem-mongo/distinfo +++ b/devel/rubygem-mongo/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1496154588 -SHA256 (rubygem/mongo-2.4.2.gem) = 6163d45ee432514528e6b3fcca8a85d18cb50bd60e1055f62265bec7e764c89d -SIZE (rubygem/mongo-2.4.2.gem) = 286208 +TIMESTAMP = 1500990068 +SHA256 (rubygem/mongo-2.4.3.gem) = 9101d1ad2d75cce8a6120ef20db1e02f0cf147394020ce9550c8a698e376e3d1 +SIZE (rubygem/mongo-2.4.3.gem) = 287232 diff --git a/dns/Makefile b/dns/Makefile index bd5d92f8888..ce83d576fd7 100644 --- a/dns/Makefile +++ b/dns/Makefile @@ -192,6 +192,7 @@ SUBDIR += renewck SUBDIR += rpsl2acl SUBDIR += rubygem-dnsruby + SUBDIR += rubygem-idn-ruby SUBDIR += rubygem-net-dns SUBDIR += rubygem-public_suffix SUBDIR += rubygem-public_suffix_service diff --git a/dns/bind9-devel/Makefile b/dns/bind9-devel/Makefile index 7874ef2a654..009a7ad556d 100644 --- a/dns/bind9-devel/Makefile +++ b/dns/bind9-devel/Makefile @@ -31,8 +31,8 @@ LICENSE= MPL LICENSE_FILE= ${WRKSRC}/COPYRIGHT # ISC releases things like 9.8.0-P1, which our versioning doesn't like -ISCVERSION= 9.12.0a.2017.07.16 -HASH= 4aafa83 +ISCVERSION= 9.12.0a.2017.07.24 +HASH= fd0039f USES= cpe libedit diff --git a/dns/bind9-devel/distinfo b/dns/bind9-devel/distinfo index 130e87a633f..5d03eae697b 100644 --- a/dns/bind9-devel/distinfo +++ b/dns/bind9-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1500286501 -SHA256 (bind9-4aafa83.tar.gz) = 7bd3de1c1ab9c61a434134e46645b7f919a3177d3d5de5846414e3d753ccf943 -SIZE (bind9-4aafa83.tar.gz) = 11882034 +TIMESTAMP = 1500984576 +SHA256 (bind9-fd0039f.tar.gz) = 10b3f2826c9cf513a7ffe4269d0454948b54ce2c1392c8e9e5fa567f8169a43d +SIZE (bind9-fd0039f.tar.gz) = 11882769 diff --git a/dns/rubygem-idn-ruby/Makefile b/dns/rubygem-idn-ruby/Makefile new file mode 100644 index 00000000000..13f5aa72090 --- /dev/null +++ b/dns/rubygem-idn-ruby/Makefile @@ -0,0 +1,19 @@ +# $FreeBSD$ + +PORTNAME= idn-ruby +PORTVERSION= 0.1.0 +CATEGORIES= dns rubygems +MASTER_SITES= RG + +MAINTAINER= jrm@FreeBSD.org +COMMENT= LibIDN Ruby Bindings + +LICENSE= APACHE20 + +LIB_DEPENDS= libunwind.so:devel/libunwind \ + libidn.so:dns/libidn + +USES= gem +USE_RUBY= yes + +.include diff --git a/dns/rubygem-idn-ruby/distinfo b/dns/rubygem-idn-ruby/distinfo new file mode 100644 index 00000000000..4f3bb984826 --- /dev/null +++ b/dns/rubygem-idn-ruby/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1501011358 +SHA256 (rubygem/idn-ruby-0.1.0.gem) = 99abba21c66e61fa16f2ddb2a507b4fd5a8d84ece77711f0d2e2bc313da36b1f +SIZE (rubygem/idn-ruby-0.1.0.gem) = 17408 diff --git a/dns/rubygem-idn-ruby/pkg-descr b/dns/rubygem-idn-ruby/pkg-descr new file mode 100644 index 00000000000..aa99a7ef775 --- /dev/null +++ b/dns/rubygem-idn-ruby/pkg-descr @@ -0,0 +1,10 @@ +Ruby Bindings for the GNU LibIDN library, an implementation of the +Stringprep, Punycode and IDNA specifications defined by the IETF +Internationalized Domain Names (IDN) working group. + +Included are the most important parts of the Stringprep, Punycode and +IDNA APIs like performing Stringprep processings, encoding to and +decoding from Punycode strings and converting entire domain names to and +from the ACE encoded form. + +WWW: https://github.com/deepfryed/idn-ruby diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile index d73a54bc5de..5ef3cb1c40a 100644 --- a/emulators/wine-devel/Makefile +++ b/emulators/wine-devel/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= wine -DISTVERSION= 2.12 -PORTREVISION= 1 +DISTVERSION= 2.13 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= SF/${PORTNAME}/Source \ diff --git a/emulators/wine-devel/distinfo b/emulators/wine-devel/distinfo index f1a3bcdb260..9b7cd1cbed4 100644 --- a/emulators/wine-devel/distinfo +++ b/emulators/wine-devel/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1499830166 -SHA256 (wine-2.12.tar.xz) = 496c11af841487e6ec4e1953ac19b05a7f48e397da502653ffbd9fe9004213a7 -SIZE (wine-2.12.tar.xz) = 19301968 -SHA256 (v2.12.tar.gz) = 0f186d2268011c12094ecac8747378ad8f4ee7152e8854cb00496ba9565b7974 -SIZE (v2.12.tar.gz) = 10105899 +TIMESTAMP = 1501016035 +SHA256 (wine-2.13.tar.xz) = 6fbca3ddd19b061ce65a267639efae93cf38cfabbe4a9c148a17a44703587ef8 +SIZE (wine-2.13.tar.xz) = 19439328 +SHA256 (v2.13.tar.gz) = 0796440ebfa2aa651051e7081cc64f83774f966f26353876e024e42c59e24b46 +SIZE (v2.13.tar.gz) = 10137549 diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist index 496186faccf..cabc896aada 100644 --- a/emulators/wine-devel/pkg-plist +++ b/emulators/wine-devel/pkg-plist @@ -992,6 +992,7 @@ lib/wine/api-ms-win-core-processthreads-l1-1-0.dll.so lib/wine/api-ms-win-core-processthreads-l1-1-1.dll.so lib/wine/api-ms-win-core-processthreads-l1-1-2.dll.so lib/wine/api-ms-win-core-profile-l1-1-0.dll.so +lib/wine/api-ms-win-core-psapi-ansi-l1-1-0.dll.so lib/wine/api-ms-win-core-psapi-l1-1-0.dll.so lib/wine/api-ms-win-core-psapi-obsolete-l1-1-0.dll.so lib/wine/api-ms-win-core-quirks-l1-1-0.dll.so @@ -1070,6 +1071,7 @@ lib/wine/api-ms-win-eventing-provider-l1-1-0.dll.so lib/wine/api-ms-win-eventlog-legacy-l1-1-0.dll.so lib/wine/api-ms-win-mm-misc-l1-1-1.dll.so lib/wine/api-ms-win-mm-mme-l1-1-0.dll.so +lib/wine/api-ms-win-mm-time-l1-1-0.dll.so lib/wine/api-ms-win-ntuser-dc-access-l1-1-0.dll.so lib/wine/api-ms-win-power-base-l1-1-0.dll.so lib/wine/api-ms-win-power-setting-l1-1-0.dll.so @@ -1087,6 +1089,7 @@ lib/wine/api-ms-win-security-lsalookup-l1-1-0.dll.so lib/wine/api-ms-win-security-lsalookup-l1-1-1.dll.so lib/wine/api-ms-win-security-lsalookup-l2-1-1.dll.so lib/wine/api-ms-win-security-lsapolicy-l1-1-0.dll.so +lib/wine/api-ms-win-security-provider-l1-1-0.dll.so lib/wine/api-ms-win-security-sddl-l1-1-0.dll.so lib/wine/api-ms-win-security-systemfunctions-l1-1-0.dll.so lib/wine/api-ms-win-service-core-l1-1-0.dll.so @@ -1372,6 +1375,7 @@ lib/wine/fakedlls/api-ms-win-core-processthreads-l1-1-0.dll lib/wine/fakedlls/api-ms-win-core-processthreads-l1-1-1.dll lib/wine/fakedlls/api-ms-win-core-processthreads-l1-1-2.dll lib/wine/fakedlls/api-ms-win-core-profile-l1-1-0.dll +lib/wine/fakedlls/api-ms-win-core-psapi-ansi-l1-1-0.dll lib/wine/fakedlls/api-ms-win-core-psapi-l1-1-0.dll lib/wine/fakedlls/api-ms-win-core-psapi-obsolete-l1-1-0.dll lib/wine/fakedlls/api-ms-win-core-quirks-l1-1-0.dll @@ -1450,6 +1454,7 @@ lib/wine/fakedlls/api-ms-win-eventing-provider-l1-1-0.dll lib/wine/fakedlls/api-ms-win-eventlog-legacy-l1-1-0.dll lib/wine/fakedlls/api-ms-win-mm-misc-l1-1-1.dll lib/wine/fakedlls/api-ms-win-mm-mme-l1-1-0.dll +lib/wine/fakedlls/api-ms-win-mm-time-l1-1-0.dll lib/wine/fakedlls/api-ms-win-ntuser-dc-access-l1-1-0.dll lib/wine/fakedlls/api-ms-win-power-base-l1-1-0.dll lib/wine/fakedlls/api-ms-win-power-setting-l1-1-0.dll @@ -1467,6 +1472,7 @@ lib/wine/fakedlls/api-ms-win-security-lsalookup-l1-1-0.dll lib/wine/fakedlls/api-ms-win-security-lsalookup-l1-1-1.dll lib/wine/fakedlls/api-ms-win-security-lsalookup-l2-1-1.dll lib/wine/fakedlls/api-ms-win-security-lsapolicy-l1-1-0.dll +lib/wine/fakedlls/api-ms-win-security-provider-l1-1-0.dll lib/wine/fakedlls/api-ms-win-security-sddl-l1-1-0.dll lib/wine/fakedlls/api-ms-win-security-systemfunctions-l1-1-0.dll lib/wine/fakedlls/api-ms-win-service-core-l1-1-0.dll @@ -1891,6 +1897,7 @@ lib/wine/fakedlls/photometadatahandler.dll lib/wine/fakedlls/pidgen.dll lib/wine/fakedlls/ping.exe lib/wine/fakedlls/plugplay.exe +lib/wine/fakedlls/powershell.exe lib/wine/fakedlls/powrprof.dll lib/wine/fakedlls/presentationfontcache.exe lib/wine/fakedlls/printui.dll @@ -2545,6 +2552,7 @@ lib/wine/photometadatahandler.dll.so lib/wine/pidgen.dll.so lib/wine/ping.exe.so lib/wine/plugplay.exe.so +lib/wine/powershell.exe.so lib/wine/powrprof.dll.so lib/wine/presentationfontcache.exe.so lib/wine/printui.dll.so diff --git a/games/Makefile b/games/Makefile index 4c038c1e2d2..5948e90ff72 100644 --- a/games/Makefile +++ b/games/Makefile @@ -939,6 +939,7 @@ SUBDIR += stormbaancoureur SUBDIR += stransball2 SUBDIR += stratagus + SUBDIR += stuntrally SUBDIR += sudoku-sensei SUBDIR += sudoku_solver SUBDIR += sudsol diff --git a/games/irrlamb/Makefile b/games/irrlamb/Makefile index 3bcc0cc4c27..1adfc5ee9c9 100644 --- a/games/irrlamb/Makefile +++ b/games/irrlamb/Makefile @@ -3,7 +3,7 @@ PORTNAME= irrlamb PORTVERSION= 0.2.1 -PORTREVISION= 3 +PORTREVISION= 4 DISTVERSIONPREFIX= v CATEGORIES= games diff --git a/games/kye/Makefile b/games/kye/Makefile index 5c2bb1cfa1f..58b6c964b89 100644 --- a/games/kye/Makefile +++ b/games/kye/Makefile @@ -22,23 +22,22 @@ COMMENT= Puzzle game with arcade game elements RESTRICTED= kye-data_nuke_levels is charityware RESTRICTED_FILES= kye-data_nuke_levels.20121101.tar.gz -BROKEN= unfetchable -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2017-08-23 - USE_GNOME= pygtk2 librsvg2 USES= python USE_PYTHON= distutils PORTDOCS= NEWS README -OPTIONS_DEFINE= DOCS SUB_FILES= pkg-message -DESKTOP_ENTRIES="Python Kye" "" "Kye" \ - "Kye" "Game;LogicGame;" "" +DESKTOP_ENTRIES="Python Kye" \ + "" \ + "Kye" \ + "Kye" \ + "Game;LogicGame;" \ + "" -.include +OPTIONS_DEFINE= DOCS post-patch: @${REINPLACE_CMD} -e 's|share/kye|${DATADIR_REL}|' ${WRKSRC}/setup.py @@ -59,6 +58,7 @@ post-install: ${STAGEDIR}${PREFIX}/share/pixmaps/Kye-edit.png @cd ${WRKDIR}/${PORTNAME} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR} +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} diff --git a/games/openmw/Makefile b/games/openmw/Makefile index e0c21bea3ee..b8e8a4d7ada 100644 --- a/games/openmw/Makefile +++ b/games/openmw/Makefile @@ -4,7 +4,7 @@ PORTNAME= openmw PORTVERSION= 0.41.0 DISTVERSIONPREFIX= openmw- -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= games MAINTAINER= tobik@FreeBSD.org diff --git a/games/stuntrally/Makefile b/games/stuntrally/Makefile new file mode 100644 index 00000000000..4d60023b12b --- /dev/null +++ b/games/stuntrally/Makefile @@ -0,0 +1,61 @@ +# Created by: Dmitry Marakasov +# $FreeBSD$ + +PORTNAME= stuntrally +PORTVERSION= 2.6 +CATEGORIES= games + +MAINTAINER= amdmi3@FreeBSD.org +COMMENT= 3D racing game based on VDrift and OGRE with track editor + +LICENSE= GPLv2+ +LICENSE_FILE= ${WRKSRC}/License.txt + +LIB_DEPENDS= libboost_thread.so:devel/boost-libs + +USE_GITHUB= yes +GH_TUPLE= stuntrally:tracks:${PORTVERSION}:tracks/data/tracks + +USES= cmake:outsource dos2unix pkgconfig +DOS2UNIX_FILES= source/ogre/BaseApp_Create.cpp +CMAKE_ARGS= -DSHARE_INSTALL="${DATADIR_REL}" \ + -DBULLET_ROOT="${LOCALBASE}" + +PORTDOCS= Readme.txt +PORTDATA= * + +OPTIONS_DEFINE= GAME EDITOR MASTER_SERVER DOCS +OPTIONS_DEFAULT=GAME EDITOR +OPTIONS_SUB= yes + +GAME_DESC= Build the game binary +GAME_CMAKE_BOOL= BUILD_GAME +GAME_LIB_DEPENDS= libOgreMain.so:graphics/ogre3d \ + libBulletDynamics.so:devel/bullet \ + libMyGUIEngine.so:x11-toolkits/mygui \ + libogg.so:audio/libogg \ + libvorbisfile.so:audio/libvorbis \ + libenet.so:net/enet +GAME_BUILD_DEPENDS= ${LOCALBASE}/include/MYGUI/MyGUI_OgreTexture.h:x11-toolkits/mygui-ogre +GAME_USE= SDL=sdl2 +GAME_USES= openal + +EDITOR_DESC= Build the track editor +EDITOR_CMAKE_BOOL= BUILD_EDITOR +EDITOR_LIB_DEPENDS= libOgreMain.so:graphics/ogre3d \ + libBulletDynamics.so:devel/bullet \ + libMyGUIEngine.so:x11-toolkits/mygui \ + libogg.so:audio/libogg \ + libvorbisfile.so:audio/libvorbis +EDITOR_USE= SDL=sdl2 +EDITOR_BUILD_DEPENDS= ${LOCALBASE}/include/MYGUI/MyGUI_OgreTexture.h:x11-toolkits/mygui-ogre + +MASTER_SERVER_CMAKE_BOOL= BUILD_MASTER_SERVER +MASTER_SERVER_DESC= Build the master server +MASTER_SERVER_LIB_DEPENDS= libenet.so:net/enet + +post-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/Readme.txt ${STAGEDIR}${DOCSDIR}/ + +.include diff --git a/games/stuntrally/distinfo b/games/stuntrally/distinfo new file mode 100644 index 00000000000..ea51528268d --- /dev/null +++ b/games/stuntrally/distinfo @@ -0,0 +1,5 @@ +TIMESTAMP = 1500906591 +SHA256 (stuntrally-stuntrally-2.6_GH0.tar.gz) = 8cc309d27d26f78dcc596440547d68b5e41d02ef830df2d52d38611d45ebbaca +SIZE (stuntrally-stuntrally-2.6_GH0.tar.gz) = 651577187 +SHA256 (stuntrally-tracks-2.6_GH0.tar.gz) = 4bce700516a2a178ac04cfbf7df2887ba42225802f5a3e670f770ea01345687b +SIZE (stuntrally-tracks-2.6_GH0.tar.gz) = 355793120 diff --git a/games/stuntrally/files/patch-CMakeLists.txt b/games/stuntrally/files/patch-CMakeLists.txt new file mode 100644 index 00000000000..4ea71bb312d --- /dev/null +++ b/games/stuntrally/files/patch-CMakeLists.txt @@ -0,0 +1,17 @@ +--- CMakeLists.txt.orig 2015-09-18 09:21:11 UTC ++++ CMakeLists.txt +@@ -16,14 +16,6 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_BINAR + message(FATAL_ERROR "In-source builds are not permitted. Make a separate folder for building:\nmkdir build; cd build; cmake ..\nBefore that, remove the files already created:\nrm -rf CMakeCache.txt CMakeFiles") + endif(CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR) + +-# Add a sensible build type default and warning because empty means no optimization and no debug info. +-if(NOT CMAKE_BUILD_TYPE) +- message("WARNING: CMAKE_BUILD_TYPE is not defined!\n Defaulting to CMAKE_BUILD_TYPE=RelWithDebInfo. Use ccmake to set a proper value.") +- set(CMAKE_BUILD_TYPE RelWithDebInfo +- CACHE STRING "Type of build, options are: None Debug Release RelWithDebInfo MinSizeRel." FORCE) +-endif(NOT CMAKE_BUILD_TYPE) +- +- + # Set default compile flags for GCC + if(CMAKE_COMPILER_IS_GNUCXX) + message(STATUS "GCC detected, adding compile flags") diff --git a/games/stuntrally/files/patch-source_ogre_BaseApp__Create.cpp b/games/stuntrally/files/patch-source_ogre_BaseApp__Create.cpp new file mode 100644 index 00000000000..4f8f4f7dda8 --- /dev/null +++ b/games/stuntrally/files/patch-source_ogre_BaseApp__Create.cpp @@ -0,0 +1,11 @@ +--- source/ogre/BaseApp_Create.cpp.orig 2015-09-18 09:21:11 UTC ++++ source/ogre/BaseApp_Create.cpp +@@ -254,7 +254,7 @@ bool BaseApp::configure() + + mRoot->initialise(false); + +- Uint32 flags = SDL_INIT_VIDEO|SDL_INIT_JOYSTICK|SDL_INIT_HAPTIC|SDL_INIT_NOPARACHUTE; ++ Uint32 flags = SDL_INIT_VIDEO|SDL_INIT_JOYSTICK|SDL_INIT_NOPARACHUTE; + if (SDL_WasInit(flags) == 0) + { + SDL_SetHint(SDL_HINT_RENDER_DRIVER, "software"); diff --git a/games/stuntrally/files/patch-source_shiny_CMakeLists.txt b/games/stuntrally/files/patch-source_shiny_CMakeLists.txt new file mode 100644 index 00000000000..fb6368c2b02 --- /dev/null +++ b/games/stuntrally/files/patch-source_shiny_CMakeLists.txt @@ -0,0 +1,42 @@ +--- source/shiny/CMakeLists.txt.orig 2015-09-18 09:21:11 UTC ++++ source/shiny/CMakeLists.txt +@@ -41,21 +41,9 @@ if(BUILD_SHARED_LIBS) + set_target_properties(${SHINY_LIBRARY} PROPERTIES SOVERSION "${SHINY_MAJOR_VERSION}.${SHINY_MINOR_VERSION}") + endif(BUILD_SHARED_LIBS) + +-if(BUILD_SHARED_LIBS) +- install(TARGETS ${SHINY_LIBRARY} +- LIBRARY DESTINATION lib${LIB_SUFFIX} +- RUNTIME DESTINATION lib${LIB_SUFFIX}) +-else(BUILD_SHARED_LIBS) +- install(TARGETS ${SHINY_LIBRARY} +- ARCHIVE DESTINATION lib${LIB_SUFFIX} +- RUNTIME DESTINATION lib${LIB_SUFFIX}) +-endif(BUILD_SHARED_LIBS) + file(GLOB HEADERS_EDITOR Editor/*.hpp) + file(GLOB HEADERS_EXTRA Extra/*.h) + file(GLOB HEADERS_MAIN Main/*.hpp) +-install(FILES ${HEADERS_EDITOR} DESTINATION include/shiny/Editor) +-install(FILES ${HEADERS_EXTRA} DESTINATION include/shiny/Extra) +-install(FILES ${HEADERS_MAIN} DESTINATION include/shiny/Main) + + set(SHINY_LIBRARIES ${SHINY_LIBRARY}) + +@@ -80,17 +68,7 @@ if (SHINY_BUILD_OGRE_PLATFORM) + add_library(${SHINY_OGREPLATFORM_LIBRARY} ${SHINY_LIBRARY_TYPE} ${OGRE_PLATFORM_SOURCE_FILES}) + add_dependencies(${SHINY_OGREPLATFORM_LIBRARY} ${SHINY_LIBRARY}) + set(SHINY_LIBRARIES ${SHINY_LIBRARIES} ${SHINY_OGREPLATFORM_LIBRARY}) +- if(BUILD_SHARED_LIBS) +- install(TARGETS ${SHINY_OGREPLATFORM_LIBRARY} +- LIBRARY DESTINATION lib${LIB_SUFFIX}//OGRE +- RUNTIME DESTINATION lib${LIB_SUFFIX}//OGRE) +- else(BUILD_SHARED_LIBS) +- install(TARGETS ${SHINY_OGREPLATFORM_LIBRARY} +- ARCHIVE DESTINATION lib${LIB_SUFFIX}//OGRE +- RUNTIME DESTINATION lib${LIB_SUFFIX}//OGRE) +- endif(BUILD_SHARED_LIBS) + file(GLOB HEADERS_PLATFORM_OGRE Platforms/Ogre/*.hpp) +- install(FILES ${HEADERS_PLATFORM_OGRE} DESTINATION include/shiny/Platforms/Ogre) + endif() + + set(SHINY_LIBRARY ${SHINY_LIBRARY} PARENT_SCOPE) diff --git a/games/stuntrally/pkg-descr b/games/stuntrally/pkg-descr new file mode 100644 index 00000000000..1ba246be558 --- /dev/null +++ b/games/stuntrally/pkg-descr @@ -0,0 +1,22 @@ +Stunt Rally is a racing game with rally style of driving, mostly +on gravel. + +It features a rich variety of 172 tracks in 34 sceneries also on +other planets. + +Track difficulty ranges from short and easy to very difficult stunt +tracks including jumps, skewed loops, pipes winding in 3D, obstacles +or all at once. + +There are 20 cars to choose, 1 motorbike, 3 hovering spaceships and +1 bouncing sphere. +The latter provide a fast and easier gameplay on flat tracks. + +Game modes include: +Single Race, Tutorials, Championships, Challenges, Multiplayer and +Split Screen. Also Replays and Ghost drive are present. + +The Track Editor allows creating and modifying tracks. It uses a +3D spline generated road. + +WWW: http://stuntrally.tuxfamily.org/ diff --git a/games/stuntrally/pkg-plist b/games/stuntrally/pkg-plist new file mode 100644 index 00000000000..10d5b81b769 --- /dev/null +++ b/games/stuntrally/pkg-plist @@ -0,0 +1,7 @@ +%%EDITOR%%bin/sr-editor +%%MASTER_SERVER%%bin/sr-masterserver +%%GAME%%bin/stuntrally +%%EDITOR%%share/applications/sr-editor.desktop +%%GAME%%share/applications/stuntrally.desktop +%%EDITOR%%share/icons/hicolor/64x64/apps/sr-editor.png +%%GAME%%share/icons/hicolor/64x64/apps/stuntrally.png diff --git a/graphics/clutter-gtk3/Makefile b/graphics/clutter-gtk3/Makefile index 0b240569da6..be877a6ff5a 100644 --- a/graphics/clutter-gtk3/Makefile +++ b/graphics/clutter-gtk3/Makefile @@ -10,6 +10,9 @@ PKGNAMESUFFIX= 3 MAINTAINER= gnome@FreeBSD.org COMMENT= GTK+ Integration library for Clutter +LICENSE= LGPL20+ +LICENSE_FILE= ${WRKSRC}/COPYING + LIB_DEPENDS= libcogl.so:graphics/cogl \ libclutter-1.0.so:graphics/clutter \ libjson-glib-1.0.so:devel/json-glib diff --git a/graphics/clutter-gtk3/pkg-descr b/graphics/clutter-gtk3/pkg-descr index b13a31eb409..7da92df242a 100644 --- a/graphics/clutter-gtk3/pkg-descr +++ b/graphics/clutter-gtk3/pkg-descr @@ -2,4 +2,4 @@ Clutter-GTK is a library providing facilities to integrate Clutter into GTK+ applications. It provides a GTK+ widget, GtkClutterEmbed, for embedding the default ClutterStage into any GtkContainer. -WWW: http://blogs.gnome.org/clutter/ +WWW: https://blogs.gnome.org/clutter/ diff --git a/java/intellij/Makefile b/java/intellij/Makefile index 107f4f01481..b60fd16cefa 100644 --- a/java/intellij/Makefile +++ b/java/intellij/Makefile @@ -5,7 +5,7 @@ # Vadim Zhukov PORTNAME= intellij -PORTVERSION= 2017.1.5 +PORTVERSION= 2017.2 CATEGORIES= java devel MASTER_SITES= https://download.jetbrains.com/idea/ \ http://download.jetbrains.com/idea/ @@ -28,7 +28,7 @@ NO_ARCH= yes NO_BUILD= yes INSTALL_TARGET= install-strip -WRKSRC= ${WRKDIR}/idea-IC-171.4694.70 +WRKSRC= ${WRKDIR}/idea-IC-172.3317.76 .include "common.mk" diff --git a/java/intellij/distinfo b/java/intellij/distinfo index b576da57208..2ae57cb8c69 100644 --- a/java/intellij/distinfo +++ b/java/intellij/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499262332 -SHA256 (ideaIC-2017.1.5-no-jdk.tar.gz) = 67c6303a999237898366f131f4f87d5185d26095fd3da80edda857c7eccce376 -SIZE (ideaIC-2017.1.5-no-jdk.tar.gz) = 355743329 +TIMESTAMP = 1500986904 +SHA256 (ideaIC-2017.2-no-jdk.tar.gz) = d88257b17447398ed60e7d774803cbc21e0fe7750add09622a98b936f14cd91f +SIZE (ideaIC-2017.2-no-jdk.tar.gz) = 365985576 diff --git a/java/intellij/pkg-plist b/java/intellij/pkg-plist index 56d6319d9c3..c795b8b913c 100644 --- a/java/intellij/pkg-plist +++ b/java/intellij/pkg-plist @@ -17,6 +17,8 @@ share/applications/idea.desktop %%IDEA_HOME%%/bin/restart.py %%IDEA_HOME%%/build.txt %%IDEA_HOME%%/idea.png +%%IDEA_HOME%%/lib/aether-1.1.0-all.jar +%%IDEA_HOME%%/lib/aether-dependency-resolver.jar %%IDEA_HOME%%/lib/annotations.jar %%IDEA_HOME%%/lib/ant/INSTALL %%IDEA_HOME%%/lib/ant/KEYS @@ -85,11 +87,15 @@ share/applications/idea.desktop %%IDEA_HOME%%/lib/bootstrap.jar %%IDEA_HOME%%/lib/cglib-nodep-3.2.4.jar %%IDEA_HOME%%/lib/cli-parser-1.1.jar +%%IDEA_HOME%%/lib/common-image-3.2.1.jar +%%IDEA_HOME%%/lib/common-io-3.2.1.jar +%%IDEA_HOME%%/lib/common-lang-3.2.1.jar %%IDEA_HOME%%/lib/commons-codec-1.9.jar %%IDEA_HOME%%/lib/commons-compress-1.10.jar %%IDEA_HOME%%/lib/commons-httpclient-3.1-patched.jar %%IDEA_HOME%%/lib/commons-logging-1.2.jar %%IDEA_HOME%%/lib/commons-net-3.3.jar +%%IDEA_HOME%%/lib/constraint-layout.jar %%IDEA_HOME%%/lib/coverage-agent.jar %%IDEA_HOME%%/lib/coverage-instrumenter.jar %%IDEA_HOME%%/lib/coverage-util.jar @@ -98,9 +104,10 @@ share/applications/idea.desktop %%IDEA_HOME%%/lib/external-system-rt.jar %%IDEA_HOME%%/lib/fluent-hc-4.5.2.jar %%IDEA_HOME%%/lib/forms_rt.jar +%%IDEA_HOME%%/lib/google-analytics-library.jar %%IDEA_HOME%%/lib/groovy-all-2.4.6.jar %%IDEA_HOME%%/lib/gson-2.5.jar -%%IDEA_HOME%%/lib/guava-19.0.jar +%%IDEA_HOME%%/lib/guava-21.0.jar %%IDEA_HOME%%/lib/hamcrest-core-1.3.jar %%IDEA_HOME%%/lib/httpclient-4.5.2.jar %%IDEA_HOME%%/lib/httpcore-4.4.5.jar @@ -108,7 +115,11 @@ share/applications/idea.desktop %%IDEA_HOME%%/lib/icons.jar %%IDEA_HOME%%/lib/idea.jar %%IDEA_HOME%%/lib/idea_rt.jar +%%IDEA_HOME%%/lib/imageio-core-3.2.1.jar +%%IDEA_HOME%%/lib/imageio-metadata-3.2.1.jar +%%IDEA_HOME%%/lib/imageio-tiff-3.2.1.jar %%IDEA_HOME%%/lib/imgscalr-lib-4.2.jar +%%IDEA_HOME%%/lib/ini4j-0.5.2-patched.jar %%IDEA_HOME%%/lib/isorelax.jar %%IDEA_HOME%%/lib/javac2.jar %%IDEA_HOME%%/lib/jaxen-1.1.3.jar @@ -132,6 +143,7 @@ share/applications/idea.desktop %%IDEA_HOME%%/lib/jsch-0.1.54.jar %%IDEA_HOME%%/lib/jsch.agentproxy.connector-factory.jar %%IDEA_HOME%%/lib/jsch.agentproxy.core.jar +%%IDEA_HOME%%/lib/jsch.agentproxy.jsch.jar %%IDEA_HOME%%/lib/jsch.agentproxy.pageant.jar %%IDEA_HOME%%/lib/jsch.agentproxy.sshagent.jar %%IDEA_HOME%%/lib/jsch.agentproxy.usocket-jna.jar @@ -143,19 +155,21 @@ share/applications/idea.desktop %%IDEA_HOME%%/lib/kotlin-reflect.jar %%IDEA_HOME%%/lib/kotlin-runtime.jar %%IDEA_HOME%%/lib/log4j.jar +%%IDEA_HOME%%/lib/lz4-java-1.3.jar %%IDEA_HOME%%/lib/markdownj-core-0.4.2-SNAPSHOT.jar +%%IDEA_HOME%%/lib/maven-aether-provider-3.3.9-all.jar %%IDEA_HOME%%/lib/microba.jar %%IDEA_HOME%%/lib/miglayout-core-5.0.jar %%IDEA_HOME%%/lib/miglayout-swing-5.0.jar %%IDEA_HOME%%/lib/nanoxml-2.2.3.jar %%IDEA_HOME%%/lib/nekohtml-1.9.14.jar -%%IDEA_HOME%%/lib/netty-all-4.1.9.Final.jar +%%IDEA_HOME%%/lib/netty-all-4.1.10.Final.jar %%IDEA_HOME%%/lib/openapi.jar %%IDEA_HOME%%/lib/optimizedFileManager.jar %%IDEA_HOME%%/lib/oromatcher.jar %%IDEA_HOME%%/lib/picocontainer.jar %%IDEA_HOME%%/lib/protobuf-2.5.0.jar -%%IDEA_HOME%%/lib/proxy-vole_20131209.jar +%%IDEA_HOME%%/lib/proxy-vole-1.0.3.jar %%IDEA_HOME%%/lib/pty4j-0.7.1.jar %%IDEA_HOME%%/lib/purejavacomm.jar %%IDEA_HOME%%/lib/resolver.jar @@ -164,22 +178,23 @@ share/applications/idea.desktop %%IDEA_HOME%%/lib/rngom-20051226-patched.jar %%IDEA_HOME%%/lib/sanselan-0.98-snapshot.jar %%IDEA_HOME%%/lib/serviceMessages.jar -%%IDEA_HOME%%/lib/sherpa-solver.jar %%IDEA_HOME%%/lib/slf4j-api-1.7.10.jar %%IDEA_HOME%%/lib/slf4j-log4j12-1.7.10.jar %%IDEA_HOME%%/lib/snakeyaml-1.17.jar %%IDEA_HOME%%/lib/snappy-in-java-0.5.1.jar -%%IDEA_HOME%%/lib/sqlite-jdbc-3.8.11.2.jar +%%IDEA_HOME%%/lib/sqlite-jdbc-3.16.1.jar %%IDEA_HOME%%/lib/streamex-0.6.2.jar +%%IDEA_HOME%%/lib/studio-profiler-grpc-1.0-jarjar.jar %%IDEA_HOME%%/lib/swingx-core-1.6.2.jar %%IDEA_HOME%%/lib/trang-core.jar +%%IDEA_HOME%%/lib/trilead-ssh2.jar %%IDEA_HOME%%/lib/trove4j.jar %%IDEA_HOME%%/lib/util.jar %%IDEA_HOME%%/lib/velocity.jar +%%IDEA_HOME%%/lib/wadl-core.jar %%IDEA_HOME%%/lib/winp-1.23.jar %%IDEA_HOME%%/lib/xbean.jar %%IDEA_HOME%%/lib/xercesImpl.jar -%%IDEA_HOME%%/lib/xml-apis-ext.jar %%IDEA_HOME%%/lib/xml-apis.jar %%IDEA_HOME%%/lib/xmlgraphics-commons-1.5.jar %%IDEA_HOME%%/lib/xmlrpc-2.0.jar @@ -244,27 +259,37 @@ share/applications/idea.desktop %%IDEA_HOME%%/plugins/Kotlin/kotlinc/build.txt %%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/allopen-compiler-plugin.jar %%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/android-extensions-compiler.jar +%%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/annotations-13.0.jar %%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-annotation-processing.jar %%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-ant.jar %%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-build-common-test.jar -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-compiler.jar %%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-compiler-client-embeddable.jar +%%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-compiler.jar %%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-daemon-client.jar %%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-jslib-sources.jar %%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-jslib.jar %%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-preloader.jar +%%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-reflect-sources.jar %%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-reflect.jar %%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-runner.jar %%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-runtime-sources.jar %%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-runtime.jar %%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-script-runtime-sources.jar %%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-script-runtime.jar -%%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/source-sections-compiler-plugin.jar +%%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-source-sections-compiler-plugin.jar +%%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-stdlib-jre7-sources.jar +%%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-stdlib-jre7.jar +%%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-stdlib-jre8-sources.jar +%%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-stdlib-jre8.jar %%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-stdlib-js-sources.jar %%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-stdlib-js.jar %%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-stdlib-sources.jar %%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-stdlib.jar +%%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-test-js-sources.jar %%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-test-js.jar +%%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-test-junit-sources.jar +%%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-test-junit.jar +%%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-test-sources.jar %%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/kotlin-test.jar %%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/noarg-compiler-plugin.jar %%IDEA_HOME%%/plugins/Kotlin/kotlinc/lib/sam-with-receiver-compiler-plugin.jar @@ -285,46 +310,41 @@ share/applications/idea.desktop %%IDEA_HOME%%/plugins/Kotlin/kotlinc/license/third_party/trove_readme_license.txt %%IDEA_HOME%%/plugins/Kotlin/lib/allopen-compiler-plugin.jar %%IDEA_HOME%%/plugins/Kotlin/lib/allopen-ide-plugin.jar +%%IDEA_HOME%%/plugins/Kotlin/lib/android-extensions-compiler.jar +%%IDEA_HOME%%/plugins/Kotlin/lib/android-extensions-ide.jar %%IDEA_HOME%%/plugins/Kotlin/lib/android-lint.jar +%%IDEA_HOME%%/plugins/Kotlin/lib/javaslang-2.0.6.jar %%IDEA_HOME%%/plugins/Kotlin/lib/javax.inject.jar %%IDEA_HOME%%/plugins/Kotlin/lib/jps/kotlin-jps-plugin.jar -%%IDEA_HOME%%/plugins/Kotlin/lib/kotlin-android-extensions-compiler-plugin.jar -%%IDEA_HOME%%/plugins/Kotlin/lib/kotlin-android-extensions-plugin.jar -%%IDEA_HOME%%/plugins/Kotlin/lib/kotlin-daemon-client.jar %%IDEA_HOME%%/plugins/Kotlin/lib/kotlin-gradle-tooling.jar %%IDEA_HOME%%/plugins/Kotlin/lib/kotlin-plugin.jar %%IDEA_HOME%%/plugins/Kotlin/lib/kotlin-reflect.jar %%IDEA_HOME%%/plugins/Kotlin/lib/kotlin-runtime.jar %%IDEA_HOME%%/plugins/Kotlin/lib/kotlin-script-runtime.jar +%%IDEA_HOME%%/plugins/Kotlin/lib/kotlinx-coroutines-core.jar %%IDEA_HOME%%/plugins/Kotlin/lib/markdown.jar %%IDEA_HOME%%/plugins/Kotlin/lib/noarg-compiler-plugin.jar %%IDEA_HOME%%/plugins/Kotlin/lib/noarg-ide-plugin.jar %%IDEA_HOME%%/plugins/Kotlin/lib/sam-with-receiver-compiler-plugin.jar %%IDEA_HOME%%/plugins/Kotlin/lib/sam-with-receiver-ide-plugin.jar -%%IDEA_HOME%%/plugins/Kotlin/lib/uast-common.jar -%%IDEA_HOME%%/plugins/Kotlin/lib/uast-tests.jar -%%IDEA_HOME%%/plugins/Kotlin/lib/uast-java.jar -%%IDEA_HOME%%/plugins/android/lib/GoogleFeedback.jar %%IDEA_HOME%%/plugins/android/lib/adt-ui.jar -%%IDEA_HOME%%/plugins/android/lib/analytics-protos.jar -%%IDEA_HOME%%/plugins/android/lib/analytics-shared.jar -%%IDEA_HOME%%/plugins/android/lib/analytics-tracker.jar +%%IDEA_HOME%%/plugins/android/lib/android-base-common.jar %%IDEA_HOME%%/plugins/android/lib/android-common.jar %%IDEA_HOME%%/plugins/android/lib/android-rt.jar %%IDEA_HOME%%/plugins/android/lib/android.jar %%IDEA_HOME%%/plugins/android/lib/androidAnnotations.jar +%%IDEA_HOME%%/plugins/android/lib/androidWidgets/BUILD %%IDEA_HOME%%/plugins/android/lib/androidWidgets/theme-editor-widgets.jar %%IDEA_HOME%%/plugins/android/lib/antlr4-runtime-4.5.3.jar %%IDEA_HOME%%/plugins/android/lib/asm-5.0.3.jar %%IDEA_HOME%%/plugins/android/lib/asm-analysis-5.0.3.jar %%IDEA_HOME%%/plugins/android/lib/asm-tree-5.0.3.jar %%IDEA_HOME%%/plugins/android/lib/bcpkix-jdk15on-155.jar -%%IDEA_HOME%%/plugins/android/lib/builder-model-2.2.0-alpha6.jar -%%IDEA_HOME%%/plugins/android/lib/common.jar %%IDEA_HOME%%/plugins/android/lib/commons-compress-1.8.1.jar %%IDEA_HOME%%/plugins/android/lib/commons-io-2.4.jar %%IDEA_HOME%%/plugins/android/lib/constraint-layout.jar %%IDEA_HOME%%/plugins/android/lib/data-binding.jar +%%IDEA_HOME%%/plugins/android/lib/device-art-resources/BUILD %%IDEA_HOME%%/plugins/android/lib/device-art-resources/device-art.xml %%IDEA_HOME%%/plugins/android/lib/device-art-resources/galaxy_nexus/land_back.png %%IDEA_HOME%%/plugins/android/lib/device-art-resources/galaxy_nexus/land_fore.png @@ -432,6 +452,13 @@ share/applications/idea.desktop %%IDEA_HOME%%/plugins/android/lib/device-art-resources/phone/phone_back_simple_port.9.png %%IDEA_HOME%%/plugins/android/lib/device-art-resources/phone/phone_shadow_simple_land.9.png %%IDEA_HOME%%/plugins/android/lib/device-art-resources/phone/phone_shadow_simple_port.9.png +%%IDEA_HOME%%/plugins/android/lib/device-art-resources/pixel/land_back.webp +%%IDEA_HOME%%/plugins/android/lib/device-art-resources/pixel/land_fore.webp +%%IDEA_HOME%%/plugins/android/lib/device-art-resources/pixel/land_shadow.webp +%%IDEA_HOME%%/plugins/android/lib/device-art-resources/pixel/layout +%%IDEA_HOME%%/plugins/android/lib/device-art-resources/pixel/port_back.webp +%%IDEA_HOME%%/plugins/android/lib/device-art-resources/pixel/port_fore.webp +%%IDEA_HOME%%/plugins/android/lib/device-art-resources/pixel/port_shadow.webp %%IDEA_HOME%%/plugins/android/lib/device-art-resources/pixel_c/land_back.png %%IDEA_HOME%%/plugins/android/lib/device-art-resources/pixel_c/land_fore.png %%IDEA_HOME%%/plugins/android/lib/device-art-resources/pixel_c/land_shadow.png @@ -439,6 +466,13 @@ share/applications/idea.desktop %%IDEA_HOME%%/plugins/android/lib/device-art-resources/pixel_c/port_back.png %%IDEA_HOME%%/plugins/android/lib/device-art-resources/pixel_c/port_fore.png %%IDEA_HOME%%/plugins/android/lib/device-art-resources/pixel_c/port_shadow.png +%%IDEA_HOME%%/plugins/android/lib/device-art-resources/pixel_xl/land_back.webp +%%IDEA_HOME%%/plugins/android/lib/device-art-resources/pixel_xl/land_fore.webp +%%IDEA_HOME%%/plugins/android/lib/device-art-resources/pixel_xl/land_shadow.webp +%%IDEA_HOME%%/plugins/android/lib/device-art-resources/pixel_xl/layout +%%IDEA_HOME%%/plugins/android/lib/device-art-resources/pixel_xl/port_back.webp +%%IDEA_HOME%%/plugins/android/lib/device-art-resources/pixel_xl/port_fore.webp +%%IDEA_HOME%%/plugins/android/lib/device-art-resources/pixel_xl/port_shadow.webp %%IDEA_HOME%%/plugins/android/lib/device-art-resources/tablet/tablet_back_simple.9.png %%IDEA_HOME%%/plugins/android/lib/device-art-resources/tablet/tablet_shadow_simple_land.9.png %%IDEA_HOME%%/plugins/android/lib/device-art-resources/tablet/tablet_shadow_simple_port.9.png @@ -488,6 +522,7 @@ share/applications/idea.desktop %%IDEA_HOME%%/plugins/android/lib/gluegen-rt-natives-windows-amd64.jar %%IDEA_HOME%%/plugins/android/lib/gluegen-rt-natives-windows-i586.jar %%IDEA_HOME%%/plugins/android/lib/gluegen-rt.jar +%%IDEA_HOME%%/plugins/android/lib/google-analytics-library.jar %%IDEA_HOME%%/plugins/android/lib/jarutils.jar %%IDEA_HOME%%/plugins/android/lib/javawriter-2.2.1.jar %%IDEA_HOME%%/plugins/android/lib/jgraphx-3.4.0.1.jar @@ -9052,6 +9087,7 @@ share/applications/idea.desktop %%IDEA_HOME%%/plugins/android/lib/sdk-tools.jar %%IDEA_HOME%%/plugins/android/lib/sdklib.jar %%IDEA_HOME%%/plugins/android/lib/spantable.jar +%%IDEA_HOME%%/plugins/android/lib/templates/BUILD %%IDEA_HOME%%/plugins/android/lib/templates/NOTICE %%IDEA_HOME%%/plugins/android/lib/templates/activities/AlwaysOnWearActivity/globals.xml.ftl %%IDEA_HOME%%/plugins/android/lib/templates/activities/AlwaysOnWearActivity/recipe.xml.ftl @@ -9163,6 +9199,19 @@ share/applications/idea.desktop %%IDEA_HOME%%/plugins/android/lib/templates/activities/BlankWearActivity/root/src/app_package/BlankActivity.java.ftl %%IDEA_HOME%%/plugins/android/lib/templates/activities/BlankWearActivity/template.xml %%IDEA_HOME%%/plugins/android/lib/templates/activities/BlankWearActivity/templates-WatchViewStub-Wear.png +%%IDEA_HOME%%/plugins/android/lib/templates/activities/BottomNavigationActivity/globals.xml.ftl +%%IDEA_HOME%%/plugins/android/lib/templates/activities/BottomNavigationActivity/recipe.xml.ftl +%%IDEA_HOME%%/plugins/android/lib/templates/activities/BottomNavigationActivity/root/build.gradle +%%IDEA_HOME%%/plugins/android/lib/templates/activities/BottomNavigationActivity/root/res/drawable/ic_dashboard_black_24dp.xml +%%IDEA_HOME%%/plugins/android/lib/templates/activities/BottomNavigationActivity/root/res/drawable/ic_home_black_24dp.xml +%%IDEA_HOME%%/plugins/android/lib/templates/activities/BottomNavigationActivity/root/res/drawable/ic_notifications_black_24dp.xml +%%IDEA_HOME%%/plugins/android/lib/templates/activities/BottomNavigationActivity/root/res/layout/activity_main.xml.ftl +%%IDEA_HOME%%/plugins/android/lib/templates/activities/BottomNavigationActivity/root/res/menu/navigation.xml +%%IDEA_HOME%%/plugins/android/lib/templates/activities/BottomNavigationActivity/root/res/values/dimens.xml +%%IDEA_HOME%%/plugins/android/lib/templates/activities/BottomNavigationActivity/root/res/values/strings.xml +%%IDEA_HOME%%/plugins/android/lib/templates/activities/BottomNavigationActivity/root/src/app_package/MainActivity.java.ftl +%%IDEA_HOME%%/plugins/android/lib/templates/activities/BottomNavigationActivity/template.xml +%%IDEA_HOME%%/plugins/android/lib/templates/activities/BottomNavigationActivity/template_bottom_navigation_activity.png %%IDEA_HOME%%/plugins/android/lib/templates/activities/EmptyActivity/globals.xml.ftl %%IDEA_HOME%%/plugins/android/lib/templates/activities/EmptyActivity/recipe.xml.ftl %%IDEA_HOME%%/plugins/android/lib/templates/activities/EmptyActivity/root/src/app_package/SimpleActivity.java.ftl @@ -9253,6 +9302,7 @@ share/applications/idea.desktop %%IDEA_HOME%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res-buildApi22/layout/navigation_view.xml.ftl %%IDEA_HOME%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res-buildApi22/menu/drawer.xml.ftl %%IDEA_HOME%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res-buildApi22/menu/main.xml.ftl +%%IDEA_HOME%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res-buildApi22/values-v21/no_actionbar_styles_v21.xml.ftl %%IDEA_HOME%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res-buildApi22/values/dimens.xml.ftl %%IDEA_HOME%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res-buildApi22/values/drawables.xml %%IDEA_HOME%%/plugins/android/lib/templates/activities/NavigationDrawerActivity/root/res-buildApi22/values/strings.xml.ftl @@ -9329,385 +9379,17 @@ share/applications/idea.desktop %%IDEA_HOME%%/plugins/android/lib/templates/activities/common/recipe_manifest.xml.ftl %%IDEA_HOME%%/plugins/android/lib/templates/activities/common/recipe_no_actionbar.xml.ftl %%IDEA_HOME%%/plugins/android/lib/templates/activities/common/recipe_simple.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/common/recipe_simple_dimens.xml %%IDEA_HOME%%/plugins/android/lib/templates/activities/common/recipe_simple_menu.xml.ftl %%IDEA_HOME%%/plugins/android/lib/templates/activities/common/root/AndroidManifest.xml.ftl %%IDEA_HOME%%/plugins/android/lib/templates/activities/common/root/res/layout/app_bar.xml.ftl %%IDEA_HOME%%/plugins/android/lib/templates/activities/common/root/res/layout/simple.xml.ftl %%IDEA_HOME%%/plugins/android/lib/templates/activities/common/root/res/menu/simple_menu.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/common/root/res/values-v21/no_actionbar_styles_v21.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/common/root/res/values-w820dp/simple_dimens.xml %%IDEA_HOME%%/plugins/android/lib/templates/activities/common/root/res/values/app_bar_dimens.xml %%IDEA_HOME%%/plugins/android/lib/templates/activities/common/root/res/values/manifest_strings.xml.ftl %%IDEA_HOME%%/plugins/android/lib/templates/activities/common/root/res/values/no_actionbar_styles.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/activities/common/root/res/values/simple_dimens.xml %%IDEA_HOME%%/plugins/android/lib/templates/activities/common/root/res/values/simple_menu_strings.xml.ftl %%IDEA_HOME%%/plugins/android/lib/templates/activities/common/root/src/app_package/dummy/DummyContent.java.ftl %%IDEA_HOME%%/plugins/android/lib/templates/activities/common/wear_common_globals.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/build.gradle -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/BlankActivity/globals.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/BlankActivity/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/BlankActivity/root/AndroidManifest.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/BlankActivity/root/res/layout/activity_simple.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/BlankActivity/root/res/menu/main.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/BlankActivity/root/res/values-w820dp/dimens.xml -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/BlankActivity/root/res/values/dimens.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/BlankActivity/root/res/values/strings.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/BlankActivity/root/src/app_package/SimpleActivity.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/BlankActivity/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/BlankActivity/template_blank_activity.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/BlankActivityWithFragment/globals.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/BlankActivityWithFragment/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/BlankActivityWithFragment/root/AndroidManifest.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/BlankActivityWithFragment/root/res/layout/activity_fragment_container.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/BlankActivityWithFragment/root/res/layout/fragment_simple.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/BlankActivityWithFragment/root/res/menu/main.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/BlankActivityWithFragment/root/res/values-w820dp/dimens.xml -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/BlankActivityWithFragment/root/res/values/dimens.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/BlankActivityWithFragment/root/res/values/strings.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/BlankActivityWithFragment/root/src/app_package/SimpleActivity.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/BlankActivityWithFragment/root/src/app_package/include_fragment.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/BlankActivityWithFragment/root/src/app_package/include_options_menu.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/BlankActivityWithFragment/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/BlankActivityWithFragment/template_blank_activity_fragment.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/EmptyActivity/globals.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/EmptyActivity/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/EmptyActivity/root/AndroidManifest.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/EmptyActivity/root/res/layout/activity_simple.xml -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/EmptyActivity/root/res/values/strings.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/EmptyActivity/root/src/app_package/SimpleActivity.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/EmptyActivity/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/EmptyActivity/template_blank_activity.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/FullscreenActivity/globals.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/FullscreenActivity/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/FullscreenActivity/root/AndroidManifest.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/FullscreenActivity/root/res/layout/activity_fullscreen.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/FullscreenActivity/root/res/values-v11/styles.xml -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/FullscreenActivity/root/res/values/attrs.xml -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/FullscreenActivity/root/res/values/colors.xml -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/FullscreenActivity/root/res/values/strings.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/FullscreenActivity/root/res/values/styles.xml -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/FullscreenActivity/root/src/app_package/FullscreenActivity.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/FullscreenActivity/root/src/app_package/util/SystemUiHider.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/FullscreenActivity/root/src/app_package/util/SystemUiHiderBase.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/FullscreenActivity/root/src/app_package/util/SystemUiHiderHoneycomb.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/FullscreenActivity/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/FullscreenActivity/template_fullscreen_activity.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/LoginActivity/globals.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/LoginActivity/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/LoginActivity/root/AndroidManifest.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/LoginActivity/root/res/layout/activity_login.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/LoginActivity/root/res/values/dimens.xml -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/LoginActivity/root/res/values/strings.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/LoginActivity/root/src/app_package/LoginActivity.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/LoginActivity/root/src/app_package/PlusBaseActivity.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/LoginActivity/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/LoginActivity/template_login_activity.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/MasterDetailFlow/globals.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/MasterDetailFlow/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/MasterDetailFlow/root/AndroidManifest.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/MasterDetailFlow/root/res/layout/activity_content_detail.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/MasterDetailFlow/root/res/layout/activity_content_list.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/MasterDetailFlow/root/res/layout/activity_content_twopane.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/MasterDetailFlow/root/res/layout/fragment_content_detail.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/MasterDetailFlow/root/res/values-large/refs.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/MasterDetailFlow/root/res/values-sw600dp/refs.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/MasterDetailFlow/root/res/values/strings.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/MasterDetailFlow/root/src/app_package/ContentDetailActivity.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/MasterDetailFlow/root/src/app_package/ContentDetailFragment.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/MasterDetailFlow/root/src/app_package/ContentListActivity.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/MasterDetailFlow/root/src/app_package/ContentListFragment.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/MasterDetailFlow/root/src/app_package/dummy/DummyContent.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/MasterDetailFlow/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/MasterDetailFlow/template_master_detail.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/NavigationDrawerActivity/globals.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/NavigationDrawerActivity/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/NavigationDrawerActivity/root/AndroidManifest.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/NavigationDrawerActivity/root/res/drawable-hdpi/drawer_shadow.9.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/NavigationDrawerActivity/root/res/drawable-hdpi/ic_drawer.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/NavigationDrawerActivity/root/res/drawable-mdpi/drawer_shadow.9.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/NavigationDrawerActivity/root/res/drawable-mdpi/ic_drawer.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/NavigationDrawerActivity/root/res/drawable-xhdpi/drawer_shadow.9.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/NavigationDrawerActivity/root/res/drawable-xhdpi/ic_drawer.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/NavigationDrawerActivity/root/res/drawable-xxhdpi/drawer_shadow.9.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/NavigationDrawerActivity/root/res/drawable-xxhdpi/ic_drawer.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/NavigationDrawerActivity/root/res/layout/activity_drawer.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/NavigationDrawerActivity/root/res/layout/fragment_navigation_drawer.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/NavigationDrawerActivity/root/res/layout/fragment_simple.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/NavigationDrawerActivity/root/res/menu/global.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/NavigationDrawerActivity/root/res/menu/main.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/NavigationDrawerActivity/root/res/values-w820dp/dimens.xml -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/NavigationDrawerActivity/root/res/values/dimens.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/NavigationDrawerActivity/root/res/values/strings.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/NavigationDrawerActivity/root/src/app_package/DrawerActivity.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/NavigationDrawerActivity/root/src/app_package/NavigationDrawerFragment.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/NavigationDrawerActivity/root/src/app_package/include_fragment.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/NavigationDrawerActivity/root/src/app_package/include_options_menu.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/NavigationDrawerActivity/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/NavigationDrawerActivity/template_blank_activity_drawer.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/SettingsActivity/globals.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/SettingsActivity/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/SettingsActivity/root/AndroidManifest.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/SettingsActivity/root/res/values/strings.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/SettingsActivity/root/res/xml/pref_data_sync.xml -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/SettingsActivity/root/res/xml/pref_general.xml -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/SettingsActivity/root/res/xml/pref_headers.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/SettingsActivity/root/res/xml/pref_notification.xml -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/SettingsActivity/root/src/app_package/SettingsActivity.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/SettingsActivity/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/SettingsActivity/template_settings_activity.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/TabbedActivity/globals.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/TabbedActivity/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/TabbedActivity/root/AndroidManifest.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/TabbedActivity/root/res/layout/activity_fragment_container.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/TabbedActivity/root/res/layout/activity_pager.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/TabbedActivity/root/res/layout/fragment_simple.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/TabbedActivity/root/res/menu/main.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/TabbedActivity/root/res/values-w820dp/dimens.xml -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/TabbedActivity/root/res/values/dimens.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/TabbedActivity/root/res/values/strings.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/TabbedActivity/root/src/app_package/DropdownActivity.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/TabbedActivity/root/src/app_package/TabsAndPagerActivity.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/TabbedActivity/root/src/app_package/include_fragment.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/TabbedActivity/root/src/app_package/include_options_menu.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/TabbedActivity/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/TabbedActivity/template_blank_activity_dropdown.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/TabbedActivity/template_blank_activity_pager.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/activities/TabbedActivity/template_blank_activity_tabs.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/gradle/wrapper/gradle/wrapper/gradle-wrapper.jar -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/gradle/wrapper/gradle/wrapper/gradle-wrapper.properties -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/gradle/wrapper/gradlew -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/gradle/wrapper/gradlew.bat -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AidlFile/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AidlFile/root/src/app_package/interface.aidl.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AidlFile/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AidlFolder/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AidlFolder/root/build.gradle.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AidlFolder/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AndroidManifest/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AndroidManifest/root/AndroidManifest.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AndroidManifest/root/build.gradle.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AndroidManifest/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AppWidget/globals.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AppWidget/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AppWidget/root/AndroidManifest.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AppWidget/root/res/drawable-nodpi/example_appwidget_preview.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AppWidget/root/res/layout/appwidget.xml -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AppWidget/root/res/layout/appwidget_configure.xml -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AppWidget/root/res/values-v14/dimens.xml -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AppWidget/root/res/values/dimens.xml -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AppWidget/root/res/values/strings.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AppWidget/root/res/xml/appwidget_info.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AppWidget/root/src/app_package/AppWidget.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AppWidget/root/src/app_package/AppWidgetConfigureActivity.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AppWidget/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AppWidget/thumbs/template_widget_1x1.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AppWidget/thumbs/template_widget_1x1_h.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AppWidget/thumbs/template_widget_1x1_v.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AppWidget/thumbs/template_widget_1x1_vh.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AppWidget/thumbs/template_widget_1x2.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AppWidget/thumbs/template_widget_1x2_h.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AppWidget/thumbs/template_widget_1x2_v.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AppWidget/thumbs/template_widget_1x2_vh.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AppWidget/thumbs/template_widget_1x3.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AppWidget/thumbs/template_widget_1x3_h.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AppWidget/thumbs/template_widget_1x3_v.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AppWidget/thumbs/template_widget_1x3_vh.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AppWidget/thumbs/template_widget_1x4.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AppWidget/thumbs/template_widget_1x4_h.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AppWidget/thumbs/template_widget_1x4_v.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AppWidget/thumbs/template_widget_1x4_vh.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AppWidget/thumbs/template_widget_2x1.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AppWidget/thumbs/template_widget_2x1_h.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AppWidget/thumbs/template_widget_2x1_v.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AppWidget/thumbs/template_widget_2x1_vh.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AppWidget/thumbs/template_widget_2x2.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AppWidget/thumbs/template_widget_2x2_h.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AppWidget/thumbs/template_widget_2x2_v.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AppWidget/thumbs/template_widget_2x2_vh.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AppWidget/thumbs/template_widget_2x3.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AppWidget/thumbs/template_widget_2x3_h.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AppWidget/thumbs/template_widget_2x3_v.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AppWidget/thumbs/template_widget_2x3_vh.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AppWidget/thumbs/template_widget_2x4.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AppWidget/thumbs/template_widget_2x4_h.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AppWidget/thumbs/template_widget_2x4_v.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AppWidget/thumbs/template_widget_2x4_vh.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AppWidget/thumbs/template_widget_3x1.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AppWidget/thumbs/template_widget_3x1_h.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AppWidget/thumbs/template_widget_3x1_v.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AppWidget/thumbs/template_widget_3x1_vh.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AppWidget/thumbs/template_widget_3x2.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AppWidget/thumbs/template_widget_3x2_h.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AppWidget/thumbs/template_widget_3x2_v.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AppWidget/thumbs/template_widget_3x2_vh.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AppWidget/thumbs/template_widget_3x3.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AppWidget/thumbs/template_widget_3x3_h.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AppWidget/thumbs/template_widget_3x3_v.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AppWidget/thumbs/template_widget_3x3_vh.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AppWidget/thumbs/template_widget_3x4.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AppWidget/thumbs/template_widget_3x4_h.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AppWidget/thumbs/template_widget_3x4_v.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AppWidget/thumbs/template_widget_3x4_vh.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AppWidget/thumbs/template_widget_4x1.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AppWidget/thumbs/template_widget_4x1_h.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AppWidget/thumbs/template_widget_4x1_v.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AppWidget/thumbs/template_widget_4x1_vh.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AppWidget/thumbs/template_widget_4x2.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AppWidget/thumbs/template_widget_4x2_h.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AppWidget/thumbs/template_widget_4x2_v.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AppWidget/thumbs/template_widget_4x2_vh.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AppWidget/thumbs/template_widget_4x3.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AppWidget/thumbs/template_widget_4x3_h.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AppWidget/thumbs/template_widget_4x3_v.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AppWidget/thumbs/template_widget_4x3_vh.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AppWidget/thumbs/template_widget_4x4.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AppWidget/thumbs/template_widget_4x4_h.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AppWidget/thumbs/template_widget_4x4_v.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AppWidget/thumbs/template_widget_4x4_vh.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AssetsFolder/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AssetsFolder/root/build.gradle.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/AssetsFolder/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/BlankFragment/globals.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/BlankFragment/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/BlankFragment/root/res/layout/fragment_blank.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/BlankFragment/root/res/values/strings.xml -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/BlankFragment/root/src/app_package/BlankFragment.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/BlankFragment/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/BlankFragment/template_blank_fragment.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/BroadcastReceiver/globals.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/BroadcastReceiver/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/BroadcastReceiver/root/AndroidManifest.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/BroadcastReceiver/root/src/app_package/BroadcastReceiver.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/BroadcastReceiver/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/ContentProvider/globals.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/ContentProvider/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/ContentProvider/root/AndroidManifest.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/ContentProvider/root/src/app_package/ContentProvider.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/ContentProvider/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/CustomView/globals.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/CustomView/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/CustomView/root/res/layout/sample.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/CustomView/root/res/values/attrs.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/CustomView/root/src/app_package/CustomView.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/CustomView/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/Daydream/globals.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/Daydream/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/Daydream/root/AndroidManifest.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/Daydream/root/res/layout-v17/dream.xml -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/Daydream/root/res/values/strings.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/Daydream/root/res/xml/dream_prefs.xml -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/Daydream/root/res/xml/xml_dream.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/Daydream/root/src/app_package/DreamService.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/Daydream/root/src/app_package/SettingsActivity.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/Daydream/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/IntentService/globals.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/IntentService/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/IntentService/root/AndroidManifest.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/IntentService/root/src/app_package/IntentService.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/IntentService/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/JavaFolder/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/JavaFolder/root/build.gradle.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/JavaFolder/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/JniFolder/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/JniFolder/root/build.gradle.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/JniFolder/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/LayoutResourceFile/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/LayoutResourceFile/root/res/layout.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/LayoutResourceFile/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/ListFragment/globals.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/ListFragment/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/ListFragment/root/res/layout/fragment_grid.xml -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/ListFragment/root/res/layout/fragment_list.xml -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/ListFragment/root/res/values-large/refs_lrg.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/ListFragment/root/res/values-sw600dp/refs_lrg.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/ListFragment/root/res/values/refs.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/ListFragment/root/res/values/refs_lrg.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/ListFragment/root/src/app_package/ListFragment.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/ListFragment/root/src/app_package/dummy/DummyContent.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/ListFragment/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/ListFragment/templates_list_fragment.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/Notification/globals.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/Notification/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/Notification/root/AndroidManifest.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/Notification/root/res/drawable-hdpi/ic_action_stat_reply.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/Notification/root/res/drawable-hdpi/ic_action_stat_share.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/Notification/root/res/drawable-mdpi/ic_action_stat_reply.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/Notification/root/res/drawable-mdpi/ic_action_stat_share.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/Notification/root/res/drawable-nodpi/example_picture_large.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/Notification/root/res/drawable-nodpi/example_picture_small.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/Notification/root/res/drawable-xhdpi/ic_action_stat_reply.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/Notification/root/res/drawable-xhdpi/ic_action_stat_share.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/Notification/root/res/values/strings.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/Notification/root/src/app_package/NotificationHelper.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/Notification/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/Notification/template_notification_list.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/Notification/template_notification_list_actions.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/Notification/template_notification_none.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/Notification/template_notification_none_actions.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/Notification/template_notification_picture.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/Notification/template_notification_picture_actions.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/Notification/template_notification_text.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/Notification/template_notification_text_actions.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/PlusOneFragment/globals.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/PlusOneFragment/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/PlusOneFragment/root/AndroidManifest.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/PlusOneFragment/root/res/layout/fragment_plus_one.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/PlusOneFragment/root/src/app_package/PlusOneFragment.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/PlusOneFragment/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/PlusOneFragment/templates_plusone_fragment.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/ResFolder/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/ResFolder/root/build.gradle.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/ResFolder/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/ResourcesFolder/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/ResourcesFolder/root/build.gradle.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/ResourcesFolder/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/RsFolder/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/RsFolder/root/build.gradle.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/RsFolder/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/Service/globals.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/Service/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/Service/root/AndroidManifest.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/Service/root/src/app_package/Service.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/Service/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/ValueResourceFile/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/ValueResourceFile/root/res/values.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/other/ValueResourceFile/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/projects/NewAndroidApplication/globals.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/projects/NewAndroidApplication/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/projects/NewAndroidApplication/root/AndroidManifest.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/projects/NewAndroidApplication/root/build.gradle.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/projects/NewAndroidApplication/root/res/drawable-hdpi/ic_launcher.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/projects/NewAndroidApplication/root/res/drawable-mdpi/ic_launcher.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/projects/NewAndroidApplication/root/res/drawable-xhdpi/ic_launcher.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/projects/NewAndroidApplication/root/res/values-v11/styles_hc.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/projects/NewAndroidApplication/root/res/values-v14/styles_ics.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/projects/NewAndroidApplication/root/res/values/strings.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/projects/NewAndroidApplication/root/res/values/styles.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/projects/NewAndroidApplication/root/settings.gradle.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/projects/NewAndroidApplication/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/projects/NewAndroidApplication/template_new_project.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/projects/NewAndroidLibrary/globals.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/projects/NewAndroidLibrary/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/projects/NewAndroidLibrary/root/AndroidManifest.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/projects/NewAndroidLibrary/root/build.gradle.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/projects/NewAndroidLibrary/root/res/drawable-hdpi/ic_launcher.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/projects/NewAndroidLibrary/root/res/drawable-mdpi/ic_launcher.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/projects/NewAndroidLibrary/root/res/drawable-xhdpi/ic_launcher.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/projects/NewAndroidLibrary/root/res/values-v11/styles_hc.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/projects/NewAndroidLibrary/root/res/values-v14/styles_ics.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/projects/NewAndroidLibrary/root/res/values/strings.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/projects/NewAndroidLibrary/root/res/values/styles.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/projects/NewAndroidLibrary/root/settings.gradle.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/projects/NewAndroidLibrary/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/projects/NewAndroidLibrary/template_new_project.png -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/projects/NewJavaLibrary/globals.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/projects/NewJavaLibrary/recipe.xml.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/projects/NewJavaLibrary/root/build.gradle.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/projects/NewJavaLibrary/root/settings.gradle.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/projects/NewJavaLibrary/root/src/library_package/Placeholder.java.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/projects/NewJavaLibrary/template.xml -%%IDEA_HOME%%/plugins/android/lib/templates/eclipse/projects/NewJavaLibrary/template_new_project.png %%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/AndroidWearModule/globals.xml.ftl %%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/AndroidWearModule/recipe.xml.ftl %%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/AndroidWearModule/root/AndroidManifest.xml.ftl @@ -9734,12 +9416,16 @@ share/applications/idea.desktop %%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/module_ignore %%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/native-lib.cpp.ftl %%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/proguard-rules.txt.ftl -%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/res/mipmap-anydpi/test.svg %%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/res/mipmap-hdpi/ic_launcher.png +%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/res/mipmap-hdpi/ic_launcher_round.png %%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/res/mipmap-mdpi/ic_launcher.png +%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/res/mipmap-mdpi/ic_launcher_round.png %%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/res/mipmap-xhdpi/ic_launcher.png +%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/res/mipmap-xhdpi/ic_launcher_round.png %%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/res/mipmap-xxhdpi/ic_launcher.png +%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/res/mipmap-xxhdpi/ic_launcher_round.png %%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/res/mipmap-xxxhdpi/ic_launcher.png +%%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/res/mipmap-xxxhdpi/ic_launcher_round.png %%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/res/values/colors.xml %%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/res/values/strings.xml.ftl %%IDEA_HOME%%/plugins/android/lib/templates/gradle-projects/NewAndroidModule/root/res/values/styles.xml.ftl @@ -9977,6 +9663,13 @@ share/applications/idea.desktop %%IDEA_HOME%%/plugins/android/lib/templates/other/ListFragment/root/src/app_package/RecyclerViewAdapter.java.ftl %%IDEA_HOME%%/plugins/android/lib/templates/other/ListFragment/template.xml %%IDEA_HOME%%/plugins/android/lib/templates/other/ListFragment/templates_list_fragment.png +%%IDEA_HOME%%/plugins/android/lib/templates/other/ModalBottomSheet/globals.xml.ftl +%%IDEA_HOME%%/plugins/android/lib/templates/other/ModalBottomSheet/recipe.xml.ftl +%%IDEA_HOME%%/plugins/android/lib/templates/other/ModalBottomSheet/root/res/layout/fragment_item_list_dialog.xml +%%IDEA_HOME%%/plugins/android/lib/templates/other/ModalBottomSheet/root/res/layout/fragment_item_list_dialog_item.xml +%%IDEA_HOME%%/plugins/android/lib/templates/other/ModalBottomSheet/root/res/values/dimens.xml +%%IDEA_HOME%%/plugins/android/lib/templates/other/ModalBottomSheet/root/src/app_package/ItemListDialogFragment.java.ftl +%%IDEA_HOME%%/plugins/android/lib/templates/other/ModalBottomSheet/template.xml %%IDEA_HOME%%/plugins/android/lib/templates/other/Notification/globals.xml.ftl %%IDEA_HOME%%/plugins/android/lib/templates/other/Notification/recipe.xml.ftl %%IDEA_HOME%%/plugins/android/lib/templates/other/Notification/root/AndroidManifest.xml.ftl @@ -10073,40 +9766,38 @@ share/applications/idea.desktop %%IDEA_HOME%%/plugins/editorconfig/lib/editorconfig.jar %%IDEA_HOME%%/plugins/git4idea/lib/git4idea-rt.jar %%IDEA_HOME%%/plugins/git4idea/lib/git4idea.jar -%%IDEA_HOME%%/plugins/git4idea/lib/ini4j-0.5.2-patched.jar %%IDEA_HOME%%/plugins/git4idea/lib/remote-servers-git.jar %%IDEA_HOME%%/plugins/git4idea/lib/resources_en.jar -%%IDEA_HOME%%/plugins/git4idea/lib/trilead-ssh2.jar %%IDEA_HOME%%/plugins/github/lib/github.jar %%IDEA_HOME%%/plugins/gradle/lib/commons-io-2.2.jar %%IDEA_HOME%%/plugins/gradle/lib/commons-lang-2.6.jar -%%IDEA_HOME%%/plugins/gradle/lib/gradle-base-services-3.3.jar -%%IDEA_HOME%%/plugins/gradle/lib/gradle-base-services-groovy-3.3.jar -%%IDEA_HOME%%/plugins/gradle/lib/gradle-cli-3.3.jar -%%IDEA_HOME%%/plugins/gradle/lib/gradle-core-3.3.jar +%%IDEA_HOME%%/plugins/gradle/lib/gradle-base-services-3.5.jar +%%IDEA_HOME%%/plugins/gradle/lib/gradle-base-services-groovy-3.5.jar +%%IDEA_HOME%%/plugins/gradle/lib/gradle-cli-3.5.jar +%%IDEA_HOME%%/plugins/gradle/lib/gradle-core-3.5.jar %%IDEA_HOME%%/plugins/gradle/lib/gradle-jps-plugin.jar -%%IDEA_HOME%%/plugins/gradle/lib/gradle-logging-3.3.jar -%%IDEA_HOME%%/plugins/gradle/lib/gradle-messaging-3.3.jar -%%IDEA_HOME%%/plugins/gradle/lib/gradle-model-core-3.3.jar -%%IDEA_HOME%%/plugins/gradle/lib/gradle-model-groovy-3.3.jar -%%IDEA_HOME%%/plugins/gradle/lib/gradle-native-3.3.jar -%%IDEA_HOME%%/plugins/gradle/lib/gradle-process-services-3.3.jar -%%IDEA_HOME%%/plugins/gradle/lib/gradle-resources-3.3.jar -%%IDEA_HOME%%/plugins/gradle/lib/gradle-tooling-api-3.3.jar +%%IDEA_HOME%%/plugins/gradle/lib/gradle-logging-3.5.jar +%%IDEA_HOME%%/plugins/gradle/lib/gradle-messaging-3.5.jar +%%IDEA_HOME%%/plugins/gradle/lib/gradle-model-core-3.5.jar +%%IDEA_HOME%%/plugins/gradle/lib/gradle-model-groovy-3.5.jar +%%IDEA_HOME%%/plugins/gradle/lib/gradle-native-3.5.jar +%%IDEA_HOME%%/plugins/gradle/lib/gradle-process-services-3.5.jar +%%IDEA_HOME%%/plugins/gradle/lib/gradle-resources-3.5.jar +%%IDEA_HOME%%/plugins/gradle/lib/gradle-tooling-api-3.5.jar %%IDEA_HOME%%/plugins/gradle/lib/gradle-tooling-extension-api.jar %%IDEA_HOME%%/plugins/gradle/lib/gradle-tooling-extension-impl.jar -%%IDEA_HOME%%/plugins/gradle/lib/gradle-version-info-3.3.jar -%%IDEA_HOME%%/plugins/gradle/lib/gradle-wrapper-3.3.jar +%%IDEA_HOME%%/plugins/gradle/lib/gradle-version-info-3.5.jar +%%IDEA_HOME%%/plugins/gradle/lib/gradle-wrapper-3.5.jar %%IDEA_HOME%%/plugins/gradle/lib/gradle.jar %%IDEA_HOME%%/plugins/gradle/lib/guava-jdk5-17.0.jar %%IDEA_HOME%%/plugins/gradle/lib/jansi-1.14.jar %%IDEA_HOME%%/plugins/gradle/lib/kryo-2.22.jar %%IDEA_HOME%%/plugins/gradle/lib/minlog-1.2.jar -%%IDEA_HOME%%/plugins/gradle/lib/native-platform-0.12.jar -%%IDEA_HOME%%/plugins/gradle/lib/native-platform-freebsd-amd64-libcpp-0.12.jar -%%IDEA_HOME%%/plugins/gradle/lib/native-platform-freebsd-amd64-libstdcpp-0.12.jar -%%IDEA_HOME%%/plugins/gradle/lib/native-platform-freebsd-i386-libcpp-0.12.jar -%%IDEA_HOME%%/plugins/gradle/lib/native-platform-freebsd-i386-libstdcpp-0.12.jar +%%IDEA_HOME%%/plugins/gradle/lib/native-platform-0.14.jar +%%IDEA_HOME%%/plugins/gradle/lib/native-platform-freebsd-amd64-libcpp-0.14.jar +%%IDEA_HOME%%/plugins/gradle/lib/native-platform-freebsd-amd64-libstdcpp-0.14.jar +%%IDEA_HOME%%/plugins/gradle/lib/native-platform-freebsd-i386-libcpp-0.14.jar +%%IDEA_HOME%%/plugins/gradle/lib/native-platform-freebsd-i386-libstdcpp-0.14.jar %%IDEA_HOME%%/plugins/gradle/lib/objenesis-1.2.jar %%IDEA_HOME%%/plugins/gradle/lib/reflectasm-1.07.jar %%IDEA_HOME%%/plugins/gradle/lib/resources_en.jar @@ -10133,13 +9824,10 @@ share/applications/idea.desktop %%IDEA_HOME%%/plugins/junit/lib/junit5-rt.jar %%IDEA_HOME%%/plugins/junit/lib/opentest4j-1.0.0-M2.jar %%IDEA_HOME%%/plugins/junit/lib/resources_en.jar -%%IDEA_HOME%%/plugins/maven/lib/aether-1.1.0-all.jar -%%IDEA_HOME%%/plugins/maven/lib/aether-dependency-resolver.jar %%IDEA_HOME%%/plugins/maven/lib/artifact-resolver-m2.jar %%IDEA_HOME%%/plugins/maven/lib/artifact-resolver-m3.jar %%IDEA_HOME%%/plugins/maven/lib/artifact-resolver-m31.jar %%IDEA_HOME%%/plugins/maven/lib/lucene-core-2.4.1.jar -%%IDEA_HOME%%/plugins/maven/lib/maven-aether-provider-3.3.9-all.jar %%IDEA_HOME%%/plugins/maven/lib/maven-jps-plugin.jar %%IDEA_HOME%%/plugins/maven/lib/maven-server-api.jar %%IDEA_HOME%%/plugins/maven/lib/maven.jar @@ -10263,7 +9951,6 @@ share/applications/idea.desktop %%IDEA_HOME%%/plugins/maven/lib/plexus-archiver-2.4.4.jar %%IDEA_HOME%%/plugins/maven/lib/plexus-utils-2.0.6.jar %%IDEA_HOME%%/plugins/maven/lib/resources_en.jar -%%IDEA_HOME%%/plugins/maven/lib/wadl-core.jar %%IDEA_HOME%%/plugins/properties/lib/properties.jar %%IDEA_HOME%%/plugins/properties/lib/resources_en.jar %%IDEA_HOME%%/plugins/settings-repository/lib/jackson-annotations-2.8.1.jar @@ -10296,7 +9983,6 @@ share/applications/idea.desktop %%IDEA_HOME%%/plugins/svn4idea/lib/svn4idea.jar %%IDEA_HOME%%/plugins/svn4idea/lib/svnkit-javahl.jar %%IDEA_HOME%%/plugins/svn4idea/lib/svnkit.jar -%%IDEA_HOME%%/plugins/svn4idea/lib/trilead.jar %%IDEA_HOME%%/plugins/tasks/lib/axis-1.4.jar %%IDEA_HOME%%/plugins/tasks/lib/axis-jaxrpc-1.4.jar %%IDEA_HOME%%/plugins/tasks/lib/axis-saaj-1.3.jar diff --git a/lang/nhc98/Makefile b/lang/nhc98/Makefile index 46a00f31729..1fc18708a7e 100644 --- a/lang/nhc98/Makefile +++ b/lang/nhc98/Makefile @@ -3,7 +3,7 @@ PORTNAME= nhc98 PORTVERSION= 1.22 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang haskell MASTER_SITES= http://haskell.org/${PORTNAME}/ DISTFILES= ${PORTNAME}src-${PORTVERSION}${EXTRACT_SUFX} @@ -14,14 +14,11 @@ COMMENT= Fully-fledged compiler for Haskell 98 ONLY_FOR_ARCHS= i386 -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} - USES= gmake -# Fails to build with GCC 4.9, cf. PR 196857. -USE_GCC= 4.8 +USE_GCC= yes HAS_CONFIGURE= yes -CONFIGURE_ARGS+= --prefix=${PREFIX} --heap=4M +CONFIGURE_ARGS+= --prefix=${PREFIX} --heap=4M --buildwith=gcc MAKE_ARGS+= ARCH= MAKE_JOBS_UNSAFE= yes @@ -35,6 +32,10 @@ CONFLICTS= hs-cpphs-[0-9]* post-patch: @${REINPLACE_CMD} -e 's|-O3|${CFLAGS}|' ${WRKSRC}/Makefile.inc +# The Makefile defines target names based on $(CC) which is +# problematic when CC=gcc5. The following patch does not affect the +# compiler used during the build, but makes sure that targets have +# the correct suffix e.g. 'basic-gcc' instead of 'basic-gcc5': @${REINPLACE_CMD} -e 's|$$(CC)|gcc|g' ${WRKSRC}/Makefile post-configure: diff --git a/lang/nhc98/pkg-plist b/lang/nhc98/pkg-plist index 7f622226f24..1107f388ee7 100644 --- a/lang/nhc98/pkg-plist +++ b/lang/nhc98/pkg-plist @@ -224,6 +224,8 @@ include/nhc98/packages/base/Text/Printf.hi include/nhc98/packages/base/Text/Read.hi include/nhc98/packages/base/Text/Show.hi include/nhc98/packages/base/Text/Show/Functions.hi +@dir include/nhc98/packages/base/Text/Html +@dir include/nhc98/packages/base/Text/Regex include/nhc98/packages/base/Typeable.h include/nhc98/packages/base/Unsafe/Coerce.hi include/nhc98/packages/bytestring.cabal @@ -249,6 +251,7 @@ include/nhc98/packages/filepath.cabal include/nhc98/packages/filepath/System/FilePath.hi include/nhc98/packages/filepath/System/FilePath/Posix.hi include/nhc98/packages/filepath/System/FilePath/Windows.hi +@dir include/nhc98/packages/haskell98 include/nhc98/packages/haskell98.cabal include/nhc98/packages/old-locale.cabal include/nhc98/packages/old-locale/System/Locale.hi diff --git a/lang/perl5-devel/Makefile b/lang/perl5-devel/Makefile index 2e6c81753d8..7ec282ff5dc 100644 --- a/lang/perl5-devel/Makefile +++ b/lang/perl5-devel/Makefile @@ -35,7 +35,7 @@ TEST_ENV= ${MAKE_ENV} TEST_JOBS=${MAKE_JOBS_NUMBER} \ USE_GITHUB= yes GH_ACCOUNT= Perl GH_PROJECT= perl5 -GH_TAGNAME= v5.27.1-250-g978b185 +GH_TAGNAME= v5.27.2-17-g6be75e6 OPTIONS_DEFINE= DEBUG GDBM PERL_64BITINT MULTIPLICITY SITECUSTOMIZE \ THREADS PERL_MALLOC DTRACE DOT_INC diff --git a/lang/perl5-devel/distinfo b/lang/perl5-devel/distinfo index 6c9f87eeb92..662637655bd 100644 --- a/lang/perl5-devel/distinfo +++ b/lang/perl5-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1500285812 -SHA256 (perl/Perl-perl5-v5.27.1-250-g978b185_GH0.tar.gz) = 51ef8f4c2087cf2ca60ab48ebce720dce5ee5523b0bb3452a72a2a8e4f46b704 -SIZE (perl/Perl-perl5-v5.27.1-250-g978b185_GH0.tar.gz) = 18625952 +TIMESTAMP = 1500983578 +SHA256 (perl/Perl-perl5-v5.27.2-17-g6be75e6_GH0.tar.gz) = 0fdd98f3c0287554103ef8c51bddc602cec2a0324ef159ccf9b9699dbe368f55 +SIZE (perl/Perl-perl5-v5.27.2-17-g6be75e6_GH0.tar.gz) = 18628505 diff --git a/lang/perl5-devel/files/patch-t_porting_customized.dat b/lang/perl5-devel/files/patch-t_porting_customized.dat index 368a38c10e5..4f723563c49 100644 --- a/lang/perl5-devel/files/patch-t_porting_customized.dat +++ b/lang/perl5-devel/files/patch-t_porting_customized.dat @@ -1,8 +1,7 @@ ---- t/porting/customized.dat.orig 2017-06-18 21:44:07 UTC +--- t/porting/customized.dat.orig 2017-07-25 11:25:51 UTC +++ t/porting/customized.dat -@@ -1,6 +1,7 @@ +@@ -1,5 +1,6 @@ Digest cpan/Digest/Digest.pm 43f7f544cb11842b2f55c73e28930da50774e081 - Encode cpan/Encode/Unicode/Unicode.pm 9749692c67f7d69083034de9184a93f070ab4799 ExtUtils::Constant cpan/ExtUtils-Constant/t/Constant.t a0369c919e216fb02767a637666bb4577ad79b02 +ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm ac29a8dc1c7d6f0aca4abff0730c05bde1dab3ad Locale::Maketext::Simple cpan/Locale-Maketext-Simple/lib/Locale/Maketext/Simple.pm 57ed38905791a17c150210cd6f42ead22a7707b6 diff --git a/lang/perl5-devel/pkg-plist b/lang/perl5-devel/pkg-plist index 2c8ee66b66d..862c077b5a0 100644 --- a/lang/perl5-devel/pkg-plist +++ b/lang/perl5-devel/pkg-plist @@ -43,7 +43,6 @@ etc/man.d/perl%%PKGNAMESUFFIX%%.conf %%PRIV_LIB%%/Attribute/Handlers.pm %%PRIV_LIB%%/AutoLoader.pm %%PRIV_LIB%%/AutoSplit.pm -%%PRIV_LIB%%/B/Debug.pm %%PRIV_LIB%%/B/Deparse.pm %%PRIV_LIB%%/B/Op_private.pm %%PRIV_LIB%%/Benchmark.pm @@ -979,6 +978,7 @@ etc/man.d/perl%%PKGNAMESUFFIX%%.conf %%MAN1%%/perl5270delta.1.gz %%MAN1%%/perl5271delta.1.gz %%MAN1%%/perl5272delta.1.gz +%%MAN1%%/perl5273delta.1.gz %%MAN1%%/perl561delta.1.gz %%MAN1%%/perl56delta.1.gz %%MAN1%%/perl581delta.1.gz @@ -1165,7 +1165,6 @@ etc/man.d/perl%%PKGNAMESUFFIX%%.conf %%MAN3%%/AutoSplit.3.gz %%MAN3%%/B.3.gz %%MAN3%%/B::Concise.3.gz -%%MAN3%%/B::Debug.3.gz %%MAN3%%/B::Deparse.3.gz %%MAN3%%/B::Op_private.3.gz %%MAN3%%/B::Showlex.3.gz @@ -1762,6 +1761,7 @@ etc/man.d/perl%%PKGNAMESUFFIX%%.conf %%PRIV_LIB%%/pod/perl5270delta.pod %%PRIV_LIB%%/pod/perl5271delta.pod %%PRIV_LIB%%/pod/perl5272delta.pod +%%PRIV_LIB%%/pod/perl5273delta.pod %%PRIV_LIB%%/pod/perl561delta.pod %%PRIV_LIB%%/pod/perl56delta.pod %%PRIV_LIB%%/pod/perl581delta.pod diff --git a/lang/perl5-devel/version.mk b/lang/perl5-devel/version.mk index ce2c1f88bdc..9aa40671087 100644 --- a/lang/perl5-devel/version.mk +++ b/lang/perl5-devel/version.mk @@ -1,2 +1,2 @@ -PERL_VERSION= 5.27.2 +PERL_VERSION= 5.27.3 PERL5_DEPEND= perl5>=5.27<5.28 diff --git a/math/R/Makefile b/math/R/Makefile index 4e4cc0c01ba..736662a5fd2 100644 --- a/math/R/Makefile +++ b/math/R/Makefile @@ -3,7 +3,7 @@ PORTNAME= R PORTVERSION= 3.4.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= math lang MASTER_SITES= CRAN/src/base/R-${PORTVERSION:C|\..*||} @@ -79,6 +79,7 @@ CAIROPANGO_CONFIGURE_WITH=cairo CAIROPANGO_USES= gettext jpeg pkgconfig CAIROPANGO_USE= GNOME=pango,cairo FLANG_USE= binutils +FLANG_PREVENTS= ATLAS OPENBLAS NETLIB FLANG_BUILD_DEPENDS= flang:devel/flang FLANG_RUN_DEPENDS= flang:devel/flang FLANG_VARS= F77=flang FC=flang @@ -99,6 +100,7 @@ JPEG_USES= jpeg LDOUBLE_CONFIGURE_ENABLE=long-double LETTER_CONFIGURE_ENV= R_PAPERSIZE=letter LIBR_CONFIGURE_ENABLE= R-shlib +LIBR_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src_main_Makefile.in LTO_CONFIGURE_ENABLE= lto LTO_CONFIGURE_ENV= AR="${LOCALBASE}/bin/gcc-ar${GCC_DEFAULT:S/.//g}" \ RANLIB="${LOCALBASE}/bin/gcc-ranlib${GCC_DEFAULT:S/.//g}" @@ -124,6 +126,8 @@ RBLAS_CONFIGURE_ON= --without-blas \ --enable-BLAS-shlib RBLAS_CONFIGURE_OFF= --with-blas="-L${LOCALBASE}/lib ${BLASLIB}" \ --with-lapack="${LAPACKLIB}" +RBLAS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src_extra_blas_Makefile.in \ + ${PATCHDIR}/extra-patch-src_modules_lapack_Makefile.in RPROF_CONFIGURE_ENABLE= R-profiling TCLTK_IMPLIES= X11 TCLTK_USES= tcl tk:84+ diff --git a/math/R/files/patch-src_extra_blas_Makefile.in b/math/R/files/extra-patch-src_extra_blas_Makefile.in similarity index 100% rename from math/R/files/patch-src_extra_blas_Makefile.in rename to math/R/files/extra-patch-src_extra_blas_Makefile.in diff --git a/math/R/files/patch-src_main_Makefile.in b/math/R/files/extra-patch-src_main_Makefile.in similarity index 100% rename from math/R/files/patch-src_main_Makefile.in rename to math/R/files/extra-patch-src_main_Makefile.in diff --git a/math/R/files/patch-src_modules_lapack_Makefile.in b/math/R/files/extra-patch-src_modules_lapack_Makefile.in similarity index 100% rename from math/R/files/patch-src_modules_lapack_Makefile.in rename to math/R/files/extra-patch-src_modules_lapack_Makefile.in diff --git a/math/asymptote/Makefile b/math/asymptote/Makefile index 2fcf234cef5..ddf132ae4f4 100644 --- a/math/asymptote/Makefile +++ b/math/asymptote/Makefile @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= asymptote -PORTVERSION= 2.37 -PORTREVISION= 5 +PORTVERSION= 2.41 +PORTREVISION= 0 CATEGORIES= math MASTER_SITES= SF/${PORTNAME}/${PORTVERSION} DISTNAME= ${PORTNAME}-${PORTVERSION}.src @@ -26,42 +26,33 @@ ALL_TARGET= asy asy-keywords.el CONFIGURE_ARGS= --enable-gc=system CPPFLAGS+= -I${LOCALBASE}/include -GNU_CONFIGURE= yes - -INSTALL_TARGET= install-asy - -MAKE_ENV= ASYMPTOTE_HOME=${WRKDIR} HOME=${WRKDIR} -MAKE_JOBS_UNSAFE= yes - -ONLY_FOR_ARCHS= i386 amd64 - -USES= gettext-runtime ghostscript gmake ncurses perl5 python \ - shebangfix tar:tgz -USE_GL= glut -USE_PERL5= build -USE_TEX= dvipsk formats - -SHEBANG_FILES= GUI/*.py - -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} - -# Options +DOCS_ALL_TARGET= html DOCS_BUILD_DEPENDS= texi2dvi:print/texinfo DOCS_CONFIGURE_WITH= docdir=${DOCSDIR} +DOCS_INSTALL_TARGET= install-html FFTW_CONFIGURE_ENABLE= fftw FFTW_DESC= Use FFTW to compute the Discrete Fourier Transform FFTW_LIB_DEPENDS= libfftw3.so:math/fftw3 +GNU_CONFIGURE= yes GSL_CONFIGURE_ENABLE= gsl GSL_DESC= Enable GNU Scientific library GSL_LIB_DEPENDS= libgsl.so:math/gsl +INSTALL_TARGET= install-asy + +MAKE_ENV= ASYMPTOTE_HOME=${WRKDIR} HOME=${WRKDIR} +MAKE_JOBS_UNSAFE= yes +MANPAGES_ALL_TARGET= man MANPAGES_BUILD_DEPENDS= texi2dvi:print/texinfo +MANPAGES_INFO= asy-faq +MANPAGE_INSTALL_TARGET= install-man OFFSCREEN_CONFIGURE_ENABLE= offscreen OFFSCREEN_DESC= Enable offscreen rendering using OSMesa library OFFSCREEN_LIB_DEPENDS= libOSMesa.so:graphics/libosmesa +ONLY_FOR_ARCHS= amd64 i386 OPTIONS_DEFAULT= FFTW GSL MANPAGES READLINE OPTIONS_DEFINE= DOCS EXAMPLES FFTW GSL MANPAGES OFFSCREEN READLINE @@ -69,19 +60,15 @@ READLINE_CONFIGURE_ENABLE= readline READLINE_DESC= ${LIBEDIT_DESC} READLINE_USES= readline -.include +SHEBANG_FILES= GUI/*.py -# Documentation -.if ${PORT_OPTIONS:MDOCS} -ALL_TARGET+= html -INSTALL_TARGET+= install-html -.endif +USES= gettext-runtime ghostscript gmake ncurses perl5 python \ + shebangfix tar:tgz +USE_GL= glut +USE_PERL5= build +USE_TEX= dvipsk formats -.if ${PORT_OPTIONS:MMANPAGES} -INFO= asy-faq -ALL_TARGET+= man -INSTALL_TARGET+= install-man -.endif +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} post-patch: @${REINPLACE_CMD} 's/-lgc/-lgc-threaded/' ${WRKSRC}/configure diff --git a/math/asymptote/distinfo b/math/asymptote/distinfo index 0c28cded522..ccc6ea1880b 100644 --- a/math/asymptote/distinfo +++ b/math/asymptote/distinfo @@ -1,2 +1,3 @@ -SHA256 (asymptote-2.37.src.tgz) = 111502a4daf055b517bb7e393af2b70f84f376a28671144751695651aa00d09a -SIZE (asymptote-2.37.src.tgz) = 3459415 +TIMESTAMP = 1500975929 +SHA256 (asymptote-2.41.src.tgz) = 1d6e7e89fb5293fad7d836fb0477f785a113f689bd71f37a05af18ff0c5eeef0 +SIZE (asymptote-2.41.src.tgz) = 3516426 diff --git a/math/asymptote/pkg-plist b/math/asymptote/pkg-plist index ec45ed0c1b0..1c8ed2405d5 100644 --- a/math/asymptote/pkg-plist +++ b/math/asymptote/pkg-plist @@ -203,6 +203,7 @@ man/man1/xasy.1x.gz %%PORTEXAMPLES%%%%EXAMPLESDIR%%/100d.views %%PORTEXAMPLES%%%%EXAMPLESDIR%%/1overx.asy %%PORTEXAMPLES%%%%EXAMPLESDIR%%/BezierPatch.asy +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/BezierSaddle.asy %%PORTEXAMPLES%%%%EXAMPLESDIR%%/BezierSurface.asy %%PORTEXAMPLES%%%%EXAMPLESDIR%%/BezierTriangle.asy %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Bode.asy @@ -267,6 +268,7 @@ man/man1/xasy.1x.gz %%PORTEXAMPLES%%%%EXAMPLESDIR%%/clockarray.asy %%PORTEXAMPLES%%%%EXAMPLESDIR%%/coag.asy %%PORTEXAMPLES%%%%EXAMPLESDIR%%/colons.asy +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/colorpatch.asy %%PORTEXAMPLES%%%%EXAMPLESDIR%%/colorplanes.asy %%PORTEXAMPLES%%%%EXAMPLESDIR%%/colors.asy %%PORTEXAMPLES%%%%EXAMPLESDIR%%/condor.asy diff --git a/math/wxMaxima/Makefile b/math/wxMaxima/Makefile index 8ef987c8077..d4452d45ca6 100644 --- a/math/wxMaxima/Makefile +++ b/math/wxMaxima/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= wxMaxima -PORTVERSION= 17.05.0 +PORTVERSION= 17.05.1 PORTREVISION= 0 CATEGORIES= math diff --git a/math/wxMaxima/distinfo b/math/wxMaxima/distinfo index 52758c1cbdd..b1c86921ef7 100644 --- a/math/wxMaxima/distinfo +++ b/math/wxMaxima/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1500752205 -SHA256 (andrejv-wxmaxima-17.05.0-Version-17.05.0_GH0.tar.gz) = f89d34b9d8cd801a0e827af1ffbf5a15c811a7f731ad1f6f66a27611f2695eaf -SIZE (andrejv-wxmaxima-17.05.0-Version-17.05.0_GH0.tar.gz) = 5888032 +TIMESTAMP = 1500975060 +SHA256 (andrejv-wxmaxima-17.05.1-Version-17.05.1_GH0.tar.gz) = 72394f266a784e433e232e600e7178fdd6362fd33f8ac11703db10c780676037 +SIZE (andrejv-wxmaxima-17.05.1-Version-17.05.1_GH0.tar.gz) = 5890723 diff --git a/math/wxMaxima/pkg-descr b/math/wxMaxima/pkg-descr index 84949b5a5be..309547918a4 100644 --- a/math/wxMaxima/pkg-descr +++ b/math/wxMaxima/pkg-descr @@ -5,4 +5,4 @@ dialogs. The input line has command history (up-key, down-key) and completion based on previous input (tab-key). wxMaxima provides 2d formated display of maxima output. -WWW: http://andrejv.github.io/wxmaxima/ +WWW: https://andrejv.github.io/wxmaxima/ diff --git a/misc/freebsd-release-manifests/Makefile b/misc/freebsd-release-manifests/Makefile index 56ad410a449..12e4311a289 100644 --- a/misc/freebsd-release-manifests/Makefile +++ b/misc/freebsd-release-manifests/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= freebsd-release-manifests -DISTVERSION= 20170715 +DISTVERSION= 20170726 PORTREVISION= 0 CATEGORIES= misc MASTER_SITES= # diff --git a/misc/freebsd-release-manifests/files/MANIFESTS/amd64-amd64-11.1-BETA3 b/misc/freebsd-release-manifests/files/MANIFESTS/amd64-amd64-11.1-BETA3 deleted file mode 100644 index 4e709fd16be..00000000000 --- a/misc/freebsd-release-manifests/files/MANIFESTS/amd64-amd64-11.1-BETA3 +++ /dev/null @@ -1,10 +0,0 @@ -base-dbg.txz da0976f352aacb01da4863b6e9158db33c4f02f3e1a2bced5b3dea3095c958e2 1427 base_dbg "Base system (Debugging)" off -base.txz 9d5e5fc79c36e698636f6452f20c201b86bc099038b3f98f94a82fafd1cd9412 22491 base "Base system (MANDATORY)" on -doc.txz 039e70da4a51b285f45e4478d101108d779ed2cf2608f1203400bb14d2d1535b 120 doc "Additional Documentation" off -kernel-dbg.txz e17e40804a55e2421e39f2c65eefb42727f91966721caa31f1b355ddcf4da8bc 845 kernel_dbg "Kernel (Debugging)" off -kernel.txz 6abc3162e8f5871ad0249fd4bde93d2dc8ebf841721e951be30b8a3ee2e80050 854 kernel "Kernel (MANDATORY)" on -lib32-dbg.txz d5f6fdd39068810289dff40232b71117a11d56ac251a06f48d0908b68f890fb4 208 lib32_dbg "32-bit compatibility libraries (Debugging)" off -lib32.txz bb7825ed29f2f2689fb2f7662c3853b2640f472a7d8e625ae784f482cc875c65 729 lib32 "32-bit compatibility libraries" on -ports.txz f9ad473774cd67537bf48d6ade499688a069da941cb96ed539fa82acadc889fd 166533 ports "Ports tree" on -src.txz 558ec36330f610f3c39f72719b49f1dd5ead1a1a4eb9483e6bfc16ecc705dfdd 78409 src "System source tree" off -tests.txz e24ee1cbf3fd20de96f1ab9611dcfe66154af04ac72c6bb50f7959743216171c 3886 tests "Test suite" off diff --git a/misc/freebsd-release-manifests/files/MANIFESTS/amd64-amd64-11.1-RC1 b/misc/freebsd-release-manifests/files/MANIFESTS/amd64-amd64-11.1-RC1 deleted file mode 100644 index b392af89aad..00000000000 --- a/misc/freebsd-release-manifests/files/MANIFESTS/amd64-amd64-11.1-RC1 +++ /dev/null @@ -1,10 +0,0 @@ -base-dbg.txz 1e1ba805003b3eb4e81bf90371e3d97a410ed2aeba6cb0a7e8108da486d46d9f 1427 base_dbg "Base system (Debugging)" off -base.txz 4e9fb9c25ff30232d4324abf818839bd444ce8e67eb6c8022d11b28315003e16 22491 base "Base system (MANDATORY)" on -doc.txz 77b987fb7887b7f5cb6c12119fa2bc46bba6403b7a5dc1c2aeca08f7f91c5c99 120 doc "Additional Documentation" off -kernel-dbg.txz 95b6e6062d16e150209af50254d6bc6b2aab8cd5c0551eb96ccfc654162ac07d 845 kernel_dbg "Kernel (Debugging)" off -kernel.txz cab1ef38205a4e3f2b6b507a32f724bc1eedbfbd78c537e0de7335fd1ec828d3 854 kernel "Kernel (MANDATORY)" on -lib32-dbg.txz a5f861b056a3f978d2421a1a80da68eabd0e52bf0c05288455aa9809ffcad2c4 208 lib32_dbg "32-bit compatibility libraries (Debugging)" off -lib32.txz f939e40d9cf9a7ff37423a4fa509c321d64411714738a219b3c29b8bf2a97cc5 729 lib32 "32-bit compatibility libraries" on -ports.txz 33e945f49931546bd7cb77972c11701966c6123abba56f23a9c4e672b604b621 166653 ports "Ports tree" on -src.txz 09c9c6340a4005ac4517fb969bc0bf67a13f66222f017c08330d7b5ffd442967 78409 src "System source tree" off -tests.txz 44016b8ac202e214dd4f1960a6ff96aced3cdb98c238facabf930605df2d428c 3886 tests "Test suite" off diff --git a/misc/freebsd-release-manifests/files/MANIFESTS/amd64-amd64-11.1-RC2 b/misc/freebsd-release-manifests/files/MANIFESTS/amd64-amd64-11.1-RC2 deleted file mode 100644 index a3fb9167d37..00000000000 --- a/misc/freebsd-release-manifests/files/MANIFESTS/amd64-amd64-11.1-RC2 +++ /dev/null @@ -1,10 +0,0 @@ -base-dbg.txz 2c5a69f00a4fd77b2481a14abc9f71e7dda89d5e4f85b874ce1fa53ddbbb15f1 1427 base_dbg "Base system (Debugging)" off -base.txz 9bab6cfe66df3e6eb3703b3c5238e4ad798fb445abc14c712fcb7af4c2504fdc 22491 base "Base system (MANDATORY)" on -doc.txz fd603f90fdbb83354e09070a140b0c463478a880b983286c36bc79637aeacad8 120 doc "Additional Documentation" off -kernel-dbg.txz e205446c3fed773bae48c5f6c8a9782fa91726699fca8a9cf3b48be6e1209dc7 846 kernel_dbg "Kernel (Debugging)" off -kernel.txz 6370fb0b546ee709d519f8d9e3732df90c80f66782ae65a4736b6cd810867ab0 855 kernel "Kernel (MANDATORY)" on -lib32-dbg.txz 7c3d3aad25796768fdcd34090ed85a389a68a7d3bd07907a17279fb8a0aa5f06 208 lib32_dbg "32-bit compatibility libraries (Debugging)" off -lib32.txz cd3e3b008b8be1e652d82f79d425fe53b4f0080d51b2a119a0d3cb16a7725f27 729 lib32 "32-bit compatibility libraries" on -ports.txz 928165d551572cea2fa5a90abe60f773189fa21a7ecad52331e526e3f12d480d 166704 ports "Ports tree" on -src.txz 934e8cfd16ba745871e562fb6ae456da5ab9ef596ed335a98ed5e148540a60e1 78427 src "System source tree" off -tests.txz e80dbef46a5c22ba2a43da7b90e3309bc9410938653799d076359f1512aecb02 3886 tests "Test suite" off diff --git a/misc/freebsd-release-manifests/files/MANIFESTS/amd64-amd64-11.1-RC3 b/misc/freebsd-release-manifests/files/MANIFESTS/amd64-amd64-11.1-RC3 deleted file mode 100644 index 07dcbcf8450..00000000000 --- a/misc/freebsd-release-manifests/files/MANIFESTS/amd64-amd64-11.1-RC3 +++ /dev/null @@ -1,10 +0,0 @@ -base-dbg.txz 3e055604df0ca8ff9d35fef58cfae156dbd7531f9a9080cfc1ed017304462bbe 1427 base_dbg "Base system (Debugging)" off -base.txz 61201e2a205cad593a5e75e06a2f81b0e0e181aa31fca7c163253f76a2b7e142 22492 base "Base system (MANDATORY)" on -doc.txz 6ad3aa52a51f4ed5cee684b4098bffa596c5184558754a0063feed5f45e489b9 120 doc "Additional Documentation" off -kernel-dbg.txz e280056d494ee2d5f22d6514c32b0e56c50d2555a6cd5dc642c63802d2b0dfe0 846 kernel_dbg "Kernel (Debugging)" off -kernel.txz e0774d6804d63510ba1c408bd329413d1364a4c80d8f17e837ce795d2671551e 855 kernel "Kernel (MANDATORY)" on -lib32-dbg.txz 039245dc7b403dbb47b908c81fec865c33dd245400e352062fb44d7366a53aa3 208 lib32_dbg "32-bit compatibility libraries (Debugging)" off -lib32.txz a25486d567219dbf5d39de68819d67bc850bdb8638934a6a18565552e1f15973 729 lib32 "32-bit compatibility libraries" on -ports.txz ff1543967a6ce7439093d13bceaa57f3739b849bb079d8316f89be05d10e6581 166694 ports "Ports tree" on -src.txz 8d6c2d7a8c22aacbe666f5ff2ecca0a7a62ffe25bbfd6bb2cc25330587487ac9 78427 src "System source tree" off -tests.txz b8940a28c95ee5a14c52953be8fb0af6d6a3f55582e4c3b4293ff07cb85f7f68 3886 tests "Test suite" off diff --git a/misc/freebsd-release-manifests/files/MANIFESTS/amd64-amd64-11.1-RELEASE b/misc/freebsd-release-manifests/files/MANIFESTS/amd64-amd64-11.1-RELEASE new file mode 100644 index 00000000000..7f00c6132b3 --- /dev/null +++ b/misc/freebsd-release-manifests/files/MANIFESTS/amd64-amd64-11.1-RELEASE @@ -0,0 +1,10 @@ +base-dbg.txz 5ee0f142ecd6da27cd9772f0f62715e88f75b413d24bb81a99f59330afffa8d7 1427 base_dbg "Base system (Debugging)" off +base.txz 62acaee7e7c9df66ee2c0c2d533d1da0ddf67d32833bc4b77d935ddd9fe27dab 22492 base "Base system (MANDATORY)" on +doc.txz 27371ae33db3160be50be542813c23e274f83eda5e80456e53885a3c081b4bcb 120 doc "Additional Documentation" off +kernel-dbg.txz 0d854963b3a819f976963332ae5fc2fe6fa7cc9e805df6cc881d036159c447d3 846 kernel_dbg "Kernel (Debugging)" off +kernel.txz b7adc3077cb7145c0567954ad1f13a1a3d37c564cdf7cea4c1204819b78ecb30 855 kernel "Kernel (MANDATORY)" on +lib32-dbg.txz 7e381d5a13618ab58b77d598b2ebe2276c007797165fe943fcd0be8d9eb403d5 208 lib32_dbg "32-bit compatibility libraries (Debugging)" off +lib32.txz 0665bce64a61eb6e508cddf2548609653a42f5c19a849c855e63e6dc2c1fb259 729 lib32 "32-bit compatibility libraries" on +ports.txz d49fd6a9da7052dec18df5e6bdec84e4650e3fc4564d3f7331c4917a99b27efa 166694 ports "Ports tree" on +src.txz 7e1186c2b3f6d070995b88bef5aded34089fed227c7b584c30b28cecaf428154 78427 src "System source tree" off +tests.txz 9eb35743fed494ebba315687a9b6aaf7ef5ea5a90a686f687a761ee5472956fa 3886 tests "Test suite" off diff --git a/misc/freebsd-release-manifests/files/MANIFESTS/arm64-aarch64-11.1-BETA3 b/misc/freebsd-release-manifests/files/MANIFESTS/arm64-aarch64-11.1-BETA3 deleted file mode 100644 index d0afeceba5f..00000000000 --- a/misc/freebsd-release-manifests/files/MANIFESTS/arm64-aarch64-11.1-BETA3 +++ /dev/null @@ -1,8 +0,0 @@ -base-dbg.txz e25a7f000242ba5d030d444b81ca42c54c1abe05bbe706291b35b0485312b77b 1393 base_dbg "Base system (Debugging)" off -base.txz b12d1ef2063e552650fd6fe0b570f42524485564f87d77d3603e296711756ef1 22133 base "Base system (MANDATORY)" on -doc.txz bebbb621443dca72a12f248217c4b454c1df4d85feef8065575be1590aba51d9 120 doc "Additional Documentation" off -kernel-dbg.txz e637f58a64e241f3017fac91fa5846fa0d56741df48d95deb3499eff3197483a 569 kernel_dbg "Kernel (Debugging)" off -kernel.txz a6e4c46560030d1e554f818ff82d62d2689267835e869f46ae9e62951ffe75e8 577 kernel "Kernel (MANDATORY)" on -ports.txz 0b333cd325f5c94f5eaba6ad3fedbe710f2acca06a5583011822fb22fee5328d 166533 ports "Ports tree" on -src.txz 558ec36330f610f3c39f72719b49f1dd5ead1a1a4eb9483e6bfc16ecc705dfdd 78409 src "System source tree" off -tests.txz 1f336d17ae94f3d3f953aafa16656a0a5a3762cf54543f6432ef5c0e97ccfa3b 3882 tests "Test suite" off diff --git a/misc/freebsd-release-manifests/files/MANIFESTS/arm64-aarch64-11.1-RC1 b/misc/freebsd-release-manifests/files/MANIFESTS/arm64-aarch64-11.1-RC1 deleted file mode 100644 index 086df91ce19..00000000000 --- a/misc/freebsd-release-manifests/files/MANIFESTS/arm64-aarch64-11.1-RC1 +++ /dev/null @@ -1,8 +0,0 @@ -base-dbg.txz 4bc0ae635286c5ac565f235f40a6baccfff3b5b9684cdb3b1a7c4cef5b441950 1393 base_dbg "Base system (Debugging)" off -base.txz d18484ee93e1e85636038939cf1121144b89c04715b0a6330a5c7301c51a5f76 22133 base "Base system (MANDATORY)" on -doc.txz 17a32742f2f7e291e0f0aa7f388238c3ef2ed3e7fb7c5f79f168c4c5fab526a7 120 doc "Additional Documentation" off -kernel-dbg.txz cfa2103be0438ab70fce5d8f6879f9f11c5148f5dd22bcb44023fb77af11e23c 569 kernel_dbg "Kernel (Debugging)" off -kernel.txz 1aea45f88cf645056ed75016226fd9516e8ff7be2804c01a5a2e6cf9ad5b2d22 577 kernel "Kernel (MANDATORY)" on -ports.txz 5990f28505f9217d0d4846687a1f3137679ed3e0f78001c72aef6a0596ddf8c9 166653 ports "Ports tree" on -src.txz 09c9c6340a4005ac4517fb969bc0bf67a13f66222f017c08330d7b5ffd442967 78409 src "System source tree" off -tests.txz 4e6441240065e0dc83dfa77902f80990d0bfa5d6129267128c9839e8ba6ea1be 3882 tests "Test suite" off diff --git a/misc/freebsd-release-manifests/files/MANIFESTS/arm64-aarch64-11.1-RC2 b/misc/freebsd-release-manifests/files/MANIFESTS/arm64-aarch64-11.1-RC2 deleted file mode 100644 index 4b2e1327c21..00000000000 --- a/misc/freebsd-release-manifests/files/MANIFESTS/arm64-aarch64-11.1-RC2 +++ /dev/null @@ -1,8 +0,0 @@ -base-dbg.txz 4f35f1704922f81f9aeac38c3a7a909b487ec5f6fbe7f16f511685320ff289f4 1393 base_dbg "Base system (Debugging)" off -base.txz cf45d3bea1ca37785c573d61ba071606752d00afaa379cb2a2e7727578512815 22133 base "Base system (MANDATORY)" on -doc.txz 19b12de050652ed6ae4263c815c79ee6bf7b4fe929cea331bfe854f9812e4c26 120 doc "Additional Documentation" off -kernel-dbg.txz 097f28073d3402f374b323e3a5e569912335b868c7f798b9a3a1a1d0629ed324 569 kernel_dbg "Kernel (Debugging)" off -kernel.txz 07933a2c6ab518cc3905855a0819dec9db1099662f0023cbaad6f30c3c2f272f 577 kernel "Kernel (MANDATORY)" on -ports.txz b6b598ea9f05f8f8fc9ee42407bdb2e90e415900064e6e0dc3412ec55796a6d6 166704 ports "Ports tree" on -src.txz 934e8cfd16ba745871e562fb6ae456da5ab9ef596ed335a98ed5e148540a60e1 78427 src "System source tree" off -tests.txz 62fb4892b0481cd4a33ed8bae1e2f745780af9e332c5d0efd12ad5d239b7a7f7 3882 tests "Test suite" off diff --git a/misc/freebsd-release-manifests/files/MANIFESTS/arm64-aarch64-11.1-RC3 b/misc/freebsd-release-manifests/files/MANIFESTS/arm64-aarch64-11.1-RC3 deleted file mode 100644 index 8876ddf4346..00000000000 --- a/misc/freebsd-release-manifests/files/MANIFESTS/arm64-aarch64-11.1-RC3 +++ /dev/null @@ -1,8 +0,0 @@ -base-dbg.txz 484f794b8d14d501a3c626d52fe81d8891287ca73e8598ab582b89b4c1e6cffe 1393 base_dbg "Base system (Debugging)" off -base.txz 8d0ca93b7f22cb1d53121a00c126e7feeea12c1e163f40be635c1970be6fdd4d 22134 base "Base system (MANDATORY)" on -doc.txz 43755e38aa2497e98fc9992c8f281f1ccc7c2203b0ed18b970337523b3cd10b7 120 doc "Additional Documentation" off -kernel-dbg.txz ea794a5d80acc2cfc00dee71ee65a7d5ac6120946dd459b7fc0268178a4b080e 569 kernel_dbg "Kernel (Debugging)" off -kernel.txz e131221814d73a2e569826f43e4f2a569f9639522769efac759a370acd3bf7b5 577 kernel "Kernel (MANDATORY)" on -ports.txz 3cc5582b3acaf439f8bc3542257090313e062c60ff8f4bee1c91ad94c35d862e 166694 ports "Ports tree" on -src.txz 8d6c2d7a8c22aacbe666f5ff2ecca0a7a62ffe25bbfd6bb2cc25330587487ac9 78427 src "System source tree" off -tests.txz f081e45c629798a9d7117a6b02b1937155af1bb5d8d642d7c6aa8fe9ce14f720 3882 tests "Test suite" off diff --git a/misc/freebsd-release-manifests/files/MANIFESTS/arm64-aarch64-11.1-RELEASE b/misc/freebsd-release-manifests/files/MANIFESTS/arm64-aarch64-11.1-RELEASE new file mode 100644 index 00000000000..f595fab8ff5 --- /dev/null +++ b/misc/freebsd-release-manifests/files/MANIFESTS/arm64-aarch64-11.1-RELEASE @@ -0,0 +1,8 @@ +base-dbg.txz a415af54d90e5d758849119e61b278ca52fdce00730c02ea2f26fd988e94404b 1393 base_dbg "Base system (Debugging)" off +base.txz 2e14bad571eb3bf1ebed61fa1e756ac2dcc83817c78610a19d2354d0b41ab648 22134 base "Base system (MANDATORY)" on +doc.txz 907ab9347da2e7fb5fb8977b759b7f8a6562ea865efcee6763cd280b2cf1c0f6 120 doc "Additional Documentation" off +kernel-dbg.txz fc40e966f012842eed68870bbc962cddb92489736a36b92d54c7e6126ce0b4fa 569 kernel_dbg "Kernel (Debugging)" off +kernel.txz cb45412deb6c9f2463c7b4b3669b4f3d8cf067a46cd6de4065457a9398e09c87 577 kernel "Kernel (MANDATORY)" on +ports.txz 8eb5ced1d34b9fa2aefbade1624fc8b55e4853d62425e3f15fd740fcd8ee8b5c 166694 ports "Ports tree" on +src.txz 7e1186c2b3f6d070995b88bef5aded34089fed227c7b584c30b28cecaf428154 78427 src "System source tree" off +tests.txz d95df85bb0660db2cd61e88097bb3ae2192f3458c3243cc122b57178ca119392 3882 tests "Test suite" off diff --git a/misc/freebsd-release-manifests/files/MANIFESTS/i386-i386-11.1-BETA3 b/misc/freebsd-release-manifests/files/MANIFESTS/i386-i386-11.1-BETA3 deleted file mode 100644 index a6b229b5670..00000000000 --- a/misc/freebsd-release-manifests/files/MANIFESTS/i386-i386-11.1-BETA3 +++ /dev/null @@ -1,8 +0,0 @@ -base-dbg.txz e2cb1a75fd01732d12a67b2b6110e4435ccc8aa15056ac71dae5d1b3cd48b349 1427 base_dbg "Base system (Debugging)" off -base.txz 717cd4c96148ffae673f26c7f9399b99eb96dedd9781e2931b4675ef57b3ab6a 22506 base "Base system (MANDATORY)" on -doc.txz aecb12efcae6c80a91351e356f15596308265f795ffe47217243946519ede9f2 120 doc "Additional Documentation" off -kernel-dbg.txz 9803c4279f2238cdff9ba361bde8e8ef4a525f9ade4865137c1318c965b955f7 856 kernel_dbg "Kernel (Debugging)" off -kernel.txz b10405db0ed103a020e376306691fff6766c9845df33f7c65e80b6dc453e963c 865 kernel "Kernel (MANDATORY)" on -ports.txz e8131f07f55b199c0e24a1bf0e632423fb151045dab145d7d155b6ce14bc4304 166533 ports "Ports tree" on -src.txz 558ec36330f610f3c39f72719b49f1dd5ead1a1a4eb9483e6bfc16ecc705dfdd 78409 src "System source tree" off -tests.txz 27da52fe3793161def067f84b457814cad051b6d0efbaac410d9147e807cde70 3886 tests "Test suite" off diff --git a/misc/freebsd-release-manifests/files/MANIFESTS/i386-i386-11.1-RC1 b/misc/freebsd-release-manifests/files/MANIFESTS/i386-i386-11.1-RC1 deleted file mode 100644 index e4e5cef4297..00000000000 --- a/misc/freebsd-release-manifests/files/MANIFESTS/i386-i386-11.1-RC1 +++ /dev/null @@ -1,8 +0,0 @@ -base-dbg.txz 6bc4ed058576c2ef7fb9abb9b948b301c207498a8cad14f072762cd55e71b477 1427 base_dbg "Base system (Debugging)" off -base.txz a1e00694c1985a5fe0ec18276224e5e7b98662aef67e7358c9039958117e9029 22506 base "Base system (MANDATORY)" on -doc.txz 883333d1b7bd36d1663ff2aa3676f289bfc423f3524dc02c0f4a1c4771f346e9 120 doc "Additional Documentation" off -kernel-dbg.txz 8185e0416c924b734c6d5f26b8c6240044464366d2b1bab842a6f17972cfb9e1 856 kernel_dbg "Kernel (Debugging)" off -kernel.txz 87e7eb8ad68e0369252da82d8145ffe9b7112e56476a5f4a9340e0d37aec254b 865 kernel "Kernel (MANDATORY)" on -ports.txz 5bcc1338e8b77f1ff5f4c0f7b7b97cf8401176c824bd58b78f19ae285b8539e1 166653 ports "Ports tree" on -src.txz 09c9c6340a4005ac4517fb969bc0bf67a13f66222f017c08330d7b5ffd442967 78409 src "System source tree" off -tests.txz 39316882388766fc399ff4422bab57d292abd3689ef1cd9975c94eddf7aa08bf 3886 tests "Test suite" off diff --git a/misc/freebsd-release-manifests/files/MANIFESTS/i386-i386-11.1-RC2 b/misc/freebsd-release-manifests/files/MANIFESTS/i386-i386-11.1-RC2 deleted file mode 100644 index b65cd833a34..00000000000 --- a/misc/freebsd-release-manifests/files/MANIFESTS/i386-i386-11.1-RC2 +++ /dev/null @@ -1,8 +0,0 @@ -base-dbg.txz c91d6bed0c21ffbbdc487ea101a19d99e9026cff8c4fff225dd0016197803a39 1427 base_dbg "Base system (Debugging)" off -base.txz 04e91412e72fa92e98ee877fc6f97b407ba2e60262df31864215d17c741efd04 22506 base "Base system (MANDATORY)" on -doc.txz 1a17d10a95ad41a31c0e9c20dbda6056f709875db82b151550c9d1b84601566f 120 doc "Additional Documentation" off -kernel-dbg.txz 7aad16bf69ba4d265d0d196091e5d9a076d16b3028fd6025b478fe9b98a31aa3 857 kernel_dbg "Kernel (Debugging)" off -kernel.txz cc71d89f51ed07063d14182be15afd263670d5936c2b41676b6b2b8c63f77cbf 866 kernel "Kernel (MANDATORY)" on -ports.txz 91a4a804b67ed3fd11130575236fe9e3739175bcd83f8f468453938cee318203 166704 ports "Ports tree" on -src.txz 934e8cfd16ba745871e562fb6ae456da5ab9ef596ed335a98ed5e148540a60e1 78427 src "System source tree" off -tests.txz 31eb3f7800b5f8de4d263f918eef378f42576136a43fa33954b4452ae9ce4374 3886 tests "Test suite" off diff --git a/misc/freebsd-release-manifests/files/MANIFESTS/i386-i386-11.1-RC3 b/misc/freebsd-release-manifests/files/MANIFESTS/i386-i386-11.1-RC3 deleted file mode 100644 index eec0c61835a..00000000000 --- a/misc/freebsd-release-manifests/files/MANIFESTS/i386-i386-11.1-RC3 +++ /dev/null @@ -1,8 +0,0 @@ -base-dbg.txz 47d15fa14d46213c1f704fc08ef9afe642b90d7c1bc2155690ea93ba6027f011 1427 base_dbg "Base system (Debugging)" off -base.txz 23183222d08701a9909faa921d18e1d3c16d5c4ae4e5a009f78cc778762466e4 22507 base "Base system (MANDATORY)" on -doc.txz 8ccf6d12a37a05fcf0493d328b5f8956d2e380a326de7cca90a9205ad40d3595 120 doc "Additional Documentation" off -kernel-dbg.txz e5e835ef0316538a1443c7d37b1dbe8e9ef09eb073c525d6f9251259c7dcd39f 857 kernel_dbg "Kernel (Debugging)" off -kernel.txz 7ddac46d9caf6480aeb123882d262fa0727f4e5f61bfdd00f8d9e8949eec2dcf 866 kernel "Kernel (MANDATORY)" on -ports.txz 988648e4c19ee40967f28a3001e9cad5a9afa9ef9812f4bb92c8c1b124eaa2d5 166694 ports "Ports tree" on -src.txz 8d6c2d7a8c22aacbe666f5ff2ecca0a7a62ffe25bbfd6bb2cc25330587487ac9 78427 src "System source tree" off -tests.txz 0582850bb9e915523438168994aa6cd126f908cee17b5d6a5db60d0739096909 3886 tests "Test suite" off diff --git a/misc/freebsd-release-manifests/files/MANIFESTS/i386-i386-11.1-RELEASE b/misc/freebsd-release-manifests/files/MANIFESTS/i386-i386-11.1-RELEASE new file mode 100644 index 00000000000..ceed2c8c7c9 --- /dev/null +++ b/misc/freebsd-release-manifests/files/MANIFESTS/i386-i386-11.1-RELEASE @@ -0,0 +1,8 @@ +base-dbg.txz 8a4c527dba1dceba0a5800dead6883d64cc6efa77a67531717e7caaa8f372453 1427 base_dbg "Base system (Debugging)" off +base.txz f996e2971640b685beb7b2b13dcaeddda5df31ad0c75d480c8f222cd94e9c143 22507 base "Base system (MANDATORY)" on +doc.txz f08ec936a899664a86789c657f4ee4bb4c4c5a31aef939bd1c854550ea936ab7 120 doc "Additional Documentation" off +kernel-dbg.txz d1d42a1cf6c9f39f64c8718f654e85dd9e17b492140d4b2689dd913fc6590ed3 857 kernel_dbg "Kernel (Debugging)" off +kernel.txz c0416f3784b137208a0e4ac9ea166b8c03b3b0ff479ea26025b2f4b4fc6f1f89 866 kernel "Kernel (MANDATORY)" on +ports.txz 3f953a46f82207b03c75213f0a0c5ba889664e24018c352b6d04f10f8c5f9be5 166694 ports "Ports tree" on +src.txz 7e1186c2b3f6d070995b88bef5aded34089fed227c7b584c30b28cecaf428154 78427 src "System source tree" off +tests.txz 2c3c85bc2dd2a4071ae49d52680ddbe8159a1143b1406b9af432ff5e24a080bb 3886 tests "Test suite" off diff --git a/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc-11.1-BETA3 b/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc-11.1-BETA3 deleted file mode 100644 index 7e2f04e48b7..00000000000 --- a/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc-11.1-BETA3 +++ /dev/null @@ -1,8 +0,0 @@ -base-dbg.txz 7e3445b5f59bfa4cea57e410b8c3d0cf0e237b66f987d4a287eb37052aa06e5d 1400 base_dbg "Base system (Debugging)" off -base.txz 1aa636394a64d65802be8df7a0e96a6308255e73fd0b799d0708d8aad933ba2d 22383 base "Base system (MANDATORY)" on -doc.txz ed27490578e8c76bb3fe998a0ddde21d4657f9c8cba2229eaa3f462afbf856e0 120 doc "Additional Documentation" off -kernel-dbg.txz fd514fa9b89b1cab65df1c3973499eb01efbff450a5563bbab04bd4c4f5f3650 579 kernel_dbg "Kernel (Debugging)" off -kernel.txz 21ecf7edb9e705d0e267845619518b45654998eb4aa17ade1cb4eaeafed4197f 587 kernel "Kernel (MANDATORY)" on -ports.txz 9b53385e3f6b8f82ce3af7ebc5909382f4cb94728128582ed7031523d49c9970 166533 ports "Ports tree" on -src.txz 558ec36330f610f3c39f72719b49f1dd5ead1a1a4eb9483e6bfc16ecc705dfdd 78409 src "System source tree" off -tests.txz 77a18d2d2be26dd46744dad2384329e020ce34594d65ac51ca71f113a25cf738 3882 tests "Test suite" off diff --git a/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc-11.1-RC1 b/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc-11.1-RC1 deleted file mode 100644 index 1e2815cb250..00000000000 --- a/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc-11.1-RC1 +++ /dev/null @@ -1,8 +0,0 @@ -base-dbg.txz de1e29c82435cbb54189385f29c1388243ed43c1d13c9bb639106bca78191a8a 1400 base_dbg "Base system (Debugging)" off -base.txz 02e902da0fab0538d6dd3edc1691693329fd3bcfab85096ab73499ed9ef5aae1 22383 base "Base system (MANDATORY)" on -doc.txz 96fba1f553b41bfd37784dbefb3647263ef848d7a8c240e507d81357c01949fe 120 doc "Additional Documentation" off -kernel-dbg.txz ecaaf227ef51ee62999e14015a20572d0d55d9f279b4470f0d22cf4dbd77d225 579 kernel_dbg "Kernel (Debugging)" off -kernel.txz 07e82aeba44e25c0063835420385fe1d9dedf76aa1eb18f73ceff0992505f3ff 587 kernel "Kernel (MANDATORY)" on -ports.txz d0cd2a738671e12caff497f8340f2e8c65646f37b8122ebc4c857c47b871c543 166653 ports "Ports tree" on -src.txz 09c9c6340a4005ac4517fb969bc0bf67a13f66222f017c08330d7b5ffd442967 78409 src "System source tree" off -tests.txz ca74f4343a441048afd21b0c2e190c688ff933a414b3f88f8afdf321e64ca426 3882 tests "Test suite" off diff --git a/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc-11.1-RC2 b/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc-11.1-RC2 deleted file mode 100644 index 3d433239635..00000000000 --- a/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc-11.1-RC2 +++ /dev/null @@ -1,8 +0,0 @@ -base-dbg.txz 56d928605bf9f986090ad069a71ea1c8efc7899f0842f15a55d1c02eef140a4d 1400 base_dbg "Base system (Debugging)" off -base.txz 6e6499b80f7d0dd8f67cae78e1e687c1d1c4abfbfc7e2d175f4661a9ea8fa2b5 22383 base "Base system (MANDATORY)" on -doc.txz ab0acb26f4f4085d85839a69ce21acdd6a12d70f74c5d065fe9460bfa556b888 120 doc "Additional Documentation" off -kernel-dbg.txz e4500fbd243a71b7e77b5d9e8b7e79b2348cdb0d4062f65420d5ba052eaa4a3b 579 kernel_dbg "Kernel (Debugging)" off -kernel.txz 75b5113685b6822907dc377221948e788e275fd89baff9fb79cb7b7c8c053772 587 kernel "Kernel (MANDATORY)" on -ports.txz c81516be2f95d9b3a79ff30e62154945d431115f5d8848d2d296cb07f21ed55c 166704 ports "Ports tree" on -src.txz 934e8cfd16ba745871e562fb6ae456da5ab9ef596ed335a98ed5e148540a60e1 78427 src "System source tree" off -tests.txz ee40f5ee28740604f6d0973672c62ce3060c44d4fb439fa4fa8caa892a681cf3 3882 tests "Test suite" off diff --git a/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc-11.1-RC3 b/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc-11.1-RC3 deleted file mode 100644 index b4ba29bcb97..00000000000 --- a/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc-11.1-RC3 +++ /dev/null @@ -1,8 +0,0 @@ -base-dbg.txz acac80f3f204df6d7cb800d7d67901dbc77e192b435d39e48603b73fb7f16b00 1400 base_dbg "Base system (Debugging)" off -base.txz 9a64a328606dc7dfa761404b1cbc1b43624e9c76bab5e7b259b162cc733ae955 22384 base "Base system (MANDATORY)" on -doc.txz 45702ccce7ab2a16e41733b72d7d18d2252754cb6ba481c4a8d74bcb7be20bad 120 doc "Additional Documentation" off -kernel-dbg.txz 6e453afaac34c9e9de23ee13dc5dbb3d4a9568e6326202ef6d94400d9a18486d 579 kernel_dbg "Kernel (Debugging)" off -kernel.txz 096116f53fac494432d3bcc5477a42b5d78983d35c14e75f3c778ed5a3ddffba 587 kernel "Kernel (MANDATORY)" on -ports.txz d6f6eaf46aa8b05cd1ed0f930665b8289fe1351c75f626ef9c9566c3cc9d4695 166694 ports "Ports tree" on -src.txz 8d6c2d7a8c22aacbe666f5ff2ecca0a7a62ffe25bbfd6bb2cc25330587487ac9 78427 src "System source tree" off -tests.txz 9e2f0f300bf712d2821bf896aac8198367e9bdb1d6af3808ad69b5e51d4b408c 3882 tests "Test suite" off diff --git a/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc-11.1-RELEASE b/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc-11.1-RELEASE new file mode 100644 index 00000000000..1bd65214130 --- /dev/null +++ b/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc-11.1-RELEASE @@ -0,0 +1,8 @@ +base-dbg.txz 0c727fc0455eb142f933aec62dfb22fbfbc7b44907d27881762d62b3a82c58f0 1400 base_dbg "Base system (Debugging)" off +base.txz f48b8bdcc6e2cb650c4afe60cce96e8942f3da5d39a713b0eca24c25e9c88d58 22384 base "Base system (MANDATORY)" on +doc.txz 247d12ffe7d7e7583dbf66cdad9d29a325555747ac45c9abff5478640cbaa031 120 doc "Additional Documentation" off +kernel-dbg.txz b4933e1cb0e59b8a0ab89543565081930e19c69b8e11667d2ec2385011c3e9f1 579 kernel_dbg "Kernel (Debugging)" off +kernel.txz 0b77cae4a7cbef992121e02e6f17b7fe1b91cb82c4239a1b5b1f9c4e25579f39 587 kernel "Kernel (MANDATORY)" on +ports.txz 858e8f3c5b3e6c570042b68f8039a92ed2ebbbeb9df13504c1e6b4e4297a44de 166694 ports "Ports tree" on +src.txz 7e1186c2b3f6d070995b88bef5aded34089fed227c7b584c30b28cecaf428154 78427 src "System source tree" off +tests.txz cd0d482f863cf5bc40aef4a09fa6b0d3911f9e5b3c36f568451d8eba8ea8d70d 3882 tests "Test suite" off diff --git a/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc64-11.1-BETA3 b/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc64-11.1-BETA3 deleted file mode 100644 index cc18714665d..00000000000 --- a/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc64-11.1-BETA3 +++ /dev/null @@ -1,10 +0,0 @@ -base-dbg.txz d6e3cf1de8f2d1444e1d07ac08d3119258188cf4915e962c66b046a9630fe3cc 1401 base_dbg "Base system (Debugging)" off -base.txz 9be4b5de68620e7a19f5d2281472ece4eceb66943a90d09de5af23bff6599328 22398 base "Base system (MANDATORY)" on -doc.txz 3b0813113c6922bac110ae987da25680c74767a884de362f7f4bb64f82598099 120 doc "Additional Documentation" off -kernel-dbg.txz 45b5c9785d48c8e20f502c9b87717fe9770a276ae12707a029a2de9bc5d730a4 672 kernel_dbg "Kernel (Debugging)" off -kernel.txz bf1c31eff38ccc935441980e3aef4a694ae85e88bd8c3c7a937d09b4be162a29 680 kernel "Kernel (MANDATORY)" on -lib32-dbg.txz b7789f7d1e2d3690b7b7af7220c7764bce95da00e6f01949c518f1d2fc2d869d 206 lib32_dbg "32-bit compatibility libraries (Debugging)" off -lib32.txz ebb4c8194dfa129acdd82a47f0feeb75a75a8da575a9b343543e34e00b3a5d83 722 lib32 "32-bit compatibility libraries" on -ports.txz 8c811e8eb3c3b658a6e919adbba09f09fc86d099e00d9df1ed67a15b4513cc56 166533 ports "Ports tree" on -src.txz 558ec36330f610f3c39f72719b49f1dd5ead1a1a4eb9483e6bfc16ecc705dfdd 78409 src "System source tree" off -tests.txz 7474112d079cbbff209d1eb390d4a70c109fa1860c3d0c24db9ebf083b1d3f50 3882 tests "Test suite" off diff --git a/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc64-11.1-RC1 b/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc64-11.1-RC1 deleted file mode 100644 index 485f8b4a7b4..00000000000 --- a/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc64-11.1-RC1 +++ /dev/null @@ -1,10 +0,0 @@ -base-dbg.txz 524587a31104488b8242c030e5cf49379ca16e5a8d856fee035f02632c4119f3 1401 base_dbg "Base system (Debugging)" off -base.txz 2d4632408adbe85154174376669413795fa22843e068ba1ca896a6fbb02e31c8 22398 base "Base system (MANDATORY)" on -doc.txz ff2b234159262a6dd054b1c03d8678c7d139354c88efc7827dbc6dc6d34e27ea 120 doc "Additional Documentation" off -kernel-dbg.txz 3c131c949ca7df4349225ccefcf7908c4a14d06c13a31c681d593e59916b6104 672 kernel_dbg "Kernel (Debugging)" off -kernel.txz c393dd16e378ad6dc5cb21873a78918c0c2048e19b11f7a9c4070aac210e8ac2 680 kernel "Kernel (MANDATORY)" on -lib32-dbg.txz 15c979439ef8c02bbfd00166933ce54532a75eebaf92cc9024a63aa34e072beb 206 lib32_dbg "32-bit compatibility libraries (Debugging)" off -lib32.txz 179ba0b1997f4a45eae5b82e2d3bd003ec441da7b0a87819cfc3bd5bc1c114a7 722 lib32 "32-bit compatibility libraries" on -ports.txz ac84cebae7c86e54fbd35b101799514e4a03773417eb3fe33fedef4166f74c0b 166653 ports "Ports tree" on -src.txz 09c9c6340a4005ac4517fb969bc0bf67a13f66222f017c08330d7b5ffd442967 78409 src "System source tree" off -tests.txz 0f0c8a95ab39c06921dd8f1e5627d0894310eda3bb4a54bb1f9e31064ec2c2cd 3882 tests "Test suite" off diff --git a/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc64-11.1-RC2 b/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc64-11.1-RC2 deleted file mode 100644 index 83122facdd2..00000000000 --- a/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc64-11.1-RC2 +++ /dev/null @@ -1,10 +0,0 @@ -base-dbg.txz b518435da9a72f2d8308fb7052f0afbe7101e537324391b8657e9e51e7d50874 1401 base_dbg "Base system (Debugging)" off -base.txz 0d11cdf46fa5bc586d43b2c2f738f13101856bd22964d9ef66df0edd39ea3fc1 22398 base "Base system (MANDATORY)" on -doc.txz 8860278019e4544c33293327dacf4b406f1ac7fe56a21da0e97eda073e0be518 120 doc "Additional Documentation" off -kernel-dbg.txz c587e98cfce74d09b2c018dbe8b6fe67999707785360c9a61d029912e02c164b 672 kernel_dbg "Kernel (Debugging)" off -kernel.txz a653366d99afcd046fce440235a63c6e8e5711324beeac987a2fda64fceb20ad 680 kernel "Kernel (MANDATORY)" on -lib32-dbg.txz e3f368642aad3bb5d94ea361dccf02ea3da4083ff22d9279e19a2bbfffd349d0 206 lib32_dbg "32-bit compatibility libraries (Debugging)" off -lib32.txz 76971a18845b381ff95ffeff8d3035a3bb181e099d785d452785da6c3a57ff7a 722 lib32 "32-bit compatibility libraries" on -ports.txz fedba24675530797d45ad74b9091cf10abe89c602127f7ff24fba5f3a009786b 166704 ports "Ports tree" on -src.txz 934e8cfd16ba745871e562fb6ae456da5ab9ef596ed335a98ed5e148540a60e1 78427 src "System source tree" off -tests.txz 77e38c41baa72c21abadce1906cde51560ecfacae2fc05370501245499ae49eb 3882 tests "Test suite" off diff --git a/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc64-11.1-RC3 b/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc64-11.1-RC3 deleted file mode 100644 index bb6f408fc1d..00000000000 --- a/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc64-11.1-RC3 +++ /dev/null @@ -1,10 +0,0 @@ -base-dbg.txz e9580cdccd4500a5a8335d1f63492c9884fd9ad1c34da8b23421b2ac9fa57e7b 1401 base_dbg "Base system (Debugging)" off -base.txz 1b75c92d589986a409aa1eda906d289c09276ea808cf157f24fa3a5f6ca71e67 22399 base "Base system (MANDATORY)" on -doc.txz 706d997d39e401255c373404e099e32f1cb1c92429db6233d3145085b988b6b5 120 doc "Additional Documentation" off -kernel-dbg.txz d9d83299f92f82b25aac492a62f1889b84e54b49958015790fde84295661a5c2 672 kernel_dbg "Kernel (Debugging)" off -kernel.txz 40a2b8dc4ad207bc274e919b39092cab4194d4f10e43c85ba16a817d756fd20c 680 kernel "Kernel (MANDATORY)" on -lib32-dbg.txz 0ac56e7e312b517cdedaad693c78ae29f01adffad2410731c4d8221826c3dd15 206 lib32_dbg "32-bit compatibility libraries (Debugging)" off -lib32.txz 5c3f0e0e4f37943b8c33b246b4d9caced561d9d943f604f4eea39197a3f91138 722 lib32 "32-bit compatibility libraries" on -ports.txz 6a02812f2dd78f4fbd816031a6dce99dd65003c038300be26f956fb48c9367c2 166694 ports "Ports tree" on -src.txz 8d6c2d7a8c22aacbe666f5ff2ecca0a7a62ffe25bbfd6bb2cc25330587487ac9 78427 src "System source tree" off -tests.txz afc8f66821944454741a00155864c31be1752dc4e79c0225ada4d18e79f66f93 3882 tests "Test suite" off diff --git a/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc64-11.1-RELEASE b/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc64-11.1-RELEASE new file mode 100644 index 00000000000..f7dc2c1068c --- /dev/null +++ b/misc/freebsd-release-manifests/files/MANIFESTS/powerpc-powerpc64-11.1-RELEASE @@ -0,0 +1,10 @@ +base-dbg.txz 8e68bb6943f9d8db93a7d9688e0c6574c670476b3e31c89fab690bfb189b6f83 1401 base_dbg "Base system (Debugging)" off +base.txz f0b1fd682bb356e747d15caae25f6d48b8b740de1a0b3b7fc816d0e32a81980d 22399 base "Base system (MANDATORY)" on +doc.txz 770ef24636dbd408272dd26ffec6278cc339d606f6d491552a28ee3e9e29dbe5 120 doc "Additional Documentation" off +kernel-dbg.txz 860f9fdf625651c6324f488e9a2d3e77f67c0ea49f180b49e4c7d26a276083db 672 kernel_dbg "Kernel (Debugging)" off +kernel.txz 687a0233bf99c81d8aa8a502d4afad757597958033f2e2834c0ff87d8c0de7b3 680 kernel "Kernel (MANDATORY)" on +lib32-dbg.txz 8f3e3fbc4d4b930520ba04e2ce2c5e32b69a241feb0c15c4fa4a44f68bea81fe 206 lib32_dbg "32-bit compatibility libraries (Debugging)" off +lib32.txz 83cb1992991745258eaa8d70c247f99a3d5387fe40ec6cef2750e31f502b38e8 722 lib32 "32-bit compatibility libraries" on +ports.txz d4a2f6500d41eef8b2b39e877eeb26a42823878dd3e8e9a44b0830eb3907d7e7 166694 ports "Ports tree" on +src.txz 7e1186c2b3f6d070995b88bef5aded34089fed227c7b584c30b28cecaf428154 78427 src "System source tree" off +tests.txz 71c1f2e9030055fb4b835f16eb3704a10bdb73fbbc11f361399106f71ebbb18c 3882 tests "Test suite" off diff --git a/misc/freebsd-release-manifests/files/MANIFESTS/sparc64-sparc64-11.1-BETA3 b/misc/freebsd-release-manifests/files/MANIFESTS/sparc64-sparc64-11.1-BETA3 deleted file mode 100644 index 112cdedc921..00000000000 --- a/misc/freebsd-release-manifests/files/MANIFESTS/sparc64-sparc64-11.1-BETA3 +++ /dev/null @@ -1,8 +0,0 @@ -base-dbg.txz 3ed6dadfdaf1f5fee36202dddc1d8814dacdb2525c9a0254066a8b85c906f914 1397 base_dbg "Base system (Debugging)" off -base.txz ef64e3bab2c60043aecdadcb479e190f48a4278e6197c6254d0beccd4075b4ac 22398 base "Base system (MANDATORY)" on -doc.txz d6a2fd64d574c42734cec87cbd658af8453c5e4fd643b079e53cde9af9017a4a 120 doc "Additional Documentation" off -kernel-dbg.txz e4dbb88109de574785430251afa23524fb1b506464a1cb5245b457af3290fcbc 564 kernel_dbg "Kernel (Debugging)" off -kernel.txz 7880de966d9109f149846adf7296b9d988fa07256197d30c220b2ffd815a5861 572 kernel "Kernel (MANDATORY)" on -ports.txz 7933d91a932e3f1e915c577c2df7be3b424032f126454c90cd7aabd7957016d0 166533 ports "Ports tree" on -src.txz 558ec36330f610f3c39f72719b49f1dd5ead1a1a4eb9483e6bfc16ecc705dfdd 78409 src "System source tree" off -tests.txz bef8868dfd6a9a395a7a56237b9eabd1b86c0e4ba66697cadb167248d7911ad6 3878 tests "Test suite" off diff --git a/misc/freebsd-release-manifests/files/MANIFESTS/sparc64-sparc64-11.1-RC1 b/misc/freebsd-release-manifests/files/MANIFESTS/sparc64-sparc64-11.1-RC1 deleted file mode 100644 index 60fa770e87f..00000000000 --- a/misc/freebsd-release-manifests/files/MANIFESTS/sparc64-sparc64-11.1-RC1 +++ /dev/null @@ -1,8 +0,0 @@ -base-dbg.txz 78efc29f399e4b001111787445e3796729b394184ac047d863fd029ed27c96a1 1397 base_dbg "Base system (Debugging)" off -base.txz 5e2372d6ecc22f05366139fbd2a86bbe97a4251e6c7590680778468432cb1008 22398 base "Base system (MANDATORY)" on -doc.txz 5557ef85012a40426f993f72f976a218f049bed61a35056de9f3ecc4e1a88cb9 120 doc "Additional Documentation" off -kernel-dbg.txz 9490d7d1923a37f619966a9d54acb123a9030b0a07d520854a258189251e8f4a 564 kernel_dbg "Kernel (Debugging)" off -kernel.txz 1d0550ad0bf2c876eca2653a55b6fb80b2d06a87e01795b9c517ca85fa30b773 572 kernel "Kernel (MANDATORY)" on -ports.txz cef319b4fc894c0bc14cdd4fbdc664cd67611ed44eda35e26e142f365d069d22 166653 ports "Ports tree" on -src.txz 09c9c6340a4005ac4517fb969bc0bf67a13f66222f017c08330d7b5ffd442967 78409 src "System source tree" off -tests.txz 54432d973f0892281be7f9244e5a4574f811605239452d8c450ea815a64b34f3 3878 tests "Test suite" off diff --git a/misc/freebsd-release-manifests/files/MANIFESTS/sparc64-sparc64-11.1-RC2 b/misc/freebsd-release-manifests/files/MANIFESTS/sparc64-sparc64-11.1-RC2 deleted file mode 100644 index afae8b6db1c..00000000000 --- a/misc/freebsd-release-manifests/files/MANIFESTS/sparc64-sparc64-11.1-RC2 +++ /dev/null @@ -1,8 +0,0 @@ -base-dbg.txz 64aafb889114fb7fc5fd545d03b915531c074143b33ea9758da746797246d8ab 1397 base_dbg "Base system (Debugging)" off -base.txz 50ddb5fceae3671a58dcf81994db00c21c88d548cd5468bd4172fc588a5db94d 22398 base "Base system (MANDATORY)" on -doc.txz dc50c9531b2293cd734090d91af345087c3c971dea9fe3418be920bd4f2f4bb4 120 doc "Additional Documentation" off -kernel-dbg.txz 1989ede1c9e7cad64d552f34e8820dbc11d95dd6bbde3c0857b038263ae58326 564 kernel_dbg "Kernel (Debugging)" off -kernel.txz ba0478f51c989db730b4f946714c5289395c7d9922c680f60857d2342f19f631 572 kernel "Kernel (MANDATORY)" on -ports.txz c0b67e745bae55f3d5f0fa835e56e7dc842dfe5f5cb71f8bc61cabe8a82340f6 166704 ports "Ports tree" on -src.txz 934e8cfd16ba745871e562fb6ae456da5ab9ef596ed335a98ed5e148540a60e1 78427 src "System source tree" off -tests.txz 9b88f4432e45c6cb9871f947fd36ebc7f17ff7c60273546f1dc1af34e34e494a 3878 tests "Test suite" off diff --git a/misc/freebsd-release-manifests/files/MANIFESTS/sparc64-sparc64-11.1-RC3 b/misc/freebsd-release-manifests/files/MANIFESTS/sparc64-sparc64-11.1-RC3 deleted file mode 100644 index cedf9b6b728..00000000000 --- a/misc/freebsd-release-manifests/files/MANIFESTS/sparc64-sparc64-11.1-RC3 +++ /dev/null @@ -1,8 +0,0 @@ -base-dbg.txz 727dc62f6483cf64641cbc71255876129ff8997eac2566040a79f4136e121f46 1397 base_dbg "Base system (Debugging)" off -base.txz cae6d46941cfa08d23880aee28b1f100494abce4a0376d937d662a11bdd0bb91 22399 base "Base system (MANDATORY)" on -doc.txz 70ade512b01e4297e900be050624421c855e1b72ebaeb5744d75878940f19074 120 doc "Additional Documentation" off -kernel-dbg.txz 346f7cc8f33c5959fe7d9e043727520070065dcd3807e0838fe689113ceada51 564 kernel_dbg "Kernel (Debugging)" off -kernel.txz b268a5ca8f2f3c1eceb9aefde33f276eca4288c0af25d9eb44eba6144d314db1 572 kernel "Kernel (MANDATORY)" on -ports.txz 3014ce01797619e162da5a9fe39edd53f8e575c0be8f0b202c2eca523494df91 166694 ports "Ports tree" on -src.txz 8d6c2d7a8c22aacbe666f5ff2ecca0a7a62ffe25bbfd6bb2cc25330587487ac9 78427 src "System source tree" off -tests.txz 2853db7ce6ef4aafa2316e7582579692f6bb4692b390d91a287a3a2a52afa29c 3878 tests "Test suite" off diff --git a/misc/freebsd-release-manifests/files/MANIFESTS/sparc64-sparc64-11.1-RELEASE b/misc/freebsd-release-manifests/files/MANIFESTS/sparc64-sparc64-11.1-RELEASE new file mode 100644 index 00000000000..93b70ec462c --- /dev/null +++ b/misc/freebsd-release-manifests/files/MANIFESTS/sparc64-sparc64-11.1-RELEASE @@ -0,0 +1,8 @@ +base-dbg.txz 7ff9db081e4866b090ce55990e3f175542cb89c291659ad05310bba6315c53bc 1397 base_dbg "Base system (Debugging)" off +base.txz 3d9411af6c176c37f6bc539222c7ff5de7b7e0425c0219fb9ee19ec3198ddde9 22399 base "Base system (MANDATORY)" on +doc.txz 527726e2e2e594a6febd2d0a919193b987326230b3e5211094267cbe495c800b 120 doc "Additional Documentation" off +kernel-dbg.txz 3f6bd8ba7c20cf6046684a3ccfe30def2b13098a3e6c033853934342804f9df9 564 kernel_dbg "Kernel (Debugging)" off +kernel.txz 669ef795eb8744038a410a35bac6f519f6d8fccba276c3ff14603b87927efae1 572 kernel "Kernel (MANDATORY)" on +ports.txz cd324b1d879c90fe54d71b83f322a1c0560af6297c5bea452870c5f7cc5aa11e 166694 ports "Ports tree" on +src.txz 7e1186c2b3f6d070995b88bef5aded34089fed227c7b584c30b28cecaf428154 78427 src "System source tree" off +tests.txz 65ea350d0752ffdec19f5628952305f10140d4db9cb39f297d52b1cd249cfe8f 3878 tests "Test suite" off diff --git a/misc/freebsd-release-manifests/pkg-plist b/misc/freebsd-release-manifests/pkg-plist index c8b25ce1ddb..0ef2c117f5b 100644 --- a/misc/freebsd-release-manifests/pkg-plist +++ b/misc/freebsd-release-manifests/pkg-plist @@ -50,27 +50,9 @@ %%DATADIR%%/MANIFESTS/powerpc-powerpc-11.0-RELEASE %%DATADIR%%/MANIFESTS/powerpc-powerpc64-11.0-RELEASE %%DATADIR%%/MANIFESTS/sparc64-sparc64-11.0-RELEASE -%%DATADIR%%/MANIFESTS/amd64-amd64-11.1-BETA3 -%%DATADIR%%/MANIFESTS/arm64-aarch64-11.1-BETA3 -%%DATADIR%%/MANIFESTS/i386-i386-11.1-BETA3 -%%DATADIR%%/MANIFESTS/powerpc-powerpc-11.1-BETA3 -%%DATADIR%%/MANIFESTS/powerpc-powerpc64-11.1-BETA3 -%%DATADIR%%/MANIFESTS/sparc64-sparc64-11.1-BETA3 -%%DATADIR%%/MANIFESTS/amd64-amd64-11.1-RC1 -%%DATADIR%%/MANIFESTS/arm64-aarch64-11.1-RC1 -%%DATADIR%%/MANIFESTS/i386-i386-11.1-RC1 -%%DATADIR%%/MANIFESTS/powerpc-powerpc-11.1-RC1 -%%DATADIR%%/MANIFESTS/powerpc-powerpc64-11.1-RC1 -%%DATADIR%%/MANIFESTS/sparc64-sparc64-11.1-RC1 -%%DATADIR%%/MANIFESTS/amd64-amd64-11.1-RC2 -%%DATADIR%%/MANIFESTS/arm64-aarch64-11.1-RC2 -%%DATADIR%%/MANIFESTS/i386-i386-11.1-RC2 -%%DATADIR%%/MANIFESTS/powerpc-powerpc-11.1-RC2 -%%DATADIR%%/MANIFESTS/powerpc-powerpc64-11.1-RC2 -%%DATADIR%%/MANIFESTS/sparc64-sparc64-11.1-RC2 -%%DATADIR%%/MANIFESTS/amd64-amd64-11.1-RC3 -%%DATADIR%%/MANIFESTS/arm64-aarch64-11.1-RC3 -%%DATADIR%%/MANIFESTS/i386-i386-11.1-RC3 -%%DATADIR%%/MANIFESTS/powerpc-powerpc-11.1-RC3 -%%DATADIR%%/MANIFESTS/powerpc-powerpc64-11.1-RC3 -%%DATADIR%%/MANIFESTS/sparc64-sparc64-11.1-RC3 +%%DATADIR%%/MANIFESTS/amd64-amd64-11.1-RELEASE +%%DATADIR%%/MANIFESTS/arm64-aarch64-11.1-RELEASE +%%DATADIR%%/MANIFESTS/i386-i386-11.1-RELEASE +%%DATADIR%%/MANIFESTS/powerpc-powerpc-11.1-RELEASE +%%DATADIR%%/MANIFESTS/powerpc-powerpc64-11.1-RELEASE +%%DATADIR%%/MANIFESTS/sparc64-sparc64-11.1-RELEASE diff --git a/misc/rump/files/patch-buildrump.sh b/misc/rump/files/patch-buildrump.sh index 7fdcbc32dad..43417f885f1 100644 --- a/misc/rump/files/patch-buildrump.sh +++ b/misc/rump/files/patch-buildrump.sh @@ -1,5 +1,5 @@ ---- buildrump.sh.orig 2013-12-14 17:51:57.000000000 +0800 -+++ buildrump.sh 2014-02-08 23:21:05.880728426 +0800 +--- buildrump.sh.orig 2013-12-14 09:51:57 UTC ++++ buildrump.sh @@ -893,6 +893,7 @@ evaltarget () ;; "freebsd") diff --git a/misc/rump/files/patch-src_sys_uvm_uvm__aobj.c b/misc/rump/files/patch-src_sys_uvm_uvm__aobj.c new file mode 100644 index 00000000000..cd0b413603e --- /dev/null +++ b/misc/rump/files/patch-src_sys_uvm_uvm__aobj.c @@ -0,0 +1,11 @@ +--- src/sys/uvm/uvm_aobj.c.orig 2017-07-25 14:56:13 UTC ++++ src/sys/uvm/uvm_aobj.c +@@ -883,7 +883,7 @@ uao_get(struct uvm_object *uobj, voff_t + (flags & PGO_ALLPAGES) != 0) + /* need to do a wait or I/O! */ + done = false; +- continue; ++ continue; + } + + /* diff --git a/multimedia/assimp/Makefile b/multimedia/assimp/Makefile index e04c7123f8d..601eb22acd8 100644 --- a/multimedia/assimp/Makefile +++ b/multimedia/assimp/Makefile @@ -4,6 +4,7 @@ PORTNAME= assimp PORTVERSION= 4.0.0 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= multimedia MAINTAINER= yuri@rawbw.com @@ -12,9 +13,11 @@ COMMENT= Library to import various 3D model formats in a uniform manner LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE +LIB_DEPENDS= libminizip.so:archivers/minizip + BROKEN_powerpc64= Does not build: error: ByteSwap has not been declared -USES= cmake compiler:c++11-lib pkgconfig +USES= cmake compiler:c++11-lib localbase:ldflags pkgconfig USE_GITHUB= yes USE_LDCONFIG= yes diff --git a/net-mgmt/p5-FusionInventory-Agent/Makefile b/net-mgmt/p5-FusionInventory-Agent/Makefile index 05c291101c1..705159ac176 100644 --- a/net-mgmt/p5-FusionInventory-Agent/Makefile +++ b/net-mgmt/p5-FusionInventory-Agent/Makefile @@ -2,10 +2,10 @@ # $FreeBSD$ PORTNAME= FusionInventory-Agent -PORTVERSION= 2.3.19 +PORTVERSION= 2.3.20 CATEGORIES= net-mgmt MASTER_SITES= CPAN -MASTER_SITE_SUBDIR= CPAN:GBOUGARD +MASTER_SITE_SUBDIR= CPAN:GBOUGARD/${PORTNAME}-2320targz PKGNAMEPREFIX= p5- MAINTAINER= vg@FreeBSD.org diff --git a/net-mgmt/p5-FusionInventory-Agent/distinfo b/net-mgmt/p5-FusionInventory-Agent/distinfo index aad934757ea..3a14c381ba8 100644 --- a/net-mgmt/p5-FusionInventory-Agent/distinfo +++ b/net-mgmt/p5-FusionInventory-Agent/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1496044118 -SHA256 (FusionInventory-Agent-2.3.19.tar.gz) = 7f5f4de5c9cbfef02b43ed5b60ee3117b30e25a5a839d1c375c3574e59b2a691 -SIZE (FusionInventory-Agent-2.3.19.tar.gz) = 2272239 +TIMESTAMP = 1500987610 +SHA256 (FusionInventory-Agent-2.3.20.tar.gz) = b1aa86ac367edc26e7bc760f7617eb87dd9bf7c2aa88a6d2b799e69241c71346 +SIZE (FusionInventory-Agent-2.3.20.tar.gz) = 2422386 diff --git a/net-mgmt/p5-FusionInventory-Agent/pkg-plist b/net-mgmt/p5-FusionInventory-Agent/pkg-plist index be4ffe58fa8..0becf609a9a 100644 --- a/net-mgmt/p5-FusionInventory-Agent/pkg-plist +++ b/net-mgmt/p5-FusionInventory-Agent/pkg-plist @@ -65,6 +65,9 @@ share/fusioninventory/lib/FusionInventory/Agent/Task/Deploy/CheckProcessor/FreeS share/fusioninventory/lib/FusionInventory/Agent/Task/Deploy/CheckProcessor/WinKeyEquals.pm share/fusioninventory/lib/FusionInventory/Agent/Task/Deploy/CheckProcessor/WinKeyExists.pm share/fusioninventory/lib/FusionInventory/Agent/Task/Deploy/CheckProcessor/WinKeyMissing.pm +share/fusioninventory/lib/FusionInventory/Agent/Task/Deploy/CheckProcessor/WinValueExists.pm +share/fusioninventory/lib/FusionInventory/Agent/Task/Deploy/CheckProcessor/WinValueMissing.pm +share/fusioninventory/lib/FusionInventory/Agent/Task/Deploy/CheckProcessor/WinValueType.pm share/fusioninventory/lib/FusionInventory/Agent/Task/Deploy/Datastore.pm share/fusioninventory/lib/FusionInventory/Agent/Task/Deploy/Datastore/WorkDir.pm share/fusioninventory/lib/FusionInventory/Agent/Task/Deploy/DiskFree.pm @@ -112,6 +115,9 @@ share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Dmidecode share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Dmidecode/Slots.pm share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Domains.pm share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Environment.pm +share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Firewall.pm +share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Firewall/Systemd.pm +share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Firewall/Ufw.pm share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Hostname.pm share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Ipmi.pm share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Networks.pm @@ -154,6 +160,7 @@ share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/HPUX/Storages.pm share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/HPUX/Uptime.pm share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Linux.pm share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Linux/ARM.pm +share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Linux/ARM/Board.pm share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Linux/ARM/CPU.pm share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Linux/Alpha.pm share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Linux/Alpha/CPU.pm @@ -190,6 +197,7 @@ share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/MacOS/Batteries.p share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/MacOS/Bios.pm share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/MacOS/CPU.pm share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/MacOS/Drives.pm +share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/MacOS/Firewall.pm share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/MacOS/Hostname.pm share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/MacOS/License.pm share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/MacOS/Memory.pm @@ -240,6 +248,7 @@ share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Win32/Chassis.pm share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Win32/Controllers.pm share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Win32/Drives.pm share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Win32/Environment.pm +share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Win32/Firewall.pm share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Win32/Inputs.pm share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Win32/License.pm share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Win32/Memory.pm @@ -265,11 +274,13 @@ share/fusioninventory/lib/FusionInventory/Agent/Task/WakeOnLan/Version.pm share/fusioninventory/lib/FusionInventory/Agent/Tools.pm share/fusioninventory/lib/FusionInventory/Agent/Tools/AIX.pm share/fusioninventory/lib/FusionInventory/Agent/Tools/BSD.pm +share/fusioninventory/lib/FusionInventory/Agent/Tools/Constants.pm share/fusioninventory/lib/FusionInventory/Agent/Tools/Generic.pm share/fusioninventory/lib/FusionInventory/Agent/Tools/HPUX.pm share/fusioninventory/lib/FusionInventory/Agent/Tools/Hardware.pm share/fusioninventory/lib/FusionInventory/Agent/Tools/Hardware/Apc.pm share/fusioninventory/lib/FusionInventory/Agent/Tools/Hardware/Brocade.pm +share/fusioninventory/lib/FusionInventory/Agent/Tools/Hardware/Juniper.pm share/fusioninventory/lib/FusionInventory/Agent/Tools/Hardware/Qlogic.pm share/fusioninventory/lib/FusionInventory/Agent/Tools/Hostname.pm share/fusioninventory/lib/FusionInventory/Agent/Tools/License.pm @@ -283,7 +294,9 @@ share/fusioninventory/lib/FusionInventory/Agent/Tools/Screen/Philips.pm share/fusioninventory/lib/FusionInventory/Agent/Tools/Screen/Samsung.pm share/fusioninventory/lib/FusionInventory/Agent/Tools/Solaris.pm share/fusioninventory/lib/FusionInventory/Agent/Tools/Unix.pm +share/fusioninventory/lib/FusionInventory/Agent/Tools/Virtualization.pm share/fusioninventory/lib/FusionInventory/Agent/Tools/Win32.pm +share/fusioninventory/lib/FusionInventory/Agent/Tools/Win32/Constants.pm share/fusioninventory/lib/FusionInventory/Agent/Version.pm share/fusioninventory/lib/FusionInventory/Agent/XML/Query.pm share/fusioninventory/lib/FusionInventory/Agent/XML/Query/Inventory.pm diff --git a/net/haproxy-devel/Makefile b/net/haproxy-devel/Makefile index 5fa2f606349..065a388fee5 100644 --- a/net/haproxy-devel/Makefile +++ b/net/haproxy-devel/Makefile @@ -3,6 +3,7 @@ PORTNAME= haproxy DISTVERSION= 1.8-dev2 +PORTREVISION= 1 CATEGORIES= net www MASTER_SITES= http://www.haproxy.org/download/1.8/src/devel/ PKGNAMESUFFIX= -devel diff --git a/net/p5-Net-CLI-Interact/Makefile b/net/p5-Net-CLI-Interact/Makefile index d2fad67e94a..1f285547d49 100644 --- a/net/p5-Net-CLI-Interact/Makefile +++ b/net/p5-Net-CLI-Interact/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Net-CLI-Interact -PORTVERSION= 2.200006 +PORTVERSION= 2.200009 CATEGORIES= net perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/net/p5-Net-CLI-Interact/distinfo b/net/p5-Net-CLI-Interact/distinfo index c6657c715e4..88aea43e27e 100644 --- a/net/p5-Net-CLI-Interact/distinfo +++ b/net/p5-Net-CLI-Interact/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1478370258 -SHA256 (Net-CLI-Interact-2.200006.tar.gz) = 6f34950ce7c77358be9f11d703433d9c85614af805ab3a57f0a0ec0291d5484c -SIZE (Net-CLI-Interact-2.200006.tar.gz) = 47583 +TIMESTAMP = 1500989943 +SHA256 (Net-CLI-Interact-2.200009.tar.gz) = 0fec943398912c128fde177f62d9bed861c5c256f3d55bc6d346d29cc7e6dee4 +SIZE (Net-CLI-Interact-2.200009.tar.gz) = 48071 diff --git a/net/p5-Net-CLI-Interact/pkg-plist b/net/p5-Net-CLI-Interact/pkg-plist index 6ed49e180aa..709736b5d67 100644 --- a/net/p5-Net-CLI-Interact/pkg-plist +++ b/net/p5-Net-CLI-Interact/pkg-plist @@ -16,6 +16,7 @@ %%SITE_PERL%%/Net/CLI/Interact/Transport/Platform/Unix.pm %%SITE_PERL%%/Net/CLI/Interact/Transport/Platform/Win32.pm %%SITE_PERL%%/Net/CLI/Interact/Transport/Role/ConnectCore.pm +%%SITE_PERL%%/Net/CLI/Interact/Transport/Role/StripControlChars.pm %%SITE_PERL%%/Net/CLI/Interact/Transport/SSH.pm %%SITE_PERL%%/Net/CLI/Interact/Transport/Serial.pm %%SITE_PERL%%/Net/CLI/Interact/Transport/Telnet.pm diff --git a/net/serviio/Makefile b/net/serviio/Makefile index 633b5881a60..2e6755c4818 100644 --- a/net/serviio/Makefile +++ b/net/serviio/Makefile @@ -2,9 +2,7 @@ # $FreeBSD$ PORTNAME= serviio -PORTVERSION= 1.8 -PORTREVISION= 2 -#PORTREVISION= 0 +PORTVERSION= 1.9 CATEGORIES= net multimedia java www MASTER_SITES= http://download.serviio.org/releases/ EXTRACT_SUFX= -linux.tar.gz diff --git a/net/serviio/pkg-plist b/net/serviio/pkg-plist index 4ea34a57da9..980185cfb6b 100644 --- a/net/serviio/pkg-plist +++ b/net/serviio/pkg-plist @@ -11,6 +11,7 @@ sbin/serviiod %%JAVAJARDIR%%/serviio/freemarker.jar %%JAVAJARDIR%%/serviio/groovy-all.jar %%JAVAJARDIR%%/serviio/gson.jar +%%JAVAJARDIR%%/serviio/httpclient-cache.jar %%JAVAJARDIR%%/serviio/httpclient.jar %%JAVAJARDIR%%/serviio/httpcore.jar %%JAVAJARDIR%%/serviio/icu4j.jar diff --git a/ports-mgmt/pkg_jail/Makefile b/ports-mgmt/pkg_jail/Makefile index e435f49b1b6..7041dbc982d 100644 --- a/ports-mgmt/pkg_jail/Makefile +++ b/ports-mgmt/pkg_jail/Makefile @@ -9,6 +9,9 @@ DISTFILES= # empty MAINTAINER= dinoex@FreeBSD.org COMMENT= Manage your own package jail +LICENSE= BSD3CLAUSE NONE +LICENSE_COMB= multi + NO_BUILD= yes NO_ARCH= yes diff --git a/ports-mgmt/pkg_jail/pkg-descr b/ports-mgmt/pkg_jail/pkg-descr index 3cbfac0a7da..ef1b10c1fee 100644 --- a/ports-mgmt/pkg_jail/pkg-descr +++ b/ports-mgmt/pkg_jail/pkg-descr @@ -8,4 +8,4 @@ is served to the production systems and desktops. On a system you can update installed ports with the clean build packages from the build system. -WWW: http://people.freebsd.org/~dinoex/batch/README +WWW: https://people.freebsd.org/~dinoex/batch/README diff --git a/ports-mgmt/synth/Makefile b/ports-mgmt/synth/Makefile index 17579ac52a4..e41d61e3ebf 100644 --- a/ports-mgmt/synth/Makefile +++ b/ports-mgmt/synth/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= synth -PORTVERSION= 1.69 +PORTVERSION= 1.70 DISTVERSIONPREFIX= v CATEGORIES= ports-mgmt @@ -23,6 +23,13 @@ GH_ACCOUNT= jrmarino GPR= ${LOCALBASE}/lib/gnat MAKE_ENV= NCURSES_LINK=static +OPTIONS_DEFINE= NOWATCHDOG +OPTIONS_DEFAULT=NOWATCHDOG + +NOWATCHDOG_DESC= Disable build watchdog monitor + +NOWATCHDOG_EXTRA_PATCHES= ${FILESDIR}/extrapatch-nowatchdog-portscan-buildcycle.adb + .include post-extract: diff --git a/ports-mgmt/synth/distinfo b/ports-mgmt/synth/distinfo index 3fe84e60bdf..78b82f66cb3 100644 --- a/ports-mgmt/synth/distinfo +++ b/ports-mgmt/synth/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1490956647 -SHA256 (jrmarino-synth-v1.69_GH0.tar.gz) = b1b73febbe1ae0fddd630c458e681e634f0bbd5dd5698bc21b9cbbf77d87a018 -SIZE (jrmarino-synth-v1.69_GH0.tar.gz) = 139278 +TIMESTAMP = 1500756316 +SHA256 (jrmarino-synth-v1.70_GH0.tar.gz) = b9f5c91bbac0a50a9d773293ad6b433d75462112a6b04259f035efbc577d4efb +SIZE (jrmarino-synth-v1.70_GH0.tar.gz) = 139429 diff --git a/ports-mgmt/synth/files/extrapatch-nowatchdog-portscan-buildcycle.adb b/ports-mgmt/synth/files/extrapatch-nowatchdog-portscan-buildcycle.adb new file mode 100644 index 00000000000..0ddb36de03a --- /dev/null +++ b/ports-mgmt/synth/files/extrapatch-nowatchdog-portscan-buildcycle.adb @@ -0,0 +1,11 @@ +--- src/portscan-buildcycle.adb.orig 2017-04-20 10:12:27.241713000 +1200 ++++ src/portscan-buildcycle.adb 2017-04-20 10:12:38.218162000 +1200 +@@ -570,7 +570,7 @@ + status : Unix.process_exit; + lock_lines : Natural; + quartersec : one_minute := one_minute'First; +- hangmonitor : constant Boolean := True; ++ hangmonitor : constant Boolean := False; + synthexec : constant String := host_localbase & "/libexec/synthexec"; + truecommand : constant String := synthexec & " " & + log_name (trackers (id).seq_id) & " " & command; diff --git a/science/avogadro/Makefile b/science/avogadro/Makefile index 1ef72025a51..cc978f4103d 100644 --- a/science/avogadro/Makefile +++ b/science/avogadro/Makefile @@ -7,7 +7,7 @@ PORTREVISION= 7 CATEGORIES= science MASTER_SITES= SF -MAINTAINER= ports@FreeBSD.org +MAINTAINER= kde@FreeBSD.org COMMENT= Advanced molecular editor and viewer LICENSE= GPLv2+ diff --git a/security/Makefile b/security/Makefile index 82f81b6fc67..d7b8d9d081c 100644 --- a/security/Makefile +++ b/security/Makefile @@ -95,6 +95,7 @@ SUBDIR += courieruserinfo SUBDIR += cp2fwb SUBDIR += cracklib + SUBDIR += crackpkcs12 SUBDIR += crank SUBDIR += create-cert SUBDIR += cryptlib @@ -1092,6 +1093,7 @@ SUBDIR += rubygem-sshkit SUBDIR += rubygem-timfel-krb5 SUBDIR += rubygem-twitter_oauth + SUBDIR += rubygem-webpush SUBDIR += s2n SUBDIR += safesh SUBDIR += samba-virusfilter diff --git a/security/crackpkcs12/Makefile b/security/crackpkcs12/Makefile new file mode 100644 index 00000000000..5d99ca1081f --- /dev/null +++ b/security/crackpkcs12/Makefile @@ -0,0 +1,23 @@ +# Created by: Emanuel Haupt +# $FreeBSD$ + +PORTNAME= crackpkcs12 +PORTVERSION= 0.2.10 +CATEGORIES= security +MASTER_SITES= SF/${PORTNAME}/${PORTVERSION} + +MAINTAINER= ehaupt@FreeBSD.org +COMMENT= Multithreaded program to crack PKCS#12 files + +LICENSE= GPLv3+ +LICENSE_FILE= ${WRKSRC}/COPYING + +USES= autoreconf ssl +GNU_CONFIGURE= yes + +PLIST_FILES= bin/crackpkcs12 + +post-patch: + @${REINPLACE_CMD} -e '/^PKG_CHECK_MODULES/d' ${WRKSRC}/configure.in + +.include diff --git a/security/crackpkcs12/distinfo b/security/crackpkcs12/distinfo new file mode 100644 index 00000000000..32b2e3b01c8 --- /dev/null +++ b/security/crackpkcs12/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1500995011 +SHA256 (crackpkcs12-0.2.10.tar.gz) = a62a7b8d9693082b5209752187ebe9101d7c15c79f5e53fb9cc4ec9533da966a +SIZE (crackpkcs12-0.2.10.tar.gz) = 94473 diff --git a/security/crackpkcs12/pkg-descr b/security/crackpkcs12/pkg-descr new file mode 100644 index 00000000000..7187f4adc27 --- /dev/null +++ b/security/crackpkcs12/pkg-descr @@ -0,0 +1,3 @@ +Multithreaded program to crack PKCS#12 files. + +WWW: http://crackpkcs12.sourceforge.net/ diff --git a/security/p5-POE-Filter-SSL/Makefile b/security/p5-POE-Filter-SSL/Makefile index 84255703f4b..bb04fa73616 100644 --- a/security/p5-POE-Filter-SSL/Makefile +++ b/security/p5-POE-Filter-SSL/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= POE-Filter-SSL -PORTVERSION= 0.32 +PORTVERSION= 0.33 CATEGORIES= security perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -13,9 +13,9 @@ COMMENT= Esiest and flexiblest way to SSL in POEIntegrate SSL into POE LICENSE= ART10 GPLv1 LICENSE_COMB= dual -BUILD_DEPENDS= p5-Net-SSLeay>=0:security/p5-Net-SSLeay \ - p5-POE>=0:devel/p5-POE \ - p5-libwww>=0:www/p5-libwww +BUILD_DEPENDS= p5-HTTP-Message>=0:www/p5-HTTP-Message \ + p5-Net-SSLeay>=1.65:security/p5-Net-SSLeay \ + p5-POE>=0:devel/p5-POE RUN_DEPENDS:= ${BUILD_DEPENDS} PORTSCOUT= skipv:0.291 diff --git a/security/p5-POE-Filter-SSL/distinfo b/security/p5-POE-Filter-SSL/distinfo index 5e112b84323..167e1caab39 100644 --- a/security/p5-POE-Filter-SSL/distinfo +++ b/security/p5-POE-Filter-SSL/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499595696 -SHA256 (POE-Filter-SSL-0.32.tar.gz) = 1aface7d78c8a288d03c5499f049b5eb56159d79b52c313ea71ae7f4a7277485 -SIZE (POE-Filter-SSL-0.32.tar.gz) = 59820 +TIMESTAMP = 1500990041 +SHA256 (POE-Filter-SSL-0.33.tar.gz) = ebbf11072e6978a3582570878d5699446e7021cdf891f12e3695e998e95580c6 +SIZE (POE-Filter-SSL-0.33.tar.gz) = 59954 diff --git a/security/rubygem-webpush/Makefile b/security/rubygem-webpush/Makefile new file mode 100644 index 00000000000..3843a9c550e --- /dev/null +++ b/security/rubygem-webpush/Makefile @@ -0,0 +1,18 @@ +# $FreeBSD$ + +PORTNAME= webpush +PORTVERSION= 0.3.2 +CATEGORIES= security rubygems +MASTER_SITES= RG + +MAINTAINER= jrm@FreeBSD.org +COMMENT= Encryption utilities for Web Push payload + +LICENSE= MIT + +USE_RUBY= yes +USES= gem + +NO_ARCH= yes + +.include diff --git a/security/rubygem-webpush/distinfo b/security/rubygem-webpush/distinfo new file mode 100644 index 00000000000..3580fef4077 --- /dev/null +++ b/security/rubygem-webpush/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1501013068 +SHA256 (rubygem/webpush-0.3.2.gem) = 2ed7a49583eb3cc7fb869a20e3a672e55039d7db13c28cc8fbfbbcb535233822 +SIZE (rubygem/webpush-0.3.2.gem) = 13824 diff --git a/security/rubygem-webpush/pkg-descr b/security/rubygem-webpush/pkg-descr new file mode 100644 index 00000000000..a05e63b390e --- /dev/null +++ b/security/rubygem-webpush/pkg-descr @@ -0,0 +1,6 @@ +This gem makes it possible to send push messages to web browsers from Ruby +backends using the Web Push Protocol. It supports Message Encryption for Web +Push to send messages securely from server to user agent. Payload is supported +by Chrome50+, Firefox48+. + +WWW: https://github.com/zaru/webpush diff --git a/sysutils/cdrtools/Makefile b/sysutils/cdrtools/Makefile index 3395bf79951..e88337383a7 100644 --- a/sysutils/cdrtools/Makefile +++ b/sysutils/cdrtools/Makefile @@ -20,9 +20,14 @@ PORTNAME= cdrtools PORTVERSION= 3.01 +PORTREVISION= 1 CATEGORIES= sysutils audio MASTER_SITES= SF/${PORTNAME} +PATCH_SITES= ${MASTER_SITES} +PATCHFILES= cdrtools-3.01-fix-20151126-mkisofs-isoinfo.patch +PATCH_DIST_STRIP= -p1 + MAINTAINER= marius@FreeBSD.org COMMENT= CD/DVD/BluRay and ISO-9660 image creation and extraction tools diff --git a/sysutils/cdrtools/distinfo b/sysutils/cdrtools/distinfo index c388a67869c..81162ce1265 100644 --- a/sysutils/cdrtools/distinfo +++ b/sysutils/cdrtools/distinfo @@ -1,2 +1,5 @@ +TIMESTAMP = 1501001984 SHA256 (cdrtools-3.01.tar.bz2) = ed282eb6276c4154ce6a0b5dee0bdb81940d0cbbfc7d03f769c4735ef5f5860f SIZE (cdrtools-3.01.tar.bz2) = 2087416 +SHA256 (cdrtools-3.01-fix-20151126-mkisofs-isoinfo.patch) = 4e07a2be599c0b910ab3401744cec417dbdabf30ea867ee59030a7ad1906498b +SIZE (cdrtools-3.01-fix-20151126-mkisofs-isoinfo.patch) = 14606 diff --git a/sysutils/rubygem-httplog/Makefile b/sysutils/rubygem-httplog/Makefile index 6c3a7b4a6cb..8bf071c9075 100644 --- a/sysutils/rubygem-httplog/Makefile +++ b/sysutils/rubygem-httplog/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= httplog -PORTVERSION= 0.99.6 +PORTVERSION= 0.99.7 CATEGORIES= sysutils rubygems MASTER_SITES= RG @@ -16,7 +16,7 @@ RUN_DEPENDS= rubygem-colorize>=0:devel/rubygem-colorize \ NO_ARCH= yes -USE_RUBY= yes USES= gem +USE_RUBY= yes .include diff --git a/sysutils/rubygem-httplog/distinfo b/sysutils/rubygem-httplog/distinfo index 63106ac372f..7551381e611 100644 --- a/sysutils/rubygem-httplog/distinfo +++ b/sysutils/rubygem-httplog/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499889169 -SHA256 (rubygem/httplog-0.99.6.gem) = cdfbcd90d60fa9c189af7e97eccd5f0689916dcede59554d86ebe7adca859b93 -SIZE (rubygem/httplog-0.99.6.gem) = 12800 +TIMESTAMP = 1501020226 +SHA256 (rubygem/httplog-0.99.7.gem) = 099cfb29e5d75e2c523cfb9bd5ea4af738c4a3c5deb8352a23909531eb1856ec +SIZE (rubygem/httplog-0.99.7.gem) = 12800 diff --git a/sysutils/rubygem-parallel/Makefile b/sysutils/rubygem-parallel/Makefile index 31f8ee46192..4d63a2289f8 100644 --- a/sysutils/rubygem-parallel/Makefile +++ b/sysutils/rubygem-parallel/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= parallel -PORTVERSION= 1.11.2 +PORTVERSION= 1.12.0 CATEGORIES= sysutils rubygems MASTER_SITES= RG diff --git a/sysutils/rubygem-parallel/distinfo b/sysutils/rubygem-parallel/distinfo index a982c92b504..664a18b8844 100644 --- a/sysutils/rubygem-parallel/distinfo +++ b/sysutils/rubygem-parallel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1494153123 -SHA256 (rubygem/parallel-1.11.2.gem) = fbf0f3068ccaa5e9470866227d184d2a9f056efd75d404ca26a84ea78999b0fb -SIZE (rubygem/parallel-1.11.2.gem) = 9216 +TIMESTAMP = 1500989996 +SHA256 (rubygem/parallel-1.12.0.gem) = ed5bdb34ec31ba808d341bcfc5f802c1c20260c26bf7d68d7a66e4ae89f46263 +SIZE (rubygem/parallel-1.12.0.gem) = 9728 diff --git a/sysutils/screenfetch/Makefile b/sysutils/screenfetch/Makefile index 7c86eba5ed1..530f9de308a 100644 --- a/sysutils/screenfetch/Makefile +++ b/sysutils/screenfetch/Makefile @@ -2,9 +2,8 @@ # $FreeBSD$ PORTNAME= screenFetch -PORTVERSION= 3.7.0 +PORTVERSION= 3.8.0 DISTVERSIONPREFIX= v -PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= LOCAL/jgh/sysutils/${PORTNAME:tl}/ diff --git a/sysutils/screenfetch/distinfo b/sysutils/screenfetch/distinfo index f5e2c782f6e..23c05339efe 100644 --- a/sysutils/screenfetch/distinfo +++ b/sysutils/screenfetch/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1464784545 -SHA256 (KittyKatt-screenFetch-v3.7.0_GH0.tar.gz) = 6711fe924833919d53c1dfbbb43f3777d33e20357a1b1536c4472f6a1b3c6be0 -SIZE (KittyKatt-screenFetch-v3.7.0_GH0.tar.gz) = 60223 +TIMESTAMP = 1501025556 +SHA256 (KittyKatt-screenFetch-v3.8.0_GH0.tar.gz) = 248283ee3c24b0dbffb79ed685bdd518554073090c1c167d07ad2a729db26633 +SIZE (KittyKatt-screenFetch-v3.8.0_GH0.tar.gz) = 71970 diff --git a/sysutils/screenfetch/files/patch-screenfetch-dev b/sysutils/screenfetch/files/patch-screenfetch-dev deleted file mode 100644 index da70f6bfc9e..00000000000 --- a/sysutils/screenfetch/files/patch-screenfetch-dev +++ /dev/null @@ -1,33 +0,0 @@ ---- screenfetch-dev.orig 2015-07-14 12:32:02 UTC -+++ screenfetch-dev -@@ -515,6 +515,14 @@ detectdistro () { - if [ "$distro" == "Unknown" ]; then - if [ $(uname -o 2>/dev/null) ]; then - case "$(uname -o)" in -+ "FreeBSD") -+ distro="FreeBSD" -+ fake_distro="${distro}" -+ ;; -+ "DragonFly") -+ distro="DragonFlyBSD" -+ fake_distro="${distro}" -+ ;; - "Cygwin") - distro="Cygwin" - fake_distro="${distro}" -@@ -4151,11 +4159,10 @@ for i in "${display[@]}"; do - ! [[ $Win_theme ]] && detectwmtheme; - else - if [[ "${display[*]}" =~ "$i" ]]; then -- if [[ "$errorSuppress" == "1" ]]; then detect${i} 2>/dev/null -- else -- exec 3> >(stderrOut) -- detect${i} 2>&3 -- exec 3>&- -+ if [[ "$errorSuppress" == "1" ]]; then -+ detect${i} 2>/dev/null -+ else -+ detect${i} - fi - fi - fi diff --git a/sysutils/u-boot-master/Makefile b/sysutils/u-boot-master/Makefile index e9eff699555..8b187025a66 100644 --- a/sysutils/u-boot-master/Makefile +++ b/sysutils/u-boot-master/Makefile @@ -16,22 +16,23 @@ LICENSE= GPLv2 BUILD_DEPENDS= arm-none-eabi-gcc:devel/arm-none-eabi-gcc \ gsed:textproc/gsed \ - swig3.0:devel/swig30 \ - ${LOCALBASE}/bin/dtc:sysutils/dtc + swig:devel/swig13 \ + dtc>=1.4.1:sysutils/dtc USES= gmake python:build shebangfix USE_GITHUB= yes -GH_ACCOUNT= bsdimp +GH_ACCOUNT= freebsd GH_PROJECT= u-boot -SHEBANG_FILES= tools/binman/binman.py +SHEBANG_FILES= lib/libfdt/pylibfdt/setup.py SSP_UNSAFE= yes UBOOT_DIR= share/u-boot/${PORTNAME}${PKGNAMESUFFIX} INST= ${PREFIX}/${UBOOT_DIR} DESCR?= ${.CURDIR}/pkg-descr -MAKE_ARGS+= V=1 ARCH=${UBOOT_ARCH} CROSS_COMPILE=${UBOOT_ARCH}-none-eabi- +MAKE_ARGS+= V=1 ARCH=${UBOOT_ARCH} CROSS_COMPILE=${UBOOT_ARCH}-none-eabi- \ + DTC=${LOCALBASE}/bin/dtc NO_ARCH= yes NOPIE_PORTS= yes @@ -58,7 +59,7 @@ UBOOT_PLIST_ALLWINNER=u-boot.img u-boot-sunxi-with-spl.bin .if !defined(UBOOT_VERSION) && defined(UBOOT_VERSION_${FAMILY:tu}) UBOOT_VERSION=${UBOOT_VERSION_${FAMILY:tu}} .endif -UBOOT_VERSION?= 2017.01.00.2 +UBOOT_VERSION?= 2017.07.00 .if !defined(UBOOT_PLIST) && defined(UBOOT_PLIST_${FAMILY:tu}) UBOOT_PLIST=${UBOOT_PLIST_${FAMILY:tu}} diff --git a/sysutils/u-boot-master/distinfo b/sysutils/u-boot-master/distinfo index 956c5c14f6b..7b649f0073f 100644 --- a/sysutils/u-boot-master/distinfo +++ b/sysutils/u-boot-master/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1485565103 -SHA256 (bsdimp-u-boot-ports-v2017.01.00.2_GH0.tar.gz) = aca53cc347ac4dc94481cd0ad360ff8caa45a1a8366a15d557edea1fe60acbf0 -SIZE (bsdimp-u-boot-ports-v2017.01.00.2_GH0.tar.gz) = 15520968 +TIMESTAMP = 1500849934 +SHA256 (freebsd-u-boot-ports-v2017.07.00_GH0.tar.gz) = a24b74828a69124737b870be35df8452b737ecacd3f8f87d4cf77aa92d445631 +SIZE (freebsd-u-boot-ports-v2017.07.00_GH0.tar.gz) = 14285266 diff --git a/sysutils/ufs_copy/Makefile b/sysutils/ufs_copy/Makefile index 5788feef52c..4deec78f22e 100644 --- a/sysutils/ufs_copy/Makefile +++ b/sysutils/ufs_copy/Makefile @@ -5,22 +5,24 @@ PORTNAME= ufs_copy PORTVERSION= 20060921 PORTREVISION= 2 CATEGORIES= sysutils -MASTER_SITES= http://people.freebsd.org/~simokawa/ufs/ +MASTER_SITES= https://people.freebsd.org/~simokawa/ufs/ DISTNAME= ufs-${PORTVERSION} MAINTAINER= nobutaka@FreeBSD.org COMMENT= Fast copy utility for UFS filesystem +LICENSE= BSD4CLAUSE + USES= uidfix WRKSRC= ${WRKDIR}/ufs MAKE_ARGS= BINDIR=${PREFIX}/sbin -PORTDOCS= README +PORTDOCS= README -OPTIONS_DEFINE= DOCS +OPTIONS_DEFINE= DOCS -post-install: - ${MKDIR} ${STAGEDIR}${DOCSDIR} +post-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR} .include diff --git a/sysutils/ufs_copy/files/patch-ufs_copy.c b/sysutils/ufs_copy/files/patch-ufs_copy.c index 2cec6e306ce..fe0ac7ef627 100644 --- a/sysutils/ufs_copy/files/patch-ufs_copy.c +++ b/sysutils/ufs_copy/files/patch-ufs_copy.c @@ -1,6 +1,6 @@ ---- ufs_copy.c.orig 2006-09-21 15:28:09.000000000 +0900 -+++ ufs_copy.c 2015-08-17 11:45:07.797947000 +0900 -@@ -111,9 +111,11 @@ +--- ufs_copy.c.orig 2006-09-21 06:28:09 UTC ++++ ufs_copy.c +@@ -111,9 +111,11 @@ int main(int argc, char *argv[]) { struct fstab *fs; @@ -14,7 +14,7 @@ #ifdef USEMMAP while ((ch = getopt(argc, argv, "aBb:ceMms:v")) != -1) -@@ -174,6 +176,21 @@ +@@ -174,6 +176,21 @@ main(int argc, char *argv[]) eval = system(buf); if (eval) errx(eval, "mksnap_ffs failed"); @@ -36,7 +36,7 @@ } if ((fs = getfsfile(src)) == NULL) { -@@ -188,9 +205,19 @@ +@@ -188,9 +205,19 @@ main(int argc, char *argv[]) } if (snapshot) { @@ -58,13 +58,11 @@ fprintf(stderr, "done\n"); else fprintf(stderr, "failed\n"); -@@ -262,6 +289,9 @@ +@@ -262,6 +289,7 @@ copy_ufs(const char *src_path, const cha } } bcopy(&src, &dst, sizeof(dst)); -+#if __FreeBSD_version >= 900011 + dst.d_sbcsum = NULL; -+#endif dst.d_name = dst_path; dst.d_fd = open(dst_path, O_CREAT | O_WRONLY, S_IRUSR | S_IWUSR ); if (dst.d_fd < 0) { diff --git a/sysutils/ufs_copy/pkg-descr b/sysutils/ufs_copy/pkg-descr index 7f2cf9226c1..e07910cb0e8 100644 --- a/sysutils/ufs_copy/pkg-descr +++ b/sysutils/ufs_copy/pkg-descr @@ -2,4 +2,4 @@ The ufs_copy copies a UFS filesystem image like dd(1). It doesn't copy free blocks for speed and it generates a sparse destination file for saving space. -WWW: http://people.freebsd.org/~simokawa/ufs/ +WWW: https://people.freebsd.org/~simokawa/ufs/ diff --git a/sysutils/xe/Makefile b/sysutils/xe/Makefile index 2489cf106c8..f95008be69c 100644 --- a/sysutils/xe/Makefile +++ b/sysutils/xe/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= xe -PORTVERSION= 0.7.0 +PORTVERSION= 0.9 DISTVERSIONPREFIX= v CATEGORIES= sysutils diff --git a/sysutils/xe/distinfo b/sysutils/xe/distinfo index e292e52d675..d7dc0217bf7 100644 --- a/sysutils/xe/distinfo +++ b/sysutils/xe/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1492163693 -SHA256 (chneukirchen-xe-v0.7.0_GH0.tar.gz) = 32af920a2d27ed0bb8bcb69339fcc805110888e872c92a372d3888df52b300f8 -SIZE (chneukirchen-xe-v0.7.0_GH0.tar.gz) = 7047 +TIMESTAMP = 1500981663 +SHA256 (chneukirchen-xe-v0.9_GH0.tar.gz) = 0e72bafd0d5c30953ef7a5dca710296aec621a60fb62c0aaf7ee2af5e68c2ac2 +SIZE (chneukirchen-xe-v0.9_GH0.tar.gz) = 8444 diff --git a/sysutils/xe/files/patch-tests b/sysutils/xe/files/patch-tests index e27bf41912c..f5017fb3e03 100644 --- a/sysutils/xe/files/patch-tests +++ b/sysutils/xe/files/patch-tests @@ -1,48 +1,39 @@ Fix tests -- -A% with no arguments fails now with the additional checks in 0.7.0 - Trying to exec /dev/null/calc.exe on FreeBSD will fail with ENOENT (xe exit 127) but on Linux fails with ENODIR (xe exit 126) - The argscap check returns 8186 + 8186 + 1339 = 17711 on FreeBSD, which should be fine. ---- tests.orig 2017-04-13 15:28:38 UTC +--- tests.orig 2017-07-17 14:20:26 UTC +++ tests -@@ -1,5 +1,5 @@ - #!/bin/sh --printf '1..42\n' -+printf '1..41\n' - - set -e - -@@ -127,9 +127,6 @@ check_output 'using -A%' '$XE -A% echo - - -- 3 +@@ -194,7 +194,7 @@ check_output 'using -LL' '{ echo 1; sleep 1; echo 2; s EOF --check_output 'using -A% with no arguments' '$XE -A% echo' </dev/null || echo $?' </dev/null || echo $?' </dev/null || echo $?' </dev/null || echo $?' < #include @@ -8,16 +8,16 @@ #include #include #include -@@ -99,7 +100,7 @@ mywait() +@@ -114,7 +115,7 @@ my_child: } else if (WEXITSTATUS(status) > 125) { exit(WEXITSTATUS(status)); } - } else if (WIFSIGNALED(status)) { + } else if (WIFSIGNALED(status) && !(fflag && WTERMSIG(status) == SIGPIPE)) { - fprintf(stderr, "xe: pid %d terminated by signal %d\n", - pid, WTERMSIG(status)); + fprintf(stderr, "xe: job %ld [pid %ld] terminated by signal %d\n", + children[i].iter, (long)pid, WTERMSIG(status)); exit(125); -@@ -358,6 +359,7 @@ main(int argc, char *argv[], char *envp[ +@@ -472,6 +473,7 @@ main(int argc, char *argv[], char *envp[]) pusharg("/bin/sh"); pusharg("-c"); pusharg(sflag); diff --git a/sysutils/xjobs/Makefile b/sysutils/xjobs/Makefile index aa9b56e8524..692d30acd72 100644 --- a/sysutils/xjobs/Makefile +++ b/sysutils/xjobs/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= xjobs -PORTVERSION= 20151012 +PORTVERSION= 20170630 CATEGORIES= sysutils MASTER_SITES= http://www.maier-komor.de/xjobs/ diff --git a/sysutils/xjobs/distinfo b/sysutils/xjobs/distinfo index e20c4957997..cc9c0301471 100644 --- a/sysutils/xjobs/distinfo +++ b/sysutils/xjobs/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1475008627 -SHA256 (xjobs-20151012.tgz) = a5dc255991525ed52d3b1786d5f902e55477569dc2ea3d029215f8d0ca208e1b -SIZE (xjobs-20151012.tgz) = 97398 +TIMESTAMP = 1501007315 +SHA256 (xjobs-20170630.tgz) = 01c4f8195db9eed307731640d135d424f78fbd19802b001b3495d285f205b802 +SIZE (xjobs-20170630.tgz) = 97761 diff --git a/sysutils/xjobs/files/patch-Makefile.in b/sysutils/xjobs/files/patch-Makefile.in deleted file mode 100644 index 1ca71fd6035..00000000000 --- a/sysutils/xjobs/files/patch-Makefile.in +++ /dev/null @@ -1,14 +0,0 @@ ---- ./Makefile.in.orig 2011-10-28 09:57:51.000000000 -0700 -+++ ./Makefile.in 2011-10-28 09:57:58.000000000 -0700 -@@ -40,11 +40,5 @@ - -$(RM) $(TARGET) config.h config.log \ - config.status Makefile core - --install: $(TARGET) -- -$(INSTALL) -d $(DESTDIR)$(bindir) -- $(INSTALL) $(TARGET) $(DESTDIR)$(bindir) -- -$(INSTALL) -d $(DESTDIR)$(mandir) -- $(INSTALL) xjobs.1 $(DESTDIR)$(mandir) -- - lint: - lint $(CFLAGS) $(SOURCES) diff --git a/textproc/Makefile b/textproc/Makefile index 7319d99e8ee..541ee9390c5 100644 --- a/textproc/Makefile +++ b/textproc/Makefile @@ -1451,6 +1451,7 @@ SUBDIR += rubygem-babel-source SUBDIR += rubygem-babel-transpiler SUBDIR += rubygem-babosa + SUBDIR += rubygem-case_transform SUBDIR += rubygem-charlock_holmes SUBDIR += rubygem-citrus SUBDIR += rubygem-cld3 diff --git a/textproc/rubygem-case_transform/Makefile b/textproc/rubygem-case_transform/Makefile new file mode 100644 index 00000000000..04e9f22a277 --- /dev/null +++ b/textproc/rubygem-case_transform/Makefile @@ -0,0 +1,20 @@ +# $FreeBSD$ + +PORTNAME= case_transform +PORTVERSION= 0.2 +CATEGORIES= textproc rubygems +MASTER_SITES= RG + +MAINTAINER= jrm@FreeBSD.org +COMMENT= Extraction of the key_transform abilities of ActiveModelSerializers + +LICENSE= MIT + +RUN_DEPENDS= rubygem-activesupport5>0:devel/rubygem-activesupport5 + +USES= gem +USE_RUBY= yes + +NO_ARCH= yes + +.include diff --git a/textproc/rubygem-case_transform/distinfo b/textproc/rubygem-case_transform/distinfo new file mode 100644 index 00000000000..60614aebf2b --- /dev/null +++ b/textproc/rubygem-case_transform/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1501013878 +SHA256 (rubygem/case_transform-0.2.gem) = e2ad4418dceeb227cf474cc332cd5004c95c136c04186c1cceaad8ab8de6fe3b +SIZE (rubygem/case_transform-0.2.gem) = 6144 diff --git a/textproc/rubygem-case_transform/pkg-descr b/textproc/rubygem-case_transform/pkg-descr new file mode 100644 index 00000000000..dc1b302e82a --- /dev/null +++ b/textproc/rubygem-case_transform/pkg-descr @@ -0,0 +1,5 @@ +This gem implements a simple extraction of the key_transform abilities of +ActiveModelSerializers. For example, it will transform the key to camel case, +dash, or underscore. + +WWW: https://github.com/NullVoxPopuli/case_transform diff --git a/textproc/rubygem-github-markup/Makefile b/textproc/rubygem-github-markup/Makefile index 995aa3109fe..8551f989b97 100644 --- a/textproc/rubygem-github-markup/Makefile +++ b/textproc/rubygem-github-markup/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= github-markup -PORTVERSION= 1.6.0 -PORTREVISION= 1 +PORTVERSION= 1.6.1 CATEGORIES= textproc rubygems MASTER_SITES= RG diff --git a/textproc/rubygem-github-markup/distinfo b/textproc/rubygem-github-markup/distinfo index abe17bc1371..de9633a88a5 100644 --- a/textproc/rubygem-github-markup/distinfo +++ b/textproc/rubygem-github-markup/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1491215703 -SHA256 (rubygem/github-markup-1.6.0.gem) = 29cec8ff0bafbff351a7fff4e5c48746148b9a3102519a1ae15148364f43a3bc -SIZE (rubygem/github-markup-1.6.0.gem) = 30208 +TIMESTAMP = 1500990073 +SHA256 (rubygem/github-markup-1.6.1.gem) = 38828ee5b49a2f645919d08fc4b6bdd888500117251f6b50c4e52726264bcbdb +SIZE (rubygem/github-markup-1.6.1.gem) = 30208 diff --git a/textproc/rubygem-ronn/pkg-descr b/textproc/rubygem-ronn/pkg-descr index 1654d98a681..216e0df6349 100644 --- a/textproc/rubygem-ronn/pkg-descr +++ b/textproc/rubygem-ronn/pkg-descr @@ -1,4 +1,4 @@ Ronn builds manuals. It converts simple, human readable textfiles to roff for terminal display, and also to HTML for the web. -WWW: http://rtomayko.github.com/ronn +WWW: https://rtomayko.github.io/ronn/ diff --git a/www/groupoffice/Makefile b/www/groupoffice/Makefile index 227ad3ad1f1..e07bc4b5d3f 100644 --- a/www/groupoffice/Makefile +++ b/www/groupoffice/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= groupoffice -PORTVERSION= 6.2.48 +PORTVERSION= 6.2.51 DISTVERSIONPREFIX= com- CATEGORIES= www MASTER_SITES= SF/group-office/${DISTVERSION:R} diff --git a/www/groupoffice/distinfo b/www/groupoffice/distinfo index c9bed1ee10d..e7a367e6140 100644 --- a/www/groupoffice/distinfo +++ b/www/groupoffice/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499973858 -SHA256 (groupoffice-com-6.2.48.tar.gz) = 7676ae307b3d13e619764c42318d099668838bfd22a8a0c9925772e55a52c676 -SIZE (groupoffice-com-6.2.48.tar.gz) = 33968408 +TIMESTAMP = 1500577260 +SHA256 (groupoffice-com-6.2.51.tar.gz) = 7748c66024579ec4e5fe3d9878e3d451944cb6d0a1aafe2a434c3f4e8d157670 +SIZE (groupoffice-com-6.2.51.tar.gz) = 33967616 diff --git a/www/groupoffice/pkg-plist b/www/groupoffice/pkg-plist index ab23fd411ea..7588fb8667a 100644 --- a/www/groupoffice/pkg-plist +++ b/www/groupoffice/pkg-plist @@ -3487,6 +3487,7 @@ %%WWWDIR%%/modules/phpcustomfield/CustomField.js %%WWWDIR%%/modules/phpcustomfield/PhpcustomfieldModule.php %%WWWDIR%%/modules/phpcustomfield/customfieldtype/Php.php +%%WWWDIR%%/modules/phpcustomfield/language/de.php %%WWWDIR%%/modules/phpcustomfield/language/en.php %%WWWDIR%%/modules/phpcustomfield/language/fr.php %%WWWDIR%%/modules/phpcustomfield/scripts.txt diff --git a/www/node/Makefile b/www/node/Makefile index 73e609b91bf..91a50c492a4 100644 --- a/www/node/Makefile +++ b/www/node/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= node -PORTVERSION= 8.1.4 +PORTVERSION= 8.2.1 DISTVERSIONPREFIX= v CATEGORIES= www MASTER_SITES= http://nodejs.org/dist/v${PORTVERSION}/ diff --git a/www/node/distinfo b/www/node/distinfo index 69e83535856..3c56ab2648e 100644 --- a/www/node/distinfo +++ b/www/node/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499836627 -SHA256 (node-v8.1.4.tar.gz) = 5d54960fb3c5e794b784d15e9e85e3853e1189e5ae840f314bf2fc091fbb5c12 -SIZE (node-v8.1.4.tar.gz) = 29947969 +TIMESTAMP = 1500933063 +SHA256 (node-v8.2.1.tar.gz) = 66fe1379bc7daf9a16c6b5c45ab695bf1cdcfae9738d2989e940104d6b31973f +SIZE (node-v8.2.1.tar.gz) = 30334692 diff --git a/www/p5-Plack-Middleware-XForwardedFor/Makefile b/www/p5-Plack-Middleware-XForwardedFor/Makefile index edf7150ae5e..7f1b7404ea6 100644 --- a/www/p5-Plack-Middleware-XForwardedFor/Makefile +++ b/www/p5-Plack-Middleware-XForwardedFor/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= Plack-Middleware-XForwardedFor -PORTVERSION= 0.103060 -PORTREVISION= 1 +PORTVERSION= 0.172050 CATEGORIES= www perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -13,10 +12,10 @@ COMMENT= Plack middleware to handle X-Forwarded-For headers LICENSE= ART10 GPLv1 LICENSE_COMB= dual +LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= p5-Net-Netmask>=1.9015:net-mgmt/p5-Net-Netmask \ - p5-Plack>=0.9913:www/p5-Plack \ - p5-Regexp-Common>=2010010201:textproc/p5-Regexp-Common +BUILD_DEPENDS= p5-Net-IP>=1.26:net-mgmt/p5-Net-IP \ + p5-Plack>=0.9913:www/p5-Plack RUN_DEPENDS:= ${BUILD_DEPENDS} NO_ARCH= yes diff --git a/www/p5-Plack-Middleware-XForwardedFor/distinfo b/www/p5-Plack-Middleware-XForwardedFor/distinfo index be5645a1fa2..ab343c8d17f 100644 --- a/www/p5-Plack-Middleware-XForwardedFor/distinfo +++ b/www/p5-Plack-Middleware-XForwardedFor/distinfo @@ -1,2 +1,3 @@ -SHA256 (Plack-Middleware-XForwardedFor-0.103060.tar.gz) = 6d2550b92ddceb4adf6b2214274821e82012dc7180c04c7b5a8245e6b2ce81cc -SIZE (Plack-Middleware-XForwardedFor-0.103060.tar.gz) = 10374 +TIMESTAMP = 1500989953 +SHA256 (Plack-Middleware-XForwardedFor-0.172050.tar.gz) = 4567c3b3637151c3ae5827dd7c99b1a59ed69a8e2ef8f7edcf9ad27842ed6d3a +SIZE (Plack-Middleware-XForwardedFor-0.172050.tar.gz) = 11190 diff --git a/www/webkit2-gtk3/Makefile b/www/webkit2-gtk3/Makefile index 1785824c370..80583ebd159 100644 --- a/www/webkit2-gtk3/Makefile +++ b/www/webkit2-gtk3/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= webkit -PORTVERSION= 2.16.5 +PORTVERSION= 2.16.6 CATEGORIES= www MASTER_SITES= http://webkitgtk.org/releases/ PKGNAMESUFFIX= 2-gtk3 diff --git a/www/webkit2-gtk3/distinfo b/www/webkit2-gtk3/distinfo index 9e3c8269f9e..f53e48cfdaf 100644 --- a/www/webkit2-gtk3/distinfo +++ b/www/webkit2-gtk3/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1498828211 -SHA256 (webkitgtk-2.16.5.tar.xz) = 8e0396f3428e757898c5856e642eed4fcd5a20ae03d96d3eaa03b76634be7dd4 -SIZE (webkitgtk-2.16.5.tar.xz) = 14655656 +TIMESTAMP = 1500907942 +SHA256 (webkitgtk-2.16.6.tar.xz) = fc23650df953123c59b9c0edf3855e7bd55bd107820997fc72375811e1ea4b21 +SIZE (webkitgtk-2.16.6.tar.xz) = 14658120 diff --git a/www/webkit2-gtk3/pkg-plist b/www/webkit2-gtk3/pkg-plist index 7d2d7921e61..7d9beba0753 100644 --- a/www/webkit2-gtk3/pkg-plist +++ b/www/webkit2-gtk3/pkg-plist @@ -191,10 +191,10 @@ lib/girepository-1.0/WebKit2-4.0.typelib lib/girepository-1.0/WebKit2WebExtension-4.0.typelib lib/libjavascriptcoregtk-4.0.so lib/libjavascriptcoregtk-4.0.so.18 -lib/libjavascriptcoregtk-4.0.so.18.5.12 +lib/libjavascriptcoregtk-4.0.so.18.5.13 lib/libwebkit2gtk-4.0.so lib/libwebkit2gtk-4.0.so.37 -lib/libwebkit2gtk-4.0.so.37.19.8 +lib/libwebkit2gtk-4.0.so.37.19.9 lib/webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbundle.so libdata/pkgconfig/javascriptcoregtk-4.0.pc libdata/pkgconfig/webkit2gtk-4.0.pc diff --git a/www/xpi-adblock_plus/Makefile b/www/xpi-adblock_plus/Makefile index 32781bdf980..6811ea658e5 100644 --- a/www/xpi-adblock_plus/Makefile +++ b/www/xpi-adblock_plus/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= adblock_plus -PORTVERSION= 2.8.2 +PORTVERSION= 2.9.1 DISTVERSIONSUFFIX= -an+fx+sm+tb CATEGORIES= www diff --git a/www/xpi-adblock_plus/distinfo b/www/xpi-adblock_plus/distinfo index b37da447cd4..d0151e01354 100644 --- a/www/xpi-adblock_plus/distinfo +++ b/www/xpi-adblock_plus/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1480255438 -SHA256 (xpi/adblock_plus-2.8.2-an+fx+sm+tb.xpi) = 2de5616ae0ad17fd6345c6f8f8ec5bd8a8db1bdf8d8dad9995857ad2d6454306 -SIZE (xpi/adblock_plus-2.8.2-an+fx+sm+tb.xpi) = 1055311 +TIMESTAMP = 1500962091 +SHA256 (xpi/adblock_plus-2.9.1-an+fx+sm+tb.xpi) = 199b9e3a8531bd10451c3e8e8adc4c529b29a55979e742cbe52d9f308c3d606d +SIZE (xpi/adblock_plus-2.9.1-an+fx+sm+tb.xpi) = 1059016 diff --git a/www/xpi-adblock_plus/pkg-plist b/www/xpi-adblock_plus/pkg-plist index ea2cb1e8c24..9b57db60d7d 100644 --- a/www/xpi-adblock_plus/pkg-plist +++ b/www/xpi-adblock_plus/pkg-plist @@ -1,5 +1,5 @@ %%XPI_XPIDIR%%/bootstrap.js -%%XPI_XPIDIR%%/chrome/content/cssProperties.js +%%XPI_XPIDIR%%/chrome/content/elemHideEmulation.js %%XPI_XPIDIR%%/chrome/content/objtabs.css %%XPI_XPIDIR%%/chrome/content/ui/common.js %%XPI_XPIDIR%%/chrome/content/ui/composer.js @@ -594,22 +594,22 @@ %%XPI_XPIDIR%%/lib/child/bootstrap.js %%XPI_XPIDIR%%/lib/child/contentPolicy.js %%XPI_XPIDIR%%/lib/child/contextMenu.js -%%XPI_XPIDIR%%/lib/child/cssProperties.js %%XPI_XPIDIR%%/lib/child/dataCollector.js %%XPI_XPIDIR%%/lib/child/elemHide.js +%%XPI_XPIDIR%%/lib/child/elemHideEmulation.js %%XPI_XPIDIR%%/lib/child/flasher.js %%XPI_XPIDIR%%/lib/child/main.js %%XPI_XPIDIR%%/lib/child/objectTabs.js %%XPI_XPIDIR%%/lib/child/requestNotifier.js %%XPI_XPIDIR%%/lib/child/subscribeLinks.js %%XPI_XPIDIR%%/lib/child/utils.js +%%XPI_XPIDIR%%/lib/common.js %%XPI_XPIDIR%%/lib/contentPolicy.js %%XPI_XPIDIR%%/lib/coreUtils.js -%%XPI_XPIDIR%%/lib/cssProperties.js -%%XPI_XPIDIR%%/lib/cssRules.js %%XPI_XPIDIR%%/lib/customizableUI.js %%XPI_XPIDIR%%/lib/downloader.js %%XPI_XPIDIR%%/lib/elemHide.js +%%XPI_XPIDIR%%/lib/elemHideEmulation.js %%XPI_XPIDIR%%/lib/elemHideFF.js %%XPI_XPIDIR%%/lib/events.js %%XPI_XPIDIR%%/lib/ext_background.js @@ -620,6 +620,7 @@ %%XPI_XPIDIR%%/lib/filterStorage.js %%XPI_XPIDIR%%/lib/io.js %%XPI_XPIDIR%%/lib/keySelector.js +%%XPI_XPIDIR%%/lib/legacyIO.js %%XPI_XPIDIR%%/lib/main.js %%XPI_XPIDIR%%/lib/matcher.js %%XPI_XPIDIR%%/lib/messageResponder.js @@ -635,3 +636,7 @@ %%XPI_XPIDIR%%/lib/utils.js %%XPI_XPIDIR%%/lib/whitelisting.js %%XPI_XPIDIR%%/lib/windowObserver.js +%%XPI_XPIDIR%%/webextension/.eslintrc.json +%%XPI_XPIDIR%%/webextension/background.js +%%XPI_XPIDIR%%/webextension/io.js +%%XPI_XPIDIR%%/webextension/manifest.json diff --git a/x11-wm/awesome/Makefile b/x11-wm/awesome/Makefile index 0a455bac436..d7a6a262323 100644 --- a/x11-wm/awesome/Makefile +++ b/x11-wm/awesome/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= awesome -PORTVERSION= 4.1 +PORTVERSION= 4.2 DISTVERSIONPREFIX= v PORTEPOCH= 1 CATEGORIES= x11-wm diff --git a/x11-wm/awesome/distinfo b/x11-wm/awesome/distinfo index fdc61629fa4..34ade1fc54f 100644 --- a/x11-wm/awesome/distinfo +++ b/x11-wm/awesome/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1491833539 -SHA256 (awesomewm-awesome-v4.1_GH0.tar.gz) = 4db6d8783a63d4a0b6fca2d0792bf1d0c7af3bb36bcdcf84f9d2cb25292d9820 -SIZE (awesomewm-awesome-v4.1_GH0.tar.gz) = 1097942 +TIMESTAMP = 1500291761 +SHA256 (awesomewm-awesome-v4.2_GH0.tar.gz) = 431544864d82fe3d6aa13041d215cfa4fac4a4d4543fa6f0365b2da74e7f6cf7 +SIZE (awesomewm-awesome-v4.2_GH0.tar.gz) = 1133897 diff --git a/x11-wm/awesome/pkg-plist b/x11-wm/awesome/pkg-plist index b4ddd5eb4cc..b5666f4c055 100644 --- a/x11-wm/awesome/pkg-plist +++ b/x11-wm/awesome/pkg-plist @@ -33,7 +33,10 @@ etc/xdg/awesome/rc.lua %%DATADIR%%/%%LUA_LIBDIR%%/awful/dbus.lua %%DATADIR%%/%%LUA_LIBDIR%%/awful/ewmh.lua %%DATADIR%%/%%LUA_LIBDIR%%/awful/hotkeys_popup/init.lua +%%DATADIR%%/%%LUA_LIBDIR%%/awful/hotkeys_popup/keys/firefox.lua %%DATADIR%%/%%LUA_LIBDIR%%/awful/hotkeys_popup/keys/init.lua +%%DATADIR%%/%%LUA_LIBDIR%%/awful/hotkeys_popup/keys/qutebrowser.lua +%%DATADIR%%/%%LUA_LIBDIR%%/awful/hotkeys_popup/keys/tmux.lua %%DATADIR%%/%%LUA_LIBDIR%%/awful/hotkeys_popup/keys/vim.lua %%DATADIR%%/%%LUA_LIBDIR%%/awful/hotkeys_popup/widget.lua %%DATADIR%%/%%LUA_LIBDIR%%/awful/init.lua @@ -67,6 +70,7 @@ etc/xdg/awesome/rc.lua %%DATADIR%%/%%LUA_LIBDIR%%/awful/wibar.lua %%DATADIR%%/%%LUA_LIBDIR%%/awful/wibox.lua %%DATADIR%%/%%LUA_LIBDIR%%/awful/widget/button.lua +%%DATADIR%%/%%LUA_LIBDIR%%/awful/widget/calendar_popup.lua %%DATADIR%%/%%LUA_LIBDIR%%/awful/widget/clienticon.lua %%DATADIR%%/%%LUA_LIBDIR%%/awful/widget/common.lua %%DATADIR%%/%%LUA_LIBDIR%%/awful/widget/graph.lua @@ -130,6 +134,7 @@ etc/xdg/awesome/rc.lua %%DATADIR%%/%%LUA_LIBDIR%%/wibox/layout/flex.lua %%DATADIR%%/%%LUA_LIBDIR%%/wibox/layout/grid.lua %%DATADIR%%/%%LUA_LIBDIR%%/wibox/layout/init.lua +%%DATADIR%%/%%LUA_LIBDIR%%/wibox/layout/manual.lua %%DATADIR%%/%%LUA_LIBDIR%%/wibox/layout/margin.lua %%DATADIR%%/%%LUA_LIBDIR%%/wibox/layout/mirror.lua %%DATADIR%%/%%LUA_LIBDIR%%/wibox/layout/ratio.lua @@ -138,6 +143,7 @@ etc/xdg/awesome/rc.lua %%DATADIR%%/%%LUA_LIBDIR%%/wibox/layout/stack.lua %%DATADIR%%/%%LUA_LIBDIR%%/wibox/widget/background.lua %%DATADIR%%/%%LUA_LIBDIR%%/wibox/widget/base.lua +%%DATADIR%%/%%LUA_LIBDIR%%/wibox/widget/calendar.lua %%DATADIR%%/%%LUA_LIBDIR%%/wibox/widget/checkbox.lua %%DATADIR%%/%%LUA_LIBDIR%%/wibox/widget/graph.lua %%DATADIR%%/%%LUA_LIBDIR%%/wibox/widget/imagebox.lua diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile index f12510e60eb..cbf2f203d0f 100644 --- a/x11/xlockmore/Makefile +++ b/x11/xlockmore/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= xlockmore -PORTVERSION= 5.51 -PORTREVISION= 1 +PORTVERSION= 5.54 CATEGORIES?= x11 MASTER_SITES= http://www.sillycycle.com/xlock/ \ LOCAL/jgh/x11/${PORTNAME}/ diff --git a/x11/xlockmore/distinfo b/x11/xlockmore/distinfo index 5d242863a02..f342f9e9b9c 100644 --- a/x11/xlockmore/distinfo +++ b/x11/xlockmore/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1490033477 -SHA256 (xlockmore-5.51.tar.xz) = 47118e718e5c892e52ecb21ff4ccfc65592643696768c57c388095732f42608d -SIZE (xlockmore-5.51.tar.xz) = 1633736 +TIMESTAMP = 1501006779 +SHA256 (xlockmore-5.54.tar.xz) = 9f4facb9721cc01450db0c11ffecd26a739b046e425e02628831a66080a0af55 +SIZE (xlockmore-5.54.tar.xz) = 1647652