*/*: sync with upstream

Taken from: HardenedBSD
This commit is contained in:
Franco Fichtner 2017-07-26 04:49:57 +02:00
parent 7288cd79a3
commit 96e3a232f6
255 changed files with 1987 additions and 1789 deletions

View file

@ -2,7 +2,7 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= Astro-SunTime PORTNAME= Astro-SunTime
PORTVERSION= 0.05 PORTVERSION= 0.06
CATEGORIES= astro perl5 CATEGORIES= astro perl5
MASTER_SITES= CPAN MASTER_SITES= CPAN
PKGNAMEPREFIX= p5- PKGNAMEPREFIX= p5-
@ -11,9 +11,7 @@ MAINTAINER= perl@FreeBSD.org
COMMENT= Perl interface to calculate sunrise/sunset times COMMENT= Perl interface to calculate sunrise/sunset times
LICENSE= GPLv3 LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= p5-Time-modules>=0:devel/p5-Time-modules
RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes NO_ARCH= yes
USES= perl5 USES= perl5

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1485032249 TIMESTAMP = 1500990004
SHA256 (Astro-SunTime-0.05.tar.gz) = 83f3d276849107b9f4fbef20d3d2849e3c751d751cfdfa67316470e9974543a7 SHA256 (Astro-SunTime-0.06.tar.gz) = b4a44fddfc055cc42ee67bfd8939354793da7512ea04f30578d42dc6a701112a
SIZE (Astro-SunTime-0.05.tar.gz) = 3523 SIZE (Astro-SunTime-0.06.tar.gz) = 18891

View file

@ -22,12 +22,11 @@ BROKEN_aarch64= fails to configure: checking whether C++ compiler accepts -msse
BROKEN_powerpc64= fails to build BROKEN_powerpc64= fails to build
GNU_CONFIGURE= yes 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_USES= gettext-runtime
NLS_CONFIGURE_ENABLE= nls NLS_CONFIGURE_ENABLE= nls
NLS_CONFIGURE_WITH= libintl-prefix="${LOCALBASE}" NLS_CONFIGURE_WITH= libintl-prefix="${LOCALBASE}"
OPTIONS_SUB= yes OPTIONS_SUB= yes
USE_GCC= yes
USE_WX= 3.0+ USE_WX= 3.0+
WX_COMPS= wx WX_COMPS= wx
INSTALLS_ICONS= yes 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 LAME_DESC= Use lame for import and export support
LV2_DESC= Add LV2 plug-in support LV2_DESC= Add LV2 plug-in support
MAD_DESC= Use libmad for mp2/3 decoding 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 SBSMS_DESC= Use libsbsms for pitch and tempo changing
SOUNDTOUCH_DESC= Use libSoundTouch for pitch and tempo changing SOUNDTOUCH_DESC= Use libSoundTouch for pitch and tempo changing
TAGLIB_DESC= Use TagLib for metadata support TAGLIB_DESC= Use TagLib for metadata support
@ -60,16 +58,17 @@ VST_DESC= VST plug-in support
CONFIGURE_ENV+= WX_CONFIG="${WX_CONFIG}" CONFIGURE_ENV+= WX_CONFIG="${WX_CONFIG}"
CONFIGURE_ARGS+= --enable-unicode \ CONFIGURE_ARGS+= --disable-option-checking \
--enable-unicode \
${ICONV_CONFIGURE_ARG} \ ${ICONV_CONFIGURE_ARG} \
--with-lib-preference="local" \ --with-lib-preference="local" \
--with-expat=system \ --with-expat=system \
--with-libsndfile=system \ --with-libsndfile=system \
--with-libsoxr \ --with-libsoxr \
--with-portaudio \
--with-midi \ --with-midi \
--with-widgetextra \ --with-portaudio \
--with-portmixer=yes --with-portmixer=yes \
--with-widgetextra
CONFIGURE_SHELL?= ${LOCALBASE}/bin/bash CONFIGURE_SHELL?= ${LOCALBASE}/bin/bash
@ -130,17 +129,17 @@ VAMP_CONFIGURE_WITH= libvamp=system
VAMP_LIB_DEPENDS= libvamp-hostsdk.so:audio/vamp-plugin-sdk VAMP_LIB_DEPENDS= libvamp-hostsdk.so:audio/vamp-plugin-sdk
VORBIS_CONFIGURE_WITH= libvorbis=system 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 VST_CONFIGURE_ENABLE= vst
.include <bsd.port.pre.mk>
post-install: post-install:
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
@${RM} ${STAGEDIR}${DOCSDIR}/LICENSE.txt
post-install-DOCS-on: post-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR} @${MKDIR} ${STAGEDIR}${DOCSDIR}
cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
.include <bsd.port.post.mk> .include <bsd.port.mk>

View file

@ -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 \

View file

@ -1,18 +1,24 @@
--- configure.ac.orig 2016-01-08 22:05:48 UTC --- configure.ac.orig 2016-01-08 22:05:48 UTC
+++ configure.ac +++ 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]) -dnl Enable C++ 11 support. Use gnu++11 on GCC since wxWidgets uses extensions
+AM_SILENT_RULES([yes]) -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]) dnl --------------------------------------------------------------------------
AM_GNU_GETTEXT([external]) dnl We would like warnings enabled on the builds, but different compilers need
@@ -690,6 +691,7 @@ AC_CONFIG_FILES([
Makefile
help/Makefile
images/Makefile
+ include/Makefile
lib-src/Makefile
po/Makefile.in
src/audacity.desktop

View file

@ -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

View file

@ -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<type>(v) } {}
// Beware implicit conversions from floating point values!
// Otherwise the meaning of binary operators with sampleCount change

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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;

View file

@ -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

View file

@ -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])

View file

@ -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.

View file

@ -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"

View file

@ -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

View file

@ -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 <wx/intl.h>
#include <wx/log.h>
-#include "portaudio.h"
+#include "../../lib-src/portaudio-v19/include/portaudio.h"
#include "../AudioIO.h"
#include "../Internat.h"

View file

@ -1,17 +1,16 @@
bin/audacity 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 man/man1/audacity.1.gz
share/appdata/audacity.appdata.xml share/appdata/audacity.appdata.xml
share/applications/audacity.desktop share/applications/audacity.desktop
%%DATADIR%%/EQDefaultCurves.xml %%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/dspprims.lsp
%%DATADIR%%/nyquist/envelopes.lsp %%DATADIR%%/nyquist/envelopes.lsp
%%DATADIR%%/nyquist/equalizer.lsp %%DATADIR%%/nyquist/equalizer.lsp
@ -80,7 +79,6 @@ share/applications/audacity.desktop
%%DATADIR%%/plug-ins/vocalrediso.ny %%DATADIR%%/plug-ins/vocalrediso.ny
%%DATADIR%%/plug-ins/vocalremover.ny %%DATADIR%%/plug-ins/vocalremover.ny
%%DATADIR%%/plug-ins/vocoder.ny %%DATADIR%%/plug-ins/vocoder.ny
%%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt
share/icons/hicolor/16x16/apps/audacity.png share/icons/hicolor/16x16/apps/audacity.png
share/icons/hicolor/22x22/apps/audacity.png share/icons/hicolor/22x22/apps/audacity.png
share/icons/hicolor/24x24/apps/audacity.png share/icons/hicolor/24x24/apps/audacity.png

View file

@ -1,7 +1,7 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= dsbmixer PORTNAME= dsbmixer
PORTVERSION= 1.0 PORTVERSION= 1.1
CATEGORIES= audio CATEGORIES= audio
MASTER_SITES= http://freeshell.de/~mk/download/ MASTER_SITES= http://freeshell.de/~mk/download/

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1498603599 TIMESTAMP = 1500951608
SHA256 (dsbmixer-1.0.tgz) = 31e794b0f942e469ddaf62d32b2aa5a4be661d706a4a6d5234eba356bf7f9385 SHA256 (dsbmixer-1.1.tgz) = 57fef13d72a542fea97a445d69560934a7e708e213b9f336f8fbb0b50374a6ec
SIZE (dsbmixer-1.0.tgz) = 26396 SIZE (dsbmixer-1.1.tgz) = 27446

View file

@ -2,23 +2,29 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= libmpdclient PORTNAME= libmpdclient
PORTVERSION= 2.11 PORTVERSION= 2.13
CATEGORIES= audio CATEGORIES= audio
MASTER_SITES= http://www.musicpd.org/download/libmpdclient/2/ MASTER_SITES= http://www.musicpd.org/download/libmpdclient/2/
MAINTAINER= gblach@FreeBSD.org MAINTAINER= gblach@FreeBSD.org
COMMENT= API library for interfacing MPD COMMENT= API library for interfacing MPD
GNU_CONFIGURE= yes LICENSE= BSD3CLAUSE
USES= tar:xz gmake libtool pathfix LICENSE_FILE= ${WRKSRC}/COPYING
USES= tar:xz meson
USE_LDCONFIG= yes USE_LDCONFIG= yes
INSTALL_TARGET= install-strip
OPTIONS_DEFINE= DOCS DOXYGEN OPTIONS_DEFINE= DOCS DOXYGEN
OPTIONS_SUB= yes OPTIONS_SUB= yes
DOXYGEN_IMPLIES= DOCS DOXYGEN_IMPLIES= DOCS
DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen
DOXYGEN_CONFIGURE_OFF= --disable-documentation
.include <bsd.port.mk> .include <bsd.port.pre.mk>
.if ${PORT_OPTIONS:MDOXYGEN}
MESON_ARGS+= -Ddocumentation=true
.endif
.include <bsd.port.post.mk>

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1491344728 TIMESTAMP = 1500972327
SHA256 (libmpdclient-2.11.tar.xz) = 15fe693893c0d7ea3f4c35c4016fbd0332836164178b20983eec9b470846baf6 SHA256 (libmpdclient-2.13.tar.xz) = 5115bd52bc20a707c1ecc7587e6389c17305348e2132a66cf767c62fc55ed45d
SIZE (libmpdclient-2.11.tar.xz) = 274836 SIZE (libmpdclient-2.13.tar.xz) = 56964

View file

@ -32,15 +32,15 @@ include/mpd/status.h
include/mpd/sticker.h include/mpd/sticker.h
include/mpd/tag.h include/mpd/tag.h
include/mpd/version.h include/mpd/version.h
lib/libmpdclient.a
lib/libmpdclient.so lib/libmpdclient.so
lib/libmpdclient.so.2 lib/libmpdclient.so.2
lib/libmpdclient.so.2.0.11 lib/libmpdclient.so.2.13
libdata/pkgconfig/libmpdclient.pc libdata/pkgconfig/libmpdclient.pc
share/vala/vapi/libmpdclient.vapi share/vala/vapi/libmpdclient.vapi
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
%%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/COPYING
%%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/NEWS
%%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/README.rst
%%PORTDOCS%%%%DOXYGEN%%%%DOCSDIR%%/html/annotated.html %%PORTDOCS%%%%DOXYGEN%%%%DOCSDIR%%/html/annotated.html
%%PORTDOCS%%%%DOXYGEN%%%%DOCSDIR%%/html/async_8h.html %%PORTDOCS%%%%DOXYGEN%%%%DOCSDIR%%/html/async_8h.html
%%PORTDOCS%%%%DOXYGEN%%%%DOCSDIR%%/html/async_8h_source.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_enum.html
%%PORTDOCS%%%%DOXYGEN%%%%DOCSDIR%%/html/globals_eval.html %%PORTDOCS%%%%DOXYGEN%%%%DOCSDIR%%/html/globals_eval.html
%%PORTDOCS%%%%DOXYGEN%%%%DOCSDIR%%/html/globals_func.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.html
%%PORTDOCS%%%%DOXYGEN%%%%DOCSDIR%%/html/idle_8h_source.html %%PORTDOCS%%%%DOXYGEN%%%%DOCSDIR%%/html/idle_8h_source.html
%%PORTDOCS%%%%DOXYGEN%%%%DOCSDIR%%/html/index.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/tabs.css
%%PORTDOCS%%%%DOXYGEN%%%%DOCSDIR%%/html/tag_8h.html %%PORTDOCS%%%%DOXYGEN%%%%DOCSDIR%%/html/tag_8h.html
%%PORTDOCS%%%%DOXYGEN%%%%DOCSDIR%%/html/tag_8h_source.html %%PORTDOCS%%%%DOXYGEN%%%%DOCSDIR%%/html/tag_8h_source.html
%%PORTDOCS%%%%DOXYGEN%%%%DOCSDIR%%/html/version_8h.html %%PORTDOCS%%%%DOXYGEN%%%%DOCSDIR%%/html/socket_8h.html
%%PORTDOCS%%%%DOXYGEN%%%%DOCSDIR%%/html/version_8h_source.html %%PORTDOCS%%%%DOXYGEN%%%%DOCSDIR%%/html/socket_8h_source.html

View file

@ -1,8 +1,7 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= logitechmediaserver PORTNAME= logitechmediaserver
PORTVERSION= 7.9.0.g2016.09.30 PORTVERSION= 7.9.1.g2017.07.11
PORTREVISION= 2
CATEGORIES= audio CATEGORIES= audio
MAINTAINER= mark@tranquillussoftware.co.uk MAINTAINER= mark@tranquillussoftware.co.uk
@ -13,21 +12,18 @@ LICENSE_NAME= Slim Devices License
LICENSE_FILE= ${WRKSRC}/License.txt LICENSE_FILE= ${WRKSRC}/License.txt
LICENSE_PERMS= no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell LICENSE_PERMS= no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell
ONLY_FOR_ARCHS= amd64 i386
BUILD_DEPENDS= nasm:devel/nasm \ BUILD_DEPENDS= nasm:devel/nasm \
bash:shells/bash \ bash:shells/bash \
rsync:net/rsync rsync:net/rsync
LIB_DEPENDS= libgd.so:graphics/gd 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 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 \ SHEBANG_FILES= Bin/darwin/check-update.pl \
Bin/dbish \ Bin/dbish \
CPAN/Log/Log4perl/Layout/PatternLayout/Multiline.pm \ 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 OPTIONS_DEFAULT=APE FAAD FLAX SOX TEST
SHORTEN_DESC= Support Shorten input SHORTEN_DESC= Support Shorten input
SOX_DESC= Support OGG Vorbis input via SoX (SliMP3 and SB1) SOX_DESC= Support OGG Vorbis input via SoX (SliMP3 and SB1)
APE_RUN_DEPENDS= mac:audio/mac APE_RUN_DEPENDS= mac:audio/mac
FAAD_RUN_DEPENDS= faad:audio/faad FAAD_RUN_DEPENDS= faad:audio/faad
FLAC_RUN_DEPENDS= flac:audio/flac FLAC_RUN_DEPENDS= flac:audio/flac
@ -56,7 +51,11 @@ SHORTEN_RUN_DEPENDS= shorten:audio/shorten
SOX_RUN_DEPENDS= sox:audio/sox SOX_RUN_DEPENDS= sox:audio/sox
TEST_VARS_OFF= CONTRIB_FLAGS=-t 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 DOCFILES= Changelog*.html Installation.txt License*.txt
CONFFILES= convert.conf types.conf CONFFILES= convert.conf types.conf
@ -85,8 +84,6 @@ SLIMGROUP?= ${SLIMUSER}
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
ONLY_FOR_ARCHS= i386 amd64
.if ${ARCH} == "i386" .if ${ARCH} == "i386"
ARCHNAME= i386-freebsd-thread-multi-64int ARCHNAME= i386-freebsd-thread-multi-64int
PLIST_SUB+= I386_ONLY="" PLIST_SUB+= I386_ONLY=""
@ -103,7 +100,6 @@ PLIST_SUB+= AMD64_ONLY="@comment "
do-build: do-build:
cd ${WRKSRC_vendor}/CPAN && ./buildme.sh ${CONTRIB_FLAGS} cd ${WRKSRC_vendor}/CPAN && ./buildme.sh ${CONTRIB_FLAGS}
cd ${WRKSRC}/CPAN/arch && ${CP} -R 5.22 5.24
do-install: do-install:
(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${SLIMDIR}) (cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${SLIMDIR})
@ -113,7 +109,7 @@ do-install:
${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${SLIMDIR}/CPAN/arch/${PERL_VER}/) ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${SLIMDIR}/CPAN/arch/${PERL_VER}/)
(cd ${STAGEDIR}${PREFIX}/${SLIMDIR} && \ (cd ${STAGEDIR}${PREFIX}/${SLIMDIR} && \
${FIND} . -name \*.orig -delete -o -name \*.bak -delete -o -name \*.packlist -delete && \ ${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} -r -- Bin/* && \
${RM} -- ${CONFFILES} ${DOCFILES}) ${RM} -- ${CONFFILES} ${DOCFILES})
(cd ${STAGEDIR}${PREFIX}/${SLIMDIR}/CPAN/arch/${PERL_VER} && \ (cd ${STAGEDIR}${PREFIX}/${SLIMDIR}/CPAN/arch/${PERL_VER} && \

View file

@ -1,5 +1,5 @@
TIMESTAMP = 1475588350 TIMESTAMP = 1499890365
SHA256 (Logitech-slimserver-7.9.0.g2016.09.30-c835a1f_GH0.tar.gz) = 01f392f7a6f2c86926e6f86fa99b78d00fe47b8c90893f2c3b5fcc03f1144035 SHA256 (Logitech-slimserver-7.9.1.g2017.07.11-762b5cb_GH0.tar.gz) = 7172ce75baf9f66d691e15974d38adc7ec62430e49355c12fc0d36a133f6c3e0
SIZE (Logitech-slimserver-7.9.0.g2016.09.30-c835a1f_GH0.tar.gz) = 187923230 SIZE (Logitech-slimserver-7.9.1.g2017.07.11-762b5cb_GH0.tar.gz) = 204891529
SHA256 (Logitech-slimserver-vendor-14cc392_GH0.tar.gz) = 4256458c6c77c06eb2616b1afed851f422f5bf26f2a0c2631339ed3b14d3e385 SHA256 (Logitech-slimserver-vendor-1463b00_GH0.tar.gz) = 101524a0472c5976ca8696e34013efcc18ed4943b9c6838136e24c9f28a9bce6
SIZE (Logitech-slimserver-vendor-14cc392_GH0.tar.gz) = 115661507 SIZE (Logitech-slimserver-vendor-1463b00_GH0.tar.gz) = 115661641

View file

@ -1,5 +1,5 @@
--- ../slimserver-vendor-14cc392/CPAN/buildme.sh.orig 2016-08-12 21:27:39.000000000 +0800 --- ../slimserver-vendor-1463b00/CPAN/buildme.sh.orig 2017-06-07 14:29:20.000000000 +0100
+++ ../slimserver-vendor-14cc392/CPAN/buildme.sh 2016-11-13 13:08:08.765866000 +0800 +++ ../slimserver-vendor-1463b00/CPAN/buildme.sh 2017-07-12 21:44:11.808290000 +0100
@@ -92,7 +92,7 @@ @@ -92,7 +92,7 @@
exit exit
fi fi
@ -9,64 +9,27 @@
which $i > /dev/null which $i > /dev/null
if [ $? -ne 0 ] ; then if [ $? -ne 0 ] ; then
echo "$i not found - please install it" echo "$i not found - please install it"
@@ -309,6 +309,19 @@ @@ -556,6 +556,19 @@
PERL_ARCH=$BUILD/arch/5.22 # because it takes so damn long on slow platforms
fi if [ ! -f build/lib/libicudata_s.a ]; then
tar_wrapper zxvf icu4c-4_6-src.tgz
+# Path to Perl 5.24 + patch << END
+if [ -x "/usr/bin/perl5.24.1" ]; then +--- icu/source/i18n/uspoof.cpp.orig 2017-07-12 21:35:34.014645000 +0100
+ PERL_524=/usr/bin/perl5.24.1 ++++ icu/source/i18n/uspoof.cpp 2017-07-12 21:33:44.790884000 +0100
+fi +@@ -366,7 +366,7 @@
+ + // u_strToUTF8() in preflight mode is an easy way to do it.
+if [ $PERL_524 ]; then + U_ASSERT(position16 <= len16);
+ echo "Building with Perl 5.24 at $PERL_524" + u_strToUTF8(NULL, 0, position, text16, position16, status);
+ PERL_BIN=$PERL_524 +- if (position > 0) {
+ # Install dir for 5.24 ++ if (position != NULL && *position > 0) {
+ PERL_BASE=$BUILD/5.24 + // position is the required buffer length from u_strToUTF8, which includes
+ PERL_ARCH=$BUILD/arch/5.24 + // space for a terminating NULL, which we don't want, hence the -1.
+fi + *position -= 1;
+ +END
# try to use default perl version cd icu/source
if [ "$PERL_BIN" = "" ]; then if [ "$OS" = 'Darwin' ]; then
PERL_BIN=`which perl` ICUFLAGS="$FLAGS $OSX_ARCH $OSX_FLAGS -DU_USING_ICU_NAMESPACE=0 -DU_CHARSET_IS_UTF8=1" # faster code for native UTF-8 systems
@@ -339,6 +352,9 @@ @@ -568,7 +581,7 @@
"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 @@
ICUOS="FreeBSD" ICUOS="FreeBSD"
fi fi
CFLAGS="$ICUFLAGS" CXXFLAGS="$ICUFLAGS" LDFLAGS="$FLAGS $OSX_ARCH $OSX_FLAGS" \ CFLAGS="$ICUFLAGS" CXXFLAGS="$ICUFLAGS" LDFLAGS="$FLAGS $OSX_ARCH $OSX_FLAGS" \
@ -75,34 +38,7 @@
$MAKE $MAKE
if [ $? != 0 ]; then if [ $? != 0 ]; then
echo "make failed" echo "make failed"
@@ -616,7 +632,7 @@ @@ -1239,6 +1252,9 @@
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 @@
if [ "$ARCH" = "amd64-freebsd" -o "$ARCH" = "amd64-freebsd-thread-multi" ]; then if [ "$ARCH" = "amd64-freebsd" -o "$ARCH" = "amd64-freebsd-thread-multi" ]; then
FFOPTS="$FFOPTS --arch=x86" FFOPTS="$FFOPTS --arch=x86"
fi fi
@ -112,12 +48,3 @@
if [ "$OS" = "Darwin" ]; then if [ "$OS" = "Darwin" ]; then
SAVED_FLAGS=$FLAGS 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

View file

@ -340,6 +340,8 @@ etc/newsyslog.conf.d/logitechmediaserver.conf
%%SLIMDIR%%/CPAN/Net/HTTP/Methods.pm %%SLIMDIR%%/CPAN/Net/HTTP/Methods.pm
%%SLIMDIR%%/CPAN/Net/HTTP/NB.pm %%SLIMDIR%%/CPAN/Net/HTTP/NB.pm
%%SLIMDIR%%/CPAN/Net/HTTPS.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.pm
%%SLIMDIR%%/CPAN/Net/UPnP/AV/Container.pm %%SLIMDIR%%/CPAN/Net/UPnP/AV/Container.pm
%%SLIMDIR%%/CPAN/Net/UPnP/AV/Content.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/HTTPResponse.pm
%%SLIMDIR%%/CPAN/Net/UPnP/QueryResponse.pm %%SLIMDIR%%/CPAN/Net/UPnP/QueryResponse.pm
%%SLIMDIR%%/CPAN/Net/UPnP/Service.pm %%SLIMDIR%%/CPAN/Net/UPnP/Service.pm
%%SLIMDIR%%/CPAN/Network/IPv4Addr.pm
%%SLIMDIR%%/CPAN/PAR.pm %%SLIMDIR%%/CPAN/PAR.pm
%%SLIMDIR%%/CPAN/PAR/Dist.pm %%SLIMDIR%%/CPAN/PAR/Dist.pm
%%SLIMDIR%%/CPAN/PAR/Heavy.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/dec_osf.pm
%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/ExtUtils/CBuilder/Platform/os2.pm %%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/ExtUtils/CBuilder/Platform/os2.pm
%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/HTML/Tagset.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.pm
%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/JSON/XS/Boolean.pm %%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/JSON/XS/Boolean.pm
%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/Module/Build.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/ProtocolHandlers.pm
%%SLIMDIR%%/Slim/Player/Protocols/File.pm %%SLIMDIR%%/Slim/Player/Protocols/File.pm
%%SLIMDIR%%/Slim/Player/Protocols/HTTP.pm %%SLIMDIR%%/Slim/Player/Protocols/HTTP.pm
%%SLIMDIR%%/Slim/Player/Protocols/HTTPS.pm
%%SLIMDIR%%/Slim/Player/Protocols/LocalFile.pm %%SLIMDIR%%/Slim/Player/Protocols/LocalFile.pm
%%SLIMDIR%%/Slim/Player/Protocols/MMS.pm %%SLIMDIR%%/Slim/Player/Protocols/MMS.pm
%%SLIMDIR%%/Slim/Player/Protocols/SqueezePlayDirect.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/Playlist.pm
%%SLIMDIR%%/Slim/Plugin/Favorites/Plugin.pm %%SLIMDIR%%/Slim/Plugin/Favorites/Plugin.pm
%%SLIMDIR%%/Slim/Plugin/Favorites/Settings.pm %%SLIMDIR%%/Slim/Plugin/Favorites/Settings.pm
%%SLIMDIR%%/Slim/Plugin/Favorites/SqueezeNetwork.pm
%%SLIMDIR%%/Slim/Plugin/Favorites/install.xml %%SLIMDIR%%/Slim/Plugin/Favorites/install.xml
%%SLIMDIR%%/Slim/Plugin/Favorites/strings.txt %%SLIMDIR%%/Slim/Plugin/Favorites/strings.txt
%%SLIMDIR%%/Slim/Plugin/Flickr/HTML/EN/plugins/Flickr/html/images/icon.png %%SLIMDIR%%/Slim/Plugin/Flickr/HTML/EN/plugins/Flickr/html/images/icon.png

View file

@ -3,7 +3,7 @@
PORTNAME= xmms2-scrobbler PORTNAME= xmms2-scrobbler
PORTVERSION= 0.4.0 PORTVERSION= 0.4.0
PORTREVISION= 3 PORTREVISION= 4
CATEGORIES= audio CATEGORIES= audio
MASTER_SITES= ftp://ftp.code-monkey.de/pub/${PORTNAME}/ MASTER_SITES= ftp://ftp.code-monkey.de/pub/${PORTNAME}/
@ -24,7 +24,11 @@ PORTDOCS= README
SUB_FILES= pkg-message 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: post-install:
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/xmms2-scrobbler @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/xmms2-scrobbler

View file

@ -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);

View file

@ -2,8 +2,7 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= linuxcnc PORTNAME= linuxcnc
PORTVERSION= 20160626 PORTVERSION= 20170708
PORTREVISION= 5
CATEGORIES= cad CATEGORIES= cad
PKGNAMESUFFIX= -devel PKGNAMESUFFIX= -devel
@ -12,7 +11,7 @@ COMMENT= Open Source CNC machine controller
LICENSE= GPLv2 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 \ LIB_DEPENDS= libBLT25.so:x11-toolkits/blt \
libboost_python.so:devel/boost-python-libs \ 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 ${LOCALBASE}/lib/Img/libtkimg1.4.6.so:graphics/libimg
BUILD_DEPENDS= ${RUN_DEPENDS} 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) NO_PACKAGE= Licensing conflict between LinuxCNC (GPL2) and readline (GPL3)
WRKSRC_SUBDIR= src WRKSRC_SUBDIR= src
PATCH_WRKSRC= ${WRKDIR}/linuxcnc-${GH_TAGNAME} PATCH_WRKSRC= ${WRKDIR}/linuxcnc-${GH_TAGNAME}
ALL_TARGET= default ALL_TARGET= default
GNU_CONFIGURE= yes GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-realtime=uspace --enable-non-distributable=yes \ CONFIGURE_ARGS= --with-realtime=uspace --enable-non-distributable=yes \
CFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" \ 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} --with-locale-dir="${PREFIX}/share/locale" --with-python=${PYTHON_CMD}
MAKE_ENV= BUILD_VERBOSE=1 MAKE_ENV= BUILD_VERBOSE=1
USES= autoreconf gettext gmake ncurses pkgconfig python readline shebangfix tk USES= autoreconf gettext gmake ncurses pkgconfig python readline shebangfix tk
USE_GL= gl glu 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_XORG= ice sm x11 xext xft xinerama xmu xrender xscrnsaver xt
USE_LDCONFIG= yes USE_LDCONFIG= yes
USE_GITHUB= yes USE_GITHUB= yes
GH_ACCOUNT= LinuxCNC GH_ACCOUNT= LinuxCNC
GH_TAGNAME= fe7b155c03fe77d6eb301bcfdc3d7c1acdea73e4 GH_TAGNAME= 5b7929df50e0574cb1105143fffe525916d8a4c2
post-patch: 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|#!.*/bin/bash|#!${LOCALBASE}/bin/bash|' \
-e 's|#!.*/usr/bin/tclsh|#!${LOCALBASE}/bin/tclsh8.6|' \ -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 <bsd.port.mk> .include <bsd.port.mk>

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1466926499 TIMESTAMP = 1499364969
SHA256 (LinuxCNC-linuxcnc-20160626-fe7b155c03fe77d6eb301bcfdc3d7c1acdea73e4_GH0.tar.gz) = f48c622e54c269569471dd89dcf888795e8e80b4cddb16040951a46f6b679c72 SHA256 (LinuxCNC-linuxcnc-20170708-5b7929df50e0574cb1105143fffe525916d8a4c2_GH0.tar.gz) = a2a58b70e705494faa048163ac59603378d705b4406fe3ae09d6aa8eee0585c5
SIZE (LinuxCNC-linuxcnc-20160626-fe7b155c03fe77d6eb301bcfdc3d7c1acdea73e4_GH0.tar.gz) = 24689564 SIZE (LinuxCNC-linuxcnc-20170708-5b7929df50e0574cb1105143fffe525916d8a4c2_GH0.tar.gz) = 25331064

