aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoop Mast <kwm@rainbow-runner.nl>2017-09-01 19:26:29 +0800
committerKoop Mast <kwm@rainbow-runner.nl>2017-09-01 19:26:29 +0800
commit64ff120725de745c8493211adbc64409733578ec (patch)
tree62aa419f5f28074208d92e0aec18ad7f64262ba1
parentcb43470128200a86454aed535dfe95ea9f36196f (diff)
parent888f61f7aeb3588a49a87dc934f18a25c9ef287d (diff)
downloadfreebsd-ports-gnome-64ff120725de745c8493211adbc64409733578ec.tar.gz
freebsd-ports-gnome-64ff120725de745c8493211adbc64409733578ec.tar.zst
freebsd-ports-gnome-64ff120725de745c8493211adbc64409733578ec.zip
Merge branch 'master' into gnome-3.24
-rw-r--r--GIDs2
-rw-r--r--LEGAL1
-rw-r--r--MOVED2
-rw-r--r--Mk/Uses/kde.mk18
-rw-r--r--Mk/bsd.sites.mk2
-rw-r--r--UIDs2
-rw-r--r--archivers/kf5-karchive/distinfo6
-rw-r--r--archivers/kf5-karchive/pkg-plist1
-rw-r--r--astro/libosmium/Makefile2
-rw-r--r--astro/libosmium/distinfo6
-rw-r--r--astro/xearth/files/freebsd.committers.markers1
-rw-r--r--audio/ctronome/Makefile2
-rw-r--r--audio/musescore/Makefile32
-rw-r--r--audio/musescore/distinfo5
-rw-r--r--audio/musescore/files/patch-CMakeLists.txt79
-rw-r--r--audio/musescore/files/patch-mscore_CMakeLists.txt34
-rw-r--r--audio/musescore/pkg-descr2
-rw-r--r--audio/musescore/pkg-plist36
-rw-r--r--audio/openal-soft/Makefile1
-rw-r--r--audio/shairport-sync/Makefile2
-rw-r--r--audio/shairport-sync/distinfo6
-rw-r--r--benchmarks/nbench/Makefile4
-rw-r--r--benchmarks/nbench/pkg-descr2
-rw-r--r--benchmarks/phoronix-test-suite/Makefile2
-rw-r--r--benchmarks/stress-ng/Makefile2
-rw-r--r--cad/freecad/pkg-descr2
-rw-r--r--cad/stepcode/Makefile8
-rw-r--r--cad/stepcode/files/patch-doc_CMakeLists.txt11
-rw-r--r--cad/stepcode/pkg-plist4
-rw-r--r--converters/p5-Cpanel-JSON-XS/Makefile2
-rw-r--r--converters/p5-Cpanel-JSON-XS/distinfo6
-rw-r--r--databases/erlang-eredis/Makefile3
-rw-r--r--databases/erlang-eredis/distinfo5
-rw-r--r--databases/pg_citus/Makefile10
-rw-r--r--databases/pg_citus/distinfo6
-rw-r--r--databases/pg_citus/pkg-plist43
-rw-r--r--databases/postgresql-plruby/files/patch-extconf.rb11
-rw-r--r--databases/py-apsw/Makefile2
-rw-r--r--databases/py-apsw/distinfo6
-rw-r--r--databases/rocksdb/Makefile2
-rw-r--r--databases/rocksdb/distinfo6
-rw-r--r--databases/rubygem-pghero-rails50/Makefile2
-rw-r--r--databases/rubygem-pghero-rails50/distinfo6
-rw-r--r--databases/rubygem-pghero/Makefile2
-rw-r--r--databases/rubygem-pghero/distinfo6
-rw-r--r--databases/speedtables/Makefile10
-rw-r--r--databases/speedtables/distinfo6
-rw-r--r--databases/zabbix22-libzbxpgsql/Makefile2
-rw-r--r--databases/zabbix3-libzbxpgsql/Makefile2
-rw-r--r--databases/zabbix32-libzbxpgsql/Makefile2
-rw-r--r--deskutils/taskcoach/Makefile6
-rw-r--r--devel/Makefile10
-rw-r--r--devel/R-cran-rlang/Makefile4
-rw-r--r--devel/R-cran-rlang/distinfo6
-rw-r--r--devel/ada-util/Makefile2
-rw-r--r--devel/ada-util/pkg-plist12
-rw-r--r--devel/babeltrace/Makefile2
-rw-r--r--devel/breakpad/Makefile2
-rw-r--r--devel/catch/Makefile2
-rw-r--r--devel/catch/distinfo6
-rw-r--r--devel/cccc/Makefile2
-rw-r--r--devel/cdecl/Makefile2
-rw-r--r--devel/cdecl/distinfo6
-rw-r--r--devel/chromium-gn/Makefile2
-rw-r--r--devel/elixir-conform/Makefile2
-rw-r--r--devel/elixir-conform/distinfo6
-rw-r--r--devel/elixir-conform/pkg-plist2
-rw-r--r--devel/elixir-estree/Makefile3
-rw-r--r--devel/elixir-estree/distinfo6
-rw-r--r--devel/elixir-exprotobuf/Makefile2
-rw-r--r--devel/elixir-exprotobuf/distinfo6
-rw-r--r--devel/elixir-hex/Makefile2
-rw-r--r--devel/elixir-hex/distinfo6
-rw-r--r--devel/erlang-meck/Makefile2
-rw-r--r--devel/erlang-meck/distinfo6
-rw-r--r--devel/gdb/Makefile2
-rw-r--r--devel/glibmm/pkg-descr2
-rw-r--r--devel/gnatcoll/Makefile15
-rw-r--r--devel/grpc/Makefile5
-rw-r--r--devel/hs-ShellCheck/Makefile2
-rw-r--r--devel/jenkins/Makefile2
-rw-r--r--devel/jenkins/distinfo6
-rw-r--r--devel/kf5-extra-cmake-modules/distinfo6
-rw-r--r--devel/kf5-kapidox/distinfo6
-rw-r--r--devel/kf5-kauth/distinfo6
-rw-r--r--devel/kf5-kbookmarks/distinfo6
-rw-r--r--devel/kf5-kcmutils/distinfo6
-rw-r--r--devel/kf5-kconfig/distinfo6
-rw-r--r--devel/kf5-kcoreaddons/distinfo6
-rw-r--r--devel/kf5-kcrash/distinfo6
-rw-r--r--devel/kf5-kdbusaddons/distinfo6
-rw-r--r--devel/kf5-kdeclarative/distinfo6
-rw-r--r--devel/kf5-kdoctools/distinfo6
-rw-r--r--devel/kf5-kdoctools/pkg-plist20
-rw-r--r--devel/kf5-kfilemetadata/distinfo6
-rw-r--r--devel/kf5-ki18n/distinfo6
-rw-r--r--devel/kf5-kidletime/distinfo6
-rw-r--r--devel/kf5-kio/distinfo6
-rw-r--r--devel/kf5-kitemmodels/distinfo6
-rw-r--r--devel/kf5-knewstuff/distinfo6
-rw-r--r--devel/kf5-knotifications/distinfo6
-rw-r--r--devel/kf5-knotifyconfig/distinfo6
-rw-r--r--devel/kf5-kpackage/distinfo6
-rw-r--r--devel/kf5-kparts/distinfo6
-rw-r--r--devel/kf5-kparts/pkg-plist1
-rw-r--r--devel/kf5-kpeople/distinfo6
-rw-r--r--devel/kf5-kpty/distinfo6
-rw-r--r--devel/kf5-kservice/distinfo6
-rw-r--r--devel/kf5-ktexteditor/distinfo6
-rw-r--r--devel/kf5-ktexteditor/pkg-plist1
-rw-r--r--devel/kf5-kunitconversion/distinfo6
-rw-r--r--devel/kf5-solid/distinfo6
-rw-r--r--devel/kf5-threadweaver/distinfo6
-rw-r--r--devel/magit/Makefile5
-rw-r--r--devel/p5-Config-Model/Makefile2
-rw-r--r--devel/p5-Config-Model/distinfo6
-rw-r--r--devel/p5-Locale-libintl/Makefile2
-rw-r--r--devel/p5-Locale-libintl/distinfo6
-rw-r--r--devel/papi/Makefile2
-rw-r--r--devel/pecl-grpc/Makefile2
-rw-r--r--devel/pecl-grpc/distinfo6
-rw-r--r--devel/pecl-grpc/files/patch-src_core_tsi_ssl__transport__security.c (renamed from devel/pecl-grpc/files/patch-src_core_lib_tsi_ssl__transport__security.c)4
-rw-r--r--devel/py-atpublic/Makefile19
-rw-r--r--devel/py-atpublic/distinfo3
-rw-r--r--devel/py-atpublic/pkg-descr5
-rw-r--r--devel/py-flufl.i18n/Makefile19
-rw-r--r--devel/py-flufl.i18n/distinfo3
-rw-r--r--devel/py-flufl.i18n/pkg-descr9
-rw-r--r--devel/py-flufl.lock/Makefile19
-rw-r--r--devel/py-flufl.lock/distinfo3
-rw-r--r--devel/py-flufl.lock/pkg-descr4
-rw-r--r--devel/py-foolscap/Makefile6
-rw-r--r--devel/py-gtfslib/Makefile27
-rw-r--r--devel/py-gtfslib/distinfo3
-rw-r--r--devel/py-gtfslib/pkg-descr4
-rw-r--r--devel/py-lazr.config/Makefile22
-rw-r--r--devel/py-lazr.config/distinfo3
-rw-r--r--devel/py-lazr.config/pkg-descr9
-rw-r--r--devel/py-lazr.delegates/Makefile22
-rw-r--r--devel/py-lazr.delegates/distinfo3
-rw-r--r--devel/py-lazr.delegates/pkg-descr6
-rw-r--r--devel/py-pyqtree/Makefile21
-rw-r--r--devel/py-pyqtree/distinfo3
-rw-r--r--devel/py-pyqtree/pkg-descr6
-rw-r--r--devel/py-pyshp/Makefile20
-rw-r--r--devel/py-pyshp/distinfo3
-rw-r--r--devel/py-pyshp/pkg-descr5
-rw-r--r--devel/py-shapely/Makefile2
-rw-r--r--devel/py-shapely/distinfo6
-rw-r--r--devel/ruby-gems/Makefile2
-rw-r--r--devel/ruby-gems/distinfo6
-rw-r--r--devel/rubygem-aws-sdk-core/Makefile2
-rw-r--r--devel/rubygem-aws-sdk-core/distinfo6
-rw-r--r--devel/rubygem-aws-sdk-resources/Makefile2
-rw-r--r--devel/rubygem-aws-sdk-resources/distinfo6
-rw-r--r--devel/rubygem-aws-sdk/Makefile2
-rw-r--r--devel/rubygem-aws-sdk/distinfo6
-rw-r--r--devel/rubygem-aws-sigv4/Makefile2
-rw-r--r--devel/rubygem-aws-sigv4/distinfo6
-rw-r--r--devel/rubygem-bindata/Makefile2
-rw-r--r--devel/rubygem-bindata/distinfo6
-rw-r--r--devel/rubygem-google-api-client/Makefile5
-rw-r--r--devel/rubygem-google-api-client/distinfo6
-rw-r--r--devel/rubygem-google-api-client010/Makefile3
-rw-r--r--devel/rubygem-mize/Makefile2
-rw-r--r--devel/rubygem-mize/distinfo6
-rw-r--r--devel/rubygem-mmap2/Makefile17
-rw-r--r--devel/rubygem-mmap2/distinfo3
-rw-r--r--devel/rubygem-mmap2/pkg-descr3
-rw-r--r--devel/rubygem-peek/Makefile13
-rw-r--r--devel/rubygem-prometheus-client-mmap/Makefile19
-rw-r--r--devel/rubygem-prometheus-client-mmap/distinfo3
-rw-r--r--devel/rubygem-prometheus-client-mmap/pkg-descr8
-rw-r--r--devel/rubygem-sequel3/Makefile3
-rw-r--r--devel/rubygem-sidekiq-scheduler/Makefile2
-rw-r--r--devel/rubygem-sidekiq-scheduler/distinfo6
-rw-r--r--devel/rubygem-sprockets-rails-rails5/Makefile2
-rw-r--r--devel/rubygem-sprockets-rails-rails5/distinfo6
-rw-r--r--devel/rubygem-sprockets-rails-rails50/Makefile2
-rw-r--r--devel/rubygem-sprockets-rails-rails50/distinfo6
-rw-r--r--devel/rubygem-sprockets-rails/Makefile2
-rw-r--r--devel/rubygem-sprockets-rails/distinfo6
-rw-r--r--devel/sbt/Makefile4
-rw-r--r--devel/sbt/distinfo6
-rw-r--r--devel/zookeeper/Makefile12
-rw-r--r--devel/zookeeper/files/zookeeper.in3
-rw-r--r--devel/zookeeper/pkg-plist6
-rw-r--r--dns/kf5-kdnssd/distinfo6
-rw-r--r--dns/libidn2/Makefile2
-rw-r--r--dns/libidn2/distinfo6
-rw-r--r--dns/libidn2/pkg-plist2
-rw-r--r--editors/mg/Makefile2
-rw-r--r--editors/mg/distinfo6
-rw-r--r--editors/zile/Makefile3
-rw-r--r--editors/zile/distinfo5
-rw-r--r--emulators/open-vm-tools/Makefile11
-rw-r--r--emulators/open-vm-tools/distinfo6
-rw-r--r--emulators/open-vm-tools/files/patch-lib_hgfsServer_hgfsServerLinux.c15
-rw-r--r--emulators/open-vm-tools/files/patch-lib_include_guest__os.h12
-rw-r--r--emulators/open-vm-tools/files/patch-lib_misc_hostinfoPosix.c53
-rw-r--r--emulators/open-vm-tools/files/patch-modules_freebsd_vmmemctl_os.c121
-rw-r--r--emulators/open-vm-tools/files/patch-scripts_freebsd_network10
-rw-r--r--emulators/qemu-sbruno/Makefile1
-rw-r--r--emulators/qemu-sbruno/files/qemu_user_static.in3
-rw-r--r--games/Makefile2
-rw-r--r--games/aklabeth/Makefile37
-rw-r--r--games/aklabeth/distinfo3
-rw-r--r--games/aklabeth/pkg-descr8
-rw-r--r--games/epiphany-game/Makefile42
-rw-r--r--games/epiphany-game/distinfo3
-rw-r--r--games/epiphany-game/pkg-descr6
-rw-r--r--games/flightgear/Makefile2
-rw-r--r--games/flightgear/files/patch-CVE-2017-13709.txt129
-rw-r--r--games/flightgear/files/patch-CVE-2017-8921.txt (renamed from games/flightgear/files/patch-src-Autopilot-route_mgr.cxx)0
-rw-r--r--games/schiff/Makefile17
-rw-r--r--games/sgt-puzzles/Makefile4
-rw-r--r--games/sgt-puzzles/distinfo6
-rw-r--r--german/mythes/Makefile2
-rw-r--r--german/mythes/distinfo6
-rw-r--r--graphics/Makefile1
-rw-r--r--graphics/R-cran-GDD/files/patch-src-Makevars.in12
-rw-r--r--graphics/R-cran-GDD/files/patch-src_Makevars.in10
-rw-r--r--graphics/drm-next-kmod/Makefile37
-rw-r--r--graphics/drm-next-kmod/distinfo3
-rw-r--r--graphics/drm-next-kmod/pkg-descr4
-rw-r--r--graphics/drm-next-kmod/pkg-message10
-rw-r--r--graphics/drm-next-kmod/pkg-plist7
-rw-r--r--graphics/gdk-pixbuf/Makefile4
-rw-r--r--graphics/gdk-pixbuf/pkg-descr2
-rw-r--r--graphics/gdk-pixbuf2/Makefile1
-rw-r--r--graphics/gdk-pixbuf2/pkg-descr2
-rw-r--r--graphics/gnustep-slideshowkit/Makefile4
-rw-r--r--graphics/gpu-firmware-kmod/Makefile17
-rw-r--r--graphics/gpu-firmware-kmod/distinfo6
-rw-r--r--graphics/gpu-firmware-kmod/pkg-plist78
-rw-r--r--graphics/gtk-update-icon-cache/Makefile8
-rw-r--r--graphics/kf5-kimageformats/distinfo6
-rw-r--r--graphics/kf5-kplotting/distinfo6
-rw-r--r--graphics/kf5-prison/distinfo6
-rw-r--r--graphics/poppler/Makefile2
-rw-r--r--graphics/py-toyplot/Makefile8
-rw-r--r--graphics/py-toyplot/distinfo5
-rw-r--r--graphics/tiled/Makefile2
-rw-r--r--graphics/tiled/distinfo6
-rw-r--r--graphics/tiled/pkg-plist1
-rw-r--r--graphics/vigra/Makefile2
-rw-r--r--graphics/vigra/pkg-plist1
-rw-r--r--irc/bitlbee-facebook/Makefile3
-rw-r--r--irc/bitlbee-facebook/distinfo6
-rw-r--r--java/intellij/Makefile4
-rw-r--r--java/intellij/distinfo6
-rw-r--r--java/intellij/pkg-plist18
-rw-r--r--lang/gcc6-devel/Makefile4
-rw-r--r--lang/gcc6-devel/distinfo6
-rw-r--r--lang/kf5-kross/distinfo6
-rw-r--r--lang/perl5-devel/Makefile2
-rw-r--r--lang/perl5.24/Makefile2
-rw-r--r--lang/perl5.26/Makefile2
-rw-r--r--lang/php70/Makefile2
-rw-r--r--lang/php70/distinfo6
-rw-r--r--lang/php71/Makefile2
-rw-r--r--lang/php71/distinfo6
-rw-r--r--lang/scala-docs/Makefile2
-rw-r--r--lang/scala-docs/distinfo6
-rw-r--r--lang/squirrel/Makefile1
-rw-r--r--lang/squirrel/files/patch-git_57ca6c1291
-rw-r--r--mail/Makefile2
-rw-r--r--mail/archiveopteryx-devel/Makefile6
-rw-r--r--mail/archiveopteryx-devel/distinfo5
-rw-r--r--mail/archiveopteryx-devel/files/patch-server_tlsthread.cpp11
-rw-r--r--mail/claws-mail-fancy/Makefile2
-rw-r--r--mail/claws-mail-pdf_viewer/Makefile2
-rw-r--r--mail/claws-mail/Makefile.claws2
-rw-r--r--mail/claws-mail/distinfo6
-rw-r--r--mail/fdm/Makefile3
-rw-r--r--mail/p5-Email-MIME-ContentType/Makefile2
-rw-r--r--mail/p5-Email-MIME-ContentType/distinfo6
-rw-r--r--mail/p5-Email-MIME/Makefile4
-rw-r--r--mail/p5-Email-MIME/distinfo6
-rw-r--r--mail/py-aiosmtpd/Makefile18
-rw-r--r--mail/py-aiosmtpd/distinfo3
-rw-r--r--mail/py-aiosmtpd/pkg-descr5
-rw-r--r--mail/py-flufl.bounce/Makefile20
-rw-r--r--mail/py-flufl.bounce/distinfo3
-rw-r--r--mail/py-flufl.bounce/pkg-descr5
-rw-r--r--math/R-cran-memisc/Makefile6
-rw-r--r--math/R-cran-memisc/distinfo6
-rw-r--r--math/glgraph/pkg-descr2
-rw-r--r--math/ndiff/Makefile2
-rw-r--r--math/pspp/Makefile2
-rw-r--r--math/pspp/distinfo6
-rw-r--r--math/py-keras/Makefile8
-rw-r--r--math/py-keras/distinfo6
-rw-r--r--math/py-sympy/Makefile2
-rw-r--r--math/py-sympy/distinfo6
-rw-r--r--misc/py-tqdm/Makefile6
-rw-r--r--misc/py-tqdm/distinfo6
-rw-r--r--multimedia/kf5-kmediaplayer/distinfo6
-rw-r--r--multimedia/plexmediaserver-plexpass/Makefile4
-rw-r--r--multimedia/plexmediaserver-plexpass/distinfo6
-rw-r--r--net-mgmt/Makefile1
-rw-r--r--net-mgmt/cacti/Makefile2
-rw-r--r--net-mgmt/cacti/distinfo6
-rw-r--r--net-mgmt/cacti/pkg-plist2
-rw-r--r--net-mgmt/monitoring-plugins/Makefile2
-rw-r--r--net-mgmt/monitoring-plugins/files/patch-configure18
-rw-r--r--net-mgmt/monitoring-plugins/files/patch-plugins_check__nagios.c10
-rw-r--r--net-mgmt/monitoring-plugins/files/patch-plugins_check__procs.c107
-rw-r--r--net-mgmt/nagios-check_bacula9/Makefile30
-rw-r--r--net-mgmt/nagios-check_bacula9/distinfo2
-rw-r--r--net-mgmt/nagios-check_bacula9/pkg-descr2
-rw-r--r--net-mgmt/nagios-plugins/Makefile2
-rw-r--r--net-mgmt/nagios-plugins/files/patch-configure27
-rw-r--r--net-mgmt/nagios-plugins/files/patch-plugins_check__http.c17
-rw-r--r--net-mgmt/nagios-plugins/files/patch-plugins_check__nagios.c10
-rw-r--r--net-mgmt/nagios-plugins/files/patch-plugins_check__procs.c107
-rw-r--r--net-mgmt/nagios-plugins/files/patch-plugins_sslutils.c21
-rw-r--r--net-mgmt/nagios4/Makefile5
-rw-r--r--net-mgmt/nagios4/distinfo6
-rw-r--r--net-mgmt/nagios4/files/patch-html_main.php4
-rw-r--r--net-mgmt/pftabled/Makefile45
-rw-r--r--net-mgmt/riemann-c-client/Makefile11
-rw-r--r--net-mgmt/riemann-c-client/distinfo6
-rw-r--r--net-mgmt/riemann-c-client/pkg-plist2
-rw-r--r--net-mgmt/riemann/Makefile51
-rw-r--r--net-mgmt/riemann/distinfo6
-rw-r--r--net-mgmt/riemann/files/riemann.in31
-rw-r--r--net-mgmt/riemann/pkg-plist4
-rw-r--r--net-mgmt/tcpreplay/Makefile12
-rw-r--r--net/asterisk11/Makefile3
-rw-r--r--net/asterisk11/distinfo6
-rw-r--r--net/asterisk13/Makefile3
-rw-r--r--net/asterisk13/distinfo6
-rw-r--r--net/foreman-proxy/pkg-descr2
-rw-r--r--net/haproxy-devel/Makefile2
-rw-r--r--net/haproxy-devel/distinfo6
-rw-r--r--net/haproxy/Makefile2
-rw-r--r--net/haproxy/distinfo6
-rw-r--r--net/kf5-kxmlrpcclient/distinfo6
-rw-r--r--net/librdkafka/Makefile2
-rw-r--r--net/mpd5/pkg-descr2
-rw-r--r--net/p5-Net-Ifconfig-Wrapper/Makefile3
-rw-r--r--net/p5-Net-Ifconfig-Wrapper/distinfo5
-rw-r--r--net/rubygem-fog-google/Makefile2
-rw-r--r--net/rubygem-fog-google/distinfo6
-rw-r--r--net/spideroak/Makefile10
-rw-r--r--net/spideroak/pkg-descr2
-rw-r--r--print/R-cran-knitr/Makefile2
-rw-r--r--print/R-cran-knitr/distinfo6
-rw-r--r--print/pecl-pdflib/Makefile2
-rw-r--r--print/pecl-pdflib/distinfo6
-rw-r--r--security/afl/Makefile2
-rw-r--r--security/afl/distinfo6
-rw-r--r--security/gnupg22/Makefile1
-rw-r--r--security/kf5-kdesu/distinfo6
-rw-r--r--security/libgcrypt/Makefile3
-rw-r--r--security/libgcrypt/distinfo6
-rw-r--r--security/libgcrypt/pkg-plist2
-rw-r--r--security/parano/Makefile9
-rw-r--r--security/pgpin/Makefile7
-rw-r--r--security/pgpin/files/patch-makefile24
-rw-r--r--security/rubygem-gpgr/Makefile7
-rw-r--r--security/rubygem-gpgr/distinfo5
-rw-r--r--security/rubygem-ruby-saml/Makefile2
-rw-r--r--security/rubygem-ruby-saml/distinfo6
-rw-r--r--security/sudo/Makefile3
-rw-r--r--security/sudo/distinfo6
-rw-r--r--security/sudo/files/patch-src_exec__nopty.c35
-rw-r--r--security/sudo/pkg-plist1
-rw-r--r--security/vuxml/vuln.xml133
-rw-r--r--shells/zsh/Makefile2
-rw-r--r--shells/zsh/distinfo10
-rw-r--r--shells/zsh/pkg-plist5
-rw-r--r--sysutils/Makefile6
-rw-r--r--sysutils/acpica-tools/Makefile2
-rw-r--r--sysutils/acpica-tools/distinfo6
-rw-r--r--sysutils/aptly/Makefile22
-rw-r--r--sysutils/aptly/distinfo3
-rw-r--r--sysutils/aptly/pkg-descr6
-rw-r--r--sysutils/azure-agent/Makefile3
-rw-r--r--sysutils/azure-agent/distinfo4
-rw-r--r--sysutils/bacula9-bat/Makefile30
-rw-r--r--sysutils/bacula9-bat/pkg-descr13
-rw-r--r--sysutils/bacula9-bat/pkg-plist4
-rw-r--r--sysutils/bacula9-client-static/Makefile29
-rw-r--r--sysutils/bacula9-client/Makefile18
-rw-r--r--sysutils/bacula9-docs/Makefile26
-rw-r--r--sysutils/bacula9-docs/distinfo3
-rw-r--r--sysutils/bacula9-docs/pkg-descr13
-rw-r--r--sysutils/bacula9-server/Makefile217
-rw-r--r--sysutils/bacula9-server/Makefile.common24
-rw-r--r--sysutils/bacula9-server/distinfo3
-rw-r--r--sysutils/bacula9-server/files/bacula-barcodes51
-rw-r--r--sysutils/bacula9-server/files/bacula-dir.in31
-rw-r--r--sysutils/bacula9-server/files/bacula-fd.in31
-rw-r--r--sysutils/bacula9-server/files/bacula-sd.in31
-rw-r--r--sysutils/bacula9-server/files/chio-bacula200
-rw-r--r--sysutils/bacula9-server/files/patch-src_console_Makefile.in11
-rw-r--r--sysutils/bacula9-server/files/patch-src_dird_Makefile.in11
-rw-r--r--sysutils/bacula9-server/files/patch-src_filed_Makefile.in11
-rw-r--r--sysutils/bacula9-server/files/patch-src_qt-console_bat.pro.in11
-rw-r--r--sysutils/bacula9-server/files/pkg-deinstall.client.in30
-rw-r--r--sysutils/bacula9-server/files/pkg-deinstall.server.in34
-rw-r--r--sysutils/bacula9-server/files/pkg-install.client.in13
-rw-r--r--sysutils/bacula9-server/files/pkg-install.server.in13
-rw-r--r--sysutils/bacula9-server/files/pkg-message.client.in8
-rw-r--r--sysutils/bacula9-server/files/pkg-message.server.in57
-rw-r--r--sysutils/bacula9-server/pkg-descr11
-rw-r--r--sysutils/bacula9-server/pkg-plist92
-rw-r--r--sysutils/bacula9-server/pkg-plist.client20
-rw-r--r--sysutils/bstack/Makefile2
-rw-r--r--sysutils/cbsd/Makefile2
-rw-r--r--sysutils/cbsd/distinfo6
-rw-r--r--sysutils/kf5-baloo/distinfo6
-rw-r--r--sysutils/kf5-baloo/pkg-plist5
-rw-r--r--sysutils/kf5-kwallet/distinfo6
-rw-r--r--sysutils/lr/Makefile2
-rw-r--r--sysutils/lr/distinfo6
-rw-r--r--sysutils/mbgtools/Makefile3
-rw-r--r--sysutils/mbgtools/distinfo5
-rw-r--r--sysutils/mbgtools/files/patch-mbgclock-mbgclock_main.c20
-rw-r--r--sysutils/mbgtools/files/patch-mbgpccyc.h12
-rw-r--r--sysutils/nomad/pkg-descr4
-rw-r--r--sysutils/osquery/Makefile3
-rw-r--r--sysutils/osquery/distinfo10
-rw-r--r--sysutils/osquery/pkg-plist1
-rw-r--r--sysutils/pstack/Makefile2
-rw-r--r--sysutils/pstacku/Makefile2
-rw-r--r--sysutils/screen/Makefile6
-rw-r--r--sysutils/terraform/Makefile2
-rw-r--r--sysutils/terraform/distinfo6
-rw-r--r--sysutils/zap/Makefile11
-rw-r--r--sysutils/zap/distinfo6
-rw-r--r--textproc/Makefile1
-rw-r--r--textproc/elixir-ex_doc/Makefile2
-rw-r--r--textproc/elixir-ex_doc/distinfo6
-rw-r--r--textproc/elixir-ex_doc/pkg-plist5
-rw-r--r--textproc/kdiff3/Makefile2
-rw-r--r--textproc/kf5-kcodecs/distinfo6
-rw-r--r--textproc/kf5-sonnet/distinfo6
-rw-r--r--textproc/kf5-syntax-highlighting/distinfo6
-rw-r--r--textproc/lowdown/Makefile2
-rw-r--r--textproc/lowdown/distinfo6
-rw-r--r--textproc/makepatch/pkg-descr2
-rw-r--r--textproc/p5-Data-FormValidator/Makefile2
-rw-r--r--textproc/p5-Data-FormValidator/distinfo6
-rw-r--r--textproc/p5-Text-BibTeX/Makefile2
-rw-r--r--textproc/p5-Text-BibTeX/distinfo6
-rw-r--r--textproc/py-sphinxcontrib-websupport/Makefile18
-rw-r--r--textproc/py-sphinxcontrib-websupport/distinfo3
-rw-r--r--textproc/py-sphinxcontrib-websupport/pkg-descr4
-rw-r--r--textproc/sk-mythes/Makefile2
-rw-r--r--textproc/sk-mythes/distinfo6
-rw-r--r--textproc/zorba/Makefile2
-rw-r--r--www/R-cran-shiny/Makefile4
-rw-r--r--www/R-cran-shiny/distinfo6
-rw-r--r--www/elixir-maru/Makefile2
-rw-r--r--www/elixir-maru/distinfo6
-rw-r--r--www/elixir-maru/pkg-plist12
-rw-r--r--www/erlang-mochiweb/Makefile2
-rw-r--r--www/erlang-mochiweb/distinfo6
-rw-r--r--www/kcgi/Makefile2
-rw-r--r--www/kcgi/distinfo6
-rw-r--r--www/kf5-kdewebkit/distinfo6
-rw-r--r--www/kf5-khtml/distinfo6
-rw-r--r--www/kf5-kjs/distinfo6
-rw-r--r--www/kf5-kjsembed/distinfo6
-rw-r--r--www/p5-Catalyst-Authentication-Credential-HTTP/Makefile10
-rw-r--r--www/p5-Catalyst-Authentication-Credential-HTTP/distinfo5
-rw-r--r--www/p5-HTML-Tree/Makefile2
-rw-r--r--www/p5-HTML-Tree/distinfo6
-rw-r--r--www/py-bottle/Makefile2
-rw-r--r--www/py-bottle/distinfo5
-rw-r--r--www/py-djangorestframework/Makefile2
-rw-r--r--www/py-djangorestframework/distinfo5
-rw-r--r--www/rubygem-browser/Makefile2
-rw-r--r--www/rubygem-browser/distinfo6
-rw-r--r--www/rubygem-rack-contrib/Makefile2
-rw-r--r--www/rubygem-rack-contrib/distinfo6
-rw-r--r--www/rubygem-rdf/Makefile2
-rw-r--r--www/rubygem-rdf/distinfo6
-rw-r--r--www/tinymce/Makefile2
-rw-r--r--www/tinymce/distinfo6
-rw-r--r--www/yarn/Makefile2
-rw-r--r--x11-fonts/code2000/Makefile1
-rw-r--r--x11-fonts/code2000/pkg-descr2
-rw-r--r--x11-fonts/gnu-unifont-ttf/Makefile31
-rw-r--r--x11-fonts/gnu-unifont-ttf/distinfo9
-rw-r--r--x11-fonts/gnu-unifont-ttf/pkg-plist4
-rw-r--r--x11-fonts/gnu-unifont/Makefile31
-rw-r--r--x11-fonts/gnu-unifont/distinfo5
-rw-r--r--x11-themes/kf5-breeze-icons/distinfo6
-rw-r--r--x11-themes/kf5-breeze-icons/pkg-plist32
-rw-r--r--x11-themes/kf5-kemoticons/distinfo6
-rw-r--r--x11-themes/kf5-kiconthemes/distinfo6
-rw-r--r--x11-themes/kf5-oxygen-icons5/distinfo6
-rw-r--r--x11-toolkits/Makefile3
-rw-r--r--x11-toolkits/gnustep-gui/Makefile3
-rw-r--r--x11-toolkits/gnustep-gui/pkg-plist172
-rw-r--r--x11-toolkits/kf5-attica/distinfo6
-rw-r--r--x11-toolkits/kf5-attica/pkg-plist1
-rw-r--r--x11-toolkits/kf5-kcompletion/distinfo6
-rw-r--r--x11-toolkits/kf5-kconfigwidgets/distinfo6
-rw-r--r--x11-toolkits/kf5-kdesignerplugin/distinfo6
-rw-r--r--x11-toolkits/kf5-kguiaddons/distinfo6
-rw-r--r--x11-toolkits/kf5-kirigami2/Makefile (renamed from x11-toolkits/kirigami2/Makefile)6
-rw-r--r--x11-toolkits/kf5-kirigami2/distinfo3
-rw-r--r--x11-toolkits/kf5-kirigami2/pkg-descr (renamed from x11-toolkits/kirigami/pkg-descr)0
-rw-r--r--x11-toolkits/kf5-kirigami2/pkg-plist (renamed from x11-toolkits/kirigami2/pkg-plist)6
-rw-r--r--x11-toolkits/kf5-kitemviews/distinfo6
-rw-r--r--x11-toolkits/kf5-kjobwidgets/distinfo6
-rw-r--r--x11-toolkits/kf5-ktextwidgets/distinfo6
-rw-r--r--x11-toolkits/kf5-kwidgetsaddons/distinfo6
-rw-r--r--x11-toolkits/kf5-kwidgetsaddons/pkg-plist2
-rw-r--r--x11-toolkits/kf5-kxmlgui/distinfo6
-rw-r--r--x11-toolkits/kirigami/Makefile19
-rw-r--r--x11-toolkits/kirigami/distinfo3
-rw-r--r--x11-toolkits/kirigami/pkg-plist72
-rw-r--r--x11-toolkits/kirigami2/distinfo3
-rw-r--r--x11-toolkits/kirigami2/pkg-descr3
-rw-r--r--x11/kf5-frameworkintegration/distinfo6
-rw-r--r--x11/kf5-kactivities/distinfo6
-rw-r--r--x11/kf5-kded/distinfo6
-rw-r--r--x11/kf5-kdelibs4support/distinfo6
-rw-r--r--x11/kf5-kglobalaccel/distinfo6
-rw-r--r--x11/kf5-kinit/distinfo6
-rw-r--r--x11/kf5-krunner/distinfo6
-rw-r--r--x11/kf5-kwayland/distinfo6
-rw-r--r--x11/kf5-kwindowsystem/distinfo6
-rw-r--r--x11/kf5-plasma-framework/distinfo6
-rw-r--r--x11/kf5-plasma-framework/pkg-plist2
531 files changed, 5063 insertions, 1458 deletions
diff --git a/GIDs b/GIDs
index 41e9ba7c0d51..eeb69ed48cce 100644
--- a/GIDs
+++ b/GIDs
@@ -159,7 +159,7 @@ kyototycoon:*:214:
opendnssec:*:215:
nsd:*:216:
anvil:*:217:
-# free: 218
+zap:*:218:
# free: 219
bs:*:220:
# free: 221
diff --git a/LEGAL b/LEGAL
index 7a9c4a53e6e5..38f6018f40fa 100644
--- a/LEGAL
+++ b/LEGAL
@@ -99,7 +99,6 @@ giftool* graphics/giftool Do not redistribute for profit
gishdemo-* games/gish-demo (c) Copyright 2004 Chronic Logic All rights reserved
gnome2/mcitymicrogui-default* x11-themes/metacity-theme-microgui Themes may contain artwork not done by the author. Keep FreeBSD safe if the theme author violated copyrights
GoogleEarthLinux-* astro/google-earth Not really sure about the redistribution terms
-gpu-firmware-kmod-* graphics/gpu-firmware-kmod Distribution in binary form without license file not allowed.
groupoffice-com-* www/groupoffice Free for personal use only
gsview* print/gsview Can only be distributed for free
HeroesOfMightAndMagic-* games/HeroesOfMightAndMagic Software is commercial
diff --git a/MOVED b/MOVED
index 324d0a355507..31445ac16ff9 100644
--- a/MOVED
+++ b/MOVED
@@ -9524,3 +9524,5 @@ games/xroach||2017-08-23|Has expired: Broken for more than 6 months
java/intellij-pycharm|devel/pycharm-ce|2017-08-23|Renamed to reflect upstream name. Use a more appropriate origin (devel for development tools, IDE)
www/pyweblib|www/py-pyweblib|2017-08-25|Rename to comply with PyPI scheme
databases/libzbxpgsql|databases/zabbix3-libzbxpgsql|2017-08-26|Rename to allow multiple versions of libzbxpgsql to coexist
+x11-toolkits/kirigami||2017-08-28|Not needed by anything
+x11-toolkits/kirigami2|x11-toolkits/kf5-kirigami2|2017-08-28|Became an official framework
diff --git a/Mk/Uses/kde.mk b/Mk/Uses/kde.mk
index e07022f825e0..1dfa96b635e2 100644
--- a/Mk/Uses/kde.mk
+++ b/Mk/Uses/kde.mk
@@ -65,7 +65,7 @@ KDE4_APPLICATIONS_VERSION?= 15.04.3
KDE4_BRANCH?= stable
# Current KDE desktop.
-KDE_FRAMEWORKS_VERSION?= 5.36.0
+KDE_FRAMEWORKS_VERSION?= 5.37.0
KDE_FRAMEWORKS_BRANCH?= stable
# Current KDE applications.
@@ -216,9 +216,9 @@ _USE_KDE4_ALL+= akonadi attica automoc4 ontologies qimageblitz soprano \
# that our list of frameworks matches the structure offered upstream.
_USE_FRAMEWORKS_TIER1= apidox archive attica5 breeze-icons codecs config \
coreaddons dbusaddons dnssd i18n idletime itemmodels \
- itemviews oxygen-icons5 plotting prison solid sonnet \
- syntaxhighlighting threadweaver wayland widgetsaddons \
- windowsystem
+ itemviews kirigami2 oxygen-icons5 plotting prison solid \
+ sonnet syntaxhighlighting threadweaver wayland \
+ widgetsaddons windowsystem
# NOT LISTED TIER1: modemmanagerqt networkmanagerqt (not applicable)
_USE_FRAMEWORKS_TIER2= auth completion crash doctools filemetadata5 \
@@ -240,11 +240,6 @@ _USE_FRAMEWORKS_TIER4= frameworkintegration
# new projects should avoid using these libraries.
_USE_FRAMEWORKS_PORTING=js jsembed kdelibs4support khtml mediaplayer kross
-# These are weird items: not officially released as Frameworks, but
-# required by them (and from KDE).
-# - kirigami https://dot.kde.org/2016/03/30/kde-proudly-presents-kirigami-ui
-_USE_FRAMEWORKS_EXTRA= kirigami kirigami2
-
_USE_FRAMEWORKS_ALL= ecm \
${_USE_FRAMEWORKS_TIER1} \
${_USE_FRAMEWORKS_TIER2} \
@@ -513,10 +508,7 @@ kimageformats_TYPE= run
kio_PORT= devel/kf5-kio
kio_LIB= libKF5KIOCore.so
-kirigami_PORT= x11-toolkits/kirigami
-kirigami_PATH= ${QT_QMLDIR}/org/kde/kirigami/libkirigamiplugin.so
-
-kirigami2_PORT= x11-toolkits/kirigami2
+kirigami2_PORT= x11-toolkits/kf5-kirigami2
kirigami2_PATH= ${QT_QMLDIR}/org/kde/kirigami.2/libkirigamiplugin.so
kross_PORT= lang/kf5-kross
diff --git a/Mk/bsd.sites.mk b/Mk/bsd.sites.mk
index 652b72d3c751..6009dcab85d6 100644
--- a/Mk/bsd.sites.mk
+++ b/Mk/bsd.sites.mk
@@ -570,7 +570,7 @@ post-extract-gh-${_group}:
@${RMDIR} ${WRKSRC}/${GH_SUBDIR_${_group}} 2>/dev/null || :
@${MKDIR} ${WRKSRC}/${GH_SUBDIR_${_group}:H} 2>/dev/null || :
@${MV} ${WRKSRC_${_group}} ${WRKSRC}/${GH_SUBDIR_${_group}}
- @ln -s ${WRKSRC:T}/${GH_SUBDIR_${_group}} ${WRKSRC_${_group}}
+ @${LN} -s ${WRKSRC:T}/${GH_SUBDIR_${_group}} ${WRKSRC_${_group}}
. endif
git-clone: git-clone-${_group}
git-clone-${_group}: ${_GITHUB_CLONE_DIR}
diff --git a/UIDs b/UIDs
index 37b67bd85580..6ab45edaca0e 100644
--- a/UIDs
+++ b/UIDs
@@ -164,7 +164,7 @@ kyototycoon:*:214:214::0:0:kyototycoon user:/var/empty:/usr/sbin/nologin
opendnssec:*:215:215::0:0:Opendnssec Pseudo User:/nonexistent:/usr/sbin/nologin
nsd:*:216:216::0:0:NSD DNS Server:/nonexistent:/usr/sbin/nologin
anvil:*:217:217::0:0:anvil certificate dropper:/var/db/anvil:/bin/sh
-# free: 218
+zap:*:218:218::0:0:zap user:/usr/local/zap:/bin/sh
# free: 219
bs:*:220:220::0:0:Big Sister:/usr/local/bigsister:/bin/sh
# free: 221
diff --git a/archivers/kf5-karchive/distinfo b/archivers/kf5-karchive/distinfo
index 74eed6137a69..cde1f8300b69 100644
--- a/archivers/kf5-karchive/distinfo
+++ b/archivers/kf5-karchive/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499098896
-SHA256 (KDE/frameworks/5.36.0/karchive-5.36.0.tar.xz) = 001c62493990bbaa9ed7d14265c6ae47b827713859b00533161526c08ce62351
-SIZE (KDE/frameworks/5.36.0/karchive-5.36.0.tar.xz) = 112660
+TIMESTAMP = 1502086004
+SHA256 (KDE/frameworks/5.37.0/karchive-5.37.0.tar.xz) = 358648e9615f521e0d8e37f3a8b7c95ee593bf5adbad114601a7b30928a62995
+SIZE (KDE/frameworks/5.37.0/karchive-5.37.0.tar.xz) = 113580
diff --git a/archivers/kf5-karchive/pkg-plist b/archivers/kf5-karchive/pkg-plist
index e3d11ae0703b..6a518bb48bbb 100644
--- a/archivers/kf5-karchive/pkg-plist
+++ b/archivers/kf5-karchive/pkg-plist
@@ -1,3 +1,4 @@
+etc/xdg/karchive.categories
include/KF5/KArchive/K7Zip
include/KF5/KArchive/KAr
include/KF5/KArchive/KArchive
diff --git a/astro/libosmium/Makefile b/astro/libosmium/Makefile
index d1b66f4b9b48..ef834c74d385 100644
--- a/astro/libosmium/Makefile
+++ b/astro/libosmium/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= libosmium
-PORTVERSION= 2.13.0
+PORTVERSION= 2.13.1
DISTVERSIONPREFIX= v
CATEGORIES= astro geography devel
diff --git a/astro/libosmium/distinfo b/astro/libosmium/distinfo
index d0f618989892..a6f45382f2e4 100644
--- a/astro/libosmium/distinfo
+++ b/astro/libosmium/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1503169568
-SHA256 (osmcode-libosmium-v2.13.0_GH0.tar.gz) = 477552a137f3658d7b476c921a3c6d20506ab0526e89defc1c1b21cd0634d168
-SIZE (osmcode-libosmium-v2.13.0_GH0.tar.gz) = 490970
+TIMESTAMP = 1504088485
+SHA256 (osmcode-libosmium-v2.13.1_GH0.tar.gz) = a73cd56838a7438bd9ed208c9ce6794e2d55a1854039c4277a0c160d5071b909
+SIZE (osmcode-libosmium-v2.13.1_GH0.tar.gz) = 493918
diff --git a/astro/xearth/files/freebsd.committers.markers b/astro/xearth/files/freebsd.committers.markers
index 80229eb62117..9d3ce151d43b 100644
--- a/astro/xearth/files/freebsd.committers.markers
+++ b/astro/xearth/files/freebsd.committers.markers
@@ -161,6 +161,7 @@
49.398056, 6.983889, "netchild" # Eppelborn, Germany
50.9953, 6.9175, "se" # Cologne, Germany
51.146552, 6.86970, "lme" # Duesseldorf, Germany
+ 51.22720, 6.80959, "pizzamig" # Duesseldorf, Germany
51.126809, 6.784074, "oliver" # Dormagen, Germany
51.4666, 6.6166, "ticso" # Moers, Germany
51.12, 6.41, "andreas" # Neuss, Germany
diff --git a/audio/ctronome/Makefile b/audio/ctronome/Makefile
index 6f0b9e6154b2..f536f4e90786 100644
--- a/audio/ctronome/Makefile
+++ b/audio/ctronome/Makefile
@@ -6,7 +6,7 @@ PORTVERSION= 0.5.6
CATEGORIES= audio
MASTER_SITES= http://ctronome.kign.org/source/
-MAINTAINER= luca.pizzamiglio@gmail.com
+MAINTAINER= pizzamig@FreeBSD.org
COMMENT= Programmable console-based metronome
LICENSE= GPLv2
diff --git a/audio/musescore/Makefile b/audio/musescore/Makefile
index a610b64bd6a6..0b19cc8ba376 100644
--- a/audio/musescore/Makefile
+++ b/audio/musescore/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= musescore
-PORTVERSION= 2.0.2
-PORTREVISION= 2
+PORTVERSION= 2.1
CATEGORIES= audio
MASTER_SITES= http://ftp.osuosl.org/pub/musescore/releases/MuseScore-${PORTVERSION}/
DISTNAME= MuseScore-${PORTVERSION}
@@ -14,23 +13,29 @@ COMMENT= Free music composition & notation software
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE.GPL
+BROKEN_aarch64= Fails to compile: error: constant expression evaluates to -1
+
LIB_DEPENDS= libmp3lame.so:audio/lame \
libsndfile.so:audio/libsndfile \
- libvorbis.so:audio/libvorbis
+ libvorbis.so:audio/libvorbis \
+ libogg.so:audio/libogg \
+ libfreetype.so:print/freetype2
USES= cmake:outsource compiler:c++11-lib desktop-file-utils \
pkgconfig shared-mime-info zip
-USE_QT5= concurrent designer help network scripttools svg \
- webkit xml xmlpatterns \
+USE_QT5= core gui widgets opengl concurrent designer help network \
+ scripttools qml quick svg sql printsupport testlib webkit \
+ xml xmlpatterns \
buildtools_build linguisttools_build qmake_build uitools_build
ALL_TARGET= lrelease manpages all
+INSTALLS_ICONS= yes
+CMAKE_ARGS+= -DUSE_SYSTEM_FREETYPE="ON"
-DATADIR= ${PREFIX}/share/mscore-${PORTVERSION:R}
+DATADIR= ${PREFIX}/share/mscore-${PORTVERSION}
-BROKEN_aarch64= Fails to compile: error: constant expression evaluates to -1
-
-OPTIONS_DEFINE= ALSA JACK PORTAUDIO PULSEAUDIO
+OPTIONS_DEFINE= ALSA JACK PORTAUDIO PULSEAUDIO OCR
OPTIONS_DEFAULT= PORTAUDIO
+OCR_DESC= Optical Character Recognition
ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib
ALSA_CMAKE_BOOL= BUILD_ALSA
@@ -40,6 +45,7 @@ PORTAUDIO_LIB_DEPENDS= libportaudio.so:audio/portaudio
PORTAUDIO_CMAKE_BOOL= BUILD_PORTAUDIO
PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio
PULSEAUDIO_CMAKE_BOOL= BUILD_PULSEAUDIO
+OCR_CMAKE_BOOL= OCR
.include <bsd.port.pre.mk>
@@ -47,11 +53,15 @@ PULSEAUDIO_CMAKE_BOOL= BUILD_PULSEAUDIO
CXXFLAGS+= -Wno-inconsistent-missing-override
.endif
+post-extract:
+ @${RM} -r ${WRKSRC}/thirdparty/freetype
+
post-patch:
@${FIND} ${WRKSRC} -name "CMakeLists.txt" -print0 | ${XARGS} -0 \
${REINPLACE_CMD} -e \
- '/RELEASE/s|-O2 || ; \
- /COMPILE_FLAGS/s|-g || ; \
+ '/RELEASE/s|-O2 ||; \
+ /COMPILE_FLAGS/s|-g ||; \
+ s|share/man|man|; \
/COMPILE_FLAGS/s|$${PCH_INCLUDE} |-include $${PROJECT_BINARY_DIR}/all.h |'
@${REINPLACE_CMD} -e \
's|<errno.h>|<cerrno>| ; \
diff --git a/audio/musescore/distinfo b/audio/musescore/distinfo
index b34848c8ff50..fd1df05cc458 100644
--- a/audio/musescore/distinfo
+++ b/audio/musescore/distinfo
@@ -1,2 +1,3 @@
-SHA256 (MuseScore-2.0.2.zip) = 21d5339a2a5fa15af6f085a52d3484d2e0d7aee697933150848d19ba6f4764d5
-SIZE (MuseScore-2.0.2.zip) = 47590201
+TIMESTAMP = 1502602140
+SHA256 (MuseScore-2.1.zip) = 51b2fd09d8d0afff84ce6aee0e14854465462616b0ef92ad8dd2325257d3bc12
+SIZE (MuseScore-2.1.zip) = 55072555
diff --git a/audio/musescore/files/patch-CMakeLists.txt b/audio/musescore/files/patch-CMakeLists.txt
deleted file mode 100644
index 71fcf351ed73..000000000000
--- a/audio/musescore/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,79 +0,0 @@
---- CMakeLists.txt.orig 2015-07-16 21:02:34 UTC
-+++ CMakeLists.txt
-@@ -74,6 +74,10 @@ option(HAS_AUDIOFILE "enable audio expor
- option(USE_SYSTEM_QTSINGLEAPPLICATION "Use system QtSingleApplication" OFF)
- option(BUILD_LAME "enable mp3 export" ON) # requires libmp3lame
-
-+option(BUILD_ALSA "Build with support for ALSA." ON)
-+option(BUILD_PORTAUDIO "Build with support for portaudio." ON)
-+option(BUILD_PULSEAUDIO "Build with support for PulseAudio." ON)
-+
- SET(JACK_LONGNAME "jack (jack audio connection kit)")
- SET(JACK_MIN_VERSION "0.98.0")
- option(BUILD_JACK "Build with support for ${JACK_LONGNAME}. jack >= ${JACK_MIN_VERSION} will be needed." ON)
-@@ -194,6 +198,7 @@ endif (APPLE)
- ## alsa >= 1.0.0
- ##
-
-+if (BUILD_ALSA)
- if (APPLE OR MINGW)
- message("Disabling ALSA support due to OS X or MINGW build.")
- set (USE_ALSA 0)
-@@ -208,11 +213,17 @@ else (APPLE OR MINGW)
- set (HAS_MIDI 1)
- endif (NOT ALSA_INCDIR)
- endif (APPLE OR MINGW)
-+else (BUILD_ALSA)
-+ MESSAGE(STATUS "alsa support disabled")
-+ set (USE_ALSA 0)
-+ set (HAS_MIDI 1)
-+endif (BUILD_ALSA)
-
- ##
- ## pulseaudio
- ##
-
-+if (BUILD_PULSEAUDIO)
- if (APPLE OR MINGW)
- set (USE_PULSEAUDIO 0)
- else (APPLE OR MINGW)
-@@ -224,6 +235,10 @@ else (APPLE OR MINGW)
- message("Pulseaudio not found.")
- endif (PULSEAUDIO_FOUND)
- endif (APPLE OR MINGW)
-+else (BUILD_PULSEAUDIO)
-+ MESSAGE(STATUS "PulseAudio support disabled")
-+ set (USE_PULSEAUDIO 0)
-+endif (BUILD_PULSEAUDIO)
-
- ##
- ## lame
-@@ -296,6 +311,7 @@ ENDIF(BUILD_JACK)
- ## portaudio
- ##
-
-+if (BUILD_PORTAUDIO)
- if (MINGW)
- set ( USE_PORTAUDIO 1 )
- set ( USE_PORTMIDI 1 )
-@@ -314,6 +330,11 @@ else (MINGW)
- set (USE_PORTMIDI 0)
- endif (APPLE)
- endif (MINGW)
-+else (BUILD_PORTAUDIO)
-+ MESSAGE(STATUS "portaudio support disabled")
-+ set (USE_PORTAUDIO 0)
-+ set (USE_PORTMIDI 0)
-+endif (BUILD_PORTAUDIO)
-
-
- if (APPLE)
-@@ -431,7 +452,7 @@ if (NOT MINGW AND NOT APPLE)
- )
- endif (GZIP_EXECUTABLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
- # install man pages in either compressed or uncompressed form
-- install( FILES ${MAN_TARGET} DESTINATION share/man/man1 COMPONENT doc)
-+ install( FILES ${MAN_TARGET} DESTINATION man/man1 COMPONENT doc)
- # add .MSCZ and .MSCX to MIME database (informs system that filetypes .MSCZ & .MSCX are MuseScore files)
- install( FILES ${PROJECT_SOURCE_DIR}/build/musescore.xml DESTINATION share/mime/packages COMPONENT doc)
- # Note: must now run "update-mime-database" to apply changes. This is done in the Makefile.
diff --git a/audio/musescore/files/patch-mscore_CMakeLists.txt b/audio/musescore/files/patch-mscore_CMakeLists.txt
index 4371aa3dcfaa..e91e5714dfb7 100644
--- a/audio/musescore/files/patch-mscore_CMakeLists.txt
+++ b/audio/musescore/files/patch-mscore_CMakeLists.txt
@@ -1,20 +1,20 @@
---- mscore/CMakeLists.txt.orig 2015-07-16 21:02:34 UTC
+--- mscore/CMakeLists.txt.orig 2017-04-27 04:14:22 UTC
+++ mscore/CMakeLists.txt
-@@ -474,7 +474,6 @@ else (MINGW)
- ${ALSA_LIB}
- ${QT_LIBRARIES}
- z
-- dl
- pthread
- )
- if (USE_PORTAUDIO)
-@@ -509,9 +508,6 @@ else (MINGW)
+@@ -493,7 +493,6 @@ else (MINGW)
+ ${ALSA_LIB}
+ ${QT_LIBRARIES}
+ z
+- dl
+ pthread
+ )
- # gold does not use indirect shared libraries for symbol resolution, Linux only
- if (NOT APPLE)
-- if(USE_JACK)
-- target_link_libraries(mscore dl)
-- endif(USE_JACK)
- target_link_libraries(mscore rt)
- endif (NOT APPLE)
+@@ -550,9 +549,6 @@ else (MINGW)
+
+ # gold does not use indirect shared libraries for symbol resolution, Linux only
+ if (NOT APPLE)
+- if (USE_JACK)
+- target_link_libraries(mscore dl)
+- endif (USE_JACK)
+ target_link_libraries(mscore rt)
+ endif (NOT APPLE)
diff --git a/audio/musescore/pkg-descr b/audio/musescore/pkg-descr
index 0ea875a962ad..3d7795286941 100644
--- a/audio/musescore/pkg-descr
+++ b/audio/musescore/pkg-descr
@@ -16,4 +16,4 @@ Some highlights:
* Translated in 43 languages
* GNU GPL licensed
-WWW: http://musescore.org/
+WWW: https://musescore.org/
diff --git a/audio/musescore/pkg-plist b/audio/musescore/pkg-plist
index 1ad42297bd12..a9fdf27c3dd2 100644
--- a/audio/musescore/pkg-plist
+++ b/audio/musescore/pkg-plist
@@ -1,11 +1,20 @@
bin/mscore
+bin/musescore
man/man1/mscore.1.gz
+man/man1/musescore.1.gz
share/applications/mscore.desktop
+share/icons/hicolor/128x128/apps/mscore.png
+share/icons/hicolor/16x16/apps/mscore.png
+share/icons/hicolor/24x24/apps/mscore.png
+share/icons/hicolor/32x32/apps/mscore.png
+share/icons/hicolor/48x48/apps/mscore.png
share/icons/hicolor/48x48/mimetypes/application-vnd.recordare.musicxml+xml.png
share/icons/hicolor/48x48/mimetypes/application-vnd.recordare.musicxml.png
share/icons/hicolor/48x48/mimetypes/application-x-musescore+xml.png
share/icons/hicolor/48x48/mimetypes/application-x-musescore.png
+share/icons/hicolor/512x512/apps/mscore.png
share/icons/hicolor/64x64/apps/mscore.png
+share/icons/hicolor/96x96/apps/mscore.png
share/icons/hicolor/scalable/apps/mscore.svg
share/icons/hicolor/scalable/mimetypes/application-vnd.recordare.musicxml+xml.svg
share/icons/hicolor/scalable/mimetypes/application-vnd.recordare.musicxml.svg
@@ -18,6 +27,9 @@ share/mime/packages/musescore.xml
%%DATADIR%%/instruments/instruments.xml
%%DATADIR%%/locale/instruments_af.qm
%%DATADIR%%/locale/instruments_ar.qm
+%%DATADIR%%/locale/instruments_ar_DZ.qm
+%%DATADIR%%/locale/instruments_ar_EG.qm
+%%DATADIR%%/locale/instruments_ar_SD.qm
%%DATADIR%%/locale/instruments_ast.qm
%%DATADIR%%/locale/instruments_be.qm
%%DATADIR%%/locale/instruments_bg.qm
@@ -38,6 +50,8 @@ share/mime/packages/musescore.xml
%%DATADIR%%/locale/instruments_fi.qm
%%DATADIR%%/locale/instruments_fo.qm
%%DATADIR%%/locale/instruments_fr.qm
+%%DATADIR%%/locale/instruments_ga.qm
+%%DATADIR%%/locale/instruments_gd.qm
%%DATADIR%%/locale/instruments_gl.qm
%%DATADIR%%/locale/instruments_he.qm
%%DATADIR%%/locale/instruments_hi_IN.qm
@@ -50,6 +64,7 @@ share/mime/packages/musescore.xml
%%DATADIR%%/locale/instruments_ko.qm
%%DATADIR%%/locale/instruments_lt.qm
%%DATADIR%%/locale/instruments_lv.qm
+%%DATADIR%%/locale/instruments_ml.qm
%%DATADIR%%/locale/instruments_mn_MN.qm
%%DATADIR%%/locale/instruments_nb.qm
%%DATADIR%%/locale/instruments_nl.qm
@@ -62,6 +77,7 @@ share/mime/packages/musescore.xml
%%DATADIR%%/locale/instruments_sk.qm
%%DATADIR%%/locale/instruments_sl.qm
%%DATADIR%%/locale/instruments_sr.qm
+%%DATADIR%%/locale/instruments_sr_RS.qm
%%DATADIR%%/locale/instruments_sv.qm
%%DATADIR%%/locale/instruments_th.qm
%%DATADIR%%/locale/instruments_tr.qm
@@ -73,6 +89,9 @@ share/mime/packages/musescore.xml
%%DATADIR%%/locale/languages.xml
%%DATADIR%%/locale/mscore_af.qm
%%DATADIR%%/locale/mscore_ar.qm
+%%DATADIR%%/locale/mscore_ar_DZ.qm
+%%DATADIR%%/locale/mscore_ar_EG.qm
+%%DATADIR%%/locale/mscore_ar_SD.qm
%%DATADIR%%/locale/mscore_ast.qm
%%DATADIR%%/locale/mscore_be.qm
%%DATADIR%%/locale/mscore_bg.qm
@@ -93,6 +112,8 @@ share/mime/packages/musescore.xml
%%DATADIR%%/locale/mscore_fi.qm
%%DATADIR%%/locale/mscore_fo.qm
%%DATADIR%%/locale/mscore_fr.qm
+%%DATADIR%%/locale/mscore_ga.qm
+%%DATADIR%%/locale/mscore_gd.qm
%%DATADIR%%/locale/mscore_gl.qm
%%DATADIR%%/locale/mscore_he.qm
%%DATADIR%%/locale/mscore_hi_IN.qm
@@ -105,6 +126,7 @@ share/mime/packages/musescore.xml
%%DATADIR%%/locale/mscore_ko.qm
%%DATADIR%%/locale/mscore_lt.qm
%%DATADIR%%/locale/mscore_lv.qm
+%%DATADIR%%/locale/mscore_ml.qm
%%DATADIR%%/locale/mscore_mn_MN.qm
%%DATADIR%%/locale/mscore_nb.qm
%%DATADIR%%/locale/mscore_nl.qm
@@ -117,6 +139,7 @@ share/mime/packages/musescore.xml
%%DATADIR%%/locale/mscore_sk.qm
%%DATADIR%%/locale/mscore_sl.qm
%%DATADIR%%/locale/mscore_sr.qm
+%%DATADIR%%/locale/mscore_sr_RS.qm
%%DATADIR%%/locale/mscore_sv.qm
%%DATADIR%%/locale/mscore_th.qm
%%DATADIR%%/locale/mscore_tr.qm
@@ -146,6 +169,7 @@ share/mime/packages/musescore.xml
%%DATADIR%%/locale/qt_lt.qm
%%DATADIR%%/locale/qt_nb.qm
%%DATADIR%%/locale/qt_nl.qm
+%%DATADIR%%/locale/qt_nl_BE.qm
%%DATADIR%%/locale/qt_pl.qm
%%DATADIR%%/locale/qt_pt.qm
%%DATADIR%%/locale/qt_pt_BR.qm
@@ -208,6 +232,7 @@ share/mime/packages/musescore.xml
%%DATADIR%%/manual/plugins/measure.html
%%DATADIR%%/manual/plugins/measurebase.html
%%DATADIR%%/manual/plugins/mscore.png
+%%DATADIR%%/manual/plugins/mtext.html
%%DATADIR%%/manual/plugins/musescore.html
%%DATADIR%%/manual/plugins/note.html
%%DATADIR%%/manual/plugins/notedot.html
@@ -246,7 +271,6 @@ share/mime/packages/musescore.xml
%%DATADIR%%/manual/plugins/system.html
%%DATADIR%%/manual/plugins/tbox.html
%%DATADIR%%/manual/plugins/tempotext.html
-%%DATADIR%%/manual/plugins/text.html
%%DATADIR%%/manual/plugins/textline.html
%%DATADIR%%/manual/plugins/textlinesegment.html
%%DATADIR%%/manual/plugins/tie.html
@@ -313,7 +337,15 @@ share/mime/packages/musescore.xml
%%DATADIR%%/templates/05-Jazz/02-Big_Band.mscz
%%DATADIR%%/templates/05-Jazz/03-Jazz_Combo.mscz
%%DATADIR%%/templates/06-Popular/01-Rock_Band.mscz
-%%DATADIR%%/templates/07-Band/01-Concert_Band.mscz
+%%DATADIR%%/templates/06-Popular/02-Bluegrass_Band.mscz
+%%DATADIR%%/templates/07-Band_and_Percussion/01-Concert_Band.mscz
+%%DATADIR%%/templates/07-Band_and_Percussion/02-Small_Concert_Band.mscz
+%%DATADIR%%/templates/07-Band_and_Percussion/03-Brass_Band.mscz
+%%DATADIR%%/templates/07-Band_and_Percussion/04-Marching_Band.mscz
+%%DATADIR%%/templates/07-Band_and_Percussion/05-Small_Marching_Band.mscz
+%%DATADIR%%/templates/07-Band_and_Percussion/06-Battery_Percussion.mscz
+%%DATADIR%%/templates/07-Band_and_Percussion/07-Large_Pit_Percussion.mscz
+%%DATADIR%%/templates/07-Band_and_Percussion/08-Small_Pit_Percussion.mscz
%%DATADIR%%/templates/08-Orchestral/01-Classical_Orchestra.mscz
%%DATADIR%%/templates/08-Orchestral/02-Concert_Orchestra.mscz
%%DATADIR%%/templates/08-Orchestral/03-String_Orchestra.mscz
diff --git a/audio/openal-soft/Makefile b/audio/openal-soft/Makefile
index 5c175b5e7ffe..997488400341 100644
--- a/audio/openal-soft/Makefile
+++ b/audio/openal-soft/Makefile
@@ -16,6 +16,7 @@ CONFLICTS= openal-200[0-9]*
USES= tar:bzip2 cmake compiler:c11
USE_LDCONFIG= yes
+LLD_UNSAFE= yes
CMAKE_ARGS= -DSHARE_INSTALL_DIR:STRING=${ETCDIR} \
-DALSOFT_REQUIRE_OSS:BOOL=OFF \
-DALSOFT_REQUIRE_JACK:BOOL=OFF \
diff --git a/audio/shairport-sync/Makefile b/audio/shairport-sync/Makefile
index 7a000979c8ad..51b0ada2b152 100644
--- a/audio/shairport-sync/Makefile
+++ b/audio/shairport-sync/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= shairport-sync
-PORTVERSION= 3.1.1
+DISTVERSION= 3.2d3
CATEGORIES= audio
MAINTAINER= ehaupt@FreeBSD.org
diff --git a/audio/shairport-sync/distinfo b/audio/shairport-sync/distinfo
index 515179898d2a..f02a30efff04 100644
--- a/audio/shairport-sync/distinfo
+++ b/audio/shairport-sync/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1503399505
-SHA256 (mikebrady-shairport-sync-3.1.1_GH0.tar.gz) = 731e23f12ca1d645989843a15259ea0bf4d18adea94cf55f6fcc63d7b55fb53b
-SIZE (mikebrady-shairport-sync-3.1.1_GH0.tar.gz) = 296618
+TIMESTAMP = 1504078550
+SHA256 (mikebrady-shairport-sync-3.2d3_GH0.tar.gz) = fb5b6b03159f74ef5d68270b0c04444b4c62043de4c5c42207e8c0010358c864
+SIZE (mikebrady-shairport-sync-3.2d3_GH0.tar.gz) = 296506
diff --git a/benchmarks/nbench/Makefile b/benchmarks/nbench/Makefile
index 472b713a6855..4dd47ef1e4ca 100644
--- a/benchmarks/nbench/Makefile
+++ b/benchmarks/nbench/Makefile
@@ -4,10 +4,10 @@
PORTNAME= nbench
PORTVERSION= 2.2.3
CATEGORIES= benchmarks
-MASTER_SITES= http://www.tux.org/~mayer/linux/
+MASTER_SITES= http://www.math.utah.edu/~mayer/linux/
DISTNAME= ${PORTNAME}-byte-${PORTVERSION}
-MAINTAINER= luca.pizzamiglio@gmail.com
+MAINTAINER= pizzamig@FreeBSD.org
COMMENT= BYTE Magazine's native benchmarks
ALL_TARGET= # empty
diff --git a/benchmarks/nbench/pkg-descr b/benchmarks/nbench/pkg-descr
index 186eae85b6d9..104a5eded364 100644
--- a/benchmarks/nbench/pkg-descr
+++ b/benchmarks/nbench/pkg-descr
@@ -2,4 +2,4 @@ This is a Linux/Unix port of release 2 of BYTE Magazine's BYTEmark benchmark
program (previously known as BYTE's Native Mode Benchmarks). It is designed
to expose the capabilities of a system's CPU, FPU, and memory system.
-WWW: http://www.tux.org/~mayer/linux/bmark.html
+WWW: http://www.math.utah.edu/~mayer/linux/bmark.html
diff --git a/benchmarks/phoronix-test-suite/Makefile b/benchmarks/phoronix-test-suite/Makefile
index 806c37f9dca6..e21d4f06c64b 100644
--- a/benchmarks/phoronix-test-suite/Makefile
+++ b/benchmarks/phoronix-test-suite/Makefile
@@ -6,7 +6,7 @@ PORTVERSION= 7.0.1
CATEGORIES= benchmarks
MASTER_SITES= http://www.phoronix-test-suite.com/releases/
-MAINTAINER= luca.pizzamiglio@gmail.com
+MAINTAINER= pizzamig@FreeBSD.org
COMMENT= Phoronix Benchmarking Suite
LICENSE= GPLv3
diff --git a/benchmarks/stress-ng/Makefile b/benchmarks/stress-ng/Makefile
index a37a39cb35ae..33b00424601f 100644
--- a/benchmarks/stress-ng/Makefile
+++ b/benchmarks/stress-ng/Makefile
@@ -5,7 +5,7 @@ PORTVERSION= 0.08.10
CATEGORIES= benchmarks
MASTER_SITES= http://kernel.ubuntu.com/~cking/tarballs/stress-ng/
-MAINTAINER= luca.pizzamiglio@gmail.com
+MAINTAINER= pizzamig@FreeBSD.org
COMMENT= Stress test benchmarks
LICENSE= GPLv2+
diff --git a/cad/freecad/pkg-descr b/cad/freecad/pkg-descr
index a4986044f15a..a2551fba5c16 100644
--- a/cad/freecad/pkg-descr
+++ b/cad/freecad/pkg-descr
@@ -13,4 +13,4 @@ without modifying the core system.
FreeCAD is under heavy development and might not be
ready for production use.
-WWW: http://www.freecadweb.org/
+WWW: https://www.freecadweb.org/
diff --git a/cad/stepcode/Makefile b/cad/stepcode/Makefile
index ee9d3d37369e..5f3da757719b 100644
--- a/cad/stepcode/Makefile
+++ b/cad/stepcode/Makefile
@@ -3,8 +3,8 @@
PORTNAME= stepcode
PORTVERSION= 0.8
-PORTREVISION= 1
DISTVERSIONPREFIX= v
+PORTREVISION= 2
CATEGORIES= cad
MAINTAINER= fernando.apesteguia@gmail.com
@@ -15,14 +15,14 @@ LICENSE_FILE= ${WRKSRC}/COPYING
BROKEN_powerpc64= fails to configure: Schema scan for 15926-0002-lifecycle_integration.exp exited with error code 1
+USES= cmake:outsource compiler:c++11-lang
USE_GITHUB= yes
-
USE_LDCONFIG= yes
-
-USES= cmake:outsource compiler:c++11-lang
CMAKE_ARGS+= -DSC_INSTALL_PREFIX=${PREFIX} \
-DSC_BUILD_TYPE=Release
+MANDIRS= ${PREFIX}/man
+
post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/schema_scanner
@(cd ${STAGEDIR}${PREFIX} ; \
diff --git a/cad/stepcode/files/patch-doc_CMakeLists.txt b/cad/stepcode/files/patch-doc_CMakeLists.txt
new file mode 100644
index 000000000000..41ad8ef5bbbb
--- /dev/null
+++ b/cad/stepcode/files/patch-doc_CMakeLists.txt
@@ -0,0 +1,11 @@
+--- doc/CMakeLists.txt.orig 2017-08-29 15:56:46 UTC
++++ doc/CMakeLists.txt
+@@ -4,7 +4,7 @@ set(sc_MANS
+ )
+
+ if(NOT DEFINED MAN_DIR)
+- set(MAN_DIR share/man)
++ set(MAN_DIR man)
+ endif(NOT DEFINED MAN_DIR)
+
+ if(NOT WIN32)
diff --git a/cad/stepcode/pkg-plist b/cad/stepcode/pkg-plist
index 7f955f6852af..78e722bc3905 100644
--- a/cad/stepcode/pkg-plist
+++ b/cad/stepcode/pkg-plist
@@ -114,5 +114,5 @@ lib/libsteplazyfile.so.2.0.0
lib/libsteputils.so
lib/libsteputils.so.2
lib/libsteputils.so.2.0.0
-share/man/man1/exp2cxx.1
-share/man/man1/fedex.1
+man/man1/exp2cxx.1.gz
+man/man1/fedex.1.gz
diff --git a/converters/p5-Cpanel-JSON-XS/Makefile b/converters/p5-Cpanel-JSON-XS/Makefile
index 03f3a577d570..ba172eb62f0a 100644
--- a/converters/p5-Cpanel-JSON-XS/Makefile
+++ b/converters/p5-Cpanel-JSON-XS/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= Cpanel-JSON-XS
-PORTVERSION= 3.0238
+PORTVERSION= 3.0239
CATEGORIES= converters perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:RURBAN
diff --git a/converters/p5-Cpanel-JSON-XS/distinfo b/converters/p5-Cpanel-JSON-XS/distinfo
index 43cb2235b076..5ccf9f192acb 100644
--- a/converters/p5-Cpanel-JSON-XS/distinfo
+++ b/converters/p5-Cpanel-JSON-XS/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1503779931
-SHA256 (Cpanel-JSON-XS-3.0238.tar.gz) = 7b336c22ae301bfb282049d7cf4441caa06aa807967ed0c801a85cbd1870ab7d
-SIZE (Cpanel-JSON-XS-3.0238.tar.gz) = 219345
+TIMESTAMP = 1504024069
+SHA256 (Cpanel-JSON-XS-3.0239.tar.gz) = 93ea089f8fcfa5c1ddbd79bd996de2c876e87ba1f09562fb9f452bf3bced282f
+SIZE (Cpanel-JSON-XS-3.0239.tar.gz) = 219371
diff --git a/databases/erlang-eredis/Makefile b/databases/erlang-eredis/Makefile
index 63f9f5d0fc28..8c57af0c7093 100644
--- a/databases/erlang-eredis/Makefile
+++ b/databases/erlang-eredis/Makefile
@@ -1,9 +1,8 @@
# $FreeBSD$
PORTNAME= eredis
-PORTVERSION= 1.0.8
+PORTVERSION= 1.1.0
DISTVERSIONPREFIX= v
-PORTREVISION= 2
CATEGORIES= databases
PKGNAMEPREFIX= erlang-
diff --git a/databases/erlang-eredis/distinfo b/databases/erlang-eredis/distinfo
index ced1c7c34a48..09bf8200679f 100644
--- a/databases/erlang-eredis/distinfo
+++ b/databases/erlang-eredis/distinfo
@@ -1,2 +1,3 @@
-SHA256 (wooga-eredis-v1.0.8_GH0.tar.gz) = cd75c5b19dca8b23ec998fecf83ea5f0e29f3cb75618a61d3080168c66509b56
-SIZE (wooga-eredis-v1.0.8_GH0.tar.gz) = 124993
+TIMESTAMP = 1503995111
+SHA256 (wooga-eredis-v1.1.0_GH0.tar.gz) = 85557666315eac3c11baec37063a5d9f83057d9da8f99a5f6487584b0cb4ef6a
+SIZE (wooga-eredis-v1.1.0_GH0.tar.gz) = 28173
diff --git a/databases/pg_citus/Makefile b/databases/pg_citus/Makefile
index 9c2c1d314bba..43038adae82e 100644
--- a/databases/pg_citus/Makefile
+++ b/databases/pg_citus/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= citus
-PORTVERSION= 6.2.3
+PORTVERSION= 7.0.0
DISTVERSIONPREFIX= v
CATEGORIES= databases
PKGNAMEPREFIX= pg_
@@ -12,13 +12,13 @@ COMMENT= Horizontally scale Postgresql using sharding and replication
LICENSE= AGPLv3
-USE_GITHUB= yes
-GH_ACCOUNT= citusdata
-
-USES= gmake pgsql:9.5+ autoreconf readline
+USES= gmake pgsql:9.6+ autoreconf readline
WANT_PGSQL= lib server
GNU_CONFIGURE= yes
+USE_GITHUB= yes
+GH_ACCOUNT= citusdata
+
INSTALL_TARGET= install-strip
MAKE_ARGS= INSTALL="${INSTALL} -c"
diff --git a/databases/pg_citus/distinfo b/databases/pg_citus/distinfo
index c045045c1ef9..569f6f31a5df 100644
--- a/databases/pg_citus/distinfo
+++ b/databases/pg_citus/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1500364275
-SHA256 (citusdata-citus-v6.2.3_GH0.tar.gz) = 03ace362e3f23b4f02c05cb567268ad13f64ec1a8de96e5ec0e607af2e3bd67e
-SIZE (citusdata-citus-v6.2.3_GH0.tar.gz) = 2282287
+TIMESTAMP = 1504009654
+SHA256 (citusdata-citus-v7.0.0_GH0.tar.gz) = bdfa80356480ebaa770b54e438fb263b3e524be45492412befd6825199c3c59e
+SIZE (citusdata-citus-v7.0.0_GH0.tar.gz) = 2451397
diff --git a/databases/pg_citus/pkg-plist b/databases/pg_citus/pkg-plist
index ad2d47ebca06..ea65fa40360b 100644
--- a/databases/pg_citus/pkg-plist
+++ b/databases/pg_citus/pkg-plist
@@ -1,4 +1,5 @@
include/postgresql/server/citus_version.h
+include/postgresql/server/distributed/backend_data.h
include/postgresql/server/distributed/citus_clauses.h
include/postgresql/server/distributed/citus_nodefuncs.h
include/postgresql/server/distributed/citus_nodes.h
@@ -6,10 +7,15 @@ include/postgresql/server/distributed/citus_ruleutils.h
include/postgresql/server/distributed/colocation_utils.h
include/postgresql/server/distributed/connection_management.h
include/postgresql/server/distributed/deparse_shard_query.h
+include/postgresql/server/distributed/distributed_deadlock_detection.h
include/postgresql/server/distributed/distribution_column.h
include/postgresql/server/distributed/errormessage.h
include/postgresql/server/distributed/hash_helpers.h
+include/postgresql/server/distributed/insert_select_executor.h
+include/postgresql/server/distributed/insert_select_planner.h
include/postgresql/server/distributed/listutils.h
+include/postgresql/server/distributed/lock_graph.h
+include/postgresql/server/distributed/maintenanced.h
include/postgresql/server/distributed/master_metadata_utility.h
include/postgresql/server/distributed/master_protocol.h
include/postgresql/server/distributed/metadata_cache.h
@@ -22,8 +28,10 @@ include/postgresql/server/distributed/multi_join_order.h
include/postgresql/server/distributed/multi_logical_optimizer.h
include/postgresql/server/distributed/multi_logical_planner.h
include/postgresql/server/distributed/multi_master_planner.h
+include/postgresql/server/distributed/multi_partitioning_utils.h
include/postgresql/server/distributed/multi_physical_planner.h
include/postgresql/server/distributed/multi_planner.h
+include/postgresql/server/distributed/multi_progress.h
include/postgresql/server/distributed/multi_resowner.h
include/postgresql/server/distributed/multi_router_executor.h
include/postgresql/server/distributed/multi_router_planner.h
@@ -34,8 +42,8 @@ include/postgresql/server/distributed/pg_dist_colocation.h
include/postgresql/server/distributed/pg_dist_local_group.h
include/postgresql/server/distributed/pg_dist_node.h
include/postgresql/server/distributed/pg_dist_partition.h
+include/postgresql/server/distributed/pg_dist_placement.h
include/postgresql/server/distributed/pg_dist_shard.h
-include/postgresql/server/distributed/pg_dist_shard_placement.h
include/postgresql/server/distributed/pg_dist_transaction.h
include/postgresql/server/distributed/placement_connection.h
include/postgresql/server/distributed/reference_table_utils.h
@@ -46,9 +54,10 @@ include/postgresql/server/distributed/remote_transaction.h
include/postgresql/server/distributed/resource_lock.h
include/postgresql/server/distributed/shard_pruning.h
include/postgresql/server/distributed/shardinterval_utils.h
+include/postgresql/server/distributed/shared_library_init.h
include/postgresql/server/distributed/task_tracker.h
include/postgresql/server/distributed/task_tracker_protocol.h
-include/postgresql/server/distributed/test_helper_functions.h
+include/postgresql/server/distributed/transaction_identifier.h
include/postgresql/server/distributed/transaction_management.h
include/postgresql/server/distributed/transaction_recovery.h
include/postgresql/server/distributed/transmit.h
@@ -162,5 +171,35 @@ share/postgresql/extension/citus--6.2-2--6.2-3.sql
share/postgresql/extension/citus--6.2-2.sql
share/postgresql/extension/citus--6.2-3--6.2-4.sql
share/postgresql/extension/citus--6.2-3.sql
+share/postgresql/extension/citus--6.2-4--7.0-1.sql
share/postgresql/extension/citus--6.2-4.sql
+share/postgresql/extension/citus--7.0-1--7.0-2.sql
+share/postgresql/extension/citus--7.0-1.sql
+share/postgresql/extension/citus--7.0-10--7.0-11.sql
+share/postgresql/extension/citus--7.0-10.sql
+share/postgresql/extension/citus--7.0-11--7.0-12.sql
+share/postgresql/extension/citus--7.0-11.sql
+share/postgresql/extension/citus--7.0-12--7.0-13.sql
+share/postgresql/extension/citus--7.0-12.sql
+share/postgresql/extension/citus--7.0-13--7.0-14.sql
+share/postgresql/extension/citus--7.0-13.sql
+share/postgresql/extension/citus--7.0-14--7.0-15.sql
+share/postgresql/extension/citus--7.0-14.sql
+share/postgresql/extension/citus--7.0-15.sql
+share/postgresql/extension/citus--7.0-2--7.0-3.sql
+share/postgresql/extension/citus--7.0-2.sql
+share/postgresql/extension/citus--7.0-3--7.0-4.sql
+share/postgresql/extension/citus--7.0-3.sql
+share/postgresql/extension/citus--7.0-4--7.0-5.sql
+share/postgresql/extension/citus--7.0-4.sql
+share/postgresql/extension/citus--7.0-5--7.0-6.sql
+share/postgresql/extension/citus--7.0-5.sql
+share/postgresql/extension/citus--7.0-6--7.0-7.sql
+share/postgresql/extension/citus--7.0-6.sql
+share/postgresql/extension/citus--7.0-7--7.0-8.sql
+share/postgresql/extension/citus--7.0-7.sql
+share/postgresql/extension/citus--7.0-8--7.0-9.sql
+share/postgresql/extension/citus--7.0-8.sql
+share/postgresql/extension/citus--7.0-9--7.0-10.sql
+share/postgresql/extension/citus--7.0-9.sql
share/postgresql/extension/citus.control
diff --git a/databases/postgresql-plruby/files/patch-extconf.rb b/databases/postgresql-plruby/files/patch-extconf.rb
new file mode 100644
index 000000000000..d621ced0e07a
--- /dev/null
+++ b/databases/postgresql-plruby/files/patch-extconf.rb
@@ -0,0 +1,11 @@
+--- extconf.rb.orig 2017-08-31 10:56:23 UTC
++++ extconf.rb
+@@ -122,6 +122,8 @@ end
+ case version_str = `#{pg_config} --version`
+ when /^PostgreSQL ([7-9])\.([0-9]{1,3})(\.[0-9]{1,3})?$/
+ version = 10 * $1.to_i + $2.to_i
++when /^PostgreSQL 10/
++ version = 100
+ else
+ version = 0
+ end
diff --git a/databases/py-apsw/Makefile b/databases/py-apsw/Makefile
index 962e307e5fe7..62dfc51e063f 100644
--- a/databases/py-apsw/Makefile
+++ b/databases/py-apsw/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= apsw
-PORTVERSION= 3.19.3
+PORTVERSION= 3.20.1
DISTVERSIONSUFFIX= -r1
CATEGORIES= databases python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/databases/py-apsw/distinfo b/databases/py-apsw/distinfo
index cb36b1b43d00..f82ebfab0864 100644
--- a/databases/py-apsw/distinfo
+++ b/databases/py-apsw/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1498491568
-SHA256 (rogerbinns-apsw-3.19.3-r1_GH0.tar.gz) = b728a668005a51257a7325d3e640b50e2ff56c541ae7628c558b5015cd5f6a87
-SIZE (rogerbinns-apsw-3.19.3-r1_GH0.tar.gz) = 304921
+TIMESTAMP = 1503939340
+SHA256 (rogerbinns-apsw-3.20.1-r1_GH0.tar.gz) = e23765a0879901eaa02b24e4df0ff77ac4325123617c489dc246447c453d5101
+SIZE (rogerbinns-apsw-3.20.1-r1_GH0.tar.gz) = 305909
diff --git a/databases/rocksdb/Makefile b/databases/rocksdb/Makefile
index d124f1c4e3d9..1e72d66c1d6f 100644
--- a/databases/rocksdb/Makefile
+++ b/databases/rocksdb/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= rocksdb
-PORTVERSION= 5.7.2
+PORTVERSION= 5.7.3
DISTVERSIONPREFIX= ${PORTNAME}-
CATEGORIES= databases
diff --git a/databases/rocksdb/distinfo b/databases/rocksdb/distinfo
index 1b593ed8d226..4507b1b46f4c 100644
--- a/databases/rocksdb/distinfo
+++ b/databases/rocksdb/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1502888630
-SHA256 (facebook-rocksdb-rocksdb-5.7.2_GH0.tar.gz) = 31934ed4e2ab4d08eabd5f68fa625146eba371f8f588350b79e1fee7dd510bcc
-SIZE (facebook-rocksdb-rocksdb-5.7.2_GH0.tar.gz) = 3865166
+TIMESTAMP = 1504161176
+SHA256 (facebook-rocksdb-rocksdb-5.7.3_GH0.tar.gz) = 6256c5d0e95e513f71f5af0a409dab1b3e68f804f12270e687ab195c3ececfd0
+SIZE (facebook-rocksdb-rocksdb-5.7.3_GH0.tar.gz) = 3866209
diff --git a/databases/rubygem-pghero-rails50/Makefile b/databases/rubygem-pghero-rails50/Makefile
index 75237b4ca379..1462631489b0 100644
--- a/databases/rubygem-pghero-rails50/Makefile
+++ b/databases/rubygem-pghero-rails50/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= pghero
-PORTVERSION= 2.0.3
+PORTVERSION= 2.0.4
CATEGORIES= databases rubygems
MASTER_SITES= RG
PKGNAMESUFFIX= -rails50
diff --git a/databases/rubygem-pghero-rails50/distinfo b/databases/rubygem-pghero-rails50/distinfo
index e0ed40f79a9a..182821b89fe2 100644
--- a/databases/rubygem-pghero-rails50/distinfo
+++ b/databases/rubygem-pghero-rails50/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1503577376
-SHA256 (rubygem/pghero-2.0.3.gem) = f178af9fdc3e38395c012909966d37946a5e44f7da69226dae468faab9e320f8
-SIZE (rubygem/pghero-2.0.3.gem) = 272896
+TIMESTAMP = 1504013385
+SHA256 (rubygem/pghero-2.0.4.gem) = 601e1b423e0f3ecfa8f14a459ac74ed0f92f8a61521e8c0e6c9d3a6267390856
+SIZE (rubygem/pghero-2.0.4.gem) = 273920
diff --git a/databases/rubygem-pghero/Makefile b/databases/rubygem-pghero/Makefile
index cc5500e08802..d24b18fa6d42 100644
--- a/databases/rubygem-pghero/Makefile
+++ b/databases/rubygem-pghero/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= pghero
-PORTVERSION= 2.0.3
+PORTVERSION= 2.0.4
CATEGORIES= databases rubygems
MASTER_SITES= RG
diff --git a/databases/rubygem-pghero/distinfo b/databases/rubygem-pghero/distinfo
index ab8fa55f9787..8d0595e03574 100644
--- a/databases/rubygem-pghero/distinfo
+++ b/databases/rubygem-pghero/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1503577371
-SHA256 (rubygem/pghero-2.0.3.gem) = f178af9fdc3e38395c012909966d37946a5e44f7da69226dae468faab9e320f8
-SIZE (rubygem/pghero-2.0.3.gem) = 272896
+TIMESTAMP = 1504013275
+SHA256 (rubygem/pghero-2.0.4.gem) = 601e1b423e0f3ecfa8f14a459ac74ed0f92f8a61521e8c0e6c9d3a6267390856
+SIZE (rubygem/pghero-2.0.4.gem) = 273920
diff --git a/databases/speedtables/Makefile b/databases/speedtables/Makefile
index 9cf625c38eac..11386cee2b93 100644
--- a/databases/speedtables/Makefile
+++ b/databases/speedtables/Makefile
@@ -2,8 +2,8 @@
# $FreeBSD$
PORTNAME= speedtables
-PORTVERSION= 1.13.2
-DISTVERSIONPREFIX= v
+PORTVERSION= 1.13.3
+#DISTVERSIONPREFIX= v
PORTREVISION= 0
CATEGORIES= databases
@@ -34,8 +34,14 @@ PGSQL_LIB_DEPENDS= libpgtcl2.0.0.so:databases/postgresql94-pgtcl
CASSANDRA_CONFIGURE_ON= --with-casstcl=${LOCALBASE}
CASSANDRA_LIB_DEPENDS= libcasstcl.so:databases/casstcl
+post-patch:
+ # https://github.com/flightaware/speedtables/commit/33d3d
+ ${REINPLACE_CMD} -e 's|fixed-defaults|fixed-default|' \
+ ${WRKSRC}/ctables/tests/Makefile.in
+
post-configure:
${CHMOD} a+x ${WRKSRC}/ctable_server/sttp
+
post-install:
${MKDIR} ${STAGEDIR}${DOCSDIR}
cd ${WRKSRC}/ctables/docs/manual && \
diff --git a/databases/speedtables/distinfo b/databases/speedtables/distinfo
index 832ef0739473..89b0b76e7b0b 100644
--- a/databases/speedtables/distinfo
+++ b/databases/speedtables/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1502724394
-SHA256 (flightaware-speedtables-v1.13.2_GH0.tar.gz) = 4897bbce25917e4de796d3a117991e1ad8da2c2d46aa3040f05bf9c9a806e741
-SIZE (flightaware-speedtables-v1.13.2_GH0.tar.gz) = 737351
+TIMESTAMP = 1504255513
+SHA256 (flightaware-speedtables-1.13.3_GH0.tar.gz) = 4cb7e44ffbbfcc8cee3da4b3a7ef454eb6229ebd111be45446323fe11ee81a3b
+SIZE (flightaware-speedtables-1.13.3_GH0.tar.gz) = 737623
diff --git a/databases/zabbix22-libzbxpgsql/Makefile b/databases/zabbix22-libzbxpgsql/Makefile
index 65db8889bbe0..44164352131e 100644
--- a/databases/zabbix22-libzbxpgsql/Makefile
+++ b/databases/zabbix22-libzbxpgsql/Makefile
@@ -32,6 +32,8 @@ USE_LDCONFIG= yes
OPTIONS_DEFINE= EXAMPLES
+PORTSCOUT= skipv:latest,gh-pages
+
do-install:
${INSTALL_LIB} ${WRKSRC}/src/.libs/libzbxpgsql.so ${STAGEDIR}${PREFIX}/lib/libzbxpgsql.so
diff --git a/databases/zabbix3-libzbxpgsql/Makefile b/databases/zabbix3-libzbxpgsql/Makefile
index 9929dc60cec7..f0a953772670 100644
--- a/databases/zabbix3-libzbxpgsql/Makefile
+++ b/databases/zabbix3-libzbxpgsql/Makefile
@@ -32,6 +32,8 @@ USE_LDCONFIG= yes
OPTIONS_DEFINE= EXAMPLES
+PORTSCOUT= skipv:latest,gh-pages
+
do-install:
${INSTALL_LIB} ${WRKSRC}/src/.libs/libzbxpgsql.so ${STAGEDIR}${PREFIX}/lib/libzbxpgsql.so
diff --git a/databases/zabbix32-libzbxpgsql/Makefile b/databases/zabbix32-libzbxpgsql/Makefile
index f7d8a887c39e..3e36971a116d 100644
--- a/databases/zabbix32-libzbxpgsql/Makefile
+++ b/databases/zabbix32-libzbxpgsql/Makefile
@@ -32,6 +32,8 @@ USE_LDCONFIG= yes
OPTIONS_DEFINE= EXAMPLES
+PORTSCOUT= skipv:latest,gh-pages
+
do-install:
${INSTALL_LIB} ${WRKSRC}/src/.libs/libzbxpgsql.so ${STAGEDIR}${PREFIX}/lib/libzbxpgsql.so
diff --git a/deskutils/taskcoach/Makefile b/deskutils/taskcoach/Makefile
index 485761865a2b..69f6f40b5218 100644
--- a/deskutils/taskcoach/Makefile
+++ b/deskutils/taskcoach/Makefile
@@ -2,7 +2,7 @@
PORTNAME= taskcoach
PORTVERSION= 1.4.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= deskutils python
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/Release-${PORTVERSION}
DISTNAME= TaskCoach-${PORTVERSION}
@@ -13,8 +13,10 @@ COMMENT= Friendly task manager
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted
+
NO_ARCH= yes
-USES= python shebangfix twisted
+USES= python shebangfix
USE_PYTHON= distutils
PYDISTUTILS_EGGINFO=${DISTNAME}-py${PYTHON_VER}.egg-info
USE_WX= 3.0+
diff --git a/devel/Makefile b/devel/Makefile
index ec3850960df2..66038d33d672 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -4224,6 +4224,7 @@
SUBDIR += py-atomiclong
SUBDIR += py-atomicwrites
SUBDIR += py-attrs
+ SUBDIR += py-atpublic
SUBDIR += py-automaton
SUBDIR += py-avro
SUBDIR += py-babel
@@ -4378,6 +4379,8 @@
SUBDIR += py-flake8-quotes
SUBDIR += py-flask-babel
SUBDIR += py-flexmock
+ SUBDIR += py-flufl.i18n
+ SUBDIR += py-flufl.lock
SUBDIR += py-foolscap
SUBDIR += py-fortran
SUBDIR += py-freebsd
@@ -4422,6 +4425,7 @@
SUBDIR += py-grizzled
SUBDIR += py-grouch
SUBDIR += py-grpcio
+ SUBDIR += py-gtfslib
SUBDIR += py-gyp
SUBDIR += py-hash_ring
SUBDIR += py-hghooks
@@ -4491,6 +4495,8 @@
SUBDIR += py-kjbuckets
SUBDIR += py-kqueue
SUBDIR += py-krosspython
+ SUBDIR += py-lazr.config
+ SUBDIR += py-lazr.delegates
SUBDIR += py-lazy
SUBDIR += py-lazy-object-proxy
SUBDIR += py-levenshtein
@@ -4680,10 +4686,12 @@
SUBDIR += py-pyperclip
SUBDIR += py-pypugjs
SUBDIR += py-pyqi
+ SUBDIR += py-pyqtree
SUBDIR += py-pyral
SUBDIR += py-pyrfc3339
SUBDIR += py-pyro
SUBDIR += py-pyshapelib
+ SUBDIR += py-pyshp
SUBDIR += py-pysparklines
SUBDIR += py-pystorm
SUBDIR += py-pyte
@@ -5549,6 +5557,7 @@
SUBDIR += rubygem-mixlib-shellout
SUBDIR += rubygem-mize
SUBDIR += rubygem-mkrf
+ SUBDIR += rubygem-mmap2
SUBDIR += rubygem-mocha
SUBDIR += rubygem-moneta
SUBDIR += rubygem-moneta06
@@ -5619,6 +5628,7 @@
SUBDIR += rubygem-pqueue
SUBDIR += rubygem-progressbar
SUBDIR += rubygem-progressbar09
+ SUBDIR += rubygem-prometheus-client-mmap
SUBDIR += rubygem-protected_attributes
SUBDIR += rubygem-protocol
SUBDIR += rubygem-pry
diff --git a/devel/R-cran-rlang/Makefile b/devel/R-cran-rlang/Makefile
index c7b675593cfe..65c42c43d2fe 100644
--- a/devel/R-cran-rlang/Makefile
+++ b/devel/R-cran-rlang/Makefile
@@ -2,9 +2,9 @@
# $FreeBSD$
PORTNAME= rlang
-PORTVERSION= 0.1.1
+PORTVERSION= 0.1.2
CATEGORIES= devel
-DISTNAME= ${PORTNAME}_${DISTVERSION}
+DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= tota@FreeBSD.org
COMMENT= Functions for Base Types and Core R and 'Tidyverse' Features
diff --git a/devel/R-cran-rlang/distinfo b/devel/R-cran-rlang/distinfo
index f39df1158eb2..d28eda0bec58 100644
--- a/devel/R-cran-rlang/distinfo
+++ b/devel/R-cran-rlang/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495156170
-SHA256 (rlang_0.1.1.tar.gz) = 5901f95d68728a7d9bb1c2373a20ce6e4ad222f66e397e7735e9eff987c73c3f
-SIZE (rlang_0.1.1.tar.gz) = 201419
+TIMESTAMP = 1503919963
+SHA256 (rlang_0.1.2.tar.gz) = 90cfcd88cae6fff044fca64b24a8e6bdc09fc276163b518ff2d90268b0c785f9
+SIZE (rlang_0.1.2.tar.gz) = 201336
diff --git a/devel/ada-util/Makefile b/devel/ada-util/Makefile
index 60e44769f969..a6f230fdf305 100644
--- a/devel/ada-util/Makefile
+++ b/devel/ada-util/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ada-util
PORTVERSION= 1.8.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel
MAINTAINER= ports@FreeBSD.org
diff --git a/devel/ada-util/pkg-plist b/devel/ada-util/pkg-plist
index f425f00b6490..562d6cd39573 100644
--- a/devel/ada-util/pkg-plist
+++ b/devel/ada-util/pkg-plist
@@ -186,29 +186,41 @@ include/util.static/util-texts-transforms.ads
include/util.static/util-texts.ads
include/util.static/util.ads
include/util_http_curl.static/util-http-clients-curl-constants.ads
+include/util_http_curl.static/util-http-clients-curl.adb
include/util_http_curl.static/util-http-clients-curl.ads
include/util_unit.static/ahven-astrings.ads
include/util_unit.static/ahven-framework.adb
include/util_unit.static/ahven-framework.ads
+include/util_unit.static/ahven-listeners-basic.adb
include/util_unit.static/ahven-listeners-basic.ads
+include/util_unit.static/ahven-listeners.adb
include/util_unit.static/ahven-listeners.ads
include/util_unit.static/ahven-long_astrings.ads
+include/util_unit.static/ahven-parameters.adb
include/util_unit.static/ahven-parameters.ads
+include/util_unit.static/ahven-results.adb
include/util_unit.static/ahven-results.ads
+include/util_unit.static/ahven-runner.adb
include/util_unit.static/ahven-runner.ads
include/util_unit.static/ahven-slist.adb
include/util_unit.static/ahven-slist.ads
+include/util_unit.static/ahven-tap_runner.adb
include/util_unit.static/ahven-tap_runner.ads
+include/util_unit.static/ahven-temporary_output.adb
include/util_unit.static/ahven-temporary_output.ads
+include/util_unit.static/ahven-text_runner.adb
include/util_unit.static/ahven-text_runner.ads
+include/util_unit.static/ahven-xml_runner.adb
include/util_unit.static/ahven-xml_runner.ads
include/util_unit.static/ahven.adb
include/util_unit.static/ahven.ads
+include/util_unit.static/ahven_compat.adb
include/util_unit.static/ahven_compat.ads
include/util_unit.static/util-assertions.adb
include/util_unit.static/util-assertions.ads
include/util_unit.static/util-test_caller.adb
include/util_unit.static/util-test_caller.ads
+include/util_unit.static/util-tests-servers.adb
include/util_unit.static/util-tests-servers.ads
include/util_unit.static/util-tests.adb
include/util_unit.static/util-tests.ads
diff --git a/devel/babeltrace/Makefile b/devel/babeltrace/Makefile
index 14ad32b4d9d6..214cd19ad030 100644
--- a/devel/babeltrace/Makefile
+++ b/devel/babeltrace/Makefile
@@ -5,7 +5,7 @@ PORTVERSION= 1.5.3
DISTVERSIONPREFIX= v
CATEGORIES= devel
-MAINTAINER= luca.pizzamiglio@gmail.com
+MAINTAINER= pizzamig@FreeBSD.org
COMMENT= Tool and library to read, write and convert execution traces
# license is complicated
diff --git a/devel/breakpad/Makefile b/devel/breakpad/Makefile
index a5e54c6682a6..0ce43eabfd52 100644
--- a/devel/breakpad/Makefile
+++ b/devel/breakpad/Makefile
@@ -5,7 +5,7 @@ PORTNAME= breakpad
DISTVERSION= g20170811
CATEGORIES= devel
-MAINTAINER= luca.pizzamiglio@gmail.com
+MAINTAINER= pizzamig@FreeBSD.org
COMMENT= Client/server based crash-reporting system
LICENSE= BSD3CLAUSE
diff --git a/devel/catch/Makefile b/devel/catch/Makefile
index 43cb60711ce2..8fe439f15aef 100644
--- a/devel/catch/Makefile
+++ b/devel/catch/Makefile
@@ -3,7 +3,7 @@
PORTNAME= catch
DISTVERSIONPREFIX= v
-DISTVERSION= 1.9.7
+DISTVERSION= 1.10.0
CATEGORIES= devel
MAINTAINER= gahr@FreeBSD.org
diff --git a/devel/catch/distinfo b/devel/catch/distinfo
index 28baa3e4b508..e21d21aeb5dd 100644
--- a/devel/catch/distinfo
+++ b/devel/catch/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1502725581
-SHA256 (philsquared-Catch-v1.9.7_GH0.tar.gz) = 751090d755072777c5bb98de6ead1f7919ea239d4b77bb028fb7b06624ec0d7a
-SIZE (philsquared-Catch-v1.9.7_GH0.tar.gz) = 371816
+TIMESTAMP = 1503937652
+SHA256 (philsquared-Catch-v1.10.0_GH0.tar.gz) = cb752cbc8033d7c967d6bd7bc3eed428f6d05f2511945db819d4a18a46853ada
+SIZE (philsquared-Catch-v1.10.0_GH0.tar.gz) = 375205
diff --git a/devel/cccc/Makefile b/devel/cccc/Makefile
index eb7b06dfb45d..50f885dc8666 100644
--- a/devel/cccc/Makefile
+++ b/devel/cccc/Makefile
@@ -7,7 +7,7 @@ PORTREVISION= 2
CATEGORIES= devel textproc www
MASTER_SITES= SF
-MAINTAINER= luca.pizzamiglio@gmail.com
+MAINTAINER= pizzamig@FreeBSD.org
COMMENT= C and C++ Code Counter
LICENSE= GPLv2+
diff --git a/devel/cdecl/Makefile b/devel/cdecl/Makefile
index f06528034cba..6e2b1b998f2e 100644
--- a/devel/cdecl/Makefile
+++ b/devel/cdecl/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= cdecl
-PORTVERSION= 3.5
+PORTVERSION= 3.6
DISTVERSIONPREFIX= ${PORTNAME}-
CATEGORIES= devel
diff --git a/devel/cdecl/distinfo b/devel/cdecl/distinfo
index 57b351ae5ed1..1dfe8c8800e1 100644
--- a/devel/cdecl/distinfo
+++ b/devel/cdecl/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1503804275
-SHA256 (paul-j-lucas-cdecl-cdecl-3.5_GH0.tar.gz) = 1fc53b9b27a9127012fd038a9f384c86301d30586aa76489861c5e64b09f4c25
-SIZE (paul-j-lucas-cdecl-cdecl-3.5_GH0.tar.gz) = 243682
+TIMESTAMP = 1504116068
+SHA256 (paul-j-lucas-cdecl-cdecl-3.6_GH0.tar.gz) = 3f7da9a56e92c7e636e59e846f78d6fb3f9e9e2bbf05ef699e21f7f6c22a2e9c
+SIZE (paul-j-lucas-cdecl-cdecl-3.6_GH0.tar.gz) = 243968
diff --git a/devel/chromium-gn/Makefile b/devel/chromium-gn/Makefile
index 4d04d524e4a3..78d52dfeb5b3 100644
--- a/devel/chromium-gn/Makefile
+++ b/devel/chromium-gn/Makefile
@@ -3,7 +3,7 @@
CATEGORIES= devel www
PKGNAMESUFFIX= -gn
-MAINTAINER= luca.pizzamiglio@gmail.com
+MAINTAINER= pizzamig@FreeBSD.org
COMMENT= Gn meta build framework
MASTERDIR= ${.CURDIR}/../../www/chromium
diff --git a/devel/elixir-conform/Makefile b/devel/elixir-conform/Makefile
index 61a59a70cd6b..324648ed4b83 100644
--- a/devel/elixir-conform/Makefile
+++ b/devel/elixir-conform/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= conform
-DISTVERSION= 2.5.0
+DISTVERSION= 2.5.2
CATEGORIES= devel
PKGNAMEPREFIX= elixir-
diff --git a/devel/elixir-conform/distinfo b/devel/elixir-conform/distinfo
index a85e245fe0f8..64a45f9ec547 100644
--- a/devel/elixir-conform/distinfo
+++ b/devel/elixir-conform/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1502265846
-SHA256 (bitwalker-conform-2.5.0_GH0.tar.gz) = a9849be1053703af6b052e2ded76d4c148d54a93530eaa966685cea91affca31
-SIZE (bitwalker-conform-2.5.0_GH0.tar.gz) = 313620
+TIMESTAMP = 1504013533
+SHA256 (bitwalker-conform-2.5.2_GH0.tar.gz) = a9b5004ee941e77a9472bfab720640140f296fbdf4d9ff8b7637381add09ce70
+SIZE (bitwalker-conform-2.5.2_GH0.tar.gz) = 315587
diff --git a/devel/elixir-conform/pkg-plist b/devel/elixir-conform/pkg-plist
index d845ac7a2043..3b9b86ccdba5 100644
--- a/devel/elixir-conform/pkg-plist
+++ b/devel/elixir-conform/pkg-plist
@@ -45,7 +45,7 @@ lib/elixir/lib/conform/lib/mix/tasks/conform.configure.ex
lib/elixir/lib/conform/lib/mix/tasks/conform.effective.ex
lib/elixir/lib/conform/lib/mix/tasks/conform.new.ex
lib/elixir/lib/conform/priv/bin/conform
+lib/elixir/lib/conform/priv/bin/post_configure.sh
lib/elixir/lib/conform/priv/bin/post_upgrade.sh
-lib/elixir/lib/conform/priv/bin/pre_configure.sh
lib/elixir/lib/conform/priv/bin/pre_upgrade.sh
%%PORTDOCS%%%%DOCSDIR%%/README.md
diff --git a/devel/elixir-estree/Makefile b/devel/elixir-estree/Makefile
index db4b8509a208..8cf948b49d16 100644
--- a/devel/elixir-estree/Makefile
+++ b/devel/elixir-estree/Makefile
@@ -1,7 +1,8 @@
# $FreeBSD$
PORTNAME= elixir-estree
-PORTVERSION= 2.6.0
+PORTVERSION= 2.6.1
+DISTVERSIONPREFIX= v
CATEGORIES= devel
MAINTAINER= olgeni@FreeBSD.org
diff --git a/devel/elixir-estree/distinfo b/devel/elixir-estree/distinfo
index 4bd27c265989..30fda7bfd1e1 100644
--- a/devel/elixir-estree/distinfo
+++ b/devel/elixir-estree/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1493099964
-SHA256 (bryanjos-elixir-estree-2.6.0_GH0.tar.gz) = 869894f316a4bf4cba1fa8f689949e0d5ed4fa697857ee2b0691fb541eac880e
-SIZE (bryanjos-elixir-estree-2.6.0_GH0.tar.gz) = 31682
+TIMESTAMP = 1504013443
+SHA256 (bryanjos-elixir-estree-v2.6.1_GH0.tar.gz) = 4be1a81c363c75ae1a68081587df55b34e36020737517d3aab8e940d46c43665
+SIZE (bryanjos-elixir-estree-v2.6.1_GH0.tar.gz) = 31628
diff --git a/devel/elixir-exprotobuf/Makefile b/devel/elixir-exprotobuf/Makefile
index c3426ab0fc88..bb0e9cb13510 100644
--- a/devel/elixir-exprotobuf/Makefile
+++ b/devel/elixir-exprotobuf/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= exprotobuf
-DISTVERSION= 1.2.8
+DISTVERSION= 1.2.9
CATEGORIES= devel
PKGNAMEPREFIX= elixir-
diff --git a/devel/elixir-exprotobuf/distinfo b/devel/elixir-exprotobuf/distinfo
index a31fd622fab9..66e7ea803f9b 100644
--- a/devel/elixir-exprotobuf/distinfo
+++ b/devel/elixir-exprotobuf/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499078564
-SHA256 (bitwalker-exprotobuf-1.2.8_GH0.tar.gz) = 14e67c9c91db4d1f13cf1e1394180479d81964a3a3ff93468a8d273a80ba33f5
-SIZE (bitwalker-exprotobuf-1.2.8_GH0.tar.gz) = 23686
+TIMESTAMP = 1504057915
+SHA256 (bitwalker-exprotobuf-1.2.9_GH0.tar.gz) = 73adb464a9d38e0bc1e9eec02ef5197022ff422a527905e8e628040e1614e25b
+SIZE (bitwalker-exprotobuf-1.2.9_GH0.tar.gz) = 23482
diff --git a/devel/elixir-hex/Makefile b/devel/elixir-hex/Makefile
index ecf701a47b3b..15f3a2cc95b5 100644
--- a/devel/elixir-hex/Makefile
+++ b/devel/elixir-hex/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= hex
-PORTVERSION= 0.17.0
+PORTVERSION= 0.17.1
DISTVERSIONPREFIX= v
CATEGORIES= devel
PKGNAMEPREFIX= elixir-
diff --git a/devel/elixir-hex/distinfo b/devel/elixir-hex/distinfo
index 29e06714091e..cf092a0188ed 100644
--- a/devel/elixir-hex/distinfo
+++ b/devel/elixir-hex/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1503922759
-SHA256 (hexpm-hex-v0.17.0_GH0.tar.gz) = ad5f7851ac7924ee792d77d93ac0fd8110af2639be397e814bc827eeb1c10f5c
-SIZE (hexpm-hex-v0.17.0_GH0.tar.gz) = 275167
+TIMESTAMP = 1504040213
+SHA256 (hexpm-hex-v0.17.1_GH0.tar.gz) = a68ac287567dbeb5b2a9af7439daac11c6380bfddf75e23dd5cde807a9c6164f
+SIZE (hexpm-hex-v0.17.1_GH0.tar.gz) = 275759
diff --git a/devel/erlang-meck/Makefile b/devel/erlang-meck/Makefile
index 55214d0133c8..cb61c81fd379 100644
--- a/devel/erlang-meck/Makefile
+++ b/devel/erlang-meck/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= meck
-PORTVERSION= 0.8.7
+PORTVERSION= 0.8.8
CATEGORIES= devel
PKGNAMEPREFIX= erlang-
diff --git a/devel/erlang-meck/distinfo b/devel/erlang-meck/distinfo
index fbc9ed700a4f..a77b5f9a150a 100644
--- a/devel/erlang-meck/distinfo
+++ b/devel/erlang-meck/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499078087
-SHA256 (eproxus-meck-0.8.7_GH0.tar.gz) = 50834c5f8cb604b285cc88d04b34f9e13e87038d492c95f0d6ba1805cc7f6da6
-SIZE (eproxus-meck-0.8.7_GH0.tar.gz) = 48540
+TIMESTAMP = 1504013307
+SHA256 (eproxus-meck-0.8.8_GH0.tar.gz) = 776440adaa421e00d8aee1687abdf9edd71152c1e6f62d6d0c9a3c7b9dee8003
+SIZE (eproxus-meck-0.8.8_GH0.tar.gz) = 48614
diff --git a/devel/gdb/Makefile b/devel/gdb/Makefile
index b25ee91a123d..b72d6ce0c3b1 100644
--- a/devel/gdb/Makefile
+++ b/devel/gdb/Makefile
@@ -7,7 +7,7 @@ PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= GNU
-MAINTAINER= luca.pizzamiglio@gmail.com
+MAINTAINER= pizzamig@FreeBSD.org
COMMENT= GNU GDB of newer version than comes with the system
LICENSE= GPLv3
diff --git a/devel/glibmm/pkg-descr b/devel/glibmm/pkg-descr
index e11a3b5a455d..2524fea2896b 100644
--- a/devel/glibmm/pkg-descr
+++ b/devel/glibmm/pkg-descr
@@ -1,3 +1,3 @@
C++ interfaces for glib20.
-WWW: http://www.gtkmm.org/
+WWW: https://www.gtkmm.org/
diff --git a/devel/gnatcoll/Makefile b/devel/gnatcoll/Makefile
index ac19c589366d..227401267fca 100644
--- a/devel/gnatcoll/Makefile
+++ b/devel/gnatcoll/Makefile
@@ -3,13 +3,14 @@
PORTNAME= gnatcoll
PORTVERSION= 2016 # branch: gpl-for-gps-2016
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
MAINTAINER= ports@FreeBSD.org
COMMENT= GNAT Component Collection from Adacore
LICENSE= GPLv3
+LICENSE_FILE= ${WRKSRC}/COPYING3
BUILD_DEPENDS= gprbuild:devel/gprbuild \
gnat_util>=20140422:lang/gnat_util
@@ -17,13 +18,15 @@ LIB_DEPENDS= libgtkada.so:x11-toolkits/gtkada3 \
libgmp.so:math/gmp
RUN_DEPENDS= gnat_util>=20140422:lang/gnat_util
-USES= ada gmake pkgconfig python
-USE_GNOME= pygobject3
USE_GITHUB= yes
GH_ACCOUNT= AdaCore
GH_PROJECT= gprbuild:libgpr
GH_TAGNAME= 858f72c a2e9066:libgpr
+USES= ada gmake pkgconfig python shebangfix
+SHEBANG_FILES= src/dborm.py
+USE_GNOME= pygobject3
+
PYCOMPILE= ${PREFIX}/lib/${PYTHON_VERSION}/compileall.py
GNU_CONFIGURE= yes
ALL_TARGET= all
@@ -60,8 +63,6 @@ PGSQL_USES= pgsql
PGSQL_CONFIGURE_ON= --with-postgresql=${PREFIX}
PGSQL_CONFIGURE_OFF= --without-postgresql
-.include <bsd.port.options.mk>
-
post-patch:
@${REINPLACE_CMD} -e "s|@PREFIX@|${PREFIX}|g" \
${WRKSRC}/src/gnatcoll_readline.gpr.in
@@ -82,8 +83,8 @@ post-install:
${RM} -r ${STAGEDIR}${DOCSDIR}/html/_sources
${RM} -r ${STAGEDIR}${PREFIX}/share/gps
${RM} -r ${STAGEDIR}${EXAMPLESDIR}/library
-.if ! ${PORT_OPTIONS:MEXAMPLES}
+
+post-install-EXAMPLES-off:
${RM} -r ${STAGEDIR}${EXAMPLESDIR}
-.endif
.include <bsd.port.mk>
diff --git a/devel/grpc/Makefile b/devel/grpc/Makefile
index 7bec6e70ef25..cb2873e4f38f 100644
--- a/devel/grpc/Makefile
+++ b/devel/grpc/Makefile
@@ -22,12 +22,11 @@ USE_GITHUB= yes
GH_TUPLE= google:boringssl:ba2d3df:boringssl/third_party/boringssl \
google:benchmark:v1.2.0:benchmark/third_party/benchmark
-USES= cmake perl5 pkgconfig
+USES= cmake localbase:ldflags perl5 pkgconfig
USE_LDCONFIG= yes
USE_PERL5= build
PLIST_SUB+= SOVERSION=${PORTVERSION}
-CFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib -lpthread -lcares -lm
+LDFLAGS+= -lcares
CMAKE_ARGS= -DgRPC_ZLIB_PROVIDER:STRING="package" \
-DgRPC_PROTOBUF_PROVIDER:STRING="package" \
-DgRPC_GFLAGS_PROVIDER:STRING="package" \
diff --git a/devel/hs-ShellCheck/Makefile b/devel/hs-ShellCheck/Makefile
index 610620b73873..1b61945689e2 100644
--- a/devel/hs-ShellCheck/Makefile
+++ b/devel/hs-ShellCheck/Makefile
@@ -4,7 +4,7 @@ PORTNAME= ShellCheck
PORTVERSION= 0.4.6
CATEGORIES= devel haskell
-MAINTAINER= luca.pizzamiglio@gmail.com
+MAINTAINER= pizzamig@FreeBSD.org
COMMENT= Shell script analysis tool
LICENSE= GPLv3
diff --git a/devel/jenkins/Makefile b/devel/jenkins/Makefile
index addc598f12b2..5806427205c6 100644
--- a/devel/jenkins/Makefile
+++ b/devel/jenkins/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= jenkins
-PORTVERSION= 2.75
+PORTVERSION= 2.76
CATEGORIES= devel java
MASTER_SITES= http://mirrors.jenkins-ci.org/war/${PORTVERSION}/
DISTNAME= jenkins
diff --git a/devel/jenkins/distinfo b/devel/jenkins/distinfo
index d99b9d031cc1..e32d04ad161d 100644
--- a/devel/jenkins/distinfo
+++ b/devel/jenkins/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1503341711
-SHA256 (jenkins/2.75/jenkins.war) = 56cc5d3152ed7d4dffa1fd5bfbebd1b91a71724dfd2bc318e649d9a7f3e601ef
-SIZE (jenkins/2.75/jenkins.war) = 72992615
+TIMESTAMP = 1504017645
+SHA256 (jenkins/2.76/jenkins.war) = 902d670e3a57670202e01402ca5ea1142c08d187636dd979d33ef317dbe7c6eb
+SIZE (jenkins/2.76/jenkins.war) = 73239816
diff --git a/devel/kf5-extra-cmake-modules/distinfo b/devel/kf5-extra-cmake-modules/distinfo
index 069f58012e5a..c1ef64801942 100644
--- a/devel/kf5-extra-cmake-modules/distinfo
+++ b/devel/kf5-extra-cmake-modules/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499098896
-SHA256 (KDE/frameworks/5.36.0/extra-cmake-modules-5.36.0.tar.xz) = 6e120bb40411ef559583ef693c0c03a41df3bb40a932bf7444c97e04266d5daf
-SIZE (KDE/frameworks/5.36.0/extra-cmake-modules-5.36.0.tar.xz) = 311140
+TIMESTAMP = 1502086004
+SHA256 (KDE/frameworks/5.37.0/extra-cmake-modules-5.37.0.tar.xz) = 26198cf05c084c158bb23f0585a9df5bba1aa16b746252c80bdf4f0261b527cb
+SIZE (KDE/frameworks/5.37.0/extra-cmake-modules-5.37.0.tar.xz) = 311696
diff --git a/devel/kf5-kapidox/distinfo b/devel/kf5-kapidox/distinfo
index 2e3add908eb3..c5939d2d705e 100644
--- a/devel/kf5-kapidox/distinfo
+++ b/devel/kf5-kapidox/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499098897
-SHA256 (KDE/frameworks/5.36.0/kapidox-5.36.0.tar.xz) = 79a505ed2ef7a755115b1da7e37c45fe6a2eda799ea9f4da15766fa5977f3fa0
-SIZE (KDE/frameworks/5.36.0/kapidox-5.36.0.tar.xz) = 395576
+TIMESTAMP = 1502086004
+SHA256 (KDE/frameworks/5.37.0/kapidox-5.37.0.tar.xz) = bb3cac795319f1376b0dd7f6986a06e7a7e69aa59a6754c2864f7617ab5293f7
+SIZE (KDE/frameworks/5.37.0/kapidox-5.37.0.tar.xz) = 395612
diff --git a/devel/kf5-kauth/distinfo b/devel/kf5-kauth/distinfo
index 1187feed4734..f9ba82dff126 100644
--- a/devel/kf5-kauth/distinfo
+++ b/devel/kf5-kauth/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499098897
-SHA256 (KDE/frameworks/5.36.0/kauth-5.36.0.tar.xz) = d3f94113d14f85894f59f234efebfec8c42b4b8a8452460b7f4f2ccc03657d28
-SIZE (KDE/frameworks/5.36.0/kauth-5.36.0.tar.xz) = 84580
+TIMESTAMP = 1502086004
+SHA256 (KDE/frameworks/5.37.0/kauth-5.37.0.tar.xz) = bc982bb8443d8a9791c4fffa20e29c9f852a7a18fa31f023d8b4efb517123f32
+SIZE (KDE/frameworks/5.37.0/kauth-5.37.0.tar.xz) = 84568
diff --git a/devel/kf5-kbookmarks/distinfo b/devel/kf5-kbookmarks/distinfo
index 71b4acab957b..8023c8f1b2f2 100644
--- a/devel/kf5-kbookmarks/distinfo
+++ b/devel/kf5-kbookmarks/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499098897
-SHA256 (KDE/frameworks/5.36.0/kbookmarks-5.36.0.tar.xz) = 59339ef15f2740665fded42638d197ac9638f763191c30054d1870e4695ce684
-SIZE (KDE/frameworks/5.36.0/kbookmarks-5.36.0.tar.xz) = 116968
+TIMESTAMP = 1502086004
+SHA256 (KDE/frameworks/5.37.0/kbookmarks-5.37.0.tar.xz) = 815843ae3c6e8f36e1ea31aa9750dfa1b18be86c415edfcce362c2b3809cd950
+SIZE (KDE/frameworks/5.37.0/kbookmarks-5.37.0.tar.xz) = 117256
diff --git a/devel/kf5-kcmutils/distinfo b/devel/kf5-kcmutils/distinfo
index 9c4609909d65..2dcf15e18dd1 100644
--- a/devel/kf5-kcmutils/distinfo
+++ b/devel/kf5-kcmutils/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499098897
-SHA256 (KDE/frameworks/5.36.0/kcmutils-5.36.0.tar.xz) = df21667f6dae44707d13e51780ffe157fd0a29d4b946b14876a2a96633b32e66
-SIZE (KDE/frameworks/5.36.0/kcmutils-5.36.0.tar.xz) = 235224
+TIMESTAMP = 1502086005
+SHA256 (KDE/frameworks/5.37.0/kcmutils-5.37.0.tar.xz) = fdefa93d5e796d82165c7ff0592d63c18da123534d989d77d55c9be00a2861c6
+SIZE (KDE/frameworks/5.37.0/kcmutils-5.37.0.tar.xz) = 235156
diff --git a/devel/kf5-kconfig/distinfo b/devel/kf5-kconfig/distinfo
index 918cdf909bd4..4f90bcc92269 100644
--- a/devel/kf5-kconfig/distinfo
+++ b/devel/kf5-kconfig/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499098897
-SHA256 (KDE/frameworks/5.36.0/kconfig-5.36.0.tar.xz) = b31e3a8595fa8dc14aa0b1828633c712205097a6e3d14650ae813d4d7833d654
-SIZE (KDE/frameworks/5.36.0/kconfig-5.36.0.tar.xz) = 232928
+TIMESTAMP = 1502086005
+SHA256 (KDE/frameworks/5.37.0/kconfig-5.37.0.tar.xz) = ad646fbf27a671761414609f729a033f5014ee0f6f9f4cd909ab00cfeb131eb8
+SIZE (KDE/frameworks/5.37.0/kconfig-5.37.0.tar.xz) = 233000
diff --git a/devel/kf5-kcoreaddons/distinfo b/devel/kf5-kcoreaddons/distinfo
index c9a8d2b94784..3697dfc939df 100644
--- a/devel/kf5-kcoreaddons/distinfo
+++ b/devel/kf5-kcoreaddons/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499098897
-SHA256 (KDE/frameworks/5.36.0/kcoreaddons-5.36.0.tar.xz) = 9d4b26bf22d1326c37f33aa4727942325cad2b23e5b3f1e32ec9ee558e9b5594
-SIZE (KDE/frameworks/5.36.0/kcoreaddons-5.36.0.tar.xz) = 346764
+TIMESTAMP = 1502086005
+SHA256 (KDE/frameworks/5.37.0/kcoreaddons-5.37.0.tar.xz) = 7e3c433cb0e010ae751c1347475283cb9e31763de5a7bc346a629d16c2d78528
+SIZE (KDE/frameworks/5.37.0/kcoreaddons-5.37.0.tar.xz) = 348284
diff --git a/devel/kf5-kcrash/distinfo b/devel/kf5-kcrash/distinfo
index b0f63a761e3b..daf08dbb7ed7 100644
--- a/devel/kf5-kcrash/distinfo
+++ b/devel/kf5-kcrash/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499098898
-SHA256 (KDE/frameworks/5.36.0/kcrash-5.36.0.tar.xz) = 2d8edd9813b8543cef68cd6cf09c85195999d06f9b06ed0803707a1c925eda38
-SIZE (KDE/frameworks/5.36.0/kcrash-5.36.0.tar.xz) = 21636
+TIMESTAMP = 1502086005
+SHA256 (KDE/frameworks/5.37.0/kcrash-5.37.0.tar.xz) = c097aaca2c6ca8a177d697a8cccd4bd8bec2d09c07efd4bc7a4d0d3d1cbf629a
+SIZE (KDE/frameworks/5.37.0/kcrash-5.37.0.tar.xz) = 21700
diff --git a/devel/kf5-kdbusaddons/distinfo b/devel/kf5-kdbusaddons/distinfo
index 294a42e34d62..81f5530ea372 100644
--- a/devel/kf5-kdbusaddons/distinfo
+++ b/devel/kf5-kdbusaddons/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499098898
-SHA256 (KDE/frameworks/5.36.0/kdbusaddons-5.36.0.tar.xz) = 8433cfb3ccb67b1364ad5594a278ec5a920b8e10fb43b7b615acaa7fdb5f4e04
-SIZE (KDE/frameworks/5.36.0/kdbusaddons-5.36.0.tar.xz) = 35464
+TIMESTAMP = 1502086005
+SHA256 (KDE/frameworks/5.37.0/kdbusaddons-5.37.0.tar.xz) = 9140b649e140eb134d7290e3f268658900a61c3d50002ca1e7d772726756851c
+SIZE (KDE/frameworks/5.37.0/kdbusaddons-5.37.0.tar.xz) = 35668
diff --git a/devel/kf5-kdeclarative/distinfo b/devel/kf5-kdeclarative/distinfo
index e3039051e711..66bbe7764242 100644
--- a/devel/kf5-kdeclarative/distinfo
+++ b/devel/kf5-kdeclarative/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499098898
-SHA256 (KDE/frameworks/5.36.0/kdeclarative-5.36.0.tar.xz) = 2dde12110310cbb980381fd51c0926f2f5cf202760a0a871a01a2412080a5d52
-SIZE (KDE/frameworks/5.36.0/kdeclarative-5.36.0.tar.xz) = 169912
+TIMESTAMP = 1502086005
+SHA256 (KDE/frameworks/5.37.0/kdeclarative-5.37.0.tar.xz) = f2bdd7e1c6d0f39b4e1573b11078317e9ec72803c63ce4acc4d7de26aa2150c7
+SIZE (KDE/frameworks/5.37.0/kdeclarative-5.37.0.tar.xz) = 169808
diff --git a/devel/kf5-kdoctools/distinfo b/devel/kf5-kdoctools/distinfo
index bd61a197bc19..4a3b2edc6896 100644
--- a/devel/kf5-kdoctools/distinfo
+++ b/devel/kf5-kdoctools/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499098898
-SHA256 (KDE/frameworks/5.36.0/kdoctools-5.36.0.tar.xz) = 327b90bd7b9fae2455ef848f44709ec8dbead1f1a86ef169083e9000d2edfb69
-SIZE (KDE/frameworks/5.36.0/kdoctools-5.36.0.tar.xz) = 416900
+TIMESTAMP = 1502086006
+SHA256 (KDE/frameworks/5.37.0/kdoctools-5.37.0.tar.xz) = f4031fccb1e7c6017456840daee1589d2e6b7d36ee263a371446981a312e6c3d
+SIZE (KDE/frameworks/5.37.0/kdoctools-5.37.0.tar.xz) = 416840
diff --git a/devel/kf5-kdoctools/pkg-plist b/devel/kf5-kdoctools/pkg-plist
index b2e8969d378a..bf2382fdda31 100644
--- a/devel/kf5-kdoctools/pkg-plist
+++ b/devel/kf5-kdoctools/pkg-plist
@@ -13,45 +13,45 @@ lib/libKF5DocTools.so.%%KDE_FRAMEWORKS_VERSION%%
man/ca/man1/checkXML5.1.gz
man/ca/man7/kf5options.7.gz
man/ca/man7/qt5options.7.gz
-man/ca/man8/meinproc5.8.gz
+man/ca/man1/meinproc5.1.gz
man/de/man1/checkXML5.1.gz
man/de/man7/kf5options.7.gz
man/de/man7/qt5options.7.gz
-man/de/man8/meinproc5.8.gz
+man/de/man1/meinproc5.1.gz
man/es/man1/checkXML5.1.gz
man/es/man7/kf5options.7.gz
man/es/man7/qt5options.7.gz
-man/es/man8/meinproc5.8.gz
+man/es/man1/meinproc5.1.gz
man/it/man1/checkXML5.1.gz
man/it/man7/kf5options.7.gz
man/it/man7/qt5options.7.gz
-man/it/man8/meinproc5.8.gz
+man/it/man1/meinproc5.1.gz
man/man1/checkXML5.1.gz
man/man7/kf5options.7.gz
man/man7/qt5options.7.gz
-man/man8/meinproc5.8.gz
+man/man1/meinproc5.1.gz
man/nl/man1/checkXML5.1.gz
man/nl/man7/kf5options.7.gz
man/nl/man7/qt5options.7.gz
-man/nl/man8/meinproc5.8.gz
+man/nl/man1/meinproc5.1.gz
man/pt/man1/checkXML5.1.gz
man/pt/man7/kf5options.7.gz
man/pt/man7/qt5options.7.gz
-man/pt/man8/meinproc5.8.gz
+man/pt/man1/meinproc5.1.gz
man/pt_BR/man1/checkXML5.1.gz
man/pt_BR/man7/kf5options.7.gz
man/pt_BR/man7/qt5options.7.gz
-man/pt_BR/man8/meinproc5.8.gz
+man/pt_BR/man1/meinproc5.1.gz
man/ru/man1/checkXML5.1.gz
man/ru/man7/qt5options.7.gz
man/sv/man1/checkXML5.1.gz
man/sv/man7/kf5options.7.gz
man/sv/man7/qt5options.7.gz
-man/sv/man8/meinproc5.8.gz
+man/sv/man1/meinproc5.1.gz
man/uk/man1/checkXML5.1.gz
man/uk/man7/kf5options.7.gz
man/uk/man7/qt5options.7.gz
-man/uk/man8/meinproc5.8.gz
+man/uk/man1/meinproc5.1.gz
share/doc/HTML/af/kdoctools5-common/kde-localised.css
share/doc/HTML/ca/kdoctools5-common/kde-localised.css
share/doc/HTML/cs/kdoctools5-common/kde-localised.css
diff --git a/devel/kf5-kfilemetadata/distinfo b/devel/kf5-kfilemetadata/distinfo
index 492347da00b0..acff15128ab5 100644
--- a/devel/kf5-kfilemetadata/distinfo
+++ b/devel/kf5-kfilemetadata/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499098898
-SHA256 (KDE/frameworks/5.36.0/kfilemetadata-5.36.0.tar.xz) = 750c1f408bad265ee10bfcd60eab88988d8bb6b3b38fd59ebad1899c683b269d
-SIZE (KDE/frameworks/5.36.0/kfilemetadata-5.36.0.tar.xz) = 218296
+TIMESTAMP = 1502086006
+SHA256 (KDE/frameworks/5.37.0/kfilemetadata-5.37.0.tar.xz) = 17e12d5e8d033e638ec727639ed3ebb0af3cfc71fd632167304c99d8aea9ab9e
+SIZE (KDE/frameworks/5.37.0/kfilemetadata-5.37.0.tar.xz) = 218252
diff --git a/devel/kf5-ki18n/distinfo b/devel/kf5-ki18n/distinfo
index 245880b7157f..56ab68b7da20 100644
--- a/devel/kf5-ki18n/distinfo
+++ b/devel/kf5-ki18n/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499377880
-SHA256 (KDE/frameworks/5.36.0/ki18n-5.36.0.tar.xz) = c0c9877a7c4f4d0630e934a903cc27fd127d0be63531c50ea77d63e10119558b
-SIZE (KDE/frameworks/5.36.0/ki18n-5.36.0.tar.xz) = 586468
+TIMESTAMP = 1502086006
+SHA256 (KDE/frameworks/5.37.0/ki18n-5.37.0.tar.xz) = 4d94f4f676161507149886c6f9c4a16a17556bcb4b9c24b4549a53b82ef13ab0
+SIZE (KDE/frameworks/5.37.0/ki18n-5.37.0.tar.xz) = 586720
diff --git a/devel/kf5-kidletime/distinfo b/devel/kf5-kidletime/distinfo
index b54be008242c..c6f44edde2c4 100644
--- a/devel/kf5-kidletime/distinfo
+++ b/devel/kf5-kidletime/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499098899
-SHA256 (KDE/frameworks/5.36.0/kidletime-5.36.0.tar.xz) = 34315b6174e69fa371c3f4236c4de9e14eab46e2464c48c1be252a27b4fa1ab6
-SIZE (KDE/frameworks/5.36.0/kidletime-5.36.0.tar.xz) = 26560
+TIMESTAMP = 1502086006
+SHA256 (KDE/frameworks/5.37.0/kidletime-5.37.0.tar.xz) = 3a472778722f38e5175ac55ff71a5e464ec98ecfd2ec759b7003612fe8c0a406
+SIZE (KDE/frameworks/5.37.0/kidletime-5.37.0.tar.xz) = 26608
diff --git a/devel/kf5-kio/distinfo b/devel/kf5-kio/distinfo
index de99e4a2cb91..9e677fb26b52 100644
--- a/devel/kf5-kio/distinfo
+++ b/devel/kf5-kio/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499098899
-SHA256 (KDE/frameworks/5.36.0/kio-5.36.0.tar.xz) = f18f51d5d85156de52bf21e7344e06b9fcb6c815043797615171c7a66bb743c8
-SIZE (KDE/frameworks/5.36.0/kio-5.36.0.tar.xz) = 3081976
+TIMESTAMP = 1502086006
+SHA256 (KDE/frameworks/5.37.0/kio-5.37.0.tar.xz) = 49448ebcfe182805f8f9cd40c1e2c8e686578cc2e7fa3688204d5ca4e182ac5b
+SIZE (KDE/frameworks/5.37.0/kio-5.37.0.tar.xz) = 3084204
diff --git a/devel/kf5-kitemmodels/distinfo b/devel/kf5-kitemmodels/distinfo
index 4f989825dfa5..193d496b33da 100644
--- a/devel/kf5-kitemmodels/distinfo
+++ b/devel/kf5-kitemmodels/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499098899
-SHA256 (KDE/frameworks/5.36.0/kitemmodels-5.36.0.tar.xz) = 2a05bc2f807b725de0515dbc12f031b00026e97d0901a8d05f475ad9b2926b23
-SIZE (KDE/frameworks/5.36.0/kitemmodels-5.36.0.tar.xz) = 389648
+TIMESTAMP = 1502086007
+SHA256 (KDE/frameworks/5.37.0/kitemmodels-5.37.0.tar.xz) = 39ffbf6aacbcc20417fe6b228c16621d4ab828b13c4371c377f0814aeeff97da
+SIZE (KDE/frameworks/5.37.0/kitemmodels-5.37.0.tar.xz) = 389648
diff --git a/devel/kf5-knewstuff/distinfo b/devel/kf5-knewstuff/distinfo
index fe9b0b7596cd..0f3a38707cbe 100644
--- a/devel/kf5-knewstuff/distinfo
+++ b/devel/kf5-knewstuff/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499377882
-SHA256 (KDE/frameworks/5.36.0/knewstuff-5.36.0.tar.xz) = f17bc9cc0852c3a4433e1ffaeb88ad7af3611a9ec95409c391b39fa57e84da5d
-SIZE (KDE/frameworks/5.36.0/knewstuff-5.36.0.tar.xz) = 890752
+TIMESTAMP = 1502086007
+SHA256 (KDE/frameworks/5.37.0/knewstuff-5.37.0.tar.xz) = dea2875aa1787525545e789fcafef75ddd0cc02e1175432b27123dd23bec96e9
+SIZE (KDE/frameworks/5.37.0/knewstuff-5.37.0.tar.xz) = 890948
diff --git a/devel/kf5-knotifications/distinfo b/devel/kf5-knotifications/distinfo
index 8d2418447ace..ab5eb9cc6858 100644
--- a/devel/kf5-knotifications/distinfo
+++ b/devel/kf5-knotifications/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499098899
-SHA256 (KDE/frameworks/5.36.0/knotifications-5.36.0.tar.xz) = e4004df99c6b470c0454e6c7a0e94ed540549ce6e6cc848f7c97b4e620a59ec2
-SIZE (KDE/frameworks/5.36.0/knotifications-5.36.0.tar.xz) = 100000
+TIMESTAMP = 1502086007
+SHA256 (KDE/frameworks/5.37.0/knotifications-5.37.0.tar.xz) = 66cdfddaa31f773a538d429026d0117e60f8a0a7f2a90c861f95d84395347b3f
+SIZE (KDE/frameworks/5.37.0/knotifications-5.37.0.tar.xz) = 100004
diff --git a/devel/kf5-knotifyconfig/distinfo b/devel/kf5-knotifyconfig/distinfo
index 3c45ef1e7daf..a682906c7f16 100644
--- a/devel/kf5-knotifyconfig/distinfo
+++ b/devel/kf5-knotifyconfig/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499098899
-SHA256 (KDE/frameworks/5.36.0/knotifyconfig-5.36.0.tar.xz) = 7c2c1717a09ef445ed50053a96e18787eb2118e3d14a81dae3cc6df317f49811
-SIZE (KDE/frameworks/5.36.0/knotifyconfig-5.36.0.tar.xz) = 83492
+TIMESTAMP = 1502086007
+SHA256 (KDE/frameworks/5.37.0/knotifyconfig-5.37.0.tar.xz) = 65c695561bf26dc5899e28a35604afb3da39283a459e704b00687f6dfd647292
+SIZE (KDE/frameworks/5.37.0/knotifyconfig-5.37.0.tar.xz) = 83444
diff --git a/devel/kf5-kpackage/distinfo b/devel/kf5-kpackage/distinfo
index 1c29fc4c302f..b84d3c726c52 100644
--- a/devel/kf5-kpackage/distinfo
+++ b/devel/kf5-kpackage/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499098900
-SHA256 (KDE/frameworks/5.36.0/kpackage-5.36.0.tar.xz) = 0887882000eeef5c12bb613672075187b1f031e8d87dbaecdadc02c9112a8a2f
-SIZE (KDE/frameworks/5.36.0/kpackage-5.36.0.tar.xz) = 121788
+TIMESTAMP = 1502086007
+SHA256 (KDE/frameworks/5.37.0/kpackage-5.37.0.tar.xz) = fac4d94dc33760aa71078f869fa0fc090c25a7aaf9547cc1a91bcd2b70296ec6
+SIZE (KDE/frameworks/5.37.0/kpackage-5.37.0.tar.xz) = 122824
diff --git a/devel/kf5-kparts/distinfo b/devel/kf5-kparts/distinfo
index 64c38c9be03f..c8f452f1fcd2 100644
--- a/devel/kf5-kparts/distinfo
+++ b/devel/kf5-kparts/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499098900
-SHA256 (KDE/frameworks/5.36.0/kparts-5.36.0.tar.xz) = f3e75ac95b1e3c61054cd9140be4b917296f0a666df3487a589cfe055978055e
-SIZE (KDE/frameworks/5.36.0/kparts-5.36.0.tar.xz) = 155360
+TIMESTAMP = 1502086008
+SHA256 (KDE/frameworks/5.37.0/kparts-5.37.0.tar.xz) = b050a342ca377c37c5fdb94a5532d9f159ac7d46eef12c549bd0a23f5b442d4b
+SIZE (KDE/frameworks/5.37.0/kparts-5.37.0.tar.xz) = 175340
diff --git a/devel/kf5-kparts/pkg-plist b/devel/kf5-kparts/pkg-plist
index 3620b6818f4f..e60d8ef94883 100644
--- a/devel/kf5-kparts/pkg-plist
+++ b/devel/kf5-kparts/pkg-plist
@@ -71,6 +71,7 @@ lib/libKF5Parts.so
lib/libKF5Parts.so.5
lib/libKF5Parts.so.%%KDE_FRAMEWORKS_VERSION%%
%%QT_MKSPECDIR%%/modules/qt_KParts.pri
+share/kdevappwizard/templates/kpartsapp.tar.bz2
share/kservicetypes5/browserview.desktop
share/kservicetypes5/kpart.desktop
share/kservicetypes5/krop.desktop
diff --git a/devel/kf5-kpeople/distinfo b/devel/kf5-kpeople/distinfo
index 47b5b8c14d44..45d8fd1b6003 100644
--- a/devel/kf5-kpeople/distinfo
+++ b/devel/kf5-kpeople/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499098900
-SHA256 (KDE/frameworks/5.36.0/kpeople-5.36.0.tar.xz) = 2a0800096207d0728c01027b65ab1f9c9b0b8aba0189e523c0050e723b812e72
-SIZE (KDE/frameworks/5.36.0/kpeople-5.36.0.tar.xz) = 59280
+TIMESTAMP = 1502086008
+SHA256 (KDE/frameworks/5.37.0/kpeople-5.37.0.tar.xz) = 4e6353c80dd9b7c3a21a6ccacc278fb90936e6d6772a9e6a60aaa0743127f7e1
+SIZE (KDE/frameworks/5.37.0/kpeople-5.37.0.tar.xz) = 59356
diff --git a/devel/kf5-kpty/distinfo b/devel/kf5-kpty/distinfo
index fee256e07573..69f8dde2a52b 100644
--- a/devel/kf5-kpty/distinfo
+++ b/devel/kf5-kpty/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499098900
-SHA256 (KDE/frameworks/5.36.0/kpty-5.36.0.tar.xz) = 64c25954915c2070edfd2e0649110ce4bafa19af352f9ac3e4979f68e06daafc
-SIZE (KDE/frameworks/5.36.0/kpty-5.36.0.tar.xz) = 58232
+TIMESTAMP = 1502086008
+SHA256 (KDE/frameworks/5.37.0/kpty-5.37.0.tar.xz) = aab4ff0a6025e6dab859ce74a5cbf7031c52fe8674740c7408f1311ff2386871
+SIZE (KDE/frameworks/5.37.0/kpty-5.37.0.tar.xz) = 58204
diff --git a/devel/kf5-kservice/distinfo b/devel/kf5-kservice/distinfo
index bf3e958eec25..7b6ec639d921 100644
--- a/devel/kf5-kservice/distinfo
+++ b/devel/kf5-kservice/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499098900
-SHA256 (KDE/frameworks/5.36.0/kservice-5.36.0.tar.xz) = 90130adca003f0d583afc1031ba1bd303857a938dd9e596127891c07f4da10a6
-SIZE (KDE/frameworks/5.36.0/kservice-5.36.0.tar.xz) = 249736
+TIMESTAMP = 1502086008
+SHA256 (KDE/frameworks/5.37.0/kservice-5.37.0.tar.xz) = 196e9bdbdb28bfda75120cf1f7d49f68bc345f248cdca8f718bee6d1be2fbaff
+SIZE (KDE/frameworks/5.37.0/kservice-5.37.0.tar.xz) = 249748
diff --git a/devel/kf5-ktexteditor/distinfo b/devel/kf5-ktexteditor/distinfo
index 275b1f7fbeb2..22a9ef60dfc9 100644
--- a/devel/kf5-ktexteditor/distinfo
+++ b/devel/kf5-ktexteditor/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499098900
-SHA256 (KDE/frameworks/5.36.0/ktexteditor-5.36.0.tar.xz) = f9a0109aff18175ef528186e099d0881b977dde7435c433c5541df44b5a18609
-SIZE (KDE/frameworks/5.36.0/ktexteditor-5.36.0.tar.xz) = 2248964
+TIMESTAMP = 1502086008
+SHA256 (KDE/frameworks/5.37.0/ktexteditor-5.37.0.tar.xz) = 7ae65ca215a53dc4e35877069004c748d8a8b504aecbeaa3b916b8c96dd00478
+SIZE (KDE/frameworks/5.37.0/ktexteditor-5.37.0.tar.xz) = 2285796
diff --git a/devel/kf5-ktexteditor/pkg-plist b/devel/kf5-ktexteditor/pkg-plist
index 25842172da41..88d88a47b479 100644
--- a/devel/kf5-ktexteditor/pkg-plist
+++ b/devel/kf5-ktexteditor/pkg-plist
@@ -65,6 +65,7 @@ lib/libexec/kauth/kauth_ktexteditor_helper
%%QT_MKSPECDIR%%/modules/qt_KTextEditor.pri
share/dbus-1/system-services/org.kde.ktexteditor.katetextbuffer.service
share/katepart5/script/README.md
+share/kdevappwizard/templates/ktexteditor-plugin.tar.bz2
share/kservices5/katepart.desktop
share/kservicetypes5/ktexteditor.desktop
share/kservicetypes5/ktexteditorplugin.desktop
diff --git a/devel/kf5-kunitconversion/distinfo b/devel/kf5-kunitconversion/distinfo
index 8b883d14162a..f6e3707e2253 100644
--- a/devel/kf5-kunitconversion/distinfo
+++ b/devel/kf5-kunitconversion/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499098901
-SHA256 (KDE/frameworks/5.36.0/kunitconversion-5.36.0.tar.xz) = b0b285f610d402f78a671cd538f50b20d7c6ea7d7b6f583bcdd4c411e0b042f5
-SIZE (KDE/frameworks/5.36.0/kunitconversion-5.36.0.tar.xz) = 771432
+TIMESTAMP = 1502086008
+SHA256 (KDE/frameworks/5.37.0/kunitconversion-5.37.0.tar.xz) = 514b768a1077ad35454859aa8897511dc4aa4ee7b297d86c91caa6bd743078e3
+SIZE (KDE/frameworks/5.37.0/kunitconversion-5.37.0.tar.xz) = 771032
diff --git a/devel/kf5-solid/distinfo b/devel/kf5-solid/distinfo
index 642de858b44d..b0854af48799 100644
--- a/devel/kf5-solid/distinfo
+++ b/devel/kf5-solid/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499098901
-SHA256 (KDE/frameworks/5.36.0/solid-5.36.0.tar.xz) = b10d3d5e1b1f30dd9e283575ab66a4279f0114207b6a69ab1a657403ef03efac
-SIZE (KDE/frameworks/5.36.0/solid-5.36.0.tar.xz) = 247564
+TIMESTAMP = 1502086009
+SHA256 (KDE/frameworks/5.37.0/solid-5.37.0.tar.xz) = 14bd7b814f3fb87ea7d26338a05966380b1703d6679d44972a380415ae7d69bd
+SIZE (KDE/frameworks/5.37.0/solid-5.37.0.tar.xz) = 248120
diff --git a/devel/kf5-threadweaver/distinfo b/devel/kf5-threadweaver/distinfo
index c79f88152038..8f5832a1927f 100644
--- a/devel/kf5-threadweaver/distinfo
+++ b/devel/kf5-threadweaver/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499098901
-SHA256 (KDE/frameworks/5.36.0/threadweaver-5.36.0.tar.xz) = a15e52811fbc710a618e060c3f7f7cb4623805c83e8a5b24d9f326b55a3be9a7
-SIZE (KDE/frameworks/5.36.0/threadweaver-5.36.0.tar.xz) = 1409564
+TIMESTAMP = 1502086009
+SHA256 (KDE/frameworks/5.37.0/threadweaver-5.37.0.tar.xz) = a4f79b937020f4a7b44e8fc1a6339828cccea6d306a11084f46bfd90833863c1
+SIZE (KDE/frameworks/5.37.0/threadweaver-5.37.0.tar.xz) = 1409680
diff --git a/devel/magit/Makefile b/devel/magit/Makefile
index 2a197301f319..645a951033a4 100644
--- a/devel/magit/Makefile
+++ b/devel/magit/Makefile
@@ -6,7 +6,7 @@ PORTVERSION= 2.10.3
CATEGORIES= devel elisp
PKGNAMESUFFIX= -${EMACS_PORT_NAME}
-MAINTAINER= kuriyama@FreeBSD.org
+MAINTAINER= yasu@utahime.org
COMMENT= Interface to Git for Emacs
LICENSE= GPLv3
@@ -16,10 +16,9 @@ BUILD_DEPENDS= dash.el>=2.12.1:devel/dash.el \
RUN_DEPENDS= dash.el>=2.12.1:devel/dash.el \
with-editor-${EMACS_PORT_NAME}>=2.5.0:editors/with-editor
-USE_GITHUB= yes
-
USES= gmake makeinfo
USE_EMACS= yes
+USE_GITHUB= yes
INFO= magit magit-popup
PORTDOCS= AUTHORS.md
NO_ARCH= yes
diff --git a/devel/p5-Config-Model/Makefile b/devel/p5-Config-Model/Makefile
index dd9c51dd0781..49786baad35e 100644
--- a/devel/p5-Config-Model/Makefile
+++ b/devel/p5-Config-Model/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= Config-Model
-PORTVERSION= 2.106
+PORTVERSION= 2.108
CATEGORIES= devel perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-Config-Model/distinfo b/devel/p5-Config-Model/distinfo
index e1548bfe558d..e696b695f2b5 100644
--- a/devel/p5-Config-Model/distinfo
+++ b/devel/p5-Config-Model/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1500299512
-SHA256 (Config-Model-2.106.tar.gz) = ee662d264d31964810a2b5f5eff30e87e8fe2b76e289a33b186eefcd9250c96f
-SIZE (Config-Model-2.106.tar.gz) = 346077
+TIMESTAMP = 1504258112
+SHA256 (Config-Model-2.108.tar.gz) = 422a65ace9f80dd4cb844f8c0601d66b3ff662c94b08e95ef2eca2f580533d54
+SIZE (Config-Model-2.108.tar.gz) = 346980
diff --git a/devel/p5-Locale-libintl/Makefile b/devel/p5-Locale-libintl/Makefile
index f74144cc20a4..636650c7aa93 100644
--- a/devel/p5-Locale-libintl/Makefile
+++ b/devel/p5-Locale-libintl/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= Locale-libintl
-PORTVERSION= 1.27
+PORTVERSION= 1.28
CATEGORIES= devel perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/devel/p5-Locale-libintl/distinfo b/devel/p5-Locale-libintl/distinfo
index 5bfa98ca6d41..33c35742c644 100644
--- a/devel/p5-Locale-libintl/distinfo
+++ b/devel/p5-Locale-libintl/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1502295293
-SHA256 (libintl-perl-1.27.tar.gz) = 46de373e84e8a178353990b87eeacf9ef4f5c72650248eb20ed9772a65817c6a
-SIZE (libintl-perl-1.27.tar.gz) = 468340
+TIMESTAMP = 1504258125
+SHA256 (libintl-perl-1.28.tar.gz) = 7bebf2fb1b6d612dbee206693eac4707e185a3e85298683ec5944916b7cb4ebd
+SIZE (libintl-perl-1.28.tar.gz) = 470898
diff --git a/devel/papi/Makefile b/devel/papi/Makefile
index 4cc4a7a40064..7704b40f9b4f 100644
--- a/devel/papi/Makefile
+++ b/devel/papi/Makefile
@@ -7,7 +7,7 @@ PORTREVISION= 3
CATEGORIES= devel
MASTER_SITES= http://icl.cs.utk.edu/projects/papi/downloads/
-MAINTAINER= luca.pizzamiglio@gmail.com
+MAINTAINER= pizzamig@FreeBSD.org
COMMENT= API to access the performance counter hw in the microprocessor
LICENSE= BSD3CLAUSE
diff --git a/devel/pecl-grpc/Makefile b/devel/pecl-grpc/Makefile
index 86d4fb578b74..352cfb5ab518 100644
--- a/devel/pecl-grpc/Makefile
+++ b/devel/pecl-grpc/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= grpc
-PORTVERSION= 1.2.0
+PORTVERSION= 1.4.6
CATEGORIES= devel net
MAINTAINER= vanilla@FreeBSD.org
diff --git a/devel/pecl-grpc/distinfo b/devel/pecl-grpc/distinfo
index 7ad1bdd5b390..39ca6ed03585 100644
--- a/devel/pecl-grpc/distinfo
+++ b/devel/pecl-grpc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1491358810
-SHA256 (PECL/grpc-1.2.0.tgz) = df205473888ad711e6c49df51732afee3e4fbcdd8dd717497531b733b22dd4ac
-SIZE (PECL/grpc-1.2.0.tgz) = 2048319
+TIMESTAMP = 1503999156
+SHA256 (PECL/grpc-1.4.6.tgz) = f2f6fc15964262166ab6536e9db411452ee91ba950cc94083a757562afbf9084
+SIZE (PECL/grpc-1.4.6.tgz) = 2300990
diff --git a/devel/pecl-grpc/files/patch-src_core_lib_tsi_ssl__transport__security.c b/devel/pecl-grpc/files/patch-src_core_tsi_ssl__transport__security.c
index 0c980813758c..7345b2634299 100644
--- a/devel/pecl-grpc/files/patch-src_core_lib_tsi_ssl__transport__security.c
+++ b/devel/pecl-grpc/files/patch-src_core_tsi_ssl__transport__security.c
@@ -1,5 +1,5 @@
---- src/core/lib/tsi/ssl_transport_security.c.orig 2017-02-09 02:54:11 UTC
-+++ src/core/lib/tsi/ssl_transport_security.c
+--- src/core/tsi/ssl_transport_security.c.orig 2017-08-29 09:34:33 UTC
++++ src/core/tsi/ssl_transport_security.c
@@ -35,6 +35,7 @@
#include <grpc/support/port_platform.h>
diff --git a/devel/py-atpublic/Makefile b/devel/py-atpublic/Makefile
new file mode 100644
index 000000000000..79d2e2e334f6
--- /dev/null
+++ b/devel/py-atpublic/Makefile
@@ -0,0 +1,19 @@
+# $FreeBSD$
+
+PORTNAME= atpublic
+PORTVERSION= 0.5
+CATEGORIES= devel python
+MASTER_SITES= CHEESESHOP
+PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER= acm@FreeBSD.org
+COMMENT= Very simple decorator and function of module's all
+
+LICENSE= APACHE20
+
+USES= python:3
+USE_PYTHON= autoplist distutils
+
+MAKE_ENV= ATPUBLIC_BUILD_EXTENSION=1
+
+.include <bsd.port.mk>
diff --git a/devel/py-atpublic/distinfo b/devel/py-atpublic/distinfo
new file mode 100644
index 000000000000..921b1ccbc4f5
--- /dev/null
+++ b/devel/py-atpublic/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1503269392
+SHA256 (atpublic-0.5.tar.gz) = 40a20d59bd64320888e81c21b43bd04d2187175f007bf6562c986f2830ac284a
+SIZE (atpublic-0.5.tar.gz) = 13483
diff --git a/devel/py-atpublic/pkg-descr b/devel/py-atpublic/pkg-descr
new file mode 100644
index 000000000000..ba8e5f6c0eb1
--- /dev/null
+++ b/devel/py-atpublic/pkg-descr
@@ -0,0 +1,5 @@
+This is a very simple decorator and function which populates a module's
+__all__ and optionally the module globals. This provides both a pure-Python
+implementation and an optional C implementation.
+
+WWW: http://public.readthedocs.io
diff --git a/devel/py-flufl.i18n/Makefile b/devel/py-flufl.i18n/Makefile
new file mode 100644
index 000000000000..0361d99ba00f
--- /dev/null
+++ b/devel/py-flufl.i18n/Makefile
@@ -0,0 +1,19 @@
+# $FreeBSD$
+
+PORTNAME= flufl.i18n
+PORTVERSION= 2.0
+CATEGORIES= devel python
+MASTER_SITES= CHEESESHOP
+PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER= acm@FreeBSD.org
+COMMENT= A high level API for Python internationalization
+
+LICENSE= APACHE20
+
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}atpublic>=0:devel/py-atpublic
+
+USES= python:3
+USE_PYTHON= autoplist distutils
+
+.include <bsd.port.mk>
diff --git a/devel/py-flufl.i18n/distinfo b/devel/py-flufl.i18n/distinfo
new file mode 100644
index 000000000000..302c598f9b0b
--- /dev/null
+++ b/devel/py-flufl.i18n/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1503368093
+SHA256 (flufl.i18n-2.0.tar.gz) = 6f1050aeba079c5984e46e93938870e348311fa6f8d19c2ea84d674244863ed0
+SIZE (flufl.i18n-2.0.tar.gz) = 18660
diff --git a/devel/py-flufl.i18n/pkg-descr b/devel/py-flufl.i18n/pkg-descr
new file mode 100644
index 000000000000..3374faffd124
--- /dev/null
+++ b/devel/py-flufl.i18n/pkg-descr
@@ -0,0 +1,9 @@
+This package provides a high level, convenient API for managing
+internationalization translation contexts in Python application. There is a
+simple API for single-context applications, such as command line scripts which
+only need to translate into one language during the entire course of their
+execution. There is a more flexible, but still convenient API for multi-context
+applications, such as servers, which may need to switch language contexts for
+different tasks.
+
+WWW: https://flufli18n.readthedocs.io
diff --git a/devel/py-flufl.lock/Makefile b/devel/py-flufl.lock/Makefile
new file mode 100644
index 000000000000..3d1731d30742
--- /dev/null
+++ b/devel/py-flufl.lock/Makefile
@@ -0,0 +1,19 @@
+# $FreeBSD$
+
+PORTNAME= flufl.lock
+PORTVERSION= 3.1
+CATEGORIES= devel python
+MASTER_SITES= CHEESESHOP
+PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER= acm@FreeBSD.org
+COMMENT= NFS-safe file locking with timeouts for POSIX systems
+
+LICENSE= APACHE20
+
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}atpublic>=0:devel/py-atpublic
+
+USES= python:3
+USE_PYTHON= autoplist distutils
+
+.include <bsd.port.mk>
diff --git a/devel/py-flufl.lock/distinfo b/devel/py-flufl.lock/distinfo
new file mode 100644
index 000000000000..93fb5830af4b
--- /dev/null
+++ b/devel/py-flufl.lock/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1503368231
+SHA256 (flufl.lock-3.1.tar.gz) = 9ec516698af6437b335c74392e8faa17af7fcc033674174cfc57afea1c7b5dd0
+SIZE (flufl.lock-3.1.tar.gz) = 18011
diff --git a/devel/py-flufl.lock/pkg-descr b/devel/py-flufl.lock/pkg-descr
new file mode 100644
index 000000000000..a17b5f4f4cbd
--- /dev/null
+++ b/devel/py-flufl.lock/pkg-descr
@@ -0,0 +1,4 @@
+This package is called flufl.lock. It is an NFS-safe file-based lock with
+timeouts for POSIX systems.
+
+WWW: https://flufllock.readthedocs.io
diff --git a/devel/py-foolscap/Makefile b/devel/py-foolscap/Makefile
index 3b80d7763256..6d821db4f5c4 100644
--- a/devel/py-foolscap/Makefile
+++ b/devel/py-foolscap/Makefile
@@ -3,6 +3,7 @@
PORTNAME= foolscap
PORTVERSION= 0.12.4
+PORTREVISION= 1
CATEGORIES= devel python
MASTER_SITES= http://foolscap.lothar.com/releases/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -13,11 +14,12 @@ COMMENT= RPC protocol for Twisted Python
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openssl>=0.13:security/py-openssl
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openssl>=0.13:security/py-openssl \
+ ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted
RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
-USES= python twisted
+USES= python
USE_PYTHON= autoplist distutils
regression-test: build
diff --git a/devel/py-gtfslib/Makefile b/devel/py-gtfslib/Makefile
new file mode 100644
index 000000000000..e79dd038045a
--- /dev/null
+++ b/devel/py-gtfslib/Makefile
@@ -0,0 +1,27 @@
+# Created by: Loïc BARTOLETTI <lbartoletti@tuxfamily.org>
+# $FreeBSD$
+
+PORTNAME= gtfslib
+PORTVERSION= 1.0.0
+CATEGORIES= devel python databases geography
+MASTER_SITES= CHEESESHOP
+PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER= lbartoletti@tuxfamily.org
+COMMENT= Library for reading GTFS-based transit data in Python
+
+LICENSE= GPLv3+
+
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy11>=0.6.1:databases/py-sqlalchemy11 \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \
+ ${PYTHON_PKGNAMEPREFIX}docopt>=0.6:devel/py-docopt \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.18:www/py-requests \
+ ${PYTHON_PKGNAMEPREFIX}pyqtree>=0.24:devel/py-pyqtree \
+ ${PYTHON_PKGNAMEPREFIX}pyshp>=1.2.12:devel/py-pyshp
+
+NO_ARCH= yes
+
+USES= python
+USE_PYTHON= autoplist distutils
+
+.include <bsd.port.mk>
diff --git a/devel/py-gtfslib/distinfo b/devel/py-gtfslib/distinfo
new file mode 100644
index 000000000000..d5938bff59d8
--- /dev/null
+++ b/devel/py-gtfslib/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1503435799
+SHA256 (gtfslib-1.0.0.tar.gz) = d3f715c32b90ee468a13b4f9da3053b7a791d52ed5bf88a4ac2b524a3a2427b5
+SIZE (gtfslib-1.0.0.tar.gz) = 46686
diff --git a/devel/py-gtfslib/pkg-descr b/devel/py-gtfslib/pkg-descr
new file mode 100644
index 000000000000..2f1226c127ac
--- /dev/null
+++ b/devel/py-gtfslib/pkg-descr
@@ -0,0 +1,4 @@
+An open source library in python for reading GTFS files and computing various
+stats and indicators about Public Transport networks.
+
+WWW: https://pypi.python.org/pypi/gtfslib
diff --git a/devel/py-lazr.config/Makefile b/devel/py-lazr.config/Makefile
new file mode 100644
index 000000000000..c393fbe017ac
--- /dev/null
+++ b/devel/py-lazr.config/Makefile
@@ -0,0 +1,22 @@
+# $FreeBSD$
+
+PORTNAME= lazr.config
+PORTVERSION= 2.2
+PORTREVISION= 1
+CATEGORIES= devel python
+MASTER_SITES= CHEESESHOP
+PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER= acm@FreeBSD.org
+COMMENT= Create configuration schemas, and process and validate configurations
+
+LICENSE= LGPL3
+LICENSE_FILE= ${WRKSRC}/COPYING.txt
+
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+ ${PYTHON_PKGNAMEPREFIX}lazr.delegates>=2.0.3:devel/py-lazr.delegates
+
+USES= python
+USE_PYTHON= autoplist distutils
+
+.include <bsd.port.mk>
diff --git a/devel/py-lazr.config/distinfo b/devel/py-lazr.config/distinfo
new file mode 100644
index 000000000000..8398b51d0e66
--- /dev/null
+++ b/devel/py-lazr.config/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1503368396
+SHA256 (lazr.config-2.2.tar.gz) = 21c6bb23a93e6653a72158e0f393f13b6f9db7408a44532d515c347a5987d777
+SIZE (lazr.config-2.2.tar.gz) = 32037
diff --git a/devel/py-lazr.config/pkg-descr b/devel/py-lazr.config/pkg-descr
new file mode 100644
index 000000000000..e3b08d7872fc
--- /dev/null
+++ b/devel/py-lazr.config/pkg-descr
@@ -0,0 +1,9 @@
+The LAZR config system is typically used to manage process configuration.
+Process configuration is for saying how things change when we run
+systems on different machines, or under different circumstances.
+
+This system uses ini-like file format of section, keys, and values.
+The config file supports inheritance to minimize duplication of
+information across files. The format supports schema validation.
+
+WWW: https://launchpad.net/lazr.config
diff --git a/devel/py-lazr.delegates/Makefile b/devel/py-lazr.delegates/Makefile
new file mode 100644
index 000000000000..bf1603d6b861
--- /dev/null
+++ b/devel/py-lazr.delegates/Makefile
@@ -0,0 +1,22 @@
+# $FreeBSD$
+
+PORTNAME= lazr.delegates
+PORTVERSION= 2.0.3
+PORTREVISION= 1
+CATEGORIES= devel python
+MASTER_SITES= CHEESESHOP
+PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER= acm@FreeBSD.org
+COMMENT= Easily write objects that delegate behavior
+
+LICENSE= LGPL3
+LICENSE_FILE= ${WRKSRC}/COPYING.txt
+
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
+ ${PYTHON_PKGNAMEPREFIX}nose>=1.3.7:devel/py-nose
+
+USES= python
+USE_PYTHON= autoplist distutils
+
+.include <bsd.port.mk>
diff --git a/devel/py-lazr.delegates/distinfo b/devel/py-lazr.delegates/distinfo
new file mode 100644
index 000000000000..e1ca36a63064
--- /dev/null
+++ b/devel/py-lazr.delegates/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1503368711
+SHA256 (lazr.delegates-2.0.3.tar.gz) = 51c80d5ac2c1f8f4a8c75fa271646529c8a6393a0b088dab50fb62138d092ee9
+SIZE (lazr.delegates-2.0.3.tar.gz) = 14039
diff --git a/devel/py-lazr.delegates/pkg-descr b/devel/py-lazr.delegates/pkg-descr
new file mode 100644
index 000000000000..2474a5199734
--- /dev/null
+++ b/devel/py-lazr.delegates/pkg-descr
@@ -0,0 +1,6 @@
+The lazr.delegates package makes it easy to write objects that delegate
+behavior to another object. The new object adds some property or behavior on
+to the other object, while still providing the underlying interface, and
+delegating behavior.
+
+WWW: https://launchpad.net/lazr.delegates
diff --git a/devel/py-pyqtree/Makefile b/devel/py-pyqtree/Makefile
new file mode 100644
index 000000000000..f1b0dc976bf9
--- /dev/null
+++ b/devel/py-pyqtree/Makefile
@@ -0,0 +1,21 @@
+# Created by: Loïc BARTOLETTI <lbartoletti@tuxfamily.org>
+# $FreeBSD$
+
+PORTNAME= pyqtree
+PORTVERSION= 0.24
+CATEGORIES= devel python geography
+MASTER_SITES= CHEESESHOP
+PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
+DISTNAME= Pyqtree-${PORTVERSION}
+
+MAINTAINER= lbartoletti@tuxfamily.org
+COMMENT= Pure Python quad tree spatial index for GIS or rendering usage
+
+LICENSE= MIT
+
+NO_ARCH= yes
+
+USES= python zip
+USE_PYTHON= autoplist concurrent distutils
+
+.include <bsd.port.mk>
diff --git a/devel/py-pyqtree/distinfo b/devel/py-pyqtree/distinfo
new file mode 100644
index 000000000000..abdff697b59c
--- /dev/null
+++ b/devel/py-pyqtree/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1503871819
+SHA256 (Pyqtree-0.24.zip) = e20a8e53a2ce0db9c824eba3144a550a804bd57c28454f18f2948db9ce97b555
+SIZE (Pyqtree-0.24.zip) = 8824
diff --git a/devel/py-pyqtree/pkg-descr b/devel/py-pyqtree/pkg-descr
new file mode 100644
index 000000000000..8f76ef125cfb
--- /dev/null
+++ b/devel/py-pyqtree/pkg-descr
@@ -0,0 +1,6 @@
+Pyqtree is a pure Python spatial index for GIS or rendering usage. It storesand
+quickly retrieves items from a 2x2 rectangular grid area, and grows in depth and
+detail as more items are added. The actual quad tree implementation is adapted
+from Matt Rasmussen's compbio library and extended for geospatial use.
+
+WWW: https://github.com/karimbahgat/Pyqtree
diff --git a/devel/py-pyshp/Makefile b/devel/py-pyshp/Makefile
new file mode 100644
index 000000000000..9f214e084d7b
--- /dev/null
+++ b/devel/py-pyshp/Makefile
@@ -0,0 +1,20 @@
+# $FreeBSD$
+
+PORTNAME= pyshp
+PORTVERSION= 1.2.12
+CATEGORIES= devel python geography
+MASTER_SITES= CHEESESHOP
+PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER= dbaio@FreeBSD.org
+COMMENT= Pure Python read/write support for ESRI Shapefile format
+
+LICENSE= MIT
+LICENSE_FILE= ${WRKSRC}/LICENSE.TXT
+
+NO_ARCH= yes
+
+USES= python
+USE_PYTHON= autoplist concurrent distutils
+
+.include <bsd.port.mk>
diff --git a/devel/py-pyshp/distinfo b/devel/py-pyshp/distinfo
new file mode 100644
index 000000000000..00da5234e986
--- /dev/null
+++ b/devel/py-pyshp/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1503952247
+SHA256 (pyshp-1.2.12.tar.gz) = 8dcd65e0aa2aa2951527ddb7339ea6e69023543d8a20a73fc51e2829b9ed6179
+SIZE (pyshp-1.2.12.tar.gz) = 193089
diff --git a/devel/py-pyshp/pkg-descr b/devel/py-pyshp/pkg-descr
new file mode 100644
index 000000000000..389bf29c04c0
--- /dev/null
+++ b/devel/py-pyshp/pkg-descr
@@ -0,0 +1,5 @@
+The Python Shapefile Library (pyshp) provides read and write support for the
+Esri Shapefile format. The Shapefile format is a popular Geographic Information
+System vector data format created by Esri.
+
+WWW: https://github.com/GeospatialPython/pyshp
diff --git a/devel/py-shapely/Makefile b/devel/py-shapely/Makefile
index 131f110d1046..cad9370475ec 100644
--- a/devel/py-shapely/Makefile
+++ b/devel/py-shapely/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= Shapely
-PORTVERSION= 1.5.17
+PORTVERSION= 1.6.0
CATEGORIES= devel python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-shapely/distinfo b/devel/py-shapely/distinfo
index bc0e8f2ada03..ea3e1dcbbfa8 100644
--- a/devel/py-shapely/distinfo
+++ b/devel/py-shapely/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1473011559
-SHA256 (Shapely-1.5.17.tar.gz) = 31fee47d9208078a19f40a451c0c99c085d16343e66cbd0dd5af0af6f48cfc3a
-SIZE (Shapely-1.5.17.tar.gz) = 180663
+TIMESTAMP = 1503926429
+SHA256 (Shapely-1.6.0.tar.gz) = 34d07cb277a5acf9ca5583a5b926678c58fb512d4fb4fcccbf3992e995b7ef60
+SIZE (Shapely-1.6.0.tar.gz) = 214027
diff --git a/devel/ruby-gems/Makefile b/devel/ruby-gems/Makefile
index 521a5804b17a..da2b472048e6 100644
--- a/devel/ruby-gems/Makefile
+++ b/devel/ruby-gems/Makefile
@@ -6,7 +6,7 @@
# - www/rubygem-gitlab-grack/files/patch-gemspec
PORTNAME= gems
-PORTVERSION= 2.6.12
+PORTVERSION= 2.6.13
CATEGORIES= devel ruby
MASTER_SITES= http://production.cf.rubygems.org/rubygems/
PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
diff --git a/devel/ruby-gems/distinfo b/devel/ruby-gems/distinfo
index 8358bcc9b9e5..a4f2e70ad896 100644
--- a/devel/ruby-gems/distinfo
+++ b/devel/ruby-gems/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1493631786
-SHA256 (ruby/rubygems-2.6.12.tgz) = 37b745cc1f957170cff4f698f473531e607827b1a6407d12c55c338257990d8d
-SIZE (ruby/rubygems-2.6.12.tgz) = 767895
+TIMESTAMP = 1503939355
+SHA256 (ruby/rubygems-2.6.13.tgz) = d041502ae77e8d49e0a436483fb91f9ad6cc1489e49e0735e7c4a7cf10e728c9
+SIZE (ruby/rubygems-2.6.13.tgz) = 768906
diff --git a/devel/rubygem-aws-sdk-core/Makefile b/devel/rubygem-aws-sdk-core/Makefile
index 1f83d834aed3..95e436c12491 100644
--- a/devel/rubygem-aws-sdk-core/Makefile
+++ b/devel/rubygem-aws-sdk-core/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= aws-sdk-core
-PORTVERSION= 2.10.34
+PORTVERSION= 2.10.37
CATEGORIES= devel rubygems
MASTER_SITES= RG
diff --git a/devel/rubygem-aws-sdk-core/distinfo b/devel/rubygem-aws-sdk-core/distinfo
index fad5ae6202fa..7167f1dc9889 100644
--- a/devel/rubygem-aws-sdk-core/distinfo
+++ b/devel/rubygem-aws-sdk-core/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1503740472
-SHA256 (rubygem/aws-sdk-core-2.10.34.gem) = bc20209248f8d7e3f7c2e529932c98c4400518801861e6f76d32953c11bcda3d
-SIZE (rubygem/aws-sdk-core-2.10.34.gem) = 1061888
+TIMESTAMP = 1504258162
+SHA256 (rubygem/aws-sdk-core-2.10.37.gem) = 5357a7f11b673938514ca2d6fdcc3d00e6dbfb38b7278586f6b016f7be7aced5
+SIZE (rubygem/aws-sdk-core-2.10.37.gem) = 1063936
diff --git a/devel/rubygem-aws-sdk-resources/Makefile b/devel/rubygem-aws-sdk-resources/Makefile
index 09fc007f83ce..35423084779c 100644
--- a/devel/rubygem-aws-sdk-resources/Makefile
+++ b/devel/rubygem-aws-sdk-resources/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= aws-sdk-resources
-PORTVERSION= 2.10.34
+PORTVERSION= 2.10.37
CATEGORIES= devel rubygems
MASTER_SITES= RG
diff --git a/devel/rubygem-aws-sdk-resources/distinfo b/devel/rubygem-aws-sdk-resources/distinfo
index 89079deba62f..e75b521d5c6e 100644
--- a/devel/rubygem-aws-sdk-resources/distinfo
+++ b/devel/rubygem-aws-sdk-resources/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1503740479
-SHA256 (rubygem/aws-sdk-resources-2.10.34.gem) = 4c2e8774dd901ecd571f713c394f3e007c91158453854b29aa0d74580bb9d14e
-SIZE (rubygem/aws-sdk-resources-2.10.34.gem) = 48640
+TIMESTAMP = 1504258168
+SHA256 (rubygem/aws-sdk-resources-2.10.37.gem) = 5b434e297d8856816bea31ab0b70dc61fdadee166650ec5eebc52c2deb70cc9a
+SIZE (rubygem/aws-sdk-resources-2.10.37.gem) = 48640
diff --git a/devel/rubygem-aws-sdk/Makefile b/devel/rubygem-aws-sdk/Makefile
index f5439eed0fba..8ae33fdd19d2 100644
--- a/devel/rubygem-aws-sdk/Makefile
+++ b/devel/rubygem-aws-sdk/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= aws-sdk
-PORTVERSION= 2.10.34
+PORTVERSION= 2.10.37
CATEGORIES= devel rubygems
MASTER_SITES= RG
diff --git a/devel/rubygem-aws-sdk/distinfo b/devel/rubygem-aws-sdk/distinfo
index 8eaa110b6031..964a3f7e573b 100644
--- a/devel/rubygem-aws-sdk/distinfo
+++ b/devel/rubygem-aws-sdk/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1503740485
-SHA256 (rubygem/aws-sdk-2.10.34.gem) = 43fc3fb24fae744127f83d2d6be7e1d3d3ea6487d7a990192066bda4f7316326
-SIZE (rubygem/aws-sdk-2.10.34.gem) = 4608
+TIMESTAMP = 1504258174
+SHA256 (rubygem/aws-sdk-2.10.37.gem) = 2192fa546b1d5e9b6b60681fce0dc9bd4f69172c90349560a6e4a6eb9571ee97
+SIZE (rubygem/aws-sdk-2.10.37.gem) = 4608
diff --git a/devel/rubygem-aws-sigv4/Makefile b/devel/rubygem-aws-sigv4/Makefile
index 13715dd0babe..0e0b85ff6f72 100644
--- a/devel/rubygem-aws-sigv4/Makefile
+++ b/devel/rubygem-aws-sigv4/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= aws-sigv4
-PORTVERSION= 1.0.1
+PORTVERSION= 1.0.2
CATEGORIES= devel rubygems
MASTER_SITES= RG
diff --git a/devel/rubygem-aws-sigv4/distinfo b/devel/rubygem-aws-sigv4/distinfo
index c00d2d544aa8..36bff9f70718 100644
--- a/devel/rubygem-aws-sigv4/distinfo
+++ b/devel/rubygem-aws-sigv4/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499960974
-SHA256 (rubygem/aws-sigv4-1.0.1.gem) = d7e75a2e8ce48d5c8f74529935199ad891386339777446a4070d515fb707b433
-SIZE (rubygem/aws-sigv4-1.0.1.gem) = 10752
+TIMESTAMP = 1504258083
+SHA256 (rubygem/aws-sigv4-1.0.2.gem) = 746efa6929bf16ec88b2768f04c53841c987dd28137c864366c6d7d985ff183c
+SIZE (rubygem/aws-sigv4-1.0.2.gem) = 10752
diff --git a/devel/rubygem-bindata/Makefile b/devel/rubygem-bindata/Makefile
index 9667b0a8fe1f..f28161b6cf12 100644
--- a/devel/rubygem-bindata/Makefile
+++ b/devel/rubygem-bindata/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= bindata
-PORTVERSION= 2.4.0
+PORTVERSION= 2.4.1
CATEGORIES= devel ruby
MASTER_SITES= RG
diff --git a/devel/rubygem-bindata/distinfo b/devel/rubygem-bindata/distinfo
index 136e5f6fe4da..cc500fe79de8 100644
--- a/devel/rubygem-bindata/distinfo
+++ b/devel/rubygem-bindata/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1491848387
-SHA256 (rubygem/bindata-2.4.0.gem) = cf335c407124f1d914948966ce78b8e802b1b8c84b8381b81477da0799885183
-SIZE (rubygem/bindata-2.4.0.gem) = 78848
+TIMESTAMP = 1504161277
+SHA256 (rubygem/bindata-2.4.1.gem) = 5fdc3ba70a30503a38d2d0548be4518689d7d32a5a0341716624cb3f8078cb2a
+SIZE (rubygem/bindata-2.4.1.gem) = 78848
diff --git a/devel/rubygem-google-api-client/Makefile b/devel/rubygem-google-api-client/Makefile
index 5531329d6ab2..a9cf471ca623 100644
--- a/devel/rubygem-google-api-client/Makefile
+++ b/devel/rubygem-google-api-client/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= google-api-client
-PORTVERSION= 0.13.3
+PORTVERSION= 0.13.4
CATEGORIES= devel rubygems
MASTER_SITES= RG
@@ -18,6 +18,9 @@ RUN_DEPENDS= rubygem-addressable>=2.5.1:www/rubygem-addressable \
rubygem-representable>=3.0:textproc/rubygem-representable \
rubygem-retriable>=2.0:devel/rubygem-retriable
+# bin/generate-api
+CONFLICTS_INSTALL= rubygem-google-api-client010
+
NO_ARCH= yes
USES= gem
USE_RUBY= yes
diff --git a/devel/rubygem-google-api-client/distinfo b/devel/rubygem-google-api-client/distinfo
index 98038de67e4f..b7c08930eb8c 100644
--- a/devel/rubygem-google-api-client/distinfo
+++ b/devel/rubygem-google-api-client/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1503836514
-SHA256 (rubygem/google-api-client-0.13.3.gem) = 74be7cf02c87ce155c25e2a299572bfbc332b308e5a2a0897e4a961d5b6532f8
-SIZE (rubygem/google-api-client-0.13.3.gem) = 3177984
+TIMESTAMP = 1503939367
+SHA256 (rubygem/google-api-client-0.13.4.gem) = f584b556491c3669c202183469e5cff813d0bae811110ab05e96de0896b7487a
+SIZE (rubygem/google-api-client-0.13.4.gem) = 3180032
diff --git a/devel/rubygem-google-api-client010/Makefile b/devel/rubygem-google-api-client010/Makefile
index 2efb8569e7a1..ea876970fbd2 100644
--- a/devel/rubygem-google-api-client010/Makefile
+++ b/devel/rubygem-google-api-client010/Makefile
@@ -23,6 +23,9 @@ RUN_DEPENDS= rubygem-addressable>=2.3:www/rubygem-addressable \
BROKEN_powerpc64= fails to package: call-i.ri: No such file or directory
+# bin/generate-api
+CONFLICTS_INSTALL= rubygem-google-api-client
+
PORTSCOUT= limit:^0\.10\.
NO_ARCH= yes
diff --git a/devel/rubygem-mize/Makefile b/devel/rubygem-mize/Makefile
index 35e43db603ba..bd903b74b735 100644
--- a/devel/rubygem-mize/Makefile
+++ b/devel/rubygem-mize/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= mize
-PORTVERSION= 0.3.2
+PORTVERSION= 0.3.3
CATEGORIES= devel rubygems
MASTER_SITES= RG
diff --git a/devel/rubygem-mize/distinfo b/devel/rubygem-mize/distinfo
index a4c899c754a6..852de8b685c9 100644
--- a/devel/rubygem-mize/distinfo
+++ b/devel/rubygem-mize/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499298144
-SHA256 (rubygem/mize-0.3.2.gem) = b93616105deee8876cb6b2e885aa082278aa071c67315d80fe0b60acad72f158
-SIZE (rubygem/mize-0.3.2.gem) = 10240
+TIMESTAMP = 1504024077
+SHA256 (rubygem/mize-0.3.3.gem) = 0afca73569418d51a345ca74c83031e218726798d8d0d6dee8ef0e3e0a01e782
+SIZE (rubygem/mize-0.3.3.gem) = 10240
diff --git a/devel/rubygem-mmap2/Makefile b/devel/rubygem-mmap2/Makefile
new file mode 100644
index 000000000000..418b6315844e
--- /dev/null
+++ b/devel/rubygem-mmap2/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+PORTNAME= mmap2
+PORTVERSION= 2.2.7
+CATEGORIES= devel rubygems
+MASTER_SITES= RG
+
+MAINTAINER= tz@FreeBSD.org
+COMMENT= Implement memory-mapped file objects for Ruby 2.x
+
+LICENSE= RUBY
+
+NO_ARCH= yes
+USES= gem
+USE_RUBY= yes
+
+.include <bsd.port.mk>
diff --git a/devel/rubygem-mmap2/distinfo b/devel/rubygem-mmap2/distinfo
new file mode 100644
index 000000000000..1586e7b5e996
--- /dev/null
+++ b/devel/rubygem-mmap2/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1504197701
+SHA256 (rubygem/mmap2-2.2.7.gem) = 46879be4e525a6cc64bc35245674103f26d301830515899715c31885e127eee5
+SIZE (rubygem/mmap2-2.2.7.gem) = 23040
diff --git a/devel/rubygem-mmap2/pkg-descr b/devel/rubygem-mmap2/pkg-descr
new file mode 100644
index 000000000000..b9658875f445
--- /dev/null
+++ b/devel/rubygem-mmap2/pkg-descr
@@ -0,0 +1,3 @@
+The Mmap class implement memory-mapped file objects for Ruby 2.x.
+
+WWW: https://gitlab.com/lyda/mmap
diff --git a/devel/rubygem-peek/Makefile b/devel/rubygem-peek/Makefile
index 34fa5e80c31f..0512367870a6 100644
--- a/devel/rubygem-peek/Makefile
+++ b/devel/rubygem-peek/Makefile
@@ -3,6 +3,7 @@
PORTNAME= peek
PORTVERSION= 1.0.1
+PORTREVISION= 1
CATEGORIES= devel rubygems
MASTER_SITES= RG
@@ -13,11 +14,19 @@ LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
RUN_DEPENDS?= rubygem-concurrent-ruby>=0.9.0:devel/rubygem-concurrent-ruby \
- rubygem-concurrent-ruby-ext>=0.9.0:devel/rubygem-concurrent-ruby-ext \
- rubygem-railties5>=4.0.0:www/rubygem-railties5
+ rubygem-concurrent-ruby-ext>=0.9.0:devel/rubygem-concurrent-ruby-ext
+
+OPTIONS_RADIO= RAILS
+OPTIONS_RADIO_RAILS= RAILS4 RAILS5
+OPTIONS_DEFAULT=RAILS4
+RAILS4_DESC= Use Rails 4
+RAILS5_DESC= Use Rails 5
NO_ARCH= yes
USE_RUBY= yes
USES= gem
+RAILS4_RUN_DEPENDS= rubygem-railties4>=4.0.0:www/rubygem-railties4
+RAILS5_RUN_DEPENDS= rubygem-railties5>=4.0.0:www/rubygem-railties5
+
.include <bsd.port.mk>
diff --git a/devel/rubygem-prometheus-client-mmap/Makefile b/devel/rubygem-prometheus-client-mmap/Makefile
new file mode 100644
index 000000000000..0e083f068532
--- /dev/null
+++ b/devel/rubygem-prometheus-client-mmap/Makefile
@@ -0,0 +1,19 @@
+# $FreeBSD$
+
+PORTNAME= prometheus-client-mmap
+DISTVERSION= 0.7.0.beta5
+CATEGORIES= devel rubygems
+MASTER_SITES= RG
+
+MAINTAINER= tz@FreeBSD.org
+COMMENT= Suite of instrumentation metric primitives
+
+LICENSE= RUBY
+
+RUN_DEPENDS= rubygem-mmap2>=2.2.6:devel/rubygem-mmap2
+
+NO_ARCH= yes
+USES= gem
+USE_RUBY= yes
+
+.include <bsd.port.mk>
diff --git a/devel/rubygem-prometheus-client-mmap/distinfo b/devel/rubygem-prometheus-client-mmap/distinfo
new file mode 100644
index 000000000000..08f5c8758e8c
--- /dev/null
+++ b/devel/rubygem-prometheus-client-mmap/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1504198010
+SHA256 (rubygem/prometheus-client-mmap-0.7.0.beta5.gem) = 1f2b1ef008b7c7d9d100cf31636bad74bbd5cfbf5f737e1b70be17a2347a8485
+SIZE (rubygem/prometheus-client-mmap-0.7.0.beta5.gem) = 14336
diff --git a/devel/rubygem-prometheus-client-mmap/pkg-descr b/devel/rubygem-prometheus-client-mmap/pkg-descr
new file mode 100644
index 000000000000..f09363771934
--- /dev/null
+++ b/devel/rubygem-prometheus-client-mmap/pkg-descr
@@ -0,0 +1,8 @@
+This Prometheus library is fork of Prometheus Ruby Client that uses mmap'ed
+files to share metrics from multiple processes. This allows efficient metrics
+processing for Ruby web apps running in multiprocess setups like Unicorn.
+
+A suite of instrumentation metric primitives for Ruby that can be exposed
+through a HTTP interface. Intended to be used together with a Prometheus server.
+
+WWW: https://gitlab.com/gitlab-org/prometheus-client-mmap
diff --git a/devel/rubygem-sequel3/Makefile b/devel/rubygem-sequel3/Makefile
index 0f1547182ea6..9342aab92390 100644
--- a/devel/rubygem-sequel3/Makefile
+++ b/devel/rubygem-sequel3/Makefile
@@ -14,6 +14,9 @@ COMMENT= The Database Toolkit for Ruby
LICENSE= MIT
+DEPRECATED= Use devel/rubygem-sequel instead
+EXPIRATION_DATE=2017-08-31
+
PORTSCOUT= limit:^3
NO_ARCH= yes
diff --git a/devel/rubygem-sidekiq-scheduler/Makefile b/devel/rubygem-sidekiq-scheduler/Makefile
index 1008a2799010..33bb8c4f38ea 100644
--- a/devel/rubygem-sidekiq-scheduler/Makefile
+++ b/devel/rubygem-sidekiq-scheduler/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= sidekiq-scheduler
-PORTVERSION= 2.1.8
+PORTVERSION= 2.1.9
CATEGORIES= devel rubygems
MASTER_SITES= RG
diff --git a/devel/rubygem-sidekiq-scheduler/distinfo b/devel/rubygem-sidekiq-scheduler/distinfo
index 608dd10b5354..eefac5e50b02 100644
--- a/devel/rubygem-sidekiq-scheduler/distinfo
+++ b/devel/rubygem-sidekiq-scheduler/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501960762
-SHA256 (rubygem/sidekiq-scheduler-2.1.8.gem) = a987cfd3585e9e0bccc2d6c158bd7347e485c48becdd6496bd73b86df7d0fce9
-SIZE (rubygem/sidekiq-scheduler-2.1.8.gem) = 16896
+TIMESTAMP = 1504258090
+SHA256 (rubygem/sidekiq-scheduler-2.1.9.gem) = 22b6fec4c12f76fb6ff564caa9fc823ad6d4b3174edbf560a552c8f81e9be779
+SIZE (rubygem/sidekiq-scheduler-2.1.9.gem) = 17408
diff --git a/devel/rubygem-sprockets-rails-rails5/Makefile b/devel/rubygem-sprockets-rails-rails5/Makefile
index 57ac9f261857..7d5605be896a 100644
--- a/devel/rubygem-sprockets-rails-rails5/Makefile
+++ b/devel/rubygem-sprockets-rails-rails5/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= sprockets-rails
-PORTVERSION= 3.2.0
+PORTVERSION= 3.2.1
CATEGORIES= devel rubygems
MASTER_SITES= RG
PKGNAMESUFFIX= -rails5
diff --git a/devel/rubygem-sprockets-rails-rails5/distinfo b/devel/rubygem-sprockets-rails-rails5/distinfo
index 6e333b0933d6..3dec7a4b21ff 100644
--- a/devel/rubygem-sprockets-rails-rails5/distinfo
+++ b/devel/rubygem-sprockets-rails-rails5/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1483228276
-SHA256 (rubygem/sprockets-rails-3.2.0.gem) = 847423bbd6ac0717d1e97619863fae9447a6adb510162388659c10bbc5dc29ff
-SIZE (rubygem/sprockets-rails-3.2.0.gem) = 14848
+TIMESTAMP = 1504258186
+SHA256 (rubygem/sprockets-rails-3.2.1.gem) = e1963a39cf9ffb0d46cdb1dd5cd36769489a56215865a7c7befd978bea156429
+SIZE (rubygem/sprockets-rails-3.2.1.gem) = 14848
diff --git a/devel/rubygem-sprockets-rails-rails50/Makefile b/devel/rubygem-sprockets-rails-rails50/Makefile
index 43a9b8fe4364..1d7358d1f934 100644
--- a/devel/rubygem-sprockets-rails-rails50/Makefile
+++ b/devel/rubygem-sprockets-rails-rails50/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= sprockets-rails
-PORTVERSION= 3.2.0
+PORTVERSION= 3.2.1
CATEGORIES= devel rubygems
MASTER_SITES= RG
PKGNAMESUFFIX= -rails50
diff --git a/devel/rubygem-sprockets-rails-rails50/distinfo b/devel/rubygem-sprockets-rails-rails50/distinfo
index 6e333b0933d6..2122c08e1229 100644
--- a/devel/rubygem-sprockets-rails-rails50/distinfo
+++ b/devel/rubygem-sprockets-rails-rails50/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1483228276
-SHA256 (rubygem/sprockets-rails-3.2.0.gem) = 847423bbd6ac0717d1e97619863fae9447a6adb510162388659c10bbc5dc29ff
-SIZE (rubygem/sprockets-rails-3.2.0.gem) = 14848
+TIMESTAMP = 1504258192
+SHA256 (rubygem/sprockets-rails-3.2.1.gem) = e1963a39cf9ffb0d46cdb1dd5cd36769489a56215865a7c7befd978bea156429
+SIZE (rubygem/sprockets-rails-3.2.1.gem) = 14848
diff --git a/devel/rubygem-sprockets-rails/Makefile b/devel/rubygem-sprockets-rails/Makefile
index 632e3de703e1..740989523e5e 100644
--- a/devel/rubygem-sprockets-rails/Makefile
+++ b/devel/rubygem-sprockets-rails/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= sprockets-rails
-PORTVERSION= 3.2.0
+PORTVERSION= 3.2.1
CATEGORIES= devel rubygems
MASTER_SITES= RG
diff --git a/devel/rubygem-sprockets-rails/distinfo b/devel/rubygem-sprockets-rails/distinfo
index 6e333b0933d6..489b18d9a5bf 100644
--- a/devel/rubygem-sprockets-rails/distinfo
+++ b/devel/rubygem-sprockets-rails/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1483228276
-SHA256 (rubygem/sprockets-rails-3.2.0.gem) = 847423bbd6ac0717d1e97619863fae9447a6adb510162388659c10bbc5dc29ff
-SIZE (rubygem/sprockets-rails-3.2.0.gem) = 14848
+TIMESTAMP = 1504258180
+SHA256 (rubygem/sprockets-rails-3.2.1.gem) = e1963a39cf9ffb0d46cdb1dd5cd36769489a56215865a7c7befd978bea156429
+SIZE (rubygem/sprockets-rails-3.2.1.gem) = 14848
diff --git a/devel/sbt/Makefile b/devel/sbt/Makefile
index b6dab365e4b5..419228107bf2 100644
--- a/devel/sbt/Makefile
+++ b/devel/sbt/Makefile
@@ -2,9 +2,9 @@
# $FreeBSD$
PORTNAME= sbt
-PORTVERSION= 0.13.15
+PORTVERSION= 1.0.0
CATEGORIES= devel java
-MASTER_SITES= http://dl.bintray.com/sbt/native-packages/sbt/${PORTVERSION}/
+MASTER_SITES= https://github.com/sbt/sbt/releases/download/v${PORTVERSION}/
MAINTAINER= ale@FreeBSD.org
COMMENT= Build tool for Scala projects
diff --git a/devel/sbt/distinfo b/devel/sbt/distinfo
index 22cd91e3ff5b..960c17b61499 100644
--- a/devel/sbt/distinfo
+++ b/devel/sbt/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1491981399
-SHA256 (sbt-0.13.15.tgz) = b6e073d7c201741dcca92cfdd1dd3cd76c42a47dc9d8c8ead8df7117deed7aef
-SIZE (sbt-0.13.15.tgz) = 60301163
+TIMESTAMP = 1504078579
+SHA256 (sbt-1.0.0.tgz) = 9ae04f4972145f2ac56c4deb868c9a5bb8b8b85c5151885dff3b997712645c5a
+SIZE (sbt-1.0.0.tgz) = 59735978
diff --git a/devel/zookeeper/Makefile b/devel/zookeeper/Makefile
index 60a4dea6d5f2..64b104090a64 100644
--- a/devel/zookeeper/Makefile
+++ b/devel/zookeeper/Makefile
@@ -2,12 +2,15 @@
PORTNAME= zookeeper
PORTVERSION= 3.4.10
+PORTREVISION= 1
CATEGORIES= devel java
MASTER_SITES= APACHE/${PORTNAME}/current
MAINTAINER= skreuzer@FreeBSD.org
COMMENT= Coordination Service for Distributed Applications
+LICENSE= APACHE20
+
RUN_DEPENDS= slf4j>=1.7.5:devel/slf4j \
netty>=3.5.5:java/netty \
jline>=0.9.94:devel/jline \
@@ -17,6 +20,8 @@ RUN_DEPENDS= slf4j>=1.7.5:devel/slf4j \
USERS= zookeeper
GROUPS= zookeeper
+ZOOKEEPER_CONFS= configuration.xsl log4j.properties zoo.cfg
+
ZOOKEEPER_JAR= ${WRKSRC}/${PORTNAME}-${PORTVERSION}.jar
ZOOKEEPER_DBDIR?= /var/db/zookeeper
@@ -47,10 +52,13 @@ PORTDOCS= *
post-extract:
@${REINPLACE_CMD} "/dataDir/s|=.*|=${ZOOKEEPER_DBDIR}|" ${WRKDIR}/${DISTNAME}/conf/zoo_sample.cfg
- @${RM} ${WRKDIR}/${DISTNAME}/conf/zoo_sample.cfg.bak
+ @${MV} ${WRKDIR}/${DISTNAME}/conf/zoo_sample.cfg ${WRKDIR}/${DISTNAME}/conf/zoo.cfg
do-install:
- ${CP} -Rp ${WRKDIR}/${DISTNAME}/conf/ ${STAGEDIR}${ETCDIR}
+ @${MKDIR} ${STAGEDIR}${ETCDIR}
+.for f in ${ZOOKEEPER_CONFS}
+ ${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/conf/${f} ${STAGEDIR}${ETCDIR}/${f}.sample
+.endfor
${INSTALL_DATA} ${ZOOKEEPER_JAR} ${STAGEDIR}${JAVALIBDIR}
(cd ${STAGEDIR}/${JAVAJARDIR} && ${LN} -nfs \
${PORTNAME}-${PORTVERSION}.jar ${PORTNAME}.jar)
diff --git a/devel/zookeeper/files/zookeeper.in b/devel/zookeeper/files/zookeeper.in
index a497328b520a..7254da1856a7 100644
--- a/devel/zookeeper/files/zookeeper.in
+++ b/devel/zookeeper/files/zookeeper.in
@@ -25,6 +25,7 @@ load_rc_config "${name}"
: ${zookeeper_log4jpropfile:=file:%%ETCDIR%%/log4j.properties}
: ${zookeeper_rootlogger:="INFO,ROLLINGFILE"}
: ${zookeeper_logdir:=%%ZOOKEEPER_LOGDIR%%}
+: ${zookeeper_jvmopts:=}
JAVA=%%JAVA%%
JAVAJARDIR=%%JAVAJARDIR%%
@@ -44,7 +45,7 @@ procname=${JAVA}
required_files="${zookeeper_config}"
command="/usr/sbin/daemon"
-command_args="-p ${pidfile} ${JAVA} ${log4j_params} ${zookeeper_main}"
+command_args="-p ${pidfile} ${JAVA} ${zookeeper_jvmopts} ${log4j_params} ${zookeeper_main}"
start_precmd="zookeeper_init"
diff --git a/devel/zookeeper/pkg-plist b/devel/zookeeper/pkg-plist
index 44ffe0c1deeb..ddf0a4d6e2ce 100644
--- a/devel/zookeeper/pkg-plist
+++ b/devel/zookeeper/pkg-plist
@@ -2,8 +2,8 @@ bin/zkCli.sh
bin/zkServer.sh
%%JAVAJARDIR%%/zookeeper-%%PORTVERSION%%.jar
%%JAVAJARDIR%%/zookeeper.jar
-%%ETCDIR%%/log4j.properties
-%%ETCDIR%%/configuration.xsl
-%%ETCDIR%%/zoo_sample.cfg
+@sample %%ETCDIR%%/log4j.properties.sample
+@sample %%ETCDIR%%/configuration.xsl.sample
+@sample %%ETCDIR%%/zoo.cfg.sample
@dir(zookeeper,zookeeper,755) %%ZOOKEEPER_LOGDIR%%
@dir(zookeeper,zookeeper,755) %%ZOOKEEPER_DBDIR%%
diff --git a/dns/kf5-kdnssd/distinfo b/dns/kf5-kdnssd/distinfo
index 350d3c87157d..051b5731d233 100644
--- a/dns/kf5-kdnssd/distinfo
+++ b/dns/kf5-kdnssd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499098901
-SHA256 (KDE/frameworks/5.36.0/kdnssd-5.36.0.tar.xz) = 57504b89b327e0c4439c1be8037e13aba588155d5201adb3e81a1b52f8e28e1e
-SIZE (KDE/frameworks/5.36.0/kdnssd-5.36.0.tar.xz) = 56620
+TIMESTAMP = 1502086009
+SHA256 (KDE/frameworks/5.37.0/kdnssd-5.37.0.tar.xz) = bf30e680be8e1a00fde32a97517c368045cfa91e60ad51896d966361ed372d0f
+SIZE (KDE/frameworks/5.37.0/kdnssd-5.37.0.tar.xz) = 56560
diff --git a/dns/libidn2/Makefile b/dns/libidn2/Makefile
index 88ea4a62419f..5d54f4a3d29e 100644
--- a/dns/libidn2/Makefile
+++ b/dns/libidn2/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= libidn2
-PORTVERSION= 2.0.3
+PORTVERSION= 2.0.4
CATEGORIES= dns
MASTER_SITES= GNU/libidn
diff --git a/dns/libidn2/distinfo b/dns/libidn2/distinfo
index 997a3017c6d0..ebbb2c78daf9 100644
--- a/dns/libidn2/distinfo
+++ b/dns/libidn2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1500989930
-SHA256 (libidn2-2.0.3.tar.gz) = 4335149ce7a5c615edb781574d38f658672780331064fb17354a10e11a5308cd
-SIZE (libidn2-2.0.3.tar.gz) = 1801001
+TIMESTAMP = 1504161218
+SHA256 (libidn2-2.0.4.tar.gz) = 644b6b03b285fb0ace02d241d59483d98bc462729d8bb3608d5cad5532f3d2f0
+SIZE (libidn2-2.0.4.tar.gz) = 2008524
diff --git a/dns/libidn2/pkg-plist b/dns/libidn2/pkg-plist
index 33f3f9996553..a6549b90fb48 100644
--- a/dns/libidn2/pkg-plist
+++ b/dns/libidn2/pkg-plist
@@ -3,7 +3,7 @@ include/idn2.h
lib/libidn2.a
lib/libidn2.so
lib/libidn2.so.0
-lib/libidn2.so.0.3.2
+lib/libidn2.so.0.3.3
libdata/pkgconfig/libidn2.pc
man/man1/idn2.1.gz
man/man3/idn2_check_version.3.gz
diff --git a/editors/mg/Makefile b/editors/mg/Makefile
index 2bc4dfe000c4..3abfe63a1cb0 100644
--- a/editors/mg/Makefile
+++ b/editors/mg/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= mg
-PORTVERSION= 20170401
+PORTVERSION= 20170828
CATEGORIES= editors
MASTER_SITES= http://homepage.boetes.org/software/mg/
diff --git a/editors/mg/distinfo b/editors/mg/distinfo
index d04698339952..0289d4e3b304 100644
--- a/editors/mg/distinfo
+++ b/editors/mg/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1491249979
-SHA256 (mg-20170401.tar.gz) = 0a3608b17c153960cb1d954ca3b62445a77c0c1a18aa5c8c58aba9f6b8d62aab
-SIZE (mg-20170401.tar.gz) = 140895
+TIMESTAMP = 1503997231
+SHA256 (mg-20170828.tar.gz) = 1f8886ab62e9abfeed7fafbb5ea71685450a34c5d0a243461bd2c5425161368d
+SIZE (mg-20170828.tar.gz) = 141028
diff --git a/editors/zile/Makefile b/editors/zile/Makefile
index 3875d09c3ddd..df9977c7f89e 100644
--- a/editors/zile/Makefile
+++ b/editors/zile/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= zile
-PORTVERSION= 2.4.11
-PORTREVISION= 2
+PORTVERSION= 2.4.13
CATEGORIES= editors
MASTER_SITES= GNU
diff --git a/editors/zile/distinfo b/editors/zile/distinfo
index 65c2c74057d7..95c3a09de00e 100644
--- a/editors/zile/distinfo
+++ b/editors/zile/distinfo
@@ -1,2 +1,3 @@
-SHA256 (zile-2.4.11.tar.gz) = 1fd27bbddc61491b1fbb29a345d0d344734aa9e80cfa07b02892eedf831fa9cc
-SIZE (zile-2.4.11.tar.gz) = 1293707
+TIMESTAMP = 1504097649
+SHA256 (zile-2.4.13.tar.gz) = c795f369ea432219c21bf59ffc9322fd5f221217021a8fbaa6f9fed91778ac0e
+SIZE (zile-2.4.13.tar.gz) = 1296379
diff --git a/emulators/open-vm-tools/Makefile b/emulators/open-vm-tools/Makefile
index 793d3cba4b14..c1ab26c2192a 100644
--- a/emulators/open-vm-tools/Makefile
+++ b/emulators/open-vm-tools/Makefile
@@ -5,7 +5,6 @@ PORTNAME= open-vm-tools
PORTVERSION= ${RELEASE_VER}
DISTVERSIONPREFIX= stable-
PORTEPOCH= 2
-PORTREVISION= 1
CATEGORIES= emulators
MAINTAINER= jpaetzel@FreeBSD.org
@@ -14,12 +13,14 @@ COMMENT?= Open VMware tools for FreeBSD VMware guests
LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/COPYING
+ONLY_FOR_ARCHS= amd64 i386
+
LIB_DEPENDS= libmspack.so:archivers/libmspack \
libxerces-c.so:textproc/xerces-c3 \
libxml-security-c.so:security/apache-xml-security-c
-RELEASE_VER= 10.1.5
-BUILD_VER= 5055683
+RELEASE_VER= 10.1.10
+BUILD_VER= 6082533
OPTIONS_DEFINE= DNET ICU LIBNOTIFY OPENSSL X11
OPTIONS_DEFAULT= DNET ICU LIBNOTIFY OPENSSL X11
@@ -44,8 +45,8 @@ OPENSSL_CONFIGURE_WITH= ssl
WRKSRC_SUBDIR= open-vm-tools
GNU_CONFIGURE= yes
-USE_GNOME= glib20
USES= autoreconf:-iv fuse gettext-runtime kmod libtool localbase pathfix pkgconfig
+USE_GNOME= glib20
USE_GITHUB= yes
GH_ACCOUNT= vmware
@@ -73,8 +74,6 @@ CONFLICTS= open-vm-tools-nox11-[0-9]*
CONFLICTS= open-vm-tools-[0-9]*
.endif
-ONLY_FOR_ARCHS= i386 amd64
-
CONFIGURE_ENV+= SYSDIR=${SRC_BASE}/sys
.include <bsd.port.pre.mk>
diff --git a/emulators/open-vm-tools/distinfo b/emulators/open-vm-tools/distinfo
index 747c1d3899f7..f52b6b13d475 100644
--- a/emulators/open-vm-tools/distinfo
+++ b/emulators/open-vm-tools/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501156965
-SHA256 (vmware-open-vm-tools-stable-10.1.5_GH0.tar.gz) = aba7bf570b8951b61784941460659c204359d98fcbfb164df3c30d468a19fb1c
-SIZE (vmware-open-vm-tools-stable-10.1.5_GH0.tar.gz) = 3540164
+TIMESTAMP = 1503010753
+SHA256 (vmware-open-vm-tools-stable-10.1.10_GH0.tar.gz) = ce03c8827389ea272a5c072366b6bff381b2eddad94750c6a9433a0dea61c762
+SIZE (vmware-open-vm-tools-stable-10.1.10_GH0.tar.gz) = 3543342
diff --git a/emulators/open-vm-tools/files/patch-lib_hgfsServer_hgfsServerLinux.c b/emulators/open-vm-tools/files/patch-lib_hgfsServer_hgfsServerLinux.c
new file mode 100644
index 000000000000..0bb2f96044d0
--- /dev/null
+++ b/emulators/open-vm-tools/files/patch-lib_hgfsServer_hgfsServerLinux.c
@@ -0,0 +1,15 @@
+--- lib/hgfsServer/hgfsServerLinux.c.orig 2017-07-28 21:59:15 UTC
++++ lib/hgfsServer/hgfsServerLinux.c
+@@ -178,6 +178,12 @@ getdents_linux(unsigned int fd,
+ # endif
+ }
+ # define getdents getdents_linux
++#elif defined(__FreeBSD__) && defined(__INO64)
++#define getdents(fd, dirp, count) \
++({ \
++ off_t basep; \
++ getdirentries(fd, dirp, count, &basep); \
++})
+ #elif defined(__FreeBSD__)
+ #define getdents(fd, dirp, count) \
+ ({ \
diff --git a/emulators/open-vm-tools/files/patch-lib_include_guest__os.h b/emulators/open-vm-tools/files/patch-lib_include_guest__os.h
new file mode 100644
index 000000000000..2376dfa7c92d
--- /dev/null
+++ b/emulators/open-vm-tools/files/patch-lib_include_guest__os.h
@@ -0,0 +1,12 @@
+--- lib/include/guest_os.h.orig 2017-07-28 21:59:15 UTC
++++ lib/include/guest_os.h
+@@ -493,7 +493,8 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
+ #define STR_OS_WIN_64_BIT_EXTENSION ", 64-bit"
+
+ /* FreeBSD */
+-#define STR_OS_FREEBSD "freeBSD"
++#define STR_OS_FREEBSD "freeBSD"
++#define STR_OS_FREEBSD11 "freeBSD11"
+
+ /* Solaris */
+ #define STR_OS_SOLARIS "solaris"
diff --git a/emulators/open-vm-tools/files/patch-lib_misc_hostinfoPosix.c b/emulators/open-vm-tools/files/patch-lib_misc_hostinfoPosix.c
new file mode 100644
index 000000000000..85bad68a32a9
--- /dev/null
+++ b/emulators/open-vm-tools/files/patch-lib_misc_hostinfoPosix.c
@@ -0,0 +1,53 @@
+--- lib/misc/hostinfoPosix.c.orig 2017-07-28 21:59:15 UTC
++++ lib/misc/hostinfoPosix.c
+@@ -1,5 +1,5 @@
+ /*********************************************************
+- * Copyright (C) 1998-2016 VMware, Inc. All rights reserved.
++ * Copyright (C) 1998-2017 VMware, Inc. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published
+@@ -1080,28 +1080,32 @@ HostinfoOSData(void)
+
+ Str_Strcpy(osName, distroShort, sizeof osName);
+ } else if (strstr(osNameFull, "FreeBSD")) {
+- size_t nameLen = sizeof STR_OS_FREEBSD - 1;
+- size_t releaseLen = 0;
+- char *dashPtr;
++ char distroShort[DISTRO_BUF_SIZE];
++ int majorVersion;
+
+ /*
+- * FreeBSD releases report their version as "x.y-RELEASE". We'll be
+- * naive look for the first dash, and use everything before it as the
+- * version number.
++ * FreeBSD releases report their version as "x.y-RELEASE".
+ */
+
+- dashPtr = Str_Strchr(buf.release, '-');
+- if (dashPtr != NULL) {
+- releaseLen = dashPtr - buf.release;
++ majorVersion = Hostinfo_OSVersion(0);
++
++ /*
++ * FreeBSD 11 and later are identified using
++ * a different guestId.
++ */
++ if (majorVersion >= 11) {
++ Str_Strcpy(distroShort, STR_OS_FREEBSD11, sizeof distroShort);
++ } else {
++ Str_Strcpy(distroShort, STR_OS_FREEBSD, sizeof distroShort);
+ }
+
+- if (nameLen + releaseLen + 1 > sizeof osName) {
++ if (strlen(distroShort) + 1 > sizeof osName) {
+ Warning("%s: Error: buffer too small\n", __FUNCTION__);
+
+ return FALSE;
+ }
+
+- Str_Strcpy(osName, STR_OS_FREEBSD, sizeof osName);
++ Str_Strcpy(osName, distroShort, sizeof osName);
+ } else if (strstr(osNameFull, "SunOS")) {
+ size_t nameLen = sizeof STR_OS_SOLARIS - 1;
+ size_t releaseLen = 0;
diff --git a/emulators/open-vm-tools/files/patch-modules_freebsd_vmmemctl_os.c b/emulators/open-vm-tools/files/patch-modules_freebsd_vmmemctl_os.c
index b97fee1be391..651668a7f55e 100644
--- a/emulators/open-vm-tools/files/patch-modules_freebsd_vmmemctl_os.c
+++ b/emulators/open-vm-tools/files/patch-modules_freebsd_vmmemctl_os.c
@@ -1,5 +1,5 @@
---- modules/freebsd/vmmemctl/os.c.orig 2017-02-24 14:15:37.000000000 -0800
-+++ modules/freebsd/vmmemctl/os.c 2017-08-15 13:54:03.813152000 -0700
+--- modules/freebsd/vmmemctl/os.c.orig 2017-07-28 21:59:15 UTC
++++ modules/freebsd/vmmemctl/os.c
@@ -37,9 +37,11 @@
#include <sys/param.h>
#include <sys/systm.h>
@@ -12,113 +12,96 @@
#include <sys/sysctl.h>
#include <vm/vm.h>
-@@ -223,7 +225,11 @@ static __inline__ unsigned long os_ffz(u
- unsigned long
- OS_ReservedPageGetLimit(void)
- {
+@@ -83,6 +85,30 @@ typedef struct {
+ MALLOC_DEFINE(M_VMMEMCTL, BALLOON_NAME, "vmmemctl metadata");
+
+ /*
++ * FreeBSD version specific MACROS
++ */
++#if __FreeBSD_version >= 900000
++ #define VM_PAGE_LOCK(page) vm_page_lock(page);
++ #define VM_PAGE_UNLOCK(page) vm_page_unlock(page)
++#else
++ #define VM_PAGE_LOCK(page) vm_page_lock_queues()
++ #define VM_PAGE_UNLOCK(page) vm_page_unlock_queues()
++#endif
++
++#if __FreeBSD_version > 1000029
++ #define VM_OBJ_LOCK(object) VM_OBJECT_WLOCK(object)
++ #define VM_OBJ_UNLOCK(object) VM_OBJECT_WUNLOCK(object);
++#else
++ #define VM_OBJ_LOCK(object) VM_OBJECT_LOCK(object);
++ #define VM_OBJ_UNLOCK(object) VM_OBJECT_UNLOCK(object);
++#endif
++
+#if __FreeBSD_version < 1100015
- return cnt.v_page_count;
++ #define VM_SYS_PAGES cnt.v_page_count
+#else
-+ return vm_cnt.v_page_count;
++ #define VM_SYS_PAGES vm_cnt.v_page_count
+#endif
++/*
+ * Globals
+ */
+
+@@ -223,7 +249,7 @@ static __inline__ unsigned long os_ffz(unsigned long w
+ unsigned long
+ OS_ReservedPageGetLimit(void)
+ {
+- return cnt.v_page_count;
++ return VM_SYS_PAGES;
}
-@@ -369,7 +375,11 @@ static void
+@@ -369,7 +395,7 @@ static void
os_pmap_alloc(os_pmap *p) // IN
{
/* number of pages (div. 8) */
-+#if __FreeBSD_version < 1100015
- p->size = (cnt.v_page_count + 7) / 8;
-+#else
-+ p->size = (vm_cnt.v_page_count + 7) / 8;
-+#endif
+- p->size = (cnt.v_page_count + 7) / 8;
++ p->size = (VM_SYS_PAGES + 7) / 8;
/*
* expand to nearest word boundary
-@@ -392,6 +402,7 @@ os_pmap_free(os_pmap *p) // IN
- #if __FreeBSD_version < 1000000
- kmem_free(kernel_map, (vm_offset_t)p->bitmap, p->size);
- #else
-+// kva_free((vm_offset_t)p->bitmap, p->size);
- kmem_free(kernel_arena, (vm_offset_t)p->bitmap, p->size);
- #endif
- p->size = 0;
-@@ -466,12 +477,36 @@ os_kmem_free(vm_page_t page) // IN
+@@ -466,12 +492,14 @@ os_kmem_free(vm_page_t page) // IN
os_state *state = &global_state;
os_pmap *pmap = &state->pmap;
- if ( !vm_page_lookup(state->vmobject, page->pindex) ) {
- return;
-+// if ( !vm_page_lookup(state->vmobject, page->pindex) ) {
-+// return;
-+// }
-+
-+// os_pmap_putindex(pmap, page->pindex);
-+// vm_page_free(page);
-+#if __FreeBSD_version > 1000029
-+ VM_OBJECT_WLOCK(state->vmobject);
-+#else
-+ VM_OBJECT_LOCK(state->vmobject);
-+#endif
++ VM_OBJ_LOCK(state->vmobject);
+ if ( vm_page_lookup(state->vmobject, page->pindex) ) {
-+ os_pmap_putindex(pmap, page->pindex);
-+#if __FreeBSD_version >= 900000
-+ vm_page_lock(page);
-+#else
-+ vm_page_lock_queues();
-+#endif
-+ vm_page_free(page);
-+#if __FreeBSD_version >= 900000
-+ vm_page_unlock(page);
-+#else
-+ vm_page_unlock_queues();
-+#endif
++ os_pmap_putindex(pmap, page->pindex);
++ VM_PAGE_LOCK(page);
++ vm_page_free(page);
++ VM_PAGE_UNLOCK(page);
}
-
- os_pmap_putindex(pmap, page->pindex);
- vm_page_free(page);
-+#if __FreeBSD_version > 1000029
-+ VM_OBJECT_WUNLOCK(state->vmobject);
-+#else
-+ VM_OBJECT_UNLOCK(state->vmobject);
-+#endif
++ VM_OBJ_UNLOCK(state->vmobject);
}
-@@ -483,8 +518,19 @@ os_kmem_alloc(int alloc_normal_failed) /
+@@ -483,8 +511,11 @@ os_kmem_alloc(int alloc_normal_failed) // IN
os_state *state = &global_state;
os_pmap *pmap = &state->pmap;
-+#if __FreeBSD_version > 1000029
-+ VM_OBJECT_WLOCK(state->vmobject);
-+#else
-+ VM_OBJECT_LOCK(state->vmobject);
-+#endif
++ VM_OBJ_LOCK(state->vmobject);
+
pindex = os_pmap_getindex(pmap);
if (pindex == (vm_pindex_t)-1) {
-+#if __FreeBSD_version > 1000029
-+ VM_OBJECT_WUNLOCK(state->vmobject);
-+#else
-+ VM_OBJECT_UNLOCK(state->vmobject);
-+#endif
++ VM_OBJ_UNLOCK(state->vmobject);
return NULL;
}
-@@ -505,6 +551,11 @@ os_kmem_alloc(int alloc_normal_failed) /
+@@ -505,6 +536,7 @@ os_kmem_alloc(int alloc_normal_failed) // IN
if (!page) {
os_pmap_putindex(pmap, pindex);
}
-+#if __FreeBSD_version > 1000029
-+ VM_OBJECT_WUNLOCK(state->vmobject);
-+#else
-+ VM_OBJECT_UNLOCK(state->vmobject);
-+#endif
++ VM_OBJ_UNLOCK(state->vmobject);
return page;
}
-@@ -847,7 +898,7 @@ vmmemctl_sysctl(SYSCTL_HANDLER_ARGS)
+@@ -847,7 +879,7 @@ vmmemctl_sysctl(SYSCTL_HANDLER_ARGS)
static void
vmmemctl_init_sysctl(void)
{
diff --git a/emulators/open-vm-tools/files/patch-scripts_freebsd_network b/emulators/open-vm-tools/files/patch-scripts_freebsd_network
deleted file mode 100644
index 4a86f951450a..000000000000
--- a/emulators/open-vm-tools/files/patch-scripts_freebsd_network
+++ /dev/null
@@ -1,10 +0,0 @@
---- scripts/freebsd/network.orig 2017-02-24 22:15:37 UTC
-+++ scripts/freebsd/network
-@@ -59,6 +59,7 @@ ToggleNetwork() {
-
- for intf in `list_net_interfaces dhcp`; do
- /etc/rc.d/netif $1 $intf
-+ /etc/rc.d/dhclient $1 $intf
- ec=$?
-
- # Failure to stop an interface should not interfere with suspend.
diff --git a/emulators/qemu-sbruno/Makefile b/emulators/qemu-sbruno/Makefile
index 884e7d3ebfc2..7ea05e4f06b2 100644
--- a/emulators/qemu-sbruno/Makefile
+++ b/emulators/qemu-sbruno/Makefile
@@ -3,6 +3,7 @@
PORTNAME= qemu
PORTVERSION= 2.9.94.g20170825
+PORTREVISION= 1
CATEGORIES= emulators
MASTER_SITES= GH
PKGNAMESUFFIX?= -sbruno
diff --git a/emulators/qemu-sbruno/files/qemu_user_static.in b/emulators/qemu-sbruno/files/qemu_user_static.in
index 38fb48ab31b7..5a06a11962a1 100644
--- a/emulators/qemu-sbruno/files/qemu_user_static.in
+++ b/emulators/qemu-sbruno/files/qemu_user_static.in
@@ -84,7 +84,7 @@ list_cmd="${BINMISCCTL} list"
else
echo "$0: interpreter ${interpreter} not found, cannot register."
fi
- # register mipsle interpreter styled 'mipsle'
+ # register mipsle interpreter styled 'mipsel'
interpreter=${QEMU_DIR}/${QEMU_PREFIX}mipsel${QEMU_SUFFIX}
if [ -x "${interpreter}" ]; then
${BINMISCCTL} add mipsel --interpreter "${interpreter}" \
@@ -141,6 +141,7 @@ list_cmd="${BINMISCCTL} list"
${BINMISCCTL} remove mips64
${BINMISCCTL} remove arm
${BINMISCCTL} remove armv6
+ ${BINMISCCTL} remove armv7
${BINMISCCTL} remove aarch64
${BINMISCCTL} remove mips
${BINMISCCTL} remove mipsel
diff --git a/games/Makefile b/games/Makefile
index 0c2e8aa481a6..5eee07660ab7 100644
--- a/games/Makefile
+++ b/games/Makefile
@@ -32,6 +32,7 @@
SUBDIR += agame
SUBDIR += ags
SUBDIR += aisleriot
+ SUBDIR += aklabeth
SUBDIR += alephone
SUBDIR += alephone-data
SUBDIR += alephone-scenarios
@@ -254,6 +255,7 @@
SUBDIR += entombed
SUBDIR += enygma
SUBDIR += epiar
+ SUBDIR += epiphany-game
SUBDIR += etracer
SUBDIR += euchre
SUBDIR += evilfinder
diff --git a/games/aklabeth/Makefile b/games/aklabeth/Makefile
new file mode 100644
index 000000000000..18d7ef06d09e
--- /dev/null
+++ b/games/aklabeth/Makefile
@@ -0,0 +1,37 @@
+# Created by: Dmitry Marakasov <amdmi3@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME= aklabeth
+PORTVERSION= 1.0
+CATEGORIES= games
+MASTER_SITES= http://reconstruction.voyd.net/zips/
+
+MAINTAINER= amdmi3@FreeBSD.org
+COMMENT= Remake of Richard Garriott's Ultima prequel
+
+LICENSE= GPLv2+
+LICENSE_FILE= ${WRKSRC}/COPYING
+
+GNU_CONFIGURE= yes
+USE_SDL= sdl
+
+PLIST_FILES= bin/${PORTNAME}
+
+PORTDOCS= AUTHORS README
+
+DESKTOP_ENTRIES="Aklabeth" \
+ "" \
+ "" \
+ "${PORTNAME}" \
+ "Game;RolePlaying;" \
+ ""
+
+OPTIONS_DEFINE= DOCS
+
+post-install-DOCS-on:
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for f in ${PORTDOCS}
+ ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/
+.endfor
+
+.include <bsd.port.mk>
diff --git a/games/aklabeth/distinfo b/games/aklabeth/distinfo
new file mode 100644
index 000000000000..02ec3323359c
--- /dev/null
+++ b/games/aklabeth/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1503939995
+SHA256 (aklabeth-1.0.tar.gz) = ce8486519f434a229f002a77cad28cb40e66794225d2b8ac7013ab867c2ff044
+SIZE (aklabeth-1.0.tar.gz) = 235131
diff --git a/games/aklabeth/pkg-descr b/games/aklabeth/pkg-descr
new file mode 100644
index 000000000000..ba218d4dcbb8
--- /dev/null
+++ b/games/aklabeth/pkg-descr
@@ -0,0 +1,8 @@
+Aklabeth is effectively Ultima 0. This is a port of original version,
+written in Basic for the Apple II.
+
+It's a RPG - sort of. You wander the top world, visit 3D (sort of)
+dungeons, beat up monsters and perform tasks for the legendary Lord
+British (AKA Richard Garriott).
+
+WWW: http://reconstruction.voyd.net/index.php?event=project&typeKeyword=remakes
diff --git a/games/epiphany-game/Makefile b/games/epiphany-game/Makefile
new file mode 100644
index 000000000000..21c3756b8422
--- /dev/null
+++ b/games/epiphany-game/Makefile
@@ -0,0 +1,42 @@
+# Created by: Dmitry Marakasov <amdmi3@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME= epiphany
+PORTVERSION= 0.7.0
+CATEGORIES= games
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-src/${PORTVERSION}
+PKGNAMESUFFIX= -game
+DISTNAME= ${PORTNAME}-src-${PORTVERSION}
+
+MAINTAINER= amdmi3@FreeBSD.org
+COMMENT= Multiplatform clone of Boulderdash
+
+LICENSE= GPLv2
+LICENSE_FILE= ${WRKSRC}/COPYING
+
+GNU_CONFIGURE= yes
+USES= autoreconf localbase
+USE_SDL= sdl mixer
+
+WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
+
+PLIST_FILES= bin/epiphany-game
+PORTDOCS= AUTHORS README BUGS
+PORTDATA= *
+
+DESKTOP_ENTRIES="Epiphany" \
+ "" \
+ "" \
+ "${PORTNAME}-game" \
+ "Game;ArcadeGame;" \
+ ""
+
+OPTIONS_DEFINE= DOCS
+
+post-install-DOCS-on:
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for f in ${PORTDOCS}
+ ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/
+.endfor
+
+.include <bsd.port.mk>
diff --git a/games/epiphany-game/distinfo b/games/epiphany-game/distinfo
new file mode 100644
index 000000000000..3bd1d1638159
--- /dev/null
+++ b/games/epiphany-game/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1501682400
+SHA256 (epiphany-src-0.7.0.tar.gz) = b377965f23c6310440b81e22cd0baf8ae4b70852970f50c0c9a54b078a8167f5
+SIZE (epiphany-src-0.7.0.tar.gz) = 2685902
diff --git a/games/epiphany-game/pkg-descr b/games/epiphany-game/pkg-descr
new file mode 100644
index 000000000000..3d089f26b72a
--- /dev/null
+++ b/games/epiphany-game/pkg-descr
@@ -0,0 +1,6 @@
+Epiphany is a multiplatform clone of Boulderdash.
+
+The player must collect all valuable minerals scattered in levels,
+avoiding being hit by a falling boulder, or (worst) by a bomb.
+
+WWW: http://epiphany.sourceforge.net/
diff --git a/games/flightgear/Makefile b/games/flightgear/Makefile
index 23ad960126a4..539bc36b24e9 100644
--- a/games/flightgear/Makefile
+++ b/games/flightgear/Makefile
@@ -3,7 +3,7 @@
PORTNAME= flightgear
PORTVERSION= 2017.1.3
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= games
MASTER_SITES= SF/flightgear/release-${PORTVERSION:R}
diff --git a/games/flightgear/files/patch-CVE-2017-13709.txt b/games/flightgear/files/patch-CVE-2017-13709.txt
new file mode 100644
index 000000000000..48edddc00d34
--- /dev/null
+++ b/games/flightgear/files/patch-CVE-2017-13709.txt
@@ -0,0 +1,129 @@
+Backport of commits 0ba2ac31 and 1ad2bf44
+
+Fixes CVE-2017-13709.
+
+--- src/Main/fg_init.cxx.orig
++++ src/Main/fg_init.cxx
+@@ -1090,7 +1090,12 @@ void fgStartNewReset()
+ fgInitGeneral(); // all of this?
+
+ flightgear::Options::sharedInstance()->processOptions();
+-
++
++ // Rebuild the lists of allowed paths for cases where a path comes from an
++ // untrusted source, such as the global property tree (this uses $FG_HOME
++ // and other paths set by Options::processOptions()).
++ fgInitAllowedPaths();
++
+ // PRESERVED properties over-write state from options, intentionally
+ if ( copyProperties(preserved, globals->get_props()) ) {
+ SG_LOG( SG_GENERAL, SG_INFO, "Preserved state restored successfully" );
+--- src/Main/main.cxx.orig
++++ src/Main/main.cxx
+@@ -536,7 +536,12 @@ int fgMainInit( int argc, char **argv )
+ } else if (configResult == flightgear::FG_OPTIONS_EXIT) {
+ return EXIT_SUCCESS;
+ }
+-
++
++ // Set the lists of allowed paths for cases where a path comes from an
++ // untrusted source, such as the global property tree (this uses $FG_HOME
++ // and other paths set by Options::processOptions()).
++ fgInitAllowedPaths();
++
+ // Initialize the Window/Graphics environment.
+ fgOSInit(&argc, argv);
+ _bootstrap_OSInit++;
+--- src/Scripting/NasalSys.cxx.orig
++++ src/Scripting/NasalSys.cxx
+@@ -909,10 +909,6 @@ void FGNasalSys::init()
+ .member("simulatedTime", &TimerObj::isSimTime, &f_timerObj_setSimTime)
+ .member("isRunning", &TimerObj::isRunning);
+
+-
+- // Set allowed paths for Nasal I/O
+- fgInitAllowedPaths();
+-
+ // Now load the various source files in the Nasal directory
+ simgear::Dir nasalDir(SGPath(globals->get_fg_root(), "Nasal"));
+ loadScriptDirectory(nasalDir);
+--- src/Main/logger.cxx.orig
++++ src/Main/logger.cxx
+@@ -9,12 +9,17 @@
+
+ #include "logger.hxx"
+
+-#include <fstream>
++#include <ios>
+ #include <string>
++#include <cstdlib>
+
+ #include <simgear/debug/logstream.hxx>
++#include <simgear/io/iostreams/sgstream.hxx>
++#include <simgear/misc/sg_path.hxx>
+
+ #include "fg_props.hxx"
++#include "globals.hxx"
++#include "util.hxx"
+
+ using std::string;
+ using std::endl;
+@@ -59,6 +64,25 @@ FGLogger::init ()
+ child->setStringValue("filename", filename.c_str());
+ }
+
++ // Security: the path comes from the global Property Tree; it *must* be
++ // validated before we overwrite the file.
++ const SGPath authorizedPath = fgValidatePath(SGPath::fromUtf8(filename),
++ /* write */ true);
++
++ if (authorizedPath.isNull()) {
++ const string propertyPath = child->getChild("filename")
++ ->getPath(/* simplify */ true);
++ const string msg =
++ "The FGLogger logging system, via the '" + propertyPath + "' property, "
++ "was asked to write to '" + filename + "', however this path is not "
++ "authorized for writing anymore for security reasons. " +
++ "Please choose another location, for instance in the $FG_HOME/Export "
++ "folder (" + (globals->get_fg_home() / "Export").utf8Str() + ").";
++
++ SG_LOG(SG_GENERAL, SG_ALERT, msg);
++ exit(EXIT_FAILURE);
++ }
++
+ string delimiter = child->getStringValue("delimiter");
+ if (delimiter.empty()) {
+ delimiter = ",";
+@@ -68,7 +92,8 @@ FGLogger::init ()
+ log.interval_ms = child->getLongValue("interval-ms");
+ log.last_time_ms = globals->get_sim_time_sec() * 1000;
+ log.delimiter = delimiter.c_str()[0];
+- log.output = new std::ofstream(filename.c_str());
++ // Security: use the return value of fgValidatePath()
++ log.output = new sg_ofstream(authorizedPath, std::ios_base::out);
+ if (!log.output) {
+ SG_LOG(SG_GENERAL, SG_ALERT, "Cannot write log to " << filename);
+ continue;
+--- src/Main/logger.hxx.orig
++++ src/Main/logger.hxx
+@@ -6,10 +6,10 @@
+ #ifndef __LOGGER_HXX
+ #define __LOGGER_HXX 1
+
+-#include <iosfwd>
+ #include <vector>
+
+ #include <simgear/compiler.h>
++#include <simgear/io/iostreams/sgstream.hxx>
+ #include <simgear/structure/subsystem_mgr.hxx>
+ #include <simgear/props/props.hxx>
+
+@@ -39,7 +39,7 @@ private:
+ Log ();
+ virtual ~Log ();
+ std::vector<SGPropertyNode_ptr> nodes;
+- std::ostream * output;
++ sg_ofstream * output;
+ long interval_ms;
+ double last_time_ms;
+ char delimiter;
diff --git a/games/flightgear/files/patch-src-Autopilot-route_mgr.cxx b/games/flightgear/files/patch-CVE-2017-8921.txt
index f348bf580084..f348bf580084 100644
--- a/games/flightgear/files/patch-src-Autopilot-route_mgr.cxx
+++ b/games/flightgear/files/patch-CVE-2017-8921.txt
diff --git a/games/schiff/Makefile b/games/schiff/Makefile
index be99ddccde12..7a57490f72b9 100644
--- a/games/schiff/Makefile
+++ b/games/schiff/Makefile
@@ -3,7 +3,7 @@
PORTNAME= schiff
PORTVERSION= 16
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= games python
MASTER_SITES= SF/pygamebook/${PORTNAME:S/s/S/}/${PORTNAME}${PORTVERSION}.py/ \
SF/nemysisfreebsdp/games/:icons
@@ -19,8 +19,11 @@ LICENSE= GPLv2+
RUN_DEPENDS= ${PYGAME}
-USES= python:2,run
+USES= python:2,run shebangfix
+SHEBANG_FILES= schiff.py
NO_BUILD= yes
+NO_WRKSUBDIR= yes
+NO_ARCH= yes
SUB_FILES= ${PORTNAME}
@@ -31,14 +34,14 @@ PLIST_FILES= bin/${PORTNAME} \
DESKTOP_ENTRIES="Schiff" "" ${PORTNAME} \
"${PORTNAME}" "Game;LogicGame;" ""
+do-extract:
+ @${CP} ${_DISTDIR}/schiff${PORTVERSION}.py ${WRKSRC}/${PORTNAME}.py
+
do-install:
- @${REINPLACE_CMD} -e 's|%%PYTHON_CMD%%|${PYTHON_CMD}|' \
- ${WRKDIR}/${PORTNAME}
${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
@${MKDIR} ${STAGEDIR}${DATADIR}
- ${INSTALL_SCRIPT} ${_DISTDIR}/schiff${PORTVERSION}.py \
- ${STAGEDIR}${DATADIR}/${PORTNAME}.py
-
+ ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.py \
+ ${STAGEDIR}${DATADIR}
${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png \
${STAGEDIR}${PREFIX}/share/pixmaps/
diff --git a/games/sgt-puzzles/Makefile b/games/sgt-puzzles/Makefile
index 47047d34635c..e39468bedb26 100644
--- a/games/sgt-puzzles/Makefile
+++ b/games/sgt-puzzles/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= puzzles
-PORTVERSION= 20170606
+PORTVERSION= 20170825
CATEGORIES= games
MASTER_SITES= http://www.chiark.greenend.org.uk/~sgtatham/puzzles/ \
http://mirror.amdmi3.ru/distfiles/
@@ -15,7 +15,7 @@ COMMENT= Simon Tatham's Portable Puzzle Collection
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENCE
-COMMITHASH= 272beef
+COMMITHASH= 9d89550
USES= autoreconf gmake pkgconfig
GNU_CONFIGURE= yes
diff --git a/games/sgt-puzzles/distinfo b/games/sgt-puzzles/distinfo
index 06f0cc7d5ce5..1a20d2c32045 100644
--- a/games/sgt-puzzles/distinfo
+++ b/games/sgt-puzzles/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1497560716
-SHA256 (puzzles-20170606.272beef.tar.gz) = e639f279f2ad1c63dd6f339ba3577b04292295023a719550242487f0163abfa9
-SIZE (puzzles-20170606.272beef.tar.gz) = 2908472
+TIMESTAMP = 1504209499
+SHA256 (puzzles-20170825.9d89550.tar.gz) = b05d3c04ba000534d82b307ac8a77342a82e692721570596f70d09c64f1dac26
+SIZE (puzzles-20170825.9d89550.tar.gz) = 2917216
diff --git a/german/mythes/Makefile b/german/mythes/Makefile
index 4d8a0d595dfe..7f752c942909 100644
--- a/german/mythes/Makefile
+++ b/german/mythes/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= mythes
-PORTVERSION= 2017.08.20
+PORTVERSION= 2017.08.27
CATEGORIES= german textproc
MASTER_SITES= LOCAL/sunpoet/${PORTNAME}/
DISTNAME= Deutscher-Thesaurus-${PORTVERSION:C/\.//g}
diff --git a/german/mythes/distinfo b/german/mythes/distinfo
index d7d2be2bc592..533cfb64cefe 100644
--- a/german/mythes/distinfo
+++ b/german/mythes/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1503323567
-SHA256 (mythes/Deutscher-Thesaurus-20170820.oxt) = 66822359a059ef64644291ccd117a2d95d9b7e06f5a5b6ff0de40342f850a3dd
-SIZE (mythes/Deutscher-Thesaurus-20170820.oxt) = 8676265
+TIMESTAMP = 1503941272
+SHA256 (mythes/Deutscher-Thesaurus-20170827.oxt) = 1fbe3f354fab974d85fdb955f821579a549b24a1d23d4e0b10e7ce497f73de36
+SIZE (mythes/Deutscher-Thesaurus-20170827.oxt) = 8681690
diff --git a/graphics/Makefile b/graphics/Makefile
index 6b4c9467d417..2fce8a30ebc5 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -150,6 +150,7 @@
SUBDIR += djvulibre
SUBDIR += dmtx-utils
SUBDIR += driconf
+ SUBDIR += drm-next-kmod
SUBDIR += dspdfviewer
SUBDIR += duhdraw
SUBDIR += dynamechs
diff --git a/graphics/R-cran-GDD/files/patch-src-Makevars.in b/graphics/R-cran-GDD/files/patch-src-Makevars.in
deleted file mode 100644
index 7dacf7c0e9c6..000000000000
--- a/graphics/R-cran-GDD/files/patch-src-Makevars.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/Makevars.in.orig 2011-09-22 15:29:19.000000000 +0000
-+++ src/Makevars.in 2011-09-22 15:29:44.000000000 +0000
-@@ -1,7 +1,7 @@
- # we need to add JNI specific stuff here
--ifdef DEBUG
-+.ifdef DEBUG
- PKG_CFLAGS+=-DJGD_DEBUG
--endif
-+.endif
- PKG_CFLAGS+=@CFLAGS@
- PKG_CPPFLAGS+=@CPPFLAGS@ -I. -Iinclude
- PKG_LIBS+=@LDFLAGS@ @LIBS@
diff --git a/graphics/R-cran-GDD/files/patch-src_Makevars.in b/graphics/R-cran-GDD/files/patch-src_Makevars.in
new file mode 100644
index 000000000000..2350bb6075f0
--- /dev/null
+++ b/graphics/R-cran-GDD/files/patch-src_Makevars.in
@@ -0,0 +1,10 @@
+--- src/Makevars.in.orig 2017-08-30 01:39:25 UTC
++++ src/Makevars.in
+@@ -1,7 +1,4 @@
+ # we need to add JNI specific stuff here
+-ifdef DEBUG
+- PKG_CFLAGS+=-DJGD_DEBUG
+-endif
+ PKG_CFLAGS+=@CFLAGS@
+ PKG_CPPFLAGS+=@CPPFLAGS@ -I. -Iinclude
+ PKG_LIBS+=@LDFLAGS@ @LIBS@
diff --git a/graphics/drm-next-kmod/Makefile b/graphics/drm-next-kmod/Makefile
new file mode 100644
index 000000000000..8a8322b89ebd
--- /dev/null
+++ b/graphics/drm-next-kmod/Makefile
@@ -0,0 +1,37 @@
+# Created by: Johannes Dieterich <jmd@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME= drm-next-kmod
+PORTVERSION= g20170829
+CATEGORIES= graphics
+
+MAINTAINER= jmd@FreeBSD.org
+COMMENT= DRM modules for the linuxkpi-based KMS components
+
+LICENSE= BSD2CLAUSE MIT GPLv2
+LICENSE_COMB= multi
+
+ONLY_FOR_ARCHS= amd64
+ONLY_FOR_ARCHS_REASON= the new KMS components are only supported on amd64
+
+RUN_DEPENDS= gpu-firmware-kmod>=g20170403:graphics/gpu-firmware-kmod
+
+OPTIONS_DEFINE= DEBUG
+
+USES= kmod uidfix
+
+USE_GITHUB= yes
+GH_ACCOUNT= FreeBSDDesktop
+GH_PROJECT= kms-drm
+GH_TAGNAME= fc90953
+
+.include <bsd.port.options.mk>
+
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1200039
+IGNORE= not supported on 11.x or older, no kernel support
+.endif
+.if ${OPSYS} != FreeBSD
+IGNORE= not supported on anything but FreeBSD (missing linuxkpi functionality)
+.endif
+
+.include <bsd.port.mk>
diff --git a/graphics/drm-next-kmod/distinfo b/graphics/drm-next-kmod/distinfo
new file mode 100644
index 000000000000..d19bb3cd47b6
--- /dev/null
+++ b/graphics/drm-next-kmod/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1504057443
+SHA256 (FreeBSDDesktop-kms-drm-g20170829-fc90953_GH0.tar.gz) = 81ab0b075727f824fafea5e61a868cedbce2f8003819dd65811e3ad363c3d729
+SIZE (FreeBSDDesktop-kms-drm-g20170829-fc90953_GH0.tar.gz) = 6678672
diff --git a/graphics/drm-next-kmod/pkg-descr b/graphics/drm-next-kmod/pkg-descr
new file mode 100644
index 000000000000..5ac130d1e325
--- /dev/null
+++ b/graphics/drm-next-kmod/pkg-descr
@@ -0,0 +1,4 @@
+amdgpu, i915, and radeon DRM modules for the linuxkpi-based KMS components.
+Currently corresponding to Linux 4.9 DRM.
+
+WWW: https://github.com/FreeBSDDesktop/kms-drm
diff --git a/graphics/drm-next-kmod/pkg-message b/graphics/drm-next-kmod/pkg-message
new file mode 100644
index 000000000000..5553f495df39
--- /dev/null
+++ b/graphics/drm-next-kmod/pkg-message
@@ -0,0 +1,10 @@
+The drm-next-kmod port requires explicit loading of its drm.ko kernel
+module prior to loading either amdgpu (for AMD GPUs starting with
+the HD7000 series / Tahiti) or i915kms (for Intel APUs starting with
+HD3000 / Sandy Bridge) through kld_list in /etc/rc.conf.
+
+For example: kld_list="/boot/modules/drm.ko /boot/modules/amdgpu.ko"
+or kld_list="/boot/modules/drm.ko /boot/modules/i915kms.ko"
+
+Older generations are supported by the kms modules (radeonkms /
+i915kms) in base.
diff --git a/graphics/drm-next-kmod/pkg-plist b/graphics/drm-next-kmod/pkg-plist
new file mode 100644
index 000000000000..8930f98d203a
--- /dev/null
+++ b/graphics/drm-next-kmod/pkg-plist
@@ -0,0 +1,7 @@
+/%%KMODDIR%%/amdgpu.ko
+/%%KMODDIR%%/amdkfd.ko
+/%%KMODDIR%%/debugfs.ko
+/%%KMODDIR%%/drm.ko
+/%%KMODDIR%%/i915kms.ko
+/%%KMODDIR%%/linuxkpi_gplv2.ko
+/%%KMODDIR%%/radeonkms.ko
diff --git a/graphics/gdk-pixbuf/Makefile b/graphics/gdk-pixbuf/Makefile
index 572145c461e3..fdcfcaabafdd 100644
--- a/graphics/gdk-pixbuf/Makefile
+++ b/graphics/gdk-pixbuf/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= libpng.so:graphics/png \
PORTSCOUT= ignore:1
-USES= cpe gmake jpeg libtool pathfix tar:bzip2
+USES= cpe gmake jpeg libtool localbase pathfix tar:bzip2
CPE_VENDOR= gnome
USE_XORG= xt xi x11
USE_GNOME= gtk12
@@ -29,8 +29,6 @@ USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \
--disable-gtk-doc
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${STAGEDIR}${PREFIX}/lib -L${LOCALBASE}/lib
post-patch:
@${REINPLACE_CMD} '/confexecdir =/s/=.*/= $$(sysconfdir)/' \
diff --git a/graphics/gdk-pixbuf/pkg-descr b/graphics/gdk-pixbuf/pkg-descr
index e3b98bcb0ed1..d227bff6ad6c 100644
--- a/graphics/gdk-pixbuf/pkg-descr
+++ b/graphics/gdk-pixbuf/pkg-descr
@@ -5,4 +5,4 @@ The GdkPixBuf library provides a number of features:
drawables (windows, pixmaps), GdkRGB buffers.
- A cache interface
-WWW: http://developer.gnome.org/arch/imaging/gdkpixbuf.html
+WWW: https://developer.gnome.org/gdk-pixbuf/
diff --git a/graphics/gdk-pixbuf2/Makefile b/graphics/gdk-pixbuf2/Makefile
index 98e7cd48fc35..9fee8eb3f171 100644
--- a/graphics/gdk-pixbuf2/Makefile
+++ b/graphics/gdk-pixbuf2/Makefile
@@ -12,6 +12,7 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= Graphic library for GTK+
LICENSE= LGPL20+
+LICENSE_FILE= ${WRKSRC}/COPYING
USE_XORG= xt xi x11
USES= cpe gmake gnome libtool localbase pathfix pkgconfig tar:xz
diff --git a/graphics/gdk-pixbuf2/pkg-descr b/graphics/gdk-pixbuf2/pkg-descr
index e3b98bcb0ed1..d227bff6ad6c 100644
--- a/graphics/gdk-pixbuf2/pkg-descr
+++ b/graphics/gdk-pixbuf2/pkg-descr
@@ -5,4 +5,4 @@ The GdkPixBuf library provides a number of features:
drawables (windows, pixmaps), GdkRGB buffers.
- A cache interface
-WWW: http://developer.gnome.org/arch/imaging/gdkpixbuf.html
+WWW: https://developer.gnome.org/gdk-pixbuf/
diff --git a/graphics/gnustep-slideshowkit/Makefile b/graphics/gnustep-slideshowkit/Makefile
index 4cb2c46a3de4..5eb7903deaad 100644
--- a/graphics/gnustep-slideshowkit/Makefile
+++ b/graphics/gnustep-slideshowkit/Makefile
@@ -6,11 +6,13 @@ PORTREVISION= 20050213
CATEGORIES= graphics gnustep
MASTER_SITES= http://download.gna.org/gsimageapps/
PKGNAMEPREFIX= gnustep-
-DISTNAME= SlideShowKit-20050212
+DISTNAME= SlideShowKit-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= SlideShow Framework
+LICENSE= NONE
+
USES= gnustep
USE_GNUSTEP= back build
USE_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES}
diff --git a/graphics/gpu-firmware-kmod/Makefile b/graphics/gpu-firmware-kmod/Makefile
index caed9d4871dd..6ba1b50c9e5c 100644
--- a/graphics/gpu-firmware-kmod/Makefile
+++ b/graphics/gpu-firmware-kmod/Makefile
@@ -2,24 +2,31 @@
# $FreeBSD$
PORTNAME= gpu-firmware-kmod
-PORTVERSION= g20170822
+PORTVERSION= g20170829
PORTREVISION= 1
CATEGORIES= graphics
MAINTAINER= jmd@FreeBSD.org
COMMENT= Firmware modules for the linuxkpi-based KMS components
+LICENSE= AMD INTEL
+LICENSE_COMB= multi
+LICENSE_NAME_AMD= AMD firmware license (amdgpu/radeon)
+LICENSE_NAME_INTEL= Intel firmware license (i915)
+LICENSE_FILE_AMD= ${WRKSRC}/LICENSE.radeon
+LICENSE_FILE_INTEL= ${WRKSRC}/LICENSE.i915
+LICENSE_PERMS_AMD= dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept
+LICENSE_PERMS_INTEL= dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept
+
ONLY_FOR_ARCHS= amd64
ONLY_FOR_ARCHS_REASON= the new KMS components are only supported on amd64
-NO_PACKAGE= Distribution in binary form without license file not allowed
+USES= kmod uidfix
USE_GITHUB= yes
GH_ACCOUNT= FreeBSDDesktop
GH_PROJECT= kms-firmware
-GH_TAGNAME= 39de0f1
-
-USES= kmod
+GH_TAGNAME= 19fc21e
.include <bsd.port.pre.mk>
diff --git a/graphics/gpu-firmware-kmod/distinfo b/graphics/gpu-firmware-kmod/distinfo
index d0191de09338..9debee3f8a34 100644
--- a/graphics/gpu-firmware-kmod/distinfo
+++ b/graphics/gpu-firmware-kmod/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1503549823
-SHA256 (FreeBSDDesktop-kms-firmware-g20170822-39de0f1_GH0.tar.gz) = 1fab7e17d2cc1489fa16a49c2445759b22937e7cd045054b02901338d990f8eb
-SIZE (FreeBSDDesktop-kms-firmware-g20170822-39de0f1_GH0.tar.gz) = 10573514
+TIMESTAMP = 1504055130
+SHA256 (FreeBSDDesktop-kms-firmware-g20170829-19fc21e_GH0.tar.gz) = df971662696719d4d5eb12f46bdf4d991c1e9e3472dd33cb0450cdf566babd91
+SIZE (FreeBSDDesktop-kms-firmware-g20170829-19fc21e_GH0.tar.gz) = 10571049
diff --git a/graphics/gpu-firmware-kmod/pkg-plist b/graphics/gpu-firmware-kmod/pkg-plist
index dc26400f8e53..b5a84dcb0807 100644
--- a/graphics/gpu-firmware-kmod/pkg-plist
+++ b/graphics/gpu-firmware-kmod/pkg-plist
@@ -117,30 +117,91 @@
/%%KMODDIR%%/radeon_BARTS_mc_bin.ko
/%%KMODDIR%%/radeon_BARTS_me_bin.ko
/%%KMODDIR%%/radeon_BARTS_pfp_bin.ko
+/%%KMODDIR%%/radeon_BARTS_smc_bin.ko
+/%%KMODDIR%%/radeon_BONAIRE_ce_bin.ko
+/%%KMODDIR%%/radeon_BONAIRE_mc2_bin.ko
+/%%KMODDIR%%/radeon_BONAIRE_mc_bin.ko
+/%%KMODDIR%%/radeon_BONAIRE_me_bin.ko
+/%%KMODDIR%%/radeon_BONAIRE_mec_bin.ko
+/%%KMODDIR%%/radeon_BONAIRE_pfp_bin.ko
+/%%KMODDIR%%/radeon_BONAIRE_rlc_bin.ko
+/%%KMODDIR%%/radeon_BONAIRE_sdma_bin.ko
+/%%KMODDIR%%/radeon_BONAIRE_smc_bin.ko
+/%%KMODDIR%%/radeon_BONAIRE_uvd_bin.ko
+/%%KMODDIR%%/radeon_BONAIRE_vce_bin.ko
/%%KMODDIR%%/radeon_BTC_rlc_bin.ko
/%%KMODDIR%%/radeon_CAICOS_mc_bin.ko
/%%KMODDIR%%/radeon_CAICOS_me_bin.ko
/%%KMODDIR%%/radeon_CAICOS_pfp_bin.ko
+/%%KMODDIR%%/radeon_CAICOS_smc_bin.ko
/%%KMODDIR%%/radeon_CAYMAN_mc_bin.ko
/%%KMODDIR%%/radeon_CAYMAN_me_bin.ko
/%%KMODDIR%%/radeon_CAYMAN_pfp_bin.ko
/%%KMODDIR%%/radeon_CAYMAN_rlc_bin.ko
+/%%KMODDIR%%/radeon_CAYMAN_smc_bin.ko
/%%KMODDIR%%/radeon_CEDAR_me_bin.ko
/%%KMODDIR%%/radeon_CEDAR_pfp_bin.ko
/%%KMODDIR%%/radeon_CEDAR_rlc_bin.ko
+/%%KMODDIR%%/radeon_CEDAR_smc_bin.ko
/%%KMODDIR%%/radeon_CYPRESS_me_bin.ko
/%%KMODDIR%%/radeon_CYPRESS_pfp_bin.ko
/%%KMODDIR%%/radeon_CYPRESS_rlc_bin.ko
+/%%KMODDIR%%/radeon_CYPRESS_smc_bin.ko
+/%%KMODDIR%%/radeon_CYPRESS_uvd_bin.ko
+/%%KMODDIR%%/radeon_HAINAN_ce_bin.ko
+/%%KMODDIR%%/radeon_HAINAN_mc2_bin.ko
+/%%KMODDIR%%/radeon_HAINAN_mc_bin.ko
+/%%KMODDIR%%/radeon_HAINAN_me_bin.ko
+/%%KMODDIR%%/radeon_HAINAN_pfp_bin.ko
+/%%KMODDIR%%/radeon_HAINAN_rlc_bin.ko
+/%%KMODDIR%%/radeon_HAINAN_smc_bin.ko
+/%%KMODDIR%%/radeon_HAWAII_ce_bin.ko
+/%%KMODDIR%%/radeon_HAWAII_mc2_bin.ko
+/%%KMODDIR%%/radeon_HAWAII_mc_bin.ko
+/%%KMODDIR%%/radeon_HAWAII_me_bin.ko
+/%%KMODDIR%%/radeon_HAWAII_mec_bin.ko
+/%%KMODDIR%%/radeon_HAWAII_pfp_bin.ko
+/%%KMODDIR%%/radeon_HAWAII_rlc_bin.ko
+/%%KMODDIR%%/radeon_HAWAII_sdma_bin.ko
+/%%KMODDIR%%/radeon_HAWAII_smc_bin.ko
/%%KMODDIR%%/radeon_JUNIPER_me_bin.ko
/%%KMODDIR%%/radeon_JUNIPER_pfp_bin.ko
/%%KMODDIR%%/radeon_JUNIPER_rlc_bin.ko
+/%%KMODDIR%%/radeon_JUNIPER_smc_bin.ko
+/%%KMODDIR%%/radeon_KABINI_ce_bin.ko
+/%%KMODDIR%%/radeon_KABINI_me_bin.ko
+/%%KMODDIR%%/radeon_KABINI_mec_bin.ko
+/%%KMODDIR%%/radeon_KABINI_pfp_bin.ko
+/%%KMODDIR%%/radeon_KABINI_rlc_bin.ko
+/%%KMODDIR%%/radeon_KABINI_sdma_bin.ko
+/%%KMODDIR%%/radeon_KAVERI_ce_bin.ko
+/%%KMODDIR%%/radeon_KAVERI_me_bin.ko
+/%%KMODDIR%%/radeon_KAVERI_mec_bin.ko
+/%%KMODDIR%%/radeon_KAVERI_pfp_bin.ko
+/%%KMODDIR%%/radeon_KAVERI_rlc_bin.ko
+/%%KMODDIR%%/radeon_KAVERI_sdma_bin.ko
+/%%KMODDIR%%/radeon_MULLINS_ce_bin.ko
+/%%KMODDIR%%/radeon_MULLINS_me_bin.ko
+/%%KMODDIR%%/radeon_MULLINS_mec_bin.ko
+/%%KMODDIR%%/radeon_MULLINS_pfp_bin.ko
+/%%KMODDIR%%/radeon_MULLINS_rlc_bin.ko
+/%%KMODDIR%%/radeon_MULLINS_sdma_bin.ko
+/%%KMODDIR%%/radeon_OLAND_ce_bin.ko
+/%%KMODDIR%%/radeon_OLAND_mc2_bin.ko
+/%%KMODDIR%%/radeon_OLAND_mc_bin.ko
+/%%KMODDIR%%/radeon_OLAND_me_bin.ko
+/%%KMODDIR%%/radeon_OLAND_pfp_bin.ko
+/%%KMODDIR%%/radeon_OLAND_rlc_bin.ko
+/%%KMODDIR%%/radeon_OLAND_smc_bin.ko
/%%KMODDIR%%/radeon_PALM_me_bin.ko
/%%KMODDIR%%/radeon_PALM_pfp_bin.ko
/%%KMODDIR%%/radeon_PITCAIRN_ce_bin.ko
+/%%KMODDIR%%/radeon_PITCAIRN_mc2_bin.ko
/%%KMODDIR%%/radeon_PITCAIRN_mc_bin.ko
/%%KMODDIR%%/radeon_PITCAIRN_me_bin.ko
/%%KMODDIR%%/radeon_PITCAIRN_pfp_bin.ko
/%%KMODDIR%%/radeon_PITCAIRN_rlc_bin.ko
+/%%KMODDIR%%/radeon_PITCAIRN_smc_bin.ko
/%%KMODDIR%%/radeon_R100_cp_bin.ko
/%%KMODDIR%%/radeon_R200_cp_bin.ko
/%%KMODDIR%%/radeon_R300_cp_bin.ko
@@ -149,14 +210,17 @@
/%%KMODDIR%%/radeon_R600_me_bin.ko
/%%KMODDIR%%/radeon_R600_pfp_bin.ko
/%%KMODDIR%%/radeon_R600_rlc_bin.ko
+/%%KMODDIR%%/radeon_R600_uvd_bin.ko
/%%KMODDIR%%/radeon_R700_rlc_bin.ko
/%%KMODDIR%%/radeon_REDWOOD_me_bin.ko
/%%KMODDIR%%/radeon_REDWOOD_pfp_bin.ko
/%%KMODDIR%%/radeon_REDWOOD_rlc_bin.ko
+/%%KMODDIR%%/radeon_REDWOOD_smc_bin.ko
/%%KMODDIR%%/radeon_RS600_cp_bin.ko
/%%KMODDIR%%/radeon_RS690_cp_bin.ko
/%%KMODDIR%%/radeon_RS780_me_bin.ko
/%%KMODDIR%%/radeon_RS780_pfp_bin.ko
+/%%KMODDIR%%/radeon_RS780_uvd_bin.ko
/%%KMODDIR%%/radeon_RV610_me_bin.ko
/%%KMODDIR%%/radeon_RV610_pfp_bin.ko
/%%KMODDIR%%/radeon_RV620_me_bin.ko
@@ -169,28 +233,42 @@
/%%KMODDIR%%/radeon_RV670_pfp_bin.ko
/%%KMODDIR%%/radeon_RV710_me_bin.ko
/%%KMODDIR%%/radeon_RV710_pfp_bin.ko
+/%%KMODDIR%%/radeon_RV710_smc_bin.ko
+/%%KMODDIR%%/radeon_RV710_uvd_bin.ko
/%%KMODDIR%%/radeon_RV730_me_bin.ko
/%%KMODDIR%%/radeon_RV730_pfp_bin.ko
+/%%KMODDIR%%/radeon_RV730_smc_bin.ko
+/%%KMODDIR%%/radeon_RV740_smc_bin.ko
/%%KMODDIR%%/radeon_RV770_me_bin.ko
/%%KMODDIR%%/radeon_RV770_pfp_bin.ko
+/%%KMODDIR%%/radeon_RV770_smc_bin.ko
+/%%KMODDIR%%/radeon_RV770_uvd_bin.ko
/%%KMODDIR%%/radeon_SUMO2_me_bin.ko
/%%KMODDIR%%/radeon_SUMO2_pfp_bin.ko
/%%KMODDIR%%/radeon_SUMO_me_bin.ko
/%%KMODDIR%%/radeon_SUMO_pfp_bin.ko
/%%KMODDIR%%/radeon_SUMO_rlc_bin.ko
+/%%KMODDIR%%/radeon_SUMO_uvd_bin.ko
/%%KMODDIR%%/radeon_TAHITI_ce_bin.ko
+/%%KMODDIR%%/radeon_TAHITI_mc2_bin.ko
/%%KMODDIR%%/radeon_TAHITI_mc_bin.ko
/%%KMODDIR%%/radeon_TAHITI_me_bin.ko
/%%KMODDIR%%/radeon_TAHITI_pfp_bin.ko
/%%KMODDIR%%/radeon_TAHITI_rlc_bin.ko
+/%%KMODDIR%%/radeon_TAHITI_smc_bin.ko
+/%%KMODDIR%%/radeon_TAHITI_uvd_bin.ko
+/%%KMODDIR%%/radeon_TAHITI_vce_bin.ko
/%%KMODDIR%%/radeon_TURKS_mc_bin.ko
/%%KMODDIR%%/radeon_TURKS_me_bin.ko
/%%KMODDIR%%/radeon_TURKS_pfp_bin.ko
+/%%KMODDIR%%/radeon_TURKS_smc_bin.ko
/%%KMODDIR%%/radeon_VERDE_ce_bin.ko
+/%%KMODDIR%%/radeon_VERDE_mc2_bin.ko
/%%KMODDIR%%/radeon_VERDE_mc_bin.ko
/%%KMODDIR%%/radeon_VERDE_me_bin.ko
/%%KMODDIR%%/radeon_VERDE_pfp_bin.ko
/%%KMODDIR%%/radeon_VERDE_rlc_bin.ko
+/%%KMODDIR%%/radeon_VERDE_smc_bin.ko
/%%KMODDIR%%/radeon_bonaire_ce_bin.ko
/%%KMODDIR%%/radeon_bonaire_k_smc_bin.ko
/%%KMODDIR%%/radeon_bonaire_mc_bin.ko
diff --git a/graphics/gtk-update-icon-cache/Makefile b/graphics/gtk-update-icon-cache/Makefile
index 547c2a2b2af3..0cb52d2ecb8d 100644
--- a/graphics/gtk-update-icon-cache/Makefile
+++ b/graphics/gtk-update-icon-cache/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS+= update-mime-database:misc/shared-mime-info \
PORTSCOUT= ignore:1
-USES= gettext gmake libtool pathfix perl5 pkgconfig tar:xz
+USES= gettext gmake libtool localbase:ldflags pathfix perl5 pkgconfig tar:xz
USE_PERL5= build
MAKE_JOBS_UNSAFE= yes
USE_LDCONFIG= yes
@@ -29,8 +29,6 @@ USE_XORG= xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \
xcomposite
PATCHDIR= ${.CURDIR}/../../x11-toolkits/gtk20/files
CONFIGURE_ARGS= --enable-static --with-xinput=yes
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
BUILD_WRKSRC= ${WRKSRC}/gtk
ALL_TARGET= ${PORTNAME}
PLIST_FILES= bin/gtk-update-icon-cache
@@ -48,9 +46,9 @@ pre-configure:
fi
do-install:
- @${INSTALL_PROGRAM} ${WRKSRC}/gtk/gtk-update-icon-cache \
+ ${INSTALL_PROGRAM} ${WRKSRC}/gtk/gtk-update-icon-cache \
${STAGEDIR}${PREFIX}/bin/
-# @${INSTALL_MAN} ${WRKSRC}/docs/reference/gtk/gtk-update-icon-cache.1 \
+# ${INSTALL_MAN} ${WRKSRC}/docs/reference/gtk/gtk-update-icon-cache.1 \
# ${STAGEDIR}${PREFIX}/man/man1/
.include <bsd.port.mk>
diff --git a/graphics/kf5-kimageformats/distinfo b/graphics/kf5-kimageformats/distinfo
index 5051ee1f0b38..9a38a37c80f8 100644
--- a/graphics/kf5-kimageformats/distinfo
+++ b/graphics/kf5-kimageformats/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499098901
-SHA256 (KDE/frameworks/5.36.0/kimageformats-5.36.0.tar.xz) = 09dd24c46bfa1d5a7422849de2940fd6aa66bf63c4b915cf7f6d7c51533320c8
-SIZE (KDE/frameworks/5.36.0/kimageformats-5.36.0.tar.xz) = 204688
+TIMESTAMP = 1502086009
+SHA256 (KDE/frameworks/5.37.0/kimageformats-5.37.0.tar.xz) = 6fb26812cd971dd23676f10096a097e2c1f1be8dee7249a7dd40cb2fb951d0ce
+SIZE (KDE/frameworks/5.37.0/kimageformats-5.37.0.tar.xz) = 204336
diff --git a/graphics/kf5-kplotting/distinfo b/graphics/kf5-kplotting/distinfo
index 8a0939cc44e1..c7d2ba155472 100644
--- a/graphics/kf5-kplotting/distinfo
+++ b/graphics/kf5-kplotting/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499098901
-SHA256 (KDE/frameworks/5.36.0/kplotting-5.36.0.tar.xz) = a7e7b00f0202ac97b0ec36e7acd240a8f9c8cacdec45a71a1314e37a7a9a4b3d
-SIZE (KDE/frameworks/5.36.0/kplotting-5.36.0.tar.xz) = 29668
+TIMESTAMP = 1502086009
+SHA256 (KDE/frameworks/5.37.0/kplotting-5.37.0.tar.xz) = fc837e0f21a6acbcff6b44d1c8b2143737bdc813839af0ea0a30550937069a4c
+SIZE (KDE/frameworks/5.37.0/kplotting-5.37.0.tar.xz) = 29668
diff --git a/graphics/kf5-prison/distinfo b/graphics/kf5-prison/distinfo
index 147b4cd1e5ed..8763a135907d 100644
--- a/graphics/kf5-prison/distinfo
+++ b/graphics/kf5-prison/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499098902
-SHA256 (KDE/frameworks/5.36.0/prison-5.36.0.tar.xz) = e3832e77904fbec6a18453f55ab03e93d3ced76ba78c7ada6919a8b76b7da238
-SIZE (KDE/frameworks/5.36.0/prison-5.36.0.tar.xz) = 13860
+TIMESTAMP = 1502086010
+SHA256 (KDE/frameworks/5.37.0/prison-5.37.0.tar.xz) = 67f1e0520670a57f39939c3a09a10a48c38fd5b94fbcd45165fa1fe8788e9ac5
+SIZE (KDE/frameworks/5.37.0/prison-5.37.0.tar.xz) = 13880
diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile
index 0324c7179f62..8ef2ed8d18bf 100644
--- a/graphics/poppler/Makefile
+++ b/graphics/poppler/Makefile
@@ -118,7 +118,7 @@ PLIST_SUB+= CURL="@comment "
CONFIGURE_ARGS+=--enable-libopenjpeg=openjpeg2
LIB_DEPENDS+= libopenjp2.so:graphics/openjpeg
.else
-CONFIGURE_ARGS+=--disable-libopenjpeg
+CONFIGURE_ARGS+=--enable-libopenjpeg=none
.endif
.endif # end of options
diff --git a/graphics/py-toyplot/Makefile b/graphics/py-toyplot/Makefile
index 14910f0e1fe9..fb79b4a20be6 100644
--- a/graphics/py-toyplot/Makefile
+++ b/graphics/py-toyplot/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= toyplot
-PORTVERSION= 0.9.0
+PORTVERSION= 0.15.1
CATEGORIES= graphics python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -12,9 +12,11 @@ COMMENT= Modern plotting toolkit supporting electronic publishing
LICENSE= BSD3CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.7,1:math/py-numpy \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.8:math/py-numpy \
${PYTHON_PKGNAMEPREFIX}colormath>=2.1.1:math/py-colormath \
- ${PYTHON_PKGNAMEPREFIX}multipledispatch>=0.4.7:devel/py-multipledispatch
+ ${PYTHON_PKGNAMEPREFIX}multipledispatch>=0.4.7:devel/py-multipledispatch \
+ ${PYTHON_PKGNAMEPREFIX}png>=0.0.17:graphics/py-png \
+ ${PYTHON_PKGNAMEPREFIX}reportlab>=3.2.0:print/py-reportlab
USES= python
USE_PYTHON= autoplist distutils
diff --git a/graphics/py-toyplot/distinfo b/graphics/py-toyplot/distinfo
index 056ebac71f48..a9c5706a2ffa 100644
--- a/graphics/py-toyplot/distinfo
+++ b/graphics/py-toyplot/distinfo
@@ -1,2 +1,3 @@
-SHA256 (toyplot-0.9.0.tar.gz) = 0df1772c39b732cd74a9137c8bb9a269bff677ed3b723909a0a55e53f50a3cb1
-SIZE (toyplot-0.9.0.tar.gz) = 89463
+TIMESTAMP = 1501768353
+SHA256 (toyplot-0.15.1.tar.gz) = 0ecc6ebee10e1ab49698e5962dd5260b5a3353f027f2bc09c27ac08a59354cbe
+SIZE (toyplot-0.15.1.tar.gz) = 114213
diff --git a/graphics/tiled/Makefile b/graphics/tiled/Makefile
index 3b36fb546ccd..f48aed90696f 100644
--- a/graphics/tiled/Makefile
+++ b/graphics/tiled/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= tiled
-PORTVERSION= 1.0.2
+PORTVERSION= 1.0.3
DISTVERSIONPREFIX= v
CATEGORIES= graphics editors games
diff --git a/graphics/tiled/distinfo b/graphics/tiled/distinfo
index 87a1297e302c..acbc937a5ce7 100644
--- a/graphics/tiled/distinfo
+++ b/graphics/tiled/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499258167
-SHA256 (bjorn-tiled-v1.0.2_GH0.tar.gz) = 23dd9ec1c7437f03fbb45d05b0706d8ed9fa4327ac421c6446034ad5c9899d8c
-SIZE (bjorn-tiled-v1.0.2_GH0.tar.gz) = 6601753
+TIMESTAMP = 1504088496
+SHA256 (bjorn-tiled-v1.0.3_GH0.tar.gz) = 3d0665bd988a877b7156842daeddd91fa17b1b473d2e5ebf8a62ffe2c9a047e2
+SIZE (bjorn-tiled-v1.0.3_GH0.tar.gz) = 6601791
diff --git a/graphics/tiled/pkg-plist b/graphics/tiled/pkg-plist
index 6d6be8c29bcf..ca164790baf2 100644
--- a/graphics/tiled/pkg-plist
+++ b/graphics/tiled/pkg-plist
@@ -29,6 +29,7 @@ share/icons/hicolor/32x32/apps/tiled.png
share/icons/hicolor/32x32/mimetypes/application-x-tiled.png
share/icons/hicolor/scalable/apps/tiled.svg
share/icons/hicolor/scalable/mimetypes/application-x-tiled.svg
+share/metainfo/tiled.appdata.xml
share/mime/packages/tiled.xml
share/thumbnailers/tiled.thumbnailer
%%DATADIR%%/translations/tiled_ar_DZ.qm
diff --git a/graphics/vigra/Makefile b/graphics/vigra/Makefile
index 5de98e90601d..f73ea8316248 100644
--- a/graphics/vigra/Makefile
+++ b/graphics/vigra/Makefile
@@ -3,7 +3,7 @@
PORTNAME= vigra
DISTVERSION= 1.11.0
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= graphics
MAINTAINER= ports@FreeBSD.org
diff --git a/graphics/vigra/pkg-plist b/graphics/vigra/pkg-plist
index 054c09b3f6a7..d1bd7c21ae5a 100644
--- a/graphics/vigra/pkg-plist
+++ b/graphics/vigra/pkg-plist
@@ -183,6 +183,7 @@ lib/vigra/vigra-targets.cmake
%%NUMPY%%%%PYTHON_SITELIBDIR%%/vigra/arraytypes.py
%%NUMPY%%%%PYTHON_SITELIBDIR%%/vigra/colors.so
%%NUMPY%%%%PYTHON_SITELIBDIR%%/vigra/filters.so
+%%NUMPY%%%%PYTHON_SITELIBDIR%%/vigra/fourier.so
%%NUMPY%%%%PYTHON_SITELIBDIR%%/vigra/geometry.so
%%NUMPY%%%%PYTHON_SITELIBDIR%%/vigra/impex.so
%%NUMPY%%%%PYTHON_SITELIBDIR%%/vigra/learning.so
diff --git a/irc/bitlbee-facebook/Makefile b/irc/bitlbee-facebook/Makefile
index ad2983877498..eb79e3cb8e6b 100644
--- a/irc/bitlbee-facebook/Makefile
+++ b/irc/bitlbee-facebook/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= bitlbee-facebook
-PORTVERSION= 1.1.1
+PORTVERSION= 1.1.2
DISTVERSIONPREFIX=v
PORTEPOCH= 1
CATEGORIES= irc
@@ -19,6 +19,7 @@ BUILD_DEPENDS= bitlbee:irc/bitlbee
USES= autoreconf gettext-runtime libtool pkgconfig
USE_GNOME= glib20
GNU_CONFIGURE= yes
+CONFIGURE_ARGS+=--with-plugindir=${PREFIX}/lib/bitlbee
USE_GITHUB= yes
GH_ACCOUNT= bitlbee
diff --git a/irc/bitlbee-facebook/distinfo b/irc/bitlbee-facebook/distinfo
index c8a9a8a17914..1f42c264ab99 100644
--- a/irc/bitlbee-facebook/distinfo
+++ b/irc/bitlbee-facebook/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1493900905
-SHA256 (bitlbee-bitlbee-facebook-v1.1.1_GH0.tar.gz) = 100cd5977fdb2495cb7d0325d12cc3825ccba0c7a2adce9146c9228f15c4e699
-SIZE (bitlbee-bitlbee-facebook-v1.1.1_GH0.tar.gz) = 66460
+TIMESTAMP = 1504172797
+SHA256 (bitlbee-bitlbee-facebook-v1.1.2_GH0.tar.gz) = dc4294d84b9f9d3e50cc1548000eafb518dfdb86bf8ecbf4261729e4e3472407
+SIZE (bitlbee-bitlbee-facebook-v1.1.2_GH0.tar.gz) = 67269
diff --git a/java/intellij/Makefile b/java/intellij/Makefile
index b7b7b497b3f3..ea9dc10cfdf6 100644
--- a/java/intellij/Makefile
+++ b/java/intellij/Makefile
@@ -5,7 +5,7 @@
# Vadim Zhukov <zhuk@openbsd.org>
PORTNAME= intellij
-PORTVERSION= 2017.2.2
+PORTVERSION= 2017.2.3
CATEGORIES= java devel
MASTER_SITES= https://download.jetbrains.com/idea/ \
http://download.jetbrains.com/idea/
@@ -28,7 +28,7 @@ NO_ARCH= yes
NO_BUILD= yes
INSTALL_TARGET= install-strip
-WRKSRC= ${WRKDIR}/idea-IC-172.3757.52
+WRKSRC= ${WRKDIR}/idea-IC-172.3968.16
.include "common.mk"
diff --git a/java/intellij/distinfo b/java/intellij/distinfo
index aaac8d064bf1..0393763e1e33 100644
--- a/java/intellij/distinfo
+++ b/java/intellij/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1502885714
-SHA256 (ideaIC-2017.2.2-no-jdk.tar.gz) = 2c85c2b021180fb6b9fa305a04169b0124962c70fabfca818051b7f81525da71
-SIZE (ideaIC-2017.2.2-no-jdk.tar.gz) = 369476212
+TIMESTAMP = 1504085199
+SHA256 (ideaIC-2017.2.3-no-jdk.tar.gz) = 5230e2656c13112d89bc5417ab1d521188e842fa58d1c89a05326223efce0e05
+SIZE (ideaIC-2017.2.3-no-jdk.tar.gz) = 369480843
diff --git a/java/intellij/pkg-plist b/java/intellij/pkg-plist
index 32b18b818684..fb686267e41d 100644
--- a/java/intellij/pkg-plist
+++ b/java/intellij/pkg-plist
@@ -9814,17 +9814,17 @@ share/applications/idea.desktop
%%IDEA_HOME%%/plugins/javaFX/lib/javaFX.jar
%%IDEA_HOME%%/plugins/javaFX/lib/resources_en.jar
%%IDEA_HOME%%/plugins/junit/lib/idea-junit.jar
-%%IDEA_HOME%%/plugins/junit/lib/junit-jupiter-api-5.0.0-M6.jar
-%%IDEA_HOME%%/plugins/junit/lib/junit-jupiter-engine-5.0.0-M6.jar
-%%IDEA_HOME%%/plugins/junit/lib/junit-platform-commons-1.0.0-M6.jar
-%%IDEA_HOME%%/plugins/junit/lib/junit-platform-engine-1.0.0-M6.jar
-%%IDEA_HOME%%/plugins/junit/lib/junit-platform-launcher-1.0.0-M6.jar
-%%IDEA_HOME%%/plugins/junit/lib/junit-platform-runner-1.0.0-M6.jar
-%%IDEA_HOME%%/plugins/junit/lib/junit-platform-suite-api-1.0.0-M6.jar
+%%IDEA_HOME%%/plugins/junit/lib/junit-jupiter-api-5.0.0-RC2.jar
+%%IDEA_HOME%%/plugins/junit/lib/junit-jupiter-engine-5.0.0-RC2.jar
+%%IDEA_HOME%%/plugins/junit/lib/junit-platform-commons-1.0.0-RC2.jar
+%%IDEA_HOME%%/plugins/junit/lib/junit-platform-engine-1.0.0-RC2.jar
+%%IDEA_HOME%%/plugins/junit/lib/junit-platform-launcher-1.0.0-RC2.jar
+%%IDEA_HOME%%/plugins/junit/lib/junit-platform-runner-1.0.0-RC2.jar
+%%IDEA_HOME%%/plugins/junit/lib/junit-platform-suite-api-1.0.0-RC2.jar
%%IDEA_HOME%%/plugins/junit/lib/junit-rt.jar
-%%IDEA_HOME%%/plugins/junit/lib/junit-vintage-engine-4.12.0-M6.jar
+%%IDEA_HOME%%/plugins/junit/lib/junit-vintage-engine-4.12.0-RC2.jar
%%IDEA_HOME%%/plugins/junit/lib/junit5-rt.jar
-%%IDEA_HOME%%/plugins/junit/lib/opentest4j-1.0.0-M3.jar
+%%IDEA_HOME%%/plugins/junit/lib/opentest4j-1.0.0-RC1.jar
%%IDEA_HOME%%/plugins/junit/lib/resources_en.jar
%%IDEA_HOME%%/plugins/maven/lib/artifact-resolver-m2.jar
%%IDEA_HOME%%/plugins/maven/lib/artifact-resolver-m3.jar
diff --git a/lang/gcc6-devel/Makefile b/lang/gcc6-devel/Makefile
index a4cbf3f1da26..db9b6c6807d2 100644
--- a/lang/gcc6-devel/Makefile
+++ b/lang/gcc6-devel/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= gcc
-PORTVERSION= 6.4.1.s20170816
+PORTVERSION= 6.4.1.s20170823
CATEGORIES= lang java
MASTER_SITES= GCC/snapshots/${DIST_VERSION}
PKGNAMESUFFIX= ${SUFFIX}-devel
@@ -14,6 +14,7 @@ COMMENT= GNU Compiler Collection 6
LICENSE= GPLv3 GPLv3RLE
LICENSE_COMB= multi
+ONLY_FOR_ARCHS= aarch64 amd64 arm armv6 i386 powerpc powerpc64 sparc64
LIB_DEPENDS= libgmp.so:math/gmp \
libmpfr.so:math/mpfr \
libmpc.so:math/mpc
@@ -34,7 +35,6 @@ CPE_VERSION= ${GCC_VERSION}
DIST_VERSION= ${PORTVERSION:C/([0-9]+).*\.s([0-9]+)/\1-\2/}
GCC_VERSION= ${PORTVERSION:C/(.+)\.s[0-9]{8}/\1/}
SUFFIX= ${PORTVERSION:C/([0-9]+).*/\1/}
-ONLY_FOR_ARCHS= aarch64 amd64 arm armv6 i386 powerpc powerpc64 sparc64
USES= compiler cpe gmake iconv libtool makeinfo perl5 tar:xz
USE_BINUTILS= yes
USE_PERL5= build
diff --git a/lang/gcc6-devel/distinfo b/lang/gcc6-devel/distinfo
index d9f43954a44c..940268be28f0 100644
--- a/lang/gcc6-devel/distinfo
+++ b/lang/gcc6-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1502997300
-SHA256 (gcc-6-20170816.tar.xz) = a6ca77be4af6a168b128d2ebac660d74fc50d73f37709d507940fdf887a3f807
-SIZE (gcc-6-20170816.tar.xz) = 72586420
+TIMESTAMP = 1503835787
+SHA256 (gcc-6-20170823.tar.xz) = e5543ee3257101bcd347ad6767c10a9aeb2a300fe252ca40ed1aeba4d84f5cee
+SIZE (gcc-6-20170823.tar.xz) = 72585700
diff --git a/lang/kf5-kross/distinfo b/lang/kf5-kross/distinfo
index 71a45202d725..5eaa39bc10ea 100644
--- a/lang/kf5-kross/distinfo
+++ b/lang/kf5-kross/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499098902
-SHA256 (KDE/frameworks/5.36.0/kross-5.36.0.tar.xz) = 586a0d68ab924dd48d7f41f04ac412b6356e33dd9fb962043480347ee7ff127a
-SIZE (KDE/frameworks/5.36.0/kross-5.36.0.tar.xz) = 127768
+TIMESTAMP = 1502086071
+SHA256 (KDE/frameworks/5.37.0/kross-5.37.0.tar.xz) = 611279d67a599d86e864980e50585eece994cb9d70569d533fed0ab48d33f31a
+SIZE (KDE/frameworks/5.37.0/kross-5.37.0.tar.xz) = 127792
diff --git a/lang/perl5-devel/Makefile b/lang/perl5-devel/Makefile
index 95d6bbdd2d8f..3b7be7658bdf 100644
--- a/lang/perl5-devel/Makefile
+++ b/lang/perl5-devel/Makefile
@@ -45,7 +45,7 @@ OPTIONS_EXCLUDE_FreeBSD_10= DTRACE
.if !exists(/usr/sbin/dtrace)
OPTIONS_EXCLUDE+= DTRACE
.endif
-.for a in aarch64 arm armeb armv6 mips mips64 mips64el mipsel mipsn32 powerpc \
+.for a in aarch64 arm armeb armv6 armv7 mips mips64 mips64el mipsel mipsn32 powerpc \
powerpc64 sparc64
OPTIONS_EXCLUDE_${a}= DTRACE
.endfor
diff --git a/lang/perl5.24/Makefile b/lang/perl5.24/Makefile
index 9a0d5ec113bf..73d4982b4893 100644
--- a/lang/perl5.24/Makefile
+++ b/lang/perl5.24/Makefile
@@ -34,7 +34,7 @@ OPTIONS_EXCLUDE_FreeBSD_10= DTRACE
.if !exists(/usr/sbin/dtrace)
OPTIONS_EXCLUDE+= DTRACE
.endif
-.for a in aarch64 arm armeb armv6 mips mips64 mips64el mipsel mipsn32 powerpc \
+.for a in aarch64 arm armeb armv6 armv7 mips mips64 mips64el mipsel mipsn32 powerpc \
powerpc64 sparc64
OPTIONS_EXCLUDE_${a}= DTRACE
.endfor
diff --git a/lang/perl5.26/Makefile b/lang/perl5.26/Makefile
index 28bf6840ca64..db609a75c53f 100644
--- a/lang/perl5.26/Makefile
+++ b/lang/perl5.26/Makefile
@@ -32,7 +32,7 @@ OPTIONS_EXCLUDE_FreeBSD_10= DTRACE
.if !exists(/usr/sbin/dtrace)
OPTIONS_EXCLUDE+= DTRACE
.endif
-.for a in aarch64 arm armeb armv6 mips mips64 mips64el mipsel mipsn32 powerpc \
+.for a in aarch64 arm armeb armv6 armv7 mips mips64 mips64el mipsel mipsn32 powerpc \
powerpc64 sparc64
OPTIONS_EXCLUDE_${a}= DTRACE
.endfor
diff --git a/lang/php70/Makefile b/lang/php70/Makefile
index 46189cb4ae3a..8fdc55f047ef 100644
--- a/lang/php70/Makefile
+++ b/lang/php70/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= php70
-PORTVERSION= 7.0.22
+PORTVERSION= 7.0.23
PORTREVISION?= 0
CATEGORIES?= lang devel www
MASTER_SITES= PHP/distributions
diff --git a/lang/php70/distinfo b/lang/php70/distinfo
index 55427d6a8a3d..24566a7a50f2 100644
--- a/lang/php70/distinfo
+++ b/lang/php70/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501755347
-SHA256 (php-7.0.22.tar.xz) = 408c3fbc235ec940433bfac1f3ed4bf797f61b4a1693b9fb0b6a04b2c1832501
-SIZE (php-7.0.22.tar.xz) = 12668604
+TIMESTAMP = 1504170108
+SHA256 (php-7.0.23.tar.xz) = 8e526e3551a58e00c8055fa4a72804aa1bd3ee1c0411b25bf1504cc4992609df
+SIZE (php-7.0.23.tar.xz) = 11953100
diff --git a/lang/php71/Makefile b/lang/php71/Makefile
index 26c8dc8d2a7d..f33361c9514c 100644
--- a/lang/php71/Makefile
+++ b/lang/php71/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= php71
-PORTVERSION= 7.1.8
+PORTVERSION= 7.1.9
PORTREVISION?= 0
CATEGORIES?= lang devel www
MASTER_SITES= PHP/distributions
diff --git a/lang/php71/distinfo b/lang/php71/distinfo
index 1462a9797079..212decc3c10e 100644
--- a/lang/php71/distinfo
+++ b/lang/php71/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501755364
-SHA256 (php-7.1.8.tar.xz) = 8943858738604acb33ecedb865d6c4051eeffe4e2d06f3a3c8f794daccaa2aab
-SIZE (php-7.1.8.tar.xz) = 12874840
+TIMESTAMP = 1504170113
+SHA256 (php-7.1.9.tar.xz) = ec9ca348dd51f19a84dc5d33acfff1fba1f977300604bdac08ed46ae2c281e8c
+SIZE (php-7.1.9.tar.xz) = 12157172
diff --git a/lang/scala-docs/Makefile b/lang/scala-docs/Makefile
index 3e057e1c096c..71f0e5b2b172 100644
--- a/lang/scala-docs/Makefile
+++ b/lang/scala-docs/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= scala-docs
-PORTVERSION= 2.12.2
+PORTVERSION= 2.12.3
CATEGORIES= lang java
MASTER_SITES= http://www.scala-lang.org/files/archive/
diff --git a/lang/scala-docs/distinfo b/lang/scala-docs/distinfo
index 7d0624466eee..d8a85d45dd42 100644
--- a/lang/scala-docs/distinfo
+++ b/lang/scala-docs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499421002
-SHA256 (scala-docs-2.12.2.txz) = b64ac34aac4d61c8925ec51fcedc13438aa2ad8d49afa25d46ba4a1d0bb87f6c
-SIZE (scala-docs-2.12.2.txz) = 59259172
+TIMESTAMP = 1504077598
+SHA256 (scala-docs-2.12.3.txz) = b3b2b4d222b5dc210505b9615fdfa18711a7f44faa4ecea3be5a1c1b03d5fac0
+SIZE (scala-docs-2.12.3.txz) = 59389408
diff --git a/lang/squirrel/Makefile b/lang/squirrel/Makefile
index 406ff6887e10..9dd8c4c60216 100644
--- a/lang/squirrel/Makefile
+++ b/lang/squirrel/Makefile
@@ -3,6 +3,7 @@
PORTNAME= squirrel
DISTVERSION= 3_1
+PORTREVISION= 1
CATEGORIES= lang
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}3/${PORTNAME}%20${PORTVERSION}%20stable
DISTNAME= ${PORTNAME}_${DISTVERSION}_stable
diff --git a/lang/squirrel/files/patch-git_57ca6c b/lang/squirrel/files/patch-git_57ca6c
new file mode 100644
index 000000000000..ef7511d063ae
--- /dev/null
+++ b/lang/squirrel/files/patch-git_57ca6c
@@ -0,0 +1,1291 @@
+From 57ca6c191e4422ed3d53d406c9d5b47bb185489d Mon Sep 17 00:00:00 2001
+From: zeromus <zeromus@users.noreply.github.com>
+Date: Sat, 29 Jul 2017 14:51:26 -0500
+Subject: [PATCH] rename `type` macro to `sqtype`
+
+--- squirrel/sqapi.cpp.orig 2017-08-31 12:07:29 UTC
++++ squirrel/sqapi.cpp
+@@ -16,7 +16,7 @@
+ static bool sq_aux_gettypedarg(HSQUIRRELVM v,SQInteger idx,SQObjectType type,SQObjectPtr **o)
+ {
+ *o = &stack_get(v,idx);
+- if(type(**o) != type){
++ if(sqtype(**o) != type){
+ SQObjectPtr oval = v->PrintObjVal(**o);
+ v->Raise_Error(_SC("wrong argument type, expected '%s' got '%.50s'"),IdType2Name(type),_stringval(oval));
+ return false;
+@@ -150,7 +150,7 @@ void sq_notifyallexceptions(HSQUIRRELVM v, SQBool enab
+
+ void sq_addref(HSQUIRRELVM v,HSQOBJECT *po)
+ {
+- if(!ISREFCOUNTED(type(*po))) return;
++ if(!ISREFCOUNTED(sqtype(*po))) return;
+ #ifdef NO_GARBAGE_COLLECTOR
+ __AddRef(po->_type,po->_unVal);
+ #else
+@@ -160,7 +160,7 @@ void sq_addref(HSQUIRRELVM v,HSQOBJECT *po)
+
+ SQUnsignedInteger sq_getrefcount(HSQUIRRELVM v,HSQOBJECT *po)
+ {
+- if(!ISREFCOUNTED(type(*po))) return 0;
++ if(!ISREFCOUNTED(sqtype(*po))) return 0;
+ #ifdef NO_GARBAGE_COLLECTOR
+ return po->_unVal.pRefCounted->_uiRef;
+ #else
+@@ -170,7 +170,7 @@ SQUnsignedInteger sq_getrefcount(HSQUIRRELVM v,HSQOBJE
+
+ SQBool sq_release(HSQUIRRELVM v,HSQOBJECT *po)
+ {
+- if(!ISREFCOUNTED(type(*po))) return SQTrue;
++ if(!ISREFCOUNTED(sqtype(*po))) return SQTrue;
+ #ifdef NO_GARBAGE_COLLECTOR
+ bool ret = (po->_unVal.pRefCounted->_uiRef <= 1) ? SQTrue : SQFalse;
+ __Release(po->_type,po->_unVal);
+@@ -182,7 +182,7 @@ SQBool sq_release(HSQUIRRELVM v,HSQOBJECT *po)
+
+ SQUnsignedInteger sq_getvmrefcount(HSQUIRRELVM SQ_UNUSED_ARG(v), const HSQOBJECT *po)
+ {
+- if (!ISREFCOUNTED(type(*po))) return 0;
++ if (!ISREFCOUNTED(sqtype(*po))) return 0;
+ return po->_unVal.pRefCounted->_uiRef;
+ }
+
+@@ -290,7 +290,7 @@ SQRESULT sq_newclass(HSQUIRRELVM v,SQBool hasbase)
+ SQClass *baseclass = NULL;
+ if(hasbase) {
+ SQObjectPtr &base = stack_get(v,-1);
+- if(type(base) != OT_CLASS)
++ if(sqtype(base) != OT_CLASS)
+ return sq_throwerror(v,_SC("invalid base type"));
+ baseclass = _class(base);
+ }
+@@ -304,7 +304,7 @@ SQBool sq_instanceof(HSQUIRRELVM v)
+ {
+ SQObjectPtr &inst = stack_get(v,-1);
+ SQObjectPtr &cl = stack_get(v,-2);
+- if(type(inst) != OT_INSTANCE || type(cl) != OT_CLASS)
++ if(sqtype(inst) != OT_INSTANCE || sqtype(cl) != OT_CLASS)
+ return sq_throwerror(v,_SC("invalid param type"));
+ return _instance(inst)->InstanceOf(_class(cl))?SQTrue:SQFalse;
+ }
+@@ -397,14 +397,14 @@ void sq_newclosure(HSQUIRRELVM v,SQFUNCTION func,SQUns
+ SQRESULT sq_getclosureinfo(HSQUIRRELVM v,SQInteger idx,SQUnsignedInteger *nparams,SQUnsignedInteger *nfreevars)
+ {
+ SQObject o = stack_get(v, idx);
+- if(type(o) == OT_CLOSURE) {
++ if(sqtype(o) == OT_CLOSURE) {
+ SQClosure *c = _closure(o);
+ SQFunctionProto *proto = c->_function;
+ *nparams = (SQUnsignedInteger)proto->_nparameters;
+ *nfreevars = (SQUnsignedInteger)proto->_noutervalues;
+ return SQ_OK;
+ }
+- else if(type(o) == OT_NATIVECLOSURE)
++ else if(sqtype(o) == OT_NATIVECLOSURE)
+ {
+ SQNativeClosure *c = _nativeclosure(o);
+ *nparams = (SQUnsignedInteger)c->_nparamscheck;
+@@ -459,7 +459,7 @@ SQRESULT sq_bindenv(HSQUIRRELVM v,SQInteger idx)
+ !sq_isclass(env) &&
+ !sq_isinstance(env))
+ return sq_throwerror(v,_SC("invalid environment"));
+- SQWeakRef *w = _refcounted(env)->GetWeakRef(type(env));
++ SQWeakRef *w = _refcounted(env)->GetWeakRef(sqtype(env));
+ SQObjectPtr ret;
+ if(sq_isclosure(o)) {
+ SQClosure *c = _closure(o)->Clone();
+@@ -524,7 +524,7 @@ SQRESULT sq_getclosureroot(HSQUIRRELVM v,SQInteger idx
+ SQRESULT sq_clear(HSQUIRRELVM v,SQInteger idx)
+ {
+ SQObject &o=stack_get(v,idx);
+- switch(type(o)) {
++ switch(sqtype(o)) {
+ case OT_TABLE: _table(o)->Clear(); break;
+ case OT_ARRAY: _array(o)->Resize(0); break;
+ default:
+@@ -619,7 +619,7 @@ void sq_push(HSQUIRRELVM v,SQInteger idx)
+
+ SQObjectType sq_gettype(HSQUIRRELVM v,SQInteger idx)
+ {
+- return type(stack_get(v, idx));
++ return sqtype(stack_get(v, idx));
+ }
+
+ SQRESULT sq_typeof(HSQUIRRELVM v,SQInteger idx)
+@@ -710,7 +710,7 @@ SQRESULT sq_clone(HSQUIRRELVM v,SQInteger idx)
+ SQInteger sq_getsize(HSQUIRRELVM v, SQInteger idx)
+ {
+ SQObjectPtr &o = stack_get(v, idx);
+- SQObjectType type = type(o);
++ SQObjectType type = sqtype(o);
+ switch(type) {
+ case OT_STRING: return _string(o)->_len;
+ case OT_TABLE: return _table(o)->CountUsed();
+@@ -741,7 +741,7 @@ SQRESULT sq_getuserdata(HSQUIRRELVM v,SQInteger idx,SQ
+ SQRESULT sq_settypetag(HSQUIRRELVM v,SQInteger idx,SQUserPointer typetag)
+ {
+ SQObjectPtr &o = stack_get(v,idx);
+- switch(type(o)) {
++ switch(sqtype(o)) {
+ case OT_USERDATA: _userdata(o)->_typetag = typetag; break;
+ case OT_CLASS: _class(o)->_typetag = typetag; break;
+ default: return sq_throwerror(v,_SC("invalid object type"));
+@@ -751,7 +751,7 @@ SQRESULT sq_settypetag(HSQUIRRELVM v,SQInteger idx,SQU
+
+ SQRESULT sq_getobjtypetag(const HSQOBJECT *o,SQUserPointer * typetag)
+ {
+- switch(type(*o)) {
++ switch(sqtype(*o)) {
+ case OT_INSTANCE: *typetag = _instance(*o)->_class->_typetag; break;
+ case OT_USERDATA: *typetag = _userdata(*o)->_typetag; break;
+ case OT_CLASS: *typetag = _class(*o)->_typetag; break;
+@@ -779,7 +779,7 @@ SQRESULT sq_getuserpointer(HSQUIRRELVM v, SQInteger id
+ SQRESULT sq_setinstanceup(HSQUIRRELVM v, SQInteger idx, SQUserPointer p)
+ {
+ SQObjectPtr &o = stack_get(v,idx);
+- if(type(o) != OT_INSTANCE) return sq_throwerror(v,_SC("the object is not a class instance"));
++ if(sqtype(o) != OT_INSTANCE) return sq_throwerror(v,_SC("the object is not a class instance"));
+ _instance(o)->_userpointer = p;
+ return SQ_OK;
+ }
+@@ -787,7 +787,7 @@ SQRESULT sq_setinstanceup(HSQUIRRELVM v, SQInteger idx
+ SQRESULT sq_setclassudsize(HSQUIRRELVM v, SQInteger idx, SQInteger udsize)
+ {
+ SQObjectPtr &o = stack_get(v,idx);
+- if(type(o) != OT_CLASS) return sq_throwerror(v,_SC("the object is not a class"));
++ if(sqtype(o) != OT_CLASS) return sq_throwerror(v,_SC("the object is not a class"));
+ if(_class(o)->_locked) return sq_throwerror(v,_SC("the class is locked"));
+ _class(o)->_udsize = udsize;
+ return SQ_OK;
+@@ -797,7 +797,7 @@ SQRESULT sq_setclassudsize(HSQUIRRELVM v, SQInteger id
+ SQRESULT sq_getinstanceup(HSQUIRRELVM v, SQInteger idx, SQUserPointer *p,SQUserPointer typetag)
+ {
+ SQObjectPtr &o = stack_get(v,idx);
+- if(type(o) != OT_INSTANCE) return sq_throwerror(v,_SC("the object is not a class instance"));
++ if(sqtype(o) != OT_INSTANCE) return sq_throwerror(v,_SC("the object is not a class instance"));
+ (*p) = _instance(o)->_userpointer;
+ if(typetag != 0) {
+ SQClass *cl = _instance(o)->_class;
+@@ -854,9 +854,9 @@ SQRESULT sq_newslot(HSQUIRRELVM v, SQInteger idx, SQBo
+ {
+ sq_aux_paramscheck(v, 3);
+ SQObjectPtr &self = stack_get(v, idx);
+- if(type(self) == OT_TABLE || type(self) == OT_CLASS) {
++ if(sqtype(self) == OT_TABLE || sqtype(self) == OT_CLASS) {
+ SQObjectPtr &key = v->GetUp(-2);
+- if(type(key) == OT_NULL) return sq_throwerror(v, _SC("null is not a valid key"));
++ if(sqtype(key) == OT_NULL) return sq_throwerror(v, _SC("null is not a valid key"));
+ v->NewSlot(self, key, v->GetUp(-1),bstatic?true:false);
+ v->Pop(2);
+ }
+@@ -869,7 +869,7 @@ SQRESULT sq_deleteslot(HSQUIRRELVM v,SQInteger idx,SQB
+ SQObjectPtr *self;
+ _GETSAFE_OBJ(v, idx, OT_TABLE,self);
+ SQObjectPtr &key = v->GetUp(-1);
+- if(type(key) == OT_NULL) return sq_throwerror(v, _SC("null is not a valid key"));
++ if(sqtype(key) == OT_NULL) return sq_throwerror(v, _SC("null is not a valid key"));
+ SQObjectPtr res;
+ if(!v->DeleteSlot(*self, key, res)){
+ v->Pop();
+@@ -894,11 +894,11 @@ SQRESULT sq_rawset(HSQUIRRELVM v,SQInteger idx)
+ {
+ SQObjectPtr &self = stack_get(v, idx);
+ SQObjectPtr &key = v->GetUp(-2);
+- if(type(key) == OT_NULL) {
++ if(sqtype(key) == OT_NULL) {
+ v->Pop(2);
+ return sq_throwerror(v, _SC("null key"));
+ }
+- switch(type(self)) {
++ switch(sqtype(self)) {
+ case OT_TABLE:
+ _table(self)->NewSlot(key, v->GetUp(-1));
+ v->Pop(2);
+@@ -931,9 +931,9 @@ SQRESULT sq_rawset(HSQUIRRELVM v,SQInteger idx)
+ SQRESULT sq_newmember(HSQUIRRELVM v,SQInteger idx,SQBool bstatic)
+ {
+ SQObjectPtr &self = stack_get(v, idx);
+- if(type(self) != OT_CLASS) return sq_throwerror(v, _SC("new member only works with classes"));
++ if(sqtype(self) != OT_CLASS) return sq_throwerror(v, _SC("new member only works with classes"));
+ SQObjectPtr &key = v->GetUp(-3);
+- if(type(key) == OT_NULL) return sq_throwerror(v, _SC("null key"));
++ if(sqtype(key) == OT_NULL) return sq_throwerror(v, _SC("null key"));
+ if(!v->NewSlotA(self,key,v->GetUp(-2),v->GetUp(-1),bstatic?true:false,false))
+ return SQ_ERROR;
+ return SQ_OK;
+@@ -942,9 +942,9 @@ SQRESULT sq_newmember(HSQUIRRELVM v,SQInteger idx,SQBo
+ SQRESULT sq_rawnewmember(HSQUIRRELVM v,SQInteger idx,SQBool bstatic)
+ {
+ SQObjectPtr &self = stack_get(v, idx);
+- if(type(self) != OT_CLASS) return sq_throwerror(v, _SC("new member only works with classes"));
++ if(sqtype(self) != OT_CLASS) return sq_throwerror(v, _SC("new member only works with classes"));
+ SQObjectPtr &key = v->GetUp(-3);
+- if(type(key) == OT_NULL) return sq_throwerror(v, _SC("null key"));
++ if(sqtype(key) == OT_NULL) return sq_throwerror(v, _SC("null key"));
+ if(!v->NewSlotA(self,key,v->GetUp(-2),v->GetUp(-1),bstatic?true:false,true))
+ return SQ_ERROR;
+ return SQ_OK;
+@@ -954,19 +954,19 @@ SQRESULT sq_setdelegate(HSQUIRRELVM v,SQInteger idx)
+ {
+ SQObjectPtr &self = stack_get(v, idx);
+ SQObjectPtr &mt = v->GetUp(-1);
+- SQObjectType type = type(self);
++ SQObjectType type = sqtype(self);
+ switch(type) {
+ case OT_TABLE:
+- if(type(mt) == OT_TABLE) {
++ if(sqtype(mt) == OT_TABLE) {
+ if(!_table(self)->SetDelegate(_table(mt))) return sq_throwerror(v, _SC("delagate cycle")); v->Pop();}
+- else if(type(mt)==OT_NULL) {
++ else if(sqtype(mt)==OT_NULL) {
+ _table(self)->SetDelegate(NULL); v->Pop(); }
+ else return sq_aux_invalidtype(v,type);
+ break;
+ case OT_USERDATA:
+- if(type(mt)==OT_TABLE) {
++ if(sqtype(mt)==OT_TABLE) {
+ _userdata(self)->SetDelegate(_table(mt)); v->Pop(); }
+- else if(type(mt)==OT_NULL) {
++ else if(sqtype(mt)==OT_NULL) {
+ _userdata(self)->SetDelegate(NULL); v->Pop(); }
+ else return sq_aux_invalidtype(v, type);
+ break;
+@@ -997,7 +997,7 @@ SQRESULT sq_rawdeleteslot(HSQUIRRELVM v,SQInteger idx,
+ SQRESULT sq_getdelegate(HSQUIRRELVM v,SQInteger idx)
+ {
+ SQObjectPtr &self=stack_get(v,idx);
+- switch(type(self)){
++ switch(sqtype(self)){
+ case OT_TABLE:
+ case OT_USERDATA:
+ if(!_delegable(self)->_delegate){
+@@ -1026,7 +1026,7 @@ SQRESULT sq_rawget(HSQUIRRELVM v,SQInteger idx)
+ {
+ SQObjectPtr &self=stack_get(v,idx);
+ SQObjectPtr &obj = v->GetUp(-1);
+- switch(type(self)) {
++ switch(sqtype(self)) {
+ case OT_TABLE:
+ if(_table(self)->Get(obj,obj))
+ return SQ_OK;
+@@ -1076,7 +1076,7 @@ const SQChar *sq_getlocal(HSQUIRRELVM v,SQUnsignedInte
+ stackbase-=ci._prevstkbase;
+ }
+ SQVM::CallInfo &ci=v->_callsstack[lvl];
+- if(type(ci._closure)!=OT_CLOSURE)
++ if(sqtype(ci._closure)!=OT_CLOSURE)
+ return NULL;
+ SQClosure *c=_closure(ci._closure);
+ SQFunctionProto *func=c->_function;
+@@ -1137,7 +1137,7 @@ SQRESULT sq_reservestack(HSQUIRRELVM v,SQInteger nsize
+
+ SQRESULT sq_resume(HSQUIRRELVM v,SQBool retval,SQBool raiseerror)
+ {
+- if (type(v->GetUp(-1)) == OT_GENERATOR)
++ if (sqtype(v->GetUp(-1)) == OT_GENERATOR)
+ {
+ v->PushNull(); //retval
+ if (!v->Execute(v->GetUp(-2), 0, v->_top, v->GetUp(-1), raiseerror, SQVM::ET_RESUME_GENERATOR))
+@@ -1201,7 +1201,7 @@ void sq_setreleasehook(HSQUIRRELVM v,SQInteger idx,SQR
+ {
+ if(sq_gettop(v) >= 1){
+ SQObjectPtr &ud=stack_get(v,idx);
+- switch( type(ud) ) {
++ switch( sqtype(ud) ) {
+ case OT_USERDATA: _userdata(ud)->_hook = hook; break;
+ case OT_INSTANCE: _instance(ud)->_hook = hook; break;
+ case OT_CLASS: _class(ud)->_hook = hook; break;
+@@ -1214,7 +1214,7 @@ SQRELEASEHOOK sq_getreleasehook(HSQUIRRELVM v,SQIntege
+ {
+ if(sq_gettop(v) >= 1){
+ SQObjectPtr &ud=stack_get(v,idx);
+- switch( type(ud) ) {
++ switch( sqtype(ud) ) {
+ case OT_USERDATA: return _userdata(ud)->_hook; break;
+ case OT_INSTANCE: return _instance(ud)->_hook; break;
+ case OT_CLASS: return _class(ud)->_hook; break;
+@@ -1296,7 +1296,7 @@ const SQChar *sq_getfreevariable(HSQUIRRELVM v,SQInteg
+ {
+ SQObjectPtr &self=stack_get(v,idx);
+ const SQChar *name = NULL;
+- switch(type(self))
++ switch(sqtype(self))
+ {
+ case OT_CLOSURE:{
+ SQClosure *clo = _closure(self);
+@@ -1324,7 +1324,7 @@ const SQChar *sq_getfreevariable(HSQUIRRELVM v,SQInteg
+ SQRESULT sq_setfreevariable(HSQUIRRELVM v,SQInteger idx,SQUnsignedInteger nval)
+ {
+ SQObjectPtr &self=stack_get(v,idx);
+- switch(type(self))
++ switch(sqtype(self))
+ {
+ case OT_CLOSURE:{
+ SQFunctionProto *fp = _closure(self)->_function;
+@@ -1341,7 +1341,7 @@ SQRESULT sq_setfreevariable(HSQUIRRELVM v,SQInteger id
+ else return sq_throwerror(v,_SC("invalid free var index"));
+ break;
+ default:
+- return sq_aux_invalidtype(v,type(self));
++ return sq_aux_invalidtype(v, sqtype(self));
+ }
+ v->Pop();
+ return SQ_OK;
+@@ -1354,7 +1354,7 @@ SQRESULT sq_setattributes(HSQUIRRELVM v,SQInteger idx)
+ SQObjectPtr &key = stack_get(v,-2);
+ SQObjectPtr &val = stack_get(v,-1);
+ SQObjectPtr attrs;
+- if(type(key) == OT_NULL) {
++ if(sqtype(key) == OT_NULL) {
+ attrs = _class(*o)->_attributes;
+ _class(*o)->_attributes = val;
+ v->Pop(2);
+@@ -1375,7 +1375,7 @@ SQRESULT sq_getattributes(HSQUIRRELVM v,SQInteger idx)
+ _GETSAFE_OBJ(v, idx, OT_CLASS,o);
+ SQObjectPtr &key = stack_get(v,-1);
+ SQObjectPtr attrs;
+- if(type(key) == OT_NULL) {
++ if(sqtype(key) == OT_NULL) {
+ attrs = _class(*o)->_attributes;
+ v->Pop();
+ v->Push(attrs);
+@@ -1407,7 +1407,7 @@ SQRESULT sq_getmemberhandle(HSQUIRRELVM v,SQInteger id
+
+ SQRESULT _getmemberbyhandle(HSQUIRRELVM v,SQObjectPtr &self,const HSQMEMBERHANDLE *handle,SQObjectPtr *&val)
+ {
+- switch(type(self)) {
++ switch(sqtype(self)) {
+ case OT_INSTANCE: {
+ SQInstance *i = _instance(self);
+ if(handle->_static) {
+@@ -1490,8 +1490,8 @@ SQRESULT sq_createinstance(HSQUIRRELVM v,SQInteger idx
+ void sq_weakref(HSQUIRRELVM v,SQInteger idx)
+ {
+ SQObject &o=stack_get(v,idx);
+- if(ISREFCOUNTED(type(o))) {
+- v->Push(_refcounted(o)->GetWeakRef(type(o)));
++ if(ISREFCOUNTED(sqtype(o))) {
++ v->Push(_refcounted(o)->GetWeakRef(sqtype(o)));
+ return;
+ }
+ v->Push(o);
+@@ -1500,7 +1500,7 @@ void sq_weakref(HSQUIRRELVM v,SQInteger idx)
+ SQRESULT sq_getweakrefval(HSQUIRRELVM v,SQInteger idx)
+ {
+ SQObjectPtr &o = stack_get(v,idx);
+- if(type(o) != OT_WEAKREF) {
++ if(sqtype(o) != OT_WEAKREF) {
+ return sq_throwerror(v,_SC("the object must be a weakref"));
+ }
+ v->Push(_weakref(o)->_obj);
+@@ -1529,7 +1529,7 @@ SQRESULT sq_getdefaultdelegate(HSQUIRRELVM v,SQObjectT
+ SQRESULT sq_next(HSQUIRRELVM v,SQInteger idx)
+ {
+ SQObjectPtr o=stack_get(v,idx),&refpos = stack_get(v,-1),realkey,val;
+- if(type(o) == OT_GENERATOR) {
++ if(sqtype(o) == OT_GENERATOR) {
+ return sq_throwerror(v,_SC("cannot iterate a generator"));
+ }
+ int faketojump;
+--- squirrel/sqbaselib.cpp.orig 2017-08-31 12:07:29 UTC
++++ squirrel/sqbaselib.cpp
+@@ -169,7 +169,7 @@ static SQInteger get_slice_params(HSQUIRRELVM v,SQInte
+ o=stack_get(v,1);
+ if(top>1){
+ SQObjectPtr &start=stack_get(v,2);
+- if(type(start)!=OT_NULL && sq_isnumeric(start)){
++ if(sqtype(start)!=OT_NULL && sq_isnumeric(start)){
+ sidx=tointeger(start);
+ }
+ }
+@@ -340,7 +340,7 @@ static SQInteger default_delegate_len(HSQUIRRELVM v)
+ static SQInteger default_delegate_tofloat(HSQUIRRELVM v)
+ {
+ SQObjectPtr &o=stack_get(v,1);
+- switch(type(o)){
++ switch(sqtype(o)){
+ case OT_STRING:{
+ SQObjectPtr res;
+ if(str2num(_stringval(o),res,10)){
+@@ -369,7 +369,7 @@ static SQInteger default_delegate_tointeger(HSQUIRRELV
+ if(sq_gettop(v) > 1) {
+ sq_getinteger(v,2,&base);
+ }
+- switch(type(o)){
++ switch(sqtype(o)){
+ case OT_STRING:{
+ SQObjectPtr res;
+ if(str2num(_stringval(o),res,base)){
+@@ -931,7 +931,7 @@ static SQInteger closure_setroot(HSQUIRRELVM v)
+ static SQInteger closure_getinfos(HSQUIRRELVM v) {
+ SQObject o = stack_get(v,1);
+ SQTable *res = SQTable::Create(_ss(v),4);
+- if(type(o) == OT_CLOSURE) {
++ if(sqtype(o) == OT_CLOSURE) {
+ SQFunctionProto *f = _closure(o)->_function;
+ SQInteger nparams = f->_nparameters + (f->_varparams?1:0);
+ SQObjectPtr params = SQArray::Create(_ss(v),nparams);
+@@ -1010,7 +1010,7 @@ const SQRegFunction SQSharedState::_generator_default_
+ static SQInteger thread_call(HSQUIRRELVM v)
+ {
+ SQObjectPtr o = stack_get(v,1);
+- if(type(o) == OT_THREAD) {
++ if(sqtype(o) == OT_THREAD) {
+ SQInteger nparams = sq_gettop(v);
+ _thread(o)->Push(_thread(o)->_roottable);
+ for(SQInteger i = 2; i<(nparams+1); i++)
+@@ -1029,7 +1029,7 @@ static SQInteger thread_call(HSQUIRRELVM v)
+ static SQInteger thread_wakeup(HSQUIRRELVM v)
+ {
+ SQObjectPtr o = stack_get(v,1);
+- if(type(o) == OT_THREAD) {
++ if(sqtype(o) == OT_THREAD) {
+ SQVM *thread = _thread(o);
+ SQInteger state = sq_getvmstate(thread);
+ if(state != SQ_VMSTATE_SUSPENDED) {
+@@ -1065,7 +1065,7 @@ static SQInteger thread_wakeup(HSQUIRRELVM v)
+ static SQInteger thread_wakeupthrow(HSQUIRRELVM v)
+ {
+ SQObjectPtr o = stack_get(v,1);
+- if(type(o) == OT_THREAD) {
++ if(sqtype(o) == OT_THREAD) {
+ SQVM *thread = _thread(o);
+ SQInteger state = sq_getvmstate(thread);
+ if(state != SQ_VMSTATE_SUSPENDED) {
+@@ -1125,7 +1125,7 @@ static SQInteger thread_getstatus(HSQUIRRELVM v)
+ static SQInteger thread_getstackinfos(HSQUIRRELVM v)
+ {
+ SQObjectPtr o = stack_get(v,1);
+- if(type(o) == OT_THREAD) {
++ if(sqtype(o) == OT_THREAD) {
+ SQVM *thread = _thread(o);
+ SQInteger threadtop = sq_gettop(thread);
+ SQInteger level;
+@@ -1134,7 +1134,7 @@ static SQInteger thread_getstackinfos(HSQUIRRELVM v)
+ if(SQ_FAILED(res))
+ {
+ sq_settop(thread,threadtop);
+- if(type(thread->_lasterror) == OT_STRING) {
++ if(sqtype(thread->_lasterror) == OT_STRING) {
+ sq_throwerror(v,_stringval(thread->_lasterror));
+ }
+ else {
+--- squirrel/sqclass.cpp.orig 2017-08-31 12:07:29 UTC
++++ squirrel/sqclass.cpp
+@@ -53,7 +53,7 @@ SQClass::~SQClass()
+ bool SQClass::NewSlot(SQSharedState *ss,const SQObjectPtr &key,const SQObjectPtr &val,bool bstatic)
+ {
+ SQObjectPtr temp;
+- bool belongs_to_static_table = type(val) == OT_CLOSURE || type(val) == OT_NATIVECLOSURE || bstatic;
++ bool belongs_to_static_table = sqtype(val) == OT_CLOSURE || sqtype(val) == OT_NATIVECLOSURE || bstatic;
+ if(_locked && !belongs_to_static_table)
+ return false; //the class already has an instance so cannot be modified
+ if(_members->Get(key,temp) && _isfield(temp)) //overrides the default value
+@@ -63,18 +63,18 @@ bool SQClass::NewSlot(SQSharedState *ss,const SQObject
+ }
+ if(belongs_to_static_table) {
+ SQInteger mmidx;
+- if((type(val) == OT_CLOSURE || type(val) == OT_NATIVECLOSURE) &&
++ if((sqtype(val) == OT_CLOSURE || sqtype(val) == OT_NATIVECLOSURE) &&
+ (mmidx = ss->GetMetaMethodIdxByName(key)) != -1) {
+ _metamethods[mmidx] = val;
+ }
+ else {
+ SQObjectPtr theval = val;
+- if(_base && type(val) == OT_CLOSURE) {
++ if(_base && sqtype(val) == OT_CLOSURE) {
+ theval = _closure(val)->Clone();
+ _closure(theval)->_base = _base;
+ __ObjAddRef(_base); //ref for the closure
+ }
+- if(type(temp) == OT_NULL) {
++ if(sqtype(temp) == OT_NULL) {
+ bool isconstructor;
+ SQVM::IsEqual(ss->_constructoridx, key, isconstructor);
+ if(isconstructor) {
+@@ -191,7 +191,7 @@ SQInstance::~SQInstance()
+
+ bool SQInstance::GetMetaMethod(SQVM SQ_UNUSED_ARG(*v),SQMetaMethod mm,SQObjectPtr &res)
+ {
+- if(type(_class->_metamethods[mm]) != OT_NULL) {
++ if(sqtype(_class->_metamethods[mm]) != OT_NULL) {
+ res = _class->_metamethods[mm];
+ return true;
+ }
+--- squirrel/sqcompiler.cpp.orig 2017-08-31 12:07:29 UTC
++++ squirrel/sqcompiler.cpp
+@@ -191,7 +191,7 @@ class SQCompiler (public)
+ }
+ else {
+ if(_raiseerror && _ss(_vm)->_compilererrorhandler) {
+- _ss(_vm)->_compilererrorhandler(_vm, _compilererror, type(_sourcename) == OT_STRING?_stringval(_sourcename):_SC("unknown"),
++ _ss(_vm)->_compilererrorhandler(_vm, _compilererror, sqtype(_sourcename) == OT_STRING?_stringval(_sourcename):_SC("unknown"),
+ _lex._currentline, _lex._currentcolumn);
+ }
+ _vm->_lasterror = SQString::Create(_ss(_vm), _compilererror, -1);
+@@ -762,7 +762,7 @@ class SQCompiler (public)
+ /* Handle named constant */
+ SQObjectPtr constval;
+ SQObject constid;
+- if(type(constant) == OT_TABLE) {
++ if(sqtype(constant) == OT_TABLE) {
+ Expect('.');
+ constid = Expect(TK_IDENTIFIER);
+ if(!_table(constant)->Get(constid, constval)) {
+@@ -776,7 +776,7 @@ class SQCompiler (public)
+ _es.epos = _fs->PushTarget();
+
+ /* generate direct or literal function depending on size */
+- SQObjectType ctype = type(constval);
++ SQObjectType ctype = sqtype(constval);
+ switch(ctype) {
+ case OT_INTEGER: EmitLoadConstInt(_integer(constval),_es.epos); break;
+ case OT_FLOAT: EmitLoadConstFloat(_float(constval),_es.epos); break;
+--- squirrel/sqdebug.cpp.orig 2017-08-31 12:07:29 UTC
++++ squirrel/sqdebug.cpp
+@@ -17,8 +17,8 @@ SQRESULT sq_getfunctioninfo(HSQUIRRELVM v,SQInteger le
+ SQClosure *c = _closure(ci._closure);
+ SQFunctionProto *proto = c->_function;
+ fi->funcid = proto;
+- fi->name = type(proto->_name) == OT_STRING?_stringval(proto->_name):_SC("unknown");
+- fi->source = type(proto->_sourcename) == OT_STRING?_stringval(proto->_sourcename):_SC("unknown");
++ fi->name = sqtype(proto->_name) == OT_STRING?_stringval(proto->_name):_SC("unknown");
++ fi->source = sqtype(proto->_sourcename) == OT_STRING?_stringval(proto->_sourcename):_SC("unknown");
+ fi->line = proto->_lineinfos[0]._line;
+ return SQ_OK;
+ }
+@@ -32,12 +32,12 @@ SQRESULT sq_stackinfos(HSQUIRRELVM v, SQInteger level,
+ if (cssize > level) {
+ memset(si, 0, sizeof(SQStackInfos));
+ SQVM::CallInfo &ci = v->_callsstack[cssize-level-1];
+- switch (type(ci._closure)) {
++ switch (sqtype(ci._closure)) {
+ case OT_CLOSURE:{
+ SQFunctionProto *func = _closure(ci._closure)->_function;
+- if (type(func->_name) == OT_STRING)
++ if (sqtype(func->_name) == OT_STRING)
+ si->funcname = _stringval(func->_name);
+- if (type(func->_sourcename) == OT_STRING)
++ if (sqtype(func->_sourcename) == OT_STRING)
+ si->source = _stringval(func->_sourcename);
+ si->line = func->GetLine(ci._ip);
+ }
+@@ -45,7 +45,7 @@ SQRESULT sq_stackinfos(HSQUIRRELVM v, SQInteger level,
+ case OT_NATIVECLOSURE:
+ si->source = _SC("NATIVE");
+ si->funcname = _SC("unknown");
+- if(type(_nativeclosure(ci._closure)->_name) == OT_STRING)
++ if(sqtype(_nativeclosure(ci._closure)->_name) == OT_STRING)
+ si->funcname = _stringval(_nativeclosure(ci._closure)->_name);
+ si->line = -1;
+ break;
+@@ -73,7 +73,7 @@ void SQVM::Raise_Error(const SQObjectPtr &desc)
+
+ SQString *SQVM::PrintObjVal(const SQObjectPtr &o)
+ {
+- switch(type(o)) {
++ switch(sqtype(o)) {
+ case OT_STRING: return _string(o);
+ case OT_INTEGER:
+ scsprintf(_sp(sq_rsl(NUMBER_MAX_CHAR+1)),sq_rsl(NUMBER_MAX_CHAR), _PRINT_INT_FMT, _integer(o));
+--- squirrel/sqfuncstate.cpp.orig 2017-08-31 12:07:29 UTC
++++ squirrel/sqfuncstate.cpp
+@@ -77,7 +77,7 @@ SQInstructionDesc g_InstrDesc[]={
+ #endif
+ void DumpLiteral(SQObjectPtr &o)
+ {
+- switch(type(o)){
++ switch(sqtype(o)){
+ case OT_STRING: scprintf(_SC("\"%s\""),_stringval(o));break;
+ case OT_FLOAT: scprintf(_SC("{%f}"),_float(o));break;
+ case OT_INTEGER: scprintf(_SC("{") _PRINT_INT_FMT _SC("}"),_integer(o));break;
+@@ -290,7 +290,7 @@ SQInteger SQFuncState::PopTarget()
+ SQUnsignedInteger npos=_targetstack.back();
+ assert(npos < _vlocals.size());
+ SQLocalVarInfo &t = _vlocals[npos];
+- if(type(t._name)==OT_NULL){
++ if(sqtype(t._name)==OT_NULL){
+ _vlocals.pop_back();
+ }
+ _targetstack.pop_back();
+@@ -322,7 +322,7 @@ void SQFuncState::SetStackSize(SQInteger n)
+ while(size>n){
+ size--;
+ SQLocalVarInfo lvi = _vlocals.back();
+- if(type(lvi._name)!=OT_NULL){
++ if(sqtype(lvi._name)!=OT_NULL){
+ if(lvi._end_op == UINT_MINUS_ONE) { //this means is an outer
+ _outers--;
+ }
+@@ -346,7 +346,7 @@ bool SQFuncState::IsConstant(const SQObject &name,SQOb
+ bool SQFuncState::IsLocal(SQUnsignedInteger stkpos)
+ {
+ if(stkpos>=_vlocals.size())return false;
+- else if(type(_vlocals[stkpos]._name)!=OT_NULL)return true;
++ else if(sqtype(_vlocals[stkpos]._name)!=OT_NULL)return true;
+ return false;
+ }
+
+@@ -369,7 +369,7 @@ SQInteger SQFuncState::GetLocalVariable(const SQObject
+ SQInteger locals=_vlocals.size();
+ while(locals>=1){
+ SQLocalVarInfo &lvi = _vlocals[locals-1];
+- if(type(lvi._name)==OT_STRING && _string(lvi._name)==_string(name)){
++ if(sqtype(lvi._name)==OT_STRING && _string(lvi._name)==_string(name)){
+ return locals-1;
+ }
+ locals--;
+--- squirrel/sqobject.cpp.orig 2017-08-31 12:07:29 UTC
++++ squirrel/sqobject.cpp
+@@ -43,7 +43,7 @@ const SQChar *IdType2Name(SQObjectType type)
+
+ const SQChar *GetTypeName(const SQObjectPtr &obj1)
+ {
+- return IdType2Name(type(obj1));
++ return IdType2Name(sqtype(obj1));
+ }
+
+ SQString *SQString::Create(SQSharedState *ss,const SQChar *s,SQInteger len)
+@@ -72,7 +72,7 @@ SQInteger SQString::Next(const SQObjectPtr &refpos, SQ
+
+ SQUnsignedInteger TranslateIndex(const SQObjectPtr &idx)
+ {
+- switch(type(idx)){
++ switch(sqtype(idx)){
+ case OT_NULL:
+ return 0;
+ case OT_INTEGER:
+@@ -139,7 +139,7 @@ bool SQGenerator::Yield(SQVM *v,SQInteger target)
+
+ _stack.resize(size);
+ SQObject _this = v->_stack[v->_stackbase];
+- _stack._vals[0] = ISREFCOUNTED(type(_this)) ? SQObjectPtr(_refcounted(_this)->GetWeakRef(type(_this))) : _this;
++ _stack._vals[0] = ISREFCOUNTED(sqtype(_this)) ? SQObjectPtr(_refcounted(_this)->GetWeakRef(sqtype(_this))) : _this;
+ for(SQInteger n =1; n<target; n++) {
+ _stack._vals[n] = v->_stack[v->_stackbase+n];
+ }
+@@ -191,7 +191,7 @@ bool SQGenerator::Resume(SQVM *v,SQObjectPtr &dest)
+ et._stacksize += newbase;
+ }
+ SQObject _this = _stack._vals[0];
+- v->_stack[v->_stackbase] = type(_this) == OT_WEAKREF ? _weakref(_this)->_obj : _this;
++ v->_stack[v->_stackbase] = sqtype(_this) == OT_WEAKREF ? _weakref(_this)->_obj : _this;
+
+ for(SQInteger n = 1; n<size; n++) {
+ v->_stack[v->_stackbase+n] = _stack._vals[n];
+@@ -312,9 +312,9 @@ bool CheckTag(HSQUIRRELVM v,SQWRITEFUNC read,SQUserPoi
+
+ bool WriteObject(HSQUIRRELVM v,SQUserPointer up,SQWRITEFUNC write,SQObjectPtr &o)
+ {
+- SQUnsignedInteger32 _type = (SQUnsignedInteger32)type(o);
++ SQUnsignedInteger32 _type = (SQUnsignedInteger32)sqtype(o);
+ _CHECK_IO(SafeWrite(v,write,up,&_type,sizeof(_type)));
+- switch(type(o)){
++ switch(sqtype(o)){
+ case OT_STRING:
+ _CHECK_IO(SafeWrite(v,write,up,&_string(o)->_len,sizeof(SQInteger)));
+ _CHECK_IO(SafeWrite(v,write,up,_stringval(o),sq_rsl(_string(o)->_len)));
+--- squirrel/sqobject.h.orig 2017-08-31 12:07:29 UTC
++++ squirrel/sqobject.h
+@@ -101,7 +101,7 @@ struct SQWeakRef : SQRefCounted
+ SQObject _obj;
+ };
+
+-#define _realval(o) (type((o)) != OT_WEAKREF?(SQObject)o:_weakref(o)->_obj)
++#define _realval(o) (sqtype((o)) != OT_WEAKREF?(SQObject)o:_weakref(o)->_obj)
+
+ struct SQObjectPtr;
+
+@@ -128,8 +128,8 @@ struct SQObjectPtr;
+ (obj)->_uiRef++; \
+ }
+
+-#define type(obj) ((obj)._type)
+-#define is_delegable(t) (type(t)&SQOBJECT_DELEGABLE)
++#define sqtype(obj) ((obj)._type)
++#define is_delegable(t) (sqtype(t)&SQOBJECT_DELEGABLE)
+ #define raw_type(obj) _RAW_TYPE((obj)._type)
+
+ #define _integer(obj) ((obj)._unVal.nInteger)
+@@ -155,8 +155,8 @@ struct SQObjectPtr;
+ #define _stringval(obj) (obj)._unVal.pString->_val
+ #define _userdataval(obj) ((SQUserPointer)sq_aligning((obj)._unVal.pUserData + 1))
+
+-#define tofloat(num) ((type(num)==OT_INTEGER)?(SQFloat)_integer(num):_float(num))
+-#define tointeger(num) ((type(num)==OT_FLOAT)?(SQInteger)_float(num):_integer(num))
++#define tofloat(num) ((sqtype(num)==OT_INTEGER)?(SQFloat)_integer(num):_float(num))
++#define tointeger(num) ((sqtype(num)==OT_FLOAT)?(SQInteger)_float(num):_integer(num))
+ /////////////////////////////////////////////////////////////////////////////////////
+ /////////////////////////////////////////////////////////////////////////////////////
+ #if defined(SQUSEDOUBLE) && !defined(_SQ64) || !defined(SQUSEDOUBLE) && defined(_SQ64)
+--- squirrel/sqstate.cpp.orig 2017-08-31 12:07:29 UTC
++++ squirrel/sqstate.cpp
+@@ -221,7 +221,7 @@ SQSharedState::~SQSharedState()
+
+ SQInteger SQSharedState::GetMetaMethodIdxByName(const SQObjectPtr &name)
+ {
+- if(type(name) != OT_STRING)
++ if(sqtype(name) != OT_STRING)
+ return -1;
+ SQObjectPtr ret;
+ if(_table(_metamethodsmap)->Get(name,ret)) {
+@@ -234,7 +234,7 @@ SQInteger SQSharedState::GetMetaMethodIdxByName(const
+
+ void SQSharedState::MarkObject(SQObjectPtr &o,SQCollectable **chain)
+ {
+- switch(type(o)){
++ switch(sqtype(o)){
+ case OT_TABLE:_table(o)->Mark(chain);break;
+ case OT_ARRAY:_array(o)->Mark(chain);break;
+ case OT_USERDATA:_userdata(o)->Mark(chain);break;
+@@ -423,7 +423,7 @@ void RefTable::Mark(SQCollectable **chain)
+ {
+ RefNode *nodes = (RefNode *)_nodes;
+ for(SQUnsignedInteger n = 0; n < _numofslots; n++) {
+- if(type(nodes->obj) != OT_NULL) {
++ if(sqtype(nodes->obj) != OT_NULL) {
+ SQSharedState::MarkObject(nodes->obj,chain);
+ }
+ nodes++;
+@@ -485,7 +485,7 @@ void RefTable::Resize(SQUnsignedInteger size)
+ //rehash
+ SQUnsignedInteger nfound = 0;
+ for(SQUnsignedInteger n = 0; n < oldnumofslots; n++) {
+- if(type(t->obj) != OT_NULL) {
++ if(sqtype(t->obj) != OT_NULL) {
+ //add back;
+ assert(t->refs != 0);
+ RefNode *nn = Add(::HashObj(t->obj)&(_numofslots-1),t->obj);
+@@ -518,7 +518,7 @@ RefTable::RefNode *RefTable::Get(SQObject &obj,SQHash
+ mainpos = ::HashObj(obj)&(_numofslots-1);
+ *prev = NULL;
+ for (ref = _buckets[mainpos]; ref; ) {
+- if(_rawval(ref->obj) == _rawval(obj) && type(ref->obj) == type(obj))
++ if(_rawval(ref->obj) == _rawval(obj) && sqtype(ref->obj) == sqtype(obj))
+ break;
+ *prev = ref;
+ ref = ref->next;
+--- squirrel/sqtable.cpp.orig 2017-08-31 12:07:29 UTC
++++ squirrel/sqtable.cpp
+@@ -62,7 +62,7 @@ void SQTable::Rehash(bool force)
+ _usednodes = 0;
+ for (SQInteger i=0; i<oldsize; i++) {
+ _HashNode *old = nold+i;
+- if (type(old->key) != OT_NULL)
++ if (sqtype(old->key) != OT_NULL)
+ NewSlot(old->key,old->val);
+ }
+ for(SQInteger k=0;k<oldsize;k++)
+@@ -107,7 +107,7 @@ SQTable *SQTable::Clone()
+
+ bool SQTable::Get(const SQObjectPtr &key,SQObjectPtr &val)
+ {
+- if(type(key) == OT_NULL)
++ if(sqtype(key) == OT_NULL)
+ return false;
+ _HashNode *n = _Get(key, HashObj(key) & (_numofnodes - 1));
+ if (n) {
+@@ -118,7 +118,7 @@ bool SQTable::Get(const SQObjectPtr &key,SQObjectPtr &
+ }
+ bool SQTable::NewSlot(const SQObjectPtr &key,const SQObjectPtr &val)
+ {
+- assert(type(key) != OT_NULL);
++ assert(sqtype(key) != OT_NULL);
+ SQHash h = HashObj(key) & (_numofnodes - 1);
+ _HashNode *n = _Get(key, h);
+ if (n) {
+@@ -132,7 +132,7 @@ bool SQTable::NewSlot(const SQObjectPtr &key,const SQO
+ //key not found I'll insert it
+ //main pos is not free
+
+- if(type(mp->key) != OT_NULL) {
++ if(sqtype(mp->key) != OT_NULL) {
+ n = _firstfree; /* get a free place */
+ SQHash mph = HashObj(mp->key) & (_numofnodes - 1);
+ _HashNode *othern; /* main position of colliding node */
+@@ -161,7 +161,7 @@ bool SQTable::NewSlot(const SQObjectPtr &key,const SQO
+ mp->key = key;
+
+ for (;;) { /* correct `firstfree' */
+- if (type(_firstfree->key) == OT_NULL && _firstfree->next == NULL) {
++ if (sqtype(_firstfree->key) == OT_NULL && _firstfree->next == NULL) {
+ mp->val = val;
+ _usednodes++;
+ return true; /* OK; table still has a free place */
+@@ -177,7 +177,7 @@ SQInteger SQTable::Next(bool getweakrefs,const SQObjec
+ {
+ SQInteger idx = (SQInteger)TranslateIndex(refpos);
+ while (idx < _numofnodes) {
+- if(type(_nodes[idx].key) != OT_NULL) {
++ if(sqtype(_nodes[idx].key) != OT_NULL) {
+ //first found
+ _HashNode &n = _nodes[idx];
+ outkey = n.key;
+--- squirrel/sqtable.h.orig 2017-08-31 12:07:29 UTC
++++ squirrel/sqtable.h
+@@ -14,7 +14,7 @@
+
+ inline SQHash HashObj(const SQObjectPtr &key)
+ {
+- switch(type(key)) {
++ switch(sqtype(key)) {
+ case OT_STRING: return _string(key)->_hash;
+ case OT_FLOAT: return (SQHash)((SQInteger)_float(key));
+ case OT_BOOL: case OT_INTEGER: return (SQHash)((SQInteger)_integer(key));
+@@ -67,7 +67,7 @@ struct SQTable : public SQDelegable (public)
+ {
+ _HashNode *n = &_nodes[hash];
+ do{
+- if(_rawval(n->key) == _rawval(key) && type(n->key) == type(key)){
++ if(_rawval(n->key) == _rawval(key) && sqtype(n->key) == sqtype(key)){
+ return n;
+ }
+ }while((n = n->next));
+@@ -80,7 +80,7 @@ struct SQTable : public SQDelegable (public)
+ _HashNode *n = &_nodes[hash & (_numofnodes - 1)];
+ _HashNode *res = NULL;
+ do{
+- if(type(n->key) == OT_STRING && (scstrcmp(_stringval(n->key),key) == 0)){
++ if(sqtype(n->key) == OT_STRING && (scstrcmp(_stringval(n->key),key) == 0)){
+ res = n;
+ break;
+ }
+--- squirrel/sqvm.cpp.orig 2017-08-31 12:07:29 UTC
++++ squirrel/sqvm.cpp
+@@ -19,7 +19,7 @@
+ bool SQVM::BW_OP(SQUnsignedInteger op,SQObjectPtr &trg,const SQObjectPtr &o1,const SQObjectPtr &o2)
+ {
+ SQInteger res;
+- if((type(o1)|type(o2)) == OT_INTEGER)
++ if((sqtype(o1)| sqtype(o2)) == OT_INTEGER)
+ {
+ SQInteger i1 = _integer(o1), i2 = _integer(o2);
+ switch(op) {
+@@ -39,7 +39,7 @@ bool SQVM::BW_OP(SQUnsignedInteger op,SQObjectPtr &trg
+
+ #define _ARITH_(op,trg,o1,o2) \
+ { \
+- SQInteger tmask = type(o1)|type(o2); \
++ SQInteger tmask = sqtype(o1)|sqtype(o2); \
+ switch(tmask) { \
+ case OT_INTEGER: trg = _integer(o1) op _integer(o2);break; \
+ case (OT_FLOAT|OT_INTEGER): \
+@@ -50,7 +50,7 @@ bool SQVM::BW_OP(SQUnsignedInteger op,SQObjectPtr &trg
+
+ #define _ARITH_NOZERO(op,trg,o1,o2,err) \
+ { \
+- SQInteger tmask = type(o1)|type(o2); \
++ SQInteger tmask = sqtype(o1)|sqtype(o2); \
+ switch(tmask) { \
+ case OT_INTEGER: { SQInteger i2 = _integer(o2); if(i2 == 0) { Raise_Error(err); SQ_THROW(); } trg = _integer(o1) op i2; } break;\
+ case (OT_FLOAT|OT_INTEGER): \
+@@ -61,7 +61,7 @@ bool SQVM::BW_OP(SQUnsignedInteger op,SQObjectPtr &trg
+
+ bool SQVM::ARITH_OP(SQUnsignedInteger op,SQObjectPtr &trg,const SQObjectPtr &o1,const SQObjectPtr &o2)
+ {
+- SQInteger tmask = type(o1)|type(o2);
++ SQInteger tmask = sqtype(o1)| sqtype(o2);
+ switch(tmask) {
+ case OT_INTEGER:{
+ SQInteger res, i1 = _integer(o1), i2 = _integer(o2);
+@@ -175,7 +175,7 @@ bool SQVM::ArithMetaMethod(SQInteger op,const SQObject
+ bool SQVM::NEG_OP(SQObjectPtr &trg,const SQObjectPtr &o)
+ {
+
+- switch(type(o)) {
++ switch(sqtype(o)) {
+ case OT_INTEGER:
+ trg = -_integer(o);
+ return true;
+@@ -204,7 +204,7 @@ bool SQVM::NEG_OP(SQObjectPtr &trg,const SQObjectPtr &
+ #define _RET_SUCCEED(exp) { result = (exp); return true; }
+ bool SQVM::ObjCmp(const SQObjectPtr &o1,const SQObjectPtr &o2,SQInteger &result)
+ {
+- SQObjectType t1 = type(o1), t2 = type(o2);
++ SQObjectType t1 = sqtype(o1), t2 = sqtype(o2);
+ if(t1 == t2) {
+ if(_rawval(o1) == _rawval(o2))_RET_SUCCEED(0);
+ SQObjectPtr res;
+@@ -223,7 +223,7 @@ bool SQVM::ObjCmp(const SQObjectPtr &o1,const SQObject
+ if(_delegable(o1)->GetMetaMethod(this, MT_CMP, closure)) {
+ Push(o1);Push(o2);
+ if(CallMetaMethod(closure,MT_CMP,2,res)) {
+- if(type(res) != OT_INTEGER) {
++ if(sqtype(res) != OT_INTEGER) {
+ Raise_Error(_SC("_cmp must return an integer"));
+ return false;
+ }
+@@ -281,7 +281,7 @@ bool SQVM::CMP_OP(CmpOP op, const SQObjectPtr &o1,cons
+
+ bool SQVM::ToString(const SQObjectPtr &o,SQObjectPtr &res)
+ {
+- switch(type(o)) {
++ switch(sqtype(o)) {
+ case OT_STRING:
+ res = o;
+ return true;
+@@ -302,7 +302,7 @@ bool SQVM::ToString(const SQObjectPtr &o,SQObjectPtr &
+ if(_delegable(o)->GetMetaMethod(this, MT_TOSTRING, closure)) {
+ Push(o);
+ if(CallMetaMethod(closure,MT_TOSTRING,1,res)) {;
+- if(type(res) == OT_STRING)
++ if(sqtype(res) == OT_STRING)
+ return true;
+ }
+ else {
+@@ -517,7 +517,7 @@ bool SQVM::FOREACH_OP(SQObjectPtr &o1,SQObjectPtr &o2,
+ &o3,SQObjectPtr &o4,SQInteger SQ_UNUSED_ARG(arg_2),int exitpos,int &jump)
+ {
+ SQInteger nrefidx;
+- switch(type(o1)) {
++ switch(sqtype(o1)) {
+ case OT_TABLE:
+ if((nrefidx = _table(o1)->Next(false,o4, o2, o3)) == -1) _FINISH(exitpos);
+ o4 = (SQInteger)nrefidx; _FINISH(1);
+@@ -540,7 +540,7 @@ bool SQVM::FOREACH_OP(SQObjectPtr &o1,SQObjectPtr &o2,
+ Push(o4);
+ if(CallMetaMethod(closure, MT_NEXTI, 2, itr)) {
+ o4 = o2 = itr;
+- if(type(itr) == OT_NULL) _FINISH(exitpos);
++ if(sqtype(itr) == OT_NULL) _FINISH(exitpos);
+ if(!Get(o1, itr, o3, 0, DONT_FALL_BACK)) {
+ Raise_Error(_SC("_nexti returned an invalid idx")); // cloud be changed
+ return false;
+@@ -559,7 +559,7 @@ bool SQVM::FOREACH_OP(SQObjectPtr &o1,SQObjectPtr &o2,
+ if(_generator(o1)->_state == SQGenerator::eDead) _FINISH(exitpos);
+ if(_generator(o1)->_state == SQGenerator::eSuspended) {
+ SQInteger idx = 0;
+- if(type(o4) == OT_INTEGER) {
++ if(sqtype(o4) == OT_INTEGER) {
+ idx = _integer(o4) + 1;
+ }
+ o2 = idx;
+@@ -614,14 +614,14 @@ bool SQVM::CLASS_OP(SQObjectPtr &target,SQInteger base
+ SQClass *base = NULL;
+ SQObjectPtr attrs;
+ if(baseclass != -1) {
+- if(type(_stack._vals[_stackbase+baseclass]) != OT_CLASS) { Raise_Error(_SC("trying to inherit from a %s"),GetTypeName(_stack._vals[_stackbase+baseclass])); return false; }
++ if(sqtype(_stack._vals[_stackbase+baseclass]) != OT_CLASS) { Raise_Error(_SC("trying to inherit from a %s"),GetTypeName(_stack._vals[_stackbase+baseclass])); return false; }
+ base = _class(_stack._vals[_stackbase + baseclass]);
+ }
+ if(attributes != MAX_FUNC_STACKSIZE) {
+ attrs = _stack._vals[_stackbase+attributes];
+ }
+ target = SQClass::Create(_ss(this),base);
+- if(type(_class(target)->_metamethods[MT_INHERITED]) != OT_NULL) {
++ if(sqtype(_class(target)->_metamethods[MT_INHERITED]) != OT_NULL) {
+ int nparams = 2;
+ SQObjectPtr ret;
+ Push(target); Push(attrs);
+@@ -637,7 +637,7 @@ bool SQVM::CLASS_OP(SQObjectPtr &target,SQInteger base
+
+ bool SQVM::IsEqual(const SQObjectPtr &o1,const SQObjectPtr &o2,bool &res)
+ {
+- if(type(o1) == type(o2)) {
++ if(sqtype(o1) == sqtype(o2)) {
+ res = (_rawval(o1) == _rawval(o2));
+ }
+ else {
+@@ -653,12 +653,12 @@ bool SQVM::IsEqual(const SQObjectPtr &o1,const SQObjec
+
+ bool SQVM::IsFalse(SQObjectPtr &o)
+ {
+- if(((type(o) & SQOBJECT_CANBEFALSE)
+- && ( ((type(o) == OT_FLOAT) && (_float(o) == SQFloat(0.0))) ))
++ if(((sqtype(o) & SQOBJECT_CANBEFALSE)
++ && ( ((sqtype(o) == OT_FLOAT) && (_float(o) == SQFloat(0.0))) ))
+ #if !defined(SQUSEDOUBLE) || (defined(SQUSEDOUBLE) && defined(_SQ64))
+ || (_integer(o) == 0) ) //OT_NULL|OT_INTEGER|OT_BOOL
+ #else
+- || (((type(o) != OT_FLOAT) && (_integer(o) == 0))) ) //OT_NULL|OT_INTEGER|OT_BOOL
++ || (((sqtype(o) != OT_FLOAT) && (_integer(o) == 0))) ) //OT_NULL|OT_INTEGER|OT_BOOL
+ #endif
+ {
+ return true;
+@@ -721,7 +721,7 @@ exception_restore:
+ case _OP_DLOAD: TARGET = ci->_literals[arg1]; STK(arg2) = ci->_literals[arg3];continue;
+ case _OP_TAILCALL:{
+ SQObjectPtr &t = STK(arg1);
+- if (type(t) == OT_CLOSURE
++ if (sqtype(t) == OT_CLOSURE
+ && (!_closure(t)->_function->_bgenerator)){
+ SQObjectPtr clo = t;
+ if(_openouters) CloseOuters(&(_stack._vals[_stackbase]));
+@@ -732,7 +732,7 @@ exception_restore:
+ }
+ case _OP_CALL: {
+ SQObjectPtr clo = STK(arg1);
+- switch (type(clo)) {
++ switch (sqtype(clo)) {
+ case OT_CLOSURE:
+ _GUARD(StartCall(_closure(clo), sarg0, arg3, _stackbase+arg2, false));
+ continue;
+@@ -759,7 +759,7 @@ exception_restore:
+ STK(arg0) = inst;
+ }
+ SQInteger stkbase;
+- switch(type(clo)) {
++ switch(sqtype(clo)) {
+ case OT_CLOSURE:
+ stkbase = _stackbase+arg2;
+ _stack._vals[stkbase] = inst;
+@@ -857,7 +857,7 @@ exception_restore:
+ case _OP_LOADNULLS:{ for(SQInt32 n=0; n < arg1; n++) STK(arg0+n).Null(); }continue;
+ case _OP_LOADROOT: {
+ SQWeakRef *w = _closure(ci->_closure)->_root;
+- if(type(w->_obj) != OT_NULL) {
++ if(sqtype(w->_obj) != OT_NULL) {
+ TARGET = w->_obj;
+ } else {
+ TARGET = _roottable; //shoud this be like this? or null
+@@ -933,7 +933,7 @@ exception_restore:
+ case _OP_INC: {SQObjectPtr o(sarg3); _GUARD(DerefInc('+',TARGET, STK(arg1), STK(arg2), o, false, arg1));} continue;
+ case _OP_INCL: {
+ SQObjectPtr &a = STK(arg1);
+- if(type(a) == OT_INTEGER) {
++ if(sqtype(a) == OT_INTEGER) {
+ a._unVal.nInteger = _integer(a) + sarg3;
+ }
+ else {
+@@ -944,7 +944,7 @@ exception_restore:
+ case _OP_PINC: {SQObjectPtr o(sarg3); _GUARD(DerefInc('+',TARGET, STK(arg1), STK(arg2), o, true, arg1));} continue;
+ case _OP_PINCL: {
+ SQObjectPtr &a = STK(arg1);
+- if(type(a) == OT_INTEGER) {
++ if(sqtype(a) == OT_INTEGER) {
+ TARGET = a;
+ a._unVal.nInteger = _integer(a) + sarg3;
+ }
+@@ -956,9 +956,9 @@ exception_restore:
+ case _OP_CMP: _GUARD(CMP_OP((CmpOP)arg3,STK(arg2),STK(arg1),TARGET)) continue;
+ case _OP_EXISTS: TARGET = Get(STK(arg1), STK(arg2), temp_reg, GET_FLAG_DO_NOT_RAISE_ERROR | GET_FLAG_RAW, DONT_FALL_BACK) ? true : false; continue;
+ case _OP_INSTANCEOF:
+- if(type(STK(arg1)) != OT_CLASS)
++ if(sqtype(STK(arg1)) != OT_CLASS)
+ {Raise_Error(_SC("cannot apply instanceof between a %s and a %s"),GetTypeName(STK(arg1)),GetTypeName(STK(arg2))); SQ_THROW();}
+- TARGET = (type(STK(arg2)) == OT_INSTANCE) ? (_instance(STK(arg2))->InstanceOf(_class(STK(arg1)))?true:false) : false;
++ TARGET = (sqtype(STK(arg2)) == OT_INSTANCE) ? (_instance(STK(arg2))->InstanceOf(_class(STK(arg1)))?true:false) : false;
+ continue;
+ case _OP_AND:
+ if(IsFalse(STK(arg2))) {
+@@ -975,7 +975,7 @@ exception_restore:
+ case _OP_NEG: _GUARD(NEG_OP(TARGET,STK(arg1))); continue;
+ case _OP_NOT: TARGET = IsFalse(STK(arg1)); continue;
+ case _OP_BWNOT:
+- if(type(STK(arg1)) == OT_INTEGER) {
++ if(sqtype(STK(arg1)) == OT_INTEGER) {
+ SQInteger t = _integer(STK(arg1));
+ TARGET = SQInteger(~t);
+ continue;
+@@ -1005,7 +1005,7 @@ exception_restore:
+ }
+ continue;
+ case _OP_RESUME:
+- if(type(STK(arg1)) != OT_GENERATOR){ Raise_Error(_SC("trying to resume a '%s',only genenerator can be resumed"), GetTypeName(STK(arg1))); SQ_THROW();}
++ if(sqtype(STK(arg1)) != OT_GENERATOR){ Raise_Error(_SC("trying to resume a '%s',only genenerator can be resumed"), GetTypeName(STK(arg1))); SQ_THROW();}
+ _GUARD(_generator(STK(arg1))->Resume(this, TARGET));
+ traps += ci->_etraps;
+ continue;
+@@ -1014,7 +1014,7 @@ exception_restore:
+ ci->_ip += tojump; }
+ continue;
+ case _OP_POSTFOREACH:
+- assert(type(STK(arg0)) == OT_GENERATOR);
++ assert(sqtype(STK(arg0)) == OT_GENERATOR);
+ if(_generator(STK(arg0))->_state == SQGenerator::eDead)
+ ci->_ip += (sarg1 - 1);
+ continue;
+@@ -1104,7 +1104,7 @@ bool SQVM::CreateClassInstance(SQClass *theclass, SQOb
+
+ void SQVM::CallErrorHandler(SQObjectPtr &error)
+ {
+- if(type(_errorhandler) != OT_NULL) {
++ if(sqtype(_errorhandler) != OT_NULL) {
+ SQObjectPtr out;
+ Push(_roottable); Push(error);
+ Call(_errorhandler, 2, _top-2, out,SQFalse);
+@@ -1118,8 +1118,8 @@ void SQVM::CallDebugHook(SQInteger type,SQInteger forc
+ _debughook = false;
+ SQFunctionProto *func=_closure(ci->_closure)->_function;
+ if(_debughook_native) {
+- const SQChar *src = type(func->_sourcename) == OT_STRING?_stringval(func->_sourcename):NULL;
+- const SQChar *fname = type(func->_name) == OT_STRING?_stringval(func->_name):NULL;
++ const SQChar *src = sqtype(func->_sourcename) == OT_STRING?_stringval(func->_sourcename):NULL;
++ const SQChar *fname = sqtype(func->_name) == OT_STRING?_stringval(func->_name):NULL;
+ SQInteger line = forcedline?forcedline:func->GetLine(ci->_ip);
+ _debughook_native(this,type,src,line,fname);
+ }
+@@ -1154,8 +1154,8 @@ bool SQVM::CallNative(SQNativeClosure *nclosure, SQInt
+ SQIntVec &tc = nclosure->_typecheck;
+ if((tcs = tc.size())) {
+ for(SQInteger i = 0; i < nargs && i < tcs; i++) {
+- if((tc._vals[i] != -1) && !(type(_stack._vals[newbase+i]) & tc._vals[i])) {
+- Raise_ParamTypeError(i,tc._vals[i],type(_stack._vals[newbase+i]));
++ if((tc._vals[i] != -1) && !(sqtype(_stack._vals[newbase+i]) & tc._vals[i])) {
++ Raise_ParamTypeError(i,tc._vals[i], sqtype(_stack._vals[newbase+i]));
+ return false;
+ }
+ }
+@@ -1202,7 +1202,7 @@ bool SQVM::CallNative(SQNativeClosure *nclosure, SQInt
+
+ bool SQVM::Get(const SQObjectPtr &self, const SQObjectPtr &key, SQObjectPtr &dest, SQUnsignedInteger getflags, SQInteger selfidx)
+ {
+- switch(type(self)){
++ switch(sqtype(self)){
+ case OT_TABLE:
+ if(_table(self)->Get(key,dest))return true;
+ break;
+@@ -1243,7 +1243,7 @@ bool SQVM::Get(const SQObjectPtr &self, const SQObject
+ //#ifdef ROOT_FALLBACK
+ if(selfidx == 0) {
+ SQWeakRef *w = _closure(ci->_closure)->_root;
+- if(type(w->_obj) != OT_NULL)
++ if(sqtype(w->_obj) != OT_NULL)
+ {
+ if(Get(*((const SQObjectPtr *)&w->_obj),key,dest,0,DONT_FALL_BACK)) return true;
+ }
+@@ -1257,7 +1257,7 @@ bool SQVM::Get(const SQObjectPtr &self, const SQObject
+ bool SQVM::InvokeDefaultDelegate(const SQObjectPtr &self,const SQObjectPtr &key,SQObjectPtr &dest)
+ {
+ SQTable *ddel = NULL;
+- switch(type(self)) {
++ switch(sqtype(self)) {
+ case OT_CLASS: ddel = _class_ddel; break;
+ case OT_TABLE: ddel = _table_ddel; break;
+ case OT_ARRAY: ddel = _array_ddel; break;
+@@ -1276,7 +1276,7 @@ bool SQVM::InvokeDefaultDelegate(const SQObjectPtr &se
+
+ SQInteger SQVM::FallBackGet(const SQObjectPtr &self,const SQObjectPtr &key,SQObjectPtr &dest)
+ {
+- switch(type(self)){
++ switch(sqtype(self)){
+ case OT_TABLE:
+ case OT_USERDATA:
+ //delegation
+@@ -1299,7 +1299,7 @@ SQInteger SQVM::FallBackGet(const SQObjectPtr &self,co
+ }
+ else {
+ Pop(2);
+- if(type(_lasterror) != OT_NULL) { //NULL means "clean failure" (not found)
++ if(sqtype(_lasterror) != OT_NULL) { //NULL means "clean failure" (not found)
+ return FALLBACK_ERROR;
+ }
+ }
+@@ -1314,7 +1314,7 @@ SQInteger SQVM::FallBackGet(const SQObjectPtr &self,co
+
+ bool SQVM::Set(const SQObjectPtr &self,const SQObjectPtr &key,const SQObjectPtr &val,SQInteger selfidx)
+ {
+- switch(type(self)){
++ switch(sqtype(self)){
+ case OT_TABLE:
+ if(_table(self)->Set(key,val)) return true;
+ break;
+@@ -1348,7 +1348,7 @@ bool SQVM::Set(const SQObjectPtr &self,const SQObjectP
+
+ SQInteger SQVM::FallBackSet(const SQObjectPtr &self,const SQObjectPtr &key,const SQObjectPtr &val)
+ {
+- switch(type(self)) {
++ switch(sqtype(self)) {
+ case OT_TABLE:
+ if(_table(self)->_delegate) {
+ if(Set(_table(self)->_delegate,key,val,DONT_FALL_BACK)) return FALLBACK_OK;
+@@ -1367,7 +1367,7 @@ SQInteger SQVM::FallBackSet(const SQObjectPtr &self,co
+ return FALLBACK_OK;
+ }
+ else {
+- if(type(_lasterror) != OT_NULL) { //NULL means "clean failure" (not found)
++ if(sqtype(_lasterror) != OT_NULL) { //NULL means "clean failure" (not found)
+ //error
+ Pop(3);
+ return FALLBACK_ERROR;
+@@ -1386,7 +1386,7 @@ bool SQVM::Clone(const SQObjectPtr &self,SQObjectPtr &
+ {
+ SQObjectPtr temp_reg;
+ SQObjectPtr newobj;
+- switch(type(self)){
++ switch(sqtype(self)){
+ case OT_TABLE:
+ newobj = _table(self)->Clone();
+ goto cloned_mt;
+@@ -1414,14 +1414,14 @@ cloned_mt:
+
+ bool SQVM::NewSlotA(const SQObjectPtr &self,const SQObjectPtr &key,const SQObjectPtr &val,const SQObjectPtr &attrs,bool bstatic,bool raw)
+ {
+- if(type(self) != OT_CLASS) {
++ if(sqtype(self) != OT_CLASS) {
+ Raise_Error(_SC("object must be a class"));
+ return false;
+ }
+ SQClass *c = _class(self);
+ if(!raw) {
+ SQObjectPtr &mm = c->_metamethods[MT_NEWMEMBER];
+- if(type(mm) != OT_NULL ) {
++ if(sqtype(mm) != OT_NULL ) {
+ Push(self); Push(key); Push(val);
+ Push(attrs);
+ Push(bstatic);
+@@ -1430,7 +1430,7 @@ bool SQVM::NewSlotA(const SQObjectPtr &self,const SQOb
+ }
+ if(!NewSlot(self, key, val,bstatic))
+ return false;
+- if(type(attrs) != OT_NULL) {
++ if(sqtype(attrs) != OT_NULL) {
+ c->SetAttributes(key,attrs);
+ }
+ return true;
+@@ -1438,8 +1438,8 @@ bool SQVM::NewSlotA(const SQObjectPtr &self,const SQOb
+
+ bool SQVM::NewSlot(const SQObjectPtr &self,const SQObjectPtr &key,const SQObjectPtr &val,bool bstatic)
+ {
+- if(type(key) == OT_NULL) { Raise_Error(_SC("null cannot be used as index")); return false; }
+- switch(type(self)) {
++ if(sqtype(key) == OT_NULL) { Raise_Error(_SC("null cannot be used as index")); return false; }
++ switch(sqtype(self)) {
+ case OT_TABLE: {
+ bool rawcall = true;
+ if(_table(self)->_delegate) {
+@@ -1499,7 +1499,7 @@ bool SQVM::NewSlot(const SQObjectPtr &self,const SQObj
+
+ bool SQVM::DeleteSlot(const SQObjectPtr &self,const SQObjectPtr &key,SQObjectPtr &res)
+ {
+- switch(type(self)) {
++ switch(sqtype(self)) {
+ case OT_TABLE:
+ case OT_INSTANCE:
+ case OT_USERDATA: {
+@@ -1511,7 +1511,7 @@ bool SQVM::DeleteSlot(const SQObjectPtr &self,const SQ
+ return CallMetaMethod(closure,MT_DELSLOT,2,res);
+ }
+ else {
+- if(type(self) == OT_TABLE) {
++ if(sqtype(self) == OT_TABLE) {
+ if(_table(self)->Get(key,t)) {
+ _table(self)->Remove(key);
+ }
+@@ -1540,7 +1540,7 @@ bool SQVM::Call(SQObjectPtr &closure,SQInteger nparams
+ #ifdef _DEBUG
+ SQInteger prevstackbase = _stackbase;
+ #endif
+- switch(type(closure)) {
++ switch(sqtype(closure)) {
+ case OT_CLOSURE:
+ return Execute(closure, nparams, stackbase, outres, raiseerror);
+ break;
+@@ -1554,7 +1554,7 @@ SQInteger prevstackbase = _stackbase;
+ SQObjectPtr constr;
+ SQObjectPtr temp;
+ CreateClassInstance(_class(closure),outres,constr);
+- SQObjectType ctype = type(constr);
++ SQObjectType ctype = sqtype(constr);
+ if (ctype == OT_NATIVECLOSURE || ctype == OT_CLOSURE) {
+ _stack[stackbase] = outres;
+ return Call(constr,nparams,stackbase,temp,raiseerror);
+@@ -1717,7 +1717,7 @@ void SQVM::dumpstack(SQInteger stackbase,bool dumpall)
+ SQObjectPtr &obj=_stack[i];
+ if(stackbase==i)scprintf(_SC(">"));else scprintf(_SC(" "));
+ scprintf(_SC("[%d]:"),n);
+- switch(type(obj)){
++ switch(sqtype(obj)){
+ case OT_FLOAT: scprintf(_SC("FLOAT %.3f"),_float(obj));break;
+ case OT_INTEGER: scprintf(_SC("INTEGER %d"),_integer(obj));break;
+ case OT_BOOL: scprintf(_SC("BOOL %s"),_integer(obj)?"true":"false");break;
diff --git a/mail/Makefile b/mail/Makefile
index 8a461d3321c2..5c2ef945a9fe 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -529,11 +529,13 @@
SUBDIR += proxsmtp
SUBDIR += py-Products.MailHost
SUBDIR += py-Products.SecureMailHost
+ SUBDIR += py-aiosmtpd
SUBDIR += py-apolicy
SUBDIR += py-authres
SUBDIR += py-cyruslib
SUBDIR += py-dkimpy
SUBDIR += py-email-reply-parser
+ SUBDIR += py-flufl.bounce
SUBDIR += py-fuglu
SUBDIR += py-libgmail
SUBDIR += py-milter
diff --git a/mail/archiveopteryx-devel/Makefile b/mail/archiveopteryx-devel/Makefile
index 3f72977ad05c..ea24731b8336 100644
--- a/mail/archiveopteryx-devel/Makefile
+++ b/mail/archiveopteryx-devel/Makefile
@@ -2,8 +2,8 @@
# $FreeBSD$
PORTNAME= archiveopteryx
-PORTVERSION= 3.2.99.20160129
-PORTREVISION= 3
+PORTVERSION= 3.2.99.20170718
+PORTREVISION= 0
CATEGORIES= mail
PKGNAMESUFFIX= -devel
@@ -19,7 +19,7 @@ BROKEN_powerpc64= Does not build: /bin/sh: clang: not found
USE_GITHUB= yes
GH_ACCOUNT= aox
GH_PROJECT= aox
-GH_TAGNAME= e10c73a
+GH_TAGNAME= f9c2e40
USES= perl5 ssl
USE_PERL5= build
diff --git a/mail/archiveopteryx-devel/distinfo b/mail/archiveopteryx-devel/distinfo
index 6bddfa0cc149..f71afc16affe 100644
--- a/mail/archiveopteryx-devel/distinfo
+++ b/mail/archiveopteryx-devel/distinfo
@@ -1,2 +1,3 @@
-SHA256 (aox-aox-3.2.99.20160129-e10c73a_GH0.tar.gz) = 293091eeab99f52ac8b20816e9e95964d37d7e82bd47d73c828942773075f3b8
-SIZE (aox-aox-3.2.99.20160129-e10c73a_GH0.tar.gz) = 1800386
+TIMESTAMP = 1504192469
+SHA256 (aox-aox-3.2.99.20170718-f9c2e40_GH0.tar.gz) = 49d1fff10e3e1a0fdf043458024dc39583903040f324d1918a895b3bc6f703ae
+SIZE (aox-aox-3.2.99.20170718-f9c2e40_GH0.tar.gz) = 1800008
diff --git a/mail/archiveopteryx-devel/files/patch-server_tlsthread.cpp b/mail/archiveopteryx-devel/files/patch-server_tlsthread.cpp
deleted file mode 100644
index bb0f90c58bb5..000000000000
--- a/mail/archiveopteryx-devel/files/patch-server_tlsthread.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- server/tlsthread.cpp.orig 2017-01-10 15:06:31 UTC
-+++ server/tlsthread.cpp
-@@ -93,7 +93,7 @@ void TlsThread::setup()
- SSL_library_init();
-
- ctx = ::SSL_CTX_new( SSLv23_server_method() );
-- int options = SSL_OP_ALL
-+ long options = SSL_OP_ALL
- // also try to pick the same ciphers suites more often
- | SSL_OP_CIPHER_SERVER_PREFERENCE
- // and don't use SSLv2, even if the client wants to
diff --git a/mail/claws-mail-fancy/Makefile b/mail/claws-mail-fancy/Makefile
index f45b6457a305..fa8ebc0aea90 100644
--- a/mail/claws-mail-fancy/Makefile
+++ b/mail/claws-mail-fancy/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= fancy
-PORTREVISION= 1
+PORTREVISION= 0
COMMENT= Webkit based HTML renderer plugin for Claws Mail
diff --git a/mail/claws-mail-pdf_viewer/Makefile b/mail/claws-mail-pdf_viewer/Makefile
index 9b98719968ef..830c470fb81d 100644
--- a/mail/claws-mail-pdf_viewer/Makefile
+++ b/mail/claws-mail-pdf_viewer/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= pdf_viewer
-PORTREVISION= 1
+PORTREVISION= 0
COMMENT= PDF and PostScript viewer plugin for Claws Mail
diff --git a/mail/claws-mail/Makefile.claws b/mail/claws-mail/Makefile.claws
index 2457f114ed8c..fbdd15bf5964 100644
--- a/mail/claws-mail/Makefile.claws
+++ b/mail/claws-mail/Makefile.claws
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTVERSION= 3.15.0
+PORTVERSION= 3.15.1
CATEGORIES?= mail
MASTER_SITES= http://www.claws-mail.org/download.php?file=releases/
diff --git a/mail/claws-mail/distinfo b/mail/claws-mail/distinfo
index 628c5eab3b6c..c23d1763911c 100644
--- a/mail/claws-mail/distinfo
+++ b/mail/claws-mail/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1490812404
-SHA256 (claws-mail-3.15.0.tar.xz) = 4e4d2d0d43f8ae3d4623408612f5979e9a697ccbc12038b80dd27802e868dc2e
-SIZE (claws-mail-3.15.0.tar.xz) = 5665648
+TIMESTAMP = 1504101480
+SHA256 (claws-mail-3.15.1.tar.xz) = 8d093c2f32db863c1141d56e35424c04ee48fe5d6adf4c7f349f647fa3149542
+SIZE (claws-mail-3.15.1.tar.xz) = 5665468
diff --git a/mail/fdm/Makefile b/mail/fdm/Makefile
index ef51d63bc16c..68838fad94b1 100644
--- a/mail/fdm/Makefile
+++ b/mail/fdm/Makefile
@@ -13,8 +13,6 @@ LICENSE= ISCL
LIB_DEPENDS= libtdb.so:databases/tdb
-MAKE_JOBS_UNSAFE= yes
-
USE_GITHUB= yes
GH_ACCOUNT= nicm
USES= autoreconf:build ssl
@@ -34,6 +32,7 @@ PCRE_LIB_DEPENDS=libpcre.so:devel/pcre
post-patch:
@${REINPLACE_CMD} -e 's|/etc|${PREFIX}/etc|g' ${WRKSRC}/*.[15] ${WRKSRC}/MANUAL
+ @${ECHO_CMD} 'lex.c: parse.h' >> ${WRKSRC}/Makefile.am
pre-configure:
@cd ${WRKSRC} && sh autogen.sh
diff --git a/mail/p5-Email-MIME-ContentType/Makefile b/mail/p5-Email-MIME-ContentType/Makefile
index 897da2110aa1..99b788083963 100644
--- a/mail/p5-Email-MIME-ContentType/Makefile
+++ b/mail/p5-Email-MIME-ContentType/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= Email-MIME-ContentType
-PORTVERSION= 1.021
+PORTVERSION= 1.022
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/mail/p5-Email-MIME-ContentType/distinfo b/mail/p5-Email-MIME-ContentType/distinfo
index 1286625852c1..abbfe89c1a4f 100644
--- a/mail/p5-Email-MIME-ContentType/distinfo
+++ b/mail/p5-Email-MIME-ContentType/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501862758
-SHA256 (Email-MIME-ContentType-1.021.tar.gz) = 59e57ec709e0191acd47c208094eb8a03416cb26dae565d371e3972926107786
-SIZE (Email-MIME-ContentType-1.021.tar.gz) = 19600
+TIMESTAMP = 1504189380
+SHA256 (Email-MIME-ContentType-1.022.tar.gz) = 9abb7280b0da62a855ae5528b14deb94341a84e721af0a7e5a2adc3534ec5310
+SIZE (Email-MIME-ContentType-1.022.tar.gz) = 20365
diff --git a/mail/p5-Email-MIME/Makefile b/mail/p5-Email-MIME/Makefile
index ee124b520eb5..730dc5c70b41 100644
--- a/mail/p5-Email-MIME/Makefile
+++ b/mail/p5-Email-MIME/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= Email-MIME
-PORTVERSION= 1.945
+PORTVERSION= 1.946
CATEGORIES= mail perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
@@ -14,7 +14,7 @@ LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= p5-Email-Address-XS>=0:mail/p5-Email-Address-XS \
- p5-Email-MIME-ContentType>=1.016:mail/p5-Email-MIME-ContentType \
+ p5-Email-MIME-ContentType>=1.022:mail/p5-Email-MIME-ContentType \
p5-Email-MIME-Encodings>=1.314:mail/p5-Email-MIME-Encodings \
p5-Email-MessageID>=0:mail/p5-Email-MessageID \
p5-Email-Simple>=2.212:mail/p5-Email-Simple \
diff --git a/mail/p5-Email-MIME/distinfo b/mail/p5-Email-MIME/distinfo
index 82d5ea605e92..ca8c5356183a 100644
--- a/mail/p5-Email-MIME/distinfo
+++ b/mail/p5-Email-MIME/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501085754
-SHA256 (Email-MIME-1.945.tar.gz) = 64401b9b2cb5e1f769158ba6223ad3d4e5c5c17573d79e1c9410aaa907fc05ff
-SIZE (Email-MIME-1.945.tar.gz) = 125115
+TIMESTAMP = 1504189395
+SHA256 (Email-MIME-1.946.tar.gz) = 68ee79023165d77bec99a2e12ef89ad4e12501e6c321f6822053dc4f411c337c
+SIZE (Email-MIME-1.946.tar.gz) = 125304
diff --git a/mail/py-aiosmtpd/Makefile b/mail/py-aiosmtpd/Makefile
new file mode 100644
index 000000000000..fa8a73678cc1
--- /dev/null
+++ b/mail/py-aiosmtpd/Makefile
@@ -0,0 +1,18 @@
+# $FreeBSD$
+
+PORTNAME= aiosmtpd
+PORTVERSION= 1.1
+PORTREVISION= 1
+CATEGORIES= mail python
+MASTER_SITES= CHEESESHOP
+PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER= acm@FreeBSD.org
+COMMENT= Asyncio based SMTP server
+
+LICENSE= APACHE20
+
+USES= python:3.5+
+USE_PYTHON= autoplist distutils
+
+.include <bsd.port.mk>
diff --git a/mail/py-aiosmtpd/distinfo b/mail/py-aiosmtpd/distinfo
new file mode 100644
index 000000000000..7a81e7a3203c
--- /dev/null
+++ b/mail/py-aiosmtpd/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1503269175
+SHA256 (aiosmtpd-1.1.tar.gz) = 8ab8cd2bb2459f8eb04b835bf1f0dbb8fe590140080b2b3b7793a0992270a557
+SIZE (aiosmtpd-1.1.tar.gz) = 50722
diff --git a/mail/py-aiosmtpd/pkg-descr b/mail/py-aiosmtpd/pkg-descr
new file mode 100644
index 000000000000..faf36308c034
--- /dev/null
+++ b/mail/py-aiosmtpd/pkg-descr
@@ -0,0 +1,5 @@
+This is a server for SMTP and related protocols, similar in utility to the
+standard library's smtpd.py module, but rewritten to be based on asyncio for
+Python 3.
+
+WWW: http://aiosmtpd.readthedocs.io
diff --git a/mail/py-flufl.bounce/Makefile b/mail/py-flufl.bounce/Makefile
new file mode 100644
index 000000000000..0b27837693f6
--- /dev/null
+++ b/mail/py-flufl.bounce/Makefile
@@ -0,0 +1,20 @@
+# $FreeBSD$
+
+PORTNAME= flufl.bounce
+PORTVERSION= 3.0
+CATEGORIES= mail python
+MASTER_SITES= CHEESESHOP
+PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER= acm@FreeBSD.org
+COMMENT= API for detecting the original bouncing email addresses from a bounce message
+
+LICENSE= APACHE20
+
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}atpublic>=0:devel/py-atpublic \
+ ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface
+
+USES= python:3
+USE_PYTHON= autoplist distutils
+
+.include <bsd.port.mk>
diff --git a/mail/py-flufl.bounce/distinfo b/mail/py-flufl.bounce/distinfo
new file mode 100644
index 000000000000..9352825c1369
--- /dev/null
+++ b/mail/py-flufl.bounce/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1503367637
+SHA256 (flufl.bounce-3.0.tar.gz) = a2c549fc40a58ddfa9dfd115fe43d5cac4f042e45bacef3be7fb993e1496b34c
+SIZE (flufl.bounce-3.0.tar.gz) = 89156
diff --git a/mail/py-flufl.bounce/pkg-descr b/mail/py-flufl.bounce/pkg-descr
new file mode 100644
index 000000000000..0b1f2cb76b0f
--- /dev/null
+++ b/mail/py-flufl.bounce/pkg-descr
@@ -0,0 +1,5 @@
+The flufl.bounce library provides a set of heuristics and an API for detecting
+the original bouncing email addresses from a bounce message. Many formats
+found in the wild are supported, as are VERP and RFC 3464 (DSN).
+
+WWW: https://fluflbounce.readthedocs.io
diff --git a/math/R-cran-memisc/Makefile b/math/R-cran-memisc/Makefile
index e6edf210d711..4f0c66dc2193 100644
--- a/math/R-cran-memisc/Makefile
+++ b/math/R-cran-memisc/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= memisc
-DISTVERSION= 0.99.8
+DISTVERSION= 0.99.13.2
CATEGORIES= math
DISTNAME= ${PORTNAME}_${DISTVERSION}
@@ -11,6 +11,10 @@ COMMENT= Provides an infrastructure for the management of survey data
LICENSE= GPLv2
+CRAN_DEPENDS= R-cran-repr>0:devel/R-cran-repr
+BUILD_DEPENDS= ${CRAN_DEPENDS}
+RUN_DEPENDS= ${CRAN_DEPENDS}
+
USES= cran:auto-plist,compiles
.include <bsd.port.mk>
diff --git a/math/R-cran-memisc/distinfo b/math/R-cran-memisc/distinfo
index 3aa3681ee8f5..ea2ed6ecd1ec 100644
--- a/math/R-cran-memisc/distinfo
+++ b/math/R-cran-memisc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1482506057
-SHA256 (memisc_0.99.8.tar.gz) = f31eb8ab1c3bba9946659ae51b069e202eb596b2cfca3761797f58e33446b0f1
-SIZE (memisc_0.99.8.tar.gz) = 1197310
+TIMESTAMP = 1503901710
+SHA256 (memisc_0.99.13.2.tar.gz) = 5791e7b0ffd2ae99e76d697e323427886080bd8b30433f5566dce1a2862c054b
+SIZE (memisc_0.99.13.2.tar.gz) = 1312604
diff --git a/math/glgraph/pkg-descr b/math/glgraph/pkg-descr
index 7e07bda40305..7114444cd2a0 100644
--- a/math/glgraph/pkg-descr
+++ b/math/glgraph/pkg-descr
@@ -1,4 +1,4 @@
GLgraph visualize mathematical functions. It can handle 3 unknowns (x,z,t) and
can produce a 4D function with 3 space and 1 time dimension.
-WWW: http://glgraph.kaosu.ch/
+WWW: https://glgraph.kaosu.ch/
diff --git a/math/ndiff/Makefile b/math/ndiff/Makefile
index 88a14700c20f..e4f4953585d8 100644
--- a/math/ndiff/Makefile
+++ b/math/ndiff/Makefile
@@ -7,7 +7,7 @@ PORTREVISION= 4
CATEGORIES= math
MASTER_SITES= ftp://ftp.math.utah.edu/pub/misc/
-MAINTAINER= luca.pizzamiglio@gmail.com
+MAINTAINER= pizzamig@FreeBSD.org
COMMENT= Compare files, ignoring numeric differences
LICENSE= GPLv2
diff --git a/math/pspp/Makefile b/math/pspp/Makefile
index 17cdc696e44c..5326c12a4840 100644
--- a/math/pspp/Makefile
+++ b/math/pspp/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= pspp
-PORTVERSION= 1.0.0
+PORTVERSION= 1.0.1
CATEGORIES= math
MASTER_SITES= GNU
diff --git a/math/pspp/distinfo b/math/pspp/distinfo
index 63f0320ec6ab..2b1878eb0675 100644
--- a/math/pspp/distinfo
+++ b/math/pspp/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1503307920
-SHA256 (pspp-1.0.0.tar.gz) = 1b991ad4f5b2adc8c972de48fdb01d3675cb5ae1fc8d28850f6c0c68a745cb83
-SIZE (pspp-1.0.0.tar.gz) = 7553661
+TIMESTAMP = 1504000065
+SHA256 (pspp-1.0.1.tar.gz) = ba281a2e5d7d40e22f36f07f434a4fbc5be49c6d15740b121c299d024aae1ae5
+SIZE (pspp-1.0.1.tar.gz) = 7556520
diff --git a/math/py-keras/Makefile b/math/py-keras/Makefile
index cc9572621e93..5b366656e23a 100644
--- a/math/py-keras/Makefile
+++ b/math/py-keras/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= keras
-PORTVERSION= 2.0.5
+PORTVERSION= 2.0.8
CATEGORIES= math
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -15,11 +15,11 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}theano>=0.8.0:math/py-theano \
${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml \
${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six
-USE_GITHUB= yes
-GH_ACCOUNT= fchollet
-
USES= python:-3.5
USE_PYTHON= autoplist distutils
NO_ARCH= yes
+USE_GITHUB= yes
+GH_ACCOUNT= fchollet
+
.include <bsd.port.mk>
diff --git a/math/py-keras/distinfo b/math/py-keras/distinfo
index 9ab4dae67a79..770ae988426e 100644
--- a/math/py-keras/distinfo
+++ b/math/py-keras/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1497827798
-SHA256 (fchollet-keras-2.0.5_GH0.tar.gz) = cc32f91e6d1f549f72abe5cc23ac1309cb364777027d1b5faa02af1e02efe163
-SIZE (fchollet-keras-2.0.5_GH0.tar.gz) = 369712
+TIMESTAMP = 1503881586
+SHA256 (fchollet-keras-2.0.8_GH0.tar.gz) = ba73d1a041d06c6909db8782933b9420a38192ace05497b5b1d2b0f89b688025
+SIZE (fchollet-keras-2.0.8_GH0.tar.gz) = 409208
diff --git a/math/py-sympy/Makefile b/math/py-sympy/Makefile
index 68e7b8f27226..057e860579cb 100644
--- a/math/py-sympy/Makefile
+++ b/math/py-sympy/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= sympy
-PORTVERSION= 1.1
+PORTVERSION= 1.1.1
CATEGORIES= math python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/math/py-sympy/distinfo b/math/py-sympy/distinfo
index 019e19c4eca0..56c19a7091a8 100644
--- a/math/py-sympy/distinfo
+++ b/math/py-sympy/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499763485
-SHA256 (sympy-1.1.tar.gz) = e42d7b8cc719bb0427b503d49f8489ec6292c74957c3bd04216a8392bee37782
-SIZE (sympy-1.1.tar.gz) = 4579454
+TIMESTAMP = 1503930683
+SHA256 (sympy-1.1.1.tar.gz) = ac5b57691bc43919dcc21167660a57cc51797c28a4301a6144eff07b751216a4
+SIZE (sympy-1.1.1.tar.gz) = 4580952
diff --git a/misc/py-tqdm/Makefile b/misc/py-tqdm/Makefile
index 73848df40bff..0b7c8c667f6c 100644
--- a/misc/py-tqdm/Makefile
+++ b/misc/py-tqdm/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= tqdm
-PORTVERSION= 4.13.0
+PORTVERSION= 4.15.0
DISTVERSIONPREFIX= v
CATEGORIES= misc
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -12,10 +12,10 @@ COMMENT= Fast, extensible progress bar for Python
LICENSE= MIT MPL20
LICENSE_COMB= multi
-USE_GITHUB= yes
-
USES?= python
USE_PYTHON= autoplist distutils
NO_ARCH= yes
+USE_GITHUB= yes
+
.include <bsd.port.mk>
diff --git a/misc/py-tqdm/distinfo b/misc/py-tqdm/distinfo
index 78573326e93f..1baae4d3f9db 100644
--- a/misc/py-tqdm/distinfo
+++ b/misc/py-tqdm/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1496457226
-SHA256 (tqdm-tqdm-v4.13.0_GH0.tar.gz) = 871efbf69e5647ea1767338dd9c4c45bd6d672bc046404dd02e214103959b1e0
-SIZE (tqdm-tqdm-v4.13.0_GH0.tar.gz) = 800614
+TIMESTAMP = 1503881021
+SHA256 (tqdm-tqdm-v4.15.0_GH0.tar.gz) = 9127219c66bf338809647a6be563a875dfc0d0bfa1570bd5f25eb88bbea0d2e8
+SIZE (tqdm-tqdm-v4.15.0_GH0.tar.gz) = 801310
diff --git a/multimedia/kf5-kmediaplayer/distinfo b/multimedia/kf5-kmediaplayer/distinfo
index b42d2d516ef4..e1f11cdbe6b0 100644
--- a/multimedia/kf5-kmediaplayer/distinfo
+++ b/multimedia/kf5-kmediaplayer/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499098902
-SHA256 (KDE/frameworks/5.36.0/kmediaplayer-5.36.0.tar.xz) = 755aee90e0a02739e35ee89f93a9873c0c927ece95871c60d7c36aa599470fdf
-SIZE (KDE/frameworks/5.36.0/kmediaplayer-5.36.0.tar.xz) = 9568
+TIMESTAMP = 1502086071
+SHA256 (KDE/frameworks/5.37.0/kmediaplayer-5.37.0.tar.xz) = 5712f0c69f77a2bdbb698c9187b54cd7591d693201a7aef40fe17dced9cc1d3b
+SIZE (KDE/frameworks/5.37.0/kmediaplayer-5.37.0.tar.xz) = 9568
diff --git a/multimedia/plexmediaserver-plexpass/Makefile b/multimedia/plexmediaserver-plexpass/Makefile
index fe621a904087..858de8ad87e2 100644
--- a/multimedia/plexmediaserver-plexpass/Makefile
+++ b/multimedia/plexmediaserver-plexpass/Makefile
@@ -1,13 +1,13 @@
# Created by: KalleDK <plexmaintainer@k-moeller.dk>
# $FreeBSD$
-PORTVERSION= 1.8.1.4139
+PORTVERSION= 1.8.2.4209
PORTREVISION= 0
PKGNAMESUFFIX= -plexpass
MAINTAINER= feld@FreeBSD.org
-PLEX_BUILD= c789b3fbb
+PLEX_BUILD= b1d4aa012
USE_RC_SUBR= ${PORTNAME}_plexpass
diff --git a/multimedia/plexmediaserver-plexpass/distinfo b/multimedia/plexmediaserver-plexpass/distinfo
index b0de07a9929f..5832252ce20a 100644
--- a/multimedia/plexmediaserver-plexpass/distinfo
+++ b/multimedia/plexmediaserver-plexpass/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1502800365
-SHA256 (PlexMediaServer-1.8.1.4139-c789b3fbb-freebsd-amd64.tar.bz2) = 72642f38ded1a1c83e0a83ff86a8feef96f5c39e534a36812a7bf9512fbd2abb
-SIZE (PlexMediaServer-1.8.1.4139-c789b3fbb-freebsd-amd64.tar.bz2) = 85463265
+TIMESTAMP = 1504202346
+SHA256 (PlexMediaServer-1.8.2.4209-b1d4aa012-freebsd-amd64.tar.bz2) = 07e84f273c5bc8ca7c17c9a858a1682cdf081fafc295c0ba02aa8aad3315793f
+SIZE (PlexMediaServer-1.8.2.4209-b1d4aa012-freebsd-amd64.tar.bz2) = 85604812
diff --git a/net-mgmt/Makefile b/net-mgmt/Makefile
index f6fe49e58db8..5f3f7cec8097 100644
--- a/net-mgmt/Makefile
+++ b/net-mgmt/Makefile
@@ -131,6 +131,7 @@
SUBDIR += nagios-certexp-plugin
SUBDIR += nagios-check_bacula
SUBDIR += nagios-check_bacula5
+ SUBDIR += nagios-check_bacula9
SUBDIR += nagios-check_clamav
SUBDIR += nagios-check_cpu_usage
SUBDIR += nagios-check_dhcp.pl
diff --git a/net-mgmt/cacti/Makefile b/net-mgmt/cacti/Makefile
index 8496edc0b21f..37cd9486e9ee 100644
--- a/net-mgmt/cacti/Makefile
+++ b/net-mgmt/cacti/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= cacti
-PORTVERSION= 1.1.19
+PORTVERSION= 1.1.20
CATEGORIES= net-mgmt www
MASTER_SITES= http://www.cacti.net/downloads/ \
ftp://ftpmirror.uk/freebsd-ports/cacti/
diff --git a/net-mgmt/cacti/distinfo b/net-mgmt/cacti/distinfo
index 3b21996fb3e9..2b957f51aac6 100644
--- a/net-mgmt/cacti/distinfo
+++ b/net-mgmt/cacti/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1503450536
-SHA256 (cacti-1.1.19.tar.gz) = 525c7d797df1361d921c99ab92b53725b9a40b8f2fb557f95958f0744acd5daf
-SIZE (cacti-1.1.19.tar.gz) = 8906595
+TIMESTAMP = 1504094201
+SHA256 (cacti-1.1.20.tar.gz) = cbad90ef98d656bb10814e1444722dc00ff0c3a922b4591775984e890a81c942
+SIZE (cacti-1.1.20.tar.gz) = 8903728
diff --git a/net-mgmt/cacti/pkg-plist b/net-mgmt/cacti/pkg-plist
index 6405a0f66821..8a7d88dcee0d 100644
--- a/net-mgmt/cacti/pkg-plist
+++ b/net-mgmt/cacti/pkg-plist
@@ -153,7 +153,6 @@
%%CACTIDIR%%/docs/html/template-import.html
%%CACTIDIR%%/docs/html/templates.html
%%CACTIDIR%%/docs/html/testing-script-in-script-server.html
-%%CACTIDIR%%/docs/html/unix-apply-patches.html
%%CACTIDIR%%/docs/html/unix-configure-%%CACTIUSER%%.html
%%CACTIDIR%%/docs/html/unix-configure-httpd.html
%%CACTIDIR%%/docs/html/unix-configure-mysql.html
@@ -1095,6 +1094,7 @@
%%CACTIDIR%%/install/upgrades/1_1_11.php
%%CACTIDIR%%/install/upgrades/1_1_14.php
%%CACTIDIR%%/install/upgrades/1_1_17.php
+%%CACTIDIR%%/install/upgrades/1_1_20.php
%%CACTIDIR%%/install/upgrades/index.php
%%CACTIDIR%%/lib/aggregate.php
%%CACTIDIR%%/lib/api_aggregate.php
diff --git a/net-mgmt/monitoring-plugins/Makefile b/net-mgmt/monitoring-plugins/Makefile
index 801b113207ba..0cbec71f0457 100644
--- a/net-mgmt/monitoring-plugins/Makefile
+++ b/net-mgmt/monitoring-plugins/Makefile
@@ -3,7 +3,7 @@
PORTNAME= monitoring-plugins
PORTVERSION= 2.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net-mgmt
MASTER_SITES= https://www.monitoring-plugins.org/download/ LOCAL/mat/${PORTNAME}
diff --git a/net-mgmt/monitoring-plugins/files/patch-configure b/net-mgmt/monitoring-plugins/files/patch-configure
index 306b52efc7b9..d9ef14e7f6d9 100644
--- a/net-mgmt/monitoring-plugins/files/patch-configure
+++ b/net-mgmt/monitoring-plugins/files/patch-configure
@@ -1,11 +1,19 @@
--- configure.orig 2016-11-29 08:48:11 UTC
+++ configure
-@@ -16748,7 +16748,7 @@ then
+@@ -16747,6 +16747,16 @@ then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ps_command" >&5
$as_echo "$ac_cv_ps_command" >&6; }
++elif ps -axwo 'stat comm vsz rss user uid pid ppid args jid' 2>/dev/null | \
++ egrep -i "^ *STAT +COMMAND +VSZ +RSS +USER +UID +PID +PPID +COMMAND +JID" > /dev/null
++then
++ ac_cv_ps_varlist="procstat,&procuid,&procpid,&procppid,&procjid,&procvsz,&procrss,&procpcpu,procprog,&pos"
++ ac_cv_ps_command="$PATH_TO_PS -axwo 'stat uid pid ppid jid vsz rss pcpu comm args'"
++ ac_cv_ps_format="%s %d %d %d %d %d %d %f %s %n"
++ ac_cv_ps_cols=10
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ps_command" >&5
++$as_echo "$ac_cv_ps_command" >&6; }
++
elif ps -axwo 'stat comm vsz rss user uid pid ppid args' 2>/dev/null | \
-- egrep -i "^ *STAT +[UCOMAND]+ +VSZ +RSS +USER +UID +PID +PPID +COMMAND" > /dev/null
-+ egrep -i "^ *STAT +COMMAND +VSZ +RSS +USER +UID +PID +PPID +COMMAND" > /dev/null
+ egrep -i "^ *STAT +[UCOMAND]+ +VSZ +RSS +USER +UID +PID +PPID +COMMAND" > /dev/null
then
- ac_cv_ps_varlist="procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos"
- ac_cv_ps_command="$PATH_TO_PS -axwo 'stat uid pid ppid vsz rss pcpu comm args'"
diff --git a/net-mgmt/monitoring-plugins/files/patch-plugins_check__nagios.c b/net-mgmt/monitoring-plugins/files/patch-plugins_check__nagios.c
new file mode 100644
index 000000000000..376fe088e309
--- /dev/null
+++ b/net-mgmt/monitoring-plugins/files/patch-plugins_check__nagios.c
@@ -0,0 +1,10 @@
+--- plugins/check_nagios.c.orig 2016-11-29 08:45:08 UTC
++++ plugins/check_nagios.c
+@@ -64,6 +64,7 @@ main (int argc, char **argv)
+ int procuid = 0;
+ int procpid = 0;
+ int procppid = 0;
++ int procjid = 0;
+ int procvsz = 0;
+ int procrss = 0;
+ float procpcpu = 0;
diff --git a/net-mgmt/monitoring-plugins/files/patch-plugins_check__procs.c b/net-mgmt/monitoring-plugins/files/patch-plugins_check__procs.c
new file mode 100644
index 000000000000..5f71cf21e0cb
--- /dev/null
+++ b/net-mgmt/monitoring-plugins/files/patch-plugins_check__procs.c
@@ -0,0 +1,107 @@
+--- plugins/check_procs.c.orig 2016-11-29 08:45:08 UTC
++++ plugins/check_procs.c
+@@ -70,6 +70,7 @@ int options = 0; /* bitmask of filter cr
+ #define PCPU 256
+ #define ELAPSED 512
+ #define EREG_ARGS 1024
++#define JID 2048
+
+ #define KTHREAD_PARENT "kthreadd" /* the parent process of kernel threads:
+ ppid of procs are compared to pid of this proc*/
+@@ -101,6 +102,7 @@ char *fails;
+ char tmp[MAX_INPUT_BUFFER];
+ int kthread_filter = 0;
+ int usepid = 0; /* whether to test for pid or /proc/pid/exe */
++int jid;
+
+ FILE *ps_input = NULL;
+
+@@ -130,6 +132,7 @@ main (int argc, char **argv)
+ int procuid = 0;
+ pid_t procpid = 0;
+ pid_t procppid = 0;
++ int procjid = 0;
+ pid_t kthread_ppid = 0;
+ int procvsz = 0;
+ int procrss = 0;
+@@ -230,9 +233,9 @@ main (int argc, char **argv)
+ procseconds = convert_to_seconds(procetime);
+
+ if (verbose >= 3)
+- printf ("proc#=%d uid=%d vsz=%d rss=%d pid=%d ppid=%d pcpu=%.2f stat=%s etime=%s prog=%s args=%s\n",
++ printf ("proc#=%d uid=%d vsz=%d rss=%d pid=%d ppid=%d jid=%d pcpu=%.2f stat=%s etime=%s prog=%s args=%s\n",
+ procs, procuid, procvsz, procrss,
+- procpid, procppid, procpcpu, procstat,
++ procpid, procppid, procjid, procpcpu, procstat,
+ procetime, procprog, procargs);
+
+ /* Ignore self */
+@@ -275,6 +278,8 @@ main (int argc, char **argv)
+ resultsum |= PROG;
+ if ((options & PPID) && (procppid == ppid))
+ resultsum |= PPID;
++ if ((options & JID) && (procjid == jid))
++ resultsum |= JID;
+ if ((options & USER) && (procuid == uid))
+ resultsum |= USER;
+ if ((options & VSZ) && (procvsz >= vsz))
+@@ -292,9 +297,9 @@ main (int argc, char **argv)
+
+ procs++;
+ if (verbose >= 2) {
+- printf ("Matched: uid=%d vsz=%d rss=%d pid=%d ppid=%d pcpu=%.2f stat=%s etime=%s prog=%s args=%s\n",
++ printf ("Matched: uid=%d vsz=%d rss=%d pid=%d ppid=%d jid=%d pcpu=%.2f stat=%s etime=%s prog=%s args=%s\n",
+ procuid, procvsz, procrss,
+- procpid, procppid, procpcpu, procstat,
++ procpid, procppid, procjid, procpcpu, procstat,
+ procetime, procprog, procargs);
+ }
+
+@@ -409,6 +414,7 @@ process_arguments (int argc, char **argv
+ {"input-file", required_argument, 0, CHAR_MAX+2},
+ {"no-kthreads", required_argument, 0, 'k'},
+ {"traditional-filter", no_argument, 0, 'T'},
++ {"jid", required_argument, 0, 'j'},
+ {0, 0, 0, 0}
+ };
+
+@@ -417,7 +423,7 @@ process_arguments (int argc, char **argv
+ strcpy (argv[c], "-t");
+
+ while (1) {
+- c = getopt_long (argc, argv, "Vvhkt:c:w:p:s:u:C:a:z:r:m:P:T",
++ c = getopt_long (argc, argv, "Vvhkt:c:w:p:s:u:C:a:z:r:m:P:Tj:",
+ longopts, &option);
+
+ if (c == -1 || c == EOF)
+@@ -451,6 +457,12 @@ process_arguments (int argc, char **argv
+ break;
+ }
+ usage4 (_("Parent Process ID must be an integer!"));
++ case 'j': /* jail id */
++ if (sscanf (optarg, "%d%[^0-9]", &jid, tmp) == 1) {
++ asprintf (&fmt, "%s%sJID = %d", (fmt ? fmt : "") , (options ? ", " : ""), jid);
++ options |= JID;
++ break;
++ }
+ case 's': /* status */
+ if (statopts)
+ break;
+@@ -731,6 +743,8 @@ print_help (void)
+ printf (" %s\n", _("RSZDT, plus others based on the output of your 'ps' command)."));
+ printf (" %s\n", "-p, --ppid=PPID");
+ printf (" %s\n", _("Only scan for children of the parent process ID indicated."));
++ printf (" %s\n", "-j, --jid=JID");
++ printf (" %s\n", _("Only scan for process running in jail which ID is JID."));
+ printf (" %s\n", "-z, --vsz=VSZ");
+ printf (" %s\n", _("Only scan for processes with VSZ higher than indicated."));
+ printf (" %s\n", "-r, --rss=RSS");
+@@ -779,7 +793,7 @@ void
+ print_usage (void)
+ {
+ printf ("%s\n", _("Usage:"));
+- printf ("%s -w <range> -c <range> [-m metric] [-s state] [-p ppid]\n", progname);
++ printf ("%s -w <range> -c <range> [-m metric] [-s state] [-p ppid] [-j jid]\n", progname);
+ printf (" [-u user] [-r rss] [-z vsz] [-P %%cpu] [-a argument-array]\n");
+ printf (" [-C command] [-k] [-t timeout] [-v]\n");
+ }
diff --git a/net-mgmt/nagios-check_bacula9/Makefile b/net-mgmt/nagios-check_bacula9/Makefile
new file mode 100644
index 000000000000..4ec5928a4478
--- /dev/null
+++ b/net-mgmt/nagios-check_bacula9/Makefile
@@ -0,0 +1,30 @@
+# Created by: Anders Troback
+# $FreeBSD$
+
+PORTNAME= bacula
+CATEGORIES= net-mgmt
+PKGNAMEPREFIX= nagios-check_
+PKGNAMESUFFIX= 9
+
+MAINTAINER= dvl@FreeBSD.org
+COMMENT= Nagios plugin for Bacula
+
+LIB_DEPENDS+= libbac.so:sysutils/bacula9-client
+
+PLIST= ${.CURDIR}/pkg-plist
+PLIST_FILES= libexec/nagios/check_bacula
+WITH_NAGIOS_CHECK_ONLY= yes
+MASTERDIR= ${.CURDIR}/../../sysutils/bacula9-server
+
+CONFIGURE_ARGS= --enable-client-only \
+ --disable-build-dird \
+ --disable-build-stored \
+ --disable-nls \
+ --disable-xatt
+
+OPTIONS_DEFINE= #
+OPTIONS_DEFAULT=#
+
+NO_CCACHE= yes
+
+.include "${MASTERDIR}/Makefile"
diff --git a/net-mgmt/nagios-check_bacula9/distinfo b/net-mgmt/nagios-check_bacula9/distinfo
new file mode 100644
index 000000000000..39c7ff7a7e8f
--- /dev/null
+++ b/net-mgmt/nagios-check_bacula9/distinfo
@@ -0,0 +1,2 @@
+SHA256 (bacula-5.0.0.tar.gz) = 4c6344807769d1b6b61f9cbddc0a5dc1160c3eb51744b23c790fcb57947ac294
+SIZE (bacula-5.0.0.tar.gz) = 4075825
diff --git a/net-mgmt/nagios-check_bacula9/pkg-descr b/net-mgmt/nagios-check_bacula9/pkg-descr
new file mode 100644
index 000000000000..4b25ba83385c
--- /dev/null
+++ b/net-mgmt/nagios-check_bacula9/pkg-descr
@@ -0,0 +1,2 @@
+check_bacula is a plugin intended for use with the
+Nagios network monitoring system to monitor Bacula.
diff --git a/net-mgmt/nagios-plugins/Makefile b/net-mgmt/nagios-plugins/Makefile
index 15305eff4b93..e415a99e76e6 100644
--- a/net-mgmt/nagios-plugins/Makefile
+++ b/net-mgmt/nagios-plugins/Makefile
@@ -3,7 +3,7 @@
PORTNAME= nagios-plugins
PORTVERSION= 2.2.1
-PORTREVISION= 1
+PORTREVISION= 4
PORTEPOCH= 1
CATEGORIES= net-mgmt
MASTER_SITES= https://www.nagios-plugins.org/download/ \
diff --git a/net-mgmt/nagios-plugins/files/patch-configure b/net-mgmt/nagios-plugins/files/patch-configure
index 683ce1be1e89..602247d66039 100644
--- a/net-mgmt/nagios-plugins/files/patch-configure
+++ b/net-mgmt/nagios-plugins/files/patch-configure
@@ -1,15 +1,22 @@
---- configure.orig 2017-04-19 18:03:27.000000000 +0200
-+++ configure
-@@ -22004,7 +22004,7 @@
- $as_echo "$ac_cv_ps_command" >&6; }
+--- configure.orig 2017-04-19 16:03:27 UTC
++++ configure
+@@ -21973,6 +21973,15 @@ $as_echo "$as_me: error: I don't know ho
+ fi
- elif ps -axwwo 'stat comm vsz rss user uid pid ppid args' 2>/dev/null | \
-- egrep -i "^ *STAT +[UCOMAND]+ +VSZ +RSS +USER +UID +PID +PPID +COMMAND" > /dev/null
-+ egrep -i "^ *STAT +COMMAND +VSZ +RSS +USER +UID +PID +PPID +COMMAND" > /dev/null
+
++elif ps -axwo 'stat comm vsz rss user uid pid ppid jid args' 2>/dev/null | \
++ egrep -i "^ *STAT +COMMAND +VSZ +RSS +USER +UID +PID +PPID +JID +COMMAND" > /dev/null
++then
++ ac_cv_ps_varlist="procstat,&procuid,&procpid,&procppid,&procjid,&procvsz,&procrss,&procpcpu,procprog,&pos"
++ ac_cv_ps_command="$PATH_TO_PS -axwo 'stat uid pid ppid jid vsz rss pcpu comm args'"
++ ac_cv_ps_format="%s %d %d %d %d %d %d %f %s %n"
++ ac_cv_ps_cols=10
++ { $as_echo "$as_me:$LINENO: result: $ac_cv_ps_command" >&5
++ $as_echo "$ac_cv_ps_command" >&6; }
+ elif ps axwwo 'stat comm vsz rss user uid pid ppid args cgroup:256' 2>/dev/null | \
+ egrep -i "^ *STAT +[UCOMAND]+ +VSZ +RSS +USER +UID +PID +PPID +COMMAND +CGROUP" > /dev/null
then
- ac_cv_ps_varlist="procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos"
- ac_cv_ps_command="$PATH_TO_PS -axwwo 'stat uid pid ppid vsz rss pcpu comm args'"
-@@ -23798,7 +23798,7 @@
+@@ -23798,7 +23807,7 @@ then
if $PATH_TO_SWAPINFO -k 2>/dev/null | egrep -i "^Device +1K-blocks +Used +Avail" >/dev/null
then
diff --git a/net-mgmt/nagios-plugins/files/patch-plugins_check__http.c b/net-mgmt/nagios-plugins/files/patch-plugins_check__http.c
new file mode 100644
index 000000000000..cff5d3ee45ee
--- /dev/null
+++ b/net-mgmt/nagios-plugins/files/patch-plugins_check__http.c
@@ -0,0 +1,17 @@
+--- plugins/check_http.c.orig 2017-04-19 16:03:12 UTC
++++ plugins/check_http.c
+@@ -1026,11 +1026,9 @@ check_http (void)
+ elapsed_time_ssl = (double)microsec_ssl / 1.0e6;
+ if (check_cert == TRUE) {
+ result = np_net_ssl_check_cert(days_till_exp_warn, days_till_exp_crit);
+- if (result != STATE_OK) {
+- np_net_ssl_cleanup();
+- if (sd) close(sd);
+- return result;
+- }
++ np_net_ssl_cleanup();
++ if (sd) close(sd);
++ return result;
+ }
+ }
+ #endif /* HAVE_SSL */
diff --git a/net-mgmt/nagios-plugins/files/patch-plugins_check__nagios.c b/net-mgmt/nagios-plugins/files/patch-plugins_check__nagios.c
new file mode 100644
index 000000000000..d96c844083be
--- /dev/null
+++ b/net-mgmt/nagios-plugins/files/patch-plugins_check__nagios.c
@@ -0,0 +1,10 @@
+--- plugins/check_nagios.c.orig 2017-01-19 16:01:31 UTC
++++ plugins/check_nagios.c
+@@ -64,6 +64,7 @@ main (int argc, char **argv)
+ int procuid = 0;
+ int procpid = 0;
+ int procppid = 0;
++ int procjid = 0;
+ int procvsz = 0;
+ int procrss = 0;
+ char proc_cgroup_hierarchy[MAX_INPUT_BUFFER];
diff --git a/net-mgmt/nagios-plugins/files/patch-plugins_check__procs.c b/net-mgmt/nagios-plugins/files/patch-plugins_check__procs.c
new file mode 100644
index 000000000000..11ea7d2df207
--- /dev/null
+++ b/net-mgmt/nagios-plugins/files/patch-plugins_check__procs.c
@@ -0,0 +1,107 @@
+--- plugins/check_procs.c.orig 2017-01-16 17:24:03 UTC
++++ plugins/check_procs.c
+@@ -71,6 +71,7 @@ int options = 0; /* bitmask of filter cr
+ #define ELAPSED 512
+ #define EREG_ARGS 1024
+ #define CGROUP_HIERARCHY 2048
++#define JID 4096
+
+ #define KTHREAD_PARENT "kthreadd" /* the parent process of kernel threads:
+ ppid of procs are compared to pid of this proc*/
+@@ -103,6 +104,7 @@ char *fails;
+ char tmp[MAX_INPUT_BUFFER];
+ int kthread_filter = 0;
+ int usepid = 0; /* whether to test for pid or /proc/pid/exe */
++int jid;
+
+ FILE *ps_input = NULL;
+
+@@ -133,6 +135,7 @@ main (int argc, char **argv)
+ int procuid = 0;
+ pid_t procpid = 0;
+ pid_t procppid = 0;
++ int procjid = 0;
+ pid_t kthread_ppid = 0;
+ int procvsz = 0;
+ int procrss = 0;
+@@ -236,9 +239,9 @@ main (int argc, char **argv)
+ procseconds = convert_to_seconds(procetime);
+
+ if (verbose >= 3) {
+- printf ("proc#=%d uid=%d vsz=%d rss=%d pid=%d ppid=%d pcpu=%.2f stat=%s etime=%s prog=%s args=%s",
+++ printf ("proc#=%d uid=%d vsz=%d rss=%d pid=%d ppid=%d jid=%d pcpu=%.2f stat=%s etime=%s prog=%s args=%s\n",
+ procs, procuid, procvsz, procrss,
+- procpid, procppid, procpcpu, procstat,
++ procpid, procppid, procjid, procpcpu, procstat,
+ procetime, procprog, procargs);
+ if (strstr(PS_COMMAND, "cgroup") != NULL) {
+ printf(" proc_cgroup_hierarchy=%s\n", proc_cgroup_hierarchy);
+@@ -287,6 +290,8 @@ main (int argc, char **argv)
+ resultsum |= PROG;
+ if ((options & PPID) && (procppid == ppid))
+ resultsum |= PPID;
++ if ((options & JID) && (procjid == jid))
++ resultsum |= JID;
+ if ((options & USER) && (procuid == uid))
+ resultsum |= USER;
+ if ((options & VSZ) && (procvsz >= vsz))
+@@ -315,9 +320,9 @@ main (int argc, char **argv)
+
+ procs++;
+ if (verbose >= 2) {
+- printf ("Matched: uid=%d vsz=%d rss=%d pid=%d ppid=%d pcpu=%.2f stat=%s etime=%s prog=%s args=%s",
+++ printf ("Matched: uid=%d vsz=%d rss=%d pid=%d ppid=%d jid=%d pcpu=%.2f stat=%s etime=%s prog=%s args=%s\n",
+ procuid, procvsz, procrss,
+- procpid, procppid, procpcpu, procstat,
++ procpid, procppid, procjid, procpcpu, procstat,
+ procetime, procprog, procargs);
+ if (strstr(PS_COMMAND, "cgroup") != NULL) {
+ printf(" cgroup_hierarchy=%s\n", cgroup_hierarchy);
+@@ -438,6 +443,7 @@ process_arguments (int argc, char **argv
+ {"no-kthreads", required_argument, 0, 'k'},
+ {"traditional-filter", no_argument, 0, 'T'},
+ {"cgroup-hierarchy", required_argument, 0, 'g'},
++ {"jid", required_argument, 0, 'j'},
+ {0, 0, 0, 0}
+ };
+
+@@ -446,7 +452,7 @@ process_arguments (int argc, char **argv
+ strcpy (argv[c], "-t");
+
+ while (1) {
+- c = getopt_long (argc, argv, "Vvhkt:c:w:p:s:u:C:a:z:r:m:P:Tg:",
++ c = getopt_long (argc, argv, "Vvhkt:c:w:p:s:u:C:a:z:r:m:P:Tg:j:",
+ longopts, &option);
+
+ if (c == -1 || c == EOF)
+@@ -477,6 +483,12 @@ process_arguments (int argc, char **argv
+ break;
+ }
+ usage4 (_("Parent Process ID must be an integer!"));
++ case 'j': /* jail id */
++ if (sscanf (optarg, "%d%[^0-9]", &jid, tmp) == 1) {
++ asprintf (&fmt, "%s%sJID = %d", (fmt ? fmt : "") , (options ? ", " : ""), jid);
++ options |= JID;
++ break;
++ }
+ case 's': /* status */
+ if (statopts)
+ break;
+@@ -766,6 +778,8 @@ print_help (void)
+ printf (" %s\n", _("RSZDT, plus others based on the output of your 'ps' command)."));
+ printf (" %s\n", "-p, --ppid=PPID");
+ printf (" %s\n", _("Only scan for children of the parent process ID indicated."));
++ printf (" %s\n", "-j, --jid=JID");
++ printf (" %s\n", _("Only scan for process running in jail which ID is JID."));
+ printf (" %s\n", "-z, --vsz=VSZ");
+ printf (" %s\n", _("Only scan for processes with VSZ higher than indicated."));
+ printf (" %s\n", "-r, --rss=RSS");
+@@ -818,7 +832,7 @@ void
+ print_usage (void)
+ {
+ printf ("%s\n", _("Usage:"));
+- printf ("%s -w <range> -c <range> [-m metric] [-s state] [-p ppid]\n", progname);
++ printf ("%s -w <range> -c <range> [-m metric] [-s state] [-p ppid] [-j jid]\n", progname);
+ printf (" [-u user] [-r rss] [-z vsz] [-P %%cpu] [-a argument-array]\n");
+ printf (" [-C command] [-k] [-t timeout] [-v]\n");
+ }
diff --git a/net-mgmt/nagios-plugins/files/patch-plugins_sslutils.c b/net-mgmt/nagios-plugins/files/patch-plugins_sslutils.c
new file mode 100644
index 000000000000..57cbd74156e3
--- /dev/null
+++ b/net-mgmt/nagios-plugins/files/patch-plugins_sslutils.c
@@ -0,0 +1,21 @@
+--- plugins/sslutils.c.orig 2017-04-19 16:03:12 UTC
++++ plugins/sslutils.c
+@@ -211,9 +211,6 @@ int np_net_ssl_check_cert(int days_till_
+ int time_remaining;
+ time_t tm_t;
+
+- // Prefix whatever we're about to print with SSL
+- printf("SSL ");
+-
+ certificate=SSL_get_peer_certificate(s);
+ if (!certificate) {
+ printf("%s\n",_("CRITICAL - Cannot retrieve server certificate."));
+@@ -304,7 +301,7 @@ int np_net_ssl_check_cert(int days_till_
+ else
+ status = STATE_CRITICAL;
+ } else {
+- printf(_("OK - Certificate '%s' will expire on %s. "), cn, timestamp);
++ printf(_("OK - Certificate '%s' will expire on %s.\n"), cn, timestamp);
+ status = STATE_OK;
+ }
+ X509_free(certificate);
diff --git a/net-mgmt/nagios4/Makefile b/net-mgmt/nagios4/Makefile
index 039ea6b495a0..b8e91d1b5c0b 100644
--- a/net-mgmt/nagios4/Makefile
+++ b/net-mgmt/nagios4/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= nagios
-PORTVERSION= 4.3.2
+PORTVERSION= 4.3.3
PORTEPOCH= 1
CATEGORIES= net-mgmt
MASTER_SITES= https://assets.nagios.com/downloads/nagioscore/releases/ \
@@ -90,8 +90,6 @@ OPTIONS_SUB=
NANOSLEEP_CONFIGURE_ENABLE= nanosleep
-.if !defined(MAKING_PATCHES)
-# make clean patch makepatch MAKING_PATCHES=
post-patch:
${REINPLACE_CMD} -e 's/\<77\([0-7]\)\>/75\1/g; s/\<66\([0-7]\)\>/64\1/; /chmod/d; \
/\.cfg$$/s/$$/-sample/' \
@@ -100,7 +98,6 @@ post-patch:
post-patch-UNHANDLED_HACK-on:
${REINPLACE_CMD} -e 's#;serviceprops=42\&#;serviceprops=10\&#g' -e \
's#;hostprops=42\"#;hostprops=10\"#g' ${WRKSRC}/html/side.php
-.endif
post-install:
@${RMDIR} ${STAGEDIR}${PREFIX}/libexec/nagios
diff --git a/net-mgmt/nagios4/distinfo b/net-mgmt/nagios4/distinfo
index f8682621eed6..51df37335fb8 100644
--- a/net-mgmt/nagios4/distinfo
+++ b/net-mgmt/nagios4/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1497348686
-SHA256 (nagios-4.3.2.tar.gz) = 687814b40b03b40361377aeace057dddb23459ffb8c00434bc1a95b21ccdf796
-SIZE (nagios-4.3.2.tar.gz) = 11096863
+TIMESTAMP = 1504003722
+SHA256 (nagios-4.3.3.tar.gz) = 1fc4c72f76c720884dd3b538dc423b44f3bdde24e014f4212e58046a1fc114b6
+SIZE (nagios-4.3.3.tar.gz) = 11101531
diff --git a/net-mgmt/nagios4/files/patch-html_main.php b/net-mgmt/nagios4/files/patch-html_main.php
index cb9d4021d2c1..a3425cb99018 100644
--- a/net-mgmt/nagios4/files/patch-html_main.php
+++ b/net-mgmt/nagios4/files/patch-html_main.php
@@ -1,9 +1,9 @@
---- html/main.php.orig 2017-05-09 17:03:31 UTC
+--- html/main.php.orig 2017-08-12 20:22:49 UTC
+++ html/main.php
@@ -141,31 +141,6 @@ $this_year = '2017';
<div class="product">Nagios<sup><span style="font-size: small;">&reg;</span></sup> Core<sup><span style="font-size: small;">&trade;</span></sup></div>
<div class="version">Version <?php echo $this_version; ?></div>
- <div class="releasedate">May 09, 2017</div>
+ <div class="releasedate">August 12, 2017</div>
- <div class="checkforupdates"><a href="https://www.nagios.org/checkforupdates/?version=<?php echo $this_version; ?>&amp;product=nagioscore" target="_blank">Check for updates</a></div>
-</div>
-
diff --git a/net-mgmt/pftabled/Makefile b/net-mgmt/pftabled/Makefile
index 840e8dbe82dd..31c162269ae4 100644
--- a/net-mgmt/pftabled/Makefile
+++ b/net-mgmt/pftabled/Makefile
@@ -3,42 +3,39 @@
PORTNAME= pftabled
PORTVERSION= 1.09
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net-mgmt
MASTER_SITES= http://www.wolfermann.org/
MAINTAINER= ports@FreeBSD.org
-COMMENT= The pftabled is a tool to manage your pf tables remotely
+COMMENT= Tool to manage pf tables remotely
-USE_RC_SUBR= pftabled
-
-PLIST_FILES= bin/pftabled-client man/man1/pftabled.1.gz sbin/pftabled
+LICENSE= BSD2CLAUSE
-GNU_CONFIGURE= yes
USES= gmake shebangfix
-SHEBANG_FILES= pftabled-client.pl
+SHEBANG_FILES= pftabled-client.pl \
+ pftabled-client.py
+GNU_CONFIGURE= yes
-OPTIONS_DEFINE= PERLC PYTHONC
-OPTIONS_DEFAULT= PERLC PYTHONC
-PERLC_DESC= A Sample Perl Client
-PYTHONC_DESC= A Sample Python Client
+USE_RC_SUBR= pftabled
-.include <bsd.port.pre.mk>
+PLIST_FILES= bin/pftabled-client man/man1/pftabled.1.gz sbin/pftabled
-.if ${PORT_OPTIONS:MPERLC}
-PLIST_FILES+= bin/pftabled-client.pl
-.endif
+OPTIONS_DEFINE= PERLC PYTHONC
+OPTIONS_DEFAULT=PERLC PYTHONC
-.if ${PORT_OPTIONS:MPYTHONC}
-PLIST_FILES+= bin/pftabled-client.py
-.endif
+PERLC_DESC= Install sample Perl client
+PERLC_PLIST_FILES= bin/pftabled-client.pl
+PERLC_USES= perl5
+PERLC_USE= PERL5=run
+PYTHONC_DESC= Install sample Python client
+PYTHONC_PLIST_FILES= bin/pftabled-client.py
+PYTHONC_USES= python:run
-post-install:
-.if ${PORT_OPTIONS:MPERLC}
+post-install-PERLC-on:
${INSTALL_SCRIPT} ${WRKSRC}/pftabled-client.pl ${STAGEDIR}${PREFIX}/bin/
-.endif
-.if ${PORT_OPTIONS:MPYTHONC}
+
+post-install-PYTHONC-on:
${INSTALL_SCRIPT} ${WRKSRC}/pftabled-client.py ${STAGEDIR}${PREFIX}/bin/
-.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net-mgmt/riemann-c-client/Makefile b/net-mgmt/riemann-c-client/Makefile
index d8d32110c00c..d0cc38214fee 100644
--- a/net-mgmt/riemann-c-client/Makefile
+++ b/net-mgmt/riemann-c-client/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= riemann-c-client
-PORTVERSION= 1.9.1
+PORTVERSION= 1.10.1
DISTVERSIONPREFIX= ${PORTNAME}-
CATEGORIES= net-mgmt
@@ -10,15 +10,13 @@ MAINTAINER= dch@skunkwerks.at
COMMENT= C library and command-line tool for Riemann
LICENSE= LGPL3+
+LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= check>0:devel/check
LIB_DEPENDS= libprotobuf-c.so:devel/protobuf-c \
libgnutls.so:security/gnutls \
libjson-c.so:devel/json-c
-USE_GITHUB= yes
-GH_ACCOUNT= algernon
-
USES= autoreconf gmake libtool pathfix pkgconfig
GNU_CONFIGURE= yes
@@ -26,6 +24,11 @@ USE_LDCONFIG= yes
INSTALL_TARGET= install-strip
TEST_TARGET= check
+USE_GITHUB= yes
+GH_ACCOUNT= algernon
+
+MAKE_JOBS_UNSAFE= yes
+
post-patch:
@${REINPLACE_CMD} 's/-ldl//' ${WRKSRC}/Makefile.am
diff --git a/net-mgmt/riemann-c-client/distinfo b/net-mgmt/riemann-c-client/distinfo
index 7ac624f669ec..d683cef7e090 100644
--- a/net-mgmt/riemann-c-client/distinfo
+++ b/net-mgmt/riemann-c-client/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1475271779
-SHA256 (algernon-riemann-c-client-riemann-c-client-1.9.1_GH0.tar.gz) = 6c8279362384e0ee01cb84a12f645bf7229c7d61f565158fe4ecc82c36ce8dc0
-SIZE (algernon-riemann-c-client-riemann-c-client-1.9.1_GH0.tar.gz) = 74563
+TIMESTAMP = 1504143801
+SHA256 (algernon-riemann-c-client-riemann-c-client-1.10.1_GH0.tar.gz) = 93ccef65536e0cd3a1b3301847773f50fc298a455b4294e465d73fa7daf7c8bf
+SIZE (algernon-riemann-c-client-riemann-c-client-1.10.1_GH0.tar.gz) = 75314
diff --git a/net-mgmt/riemann-c-client/pkg-plist b/net-mgmt/riemann-c-client/pkg-plist
index da3a1d7742a3..005846b35430 100644
--- a/net-mgmt/riemann-c-client/pkg-plist
+++ b/net-mgmt/riemann-c-client/pkg-plist
@@ -10,6 +10,6 @@ include/riemann/simple.h
lib/libriemann-client.a
lib/libriemann-client.so
lib/libriemann-client.so.0
-lib/libriemann-client.so.0.9.1
+lib/libriemann-client.so.0.10.1
libdata/pkgconfig/riemann-client.pc
man/man1/riemann-client.1.gz
diff --git a/net-mgmt/riemann/Makefile b/net-mgmt/riemann/Makefile
index acc26ec3552f..a128d6a7bcef 100644
--- a/net-mgmt/riemann/Makefile
+++ b/net-mgmt/riemann/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= riemann
-PORTVERSION= 0.2.12
-PORTREVISION= 1
+PORTVERSION= 0.2.14
CATEGORIES= net-mgmt java
MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${PORTVERSION}/
@@ -16,47 +15,27 @@ USES= tar:bzip2
NO_BUILD= yes
NO_ARCH= yes
USE_JAVA= yes
-JAVA_VERSION= 1.7+
+JAVA_VERSION= 1.8+
-SUB_LIST= JAVA_HOME=${JAVA_HOME} \
- RIEMANN_USER=${RIEMANN_USER} \
- RIEMANN_GROUP=${RIEMANN_GROUP} \
- RIEMANN_PIDFILE=${RIEMANN_PIDFILE} \
- RIEMANN_LOGDIR=${RIEMANN_LOGDIR}
+SUB_LIST= JAVA_HOME=${JAVA_HOME}
-PLIST_SUB= JAVA_HOME=${JAVA_HOME} \
- RIEMANN_USER=${RIEMANN_USER} \
- RIEMANN_GROUP=${RIEMANN_GROUP} \
- RIEMANN_PIDFILE=${RIEMANN_PIDFILE} \
- RIEMANN_LOGDIR=${RIEMANN_LOGDIR}
+PLIST_SUB= JAVA_HOME=${JAVA_HOME}
-RIEMANN_USER?= ${PORTNAME}
-RIEMANN_GROUP?= ${PORTNAME}
+USERS= riemann
+GROUPS= riemann
-.if ${RIEMANN_USER} == "${PORTNAME}"
-USERS= ${PORTNAME}
-.endif
-.if ${RIEMANN_GROUP} == "${PORTNAME}"
-GROUPS= ${PORTNAME}
-.endif
-
-USE_RC_SUBR= ${PORTNAME}
-
-RIEMANN_LOGDIR= /var/log/${PORTNAME}/
-RIEMANN_PIDFILE= /var/run/${PORTNAME}.pid
+USE_RC_SUBR= riemann
do-install:
- ${MKDIR} \
- ${STAGEDIR}${JAVAJARDIR} \
+ ${MKDIR} ${STAGEDIR}${JAVAJARDIR} \
${STAGEDIR}${ETCDIR} \
${STAGEDIR}${ETCDIR}/conf.d \
- ${STAGEDIR}${RIEMANN_LOGDIR}
- ${INSTALL_DATA} \
- ${WRKSRC}/lib/${PORTNAME}.jar \
- ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar
- ${SED} -i -e "s:riemann.log:${RIEMANN_LOGDIR}${PORTNAME}.log:g" \
- ${WRKSRC}/etc/${PORTNAME}.config
- ${INSTALL_DATA} ${WRKSRC}/etc/${PORTNAME}.config \
- ${STAGEDIR}${ETCDIR}/${PORTNAME}.config.sample
+ ${STAGEDIR}/var/log/riemann
+ ${INSTALL_DATA} ${WRKSRC}/lib/riemann.jar \
+ ${STAGEDIR}${JAVAJARDIR}/riemann.jar
+ ${SED} -i -e "s:riemann.log:/var/log/riemann.log:g" \
+ ${WRKSRC}/etc/riemann.config
+ ${INSTALL_DATA} ${WRKSRC}/etc/riemann.config \
+ ${STAGEDIR}${ETCDIR}/riemann.config.sample
.include <bsd.port.mk>
diff --git a/net-mgmt/riemann/distinfo b/net-mgmt/riemann/distinfo
index a774705f9109..d55245bcd996 100644
--- a/net-mgmt/riemann/distinfo
+++ b/net-mgmt/riemann/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1484592882
-SHA256 (riemann-0.2.12.tar.bz2) = 79f21fb2ac90a3d55e7cfa4a1eb14d1bdcdb1266ba6052bb72e6e500467ca7f4
-SIZE (riemann-0.2.12.tar.bz2) = 41672027
+TIMESTAMP = 1501697423
+SHA256 (riemann-0.2.14.tar.bz2) = 165ee73ad10f5d187d559da1db8f99e151bba8c3bb1d774eb465ced23476fbce
+SIZE (riemann-0.2.14.tar.bz2) = 81960540
diff --git a/net-mgmt/riemann/files/riemann.in b/net-mgmt/riemann/files/riemann.in
index 437c5d1f2203..861fff308a5a 100644
--- a/net-mgmt/riemann/files/riemann.in
+++ b/net-mgmt/riemann/files/riemann.in
@@ -30,9 +30,9 @@ rcvar=riemann_enable
load_rc_config $name
: ${riemann_enable="NO"}
-: ${riemann_user:="%%RIEMANN_USER%%"}
-: ${riemann_group:="%%RIEMANN_GROUP%%"}
-: ${riemann_config:="%%PREFIX%%/etc/riemann/riemann.config.sample"}
+: ${riemann_user:="riemann"}
+: ${riemann_group:="riemann"}
+: ${riemann_config:="%%ETCDIR%%/riemann/riemann.config"}
: ${riemann_jarfile:="%%JAVAJARDIR%%/riemann.jar"}
: ${riemann_java_home:="%%JAVA_HOME%%"}
: ${riemann_min_mem:="256m"}
@@ -40,7 +40,7 @@ load_rc_config $name
: ${riemann_java_classpath:=${riemann_jarfile}}
: ${riemann_java_opts:=" -server \
-cp ${riemann_java_classpath} \
- -Dapp=${name} \
+ -Dapp=riemann \
-Xms${riemann_min_mem} \
-Xmx${riemann_max_mem} \
-Xss256k \
@@ -58,19 +58,20 @@ load_rc_config $name
-XX:+UseParNewGC \
-XX:CMSInitiatingOccupancyFraction=75 "}
-pidfile="%%RIEMANN_PIDFILE%%"
+pidfile="/var/run/riemann.pid"
+start_precmd="install -o ${riemann_user} /dev/null ${pidfile}"
+
command="/usr/sbin/daemon"
-command_args="-f -t ${name} -c -r -P ${pidfile} \
- ${riemann_java_home}/bin/java \
- ${riemann_java_opts} \
- riemann.bin start ${riemann_config}"
-required_files="${java_cmd} ${riemann_config}"
+command_args=" \
+ -c \
+ -t riemann \
+ -r \
+ -P ${pidfile} \
+ ${riemann_java_home}/bin/java \
+ ${riemann_java_opts} \
+ riemann.bin start ${riemann_config}"
-riemann_prestart()
-{
- install -o ${riemann_user} /dev/null ${pidfile}
-}
-start_precmd="${name}_prestart"
+required_files="${java_cmd} ${riemann_config}"
# support SIGHUP to reload config file using pkill. parent pid
# is that of daemon(8) and not of riemann's JVM instance
diff --git a/net-mgmt/riemann/pkg-plist b/net-mgmt/riemann/pkg-plist
index a9fd6e23292e..27fb500906ce 100644
--- a/net-mgmt/riemann/pkg-plist
+++ b/net-mgmt/riemann/pkg-plist
@@ -1,4 +1,4 @@
%%JAVAJARDIR%%/riemann.jar
@sample %%ETCDIR%%/riemann.config.sample
-@dir(%%RIEMANN_USER%%,%%RIEMANN_GROUP%%,0750) %%RIEMANN_LOGDIR%%
-@dir(%%RIEMANN_USER%%,%%RIEMANN_GROUP%%,0750) %%ETCDIR%%/conf.d
+@dir(riemann,riemann,0750) /var/log/riemann
+@dir(riemann,riemann,0750) %%ETCDIR%%/conf.d
diff --git a/net-mgmt/tcpreplay/Makefile b/net-mgmt/tcpreplay/Makefile
index f0d1cbe3fc95..43c436cae3af 100644
--- a/net-mgmt/tcpreplay/Makefile
+++ b/net-mgmt/tcpreplay/Makefile
@@ -4,6 +4,7 @@
PORTNAME= tcpreplay
PORTVERSION= 4.2.6
DISTVERSIONPREFIX= v
+PORTREVISION= 3
CATEGORIES= net-mgmt
MAINTAINER= ehaupt@FreeBSD.org
@@ -27,6 +28,17 @@ CONFIGURE_ARGS= --program-transform-name='s|.*\(tcp.*\)|\1|' \
# required when using autogen
CONFIGURE_ARGS+= --disable-local-libopts --disable-libopts-install
+LIBPCAP_BASE_DESC= Build with libpcap from the base OS
+LIBPCAP_PORTS_DESC= Build with net/libpcap
+
+OPTIONS_SINGLE= LIBPCAP
+OPTIONS_SINGLE_LIBPCAP= LIBPCAP_BASE LIBPCAP_PORTS
+
+OPTIONS_DEFAULT= LIBPCAP_BASE
+
+LIBPCAP_BASE_CONFIGURE_ON= --with-libpcap=/usr/lib
+LIBPCAP_PORTS_LIB_DEPENDS= libpcap.so:net/libpcap
+
post-patch:
@${REINPLACE_CMD} -e 's|-Wall -O3||' ${WRKSRC}/${CONFIGURE_SCRIPT}.ac
diff --git a/net/asterisk11/Makefile b/net/asterisk11/Makefile
index e7d039ac26fa..b201b3c49e25 100644
--- a/net/asterisk11/Makefile
+++ b/net/asterisk11/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= asterisk
-PORTVERSION= 11.25.1
-PORTREVISION= 3
+PORTVERSION= 11.25.2
CATEGORIES= net
MASTER_SITES= http://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729
MASTER_SITE_SUBDIR= asterisk/ \
diff --git a/net/asterisk11/distinfo b/net/asterisk11/distinfo
index e431884a9702..4900e61e205c 100644
--- a/net/asterisk11/distinfo
+++ b/net/asterisk11/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1481311749
-SHA256 (asterisk-11.25.1.tar.gz) = dc9c282ca1142b286e5a5c391647d6be73f35524c8def37718de866e8384a57c
-SIZE (asterisk-11.25.1.tar.gz) = 35125897
+TIMESTAMP = 1504251297
+SHA256 (asterisk-11.25.2.tar.gz) = 59fd3735546cb56bda15f39caf34636c113e68b79019554a007ad63cb6fc2d33
+SIZE (asterisk-11.25.2.tar.gz) = 35130400
SHA256 (asterisk-core-sounds-en-g729-1.5.tar.gz) = 8b28a59cfa53b59c76e0a191704f0708e3d83acffab8c5e6f25dfc599f0123f9
SIZE (asterisk-core-sounds-en-g729-1.5.tar.gz) = 1551123
SHA256 (asterisk-moh-opsound-g729-2.03.tar.gz) = 0147ca9a97f0c550227aacb7793499057c4d2c64e021c95f93722f27d5549585
diff --git a/net/asterisk13/Makefile b/net/asterisk13/Makefile
index 9ec5365c9b7b..9045ed010332 100644
--- a/net/asterisk13/Makefile
+++ b/net/asterisk13/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= asterisk
-PORTVERSION= 13.17.0
-PORTREVISION= 1
+PORTVERSION= 13.17.1
CATEGORIES= net
MASTER_SITES= http://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729
MASTER_SITE_SUBDIR= asterisk/ \
diff --git a/net/asterisk13/distinfo b/net/asterisk13/distinfo
index 78e0d20b3c78..ec29ceadd08e 100644
--- a/net/asterisk13/distinfo
+++ b/net/asterisk13/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1499871944
-SHA256 (asterisk-13.17.0.tar.gz) = c4a89386d7db58520391fcbd3202902584b4434289094ca2e4a6b8dada1e90a4
-SIZE (asterisk-13.17.0.tar.gz) = 32908945
+TIMESTAMP = 1504251584
+SHA256 (asterisk-13.17.1.tar.gz) = aee15699a4100ca0360e8168802c711caf7664d21d9fb84f686873f0e7c5fb34
+SIZE (asterisk-13.17.1.tar.gz) = 32897834
SHA256 (asterisk-core-sounds-en-g729-1.5.tar.gz) = 8b28a59cfa53b59c76e0a191704f0708e3d83acffab8c5e6f25dfc599f0123f9
SIZE (asterisk-core-sounds-en-g729-1.5.tar.gz) = 1551123
SHA256 (asterisk-moh-opsound-g729-2.03.tar.gz) = 0147ca9a97f0c550227aacb7793499057c4d2c64e021c95f93722f27d5549585
diff --git a/net/foreman-proxy/pkg-descr b/net/foreman-proxy/pkg-descr
index 0dee3297b281..3d2561a264b8 100644
--- a/net/foreman-proxy/pkg-descr
+++ b/net/foreman-proxy/pkg-descr
@@ -14,4 +14,4 @@ Puppet CA - Manage certificate signing, cleaning and autosign on a Puppet CA
server
BMC - BMC management etc
-WWW: http://theforeman.org
+WWW: https://theforeman.org/
diff --git a/net/haproxy-devel/Makefile b/net/haproxy-devel/Makefile
index ec90a9c41b88..3452ce1aa763 100644
--- a/net/haproxy-devel/Makefile
+++ b/net/haproxy-devel/Makefile
@@ -20,7 +20,7 @@ CONFLICTS_INSTALL= haproxy-[1234567890]\*
USES= cpe gmake
USE_RC_SUBR= haproxy
-DEVICEATLAS_VERSION= 2.1.2_1
+DEVICEATLAS_VERSION= 2.1.2_2
DEVICEATLAS_DISTFILE= deviceatlas-enterprise-c-${DEVICEATLAS_VERSION}
DEVICEATLAS_REGISTRATION_URL= https://deviceatlas.com/deviceatlas-haproxy-module
diff --git a/net/haproxy-devel/distinfo b/net/haproxy-devel/distinfo
index 06efdb3190be..3bb0d25df3e0 100644
--- a/net/haproxy-devel/distinfo
+++ b/net/haproxy-devel/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1496416049
+TIMESTAMP = 1504203934
SHA256 (haproxy-1.8-dev2.tar.gz) = 45f42107e8730fc7bf324523d148d67aae6a65f0d4a4b981273d3dcefd6de2e1
SIZE (haproxy-1.8-dev2.tar.gz) = 1850881
-SHA256 (deviceatlas-enterprise-c-2.1.2_1.tgz) = 984e1ae3147459a4ed0a8d5053d83dd05ce8c5127cd3cb055be35a74e9217372
-SIZE (deviceatlas-enterprise-c-2.1.2_1.tgz) = 184432
+SHA256 (deviceatlas-enterprise-c-2.1.2_2.tgz) = feaa9198a5d6bed125b34742bd626ad0a0fcb862803916cd7d974413f8bdfdce
+SIZE (deviceatlas-enterprise-c-2.1.2_2.tgz) = 184368
diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile
index 5c7c952b9fd6..81ac0852b88d 100644
--- a/net/haproxy/Makefile
+++ b/net/haproxy/Makefile
@@ -18,7 +18,7 @@ CONFLICTS_INSTALL= haproxy-devel-[0-9]*
USES= cpe gmake
USE_RC_SUBR= haproxy
-DEVICEATLAS_VERSION= 2.1.2_1
+DEVICEATLAS_VERSION= 2.1.2_2
DEVICEATLAS_DISTFILE= deviceatlas-enterprise-c-${DEVICEATLAS_VERSION}
DEVICEATLAS_REGISTRATION_URL= https://deviceatlas.com/deviceatlas-haproxy-module
diff --git a/net/haproxy/distinfo b/net/haproxy/distinfo
index eabdb323833e..c9254ff1a197 100644
--- a/net/haproxy/distinfo
+++ b/net/haproxy/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1503043277
+TIMESTAMP = 1504203902
SHA256 (haproxy-1.7.9.tar.gz) = 1072337e54fa188dc6e0cfe3ba4c2200b07082e321cbfe5a0882d85d54db068e
SIZE (haproxy-1.7.9.tar.gz) = 1748159
-SHA256 (deviceatlas-enterprise-c-2.1.2_1.tgz) = 984e1ae3147459a4ed0a8d5053d83dd05ce8c5127cd3cb055be35a74e9217372
-SIZE (deviceatlas-enterprise-c-2.1.2_1.tgz) = 184432
+SHA256 (deviceatlas-enterprise-c-2.1.2_2.tgz) = feaa9198a5d6bed125b34742bd626ad0a0fcb862803916cd7d974413f8bdfdce
+SIZE (deviceatlas-enterprise-c-2.1.2_2.tgz) = 184368
diff --git a/net/kf5-kxmlrpcclient/distinfo b/net/kf5-kxmlrpcclient/distinfo
index d219dfd977f7..abf8b38d3c1b 100644
--- a/net/kf5-kxmlrpcclient/distinfo
+++ b/net/kf5-kxmlrpcclient/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499098902
-SHA256 (KDE/frameworks/5.36.0/kxmlrpcclient-5.36.0.tar.xz) = a181b54e093a257309d960c797159e7bcbeccee7aa5b59e4e708880045eca793
-SIZE (KDE/frameworks/5.36.0/kxmlrpcclient-5.36.0.tar.xz) = 29044
+TIMESTAMP = 1502086071
+SHA256 (KDE/frameworks/5.37.0/kxmlrpcclient-5.37.0.tar.xz) = 78bfc409af7d71f0387973cabe8b520627f5eca5e66ad6181ea4bbdb0cdac9ca
+SIZE (KDE/frameworks/5.37.0/kxmlrpcclient-5.37.0.tar.xz) = 29076
diff --git a/net/librdkafka/Makefile b/net/librdkafka/Makefile
index d6556b76be57..903a2edcd63b 100644
--- a/net/librdkafka/Makefile
+++ b/net/librdkafka/Makefile
@@ -6,7 +6,7 @@ PORTVERSION= 0.11.0
DISTVERSIONPREFIX= v
CATEGORIES= net
-MAINTAINER= luca.pizzamiglio@gmail.com
+MAINTAINER= pizzamig@FreeBSD.org
COMMENT= Apache Kafka C/C++ library
LICENSE= BSD2CLAUSE
diff --git a/net/mpd5/pkg-descr b/net/mpd5/pkg-descr
index 05eb3703d09e..f6b3ed7ac84b 100644
--- a/net/mpd5/pkg-descr
+++ b/net/mpd5/pkg-descr
@@ -34,4 +34,4 @@ Mpd also includes many additional features:
Comprehensive logging
Telnet and HTTP control interfaces.
-WWW: http://www.sourceforge.net/projects/mpd
+WWW: https://sourceforge.net/projects/mpd/
diff --git a/net/p5-Net-Ifconfig-Wrapper/Makefile b/net/p5-Net-Ifconfig-Wrapper/Makefile
index 8b602725a7ce..4436290fa677 100644
--- a/net/p5-Net-Ifconfig-Wrapper/Makefile
+++ b/net/p5-Net-Ifconfig-Wrapper/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= Net-Ifconfig-Wrapper
-PORTVERSION= 0.14
+PORTVERSION= 0.15
CATEGORIES= net perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
@@ -12,6 +12,7 @@ COMMENT= Provides a unified way to configure network interfaces
LICENSE= ARTPERL10
+NO_ARCH= yes
USES= perl5
USE_PERL5= configure
diff --git a/net/p5-Net-Ifconfig-Wrapper/distinfo b/net/p5-Net-Ifconfig-Wrapper/distinfo
index 173ae3df6462..3d31ca5b8a8a 100644
--- a/net/p5-Net-Ifconfig-Wrapper/distinfo
+++ b/net/p5-Net-Ifconfig-Wrapper/distinfo
@@ -1,2 +1,3 @@
-SHA256 (Net-Ifconfig-Wrapper-0.14.tar.gz) = 74ccaea20184f3b4ebe32d0b852288a6dc68bafa05a40119133cc79e58b98c3c
-SIZE (Net-Ifconfig-Wrapper-0.14.tar.gz) = 10562
+TIMESTAMP = 1503939348
+SHA256 (Net-Ifconfig-Wrapper-0.15.tar.gz) = 7e9b1ba4b451157eb3d6fccdf8bd8ae75f6a73115e1ebf26d729e97c9d0bb119
+SIZE (Net-Ifconfig-Wrapper-0.15.tar.gz) = 11724
diff --git a/net/rubygem-fog-google/Makefile b/net/rubygem-fog-google/Makefile
index bdf9197760f3..1f58e45e165d 100644
--- a/net/rubygem-fog-google/Makefile
+++ b/net/rubygem-fog-google/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= fog-google
-PORTVERSION= 0.5.3
+PORTVERSION= 0.5.5
CATEGORIES= net rubygems
MASTER_SITES= RG
diff --git a/net/rubygem-fog-google/distinfo b/net/rubygem-fog-google/distinfo
index 71c0fe971f54..42667135751b 100644
--- a/net/rubygem-fog-google/distinfo
+++ b/net/rubygem-fog-google/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1496491457
-SHA256 (rubygem/fog-google-0.5.3.gem) = 310a8a1b37643341d17eb413f46059e397e4519d4c3a25eaf29a1394ab99339d
-SIZE (rubygem/fog-google-0.5.3.gem) = 138752
+TIMESTAMP = 1504161225
+SHA256 (rubygem/fog-google-0.5.5.gem) = ca92c4aca49595216019457b3a1f1b9278a46c666bd188c14a12108b9e3062e8
+SIZE (rubygem/fog-google-0.5.5.gem) = 141312
diff --git a/net/spideroak/Makefile b/net/spideroak/Makefile
index f20fff0f5274..1aefbca5d92e 100644
--- a/net/spideroak/Makefile
+++ b/net/spideroak/Makefile
@@ -35,8 +35,6 @@ SUB_FILES= pkg-message
USES= desktop-file-utils linux python:2 tar:tgz
USE_LINUX= xorglibs
-.include <bsd.port.options.mk>
-
post-patch:
${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},1' \
-e 's,%%DATADIR%%,${DATADIR},1' \
@@ -55,11 +53,13 @@ do-install:
${LOCALBASE}/bin/desktop-file-install \
--mode=${SHAREMODE} --dir=${STAGEDIR}${DESKTOPDIR} \
${WRKSRC}/usr/share/applications/SpiderOakONE.desktop
+ ${INSTALL_DATA} ${WRKSRC}/usr/share/pixmaps/*.png ${STAGEDIR}${PREFIX}/share/pixmaps/
+
+do-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/usr/share/doc/SpiderOakONE/Getting\ Started\ Guide.pdf ${STAGEDIR}${DOCSDIR}
-.if ${PORT_OPTIONS:MMANPAGES}
+
+do-install-MANPAGES-on:
${INSTALL_MAN} ${WRKSRC}/usr/share/man/man1/SpiderOakONE.1.gz ${STAGEDIR}${MANPREFIX}/man/man1/
-.endif
- ${INSTALL_DATA} ${WRKSRC}/usr/share/pixmaps/*.png ${STAGEDIR}${PREFIX}/share/pixmaps/
.include <bsd.port.mk>
diff --git a/net/spideroak/pkg-descr b/net/spideroak/pkg-descr
index 08d47f7e39af..40227367f3e6 100644
--- a/net/spideroak/pkg-descr
+++ b/net/spideroak/pkg-descr
@@ -1,4 +1,4 @@
SpiderOak is a popular service for storing and syncing files online.
This port installs the Linux client.
-WWW: http://spideroak.com/
+WWW: https://spideroak.com/
diff --git a/print/R-cran-knitr/Makefile b/print/R-cran-knitr/Makefile
index 32bfcee6f3fb..ae25cf3962d3 100644
--- a/print/R-cran-knitr/Makefile
+++ b/print/R-cran-knitr/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= knitr
-PORTVERSION= 1.16
+PORTVERSION= 1.17
CATEGORIES= print
DISTNAME= ${PORTNAME}_${PORTVERSION}
diff --git a/print/R-cran-knitr/distinfo b/print/R-cran-knitr/distinfo
index 30eea099ae0c..136a9fae7269 100644
--- a/print/R-cran-knitr/distinfo
+++ b/print/R-cran-knitr/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495171078
-SHA256 (knitr_1.16.tar.gz) = 10481fbf266b68402bf1973da99a87576ec2579f1c6cb2f1cca524b661a56a09
-SIZE (knitr_1.16.tar.gz) = 1031259
+TIMESTAMP = 1503920253
+SHA256 (knitr_1.17.tar.gz) = 9484a2b2c7b0c2aae24ab7f4eec6db48affbceb0e42bd3d69e34d953fe92f401
+SIZE (knitr_1.17.tar.gz) = 769923
diff --git a/print/pecl-pdflib/Makefile b/print/pecl-pdflib/Makefile
index 0d84fa326852..fd690b510f46 100644
--- a/print/pecl-pdflib/Makefile
+++ b/print/pecl-pdflib/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= pdflib
-PORTVERSION= 4.1.1
+PORTVERSION= 4.1.2
CATEGORIES= print pear
MAINTAINER= ale@FreeBSD.org
diff --git a/print/pecl-pdflib/distinfo b/print/pecl-pdflib/distinfo
index ababb44b21b7..a9c0c667d6e5 100644
--- a/print/pecl-pdflib/distinfo
+++ b/print/pecl-pdflib/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1484817509
-SHA256 (PECL/pdflib-4.1.1.tgz) = 55a4175080933a0e149fc0b696c1cdbc4543f14a08aa0b4456bd4ef1a662199c
-SIZE (PECL/pdflib-4.1.1.tgz) = 33080
+TIMESTAMP = 1504079635
+SHA256 (PECL/pdflib-4.1.2.tgz) = abb231d5986bf46cdb430b2dfb9918237038ed1c0330f0ce99c77525ef393e14
+SIZE (PECL/pdflib-4.1.2.tgz) = 33081
diff --git a/security/afl/Makefile b/security/afl/Makefile
index d34f914ae55e..dc09ffe9e022 100644
--- a/security/afl/Makefile
+++ b/security/afl/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= afl
-PORTVERSION= 2.50
+PORTVERSION= 2.51
DISTVERSIONSUFFIX= b
CATEGORIES= security
MASTER_SITES= http://lcamtuf.coredump.cx/afl/releases/
diff --git a/security/afl/distinfo b/security/afl/distinfo
index 71962193382c..1e50e32645fb 100644
--- a/security/afl/distinfo
+++ b/security/afl/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1503651849
-SHA256 (afl-2.50b.tgz) = 0bdb0efd77b394b8b1a816e957a6dc27ffe01007d73c6247b9e424f0e36176c5
-SIZE (afl-2.50b.tgz) = 835578
+TIMESTAMP = 1504170836
+SHA256 (afl-2.51b.tgz) = d435b94b35b844ea0bacbdb8516d2d5adffc2a4f4a5aad78785c5d2a5495bb97
+SIZE (afl-2.51b.tgz) = 835611
diff --git a/security/gnupg22/Makefile b/security/gnupg22/Makefile
index fefa2f63a45c..d850003944fc 100644
--- a/security/gnupg22/Makefile
+++ b/security/gnupg22/Makefile
@@ -4,6 +4,7 @@ PORTNAME= gnupg
PORTVERSION= 2.2.0
CATEGORIES= security
MASTER_SITES= GNUPG
+PKGNAMESUFFIX= 22
MAINTAINER= adamw@FreeBSD.org
COMMENT= The GNU Privacy Guard (modern version)
diff --git a/security/kf5-kdesu/distinfo b/security/kf5-kdesu/distinfo
index 509e8fe8852f..048978c03efa 100644
--- a/security/kf5-kdesu/distinfo
+++ b/security/kf5-kdesu/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499098902
-SHA256 (KDE/frameworks/5.36.0/kdesu-5.36.0.tar.xz) = 8af37b0ca1563c58e5f8446f66286b2d418946960575cf6f444ae314aa198f06
-SIZE (KDE/frameworks/5.36.0/kdesu-5.36.0.tar.xz) = 44616
+TIMESTAMP = 1502086071
+SHA256 (KDE/frameworks/5.37.0/kdesu-5.37.0.tar.xz) = ea37e8517ab376f86c9d7df726f0f8f143fac198c6a3a6a26f2e276ae69fd0e1
+SIZE (KDE/frameworks/5.37.0/kdesu-5.37.0.tar.xz) = 44660
diff --git a/security/libgcrypt/Makefile b/security/libgcrypt/Makefile
index d0f99715ea8c..0a9e70b47d89 100644
--- a/security/libgcrypt/Makefile
+++ b/security/libgcrypt/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= libgcrypt
-PORTVERSION= 1.8.0
+PORTVERSION= 1.8.1
CATEGORIES= security
MASTER_SITES= GNUPG
@@ -40,7 +40,6 @@ CONFIGURE_ARGS+= --disable-asm
post-patch:
@${RM} ${WRKSRC}/doc/gcrypt.info*
@${REINPLACE_CMD} -e 's|ALIGN (3)|ALIGN (2)|g' ${WRKSRC}/mpi/i386/*.S
- @${REINPLACE_CMD} -e 's|-O0/'\''|-O0/g'\''|g' ${WRKSRC}/random/Makefile.*
post-install:
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}.so
diff --git a/security/libgcrypt/distinfo b/security/libgcrypt/distinfo
index 35aa71114f93..392c1743d7ca 100644
--- a/security/libgcrypt/distinfo
+++ b/security/libgcrypt/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1500481367
-SHA256 (libgcrypt-1.8.0.tar.bz2) = 23e49697b87cc4173b03b4757c8df4314e3149058fa18bdc4f82098f103d891b
-SIZE (libgcrypt-1.8.0.tar.bz2) = 2963266
+TIMESTAMP = 1503947280
+SHA256 (libgcrypt-1.8.1.tar.bz2) = 7a2875f8b1ae0301732e878c0cca2c9664ff09ef71408f085c50e332656a78b3
+SIZE (libgcrypt-1.8.1.tar.bz2) = 2967344
diff --git a/security/libgcrypt/pkg-plist b/security/libgcrypt/pkg-plist
index 5e68f4c69d51..aa1cbf9f2f84 100644
--- a/security/libgcrypt/pkg-plist
+++ b/security/libgcrypt/pkg-plist
@@ -6,6 +6,6 @@ include/gcrypt.h
lib/libgcrypt.a
lib/libgcrypt.so
lib/libgcrypt.so.20
-lib/libgcrypt.so.20.2.0
+lib/libgcrypt.so.20.2.1
man/man1/hmac256.1.gz
share/aclocal/libgcrypt.m4
diff --git a/security/parano/Makefile b/security/parano/Makefile
index fea35ea7369f..55a285aa945d 100644
--- a/security/parano/Makefile
+++ b/security/parano/Makefile
@@ -3,7 +3,7 @@
PORTNAME= parano
PORTVERSION= 0.3.5
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= security
MASTER_SITES= BERLIOS
@@ -14,11 +14,10 @@ LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USE_GNOME= pygnome2 intltool
-USES= desktop-file-utils gettext gmake python shared-mime-info
+USES= desktop-file-utils gettext gmake localbase python shared-mime-info shebangfix
+SHEBANG_FILES= src/parano.py
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-update-mime-database
-
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
+NO_ARCH= yes
.include <bsd.port.mk>
diff --git a/security/pgpin/Makefile b/security/pgpin/Makefile
index 55173b3d32bd..cb68560112f2 100644
--- a/security/pgpin/Makefile
+++ b/security/pgpin/Makefile
@@ -22,8 +22,7 @@ WRKSRC= ${WRKDIR}/pgp263in/src
MAKEFILE= makefile
ALL_TARGET= freebsd-${ARCH} OS_CFLAGS="${CFLAGS}"
PGPLIB= ${STAGEDIR}${PREFIX}/lib/pgpin
-
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE= DOCS
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/pgp ${STAGEDIR}${PREFIX}/bin/pgpin
@@ -32,11 +31,11 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/../pgp.hlp ${PGPLIB}/
${INSTALL_DATA} ${WRKSRC}/../language.txt ${PGPLIB}/language.txt.sample
${INSTALL_DATA} ${WRKSRC}/../config.txt ${PGPLIB}/config.txt.sample
-.if ${PORT_OPTIONS:MDOCS}
+
+post-install-DOCS-on:
${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${FILESDIR}/CHANGES ${STAGEDIR}${DOCSDIR}/
${INSTALL_DATA} ${WRKSRC}/../doc/pgpdoc1.txt \
${WRKSRC}/../doc/pgpdoc2.txt ${STAGEDIR}${DOCSDIR}/
-.endif
.include <bsd.port.mk>
diff --git a/security/pgpin/files/patch-makefile b/security/pgpin/files/patch-makefile
index c958aeac416c..be43f0d0ce08 100644
--- a/security/pgpin/files/patch-makefile
+++ b/security/pgpin/files/patch-makefile
@@ -1,5 +1,5 @@
---- makefile.orig 2001-03-23 11:44:58.000000000 +0100
-+++ makefile 2016-11-19 13:49:38.970838000 +0100
+--- makefile.orig 2001-03-23 10:44:58 UTC
++++ makefile
@@ -50,15 +50,15 @@
# -DUSE_SELECT to use select() system call
# -DUSE_NBIO to use non-blocking read()
@@ -21,17 +21,17 @@
DBG = -O
RM = rm -f
-@@ -79,7 +79,8 @@
+@@ -79,7 +79,8 @@ default:
@echo "where <system> can be:"
@echo " 386bsd, 3b1, 3b1_asm, aix370, aix386, amix-68k-gcc, apollo,"
@echo " apollo-gcc, atari,aux(*), aux-gcc, bsd, bsdgcc, convexos,"
- @echo " dgux, djgpp, encore, freebsd, hpux-68k(*), hpux-68k-ansi,"
+ @echo " dgux, djgpp, encore, hpux-68k(*), hpux-68k-ansi,"
-+ @echo " freebsd-{alpha,i386,sparc64,ia64,amd64,powerpc,armv6,mips,mips64},"
++ @echo " freebsd-{alpha,i386,sparc64,ia64,amd64,powerpc,armv6,armv7,mips,mips64},"
@echo " hpux-68k-gcc, hpux-pa(*), hpux-pa-ansi, hpux-pa-gcc, hpux9-pa-ansi,"
@echo " irix, irix_asm, isc, isc_asm, linux, linux-aout, linux-68k,"
@echo " machten, mach_386, mips-ultrix, netbsd, netbsd_68k, newsasm,"
-@@ -175,11 +176,54 @@
+@@ -175,9 +176,56 @@ linux-68k:
$(MAKE) all CC=gcc LD=gcc \
CFLAGS="$(RSAINCDIR) -O2 -DHIGHFIRST -DUNIX -DPORTABLE -DIDEA32"
@@ -40,8 +40,8 @@
$(MAKE) all LD="$(CC) -s" OBJS_EXT="_80386.o _zmatch.o" \
- CFLAGS="$(RSAINCDIR) -O2 -fno-strength-reduce -DUNIX -DIDEA32 -DASM \
+ CFLAGS="$(RSAINCDIR) $(OS_CFLAGS) -DUNIX -DIDEA32 -DASM \
- -DMAX_NAMELEN=255"
-
++ -DMAX_NAMELEN=255"
++
+freebsd-alpha:
+ $(MAKE) all LD="$(CC) -s" \
+ CFLAGS="$(RSAINCDIR) $(OS_CFLAGS) -DPORTABLE -DUNIX -DIDEA32 \
@@ -68,6 +68,10 @@
+ $(MAKE) all LD="$(CC) -s" \
+ CFLAGS="$(RSAINCDIR) $(OS_CFLAGS) -DPORTABLE -DUNIX -DIDEA32 \
+ -DMAX_NAMELEN=255"
++freebsd-armv7:
++ $(MAKE) all LD="$(CC) -s" \
++ CFLAGS="$(RSAINCDIR) $(OS_CFLAGS) -DPORTABLE -DUNIX -DIDEA32 \
++ -DMAX_NAMELEN=255"
+freebsd-mips:
+ $(MAKE) all LD="$(CC) -s" \
+ CFLAGS="$(RSAINCDIR) $(OS_CFLAGS) -DPORTABLE -DUNIX -DIDEA32 \
@@ -83,8 +87,6 @@
+freebsd-powerpc64:
+ $(MAKE) all LD="$(CC) -s" \
+ CFLAGS="$(RSAINCDIR) $(OS_CFLAGS) -DPORTABLE -DUNIX -DIDEA32 \
-+ -DMAX_NAMELEN=255"
-+
+ -DMAX_NAMELEN=255"
+
386bsd:
- $(MAKE) all CC=gcc LD=gcc OBJS_EXT="_80386.o _zmatch.o" \
- CFLAGS="$(RSAINCDIR) -O -DUNIX -DIDEA32 -DASM -DMAX_NAMELEN=255"
diff --git a/security/rubygem-gpgr/Makefile b/security/rubygem-gpgr/Makefile
index 4f3352db37b0..41e58f9c0f9f 100644
--- a/security/rubygem-gpgr/Makefile
+++ b/security/rubygem-gpgr/Makefile
@@ -2,20 +2,19 @@
# $FreeBSD$
PORTNAME= gpgr
-PORTVERSION= 0.0.4
-PORTREVISION= 1
+PORTVERSION= 0.1.0
CATEGORIES= security rubygems
MASTER_SITES= RG
MAINTAINER= ruby@FreeBSD.org
COMMENT= Very light interface to the command-line GPG tool
-LICENSE= RUBY
+LICENSE= MIT
+LICENSE_FILE= ${WRKSRC}/LICENSE.txt
RUN_DEPENDS= gpg:security/gnupg
NO_ARCH= yes
-
USE_RUBY= yes
USES= gem
diff --git a/security/rubygem-gpgr/distinfo b/security/rubygem-gpgr/distinfo
index c71d62e3f2cb..87d15fc71cca 100644
--- a/security/rubygem-gpgr/distinfo
+++ b/security/rubygem-gpgr/distinfo
@@ -1,2 +1,3 @@
-SHA256 (rubygem/gpgr-0.0.4.gem) = 11f5e9c94c8e5eaedefdd3325c8c426d05994f2768d72aa5de329b74ed477195
-SIZE (rubygem/gpgr-0.0.4.gem) = 22528
+TIMESTAMP = 1504098823
+SHA256 (rubygem/gpgr-0.1.0.gem) = 6243113641828bab968961df85f7047b47e203aa41820b4243b9b42e4cf2c658
+SIZE (rubygem/gpgr-0.1.0.gem) = 11776
diff --git a/security/rubygem-ruby-saml/Makefile b/security/rubygem-ruby-saml/Makefile
index 8f553d9b68e1..897b0bd61694 100644
--- a/security/rubygem-ruby-saml/Makefile
+++ b/security/rubygem-ruby-saml/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= ruby-saml
-PORTVERSION= 1.4.3
+PORTVERSION= 1.5.0
CATEGORIES= security rubygems
MASTER_SITES= RG
diff --git a/security/rubygem-ruby-saml/distinfo b/security/rubygem-ruby-saml/distinfo
index 3549e4ce35ab..28ffcd0d9d0c 100644
--- a/security/rubygem-ruby-saml/distinfo
+++ b/security/rubygem-ruby-saml/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495210742
-SHA256 (rubygem/ruby-saml-1.4.3.gem) = af58a9d1009b376d17dfed56678059e91387d2dc8d55291d0b42558ffa0359d1
-SIZE (rubygem/ruby-saml-1.4.3.gem) = 260608
+TIMESTAMP = 1504258206
+SHA256 (rubygem/ruby-saml-1.5.0.gem) = 3c1ec3baa992b562d2e71053bbc15b38d70e11eb519e3e5ebd74189243d45665
+SIZE (rubygem/ruby-saml-1.5.0.gem) = 266752
diff --git a/security/sudo/Makefile b/security/sudo/Makefile
index f37bd6212c50..cc06323bff28 100644
--- a/security/sudo/Makefile
+++ b/security/sudo/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= sudo
-PORTVERSION= 1.8.20p2
-PORTREVISION= 3
+PORTVERSION= 1.8.21
CATEGORIES= security
MASTER_SITES= SUDO
diff --git a/security/sudo/distinfo b/security/sudo/distinfo
index fa89c08d437b..930deccab95a 100644
--- a/security/sudo/distinfo
+++ b/security/sudo/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1497103724
-SHA256 (sudo-1.8.20p2.tar.gz) = bd42ae1059e935f795c69ea97b3de09fe9410a58a74b5d5e6836eb5067a445d9
-SIZE (sudo-1.8.20p2.tar.gz) = 2930769
+TIMESTAMP = 1503887359
+SHA256 (sudo-1.8.21.tar.gz) = 126e9214613e842e19a02658f060186fe6a5927948679d64895b17ed933bb523
+SIZE (sudo-1.8.21.tar.gz) = 2973939
diff --git a/security/sudo/files/patch-src_exec__nopty.c b/security/sudo/files/patch-src_exec__nopty.c
index 188125823925..21799d7b9504 100644
--- a/security/sudo/files/patch-src_exec__nopty.c
+++ b/security/sudo/files/patch-src_exec__nopty.c
@@ -1,26 +1,17 @@
---- src/exec_nopty.c.orig 2017-08-09 17:20:41 UTC
-+++ src/exec_nopty.c
-@@ -201,7 +201,7 @@ exec_nopty(struct command_details *details, struct com
- sudo_warn(U_("unable to set handler for signal %d"), SIGCHLD);
- if (sudo_sigaction(SIGCONT, &sa, NULL) != 0)
- sudo_warn(U_("unable to set handler for signal %d"), SIGCONT);
--#ifdef SIGINFO
-+#if defined(SIGINFO) && !defined(__FreeBSD__)
- if (sudo_sigaction(SIGINFO, &sa, NULL) != 0)
- sudo_warn(U_("unable to set handler for signal %d"), SIGINFO);
- #endif
-@@ -222,6 +222,14 @@ exec_nopty(struct command_details *details, struct com
- sudo_warn(U_("unable to set handler for signal %d"), SIGQUIT);
- if (sudo_sigaction(SIGTSTP, &sa, NULL) != 0)
- sudo_warn(U_("unable to set handler for signal %d"), SIGTSTP);
+--- src/exec_nopty.c.orig 2017-08-28 20:07:24.296708000 -0700
++++ src/exec_nopty.c 2017-08-28 20:17:50.768102000 -0700
+@@ -134,6 +134,14 @@ signal_cb_nopty(int signo, int what, void *v)
+ sudo_ev_loopexit(ec->evbase);
+ }
+ debug_return;
+#if defined(SIGINFO) && defined(__FreeBSD__)
+ /*
-+ * FreeBSD's ^T will generate a SIGINFO to the controlling terminal's
-+ * process group.
++ * FreeBSD's ^T (terminal STATUS) will send a kernel-generated SIGINFO
++ * to the controlling terminal's process group that should not be
++ * forwarded.
+ */
-+ if (sudo_sigaction(SIGINFO, &sa, NULL) != 0)
-+ sudo_warn(U_("unable to set handler for signal %d"), SIGINFO);
++ case SIGINFO:
+#endif
-
- /*
- * The policy plugin's session init must be run before we fork
+ case SIGINT:
+ case SIGQUIT:
+ case SIGTSTP:
diff --git a/security/sudo/pkg-plist b/security/sudo/pkg-plist
index 4487d39c6649..ded7167a929b 100644
--- a/security/sudo/pkg-plist
+++ b/security/sudo/pkg-plist
@@ -55,6 +55,7 @@ sbin/visudo
%%NLS%%share/locale/fi/LC_MESSAGES/sudoers.mo
%%NLS%%share/locale/fr/LC_MESSAGES/sudo.mo
%%NLS%%share/locale/fr/LC_MESSAGES/sudoers.mo
+%%NLS%%share/locale/fur/LC_MESSAGES/sudo.mo
%%NLS%%share/locale/gl/LC_MESSAGES/sudo.mo
%%NLS%%share/locale/hr/LC_MESSAGES/sudo.mo
%%NLS%%share/locale/hr/LC_MESSAGES/sudoers.mo
diff --git a/security/vuxml/vuln.xml b/security/vuxml/vuln.xml
index ea6bc969f05c..9449cc5608d7 100644
--- a/security/vuxml/vuln.xml
+++ b/security/vuxml/vuln.xml
@@ -58,6 +58,136 @@ Notes:
* Do not forget port variants (linux-f10-libxml2, libxml2, etc.)
-->
<vuxml xmlns="http://www.vuxml.org/apps/vuxml-1">
+ <vuln vid="ec1df2a1-8ee6-11e7-8be8-001999f8d30b">
+ <topic>asterisk -- Remote Crash Vulerability in res_pjsip</topic>
+ <affects>
+ <package>
+ <name>asterisk13</name>
+ <range><lt>13.17.1</lt></range>
+ </package>
+ </affects>
+ <description>
+ <body xmlns="http://www.w3.org/1999/xhtml">
+ <p>The Asterisk project reports:</p>
+ <blockquote cite="http://www.asterisk.org/downloads/security-advisories">
+ <p>A carefully crafted URI in a From, To or Contact header could cause Asterisk to crash.</p>
+ </blockquote>
+ </body>
+ </description>
+ <references>
+ <url>https://downloads.asterisk.org/pub/security/AST-2017-007.html</url>
+ <cvename>CVE-2017-14098</cvename>
+ </references>
+ <dates>
+ <discovery>2017-08-31</discovery>
+ <entry>2017-09-01</entry>
+ </dates>
+ </vuln>
+
+ <vuln vid="c599f95c-8ee5-11e7-8be8-001999f8d30b">
+ <topic>asterisk -- Unauthorized data disclosure and shell access command injection in app_minivm</topic>
+ <affects>
+ <package>
+ <name>asterisk11</name>
+ <range><lt>11.25.2</lt></range>
+ </package>
+ <package>
+ <name>asterisk13</name>
+ <range><lt>13.17.1</lt></range>
+ </package>
+ </affects>
+ <description>
+ <body xmlns="http://www.w3.org/1999/xhtml">
+ <p>The Asterisk project reports:</p>
+ <blockquote cite="http://www.asterisk.org/downloads/security-advisories">
+ <p>AST-2017-005 - A change was made to the strict RTP
+ support in the RTP stack to better tolerate late media
+ when a reinvite occurs. When combined with the symmetric
+ RTP support this introduced an avenue where media could
+ be hijacked. Instead of only learning a new address when
+ expected the new code allowed a new source address to be
+ learned at all times.</p>
+ <p>AST-2017-006 - The app_minivm module has an "externnotify"
+ program configuration option that is executed by the
+ MinivmNotify dialplan application. The application uses
+ the caller-id name and number as part of a built string
+ passed to the OS shell for interpretation and execution.
+ Since the caller-id name and number can come from an
+ untrusted source, a crafted caller-id name or number
+ allows an arbitrary shell command injection.</p>
+ </blockquote>
+ </body>
+ </description>
+ <references>
+ <url>https://downloads.asterisk.org/pub/security/AST-2017-005.html</url>
+ <cvename>CVE-2017-14099</cvename>
+ <url>https://downloads.asterisk.org/pub/security/AST-2017-006.html</url>
+ <cvename>CVE-2017-14100</cvename>
+ </references>
+ <dates>
+ <discovery>2017-08-31</discovery>
+ <entry>2017-09-01</entry>
+ </dates>
+ </vuln>
+
+ <vuln vid="22f28bb3-8d98-11e7-8c37-e8e0b747a45a">
+ <topic>libgcrypt -- side-channel attack vulnerability</topic>
+ <affects>
+ <package>
+ <name>libgcrypt</name>
+ <range><lt>1.8.1</lt></range>
+ </package>
+ </affects>
+ <description>
+ <body xmlns="http://www.w3.org/1999/xhtml">
+ <p>GnuPG reports:</p>
+ <blockquote cite="https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-0379">
+ <p>Mitigate a local side-channel attack on Curve25519 dubbed "May the Fourth Be With You".</p>
+ </blockquote>
+ </body>
+ </description>
+ <references>
+ <cvename>CVE-2017-0379</cvename>
+ <url>https://eprint.iacr.org/2017/806</url>
+ <url>https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-0379</url>
+ </references>
+ <dates>
+ <discovery>2017-08-27</discovery>
+ <entry>2017-08-30</entry>
+ </dates>
+ </vuln>
+
+ <vuln vid="3f6de636-8cdb-11e7-9c71-f0def1fd7ea2">
+ <topic>rubygems -- multiple vulnerabilities</topic>
+ <affects>
+ <package>
+ <name>ruby22-gems</name>
+ <name>ruby23-gems</name>
+ <name>ruby24-gems</name>
+ <range><lt>2.6.13</lt></range>
+ </package>
+ </affects>
+ <description>
+ <body xmlns="http://www.w3.org/1999/xhtml">
+ <p>Official blog of RubyGems reports:</p>
+ <blockquote cite="https://www.ruby-lang.org/en/news/2017/08/29/multiple-vulnerabilities-in-rubygems/">
+ <p>The following vulnerabilities have been reported: a DNS request
+ hijacking vulnerability, an ANSI escape sequence vulnerability, a DoS
+ vulnerability in the query command, and a vulnerability in the gem
+ installer that allowed a malicious gem to overwrite arbitrary
+ files.</p>
+ </blockquote>
+ </body>
+ </description>
+ <references>
+ <url>https://www.ruby-lang.org/en/news/2017/08/29/multiple-vulnerabilities-in-rubygems/</url>
+ </references>
+ <dates>
+ <discovery>2017-08-29</discovery>
+ <entry>2017-08-29</entry>
+ </dates>
+ </vuln>
+
<vuln vid="7d7e05fb-64da-435a-84fb-4061493b89b9">
<topic>kanboard -- multiple privilege escalation vulnerabilities</topic>
<affects>
@@ -292,7 +422,7 @@ Notes:
<affects>
<package>
<name>pspp</name>
- <range><lt>1.0.0</lt></range>
+ <range><lt>1.0.1</lt></range>
</package>
</affects>
<description>
@@ -328,6 +458,7 @@ Notes:
<dates>
<discovery>2017-08-18</discovery>
<entry>2017-08-22</entry>
+ <modified>2017-08-30</modified>
</dates>
</vuln>
diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile
index b2f119010dd9..42070a99b825 100644
--- a/shells/zsh/Makefile
+++ b/shells/zsh/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= zsh
-DISTVERSION= 5.4.1
+DISTVERSION= 5.4.2
CATEGORIES= shells
MASTER_SITES= http://www.zsh.org/pub/ \
SF \
diff --git a/shells/zsh/distinfo b/shells/zsh/distinfo
index b90f0861786f..276370e2dec0 100644
--- a/shells/zsh/distinfo
+++ b/shells/zsh/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1502363252
-SHA256 (zsh-5.4.1.tar.xz) = 94cbd57508287e8faa081424509738d496f5f41e32ed890e3a5498ce05d3633b
-SIZE (zsh-5.4.1.tar.xz) = 2972824
-SHA256 (zsh-5.4.1-doc.tar.xz) = b8b1a40aeec852806ad2b74b0a0c534320bf517e2fe2a087c0c9d39e75dc29f1
-SIZE (zsh-5.4.1-doc.tar.xz) = 3197560
+TIMESTAMP = 1504170017
+SHA256 (zsh-5.4.2.tar.xz) = a80b187b6b770f092ea1f53e89021d06c03d8bbe6a5e996bcca3267de14c5e52
+SIZE (zsh-5.4.2.tar.xz) = 2983492
+SHA256 (zsh-5.4.2-doc.tar.xz) = 5229cc93ebe637a07deb5b386b705c37a50f4adfef788b3c0f6647741df4f6bd
+SIZE (zsh-5.4.2-doc.tar.xz) = 3198880
diff --git a/shells/zsh/pkg-plist b/shells/zsh/pkg-plist
index 79c2f187414d..3b4f87510d5e 100644
--- a/shells/zsh/pkg-plist
+++ b/shells/zsh/pkg-plist
@@ -354,6 +354,7 @@ bin/zsh-%%ZSH_VER%%
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_bison
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_bittorrent
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_bogofilter
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_bpf_filters
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_bpython
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_bzip2
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_bzr
@@ -536,6 +537,7 @@ bin/zsh-%%ZSH_VER%%
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_net_interfaces
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_netcat
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_newsgroups
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_ngrep
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_nice
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_nkf
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_nl
@@ -602,6 +604,7 @@ bin/zsh-%%ZSH_VER%%
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_ri
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_rlogin
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_rm
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_route
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_rrdtool
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_rsync
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_rubber
@@ -689,12 +692,14 @@ bin/zsh-%%ZSH_VER%%
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_vorbis
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_vorbiscomment
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_vux
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_w
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_w3m
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_watch
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_wc
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_webbrowser
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_wget
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_whereis
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_who
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_whois
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_wiggle
%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_xargs
diff --git a/sysutils/Makefile b/sysutils/Makefile
index a91bd54f1b36..75ae0bfa3e80 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -43,6 +43,7 @@
SUBDIR += apachetop
SUBDIR += apcpwr
SUBDIR += apcupsd
+ SUBDIR += aptly
SUBDIR += arcconf
SUBDIR += archivemount
SUBDIR += areca-cli
@@ -78,6 +79,11 @@
SUBDIR += bacula5-client-static
SUBDIR += bacula5-docs
SUBDIR += bacula5-server
+ SUBDIR += bacula9-bat
+ SUBDIR += bacula9-client
+ SUBDIR += bacula9-client-static
+ SUBDIR += bacula9-docs
+ SUBDIR += bacula9-server
SUBDIR += baloo
SUBDIR += baloo-widgets
SUBDIR += bamf
diff --git a/sysutils/acpica-tools/Makefile b/sysutils/acpica-tools/Makefile
index 050b63423eb0..1a58dab08bfc 100644
--- a/sysutils/acpica-tools/Makefile
+++ b/sysutils/acpica-tools/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= acpica
-PORTVERSION= 20170728
+PORTVERSION= 20170831
CATEGORIES= sysutils devel
MASTER_SITES= https://acpica.org/sites/acpica/files/ \
LOCAL/jkim
diff --git a/sysutils/acpica-tools/distinfo b/sysutils/acpica-tools/distinfo
index 85fb940b1e7e..99fa7546872f 100644
--- a/sysutils/acpica-tools/distinfo
+++ b/sysutils/acpica-tools/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501262970
-SHA256 (acpica-unix-20170728.tar.gz) = 6f9a37125bbb07c0a90fa25b59153b2774f6abe0e43eb1ddde852e43b21939ab
-SIZE (acpica-unix-20170728.tar.gz) = 1752637
+TIMESTAMP = 1504197806
+SHA256 (acpica-unix-20170831.tar.gz) = c918a422f6c72e27b08c841158b52d870b92730fb6406b33d20ef50b1d2b4113
+SIZE (acpica-unix-20170831.tar.gz) = 1757523
diff --git a/sysutils/aptly/Makefile b/sysutils/aptly/Makefile
new file mode 100644
index 000000000000..65cb9918ce53
--- /dev/null
+++ b/sysutils/aptly/Makefile
@@ -0,0 +1,22 @@
+# $FreeBSD$
+
+PORTNAME= aptly
+PORTVERSION= 1.1.1
+DISTVERSIONPREFIX=v
+CATEGORIES= sysutils
+
+MAINTAINER= romain@FreeBSD.org
+COMMENT= Debian repository management tool
+
+LICENSE= MIT
+LICENSE_FILE= ${WRKSRC}/LICENSE
+
+USES= go
+
+USE_GITHUB= yes
+GH_ACCOUNT= smira
+GO_PKGNAME= github.com/smira/aptly
+
+PLIST_FILES= bin/aptly
+
+.include <bsd.port.mk>
diff --git a/sysutils/aptly/distinfo b/sysutils/aptly/distinfo
new file mode 100644
index 000000000000..4bddbe086e71
--- /dev/null
+++ b/sysutils/aptly/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1503643522
+SHA256 (smira-aptly-v1.1.1_GH0.tar.gz) = 92aa5caa12d756cb7469fa5772a03d7631b73d655b7329408a4d597ee8fb0ba4
+SIZE (smira-aptly-v1.1.1_GH0.tar.gz) = 18403464
diff --git a/sysutils/aptly/pkg-descr b/sysutils/aptly/pkg-descr
new file mode 100644
index 000000000000..d5db177000df
--- /dev/null
+++ b/sysutils/aptly/pkg-descr
@@ -0,0 +1,6 @@
+aptly is a swiss army knife for Debian repository management: it allows you to
+mirror remote repositories, manage local package repositories, take snapshots,
+pull new versions of packages along with dependencies, publish as Debian
+repository.
+
+WWW: https://www.aptly.info/
diff --git a/sysutils/azure-agent/Makefile b/sysutils/azure-agent/Makefile
index 7f711455df27..680a0fc18e42 100644
--- a/sysutils/azure-agent/Makefile
+++ b/sysutils/azure-agent/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= azure-agent
-PORTVERSION= 2.2.13
+PORTVERSION= 2.2.14
DISTVERSIONPREFIX= v
PORTREVISION= 1
CATEGORIES= sysutils
@@ -15,6 +15,7 @@ RUN_DEPENDS= python:lang/python \
sudo:security/sudo \
bash:shells/bash \
base64:converters/base64 \
+ dmidecode:sysutils/dmidecode \
${PYTHON_PKGNAMEPREFIX}pyasn1>=0:devel/py-pyasn1 \
${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
diff --git a/sysutils/azure-agent/distinfo b/sysutils/azure-agent/distinfo
index eb27dc679e0a..c70eda0786b5 100644
--- a/sysutils/azure-agent/distinfo
+++ b/sysutils/azure-agent/distinfo
@@ -1,3 +1,3 @@
TIMESTAMP = 1497364262
-SHA256 (Azure-WALinuxAgent-v2.2.13_GH0.tar.gz) = 7a5739f5be91107afb6bfcf7acc93aff50638820c368ff0845a9899274291ee0
-SIZE (Azure-WALinuxAgent-v2.2.13_GH0.tar.gz) = 690906
+SHA256 (Azure-WALinuxAgent-v2.2.14_GH0.tar.gz) = d76c1db57ac7a019ac2262f9665b56fbce7bb4cdaeb0d30810d892fbb1ec856e
+SIZE (Azure-WALinuxAgent-v2.2.14_GH0.tar.gz) = 692532
diff --git a/sysutils/bacula9-bat/Makefile b/sysutils/bacula9-bat/Makefile
new file mode 100644
index 000000000000..c6da4c4f4f5e
--- /dev/null
+++ b/sysutils/bacula9-bat/Makefile
@@ -0,0 +1,30 @@
+# Created by: Dan Langille <dan@langille.org>
+# $FreeBSD$
+
+PORTNAME= bacula
+PKGNAMESUFFIX= 9-bat
+
+COMMENT= Network backup solution (GUI)
+
+LIB_DEPENDS+= libqwt.so:x11-toolkits/qwt5 \
+ libbac.so:sysutils/bacula9-client
+
+USES= pkgconfig
+USE_QT4= qmake_build uic_build moc_build rcc_build
+WITH_BAT= yes
+
+PLIST= ${.CURDIR}/pkg-plist
+MAKE_ENV+= MAKEOBJDIRPREFIX=/
+
+MASTERDIR= ${.CURDIR}/../../sysutils/bacula9-server
+
+CONFIGURE_ARGS+= --enable-bat \
+ --with-qwt=${LOCALBASE}/lib \
+ --disable-build-dird \
+ --disable-build-stored \
+ --enable-client-only
+
+OPTIONS_DEFINE= #
+OPTIONS_DEFAULT=#
+
+.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/bacula9-bat/pkg-descr b/sysutils/bacula9-bat/pkg-descr
new file mode 100644
index 000000000000..91e157ffc8b8
--- /dev/null
+++ b/sysutils/bacula9-bat/pkg-descr
@@ -0,0 +1,13 @@
+bat is the GUI inteface for Bacula.
+
+Bacula is a set of computer programs that permit you (or the system
+administrator) to manage backup, recovery, and verification of
+computer data across a network of computers of different kinds.
+In technical terms, it is a network Client/Server based backup program.
+Bacula is relatively easy to use and efficient, while offering many
+advanced storage management features that make it easy to find and
+recover lost or damaged files. Due to its modular design, Bacula is
+scalable from small single computer systems to systems consisting of
+hundreds of computers located over a large network.
+
+WWW: http://www.bacula.org/
diff --git a/sysutils/bacula9-bat/pkg-plist b/sysutils/bacula9-bat/pkg-plist
new file mode 100644
index 000000000000..9cd89bca56cc
--- /dev/null
+++ b/sysutils/bacula9-bat/pkg-plist
@@ -0,0 +1,4 @@
+@sample %%ETCDIR%%/bat.conf.sample
+man/man1/bat.1.gz
+sbin/bat
+
diff --git a/sysutils/bacula9-client-static/Makefile b/sysutils/bacula9-client-static/Makefile
new file mode 100644
index 000000000000..763fa8f13e7b
--- /dev/null
+++ b/sysutils/bacula9-client-static/Makefile
@@ -0,0 +1,29 @@
+# $FreeBSD$
+
+PORTNAME= bacula
+PKGNAMESUFFIX= 9-client-static
+
+COMMENT= Network backup solution (static client)
+
+WITH_CLIENT_ONLY=yes
+PLIST= ${.CURDIR}/pkg-plist
+MASTERDIR= ${.CURDIR}/../../sysutils/bacula9-server
+
+PLIST_FILES= sbin/bacula-fd-static \
+ sbin/bconsole-static
+
+OPTIONS_DEFINE= NLS OPENSSL
+OPTIONS_DEFAULT=OPENSSL
+
+CONFIGURE_ARGS+= --enable-client-only \
+ --enable-static-fd \
+ --enable-static-cons \
+ --disable-libtool \
+ --disable-build-dird \
+ --disable-build-stored
+
+BROKEN_aarch64= Fails to link: missing sbrk
+
+BROKEN_SSL= libressl
+
+.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/bacula9-client/Makefile b/sysutils/bacula9-client/Makefile
new file mode 100644
index 000000000000..7a709d2cef6b
--- /dev/null
+++ b/sysutils/bacula9-client/Makefile
@@ -0,0 +1,18 @@
+# $FreeBSD$
+
+PORTNAME= bacula
+PKGNAMESUFFIX= 9-client
+
+COMMENT= Network backup solution (client)
+
+WITH_CLIENT_ONLY=yes
+USE_RC_SUBR= bacula-fd
+
+PLIST= ${PKGDIR}/pkg-plist.client
+MASTERDIR= ${.CURDIR}/../../sysutils/bacula9-server
+
+OPTIONS_DEFINE= NLS PYTHON IPV6
+
+BROKEN_aarch64= Fails to link: missing sbrk
+
+.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/bacula9-docs/Makefile b/sysutils/bacula9-docs/Makefile
new file mode 100644
index 000000000000..76c3eb4e65ef
--- /dev/null
+++ b/sysutils/bacula9-docs/Makefile
@@ -0,0 +1,26 @@
+# Created by: Dan Langille <dan@langille.org>
+# $FreeBSD$
+
+PORTNAME= bacula
+PORTVERSION= 9.0.3
+CATEGORIES= sysutils
+MASTER_SITES= SF
+PKGNAMESUFFIX= 9-docs
+DISTNAME= ${PORTNAME}-docs-${PORTVERSION}
+
+CONFLICTS= bacula-* bacula5-*
+
+MAINTAINER= dvl@FreeBSD.org
+COMMENT= Bacula document set
+
+USES= tar:bz2
+NO_BUILD= yes
+
+PORTDOCS= *.pdf
+
+do-install:
+ ${MKDIR} ${STAGEDIR}${DOCSDIR}
+ ${FIND} ${WRKSRC}/manuals/en \
+ -name "*.pdf" -exec ${INSTALL_DATA} {} ${STAGEDIR}${DOCSDIR}/ \;
+
+.include <bsd.port.mk>
diff --git a/sysutils/bacula9-docs/distinfo b/sysutils/bacula9-docs/distinfo
new file mode 100644
index 000000000000..08297efb51ac
--- /dev/null
+++ b/sysutils/bacula9-docs/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1503938340
+SHA256 (bacula-docs-9.0.3.tar.bz2) = 96ed36991d486f4fd5cb0734d3fa7c12f7dbcac936d0e0a87d6c25f7fa3066cb
+SIZE (bacula-docs-9.0.3.tar.bz2) = 50216652
diff --git a/sysutils/bacula9-docs/pkg-descr b/sysutils/bacula9-docs/pkg-descr
new file mode 100644
index 000000000000..2beb63b5605d
--- /dev/null
+++ b/sysutils/bacula9-docs/pkg-descr
@@ -0,0 +1,13 @@
+Bacula is a set of computer programs that permit you (or the system
+administrator) to manage backup, recovery, and verification of
+computer data across a network of computers of different kinds.
+In technical terms, it is a network Client/Server based backup program.
+Bacula is relatively easy to use and efficient, while offering many
+advanced storage management features that make it easy to find and
+recover lost or damaged files. Due to its modular design, Bacula is
+scalable from small single computer systems to systems consisting of
+hundreds of computers located over a large network.
+
+This port installs the latest documentation for Bacula.
+
+WWW: http://www.bacula.org/
diff --git a/sysutils/bacula9-server/Makefile b/sysutils/bacula9-server/Makefile
new file mode 100644
index 000000000000..5f0229e6e00e
--- /dev/null
+++ b/sysutils/bacula9-server/Makefile
@@ -0,0 +1,217 @@
+# Created by: Dmitry Sivachenko <demon@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME= bacula
+PORTVERSION= 9.0.3
+PORTREVISION= 0
+CATEGORIES?= sysutils
+MASTER_SITES= SF/bacula/bacula/${PORTVERSION}
+PKGNAMEPREFIX?= #
+PKGNAMESUFFIX?= 9-server
+
+MAINTAINER= dvl@FreeBSD.org
+COMMENT?= Network backup solution (server)
+
+USES+= libtool readline shebangfix ssl
+SHEBANG_FILES= scripts/dvd-handler.in src/cats/make_catalog_backup.pl.in
+python_OLD_CMD= @PYTHON@
+
+CONFLICTS?= bacula5-server-* bacula-server-*
+
+LIB_DEPENDS+= liblzo2.so:archivers/lzo2
+
+USERS= bacula
+GROUPS= ${USERS}
+
+PLIST_SUB+= LIB_VERSION=${PORTVERSION}
+
+GNU_CONFIGURE= yes
+USE_LDCONFIG= yes
+
+CPPFLAGS+= -I/usr/include/readline -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
+
+OPTIONS_DEFINE?= MTX PYTHON NLS IPV6
+MTX_DESC= Install mtx for control of autochanger devices
+
+.if ${PKGNAMESUFFIX} == "9-server"
+OPTIONS_MULTI= BACKEND
+OPTIONS_MULTI_BACKEND= SQLITE3 MYSQL PGSQL
+OPTIONS_DEFAULT+= PGSQL
+.endif
+
+OPTIONS_SUB= yes
+
+.if ${PKGNAMESUFFIX} == "9-client" || ${PKGNAMESUFFIX} == "9-server" #Till end of the file
+
+PYTHON_USES= python
+PYTHON_CONFIGURE_ON= --with-python=yes
+
+.if !defined(WITH_CLIENT_ONLY)
+LIB_DEPENDS+= libbac-${PORTVERSION}.so:sysutils/bacula9-client
+USE_RC_SUBR?= bacula-dir bacula-sd
+.endif
+
+.if defined(WITH_CLIENT_ONLY)
+SUB_FILES+= pkg-install.client pkg-deinstall.client pkg-message.client
+.else
+SUB_FILES+= pkg-message.server
+.endif
+
+CONFIGURE_ARGS+=--with-tcp-wrappers=/usr/lib \
+ --enable-smartalloc \
+ --sysconfdir=${ETCDIR} \
+ --with-working-dir=${BACULA_DIR} \
+ --with-scriptdir=${PREFIX}/share/${PORTNAME} \
+ --disable-conio \
+ --enable-batch-insert \
+ --with-plugindir=${PREFIX}/lib \
+ --with-dump-email=root@localhost \
+ --with-job-email=root@localhost \
+ --with-db-name=bacula \
+ --with-sbin-perm=755 \
+ --with-db-user=bacula \
+ --with-logdir=/var/log \
+ --with-baseport=9101
+
+.if defined(WITH_CLIENT_ONLY)
+CONFIGURE_ARGS+=--with-fd-user=root \
+ --with-fd-group=wheel
+.else
+CONFIGURE_ARGS+=--with-dir-user=${BACULA_USER} \
+ --with-dir-group=${BACULA_GROUP} \
+ --with-sd-user=${BACULA_USER} \
+ --with-sd-group=operator
+.endif
+
+# The user/group IDs below are registered, see
+# http://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/book.html#users-and-groups
+#
+BACULA_USER?= bacula
+BACULA_GROUP?= ${BACULA_USER}
+BACULA_UID?= bacula
+BACULA_GID?= ${BACULA_UID}
+BACULA_DIR?= /var/db/bacula
+
+PLIST_SUB+= BACULA_DIR=${BACULA_DIR}
+
+SUB_LIST= BACULA_USER=${BACULA_USER} \
+ BACULA_GROUP=${BACULA_GROUP} \
+ BACULA_UID=${BACULA_UID} \
+ BACULA_GID=${BACULA_GID} \
+ BACULA_DIR=${BACULA_DIR}
+
+NLS_USES= gettext
+NLS_CONFIGURE_ENABLE= nls
+
+# Client only or full server version
+.if defined(WITH_CLIENT_ONLY)
+CONFFILES= fd
+CONFIGURE_ARGS+= --enable-client-only
+
+PKGDEINSTALL= ${FILESDIR}/pkg-deinstall.client
+PKGINSTALL= ${FILESDIR}/pkg-install.client
+.else
+# Server only Options
+CONFFILES= sd dir
+# Server default database
+
+MYSQL_CONFIGURE_ON= --with-mysql=yes
+MYSQL_USES= mysql
+SQLITE3_CONFIGURE_ON= --with-sqlite3=yes
+SQLITE3_USES= sqlite:3
+PGSQL_CONFIGURE_ON= --with-postgresql=yes
+PGSQL_USES= pgsql
+
+MTX_RUN_DEPENDS= ${LOCALBASE}/sbin/mtx:misc/mtx
+
+.endif
+
+.include <bsd.port.pre.mk>
+
+.if ${SSL_DEFAULT:Mopenssl-devel}
+BROKEN= Does not build with openssl-devel
+.endif
+
+.if ${readline_ARGS} == "port"
+readline_CONFIGURE= ${LOCALBASE}
+.else
+readline_CONFIGURE= yes
+.endif
+
+# if IPv6 is not in the kernel, it generates many errors
+.if ! ${PORT_OPTIONS:MIPV6}
+CONFIGURE_ARGS+= --disable-ipv6
+.endif
+
+CONFIGURE_ARGS+= --with-readline=${readline_CONFIGURE}
+
+.if defined(WITH_CLIENT_ONLY)
+MP8+= bacula.8 bacula-fd.8 bconsole.8
+.else
+MP8+= bacula-dir.8 bacula-sd.8 bcopy.8 bextract.8 bls.8 bscan.8 \
+ btape.8 btraceback.8 dbcheck.8 bwild.8 bregex.8
+MP1+= bsmtp.1 bacula-tray-monitor.1
+.endif
+
+MAKE_ENV+= MAN8="${MP8}" MAN1="${MP1}"
+
+post-patch:
+ # This port does not install docs. See bacula-docs for that
+ @${REINPLACE_CMD} -e '/docdir/d' ${WRKSRC}/Makefile.in
+ # Change $(ECHO) to echo in some Makefile.in files
+ @${REINPLACE_CMD} -e 's|$$(ECHO)|echo|g' \
+ ${WRKSRC}/src/filed/Makefile.in \
+ ${WRKSRC}/src/console/Makefile.in \
+ ${WRKSRC}/src/cats/Makefile.in \
+ ${WRKSRC}/src/dird/Makefile.in \
+ ${WRKSRC}/src/stored/Makefile.in \
+ ${WRKSRC}/src/tools/Makefile.in
+
+ # Default bconsole.conf is in ${ETCDIR}
+ @${REINPLACE_CMD} -e 's|./bconsole.conf|${ETCDIR}/bconsole.conf|g' ${WRKSRC}/src/console/console.c
+ @${REINPLACE_CMD} -e 's|^MAN8 =|MAN8 ?=|g' -e 's|^MAN1 =|MAN1 ?=|g' ${WRKSRC}/manpages/Makefile.in
+.if defined(WITH_CLIENT_ONLY)
+ # In client port only install startup script out of script dir (see below post-install)
+ # Dont mkdir ${PREFIX}/share/bacula cause it's empty
+ @${REINPLACE_CMD} -e 's|^\(fd_subdirs = .*\)scripts\(.*\)|\1\2|g' ${WRKSRC}/Makefile.in
+ @${REINPLACE_CMD} -e 's|\(.*$${MKDIR} $${DESTDIR}$${scriptdir}\)|#\1|g' ${WRKSRC}/Makefile.in
+.else
+ # In server port don't install filed
+ @${REINPLACE_CMD} -e '/^fd_subdirs = /s|src/filed||' -e 's|src/console||' \
+ ${WRKSRC}/Makefile.in
+.endif
+
+.if !target(post-install)
+post-install:
+.if ! ${PORT_OPTIONS:MPYTHON}
+ ${RM} ${STAGEDIR}${DATADIR}/dvd-handler
+.endif
+.if defined(WITH_CLIENT_ONLY)
+ ${MV} ${STAGEDIR}${ETCDIR}/bconsole.conf ${STAGEDIR}${ETCDIR}/bconsole.conf.sample
+ ${INSTALL_DATA} ${WRKSRC}/examples/sample-query.sql ${STAGEDIR}${LOCALBASE}/share/bacula/query.sql.sample
+.else
+ ${INSTALL_SCRIPT} ${FILESDIR}/chio-bacula ${STAGEDIR}${PREFIX}/sbin
+ ${INSTALL_DATA} ${FILESDIR}/bacula-barcodes ${STAGEDIR}${ETCDIR}/bacula-barcodes.sample
+ # bacula-dir attempts to install query.sql as bpart of bacula-server, but that should only installed by bacula-client.
+ ${RM} ${STAGEDIR}${LOCALBASE}/share/bacula/query.sql
+
+ #the following are installed by the -CLIENT port, and I (ler@lerctr.org)
+ #don't know how to remove them from being built for the -SERVER port.
+ ${RM} ${STAGEDIR}${LOCALBASE}/lib/bpipe-fd.so
+ ${RM} ${STAGEDIR}${LOCALBASE}/lib/libbac-${PORTVERSION}.so
+ ${RM} ${STAGEDIR}${LOCALBASE}/lib/libbac.so
+ ${RM} ${STAGEDIR}${LOCALBASE}/lib/libbaccfg-${PORTVERSION}.so
+ ${RM} ${STAGEDIR}${LOCALBASE}/lib/libbaccfg.so
+ ${RM} ${STAGEDIR}${LOCALBASE}/lib/libbacfind-${PORTVERSION}.so
+ ${RM} ${STAGEDIR}${LOCALBASE}/lib/libbacfind.so
+.endif
+ for na in ${CONFFILES}; do \
+ ${MV} ${STAGEDIR}${ETCDIR}/bacula-$$na.conf ${STAGEDIR}${ETCDIR}/bacula-$$na.conf.sample; \
+ done
+.endif
+.else
+.include "${MASTERDIR}/Makefile.common"
+.endif # 9-client and 9-server are defined
+
+.include <bsd.port.post.mk>
diff --git a/sysutils/bacula9-server/Makefile.common b/sysutils/bacula9-server/Makefile.common
new file mode 100644
index 000000000000..a4ad34770fed
--- /dev/null
+++ b/sysutils/bacula9-server/Makefile.common
@@ -0,0 +1,24 @@
+.include <bsd.port.pre.mk>
+
+post-build:
+.if ${PKGNAMEPREFIX} == "nagios-check_"
+ ${MAKE_CMD} -C ${WRKSRC}/examples/nagios/check_bacula
+.endif
+
+do-install:
+.if ${PKGNAMESUFFIX} == "9-bat"
+# Install config files and preserve existing ones
+ ${MKDIR} ${STAGEDIR}${ETCDIR}
+ ${INSTALL_SCRIPT} ${WRKSRC}/src/qt-console/bat.conf ${STAGEDIR}${PREFIX}/etc/bacula/bat.conf.sample
+ ${INSTALL_MAN} ${WRKSRC}/manpages/bat.1 ${STAGEDIR}${PREFIX}/man/man1/
+ ${INSTALL_PROGRAM} ${WRKSRC}/src/qt-console/bat ${STAGEDIR}${PREFIX}/sbin
+.endif
+.if ${PKGNAMEPREFIX} == "nagios-check_"
+ @${MKDIR} ${STAGEDIR}${PREFIX}/libexec/nagios
+ ${INSTALL_PROGRAM} ${WRKSRC}/examples/nagios/check_bacula/check_bacula \
+ ${STAGEDIR}${PREFIX}/libexec/nagios
+.endif
+.if ${PKGNAMESUFFIX} == "9-client-static"
+ ${INSTALL_PROGRAM} ${WRKSRC}/src/filed/static-bacula-fd ${STAGEDIR}${PREFIX}/sbin/bacula-fd-static
+ ${INSTALL_PROGRAM} ${WRKSRC}/src/console/static-bconsole ${STAGEDIR}${PREFIX}/sbin/bconsole-static
+.endif
diff --git a/sysutils/bacula9-server/distinfo b/sysutils/bacula9-server/distinfo
new file mode 100644
index 000000000000..d1dbeee54b22
--- /dev/null
+++ b/sysutils/bacula9-server/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1503524082
+SHA256 (bacula-9.0.3.tar.gz) = ae8501960d43399bea13113274993637b6395d73d7d2c47f9b7a07cb4aa72251
+SIZE (bacula-9.0.3.tar.gz) = 3951688
diff --git a/sysutils/bacula9-server/files/bacula-barcodes b/sysutils/bacula9-server/files/bacula-barcodes
new file mode 100644
index 000000000000..0a0b2dc28f24
--- /dev/null
+++ b/sysutils/bacula9-server/files/bacula-barcodes
@@ -0,0 +1,51 @@
+#
+# Bacula barcode simulation file
+# used by ${PREFIX}/sbin/chio-bacula (FreeBSD)
+#
+# The volumenames are returned by the "changer list" command
+# labeling in the console is done by "label barcodes"
+# (then all volumes belog to the default pool).
+# All Lines with an "#" at the bedinning are ignored
+#
+# !!!! If you export an tape and reinsert another one,
+# !!!! don't forget to change the volume name in this file!
+#
+1:Volume1-100
+2:Volume1-101
+3:Volume1-102
+4:Volume1-103
+5:Volume1-104
+6:Volume1-105
+7:Volume1-106
+8:Volume1-107
+9:Volume1-108
+10:Volume1-109
+11:Volume1-110
+12:Volume1-111
+#
+# Further volumes exported from the changer
+#
+# 36GB AIT2 tapes
+#Volume1-100
+#Volume1-101
+#Volume1-102
+#Volume1-103
+#Volume1-104
+#Volume1-105
+#Volume1-106
+#Volume1-107
+#Volume1-108
+#Volume1-109
+#Volume1-110
+#Volume1-111
+#Volume1-112
+#Volume1-113
+#Volume1-114
+#Volume1-115
+#
+# 50GB AIT2 tapes
+#Volume2-200
+#Volume2-201
+#Volume2-202
+#Volume2-203
+#Volume2-204
diff --git a/sysutils/bacula9-server/files/bacula-dir.in b/sysutils/bacula9-server/files/bacula-dir.in
new file mode 100644
index 000000000000..49086897bd68
--- /dev/null
+++ b/sysutils/bacula9-server/files/bacula-dir.in
@@ -0,0 +1,31 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+# PROVIDE: bacula_dir
+# REQUIRE: DAEMON %%REQ_MYSQL%% %%REQ_PGSQL%%
+# KEYWORD: shutdown
+#
+# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
+# to enable this service:
+#
+# bacula_dir_enable (bool): Set to NO by default.
+# Set it to YES to enable bacula_dir.
+# bacula_dir_flags (params): Set params used to start bacula_dir.
+#
+
+. /etc/rc.subr
+
+name="bacula_dir"
+rcvar=${name}_enable
+command=%%PREFIX%%/sbin/bacula-dir
+
+load_rc_config $name
+
+: ${bacula_dir_enable="NO"}
+: ${bacula_dir_flags=" -u bacula -g bacula -v -c %%PREFIX%%/etc/bacula/bacula-dir.conf"}
+: ${bacula_dir_pidfile="/var/run/bacula-dir.9101.pid"}
+
+pidfile="${bacula_dir_pidfile}"
+
+run_rc_command "$1"
diff --git a/sysutils/bacula9-server/files/bacula-fd.in b/sysutils/bacula9-server/files/bacula-fd.in
new file mode 100644
index 000000000000..70add50a1915
--- /dev/null
+++ b/sysutils/bacula9-server/files/bacula-fd.in
@@ -0,0 +1,31 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+# PROVIDE: bacula_fd
+# REQUIRE: DAEMON
+# KEYWORD: shutdown
+#
+# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
+# to enable this service:
+#
+# bacula_fd_enable (bool): Set to NO by default.
+# Set it to YES to enable bacula_fd.
+# bacula_fd_flags (params): Set params used to start bacula_fd.
+#
+
+. /etc/rc.subr
+
+name="bacula_fd"
+rcvar=${name}_enable
+command=%%PREFIX%%/sbin/bacula-fd
+
+load_rc_config $name
+
+: ${bacula_fd_enable="NO"}
+: ${bacula_fd_flags=" -u root -g wheel -v -c %%PREFIX%%/etc/bacula/bacula-fd.conf"}
+: ${bacula_fd_pidfile="/var/run/bacula-fd.9102.pid"}
+
+pidfile="${bacula_fd_pidfile}"
+
+run_rc_command "$1"
diff --git a/sysutils/bacula9-server/files/bacula-sd.in b/sysutils/bacula9-server/files/bacula-sd.in
new file mode 100644
index 000000000000..1c37c68fd6d5
--- /dev/null
+++ b/sysutils/bacula9-server/files/bacula-sd.in
@@ -0,0 +1,31 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+# PROVIDE: bacula_sd
+# REQUIRE: DAEMON
+# KEYWORD: shutdown
+#
+# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
+# to enable this service:
+#
+# bacula_sd_enable (bool): Set to NO by default.
+# Set it to YES to enable bacula_sd.
+# bacula_sd_flags (params): Set params used to start bacula_sd.
+#
+
+. /etc/rc.subr
+
+name="bacula_sd"
+rcvar=${name}_enable
+command=%%PREFIX%%/sbin/bacula-sd
+
+load_rc_config $name
+
+: ${bacula_sd_enable="NO"}
+: ${bacula_sd_flags=" -u bacula -g bacula -v -c %%PREFIX%%/etc/bacula/bacula-sd.conf"}
+: ${bacula_sd_pidfile="/var/run/bacula-sd.9103.pid"}
+
+pidfile="${bacula_sd_pidfile}"
+
+run_rc_command "$1"
diff --git a/sysutils/bacula9-server/files/chio-bacula b/sysutils/bacula9-server/files/chio-bacula
new file mode 100644
index 000000000000..6650426857dc
--- /dev/null
+++ b/sysutils/bacula9-server/files/chio-bacula
@@ -0,0 +1,200 @@
+#!/bin/sh
+#
+# Bacula interface to FreeBSD chio autoloader command with
+# multiple drive support
+# (By Lars Köller, lars+bacula@koellers.net, 2004)
+#
+# If you set in your Device resource
+#
+# Changer Command = "path-to-this-script/chio-bacula" %c %o %S %a
+# you will have the following input to this script:
+#
+# chio-bacula "changer-device" "command" "slot" "archive-device" "drive-index"
+# $1 $2 $3 $4 $5
+# for example:
+#
+# chio-bacula /dev/sg0 load 1 /dev/nst0 0 (on a FreeBSD system)
+#
+# If you need to to an offline, refer to the drive as $4
+# e.g. mt -f $f offline
+#
+# Many changers need an offline after the unload. Also many
+# changers need a sleep 60 after the mtx load.
+#
+# N.B. If you change the script, take care to return either
+# the mtx exit code or a 0. If the script exits with a non-zero
+# exit code, Bacula will assume the request failed.
+#
+me=$(basename $0)
+
+# Debug output, take care this file is writeable for user bacula!
+#LOG=/var/db/bacula/chio-bacula.log
+#exec 2>>$LOG
+#echo "------------------------- $(date) Start $(basename $0) -------------------------" >> $LOG
+#set -x
+
+# Debug
+logger -p user.err "$me $@"
+
+# This simulates a barcode reader in the changer.
+# The labes of the virtual barcode reader are located in the BARCODE_FILE
+SIMULATE_BARCODE=true
+BARCODE_FILE=/usr/local/etc/bacula/bacula-barcodes
+MTX=/bin/chio
+# Set default values (see case statement below for
+# free mapping of drive index and tape device
+# We have a double drive Qualstar where drive 1 is the default bacula drive
+#TAPE=/dev/bacula-tape
+TAPE=/dev/nrsa0
+DRIVE=0
+# Time to wait for (un)loading
+SLEEP=20
+
+usage()
+{
+ echo ""
+ echo "The $me script for bacula"
+ echo "--------------------------------------"
+ echo ""
+ echo "usage: $me <changer-device> <command> [slot] [devicename of tapedrive] [drive index]"
+ echo ""
+ echo "Valid commands:"
+ echo ""
+ echo "unload Unloads a tape into the slot"
+ echo " from where it was loaded."
+ echo "load <slot> Loads a tape from the slot <slot>"
+ echo " (slot-base is calculated to 1 as first slot)"
+ echo "list Lists full storage slots"
+ echo "loaded Gives slot from where the tape was loaded."
+ echo " 0 means the tape drive is empty."
+ echo "slots Gives Number of aviable slots."
+ echo ""
+ echo "Example:"
+ echo " $me /dev/changer load 1 loads a tape from slot 1"
+ echo ""
+ exit 2
+}
+
+# The changer device
+if [ -z "$1" ] ; then
+ usage;
+else
+ CHANGER=$1
+fi
+# The command
+if [ -z "$2" ] ; then
+ usage;
+else
+ COMMAND=$2
+fi
+# The slot number
+if [ ! -z "$3" ]; then
+ SLOT=$3
+ # btape fill says "... slot 1 drive 0" :-(
+ if [ "$SLOT" = "slot" ]; then
+ shift
+ SLOT=$3
+ fi
+fi
+# Set tape device
+if [ ! -z "$4" ]; then
+ TAPE=$4
+fi
+
+# Here you can map bacula drive number to any tape device
+# DRIVE is the chio drive number used below by chio!
+case $5 in
+ 0)
+ # First Drive in Changer is Bacula drive
+ DRIVE=0
+ #TAPE=/dev/bacula-tape
+ TAPE=/dev/nrsa0
+ ;;
+ 1)
+ DRIVE=1
+ #TAPE=/dev/bacula-tape2
+ TAPE=/dev/nrsa1
+ ;;
+esac
+
+#
+# Main
+#
+case ${COMMAND} in
+ unload)
+ # enable the following line if you need to eject the cartridge
+ mt -f ${TAPE} off
+ sleep 2
+ # if we have a slot, try it
+ if [ ! -z "$SLOT" ]; then
+ ${MTX} -f ${CHANGER} move drive ${DRIVE} slot $((${SLOT}-1))
+ exit $?
+ fi
+ # Try other way (works if source element information is valid for drive)
+ ${MTX} -f ${CHANGER} return drive ${DRIVE}
+ # If the changer is power cycled with a tape loaded in a drive
+ # we can compute the slot in case of a complete filled magazine, with
+ # one slot free.
+ if [ "$?" != "0" ]; then
+ free_slot=`${MTX} -f ${CHANGER} stat | grep "^slot " | grep -v "FULL" | awk '{print $2}'`
+ free_slot=${free_slot%:}
+ ${MTX} -f ${CHANGER} move drive ${DRIVE} slot $free_slot
+ fi
+ ;;
+
+ load)
+ ${MTX} -f ${CHANGER} move slot $((${SLOT}-1)) drive ${DRIVE}
+ rtn=$?
+ # Increase the sleep time if you have a slow device
+ sleep $SLEEP
+ exit $rtn
+ ;;
+
+ list)
+ if [ "${SIMULATE_BARCODE}" = "true" ]; then
+ if [ -f "$BARCODE_FILE" ]; then
+ cat $BARCODE_FILE | grep -v -e "^#" -e "^$"
+ exit 0
+ else
+ echo "Barcode file $BARCODE_FILE missing ... exiting!"
+ exit 1
+ fi
+ else
+ ${MTX} -f ${CHANGER} status | grep "^slot .*: .*FULL>" | awk '{print $2}' | awk -F: '{print $1+1" "}' | tr -d "[\r\n]"
+ fi
+ ;;
+
+ loaded)
+ # echo "Request loaded"
+ ${MTX} -f ${CHANGER} status -S > /tmp/mtx.$$
+ rtn=$?
+ # Try to get chio slot source from drive entry
+ SLOT=$(cat /tmp/mtx.$$ | grep "^drive ${DRIVE}: <FULL> .*slot" | awk '{print $6+1}' | tr -d ">")
+ if [ -z "$SLOT" ]; then
+ # This handles the case a source slot is not available (power on
+ # of the changer with a drive loaded) and all other slots are
+ # occupied with a tape!
+ SLOT=$(cat /tmp/mtx.$$ | grep "^slot .*: <ACCESS>" | awk '{print $2+1}')
+ if [ -z "$SLOT" ]; then
+ echo 0
+ else
+ echo $SLOT
+ fi
+ else
+ echo $SLOT
+ fi
+ # All tapes are in the slots
+ #cat /tmp/mtx.$$ | grep "^drive ${DRIVE}: .* source: <>" | awk "{print 0}"
+ rm -f /tmp/mtx.$$
+ exit $rtn
+ ;;
+
+ slots)
+ # echo "Request slots"
+ ${MTX} -f ${CHANGER} status | grep "^slot " | tail -1 | awk '{print $2+1}' | tr -d ":"
+ ;;
+
+ *)
+ usage
+ ;;
+esac
diff --git a/sysutils/bacula9-server/files/patch-src_console_Makefile.in b/sysutils/bacula9-server/files/patch-src_console_Makefile.in
new file mode 100644
index 000000000000..d41747a16d07
--- /dev/null
+++ b/sysutils/bacula9-server/files/patch-src_console_Makefile.in
@@ -0,0 +1,11 @@
+--- src/console/Makefile.in.orig 2015-08-13 13:52:24 UTC
++++ src/console/Makefile.in
+@@ -121,7 +121,7 @@ uninstall:
+ depend:
+ @$(MV) Makefile Makefile.bak
+ @$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile
+- @$(ECHO) "# DO NOT DELETE: nice dependency list follows" >> Makefile
++ @echo "# DO NOT DELETE: nice dependency list follows" >> Makefile
+ @$(CXX) -S -M $(CPPFLAGS) $(CONS_INC) -I$(srcdir) -I$(basedir) *.c >> Makefile
+ @if test -f Makefile ; then \
+ $(RMF) Makefile.bak; \
diff --git a/sysutils/bacula9-server/files/patch-src_dird_Makefile.in b/sysutils/bacula9-server/files/patch-src_dird_Makefile.in
new file mode 100644
index 000000000000..132291431a90
--- /dev/null
+++ b/sysutils/bacula9-server/files/patch-src_dird_Makefile.in
@@ -0,0 +1,11 @@
+--- src/dird/Makefile.in.orig 2015-08-13 13:52:24 UTC
++++ src/dird/Makefile.in
+@@ -140,7 +140,7 @@ uninstall:
+ depend:
+ @$(MV) Makefile Makefile.bak
+ @$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile
+- @$(ECHO) "# DO NOT DELETE: nice dependency list follows" >> Makefile
++ @echo "# DO NOT DELETE: nice dependency list follows" >> Makefile
+ @$(CXX) -S -M $(CPPFLAGS) $(XINC) -I$(srcdir) -I$(basedir) *.c >> Makefile
+ @if test -f Makefile ; then \
+ $(RMF) Makefile.bak; \
diff --git a/sysutils/bacula9-server/files/patch-src_filed_Makefile.in b/sysutils/bacula9-server/files/patch-src_filed_Makefile.in
new file mode 100644
index 000000000000..8886fc40f83d
--- /dev/null
+++ b/sysutils/bacula9-server/files/patch-src_filed_Makefile.in
@@ -0,0 +1,11 @@
+--- src/filed/Makefile.in.orig 2015-08-13 13:52:24 UTC
++++ src/filed/Makefile.in
+@@ -137,7 +127,7 @@ uninstall:
+ depend:
+ @$(MV) Makefile Makefile.bak
+ @$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile
+- @$(ECHO) "# DO NOT DELETE: nice dependency list follows" >> Makefile
++ @echo "# DO NOT DELETE: nice dependency list follows" >> Makefile
+ @$(CXX) -S -M $(CPPFLAGS) $(XINC) $(LZO_INC) -I$(srcdir) -I$(basedir) *.c >> Makefile
+ @if test -f Makefile ; then \
+ $(RMF) Makefile.bak; \
diff --git a/sysutils/bacula9-server/files/patch-src_qt-console_bat.pro.in b/sysutils/bacula9-server/files/patch-src_qt-console_bat.pro.in
new file mode 100644
index 000000000000..1bca6f6d819b
--- /dev/null
+++ b/sysutils/bacula9-server/files/patch-src_qt-console_bat.pro.in
@@ -0,0 +1,11 @@
+--- src/qt-console/bat.pro.in.orig 2015-08-13 13:52:24 UTC
++++ src/qt-console/bat.pro.in
+@@ -19,7 +19,7 @@ TEMPLATE = app
+ TARGET = bat
+ DEPENDPATH += .
+ INCLUDEPATH += .. . ./console ./restore ./select
+-LIBS += -L../lib -lbaccfg -lbac -L../findlib -lbacfind @OPENSSL_LIBS@
++LIBS += -L../lib -lbaccfg -lbac -L../findlib -lbacfind @OPENSSL_LIBS@ -lintl
+ LIBTOOL_LINK = @QMAKE_LIBTOOL@ --silent --tag=CXX --mode=link
+ LIBTOOL_INSTALL = @QMAKE_LIBTOOL@ --silent --mode=install
+ QMAKE_LINK = $${LIBTOOL_LINK} $(CXX)
diff --git a/sysutils/bacula9-server/files/pkg-deinstall.client.in b/sysutils/bacula9-server/files/pkg-deinstall.client.in
new file mode 100644
index 000000000000..27590d301e06
--- /dev/null
+++ b/sysutils/bacula9-server/files/pkg-deinstall.client.in
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+PATH=/bin:/usr/bin:/usr/sbin
+
+# Note how to delete UID/GID
+USER=%%BACULA_USER%%
+GROUP=%%BACULA_GROUP%%
+UID=%%BACULA_UID%%
+GID=%%BACULA_UID%%
+BACULA_DIR=%%BACULA_DIR%%
+
+TMPFILE=/tmp/services-$RANDOM-$$
+
+case "$2" in
+"DEINSTALL")
+ # Delete entries in /etc/services
+ sed -e '/# Bacula port start/,/# Bacula port end/{' \
+ -e 'd' \
+ -e '}' /etc/services > $TMPFILE
+ mv -f $TMPFILE /etc/services
+
+ if [ -d ${BACULA_DIR} ]; then
+ echo "Check if ${BACULA_DIR} is empty and delete it to permanently remove the bacula port."
+ fi
+
+ if pw groupshow "${USER}" 2>/dev/null 1>&2; then
+ echo "To delete Bacula group permanently, use 'pw groupdel ${GROUP}'"
+ fi
+ ;;
+esac
diff --git a/sysutils/bacula9-server/files/pkg-deinstall.server.in b/sysutils/bacula9-server/files/pkg-deinstall.server.in
new file mode 100644
index 000000000000..05da0eb6a7f6
--- /dev/null
+++ b/sysutils/bacula9-server/files/pkg-deinstall.server.in
@@ -0,0 +1,34 @@
+#!/bin/sh
+
+PATH=/bin:/usr/bin:/usr/sbin
+
+# Note how to delete UID/GID
+USER=%%BACULA_USER%%
+GROUP=%%BACULA_GROUP%%
+UID=%%BACULA_UID%%
+GID=%%BACULA_UID%%
+BACULA_DIR=%%BACULA_DIR%%
+
+TMPFILE=/tmp/services-$RANDOM-$$
+
+case "$2" in
+"DEINSTALL")
+ # Delete entries in /etc/services
+ sed -e '/# Bacula port start/,/# Bacula port end/{' \
+ -e 'd' \
+ -e '}' /etc/services > $TMPFILE
+ mv -f $TMPFILE /etc/services
+
+ if [ -d ${BACULA_DIR} ]; then
+ rmdir ${BACULA_DIR};
+ fi
+ if [ -d ${BACULA_DIR} ]; then
+ echo "Check if ${BACULA_DIR} is empty and delete it to permanently remove the bacula port."
+ fi
+
+ if pw usershow "${USER}" 2>/dev/null 1>&2; then
+ echo "To delete Bacula user permanently, use 'pw userdel ${USER}'"
+ echo "To delete Bacula group permanently, use 'pw groupdel ${GROUP}'"
+ fi
+ ;;
+esac
diff --git a/sysutils/bacula9-server/files/pkg-install.client.in b/sysutils/bacula9-server/files/pkg-install.client.in
new file mode 100644
index 000000000000..12e044538074
--- /dev/null
+++ b/sysutils/bacula9-server/files/pkg-install.client.in
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+PATH=/bin:/usr/bin:/usr/sbin
+
+# Always add lines in /etc/services
+grep -q "bacula-dir" /etc/services
+if [ "$?" != "0" ]; then
+ echo "# Bacula port start
+bacula-dir 9101/tcp #Bacula director daemon
+bacula-fd 9102/tcp #Bacula file daemon
+bacula-sd 9103/tcp #Bacula storage daemon
+# Bacula port end" >> /etc/services
+fi
diff --git a/sysutils/bacula9-server/files/pkg-install.server.in b/sysutils/bacula9-server/files/pkg-install.server.in
new file mode 100644
index 000000000000..12e044538074
--- /dev/null
+++ b/sysutils/bacula9-server/files/pkg-install.server.in
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+PATH=/bin:/usr/bin:/usr/sbin
+
+# Always add lines in /etc/services
+grep -q "bacula-dir" /etc/services
+if [ "$?" != "0" ]; then
+ echo "# Bacula port start
+bacula-dir 9101/tcp #Bacula director daemon
+bacula-fd 9102/tcp #Bacula file daemon
+bacula-sd 9103/tcp #Bacula storage daemon
+# Bacula port end" >> /etc/services
+fi
diff --git a/sysutils/bacula9-server/files/pkg-message.client.in b/sysutils/bacula9-server/files/pkg-message.client.in
new file mode 100644
index 000000000000..c4041a26df11
--- /dev/null
+++ b/sysutils/bacula9-server/files/pkg-message.client.in
@@ -0,0 +1,8 @@
+################################################################################
+
+NOTE:
+Sample files are installed in %%PREFIX%%/etc/bacula:
+
+ bconsole.conf.sample, bacula-fd.conf.sample
+
+################################################################################
diff --git a/sysutils/bacula9-server/files/pkg-message.server.in b/sysutils/bacula9-server/files/pkg-message.server.in
new file mode 100644
index 000000000000..d694599140fc
--- /dev/null
+++ b/sysutils/bacula9-server/files/pkg-message.server.in
@@ -0,0 +1,57 @@
+###############################################################################
+
+bacula server was installed
+
+A database upgrade is required if upgrading from Bacula < 9.0.
+See %%DATADIR%%/update_bacula_tables
+
+An auto-changer manipulation script based on FreeBSDs
+chio command is included and installed at
+
+ %%PREFIX%%/sbin/chio-bacula
+
+Please have a look at it if you want to use an
+autochanger. You have to configure the usage in
+
+ %%PREFIX%%/etc/bacula/bacula-dir.conf
+
+Take care of correct permissions for changer and
+tape device (e.g. /dev/ch0 and /dev/n[r]sa0) i.e.
+they must be accessible by user bacula.
+
+Due to lack of some features in the FreeBSD tape driver
+implementation you MUST add some OS dependent options to
+the bacula-sd.conf file:
+
+ Hardware End of Medium = no;
+ Backward Space Record = no;
+ Backward Space File = no;
+
+With 2 filemarks at EOT (see man mt):
+ Fast Forward Space File = no;
+ BSF at EOM = yes;
+ TWO EOF = yes;
+
+With 1 filemarks at EOT (see man mt):
+ Fast Forward Space File = yes;
+ BSF at EOM = no;
+ TWO EOF = no;
+
+NOTE: YOU CAN SWITCH EOT model ONLY when starting
+ from scratch with EMPTY tapes.
+
+It is also important that all the scripts accessed
+by RunBeforeJob and RunAfterJob will be executed by
+the user bacula. Check your permissions.
+
+For USB support read the bacula manual. It could be necessary
+to configure/compile a new kernel.
+
+Look at %%PREFIX%%/share/bacula/update_bacula_tables for
+database update procedure. Details can be found in the
+ReleaseNotes
+
+If you are using sqlite you need to run the make_sqlite_tables script as
+the bacula user. Do this using 'sudo su -m bacula'.
+
+################################################################################
diff --git a/sysutils/bacula9-server/pkg-descr b/sysutils/bacula9-server/pkg-descr
new file mode 100644
index 000000000000..4167c26533dc
--- /dev/null
+++ b/sysutils/bacula9-server/pkg-descr
@@ -0,0 +1,11 @@
+Bacula is a set of computer programs that permit you (or the system
+administrator) to manage backup, recovery, and verification of
+computer data across a network of computers of different kinds.
+In technical terms, it is a network Client/Server based backup program.
+Bacula is relatively easy to use and efficient, while offering many
+advanced storage management features that make it easy to find and
+recover lost or damaged files. Due to its modular design, Bacula is
+scalable from small single computer systems to systems consisting of
+hundreds of computers located over a large network.
+
+WWW: http://www.bacula.org/
diff --git a/sysutils/bacula9-server/pkg-plist b/sysutils/bacula9-server/pkg-plist
new file mode 100644
index 000000000000..eaf1f11b9692
--- /dev/null
+++ b/sysutils/bacula9-server/pkg-plist
@@ -0,0 +1,92 @@
+@sample(,bacula,640) %%ETCDIR%%/bacula-barcodes.sample
+@sample(,bacula,) %%ETCDIR%%/bacula-dir.conf.sample
+@sample(,bacula,) %%ETCDIR%%/bacula-sd.conf.sample
+lib/libbaccats-%%LIB_VERSION%%.so
+lib/libbaccats.so
+%%MYSQL%%lib/libbaccats-mysql-%%LIB_VERSION%%.so
+%%PGSQL%%lib/libbaccats-postgresql-%%LIB_VERSION%%.so
+%%SQLITE3%%lib/libbaccats-sqlite3-%%LIB_VERSION%%.so
+%%MYSQL%%lib/libbaccats-mysql.so
+%%PGSQL%%lib/libbaccats-postgresql.so
+%%SQLITE3%%lib/libbaccats-sqlite3.so
+lib/libbacsd-%%LIB_VERSION%%.so
+lib/libbacsd.so
+lib/libbacsql-%%LIB_VERSION%%.so
+lib/libbacsql.so
+sbin/bacula
+sbin/bacula-dir
+sbin/bacula-sd
+sbin/bcopy
+sbin/bdirjson
+sbin/bsdjson
+sbin/bextract
+sbin/bls
+sbin/bregex
+sbin/bscan
+sbin/bsmtp
+sbin/btape
+sbin/btraceback
+sbin/bwild
+sbin/chio-bacula
+sbin/dbcheck
+@owner bacula
+@group bacula
+%%DATADIR%%/bacula
+%%DATADIR%%/bacula-ctl-dir
+%%DATADIR%%/bacula-ctl-fd
+%%DATADIR%%/bacula-ctl-sd
+%%DATADIR%%/bacula-tray-monitor.desktop
+%%DATADIR%%/baculabackupreport
+%%DATADIR%%/bacula_config
+%%DATADIR%%/bconsole
+%%DATADIR%%/btraceback.dbx
+%%DATADIR%%/btraceback.gdb
+%%DATADIR%%/btraceback.mdb
+%%DATADIR%%/create_bacula_database
+%%DATADIR%%/tapealert
+%%MYSQL%%%%DATADIR%%/create_mysql_database
+%%PGSQL%%%%DATADIR%%/create_postgresql_database
+%%SQLITE3%%%%DATADIR%%/create_sqlite3_database
+%%DATADIR%%/delete_catalog_backup
+%%DATADIR%%/disk-changer
+%%DATADIR%%/drop_bacula_database
+%%DATADIR%%/drop_bacula_tables
+%%MYSQL%%%%DATADIR%%/drop_mysql_database
+%%PGSQL%%%%DATADIR%%/drop_postgresql_database
+%%SQLITE3%%%%DATADIR%%/drop_sqlite3_database
+%%MYSQL%%%%DATADIR%%/drop_mysql_tables
+%%PGSQL%%%%DATADIR%%/drop_postgresql_tables
+%%SQLITE3%%%%DATADIR%%/drop_sqlite3_tables
+%%PYTHON%%%%DATADIR%%/dvd-handler
+%%DATADIR%%/grant_bacula_privileges
+%%MYSQL%%%%DATADIR%%/grant_mysql_privileges
+%%PGSQL%%%%DATADIR%%/grant_postgresql_privileges
+%%SQLITE3%%%%DATADIR%%/grant_sqlite3_privileges
+%%DATADIR%%/make_bacula_tables
+%%DATADIR%%/make_catalog_backup
+%%DATADIR%%/make_catalog_backup.pl
+%%MYSQL%%%%DATADIR%%/make_mysql_tables
+%%PGSQL%%%%DATADIR%%/make_postgresql_tables
+%%SQLITE3%%%%DATADIR%%/make_sqlite3_tables
+%%DATADIR%%/mtx-changer
+%%DATADIR%%/mtx-changer.conf
+%%DATADIR%%/update_bacula_tables
+%%MYSQL%%%%DATADIR%%/update_mysql_tables
+%%PGSQL%%%%DATADIR%%/update_postgresql_tables
+%%SQLITE3%%%%DATADIR%%/update_sqlite3_tables
+@owner
+@group
+man/man1/bsmtp.1.gz
+man/man1/bacula-tray-monitor.1.gz
+man/man8/bacula-dir.8.gz
+man/man8/bacula-sd.8.gz
+man/man8/bcopy.8.gz
+man/man8/bextract.8.gz
+man/man8/bls.8.gz
+man/man8/bregex.8.gz
+man/man8/bscan.8.gz
+man/man8/btape.8.gz
+man/man8/btraceback.8.gz
+man/man8/bwild.8.gz
+man/man8/dbcheck.8.gz
+@dir(bacula,bacula,) %%BACULA_DIR%%
diff --git a/sysutils/bacula9-server/pkg-plist.client b/sysutils/bacula9-server/pkg-plist.client
new file mode 100644
index 000000000000..e32392a52f5c
--- /dev/null
+++ b/sysutils/bacula9-server/pkg-plist.client
@@ -0,0 +1,20 @@
+@sample(,bacula,640) %%ETCDIR%%/bacula-fd.conf.sample
+@sample(,bacula,640) %%ETCDIR%%/bconsole.conf.sample
+lib/libbac-%%LIB_VERSION%%.so
+lib/libbac.so
+lib/libbaccfg-%%LIB_VERSION%%.so
+lib/libbaccfg.so
+lib/libbacfind-%%LIB_VERSION%%.so
+lib/libbacfind.so
+lib/bpipe-fd.so
+man/man8/bacula.8.gz
+man/man8/bacula-fd.8.gz
+man/man8/bconsole.8.gz
+sbin/bacula-fd
+sbin/bbconsjson
+sbin/bfdjson
+@(,bacula,750) sbin/bconsole
+@dir(bacula,bacula,) %%BACULA_DIR%%
+@dir share/bacula
+@dir(,bacula,) %%ETCDIR%%
+@sample(,bacula,644) share/bacula/query.sql.sample
diff --git a/sysutils/bstack/Makefile b/sysutils/bstack/Makefile
index 9678cc084a82..769be9e272ad 100644
--- a/sysutils/bstack/Makefile
+++ b/sysutils/bstack/Makefile
@@ -5,7 +5,7 @@ PORTVERSION= 0.1
PORTREVISION= 1
CATEGORIES= sysutils
-MAINTAINER= luca.pizzamiglio@gmail.com
+MAINTAINER= pizzamig@FreeBSD.org
COMMENT= Debug tool that shows the stack trace of a running process
LICENSE= BSD3CLAUSE
diff --git a/sysutils/cbsd/Makefile b/sysutils/cbsd/Makefile
index f771077e9de4..c197f4ac9c8e 100644
--- a/sysutils/cbsd/Makefile
+++ b/sysutils/cbsd/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= cbsd
-PORTVERSION= 11.1.2
+PORTVERSION= 11.1.3
CATEGORIES= sysutils
MAINTAINER= olevole@olevole.ru
diff --git a/sysutils/cbsd/distinfo b/sysutils/cbsd/distinfo
index 7518c4b09a07..78dd6b865ee5 100644
--- a/sysutils/cbsd/distinfo
+++ b/sysutils/cbsd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1503346908
-SHA256 (cbsd-cbsd-11.1.2_GH0.tar.gz) = 1fbe94715679f9c1a6b69ecd2845d45c05fbae8489f226dc8ba29bb126e05b3b
-SIZE (cbsd-cbsd-11.1.2_GH0.tar.gz) = 5510861
+TIMESTAMP = 1504093396
+SHA256 (cbsd-cbsd-11.1.3_GH0.tar.gz) = 3d0ba2daa0242ca957fcd0ab92f7600c78dd8f2a2f5a1e1e40de0cf2ef6e93b2
+SIZE (cbsd-cbsd-11.1.3_GH0.tar.gz) = 5512823
diff --git a/sysutils/kf5-baloo/distinfo b/sysutils/kf5-baloo/distinfo
index 07d23ef88765..20a0d42e5262 100644
--- a/sysutils/kf5-baloo/distinfo
+++ b/sysutils/kf5-baloo/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499098902
-SHA256 (KDE/frameworks/5.36.0/baloo-5.36.0.tar.xz) = f121d9537ce785e3fa13888c09fac4f22b493a6ec6521ef880156df27e9e31ff
-SIZE (KDE/frameworks/5.36.0/baloo-5.36.0.tar.xz) = 195960
+TIMESTAMP = 1502086072
+SHA256 (KDE/frameworks/5.37.0/baloo-5.37.0.tar.xz) = e9706ed75af26a234108bda3b4dca308bcfabe3294a3e83620316709e90154a7
+SIZE (KDE/frameworks/5.37.0/baloo-5.37.0.tar.xz) = 197656
diff --git a/sysutils/kf5-baloo/pkg-plist b/sysutils/kf5-baloo/pkg-plist
index fefb26dc7904..c9bc0be7519e 100644
--- a/sysutils/kf5-baloo/pkg-plist
+++ b/sysutils/kf5-baloo/pkg-plist
@@ -155,6 +155,11 @@ share/locale/et/LC_MESSAGES/kio5_baloosearch.mo
share/locale/et/LC_MESSAGES/kio5_tags.mo
share/locale/et/LC_MESSAGES/kio5_timeline.mo
share/locale/eu/LC_MESSAGES/baloo_file5.mo
+share/locale/eu/LC_MESSAGES/baloo_file_extractor5.mo
+share/locale/eu/LC_MESSAGES/balooctl5.mo
+share/locale/eu/LC_MESSAGES/baloomonitorplugin.mo
+share/locale/eu/LC_MESSAGES/baloosearch5.mo
+share/locale/eu/LC_MESSAGES/balooshow5.mo
share/locale/fi/LC_MESSAGES/baloo_file5.mo
share/locale/fi/LC_MESSAGES/baloo_file_extractor5.mo
share/locale/fi/LC_MESSAGES/balooctl5.mo
diff --git a/sysutils/kf5-kwallet/distinfo b/sysutils/kf5-kwallet/distinfo
index d23a307bfb39..82e26d6ff81a 100644
--- a/sysutils/kf5-kwallet/distinfo
+++ b/sysutils/kf5-kwallet/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499098903
-SHA256 (KDE/frameworks/5.36.0/kwallet-5.36.0.tar.xz) = 8782caeb8d75da67a84c8eddf1d28af19fb01ffc0bbf7a35c0240e22519ccabb
-SIZE (KDE/frameworks/5.36.0/kwallet-5.36.0.tar.xz) = 303684
+TIMESTAMP = 1502086072
+SHA256 (KDE/frameworks/5.37.0/kwallet-5.37.0.tar.xz) = 5fc368410da498dcd9eb9d5b7119f37c87f3a6b9859bbb2ce4a2ff0cfca0f2d0
+SIZE (KDE/frameworks/5.37.0/kwallet-5.37.0.tar.xz) = 303728
diff --git a/sysutils/lr/Makefile b/sysutils/lr/Makefile
index 53a388d61858..b4f8dc679030 100644
--- a/sysutils/lr/Makefile
+++ b/sysutils/lr/Makefile
@@ -2,8 +2,8 @@
# $FreeBSD$
PORTNAME= lr
-PORTVERSION= 0.4
DISTVERSIONPREFIX= v
+DISTVERSION= 1.0
CATEGORIES= sysutils
MAINTAINER= tobik@FreeBSD.org
diff --git a/sysutils/lr/distinfo b/sysutils/lr/distinfo
index f33a4b7e87ba..bd02480c9d00 100644
--- a/sysutils/lr/distinfo
+++ b/sysutils/lr/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1493205478
-SHA256 (chneukirchen-lr-v0.4_GH0.tar.gz) = 4fdfa4dbd5757c11e41398d076ded8d4bd87e61bb0a497c423b4625914b63562
-SIZE (chneukirchen-lr-v0.4_GH0.tar.gz) = 31664
+TIMESTAMP = 1504078787
+SHA256 (chneukirchen-lr-v1.0_GH0.tar.gz) = 35512b7f85bef0fed3b32bdc581286485d82df85edbf425a263156459efe6861
+SIZE (chneukirchen-lr-v1.0_GH0.tar.gz) = 33433
diff --git a/sysutils/mbgtools/Makefile b/sysutils/mbgtools/Makefile
index ca6c6d38aab4..41bd326a95be 100644
--- a/sysutils/mbgtools/Makefile
+++ b/sysutils/mbgtools/Makefile
@@ -2,10 +2,11 @@
# $FreeBSD$
PORTNAME= mbgtools
-DISTVERSION= fbsd-dev-2013-06-26
+DISTVERSION= fbsd-1.0.0
CATEGORIES= sysutils
MASTER_SITES= http://www.meinberg.de/download/drivers/
+
MAINTAINER= gnn@FreeBSD.org
COMMENT= Drivers and tools for Meinberg PTP/GPS cards
diff --git a/sysutils/mbgtools/distinfo b/sysutils/mbgtools/distinfo
index a8aa027a9dc9..c0af05ffc4ac 100644
--- a/sysutils/mbgtools/distinfo
+++ b/sysutils/mbgtools/distinfo
@@ -1,2 +1,3 @@
-SHA256 (mbgtools-fbsd-dev-2013-06-26.tar.gz) = a676d5bf431e6bd9ed399c831a12d31f1ee9f466412534d439108c7aa4261c0a
-SIZE (mbgtools-fbsd-dev-2013-06-26.tar.gz) = 345665
+TIMESTAMP = 1503933202
+SHA256 (mbgtools-fbsd-1.0.0.tar.gz) = 807f5ea0da495be2d4f29d47d8ad2b2554948d8ac71fcca592615ab510772a09
+SIZE (mbgtools-fbsd-1.0.0.tar.gz) = 563563
diff --git a/sysutils/mbgtools/files/patch-mbgclock-mbgclock_main.c b/sysutils/mbgtools/files/patch-mbgclock-mbgclock_main.c
deleted file mode 100644
index 008aad8af0f6..000000000000
--- a/sysutils/mbgtools/files/patch-mbgclock-mbgclock_main.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- mbgclock/mbgclock_main.c.orig 2015-01-10 10:47:02.000000000 -0500
-+++ mbgclock/mbgclock_main.c 2015-01-10 10:47:17.000000000 -0500
-@@ -135,7 +135,7 @@
- * attach routine when we create the /dev entry.
- */
- int
--mbgclock_open( struct cdev *dev, int oflags, int devtype, d_thread_t *td )
-+mbgclock_open( struct cdev *dev, int oflags, int devtype, struct thread *td )
- {
- struct mbgclock_softc *psc = dev->si_drv1;
- PCPS_DDEV *pddev = psc->pddev;
-@@ -152,7 +152,7 @@
-
-
- int
--mbgclock_close( struct cdev *dev, int fflag, int devtype, d_thread_t *td )
-+mbgclock_close( struct cdev *dev, int fflag, int devtype, struct thread *td )
- {
- struct mbgclock_softc *psc = dev->si_drv1;
- PCPS_DDEV *pddev = psc->pddev;
diff --git a/sysutils/mbgtools/files/patch-mbgpccyc.h b/sysutils/mbgtools/files/patch-mbgpccyc.h
deleted file mode 100644
index cece873988f4..000000000000
--- a/sysutils/mbgtools/files/patch-mbgpccyc.h
+++ /dev/null
@@ -1,12 +0,0 @@
-*** mbglib/common/mbgpccyc.h 2013-06-26 12:37:50.000000000 -0400
---- mbglib/common/mbgpccyc.h 2013-11-18 13:24:31.653569000 -0500
-***************
-*** 39,44 ****
---- 39,45 ----
- #if defined( MBG_TGT_FREEBSD )
- #if defined( MBG_TGT_KERNEL )
- #if defined( MBG_ARCH_X86 )
-+ #include <sys/time.h>
- #include <machine/clock.h> /* for symbol 'tsc_freq' */
- #endif
- #endif
diff --git a/sysutils/nomad/pkg-descr b/sysutils/nomad/pkg-descr
index 9c89a6dbe62c..f1e8d36becf5 100644
--- a/sysutils/nomad/pkg-descr
+++ b/sysutils/nomad/pkg-descr
@@ -1,6 +1,6 @@
Nomad is a cluster manager and schedular that provides a common workflow
to deploy applications across an infrastructure. Deploy virtualized,
containerized, or standalone application workloads across a fleet of
-servers to maximize resource utilization.
+servers to maximize resource utilization.
-WWW: http://www.nomadproject.io/
+WWW: https://www.nomadproject.io/
diff --git a/sysutils/osquery/Makefile b/sysutils/osquery/Makefile
index d0e37b9f87e4..c613962cdb12 100644
--- a/sysutils/osquery/Makefile
+++ b/sysutils/osquery/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= osquery
-PORTVERSION= 2.6.1
+PORTVERSION= 2.7.0
CATEGORIES= sysutils
MAINTAINER= zi@FreeBSD.org
@@ -15,6 +15,7 @@ BUILD_DEPENDS= thrift>0:devel/thrift \
bash>0:shells/bash \
linenoise-ng>0:devel/linenoise-ng \
asio>0:net/asio \
+ rapidjson>0:devel/rapidjson \
${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2
LIB_DEPENDS= libaugeas.so:textproc/augeas \
libboost_regex.so:devel/boost-libs \
diff --git a/sysutils/osquery/distinfo b/sysutils/osquery/distinfo
index 647538b69729..1a522df1e6b6 100644
--- a/sysutils/osquery/distinfo
+++ b/sysutils/osquery/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1502739110
-SHA256 (facebook-osquery-2.6.1_GH0.tar.gz) = 288e5455fedd4e7d5ea2ee123477b3f75630db14979205717268c25cbdca04fd
-SIZE (facebook-osquery-2.6.1_GH0.tar.gz) = 957008
-SHA256 (osquery-third-party-2.6.1_GH0.tar.gz) = 1c58ad711f08656184e0d5b3fa53ecf5e9fef6034143e4c41c2989b54f6d5381
-SIZE (osquery-third-party-2.6.1_GH0.tar.gz) = 3264472
+TIMESTAMP = 1504120429
+SHA256 (facebook-osquery-2.7.0_GH0.tar.gz) = ce5fb4e6000904e998ca4cc9aae2c4125505d6b11e5f0c318456ee9ded8cc2dc
+SIZE (facebook-osquery-2.7.0_GH0.tar.gz) = 973435
+SHA256 (osquery-third-party-2.7.0_GH0.tar.gz) = 264070dbe55e1cb3dd94b263b9110b863963cbde9363a08f49d7a27b2aa9e5f1
+SIZE (osquery-third-party-2.7.0_GH0.tar.gz) = 3264470
diff --git a/sysutils/osquery/pkg-plist b/sysutils/osquery/pkg-plist
index 85ad56d547e0..7b4e7573ad7b 100644
--- a/sysutils/osquery/pkg-plist
+++ b/sysutils/osquery/pkg-plist
@@ -19,6 +19,7 @@ include/osquery/sql.h
include/osquery/status.h
include/osquery/system.h
include/osquery/tables.h
+include/osquery/query.h
lib/libosquery.a
sbin/osqueryd
@sample etc/osquery.conf.sample
diff --git a/sysutils/pstack/Makefile b/sysutils/pstack/Makefile
index bee8a1fd3a39..f135adaa7585 100644
--- a/sysutils/pstack/Makefile
+++ b/sysutils/pstack/Makefile
@@ -5,7 +5,7 @@ PORTNAME= pstack
PORTVERSION= 1.3
CATEGORIES= sysutils
-MAINTAINER= luca.pizzamiglio@gmail.com
+MAINTAINER= pizzamig@FreeBSD.org
COMMENT= Retrieve process/core file stack traces
LICENSE= BSD2CLAUSE
diff --git a/sysutils/pstacku/Makefile b/sysutils/pstacku/Makefile
index 6239a13e9e5e..a4d0741274ef 100644
--- a/sysutils/pstacku/Makefile
+++ b/sysutils/pstacku/Makefile
@@ -7,7 +7,7 @@ CATEGORIES= sysutils
MASTER_SITES= https://kib.kiev.ua/kib/${PORTNAME}/ \
http://kib.kiev.ua/kib/${PORTNAME}/
-MAINTAINER= luca.pizzamiglio@gmail.com
+MAINTAINER= pizzamig@FreeBSD.org
COMMENT= Retrieve process stack traces
LICENSE= BSD2CLAUSE
diff --git a/sysutils/screen/Makefile b/sysutils/screen/Makefile
index 28cb4cc496a6..c4a94415ed4e 100644
--- a/sysutils/screen/Makefile
+++ b/sysutils/screen/Makefile
@@ -25,7 +25,7 @@ OPTIONS_DEFAULT= INFO MAN NETHACK XTERM_256 SOCKETS SYSTEM_SCREENRC \
NCURSES_DEFAULT
OPTIONS_SINGLE= IPC NCURSES
OPTIONS_SINGLE_IPC= SOCKETS NAMED_PIPES
-OPTIONS_SINGLE_NCURSES= NCURSES_DEFAULT NCURSES_BASE NCURSES_PORTS
+OPTIONS_SINGLE_NCURSES= NCURSES_DEFAULT NCURSES_BASE NCURSES_PORT
INFO_DESC= Build and install info documentation
MAN_DESC= Build and install man pages
NETHACK_DESC= Enable nethack-style messages
@@ -36,11 +36,11 @@ NAMED_PIPES_DESC= Use legacy (4.0.3) named pipes for IPC (override)
SYSTEM_SCREENRC_DESC= Install system screenrc with helpful status line
NCURSES_DEFAULT_DESC= Depend on ncurses (ports if installed, otherwise base)
NCURSES_BASE_DESC= Depend on ncurses in base
-NCURSES_PORTS_DESC= Depend on devel/ncurses in ports
+NCURSES_PORT_DESC= Depend on devel/ncurses in ports
NCURSES_DEFAULT_USES= ncurses
NCURSES_BASE_USES= ncurses:base
-NCURSES_PORTS_USES= ncurses:ports
+NCURSES_PORT_USES= ncurses:port
OPTIONS_SUB=
diff --git a/sysutils/terraform/Makefile b/sysutils/terraform/Makefile
index cd4cbae7d43f..07c309b10b01 100644
--- a/sysutils/terraform/Makefile
+++ b/sysutils/terraform/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= terraform
-PORTVERSION= 0.10.2
+PORTVERSION= 0.10.3
DISTVERSIONPREFIX= v
CATEGORIES= sysutils
diff --git a/sysutils/terraform/distinfo b/sysutils/terraform/distinfo
index 2c3c39381a71..cd764b52e3ec 100644
--- a/sysutils/terraform/distinfo
+++ b/sysutils/terraform/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1502977860
-SHA256 (hashicorp-terraform-v0.10.2_GH0.tar.gz) = 2a1e4e92b480aaf996fda073503f7bfb4039152cf7d19e5598aca45a00196150
-SIZE (hashicorp-terraform-v0.10.2_GH0.tar.gz) = 6936836
+TIMESTAMP = 1504186880
+SHA256 (hashicorp-terraform-v0.10.3_GH0.tar.gz) = a87fd97649f6ebabac243a85a09dfb0a16dc351fb9bb799fbdf076d35734cc74
+SIZE (hashicorp-terraform-v0.10.3_GH0.tar.gz) = 8065950
diff --git a/sysutils/zap/Makefile b/sysutils/zap/Makefile
index 3aef98112d35..ed90e146a6fb 100644
--- a/sysutils/zap/Makefile
+++ b/sysutils/zap/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= zap
-PORTVERSION= 0.7.1
+DISTVERSION= 0.7.2
CATEGORIES= sysutils
MAINTAINER= jrm@FreeBSD.org
@@ -15,12 +15,15 @@ NO_BUILD= yes
USE_GITHUB= yes
GH_ACCOUNT= Jehops
-PLIST_FILES= bin/zap man/man1/zap.1.gz
+PLIST_FILES= bin/${PORTNAME} man/man1/${PORTNAME}.1.gz
PORTDOCS= README.org
+USERS= ${PORTNAME}
+GROUPS= ${PORTNAME}
+
do-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/zap ${STAGEDIR}${PREFIX}/bin
- ${INSTALL_MAN} ${WRKSRC}/zap.1 ${STAGEDIR}${PREFIX}/man/man1
+ ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+ ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/man/man1
@${MKDIR} ${STAGEDIR}${DOCSDIR}
(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
diff --git a/sysutils/zap/distinfo b/sysutils/zap/distinfo
index 8d6e6cf65c05..cea4bd5996e2 100644
--- a/sysutils/zap/distinfo
+++ b/sysutils/zap/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1503077854
-SHA256 (Jehops-zap-0.7.1_GH0.tar.gz) = f6e66c330031c5040fbb6d021c3bc94c9d4c8a41ec0431bb998f113df3caaebf
-SIZE (Jehops-zap-0.7.1_GH0.tar.gz) = 7995
+TIMESTAMP = 1504120292
+SHA256 (Jehops-zap-0.7.2_GH0.tar.gz) = af9d5fe9d776e4253436b1aba5d4eafa1d29ef0b1dc6c1d25d5e2400530049bc
+SIZE (Jehops-zap-0.7.2_GH0.tar.gz) = 7861
diff --git a/textproc/Makefile b/textproc/Makefile
index 5899370296bd..158034d5b0cd 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -1352,6 +1352,7 @@
SUBDIR += py-sphinxcontrib-fulltoc
SUBDIR += py-sphinxcontrib-httpdomain
SUBDIR += py-sphinxcontrib-programoutput
+ SUBDIR += py-sphinxcontrib-websupport
SUBDIR += py-stemming
SUBDIR += py-syck
SUBDIR += py-tabletext
diff --git a/textproc/elixir-ex_doc/Makefile b/textproc/elixir-ex_doc/Makefile
index aad89d9898a2..3b2ce7c0bdf5 100644
--- a/textproc/elixir-ex_doc/Makefile
+++ b/textproc/elixir-ex_doc/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= ex_doc
-PORTVERSION= 0.16.2
+PORTVERSION= 0.16.3
DISTVERSIONPREFIX= v
CATEGORIES= textproc
PKGNAMEPREFIX= elixir-
diff --git a/textproc/elixir-ex_doc/distinfo b/textproc/elixir-ex_doc/distinfo
index 31308185c0cf..42163405d4c7 100644
--- a/textproc/elixir-ex_doc/distinfo
+++ b/textproc/elixir-ex_doc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1498763196
-SHA256 (elixir-lang-ex_doc-v0.16.2_GH0.tar.gz) = bffa930fd359f4e005a9b2fd4399e8629b4af2a4aa03531e8ffcd84d07eb9fef
-SIZE (elixir-lang-ex_doc-v0.16.2_GH0.tar.gz) = 89164
+TIMESTAMP = 1503994675
+SHA256 (elixir-lang-ex_doc-v0.16.3_GH0.tar.gz) = a173f1c9e37f9d47614c5709830021d1344fa486bfe73ea4e49d8f611ddac631
+SIZE (elixir-lang-ex_doc-v0.16.3_GH0.tar.gz) = 508103
diff --git a/textproc/elixir-ex_doc/pkg-plist b/textproc/elixir-ex_doc/pkg-plist
index f4880a75db3f..bdf90f7ea3f9 100644
--- a/textproc/elixir-ex_doc/pkg-plist
+++ b/textproc/elixir-ex_doc/pkg-plist
@@ -46,6 +46,7 @@ lib/elixir/lib/ex_doc/lib/ex_doc/formatter/html/templates/head_template.eex
lib/elixir/lib/ex_doc/lib/ex_doc/formatter/html/templates/module_template.eex
lib/elixir/lib/ex_doc/lib/ex_doc/formatter/html/templates/not_found_template.eex
lib/elixir/lib/ex_doc/lib/ex_doc/formatter/html/templates/redirect_template.eex
+lib/elixir/lib/ex_doc/lib/ex_doc/formatter/html/templates/search_template.eex
lib/elixir/lib/ex_doc/lib/ex_doc/formatter/html/templates/sidebar_template.eex
lib/elixir/lib/ex_doc/lib/ex_doc/formatter/html/templates/summary_item_template.eex
lib/elixir/lib/ex_doc/lib/ex_doc/formatter/html/templates/summary_template.eex
@@ -59,9 +60,11 @@ lib/elixir/lib/ex_doc/priv/ex_doc/formatter/epub/assets/dist/app-75ab88af99.js
lib/elixir/lib/ex_doc/priv/ex_doc/formatter/epub/assets/dist/epub-3f654f2a47.css
lib/elixir/lib/ex_doc/priv/ex_doc/formatter/epub/assets/metainfo/com.apple.ibooks.display-options.xml
lib/elixir/lib/ex_doc/priv/ex_doc/formatter/epub/assets/metainfo/container.xml
+lib/elixir/lib/ex_doc/priv/ex_doc/formatter/html/assets/dist/app-5b9e160cec.css
+lib/elixir/lib/ex_doc/priv/ex_doc/formatter/html/assets/dist/app-da04b39d0c.js
+lib/elixir/lib/ex_doc/priv/ex_doc/formatter/html/assets/dist/app-da04b39d0c.js.map
lib/elixir/lib/ex_doc/priv/ex_doc/formatter/html/assets/fonts/icomoon.eot
lib/elixir/lib/ex_doc/priv/ex_doc/formatter/html/assets/fonts/icomoon.svg
lib/elixir/lib/ex_doc/priv/ex_doc/formatter/html/assets/fonts/icomoon.ttf
lib/elixir/lib/ex_doc/priv/ex_doc/formatter/html/assets/fonts/icomoon.woff
-lib/elixir/lib/ex_doc/priv/ex_doc/formatter/html/templates/dist/app-4dfb6411b0.css
%%PORTDOCS%%%%DOCSDIR%%/README.md
diff --git a/textproc/kdiff3/Makefile b/textproc/kdiff3/Makefile
index 8c629311798a..1426d1075d31 100644
--- a/textproc/kdiff3/Makefile
+++ b/textproc/kdiff3/Makefile
@@ -7,7 +7,7 @@ PORTREVISION= 1
CATEGORIES= textproc kde
MASTER_SITES= SF
-MAINTAINER= luca.pizzamiglio@gmail.com
+MAINTAINER= pizzamig@FreeBSD.org
COMMENT= KDE4 graphical frontend for diff
LICENSE= GPLv2
diff --git a/textproc/kf5-kcodecs/distinfo b/textproc/kf5-kcodecs/distinfo
index 744a69d12130..4b129b1d5464 100644
--- a/textproc/kf5-kcodecs/distinfo
+++ b/textproc/kf5-kcodecs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499098903
-SHA256 (KDE/frameworks/5.36.0/kcodecs-5.36.0.tar.xz) = 6cff3e88f9cd623509caad8cc4e20993189fdc5071f9b5c05fbcf58850dabe6c
-SIZE (KDE/frameworks/5.36.0/kcodecs-5.36.0.tar.xz) = 218372
+TIMESTAMP = 1502086072
+SHA256 (KDE/frameworks/5.37.0/kcodecs-5.37.0.tar.xz) = 6a2fe7e8e5d82490373f973c50dcac484d75081daff22efb58deae5dd649b34e
+SIZE (KDE/frameworks/5.37.0/kcodecs-5.37.0.tar.xz) = 218388
diff --git a/textproc/kf5-sonnet/distinfo b/textproc/kf5-sonnet/distinfo
index 90a6d7666aba..ac38c6d32479 100644
--- a/textproc/kf5-sonnet/distinfo
+++ b/textproc/kf5-sonnet/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499098903
-SHA256 (KDE/frameworks/5.36.0/sonnet-5.36.0.tar.xz) = accf0724615abf684258fa087e4166e803385ec4190f92c792fd16e8189366ed
-SIZE (KDE/frameworks/5.36.0/sonnet-5.36.0.tar.xz) = 285240
+TIMESTAMP = 1502086072
+SHA256 (KDE/frameworks/5.37.0/sonnet-5.37.0.tar.xz) = 60cee18889475a20327c3b7fad431579ab6efc06d28e83c57a4dc54c0c896669
+SIZE (KDE/frameworks/5.37.0/sonnet-5.37.0.tar.xz) = 285036
diff --git a/textproc/kf5-syntax-highlighting/distinfo b/textproc/kf5-syntax-highlighting/distinfo
index 5739a1b7fa9d..7fbee38797e0 100644
--- a/textproc/kf5-syntax-highlighting/distinfo
+++ b/textproc/kf5-syntax-highlighting/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499098903
-SHA256 (KDE/frameworks/5.36.0/syntax-highlighting-5.36.0.tar.xz) = 925a8845cd3a1d1720753aaba80f364d59612d45a71de089531d5e8dfa94fdc5
-SIZE (KDE/frameworks/5.36.0/syntax-highlighting-5.36.0.tar.xz) = 995060
+TIMESTAMP = 1502086072
+SHA256 (KDE/frameworks/5.37.0/syntax-highlighting-5.37.0.tar.xz) = e2d075482bc5409646db40374c6caa0b055276e1a5cd8e30065e9f4fd0baa6d0
+SIZE (KDE/frameworks/5.37.0/syntax-highlighting-5.37.0.tar.xz) = 1050660
diff --git a/textproc/lowdown/Makefile b/textproc/lowdown/Makefile
index bcc7d0ab319e..1641b9d500be 100644
--- a/textproc/lowdown/Makefile
+++ b/textproc/lowdown/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= lowdown
-PORTVERSION= 0.1.12
+PORTVERSION= 0.2.0
CATEGORIES= textproc
MASTER_SITES= http://kristaps.bsd.lv/lowdown/snapshots/
diff --git a/textproc/lowdown/distinfo b/textproc/lowdown/distinfo
index 3087527b60b8..3e9e96fe3362 100644
--- a/textproc/lowdown/distinfo
+++ b/textproc/lowdown/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1500455641
-SHA256 (lowdown-0.1.12.tar.gz) = 0a87c983414f28a1c11e80cedcef021d0113a363c7a2d6517827dab34571c253
-SIZE (lowdown-0.1.12.tar.gz) = 56232
+TIMESTAMP = 1504169830
+SHA256 (lowdown-0.2.0.tar.gz) = 27f19c591ad19cbe67b045215b64da27cc73421372a2bb416cf4560dd3f6d65e
+SIZE (lowdown-0.2.0.tar.gz) = 59796
diff --git a/textproc/makepatch/pkg-descr b/textproc/makepatch/pkg-descr
index fe2c9313f2b1..38efdcc37618 100644
--- a/textproc/makepatch/pkg-descr
+++ b/textproc/makepatch/pkg-descr
@@ -2,4 +2,4 @@
assist in the generation and application of patch kits to synchronise
source trees.
-WWW: http://www.squirrel.nl/people/jvromans/tpj0403-0016.html
+WWW: https://www.vromans.org/johan/software/sw_makepatch.html
diff --git a/textproc/p5-Data-FormValidator/Makefile b/textproc/p5-Data-FormValidator/Makefile
index 384c4ecf67e4..2c18fec2f17d 100644
--- a/textproc/p5-Data-FormValidator/Makefile
+++ b/textproc/p5-Data-FormValidator/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= Data-FormValidator
-PORTVERSION= 4.86
+PORTVERSION= 4.88
CATEGORIES= textproc perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/textproc/p5-Data-FormValidator/distinfo b/textproc/p5-Data-FormValidator/distinfo
index 1efb7177dfb7..8ed5835e62ed 100644
--- a/textproc/p5-Data-FormValidator/distinfo
+++ b/textproc/p5-Data-FormValidator/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1490609389
-SHA256 (Data-FormValidator-4.86.tar.gz) = 004fc21b95574402229f498b9cbdffc5c16a88302338dcc0b3b8091012cdc407
-SIZE (Data-FormValidator-4.86.tar.gz) = 101409
+TIMESTAMP = 1504098815
+SHA256 (Data-FormValidator-4.88.tar.gz) = c1a539f91c92cbcd8a8d83597ec9a7643fcd8ccf5a94e15382c3765289170066
+SIZE (Data-FormValidator-4.88.tar.gz) = 99850
diff --git a/textproc/p5-Text-BibTeX/Makefile b/textproc/p5-Text-BibTeX/Makefile
index 86b98998251d..2de36c915cc8 100644
--- a/textproc/p5-Text-BibTeX/Makefile
+++ b/textproc/p5-Text-BibTeX/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= Text-BibTeX
-PORTVERSION= 0.82
+PORTVERSION= 0.85
CATEGORIES= textproc perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/textproc/p5-Text-BibTeX/distinfo b/textproc/p5-Text-BibTeX/distinfo
index 5677f0eb8b37..9e6f8f82b646 100644
--- a/textproc/p5-Text-BibTeX/distinfo
+++ b/textproc/p5-Text-BibTeX/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1503907773
-SHA256 (Text-BibTeX-0.82.tar.gz) = f76b29812c018ad9ecb4988e7acfa819c95774b338cada031644a2f66cfc0e76
-SIZE (Text-BibTeX-0.82.tar.gz) = 298356
+TIMESTAMP = 1504189393
+SHA256 (Text-BibTeX-0.85.tar.gz) = 1005455f09ad5d39ebf6b45c87106a7341cbe5a7b25251dd05c7c960d7ebd30c
+SIZE (Text-BibTeX-0.85.tar.gz) = 299430
diff --git a/textproc/py-sphinxcontrib-websupport/Makefile b/textproc/py-sphinxcontrib-websupport/Makefile
new file mode 100644
index 000000000000..e28fc9e290ac
--- /dev/null
+++ b/textproc/py-sphinxcontrib-websupport/Makefile
@@ -0,0 +1,18 @@
+# $FreeBSD$
+
+PORTNAME= sphinxcontrib-websupport
+PORTVERSION= 1.0.1
+CATEGORIES= textproc
+MASTER_SITES= CHEESESHOP
+PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER= araujo@FreeBSD.org
+COMMENT= Sphinx API for Web Apps
+
+LICENSE= BSD2CLAUSE
+LICENSE_FILE= ${WRKSRC}/LICENSE
+
+USES= python
+USE_PYTHON= distutils autoplist
+
+.include <bsd.port.mk>
diff --git a/textproc/py-sphinxcontrib-websupport/distinfo b/textproc/py-sphinxcontrib-websupport/distinfo
new file mode 100644
index 000000000000..405f23468a67
--- /dev/null
+++ b/textproc/py-sphinxcontrib-websupport/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1504058132
+SHA256 (sphinxcontrib-websupport-1.0.1.tar.gz) = 7a85961326aa3a400cd4ad3c816d70ed6f7c740acd7ce5d78cd0a67825072eb9
+SIZE (sphinxcontrib-websupport-1.0.1.tar.gz) = 590480
diff --git a/textproc/py-sphinxcontrib-websupport/pkg-descr b/textproc/py-sphinxcontrib-websupport/pkg-descr
new file mode 100644
index 000000000000..03f5eb1c3119
--- /dev/null
+++ b/textproc/py-sphinxcontrib-websupport/pkg-descr
@@ -0,0 +1,4 @@
+sphinxcontrib-webuspport provides a Python API to
+easily integrate Sphinx documentation into your Web application.
+
+WWW: http://bitbucket.org/birkenfeld/sphinx-contrib/
diff --git a/textproc/sk-mythes/Makefile b/textproc/sk-mythes/Makefile
index 0a072cf40983..a8619236e77d 100644
--- a/textproc/sk-mythes/Makefile
+++ b/textproc/sk-mythes/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= mythes
-PORTVERSION= 2017.08.20
+PORTVERSION= 2017.08.27
CATEGORIES= textproc
MASTER_SITES= LOCAL/sunpoet/${PORTNAME}/
PKGNAMEPREFIX= sk-
diff --git a/textproc/sk-mythes/distinfo b/textproc/sk-mythes/distinfo
index 298cf78c4ed1..2fe9ab1cb9ac 100644
--- a/textproc/sk-mythes/distinfo
+++ b/textproc/sk-mythes/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1503323574
-SHA256 (mythes/OOo-Thesaurus2-sk_SK-20170820.zip) = 14180011f7ce8d21f567cdb0027b2e7c248696f6a476962983e08d39e8a587bb
-SIZE (mythes/OOo-Thesaurus2-sk_SK-20170820.zip) = 239473
+TIMESTAMP = 1503941280
+SHA256 (mythes/OOo-Thesaurus2-sk_SK-20170827.zip) = 88425f62e42620d22f3e82dd3082aecdb120c3843c9b94404f3cfeee4b047e48
+SIZE (mythes/OOo-Thesaurus2-sk_SK-20170827.zip) = 239473
diff --git a/textproc/zorba/Makefile b/textproc/zorba/Makefile
index f0f8f8761468..ba0f18ceaf44 100644
--- a/textproc/zorba/Makefile
+++ b/textproc/zorba/Makefile
@@ -103,7 +103,7 @@ post-patch:
post-install:
${LN} -sf libzorba_simplestore.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libzorba_simplestore.so.${PORTVERSION:R:R}
.if ${PORT_OPTIONS:MDOCS} && !${PORT_OPTIONS:MDOXYGEN}
- cd ${STAGEDIR}${DOCSDIR} && rmdir c/html code/html code cxx/html zorba/html
+ cd ${STAGEDIR}${DOCSDIR} && ${RMDIR} c/html code/html code cxx/html zorba/html zorba/xqdoc zorba
.endif
test: build
diff --git a/www/R-cran-shiny/Makefile b/www/R-cran-shiny/Makefile
index 95fe56029d2b..4d18fac55a70 100644
--- a/www/R-cran-shiny/Makefile
+++ b/www/R-cran-shiny/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= shiny
-PORTVERSION= 1.0.3
+PORTVERSION= 1.0.5
CATEGORIES= www
DISTNAME= ${PORTNAME}_${PORTVERSION}
@@ -12,7 +12,7 @@ COMMENT= Web Application Framework for R
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE
-CRAN_DEPENDS= R-cran-httpuv>=1.3.3:www/R-cran-httpuv \
+CRAN_DEPENDS= R-cran-httpuv>=1.3.5:www/R-cran-httpuv \
R-cran-mime>=0.3:misc/R-cran-mime \
R-cran-jsonlite>=0.9.16:converters/R-cran-jsonlite \
R-cran-xtable>0:textproc/R-cran-xtable \
diff --git a/www/R-cran-shiny/distinfo b/www/R-cran-shiny/distinfo
index 5682561b8fea..eacf2386d917 100644
--- a/www/R-cran-shiny/distinfo
+++ b/www/R-cran-shiny/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1493819492
-SHA256 (shiny_1.0.3.tar.gz) = 3a2a5a4437dbcfba1b640ef858667a59ee593754a17b73169b10003183574486
-SIZE (shiny_1.0.3.tar.gz) = 2273603
+TIMESTAMP = 1503920358
+SHA256 (shiny_1.0.5.tar.gz) = 20e25f3f72f3608a2151663f7836f2e0c6da32683a555d7541063ae7a935fa42
+SIZE (shiny_1.0.5.tar.gz) = 2330710
diff --git a/www/elixir-maru/Makefile b/www/elixir-maru/Makefile
index 77ca0554f990..cb8e5e79bbdd 100644
--- a/www/elixir-maru/Makefile
+++ b/www/elixir-maru/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= maru
-PORTVERSION= 0.11.4
+PORTVERSION= 0.12.3
DISTVERSIONPREFIX= v
CATEGORIES= www
PKGNAMEPREFIX= elixir-
diff --git a/www/elixir-maru/distinfo b/www/elixir-maru/distinfo
index 00a5845a7269..5a80c38c4f99 100644
--- a/www/elixir-maru/distinfo
+++ b/www/elixir-maru/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1489860998
-SHA256 (falood-maru-v0.11.4_GH0.tar.gz) = ee7c6d80c7dd4748c510e05be0d1bd8fd3be2d449ff10b2aa5cb566bd293cc5d
-SIZE (falood-maru-v0.11.4_GH0.tar.gz) = 32699
+TIMESTAMP = 1504015973
+SHA256 (falood-maru-v0.12.3_GH0.tar.gz) = 5c8526ab7815baa0ee57e50e9f60df82e0b69caad70fcd5aed911f6cdd206c34
+SIZE (falood-maru-v0.12.3_GH0.tar.gz) = 32331
diff --git a/www/elixir-maru/pkg-plist b/www/elixir-maru/pkg-plist
index 7d5fc50e6f13..d998a99c1271 100644
--- a/www/elixir-maru/pkg-plist
+++ b/www/elixir-maru/pkg-plist
@@ -5,19 +5,17 @@ lib/elixir/lib/maru/ebin/Elixir.Maru.Builder.Endpoint.beam
lib/elixir/lib/maru/ebin/Elixir.Maru.Builder.Exceptions.beam
lib/elixir/lib/maru/ebin/Elixir.Maru.Builder.Extend.beam
lib/elixir/lib/maru/ebin/Elixir.Maru.Builder.Methods.beam
-lib/elixir/lib/maru/ebin/Elixir.Maru.Builder.MountLink.beam
lib/elixir/lib/maru/ebin/Elixir.Maru.Builder.Namespaces.beam
lib/elixir/lib/maru/ebin/Elixir.Maru.Builder.Params.beam
lib/elixir/lib/maru/ebin/Elixir.Maru.Builder.Path.beam
lib/elixir/lib/maru/ebin/Elixir.Maru.Builder.Pipeline.beam
lib/elixir/lib/maru/ebin/Elixir.Maru.Builder.PlugRouter.beam
lib/elixir/lib/maru/ebin/Elixir.Maru.Builder.Route.beam
-lib/elixir/lib/maru/ebin/Elixir.Maru.Builder.TestRouter.beam
+lib/elixir/lib/maru/ebin/Elixir.Maru.Builder.Versioning.AcceptHeader.beam
lib/elixir/lib/maru/ebin/Elixir.Maru.Builder.Versioning.AcceptVersionHeader.beam
lib/elixir/lib/maru/ebin/Elixir.Maru.Builder.Versioning.None.beam
lib/elixir/lib/maru/ebin/Elixir.Maru.Builder.Versioning.Parameter.beam
lib/elixir/lib/maru/ebin/Elixir.Maru.Builder.Versioning.Path.beam
-lib/elixir/lib/maru/ebin/Elixir.Maru.Builder.Versioning.Test.beam
lib/elixir/lib/maru/ebin/Elixir.Maru.Builder.Versioning.beam
lib/elixir/lib/maru/ebin/Elixir.Maru.Builder.beam
lib/elixir/lib/maru/ebin/Elixir.Maru.Exceptions.InvalidFormat.beam
@@ -57,7 +55,7 @@ lib/elixir/lib/maru/ebin/Elixir.Maru.Type.beam
lib/elixir/lib/maru/ebin/Elixir.Maru.Types.Atom.beam
lib/elixir/lib/maru/ebin/Elixir.Maru.Types.Base64.beam
lib/elixir/lib/maru/ebin/Elixir.Maru.Types.Boolean.beam
-lib/elixir/lib/maru/ebin/Elixir.Maru.Types.CharList.beam
+lib/elixir/lib/maru/ebin/Elixir.Maru.Types.Charlist.beam
lib/elixir/lib/maru/ebin/Elixir.Maru.Types.File.beam
lib/elixir/lib/maru/ebin/Elixir.Maru.Types.Float.beam
lib/elixir/lib/maru/ebin/Elixir.Maru.Types.Integer.beam
@@ -85,20 +83,18 @@ lib/elixir/lib/maru/lib/maru/builder/endpoint.ex
lib/elixir/lib/maru/lib/maru/builder/exceptions.ex
lib/elixir/lib/maru/lib/maru/builder/extend.ex
lib/elixir/lib/maru/lib/maru/builder/methods.ex
-lib/elixir/lib/maru/lib/maru/builder/mount_link.ex
lib/elixir/lib/maru/lib/maru/builder/namespaces.ex
lib/elixir/lib/maru/lib/maru/builder/params.ex
lib/elixir/lib/maru/lib/maru/builder/path.ex
lib/elixir/lib/maru/lib/maru/builder/pipeline.ex
lib/elixir/lib/maru/lib/maru/builder/plug_router.ex
lib/elixir/lib/maru/lib/maru/builder/route.ex
-lib/elixir/lib/maru/lib/maru/builder/test_router.ex
lib/elixir/lib/maru/lib/maru/builder/versioning.ex
+lib/elixir/lib/maru/lib/maru/builder/versioning/accept_header.ex
lib/elixir/lib/maru/lib/maru/builder/versioning/accept_version_header.ex
lib/elixir/lib/maru/lib/maru/builder/versioning/none.ex
lib/elixir/lib/maru/lib/maru/builder/versioning/parameter.ex
lib/elixir/lib/maru/lib/maru/builder/versioning/path.ex
-lib/elixir/lib/maru/lib/maru/builder/versioning/test.ex
lib/elixir/lib/maru/lib/maru/exceptions.ex
lib/elixir/lib/maru/lib/maru/helper.ex
lib/elixir/lib/maru/lib/maru/helpers/response.ex
@@ -123,7 +119,7 @@ lib/elixir/lib/maru/lib/maru/type.ex
lib/elixir/lib/maru/lib/maru/types/atom.ex
lib/elixir/lib/maru/lib/maru/types/base64.ex
lib/elixir/lib/maru/lib/maru/types/boolean.ex
-lib/elixir/lib/maru/lib/maru/types/char_list.ex
+lib/elixir/lib/maru/lib/maru/types/charlist.ex
lib/elixir/lib/maru/lib/maru/types/file.ex
lib/elixir/lib/maru/lib/maru/types/float.ex
lib/elixir/lib/maru/lib/maru/types/integer.ex
diff --git a/www/erlang-mochiweb/Makefile b/www/erlang-mochiweb/Makefile
index 45b5b385bd22..fe85624fcab6 100644
--- a/www/erlang-mochiweb/Makefile
+++ b/www/erlang-mochiweb/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= mochiweb
-PORTVERSION= 2.16.0
+PORTVERSION= 2.17.0
DISTVERSIONPREFIX= v
CATEGORIES= www devel
PKGNAMEPREFIX= erlang-
diff --git a/www/erlang-mochiweb/distinfo b/www/erlang-mochiweb/distinfo
index 781c56943bb8..c6ed5faaf634 100644
--- a/www/erlang-mochiweb/distinfo
+++ b/www/erlang-mochiweb/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1483562738
-SHA256 (mochi-mochiweb-v2.16.0_GH0.tar.gz) = 3754c5db8a16edc59f7b585715ecfa5225ffb07ab01ca13aa3757f6b38ae0cf1
-SIZE (mochi-mochiweb-v2.16.0_GH0.tar.gz) = 287938
+TIMESTAMP = 1504015834
+SHA256 (mochi-mochiweb-v2.17.0_GH0.tar.gz) = a2a0cf0309b01ead4c58fa724686dfee7a137c17ee158da32ac3eab6256313c6
+SIZE (mochi-mochiweb-v2.17.0_GH0.tar.gz) = 288450
diff --git a/www/kcgi/Makefile b/www/kcgi/Makefile
index e5572f571377..f42c0f14286e 100644
--- a/www/kcgi/Makefile
+++ b/www/kcgi/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= kcgi
-PORTVERSION= 0.9.5
+PORTVERSION= 0.9.6
CATEGORIES= www devel
MASTER_SITES= http://kristaps.bsd.lv/kcgi/snapshots/
diff --git a/www/kcgi/distinfo b/www/kcgi/distinfo
index 2a253fd53412..48ad21610f97 100644
--- a/www/kcgi/distinfo
+++ b/www/kcgi/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1496886367
-SHA256 (kcgi-0.9.5.tgz) = 08bf47ff932032dc901c9a2c25bffbdbb23a445795fe4fee44b82f5e2d76707f
-SIZE (kcgi-0.9.5.tgz) = 143264
+TIMESTAMP = 1504255667
+SHA256 (kcgi-0.9.6.tgz) = 66d999440c53556eb3ece34d0ba02ecd9a365d8e29b85cddc65ce3ab60fdf736
+SIZE (kcgi-0.9.6.tgz) = 143613
diff --git a/www/kf5-kdewebkit/distinfo b/www/kf5-kdewebkit/distinfo
index fb514b821e1d..89d5e3953b7a 100644
--- a/www/kf5-kdewebkit/distinfo
+++ b/www/kf5-kdewebkit/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499098903
-SHA256 (KDE/frameworks/5.36.0/kdewebkit-5.36.0.tar.xz) = 3aad10187eba6385c568b43294311606917d9230543a6c46a7db7b1cec7fa3f4
-SIZE (KDE/frameworks/5.36.0/kdewebkit-5.36.0.tar.xz) = 29328
+TIMESTAMP = 1502086073
+SHA256 (KDE/frameworks/5.37.0/kdewebkit-5.37.0.tar.xz) = e1c1a1f6514126a07e4ef7fbd4258c4a9ca068774b26b6748582f4c8415103de
+SIZE (KDE/frameworks/5.37.0/kdewebkit-5.37.0.tar.xz) = 29328
diff --git a/www/kf5-khtml/distinfo b/www/kf5-khtml/distinfo
index 030097e9b6c5..70d505071cb4 100644
--- a/www/kf5-khtml/distinfo
+++ b/www/kf5-khtml/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499098904
-SHA256 (KDE/frameworks/5.36.0/khtml-5.36.0.tar.xz) = fad99c7f46f4ad932300d0ad9dafeb9b18fc32de05efa937e9df0f7b138c5395
-SIZE (KDE/frameworks/5.36.0/khtml-5.36.0.tar.xz) = 2081300
+TIMESTAMP = 1502086073
+SHA256 (KDE/frameworks/5.37.0/khtml-5.37.0.tar.xz) = 02aa4260f078f97b9299fdf1acef85ed28158c9de3a3023774aed8e4bbe815d8
+SIZE (KDE/frameworks/5.37.0/khtml-5.37.0.tar.xz) = 2081460
diff --git a/www/kf5-kjs/distinfo b/www/kf5-kjs/distinfo
index c31e29b7a0ad..265670c83fea 100644
--- a/www/kf5-kjs/distinfo
+++ b/www/kf5-kjs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499098904
-SHA256 (KDE/frameworks/5.36.0/kjs-5.36.0.tar.xz) = c6929aa120384c1de8024d8a5a5462ad1604295171761840f36342a9e4e9ff1a
-SIZE (KDE/frameworks/5.36.0/kjs-5.36.0.tar.xz) = 294836
+TIMESTAMP = 1502086073
+SHA256 (KDE/frameworks/5.37.0/kjs-5.37.0.tar.xz) = 2be1dd4e8a6b0914d3f1c7bc4ee0d2666b8166430adb576e17d7441225f2d010
+SIZE (KDE/frameworks/5.37.0/kjs-5.37.0.tar.xz) = 294908
diff --git a/www/kf5-kjsembed/distinfo b/www/kf5-kjsembed/distinfo
index d01ad4e48141..3cc9cb583280 100644
--- a/www/kf5-kjsembed/distinfo
+++ b/www/kf5-kjsembed/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499098904
-SHA256 (KDE/frameworks/5.36.0/kjsembed-5.36.0.tar.xz) = 49bf01a91f227d7daa1b41f1e792054a814de4f1783c4a44a316123fbb938580
-SIZE (KDE/frameworks/5.36.0/kjsembed-5.36.0.tar.xz) = 169624
+TIMESTAMP = 1502086073
+SHA256 (KDE/frameworks/5.37.0/kjsembed-5.37.0.tar.xz) = 202f8377abbdf4ad564ca0b11e74eaa6001a5863406254562b6405f755995c70
+SIZE (KDE/frameworks/5.37.0/kjsembed-5.37.0.tar.xz) = 169532
diff --git a/www/p5-Catalyst-Authentication-Credential-HTTP/Makefile b/www/p5-Catalyst-Authentication-Credential-HTTP/Makefile
index 4a849913217f..0abea6d3d356 100644
--- a/www/p5-Catalyst-Authentication-Credential-HTTP/Makefile
+++ b/www/p5-Catalyst-Authentication-Credential-HTTP/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= Catalyst-Authentication-Credential-HTTP
-PORTVERSION= 1.016
-PORTREVISION= 1
+PORTVERSION= 1.018
CATEGORIES= www perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
@@ -21,9 +20,12 @@ BUILD_DEPENDS= p5-Catalyst-Plugin-Authentication>=0.10005:www/p5-Catalyst-Plugin
p5-String-Escape>0:textproc/p5-String-Escape \
p5-URI>0:net/p5-URI
RUN_DEPENDS:= ${BUILD_DEPENDS}
-TEST_DEPENDS= p5-Test-Exception>=0:devel/p5-Test-Exception \
- p5-Test-MockObject>=0:devel/p5-Test-MockObject
+TEST_DEPENDS= p5-HTTP-Message>0:www/p5-HTTP-Message \
+ p5-Test-Exception>0:devel/p5-Test-Exception \
+ p5-Test-MockObject>0:devel/p5-Test-MockObject \
+ p5-Test-Needs>0:devel/p5-Test-Needs
+NO_ARCH= YES
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-Catalyst-Authentication-Credential-HTTP/distinfo b/www/p5-Catalyst-Authentication-Credential-HTTP/distinfo
index d499eeeec4b7..4bbdebda184f 100644
--- a/www/p5-Catalyst-Authentication-Credential-HTTP/distinfo
+++ b/www/p5-Catalyst-Authentication-Credential-HTTP/distinfo
@@ -1,2 +1,3 @@
-SHA256 (Catalyst-Authentication-Credential-HTTP-1.016.tar.gz) = a13cdda3ac24572cf4e35f0e2f5dd9dcc90e8d5c989868028ea7a58c07549364
-SIZE (Catalyst-Authentication-Credential-HTTP-1.016.tar.gz) = 42770
+TIMESTAMP = 1504091860
+SHA256 (Catalyst-Authentication-Credential-HTTP-1.018.tar.gz) = 6fa1816dee644b0db5ea0cc15c5e711dc2ced2083625abce7096521f1d65a529
+SIZE (Catalyst-Authentication-Credential-HTTP-1.018.tar.gz) = 39956
diff --git a/www/p5-HTML-Tree/Makefile b/www/p5-HTML-Tree/Makefile
index 962d7a496f55..f872c156b561 100644
--- a/www/p5-HTML-Tree/Makefile
+++ b/www/p5-HTML-Tree/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= HTML-Tree
-PORTVERSION= 5.06
+PORTVERSION= 5.07
CATEGORIES= www perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/www/p5-HTML-Tree/distinfo b/www/p5-HTML-Tree/distinfo
index 3b92c551aca8..c9d0e38a5fad 100644
--- a/www/p5-HTML-Tree/distinfo
+++ b/www/p5-HTML-Tree/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1493377608
-SHA256 (HTML-Tree-5.06.tar.gz) = 9c36eb19cbdf9a5906c858948ca51c35bd7561f52cc18c43281acbe57327536e
-SIZE (HTML-Tree-5.06.tar.gz) = 150067
+TIMESTAMP = 1504189405
+SHA256 (HTML-Tree-5.07.tar.gz) = f0374db84731c204b86c1d5b90975fef0d30a86bd9def919343e554e31a9dbbf
+SIZE (HTML-Tree-5.07.tar.gz) = 150477
diff --git a/www/py-bottle/Makefile b/www/py-bottle/Makefile
index 245d3f8812c6..6443d834fe8f 100644
--- a/www/py-bottle/Makefile
+++ b/www/py-bottle/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= bottle
-PORTVERSION= 0.12.7
+PORTVERSION= 0.12.13
PORTREVISION= 0
CATEGORIES= www python
MASTER_SITES= CHEESESHOP
diff --git a/www/py-bottle/distinfo b/www/py-bottle/distinfo
index 9f0b6f082c8f..2b6b664d48f8 100644
--- a/www/py-bottle/distinfo
+++ b/www/py-bottle/distinfo
@@ -1,2 +1,3 @@
-SHA256 (bottle-0.12.7.tar.gz) = e3ea2191f06ca51af45bf6ca41ed2d1b2d809ceda0876466879fe205be7b2073
-SIZE (bottle-0.12.7.tar.gz) = 69375
+TIMESTAMP = 1503918871
+SHA256 (bottle-0.12.13.tar.gz) = 39b751aee0b167be8dffb63ca81b735bbf1dd0905b3bc42761efedee8f123355
+SIZE (bottle-0.12.13.tar.gz) = 70870
diff --git a/www/py-djangorestframework/Makefile b/www/py-djangorestframework/Makefile
index fa58ef7a8b4f..3c07b5c18158 100644
--- a/www/py-djangorestframework/Makefile
+++ b/www/py-djangorestframework/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= djangorestframework
-PORTVERSION= 3.3.3
+PORTVERSION= 3.6.4
CATEGORIES= www python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/www/py-djangorestframework/distinfo b/www/py-djangorestframework/distinfo
index 395d2adf7036..8b2a4d60d70b 100644
--- a/www/py-djangorestframework/distinfo
+++ b/www/py-djangorestframework/distinfo
@@ -1,2 +1,3 @@
-SHA256 (djangorestframework-3.3.3.tar.gz) = f606f2bb4e9bb320937cb6ccce299991b2d302f5cc705a671dffca491e55935c
-SIZE (djangorestframework-3.3.3.tar.gz) = 420033
+TIMESTAMP = 1503903057
+SHA256 (djangorestframework-3.6.4.tar.gz) = de8ac68b3cf6dd41b98e01dcc92dc0022a5958f096eafc181a17fa975d18ca42
+SIZE (djangorestframework-3.6.4.tar.gz) = 1011409
diff --git a/www/rubygem-browser/Makefile b/www/rubygem-browser/Makefile
index 376dc18a1f62..73a7d45fa6b3 100644
--- a/www/rubygem-browser/Makefile
+++ b/www/rubygem-browser/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= browser
-PORTVERSION= 2.5.0
+PORTVERSION= 2.5.1
CATEGORIES= www rubygems
MASTER_SITES= RG
diff --git a/www/rubygem-browser/distinfo b/www/rubygem-browser/distinfo
index 7151ac7475e6..017ead1e7e07 100644
--- a/www/rubygem-browser/distinfo
+++ b/www/rubygem-browser/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1502295350
-SHA256 (rubygem/browser-2.5.0.gem) = d32789dd7c26b7be0902423af0f53ccce951b31b2f68a637935218488f959b7e
-SIZE (rubygem/browser-2.5.0.gem) = 45056
+TIMESTAMP = 1504258211
+SHA256 (rubygem/browser-2.5.1.gem) = 747fb13b14ce4d0535498a99ecc8bc58cfeacd5a9a54882f797fbd8830f28696
+SIZE (rubygem/browser-2.5.1.gem) = 45568
diff --git a/www/rubygem-rack-contrib/Makefile b/www/rubygem-rack-contrib/Makefile
index a8e22e9ab46b..103c5e48c9d6 100644
--- a/www/rubygem-rack-contrib/Makefile
+++ b/www/rubygem-rack-contrib/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= rack-contrib
-PORTVERSION= 1.5.0
+PORTVERSION= 1.6.0
CATEGORIES= www rubygems
MASTER_SITES= RG
diff --git a/www/rubygem-rack-contrib/distinfo b/www/rubygem-rack-contrib/distinfo
index 73135b9ebef6..2b653380ba80 100644
--- a/www/rubygem-rack-contrib/distinfo
+++ b/www/rubygem-rack-contrib/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1500474514
-SHA256 (rubygem/rack-contrib-1.5.0.gem) = c899a893df593c8a7244d662ec9d7b909bcdc1cdb6b6f09c67a108c04b898ff7
-SIZE (rubygem/rack-contrib-1.5.0.gem) = 29696
+TIMESTAMP = 1504258217
+SHA256 (rubygem/rack-contrib-1.6.0.gem) = f0203c44f678e15f64aa1457f712313fb75dc29d166e0e03a0aa19d7b43799b6
+SIZE (rubygem/rack-contrib-1.6.0.gem) = 29696
diff --git a/www/rubygem-rdf/Makefile b/www/rubygem-rdf/Makefile
index 25857380de7c..0de26ff5a4dd 100644
--- a/www/rubygem-rdf/Makefile
+++ b/www/rubygem-rdf/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= rdf
-PORTVERSION= 2.2.8
+PORTVERSION= 2.2.9
CATEGORIES= www rubygems
MASTER_SITES= RG
diff --git a/www/rubygem-rdf/distinfo b/www/rubygem-rdf/distinfo
index 0a8f1caa07d7..69bf436b64dd 100644
--- a/www/rubygem-rdf/distinfo
+++ b/www/rubygem-rdf/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1503678499
-SHA256 (rubygem/rdf-2.2.8.gem) = 17abedadc88ddd143f2dcec59096955b8d309cc11ac47564a3592cd854745e32
-SIZE (rubygem/rdf-2.2.8.gem) = 133632
+TIMESTAMP = 1503939374
+SHA256 (rubygem/rdf-2.2.9.gem) = f1af4a79f55f40389843fca83f5663902b03e1b0d9e5b9741a3adac571e645b3
+SIZE (rubygem/rdf-2.2.9.gem) = 133632
diff --git a/www/tinymce/Makefile b/www/tinymce/Makefile
index 628b710b87a1..d5a26d49d1e6 100644
--- a/www/tinymce/Makefile
+++ b/www/tinymce/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= tinymce
-PORTVERSION= 4.6.5
+PORTVERSION= 4.6.6
CATEGORIES= www
MASTER_SITES= http://download.ephox.com/${PORTNAME}/community/ \
LOCAL/sunpoet
diff --git a/www/tinymce/distinfo b/www/tinymce/distinfo
index 616be2775a2c..900f13280295 100644
--- a/www/tinymce/distinfo
+++ b/www/tinymce/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501766514
-SHA256 (tinymce_4.6.5.zip) = 9f0ae0eafde499c68abe7f7bf564590365cb684bb276f709f7d1fcf0db42a52c
-SIZE (tinymce_4.6.5.zip) = 456480
+TIMESTAMP = 1504258077
+SHA256 (tinymce_4.6.6.zip) = 690f4af59073eaeca24102d21eb9a5f440fa5213f639a08921d77865b1e2df83
+SIZE (tinymce_4.6.6.zip) = 459358
diff --git a/www/yarn/Makefile b/www/yarn/Makefile
index 229f3eaffee3..7caaaf1afcc5 100644
--- a/www/yarn/Makefile
+++ b/www/yarn/Makefile
@@ -6,7 +6,7 @@ DISTVERSION= 0.27.5
CATEGORIES= www
MASTER_SITES= https://yarnpkg.com/downloads/${PORTVERSION}/
-MAINTAINER= luca.pizzamiglio@gmail.com
+MAINTAINER= pizzamig@FreeBSD.org
COMMENT= Package manager for node, alternative to npm
LICENSE= BSD2CLAUSE
diff --git a/x11-fonts/code2000/Makefile b/x11-fonts/code2000/Makefile
index 438ea2591bd1..ce0f1041ba85 100644
--- a/x11-fonts/code2000/Makefile
+++ b/x11-fonts/code2000/Makefile
@@ -17,6 +17,7 @@ USES= fonts zip
SUB_FILES= pkg-message
NO_BUILD= yes
+NO_ARCH= yes
post-extract:
${MKDIR} ${WRKSRC}
diff --git a/x11-fonts/code2000/pkg-descr b/x11-fonts/code2000/pkg-descr
index 080b2046caba..5cd207ed8c5a 100644
--- a/x11-fonts/code2000/pkg-descr
+++ b/x11-fonts/code2000/pkg-descr
@@ -4,4 +4,4 @@ version 1.16).
With Unicode-aware applications you'll be able to display and use special
characters and a lot of languages.
-WWW: http://en.wikipedia.org/wiki/Code2000
+WWW: https://en.wikipedia.org/wiki/Code2000
diff --git a/x11-fonts/gnu-unifont-ttf/Makefile b/x11-fonts/gnu-unifont-ttf/Makefile
index 7ec6dfb68a5e..b7437eb689be 100644
--- a/x11-fonts/gnu-unifont-ttf/Makefile
+++ b/x11-fonts/gnu-unifont-ttf/Makefile
@@ -1,30 +1,15 @@
# $FreeBSD$
-PORTNAME= gnu-unifont-ttf
-PORTVERSION= 7.0.03
-PORTREVISION= 1
-PORTEPOCH= 1
-CATEGORIES= x11-fonts
-MASTER_SITES= GNU/unifont/unifont-${PORTVERSION}
-DISTNAME= unifont-${PORTVERSION}
+MASTERDIR= ${.CURDIR}/../gnu-unifont
-MAINTAINER= bsdports@gmail.com
-COMMENT= Unicode TrueType Font
+PKGNAMESUFFIX= -ttf
-USES= fonts
+COMMENT= GNU Unicode TrueType font
-NO_BUILD= yes
-WRKSRC_SUBDIR= font/precompiled
+FONTFILES= ${PORTNAME} ${PORTNAME}_csur ${PORTNAME}_upper
+FONTSUFFIX= .ttf
-do-install:
- @${MKDIR} ${STAGEDIR}${FONTSDIR}
- ${INSTALL_DATA} ${WRKSRC}/unifont-${PORTVERSION}.ttf \
- ${STAGEDIR}${FONTSDIR}/unifont.ttf
- ${INSTALL_DATA} ${WRKSRC}/unifont_csur-${PORTVERSION}.ttf \
- ${STAGEDIR}${FONTSDIR}/unifont_csur.ttf
- ${INSTALL_DATA} ${WRKSRC}/unifont_upper-${PORTVERSION}.ttf \
- ${STAGEDIR}${FONTSDIR}/unifont_upper.ttf
- ${INSTALL_DATA} ${WRKSRC}/unifont_upper_csur-${PORTVERSION}.ttf \
- ${STAGEDIR}${FONTSDIR}/unifont_upper_csur.ttf
+DESCR= ${.CURDIR}/pkg-descr
+DISTINFO_FILE= ${.CURDIR}/distinfo
-.include <bsd.port.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/x11-fonts/gnu-unifont-ttf/distinfo b/x11-fonts/gnu-unifont-ttf/distinfo
index da903576d772..6c700644c7c3 100644
--- a/x11-fonts/gnu-unifont-ttf/distinfo
+++ b/x11-fonts/gnu-unifont-ttf/distinfo
@@ -1,2 +1,7 @@
-SHA256 (unifont-7.0.03.tar.gz) = 3b5f2f3aa1bee9fdd3b23b17c0a3206948c3148dfd3ca0404696ea06d63c72cd
-SIZE (unifont-7.0.03.tar.gz) = 18372349
+TIMESTAMP = 1503957706
+SHA256 (unifont-10.0.06.ttf) = 669a9764fb640c832a8ebfbd2c351be744b55c6f65b40f1fb203144309659ac0
+SIZE (unifont-10.0.06.ttf) = 12291504
+SHA256 (unifont_csur-10.0.06.ttf) = c6bbd70acb29bec83611732cce1e41953c48cb59516506dbf0ed94a23f71753a
+SIZE (unifont_csur-10.0.06.ttf) = 750816
+SHA256 (unifont_upper-10.0.06.ttf) = be9d9670632b65113bc280d687fbc806990847f6b4567af89f1db45ae97f5b92
+SIZE (unifont_upper-10.0.06.ttf) = 1375664
diff --git a/x11-fonts/gnu-unifont-ttf/pkg-plist b/x11-fonts/gnu-unifont-ttf/pkg-plist
deleted file mode 100644
index f4701aefec45..000000000000
--- a/x11-fonts/gnu-unifont-ttf/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-%%FONTSDIR%%/unifont.ttf
-%%FONTSDIR%%/unifont_csur.ttf
-%%FONTSDIR%%/unifont_upper.ttf
-%%FONTSDIR%%/unifont_upper_csur.ttf
diff --git a/x11-fonts/gnu-unifont/Makefile b/x11-fonts/gnu-unifont/Makefile
index 26a3d007e994..e33896f58286 100644
--- a/x11-fonts/gnu-unifont/Makefile
+++ b/x11-fonts/gnu-unifont/Makefile
@@ -1,26 +1,33 @@
# $FreeBSD$
-PORTNAME= gnu-unifont
-PORTVERSION= 7.0.03
-PORTREVISION= 1
+PORTNAME= unifont
+PORTVERSION= 10.0.06
PORTEPOCH= 1
CATEGORIES= x11-fonts
-MASTER_SITES= GNU/unifont/unifont-${PORTVERSION}
-DISTNAME= unifont-${PORTVERSION}.pcf
-EXTRACT_SUFX= .gz
+MASTER_SITES= GNU/${PORTNAME}/${PORTNAME}-${PORTVERSION}
+PKGNAMEPREFIX= gnu-
+DISTFILES= ${FONTFILES:S|$|-${PORTVERSION}${FONTSUFFIX}|}
EXTRACT_ONLY=
-MAINTAINER= bsdports@gmail.com
-COMMENT= Unicode Font
+MAINTAINER= ports@FreeBSD.org
+COMMENT?= GNU Unicode font
-USES= fonts
+LICENSE= GPLv2+
+
+FONTFILES?= ${PORTNAME}
+FONTSUFFIX?= .pcf.gz
+FONTSDIR= ${PREFIX}/share/fonts/${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
+NO_ARCH= yes
NO_BUILD= yes
-PLIST_FILES= ${FONTSDIR}/unifont.pcf.gz
+PLIST_FILES= ${FONTFILES:S|^|${FONTSDIR}/|:S|$|${FONTSUFFIX}|}
+USES= fonts
do-install:
${MKDIR} ${STAGEDIR}${FONTSDIR}
- ${INSTALL_DATA} ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} \
- ${STAGEDIR}${FONTSDIR}/unifont.pcf.gz
+.for i in ${FONTFILES}
+ ${INSTALL_DATA} ${DISTDIR}/${i}-${PORTVERSION}${FONTSUFFIX} \
+ ${STAGEDIR}${FONTSDIR}/${i}${FONTSUFFIX}
+.endfor
.include <bsd.port.mk>
diff --git a/x11-fonts/gnu-unifont/distinfo b/x11-fonts/gnu-unifont/distinfo
index 7e3062605256..a8440f19a7fe 100644
--- a/x11-fonts/gnu-unifont/distinfo
+++ b/x11-fonts/gnu-unifont/distinfo
@@ -1,2 +1,3 @@
-SHA256 (unifont-7.0.03.pcf.gz) = cffed831498eb67933acbf2a7e398d64a7e3bf97a784a10fc999db51891cc515
-SIZE (unifont-7.0.03.pcf.gz) = 1358950
+TIMESTAMP = 1503957691
+SHA256 (unifont-10.0.06.pcf.gz) = 60465589797f6581efc43af8c4a471e45b9513ea15b0009379caeaec3caff37a
+SIZE (unifont-10.0.06.pcf.gz) = 1360484
diff --git a/x11-themes/kf5-breeze-icons/distinfo b/x11-themes/kf5-breeze-icons/distinfo
index a826effcd777..68d3fc61e78b 100644
--- a/x11-themes/kf5-breeze-icons/distinfo
+++ b/x11-themes/kf5-breeze-icons/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499098904
-SHA256 (KDE/frameworks/5.36.0/breeze-icons-5.36.0.tar.xz) = c39d5bb13f1a3e81ac5cc10f44f842228c7441a98c3c370aa55ca93ffc9566a5
-SIZE (KDE/frameworks/5.36.0/breeze-icons-5.36.0.tar.xz) = 1496036
+TIMESTAMP = 1502086073
+SHA256 (KDE/frameworks/5.37.0/breeze-icons-5.37.0.tar.xz) = bc2f466920bcd606f835e21733087b57cda8273881ee1713e9be5bd0e015d99e
+SIZE (KDE/frameworks/5.37.0/breeze-icons-5.37.0.tar.xz) = 1498320
diff --git a/x11-themes/kf5-breeze-icons/pkg-plist b/x11-themes/kf5-breeze-icons/pkg-plist
index 380b350b7ce0..46d081948d89 100644
--- a/x11-themes/kf5-breeze-icons/pkg-plist
+++ b/x11-themes/kf5-breeze-icons/pkg-plist
@@ -3882,6 +3882,7 @@ share/icons/breeze-dark/actions/32/autocorrection.svg
share/icons/breeze-dark/actions/32/blurimage.svg
share/icons/breeze-dark/actions/32/bookmark-new.svg
share/icons/breeze-dark/actions/32/bookmark-remove.svg
+share/icons/breeze-dark/actions/32/bookmarks.svg
share/icons/breeze-dark/actions/32/bordertool.svg
share/icons/breeze-dark/actions/32/call-start.svg
share/icons/breeze-dark/actions/32/call-stop.svg
@@ -4340,6 +4341,15 @@ share/icons/breeze-dark/applets/48/weather-snow.svg
share/icons/breeze-dark/applets/48/weather-storm-day.svg
share/icons/breeze-dark/applets/48/weather-storm-night.svg
share/icons/breeze-dark/applets/48/weather-storm.svg
+share/icons/breeze-dark/applets/64/osd-duplicate.svg
+share/icons/breeze-dark/applets/64/osd-rotate-ccw.svg
+share/icons/breeze-dark/applets/64/osd-rotate-cw.svg
+share/icons/breeze-dark/applets/64/osd-rotate-flip.svg
+share/icons/breeze-dark/applets/64/osd-rotate-normal.svg
+share/icons/breeze-dark/applets/64/osd-sbs-left.svg
+share/icons/breeze-dark/applets/64/osd-sbs-sright.svg
+share/icons/breeze-dark/applets/64/osd-shutd-laptop.svg
+share/icons/breeze-dark/applets/64/osd-shutd-screen.svg
share/icons/breeze-dark/applets/64/preferences-system-windows-effect-blur.svg
share/icons/breeze-dark/applets/64/preferences-system-windows-effect-contrast.svg
share/icons/breeze-dark/applets/64/preferences-system-windows-effect-coverswitch.svg
@@ -4401,9 +4411,7 @@ share/icons/breeze-dark/apps/22/hotspot.svg
share/icons/breeze-dark/apps/22/kate.svg
share/icons/breeze-dark/apps/22/kde.svg
share/icons/breeze-dark/apps/22/kdeconnect.svg
-share/icons/breeze-dark/apps/22/kget.svg
share/icons/breeze-dark/apps/22/korg-todo.svg
-share/icons/breeze-dark/apps/22/ktorrent.svg
share/icons/breeze-dark/apps/22/kwrite.svg
share/icons/breeze-dark/apps/22/plasma.svg
share/icons/breeze-dark/apps/22/preferences-desktop-font.svg
@@ -6760,7 +6768,6 @@ share/icons/breeze-dark/mimetypes/64/x-office-document.svg
share/icons/breeze-dark/mimetypes/64/x-office-drawing.svg
share/icons/breeze-dark/mimetypes/64/x-office-presentation.svg
share/icons/breeze-dark/mimetypes/64/x-office-spreadsheet.svg
-share/icons/breeze-dark/places/16/bookmarks.svg
share/icons/breeze-dark/places/16/certificate-server.svg
share/icons/breeze-dark/places/16/desktop.svg
share/icons/breeze-dark/places/16/document-multiple.svg
@@ -6833,7 +6840,6 @@ share/icons/breeze-dark/places/16/user-home.svg
share/icons/breeze-dark/places/16/user-identity.svg
share/icons/breeze-dark/places/16/user-trash-full.svg
share/icons/breeze-dark/places/16/user-trash.svg
-share/icons/breeze-dark/places/22/bookmarks.svg
share/icons/breeze-dark/places/22/certificate-server.svg
share/icons/breeze-dark/places/22/desktop.svg
share/icons/breeze-dark/places/22/document-multiple.svg
@@ -6906,7 +6912,6 @@ share/icons/breeze-dark/places/22/user-home.svg
share/icons/breeze-dark/places/22/user-identity.svg
share/icons/breeze-dark/places/22/user-trash-full.svg
share/icons/breeze-dark/places/22/user-trash.svg
-share/icons/breeze-dark/places/32/bookmarks.svg
share/icons/breeze-dark/places/32/certificate-server.svg
share/icons/breeze-dark/places/32/desktop.svg
share/icons/breeze-dark/places/32/favorites.svg
@@ -6969,7 +6974,6 @@ share/icons/breeze-dark/places/32/user-desktop.svg
share/icons/breeze-dark/places/32/user-home.svg
share/icons/breeze-dark/places/32/user-trash-full.svg
share/icons/breeze-dark/places/32/user-trash.svg
-share/icons/breeze-dark/places/64/bookmarks.svg
share/icons/breeze-dark/places/64/certificate-server.svg
share/icons/breeze-dark/places/64/desktop.svg
share/icons/breeze-dark/places/64/favorites.svg
@@ -11440,6 +11444,7 @@ share/icons/breeze/actions/32/autocorrection.svg
share/icons/breeze/actions/32/blurimage.svg
share/icons/breeze/actions/32/bookmark-new.svg
share/icons/breeze/actions/32/bookmark-remove.svg
+share/icons/breeze/actions/32/bookmarks.svg
share/icons/breeze/actions/32/bordertool.svg
share/icons/breeze/actions/32/call-start.svg
share/icons/breeze/actions/32/call-stop.svg
@@ -11902,6 +11907,15 @@ share/icons/breeze/applets/48/weather-snow.svg
share/icons/breeze/applets/48/weather-storm-day.svg
share/icons/breeze/applets/48/weather-storm-night.svg
share/icons/breeze/applets/48/weather-storm.svg
+share/icons/breeze/applets/64/osd-duplicate.svg
+share/icons/breeze/applets/64/osd-rotate-ccw.svg
+share/icons/breeze/applets/64/osd-rotate-cw.svg
+share/icons/breeze/applets/64/osd-rotate-flip.svg
+share/icons/breeze/applets/64/osd-rotate-normal.svg
+share/icons/breeze/applets/64/osd-sbs-left.svg
+share/icons/breeze/applets/64/osd-sbs-sright.svg
+share/icons/breeze/applets/64/osd-shutd-laptop.svg
+share/icons/breeze/applets/64/osd-shutd-screen.svg
share/icons/breeze/applets/64/preferences-system-windows-effect-blur.svg
share/icons/breeze/applets/64/preferences-system-windows-effect-contrast.svg
share/icons/breeze/applets/64/preferences-system-windows-effect-coverswitch.svg
@@ -11964,9 +11978,7 @@ share/icons/breeze/apps/22/hotspot.svg
share/icons/breeze/apps/22/kate.svg
share/icons/breeze/apps/22/kde.svg
share/icons/breeze/apps/22/kdeconnect.svg
-share/icons/breeze/apps/22/kget.svg
share/icons/breeze/apps/22/korg-todo.svg
-share/icons/breeze/apps/22/ktorrent.svg
share/icons/breeze/apps/22/kwrite.svg
share/icons/breeze/apps/22/plasma.svg
share/icons/breeze/apps/22/plasmavault.svg
@@ -14347,7 +14359,6 @@ share/icons/breeze/mimetypes/64/x-office-document.svg
share/icons/breeze/mimetypes/64/x-office-drawing.svg
share/icons/breeze/mimetypes/64/x-office-presentation.svg
share/icons/breeze/mimetypes/64/x-office-spreadsheet.svg
-share/icons/breeze/places/16/bookmarks.svg
share/icons/breeze/places/16/certificate-server.svg
share/icons/breeze/places/16/desktop.svg
share/icons/breeze/places/16/document-multiple.svg
@@ -14420,7 +14431,6 @@ share/icons/breeze/places/16/user-home.svg
share/icons/breeze/places/16/user-identity.svg
share/icons/breeze/places/16/user-trash-full.svg
share/icons/breeze/places/16/user-trash.svg
-share/icons/breeze/places/22/bookmarks.svg
share/icons/breeze/places/22/certificate-server.svg
share/icons/breeze/places/22/desktop.svg
share/icons/breeze/places/22/document-multiple.svg
@@ -14493,7 +14503,6 @@ share/icons/breeze/places/22/user-home.svg
share/icons/breeze/places/22/user-identity.svg
share/icons/breeze/places/22/user-trash-full.svg
share/icons/breeze/places/22/user-trash.svg
-share/icons/breeze/places/32/bookmarks.svg
share/icons/breeze/places/32/certificate-server.svg
share/icons/breeze/places/32/desktop.svg
share/icons/breeze/places/32/favorites.svg
@@ -14556,7 +14565,6 @@ share/icons/breeze/places/32/user-desktop.svg
share/icons/breeze/places/32/user-home.svg
share/icons/breeze/places/32/user-trash-full.svg
share/icons/breeze/places/32/user-trash.svg
-share/icons/breeze/places/64/bookmarks.svg
share/icons/breeze/places/64/certificate-server.svg
share/icons/breeze/places/64/desktop.svg
share/icons/breeze/places/64/favorites.svg
diff --git a/x11-themes/kf5-kemoticons/distinfo b/x11-themes/kf5-kemoticons/distinfo
index b777249c25e7..48231ab6e05b 100644
--- a/x11-themes/kf5-kemoticons/distinfo
+++ b/x11-themes/kf5-kemoticons/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499098904
-SHA256 (KDE/frameworks/5.36.0/kemoticons-5.36.0.tar.xz) = aecc1537cc03124ccc6f9f625424ec96d0904afe800c411a84dab5233a7a8a2f
-SIZE (KDE/frameworks/5.36.0/kemoticons-5.36.0.tar.xz) = 1695608
+TIMESTAMP = 1502086073
+SHA256 (KDE/frameworks/5.37.0/kemoticons-5.37.0.tar.xz) = d8c6bd991b04b85a6a7ab891132e6e3f46427467b67a45a00c7bd416343aa9b3
+SIZE (KDE/frameworks/5.37.0/kemoticons-5.37.0.tar.xz) = 1695528
diff --git a/x11-themes/kf5-kiconthemes/distinfo b/x11-themes/kf5-kiconthemes/distinfo
index a17dda0cb2f4..f37855193945 100644
--- a/x11-themes/kf5-kiconthemes/distinfo
+++ b/x11-themes/kf5-kiconthemes/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499098904
-SHA256 (KDE/frameworks/5.36.0/kiconthemes-5.36.0.tar.xz) = 54c833a09f1b9d117ede26b9ec5d069b84b7304ace6a173c7fd5470d849d2d29
-SIZE (KDE/frameworks/5.36.0/kiconthemes-5.36.0.tar.xz) = 204956
+TIMESTAMP = 1502086074
+SHA256 (KDE/frameworks/5.37.0/kiconthemes-5.37.0.tar.xz) = b83bc856947134d4c7a97a6bf8f61045269fb614d6f7d482b344a8beb57bf5c8
+SIZE (KDE/frameworks/5.37.0/kiconthemes-5.37.0.tar.xz) = 204832
diff --git a/x11-themes/kf5-oxygen-icons5/distinfo b/x11-themes/kf5-oxygen-icons5/distinfo
index d29143666069..750fcfc9fe7d 100644
--- a/x11-themes/kf5-oxygen-icons5/distinfo
+++ b/x11-themes/kf5-oxygen-icons5/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499098906
-SHA256 (KDE/frameworks/5.36.0/oxygen-icons5-5.36.0.tar.xz) = 2fb5414909ee0b8ace97dec6ef1d056c6962ba992336e8c972319c1d1ef25910
-SIZE (KDE/frameworks/5.36.0/oxygen-icons5-5.36.0.tar.xz) = 234410140
+TIMESTAMP = 1502086076
+SHA256 (KDE/frameworks/5.37.0/oxygen-icons5-5.37.0.tar.xz) = 9004435ec6ba3be0313b25ab9230601b027f902ff9a81070b9782037923ddae6
+SIZE (KDE/frameworks/5.37.0/oxygen-icons5-5.37.0.tar.xz) = 234411868
diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile
index 6c9d63c1bef2..83f3358e4c85 100644
--- a/x11-toolkits/Makefile
+++ b/x11-toolkits/Makefile
@@ -86,13 +86,12 @@
SUBDIR += kf5-kconfigwidgets
SUBDIR += kf5-kdesignerplugin
SUBDIR += kf5-kguiaddons
+ SUBDIR += kf5-kirigami2
SUBDIR += kf5-kitemviews
SUBDIR += kf5-kjobwidgets
SUBDIR += kf5-ktextwidgets
SUBDIR += kf5-kwidgetsaddons
SUBDIR += kf5-kxmlgui
- SUBDIR += kirigami
- SUBDIR += kirigami2
SUBDIR += kproperty
SUBDIR += lesstif
SUBDIR += libXaw
diff --git a/x11-toolkits/gnustep-gui/Makefile b/x11-toolkits/gnustep-gui/Makefile
index 0b57fc303c3d..2b5a6ecaea79 100644
--- a/x11-toolkits/gnustep-gui/Makefile
+++ b/x11-toolkits/gnustep-gui/Makefile
@@ -65,4 +65,7 @@ pre-configure:
@${CP} ${GNUSTEP_PREFIX}/System/Library/Makefiles/${file} ${WRKSRC}
.endfor
+post-install-DOCS-off:
+ @${FIND} -d ${STAGEDIR}${PREFIX}/GNUstep/System/Library/Documentation -type d -empty -delete
+
.include <bsd.port.mk>
diff --git a/x11-toolkits/gnustep-gui/pkg-plist b/x11-toolkits/gnustep-gui/pkg-plist
index 1b4925319734..48249b4267ed 100644
--- a/x11-toolkits/gnustep-gui/pkg-plist
+++ b/x11-toolkits/gnustep-gui/pkg-plist
@@ -1,7 +1,44 @@
-
+GNUstep/System/Applications/GSSpeechServer.app/GSSpeechServer
+GNUstep/System/Applications/GSSpeechServer.app/Resources/GSSpeechServer.desktop
+GNUstep/System/Applications/GSSpeechServer.app/Resources/Info-gnustep.plist
+GNUstep/System/Applications/GSSpeechServer.app/stamp.make
+GNUstep/System/Library/Bundles/AudioOutput.nssound/AudioOutput
+GNUstep/System/Library/Bundles/AudioOutput.nssound/Resources/Info-gnustep.plist
+GNUstep/System/Library/Bundles/AudioOutput.nssound/stamp.make
%%CUPS%%GNUstep/System/Library/Bundles/GSPrinting/GSCUPS.bundle/GSCUPS
%%CUPS%%GNUstep/System/Library/Bundles/GSPrinting/GSCUPS.bundle/Resources/Info-gnustep.plist
%%CUPS%%GNUstep/System/Library/Bundles/GSPrinting/GSCUPS.bundle/stamp.make
+GNUstep/System/Library/Bundles/GSPrinting/GSLPR.bundle/GSLPR
+GNUstep/System/Library/Bundles/GSPrinting/GSLPR.bundle/Resources/Info-gnustep.plist
+GNUstep/System/Library/Bundles/GSPrinting/GSLPR.bundle/stamp.make
+GNUstep/System/Library/Bundles/Sndfile.nssound/Resources/Info-gnustep.plist
+GNUstep/System/Library/Bundles/Sndfile.nssound/Sndfile
+GNUstep/System/Library/Bundles/Sndfile.nssound/stamp.make
+GNUstep/System/Library/Bundles/TextConverters/RTFConverter.bundle/RTFConverter
+GNUstep/System/Library/Bundles/TextConverters/RTFConverter.bundle/Resources/Info-gnustep.plist
+GNUstep/System/Library/Bundles/TextConverters/RTFConverter.bundle/stamp.make
+GNUstep/System/Library/Bundles/libgmodel.bundle/Resources/Info-gnustep.plist
+GNUstep/System/Library/Bundles/libgmodel.bundle/libgmodel
+GNUstep/System/Library/Bundles/libgmodel.bundle/stamp.make
+GNUstep/System/Library/ColorPickers/NamedPicker.bundle/NamedPicker
+GNUstep/System/Library/ColorPickers/NamedPicker.bundle/Resources/GSNamedColorPicker.tiff
+GNUstep/System/Library/ColorPickers/NamedPicker.bundle/Resources/Info-gnustep.plist
+GNUstep/System/Library/ColorPickers/NamedPicker.bundle/stamp.make
+GNUstep/System/Library/ColorPickers/StandardPicker.bundle/Resources/English.lproj/StandardPicker.strings
+GNUstep/System/Library/ColorPickers/StandardPicker.bundle/Resources/French.lproj/StandardPicker.strings
+GNUstep/System/Library/ColorPickers/StandardPicker.bundle/Resources/GSCMYKColorPicker.tiff
+GNUstep/System/Library/ColorPickers/StandardPicker.bundle/Resources/GSGrayColorPicker.tiff
+GNUstep/System/Library/ColorPickers/StandardPicker.bundle/Resources/GSHSBColorPicker.tiff
+GNUstep/System/Library/ColorPickers/StandardPicker.bundle/Resources/GSRGBColorPicker.tiff
+GNUstep/System/Library/ColorPickers/StandardPicker.bundle/Resources/Info-gnustep.plist
+GNUstep/System/Library/ColorPickers/StandardPicker.bundle/Resources/Spanish.lproj/StandardPicker.strings
+GNUstep/System/Library/ColorPickers/StandardPicker.bundle/Resources/Swedish.lproj/StandardPicker.strings
+GNUstep/System/Library/ColorPickers/StandardPicker.bundle/StandardPicker
+GNUstep/System/Library/ColorPickers/StandardPicker.bundle/stamp.make
+GNUstep/System/Library/ColorPickers/WheelPicker.bundle/Resources/GSWheelColorPicker.tiff
+GNUstep/System/Library/ColorPickers/WheelPicker.bundle/Resources/Info-gnustep.plist
+GNUstep/System/Library/ColorPickers/WheelPicker.bundle/WheelPicker
+GNUstep/System/Library/ColorPickers/WheelPicker.bundle/stamp.make
%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/Additions/ClassesTOC.gsdoc
%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/Additions/ClassesTOC.html
%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/Additions/Functions.gsdoc
@@ -32,6 +69,33 @@
%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/General/General.igsdoc
%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/General/OpenStepCompliance.html
%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/General/dependencies
+%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit/Affine-Transformations.html
+%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit/Application-Makefiles.html
+%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit/Basic-Controls.html
+%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit/Browsers.html
+%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit/Images-and-Imageviews.html
+%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit/Interface-Files.html
+%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit/Introduction.html
+%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit/Matrix-Controls.html
+%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit/Outlets-and-Actions.html
+%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit/Tableviews.html
+%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit/The-view-concept.html
+%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit/applicationmakefiles.html
+%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit/basicconcepts.html
+%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit/browsercontrols.html
+%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit/conceptindex.html
+%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit/controls.html
+%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit/dataexchange.html
+%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit/eventhandling.html
+%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit/fdl.html
+%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit/gnustepapplications.html
+%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit/images.html
+%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit/index.html
+%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit/interfacefiles.html
+%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit/matrix.html
+%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit/outlineviews.html
+%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit/tableview.html
+%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit/theviewconcept.html
%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/Reference/ClassesTOC.gsdoc
%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/Reference/ClassesTOC.html
%%PORTDOCS%%GNUstep/System/Library/Documentation/Developer/Gui/Reference/ConstantsTOC.gsdoc
@@ -277,51 +341,13 @@
%%PORTDOCS%%GNUstep/System/Library/Documentation/User/Gui/GuiUser/LanguageSetup.html
%%PORTDOCS%%GNUstep/System/Library/Documentation/User/Gui/GuiUser/dependencies
%%PORTDOCS%%GNUstep/System/Library/Documentation/info/AppKit.info
+GNUstep/System/Library/Documentation/man/man1/GSSpeechServer.1.gz
%%PORTDOCS%%GNUstep/System/Library/Documentation/man/man1/gclose.1.gz
%%PORTDOCS%%GNUstep/System/Library/Documentation/man/man1/gcloseall.1.gz
%%PORTDOCS%%GNUstep/System/Library/Documentation/man/man1/gopen.1.gz
%%PORTDOCS%%GNUstep/System/Library/Documentation/man/man1/make_services.1.gz
+GNUstep/System/Library/Documentation/man/man1/say.1.gz
%%PORTDOCS%%GNUstep/System/Library/Documentation/man/man1/set_show_service.1.gz
-@dir GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual
-@dir GNUstep/System/Library/Themes
-GNUstep/System/Applications/GSSpeechServer.app/GSSpeechServer
-GNUstep/System/Applications/GSSpeechServer.app/Resources/GSSpeechServer.desktop
-GNUstep/System/Applications/GSSpeechServer.app/Resources/Info-gnustep.plist
-GNUstep/System/Applications/GSSpeechServer.app/stamp.make
-GNUstep/System/Library/Bundles/AudioOutput.nssound/AudioOutput
-GNUstep/System/Library/Bundles/AudioOutput.nssound/Resources/Info-gnustep.plist
-GNUstep/System/Library/Bundles/AudioOutput.nssound/stamp.make
-GNUstep/System/Library/Bundles/GSPrinting/GSLPR.bundle/GSLPR
-GNUstep/System/Library/Bundles/GSPrinting/GSLPR.bundle/Resources/Info-gnustep.plist
-GNUstep/System/Library/Bundles/GSPrinting/GSLPR.bundle/stamp.make
-GNUstep/System/Library/Bundles/Sndfile.nssound/Resources/Info-gnustep.plist
-GNUstep/System/Library/Bundles/Sndfile.nssound/Sndfile
-GNUstep/System/Library/Bundles/Sndfile.nssound/stamp.make
-GNUstep/System/Library/Bundles/TextConverters/RTFConverter.bundle/RTFConverter
-GNUstep/System/Library/Bundles/TextConverters/RTFConverter.bundle/Resources/Info-gnustep.plist
-GNUstep/System/Library/Bundles/TextConverters/RTFConverter.bundle/stamp.make
-GNUstep/System/Library/Bundles/libgmodel.bundle/Resources/Info-gnustep.plist
-GNUstep/System/Library/Bundles/libgmodel.bundle/libgmodel
-GNUstep/System/Library/Bundles/libgmodel.bundle/stamp.make
-GNUstep/System/Library/ColorPickers/NamedPicker.bundle/NamedPicker
-GNUstep/System/Library/ColorPickers/NamedPicker.bundle/Resources/GSNamedColorPicker.tiff
-GNUstep/System/Library/ColorPickers/NamedPicker.bundle/Resources/Info-gnustep.plist
-GNUstep/System/Library/ColorPickers/NamedPicker.bundle/stamp.make
-GNUstep/System/Library/ColorPickers/StandardPicker.bundle/Resources/English.lproj/StandardPicker.strings
-GNUstep/System/Library/ColorPickers/StandardPicker.bundle/Resources/French.lproj/StandardPicker.strings
-GNUstep/System/Library/ColorPickers/StandardPicker.bundle/Resources/GSCMYKColorPicker.tiff
-GNUstep/System/Library/ColorPickers/StandardPicker.bundle/Resources/GSGrayColorPicker.tiff
-GNUstep/System/Library/ColorPickers/StandardPicker.bundle/Resources/GSHSBColorPicker.tiff
-GNUstep/System/Library/ColorPickers/StandardPicker.bundle/Resources/GSRGBColorPicker.tiff
-GNUstep/System/Library/ColorPickers/StandardPicker.bundle/Resources/Info-gnustep.plist
-GNUstep/System/Library/ColorPickers/StandardPicker.bundle/Resources/Spanish.lproj/StandardPicker.strings
-GNUstep/System/Library/ColorPickers/StandardPicker.bundle/Resources/Swedish.lproj/StandardPicker.strings
-GNUstep/System/Library/ColorPickers/StandardPicker.bundle/StandardPicker
-GNUstep/System/Library/ColorPickers/StandardPicker.bundle/stamp.make
-GNUstep/System/Library/ColorPickers/WheelPicker.bundle/Resources/GSWheelColorPicker.tiff
-GNUstep/System/Library/ColorPickers/WheelPicker.bundle/Resources/Info-gnustep.plist
-GNUstep/System/Library/ColorPickers/WheelPicker.bundle/WheelPicker
-GNUstep/System/Library/ColorPickers/WheelPicker.bundle/stamp.make
GNUstep/System/Library/Headers/AppKit/AppKit.h
GNUstep/System/Library/Headers/AppKit/AppKitDefines.h
GNUstep/System/Library/Headers/AppKit/AppKitExceptions.h
@@ -365,6 +391,7 @@ GNUstep/System/Library/Headers/AppKit/GSVbox.h
GNUstep/System/Library/Headers/AppKit/GSVersion.h
GNUstep/System/Library/Headers/AppKit/GSWindowDecorationView.h
GNUstep/System/Library/Headers/AppKit/GSXibElement.h
+GNUstep/System/Library/Headers/AppKit/GSXibKeyedUnarchiver.h
GNUstep/System/Library/Headers/AppKit/GSXibLoading.h
GNUstep/System/Library/Headers/AppKit/GSXibObjectContainer.h
GNUstep/System/Library/Headers/AppKit/GSXibParser.h
@@ -375,6 +402,7 @@ GNUstep/System/Library/Headers/AppKit/NSActionCell.h
GNUstep/System/Library/Headers/AppKit/NSAffineTransform.h
GNUstep/System/Library/Headers/AppKit/NSAlert.h
GNUstep/System/Library/Headers/AppKit/NSAnimation.h
+GNUstep/System/Library/Headers/AppKit/NSAnimationContext.h
GNUstep/System/Library/Headers/AppKit/NSApplication.h
GNUstep/System/Library/Headers/AppKit/NSArrayController.h
GNUstep/System/Library/Headers/AppKit/NSAttributedString.h
@@ -562,6 +590,7 @@ GNUstep/System/Library/Headers/GNUstepGUI/GSVbox.h
GNUstep/System/Library/Headers/GNUstepGUI/GSVersion.h
GNUstep/System/Library/Headers/GNUstepGUI/GSWindowDecorationView.h
GNUstep/System/Library/Headers/GNUstepGUI/GSXibElement.h
+GNUstep/System/Library/Headers/GNUstepGUI/GSXibKeyedUnarchiver.h
GNUstep/System/Library/Headers/GNUstepGUI/GSXibLoading.h
GNUstep/System/Library/Headers/GNUstepGUI/GSXibObjectContainer.h
GNUstep/System/Library/Headers/GNUstepGUI/GSXibParser.h
@@ -607,6 +636,7 @@ GNUstep/System/Library/Headers/gnustep/gui/GSVbox.h
GNUstep/System/Library/Headers/gnustep/gui/GSVersion.h
GNUstep/System/Library/Headers/gnustep/gui/GSWindowDecorationView.h
GNUstep/System/Library/Headers/gnustep/gui/GSXibElement.h
+GNUstep/System/Library/Headers/gnustep/gui/GSXibKeyedUnarchiver.h
GNUstep/System/Library/Headers/gnustep/gui/GSXibLoading.h
GNUstep/System/Library/Headers/gnustep/gui/GSXibObjectContainer.h
GNUstep/System/Library/Headers/gnustep/gui/GSXibParser.h
@@ -620,9 +650,16 @@ GNUstep/System/Library/Images/GSStop.tiff
GNUstep/System/Library/Images/LogoGNUstep.tiff
GNUstep/System/Library/Images/MagnifyGlass.tiff
GNUstep/System/Library/Images/NSAddTemplate.tiff
+GNUstep/System/Library/Images/NSAdvanced.tiff
+GNUstep/System/Library/Images/NSCaution.tiff
+GNUstep/System/Library/Images/NSColorPanel.tiff
GNUstep/System/Library/Images/NSComboArrow.tiff
+GNUstep/System/Library/Images/NSFontPanel.tiff
+GNUstep/System/Library/Images/NSInfo.tiff
+GNUstep/System/Library/Images/NSPreferencesGeneral.tiff
GNUstep/System/Library/Images/NSRatingLevelIndicator.tiff
GNUstep/System/Library/Images/NSRemoveTemplate.tiff
+GNUstep/System/Library/Images/NSUserAccounts.tiff
GNUstep/System/Library/Images/common_2DCheckMark.tiff
GNUstep/System/Library/Images/common_2DDash.tiff
GNUstep/System/Library/Images/common_3DArrowDown.tiff
@@ -630,6 +667,7 @@ GNUstep/System/Library/Images/common_3DArrowLeft.tiff
GNUstep/System/Library/Images/common_3DArrowRight.tiff
GNUstep/System/Library/Images/common_3DArrowRightH.tiff
GNUstep/System/Library/Images/common_3DArrowUp.tiff
+GNUstep/System/Library/Images/common_ApplicationFolder.tiff
GNUstep/System/Library/Images/common_ArrowDown.tiff
GNUstep/System/Library/Images/common_ArrowDownH.tiff
GNUstep/System/Library/Images/common_ArrowLeft.tiff
@@ -668,6 +706,7 @@ GNUstep/System/Library/Images/common_MiniWindowTile.tiff
GNUstep/System/Library/Images/common_Miniaturize.tiff
GNUstep/System/Library/Images/common_MiniaturizeH.tiff
GNUstep/System/Library/Images/common_Mount.tiff
+GNUstep/System/Library/Images/common_MultipleSelection.tiff
GNUstep/System/Library/Images/common_MusicFolder.tiff
GNUstep/System/Library/Images/common_Nibble.tiff
GNUstep/System/Library/Images/common_OpenHandCursor.tiff
@@ -688,6 +727,8 @@ GNUstep/System/Library/Images/common_ProgressSpinning_7.tiff
GNUstep/System/Library/Images/common_ProgressSpinning_8.tiff
GNUstep/System/Library/Images/common_RadioOff.tiff
GNUstep/System/Library/Images/common_RadioOn.tiff
+GNUstep/System/Library/Images/common_RecyclerEmpty.tiff
+GNUstep/System/Library/Images/common_RecyclerFull.tiff
GNUstep/System/Library/Images/common_Right.tiff
GNUstep/System/Library/Images/common_RightH.tiff
GNUstep/System/Library/Images/common_RightTabStop.tiff
@@ -730,6 +771,7 @@ GNUstep/System/Library/Images/common_UnknownApplication.tiff
GNUstep/System/Library/Images/common_UnknownTool.tiff
GNUstep/System/Library/Images/common_Unmount.tiff
GNUstep/System/Library/Images/common_UpAndDownArrowSmall.tiff
+GNUstep/System/Library/Images/common_VideoFolder.tiff
GNUstep/System/Library/Images/common_copyCursor.tiff
GNUstep/System/Library/Images/common_linkCursor.tiff
GNUstep/System/Library/Images/common_noCursor.tiff
@@ -765,6 +807,7 @@ GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/
GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/German.lproj/Localizable.strings
GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/Info-gnustep.plist
GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/Italian.lproj/Localizable.strings
+GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/Korean.lproj/Localizable.strings
GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/Lojban.lproj/Localizable.strings
GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/Spanish.lproj/GSDataLinkPanel.gorm/data.classes
GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/Spanish.lproj/GSDataLinkPanel.gorm/data.info
@@ -811,49 +854,4 @@ GNUstep/System/Tools/gopen
GNUstep/System/Tools/make_services
GNUstep/System/Tools/say
GNUstep/System/Tools/set_show_service
-GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit/Affine-Transformations.html
-GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit/Application-Makefiles.html
-GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit/Basic-Controls.html
-GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit/Browsers.html
-GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit/Images-and-Imageviews.html
-GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit/Interface-Files.html
-GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit/Introduction.html
-GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit/Matrix-Controls.html
-GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit/Outlets-and-Actions.html
-GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit/Tableviews.html
-GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit/The-view-concept.html
-GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit/applicationmakefiles.html
-GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit/basicconcepts.html
-GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit/browsercontrols.html
-GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit/conceptindex.html
-GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit/controls.html
-GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit/dataexchange.html
-GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit/eventhandling.html
-GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit/fdl.html
-GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit/gnustepapplications.html
-GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit/images.html
-GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit/index.html
-GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit/interfacefiles.html
-GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit/matrix.html
-GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit/outlineviews.html
-GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit/tableview.html
-GNUstep/System/Library/Documentation/Developer/Gui/ProgrammingManual/AppKit/theviewconcept.html
-GNUstep/System/Library/Documentation/man/man1/GSSpeechServer.1.gz
-GNUstep/System/Library/Documentation/man/man1/say.1.gz
-GNUstep/System/Library/Headers/AppKit/GSXibKeyedUnarchiver.h
-GNUstep/System/Library/Headers/AppKit/NSAnimationContext.h
-GNUstep/System/Library/Headers/GNUstepGUI/GSXibKeyedUnarchiver.h
-GNUstep/System/Library/Headers/gnustep/gui/GSXibKeyedUnarchiver.h
-GNUstep/System/Library/Images/NSAdvanced.tiff
-GNUstep/System/Library/Images/NSCaution.tiff
-GNUstep/System/Library/Images/NSColorPanel.tiff
-GNUstep/System/Library/Images/NSFontPanel.tiff
-GNUstep/System/Library/Images/NSInfo.tiff
-GNUstep/System/Library/Images/NSPreferencesGeneral.tiff
-GNUstep/System/Library/Images/NSUserAccounts.tiff
-GNUstep/System/Library/Images/common_ApplicationFolder.tiff
-GNUstep/System/Library/Images/common_MultipleSelection.tiff
-GNUstep/System/Library/Images/common_RecyclerEmpty.tiff
-GNUstep/System/Library/Images/common_RecyclerFull.tiff
-GNUstep/System/Library/Images/common_VideoFolder.tiff
-GNUstep/System/Library/Libraries/gnustep-gui/Versions/%%BASEVERSION%%/Resources/Korean.lproj/Localizable.strings
+@dir GNUstep/System/Library/Themes
diff --git a/x11-toolkits/kf5-attica/distinfo b/x11-toolkits/kf5-attica/distinfo
index 6c6360e296e4..a6ac6d6a4db4 100644
--- a/x11-toolkits/kf5-attica/distinfo
+++ b/x11-toolkits/kf5-attica/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499098907
-SHA256 (KDE/frameworks/5.36.0/attica-5.36.0.tar.xz) = 8dd2998f5c9b5f727ec406385f065907f1c6b094ac47d3c1eaae2b858c9f258a
-SIZE (KDE/frameworks/5.36.0/attica-5.36.0.tar.xz) = 60572
+TIMESTAMP = 1502086076
+SHA256 (KDE/frameworks/5.37.0/attica-5.37.0.tar.xz) = 573c71704b4116e82a9866a86b90e375a1f5022563246b14bb0866963899588e
+SIZE (KDE/frameworks/5.37.0/attica-5.37.0.tar.xz) = 60616
diff --git a/x11-toolkits/kf5-attica/pkg-plist b/x11-toolkits/kf5-attica/pkg-plist
index 945ce512d958..b48c5677cf83 100644
--- a/x11-toolkits/kf5-attica/pkg-plist
+++ b/x11-toolkits/kf5-attica/pkg-plist
@@ -1,3 +1,4 @@
+etc/xdg/attica.categories
include/KF5/Attica/Attica/AccountBalance
include/KF5/Attica/Attica/Achievement
include/KF5/Attica/Attica/Activity
diff --git a/x11-toolkits/kf5-kcompletion/distinfo b/x11-toolkits/kf5-kcompletion/distinfo
index 6ff231580c07..70e22fea1d9e 100644
--- a/x11-toolkits/kf5-kcompletion/distinfo
+++ b/x11-toolkits/kf5-kcompletion/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499098907
-SHA256 (KDE/frameworks/5.36.0/kcompletion-5.36.0.tar.xz) = 377103eb36855e0bb971fc22c974f85792ee71a73e6705725047ccfe337320f2
-SIZE (KDE/frameworks/5.36.0/kcompletion-5.36.0.tar.xz) = 118460
+TIMESTAMP = 1502086076
+SHA256 (KDE/frameworks/5.37.0/kcompletion-5.37.0.tar.xz) = 5fd2b0a51fe87e3b2042b65069c7cfcd5d2eede3bde94f21285ecad02a9e1262
+SIZE (KDE/frameworks/5.37.0/kcompletion-5.37.0.tar.xz) = 118424
diff --git a/x11-toolkits/kf5-kconfigwidgets/distinfo b/x11-toolkits/kf5-kconfigwidgets/distinfo
index d559fa29aa0a..c1783778d280 100644
--- a/x11-toolkits/kf5-kconfigwidgets/distinfo
+++ b/x11-toolkits/kf5-kconfigwidgets/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499098907
-SHA256 (KDE/frameworks/5.36.0/kconfigwidgets-5.36.0.tar.xz) = a54382442dedd4da340f291d81d1dd1a89289bcb42e8d82d34555e44611e3c6a
-SIZE (KDE/frameworks/5.36.0/kconfigwidgets-5.36.0.tar.xz) = 375508
+TIMESTAMP = 1502086076
+SHA256 (KDE/frameworks/5.37.0/kconfigwidgets-5.37.0.tar.xz) = 46af20c09871dd720f8bc46d3bf7ed5eaae2b7cd25549ec3a1b71b8ca40d2d00
+SIZE (KDE/frameworks/5.37.0/kconfigwidgets-5.37.0.tar.xz) = 375492
diff --git a/x11-toolkits/kf5-kdesignerplugin/distinfo b/x11-toolkits/kf5-kdesignerplugin/distinfo
index 9786176a3add..e074ef25e60d 100644
--- a/x11-toolkits/kf5-kdesignerplugin/distinfo
+++ b/x11-toolkits/kf5-kdesignerplugin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499098907
-SHA256 (KDE/frameworks/5.36.0/kdesignerplugin-5.36.0.tar.xz) = 1ba67344b46e1cb0809975f84c667019158e69ae1b884ab3a995ca1d8d434acf
-SIZE (KDE/frameworks/5.36.0/kdesignerplugin-5.36.0.tar.xz) = 90632
+TIMESTAMP = 1502086076
+SHA256 (KDE/frameworks/5.37.0/kdesignerplugin-5.37.0.tar.xz) = bc691bf91e4ea15323be728bf47c3eb02905adc85a2967acd7b731bc06002785
+SIZE (KDE/frameworks/5.37.0/kdesignerplugin-5.37.0.tar.xz) = 90656
diff --git a/x11-toolkits/kf5-kguiaddons/distinfo b/x11-toolkits/kf5-kguiaddons/distinfo
index 0535b36e667b..149ba4149ffd 100644
--- a/x11-toolkits/kf5-kguiaddons/distinfo
+++ b/x11-toolkits/kf5-kguiaddons/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499098907
-SHA256 (KDE/frameworks/5.36.0/kguiaddons-5.36.0.tar.xz) = 8c782147fdfab9876d66ec1e5d598043621bd6a6795e74e263333df7938a91f6
-SIZE (KDE/frameworks/5.36.0/kguiaddons-5.36.0.tar.xz) = 40136
+TIMESTAMP = 1502086077
+SHA256 (KDE/frameworks/5.37.0/kguiaddons-5.37.0.tar.xz) = c56ef3b231b088ba6903e8319fc936ad438e3c6411b9f14d2c234c8738b5e68d
+SIZE (KDE/frameworks/5.37.0/kguiaddons-5.37.0.tar.xz) = 40148
diff --git a/x11-toolkits/kirigami2/Makefile b/x11-toolkits/kf5-kirigami2/Makefile
index f172a9d7a947..1410c38bff17 100644
--- a/x11-toolkits/kirigami2/Makefile
+++ b/x11-toolkits/kf5-kirigami2/Makefile
@@ -2,10 +2,8 @@
# $FreeBSD$
PORTNAME= kirigami2
-PORTVERSION= 2.2.0
-CATEGORIES= x11-toolkits kde # kde-framework
-MASTER_SITES= KDE/stable/${PORTNAME:C/2//}
-DIST_SUBDIR= KDE/kirigami
+PORTVERSION= ${KDE_FRAMEWORKS_VERSION}
+CATEGORIES= x11-toolkits kde kde-frameworks
MAINTAINER= kde@FreeBSD.org
COMMENT= QtQuick based components set
diff --git a/x11-toolkits/kf5-kirigami2/distinfo b/x11-toolkits/kf5-kirigami2/distinfo
new file mode 100644
index 000000000000..e3acfd44aad1
--- /dev/null
+++ b/x11-toolkits/kf5-kirigami2/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1502393931
+SHA256 (KDE/frameworks/5.37.0/kirigami2-5.37.0.tar.xz) = ad252c1ff20060f1de5afd41fade9b86e046bc9a7da38af6ca507f8ba2ce82fc
+SIZE (KDE/frameworks/5.37.0/kirigami2-5.37.0.tar.xz) = 278452
diff --git a/x11-toolkits/kirigami/pkg-descr b/x11-toolkits/kf5-kirigami2/pkg-descr
index e70aa03d2081..e70aa03d2081 100644
--- a/x11-toolkits/kirigami/pkg-descr
+++ b/x11-toolkits/kf5-kirigami2/pkg-descr
diff --git a/x11-toolkits/kirigami2/pkg-plist b/x11-toolkits/kf5-kirigami2/pkg-plist
index bccb873647f8..be81818c6c14 100644
--- a/x11-toolkits/kirigami2/pkg-plist
+++ b/x11-toolkits/kf5-kirigami2/pkg-plist
@@ -74,6 +74,7 @@ share/locale/de/LC_MESSAGES/libkirigami2plugin_qt.qm
share/locale/el/LC_MESSAGES/libkirigami2plugin_qt.qm
share/locale/en_GB/LC_MESSAGES/libkirigami2plugin_qt.qm
share/locale/es/LC_MESSAGES/libkirigami2plugin_qt.qm
+share/locale/fi/LC_MESSAGES/libkirigami2plugin_qt.qm
share/locale/fr/LC_MESSAGES/libkirigami2plugin_qt.qm
share/locale/gl/LC_MESSAGES/libkirigami2plugin_qt.qm
share/locale/hu/LC_MESSAGES/libkirigami2plugin_qt.qm
@@ -87,7 +88,12 @@ share/locale/pt_BR/LC_MESSAGES/libkirigami2plugin_qt.qm
share/locale/ru/LC_MESSAGES/libkirigami2plugin_qt.qm
share/locale/sk/LC_MESSAGES/libkirigami2plugin_qt.qm
share/locale/sl/LC_MESSAGES/libkirigami2plugin_qt.qm
+share/locale/sr/LC_MESSAGES/libkirigami2plugin_qt.qm
+share/locale/sr@ijekavian/LC_MESSAGES/libkirigami2plugin_qt.qm
+share/locale/sr@ijekavianlatin/LC_MESSAGES/libkirigami2plugin_qt.qm
+share/locale/sr@latin/LC_MESSAGES/libkirigami2plugin_qt.qm
share/locale/sv/LC_MESSAGES/libkirigami2plugin_qt.qm
+share/locale/tr/LC_MESSAGES/libkirigami2plugin_qt.qm
share/locale/uk/LC_MESSAGES/libkirigami2plugin_qt.qm
share/locale/zh_CN/LC_MESSAGES/libkirigami2plugin_qt.qm
share/locale/zh_TW/LC_MESSAGES/libkirigami2plugin_qt.qm
diff --git a/x11-toolkits/kf5-kitemviews/distinfo b/x11-toolkits/kf5-kitemviews/distinfo
index 49a6ca282ae2..878a4283a2ec 100644
--- a/x11-toolkits/kf5-kitemviews/distinfo
+++ b/x11-toolkits/kf5-kitemviews/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499098907
-SHA256 (KDE/frameworks/5.36.0/kitemviews-5.36.0.tar.xz) = 74ead758a65746d9404bfa4cfbebb95fdada196246b38b07b68c7094cdf22a06
-SIZE (KDE/frameworks/5.36.0/kitemviews-5.36.0.tar.xz) = 74860
+TIMESTAMP = 1502086077
+SHA256 (KDE/frameworks/5.37.0/kitemviews-5.37.0.tar.xz) = 55737ee6cf018c86e2674d417a0c234b060bb58b8eac477e862ec6e8a9dd279f
+SIZE (KDE/frameworks/5.37.0/kitemviews-5.37.0.tar.xz) = 74868
diff --git a/x11-toolkits/kf5-kjobwidgets/distinfo b/x11-toolkits/kf5-kjobwidgets/distinfo
index 24d731b57e08..1cb1eac679b5 100644
--- a/x11-toolkits/kf5-kjobwidgets/distinfo
+++ b/x11-toolkits/kf5-kjobwidgets/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499098908
-SHA256 (KDE/frameworks/5.36.0/kjobwidgets-5.36.0.tar.xz) = 97ad95e78dedef69500b68befd39b756bfa4773b737628c63efd4cc2efd69cd4
-SIZE (KDE/frameworks/5.36.0/kjobwidgets-5.36.0.tar.xz) = 89896
+TIMESTAMP = 1502086077
+SHA256 (KDE/frameworks/5.37.0/kjobwidgets-5.37.0.tar.xz) = 8b645c1dded5ec2c6628a6b8638804abe49eab02f7da324eb8a75d7d616fc284
+SIZE (KDE/frameworks/5.37.0/kjobwidgets-5.37.0.tar.xz) = 89892
diff --git a/x11-toolkits/kf5-ktextwidgets/distinfo b/x11-toolkits/kf5-ktextwidgets/distinfo
index 925474c5173b..97899c062df4 100644
--- a/x11-toolkits/kf5-ktextwidgets/distinfo
+++ b/x11-toolkits/kf5-ktextwidgets/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499098908
-SHA256 (KDE/frameworks/5.36.0/ktextwidgets-5.36.0.tar.xz) = 8afb6e8178ecc45cbeb054b26ad1e4b928eccd61d6b0d883d7abd650fd031c2d
-SIZE (KDE/frameworks/5.36.0/ktextwidgets-5.36.0.tar.xz) = 308464
+TIMESTAMP = 1502086077
+SHA256 (KDE/frameworks/5.37.0/ktextwidgets-5.37.0.tar.xz) = 257f4feac67db2501fe81909ffe04ddfd29db0191d9aa09ba957d9a5cbd116dd
+SIZE (KDE/frameworks/5.37.0/ktextwidgets-5.37.0.tar.xz) = 308452
diff --git a/x11-toolkits/kf5-kwidgetsaddons/distinfo b/x11-toolkits/kf5-kwidgetsaddons/distinfo
index eade102c2a7d..beaed0ff4459 100644
--- a/x11-toolkits/kf5-kwidgetsaddons/distinfo
+++ b/x11-toolkits/kf5-kwidgetsaddons/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499098908
-SHA256 (KDE/frameworks/5.36.0/kwidgetsaddons-5.36.0.tar.xz) = bc9a62d24f6bdd0e8830481f915744cf640660c99ecb54cbeea73de5b218a20b
-SIZE (KDE/frameworks/5.36.0/kwidgetsaddons-5.36.0.tar.xz) = 2171544
+TIMESTAMP = 1502086078
+SHA256 (KDE/frameworks/5.37.0/kwidgetsaddons-5.37.0.tar.xz) = a4c54b371a6fc748108f3e2ce2f40d422e8ef03210b243a3d091c090cf19b3ca
+SIZE (KDE/frameworks/5.37.0/kwidgetsaddons-5.37.0.tar.xz) = 2175360
diff --git a/x11-toolkits/kf5-kwidgetsaddons/pkg-plist b/x11-toolkits/kf5-kwidgetsaddons/pkg-plist
index 585ca48abef3..0d0b365b73b5 100644
--- a/x11-toolkits/kf5-kwidgetsaddons/pkg-plist
+++ b/x11-toolkits/kf5-kwidgetsaddons/pkg-plist
@@ -42,6 +42,7 @@ include/KF5/KWidgetsAddons/KPageWidget
include/KF5/KWidgetsAddons/KPageWidgetItem
include/KF5/KWidgetsAddons/KPageWidgetModel
include/KF5/KWidgetsAddons/KPasswordDialog
+include/KF5/KWidgetsAddons/KPasswordLineEdit
include/KF5/KWidgetsAddons/KPixmapRegionSelectorDialog
include/KF5/KWidgetsAddons/KPixmapRegionSelectorWidget
include/KF5/KWidgetsAddons/KPixmapSequence
@@ -110,6 +111,7 @@ include/KF5/KWidgetsAddons/kpageview.h
include/KF5/KWidgetsAddons/kpagewidget.h
include/KF5/KWidgetsAddons/kpagewidgetmodel.h
include/KF5/KWidgetsAddons/kpassworddialog.h
+include/KF5/KWidgetsAddons/kpasswordlineedit.h
include/KF5/KWidgetsAddons/kpixmapregionselectordialog.h
include/KF5/KWidgetsAddons/kpixmapregionselectorwidget.h
include/KF5/KWidgetsAddons/kpixmapsequence.h
diff --git a/x11-toolkits/kf5-kxmlgui/distinfo b/x11-toolkits/kf5-kxmlgui/distinfo
index 03614af2538f..d99265a897a2 100644
--- a/x11-toolkits/kf5-kxmlgui/distinfo
+++ b/x11-toolkits/kf5-kxmlgui/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499098908
-SHA256 (KDE/frameworks/5.36.0/kxmlgui-5.36.0.tar.xz) = e77b3f59d393d3610ecae83d89f6692bd144d899fb9c6559139b7cb6b8da0e31
-SIZE (KDE/frameworks/5.36.0/kxmlgui-5.36.0.tar.xz) = 884080
+TIMESTAMP = 1502086078
+SHA256 (KDE/frameworks/5.37.0/kxmlgui-5.37.0.tar.xz) = e235367a31a38c1c114032123b13e7954a93a8e1423eb1829176a6373b953b4b
+SIZE (KDE/frameworks/5.37.0/kxmlgui-5.37.0.tar.xz) = 883920
diff --git a/x11-toolkits/kirigami/Makefile b/x11-toolkits/kirigami/Makefile
deleted file mode 100644
index f79ce0832647..000000000000
--- a/x11-toolkits/kirigami/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# Created by: tcberner
-# $FreeBSD$
-
-PORTNAME= kirigami
-PORTVERSION= 1.1.0
-PORTREVISION= 1
-CATEGORIES= x11-toolkits kde # kde-framework
-MASTER_SITES= KDE/stable/${PORTNAME}
-DIST_SUBDIR= KDE/kirigami
-
-MAINTAINER= kde@FreeBSD.org
-COMMENT= QtQuick based components set
-
-USES= cmake:outsource compiler:c++11-lib gettext kde:5 tar:xz
-USE_KDE= ecm kdeclarative plasma-framework
-USE_QT5= buildtools_build core gui linguisttools network qmake_build \
- qml quick svg testlib widgets
-
-.include <bsd.port.mk>
diff --git a/x11-toolkits/kirigami/distinfo b/x11-toolkits/kirigami/distinfo
deleted file mode 100644
index dbea0da21a04..000000000000
--- a/x11-toolkits/kirigami/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1489235137
-SHA256 (KDE/kirigami/kirigami-1.1.0.tar.xz) = 6677af0c486a4c9cfefe74a0951e85dad53435010031bf2b7fcdf9c5df6b3edd
-SIZE (KDE/kirigami/kirigami-1.1.0.tar.xz) = 262152
diff --git a/x11-toolkits/kirigami/pkg-plist b/x11-toolkits/kirigami/pkg-plist
deleted file mode 100644
index a8d7a2215932..000000000000
--- a/x11-toolkits/kirigami/pkg-plist
+++ /dev/null
@@ -1,72 +0,0 @@
-lib/cmake/KF5Kirigami/KF5KirigamiConfig.cmake
-lib/cmake/KF5Kirigami/KF5KirigamiConfigVersion.cmake
-lib/cmake/KF5Kirigami/KF5KirigamiMacros.cmake
-%%QT_MKSPECDIR%%/modules/qt_Kirigami.pri
-%%QT_QMLDIR%%/org/kde/kirigami/AbstractApplicationHeader.qml
-%%QT_QMLDIR%%/org/kde/kirigami/AbstractApplicationWindow.qml
-%%QT_QMLDIR%%/org/kde/kirigami/AbstractListItem.qml
-%%QT_QMLDIR%%/org/kde/kirigami/Action.qml
-%%QT_QMLDIR%%/org/kde/kirigami/ApplicationHeader.qml
-%%QT_QMLDIR%%/org/kde/kirigami/ApplicationWindow.qml
-%%QT_QMLDIR%%/org/kde/kirigami/BasicListItem.qml
-%%QT_QMLDIR%%/org/kde/kirigami/ContextDrawer.qml
-%%QT_QMLDIR%%/org/kde/kirigami/GlobalDrawer.qml
-%%QT_QMLDIR%%/org/kde/kirigami/Heading.qml
-%%QT_QMLDIR%%/org/kde/kirigami/Icon.qml
-%%QT_QMLDIR%%/org/kde/kirigami/Label.qml
-%%QT_QMLDIR%%/org/kde/kirigami/OverlayDrawer.qml
-%%QT_QMLDIR%%/org/kde/kirigami/OverlaySheet.qml
-%%QT_QMLDIR%%/org/kde/kirigami/Page.qml
-%%QT_QMLDIR%%/org/kde/kirigami/ScrollablePage.qml
-%%QT_QMLDIR%%/org/kde/kirigami/Separator.qml
-%%QT_QMLDIR%%/org/kde/kirigami/SplitDrawer.qml
-%%QT_QMLDIR%%/org/kde/kirigami/SwipeListItem.qml
-%%QT_QMLDIR%%/org/kde/kirigami/Theme.qml
-%%QT_QMLDIR%%/org/kde/kirigami/ToolBarApplicationHeader.qml
-%%QT_QMLDIR%%/org/kde/kirigami/Units.qml
-%%QT_QMLDIR%%/org/kde/kirigami/libkirigamiplugin.so
-%%QT_QMLDIR%%/org/kde/kirigami/private/ActionButton.qml
-%%QT_QMLDIR%%/org/kde/kirigami/private/CornerShadow.qml
-%%QT_QMLDIR%%/org/kde/kirigami/private/DefaultListItemBackground.qml
-%%QT_QMLDIR%%/org/kde/kirigami/private/EdgeShadow.qml
-%%QT_QMLDIR%%/org/kde/kirigami/private/PageActionPropertyGroup.qml
-%%QT_QMLDIR%%/org/kde/kirigami/private/RefreshableScrollView.qml
-%%QT_QMLDIR%%/org/kde/kirigami/qmldir
-%%QT_QMLDIR%%/org/kde/kirigami/styles/Desktop/AbstractApplicationHeader.qml
-%%QT_QMLDIR%%/org/kde/kirigami/styles/Desktop/AbstractListItem.qml
-%%QT_QMLDIR%%/org/kde/kirigami/styles/Desktop/ApplicationWindow.qml
-%%QT_QMLDIR%%/org/kde/kirigami/styles/Desktop/OverlayDrawer.qml
-%%QT_QMLDIR%%/org/kde/kirigami/styles/Desktop/SwipeListItem.qml
-%%QT_QMLDIR%%/org/kde/kirigami/styles/Desktop/Theme.qml
-%%QT_QMLDIR%%/org/kde/kirigami/styles/Desktop/Units.qml
-%%QT_QMLDIR%%/org/kde/kirigami/styles/Plasma/Icon.qml
-%%QT_QMLDIR%%/org/kde/kirigami/styles/Plasma/Theme.qml
-%%QT_QMLDIR%%/org/kde/kirigami/styles/Plasma/Units.qml
-%%QT_QMLDIR%%/org/kde/kirigami/templates/AbstractApplicationHeader.qml
-%%QT_QMLDIR%%/org/kde/kirigami/templates/AbstractListItem.qml
-%%QT_QMLDIR%%/org/kde/kirigami/templates/ApplicationHeader.qml
-%%QT_QMLDIR%%/org/kde/kirigami/templates/OverlayDrawer.qml
-%%QT_QMLDIR%%/org/kde/kirigami/templates/OverlaySheet.qml
-%%QT_QMLDIR%%/org/kde/kirigami/templates/SplitDrawer.qml
-%%QT_QMLDIR%%/org/kde/kirigami/templates/SwipeListItem.qml
-%%QT_QMLDIR%%/org/kde/kirigami/templates/private/AbstractDrawer.qml
-%%QT_QMLDIR%%/org/kde/kirigami/templates/private/BackButton.qml
-%%QT_QMLDIR%%/org/kde/kirigami/templates/private/ContextIcon.qml
-%%QT_QMLDIR%%/org/kde/kirigami/templates/private/MenuIcon.qml
-%%QT_QMLDIR%%/org/kde/kirigami/templates/private/PageRow.qml
-%%QT_QMLDIR%%/org/kde/kirigami/templates/private/PassiveNotification.qml
-share/locale/ca/LC_MESSAGES/libkirigamiplugin_qt.qm
-share/locale/ca@valencia/LC_MESSAGES/libkirigamiplugin_qt.qm
-share/locale/cs/LC_MESSAGES/libkirigamiplugin_qt.qm
-share/locale/de/LC_MESSAGES/libkirigamiplugin_qt.qm
-share/locale/en_GB/LC_MESSAGES/libkirigamiplugin_qt.qm
-share/locale/es/LC_MESSAGES/libkirigamiplugin_qt.qm
-share/locale/nl/LC_MESSAGES/libkirigamiplugin_qt.qm
-share/locale/pl/LC_MESSAGES/libkirigamiplugin_qt.qm
-share/locale/pt/LC_MESSAGES/libkirigamiplugin_qt.qm
-share/locale/pt_BR/LC_MESSAGES/libkirigamiplugin_qt.qm
-share/locale/sk/LC_MESSAGES/libkirigamiplugin_qt.qm
-share/locale/sl/LC_MESSAGES/libkirigamiplugin_qt.qm
-share/locale/sv/LC_MESSAGES/libkirigamiplugin_qt.qm
-share/locale/uk/LC_MESSAGES/libkirigamiplugin_qt.qm
-share/locale/zh_TW/LC_MESSAGES/libkirigamiplugin_qt.qm
diff --git a/x11-toolkits/kirigami2/distinfo b/x11-toolkits/kirigami2/distinfo
deleted file mode 100644
index 3c201aa48877..000000000000
--- a/x11-toolkits/kirigami2/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1497817559
-SHA256 (KDE/kirigami/kirigami2-2.2.0.tar.xz) = b8e0b5088c39740dd002d5bf8046ea219cb63f7d9e19083202f7ba05cc3a4c05
-SIZE (KDE/kirigami/kirigami2-2.2.0.tar.xz) = 275832
diff --git a/x11-toolkits/kirigami2/pkg-descr b/x11-toolkits/kirigami2/pkg-descr
deleted file mode 100644
index e70aa03d2081..000000000000
--- a/x11-toolkits/kirigami2/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-A QtQuick based components set
-
-WWW: https://api.kde.org/kirigami/html/index.html
diff --git a/x11/kf5-frameworkintegration/distinfo b/x11/kf5-frameworkintegration/distinfo
index 07c0a47a92f2..07db92dc4ea0 100644
--- a/x11/kf5-frameworkintegration/distinfo
+++ b/x11/kf5-frameworkintegration/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499098908
-SHA256 (KDE/frameworks/5.36.0/frameworkintegration-5.36.0.tar.xz) = 345f6dc25d5f864aaeeffec8b5888c25b3248dcab16210c60663e2a65d1143e1
-SIZE (KDE/frameworks/5.36.0/frameworkintegration-5.36.0.tar.xz) = 1751992
+TIMESTAMP = 1502086078
+SHA256 (KDE/frameworks/5.37.0/frameworkintegration-5.37.0.tar.xz) = aa8ca045ba97899b739077e07a961b9e402520a0abfcee8be90baa85251c9e5d
+SIZE (KDE/frameworks/5.37.0/frameworkintegration-5.37.0.tar.xz) = 1752004
diff --git a/x11/kf5-kactivities/distinfo b/x11/kf5-kactivities/distinfo
index 37805993f00d..6686331eda64 100644
--- a/x11/kf5-kactivities/distinfo
+++ b/x11/kf5-kactivities/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499098909
-SHA256 (KDE/frameworks/5.36.0/kactivities-5.36.0.tar.xz) = 47eb6967336d4d985b079e5b5b44afc51d66e7ed3a85cea923e295e10a952340
-SIZE (KDE/frameworks/5.36.0/kactivities-5.36.0.tar.xz) = 61232
+TIMESTAMP = 1502086078
+SHA256 (KDE/frameworks/5.37.0/kactivities-5.37.0.tar.xz) = db8857d062bb084f882731189ef66e59648b1f66f0192ea8667c4f10eedfbd00
+SIZE (KDE/frameworks/5.37.0/kactivities-5.37.0.tar.xz) = 61288
diff --git a/x11/kf5-kded/distinfo b/x11/kf5-kded/distinfo
index f997c6d99c28..63ce6fa632ac 100644
--- a/x11/kf5-kded/distinfo
+++ b/x11/kf5-kded/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499098909
-SHA256 (KDE/frameworks/5.36.0/kded-5.36.0.tar.xz) = 44336777a02273a62c14b4c47dcdf71f3ab2627b46f72b2991eb10d8f3cb8478
-SIZE (KDE/frameworks/5.36.0/kded-5.36.0.tar.xz) = 38032
+TIMESTAMP = 1502086079
+SHA256 (KDE/frameworks/5.37.0/kded-5.37.0.tar.xz) = fea1c5e9fb1444be0988455c1e51fb2a8cc846db522297108a0b2c2c3a2e5a98
+SIZE (KDE/frameworks/5.37.0/kded-5.37.0.tar.xz) = 38020
diff --git a/x11/kf5-kdelibs4support/distinfo b/x11/kf5-kdelibs4support/distinfo
index 8b38edd79363..c47b1efcd1f8 100644
--- a/x11/kf5-kdelibs4support/distinfo
+++ b/x11/kf5-kdelibs4support/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499098909
-SHA256 (KDE/frameworks/5.36.0/kdelibs4support-5.36.0.tar.xz) = d8de45922f805a752b147b568a4df196b02024efc3ec7b930c2997e6817d3e10
-SIZE (KDE/frameworks/5.36.0/kdelibs4support-5.36.0.tar.xz) = 3338020
+TIMESTAMP = 1502086079
+SHA256 (KDE/frameworks/5.37.0/kdelibs4support-5.37.0.tar.xz) = 09d2a7817dbfd0aec82886fb2c5a83321d8b535a438013ed78d5611d2a00e1ff
+SIZE (KDE/frameworks/5.37.0/kdelibs4support-5.37.0.tar.xz) = 3339044
diff --git a/x11/kf5-kglobalaccel/distinfo b/x11/kf5-kglobalaccel/distinfo
index 1b3e47b52f54..76f6eacd4042 100644
--- a/x11/kf5-kglobalaccel/distinfo
+++ b/x11/kf5-kglobalaccel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499098909
-SHA256 (KDE/frameworks/5.36.0/kglobalaccel-5.36.0.tar.xz) = 729562dcaa1fea9f18b57a39a680276d1fdfd1b3333d4308e6c5218b061775da
-SIZE (KDE/frameworks/5.36.0/kglobalaccel-5.36.0.tar.xz) = 83864
+TIMESTAMP = 1502086079
+SHA256 (KDE/frameworks/5.37.0/kglobalaccel-5.37.0.tar.xz) = 4b373660976ba8c5e0fed74ddfc61dd8629757a849a5ea29a3c2166cf2c004b5
+SIZE (KDE/frameworks/5.37.0/kglobalaccel-5.37.0.tar.xz) = 83840
diff --git a/x11/kf5-kinit/distinfo b/x11/kf5-kinit/distinfo
index f84020d17340..27e7b39d0fce 100644
--- a/x11/kf5-kinit/distinfo
+++ b/x11/kf5-kinit/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499098909
-SHA256 (KDE/frameworks/5.36.0/kinit-5.36.0.tar.xz) = 24d52d2786d61f28c966f6de7beab6ab064f6fdefb0a9def9b43ad2bafe42911
-SIZE (KDE/frameworks/5.36.0/kinit-5.36.0.tar.xz) = 121348
+TIMESTAMP = 1502086079
+SHA256 (KDE/frameworks/5.37.0/kinit-5.37.0.tar.xz) = b9686968cb277a027169bc48ff37a25f44691b1d828af7cee4c6790c89f7ed2c
+SIZE (KDE/frameworks/5.37.0/kinit-5.37.0.tar.xz) = 121296
diff --git a/x11/kf5-krunner/distinfo b/x11/kf5-krunner/distinfo
index fa2c3897cae0..03915a086ccd 100644
--- a/x11/kf5-krunner/distinfo
+++ b/x11/kf5-krunner/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499098910
-SHA256 (KDE/frameworks/5.36.0/krunner-5.36.0.tar.xz) = 1856e17a2fd8d6ad94f463fe2cb44d7377439650dd47f88444e924d650e32165
-SIZE (KDE/frameworks/5.36.0/krunner-5.36.0.tar.xz) = 67720
+TIMESTAMP = 1502086079
+SHA256 (KDE/frameworks/5.37.0/krunner-5.37.0.tar.xz) = 8d12150cf48ec7eb36ccdacc0d7de2e1481e79b98754e7d813f46b1f325c389c
+SIZE (KDE/frameworks/5.37.0/krunner-5.37.0.tar.xz) = 68020
diff --git a/x11/kf5-kwayland/distinfo b/x11/kf5-kwayland/distinfo
index 1feec68d7a0a..a954cff60813 100644
--- a/x11/kf5-kwayland/distinfo
+++ b/x11/kf5-kwayland/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499098910
-SHA256 (KDE/frameworks/5.36.0/kwayland-5.36.0.tar.xz) = a2c473c7f5cefc87b5b63813fa1373c43c1c8374423fb85fe1c187b553453341
-SIZE (KDE/frameworks/5.36.0/kwayland-5.36.0.tar.xz) = 261832
+TIMESTAMP = 1502086079
+SHA256 (KDE/frameworks/5.37.0/kwayland-5.37.0.tar.xz) = d9479985f50533b0578097dfc793e7617051b086c1d13fc791efa23111458c34
+SIZE (KDE/frameworks/5.37.0/kwayland-5.37.0.tar.xz) = 262412
diff --git a/x11/kf5-kwindowsystem/distinfo b/x11/kf5-kwindowsystem/distinfo
index cda9a95c5ffe..28f91dc3a92c 100644
--- a/x11/kf5-kwindowsystem/distinfo
+++ b/x11/kf5-kwindowsystem/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499098910
-SHA256 (KDE/frameworks/5.36.0/kwindowsystem-5.36.0.tar.xz) = 8a1991e36ed74daa2085ea936d26adf59edd11d7d5c08a9b721a670a21821172
-SIZE (KDE/frameworks/5.36.0/kwindowsystem-5.36.0.tar.xz) = 167920
+TIMESTAMP = 1502086080
+SHA256 (KDE/frameworks/5.37.0/kwindowsystem-5.37.0.tar.xz) = 628a1e6512e89ef1eec2b0c50ea879e340656bbc8c57e2f8e961b75b24b0a25d
+SIZE (KDE/frameworks/5.37.0/kwindowsystem-5.37.0.tar.xz) = 167936
diff --git a/x11/kf5-plasma-framework/distinfo b/x11/kf5-plasma-framework/distinfo
index 225c449a83be..d0ef5d3c92b0 100644
--- a/x11/kf5-plasma-framework/distinfo
+++ b/x11/kf5-plasma-framework/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499098910
-SHA256 (KDE/frameworks/5.36.0/plasma-framework-5.36.0.tar.xz) = 7060e5b61eb8b00a350967528e0c22e18edd9cdc2cb7cb398aae3874ac859f17
-SIZE (KDE/frameworks/5.36.0/plasma-framework-5.36.0.tar.xz) = 4605968
+TIMESTAMP = 1502086080
+SHA256 (KDE/frameworks/5.37.0/plasma-framework-5.37.0.tar.xz) = 7099b0cbccf59b6be0f85f515e9e4c1f324c1910735c06acaea3affc5ddf554d
+SIZE (KDE/frameworks/5.37.0/plasma-framework-5.37.0.tar.xz) = 4606020
diff --git a/x11/kf5-plasma-framework/pkg-plist b/x11/kf5-plasma-framework/pkg-plist
index 625d653b2d8d..3ebc6c1a5adb 100644
--- a/x11/kf5-plasma-framework/pkg-plist
+++ b/x11/kf5-plasma-framework/pkg-plist
@@ -142,6 +142,7 @@ lib/libKF5PlasmaQuick.so.%%KDE_FRAMEWORKS_VERSION%%
%%QT_QMLDIR%%/QtQuick/Controls/Styles/Plasma/private/ButtonShadow.qml
%%QT_QMLDIR%%/QtQuick/Controls/Styles/Plasma/private/RoundShadow.qml
%%QT_QMLDIR%%/QtQuick/Controls/Styles/Plasma/private/TextFieldFocus.qml
+%%QT_QMLDIR%%/QtQuick/Controls/Styles/Plasma/private/Util.js
%%QT_QMLDIR%%/QtQuick/Controls/Styles/Plasma/qmldir
%%QT_QMLDIR%%/org/kde/plasma/accessdenied/qmldir
%%QT_QMLDIR%%/org/kde/plasma/calendar/CalendarToolbar.qml
@@ -216,7 +217,6 @@ lib/libKF5PlasmaQuick.so.%%KDE_FRAMEWORKS_VERSION%%
%%QT_QMLDIR%%/org/kde/plasma/components/libplasmacomponentsplugin.so
%%QT_QMLDIR%%/org/kde/plasma/components/plugins.qmltypes
%%QT_QMLDIR%%/org/kde/plasma/components/private/AppManager.js
-%%QT_QMLDIR%%/org/kde/plasma/components/private/Config.js
%%QT_QMLDIR%%/org/kde/plasma/components/private/DualStateButton.qml
%%QT_QMLDIR%%/org/kde/plasma/components/private/InlineDialog.qml
%%QT_QMLDIR%%/org/kde/plasma/components/private/PageStack.js