View file

@ -1,6 +1,6 @@
--- src/Makefile.orig 2016-06-25 02:19:12 UTC --- src/Makefile.orig 2017-07-08 02:09:02.000000000 +0100
+++ src/Makefile +++ src/Makefile 2017-07-06 12:52:07.633525000 +0100
@@ -183,7 +183,7 @@ $(shell $(VECHO) 1>&2 Done reading depen @@ -183,7 +183,7 @@ $(shell $(VECHO) 1>&2 Done reading dependencies)
endif endif
# Each directory in $(INCLUDES) is passed as a -I directory when compiling. # Each directory in $(INCLUDES) is passed as a -I directory when compiling.
@ -24,7 +24,7 @@
endif endif
# Rules to make .o (object) files # 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 DIR=install -d -m 0755 -o root
FILE=install -m 0644 -o root FILE=install -m 0644 -o root
@ -33,7 +33,7 @@
CONFIGFILE=install -m 0644 CONFIGFILE=install -m 0644
EXE=install -m 0755 -o root EXE=install -m 0755 -o root
SETUID=install -m 4755 -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)$(sysconfdir)/linuxcnc $(DESTDIR)$(bindir) \
$(DESTDIR)$(libdir) $(DESTDIR)$(includedir)/linuxcnc \ $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)/linuxcnc \
$(DESTDIR)$(docsdir) $(DESTDIR)$(ncfilesdir) \ $(DESTDIR)$(docsdir) $(DESTDIR)$(ncfilesdir) \
@ -42,9 +42,9 @@
$(DESTDIR)$(tcldir)/scripts \ $(DESTDIR)$(tcldir)/scripts \
$(DESTDIR)$(mandir)/man1 \ $(DESTDIR)$(mandir)/man1 \
$(DESTDIR)$(mandir)/man3 \ $(DESTDIR)$(mandir)/man3 \
@@ -600,15 +602,14 @@ install-kernel-indep: install-dirs @@ -605,14 +607,13 @@ install-kernel-indep: install-dirs
$(EXE) ../scripts/gladevcp_demo $(DESTDIR)$(bindir)
$(EXE) ../scripts/linuxcncmkdesktop $(DESTDIR)$(bindir) $(EXE) ../scripts/linuxcncmkdesktop $(DESTDIR)$(bindir)
$(EXE) ../scripts/update_ini $(DESTDIR)$(bindir)
$(FILE) $(filter ../lib/%.a ../lib/%.so.0,$(TARGETS)) $(DESTDIR)$(libdir) $(FILE) $(filter ../lib/%.a ../lib/%.so.0,$(TARGETS)) $(DESTDIR)$(libdir)
- cp --no-dereference $(filter ../lib/%.so, $(TARGETS)) $(DESTDIR)$(libdir) - cp --no-dereference $(filter ../lib/%.so, $(TARGETS)) $(DESTDIR)$(libdir)
- -ldconfig $(DESTDIR)$(libdir) - -ldconfig $(DESTDIR)$(libdir)
@ -55,13 +55,11 @@
$(TREE) $(NC_FILES) $(DESTDIR)$(ncfilesdir) $(TREE) $(NC_FILES) $(DESTDIR)$(ncfilesdir)
$(EXE) ../nc_files/M101 $(DESTDIR)$(ncfilesdir) $(EXE) ../nc_files/M101 $(DESTDIR)$(ncfilesdir)
- $(FILE) ../tcl/TkLinuxCNC $(DESTDIR)/etc/X11/app-defaults - $(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) ../tcl/TkLinuxCNC $(DESTDIR)$(prefix)/share/X11/app-defaults
+ $(FILE) ../app-defaults/XEmc $(DESTDIR)$(prefix)/share/X11/app-defaults
$(FILE) Makefile.modinc $(DESTDIR)$(datadir)/linuxcnc $(FILE) Makefile.modinc $(DESTDIR)$(datadir)/linuxcnc
$(EXE) $(TCL) $(DESTDIR)$(tcldir) $(EXE) $(TCL) $(DESTDIR)$(tcldir)
$(FILE) ../tcl/hal.so $(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 # that's what kbuild seems to require
EXTRA_CFLAGS := $(filter-out -ffast-math,$(RTFLAGS)) -D__MODULE__ -I$(BASEPWD) -I$(BASEPWD)/libnml/linklist \ 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/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/os_intf -I$(BASEPWD)/libnml/nml -I$(BASEPWD)/libnml/buffer \
-I$(BASEPWD)/libnml/posemath -I$(BASEPWD)/rtapi -I$(BASEPWD)/hal \ -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 obj-$(CONFIG_HAL_PPMC) += hal_ppmc.o
hal_ppmc-objs := hal/drivers/hal_ppmc.o $(MATHSTUB) 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 -obj-$(CONFIG_HOSTMOT2) += hostmot2.o hm2_test.o hm2_pci.o hm2_7i43.o hm2_7i90.o setsserial.o
-ifeq ($(BUILD_SYS),uspace) -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 -endif
-hostmot2-objs := \ -hostmot2-objs := \
+#obj-$(CONFIG_HOSTMOT2) += hostmot2.o hm2_test.o hm2_pci.o hm2_7i43.o hm2_7i90.o setsserial.o +#obj-$(CONFIG_HOSTMOT2) += hostmot2.o hm2_test.o hm2_pci.o hm2_7i43.o hm2_7i90.o setsserial.o
+#ifeq ($(BUILD_SYS),uspace) +#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 +#endif
+#hostmot2-objs := \ +#hostmot2-objs := \
hal/drivers/mesa-hostmot2/hostmot2.o \ hal/drivers/mesa-hostmot2/hostmot2.o \
hal/drivers/mesa-hostmot2/ioport.o \ hal/drivers/mesa-hostmot2/ioport.o \
hal/drivers/mesa-hostmot2/encoder.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/raw.o \
hal/drivers/mesa-hostmot2/bitfile.o \ hal/drivers/mesa-hostmot2/bitfile.o \
$(MATHSTUB) $(MATHSTUB)
@ -113,6 +111,14 @@
+#hm2_spi-objs := \ +#hm2_spi-objs := \
hal/drivers/mesa-hostmot2/hm2_spi.o \ hal/drivers/mesa-hostmot2/hm2_spi.o \
$(MATHSTUB) $(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 := \
+#hm2_test-objs := \ +#hm2_test-objs := \
hal/drivers/mesa-hostmot2/hm2_test.o \ hal/drivers/mesa-hostmot2/hm2_test.o \
@ -123,9 +129,9 @@
hal/drivers/mesa-hostmot2/setsserial.o \ hal/drivers/mesa-hostmot2/setsserial.o \
$(MATHSTUB) $(MATHSTUB)
@@ -1045,13 +1047,13 @@ endif @@ -1083,13 +1085,13 @@ endif
../rtlib/pumakins$(MODULE_EXT): $(addprefix objects/rt,$(pumakins-objs)) ../rtlib/rosekins$(MODULE_EXT): $(addprefix objects/rt,$(rosekins-objs))
../rtlib/scarakins$(MODULE_EXT): $(addprefix objects/rt,$(scarakins-objs)) ../rtlib/scorbot-kins$(MODULE_EXT): $(addprefix objects/rt,$(scorbot-kins-objs))
../rtlib/hal_gm$(MODULE_EXT): $(addprefix objects/rt,$(hal_gm-objs)) ../rtlib/hal_gm$(MODULE_EXT): $(addprefix objects/rt,$(hal_gm-objs))
-../rtlib/hostmot2$(MODULE_EXT): $(addprefix objects/rt,$(hostmot2-objs)) -../rtlib/hostmot2$(MODULE_EXT): $(addprefix objects/rt,$(hostmot2-objs))
-../rtlib/hm2_test$(MODULE_EXT): $(addprefix objects/rt,$(hm2_test-objs)) -../rtlib/hm2_test$(MODULE_EXT): $(addprefix objects/rt,$(hm2_test-objs))

View file

@ -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;

View file

@ -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 <sys/fsuid.h>
+#endif
#include <unistd.h>
#include <pthread.h>
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;
};

View file

@ -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() {

View file

@ -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 <sys/fsuid.h>
+#endif
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/un.h>
@@ -42,8 +44,13 @@
#endif
#include <sys/resource.h>
#include <sys/mman.h>
-#include <malloc.h>
+#ifdef __linux__
#include <sys/prctl.h>
+#endif
+#ifdef __FreeBSD__
+#include <pthread_np.h>
+#endif
+
#include "config.h"
@@ -56,6 +63,10 @@
#include <sys/shm.h> /* shmget() */
#include <string.h>
+#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<string> args;
for(int i=1; i<argc; i++) { args.push_back(string(argv[i])); }
@@ -589,6 +604,7 @@ static void configure_memory()
res = mlockall(MCL_CURRENT | MCL_FUTURE);
if(res < 0) perror("mlockall");
+#ifdef __linux__
/* Turn off malloc trimming.*/
if (!mallopt(M_TRIM_THRESHOLD, -1)) {
rtapi_print_msg(RTAPI_MSG_WARN,
@@ -599,6 +615,7 @@ static void configure_memory()
rtapi_print_msg(RTAPI_MSG_WARN,
"mallopt(M_MMAP_MAX, -1) failed\n");
}
+#endif
char *buf = static_cast<char *>(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;
}

View file

@ -1,6 +1,3 @@
share/X11/app-defaults/TkLinuxCNC
share/X11/app-defaults/XEmc
etc/rc.d/realtime
bin/5axisgui bin/5axisgui
bin/axis bin/axis
bin/axis-remote bin/axis-remote
@ -18,6 +15,7 @@ bin/hal-histogram
bin/hal_input bin/hal_input
bin/hal_manualtoolchange bin/hal_manualtoolchange
bin/halcmd bin/halcmd
bin/halcmd_twopass
bin/halcompile bin/halcompile
bin/halmeter bin/halmeter
bin/halrmt bin/halrmt
@ -30,17 +28,19 @@ bin/haltcl
bin/halui bin/halui
bin/hbmgui bin/hbmgui
bin/hexagui bin/hexagui
bin/hy_gt_vfd
bin/hy_vfd bin/hy_vfd
bin/image-to-gcode bin/image-to-gcode
bin/inivar bin/inivar
bin/io bin/io
bin/iov2 bin/iov2
bin/keystick
bin/latency-histogram bin/latency-histogram
bin/latency-plot bin/latency-plot
bin/latency-test bin/latency-test
bin/lineardelta
bin/linuxcnc bin/linuxcnc
bin/linuxcnc_info bin/linuxcnc_info
bin/linuxcnc_module_helper
bin/linuxcnc_var bin/linuxcnc_var
bin/linuxcnclcd bin/linuxcnclcd
bin/linuxcncmkdesktop bin/linuxcncmkdesktop
@ -52,6 +52,7 @@ bin/max5gui
bin/mb2hal bin/mb2hal
bin/mdi bin/mdi
bin/milltask bin/milltask
bin/mitsub_vfd
bin/monitor-xhc-hb04 bin/monitor-xhc-hb04
bin/motion-logger bin/motion-logger
bin/moveoff_gui bin/moveoff_gui
@ -64,23 +65,29 @@ bin/pyngcgui
bin/pyui bin/pyui
bin/pyvcp bin/pyvcp
bin/pyvcp_demo bin/pyvcp_demo
bin/rotarydelta
bin/rs274 bin/rs274
bin/rtapi_app bin/rtapi_app
bin/scaragui bin/scaragui
bin/schedrmt bin/schedrmt
bin/scorbot-er-3
bin/sim_pin bin/sim_pin
bin/simulate_probe bin/simulate_probe
bin/stepconf bin/stepconf
bin/teach-in
bin/thermistor bin/thermistor
bin/tooledit bin/tooledit
bin/touchy bin/touchy
bin/update_ini
bin/vfdb_vfd bin/vfdb_vfd
bin/vfs11_vfd bin/vfs11_vfd
bin/wj200_vfd bin/wj200_vfd
bin/xhc-hb04 bin/xhc-hb04
bin/xhc-hb04-accels bin/xhc-hb04-accels
bin/xlinuxcnc bin/xyzac-trt-gui
etc/linuxcnc/rtapi.conf bin/xyzbc-trt-gui
%%ETCDIR%%/rtapi.conf
etc/rc.d/realtime
include/linuxcnc/_sem.h include/linuxcnc/_sem.h
include/linuxcnc/_shm.h include/linuxcnc/_shm.h
include/linuxcnc/_timer.h include/linuxcnc/_timer.h
@ -118,6 +125,7 @@ include/linuxcnc/iniaxis.hh
include/linuxcnc/inifile.h include/linuxcnc/inifile.h
include/linuxcnc/inifile.hh include/linuxcnc/inifile.hh
include/linuxcnc/inihal.hh include/linuxcnc/inihal.hh
include/linuxcnc/inijoint.hh
include/linuxcnc/initool.hh include/linuxcnc/initool.hh
include/linuxcnc/initraj.hh include/linuxcnc/initraj.hh
include/linuxcnc/interp_base.hh include/linuxcnc/interp_base.hh
@ -175,6 +183,7 @@ include/linuxcnc/sem.hh
include/linuxcnc/sendn.h include/linuxcnc/sendn.h
include/linuxcnc/shm.hh include/linuxcnc/shm.hh
include/linuxcnc/shmem.hh include/linuxcnc/shmem.hh
include/linuxcnc/simple_tp.h
include/linuxcnc/sincos.h include/linuxcnc/sincos.h
include/linuxcnc/spherical_arc.h include/linuxcnc/spherical_arc.h
include/linuxcnc/stat_msg.hh 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_bit.so
lib/linuxcnc/modules/conv_u32_float.so lib/linuxcnc/modules/conv_u32_float.so
lib/linuxcnc/modules/conv_u32_s32.so lib/linuxcnc/modules/conv_u32_s32.so
lib/linuxcnc/modules/corexykins.so
lib/linuxcnc/modules/counter.so lib/linuxcnc/modules/counter.so
lib/linuxcnc/modules/ddt.so lib/linuxcnc/modules/ddt.so
lib/linuxcnc/modules/deadzone.so lib/linuxcnc/modules/deadzone.so
lib/linuxcnc/modules/debounce.so lib/linuxcnc/modules/debounce.so
lib/linuxcnc/modules/differential.so
lib/linuxcnc/modules/edge.so lib/linuxcnc/modules/edge.so
lib/linuxcnc/modules/encoder.so lib/linuxcnc/modules/encoder.so
lib/linuxcnc/modules/encoder_ratio.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/feedcomp.so
lib/linuxcnc/modules/flipflop.so lib/linuxcnc/modules/flipflop.so
lib/linuxcnc/modules/gantry.so lib/linuxcnc/modules/gantry.so
lib/linuxcnc/modules/gantrykins.so
lib/linuxcnc/modules/gearchange.so lib/linuxcnc/modules/gearchange.so
lib/linuxcnc/modules/genhexkins.so lib/linuxcnc/modules/genhexkins.so
lib/linuxcnc/modules/genserkins.so lib/linuxcnc/modules/genserkins.so
@ -268,6 +278,7 @@ lib/linuxcnc/modules/limit1.so
lib/linuxcnc/modules/limit2.so lib/linuxcnc/modules/limit2.so
lib/linuxcnc/modules/limit3.so lib/linuxcnc/modules/limit3.so
lib/linuxcnc/modules/lincurve.so lib/linuxcnc/modules/lincurve.so
lib/linuxcnc/modules/lineardeltakins.so
lib/linuxcnc/modules/logic.so lib/linuxcnc/modules/logic.so
lib/linuxcnc/modules/lowpass.so lib/linuxcnc/modules/lowpass.so
lib/linuxcnc/modules/lut5.so lib/linuxcnc/modules/lut5.so
@ -299,12 +310,15 @@ lib/linuxcnc/modules/orient.so
lib/linuxcnc/modules/pid.so lib/linuxcnc/modules/pid.so
lib/linuxcnc/modules/pumakins.so lib/linuxcnc/modules/pumakins.so
lib/linuxcnc/modules/pwmgen.so lib/linuxcnc/modules/pwmgen.so
lib/linuxcnc/modules/rosekins.so
lib/linuxcnc/modules/rotarydeltakins.so
lib/linuxcnc/modules/rotatekins.so lib/linuxcnc/modules/rotatekins.so
lib/linuxcnc/modules/sample_hold.so lib/linuxcnc/modules/sample_hold.so
lib/linuxcnc/modules/sampler.so lib/linuxcnc/modules/sampler.so
lib/linuxcnc/modules/scale.so lib/linuxcnc/modules/scale.so
lib/linuxcnc/modules/scarakins.so lib/linuxcnc/modules/scarakins.so
lib/linuxcnc/modules/scope_rt.so lib/linuxcnc/modules/scope_rt.so
lib/linuxcnc/modules/scorbot-kins.so
lib/linuxcnc/modules/select8.so lib/linuxcnc/modules/select8.so
lib/linuxcnc/modules/serport.so lib/linuxcnc/modules/serport.so
lib/linuxcnc/modules/siggen.so lib/linuxcnc/modules/siggen.so
@ -340,6 +354,8 @@ lib/linuxcnc/modules/wcomp.so
lib/linuxcnc/modules/weighted_sum.so lib/linuxcnc/modules/weighted_sum.so
lib/linuxcnc/modules/xhc_hb04_util.so lib/linuxcnc/modules/xhc_hb04_util.so
lib/linuxcnc/modules/xor2.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/emccalib.tcl
lib/tcltk/linuxcnc/bin/emcdebug.tcl lib/tcltk/linuxcnc/bin/emcdebug.tcl
lib/tcltk/linuxcnc/bin/emctesting.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/hal.so
lib/tcltk/linuxcnc/linuxcnc.so lib/tcltk/linuxcnc/linuxcnc.so
lib/tcltk/linuxcnc/linuxcnc.tcl lib/tcltk/linuxcnc/linuxcnc.tcl
lib/tcltk/linuxcnc/mini.tcl
lib/tcltk/linuxcnc/msgs/de.msg lib/tcltk/linuxcnc/msgs/de.msg
lib/tcltk/linuxcnc/msgs/es.msg lib/tcltk/linuxcnc/msgs/es.msg
lib/tcltk/linuxcnc/msgs/fi.msg lib/tcltk/linuxcnc/msgs/fi.msg
@ -392,6 +407,8 @@ man/man1/elbpcom.1.gz
man/man1/gladevcp.1.gz man/man1/gladevcp.1.gz
man/man1/gs2.1.gz man/man1/gs2.1.gz
man/man1/hal_input.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/halcmd.1.gz
man/man1/halcompile.1.gz man/man1/halcompile.1.gz
man/man1/halmeter.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_list.3rtapi.gz
man/man3/rtapi_module_param.3rtapi.gz man/man3/rtapi_module_param.3rtapi.gz
man/man3/rtapi_mutex.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_outb.3rtapi.gz
man/man3/rtapi_parport.3rtapi.gz man/man3/rtapi_parport.3rtapi.gz
man/man3/rtapi_pci.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/gantrykins.9.gz
man/man9/genhexkins.9.gz man/man9/genhexkins.9.gz
man/man9/genserkins.9.gz man/man9/genserkins.9.gz
man/man9/gentrivkins.9.gz
man/man9/gladevcp.9.gz man/man9/gladevcp.9.gz
man/man9/hal_bb_gpio.9.gz
man/man9/hm2_7i43.9.gz man/man9/hm2_7i43.9.gz
man/man9/hm2_7i90.9.gz man/man9/hm2_7i90.9.gz
man/man9/hm2_eth.9.gz man/man9/hm2_eth.9.gz
man/man9/hm2_pci.9.gz man/man9/hm2_pci.9.gz
man/man9/hm2_rpspi.9.gz
man/man9/hm2_spi.9.gz man/man9/hm2_spi.9.gz
man/man9/hostmot2.9.gz man/man9/hostmot2.9.gz
man/man9/kins.9.gz man/man9/kins.9.gz
man/man9/lcd.9.gz man/man9/lcd.9.gz
man/man9/lineardeltakins.9.gz
man/man9/matrix_kb.9.gz man/man9/matrix_kb.9.gz
man/man9/maxkins.9.gz man/man9/maxkins.9.gz
man/man9/motion.9.gz man/man9/motion.9.gz
@ -549,6 +571,7 @@ man/man9/opto_ac5.9.gz
man/man9/pid.9.gz man/man9/pid.9.gz
man/man9/pumakins.9.gz man/man9/pumakins.9.gz
man/man9/pwmgen.9.gz man/man9/pwmgen.9.gz
man/man9/rosekins.9.gz
man/man9/rotatekins.9.gz man/man9/rotatekins.9.gz
man/man9/sampler.9.gz man/man9/sampler.9.gz
man/man9/scarakins.9.gz man/man9/scarakins.9.gz
@ -563,6 +586,7 @@ man/man9/tripodkins.9.gz
man/man9/trivkins.9.gz man/man9/trivkins.9.gz
man/man9/watchdog.9.gz man/man9/watchdog.9.gz
man/man9/weighted_sum.9.gz man/man9/weighted_sum.9.gz
share/X11/app-defaults/TkLinuxCNC
share/axis/images/axis-16x16.png share/axis/images/axis-16x16.png
share/axis/images/axis-24x24.png share/axis/images/axis-24x24.png
share/axis/images/axis-32x32.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-lathe.ngc
share/axis/images/axis.ngc share/axis/images/axis.ngc
share/axis/images/banner.gif 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/close.gif
share/axis/images/downarrow.xbm share/axis/images/downarrow.xbm
share/axis/images/leftarrow.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/resume_inhibit.gif
share/axis/images/rightarrow.xbm share/axis/images/rightarrow.xbm
share/axis/images/spindle_ccw.gif share/axis/images/spindle_ccw.gif
@ -615,10 +627,8 @@ share/axis/images/tool_zoomout.gif
share/axis/images/uparrow.xbm share/axis/images/uparrow.xbm
share/axis/tcl/accel.tcl share/axis/tcl/accel.tcl
share/axis/tcl/axis.tcl share/axis/tcl/axis.tcl
share/axis/tcl/cb.tcl
share/axis/tcl/combobox.tcl share/axis/tcl/combobox.tcl
share/axis/tcl/dialog.tcl share/axis/tcl/dialog.tcl
share/axis/tcl/rb.tcl
share/axis/tcl/sb.tcl share/axis/tcl/sb.tcl
share/axis/tcl/support.tcl share/axis/tcl/support.tcl
share/doc/linuxcnc/AUTHORS 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/demo_mazak.tbl
share/doc/linuxcnc/examples/sample-configs/attic/demo_mazak/tester.hal 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/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/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.hal
share/doc/linuxcnc/examples/sample-configs/by_interface/general_mechatronics/GM6-PCI/3-axis-servo.ini 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/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.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/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/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/panel.xml
share/doc/linuxcnc/examples/sample-configs/by_interface/parport/classicladder/cl-estop/tool.tbl 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_pinout.hal
share/doc/linuxcnc/examples/sample-configs/by_machine/cooltool/uni-dreh-g_stepper.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/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/README
share/doc/linuxcnc/examples/sample-configs/by_machine/sherline/Sherline3Axis/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 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/nc_files
share/doc/linuxcnc/examples/sample-configs/sim/README 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/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.ini
share/doc/linuxcnc/examples/sample-configs/sim/axis/axis_9axis.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/axis_mm.ini
share/doc/linuxcnc/examples/sample-configs/sim/axis/canterp.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/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/README
share/doc/linuxcnc/examples/sample-configs/sim/axis/classicladder/classicladder.hal 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.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.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.ini
share/doc/linuxcnc/examples/sample-configs/sim/axis/classicladder/demo_sim_cl.tbl 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.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/README
share/doc/linuxcnc/examples/sample-configs/sim/axis/gladevcp/gladevcp_panel.ini share/doc/linuxcnc/examples/sample-configs/sim/axis/gladevcp/gladevcp_panel.ini
share/doc/linuxcnc/examples/sample-configs/sim/axis/gladevcp/gladevcp_tab.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/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.ini
share/doc/linuxcnc/examples/sample-configs/sim/axis/histogram_demo.txt 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.ini
share/doc/linuxcnc/examples/sample-configs/sim/axis/ini_hal_demo.txt 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/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_x.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_y.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_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/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/emc.inc
share/doc/linuxcnc/examples/sample-configs/sim/axis/ini_with_includes/emcio.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/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/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/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/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/sim.tbl
share/doc/linuxcnc/examples/sample-configs/sim/axis/ini_with_includes/task.inc 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-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_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/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/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.ini
share/doc/linuxcnc/examples/sample-configs/sim/axis/lathe-fanucy/lathe-fanucy.tbl 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.tbl
share/doc/linuxcnc/examples/sample-configs/sim/axis/lathe.xml 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/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.ini
share/doc/linuxcnc/examples/sample-configs/sim/axis/moveoff/1_onpause_local.txt 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 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.halscope
share/doc/linuxcnc/examples/sample-configs/sim/axis/moveoff/moveoff.halshow 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_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.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.hal
share/doc/linuxcnc/examples/sample-configs/sim/axis/moveoff/moveoff_display_6.inc 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/moveoff/sim.tbl
share/doc/linuxcnc/examples/sample-configs/sim/axis/nc_files 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/README
share/doc/linuxcnc/examples/sample-configs/sim/axis/ngcgui/axis_resize.tcl share/doc/linuxcnc/examples/sample-configs/sim/axis/ngcgui/axis_resize.py
share/doc/linuxcnc/examples/sample-configs/sim/axis/ngcgui/fullscreen.tcl 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/gremlin_view.ui
share/doc/linuxcnc/examples/sample-configs/sim/axis/ngcgui/lathe.tbl share/doc/linuxcnc/examples/sample-configs/sim/axis/ngcgui/lathe.tbl
share/doc/linuxcnc/examples/sample-configs/sim/axis/ngcgui/ngcgui.ini 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/pyngcgui_popupkeyboard.ui
share/doc/linuxcnc/examples/sample-configs/sim/axis/ngcgui/sim.tbl 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/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/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_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_noiocontrol.hal
share/doc/linuxcnc/examples/sample-configs/sim/axis/orphans/core_sim_test.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/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/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/no-iotask.nml
share/doc/linuxcnc/examples/sample-configs/sim/axis/orphans/py.ini.notworking share/doc/linuxcnc/examples/sample-configs/sim/axis/orphans/py.ini.notworking
share/doc/linuxcnc/examples/sample-configs/sim/axis/orphans/pyiocontrol.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/postgui_calib_helper.hal
share/doc/linuxcnc/examples/sample-configs/sim/axis/profile_axis.ini 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/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/README
share/doc/linuxcnc/examples/sample-configs/sim/axis/remap/cycle/README share/doc/linuxcnc/examples/sample-configs/sim/axis/remap/cycle/README
share/doc/linuxcnc/examples/sample-configs/sim/axis/remap/cycle/cycle.ini 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/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/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/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/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/gladevcp.hal
share/doc/linuxcnc/examples/sample-configs/sim/axis/remap/manual-toolchange-with-tool-length-switch/manualtoolchange.glade 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/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/stop-lookahead/tool.tbl
share/doc/linuxcnc/examples/sample-configs/sim/axis/remap/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.tbl
share/doc/linuxcnc/examples/sample-configs/sim/axis/sim_mm.tbl share/doc/linuxcnc/examples/sample-configs/sim/axis/sim_mm.tbl
share/doc/linuxcnc/examples/sample-configs/sim/axis/simpockets.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_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.ini
share/doc/linuxcnc/examples/sample-configs/sim/axis/simtcl/twopass_compat.txt 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/README
share/doc/linuxcnc/examples/sample-configs/sim/axis/spindle_orient/orient.hal share/doc/linuxcnc/examples/sample-configs/sim/axis/spindle_orient/orient.hal
share/doc/linuxcnc/examples/sample-configs/sim/axis/spindle_orient/orient.ini 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/sim.tbl
share/doc/linuxcnc/examples/sample-configs/sim/axis/twopass/twopass.ini 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/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/bridgemill/5axis.ini
share/doc/linuxcnc/examples/sample-configs/sim/axis/vismach/5axis/5axis.tbl share/doc/linuxcnc/examples/sample-configs/sim/axis/vismach/5axis/bridgemill/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/bridgemill/README
share/doc/linuxcnc/examples/sample-configs/sim/axis/vismach/5axis/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/README
share/doc/linuxcnc/examples/sample-configs/sim/axis/vismach/VMC_toolchange/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 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/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/kinematics.hal
share/doc/linuxcnc/examples/sample-configs/sim/axis/vismach/hexapod-sim/panel.xml 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/README
share/doc/linuxcnc/examples/sample-configs/sim/axis/vismach/puma/puma.ini share/doc/linuxcnc/examples/sample-configs/sim/axis/vismach/puma/puma.ini
share/doc/linuxcnc/examples/sample-configs/sim/axis/vismach/puma/puma.tbl 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/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/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_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/layout1.inc
share/doc/linuxcnc/examples/sample-configs/sim/axis/xhc-hb04/layout2.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_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.tbl
share/doc/linuxcnc/examples/sample-configs/sim/axis/xhc-hb04/sim_mm.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 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/README
share/doc/linuxcnc/examples/sample-configs/sim/gmoccapy/button.glade 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_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/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/gmoccapy.ini
share/doc/linuxcnc/examples/sample-configs/sim/gmoccapy/gmoccapy2.glade 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_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.ini
share/doc/linuxcnc/examples/sample-configs/sim/gmoccapy/gmoccapy_lathe_imperial.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 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/remap.py
share/doc/linuxcnc/examples/sample-configs/sim/gmoccapy/python/stdglue.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/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/spindle_sim.hal
share/doc/linuxcnc/examples/sample-configs/sim/gmoccapy/tool.tbl share/doc/linuxcnc/examples/sample-configs/sim/gmoccapy/tool.tbl
share/doc/linuxcnc/examples/sample-configs/sim/gmoccapy/tool_sensor.glade 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.tbl
share/doc/linuxcnc/examples/sample-configs/sim/lathe.xml 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/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.hal
share/doc/linuxcnc/examples/sample-configs/sim/manual-example.ui share/doc/linuxcnc/examples/sample-configs/sim/manual-example.ui
share/doc/linuxcnc/examples/sample-configs/sim/nc_files 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/simpockets.tbl
share/doc/linuxcnc/examples/sample-configs/sim/test.vcp 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/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/screwcompX.dat
share/doc/linuxcnc/examples/sample-configs/sim/tklinuxcnc/servo_sim.ini 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/sim.tbl
share/doc/linuxcnc/examples/sample-configs/sim/tklinuxcnc/tklinuxcnc.ini 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/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/README
share/doc/linuxcnc/examples/sample-configs/sim/touchy/gladevcp/README share/doc/linuxcnc/examples/sample-configs/sim/touchy/gladevcp/README
share/doc/linuxcnc/examples/sample-configs/sim/touchy/gladevcp/gladevcp-touchy.hal 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/gladevcp/touchy.ini
share/doc/linuxcnc/examples/sample-configs/sim/touchy/ngcgui/README 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/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/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.ini
share/doc/linuxcnc/examples/sample-configs/sim/touchy/ngcgui/pyngcgui_touchy.txt 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/touchy/touchy.txt
share/doc/linuxcnc/examples/sample-configs/sim/tracking-test.hal share/doc/linuxcnc/examples/sample-configs/sim/tracking-test.hal
share/doc/linuxcnc/tklinuxcnc.txt share/doc/linuxcnc/tklinuxcnc.txt
share/doc/linuxcnc/xlinuxcnc.txt
share/glade3/catalogs/hal_python.xml share/glade3/catalogs/hal_python.xml
share/glade3/pixmaps/widget-gladevcp-calc.png share/glade3/pixmaps/widget-gladevcp-calc.png
share/glade3/pixmaps/widget-gladevcp-combi_dro.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_dro.png
share/glade3/pixmaps/widget-gladevcp-hal_gremlin.png share/glade3/pixmaps/widget-gladevcp-hal_gremlin.png
share/glade3/pixmaps/widget-gladevcp-hal_hbar.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/mist_on.gif
share/gmoccapy/images/pause.png share/gmoccapy/images/pause.png
share/gmoccapy/images/rabbit_jog.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/refa.png
share/gmoccapy/images/refall.png share/gmoccapy/images/refall.png
share/gmoccapy/images/refb.png share/gmoccapy/images/refb.png
@ -1735,6 +1828,12 @@ share/gmoccapy/images/toolaxisz.png
share/gmoccapy/images/toolchange.png share/gmoccapy/images/toolchange.png
share/gmoccapy/images/toolpath.png share/gmoccapy/images/toolpath.png
share/gmoccapy/images/tools.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/touchoffwz.png
share/gmoccapy/images/touchoffx.png share/gmoccapy/images/touchoffx.png
share/gmoccapy/images/touchoffx_value.png share/gmoccapy/images/touchoffx_value.png
@ -1775,6 +1874,8 @@ share/linuxcnc/gscreen2.glade
share/linuxcnc/hallib/README share/linuxcnc/hallib/README
share/linuxcnc/hallib/axis_manualtoolchange.hal share/linuxcnc/hallib/axis_manualtoolchange.hal
share/linuxcnc/hallib/basic_sim.tcl 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_servo.hal
share/linuxcnc/hallib/core_sim.hal share/linuxcnc/hallib/core_sim.hal
share/linuxcnc/hallib/core_sim9.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/locking_indexer.hal
share/linuxcnc/hallib/moveoff_external.hal share/linuxcnc/hallib/moveoff_external.hal
share/linuxcnc/hallib/servo_sim.hal share/linuxcnc/hallib/servo_sim.hal
share/linuxcnc/hallib/sim_ldelta.hal
share/linuxcnc/hallib/sim_lib.tcl share/linuxcnc/hallib/sim_lib.tcl
share/linuxcnc/hallib/sim_rdelta.hal
share/linuxcnc/hallib/sim_spindle_encoder.hal share/linuxcnc/hallib/sim_spindle_encoder.hal
share/linuxcnc/hallib/simulated-gantry-home.hal share/linuxcnc/hallib/simulated-gantry-home.hal
share/linuxcnc/hallib/simulated_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/tripodsim.hal
share/linuxcnc/hallib/util_lib.tcl share/linuxcnc/hallib/util_lib.tcl
share/linuxcnc/hallib/var_show.tcl share/linuxcnc/hallib/var_show.tcl
share/linuxcnc/hallib/wheeljogpins.tcl
share/linuxcnc/hallib/xhc-hb04-layout1.cfg share/linuxcnc/hallib/xhc-hb04-layout1.cfg
share/linuxcnc/hallib/xhc-hb04-layout2.cfg share/linuxcnc/hallib/xhc-hb04-layout2.cfg
share/linuxcnc/hallib/xhc-hb04.tcl share/linuxcnc/hallib/xhc-hb04.tcl
@ -1980,6 +2084,29 @@ share/linuxcnc/stepconf/pport2.glade
share/linuxcnc/stepconf/spindle.glade share/linuxcnc/stepconf/spindle.glade
share/linuxcnc/stepconf/start.glade share/linuxcnc/stepconf/start.glade
share/linuxcnc/touchy.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%%/_hal.so
/usr/local/%%PYTHON_SITELIBDIR%%/_togl.so /usr/local/%%PYTHON_SITELIBDIR%%/_togl.so
/usr/local/%%PYTHON_SITELIBDIR%%/bitfile.py /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/iconview.py
/usr/local/%%PYTHON_SITELIBDIR%%/gladevcp/jogwheel.py /usr/local/%%PYTHON_SITELIBDIR%%/gladevcp/jogwheel.py
/usr/local/%%PYTHON_SITELIBDIR%%/gladevcp/led.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/makepins.py
/usr/local/%%PYTHON_SITELIBDIR%%/gladevcp/offsetpage.glade /usr/local/%%PYTHON_SITELIBDIR%%/gladevcp/offsetpage.glade
/usr/local/%%PYTHON_SITELIBDIR%%/gladevcp/offsetpage_widget.py /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.py
/usr/local/%%PYTHON_SITELIBDIR%%/hal_glib.py /usr/local/%%PYTHON_SITELIBDIR%%/hal_glib.py
/usr/local/%%PYTHON_SITELIBDIR%%/hershey.py /usr/local/%%PYTHON_SITELIBDIR%%/hershey.py
/usr/local/%%PYTHON_SITELIBDIR%%/lineardeltakins.so
/usr/local/%%PYTHON_SITELIBDIR%%/linux_event.py /usr/local/%%PYTHON_SITELIBDIR%%/linux_event.py
/usr/local/%%PYTHON_SITELIBDIR%%/linuxcnc.so /usr/local/%%PYTHON_SITELIBDIR%%/linuxcnc.so
/usr/local/%%PYTHON_SITELIBDIR%%/linuxcnc_util.py
/usr/local/%%PYTHON_SITELIBDIR%%/minigl.so /usr/local/%%PYTHON_SITELIBDIR%%/minigl.so
/usr/local/%%PYTHON_SITELIBDIR%%/multifilebuilder.py /usr/local/%%PYTHON_SITELIBDIR%%/multifilebuilder.py
/usr/local/%%PYTHON_SITELIBDIR%%/multifilebuilder_gtk3.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/panelui_validate.py
/usr/local/%%PYTHON_SITELIBDIR%%/pyui/widgets.py /usr/local/%%PYTHON_SITELIBDIR%%/pyui/widgets.py
/usr/local/%%PYTHON_SITELIBDIR%%/pyvcp_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/OpenGLTk.py
/usr/local/%%PYTHON_SITELIBDIR%%/rs274/__init__.py /usr/local/%%PYTHON_SITELIBDIR%%/rs274/__init__.py
/usr/local/%%PYTHON_SITELIBDIR%%/rs274/author.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%%/touchy/preferences.py
/usr/local/%%PYTHON_SITELIBDIR%%/vcpparse.py /usr/local/%%PYTHON_SITELIBDIR%%/vcpparse.py
/usr/local/%%PYTHON_SITELIBDIR%%/vismach.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 lib/linuxcnc/modules/linuxcnc
@dir share/X11/app-defaults
@dir etc/rc.d
@dir /usr/local/%%PYTHON_SITELIBDIR%%/gladevcp @dir /usr/local/%%PYTHON_SITELIBDIR%%/gladevcp
@dir /usr/local/%%PYTHON_SITELIBDIR%%/gmoccapy @dir /usr/local/%%PYTHON_SITELIBDIR%%/gmoccapy
@dir /usr/local/%%PYTHON_SITELIBDIR%%/gscreen @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%%/touchy
@dir /usr/local/%%PYTHON_SITELIBDIR%% @dir /usr/local/%%PYTHON_SITELIBDIR%%
@dir /usr/local/%%PYTHON_LIBDIR%% @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

View file

@ -168,6 +168,7 @@
SUBDIR += spandsp SUBDIR += spandsp
SUBDIR += splat SUBDIR += splat
SUBDIR += sredird SUBDIR += sredird
SUBDIR += sunxi-tools
SUBDIR += svxlink SUBDIR += svxlink
SUBDIR += syncterm SUBDIR += syncterm
SUBDIR += tcpser SUBDIR += tcpser

View file

@ -10,25 +10,41 @@ MASTER_SITES= BERLIOS
MAINTAINER= ports@FreeBSD.org MAINTAINER= ports@FreeBSD.org
COMMENT= Software for collecting and analyzing calls from different PBX models 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_DEFAULT= LIBWRAP MYSQL WWW WWWGD
OPTIONS_MULTI= DB OPTIONS_MULTI= DB
OPTIONS_MULTI_DB= PGSQL MYSQL OPTIONS_MULTI_DB= PGSQL MYSQL
OPTIONS_SUB= yes
LIBWRAP_DESC= Enable TCP wrapper support LIBWRAP_DESC= Enable TCP wrapper support
WWW_DESC= Install web interface WWW_DESC= Install web interface
WWWGD_DESC= Graphic reports WWWGD_DESC= Graphic reports
GNU_CONFIGURE= yes MYSQL_USES= mysql
USES= perl5 shebangfix MYSQL_BUILD_DEPENDS= p5-DBD-mysql>=0:databases/p5-DBD-mysql
USE_RC_SUBR= ${PORTNAME}d MYSQL_RUN_DEPENDS= p5-DBD-mysql>=0:databases/p5-DBD-mysql
SHEBANG_FILES= data/sql/install-sql.pl \
include/atslogcleardb.pl.in include/atslogdb.pl.in PGSQL_USES= pgsql
PORTDOCS= CHANGES ChangeLog DEINSTALL INSTALL LICENSE TODO UPDATING USAGE PGSQL_BUILD_DEPENDS= p5-DBD-Pg>=0:databases/p5-DBD-Pg
SUB_FILES= pkg-message PGSQL_RUN_DEPENDS= p5-DBD-Pg>=0:databases/p5-DBD-Pg
CONFIGS= ${PORTNAME}.conf.default ${PORTNAME}.conf.default.rus
CONFIGURE_ARGS+=--localstatedir=/var LIBWRAP_CONFIGURE_OFF= --disable-libwrap
PLIST_SUB= WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}"
OPTIONS_SUB=yes
.include <bsd.port.options.mk> .include <bsd.port.options.mk>
@ -46,22 +62,6 @@ USE_PHP+= pgsql
.endif .endif
.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: post-patch:
@${REINPLACE_CMD} -e 's|createsqltables.|${DATADIR}/sql/createsqltables.|g' \ @${REINPLACE_CMD} -e 's|createsqltables.|${DATADIR}/sql/createsqltables.|g' \
-e 's|data.sql|${DATADIR}/sql/data.sql|' ${WRKSRC}/data/sql/install-sql.pl -e 's|data.sql|${DATADIR}/sql/data.sql|' ${WRKSRC}/data/sql/install-sql.pl

View file

@ -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 <bsd.port.mk>

View file

@ -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

View file

@ -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 <http://www.gnu.org/licenses/>.
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 ; \

View file

@ -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

View file

@ -0,0 +1,7 @@
bin/bin2fex
bin/fex2bin
bin/sunxi-bootinfo
bin/sunxi-fel
bin/sunxi-fexc
bin/sunxi-nand-part
bin/sunxi-pio

View file

@ -3,7 +3,7 @@
PORTNAME= xastir PORTNAME= xastir
PORTVERSION= 2.0.6 PORTVERSION= 2.0.6
PORTREVISION= 4 PORTREVISION= 5
CATEGORIES= comms hamradio CATEGORIES= comms hamradio
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-stable/${PORTNAME}-${PORTVERSION} MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-stable/${PORTNAME}-${PORTVERSION}
@ -16,9 +16,10 @@ LIB_DEPENDS= libtiff.so:graphics/tiff \
libpng.so:graphics/png libpng.so:graphics/png
GNU_CONFIGURE= yes 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 \ 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 SUB_FILES= pkg-message

View file

@ -879,6 +879,7 @@
SUBDIR += ruby-qdbm SUBDIR += ruby-qdbm
SUBDIR += ruby-tokyocabinet SUBDIR += ruby-tokyocabinet
SUBDIR += ruby-xapian SUBDIR += ruby-xapian
SUBDIR += rubygem-active_model_serializers
SUBDIR += rubygem-active_record_query_trace SUBDIR += rubygem-active_record_query_trace
SUBDIR += rubygem-activemodel-serializers-xml SUBDIR += rubygem-activemodel-serializers-xml
SUBDIR += rubygem-activemodel4 SUBDIR += rubygem-activemodel4
@ -937,6 +938,7 @@
SUBDIR += rubygem-hiredis SUBDIR += rubygem-hiredis
SUBDIR += rubygem-jdbc-mysql SUBDIR += rubygem-jdbc-mysql
SUBDIR += rubygem-leo_manager_client SUBDIR += rubygem-leo_manager_client
SUBDIR += rubygem-mario-redis-lock
SUBDIR += rubygem-memcache SUBDIR += rubygem-memcache
SUBDIR += rubygem-memcache-client SUBDIR += rubygem-memcache-client
SUBDIR += rubygem-mysql SUBDIR += rubygem-mysql

View file

@ -2,7 +2,7 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= psycopg2 PORTNAME= psycopg2
PORTVERSION= 2.7.2 PORTVERSION= 2.7.3
CATEGORIES= databases python CATEGORIES= databases python
MASTER_SITES= CHEESESHOP \ MASTER_SITES= CHEESESHOP \
http://initd.org/psycopg/tarballs/PSYCOPG-${PORTVERSION:R:S|.|-|}/ http://initd.org/psycopg/tarballs/PSYCOPG-${PORTVERSION:R:S|.|-|}/

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1500809121 TIMESTAMP = 1500989964
SHA256 (psycopg2-2.7.2.tar.gz) = 3767f40bb35713ccc75dbcff80bf228a75e080d6b98c78afd5fb9aa84682a9f4 SHA256 (psycopg2-2.7.3.tar.gz) = c9bd49848556d04093909faec017c3675efabf78c2b7f383bf7c43ba18324ac8
SIZE (psycopg2-2.7.2.tar.gz) = 424897 SIZE (psycopg2-2.7.3.tar.gz) = 425004

View file

@ -1,7 +1,7 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= sqlalchemy PORTNAME= sqlalchemy
PORTVERSION= 1.1.11 PORTVERSION= 1.1.12
CATEGORIES= databases python CATEGORIES= databases python
MASTER_SITES= CHEESESHOP MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1497958481 TIMESTAMP = 1500989978
SHA256 (SQLAlchemy-1.1.11.tar.gz) = 76f76965e9a968ba3aecd2a8bc0d991cea04fd9a182e6c95c81f1551487b0211 SHA256 (SQLAlchemy-1.1.12.tar.gz) = d501527319f51a3d9eb639b654222c6f67287228a98ba102b1d0b598eb3266c9
SIZE (SQLAlchemy-1.1.11.tar.gz) = 5197520 SIZE (SQLAlchemy-1.1.12.tar.gz) = 5178158

View file

@ -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 <bsd.port.mk>

View file

@ -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

View file

@ -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

View file

@ -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 <bsd.port.mk>

View file

@ -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

View file

@ -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

View file

@ -1,8 +1,8 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= growl-for-linux PORTNAME= growl-for-linux
PORTVERSION= 0.8.1 PORTVERSION= 0.8.5
PORTREVISION= 2 PORTREVISION= 0
CATEGORIES= deskutils CATEGORIES= deskutils
MAINTAINER= nivit@FreeBSD.org MAINTAINER= nivit@FreeBSD.org
@ -13,7 +13,10 @@ LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= desktop-file-install:devel/desktop-file-utils BUILD_DEPENDS= desktop-file-install:devel/desktop-file-utils
LIB_DEPENDS= libcurl.so:ftp/curl \ 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 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 USES= autoreconf compiler:nestedfct libtool pkgconfig sqlite:3 ssl
USE_GITHUB= yes USE_GITHUB= yes
USE_GNOME= gtk20 USE_GNOME= cairo gdkpixbuf2 gtk20 libxml2
USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME}/display \
${PREFIX}/lib/${PORTNAME}/subscribe
post-patch: post-patch:
@${REINPLACE_CMD} '/^gol_LDADD =/s/$$/ -lgmodule-2.0/' \ @${REINPLACE_CMD} '/^gol_LDADD =/s/$$/ -lgmodule-2.0/' \
${WRKSRC}/Makefile.am ${WRKSRC}/Makefile.am

View file

@ -1,2 +1,3 @@
SHA256 (mattn-growl-for-linux-0.8.1_GH0.tar.gz) = 4762ca137277c48ba778e4652eb5ee354d726953c515a9fb0527b373fd2d4bf9 TIMESTAMP = 1500984019
SIZE (mattn-growl-for-linux-0.8.1_GH0.tar.gz) = 746865 SHA256 (mattn-growl-for-linux-0.8.5_GH0.tar.gz) = 6af57c763d26e8bf985eb6ede5c2d2be9469c4f9254bdebcb168f0703dfb20fa
SIZE (mattn-growl-for-linux-0.8.5_GH0.tar.gz) = 842940

View file

@ -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])

View file

@ -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);

View file

@ -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
lib/growl-for-linux/subscribe/libtweets.so.0.0.0 lib/growl-for-linux/subscribe/libtweets.so.0.0.0
%%DESKTOPDIR%%/gol.desktop %%DESKTOPDIR%%/gol.desktop
%%DATADIR%%/data/growl4linux.jpg
%%DATADIR%%/data/icon.png %%DATADIR%%/data/icon.png
%%DATADIR%%/data/icon256.png
%%DATADIR%%/data/icon_dnd.png %%DATADIR%%/data/icon_dnd.png
%%DATADIR%%/data/mattn.png %%DATADIR%%/data/mattn.png

View file

@ -2,7 +2,7 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= menumaker PORTNAME= menumaker
PORTVERSION= 0.99.9 PORTVERSION= 0.99.10
CATEGORIES= deskutils CATEGORIES= deskutils
MASTER_SITES= SF/${PORTNAME} MASTER_SITES= SF/${PORTNAME}

View file

@ -1,2 +1,3 @@
SHA256 (menumaker-0.99.9.tar.gz) = 653361fa8d739e0adba788f187ae2545e0a9c510fd7544c31b7fbc25e87e0e2f TIMESTAMP = 1501021609
SIZE (menumaker-0.99.9.tar.gz) = 177303 SHA256 (menumaker-0.99.10.tar.gz) = 7e22db0f0d937d33bb338e03f6eac9aa549b9a790c666e519b13de39de66a4d6
SIZE (menumaker-0.99.10.tar.gz) = 202580

View file

@ -1631,6 +1631,7 @@
SUBDIR += mate-common SUBDIR += mate-common
SUBDIR += matreshka SUBDIR += matreshka
SUBDIR += maven-wrapper SUBDIR += maven-wrapper
SUBDIR += maven
SUBDIR += maven3 SUBDIR += maven3
SUBDIR += maven31 SUBDIR += maven31
SUBDIR += maven33 SUBDIR += maven33
@ -4673,6 +4674,7 @@
SUBDIR += py-pyvalid SUBDIR += py-pyvalid
SUBDIR += py-pyvisa SUBDIR += py-pyvisa
SUBDIR += py-pyvisa-py SUBDIR += py-pyvisa-py
SUBDIR += py-pyxb
SUBDIR += py-pyxml2obj SUBDIR += py-pyxml2obj
SUBDIR += py-qpid SUBDIR += py-qpid
SUBDIR += py-qserve SUBDIR += py-qserve
@ -5448,6 +5450,7 @@
SUBDIR += rubygem-json1 SUBDIR += rubygem-json1
SUBDIR += rubygem-json_pure SUBDIR += rubygem-json_pure
SUBDIR += rubygem-json_pure1 SUBDIR += rubygem-json_pure1
SUBDIR += rubygem-jsonapi-renderer
SUBDIR += rubygem-kafo SUBDIR += rubygem-kafo
SUBDIR += rubygem-kafo_parsers SUBDIR += rubygem-kafo_parsers
SUBDIR += rubygem-kafo_wizards SUBDIR += rubygem-kafo_wizards

View file

@ -2,7 +2,7 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= awscli PORTNAME= awscli
PORTVERSION= 1.11.117 PORTVERSION= 1.11.123
CATEGORIES= devel CATEGORIES= devel
MASTER_SITES= CHEESESHOP MASTER_SITES= CHEESESHOP
@ -12,7 +12,7 @@ COMMENT= Universal Command Line Interface for Amazon Web Services
LICENSE= APACHE20 LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE.txt 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}colorama>=0.2.5:devel/py-colorama \
${PYTHON_PKGNAMEPREFIX}s3transfer>=0.1.9:net/py-s3transfer \ ${PYTHON_PKGNAMEPREFIX}s3transfer>=0.1.9:net/py-s3transfer \
${PYTHON_PKGNAMEPREFIX}docutils>=0.10:textproc/py-docutils \ ${PYTHON_PKGNAMEPREFIX}docutils>=0.10:textproc/py-docutils \

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1499406724 TIMESTAMP = 1500931988
SHA256 (awscli-1.11.117.tar.gz) = 6f77d8d7b990f43795c2fac6117ff56d751ef8f8e71116c5cc7f4ab16a3f4154 SHA256 (awscli-1.11.123.tar.gz) = 74808159d67c31ce00f6ef1ea7a7f15794cc9cc16d23e25689bf18c30de24c48
SIZE (awscli-1.11.117.tar.gz) = 547259 SIZE (awscli-1.11.123.tar.gz) = 548760

View file

@ -2,8 +2,7 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= bullet PORTNAME= bullet
PORTVERSION= 2.83.7 PORTVERSION= 2.86.1
PORTREVISION= 2
CATEGORIES= devel CATEGORIES= devel
MAINTAINER= acm@FreeBSD.org MAINTAINER= acm@FreeBSD.org
@ -24,7 +23,10 @@ USE_XORG= x11
USES= cmake tar:tgz USES= cmake tar:tgz
CMAKE_ARGS= -DBUILD_SHARED_LIBS:BOOL=ON \ CMAKE_ARGS= -DBUILD_SHARED_LIBS:BOOL=ON \
-DINSTALL_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 NOPIE_PORTS= yes

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1472045659 TIMESTAMP = 1500496996
SHA256 (bulletphysics-bullet3-2.83.7_GH0.tar.gz) = 00d1d8f206ee85ffd171643ac8e72f9f4e0bf6dbf3d4ac55f4495cb168b51243 SHA256 (bulletphysics-bullet3-2.86.1_GH0.tar.gz) = c058b2e4321ba6adaa656976c1a138c07b18fc03b29f5b82880d5d8228fbf059
SIZE (bulletphysics-bullet3-2.83.7_GH0.tar.gz) = 18754201 SIZE (bulletphysics-bullet3-2.86.1_GH0.tar.gz) = 26065278

View file

@ -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 <stdlib.h>
#include <stdarg.h>
-#ifndef __APPLE__
-#include <malloc.h>
-#endif //__APPLE__
#include <memory.h>
#include <algorithm>
@@ -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 )

View file

@ -151,7 +151,6 @@ include/bullet/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h
include/bullet/BulletCollision/BroadphaseCollision/btDbvt.h include/bullet/BulletCollision/BroadphaseCollision/btDbvt.h
include/bullet/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h include/bullet/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h
include/bullet/BulletCollision/BroadphaseCollision/btDispatcher.h include/bullet/BulletCollision/BroadphaseCollision/btDispatcher.h
include/bullet/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.h
include/bullet/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h include/bullet/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h
include/bullet/BulletCollision/BroadphaseCollision/btOverlappingPairCallback.h include/bullet/BulletCollision/BroadphaseCollision/btOverlappingPairCallback.h
include/bullet/BulletCollision/BroadphaseCollision/btQuantizedBvh.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/ConstraintSolver/btUniversalConstraint.h
include/bullet/BulletDynamics/Dynamics/btActionInterface.h include/bullet/BulletDynamics/Dynamics/btActionInterface.h
include/bullet/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h include/bullet/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h
include/bullet/BulletDynamics/Dynamics/btDiscreteDynamicsWorldMt.h
include/bullet/BulletDynamics/Dynamics/btDynamicsWorld.h include/bullet/BulletDynamics/Dynamics/btDynamicsWorld.h
include/bullet/BulletDynamics/Dynamics/btRigidBody.h include/bullet/BulletDynamics/Dynamics/btRigidBody.h
include/bullet/BulletDynamics/Dynamics/btSimpleDynamicsWorld.h include/bullet/BulletDynamics/Dynamics/btSimpleDynamicsWorld.h
include/bullet/BulletDynamics/Dynamics/btSimulationIslandManagerMt.h
include/bullet/BulletDynamics/Featherstone/btMultiBody.h include/bullet/BulletDynamics/Featherstone/btMultiBody.h
include/bullet/BulletDynamics/Featherstone/btMultiBodyConstraint.h include/bullet/BulletDynamics/Featherstone/btMultiBodyConstraint.h
include/bullet/BulletDynamics/Featherstone/btMultiBodyConstraintSolver.h include/bullet/BulletDynamics/Featherstone/btMultiBodyConstraintSolver.h
include/bullet/BulletDynamics/Featherstone/btMultiBodyDynamicsWorld.h include/bullet/BulletDynamics/Featherstone/btMultiBodyDynamicsWorld.h
include/bullet/BulletDynamics/Featherstone/btMultiBodyFixedConstraint.h
include/bullet/BulletDynamics/Featherstone/btMultiBodyJointFeedback.h include/bullet/BulletDynamics/Featherstone/btMultiBodyJointFeedback.h
include/bullet/BulletDynamics/Featherstone/btMultiBodyJointLimitConstraint.h include/bullet/BulletDynamics/Featherstone/btMultiBodyJointLimitConstraint.h
include/bullet/BulletDynamics/Featherstone/btMultiBodyJointMotor.h include/bullet/BulletDynamics/Featherstone/btMultiBodyJointMotor.h
include/bullet/BulletDynamics/Featherstone/btMultiBodyLink.h include/bullet/BulletDynamics/Featherstone/btMultiBodyLink.h
include/bullet/BulletDynamics/Featherstone/btMultiBodyLinkCollider.h include/bullet/BulletDynamics/Featherstone/btMultiBodyLinkCollider.h
include/bullet/BulletDynamics/Featherstone/btMultiBodyPoint2Point.h include/bullet/BulletDynamics/Featherstone/btMultiBodyPoint2Point.h
include/bullet/BulletDynamics/Featherstone/btMultiBodySliderConstraint.h
include/bullet/BulletDynamics/Featherstone/btMultiBodySolverConstraint.h include/bullet/BulletDynamics/Featherstone/btMultiBodySolverConstraint.h
include/bullet/BulletDynamics/MLCPSolvers/btDantzigLCP.h include/bullet/BulletDynamics/MLCPSolvers/btDantzigLCP.h
include/bullet/BulletDynamics/MLCPSolvers/btDantzigSolver.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/btVehicleRaycaster.h
include/bullet/BulletDynamics/Vehicle/btWheelInfo.h include/bullet/BulletDynamics/Vehicle/btWheelInfo.h
include/bullet/BulletDynamics/btBulletDynamicsCommon.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/BulletInverseDynamics/btBulletCollisionCommon.h
include/bullet/BulletSoftBody/btDefaultSoftBodySolver.h include/bullet/BulletSoftBody/btDefaultSoftBodySolver.h
include/bullet/BulletSoftBody/btSoftBody.h include/bullet/BulletSoftBody/btSoftBody.h
@ -336,10 +346,43 @@ include/bullet/BulletSoftBody/btSoftBodyInternals.h
include/bullet/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.h include/bullet/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.h
include/bullet/BulletSoftBody/btSoftBodySolverVertexBuffer.h include/bullet/BulletSoftBody/btSoftBodySolverVertexBuffer.h
include/bullet/BulletSoftBody/btSoftBodySolvers.h include/bullet/BulletSoftBody/btSoftBodySolvers.h
include/bullet/BulletSoftBody/btSoftMultiBodyDynamicsWorld.h
include/bullet/BulletSoftBody/btSoftRigidCollisionAlgorithm.h include/bullet/BulletSoftBody/btSoftRigidCollisionAlgorithm.h
include/bullet/BulletSoftBody/btSoftRigidDynamicsWorld.h include/bullet/BulletSoftBody/btSoftRigidDynamicsWorld.h
include/bullet/BulletSoftBody/btSoftSoftCollisionAlgorithm.h include/bullet/BulletSoftBody/btSoftSoftCollisionAlgorithm.h
include/bullet/BulletSoftBody/btSparseSDF.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/btAabbUtil2.h
include/bullet/LinearMath/btAlignedAllocator.h include/bullet/LinearMath/btAlignedAllocator.h
include/bullet/LinearMath/btAlignedObjectArray.h include/bullet/LinearMath/btAlignedObjectArray.h
@ -366,6 +409,7 @@ include/bullet/LinearMath/btScalar.h
include/bullet/LinearMath/btSerializer.h include/bullet/LinearMath/btSerializer.h
include/bullet/LinearMath/btSpatialAlgebra.h include/bullet/LinearMath/btSpatialAlgebra.h
include/bullet/LinearMath/btStackAlloc.h include/bullet/LinearMath/btStackAlloc.h
include/bullet/LinearMath/btThreads.h
include/bullet/LinearMath/btTransform.h include/bullet/LinearMath/btTransform.h
include/bullet/LinearMath/btTransformUtil.h include/bullet/LinearMath/btTransformUtil.h
include/bullet/LinearMath/btVector3.h include/bullet/LinearMath/btVector3.h
@ -374,26 +418,40 @@ include/bullet/btBulletDynamicsCommon.h
lib/cmake/bullet/BulletConfig.cmake lib/cmake/bullet/BulletConfig.cmake
lib/cmake/bullet/UseBullet.cmake lib/cmake/bullet/UseBullet.cmake
lib/libBullet2FileLoader.so lib/libBullet2FileLoader.so
lib/libBullet2FileLoader.so.2.83 lib/libBullet2FileLoader.so.2.86
lib/libBullet3Collision.so lib/libBullet3Collision.so
lib/libBullet3Collision.so.2.83 lib/libBullet3Collision.so.2.86
lib/libBullet3Common.so lib/libBullet3Common.so
lib/libBullet3Common.so.2.83 lib/libBullet3Common.so.2.86
lib/libBullet3Dynamics.so lib/libBullet3Dynamics.so
lib/libBullet3Dynamics.so.2.83 lib/libBullet3Dynamics.so.2.86
lib/libBullet3Geometry.so lib/libBullet3Geometry.so
lib/libBullet3Geometry.so.2.83 lib/libBullet3Geometry.so.2.86
lib/libBullet3OpenCL_clew.so lib/libBullet3OpenCL_clew.so
lib/libBullet3OpenCL_clew.so.2.83 lib/libBullet3OpenCL_clew.so.2.86
lib/libBulletCollision.so lib/libBulletCollision.so
lib/libBulletCollision.so.2.83 lib/libBulletCollision.so.2.86
lib/libBulletDynamics.so 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
lib/libBulletInverseDynamics.so.2.83 lib/libBulletInverseDynamics.so.2.86
lib/libBulletInverseDynamicsUtils.so
lib/libBulletInverseDynamicsUtils.so.2.86
lib/libBulletSoftBody.so 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
lib/libLinearMath.so.2.83 lib/libLinearMath.so.2.86
libdata/pkgconfig/bullet.pc libdata/pkgconfig/bullet.pc
@dir include/bullet/BulletInverseDynamics/details @dir include/bullet/BulletInverseDynamics/details

View file

@ -3,7 +3,7 @@
PORTNAME= efl PORTNAME= efl
PORTVERSION= 1.18.4 PORTVERSION= 1.18.4
PORTREVISION= 6 PORTREVISION= 7
CATEGORIES= devel enlightenment CATEGORIES= devel enlightenment
MASTER_SITES= http://download.enlightenment.org/rel/libs/${PORTNAME}/ MASTER_SITES= http://download.enlightenment.org/rel/libs/${PORTNAME}/
DIST_SUBDIR= enlightenment DIST_SUBDIR= enlightenment

View file

@ -2,7 +2,7 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= gsoap PORTNAME= gsoap
PORTVERSION= 2.8.46 PORTVERSION= 2.8.50
CATEGORIES= devel CATEGORIES= devel
MASTER_SITES= SF/${PORTNAME}2/gsoap-2.8 MASTER_SITES= SF/${PORTNAME}2/gsoap-2.8
DISTNAME= ${PORTNAME}_${PORTVERSION} DISTNAME= ${PORTNAME}_${PORTVERSION}

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1495260869 TIMESTAMP = 1500917106
SHA256 (gsoap_2.8.46.zip) = 3083818fb42b9e7251daf21728132db15354eb8c14060c2dc6949dafbec976be SHA256 (gsoap_2.8.50.zip) = d1225f297963d1336ffaa7557990a2a0c8c7700774baa107ecb5467bfc0a265a
SIZE (gsoap_2.8.46.zip) = 33607528 SIZE (gsoap_2.8.50.zip) = 34688187

View file

@ -1,9 +1,9 @@
--- gsoap/wsdl/Makefile.in.orig 2017-04-08 13:59:08 UTC --- gsoap/wsdl/Makefile.in.orig 2017-07-24 13:25:52.574440000 -0400
+++ gsoap/wsdl/Makefile.in +++ gsoap/wsdl/Makefile.in 2017-07-24 13:26:49.901559000 -0400
@@ -314,7 +314,7 @@ SOAP_FLAGS = -SC -pwsdl -I$(srcdir) -I$( @@ -315,7 +315,7 @@ SOAP_FLAGS = -SC -pwsdl -I$(srcdir) -I$(top_srcdir)/gs
BUILT_SOURCES = $(SOAP_CPP_SRC) BUILT_SOURCES = $(SOAP_CPP_SRC)
wsdl2h_CFLAGS = $(C_DEBUG_FLAGS) $(WSDL2H_EXTRA_FLAGS) wsdl2h_CFLAGS = $(C_DEBUG_FLAGS) $(SOAPCPP2_NO_C_LOCALE) $(WSDL2H_EXTRA_FLAGS)
wsdl2h_CXXFLAGS = $(C_DEBUG_FLAGS) $(WSDL2H_EXTRA_FLAGS) $(WSDL2H_IMPORTPATH) 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) -D$(platform)
+wsdl2h_CPPFLAGS = $(AM_CPPFLAGS) $(SOAPCPP2_NONAMESPACES) $(WSDL2H_IMPORTPATH) -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) 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)

View file

@ -152,6 +152,8 @@ libdata/pkgconfig/gsoapssl.pc
%%DATADIR%%/plugin/cacerts.c %%DATADIR%%/plugin/cacerts.c
%%DATADIR%%/plugin/cacerts.h %%DATADIR%%/plugin/cacerts.h
%%DATADIR%%/plugin/calcrest.h %%DATADIR%%/plugin/calcrest.h
%%DATADIR%%/plugin/curlapi.c
%%DATADIR%%/plugin/curlapi.h
%%DATADIR%%/plugin/httpda.c %%DATADIR%%/plugin/httpda.c
%%DATADIR%%/plugin/httpda.h %%DATADIR%%/plugin/httpda.h
%%DATADIR%%/plugin/httpdatest.c %%DATADIR%%/plugin/httpdatest.c

View file

@ -2,7 +2,7 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= liteide PORTNAME= liteide
PORTVERSION= 32.1 PORTVERSION= 32.2
DISTVERSIONPREFIX= x DISTVERSIONPREFIX= x
CATEGORIES= devel editors CATEGORIES= devel editors

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1500133916 TIMESTAMP = 1500472890
SHA256 (visualfc-liteide-x32.1_GH0.tar.gz) = 3753530fcaa2408eaf048d93d1c8a7113e1795be0176c074ab1cc86306bab4fb SHA256 (visualfc-liteide-x32.2_GH0.tar.gz) = 36c1b9cb8632577ea89e8c955d5f94079245b99f4020d5c350bb9199df3f4a8a
SIZE (visualfc-liteide-x32.1_GH0.tar.gz) = 2365474 SIZE (visualfc-liteide-x32.2_GH0.tar.gz) = 2559354

View file

@ -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

View file

@ -2,6 +2,7 @@ bin/liteide
lib/liteide/libcolorstyle.a lib/liteide/libcolorstyle.a
lib/liteide/libcplusplus.a lib/liteide/libcplusplus.a
lib/liteide/libdiff_match_pitch.a lib/liteide/libdiff_match_pitch.a
lib/liteide/libdlvclient.a
lib/liteide/libdocbrowserapi.a lib/liteide/libdocbrowserapi.a
lib/liteide/libdocumentbrowser.a lib/liteide/libdocumentbrowser.a
lib/liteide/libeditorutil.a lib/liteide/libeditorutil.a
@ -31,6 +32,7 @@ lib/liteide/liblitettyapi.a
lib/liteide/libmimetype.a lib/liteide/libmimetype.a
lib/liteide/libmodelproject.a lib/liteide/libmodelproject.a
lib/liteide/libprocessex.a lib/liteide/libprocessex.a
lib/liteide/libqjsonrpc.a
lib/liteide/libqt_browser.a lib/liteide/libqt_browser.a
lib/liteide/libqtc_editutil.a lib/liteide/libqtc_editutil.a
lib/liteide/libqtc_itemview.a lib/liteide/libqtc_itemview.a

46
devel/maven/Makefile Normal file
View file

@ -0,0 +1,46 @@
# Created by: JonathanChen <jonc@chen.org.nz>
# $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 <bsd.port.mk>

3
devel/maven/distinfo Normal file
View file

@ -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

View file

@ -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 "$@"

5
devel/maven/pkg-descr Normal file
View file

@ -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/

101
devel/maven/pkg-plist Normal file
View file

@ -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

View file

@ -2,7 +2,7 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= Devel-Cover PORTNAME= Devel-Cover
PORTVERSION= 1.25 PORTVERSION= 1.26
CATEGORIES= devel perl5 CATEGORIES= devel perl5
MASTER_SITES= CPAN MASTER_SITES= CPAN
PKGNAMEPREFIX= p5- PKGNAMEPREFIX= p5-

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1494592646 TIMESTAMP = 1500990016
SHA256 (Devel-Cover-1.25.tar.gz) = 4880c4f60dd4589e7853dd98a26564f0ec3f15b0006a6a9567bdf4fa0803fa36 SHA256 (Devel-Cover-1.26.tar.gz) = 6177abce89de2f7b709d0dd300cb787da2d7eb61693b907b47125ea439579244
SIZE (Devel-Cover-1.25.tar.gz) = 204888 SIZE (Devel-Cover-1.26.tar.gz) = 202692

View file

@ -1,7 +1,7 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= MooseX-AttributeShortcuts PORTNAME= MooseX-AttributeShortcuts
PORTVERSION= 0.032 PORTVERSION= 0.033
CATEGORIES= devel perl5 CATEGORIES= devel perl5
MASTER_SITES= CPAN MASTER_SITES= CPAN
PKGNAMEPREFIX= p5- PKGNAMEPREFIX= p5-
@ -15,6 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= p5-Moose>=1.14:devel/p5-Moose \ BUILD_DEPENDS= p5-Moose>=1.14:devel/p5-Moose \
p5-MooseX-Meta-TypeConstraint-Mooish>=0:devel/p5-MooseX-Meta-TypeConstraint-Mooish \ p5-MooseX-Meta-TypeConstraint-Mooish>=0:devel/p5-MooseX-Meta-TypeConstraint-Mooish \
p5-MooseX-Role-Parameterized>=0:devel/p5-MooseX-Role-Parameterized \ 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-Common>=0:devel/p5-MooseX-Types-Common \
p5-MooseX-Types>=0:devel/p5-MooseX-Types \ p5-MooseX-Types>=0:devel/p5-MooseX-Types \
p5-aliased>=0:devel/p5-aliased \ 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-CheckDeps>=0.010:devel/p5-Test-CheckDeps \
p5-Test-Fatal>=0:devel/p5-Test-Fatal \ p5-Test-Fatal>=0:devel/p5-Test-Fatal \
p5-Test-Moose-More>=0.018:devel/p5-Test-Moose-More \ 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 p5-Test-Warn>=0:devel/p5-Test-Warn
NO_ARCH= yes NO_ARCH= yes

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1497527245 TIMESTAMP = 1500990031
SHA256 (MooseX-AttributeShortcuts-0.032.tar.gz) = 0c5e3e39c83ee8857279d56e0f50096b6c2cab71da5db7199dea8461412eac28 SHA256 (MooseX-AttributeShortcuts-0.033.tar.gz) = 3bc349d50bff1fbd78d493449e83d6685a5afc82c75c7f3da206a715eff1257a
SIZE (MooseX-AttributeShortcuts-0.032.tar.gz) = 51099 SIZE (MooseX-AttributeShortcuts-0.033.tar.gz) = 52888

View file

@ -2,7 +2,7 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= botocore PORTNAME= botocore
PORTVERSION= 1.5.80 PORTVERSION= 1.5.86
CATEGORIES= devel python CATEGORIES= devel python
MASTER_SITES= CHEESESHOP MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1499406571 TIMESTAMP = 1500931847
SHA256 (botocore-1.5.80.tar.gz) = cd96808ff204b7e7c9be62f383bd0da2bdfc6ff14c5e691a81a929788662e10f SHA256 (botocore-1.5.86.tar.gz) = e0c8020c9b33c37b4ae09e1e9cd5b172aa1b0e331cf08d53d65ba932c56759d7
SIZE (botocore-1.5.80.tar.gz) = 3680973 SIZE (botocore-1.5.86.tar.gz) = 3691194

View file

@ -2,7 +2,7 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= django-rq PORTNAME= django-rq
PORTVERSION= 0.9.5 PORTVERSION= 0.9.6
DISTVERSIONPREFIX= v DISTVERSIONPREFIX= v
CATEGORIES= devel python CATEGORIES= devel python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@ -16,14 +16,14 @@ TEST_DEPENDS= redis-server:databases/redis
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=1.5:www/py-django18 \ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=1.5:www/py-django18 \
${PYTHON_PKGNAMEPREFIX}rq>=0.5.5:devel/py-rq ${PYTHON_PKGNAMEPREFIX}rq>=0.5.5:devel/py-rq
USE_GITHUB= yes
GH_ACCOUNT= ui
NO_ARCH= yes NO_ARCH= yes
USES= python USES= python
USE_PYTHON= autoplist distutils USE_PYTHON= autoplist distutils
USE_GITHUB= yes
GH_ACCOUNT= ui
TEST_TARGET= test TEST_TARGET= test
.include <bsd.port.mk> .include <bsd.port.mk>

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1489653887 TIMESTAMP = 1501004244
SHA256 (ui-django-rq-v0.9.5_GH0.tar.gz) = 683ee6444f2e21b9150215930044ef4f75bb5c5376919c36a6d401305296a544 SHA256 (ui-django-rq-v0.9.6_GH0.tar.gz) = d3db8102c1a818d58f2c703b9e3176e172b51d1e81212f3a6aab5b9f922e69eb
SIZE (ui-django-rq-v0.9.5_GH0.tar.gz) = 28072 SIZE (ui-django-rq-v0.9.6_GH0.tar.gz) = 28823

27
devel/py-pyxb/Makefile Normal file
View file

@ -0,0 +1,27 @@
# Created by: Jov <amutu@amutu.com>
# $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 <bsd.port.mk>

3
devel/py-pyxb/distinfo Normal file
View file

@ -0,0 +1,3 @@
TIMESTAMP = 1500859900
SHA256 (PyXB-1.2.5.tar.gz) = 4e8f62ee2cfffc37e4f40634ab9c79e0311cfaf28cf4ce5e7f4828ec56e4ff67
SIZE (PyXB-1.2.5.tar.gz) = 8847079

5
devel/py-pyxb/pkg-descr Normal file
View file

@ -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

View file

@ -2,7 +2,7 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= rwt PORTNAME= rwt
PORTVERSION= 2.15.1 PORTVERSION= 3.0
CATEGORIES= devel python CATEGORIES= devel python
MASTER_SITES= CHEESESHOP MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} 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 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pip>=0:devel/py-pip
NO_ARCH= yes NO_ARCH= yes
USE_PYTHON= distutils USE_PYTHON= concurrent distutils
USES= python USES= python
.include <bsd.port.mk> .include <bsd.port.mk>

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1495052893 TIMESTAMP = 1500989989
SHA256 (rwt-2.15.1.tar.gz) = b0abb1c3c1621b2bb33483245a4572a109143764176cd0a0156d50b36549760a SHA256 (rwt-3.0.tar.gz) = 1830f10a733f57176a5b155dfcb8d10ea47e553a76f9dd673fe7b7fe7e0fa147
SIZE (rwt-2.15.1.tar.gz) = 13578 SIZE (rwt-3.0.tar.gz) = 14444

View file

@ -1,7 +1,7 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= aws-sdk-core PORTNAME= aws-sdk-core
PORTVERSION= 2.10.15 PORTVERSION= 2.10.16
CATEGORIES= devel rubygems CATEGORIES= devel rubygems
MASTER_SITES= RG MASTER_SITES= RG

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1500642218 TIMESTAMP = 1500990050
SHA256 (rubygem/aws-sdk-core-2.10.15.gem) = 362c9d45339ec295565d78f0463ecd33545813d22483ba67e4368fd18b95366e SHA256 (rubygem/aws-sdk-core-2.10.16.gem) = 2f84c311eeae54f0a61d18b7d310eb5b69dff983f296ac9b8e62dedc90d7853e
SIZE (rubygem/aws-sdk-core-2.10.15.gem) = 1040384 SIZE (rubygem/aws-sdk-core-2.10.16.gem) = 1040896

View file

@ -1,7 +1,7 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= aws-sdk-resources PORTNAME= aws-sdk-resources
PORTVERSION= 2.10.15 PORTVERSION= 2.10.16
CATEGORIES= devel rubygems CATEGORIES= devel rubygems
MASTER_SITES= RG MASTER_SITES= RG

Some files were not shown because too many files have changed in this diff Show more