aboutsummaryrefslogtreecommitdiffstats
path: root/www
diff options
context:
space:
mode:
authorKoop Mast <koop@beyonit.nl>2019-09-25 01:10:20 +0800
committerKoop Mast <koop@beyonit.nl>2019-09-25 01:10:20 +0800
commitc5d4cd5d5cbcd9f16aa5bd8e5fcfdc96e17a81f6 (patch)
tree4b5a3cd1d243ff0c74465ea743ec310199c5edb5 /www
parentfe87ebd172e9d689d85015844fb5a85fb32b3e50 (diff)
parent54294ad9726b349cbad4ebbbe9711550f8b1e53d (diff)
downloadfreebsd-ports-gnome-c5d4cd5d5cbcd9f16aa5bd8e5fcfdc96e17a81f6.tar.gz
freebsd-ports-gnome-c5d4cd5d5cbcd9f16aa5bd8e5fcfdc96e17a81f6.tar.zst
freebsd-ports-gnome-c5d4cd5d5cbcd9f16aa5bd8e5fcfdc96e17a81f6.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'www')
-rw-r--r--www/Makefile7
-rw-r--r--www/WebMagick/Makefile2
-rw-r--r--www/bins/Makefile2
-rw-r--r--www/blogsum/Makefile2
-rw-r--r--www/boa/Makefile2
-rw-r--r--www/cgihtml/Makefile2
-rw-r--r--www/cgiparse/Makefile2
-rw-r--r--www/chromium/files/patch-media_audio_pulse_pulse.sigs143
-rw-r--r--www/cliqz/Makefile1
-rw-r--r--www/firefox-esr/Makefile2
-rw-r--r--www/firefox/Makefile4
-rw-r--r--www/firefox/distinfo6
-rw-r--r--www/flot/Makefile2
-rw-r--r--www/ftasv/Makefile2
-rw-r--r--www/gitea/Makefile12
-rw-r--r--www/gitlab-ce/Makefile11
-rw-r--r--www/gitlab-ce/distinfo6
-rw-r--r--www/gitlab-pages/Makefile4
-rw-r--r--www/gitlab-pages/distinfo6
-rw-r--r--www/glassfish5/Makefile17
-rw-r--r--www/glassfish5/distinfo6
-rw-r--r--www/glassfish5/pkg-descr11
-rw-r--r--www/glassfish5/pkg-plist874
-rw-r--r--www/go-appengine-sdk/Makefile2
-rw-r--r--www/gobuffalo/Makefile2
-rw-r--r--www/gohugo/Makefile32
-rw-r--r--www/gohugo/distinfo32
-rw-r--r--www/googler/Makefile2
-rw-r--r--www/googler/distinfo6
-rw-r--r--www/hastymail2-devel/Makefile2
-rw-r--r--www/hiawatha/Makefile19
-rw-r--r--www/hiawatha/distinfo6
-rw-r--r--www/hiawatha/pkg-help9
-rw-r--r--www/htmlpp/Makefile2
-rw-r--r--www/http-analyze/Makefile2
-rw-r--r--www/iridium/files/patch-media_audio_pulse_pulse.sigs143
-rw-r--r--www/junkbuster/Makefile2
-rw-r--r--www/jwt-cli/Makefile67
-rw-r--r--www/jwt-cli/distinfo89
-rw-r--r--www/jwt-cli/pkg-descr8
-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/links-hacked/Makefile2
-rw-r--r--www/llgal/Makefile2
-rw-r--r--www/lua-resty-core/Makefile30
-rw-r--r--www/lua-resty-core/distinfo3
-rw-r--r--www/lua-resty-core/pkg-descr3
-rw-r--r--www/lua-resty-core/pkg-plist29
-rw-r--r--www/lua-resty-lrucache/Makefile30
-rw-r--r--www/lua-resty-lrucache/distinfo3
-rw-r--r--www/lua-resty-lrucache/pkg-descr3
-rw-r--r--www/mgstat/Makefile2
-rw-r--r--www/midori/Makefile2
-rw-r--r--www/mod_php74/Makefile15
-rw-r--r--www/mod_scgi/Makefile15
-rw-r--r--www/mod_scgi/distinfo5
-rw-r--r--www/mod_scgi/files/apache24-compat-mod__scgi.c49
-rw-r--r--www/netsurf/Makefile3
-rw-r--r--www/netsurf/files/patch-utils_idna.c11
-rw-r--r--www/newsboat/Makefile11
-rw-r--r--www/newsboat/distinfo12
-rw-r--r--www/nextcloud-calendar/Makefile1
-rw-r--r--www/nextcloud-contacts/Makefile1
-rw-r--r--www/nextcloud-notes/Makefile1
-rw-r--r--www/nextcloud-tasks/Makefile1
-rw-r--r--www/nextcloud/Makefile1
-rw-r--r--www/nginx-devel/Makefile22
-rw-r--r--www/nginx-devel/Makefile.extmod19
-rw-r--r--www/nginx-devel/Makefile.options.desc4
-rw-r--r--www/nginx-devel/distinfo12
-rw-r--r--www/nginx-devel/files/extra-patch-passenger-build-nginx.rb4
-rw-r--r--www/nginx-devel/files/extra-patch-passenger-disable-telemetry4
-rw-r--r--www/nginx-devel/files/extra-patch-src_http_modules_ngx_http_slice_read_ahead.c456
-rw-r--r--www/nginx/Makefile2
-rw-r--r--www/nginx/Makefile.extmod2
-rw-r--r--www/nginx/distinfo14
-rw-r--r--www/nginx/files/extra-patch-passenger-build-nginx.rb4
-rw-r--r--www/nginx/files/extra-patch-passenger-disable-telemetry4
-rw-r--r--www/node/Makefile9
-rw-r--r--www/node10/Makefile9
-rw-r--r--www/node6/Makefile9
-rw-r--r--www/node8/Makefile9
-rw-r--r--www/owncloud/Makefile1
-rw-r--r--www/p5-HTML-Clean/Makefile2
-rw-r--r--www/p5-HTML-Clean/distinfo6
-rw-r--r--www/pecl-http/Makefile1
-rw-r--r--www/pecl-solr/Makefile1
-rw-r--r--www/pecl-yaf/Makefile1
-rw-r--r--www/pecl-yar/Makefile1
-rw-r--r--www/phalcon/Makefile1
-rw-r--r--www/php-screw/Makefile2
-rw-r--r--www/php74-opcache/Makefile13
-rw-r--r--www/php74-session/Makefile11
-rw-r--r--www/php74-tidy/Makefile11
-rw-r--r--www/phproxy/Makefile2
-rw-r--r--www/pmwiki/Makefile2
-rw-r--r--www/pmwiki/distinfo6
-rw-r--r--www/py-httplib2/Makefile2
-rw-r--r--www/py-httplib2/distinfo6
-rw-r--r--www/py-instabot/Makefile2
-rw-r--r--www/py-instabot/distinfo6
-rw-r--r--www/py-prewikka/Makefile2
-rw-r--r--www/qt5-webengine/files/patch-src_3rdparty_chromium_media_audio_pulse_pulse.sigs143
-rw-r--r--www/redmine-backlogs/Makefile2
-rw-r--r--www/rubygem-passenger/Makefile2
-rw-r--r--www/rubygem-passenger/distinfo6
-rw-r--r--www/rubygem-passenger/files/patch-asio-libc++713
-rw-r--r--www/rubygem-passenger/files/patch-freebsd1391
-rw-r--r--www/rubygem-roda/Makefile2
-rw-r--r--www/rubygem-roda/distinfo6
-rw-r--r--www/sfnt2woff/Makefile2
-rw-r--r--www/surf/Makefile2
-rw-r--r--www/swfdec-plugin/Makefile2
-rw-r--r--www/swish-e/Makefile2
-rw-r--r--www/tikiwiki/Makefile2
-rw-r--r--www/tikiwiki/distinfo6
-rw-r--r--www/tikiwiki/pkg-descr2
-rw-r--r--www/unit/Makefile2
-rw-r--r--www/unit/distinfo6
-rw-r--r--www/varnish-libvmod-dynamic/Makefile4
-rw-r--r--www/varnish-libvmod-dynamic/distinfo6
-rw-r--r--www/varnish-libvmod-dynamic/files/patch-src_dyn__resolver__getdns.c15
-rw-r--r--www/varnish6/Makefile2
-rw-r--r--www/varnish6/distinfo6
-rw-r--r--www/wt/Makefile3
-rw-r--r--www/wt/distinfo6
-rw-r--r--www/wt/pkg-plist18
-rw-r--r--www/wt3/Makefile5
-rw-r--r--www/wt3/distinfo6
-rw-r--r--www/wt3/pkg-plist20
-rw-r--r--www/xfce4-smartbookmark-plugin/Makefile4
-rw-r--r--www/xfce4-smartbookmark-plugin/distinfo6
-rw-r--r--www/xfce4-smartbookmark-plugin/pkg-plist3
-rw-r--r--www/youtube_dl/Makefile2
-rw-r--r--www/youtube_dl/distinfo6
137 files changed, 2262 insertions, 613 deletions
diff --git a/www/Makefile b/www/Makefile
index 0288ff431d30..c6d5fc98b2d8 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -284,6 +284,7 @@
SUBDIR += jspwiki
SUBDIR += jtoolkit
SUBDIR += junkbuster
+ SUBDIR += jwt-cli
SUBDIR += kanboard
SUBDIR += kannel
SUBDIR += kannel-sqlbox
@@ -327,6 +328,8 @@
SUBDIR += ljdump
SUBDIR += llgal
SUBDIR += logtools
+ SUBDIR += lua-resty-core
+ SUBDIR += lua-resty-lrucache
SUBDIR += luakit
SUBDIR += lynx
SUBDIR += lynx-current
@@ -408,6 +411,7 @@
SUBDIR += mod_php71
SUBDIR += mod_php72
SUBDIR += mod_php73
+ SUBDIR += mod_php74
SUBDIR += mod_proctitle
SUBDIR += mod_proxy_xml
SUBDIR += mod_python35
@@ -1401,6 +1405,9 @@
SUBDIR += php73-opcache
SUBDIR += php73-session
SUBDIR += php73-tidy
+ SUBDIR += php74-opcache
+ SUBDIR += php74-session
+ SUBDIR += php74-tidy
SUBDIR += phpbb
SUBDIR += phpbb3
SUBDIR += phpgroupware
diff --git a/www/WebMagick/Makefile b/www/WebMagick/Makefile
index ebe26f97eff0..5b7c6bcacc30 100644
--- a/www/WebMagick/Makefile
+++ b/www/WebMagick/Makefile
@@ -16,6 +16,8 @@ LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
BROKEN= unfetchable
+DEPRECATED= Unfetchable, unmaintained
+EXPIRATION_DATE= 2019-10-16
LIB_DEPENDS= libMagickCore-6.so:graphics/ImageMagick6
RUN_DEPENDS= p5-Sort-Naturally>=0:textproc/p5-Sort-Naturally
diff --git a/www/bins/Makefile b/www/bins/Makefile
index fbbc46a641d3..b46ef6a4ffae 100644
--- a/www/bins/Makefile
+++ b/www/bins/Makefile
@@ -11,6 +11,8 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Tool to generate HTML photo albums with XML support
BROKEN= unfetchable
+DEPRECATED= Unfetchable, unmaintained
+EXPIRATION_DATE= 2019-10-16
RUN_DEPENDS= \
p5-HTML-Parser>=0:www/p5-HTML-Parser \
diff --git a/www/blogsum/Makefile b/www/blogsum/Makefile
index 480540f39b91..1b10f7423244 100644
--- a/www/blogsum/Makefile
+++ b/www/blogsum/Makefile
@@ -11,6 +11,8 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Simple weblog
BROKEN= unfetchable
+DEPRECATED= Unfetchable, unmaintained
+EXPIRATION_DATE= 2019-10-16
RUN_DEPENDS= p5-DBI>=0:databases/p5-DBI \
p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \
diff --git a/www/boa/Makefile b/www/boa/Makefile
index 497299aa9b9b..4a5e7faf21e2 100644
--- a/www/boa/Makefile
+++ b/www/boa/Makefile
@@ -15,6 +15,8 @@ LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
BROKEN= unfetchable
+DEPRECATED= Unfetchable, unmaintained
+EXPIRATION_DATE= 2019-10-16
USES= cpe gmake makeinfo tar:bzip2
CPE_VENDOR= ${PORTVERSION:C/\.r/./}
diff --git a/www/cgihtml/Makefile b/www/cgihtml/Makefile
index a70e4121535a..ef3217ff54ec 100644
--- a/www/cgihtml/Makefile
+++ b/www/cgihtml/Makefile
@@ -13,6 +13,8 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Library that simplifies the task of writing CGI programs in C
BROKEN= unfetchable
+DEPRECATED= Unfetchable, unmaintained
+EXPIRATION_DATE= 2019-10-16
USE_LDCONFIG= yes
LLD_UNSAFE= yes
diff --git a/www/cgiparse/Makefile b/www/cgiparse/Makefile
index 4eab0d4cd4ab..b096f57e7a11 100644
--- a/www/cgiparse/Makefile
+++ b/www/cgiparse/Makefile
@@ -10,6 +10,8 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= C library to parse CGI Forms
BROKEN= unfetchable
+DEPRECATED= Unfetchable, unmaintained
+EXPIRATION_DATE= 2019-10-16
LIB_DEPENDS= libmime.so:devel/mime
diff --git a/www/chromium/files/patch-media_audio_pulse_pulse.sigs b/www/chromium/files/patch-media_audio_pulse_pulse.sigs
new file mode 100644
index 000000000000..3d31bd187348
--- /dev/null
+++ b/www/chromium/files/patch-media_audio_pulse_pulse.sigs
@@ -0,0 +1,143 @@
+gen/media/audio/pulse/pulse_stubs.cc:155:27: error: conflicting types for 'pa_context_get_state'
+extern pa_context_state_t pa_context_get_state(pa_context* c) __attribute__((weak));
+ ^
+../../../../../../../../../../usr/local/include/pulse/context.h:199:20: note: previous declaration is here
+pa_context_state_t pa_context_get_state(const pa_context *c);
+ ^
+gen/media/audio/pulse/pulse_stubs.cc:156:21: error: conflicting types for 'pa_context_get_state'
+pa_context_state_t pa_context_get_state(pa_context* c) {
+ ^
+../../../../../../../../../../usr/local/include/pulse/context.h:199:20: note: previous declaration is here
+pa_context_state_t pa_context_get_state(const pa_context *c);
+ ^
+gen/media/audio/pulse/pulse_stubs.cc:171:29: error: conflicting types for 'pa_operation_get_state'
+extern pa_operation_state_t pa_operation_get_state(pa_operation* o) __attribute__((weak));
+ ^
+../../../../../../../../../../usr/local/include/pulse/operation.h:52:22: note: previous declaration is here
+pa_operation_state_t pa_operation_get_state(const pa_operation *o);
+ ^
+gen/media/audio/pulse/pulse_stubs.cc:172:23: error: conflicting types for 'pa_operation_get_state'
+pa_operation_state_t pa_operation_get_state(pa_operation* o) {
+ ^
+../../../../../../../../../../usr/local/include/pulse/operation.h:52:22: note: previous declaration is here
+pa_operation_state_t pa_operation_get_state(const pa_operation *o);
+ ^
+gen/media/audio/pulse/pulse_stubs.cc:211:17: error: conflicting types for 'pa_stream_get_device_index'
+extern uint32_t pa_stream_get_device_index(pa_stream* s) __attribute__((weak));
+ ^
+../../../../../../../../../../usr/local/include/pulse/stream.h:366:10: note: previous declaration is here
+uint32_t pa_stream_get_device_index(const pa_stream *s);
+ ^
+gen/media/audio/pulse/pulse_stubs.cc:212:11: error: conflicting types for 'pa_stream_get_device_index'
+uint32_t pa_stream_get_device_index(pa_stream* s) {
+ ^
+../../../../../../../../../../usr/local/include/pulse/stream.h:366:10: note: previous declaration is here
+uint32_t pa_stream_get_device_index(const pa_stream *s);
+ ^
+gen/media/audio/pulse/pulse_stubs.cc:219:26: error: conflicting types for 'pa_stream_get_state'
+extern pa_stream_state_t pa_stream_get_state(pa_stream* p) __attribute__((weak));
+ ^
+../../../../../../../../../../usr/local/include/pulse/stream.h:345:19: note: previous declaration is here
+pa_stream_state_t pa_stream_get_state(const pa_stream *p);
+ ^
+gen/media/audio/pulse/pulse_stubs.cc:220:20: error: conflicting types for 'pa_stream_get_state'
+pa_stream_state_t pa_stream_get_state(pa_stream* p) {
+ ^
+../../../../../../../../../../usr/local/include/pulse/stream.h:345:19: note: previous declaration is here
+pa_stream_state_t pa_stream_get_state(const pa_stream *p);
+ ^
+gen/media/audio/pulse/pulse_stubs.cc:235:12: error: conflicting types for 'pa_proplist_contains'
+extern int pa_proplist_contains(pa_proplist* p, const char* key) __attribute__((weak));
+ ^
+../../../../../../../../../../usr/local/include/pulse/proplist.h:390:5: note: previous declaration is here
+int pa_proplist_contains(const pa_proplist *p, const char *key);
+ ^
+gen/media/audio/pulse/pulse_stubs.cc:236:6: error: conflicting types for 'pa_proplist_contains'
+int pa_proplist_contains(pa_proplist* p, const char* key) {
+ ^
+../../../../../../../../../../usr/local/include/pulse/proplist.h:390:5: note: previous declaration is here
+int pa_proplist_contains(const pa_proplist *p, const char *key);
+ ^
+gen/media/audio/pulse/pulse_stubs.cc:243:20: error: conflicting types for 'pa_proplist_gets'
+extern const char* pa_proplist_gets(pa_proplist* p, const char* key) __attribute__((weak));
+ ^
+../../../../../../../../../../usr/local/include/pulse/proplist.h:314:13: note: previous declaration is here
+const char *pa_proplist_gets(const pa_proplist *p, const char *key);
+ ^
+gen/media/audio/pulse/pulse_stubs.cc:244:14: error: conflicting types for 'pa_proplist_gets'
+const char* pa_proplist_gets(pa_proplist* p, const char* key) {
+ ^
+../../../../../../../../../../usr/local/include/pulse/proplist.h:314:13: note: previous declaration is here
+const char *pa_proplist_gets(const pa_proplist *p, const char *key);
+ ^
+gen/media/audio/pulse/pulse_stubs.cc:251:15: error: conflicting types for 'pa_stream_readable_size'
+extern size_t pa_stream_readable_size(pa_stream *p) __attribute__((weak));
+ ^
+../../../../../../../../../../usr/local/include/pulse/stream.h:574:8: note: previous declaration is here
+size_t pa_stream_readable_size(const pa_stream *p);
+ ^
+gen/media/audio/pulse/pulse_stubs.cc:252:9: error: conflicting types for 'pa_stream_readable_size'
+size_t pa_stream_readable_size(pa_stream *p) {
+ ^
+../../../../../../../../../../usr/local/include/pulse/stream.h:574:8: note: previous declaration is here
+size_t pa_stream_readable_size(const pa_stream *p);
+ ^
+gen/media/audio/pulse/pulse_stubs.cc:279:12: error: conflicting types for 'pa_context_errno'
+extern int pa_context_errno(pa_context *c) __attribute__((weak));
+ ^
+../../../../../../../../../../usr/local/include/pulse/context.h:193:5: note: previous declaration is here
+int pa_context_errno(const pa_context *c);
+ ^
+gen/media/audio/pulse/pulse_stubs.cc:280:6: error: conflicting types for 'pa_context_errno'
+int pa_context_errno(pa_context *c) {
+ ^
+../../../../../../../../../../usr/local/include/pulse/context.h:193:5: note: previous declaration is here
+int pa_context_errno(const pa_context *c);
+ ^
+
+--- media/audio/pulse/pulse.sigs.orig 2019-03-19 08:52:48 UTC
++++ media/audio/pulse/pulse.sigs
+@@ -24,11 +24,11 @@ pa_operation* pa_context_get_source_info_by_index(pa_c
+ pa_operation* pa_context_get_source_info_by_name(pa_context* c, const char* name, pa_source_info_cb_t cb, void *userdata);
+ pa_operation* pa_context_get_source_info_list(pa_context* c, pa_source_info_cb_t cb, void* userdata);
+ pa_operation* pa_context_get_sink_info_list(pa_context* c, pa_sink_info_cb_t cb, void* userdata);
+-pa_context_state_t pa_context_get_state(pa_context* c);
++pa_context_state_t pa_context_get_state(const pa_context *c);
+ pa_context* pa_context_new(pa_mainloop_api* mainloop, const char* name);
+ pa_operation* pa_context_set_source_volume_by_index(pa_context* c, uint32_t idx, const pa_cvolume* volume, pa_context_success_cb_t cb, void* userdata);
+ void pa_context_set_state_callback(pa_context* c, pa_context_notify_cb_t cb, void* userdata);
+-pa_operation_state_t pa_operation_get_state(pa_operation* o);
++pa_operation_state_t pa_operation_get_state(const pa_operation* o);
+ void pa_context_unref(pa_context* c);
+ void pa_operation_unref(pa_operation* o);
+ int pa_stream_begin_write(pa_stream* p, void** data, size_t* nbytes);
+@@ -38,23 +38,23 @@ pa_operation* pa_stream_cork(pa_stream* s, int b, pa_s
+ int pa_stream_disconnect(pa_stream* s);
+ int pa_stream_drop(pa_stream *p);
+ pa_operation* pa_stream_flush(pa_stream* s, pa_stream_success_cb_t cb, void* userdata);
+-uint32_t pa_stream_get_device_index(pa_stream* s);
++uint32_t pa_stream_get_device_index(const pa_stream* s);
+ int pa_stream_get_latency(pa_stream* s, pa_usec_t* r_usec, int* negative);
+-pa_stream_state_t pa_stream_get_state(pa_stream* p);
++pa_stream_state_t pa_stream_get_state(const pa_stream* p);
+ pa_stream* pa_stream_new(pa_context* c, const char* name, const pa_sample_spec* ss, const pa_channel_map * map);
+ pa_stream* pa_stream_new_with_proplist(pa_context* c, const char* name, const pa_sample_spec* ss, const pa_channel_map* map, pa_proplist* p);
+ pa_proplist* pa_proplist_new(void);
+-int pa_proplist_contains(pa_proplist* p, const char* key);
++int pa_proplist_contains(const pa_proplist* p, const char* key);
+ void pa_proplist_free(pa_proplist* p);
+-const char* pa_proplist_gets(pa_proplist* p, const char* key);
++const char* pa_proplist_gets(const pa_proplist* p, const char* key);
+ int pa_proplist_sets(pa_proplist* p, const char* key, const char* value);
+-size_t pa_stream_readable_size(pa_stream *p);
++size_t pa_stream_readable_size(const pa_stream *p);
+ int pa_stream_peek(pa_stream* p, const void** data, size_t* nbytes);
+ void pa_stream_set_read_callback(pa_stream* p, pa_stream_request_cb_t cb, void* userdata);
+ void pa_stream_set_state_callback(pa_stream* s, pa_stream_notify_cb_t cb, void* userdata);
+ int pa_stream_write(pa_stream* p, const void* data, size_t nbytes, pa_free_cb_t free_cb, int64_t offset, pa_seek_mode_t seek);
+ void pa_stream_set_write_callback(pa_stream *p, pa_stream_request_cb_t cb, void *userdata);
+ void pa_stream_unref(pa_stream* s);
+-int pa_context_errno(pa_context *c);
++int pa_context_errno(const pa_context *c);
+ const char* pa_strerror(int error);
+ pa_cvolume* pa_cvolume_set(pa_cvolume* a, unsigned channels, pa_volume_t v);
diff --git a/www/cliqz/Makefile b/www/cliqz/Makefile
index 1eb60abf5539..a28f9574e8b1 100644
--- a/www/cliqz/Makefile
+++ b/www/cliqz/Makefile
@@ -2,6 +2,7 @@
PORTNAME= cliqz
DISTVERSION= 1.28.2
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= https://s3.amazonaws.com/cdn.cliqz.com/browser-f/APT/:amazon \
http://repository.cliqz.com/dist/${CLIQZ_CHANNEL}/${DISTVERSION}/${CLIQZ_LAST_BUILD_ID}/:cliqz
diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile
index f5d6da8cc5da..ceeb5dc5e08d 100644
--- a/www/firefox-esr/Makefile
+++ b/www/firefox-esr/Makefile
@@ -3,7 +3,7 @@
PORTNAME= firefox
DISTVERSION= 68.1.0
-PORTREVISION= 2
+PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= www ipv6
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index dcfef1de663e..abf6cb894bf7 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -2,8 +2,8 @@
# $FreeBSD$
PORTNAME= firefox
-DISTVERSION= 69.0
-PORTREVISION= 2
+DISTVERSION= 69.0.1
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= www ipv6
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index 56d19ac0a57c..6f1193b41830 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1566869555
-SHA256 (firefox-69.0.source.tar.xz) = 413c3febdfeb69eade818824eecbdb11eaeda71de229573810afd641ba741ec5
-SIZE (firefox-69.0.source.tar.xz) = 323421020
+TIMESTAMP = 1568742653
+SHA256 (firefox-69.0.1.source.tar.xz) = f5f2f592b8296812d43244d6a50c0c57ad11a5324db8e4e79749545482b79033
+SIZE (firefox-69.0.1.source.tar.xz) = 315516072
diff --git a/www/flot/Makefile b/www/flot/Makefile
index a4be0b3a4f17..ccf57aefbd43 100644
--- a/www/flot/Makefile
+++ b/www/flot/Makefile
@@ -12,6 +12,8 @@ LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
BROKEN= unfetchable
+DEPRECATED= Unfetchable, unmaintained
+EXPIRATION_DATE= 2019-10-16
USES= zip
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/www/ftasv/Makefile b/www/ftasv/Makefile
index fa8a45e51a25..881d10c597f2 100644
--- a/www/ftasv/Makefile
+++ b/www/ftasv/Makefile
@@ -14,6 +14,8 @@ LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/COPYING
BROKEN= unfetchable
+DEPRECATED= Unfetchable, unmaintained
+EXPIRATION_DATE= 2019-10-16
GNU_CONFIGURE= yes
USES= apache:2.2+
diff --git a/www/gitea/Makefile b/www/gitea/Makefile
index d8d6a06e4a5c..7fb569c13380 100644
--- a/www/gitea/Makefile
+++ b/www/gitea/Makefile
@@ -4,6 +4,7 @@
PORTNAME= gitea
DISTVERSIONPREFIX= v
DISTVERSION= 1.9.3
+PORTREVISION= 1
CATEGORIES= www
MAINTAINER= stb@lassitu.de
@@ -19,7 +20,7 @@ USE_GITHUB= yes
GH_ACCOUNT= go-gitea
USE_RC_SUBR= gitea
-GO_BUILDFLAGS= -tags "${GO_TAGS}"
+GO_BUILDFLAGS= -tags "${GO_TAGS}" -ldflags '-X "main.Version=${PORTVERSION}"'
SUB_FILES+= app.ini.sample
SUB_LIST+= GITUSER=${USERS}
@@ -47,15 +48,6 @@ DAEMONARGS= -f
SUB_LIST+= DAEMONARGS="${DAEMONARGS}"
-post-patch:
- # Gitea releases don't supply the release version number; the
- # automatic method to obtain the version number in the Gitea build
- # system only works when sources are checked out from git.
- # See https://github.com/go-gitea/gitea/issues/1136#issuecomment-311622745
- @${SED} -Ei .orig \
- -e 's#^(var Version = )"[^"]+"#\1"${PORTVERSION}"#' \
- ${GO_WRKSRC}/main.go
-
do-install:
${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/${PORTNAME} ${STAGEDIR}${PREFIX}/sbin
@${MKDIR} ${STAGEDIR}${ETCDIR}/conf
diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile
index f5d7f256ea33..ac05aee65199 100644
--- a/www/gitlab-ce/Makefile
+++ b/www/gitlab-ce/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= gitlab-ce
-PORTVERSION= 12.2.4
+PORTVERSION= 12.2.5
PORTREVISION= 0
CATEGORIES= www devel
@@ -18,7 +18,7 @@ MY_DEPENDS= git>=2.21.0:devel/git \
gitlab-shell>=9.3.0:devel/gitlab-shell \
gitlab-workhorse>=8.8.1:www/gitlab-workhorse \
gitaly>=1.59.2:devel/gitaly \
- gitlab-pages>=1.7.1:www/gitlab-pages \
+ gitlab-pages>=1.7.2:www/gitlab-pages \
redis>=3.2.12:databases/redis \
yarn>=1.10.0:www/yarn \
rubygem-rails52>=5.2.3:www/rubygem-rails52 \
@@ -206,7 +206,7 @@ MY_DEPENDS= git>=2.21.0:devel/git \
rubygem-flipper-active_record013>=0.13.0<0.14.0:databases/rubygem-flipper-active_record013 \
rubygem-flipper-active_support_cache_store013>=0.13.0<0.14.0:devel/rubygem-flipper-active_support_cache_store013 \
rubygem-lograge-rails52>=0.5<1.0:www/rubygem-lograge-rails52 \
- rubygem-grape_logging181>=1.7<2.0:devel/rubygem-grape_logging181
+ rubygem-grape_logging>=1.7<2.0:devel/rubygem-grape_logging
BUILD_DEPENDS= gem:devel/ruby-gems \
${MY_DEPENDS}
@@ -224,8 +224,9 @@ USE_RUBY= yes
USE_RC_SUBR= gitlab
USE_GITLAB= yes
GL_ACCOUNT= gitlab-org
-# Find the here: https://gitlab.com/gitlab-org/gitlab-ce/tags
-GL_COMMIT= fcd107681ab480f87d5328367d25734ef5b81046
+GL_PROJECT= gitlab-foss
+# Find the here: https://gitlab.com/gitlab-org/gitlab-foss/-/tags
+GL_COMMIT= 09f8edbc29a2e489e7dfefacdcb589affc5fae0f
USERS= git
GROUPS= git
diff --git a/www/gitlab-ce/distinfo b/www/gitlab-ce/distinfo
index 0c4f53cca2b6..27e691ceea02 100644
--- a/www/gitlab-ce/distinfo
+++ b/www/gitlab-ce/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1568022609
-SHA256 (gitlab-org-gitlab-ce-fcd107681ab480f87d5328367d25734ef5b81046_GL0.tar.gz) = 685f777499b6689282d0743d38e06e6cdf7756226248c0356cac15485548e85c
-SIZE (gitlab-org-gitlab-ce-fcd107681ab480f87d5328367d25734ef5b81046_GL0.tar.gz) = 76157261
+TIMESTAMP = 1568722551
+SHA256 (gitlab-org-gitlab-foss-09f8edbc29a2e489e7dfefacdcb589affc5fae0f_GL0.tar.gz) = 619bcffee72a4926d0af14bde932b40b4f6952d3012fcfb868c0da63ce37c72a
+SIZE (gitlab-org-gitlab-foss-09f8edbc29a2e489e7dfefacdcb589affc5fae0f_GL0.tar.gz) = 76164390
diff --git a/www/gitlab-pages/Makefile b/www/gitlab-pages/Makefile
index 8e21b87b19d9..efd78fb411a4 100644
--- a/www/gitlab-pages/Makefile
+++ b/www/gitlab-pages/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= gitlab-pages
-PORTVERSION= 1.7.1
+PORTVERSION= 1.7.2
CATEGORIES= www
MAINTAINER= swills@FreeBSD.org
@@ -15,7 +15,7 @@ USES= go
USE_GITLAB= yes
GL_ACCOUNT= gitlab-org
# Find the here: https://gitlab.com/gitlab-org/gitlab-pages/tags
-GL_COMMIT= 1fa5c7b079831a73b55bb874b84a0b53fd4c0f23
+GL_COMMIT= 520398c7154a50f7768ee52da71afd52efff85b1
PLIST_FILES= bin/gitlab-pages
diff --git a/www/gitlab-pages/distinfo b/www/gitlab-pages/distinfo
index f6160972e37a..854246ac7d4d 100644
--- a/www/gitlab-pages/distinfo
+++ b/www/gitlab-pages/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1566042666
-SHA256 (gitlab-org-gitlab-pages-1fa5c7b079831a73b55bb874b84a0b53fd4c0f23_GL0.tar.gz) = 2dfb836da15b802922b0d7218edb797bcd98331c4c442f63a8c0d59b59194ffe
-SIZE (gitlab-org-gitlab-pages-1fa5c7b079831a73b55bb874b84a0b53fd4c0f23_GL0.tar.gz) = 1983405
+TIMESTAMP = 1568490277
+SHA256 (gitlab-org-gitlab-pages-520398c7154a50f7768ee52da71afd52efff85b1_GL0.tar.gz) = fe75cabbc863ea1de90e9cdf12fe6a07f0f7bc4f77561e0de5b35110b1a63bcc
+SIZE (gitlab-org-gitlab-pages-520398c7154a50f7768ee52da71afd52efff85b1_GL0.tar.gz) = 1984367
diff --git a/www/glassfish5/Makefile b/www/glassfish5/Makefile
index d617fc0ecb9f..eb26c681d0c3 100644
--- a/www/glassfish5/Makefile
+++ b/www/glassfish5/Makefile
@@ -1,16 +1,17 @@
-# Created by: cjr@cruwe.de
+# Created by: cjr@cruwe.de
# $FreeBSD$
PORTNAME= glassfish
-PORTVERSION= 5.0
+PORTVERSION= 5.1.0
CATEGORIES= www java
-MASTER_SITES= http://download.oracle.com/glassfish/${PORTVERSION}/release/
+MASTER_SITES= ECLIPSE/glassfish
+PKGNAMEPREFIX= eclipse-
PKGNAMESUFFIX= 5
MAINTAINER= jmd@FreeBSD.org
-COMMENT= Reference implementation of the Java EE application server
+COMMENT= Eclipse Jakarta EE Platform
-LICENSE= CDDL
+LICENSE= EPL
USES= zip
USE_JAVA= yes
@@ -29,7 +30,9 @@ SUB_LIST= GLASSFISHVERSION=${PORTVERSION} \
JAVA_HOME=${JAVA_HOME}
USE_RC_SUBR= glassfish
-GLASSFISH_BIN_FILES= appclient asadmin capture-schema jspc package-appclient schemagen startserv stopserv wscompile wsdeploy wsgen wsimport xjc
+GLASSFISH_BIN_FILES= appclient appclient.js asadmin capture-schema capture-schema.1m jspc package-appclient schemagen startserv stopserv wscompile wsdeploy wsgen wsimport xjc
+
+.include <bsd.port.pre.mk>
do-install:
@${FIND} ${WRKSRC} -name '*.bat' -delete
@@ -41,4 +44,4 @@ do-install:
@${CHMOD} ${BINMODE} ${STAGEDIR}${DATADIR}/glassfish/bin/${x}
.endfor
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/www/glassfish5/distinfo b/www/glassfish5/distinfo
index 4ea7f216d8c5..bec52f378bb4 100644
--- a/www/glassfish5/distinfo
+++ b/www/glassfish5/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1568211939
-SHA256 (glassfish-5.0.zip) = 85450f0cd4875729d64be6bcbf7ed8f61009ea0f23d3be453c6f3d1dbab02420
-SIZE (glassfish-5.0.zip) = 119735241
+TIMESTAMP = 1568870755
+SHA256 (glassfish-5.1.0.zip) = 26f3fa6463d24c5ed3956e4cab24a97e834ca37d7a23d341aadaa78d9e0093ce
+SIZE (glassfish-5.1.0.zip) = 117379392
diff --git a/www/glassfish5/pkg-descr b/www/glassfish5/pkg-descr
index 18fa455b69d9..7ed10db6c8c3 100644
--- a/www/glassfish5/pkg-descr
+++ b/www/glassfish5/pkg-descr
@@ -1,4 +1,9 @@
-The Glassfish Java Application Server is the reference implementation for a
-Java EE Application server.
+Eclipse Enterprise for Java
-WWW: http://glassfish.java.net/
+Eclipse GlassFish is a complete application server that implements the Jakarta
+EE specification. GlassFish includes implementations of all required and
+optional Jakarta EE APIs, and passes all Jakarta EE TCKs. GlassFish also
+includes a complete administration console, clustering support, and other
+developer and production focused tools and features.
+
+WWW: https://projects.eclipse.org/projects/ee4j.glassfish
diff --git a/www/glassfish5/pkg-plist b/www/glassfish5/pkg-plist
index 39288712233d..b62c7327cd8a 100644
--- a/www/glassfish5/pkg-plist
+++ b/www/glassfish5/pkg-plist
@@ -1,4 +1,6 @@
etc/rc.d/glassfish
+%%DATADIR%%/META-INF/LICENSE.md
+%%DATADIR%%/META-INF/NOTICE.md
%%DATADIR%%/README.txt
%%DATADIR%%/bin/asadmin
%%DATADIR%%/glassfish/bin/appclient
@@ -20,7 +22,6 @@ etc/rc.d/glassfish
%%DATADIR%%/glassfish/common/templates/gf/nucleus-domain.jar
%%DATADIR%%/glassfish/config/asenv.conf
%%DATADIR%%/glassfish/config/branding/glassfish-version.properties
-%%DATADIR%%/glassfish/config/client-jnlp-config.properties
%%DATADIR%%/glassfish/config/glassfish.container
%%DATADIR%%/glassfish/config/osgi.properties
%%DATADIR%%/glassfish/docs/about.html
@@ -46,9 +47,6 @@ etc/rc.d/glassfish
%%DATADIR%%/glassfish/domains/domain1/config/wss-server-config-2.0.xml
%%DATADIR%%/glassfish/domains/domain1/docroot/index.html
%%DATADIR%%/glassfish/domains/domain1/init-info/domain-info.xml
-%%DATADIR%%/glassfish/glassfish/.gitkeep_empty_dir
-%%DATADIR%%/glassfish/legal/3RD-PARTY-LICENSE-WEB-PROFILE.txt
-%%DATADIR%%/glassfish/legal/3RD-PARTY-LICENSE.txt
%%DATADIR%%/glassfish/legal/LICENSE.txt
%%DATADIR%%/glassfish/lib/appclient/appclientlogin.conf
%%DATADIR%%/glassfish/lib/appclient/client.policy
@@ -121,25 +119,22 @@ etc/rc.d/glassfish
%%DATADIR%%/glassfish/lib/dtds/web-app_2_3.dtd
%%DATADIR%%/glassfish/lib/dtds/web-jsptaglibrary_1_1.dtd
%%DATADIR%%/glassfish/lib/dtds/web-jsptaglibrary_1_2.dtd
-%%DATADIR%%/glassfish/lib/dtds/wls810/dtd/weblogic-application_2_0.dtd
%%DATADIR%%/glassfish/lib/embedded/glassfish-embedded-shell.jar
%%DATADIR%%/glassfish/lib/embedded/glassfish-embedded-static-shell.jar
%%DATADIR%%/glassfish/lib/gf-client.jar
-%%DATADIR%%/glassfish/lib/install/applications/__admingui/3rd-party-license
%%DATADIR%%/glassfish/lib/install/applications/__admingui/META-INF/MANIFEST.MF
%%DATADIR%%/glassfish/lib/install/applications/__admingui/META-INF/context.xml
-%%DATADIR%%/glassfish/lib/install/applications/__admingui/META-INF/maven/org.glassfish.main.admingui/war/pom.properties
-%%DATADIR%%/glassfish/lib/install/applications/__admingui/META-INF/maven/org.glassfish.main.admingui/war/pom.xml
+%%DATADIR%%/glassfish/lib/install/applications/__admingui/WEB-INF/classes/META-INF/LICENSE.md
+%%DATADIR%%/glassfish/lib/install/applications/__admingui/WEB-INF/classes/META-INF/NOTICE.md
%%DATADIR%%/glassfish/lib/install/applications/__admingui/WEB-INF/extra/commons-fileupload-1.3.3.jar
%%DATADIR%%/glassfish/lib/install/applications/__admingui/WEB-INF/extra/commons-io-2.5.jar
-%%DATADIR%%/glassfish/lib/install/applications/__admingui/WEB-INF/extra/dojo-ajax-nodemo-0.4.1.jar
-%%DATADIR%%/glassfish/lib/install/applications/__admingui/WEB-INF/extra/json-1.0.jar
-%%DATADIR%%/glassfish/lib/install/applications/__admingui/WEB-INF/extra/prototype-1.5.0.jar
-%%DATADIR%%/glassfish/lib/install/applications/__admingui/WEB-INF/extra/webui-jsf-4.0.2.10.jar
-%%DATADIR%%/glassfish/lib/install/applications/__admingui/WEB-INF/extra/webui-jsf-suntheme-4.0.2.10.jar
+%%DATADIR%%/glassfish/lib/install/applications/__admingui/WEB-INF/extra/dojo-ajax-nodemo-1.12.4.jar
+%%DATADIR%%/glassfish/lib/install/applications/__admingui/WEB-INF/extra/json-2.0.jar
+%%DATADIR%%/glassfish/lib/install/applications/__admingui/WEB-INF/extra/prototype-1.7.3.jar
+%%DATADIR%%/glassfish/lib/install/applications/__admingui/WEB-INF/extra/webui-jsf-4.0.2.16.jar
+%%DATADIR%%/glassfish/lib/install/applications/__admingui/WEB-INF/extra/webui-jsf-suntheme-4.0.2.16.jar
%%DATADIR%%/glassfish/lib/install/applications/__admingui/WEB-INF/faces-config.xml
-%%DATADIR%%/glassfish/lib/install/applications/__admingui/WEB-INF/lib/.gitkeep_empty_dir
-%%DATADIR%%/glassfish/lib/install/applications/__admingui/WEB-INF/lib/console-core-5.0.jar
+%%DATADIR%%/glassfish/lib/install/applications/__admingui/WEB-INF/lib/console-core-5.1.0.jar
%%DATADIR%%/glassfish/lib/install/applications/__admingui/WEB-INF/sun-web.xml
%%DATADIR%%/glassfish/lib/install/applications/__admingui/WEB-INF/web.xml
%%DATADIR%%/glassfish/lib/install/applications/__admingui/index.jsf
@@ -170,6 +165,7 @@ etc/rc.d/glassfish
%%DATADIR%%/glassfish/lib/install/applications/ejb-timer-service-app.war
%%DATADIR%%/glassfish/lib/install/applications/jaxr-ra/META-INF/MANIFEST.MF
%%DATADIR%%/glassfish/lib/install/applications/jaxr-ra/META-INF/ra.xml
+%%DATADIR%%/glassfish/lib/install/applications/jaxr-ra/jakarta.xml.registry-api-1.0.9.jar
%%DATADIR%%/glassfish/lib/install/applications/jaxr-ra/jaxr-ra.jar
%%DATADIR%%/glassfish/lib/install/applications/jmsra/META-INF/MANIFEST.MF
%%DATADIR%%/glassfish/lib/install/applications/jmsra/META-INF/ra.xml
@@ -244,126 +240,25 @@ etc/rc.d/glassfish
%%DATADIR%%/glassfish/lib/install/templates/resources/jdbc/sybase_inet_datasource.xml
%%DATADIR%%/glassfish/lib/install/templates/resources/jdbc/sybase_jconn_datasource.xml
%%DATADIR%%/glassfish/lib/javaee.jar
-%%DATADIR%%/glassfish/lib/jndi-properties.jar
%%DATADIR%%/glassfish/lib/monitor/flashlight-agent.jar
%%DATADIR%%/glassfish/lib/nadmin
%%DATADIR%%/glassfish/lib/package-appclient.xml
-%%DATADIR%%/glassfish/lib/registration/servicetag-registry.xml
-%%DATADIR%%/glassfish/lib/schemas/1.0/domain.xsd
-%%DATADIR%%/glassfish/lib/schemas/1.0/security.xsd
-%%DATADIR%%/glassfish/lib/schemas/10.0/persistence-configuration.xsd
-%%DATADIR%%/glassfish/lib/schemas/10.0/weblogic-appclient.xsd
-%%DATADIR%%/glassfish/lib/schemas/10.0/weblogic-ejb-jar.xsd
-%%DATADIR%%/glassfish/lib/schemas/10.0/weblogic-javaee.xsd
-%%DATADIR%%/glassfish/lib/schemas/10.3/deployment-plan/1.0/deployment-plan.xsd
-%%DATADIR%%/glassfish/lib/schemas/10.3/jdbc-data-source/1.0/jdbc-data-source.xsd
-%%DATADIR%%/glassfish/lib/schemas/10.3/persistence-configuration/1.0/persistence-configuration.xsd
-%%DATADIR%%/glassfish/lib/schemas/10.3/weblogic-application-client/1.0/weblogic-application-client.xsd
-%%DATADIR%%/glassfish/lib/schemas/10.3/weblogic-application/1.0/weblogic-application.xsd
-%%DATADIR%%/glassfish/lib/schemas/10.3/weblogic-connector/1.0/weblogic-connector.xsd
-%%DATADIR%%/glassfish/lib/schemas/10.3/weblogic-diagnostics/1.1/weblogic-diagnostics.xsd
-%%DATADIR%%/glassfish/lib/schemas/10.3/weblogic-ejb-jar/1.0/weblogic-ejb-jar.xsd
-%%DATADIR%%/glassfish/lib/schemas/10.3/weblogic-extension/1.0/weblogic-extension.xsd
-%%DATADIR%%/glassfish/lib/schemas/10.3/weblogic-interception/1.0/weblogic-interception.xsd
-%%DATADIR%%/glassfish/lib/schemas/10.3/weblogic-javaee/1.0/weblogic-javaee.xsd
-%%DATADIR%%/glassfish/lib/schemas/10.3/weblogic-jms/1.0/weblogic-jms.xsd
-%%DATADIR%%/glassfish/lib/schemas/10.3/weblogic-pubsub/1.0/weblogic-pubsub.xsd
-%%DATADIR%%/glassfish/lib/schemas/10.3/weblogic-rdbms-jar/1.0/weblogic-rdbms-jar.xsd
-%%DATADIR%%/glassfish/lib/schemas/10.3/weblogic-web-app/1.0/weblogic-web-app.xsd
-%%DATADIR%%/glassfish/lib/schemas/10.3/weblogic-webservices/1.0/weblogic-webservices.xsd
-%%DATADIR%%/glassfish/lib/schemas/10.3/weblogic-wsee-clienthandlerchain/1.0/weblogic-wsee-clienthandlerchain.xsd
-%%DATADIR%%/glassfish/lib/schemas/10.3/weblogic-wsee-standaloneclient/1.0/weblogic-wsee-standaloneclient.xsd
-%%DATADIR%%/glassfish/lib/schemas/10.3/webservice-policy-ref/1.0/webservice-policy-ref.xsd
-%%DATADIR%%/glassfish/lib/schemas/90/diagnostics.xsd
-%%DATADIR%%/glassfish/lib/schemas/90/diagnostics/accessor/export.xsd
-%%DATADIR%%/glassfish/lib/schemas/90/domain.xsd
-%%DATADIR%%/glassfish/lib/schemas/90/security.xsd
-%%DATADIR%%/glassfish/lib/schemas/90/security/wls.xsd
-%%DATADIR%%/glassfish/lib/schemas/90/security/xacml.xsd
-%%DATADIR%%/glassfish/lib/schemas/90/weblogic-annotation.xsd
-%%DATADIR%%/glassfish/lib/schemas/90/weblogic-appclient.xsd
-%%DATADIR%%/glassfish/lib/schemas/90/weblogic-application.xsd
-%%DATADIR%%/glassfish/lib/schemas/90/weblogic-deployment-plan.xsd
-%%DATADIR%%/glassfish/lib/schemas/90/weblogic-ejb-jar.xsd
-%%DATADIR%%/glassfish/lib/schemas/90/weblogic-extension.xsd
-%%DATADIR%%/glassfish/lib/schemas/90/weblogic-interception.xsd
-%%DATADIR%%/glassfish/lib/schemas/90/weblogic-j2ee.xsd
-%%DATADIR%%/glassfish/lib/schemas/90/weblogic-jdbc.xsd
-%%DATADIR%%/glassfish/lib/schemas/90/weblogic-jmsmd.xsd
-%%DATADIR%%/glassfish/lib/schemas/90/weblogic-ra-ext.xsd
-%%DATADIR%%/glassfish/lib/schemas/90/weblogic-ra.xsd
-%%DATADIR%%/glassfish/lib/schemas/90/weblogic-rdbms11-persistence.xsd
-%%DATADIR%%/glassfish/lib/schemas/90/weblogic-rdbms20-persistence.xsd
-%%DATADIR%%/glassfish/lib/schemas/90/weblogic-standalone-wsclient.xsd
-%%DATADIR%%/glassfish/lib/schemas/90/weblogic-web-app.xsd
-%%DATADIR%%/glassfish/lib/schemas/90/weblogic-ws-policy.xsd
-%%DATADIR%%/glassfish/lib/schemas/90/weblogic-wsee-clienthandlerchain.xsd
-%%DATADIR%%/glassfish/lib/schemas/90/weblogic-wsee.xsd
-%%DATADIR%%/glassfish/lib/schemas/910/diagnostics-image.xsd
-%%DATADIR%%/glassfish/lib/schemas/910/diagnostics.xsd
-%%DATADIR%%/glassfish/lib/schemas/910/domain.xsd
-%%DATADIR%%/glassfish/lib/schemas/910/security.xsd
-%%DATADIR%%/glassfish/lib/schemas/910/weblogic-annotation.xsd
-%%DATADIR%%/glassfish/lib/schemas/910/weblogic-appclient.xsd
-%%DATADIR%%/glassfish/lib/schemas/910/weblogic-application.xsd
-%%DATADIR%%/glassfish/lib/schemas/910/weblogic-deployment-plan.xsd
-%%DATADIR%%/glassfish/lib/schemas/910/weblogic-ejb-jar.xsd
-%%DATADIR%%/glassfish/lib/schemas/910/weblogic-extension.xsd
-%%DATADIR%%/glassfish/lib/schemas/910/weblogic-interception.xsd
-%%DATADIR%%/glassfish/lib/schemas/910/weblogic-j2ee.xsd
-%%DATADIR%%/glassfish/lib/schemas/910/weblogic-jdbc.xsd
-%%DATADIR%%/glassfish/lib/schemas/910/weblogic-jmsmd.xsd
-%%DATADIR%%/glassfish/lib/schemas/910/weblogic-ra-ext.xsd
-%%DATADIR%%/glassfish/lib/schemas/910/weblogic-ra.xsd
-%%DATADIR%%/glassfish/lib/schemas/910/weblogic-rdbms11-persistence.xsd
-%%DATADIR%%/glassfish/lib/schemas/910/weblogic-rdbms20-persistence.xsd
-%%DATADIR%%/glassfish/lib/schemas/910/weblogic-standalone-wsclient.xsd
-%%DATADIR%%/glassfish/lib/schemas/910/weblogic-web-app.xsd
-%%DATADIR%%/glassfish/lib/schemas/910/weblogic-ws-policy.xsd
-%%DATADIR%%/glassfish/lib/schemas/910/weblogic-wsee-clienthandlerchain.xsd
-%%DATADIR%%/glassfish/lib/schemas/910/weblogic-wsee.xsd
-%%DATADIR%%/glassfish/lib/schemas/920/diagnostics-image.xsd
-%%DATADIR%%/glassfish/lib/schemas/920/diagnostics.xsd
-%%DATADIR%%/glassfish/lib/schemas/920/domain.xsd
-%%DATADIR%%/glassfish/lib/schemas/920/security.xsd
-%%DATADIR%%/glassfish/lib/schemas/920/security/medrec.xsd
-%%DATADIR%%/glassfish/lib/schemas/920/weblogic-annotation.xsd
-%%DATADIR%%/glassfish/lib/schemas/920/weblogic-appclient.xsd
-%%DATADIR%%/glassfish/lib/schemas/920/weblogic-application.xsd
-%%DATADIR%%/glassfish/lib/schemas/920/weblogic-deployment-plan.xsd
-%%DATADIR%%/glassfish/lib/schemas/920/weblogic-ejb-jar.xsd
-%%DATADIR%%/glassfish/lib/schemas/920/weblogic-extension.xsd
-%%DATADIR%%/glassfish/lib/schemas/920/weblogic-interception.xsd
-%%DATADIR%%/glassfish/lib/schemas/920/weblogic-j2ee.xsd
-%%DATADIR%%/glassfish/lib/schemas/920/weblogic-jdbc.xsd
-%%DATADIR%%/glassfish/lib/schemas/920/weblogic-jmsmd.xsd
-%%DATADIR%%/glassfish/lib/schemas/920/weblogic-ra-ext.xsd
-%%DATADIR%%/glassfish/lib/schemas/920/weblogic-ra.xsd
-%%DATADIR%%/glassfish/lib/schemas/920/weblogic-rdbms11-persistence.xsd
-%%DATADIR%%/glassfish/lib/schemas/920/weblogic-rdbms20-persistence.xsd
-%%DATADIR%%/glassfish/lib/schemas/920/weblogic-standalone-wsclient.xsd
-%%DATADIR%%/glassfish/lib/schemas/920/weblogic-web-app.xsd
-%%DATADIR%%/glassfish/lib/schemas/920/weblogic-ws-policy.xsd
-%%DATADIR%%/glassfish/lib/schemas/920/weblogic-wsee-clienthandlerchain.xsd
-%%DATADIR%%/glassfish/lib/schemas/920/weblogic-wsee.xsd
%%DATADIR%%/glassfish/lib/schemas/XMLSchema.dtd
%%DATADIR%%/glassfish/lib/schemas/application-client_1_4.xsd
%%DATADIR%%/glassfish/lib/schemas/application-client_5.xsd
%%DATADIR%%/glassfish/lib/schemas/application-client_6.xsd
%%DATADIR%%/glassfish/lib/schemas/application-client_7.xsd
+%%DATADIR%%/glassfish/lib/schemas/application-client_8.xsd
%%DATADIR%%/glassfish/lib/schemas/application_1_4.xsd
%%DATADIR%%/glassfish/lib/schemas/application_5.xsd
%%DATADIR%%/glassfish/lib/schemas/application_6.xsd
%%DATADIR%%/glassfish/lib/schemas/application_7.xsd
+%%DATADIR%%/glassfish/lib/schemas/application_8.xsd
%%DATADIR%%/glassfish/lib/schemas/beans_1_0.xsd
%%DATADIR%%/glassfish/lib/schemas/connector_1_5.xsd
%%DATADIR%%/glassfish/lib/schemas/connector_1_6.xsd
%%DATADIR%%/glassfish/lib/schemas/connector_1_7.xsd
%%DATADIR%%/glassfish/lib/schemas/datatypes.dtd
-%%DATADIR%%/glassfish/lib/schemas/deployment-plan/1.0/deployment-plan.xsd
-%%DATADIR%%/glassfish/lib/schemas/deployment-plan/index.html
-%%DATADIR%%/glassfish/lib/schemas/domain/1.0/domain.xsd
-%%DATADIR%%/glassfish/lib/schemas/domain/index_0.html
%%DATADIR%%/glassfish/lib/schemas/ejb-jar_2_1.xsd
%%DATADIR%%/glassfish/lib/schemas/ejb-jar_3_0.xsd
%%DATADIR%%/glassfish/lib/schemas/ejb-jar_3_1.xsd
@@ -383,11 +278,6 @@ etc/rc.d/glassfish
%%DATADIR%%/glassfish/lib/schemas/javaee_web_services_client_1_3.xsd
%%DATADIR%%/glassfish/lib/schemas/javaee_web_services_client_1_4.xsd
%%DATADIR%%/glassfish/lib/schemas/jax-rpc-ri-config.xsd
-%%DATADIR%%/glassfish/lib/schemas/jdbc-data-source.xsd
-%%DATADIR%%/glassfish/lib/schemas/jdbc-data-source/1.0/jdbc-data-source.xsd
-%%DATADIR%%/glassfish/lib/schemas/jdbc-data-source/1.1/jdbc-data-source.xsd
-%%DATADIR%%/glassfish/lib/schemas/jdbc-data-source/1.2/jdbc-data-source.xsd
-%%DATADIR%%/glassfish/lib/schemas/jdbc-data-source/index.html
%%DATADIR%%/glassfish/lib/schemas/jsp_2_0.xsd
%%DATADIR%%/glassfish/lib/schemas/jsp_2_1.xsd
%%DATADIR%%/glassfish/lib/schemas/jsp_2_2.xsd
@@ -397,21 +287,10 @@ etc/rc.d/glassfish
%%DATADIR%%/glassfish/lib/schemas/orm_2_1.xsd
%%DATADIR%%/glassfish/lib/schemas/orm_2_2.xsd
%%DATADIR%%/glassfish/lib/schemas/permissions_7.xsd
-%%DATADIR%%/glassfish/lib/schemas/persistence-configuration/1.0/persistence-configuration.xsd
-%%DATADIR%%/glassfish/lib/schemas/persistence-configuration/index.html
%%DATADIR%%/glassfish/lib/schemas/persistence_1_0.xsd
%%DATADIR%%/glassfish/lib/schemas/persistence_2_0.xsd
%%DATADIR%%/glassfish/lib/schemas/persistence_2_1.xsd
%%DATADIR%%/glassfish/lib/schemas/persistence_2_2.xsd
-%%DATADIR%%/glassfish/lib/schemas/security/1.0/security.xsd
-%%DATADIR%%/glassfish/lib/schemas/security/index.html
-%%DATADIR%%/glassfish/lib/schemas/security/wls/1.0/wls.xsd
-%%DATADIR%%/glassfish/lib/schemas/security/wls/index.html
-%%DATADIR%%/glassfish/lib/schemas/security/xacml/1.0/xacml.xsd
-%%DATADIR%%/glassfish/lib/schemas/security/xacml/index.html
-%%DATADIR%%/glassfish/lib/schemas/servers/portal/weblogic-portal/8.0/netuix-config.xsd
-%%DATADIR%%/glassfish/lib/schemas/servers/portal/weblogic-portlet/8.0/weblogic-portlet.xsd
-%%DATADIR%%/glassfish/lib/schemas/servers/weblogic/url-template-config/8.0/url-template-config.xsd
%%DATADIR%%/glassfish/lib/schemas/web-app_2_4.xsd
%%DATADIR%%/glassfish/lib/schemas/web-app_2_5.xsd
%%DATADIR%%/glassfish/lib/schemas/web-app_3_0.xsd
@@ -422,86 +301,19 @@ etc/rc.d/glassfish
%%DATADIR%%/glassfish/lib/schemas/web-common_4_0.xsd
%%DATADIR%%/glassfish/lib/schemas/web-facelettaglibrary_2_0.xsd
%%DATADIR%%/glassfish/lib/schemas/web-facelettaglibrary_2_2.xsd
+%%DATADIR%%/glassfish/lib/schemas/web-facelettaglibrary_2_3.xsd
%%DATADIR%%/glassfish/lib/schemas/web-facesconfig_1_2.xsd
%%DATADIR%%/glassfish/lib/schemas/web-facesconfig_2_0.xsd
%%DATADIR%%/glassfish/lib/schemas/web-facesconfig_2_1.xsd
%%DATADIR%%/glassfish/lib/schemas/web-facesconfig_2_2.xsd
+%%DATADIR%%/glassfish/lib/schemas/web-facesconfig_2_3.xsd
%%DATADIR%%/glassfish/lib/schemas/web-fragment_3_0.xsd
%%DATADIR%%/glassfish/lib/schemas/web-fragment_3_1.xsd
%%DATADIR%%/glassfish/lib/schemas/web-fragment_4_0.xsd
%%DATADIR%%/glassfish/lib/schemas/web-jsptaglibrary_2_0.xsd
%%DATADIR%%/glassfish/lib/schemas/web-jsptaglibrary_2_1.xsd
%%DATADIR%%/glassfish/lib/schemas/web-partialresponse_2_2.xsd
-%%DATADIR%%/glassfish/lib/schemas/weblogic-application-client/1.0/weblogic-application-client.xsd
-%%DATADIR%%/glassfish/lib/schemas/weblogic-application-client/1.1/weblogic-application-client.xsd
-%%DATADIR%%/glassfish/lib/schemas/weblogic-application-client/1.2/weblogic-application-client.xsd
-%%DATADIR%%/glassfish/lib/schemas/weblogic-application-client/1.3/weblogic-application-client.xsd
-%%DATADIR%%/glassfish/lib/schemas/weblogic-application-client/index.html
-%%DATADIR%%/glassfish/lib/schemas/weblogic-application/1.0/weblogic-application.xsd
-%%DATADIR%%/glassfish/lib/schemas/weblogic-application/1.1/weblogic-application.xsd
-%%DATADIR%%/glassfish/lib/schemas/weblogic-application/1.2/weblogic-application.xsd
-%%DATADIR%%/glassfish/lib/schemas/weblogic-application/1.3/weblogic-application.xsd
-%%DATADIR%%/glassfish/lib/schemas/weblogic-application/1.4/weblogic-application.xsd
-%%DATADIR%%/glassfish/lib/schemas/weblogic-application/1.5/weblogic-application.xsd
-%%DATADIR%%/glassfish/lib/schemas/weblogic-application/1.6/weblogic-application.xsd
-%%DATADIR%%/glassfish/lib/schemas/weblogic-application/index.html
-%%DATADIR%%/glassfish/lib/schemas/weblogic-connector/1.0/weblogic-connector.xsd
-%%DATADIR%%/glassfish/lib/schemas/weblogic-connector/1.2/weblogic-connector.xsd
-%%DATADIR%%/glassfish/lib/schemas/weblogic-connector/1.3/weblogic-connector.xsd
-%%DATADIR%%/glassfish/lib/schemas/weblogic-connector/index.html
-%%DATADIR%%/glassfish/lib/schemas/weblogic-diagnostics-image/1.0/weblogic-diagnostics-image.xsd
-%%DATADIR%%/glassfish/lib/schemas/weblogic-diagnostics-image/index.html
-%%DATADIR%%/glassfish/lib/schemas/weblogic-diagnostics/1.0/weblogic-diagnostics.xsd
-%%DATADIR%%/glassfish/lib/schemas/weblogic-diagnostics/index.html
-%%DATADIR%%/glassfish/lib/schemas/weblogic-ejb-jar/1.0/weblogic-ejb-jar.xsd
-%%DATADIR%%/glassfish/lib/schemas/weblogic-ejb-jar/1.1/weblogic-ejb-jar.xsd
-%%DATADIR%%/glassfish/lib/schemas/weblogic-ejb-jar/1.2/weblogic-ejb-jar.xsd
-%%DATADIR%%/glassfish/lib/schemas/weblogic-ejb-jar/1.3/weblogic-ejb-jar.xsd
-%%DATADIR%%/glassfish/lib/schemas/weblogic-ejb-jar/index.html
-%%DATADIR%%/glassfish/lib/schemas/weblogic-interception/1.0/weblogic-interception.xsd
-%%DATADIR%%/glassfish/lib/schemas/weblogic-interception/index.html
-%%DATADIR%%/glassfish/lib/schemas/weblogic-javaee/1.0/weblogic-javaee.xsd
-%%DATADIR%%/glassfish/lib/schemas/weblogic-javaee/1.1/weblogic-javaee.xsd
-%%DATADIR%%/glassfish/lib/schemas/weblogic-javaee/1.2/weblogic-javaee.xsd
-%%DATADIR%%/glassfish/lib/schemas/weblogic-javaee/1.3/weblogic-javaee.xsd
-%%DATADIR%%/glassfish/lib/schemas/weblogic-javaee/1.4/weblogic-javaee.xsd
-%%DATADIR%%/glassfish/lib/schemas/weblogic-javaee/1.5/weblogic-javaee.xsd
-%%DATADIR%%/glassfish/lib/schemas/weblogic-javaee/index.html
-%%DATADIR%%/glassfish/lib/schemas/weblogic-jms/1.0/weblogic-jms.xsd
-%%DATADIR%%/glassfish/lib/schemas/weblogic-jms/1.1/weblogic-jms.xsd
-%%DATADIR%%/glassfish/lib/schemas/weblogic-jms/1.2/weblogic-jms.xsd
-%%DATADIR%%/glassfish/lib/schemas/weblogic-jms/index.html
-%%DATADIR%%/glassfish/lib/schemas/weblogic-pubsub/1.0/weblogic-pubsub.xsd
-%%DATADIR%%/glassfish/lib/schemas/weblogic-pubsub/index.html
-%%DATADIR%%/glassfish/lib/schemas/weblogic-rdbms-jar/1.0/weblogic-rdbms-jar.xsd
-%%DATADIR%%/glassfish/lib/schemas/weblogic-rdbms-jar/1.1/weblogic-rdbms-jar.xsd
-%%DATADIR%%/glassfish/lib/schemas/weblogic-rdbms-jar/1.2/weblogic-rdbms-jar.xsd
-%%DATADIR%%/glassfish/lib/schemas/weblogic-rdbms-jar/index.html
-%%DATADIR%%/glassfish/lib/schemas/weblogic-sca-binding/1.0/weblogic-sca-binding.xsd
-%%DATADIR%%/glassfish/lib/schemas/weblogic-sca-binding/index.html
-%%DATADIR%%/glassfish/lib/schemas/weblogic-sca/1.0/weblogic-sca.xsd
-%%DATADIR%%/glassfish/lib/schemas/weblogic-sca/index.html
-%%DATADIR%%/glassfish/lib/schemas/weblogic-web-app/1.0/weblogic-web-app.xsd
-%%DATADIR%%/glassfish/lib/schemas/weblogic-web-app/1.1/weblogic-web-app.xsd
-%%DATADIR%%/glassfish/lib/schemas/weblogic-web-app/1.2/weblogic-web-app.xsd
-%%DATADIR%%/glassfish/lib/schemas/weblogic-web-app/1.3/weblogic-web-app.xsd
-%%DATADIR%%/glassfish/lib/schemas/weblogic-web-app/1.4/weblogic-web-app.xsd
-%%DATADIR%%/glassfish/lib/schemas/weblogic-web-app/1.5/weblogic-web-application.xsd
-%%DATADIR%%/glassfish/lib/schemas/weblogic-web-app/index.html
-%%DATADIR%%/glassfish/lib/schemas/weblogic-webservices/1.0/weblogic-webservices.xsd
-%%DATADIR%%/glassfish/lib/schemas/weblogic-webservices/1.1/weblogic-webservices.xsd
-%%DATADIR%%/glassfish/lib/schemas/weblogic-webservices/index.html
-%%DATADIR%%/glassfish/lib/schemas/weblogic-wsee-clienthandlerchain/1.0/weblogic-wsee-clienthandlerchain.xsd
-%%DATADIR%%/glassfish/lib/schemas/weblogic-wsee-clienthandlerchain/index.html
-%%DATADIR%%/glassfish/lib/schemas/weblogic-wsee-databinding/1.0/weblogic-wsee-databinding.xsd
-%%DATADIR%%/glassfish/lib/schemas/weblogic-wsee-databinding/1.1/weblogic-wsee-databinding.xsd
-%%DATADIR%%/glassfish/lib/schemas/weblogic-wsee-databinding/1.2/weblogic-wsee-databinding.xsd
-%%DATADIR%%/glassfish/lib/schemas/weblogic-wsee-databinding/index.html
-%%DATADIR%%/glassfish/lib/schemas/weblogic-wsee-standaloneclient/1.0/weblogic-wsee-standaloneclient.xsd
-%%DATADIR%%/glassfish/lib/schemas/weblogic-wsee-standaloneclient/index.html
-%%DATADIR%%/glassfish/lib/schemas/webservice-policy-ref/1.0/webservice-policy-ref.xsd
-%%DATADIR%%/glassfish/lib/schemas/webservice-policy-ref/1.1/webservice-policy-ref.xsd
-%%DATADIR%%/glassfish/lib/schemas/webservice-policy-ref/index.html
+%%DATADIR%%/glassfish/lib/schemas/web-partialresponse_2_3.xsd
%%DATADIR%%/glassfish/lib/schemas/xml.xsd
%%DATADIR%%/glassfish/modules/acc-config.jar
%%DATADIR%%/glassfish/modules/admin-cli.jar
@@ -517,8 +329,8 @@ etc/rc.d/glassfish
%%DATADIR%%/glassfish/modules/appclient-connector.jar
%%DATADIR%%/glassfish/modules/appclient-server-core.jar
%%DATADIR%%/glassfish/modules/appclient.security.jar
-%%DATADIR%%/glassfish/modules/asm-all-repackaged.jar
%%DATADIR%%/glassfish/modules/asm-all.jar
+%%DATADIR%%/glassfish/modules/asm-repackaged.jar
%%DATADIR%%/glassfish/modules/autostart/org.apache.felix.configadmin.jar
%%DATADIR%%/glassfish/modules/autostart/org.apache.felix.eventadmin.jar
%%DATADIR%%/glassfish/modules/autostart/org.apache.felix.fileinstall.jar
@@ -577,11 +389,10 @@ etc/rc.d/glassfish
%%DATADIR%%/glassfish/modules/console-jms-plugin.jar
%%DATADIR%%/glassfish/modules/console-jts-plugin.jar
%%DATADIR%%/glassfish/modules/console-plugin-service.jar
-%%DATADIR%%/glassfish/modules/console-updatecenter-plugin.jar
%%DATADIR%%/glassfish/modules/console-web-plugin.jar
%%DATADIR%%/glassfish/modules/container-common.jar
%%DATADIR%%/glassfish/modules/dataprovider.jar
-%%DATADIR%%/glassfish/modules/dbschema-repackaged.jar
+%%DATADIR%%/glassfish/modules/dbschema.jar
%%DATADIR%%/glassfish/modules/deployment-admin.jar
%%DATADIR%%/glassfish/modules/deployment-autodeploy.jar
%%DATADIR%%/glassfish/modules/deployment-client.jar
@@ -595,8 +406,8 @@ etc/rc.d/glassfish
%%DATADIR%%/glassfish/modules/ejb-internal-api.jar
%%DATADIR%%/glassfish/modules/ejb.security.jar
%%DATADIR%%/glassfish/modules/endorsed/grizzly-npn-bootstrap.jar
-%%DATADIR%%/glassfish/modules/endorsed/javax.annotation-api.jar
-%%DATADIR%%/glassfish/modules/endorsed/jaxb-api.jar
+%%DATADIR%%/glassfish/modules/endorsed/jakarta.annotation-api.jar
+%%DATADIR%%/glassfish/modules/endorsed/jakarta.xml.bind-api.jar
%%DATADIR%%/glassfish/modules/endorsed/webservices-api-osgi.jar
%%DATADIR%%/glassfish/modules/entitybean-container.jar
%%DATADIR%%/glassfish/modules/flashlight-extra-jdk-packages.jar
@@ -625,13 +436,11 @@ etc/rc.d/glassfish
%%DATADIR%%/glassfish/modules/glassfish-mbeanserver.jar
%%DATADIR%%/glassfish/modules/glassfish-naming.jar
%%DATADIR%%/glassfish/modules/glassfish-oracle-jdbc-driver-packages.jar
-%%DATADIR%%/glassfish/modules/glassfish-registration.jar
%%DATADIR%%/glassfish/modules/glassfish.jar
%%DATADIR%%/glassfish/modules/gmbal.jar
%%DATADIR%%/glassfish/modules/gms-adapter.jar
%%DATADIR%%/glassfish/modules/gms-bootstrap.jar
%%DATADIR%%/glassfish/modules/grizzly-npn-osgi.jar
-%%DATADIR%%/glassfish/modules/guava.jar
%%DATADIR%%/glassfish/modules/ha-api.jar
%%DATADIR%%/glassfish/modules/ha-file-store.jar
%%DATADIR%%/glassfish/modules/ha-shoal-cache-bootstrap.jar
@@ -649,42 +458,41 @@ etc/rc.d/glassfish
%%DATADIR%%/glassfish/modules/jackson-core.jar
%%DATADIR%%/glassfish/modules/jackson-databind.jar
%%DATADIR%%/glassfish/modules/jackson-module-jaxb-annotations.jar
+%%DATADIR%%/glassfish/modules/jakarta.ejb-api.jar
+%%DATADIR%%/glassfish/modules/jakarta.el.jar
+%%DATADIR%%/glassfish/modules/jakarta.enterprise.concurrent-api.jar
+%%DATADIR%%/glassfish/modules/jakarta.enterprise.concurrent.jar
+%%DATADIR%%/glassfish/modules/jakarta.enterprise.deploy-api.jar
+%%DATADIR%%/glassfish/modules/jakarta.faces.jar
+%%DATADIR%%/glassfish/modules/jakarta.inject.jar
+%%DATADIR%%/glassfish/modules/jakarta.interceptor-api.jar
+%%DATADIR%%/glassfish/modules/jakarta.jms-api.jar
+%%DATADIR%%/glassfish/modules/jakarta.json.bind-api.jar
+%%DATADIR%%/glassfish/modules/jakarta.json.jar
+%%DATADIR%%/glassfish/modules/jakarta.mail.jar
+%%DATADIR%%/glassfish/modules/jakarta.management.j2ee-api.jar
+%%DATADIR%%/glassfish/modules/jakarta.persistence.jar
+%%DATADIR%%/glassfish/modules/jakarta.resource-api.jar
+%%DATADIR%%/glassfish/modules/jakarta.security.auth.message-api.jar
+%%DATADIR%%/glassfish/modules/jakarta.security.enterprise-api.jar
+%%DATADIR%%/glassfish/modules/jakarta.security.enterprise.jar
+%%DATADIR%%/glassfish/modules/jakarta.security.jacc-api.jar
+%%DATADIR%%/glassfish/modules/jakarta.servlet-api.jar
+%%DATADIR%%/glassfish/modules/jakarta.servlet.jsp-api.jar
+%%DATADIR%%/glassfish/modules/jakarta.servlet.jsp.jar
+%%DATADIR%%/glassfish/modules/jakarta.servlet.jsp.jstl-api.jar
+%%DATADIR%%/glassfish/modules/jakarta.servlet.jsp.jstl.jar
+%%DATADIR%%/glassfish/modules/jakarta.transaction-api.jar
+%%DATADIR%%/glassfish/modules/jakarta.websocket-api.jar
+%%DATADIR%%/glassfish/modules/jakarta.ws.rs-api.jar
+%%DATADIR%%/glassfish/modules/jakarta.xml.registry-api.jar
+%%DATADIR%%/glassfish/modules/jakarta.xml.rpc-api.jar
%%DATADIR%%/glassfish/modules/jaspic.provider.framework.jar
%%DATADIR%%/glassfish/modules/javaee-kernel.jar
%%DATADIR%%/glassfish/modules/javamail-connector.jar
%%DATADIR%%/glassfish/modules/javamail-runtime.jar
%%DATADIR%%/glassfish/modules/javassist.jar
%%DATADIR%%/glassfish/modules/javax.batch-api.jar
-%%DATADIR%%/glassfish/modules/javax.ejb-api.jar
-%%DATADIR%%/glassfish/modules/javax.el.jar
-%%DATADIR%%/glassfish/modules/javax.enterprise.concurrent-api.jar
-%%DATADIR%%/glassfish/modules/javax.enterprise.concurrent.jar
-%%DATADIR%%/glassfish/modules/javax.enterprise.deploy-api.jar
-%%DATADIR%%/glassfish/modules/javax.faces.jar
-%%DATADIR%%/glassfish/modules/javax.inject.jar
-%%DATADIR%%/glassfish/modules/javax.interceptor-api.jar
-%%DATADIR%%/glassfish/modules/javax.jms-api.jar
-%%DATADIR%%/glassfish/modules/javax.json.bind-api.jar
-%%DATADIR%%/glassfish/modules/javax.json.jar
-%%DATADIR%%/glassfish/modules/javax.mail.jar
-%%DATADIR%%/glassfish/modules/javax.management.j2ee-api.jar
-%%DATADIR%%/glassfish/modules/javax.persistence.jar
-%%DATADIR%%/glassfish/modules/javax.resource-api.jar
-%%DATADIR%%/glassfish/modules/javax.security.auth.message-api.jar
-%%DATADIR%%/glassfish/modules/javax.security.enterprise-api.jar
-%%DATADIR%%/glassfish/modules/javax.security.enterprise.jar
-%%DATADIR%%/glassfish/modules/javax.security.jacc-api.jar
-%%DATADIR%%/glassfish/modules/javax.servlet-api.jar
-%%DATADIR%%/glassfish/modules/javax.servlet.jsp-api.jar
-%%DATADIR%%/glassfish/modules/javax.servlet.jsp.jar
-%%DATADIR%%/glassfish/modules/javax.servlet.jsp.jstl-api.jar
-%%DATADIR%%/glassfish/modules/javax.servlet.jsp.jstl.jar
-%%DATADIR%%/glassfish/modules/javax.transaction-api.jar
-%%DATADIR%%/glassfish/modules/javax.websocket-api.jar
-%%DATADIR%%/glassfish/modules/javax.ws.rs-api.jar
-%%DATADIR%%/glassfish/modules/javax.xml.registry-api.jar
-%%DATADIR%%/glassfish/modules/javax.xml.rpc-api.jar
-%%DATADIR%%/glassfish/modules/jaxb-extra-osgi.jar
%%DATADIR%%/glassfish/modules/jaxb-osgi.jar
%%DATADIR%%/glassfish/modules/jboss-classfilewriter.jar
%%DATADIR%%/glassfish/modules/jboss-logging.jar
@@ -718,8 +526,8 @@ etc/rc.d/glassfish
%%DATADIR%%/glassfish/modules/jettison.jar
%%DATADIR%%/glassfish/modules/jms-admin.jar
%%DATADIR%%/glassfish/modules/jms-core.jar
-%%DATADIR%%/glassfish/modules/jmxremote_optional-repackaged.jar
%%DATADIR%%/glassfish/modules/jpa-container.jar
+%%DATADIR%%/glassfish/modules/jsch.jar
%%DATADIR%%/glassfish/modules/jsf-connector.jar
%%DATADIR%%/glassfish/modules/jsftemplating.jar
%%DATADIR%%/glassfish/modules/jsonp-jaxrs.jar
@@ -730,7 +538,7 @@ etc/rc.d/glassfish
%%DATADIR%%/glassfish/modules/jts.jar
%%DATADIR%%/glassfish/modules/kernel.jar
%%DATADIR%%/glassfish/modules/launcher.jar
-%%DATADIR%%/glassfish/modules/ldapbp-repackaged.jar
+%%DATADIR%%/glassfish/modules/ldapbp.jar
%%DATADIR%%/glassfish/modules/libpam4j.jar
%%DATADIR%%/glassfish/modules/load-balancer-admin.jar
%%DATADIR%%/glassfish/modules/logging.jar
@@ -765,15 +573,12 @@ etc/rc.d/glassfish
%%DATADIR%%/glassfish/modules/pfl-dynamic.jar
%%DATADIR%%/glassfish/modules/pfl-tf-tools.jar
%%DATADIR%%/glassfish/modules/pfl-tf.jar
-%%DATADIR%%/glassfish/modules/pkg-client.jar
-%%DATADIR%%/glassfish/modules/registration-api.jar
-%%DATADIR%%/glassfish/modules/registration-impl.jar
%%DATADIR%%/glassfish/modules/resources-connector.jar
%%DATADIR%%/glassfish/modules/resources-runtime.jar
%%DATADIR%%/glassfish/modules/rest-client.jar
%%DATADIR%%/glassfish/modules/rest-service.jar
%%DATADIR%%/glassfish/modules/scattered-archive-api.jar
-%%DATADIR%%/glassfish/modules/schema2beans-repackaged.jar
+%%DATADIR%%/glassfish/modules/schema2beans.jar
%%DATADIR%%/glassfish/modules/security-ee.jar
%%DATADIR%%/glassfish/modules/security-services.jar
%%DATADIR%%/glassfish/modules/security.jar
@@ -785,8 +590,8 @@ etc/rc.d/glassfish
%%DATADIR%%/glassfish/modules/ssl-impl.jar
%%DATADIR%%/glassfish/modules/stats77.jar
%%DATADIR%%/glassfish/modules/stax2-api.jar
+%%DATADIR%%/glassfish/modules/tiger-types.jar
%%DATADIR%%/glassfish/modules/transaction-internal-api.jar
-%%DATADIR%%/glassfish/modules/trilead-ssh2.jar
%%DATADIR%%/glassfish/modules/tyrus-client.jar
%%DATADIR%%/glassfish/modules/tyrus-container-glassfish-cdi.jar
%%DATADIR%%/glassfish/modules/tyrus-container-glassfish-ejb.jar
@@ -812,7 +617,7 @@ etc/rc.d/glassfish
%%DATADIR%%/glassfish/modules/weld-integration-fragment.jar
%%DATADIR%%/glassfish/modules/weld-integration.jar
%%DATADIR%%/glassfish/modules/weld-osgi-bundle.jar
-%%DATADIR%%/glassfish/modules/woodstox-core-asl.jar
+%%DATADIR%%/glassfish/modules/woodstox-core.jar
%%DATADIR%%/glassfish/modules/work-management.jar
%%DATADIR%%/glassfish/modules/yasson.jar
%%DATADIR%%/glassfish/osgi/felix/bin/felix.jar
@@ -865,6 +670,568 @@ etc/rc.d/glassfish
%%DATADIR%%/mq/etc/registry/servicetag.xml
%%DATADIR%%/mq/etc/xml/com.sun.cmm.mq.xml
%%DATADIR%%/mq/etc/xml/template/com.sun.cmm.mq.xml
+%%DATADIR%%/mq/examples/README
+%%DATADIR%%/mq/examples/applications/README
+%%DATADIR%%/mq/examples/applications/mqapplet/MQApplet.java
+%%DATADIR%%/mq/examples/applications/mqapplet/README
+%%DATADIR%%/mq/examples/applications/mqapplet/build.xml
+%%DATADIR%%/mq/examples/applications/mqapplet/mqapplet.html
+%%DATADIR%%/mq/examples/applications/mqping/PingShutdownHook.class
+%%DATADIR%%/mq/examples/applications/mqping/README
+%%DATADIR%%/mq/examples/applications/mqping/mqping.class
+%%DATADIR%%/mq/examples/applications/mqping/mqping.java
+%%DATADIR%%/mq/examples/applications/qbrowser/QBrowser$BrowseListener.class
+%%DATADIR%%/mq/examples/applications/qbrowser/QBrowser$DetailsListener.class
+%%DATADIR%%/mq/examples/applications/qbrowser/QBrowser$ExitListener.class
+%%DATADIR%%/mq/examples/applications/qbrowser/QBrowser$MsgTable.class
+%%DATADIR%%/mq/examples/applications/qbrowser/QBrowser$OptionListener.class
+%%DATADIR%%/mq/examples/applications/qbrowser/QBrowser$PropertyPanel.class
+%%DATADIR%%/mq/examples/applications/qbrowser/QBrowser$TableMouseListener.class
+%%DATADIR%%/mq/examples/applications/qbrowser/QBrowser.class
+%%DATADIR%%/mq/examples/applications/qbrowser/QBrowser.java
+%%DATADIR%%/mq/examples/applications/qbrowser/README
+%%DATADIR%%/mq/examples/applications/simplechat/ChatObjMessage.class
+%%DATADIR%%/mq/examples/applications/simplechat/README
+%%DATADIR%%/mq/examples/applications/simplechat/SimpleChat.class
+%%DATADIR%%/mq/examples/applications/simplechat/SimpleChat.java
+%%DATADIR%%/mq/examples/applications/simplechat/SimpleChatBytesMessageCreator.class
+%%DATADIR%%/mq/examples/applications/simplechat/SimpleChatDialog.class
+%%DATADIR%%/mq/examples/applications/simplechat/SimpleChatMapMessageCreator.class
+%%DATADIR%%/mq/examples/applications/simplechat/SimpleChatMessageCreator.class
+%%DATADIR%%/mq/examples/applications/simplechat/SimpleChatMessageTypes.class
+%%DATADIR%%/mq/examples/applications/simplechat/SimpleChatObjMessageCreator.class
+%%DATADIR%%/mq/examples/applications/simplechat/SimpleChatPanel.class
+%%DATADIR%%/mq/examples/applications/simplechat/SimpleChatStreamMessageCreator.class
+%%DATADIR%%/mq/examples/applications/simplechat/SimpleChatTextMessageCreator.class
+%%DATADIR%%/mq/examples/applications/uclient/ConnectionDialogBox.class
+%%DATADIR%%/mq/examples/applications/uclient/FormattedDocument.class
+%%DATADIR%%/mq/examples/applications/uclient/IntegerField$1.class
+%%DATADIR%%/mq/examples/applications/uclient/IntegerField.class
+%%DATADIR%%/mq/examples/applications/uclient/MsgTable.class
+%%DATADIR%%/mq/examples/applications/uclient/PropertyPanel.class
+%%DATADIR%%/mq/examples/applications/uclient/README
+%%DATADIR%%/mq/examples/applications/uclient/ReceiveMessageDialogBox.class
+%%DATADIR%%/mq/examples/applications/uclient/SendMessageDialogBox.class
+%%DATADIR%%/mq/examples/applications/uclient/StatusArea.class
+%%DATADIR%%/mq/examples/applications/uclient/UniversalClient$1.class
+%%DATADIR%%/mq/examples/applications/uclient/UniversalClient$2.class
+%%DATADIR%%/mq/examples/applications/uclient/UniversalClient$3.class
+%%DATADIR%%/mq/examples/applications/uclient/UniversalClient$4.class
+%%DATADIR%%/mq/examples/applications/uclient/UniversalClient$5.class
+%%DATADIR%%/mq/examples/applications/uclient/UniversalClient$6.class
+%%DATADIR%%/mq/examples/applications/uclient/UniversalClient$7.class
+%%DATADIR%%/mq/examples/applications/uclient/UniversalClient$ClearMessageListener.class
+%%DATADIR%%/mq/examples/applications/uclient/UniversalClient$ConnectionEventListener.class
+%%DATADIR%%/mq/examples/applications/uclient/UniversalClient$ConnectionListener.class
+%%DATADIR%%/mq/examples/applications/uclient/UniversalClient$ConnectionPopUpListener.class
+%%DATADIR%%/mq/examples/applications/uclient/UniversalClient$DetailsListener.class
+%%DATADIR%%/mq/examples/applications/uclient/UniversalClient$DisConnectionListener.class
+%%DATADIR%%/mq/examples/applications/uclient/UniversalClient$ExitListener.class
+%%DATADIR%%/mq/examples/applications/uclient/UniversalClient$MessageReceiverThread.class
+%%DATADIR%%/mq/examples/applications/uclient/UniversalClient$MessageSenderThread.class
+%%DATADIR%%/mq/examples/applications/uclient/UniversalClient$ReceiveMessageListener.class
+%%DATADIR%%/mq/examples/applications/uclient/UniversalClient$ReceiveMessagePopUpListener.class
+%%DATADIR%%/mq/examples/applications/uclient/UniversalClient$SendMessageListener.class
+%%DATADIR%%/mq/examples/applications/uclient/UniversalClient$SendMessagePopUpListener.class
+%%DATADIR%%/mq/examples/applications/uclient/UniversalClient$StatusReportingThread.class
+%%DATADIR%%/mq/examples/applications/uclient/UniversalClient$TableMouseListener.class
+%%DATADIR%%/mq/examples/applications/uclient/UniversalClient.class
+%%DATADIR%%/mq/examples/applications/uclient/UniversalClient.java
+%%DATADIR%%/mq/examples/applications/uclient/UniversalClientConstants.class
+%%DATADIR%%/mq/examples/applications/uclient/UniversalClientUtility.class
+%%DATADIR%%/mq/examples/helloworld/README
+%%DATADIR%%/mq/examples/helloworld/helloworldmessage/HelloWorldMessage.class
+%%DATADIR%%/mq/examples/helloworld/helloworldmessage/HelloWorldMessage.java
+%%DATADIR%%/mq/examples/helloworld/helloworldmessage/README
+%%DATADIR%%/mq/examples/helloworld/helloworldmessagejndi/HelloWorldMessageJNDI.class
+%%DATADIR%%/mq/examples/helloworld/helloworldmessagejndi/HelloWorldMessageJNDI.java
+%%DATADIR%%/mq/examples/helloworld/helloworldmessagejndi/README
+%%DATADIR%%/mq/examples/helloworld/helloworldmessagejndi/add_cf.props
+%%DATADIR%%/mq/examples/helloworld/helloworldmessagejndi/add_q.props
+%%DATADIR%%/mq/examples/helloworld/helloworldmessagejndi/delete_cf.props
+%%DATADIR%%/mq/examples/helloworld/helloworldmessagejndi/delete_q.props
+%%DATADIR%%/mq/examples/helloworld/helloworldmessagejndi/list.props
+%%DATADIR%%/mq/examples/imqobjmgr/README
+%%DATADIR%%/mq/examples/imqobjmgr/add_qcf.properties
+%%DATADIR%%/mq/examples/imqobjmgr/add_topic.properties
+%%DATADIR%%/mq/examples/imqobjmgr/delete_topic.properties
+%%DATADIR%%/mq/examples/imqobjmgr/list.properties
+%%DATADIR%%/mq/examples/imqobjmgr/query_qcf.properties
+%%DATADIR%%/mq/examples/imqobjmgr/query_topic.properties
+%%DATADIR%%/mq/examples/imqobjmgr/update_qcf.properties
+%%DATADIR%%/mq/examples/jaas/README
+%%DATADIR%%/mq/examples/jaxm/README
+%%DATADIR%%/mq/examples/jaxm/ReceiveSOAPMessageWithJMS.class
+%%DATADIR%%/mq/examples/jaxm/ReceiveSOAPMessageWithJMS.java
+%%DATADIR%%/mq/examples/jaxm/SOAPEchoServlet.class
+%%DATADIR%%/mq/examples/jaxm/SOAPEchoServlet.java
+%%DATADIR%%/mq/examples/jaxm/SOAPtoJMSServlet.class
+%%DATADIR%%/mq/examples/jaxm/SOAPtoJMSServlet.java
+%%DATADIR%%/mq/examples/jaxm/SendSOAPMessage.class
+%%DATADIR%%/mq/examples/jaxm/SendSOAPMessage.java
+%%DATADIR%%/mq/examples/jaxm/SendSOAPMessageWithJMS.class
+%%DATADIR%%/mq/examples/jaxm/SendSOAPMessageWithJMS.java
+%%DATADIR%%/mq/examples/jdbc/README
+%%DATADIR%%/mq/examples/jdbc/config.properties.db2
+%%DATADIR%%/mq/examples/jdbc/config.properties.derby
+%%DATADIR%%/mq/examples/jdbc/config.properties.mysql
+%%DATADIR%%/mq/examples/jdbc/config.properties.oracle
+%%DATADIR%%/mq/examples/jdbc/config.properties.pointbase
+%%DATADIR%%/mq/examples/jms/AckEquivExample$1.class
+%%DATADIR%%/mq/examples/jms/AckEquivExample$AsynchSubscriber$TextListener.class
+%%DATADIR%%/mq/examples/jms/AckEquivExample$AsynchSubscriber.class
+%%DATADIR%%/mq/examples/jms/AckEquivExample$MultiplePublisher.class
+%%DATADIR%%/mq/examples/jms/AckEquivExample$SynchConsumer.class
+%%DATADIR%%/mq/examples/jms/AckEquivExample$SynchProducer.class
+%%DATADIR%%/mq/examples/jms/AckEquivExample.class
+%%DATADIR%%/mq/examples/jms/AckEquivExample.java
+%%DATADIR%%/mq/examples/jms/AsynchQueueExample.class
+%%DATADIR%%/mq/examples/jms/AsynchQueueExample.java
+%%DATADIR%%/mq/examples/jms/AsynchTopicExample$1.class
+%%DATADIR%%/mq/examples/jms/AsynchTopicExample$AsynchConsumer$TextListener.class
+%%DATADIR%%/mq/examples/jms/AsynchTopicExample$AsynchConsumer.class
+%%DATADIR%%/mq/examples/jms/AsynchTopicExample$MultipleProducer.class
+%%DATADIR%%/mq/examples/jms/AsynchTopicExample.class
+%%DATADIR%%/mq/examples/jms/AsynchTopicExample.java
+%%DATADIR%%/mq/examples/jms/BytesMessages.class
+%%DATADIR%%/mq/examples/jms/BytesMessages.java
+%%DATADIR%%/mq/examples/jms/Consumer.class
+%%DATADIR%%/mq/examples/jms/DurableSubscriberExample$1.class
+%%DATADIR%%/mq/examples/jms/DurableSubscriberExample$DurableSubscriber$TextListener.class
+%%DATADIR%%/mq/examples/jms/DurableSubscriberExample$DurableSubscriber.class
+%%DATADIR%%/mq/examples/jms/DurableSubscriberExample$MultiplePublisher.class
+%%DATADIR%%/mq/examples/jms/DurableSubscriberExample.class
+%%DATADIR%%/mq/examples/jms/DurableSubscriberExample.java
+%%DATADIR%%/mq/examples/jms/MessageConversion.class
+%%DATADIR%%/mq/examples/jms/MessageConversion.java
+%%DATADIR%%/mq/examples/jms/MessageFormats.class
+%%DATADIR%%/mq/examples/jms/MessageFormats.java
+%%DATADIR%%/mq/examples/jms/MessageHeadersTopic$HeaderConsumer.class
+%%DATADIR%%/mq/examples/jms/MessageHeadersTopic$HeaderProducer.class
+%%DATADIR%%/mq/examples/jms/MessageHeadersTopic.class
+%%DATADIR%%/mq/examples/jms/MessageHeadersTopic.java
+%%DATADIR%%/mq/examples/jms/ObjectMessages.class
+%%DATADIR%%/mq/examples/jms/ObjectMessages.java
+%%DATADIR%%/mq/examples/jms/Producer.class
+%%DATADIR%%/mq/examples/jms/README
+%%DATADIR%%/mq/examples/jms/RequestReplyQueue$Reply.class
+%%DATADIR%%/mq/examples/jms/RequestReplyQueue$Request.class
+%%DATADIR%%/mq/examples/jms/RequestReplyQueue.class
+%%DATADIR%%/mq/examples/jms/RequestReplyQueue.java
+%%DATADIR%%/mq/examples/jms/SampleUtilities$DoneLatch.class
+%%DATADIR%%/mq/examples/jms/SampleUtilities.class
+%%DATADIR%%/mq/examples/jms/SampleUtilities.java
+%%DATADIR%%/mq/examples/jms/SenderToQueue.class
+%%DATADIR%%/mq/examples/jms/SenderToQueue.java
+%%DATADIR%%/mq/examples/jms/SynchQueueExample.class
+%%DATADIR%%/mq/examples/jms/SynchQueueExample.java
+%%DATADIR%%/mq/examples/jms/SynchTopicExample$SimpleProducer.class
+%%DATADIR%%/mq/examples/jms/SynchTopicExample$SynchConsumer.class
+%%DATADIR%%/mq/examples/jms/SynchTopicExample.class
+%%DATADIR%%/mq/examples/jms/SynchTopicExample.java
+%%DATADIR%%/mq/examples/jms/TextListener.class
+%%DATADIR%%/mq/examples/jms/TextListener.java
+%%DATADIR%%/mq/examples/jms/TopicSelectors$1.class
+%%DATADIR%%/mq/examples/jms/TopicSelectors$Publisher.class
+%%DATADIR%%/mq/examples/jms/TopicSelectors$Subscriber$MultipleListener.class
+%%DATADIR%%/mq/examples/jms/TopicSelectors$Subscriber.class
+%%DATADIR%%/mq/examples/jms/TopicSelectors.class
+%%DATADIR%%/mq/examples/jms/TopicSelectors.java
+%%DATADIR%%/mq/examples/jms/TransactedExample$GenericSupplier.class
+%%DATADIR%%/mq/examples/jms/TransactedExample$Order.class
+%%DATADIR%%/mq/examples/jms/TransactedExample$Retailer.class
+%%DATADIR%%/mq/examples/jms/TransactedExample$Vendor.class
+%%DATADIR%%/mq/examples/jms/TransactedExample$VendorMessageListener.class
+%%DATADIR%%/mq/examples/jms/TransactedExample.class
+%%DATADIR%%/mq/examples/jms/TransactedExample.java
+%%DATADIR%%/mq/examples/jms/XMLMessageExample.class
+%%DATADIR%%/mq/examples/jms/XMLMessageExample.java
+%%DATADIR%%/mq/examples/jms/sample.dtd
+%%DATADIR%%/mq/examples/jms/sample.xml
+%%DATADIR%%/mq/examples/jms20/README
+%%DATADIR%%/mq/examples/jms20/asyncsend/AsyncTopicConsumerExample$MessageHandler.class
+%%DATADIR%%/mq/examples/jms20/asyncsend/AsyncTopicConsumerExample.class
+%%DATADIR%%/mq/examples/jms20/asyncsend/AsyncTopicConsumerExample.java
+%%DATADIR%%/mq/examples/jms20/asyncsend/AsyncTopicProducerExample$MyCompletionListener.class
+%%DATADIR%%/mq/examples/jms20/asyncsend/AsyncTopicProducerExample.class
+%%DATADIR%%/mq/examples/jms20/asyncsend/AsyncTopicProducerExample.java
+%%DATADIR%%/mq/examples/jms20/asyncsend/README
+%%DATADIR%%/mq/examples/jms20/asynctopicconsumer/AsyncTopicConsumer$MessageHandler.class
+%%DATADIR%%/mq/examples/jms20/asynctopicconsumer/AsyncTopicConsumer.class
+%%DATADIR%%/mq/examples/jms20/asynctopicconsumer/AsyncTopicConsumer.java
+%%DATADIR%%/mq/examples/jms20/asynctopicconsumer/README
+%%DATADIR%%/mq/examples/jms20/asynctopicconsumer/SendMsgsToTopic.class
+%%DATADIR%%/mq/examples/jms20/asynctopicconsumer/SendMsgsToTopic.java
+%%DATADIR%%/mq/examples/jms20/deliverycount/JMSXDeliveryCountExample1.class
+%%DATADIR%%/mq/examples/jms20/deliverycount/JMSXDeliveryCountExample1.java
+%%DATADIR%%/mq/examples/jms20/deliverycount/JMSXDeliveryCountExample2.class
+%%DATADIR%%/mq/examples/jms20/deliverycount/JMSXDeliveryCountExample2.java
+%%DATADIR%%/mq/examples/jms20/deliverycount/README
+%%DATADIR%%/mq/examples/jms20/deliverydelay/DeliveryDelayConsumer$MessageHandler.class
+%%DATADIR%%/mq/examples/jms20/deliverydelay/DeliveryDelayConsumer.class
+%%DATADIR%%/mq/examples/jms20/deliverydelay/DeliveryDelayConsumer.java
+%%DATADIR%%/mq/examples/jms20/deliverydelay/DeliveryDelayProducer.class
+%%DATADIR%%/mq/examples/jms20/deliverydelay/DeliveryDelayProducer.java
+%%DATADIR%%/mq/examples/jms20/deliverydelay/README
+%%DATADIR%%/mq/examples/jms20/messagegetbody/MessageGetBodyExample$MyObject.class
+%%DATADIR%%/mq/examples/jms20/messagegetbody/MessageGetBodyExample.class
+%%DATADIR%%/mq/examples/jms20/messagegetbody/MessageGetBodyExample.java
+%%DATADIR%%/mq/examples/jms20/messagegetbody/README
+%%DATADIR%%/mq/examples/jms20/messageheader/MessageHeadersConsumer.class
+%%DATADIR%%/mq/examples/jms20/messageheader/MessageHeadersConsumer.java
+%%DATADIR%%/mq/examples/jms20/messageheader/MessageHeadersProducer.class
+%%DATADIR%%/mq/examples/jms20/messageheader/MessageHeadersProducer.java
+%%DATADIR%%/mq/examples/jms20/messageheader/README
+%%DATADIR%%/mq/examples/jms20/messageproperties/MessagePropertiesConsumer.class
+%%DATADIR%%/mq/examples/jms20/messageproperties/MessagePropertiesConsumer.java
+%%DATADIR%%/mq/examples/jms20/messageproperties/MessagePropertiesProducer.class
+%%DATADIR%%/mq/examples/jms20/messageproperties/MessagePropertiesProducer.java
+%%DATADIR%%/mq/examples/jms20/messageproperties/README
+%%DATADIR%%/mq/examples/jms20/selector/README
+%%DATADIR%%/mq/examples/jms20/selector/SelectorConsumerExample$Subscriber$MultipleListener.class
+%%DATADIR%%/mq/examples/jms20/selector/SelectorConsumerExample$Subscriber.class
+%%DATADIR%%/mq/examples/jms20/selector/SelectorConsumerExample.class
+%%DATADIR%%/mq/examples/jms20/selector/SelectorConsumerExample.java
+%%DATADIR%%/mq/examples/jms20/selector/SelectorProducerExample.class
+%%DATADIR%%/mq/examples/jms20/selector/SelectorProducerExample.java
+%%DATADIR%%/mq/examples/jms20/sharedsub/ProducerExample.class
+%%DATADIR%%/mq/examples/jms20/sharedsub/ProducerExample.java
+%%DATADIR%%/mq/examples/jms20/sharedsub/README
+%%DATADIR%%/mq/examples/jms20/sharedsub/SharedDuraConsumerExample$Subscriber.class
+%%DATADIR%%/mq/examples/jms20/sharedsub/SharedDuraConsumerExample.class
+%%DATADIR%%/mq/examples/jms20/sharedsub/SharedDuraConsumerExample.java
+%%DATADIR%%/mq/examples/jms20/sharedsub/SharedNonDuraConsumerExample$Subscriber$MultipleListener.class
+%%DATADIR%%/mq/examples/jms20/sharedsub/SharedNonDuraConsumerExample$Subscriber.class
+%%DATADIR%%/mq/examples/jms20/sharedsub/SharedNonDuraConsumerExample.class
+%%DATADIR%%/mq/examples/jms20/sharedsub/SharedNonDuraConsumerExample.java
+%%DATADIR%%/mq/examples/jms20/syncqueue/MyObject.class
+%%DATADIR%%/mq/examples/jms20/syncqueue/MyObject.java
+%%DATADIR%%/mq/examples/jms20/syncqueue/README
+%%DATADIR%%/mq/examples/jms20/syncqueue/SendObjectMsgsToQueue.class
+%%DATADIR%%/mq/examples/jms20/syncqueue/SendObjectMsgsToQueue.java
+%%DATADIR%%/mq/examples/jms20/syncqueue/SyncQueueConsumer.class
+%%DATADIR%%/mq/examples/jms20/syncqueue/SyncQueueConsumer.java
+%%DATADIR%%/mq/examples/jmsbridge/README
+%%DATADIR%%/mq/examples/jmsbridge/mqtomq/README
+%%DATADIR%%/mq/examples/jmsbridge/mqtomq/jmsbridge.xml
+%%DATADIR%%/mq/examples/jmsbridge/mqtomq/logging.properties
+%%DATADIR%%/mq/examples/jmsbridge/mqtomq/passfile
+%%DATADIR%%/mq/examples/jmx/ClusterTableModel.class
+%%DATADIR%%/mq/examples/jmx/ListDestinations.class
+%%DATADIR%%/mq/examples/jmx/ListDestinations.java
+%%DATADIR%%/mq/examples/jmx/MQClusterMonitor$1.class
+%%DATADIR%%/mq/examples/jmx/MQClusterMonitor$2.class
+%%DATADIR%%/mq/examples/jmx/MQClusterMonitor.class
+%%DATADIR%%/mq/examples/jmx/MQClusterMonitor.java
+%%DATADIR%%/mq/examples/jmx/MQConnectDialog.class
+%%DATADIR%%/mq/examples/jmx/MQConnectDialog.java
+%%DATADIR%%/mq/examples/jmx/MQLogViewer$1.class
+%%DATADIR%%/mq/examples/jmx/MQLogViewer.class
+%%DATADIR%%/mq/examples/jmx/MQLogViewer.java
+%%DATADIR%%/mq/examples/jmx/README
+%%DATADIR%%/mq/examples/jmx/SimpleClient.class
+%%DATADIR%%/mq/examples/jmx/SimpleClient.java
+%%DATADIR%%/mq/examples/monitoring/BrokerMetrics.class
+%%DATADIR%%/mq/examples/monitoring/BrokerMetrics.java
+%%DATADIR%%/mq/examples/monitoring/DestListMetrics.class
+%%DATADIR%%/mq/examples/monitoring/DestListMetrics.java
+%%DATADIR%%/mq/examples/monitoring/DestMetrics.class
+%%DATADIR%%/mq/examples/monitoring/DestMetrics.java
+%%DATADIR%%/mq/examples/monitoring/MetricsPrinter.class
+%%DATADIR%%/mq/examples/monitoring/MetricsPrinter.java
+%%DATADIR%%/mq/examples/monitoring/MultiColumnPrinter.class
+%%DATADIR%%/mq/examples/monitoring/MultiColumnPrinter.java
+%%DATADIR%%/mq/examples/monitoring/README
+%%DATADIR%%/mq/examples/monitoring/VMMetrics.class
+%%DATADIR%%/mq/examples/monitoring/VMMetrics.java
+%%DATADIR%%/mq/examples/stomp/README
+%%DATADIR%%/mq/examples/stomp/ruby/README
+%%DATADIR%%/mq/examples/stomp/ruby/ReceiveMsg.rb
+%%DATADIR%%/mq/examples/stomp/ruby/SendMsg.rb
+%%DATADIR%%/mq/examples/ums/README
+%%DATADIR%%/mq/examples/ums/README.html
+%%DATADIR%%/mq/examples/ums/ajax/README
+%%DATADIR%%/mq/examples/ums/ajax/ReceiveMsg.html
+%%DATADIR%%/mq/examples/ums/ajax/SendMsg.html
+%%DATADIR%%/mq/examples/ums/csharp/README
+%%DATADIR%%/mq/examples/ums/csharp/ReceiveSOAPMsg.cs
+%%DATADIR%%/mq/examples/ums/csharp/SendSOAPMsg.cs
+%%DATADIR%%/mq/examples/ums/get/README
+%%DATADIR%%/mq/examples/ums/get/ReceiveUsingGet.html
+%%DATADIR%%/mq/examples/ums/get/SendUsingGet.html
+%%DATADIR%%/mq/examples/ums/get/UtilsUsingGet.html
+%%DATADIR%%/mq/examples/ums/python/README
+%%DATADIR%%/mq/examples/ums/python/ReceiveMsg.py
+%%DATADIR%%/mq/examples/ums/python/ReceiveSOAPMsg.py
+%%DATADIR%%/mq/examples/ums/python/SendMsg.py
+%%DATADIR%%/mq/examples/ums/python/SendSOAPMsg.py
+%%DATADIR%%/mq/examples/ums/ruby/README
+%%DATADIR%%/mq/examples/ums/ruby/ReceiveMsg.rb
+%%DATADIR%%/mq/examples/ums/ruby/SendMsg.rb
+%%DATADIR%%/mq/javadoc/allclasses-frame.html
+%%DATADIR%%/mq/javadoc/allclasses-noframe.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/AdminConnectionConfiguration.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/AdminConnectionFactory.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/AdministeredObject.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/BasicConnectionFactory.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/BasicQueue.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/BasicTopic.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/ConnectionConfiguration.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/ConnectionFactory.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/Destination.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/DestinationConfiguration.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/InvalidPropertyException.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/InvalidPropertyValueException.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/PropertyOwner.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/Queue.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/QueueConnectionFactory.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/ReadOnlyPropertyException.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/Topic.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/TopicConnectionFactory.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/Version.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/XAConnectionFactory.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/XAQueueConnectionFactory.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/XATopicConnectionFactory.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/bridge/api/MessageTransformer.JMSMessageType.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/bridge/api/MessageTransformer.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/bridge/api/class-use/MessageTransformer.JMSMessageType.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/bridge/api/class-use/MessageTransformer.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/bridge/api/package-frame.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/bridge/api/package-summary.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/bridge/api/package-tree.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/bridge/api/package-use.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/class-use/AdminConnectionConfiguration.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/class-use/AdminConnectionFactory.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/class-use/AdministeredObject.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/class-use/BasicConnectionFactory.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/class-use/BasicQueue.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/class-use/BasicTopic.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/class-use/ConnectionConfiguration.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/class-use/ConnectionFactory.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/class-use/Destination.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/class-use/DestinationConfiguration.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/class-use/InvalidPropertyException.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/class-use/InvalidPropertyValueException.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/class-use/PropertyOwner.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/class-use/Queue.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/class-use/QueueConnectionFactory.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/class-use/ReadOnlyPropertyException.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/class-use/Topic.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/class-use/TopicConnectionFactory.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/class-use/Version.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/class-use/XAConnectionFactory.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/class-use/XAQueueConnectionFactory.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/class-use/XATopicConnectionFactory.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/Connection.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/IllegalStateException.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/InvalidClientIDException.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/InvalidDestinationException.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/InvalidSelectorException.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/JMSException.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/JMSSecurityException.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/MQIllegalStateRuntimeException.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/MQInvalidClientIDRuntimeException.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/MQInvalidDestinationRuntimeException.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/MQInvalidSelectorRuntimeException.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/MQMessageFormatRuntimeException.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/MQMessageNotWriteableRuntimeException.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/MQResourceAllocationRuntimeException.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/MQRuntimeException.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/MQSecurityRuntimeException.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/MQTransactionInProgressRuntimeException.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/MQTransactionRolledBackRuntimeException.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/Message.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/MessageEOFException.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/MessageFormatException.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/MessageNotReadableException.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/MessageNotWriteableException.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/QueueConnection.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/ResourceAllocationException.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/Session.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/TopicConnection.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/TransactionInProgressException.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/TransactionRolledBackException.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/class-use/Connection.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/class-use/IllegalStateException.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/class-use/InvalidClientIDException.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/class-use/InvalidDestinationException.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/class-use/InvalidSelectorException.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/class-use/JMSException.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/class-use/JMSSecurityException.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/class-use/MQIllegalStateRuntimeException.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/class-use/MQInvalidClientIDRuntimeException.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/class-use/MQInvalidDestinationRuntimeException.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/class-use/MQInvalidSelectorRuntimeException.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/class-use/MQMessageFormatRuntimeException.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/class-use/MQMessageNotWriteableRuntimeException.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/class-use/MQResourceAllocationRuntimeException.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/class-use/MQRuntimeException.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/class-use/MQSecurityRuntimeException.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/class-use/MQTransactionInProgressRuntimeException.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/class-use/MQTransactionRolledBackRuntimeException.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/class-use/Message.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/class-use/MessageEOFException.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/class-use/MessageFormatException.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/class-use/MessageNotReadableException.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/class-use/MessageNotWriteableException.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/class-use/QueueConnection.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/class-use/ResourceAllocationException.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/class-use/Session.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/class-use/TopicConnection.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/class-use/TransactionInProgressException.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/class-use/TransactionRolledBackException.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/BrokerAttributes.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/BrokerClusterInfo.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/BrokerNotification.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/BrokerOperations.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/BrokerState.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/ChangeMasterBrokerResultInfo.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/ClusterAttributes.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/ClusterNotification.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/ClusterOperations.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/ConnectionAttributes.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/ConnectionNotification.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/ConnectionOperations.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/ConsumerAttributes.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/ConsumerInfo.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/ConsumerOperations.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/DestinationAttributes.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/DestinationLimitBehavior.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/DestinationNotification.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/DestinationOperations.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/DestinationPauseType.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/DestinationState.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/DestinationType.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/JVMAttributes.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/LogAttributes.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/LogLevel.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/LogNotification.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/MQNotification.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/MQObjectName.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/ProducerAttributes.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/ProducerInfo.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/ProducerOperations.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/ServiceAttributes.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/ServiceNotification.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/ServiceOperations.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/ServiceState.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/TransactionAttributes.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/TransactionInfo.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/TransactionNotification.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/TransactionOperations.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/TransactionState.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/class-use/BrokerAttributes.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/class-use/BrokerClusterInfo.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/class-use/BrokerNotification.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/class-use/BrokerOperations.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/class-use/BrokerState.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/class-use/ChangeMasterBrokerResultInfo.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/class-use/ClusterAttributes.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/class-use/ClusterNotification.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/class-use/ClusterOperations.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/class-use/ConnectionAttributes.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/class-use/ConnectionNotification.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/class-use/ConnectionOperations.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/class-use/ConsumerAttributes.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/class-use/ConsumerInfo.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/class-use/ConsumerOperations.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/class-use/DestinationAttributes.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/class-use/DestinationLimitBehavior.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/class-use/DestinationNotification.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/class-use/DestinationOperations.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/class-use/DestinationPauseType.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/class-use/DestinationState.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/class-use/DestinationType.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/class-use/JVMAttributes.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/class-use/LogAttributes.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/class-use/LogLevel.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/class-use/LogNotification.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/class-use/MQNotification.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/class-use/MQObjectName.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/class-use/ProducerAttributes.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/class-use/ProducerInfo.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/class-use/ProducerOperations.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/class-use/ServiceAttributes.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/class-use/ServiceNotification.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/class-use/ServiceOperations.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/class-use/ServiceState.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/class-use/TransactionAttributes.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/class-use/TransactionInfo.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/class-use/TransactionNotification.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/class-use/TransactionOperations.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/class-use/TransactionState.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/package-frame.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/package-summary.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/package-tree.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/management/server/package-use.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/notification/ConnectionClosedEvent.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/notification/ConnectionClosingEvent.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/notification/ConnectionEvent.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/notification/ConnectionReconnectFailedEvent.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/notification/ConnectionReconnectedEvent.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/notification/ConsumerEvent.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/notification/Event.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/notification/EventListener.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/notification/class-use/ConnectionClosedEvent.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/notification/class-use/ConnectionClosingEvent.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/notification/class-use/ConnectionEvent.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/notification/class-use/ConnectionReconnectFailedEvent.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/notification/class-use/ConnectionReconnectedEvent.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/notification/class-use/ConsumerEvent.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/notification/class-use/Event.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/notification/class-use/EventListener.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/notification/package-frame.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/notification/package-summary.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/notification/package-tree.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/notification/package-use.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/package-frame.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/package-summary.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/package-tree.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/jms/package-use.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/package-frame.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/package-summary.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/package-tree.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/package-use.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/xml/MessageTransformer.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/xml/class-use/MessageTransformer.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/xml/package-frame.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/xml/package-summary.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/xml/package-tree.html
+%%DATADIR%%/mq/javadoc/com/sun/messaging/xml/package-use.html
+%%DATADIR%%/mq/javadoc/constant-values.html
+%%DATADIR%%/mq/javadoc/deprecated-list.html
+%%DATADIR%%/mq/javadoc/help-doc.html
+%%DATADIR%%/mq/javadoc/index-all.html
+%%DATADIR%%/mq/javadoc/index.html
+%%DATADIR%%/mq/javadoc/javax/xml/messaging/Endpoint.html
+%%DATADIR%%/mq/javadoc/javax/xml/messaging/JAXMException.html
+%%DATADIR%%/mq/javadoc/javax/xml/messaging/JAXMServlet.html
+%%DATADIR%%/mq/javadoc/javax/xml/messaging/OnewayListener.html
+%%DATADIR%%/mq/javadoc/javax/xml/messaging/ProviderConnection.html
+%%DATADIR%%/mq/javadoc/javax/xml/messaging/ProviderConnectionFactory.html
+%%DATADIR%%/mq/javadoc/javax/xml/messaging/ProviderMetaData.html
+%%DATADIR%%/mq/javadoc/javax/xml/messaging/ReqRespListener.html
+%%DATADIR%%/mq/javadoc/javax/xml/messaging/URLEndpoint.html
+%%DATADIR%%/mq/javadoc/javax/xml/messaging/class-use/Endpoint.html
+%%DATADIR%%/mq/javadoc/javax/xml/messaging/class-use/JAXMException.html
+%%DATADIR%%/mq/javadoc/javax/xml/messaging/class-use/JAXMServlet.html
+%%DATADIR%%/mq/javadoc/javax/xml/messaging/class-use/OnewayListener.html
+%%DATADIR%%/mq/javadoc/javax/xml/messaging/class-use/ProviderConnection.html
+%%DATADIR%%/mq/javadoc/javax/xml/messaging/class-use/ProviderConnectionFactory.html
+%%DATADIR%%/mq/javadoc/javax/xml/messaging/class-use/ProviderMetaData.html
+%%DATADIR%%/mq/javadoc/javax/xml/messaging/class-use/ReqRespListener.html
+%%DATADIR%%/mq/javadoc/javax/xml/messaging/class-use/URLEndpoint.html
+%%DATADIR%%/mq/javadoc/javax/xml/messaging/package-frame.html
+%%DATADIR%%/mq/javadoc/javax/xml/messaging/package-summary.html
+%%DATADIR%%/mq/javadoc/javax/xml/messaging/package-tree.html
+%%DATADIR%%/mq/javadoc/javax/xml/messaging/package-use.html
+%%DATADIR%%/mq/javadoc/overview-frame.html
+%%DATADIR%%/mq/javadoc/overview-summary.html
+%%DATADIR%%/mq/javadoc/overview-tree.html
+%%DATADIR%%/mq/javadoc/package-list
+%%DATADIR%%/mq/javadoc/script.js
+%%DATADIR%%/mq/javadoc/serialized-form.html
+%%DATADIR%%/mq/javadoc/stylesheet.css
%%DATADIR%%/mq/legal/LICENSE.txt
%%DATADIR%%/mq/lib/dtd/sun_jmsbridge_1_0.dtd
%%DATADIR%%/mq/lib/ext/README
@@ -876,6 +1243,7 @@ etc/rc.d/glassfish
%%DATADIR%%/mq/lib/grizzly-http.jar
%%DATADIR%%/mq/lib/grizzly-portunif.jar
%%DATADIR%%/mq/lib/grizzly-websockets.jar
+%%DATADIR%%/mq/lib/help/META-INF/MANIFEST.MF
%%DATADIR%%/mq/lib/help/Master.hs
%%DATADIR%%/mq/lib/help/en/Master.jhm
%%DATADIR%%/mq/lib/help/en/MasterTOC.xml
@@ -955,7 +1323,6 @@ etc/rc.d/glassfish
%%DATADIR%%/mq/lib/images/admin/Shutdown24x.gif
%%DATADIR%%/mq/lib/images/admin/dot.gif
%%DATADIR%%/mq/lib/images/admin/folder.gif
-%%DATADIR%%/mq/lib/images/admin/splash_block.gif
%%DATADIR%%/mq/lib/images/admin/splash_comm.gif
%%DATADIR%%/mq/lib/images/admin/splash_openmq.gif
%%DATADIR%%/mq/lib/imq.jar
@@ -973,9 +1340,9 @@ etc/rc.d/glassfish
%%DATADIR%%/mq/lib/imqums.war
%%DATADIR%%/mq/lib/imqutil.jar
%%DATADIR%%/mq/lib/imqxm.jar
-%%DATADIR%%/mq/lib/javax.json.jar
-%%DATADIR%%/mq/lib/javax.servlet-api.jar
-%%DATADIR%%/mq/lib/javax.transaction-api.jar
+%%DATADIR%%/mq/lib/jakarta.json.jar
+%%DATADIR%%/mq/lib/jakarta.servlet-api.jar
+%%DATADIR%%/mq/lib/jakarta.transaction-api.jar
%%DATADIR%%/mq/lib/jaxm-api.jar
%%DATADIR%%/mq/lib/jhall.jar
%%DATADIR%%/mq/lib/jms.jar
@@ -991,4 +1358,3 @@ etc/rc.d/glassfish
@dir %%DATADIR%%/glassfish/domains/domain1/lib/databases
@dir %%DATADIR%%/glassfish/domains/domain1/lib/ext
@dir %%DATADIR%%/glassfish/domains/domain1/logs
-@dir %%DATADIR%%/glassfish/lib/endorsed
diff --git a/www/go-appengine-sdk/Makefile b/www/go-appengine-sdk/Makefile
index 020c55fd3589..a6d10cb110f2 100644
--- a/www/go-appengine-sdk/Makefile
+++ b/www/go-appengine-sdk/Makefile
@@ -6,7 +6,7 @@ CATEGORIES= www devel
MASTER_SITES= https://storage.googleapis.com/appengine-sdks/featured/
DISTNAME= ${PORTNAME:S,-,_,g}_linux_amd64-${PORTVERSION}
-MAINTAINER= dg@syrec.org
+MAINTAINER= dmgk@FreeBSD.org
COMMENT= App Engine SDK for Go
# The actual license for this port is "APACHE20 and BSD3CLAUSE and MIT and PSFL and (GPLv2+ or LGPL21+ or MPL11)".
diff --git a/www/gobuffalo/Makefile b/www/gobuffalo/Makefile
index c2a421aa8fef..af779b8d214f 100644
--- a/www/gobuffalo/Makefile
+++ b/www/gobuffalo/Makefile
@@ -5,7 +5,7 @@ PORTVERSION= 0.14.10
DISTVERSIONPREFIX= v
CATEGORIES= www
-MAINTAINER= dg@syrec.org
+MAINTAINER= dmgk@FreeBSD.org
COMMENT= Go web development eco-system, designed to make the life easier
LICENSE= MIT
diff --git a/www/gohugo/Makefile b/www/gohugo/Makefile
index c402f86fbf95..dd341257eb1a 100644
--- a/www/gohugo/Makefile
+++ b/www/gohugo/Makefile
@@ -2,7 +2,7 @@
PORTNAME= hugo
DISTVERSIONPREFIX= v
-DISTVERSION= 0.57.1
+DISTVERSION= 0.58.3
CATEGORIES= www
PKGNAMEPREFIX= go
DIST_SUBDIR= ${PKGNAMEPREFIX}${PORTNAME}
@@ -27,12 +27,13 @@ GH_TUPLE= \
armon:go-radix:v1.0.0:armon_go_radix/vendor/github.com/armon/go-radix \
aws:aws-sdk-go:v1.19.40:aws_aws_sdk_go/vendor/github.com/aws/aws-sdk-go \
bep:debounce:v1.2.0:bep_debounce/vendor/github.com/bep/debounce \
- bep:gitmap:v1.1.0:bep_gitmap/vendor/github.com/bep/gitmap \
+ bep:gitmap:v1.1.1:bep_gitmap/vendor/github.com/bep/gitmap \
bep:go-tocss:v0.6.0:bep_go_tocss/vendor/github.com/bep/go-tocss \
+ bep:tmc:v0.5.0:bep_tmc/vendor/github.com/bep/tmc \
census-instrumentation:opencensus-go:v0.22.0:census_instrumentation_opencensus_go/vendor/go.opencensus.io \
cpuguy83:go-md2man:v1.0.10:cpuguy83_go_md2man/vendor/github.com/cpuguy83/go-md2man \
danwakefield:fnmatch:cbb64ac3d964:danwakefield_fnmatch/vendor/github.com/danwakefield/fnmatch \
- disintegration:imaging:v1.6.0:disintegration_imaging/vendor/github.com/disintegration/imaging \
+ disintegration:gift:v1.2.1:disintegration_gift/vendor/github.com/disintegration/gift \
dlclark:regexp2:v1.1.6:dlclark_regexp2/vendor/github.com/dlclark/regexp2 \
dustin:go-humanize:v1.0.0:dustin_go_humanize/vendor/github.com/dustin/go-humanize \
eknkc:amber:cdade1c07385:eknkc_amber/vendor/github.com/eknkc/amber \
@@ -43,7 +44,6 @@ GH_TUPLE= \
gobwas:glob:v0.2.3:gobwas_glob/vendor/github.com/gobwas/glob \
gohugoio:testmodBuilder:c56af20f2e95:gohugoio_testmodbuilder/vendor/github.com/gohugoio/testmodBuilder/mods \
golang:appengine:v1.6.0:golang_appengine/vendor/google.golang.org/appengine \
- golang:crypto:d864b10871cd:golang_crypto/vendor/golang.org/x/crypto \
golang:image:f03afa92d3ff:golang_image/vendor/golang.org/x/image \
golang:net:1492cefac77f:golang_net/vendor/golang.org/x/net \
golang:oauth2:aaccbc9213b0:golang_oauth2/vendor/golang.org/x/oauth2 \
@@ -53,11 +53,11 @@ GH_TUPLE= \
golang:text:v0.3.2:golang_text/vendor/golang.org/x/text \
golang:xerrors:a985d3407aa7:golang_xerrors/vendor/golang.org/x/xerrors \
google:go-cloud:v0.15.0:google_go_cloud/vendor/gocloud.dev \
- google:go-cmp:v0.3.0:google_go_cmp/vendor/github.com/google/go-cmp \
+ google:go-cmp:v0.3.1:google_go_cmp/vendor/github.com/google/go-cmp \
google:go-genproto:c2c4e71fbf69:google_go_genproto/vendor/google.golang.org/genproto \
google:uuid:v1.1.1:google_uuid/vendor/github.com/google/uuid \
google:wire:v0.2.2:google_wire/vendor/github.com/google/wire \
- googleapis:gax-go:v2.0.4:googleapis_gax_go/vendor/github.com/googleapis/gax-go \
+ googleapis:gax-go:v2.0.2:googleapis_gax_go/vendor/github.com/googleapis/gax-go \
googleapis:google-api-go-client:v0.5.0:googleapis_google_api_go_client/vendor/google.golang.org/api \
googleapis:google-cloud-go:v0.39.0:googleapis_google_cloud_go/vendor/cloud.google.com/go \
gorilla:websocket:v1.4.0:gorilla_websocket/vendor/github.com/gorilla/websocket \
@@ -80,12 +80,13 @@ GH_TUPLE= \
mitchellh:mapstructure:v1.1.2:mitchellh_mapstructure/vendor/github.com/mitchellh/mapstructure \
muesli:smartcrop:f6ebaa786a12:muesli_smartcrop/vendor/github.com/muesli/smartcrop \
nicksnyder:go-i18n:v1.10.0:nicksnyder_go_i18n/vendor/github.com/nicksnyder/go-i18n \
- niklasfasching:go-org:v0.1.2:niklasfasching_go_org/vendor/github.com/niklasfasching/go-org \
+ niklasfasching:go-org:v0.1.4:niklasfasching_go_org/vendor/github.com/niklasfasching/go-org \
olekukonko:tablewriter:d4647c9c7a84:olekukonko_tablewriter/vendor/github.com/olekukonko/tablewriter \
pelletier:go-toml:v1.4.0:pelletier_go_toml/vendor/github.com/pelletier/go-toml \
pkg:errors:v0.8.1:pkg_errors/vendor/github.com/pkg/errors \
rogpeppe:go-internal:v1.3.0:rogpeppe_go_internal/vendor/github.com/rogpeppe/go-internal \
russross:blackfriday:a477dd164691:russross_blackfriday/vendor/github.com/russross/blackfriday \
+ rwcarlsen:goexif:9e8deecbddbd:rwcarlsen_goexif/vendor/github.com/rwcarlsen/goexif \
sanity-io:litter:v1.1.0:sanity_io_litter/vendor/github.com/sanity-io/litter \
spf13:afero:v1.2.2:spf13_afero/vendor/github.com/spf13/afero \
spf13:cast:v1.3.0:spf13_cast/vendor/github.com/spf13/cast \
@@ -105,20 +106,15 @@ GO_BUILDFLAGS= -ldflags="\
-X github.com/gohugoio/hugo/hugolib.CommitHash=${COMMIT_ID}" \
${BUILD_TAGS}
-SOURCE_DATE_EPOCH_CMD= date -r $$(grep TIMESTAMP ${DISTINFO_FILE} | ${SED} -e 's/[^0-9]//g') '+%FT%TZ%z'
-COMMIT_ID= 58c56e9ded2e4b7f0c9ae7e02f89f3a1dcb0d3a7
-
OPTIONS_DEFINE= MANPAGES EXTENDED
+OPTIONS_DEFAULT= MANPAGES EXTENDED
+OPTIONS_SUB= yes
EXTENDED_DESC= Enable SCSS/SASS support
-OPTIONS_DEFAULT= MANPAGES
-
EXTENDED_VARS= CGO_ENABLED=1 BUILD_TAGS="-tags extended"
EXTENDED_VARS_OFF= CGO_ENABLED=0
-OPTIONS_SUB= yes
-
PORTMANS= hugo-config.1 hugo-convert-toJSON.1 hugo-convert-toTOML.1 \
hugo-convert-toYAML.1 hugo-convert.1 hugo-env.1 \
hugo-gen-autocomplete.1 hugo-gen-chromastyles.1 \
@@ -128,6 +124,12 @@ PORTMANS= hugo-config.1 hugo-convert-toJSON.1 hugo-convert-toTOML.1 \
hugo-new-site.1 hugo-new-theme.1 hugo-new.1 hugo-server.1 \
hugo-version.1 hugo.1
+# needed to get DISTINFO_FILE in scope for the shell command evaluation by go.mk
+.include <bsd.port.pre.mk>
+
+SOURCE_DATE_EPOCH_CMD= date -r $$(grep TIMESTAMP ${DISTINFO_FILE} | ${SED} -e 's/[^0-9]//g') '+%FT%TZ%z'
+COMMIT_ID= 4aac02d49c2e2bab9f36f0caabbbd9f3cb4715cd
+
do-build-MANPAGES-on:
@cd ${GO_WRKSRC} && ${GO_WRKDIR_BIN}/${PORTNAME} gen man --dir man/man1/
@@ -136,4 +138,4 @@ do-install-MANPAGES-on:
${INSTALL_MAN} ${WRKSRC}/man/man1/$i ${STAGEDIR}/${PREFIX}/man/man1
.endfor
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/www/gohugo/distinfo b/www/gohugo/distinfo
index 73d3ffa4209d..3c6d3a6d13d9 100644
--- a/www/gohugo/distinfo
+++ b/www/gohugo/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1565991197
-SHA256 (gohugo/gohugoio-hugo-v0.57.1_GH0.tar.gz) = def6e233311c6e4593453d2cce43f3c82160553c9163232990eb83c80308ba20
-SIZE (gohugo/gohugoio-hugo-v0.57.1_GH0.tar.gz) = 27661013
+TIMESTAMP = 1569149189
+SHA256 (gohugo/gohugoio-hugo-v0.58.3_GH0.tar.gz) = 4733f22fc447d745c88f7c688407d67e9ab67e7e276557f3a48edd8b37900718
+SIZE (gohugo/gohugoio-hugo-v0.58.3_GH0.tar.gz) = 30044966
SHA256 (gohugo/Azure-azure-pipeline-go-v0.1.9_GH0.tar.gz) = 365c183602d495e67399b5a4c42a41d3ce0e7d79348dc7c9fd04324b35333b8b
SIZE (gohugo/Azure-azure-pipeline-go-v0.1.9_GH0.tar.gz) = 15849
SHA256 (gohugo/Azure-azure-storage-blob-go-v0.6.0_GH0.tar.gz) = 69fa9d27f51ccdd9879351bc5bd4b09544ee745ec63eb473479fac73970523ef
@@ -21,18 +21,20 @@ SHA256 (gohugo/aws-aws-sdk-go-v1.19.40_GH0.tar.gz) = c24d94e369aadf3d0c9a822a090
SIZE (gohugo/aws-aws-sdk-go-v1.19.40_GH0.tar.gz) = 11162089
SHA256 (gohugo/bep-debounce-v1.2.0_GH0.tar.gz) = 89da4947e4e83af6037ca961d64bdf055a4ae811c4057c16b4c4b354c098862d
SIZE (gohugo/bep-debounce-v1.2.0_GH0.tar.gz) = 2845
-SHA256 (gohugo/bep-gitmap-v1.1.0_GH0.tar.gz) = 60a10577c38bdfc020f10b08eab067e2fb5d844705c1c22b7800656cdcc2960f
-SIZE (gohugo/bep-gitmap-v1.1.0_GH0.tar.gz) = 4778
+SHA256 (gohugo/bep-gitmap-v1.1.1_GH0.tar.gz) = 2096414b37b653be4066f758430a8df443767e2c7b3448b89fddb8aa0ba05ca8
+SIZE (gohugo/bep-gitmap-v1.1.1_GH0.tar.gz) = 4792
SHA256 (gohugo/bep-go-tocss-v0.6.0_GH0.tar.gz) = 7acdd0c850d4395da82653c80a4e6df9f4a21b4971face96adc2f56444bd76a2
SIZE (gohugo/bep-go-tocss-v0.6.0_GH0.tar.gz) = 5753
+SHA256 (gohugo/bep-tmc-v0.5.0_GH0.tar.gz) = 16e22321e21ccd0961f7a29ebf7c61b623b73605bebba7c335df800fc94eaf6b
+SIZE (gohugo/bep-tmc-v0.5.0_GH0.tar.gz) = 7822
SHA256 (gohugo/census-instrumentation-opencensus-go-v0.22.0_GH0.tar.gz) = 4213d120fd3b7f9c39470babed3cfe5770d6d16be252cdcf4c62a747f19b8ca9
SIZE (gohugo/census-instrumentation-opencensus-go-v0.22.0_GH0.tar.gz) = 162290
SHA256 (gohugo/cpuguy83-go-md2man-v1.0.10_GH0.tar.gz) = 76aa56849123b99b95fcea2b15502fd886dead9a5c35be7f78bdc2bad6be8d99
SIZE (gohugo/cpuguy83-go-md2man-v1.0.10_GH0.tar.gz) = 43936
SHA256 (gohugo/danwakefield-fnmatch-cbb64ac3d964_GH0.tar.gz) = 7ebff38d382142f9220d2cfcb4731d0ae90cdef71238c94a15c35f8aa746007f
SIZE (gohugo/danwakefield-fnmatch-cbb64ac3d964_GH0.tar.gz) = 4955
-SHA256 (gohugo/disintegration-imaging-v1.6.0_GH0.tar.gz) = 4514ecf9c7a6d5a543319cea42fa2bddd7a30d2ac3f37ed05819dbaa632b1cd9
-SIZE (gohugo/disintegration-imaging-v1.6.0_GH0.tar.gz) = 2211528
+SHA256 (gohugo/disintegration-gift-v1.2.1_GH0.tar.gz) = 2f6a5ef57a2b4d660b7c2d778107a6fd25cf654ff1845737d8ef494130a67ffc
+SIZE (gohugo/disintegration-gift-v1.2.1_GH0.tar.gz) = 1098337
SHA256 (gohugo/dlclark-regexp2-v1.1.6_GH0.tar.gz) = 81ede5b49ff46bd1c686416c52605aa4698b9dce07d011581c49a1d35b8a5239
SIZE (gohugo/dlclark-regexp2-v1.1.6_GH0.tar.gz) = 203691
SHA256 (gohugo/dustin-go-humanize-v1.0.0_GH0.tar.gz) = e4540bd50ac855143b4f2e509313079c50cf5d8774f09cc10dbca5ae9803d8ba
@@ -53,8 +55,6 @@ SHA256 (gohugo/gohugoio-testmodBuilder-c56af20f2e95_GH0.tar.gz) = 23394d4ce3284f
SIZE (gohugo/gohugoio-testmodBuilder-c56af20f2e95_GH0.tar.gz) = 6360001
SHA256 (gohugo/golang-appengine-v1.6.0_GH0.tar.gz) = b2273441e2f02213d10acc4c5410662a13407a80589f74ff49353ffcae3f517f
SIZE (gohugo/golang-appengine-v1.6.0_GH0.tar.gz) = 332522
-SHA256 (gohugo/golang-crypto-d864b10871cd_GH0.tar.gz) = 2e6dfb00792bbd2da5709324505c278d0afeadd12a911e5cb1c8bdba4a9eb24c
-SIZE (gohugo/golang-crypto-d864b10871cd_GH0.tar.gz) = 1678855
SHA256 (gohugo/golang-image-f03afa92d3ff_GH0.tar.gz) = cbe5553c4603e9960c2a9df3d2982e9677860606e03bfde811030a046899c863
SIZE (gohugo/golang-image-f03afa92d3ff_GH0.tar.gz) = 4875165
SHA256 (gohugo/golang-net-1492cefac77f_GH0.tar.gz) = b7bb8a549796da1fdba4427e5955b58b68dedd81bf6862c33227376471c26bc4
@@ -73,16 +73,16 @@ SHA256 (gohugo/golang-xerrors-a985d3407aa7_GH0.tar.gz) = cbceb1aab297e932cee5a54
SIZE (gohugo/golang-xerrors-a985d3407aa7_GH0.tar.gz) = 12270
SHA256 (gohugo/google-go-cloud-v0.15.0_GH0.tar.gz) = 2bacbdc34a9dcc084932d5a77cdc7ff6ff80406a7f485b50e041a6600e84f457
SIZE (gohugo/google-go-cloud-v0.15.0_GH0.tar.gz) = 2298417
-SHA256 (gohugo/google-go-cmp-v0.3.0_GH0.tar.gz) = 7a5aa31b9619b0217a3e2af8b206ba0dbcf5c8322ceb5e9fad18ef252ad6b1c5
-SIZE (gohugo/google-go-cmp-v0.3.0_GH0.tar.gz) = 76127
+SHA256 (gohugo/google-go-cmp-v0.3.1_GH0.tar.gz) = a95fa266e5c2283b813102f265c1bdf5b78100f9889b984aef828eb094efe6e3
+SIZE (gohugo/google-go-cmp-v0.3.1_GH0.tar.gz) = 76403
SHA256 (gohugo/google-go-genproto-c2c4e71fbf69_GH0.tar.gz) = 710e51dff1c47134759459f2068690c8d4c1ca37adfb5633762cff5081bbccc8
SIZE (gohugo/google-go-genproto-c2c4e71fbf69_GH0.tar.gz) = 4027130
SHA256 (gohugo/google-uuid-v1.1.1_GH0.tar.gz) = bebd4b0b4ea152a9793615ef23c83f688876d8c284a2092264d20a4bf4ffc423
SIZE (gohugo/google-uuid-v1.1.1_GH0.tar.gz) = 13543
SHA256 (gohugo/google-wire-v0.2.2_GH0.tar.gz) = c385e16645846de49fad3f73f35ea3da00293ba4ed7fe62eb6eb4b05ca4c6e8c
SIZE (gohugo/google-wire-v0.2.2_GH0.tar.gz) = 77085
-SHA256 (gohugo/googleapis-gax-go-v2.0.4_GH0.tar.gz) = 9c02744a9260cb20efd22cad068c521029c2b0cc13adaaf768d1f75b53e2a20d
-SIZE (gohugo/googleapis-gax-go-v2.0.4_GH0.tar.gz) = 14335
+SHA256 (gohugo/googleapis-gax-go-v2.0.2_GH0.tar.gz) = 624786968d59eb032cfe049f139ddc14be1be5d508c34ebf520edc3946bae2ac
+SIZE (gohugo/googleapis-gax-go-v2.0.2_GH0.tar.gz) = 8942
SHA256 (gohugo/googleapis-google-api-go-client-v0.5.0_GH0.tar.gz) = 518691b284fc806ae4fda9dc2d8eb2ce6f9d26bbb5e512b3e0e09604e5b4e0db
SIZE (gohugo/googleapis-google-api-go-client-v0.5.0_GH0.tar.gz) = 11905507
SHA256 (gohugo/googleapis-google-cloud-go-v0.39.0_GH0.tar.gz) = f88613524248130c58c30ddbcc6605d234abae02d96e896f9a683a16431776c7
@@ -127,8 +127,8 @@ SHA256 (gohugo/muesli-smartcrop-f6ebaa786a12_GH0.tar.gz) = 5b44de70b1a19db90248f
SIZE (gohugo/muesli-smartcrop-f6ebaa786a12_GH0.tar.gz) = 448040
SHA256 (gohugo/nicksnyder-go-i18n-v1.10.0_GH0.tar.gz) = 01d8ffab851cd178f7ff06bbe1e852dcb07fd173b58bd0154485c9511d620f7e
SIZE (gohugo/nicksnyder-go-i18n-v1.10.0_GH0.tar.gz) = 39648
-SHA256 (gohugo/niklasfasching-go-org-v0.1.2_GH0.tar.gz) = cab70e93033fc4cec2b0e2b984af3463a39426d1f0598e8ff4dd70172eab9ff5
-SIZE (gohugo/niklasfasching-go-org-v0.1.2_GH0.tar.gz) = 216728
+SHA256 (gohugo/niklasfasching-go-org-v0.1.4_GH0.tar.gz) = 0c4999a9b4dd7471d9ace07b044523e367cb60418ded7a84b6d4a6c5f49a8b67
+SIZE (gohugo/niklasfasching-go-org-v0.1.4_GH0.tar.gz) = 217416
SHA256 (gohugo/olekukonko-tablewriter-d4647c9c7a84_GH0.tar.gz) = c34d8dae214ee0b55c5f70e414471b0da9101606490746f30d45d84d594fc5cb
SIZE (gohugo/olekukonko-tablewriter-d4647c9c7a84_GH0.tar.gz) = 17349
SHA256 (gohugo/pelletier-go-toml-v1.4.0_GH0.tar.gz) = 04fb4855a64495c0c055c83b8a3446cabc6bfa4830eb458816370db38c0e67b0
@@ -139,6 +139,8 @@ SHA256 (gohugo/rogpeppe-go-internal-v1.3.0_GH0.tar.gz) = 7fecb37397a38b413ada142
SIZE (gohugo/rogpeppe-go-internal-v1.3.0_GH0.tar.gz) = 113035
SHA256 (gohugo/russross-blackfriday-a477dd164691_GH0.tar.gz) = f4303f06046da0d9fffa6cec85bd0f2d6cc25a78611898ca9f1fc51e57aa9f75
SIZE (gohugo/russross-blackfriday-a477dd164691_GH0.tar.gz) = 75990
+SHA256 (gohugo/rwcarlsen-goexif-9e8deecbddbd_GH0.tar.gz) = 3a87edeb13c1d3febbc58fa8e58746f283fef347a25c98a01893bc43db3e9b28
+SIZE (gohugo/rwcarlsen-goexif-9e8deecbddbd_GH0.tar.gz) = 936327
SHA256 (gohugo/sanity-io-litter-v1.1.0_GH0.tar.gz) = e1ebfaf79182a7bf1db519aaabab127909dfd9b44f827fe3e5d1c7ff59e6b31b
SIZE (gohugo/sanity-io-litter-v1.1.0_GH0.tar.gz) = 8785
SHA256 (gohugo/spf13-afero-v1.2.2_GH0.tar.gz) = b577afca7e9839aa7cf0ddd712af553aec671b74f97fe0c88c63f911d1020570
diff --git a/www/googler/Makefile b/www/googler/Makefile
index 527f4863576e..8353ebe1b210 100644
--- a/www/googler/Makefile
+++ b/www/googler/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= googler
-PORTVERSION= 3.8
+PORTVERSION= 3.9
DISTVERSIONPREFIX= v
PORTREVISION= 0
CATEGORIES= www
diff --git a/www/googler/distinfo b/www/googler/distinfo
index c203187b19af..b2e81679a897 100644
--- a/www/googler/distinfo
+++ b/www/googler/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1558284457
-SHA256 (jarun-googler-v3.8_GH0.tar.gz) = d942392a6bc3faee44951e2069b547b401bb688b2368f3a4385bb3ca7b6efa0f
-SIZE (jarun-googler-v3.8_GH0.tar.gz) = 76343
+TIMESTAMP = 1569254909
+SHA256 (jarun-googler-v3.9_GH0.tar.gz) = b90c6d28ad6ce0a2a2320806ab2133857fe1a0b6ca2a489d8eda1b8062e620e2
+SIZE (jarun-googler-v3.9_GH0.tar.gz) = 76432
diff --git a/www/hastymail2-devel/Makefile b/www/hastymail2-devel/Makefile
index 2cc6a3f238e9..eb0a5ddd01a1 100644
--- a/www/hastymail2-devel/Makefile
+++ b/www/hastymail2-devel/Makefile
@@ -15,6 +15,8 @@ LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
BROKEN= unfetchable
+DEPRECATED= Unfetchable, unmaintained
+EXPIRATION_DATE= 2019-10-16
NO_BUILD= yes
SUB_FILES= pkg-message
diff --git a/www/hiawatha/Makefile b/www/hiawatha/Makefile
index 3bab5b7b5563..8cae8ab86797 100644
--- a/www/hiawatha/Makefile
+++ b/www/hiawatha/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= hiawatha
-PORTVERSION= 10.9
-PORTREVISION= 2
+PORTVERSION= 10.10
CATEGORIES= www
MASTER_SITES= https://www.hiawatha-webserver.org/files/
@@ -13,17 +12,20 @@ COMMENT= Advanced and secure webserver for Unix
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE
-USES= cmake:insource compiler:c11 shebangfix
+LIB_DEPENDS= libmbedtls.so:security/mbedtls
+
+USES= cmake:insource compiler:c11 localbase:ldflags shebangfix
USE_RC_SUBR= hiawatha
SHEBANG_FILES= extra/letsencrypt/lefh.in
CMAKE_ARGS= -DCMAKE_INSTALL_LOCALSTATEDIR=/var \
-DWEBROOT_DIR=${WWWDIR} \
-DWORK_DIR=/var/db/${PORTNAME}
+CMAKE_ON= USE_SYSTEM_MBEDTLS
-OPTIONS_DEFINE= CACHE CGIWRAPPER IPV6 LEFH LOADCHECK MBEDTLS MONITOR \
- RPROXY TOMAHAWK TOOLKIT XSLT
-OPTIONS_DEFAULT= CACHE CGIWRAPPER MBEDTLS RPROXY TOOLKIT XSLT
+OPTIONS_DEFINE= CACHE CGIWRAPPER LEFH LOADCHECK MONITOR RPROXY TOMAHAWK \
+ TOOLKIT XSLT
+OPTIONS_DEFAULT= CACHE CGIWRAPPER RPROXY TOOLKIT XSLT
OPTIONS_SUB= yes
CACHE_DESC= Caching support
@@ -37,13 +39,8 @@ TOOLKIT_DESC= URL toolkit support
XSLT_DESC= XSLT support
CACHE_CMAKE_BOOL= ENABLE_CACHE
-IPV6_CMAKE_BOOL= ENABLE_IPV6
-LEFH_IMPLIES= MBEDTLS
LEFH_USES= php:cli
LOADCHECK_CMAKE_BOOL= ENABLE_LOADCHECK
-MBEDTLS_LIB_DEPENDS= libmbedtls.so:security/mbedtls
-MBEDTLS_USES= localbase:ldflags
-MBEDTLS_CMAKE_BOOL= ENABLE_TLS USE_SYSTEM_MBEDTLS
MONITOR_CMAKE_BOOL= ENABLE_MONITOR
RPROXY_CMAKE_BOOL= ENABLE_RPROXY
TOMAHAWK_CMAKE_BOOL= ENABLE_TOMAHAWK
diff --git a/www/hiawatha/distinfo b/www/hiawatha/distinfo
index 5262a5f1b54c..1088d1231f5d 100644
--- a/www/hiawatha/distinfo
+++ b/www/hiawatha/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1550525987
-SHA256 (hiawatha-10.9.tar.gz) = 74dd43812272c3ddbf067b6d4da1773cdeef2ffe71e8f164449fabf8431752b8
-SIZE (hiawatha-10.9.tar.gz) = 1139702
+TIMESTAMP = 1568958968
+SHA256 (hiawatha-10.10.tar.gz) = b5e46f5757fa647e77d21d24f7eea912d59f26a75558cba780b45c1c3a33a4d9
+SIZE (hiawatha-10.10.tar.gz) = 1168325
diff --git a/www/hiawatha/pkg-help b/www/hiawatha/pkg-help
index c6db296376f9..6d6e28513f11 100644
--- a/www/hiawatha/pkg-help
+++ b/www/hiawatha/pkg-help
@@ -13,8 +13,8 @@ properly, the CGI wrapper binary needs to have the setuid bit set.
LEFH
Install the 'lefh' (Let's Encrypt For Hiawatha) tool to help in
-obtaining and maintaining Let's Encrypt certificates. It needs PHP
-and also implies having MBEDTLS enabled.
+obtaining and maintaining Let's Encrypt certificates. It requires
+PHP.
LOADCHECK
Enable experimental support for MaxServerLoad. When the host has
@@ -22,11 +22,6 @@ a load higher than that value, Hiawatha will drop incoming connections.
Officially this feature is only available on Linux. FreeBSD support
is largely untested.
-MBEDTLS
-Enable TLS support via security/mbedtls. It is required for the
-MinTLSversion, PublicKeyPins, RequiredCA, RequireTLS, and TLScertFile
-settings.
-
MONITOR
Enable Hiawatha Monitor support. The MonitorServer setting enables
logging of statistical information to a remote monitor server running
diff --git a/www/htmlpp/Makefile b/www/htmlpp/Makefile
index 4a906f41552b..b7fb51d0fc08 100644
--- a/www/htmlpp/Makefile
+++ b/www/htmlpp/Makefile
@@ -14,6 +14,8 @@ COMMENT= Perl script to allow easy creation of HTML from template files
LICENSE= GPLv2+
BROKEN= unfetchable
+DEPRECATED= Unfetchable, unmaintained
+EXPIRATION_DATE= 2019-10-16
USES= perl5 shebangfix tar:tgz
SHEBANG_FILES= htmlpp
diff --git a/www/http-analyze/Makefile b/www/http-analyze/Makefile
index 2ce35471f18f..5c8a4143800c 100644
--- a/www/http-analyze/Makefile
+++ b/www/http-analyze/Makefile
@@ -16,6 +16,8 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Fast Log-Analyzer for web servers
BROKEN= unfetchable
+DEPRECATED= Unfetchable, unmaintained
+EXPIRATION_DATE= 2019-10-16
LIB_DEPENDS= libgd.so:graphics/gd
diff --git a/www/iridium/files/patch-media_audio_pulse_pulse.sigs b/www/iridium/files/patch-media_audio_pulse_pulse.sigs
new file mode 100644
index 000000000000..3d31bd187348
--- /dev/null
+++ b/www/iridium/files/patch-media_audio_pulse_pulse.sigs
@@ -0,0 +1,143 @@
+gen/media/audio/pulse/pulse_stubs.cc:155:27: error: conflicting types for 'pa_context_get_state'
+extern pa_context_state_t pa_context_get_state(pa_context* c) __attribute__((weak));
+ ^
+../../../../../../../../../../usr/local/include/pulse/context.h:199:20: note: previous declaration is here
+pa_context_state_t pa_context_get_state(const pa_context *c);
+ ^
+gen/media/audio/pulse/pulse_stubs.cc:156:21: error: conflicting types for 'pa_context_get_state'
+pa_context_state_t pa_context_get_state(pa_context* c) {
+ ^
+../../../../../../../../../../usr/local/include/pulse/context.h:199:20: note: previous declaration is here
+pa_context_state_t pa_context_get_state(const pa_context *c);
+ ^
+gen/media/audio/pulse/pulse_stubs.cc:171:29: error: conflicting types for 'pa_operation_get_state'
+extern pa_operation_state_t pa_operation_get_state(pa_operation* o) __attribute__((weak));
+ ^
+../../../../../../../../../../usr/local/include/pulse/operation.h:52:22: note: previous declaration is here
+pa_operation_state_t pa_operation_get_state(const pa_operation *o);
+ ^
+gen/media/audio/pulse/pulse_stubs.cc:172:23: error: conflicting types for 'pa_operation_get_state'
+pa_operation_state_t pa_operation_get_state(pa_operation* o) {
+ ^
+../../../../../../../../../../usr/local/include/pulse/operation.h:52:22: note: previous declaration is here
+pa_operation_state_t pa_operation_get_state(const pa_operation *o);
+ ^
+gen/media/audio/pulse/pulse_stubs.cc:211:17: error: conflicting types for 'pa_stream_get_device_index'
+extern uint32_t pa_stream_get_device_index(pa_stream* s) __attribute__((weak));
+ ^
+../../../../../../../../../../usr/local/include/pulse/stream.h:366:10: note: previous declaration is here
+uint32_t pa_stream_get_device_index(const pa_stream *s);
+ ^
+gen/media/audio/pulse/pulse_stubs.cc:212:11: error: conflicting types for 'pa_stream_get_device_index'
+uint32_t pa_stream_get_device_index(pa_stream* s) {
+ ^
+../../../../../../../../../../usr/local/include/pulse/stream.h:366:10: note: previous declaration is here
+uint32_t pa_stream_get_device_index(const pa_stream *s);
+ ^
+gen/media/audio/pulse/pulse_stubs.cc:219:26: error: conflicting types for 'pa_stream_get_state'
+extern pa_stream_state_t pa_stream_get_state(pa_stream* p) __attribute__((weak));
+ ^
+../../../../../../../../../../usr/local/include/pulse/stream.h:345:19: note: previous declaration is here
+pa_stream_state_t pa_stream_get_state(const pa_stream *p);
+ ^
+gen/media/audio/pulse/pulse_stubs.cc:220:20: error: conflicting types for 'pa_stream_get_state'
+pa_stream_state_t pa_stream_get_state(pa_stream* p) {
+ ^
+../../../../../../../../../../usr/local/include/pulse/stream.h:345:19: note: previous declaration is here
+pa_stream_state_t pa_stream_get_state(const pa_stream *p);
+ ^
+gen/media/audio/pulse/pulse_stubs.cc:235:12: error: conflicting types for 'pa_proplist_contains'
+extern int pa_proplist_contains(pa_proplist* p, const char* key) __attribute__((weak));
+ ^
+../../../../../../../../../../usr/local/include/pulse/proplist.h:390:5: note: previous declaration is here
+int pa_proplist_contains(const pa_proplist *p, const char *key);
+ ^
+gen/media/audio/pulse/pulse_stubs.cc:236:6: error: conflicting types for 'pa_proplist_contains'
+int pa_proplist_contains(pa_proplist* p, const char* key) {
+ ^
+../../../../../../../../../../usr/local/include/pulse/proplist.h:390:5: note: previous declaration is here
+int pa_proplist_contains(const pa_proplist *p, const char *key);
+ ^
+gen/media/audio/pulse/pulse_stubs.cc:243:20: error: conflicting types for 'pa_proplist_gets'
+extern const char* pa_proplist_gets(pa_proplist* p, const char* key) __attribute__((weak));
+ ^
+../../../../../../../../../../usr/local/include/pulse/proplist.h:314:13: note: previous declaration is here
+const char *pa_proplist_gets(const pa_proplist *p, const char *key);
+ ^
+gen/media/audio/pulse/pulse_stubs.cc:244:14: error: conflicting types for 'pa_proplist_gets'
+const char* pa_proplist_gets(pa_proplist* p, const char* key) {
+ ^
+../../../../../../../../../../usr/local/include/pulse/proplist.h:314:13: note: previous declaration is here
+const char *pa_proplist_gets(const pa_proplist *p, const char *key);
+ ^
+gen/media/audio/pulse/pulse_stubs.cc:251:15: error: conflicting types for 'pa_stream_readable_size'
+extern size_t pa_stream_readable_size(pa_stream *p) __attribute__((weak));
+ ^
+../../../../../../../../../../usr/local/include/pulse/stream.h:574:8: note: previous declaration is here
+size_t pa_stream_readable_size(const pa_stream *p);
+ ^
+gen/media/audio/pulse/pulse_stubs.cc:252:9: error: conflicting types for 'pa_stream_readable_size'
+size_t pa_stream_readable_size(pa_stream *p) {
+ ^
+../../../../../../../../../../usr/local/include/pulse/stream.h:574:8: note: previous declaration is here
+size_t pa_stream_readable_size(const pa_stream *p);
+ ^
+gen/media/audio/pulse/pulse_stubs.cc:279:12: error: conflicting types for 'pa_context_errno'
+extern int pa_context_errno(pa_context *c) __attribute__((weak));
+ ^
+../../../../../../../../../../usr/local/include/pulse/context.h:193:5: note: previous declaration is here
+int pa_context_errno(const pa_context *c);
+ ^
+gen/media/audio/pulse/pulse_stubs.cc:280:6: error: conflicting types for 'pa_context_errno'
+int pa_context_errno(pa_context *c) {
+ ^
+../../../../../../../../../../usr/local/include/pulse/context.h:193:5: note: previous declaration is here
+int pa_context_errno(const pa_context *c);
+ ^
+
+--- media/audio/pulse/pulse.sigs.orig 2019-03-19 08:52:48 UTC
++++ media/audio/pulse/pulse.sigs
+@@ -24,11 +24,11 @@ pa_operation* pa_context_get_source_info_by_index(pa_c
+ pa_operation* pa_context_get_source_info_by_name(pa_context* c, const char* name, pa_source_info_cb_t cb, void *userdata);
+ pa_operation* pa_context_get_source_info_list(pa_context* c, pa_source_info_cb_t cb, void* userdata);
+ pa_operation* pa_context_get_sink_info_list(pa_context* c, pa_sink_info_cb_t cb, void* userdata);
+-pa_context_state_t pa_context_get_state(pa_context* c);
++pa_context_state_t pa_context_get_state(const pa_context *c);
+ pa_context* pa_context_new(pa_mainloop_api* mainloop, const char* name);
+ pa_operation* pa_context_set_source_volume_by_index(pa_context* c, uint32_t idx, const pa_cvolume* volume, pa_context_success_cb_t cb, void* userdata);
+ void pa_context_set_state_callback(pa_context* c, pa_context_notify_cb_t cb, void* userdata);
+-pa_operation_state_t pa_operation_get_state(pa_operation* o);
++pa_operation_state_t pa_operation_get_state(const pa_operation* o);
+ void pa_context_unref(pa_context* c);
+ void pa_operation_unref(pa_operation* o);
+ int pa_stream_begin_write(pa_stream* p, void** data, size_t* nbytes);
+@@ -38,23 +38,23 @@ pa_operation* pa_stream_cork(pa_stream* s, int b, pa_s
+ int pa_stream_disconnect(pa_stream* s);
+ int pa_stream_drop(pa_stream *p);
+ pa_operation* pa_stream_flush(pa_stream* s, pa_stream_success_cb_t cb, void* userdata);
+-uint32_t pa_stream_get_device_index(pa_stream* s);
++uint32_t pa_stream_get_device_index(const pa_stream* s);
+ int pa_stream_get_latency(pa_stream* s, pa_usec_t* r_usec, int* negative);
+-pa_stream_state_t pa_stream_get_state(pa_stream* p);
++pa_stream_state_t pa_stream_get_state(const pa_stream* p);
+ pa_stream* pa_stream_new(pa_context* c, const char* name, const pa_sample_spec* ss, const pa_channel_map * map);
+ pa_stream* pa_stream_new_with_proplist(pa_context* c, const char* name, const pa_sample_spec* ss, const pa_channel_map* map, pa_proplist* p);
+ pa_proplist* pa_proplist_new(void);
+-int pa_proplist_contains(pa_proplist* p, const char* key);
++int pa_proplist_contains(const pa_proplist* p, const char* key);
+ void pa_proplist_free(pa_proplist* p);
+-const char* pa_proplist_gets(pa_proplist* p, const char* key);
++const char* pa_proplist_gets(const pa_proplist* p, const char* key);
+ int pa_proplist_sets(pa_proplist* p, const char* key, const char* value);
+-size_t pa_stream_readable_size(pa_stream *p);
++size_t pa_stream_readable_size(const pa_stream *p);
+ int pa_stream_peek(pa_stream* p, const void** data, size_t* nbytes);
+ void pa_stream_set_read_callback(pa_stream* p, pa_stream_request_cb_t cb, void* userdata);
+ void pa_stream_set_state_callback(pa_stream* s, pa_stream_notify_cb_t cb, void* userdata);
+ int pa_stream_write(pa_stream* p, const void* data, size_t nbytes, pa_free_cb_t free_cb, int64_t offset, pa_seek_mode_t seek);
+ void pa_stream_set_write_callback(pa_stream *p, pa_stream_request_cb_t cb, void *userdata);
+ void pa_stream_unref(pa_stream* s);
+-int pa_context_errno(pa_context *c);
++int pa_context_errno(const pa_context *c);
+ const char* pa_strerror(int error);
+ pa_cvolume* pa_cvolume_set(pa_cvolume* a, unsigned channels, pa_volume_t v);
diff --git a/www/junkbuster/Makefile b/www/junkbuster/Makefile
index 4709e2e62868..08334178c60a 100644
--- a/www/junkbuster/Makefile
+++ b/www/junkbuster/Makefile
@@ -14,6 +14,8 @@ COMMENT= HTTP proxy server that eliminates ads
LICENSE= GPLv2+
BROKEN= unfetchable
+DEPRECATED= Unfetchable, unmaintained
+EXPIRATION_DATE= 2019-10-16
USES= dos2unix tar:tgz
ALL_TARGET= # yes, an empty target.
diff --git a/www/jwt-cli/Makefile b/www/jwt-cli/Makefile
new file mode 100644
index 000000000000..7f9217613d87
--- /dev/null
+++ b/www/jwt-cli/Makefile
@@ -0,0 +1,67 @@
+# Created by: Sergey A. Osokin <osa@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME= jwt-cli
+PORTVERSION= 2.5.0
+CATEGORIES= www
+
+MAINTAINER= osa@FreeBSD.org
+COMMENT= Super fast CLI tool to decode and encode JWTs
+
+LICENSE= MIT
+LICENSE_FILE= ${WRKSRC}/LICENSE.md
+
+USES= cargo
+USE_GITHUB= yes
+GH_ACCOUNT= mike-engel
+
+CARGO_CRATES= ansi_term-0.11.0 \
+ atty-0.2.11 \
+ autocfg-0.1.4 \
+ base64-0.10.1 \
+ bitflags-1.0.4 \
+ byteorder-1.3.1 \
+ cc-1.0.37 \
+ chrono-0.4.6 \
+ clap-2.33.0 \
+ itoa-0.4.4 \
+ jsonwebtoken-6.0.1 \
+ kernel32-sys-0.2.2 \
+ lazy_static-1.3.0 \
+ libc-0.2.55 \
+ num-integer-0.1.41 \
+ num-traits-0.2.8 \
+ numtoa-0.1.0 \
+ proc-macro2-0.4.30 \
+ quote-0.6.12 \
+ redox_syscall-0.1.54 \
+ redox_termios-0.1.1 \
+ ring-0.14.6 \
+ ryu-0.2.8 \
+ serde-1.0.91 \
+ serde_derive-1.0.91 \
+ serde_json-1.0.39 \
+ spin-0.5.0 \
+ strsim-0.8.0 \
+ syn-0.15.34 \
+ term-0.4.6 \
+ term-painter-0.2.4 \
+ termion-1.5.2 \
+ textwrap-0.11.0 \
+ time-0.1.42 \
+ unicode-width-0.1.5 \
+ unicode-xid-0.1.0 \
+ untrusted-0.6.2 \
+ vec_map-0.8.1 \
+ winapi-0.2.8 \
+ winapi-0.3.7 \
+ winapi-build-0.1.1 \
+ winapi-i686-pc-windows-gnu-0.4.0 \
+ winapi-x86_64-pc-windows-gnu-0.4.0
+
+PLIST_FILES= bin/jwt
+
+post-install:
+ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/jwt
+
+.include <bsd.port.mk>
diff --git a/www/jwt-cli/distinfo b/www/jwt-cli/distinfo
new file mode 100644
index 000000000000..890ce190f2d8
--- /dev/null
+++ b/www/jwt-cli/distinfo
@@ -0,0 +1,89 @@
+TIMESTAMP = 1568735044
+SHA256 (rust/crates/ansi_term-0.11.0.tar.gz) = ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b
+SIZE (rust/crates/ansi_term-0.11.0.tar.gz) = 17087
+SHA256 (rust/crates/atty-0.2.11.tar.gz) = 9a7d5b8723950951411ee34d271d99dddcc2035a16ab25310ea2c8cfd4369652
+SIZE (rust/crates/atty-0.2.11.tar.gz) = 5916
+SHA256 (rust/crates/autocfg-0.1.4.tar.gz) = 0e49efa51329a5fd37e7c79db4621af617cd4e3e5bc224939808d076077077bf
+SIZE (rust/crates/autocfg-0.1.4.tar.gz) = 10937
+SHA256 (rust/crates/base64-0.10.1.tar.gz) = 0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e
+SIZE (rust/crates/base64-0.10.1.tar.gz) = 41988
+SHA256 (rust/crates/bitflags-1.0.4.tar.gz) = 228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12
+SIZE (rust/crates/bitflags-1.0.4.tar.gz) = 15282
+SHA256 (rust/crates/byteorder-1.3.1.tar.gz) = a019b10a2a7cdeb292db131fc8113e57ea2a908f6e7894b0c3c671893b65dbeb
+SIZE (rust/crates/byteorder-1.3.1.tar.gz) = 20959
+SHA256 (rust/crates/cc-1.0.37.tar.gz) = 39f75544d7bbaf57560d2168f28fd649ff9c76153874db88bdbdfd839b1a7e7d
+SIZE (rust/crates/cc-1.0.37.tar.gz) = 44499
+SHA256 (rust/crates/chrono-0.4.6.tar.gz) = 45912881121cb26fad7c38c17ba7daa18764771836b34fab7d3fbd93ed633878
+SIZE (rust/crates/chrono-0.4.6.tar.gz) = 133108
+SHA256 (rust/crates/clap-2.33.0.tar.gz) = 5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9
+SIZE (rust/crates/clap-2.33.0.tar.gz) = 196458
+SHA256 (rust/crates/itoa-0.4.4.tar.gz) = 501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f
+SIZE (rust/crates/itoa-0.4.4.tar.gz) = 11147
+SHA256 (rust/crates/jsonwebtoken-6.0.1.tar.gz) = a81d1812d731546d2614737bee92aa071d37e9afa1409bc374da9e5e70e70b22
+SIZE (rust/crates/jsonwebtoken-6.0.1.tar.gz) = 17095
+SHA256 (rust/crates/kernel32-sys-0.2.2.tar.gz) = 7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d
+SIZE (rust/crates/kernel32-sys-0.2.2.tar.gz) = 24537
+SHA256 (rust/crates/lazy_static-1.3.0.tar.gz) = bc5729f27f159ddd61f4df6228e827e86643d4d3e7c32183cb30a1c08f604a14
+SIZE (rust/crates/lazy_static-1.3.0.tar.gz) = 10616
+SHA256 (rust/crates/libc-0.2.55.tar.gz) = 42914d39aad277d9e176efbdad68acb1d5443ab65afe0e0e4f0d49352a950880
+SIZE (rust/crates/libc-0.2.55.tar.gz) = 400416
+SHA256 (rust/crates/num-integer-0.1.41.tar.gz) = b85e541ef8255f6cf42bbfe4ef361305c6c135d10919ecc26126c4e5ae94bc09
+SIZE (rust/crates/num-integer-0.1.41.tar.gz) = 19399
+SHA256 (rust/crates/num-traits-0.2.8.tar.gz) = 6ba9a427cfca2be13aa6f6403b0b7e7368fe982bfa16fccc450ce74c46cd9b32
+SIZE (rust/crates/num-traits-0.2.8.tar.gz) = 39965
+SHA256 (rust/crates/numtoa-0.1.0.tar.gz) = b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef
+SIZE (rust/crates/numtoa-0.1.0.tar.gz) = 8999
+SHA256 (rust/crates/proc-macro2-0.4.30.tar.gz) = cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759
+SIZE (rust/crates/proc-macro2-0.4.30.tar.gz) = 34731
+SHA256 (rust/crates/quote-0.6.12.tar.gz) = faf4799c5d274f3868a4aae320a0a182cbd2baee377b378f080e16a23e9d80db
+SIZE (rust/crates/quote-0.6.12.tar.gz) = 17541
+SHA256 (rust/crates/redox_syscall-0.1.54.tar.gz) = 12229c14a0f65c4f1cb046a3b52047cdd9da1f4b30f8a39c5063c8bae515e252
+SIZE (rust/crates/redox_syscall-0.1.54.tar.gz) = 15668
+SHA256 (rust/crates/redox_termios-0.1.1.tar.gz) = 7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76
+SIZE (rust/crates/redox_termios-0.1.1.tar.gz) = 3227
+SHA256 (rust/crates/ring-0.14.6.tar.gz) = 426bc186e3e95cac1e4a4be125a4aca7e84c2d616ffc02244eef36e2a60a093c
+SIZE (rust/crates/ring-0.14.6.tar.gz) = 5428922
+SHA256 (rust/crates/ryu-0.2.8.tar.gz) = b96a9549dc8d48f2c283938303c4b5a77aa29bfbc5b54b084fb1630408899a8f
+SIZE (rust/crates/ryu-0.2.8.tar.gz) = 42798
+SHA256 (rust/crates/serde-1.0.91.tar.gz) = a72e9b96fa45ce22a4bc23da3858dfccfd60acd28a25bcd328a98fdd6bea43fd
+SIZE (rust/crates/serde-1.0.91.tar.gz) = 71696
+SHA256 (rust/crates/serde_derive-1.0.91.tar.gz) = 101b495b109a3e3ca8c4cbe44cf62391527cdfb6ba15821c5ce80bcd5ea23f9f
+SIZE (rust/crates/serde_derive-1.0.91.tar.gz) = 48765
+SHA256 (rust/crates/serde_json-1.0.39.tar.gz) = 5a23aa71d4a4d43fdbfaac00eff68ba8a06a51759a89ac3304323e800c4dd40d
+SIZE (rust/crates/serde_json-1.0.39.tar.gz) = 69621
+SHA256 (rust/crates/spin-0.5.0.tar.gz) = 44363f6f51401c34e7be73db0db371c04705d35efbe9f7d6082e03a921a32c55
+SIZE (rust/crates/spin-0.5.0.tar.gz) = 10493
+SHA256 (rust/crates/strsim-0.8.0.tar.gz) = 8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a
+SIZE (rust/crates/strsim-0.8.0.tar.gz) = 9309
+SHA256 (rust/crates/syn-0.15.34.tar.gz) = a1393e4a97a19c01e900df2aec855a29f71cf02c402e2f443b8d2747c25c5dbe
+SIZE (rust/crates/syn-0.15.34.tar.gz) = 149802
+SHA256 (rust/crates/term-0.4.6.tar.gz) = fa63644f74ce96fbeb9b794f66aff2a52d601cbd5e80f4b97123e3899f4570f1
+SIZE (rust/crates/term-0.4.6.tar.gz) = 38250
+SHA256 (rust/crates/term-painter-0.2.4.tar.gz) = dcaa948f0e3e38470cd8dc8dcfe561a75c9e43f28075bb183845be2b9b3c08cf
+SIZE (rust/crates/term-painter-0.2.4.tar.gz) = 38740
+SHA256 (rust/crates/termion-1.5.2.tar.gz) = dde0593aeb8d47accea5392b39350015b5eccb12c0d98044d856983d89548dea
+SIZE (rust/crates/termion-1.5.2.tar.gz) = 22076
+SHA256 (rust/crates/textwrap-0.11.0.tar.gz) = d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060
+SIZE (rust/crates/textwrap-0.11.0.tar.gz) = 17322
+SHA256 (rust/crates/time-0.1.42.tar.gz) = db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f
+SIZE (rust/crates/time-0.1.42.tar.gz) = 30005
+SHA256 (rust/crates/unicode-width-0.1.5.tar.gz) = 882386231c45df4700b275c7ff55b6f3698780a650026380e72dabe76fa46526
+SIZE (rust/crates/unicode-width-0.1.5.tar.gz) = 15761
+SHA256 (rust/crates/unicode-xid-0.1.0.tar.gz) = fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc
+SIZE (rust/crates/unicode-xid-0.1.0.tar.gz) = 16000
+SHA256 (rust/crates/untrusted-0.6.2.tar.gz) = 55cd1f4b4e96b46aeb8d4855db4a7a9bd96eeeb5c6a1ab54593328761642ce2f
+SIZE (rust/crates/untrusted-0.6.2.tar.gz) = 7526
+SHA256 (rust/crates/vec_map-0.8.1.tar.gz) = 05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a
+SIZE (rust/crates/vec_map-0.8.1.tar.gz) = 14959
+SHA256 (rust/crates/winapi-0.2.8.tar.gz) = 167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a
+SIZE (rust/crates/winapi-0.2.8.tar.gz) = 455145
+SHA256 (rust/crates/winapi-0.3.7.tar.gz) = f10e386af2b13e47c89e7236a7a14a086791a2b88ebad6df9bf42040195cf770
+SIZE (rust/crates/winapi-0.3.7.tar.gz) = 1075776
+SHA256 (rust/crates/winapi-build-0.1.1.tar.gz) = 2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc
+SIZE (rust/crates/winapi-build-0.1.1.tar.gz) = 669
+SHA256 (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.tar.gz) = ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6
+SIZE (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.tar.gz) = 2918815
+SHA256 (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.tar.gz) = 712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f
+SIZE (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.tar.gz) = 2947998
+SHA256 (mike-engel-jwt-cli-2.5.0_GH0.tar.gz) = b566525ee0e7532aa85c25bab00418975a498ada1af82214ee51989593cd7da3
+SIZE (mike-engel-jwt-cli-2.5.0_GH0.tar.gz) = 22215
diff --git a/www/jwt-cli/pkg-descr b/www/jwt-cli/pkg-descr
new file mode 100644
index 000000000000..4ebd0bfe0f90
--- /dev/null
+++ b/www/jwt-cli/pkg-descr
@@ -0,0 +1,8 @@
+Command line tool to help you work with JSON Web Tokens (JWTs). Like
+most JWT command line tools out there, you can decode almost any JWT
+header and claims body. Unlike any that I've found, however, jwt-cli
+allows you to encode a new JWT with nearly any piece of data you can
+think of. Custom header values (some), custom claim bodies (as long
+as it's JSON, it's game), and using any secret you need.
+
+WWW: https://github.com/mike-engel/jwt-cli
diff --git a/www/kf5-kdewebkit/distinfo b/www/kf5-kdewebkit/distinfo
index 6031749a66c7..014c8091c325 100644
--- a/www/kf5-kdewebkit/distinfo
+++ b/www/kf5-kdewebkit/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1565017411
-SHA256 (KDE/frameworks/5.61.0/kdewebkit-5.61.0.tar.xz) = 1ee2a00ee3d95df9270e8c3d434568cda8f42151e361bc07fe374bf0f7afe211
-SIZE (KDE/frameworks/5.61.0/kdewebkit-5.61.0.tar.xz) = 35380
+TIMESTAMP = 1568002341
+SHA256 (KDE/frameworks/5.62.0/kdewebkit-5.62.0.tar.xz) = 5e45a7866b28d69e6d28f821011c020e53cc6e5b59bcdb7a5d9cb7bda37175e4
+SIZE (KDE/frameworks/5.62.0/kdewebkit-5.62.0.tar.xz) = 29804
diff --git a/www/kf5-khtml/distinfo b/www/kf5-khtml/distinfo
index feff8ab4113c..a384137e530c 100644
--- a/www/kf5-khtml/distinfo
+++ b/www/kf5-khtml/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1565017411
-SHA256 (KDE/frameworks/5.61.0/khtml-5.61.0.tar.xz) = 5d8612b584eecf96959d56bb75b1470b3b34ff7176cef7a0a15bc2531b21720b
-SIZE (KDE/frameworks/5.61.0/khtml-5.61.0.tar.xz) = 2081180
+TIMESTAMP = 1568002352
+SHA256 (KDE/frameworks/5.62.0/khtml-5.62.0.tar.xz) = 35e3f7e419041f0892ea42c6506b627661137602c25f0f1d6a81537b583682c1
+SIZE (KDE/frameworks/5.62.0/khtml-5.62.0.tar.xz) = 2082152
diff --git a/www/kf5-kjs/distinfo b/www/kf5-kjs/distinfo
index 7b58ad0242f2..4f795f40ea11 100644
--- a/www/kf5-kjs/distinfo
+++ b/www/kf5-kjs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1565017412
-SHA256 (KDE/frameworks/5.61.0/kjs-5.61.0.tar.xz) = 968e1592c98ee260d80644bf4631bf09479512e48fa878887ee3b9d6d57d3d17
-SIZE (KDE/frameworks/5.61.0/kjs-5.61.0.tar.xz) = 295640
+TIMESTAMP = 1568002352
+SHA256 (KDE/frameworks/5.62.0/kjs-5.62.0.tar.xz) = aaff97d97e3163f890001b7d2e4c0329fdd9d9c53ce4924233246f3ef6cd5962
+SIZE (KDE/frameworks/5.62.0/kjs-5.62.0.tar.xz) = 294920
diff --git a/www/kf5-kjsembed/distinfo b/www/kf5-kjsembed/distinfo
index 5314da5147bc..e7029ae0d2af 100644
--- a/www/kf5-kjsembed/distinfo
+++ b/www/kf5-kjsembed/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1565017412
-SHA256 (KDE/frameworks/5.61.0/kjsembed-5.61.0.tar.xz) = d8e0afad638574c31c89d716d78456ce51ffe6dd03eae6787bc9b4f8b52d5b44
-SIZE (KDE/frameworks/5.61.0/kjsembed-5.61.0.tar.xz) = 169540
+TIMESTAMP = 1568002352
+SHA256 (KDE/frameworks/5.62.0/kjsembed-5.62.0.tar.xz) = 3763c5f67fa92803b5003a41c5b696524be3d0528018a3d5643abc25b161c23b
+SIZE (KDE/frameworks/5.62.0/kjsembed-5.62.0.tar.xz) = 169848
diff --git a/www/links-hacked/Makefile b/www/links-hacked/Makefile
index 76b2c34df4c6..af382b1aec02 100644
--- a/www/links-hacked/Makefile
+++ b/www/links-hacked/Makefile
@@ -13,6 +13,8 @@ COMMENT= Hacked version of a Links WWW browser
LICENSE= GPLv2
BROKEN= unfetchable
+DEPRECATED= Unfetchable, unmaintained
+EXPIRATION_DATE= 2019-10-16
USES= autoreconf ssl
USE_CSTD= gnu89
diff --git a/www/llgal/Makefile b/www/llgal/Makefile
index 320f5ef1a6d5..1a346bd2367c 100644
--- a/www/llgal/Makefile
+++ b/www/llgal/Makefile
@@ -14,6 +14,8 @@ LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
BROKEN= unfetchable
+DEPRECATED= Unfetchable, unmaintained
+EXPIRATION_DATE= 2019-10-16
BUILD_DEPENDS= p5-Image-Size>=0:graphics/p5-Image-Size \
p5-URI>=0:net/p5-URI \
diff --git a/www/lua-resty-core/Makefile b/www/lua-resty-core/Makefile
new file mode 100644
index 000000000000..1544229b7a85
--- /dev/null
+++ b/www/lua-resty-core/Makefile
@@ -0,0 +1,30 @@
+# $FreeBSD$
+
+PORTNAME= lua-resty-core
+PORTVERSION= 0.1.17
+DISTVERSIONPREFIX=v
+CATEGORIES= www
+
+MAINTAINER= dmitry.wagin@ya.ru
+COMMENT= New FFI-based Lua API for OpenResty NGINX Lua modules
+
+LICENSE= BSD2CLAUSE
+
+RUN_DEPENDS= luajit-openresty>=2.1:lang/luajit-openresty \
+ lua-resty-lrucache>=0.09:www/lua-resty-lrucache
+
+USE_GITHUB= yes
+GH_ACCOUNT= openresty
+
+NO_ARCH= yes
+NO_BUILD= yes
+
+LUA_MODSHAREDIR=${LOCALBASE}/share/lua/5.1
+
+PLIST_SUB= LUA_MODSHAREDIR=${LUA_MODSHAREDIR}
+
+do-install:
+ @${MKDIR} ${STAGEDIR}${LUA_MODSHAREDIR}
+ @(cd ${WRKSRC}/lib && ${COPYTREE_SHARE} . ${STAGEDIR}${LUA_MODSHAREDIR} "-name *\.lua")
+
+.include <bsd.port.mk>
diff --git a/www/lua-resty-core/distinfo b/www/lua-resty-core/distinfo
new file mode 100644
index 000000000000..c9b140b13ff2
--- /dev/null
+++ b/www/lua-resty-core/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1566940586
+SHA256 (openresty-lua-resty-core-v0.1.17_GH0.tar.gz) = 8f5f76d2689a3f6b0782f0a009c56a65e4c7a4382be86422c9b3549fe95b0dc4
+SIZE (openresty-lua-resty-core-v0.1.17_GH0.tar.gz) = 150985
diff --git a/www/lua-resty-core/pkg-descr b/www/lua-resty-core/pkg-descr
new file mode 100644
index 000000000000..41f4c61a9065
--- /dev/null
+++ b/www/lua-resty-core/pkg-descr
@@ -0,0 +1,3 @@
+New FFI-based Lua API for ngx_http_lua_module and/or ngx_stream_lua_module
+
+WWW: https://github.com/openresty/lua-resty-core
diff --git a/www/lua-resty-core/pkg-plist b/www/lua-resty-core/pkg-plist
new file mode 100644
index 000000000000..ce3c9efb5e32
--- /dev/null
+++ b/www/lua-resty-core/pkg-plist
@@ -0,0 +1,29 @@
+%%LUA_MODSHAREDIR%%/ngx/balancer.lua
+%%LUA_MODSHAREDIR%%/ngx/base64.lua
+%%LUA_MODSHAREDIR%%/ngx/errlog.lua
+%%LUA_MODSHAREDIR%%/ngx/ocsp.lua
+%%LUA_MODSHAREDIR%%/ngx/pipe.lua
+%%LUA_MODSHAREDIR%%/ngx/process.lua
+%%LUA_MODSHAREDIR%%/ngx/re.lua
+%%LUA_MODSHAREDIR%%/ngx/resp.lua
+%%LUA_MODSHAREDIR%%/ngx/semaphore.lua
+%%LUA_MODSHAREDIR%%/ngx/ssl.lua
+%%LUA_MODSHAREDIR%%/ngx/ssl/session.lua
+%%LUA_MODSHAREDIR%%/resty/core.lua
+%%LUA_MODSHAREDIR%%/resty/core/base.lua
+%%LUA_MODSHAREDIR%%/resty/core/base64.lua
+%%LUA_MODSHAREDIR%%/resty/core/ctx.lua
+%%LUA_MODSHAREDIR%%/resty/core/exit.lua
+%%LUA_MODSHAREDIR%%/resty/core/hash.lua
+%%LUA_MODSHAREDIR%%/resty/core/misc.lua
+%%LUA_MODSHAREDIR%%/resty/core/ndk.lua
+%%LUA_MODSHAREDIR%%/resty/core/phase.lua
+%%LUA_MODSHAREDIR%%/resty/core/regex.lua
+%%LUA_MODSHAREDIR%%/resty/core/request.lua
+%%LUA_MODSHAREDIR%%/resty/core/response.lua
+%%LUA_MODSHAREDIR%%/resty/core/shdict.lua
+%%LUA_MODSHAREDIR%%/resty/core/time.lua
+%%LUA_MODSHAREDIR%%/resty/core/uri.lua
+%%LUA_MODSHAREDIR%%/resty/core/utils.lua
+%%LUA_MODSHAREDIR%%/resty/core/var.lua
+%%LUA_MODSHAREDIR%%/resty/core/worker.lua
diff --git a/www/lua-resty-lrucache/Makefile b/www/lua-resty-lrucache/Makefile
new file mode 100644
index 000000000000..c6c640599512
--- /dev/null
+++ b/www/lua-resty-lrucache/Makefile
@@ -0,0 +1,30 @@
+# $FreeBSD$
+
+PORTNAME= lua-resty-lrucache
+PORTVERSION= 0.09
+DISTVERSIONPREFIX=v
+CATEGORIES= www
+
+MAINTAINER= dmitry.wagin@ya.ru
+COMMENT= Lua-land LRU cache based on the LuaJIT FFI
+
+LICENSE= BSD2CLAUSE
+
+RUN_DEPENDS= luajit-openresty>=2.1:lang/luajit-openresty
+
+USE_GITHUB= yes
+GH_ACCOUNT= openresty
+
+NO_ARCH= yes
+NO_BUILD= yes
+
+LUA_MODSHAREDIR=${LOCALBASE}/share/lua/5.1
+
+PLIST_FILES+= ${LUA_MODSHAREDIR}/resty/lrucache.lua \
+ ${LUA_MODSHAREDIR}/resty/lrucache/pureffi.lua
+
+do-install:
+ @${MKDIR} ${STAGEDIR}${LUA_MODSHAREDIR}
+ @(cd ${WRKSRC}/lib && ${COPYTREE_SHARE} . ${STAGEDIR}${LUA_MODSHAREDIR} "-name *\.lua")
+
+.include <bsd.port.mk>
diff --git a/www/lua-resty-lrucache/distinfo b/www/lua-resty-lrucache/distinfo
new file mode 100644
index 000000000000..30024fc34e45
--- /dev/null
+++ b/www/lua-resty-lrucache/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1566944480
+SHA256 (openresty-lua-resty-lrucache-v0.09_GH0.tar.gz) = 42f0384f80b6a9b4f42f91ee688baf69165d0573347e6ea84ebed95e928211d7
+SIZE (openresty-lua-resty-lrucache-v0.09_GH0.tar.gz) = 14954
diff --git a/www/lua-resty-lrucache/pkg-descr b/www/lua-resty-lrucache/pkg-descr
new file mode 100644
index 000000000000..88b8add4e2d6
--- /dev/null
+++ b/www/lua-resty-lrucache/pkg-descr
@@ -0,0 +1,3 @@
+Lua-land LRU cache based on the LuaJIT FFI
+
+WWW: https://github.com/openresty/lua-resty-lrucache
diff --git a/www/mgstat/Makefile b/www/mgstat/Makefile
index a3bf96fd7c87..2ba5c8c11af1 100644
--- a/www/mgstat/Makefile
+++ b/www/mgstat/Makefile
@@ -11,6 +11,8 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Produce graphs from mod_gzip log files
BROKEN= unfetchable
+DEPRECATED= Unfetchable, unmaintained
+EXPIRATION_DATE= 2019-10-16
LIB_DEPENDS= libgd.so:graphics/gd
diff --git a/www/midori/Makefile b/www/midori/Makefile
index 0bbc4081e6f3..dd08174d41ac 100644
--- a/www/midori/Makefile
+++ b/www/midori/Makefile
@@ -25,7 +25,7 @@ LIB_DEPENDS= libnotify.so:devel/libnotify \
RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
USES= cmake compiler:c++11-lang desktop-file-utils gettext gnome \
- libarchive localbase:ldflags pkgconfig sqlite tar:bzip2
+ libarchive localbase:ldflags pkgconfig sqlite tar:bzip2 xorg
USE_GNOME= cairo glib20 gtk30 intltool introspection libxml2
USE_XORG= xscrnsaver
diff --git a/www/mod_php74/Makefile b/www/mod_php74/Makefile
new file mode 100644
index 000000000000..64d364d364d0
--- /dev/null
+++ b/www/mod_php74/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+CATEGORIES= www devel
+PKGNAMEPREFIX= mod_
+
+MAINTAINER= ports@FreeBSD.org
+
+PHP_PORT= lang/php74
+MASTERDIR= ${.CURDIR}/../../${PHP_PORT}
+
+OPTIONS_DEFINE= AP2FILTER
+AP2FILTER_DESC= Use Apache 2.x filter interface (experimental)
+OPTIONS_EXCLUDE=CGI CLI FPM EMBED
+
+.include "${MASTERDIR}/Makefile"
diff --git a/www/mod_scgi/Makefile b/www/mod_scgi/Makefile
index 8115c7f76722..70faae182a9c 100644
--- a/www/mod_scgi/Makefile
+++ b/www/mod_scgi/Makefile
@@ -2,28 +2,23 @@
# $FreeBSD$
PORTNAME= mod_scgi
-PORTVERSION= 1.15
+PORTVERSION= 2.0
CATEGORIES= www
MASTER_SITES= http://python.ca/scgi/releases/
DISTNAME= scgi-${PORTVERSION:S/.a/a/}
-MAINTAINER= w.schwarzenfeld@aon.at
+MAINTAINER= w.schwarzenfeld@utanet.at
COMMENT= Apache module that implements the client side of the SCGI protocol
LICENSE= MIT
LICENSE_FILE= ${WRKDIR}/${DISTNAME}/LICENSE.txt
+USES= apache:2.4
+
SCGI_DIR= apache2
WRKSRC= ${WRKDIR}/${DISTNAME}/${SCGI_DIR}
-USES= apache:2.2+
AP_FAST_BUILD= yes
AP_GENPLIST= yes
-.include <bsd.port.pre.mk>
-
-.if ${APACHE_VERSION} == 2.4
-EXTRA_PATCHES= ${FILESDIR}/apache24-compat-mod__scgi.c
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/mod_scgi/distinfo b/www/mod_scgi/distinfo
index cfd29957edd0..ac375c917643 100644
--- a/www/mod_scgi/distinfo
+++ b/www/mod_scgi/distinfo
@@ -1,2 +1,3 @@
-SHA256 (scgi-1.15.tar.gz) = e6cd197b089cca6478e9995ed076975756c30ebb903aabce912f404ee75a6d6f
-SIZE (scgi-1.15.tar.gz) = 32984
+TIMESTAMP = 1568303948
+SHA256 (scgi-2.0.tar.gz) = fc59ec13cb989d14216e78426a2f84bd3d46f712a35bca0f4806cd3c38050a72
+SIZE (scgi-2.0.tar.gz) = 32726
diff --git a/www/mod_scgi/files/apache24-compat-mod__scgi.c b/www/mod_scgi/files/apache24-compat-mod__scgi.c
deleted file mode 100644
index 21b1cfefa91f..000000000000
--- a/www/mod_scgi/files/apache24-compat-mod__scgi.c
+++ /dev/null
@@ -1,49 +0,0 @@
---- mod_scgi.c.orig 2009-11-21 23:02:06 UTC
-+++ mod_scgi.c
-@@ -135,16 +135,16 @@ static int scgi_map_location(request_rec
- return DECLINED;
- }
-
--static void log_err(const char *file, int line, request_rec *r,
-+static void log_err(const char *file, int line, int index, request_rec *r,
- apr_status_t status, const char *msg)
- {
-- ap_log_rerror(file, line, APLOG_ERR, status, r, "scgi: %s", msg);
-+ ap_log_rerror(file, line, index, APLOG_ERR, status, r, "scgi: %s", msg);
- }
-
--static void log_debug(const char *file, int line, request_rec *r, const
-+static void log_debug(const char *file, int line, int index, request_rec *r, const
- char *msg)
- {
-- ap_log_rerror(file, line, APLOG_DEBUG, APR_SUCCESS, r, msg);
-+ ap_log_rerror(file, line, index, APLOG_DEBUG, APR_SUCCESS, r, "%s", msg);
- }
-
- static char *http2env(apr_pool_t *p, const char *name)
-@@ -312,7 +312,7 @@ send_headers(request_rec *r, struct sock
- int i;
- apr_status_t rv = 0;
- apr_port_t port = 0;
-- GET_PORT(port, r->connection->remote_addr);
-+ GET_PORT(port, r->useragent_addr);
-
- log_debug(APLOG_MARK,r, "sending headers");
- t = apr_table_make(r->pool, 40);
-@@ -324,14 +324,14 @@ send_headers(request_rec *r, struct sock
- buf = "0";
- add_header(t, "CONTENT_LENGTH", buf);
- add_header(t, "SCGI", SCGI_PROTOCOL_VERSION);
-- add_header(t, "SERVER_SOFTWARE", ap_get_server_version());
-+ add_header(t, "SERVER_SOFTWARE", ap_get_server_banner());
- add_header(t, "SERVER_PROTOCOL", r->protocol);
- add_header(t, "SERVER_NAME", ap_get_server_name(r));
- add_header(t, "SERVER_ADMIN", r->server->server_admin);
- add_header(t, "SERVER_ADDR", r->connection->local_ip);
- add_header(t, "SERVER_PORT", apr_psprintf(r->pool, "%u",
- ap_get_server_port(r)));
-- add_header(t, "REMOTE_ADDR", r->connection->remote_ip);
-+ add_header(t, "REMOTE_ADDR", r->useragent_ip);
- add_header(t, "REMOTE_PORT", apr_psprintf(r->pool, "%d", port));
- add_header(t, "REMOTE_USER", r->user);
- add_header(t, "REQUEST_METHOD", r->method);
diff --git a/www/netsurf/Makefile b/www/netsurf/Makefile
index b68819d4533d..958d10a2606a 100644
--- a/www/netsurf/Makefile
+++ b/www/netsurf/Makefile
@@ -3,6 +3,7 @@
PORTNAME= netsurf
PORTVERSION= 3.9
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= http://download.netsurf-browser.org/netsurf/releases/source/
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
@@ -20,7 +21,7 @@ BUILD_DEPENDS= duk:lang/duktape \
LIB_DEPENDS= libcurl.so:ftp/curl \
libpng.so:graphics/png \
libnsutils.so:devel/libnsutils \
- libutf8proc.so:textproc/libutf8proc \
+ libutf8proc.so:textproc/utf8proc \
libnsgif.so:graphics/libnsgif \
libnsbmp.so:graphics/libnsbmp \
libdom.so:www/libdom \
diff --git a/www/netsurf/files/patch-utils_idna.c b/www/netsurf/files/patch-utils_idna.c
new file mode 100644
index 000000000000..4e628c279dd3
--- /dev/null
+++ b/www/netsurf/files/patch-utils_idna.c
@@ -0,0 +1,11 @@
+--- utils/idna.c.orig 2019-09-15 12:06:06.236299000 +0200
++++ utils/idna.c 2019-09-15 12:06:07.393935000 +0200
+@@ -27,7 +27,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <sys/types.h>
+-#include <libutf8proc/utf8proc.h>
++#include <utf8proc.h>
+
+ #include "netsurf/inttypes.h"
+
diff --git a/www/newsboat/Makefile b/www/newsboat/Makefile
index efd848b29485..f45196e580ce 100644
--- a/www/newsboat/Makefile
+++ b/www/newsboat/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= newsboat
-PORTVERSION= 2.16.1
-PORTREVISION= 3
+PORTVERSION= 2.17
CATEGORIES= www
MASTER_SITES= https://newsboat.org/releases/${PORTVERSION}/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
@@ -68,6 +67,7 @@ CARGO_CRATES= aho-corasick-0.6.9 \
lock_api-0.1.5 \
matches-0.1.8 \
memchr-2.1.3 \
+ natord-1.0.9 \
nodrop-0.1.13 \
nom-4.2.3 \
num-integer-0.1.39 \
@@ -108,6 +108,7 @@ CARGO_CRATES= aho-corasick-0.6.9 \
rusty-fork-0.2.1 \
scoped_threadpool-0.1.9 \
scopeguard-0.3.3 \
+ section_testing-0.0.4 \
semver-0.9.0 \
semver-parser-0.7.0 \
smallvec-0.6.8 \
@@ -134,7 +135,8 @@ CARGO_CRATES= aho-corasick-0.6.9 \
winapi-0.3.6 \
winapi-build-0.1.1 \
winapi-i686-pc-windows-gnu-0.4.0 \
- winapi-x86_64-pc-windows-gnu-0.4.0
+ winapi-x86_64-pc-windows-gnu-0.4.0 \
+ xdg-2.2.0
OPTIONS_DEFINE= DOCS
@@ -144,9 +146,6 @@ post-patch:
${WRKSRC}/config.sh
@${REINPLACE_CMD} -e 's|-liconv|${ICONV_LIB} -lcrypto -lncursesw|;s|-Werror||' \
${WRKSRC}/Makefile
-# Tries to run git to export GIT_HASH env variable. This is not
-# needed for release versions per rust/libnewsboat/src/utils.rs
- @${RM} ${WRKSRC}/rust/libnewsboat/build.rs
post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*boat
diff --git a/www/newsboat/distinfo b/www/newsboat/distinfo
index a6b0fa23fa6c..f9950c16a441 100644
--- a/www/newsboat/distinfo
+++ b/www/newsboat/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1561578609
-SHA256 (newsboat-2.16.1.tar.xz) = 4023c817b36fc08a3191283eec2c7161949c0727633f60ad837e11c599d3ad53
-SIZE (newsboat-2.16.1.tar.xz) = 546676
+TIMESTAMP = 1569167688
+SHA256 (newsboat-2.17.tar.xz) = 88c3f73b676f5fc52a0c935922eb520b463b388c7ef2325e67d847bee41efa79
+SIZE (newsboat-2.17.tar.xz) = 569476
SHA256 (rust/crates/aho-corasick-0.6.9.tar.gz) = 1e9a933f4e58658d7b12defcf96dc5c720f20832deebe3e0a19efd3b6aaeeb9e
SIZE (rust/crates/aho-corasick-0.6.9.tar.gz) = 25979
SHA256 (rust/crates/argon2rs-0.2.5.tar.gz) = 3f67b0b6a86dae6e67ff4ca2b6201396074996379fba2b92ff649126f37cb392
@@ -69,6 +69,8 @@ SHA256 (rust/crates/matches-0.1.8.tar.gz) = 7ffc5c5338469d4d3ea17d269fa8ea3512ad
SIZE (rust/crates/matches-0.1.8.tar.gz) = 2216
SHA256 (rust/crates/memchr-2.1.3.tar.gz) = e1dd4eaac298c32ce07eb6ed9242eda7d82955b9170b7d6db59b2e02cc63fcb8
SIZE (rust/crates/memchr-2.1.3.tar.gz) = 20069
+SHA256 (rust/crates/natord-1.0.9.tar.gz) = 308d96db8debc727c3fd9744aac51751243420e46edf401010908da7f8d5e57c
+SIZE (rust/crates/natord-1.0.9.tar.gz) = 3866
SHA256 (rust/crates/nodrop-0.1.13.tar.gz) = 2f9667ddcc6cc8a43afc9b7917599d7216aa09c463919ea32c59ed6cac8bc945
SIZE (rust/crates/nodrop-0.1.13.tar.gz) = 7508
SHA256 (rust/crates/nom-4.2.3.tar.gz) = 2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6
@@ -149,6 +151,8 @@ SHA256 (rust/crates/scoped_threadpool-0.1.9.tar.gz) = 1d51f5df5af43ab3f1360b429f
SIZE (rust/crates/scoped_threadpool-0.1.9.tar.gz) = 7800
SHA256 (rust/crates/scopeguard-0.3.3.tar.gz) = 94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27
SIZE (rust/crates/scopeguard-0.3.3.tar.gz) = 9605
+SHA256 (rust/crates/section_testing-0.0.4.tar.gz) = ece4d7d98fdab75ddff5c4fad54a4c7ad0222a13c8a3c6859f1037a1d9e53f28
+SIZE (rust/crates/section_testing-0.0.4.tar.gz) = 4362
SHA256 (rust/crates/semver-0.9.0.tar.gz) = 1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403
SIZE (rust/crates/semver-0.9.0.tar.gz) = 17344
SHA256 (rust/crates/semver-parser-0.7.0.tar.gz) = 388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3
@@ -203,3 +207,5 @@ SHA256 (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.tar.gz) = ac3b87c63620426dd
SIZE (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.tar.gz) = 2918815
SHA256 (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.tar.gz) = 712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f
SIZE (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.tar.gz) = 2947998
+SHA256 (rust/crates/xdg-2.2.0.tar.gz) = d089681aa106a86fade1b0128fb5daf07d5867a509ab036d99988dec80429a57
+SIZE (rust/crates/xdg-2.2.0.tar.gz) = 13387
diff --git a/www/nextcloud-calendar/Makefile b/www/nextcloud-calendar/Makefile
index 2e61db90fd47..66dda7aba9dc 100644
--- a/www/nextcloud-calendar/Makefile
+++ b/www/nextcloud-calendar/Makefile
@@ -19,6 +19,7 @@ LICENSE= AGPLv3
RUN_DEPENDS= nextcloud${PHP_PKGNAMESUFFIX}>=15.9:www/nextcloud@${PHP_FLAVOR}
USES= php:flavors
+IGNORE_WITH_PHP= 74
NO_BUILD= yes
NO_ARCH= yes
diff --git a/www/nextcloud-contacts/Makefile b/www/nextcloud-contacts/Makefile
index 85e9dbb625b8..c3f08a24c49a 100644
--- a/www/nextcloud-contacts/Makefile
+++ b/www/nextcloud-contacts/Makefile
@@ -20,6 +20,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
RUN_DEPENDS= nextcloud${PHP_PKGNAMESUFFIX}>=15:www/nextcloud@${PHP_FLAVOR}
USES= php:flavors
+IGNORE_WITH_PHP= 74
NO_BUILD= yes
NO_ARCH= yes
diff --git a/www/nextcloud-notes/Makefile b/www/nextcloud-notes/Makefile
index 0bb06f8c3a7b..588139a19414 100644
--- a/www/nextcloud-notes/Makefile
+++ b/www/nextcloud-notes/Makefile
@@ -19,6 +19,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
RUN_DEPENDS= nextcloud${PHP_PKGNAMESUFFIX}>=15:www/nextcloud@${PHP_FLAVOR}
USES= php:flavors
+IGNORE_WITH_PHP= 74
NO_BUILD= yes
NO_ARCH= yes
diff --git a/www/nextcloud-tasks/Makefile b/www/nextcloud-tasks/Makefile
index 65fdd6d99b87..70faf9a55a1b 100644
--- a/www/nextcloud-tasks/Makefile
+++ b/www/nextcloud-tasks/Makefile
@@ -20,6 +20,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
RUN_DEPENDS= nextcloud${PHP_PKGNAMESUFFIX}>=15:www/nextcloud@${PHP_FLAVOR}
USES= php:flavors
+IGNORE_WITH_PHP= 74
NO_BUILD= yes
NO_ARCH= yes
diff --git a/www/nextcloud/Makefile b/www/nextcloud/Makefile
index 802a709f0abe..51df4ab6982a 100644
--- a/www/nextcloud/Makefile
+++ b/www/nextcloud/Makefile
@@ -15,6 +15,7 @@ USES= cpe gettext-runtime php:flavors,web tar:bzip2
USE_PHP= bz2 ctype curl dom fileinfo filter gd hash iconv json \
mbstring pdo posix session simplexml xml xmlreader xmlwriter \
xsl wddx zip zlib
+IGNORE_WITH_PHP= 74
NEXTCLOUD_USERNAME?= ${WWWOWN}
NEXTCLOUD_GROUPNAME?= ${WWWGRP}
diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index 8b30fe4777ae..4a1ecc3c104a 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -3,7 +3,7 @@
PORTNAME= nginx
PORTVERSION= 1.17.3
-PORTREVISION= 1
+PORTREVISION= 3
CATEGORIES= www
MASTER_SITES= https://nginx.org/download/ \
LOCAL/osa
@@ -70,21 +70,23 @@ OPTIONS_GROUP= MAILGRP HTTPGRP
OPTIONS_GROUP_HTTPGRP= GOOGLE_PERFTOOLS HTTP HTTP_ADDITION HTTP_AUTH_REQ \
HTTP_CACHE HTTP_DAV HTTP_FLV HTTP_GUNZIP_FILTER HTTP_GZIP_STATIC \
HTTP_IMAGE_FILTER HTTP_MP4 HTTP_PERL HTTP_RANDOM_INDEX HTTP_REALIP \
- HTTP_REWRITE HTTP_SECURE_LINK HTTP_SLICE HTTP_SSL HTTP_STATUS HTTP_SUB \
- HTTP_XSLT HTTPV2 STREAM STREAM_SSL STREAM_SSL_PREREAD
+ HTTP_REWRITE HTTP_SECURE_LINK HTTP_SLICE HTTP_SLICE_AHEAD \
+ HTTP_SSL HTTP_STATUS HTTP_SUB HTTP_XSLT HTTPV2 STREAM STREAM_SSL \
+ STREAM_SSL_PREREAD
# External modules (arrayvar MUST appear after devel_kit for build-dep)
OPTIONS_GROUP_HTTPGRP+= AJP AWS_AUTH BROTLI CACHE_PURGE CLOJURE CT DEVEL_KIT \
ARRAYVAR DRIZZLE DYNAMIC_UPSTREAM ECHO ENCRYPTSESSION FASTDFS FORMINPUT \
GRIDFS HEADERS_MORE HTTP_ACCEPT_LANGUAGE HTTP_AUTH_DIGEST HTTP_AUTH_KRB5 \
HTTP_AUTH_LDAP HTTP_AUTH_PAM HTTP_DAV_EXT HTTP_EVAL HTTP_FANCYINDEX \
- HTTP_FOOTER HTTP_GEOIP2 HTTP_JSON_STATUS HTTP_MOGILEFS HTTP_MP4_H264 \
- HTTP_NOTICE HTTP_PUSH HTTP_PUSH_STREAM HTTP_REDIS HTTP_RESPONSE \
- HTTP_SUBS_FILTER HTTP_TARANTOOL HTTP_UPLOAD HTTP_UPLOAD_PROGRESS \
- HTTP_UPSTREAM_CHECK HTTP_UPSTREAM_FAIR HTTP_UPSTREAM_STICKY \
- HTTP_VIDEO_THUMBEXTRACTOR HTTP_ZIP ICONV LET LUA MEMC MODSECURITY \
- MODSECURITY3 NAXSI NJS PASSENGER POSTGRES RDS_CSV RDS_JSON REDIS2 RTMP \
- SET_MISC SFLOW SHIBBOLETH SLOWFS_CACHE SMALL_LIGHT SRCACHE VOD VTS XSS
+ HTTP_FOOTER HTTP_GEOIP2 HTTP_IP2LOCATION HTTP_IP2PROXY HTTP_JSON_STATUS \
+ HTTP_MOGILEFS HTTP_MP4_H264 HTTP_NOTICE HTTP_PUSH HTTP_PUSH_STREAM \
+ HTTP_REDIS HTTP_RESPONSE HTTP_SUBS_FILTER HTTP_TARANTOOL HTTP_UPLOAD \
+ HTTP_UPLOAD_PROGRESS HTTP_UPSTREAM_CHECK HTTP_UPSTREAM_FAIR \
+ HTTP_UPSTREAM_STICKY HTTP_VIDEO_THUMBEXTRACTOR HTTP_ZIP ICONV LET LUA \
+ MEMC MODSECURITY MODSECURITY3 NAXSI NJS PASSENGER POSTGRES RDS_CSV \
+ RDS_JSON REDIS2 RTMP SET_MISC SFLOW SHIBBOLETH SLOWFS_CACHE \
+ SMALL_LIGHT SRCACHE VOD VTS XSS WEBSOCKIFY
OPTIONS_GROUP_MAILGRP= MAIL MAIL_IMAP MAIL_POP3 MAIL_SMTP MAIL_SSL
OPTIONS_DEFINE= DEBUG DEBUGLOG DSO FILE_AIO IPV6 THREADS WWW
OPTIONS_DEFAULT?= DSO FILE_AIO HTTP HTTP_ADDITION HTTP_AUTH_REQ HTTP_CACHE \
diff --git a/www/nginx-devel/Makefile.extmod b/www/nginx-devel/Makefile.extmod
index 68f2ff20de0f..13d46a655255 100644
--- a/www/nginx-devel/Makefile.extmod
+++ b/www/nginx-devel/Makefile.extmod
@@ -108,6 +108,14 @@ HTTP_GEOIP2_CFLAGS= -I${LOCALBASE}/include
HTTP_GEOIP2_VARS= DSO_EXTMODS+=geoip2
HTTP_GEOIP2_LIB_DEPENDS= libmaxminddb.so:net/libmaxminddb
+HTTP_IP2LOCATION_GH_TUPLE= ip2location:ip2location-nginx:d47d248:ip2location
+HTTP_IP2LOCATION_LIB_DEPENDS= libIP2Location.so:net/ip2location
+HTTP_IP2LOCATION_CONFIGURE_ON= --add-module=${WRKSRC_ip2location}
+
+HTTP_IP2PROXY_GH_TUPLE= ip2location:ip2proxy-nginx:d6fd05a:ip2proxy
+HTTP_IP2PROXY_LIB_DEPENDS= libIP2Proxy.so:net/ip2proxy
+HTTP_IP2PROXY_CONFIGURE_ON= --add-module=${WRKSRC_ip2proxy}
+
HTTP_JSON_STATUS_GH_TUPLE= nginx-modules:ngx_http_json_status_module:1d2f303:json_status
HTTP_JSON_STATUS_CONFIGURE_ON= --add-module=${WRKSRC_json_status}
@@ -139,6 +147,8 @@ HTTP_RESPONSE_MASTER_SITES= http://catap.ru/downloads/nginx/:response
HTTP_RESPONSE_DISTFILES= ngx_http_response-0.3.tar.gz:response
HTTP_RESPONSE_CONFIGURE_ON= --add-module=${WRKDIR}/ngx_http_response-0.3
+HTTP_SLICE_AHEAD_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src_http_modules_ngx_http_slice_read_ahead.c
+
HTTP_SUBS_FILTER_GH_TUPLE= yaoweibin:ngx_http_substitutions_filter_module:v0.6.4:subs_filter
HTTP_SUBS_FILTER_CONFIGURE_ON= --add-module=${WRKSRC_subs_filter}
@@ -190,8 +200,8 @@ LET_GH_TUPLE= arut:nginx-let-module:v0.0.4:let
LET_CONFIGURE_ON= --add-module=${WRKSRC_let}
LUA_IMPLIES= DEVEL_KIT
-LUA_LIB_DEPENDS= libluajit-5.1.so:lang/luajit
-LUA_CONFIGURE_ENV= LUAJIT_INC=${LOCALBASE}/include/luajit-2.0 \
+LUA_LIB_DEPENDS= libluajit-5.1.so:lang/luajit-openresty
+LUA_CONFIGURE_ENV= LUAJIT_INC=${LOCALBASE}/include/luajit-2.1 \
LUAJIT_LIB=${LOCALBASE}/lib
LUA_GH_TUPLE= openresty:lua-nginx-module:v0.10.15:lua
LUA_VARS= DSO_EXTMODS+=lua
@@ -223,7 +233,7 @@ NAXSI_VARS= DSO_EXTMODS+=naxsi NAXSI_SUBDIR=/naxsi_src
NJS_GH_TUPLE= nginx:njs:0.3.5:njs
NJS_VARS= DSO_EXTMODS+=njs NJS_SUBDIR=/nginx
-PASSENGER_NGINX_VER= 6.0.2
+PASSENGER_NGINX_VER= 6.0.4
PASSENGER_CATEGORIES= ruby
PASSENGER_USE= ruby=yes
PASSENGER_BUILD_DEPENDS=${LOCALBASE}/bin/rake:devel/rubygem-rake
@@ -288,3 +298,6 @@ VTS_CONFIGURE_ON= --add-module=${WRKSRC_vts}
XSS_GH_TUPLE= openresty:xss-nginx-module:v0.05:xss
XSS_CONFIGURE_ON= --add-module=${WRKSRC_xss}
+
+WEBSOCKIFY_GH_TUPLE= tg123:websockify-nginx-module:e82d254:websockify
+WEBSOCKIFY_CONFIGURE_ON= --add-module=${WRKSRC_websockify}
diff --git a/www/nginx-devel/Makefile.options.desc b/www/nginx-devel/Makefile.options.desc
index 6e4400eed05c..43309bc83e72 100644
--- a/www/nginx-devel/Makefile.options.desc
+++ b/www/nginx-devel/Makefile.options.desc
@@ -43,6 +43,8 @@ HTTP_GEOIP2_DESC= 3rd party geoip2 module
HTTP_GUNZIP_FILTER_DESC= Enable http_gunzip_filter module
HTTP_GZIP_STATIC_DESC= Enable http_gzip_static module
HTTP_IMAGE_FILTER_DESC= Enable http_image_filter module
+HTTP_IP2LOCATION_DESC= 3rd party ip2location-nginx module
+HTTP_IP2PROXY_DESC= 3rd party ip2proxy-nginx module
HTTP_JSON_STATUS_DESC= 3rd party http_json_status module
HTTP_MOGILEFS_DESC= 3rd party mogilefs module
HTTP_MP4_DESC= Enable http_mp4 module
@@ -58,6 +60,7 @@ HTTP_RESPONSE_DESC= 3rd party http_response module
HTTP_REWRITE_DESC= Enable http_rewrite module
HTTP_SECURE_LINK_DESC= Enable http_secure_link module
HTTP_SLICE_DESC= Enable http_slice module
+HTTP_SLICE_AHEAD_DESC= 3rd party http_slice_ahead module
HTTP_SSL_DESC= Enable http_ssl module
HTTP_STATUS_DESC= Enable http_stub_status module
HTTP_SUBS_FILTER_DESC= 3rd party subs filter module
@@ -107,3 +110,4 @@ VOD_DESC= 3rd party vod module
VTS_DESC= 3rd party vts module
WWW_DESC= Enable html sample files
XSS_DESC= 3rd party xss module
+WEBSOCKIFY_DESC= 3rd party websockify module
diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo
index 818996caf71d..2f845a4f6c39 100644
--- a/www/nginx-devel/distinfo
+++ b/www/nginx-devel/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1566256984
+TIMESTAMP = 1568811851
SHA256 (nginx-1.17.3.tar.gz) = 3b84fe1c2cf9ca22fde370e486a9ab16b6427df1b6ea62cdb61978c9f34d0f3c
SIZE (nginx-1.17.3.tar.gz) = 1034586
SHA256 (ngx_cache_purge-2.3.tar.gz) = 279e0d8a46d3b1521fd43b3f78bc1c08b263899142a7cc5058c1c0361a92c89c
@@ -13,8 +13,8 @@ SHA256 (ngx_http_response-0.3.tar.gz) = 0835584029f053051c624adbe33a826ab0205c9d
SIZE (ngx_http_response-0.3.tar.gz) = 2244
SHA256 (modsecurity-2.9.3.tar.gz) = 4192019d169d3f1dd82cc4714db6986df54c6ceb4ee1c8f253de78d1a6b62118
SIZE (modsecurity-2.9.3.tar.gz) = 4307670
-SHA256 (passenger-6.0.2.tar.gz) = 56b2273312e6dc9880f6ba83e381583b8759085a0b41338b782c9575d58346bc
-SIZE (passenger-6.0.2.tar.gz) = 7204982
+SHA256 (passenger-6.0.4.tar.gz) = ec1e4b555c176642c1c316897177d54b6f7d369490280e8ee3e54644e40b250b
+SIZE (passenger-6.0.4.tar.gz) = 7347803
SHA256 (ngx_slowfs_cache-1.10.tar.gz) = 1e81453942e5b0877de1f1f06c56ae82918ea9818255cb935bcb673c95a758a1
SIZE (ngx_slowfs_cache-1.10.tar.gz) = 11809
SHA256 (yaoweibin-nginx_ajp_module-bf6cd93_GH0.tar.gz) = 9e3f78ea73e2d606a95ee64fd3affa4c249f9b342e66b6b11b63061791f28316
@@ -69,6 +69,10 @@ SHA256 (alibaba-nginx-http-footer-filter-1.2.2_GH0.tar.gz) = 3493b54460c59370f9f
SIZE (alibaba-nginx-http-footer-filter-1.2.2_GH0.tar.gz) = 3934
SHA256 (leev-ngx_http_geoip2_module-3.2_GH0.tar.gz) = 15bd1005228cf2c869a6f09e8c41a6aaa6846e4936c473106786ae8ac860fab7
SIZE (leev-ngx_http_geoip2_module-3.2_GH0.tar.gz) = 8465
+SHA256 (ip2location-ip2location-nginx-d47d248_GH0.tar.gz) = ae45341c361fb4ab11f8415c5d85b51ea1aa1027f8ab4fa9524df2074080bb9c
+SIZE (ip2location-ip2location-nginx-d47d248_GH0.tar.gz) = 5542
+SHA256 (ip2location-ip2proxy-nginx-d6fd05a_GH0.tar.gz) = 7b8df48216cd258d770b084b1768d6963a1ec850a748944f896098ce0fa0d993
+SIZE (ip2location-ip2proxy-nginx-d6fd05a_GH0.tar.gz) = 4573
SHA256 (nginx-modules-ngx_http_json_status_module-1d2f303_GH0.tar.gz) = fdc34e0e712d28f4452ce3858ba05a38cc00703f14502095189c4a1063a36997
SIZE (nginx-modules-ngx_http_json_status_module-1d2f303_GH0.tar.gz) = 6736
SHA256 (kr-nginx-notice-3c95966_GH0.tar.gz) = e829fc94178cc8c91fef15a1fc44ee7ac162c13eddc0bba4c9427aaa23386885
@@ -133,5 +137,7 @@ SHA256 (kaltura-nginx-vod-module-1.23_GH0.tar.gz) = 800cf3de639567e27f4cb7552739
SIZE (kaltura-nginx-vod-module-1.23_GH0.tar.gz) = 442053
SHA256 (vozlt-nginx-module-vts-v0.1.18_GH0.tar.gz) = 17ea41d4083f6d1ab1ab83dad9160eeca66867abe16c5a0421f85a39d7c84b65
SIZE (vozlt-nginx-module-vts-v0.1.18_GH0.tar.gz) = 380327
+SHA256 (tg123-websockify-nginx-module-e82d254_GH0.tar.gz) = 1ea0fd35e3bed61c822aa0bfb9329a38d908a602b78a5e5fef9c7e946a26de6b
+SIZE (tg123-websockify-nginx-module-e82d254_GH0.tar.gz) = 14378
SHA256 (openresty-xss-nginx-module-v0.05_GH0.tar.gz) = 958bd8de773601d8d3138501cc4be0420f1c818a3987a70cc9c0023371e432cf
SIZE (openresty-xss-nginx-module-v0.05_GH0.tar.gz) = 11477
diff --git a/www/nginx-devel/files/extra-patch-passenger-build-nginx.rb b/www/nginx-devel/files/extra-patch-passenger-build-nginx.rb
index b3867ebeffdc..ad018bbf0e46 100644
--- a/www/nginx-devel/files/extra-patch-passenger-build-nginx.rb
+++ b/www/nginx-devel/files/extra-patch-passenger-build-nginx.rb
@@ -1,5 +1,5 @@
---- ../passenger-6.0.2/build/nginx.rb.orig 2013-10-26 18:00:00.000000000 -0400
-+++ ../passenger-6.0.2/build/nginx.rb 2016-05-09 18:21:22.426777000 -0400
+--- ../passenger-6.0.4/build/nginx.rb.orig 2013-10-26 18:00:00.000000000 -0400
++++ ../passenger-6.0.4/build/nginx.rb 2016-05-09 18:21:22.426777000 -0400
@@ -33,13 +33,12 @@
desc "Build Nginx support files"
task :nginx => [
diff --git a/www/nginx-devel/files/extra-patch-passenger-disable-telemetry b/www/nginx-devel/files/extra-patch-passenger-disable-telemetry
index b532547abd2a..233b5c9428eb 100644
--- a/www/nginx-devel/files/extra-patch-passenger-disable-telemetry
+++ b/www/nginx-devel/files/extra-patch-passenger-disable-telemetry
@@ -1,5 +1,5 @@
---- ../passenger-6.0.2/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb.orig 2018-12-03 12:23:06.980728000 -0500
-+++ ../passenger-6.0.2/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb 2018-12-03 12:23:32.978924000 -0500
+--- ../passenger-6.0.4/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb.orig 2018-12-03 12:23:06.980728000 -0500
++++ ../passenger-6.0.4/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb 2018-12-03 12:23:32.978924000 -0500
@@ -204,7 +204,7 @@
:name => 'passenger_disable_anonymous_telemetry',
:scope => :global,
diff --git a/www/nginx-devel/files/extra-patch-src_http_modules_ngx_http_slice_read_ahead.c b/www/nginx-devel/files/extra-patch-src_http_modules_ngx_http_slice_read_ahead.c
new file mode 100644
index 000000000000..b9eb1f20a439
--- /dev/null
+++ b/www/nginx-devel/files/extra-patch-src_http_modules_ngx_http_slice_read_ahead.c
@@ -0,0 +1,456 @@
+--- src/http/modules/ngx_http_slice_filter_module.c.orig 2019-04-23 13:12:58 UTC
++++ src/http/modules/ngx_http_slice_filter_module.c
+@@ -2,6 +2,10 @@
+ /*
+ * Copyright (C) Roman Arutyunyan
+ * Copyright (C) Nginx, Inc.
++ * Copyright (C) Carey Gister
++ * Copyright (C) Metapeer, Inc.
++ *
++ * Retrieve slices with an optional look-a-head of N slices where N is a float value.
+ */
+
+
+@@ -9,13 +13,25 @@
+ #include <ngx_core.h>
+ #include <ngx_http.h>
+
++/*
++ * Location Configuration -- size is size of a slice, read_a_heads is number of
++ * blocks to look a head: 0, will not limit the number of blocks. Blocks will be
++ * retrieved as quickly as GETs can be issued and returned.
++ */
+
+ typedef struct {
+ size_t size;
++ float read_a_heads;
+ } ngx_http_slice_loc_conf_t;
+
+
+ typedef struct {
++ size_t requested_bytes;
++ size_t received_bytes;
++ size_t skipped_first_slice;
++} ngx_http_slice_read_a_head_t;
++
++typedef struct {
+ off_t start;
+ off_t end;
+ ngx_str_t range;
+@@ -23,6 +39,7 @@ typedef struct {
+ unsigned last:1;
+ unsigned active:1;
+ ngx_http_request_t *sr;
++ ngx_http_slice_read_a_head_t *read_a_head;
+ } ngx_http_slice_ctx_t;
+
+
+@@ -46,6 +63,8 @@ static char *ngx_http_slice_merge_loc_conf(ngx_conf_t
+ void *child);
+ static ngx_int_t ngx_http_slice_add_variables(ngx_conf_t *cf);
+ static ngx_int_t ngx_http_slice_init(ngx_conf_t *cf);
++static char * ngx_conf_set_float_slot(ngx_conf_t *cf, ngx_command_t *cmd,
++ void *conf);
+
+
+ static ngx_command_t ngx_http_slice_filter_commands[] = {
+@@ -57,6 +76,13 @@ static ngx_command_t ngx_http_slice_filter_commands[]
+ offsetof(ngx_http_slice_loc_conf_t, size),
+ NULL },
+
++ { ngx_string("slice_read_ahead"),
++ NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
++ ngx_conf_set_float_slot,
++ NGX_HTTP_LOC_CONF_OFFSET,
++ offsetof(ngx_http_slice_loc_conf_t, read_a_heads),
++ NULL },
++
+ ngx_null_command
+ };
+
+@@ -102,11 +128,11 @@ static ngx_int_t
+ ngx_http_slice_header_filter(ngx_http_request_t *r)
+ {
+ off_t end;
+- ngx_int_t rc;
++ ngx_int_t rc, rc1;
+ ngx_table_elt_t *h;
+ ngx_http_slice_ctx_t *ctx;
+ ngx_http_slice_loc_conf_t *slcf;
+- ngx_http_slice_content_range_t cr;
++ ngx_http_slice_content_range_t cr, cr1;
+
+ ctx = ngx_http_get_module_ctx(r, ngx_http_slice_filter_module);
+ if (ctx == NULL) {
+@@ -187,6 +213,23 @@ ngx_http_slice_header_filter(ngx_http_request_t *r)
+ rc = ngx_http_next_header_filter(r);
+
+ if (r != r->main) {
++ if (ctx->read_a_head != NULL) {
++ ngx_log_debug5(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
++ "http slice header (subrequest) requested_bytes: %uz, size: %uz, range: %O/%O, end: %O",
++ ctx->read_a_head->requested_bytes, slcf->size, cr.start,
++ cr.end, end);
++
++ if (end != cr.start) {
++ ctx->read_a_head->requested_bytes +=
++ ngx_min(slcf->size,
++ (size_t) end - (size_t) cr.start);
++ }
++
++ ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
++ "http slice header (subrequest) new requested_bytes: %uz, size: %uz",
++ ctx->read_a_head->requested_bytes, slcf->size);
++ }
++
+ return rc;
+ }
+
+@@ -201,8 +244,68 @@ ngx_http_slice_header_filter(ngx_http_request_t *r)
+ ctx->end = r->headers_out.content_offset
+ + r->headers_out.content_length_n;
+
++ /* Update requested bytes for the new chunk. */
++ if (ctx->read_a_head != NULL) {
++ ngx_log_debug4(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
++ "http slice header (main request, partial) requested_bytes: %uz, size: %uz, start/end (%O/%O)",
++ ctx->read_a_head->requested_bytes, slcf->size,
++ ctx->start, ctx->end);
++
++ if (ctx->end != ctx->start) {
++ ctx->read_a_head->requested_bytes +=
++ ngx_min(slcf->size,
++ (size_t) ctx->end - (size_t) ctx->start);
++ }
++
++ ngx_log_debug4(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
++ "http slice header (main request, partial) new requested_bytes: %uz, size: %uz, start/end (%O/%O)",
++ ctx->read_a_head->requested_bytes, slcf->size, ctx->start, ctx->end);
++
++ /* Parse the new Content-Range, which may have been set by the Range
++ filter. If the start changed, then adjust the requested_byte count
++ by the difference between the slice start and the actual start.
++ These bytes will never be received. */
++
++ rc1 = ngx_http_slice_parse_content_range(r, &cr1);
++ ngx_log_debug(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
++ "http slice header (main request, partial): rc1: %d",
++ rc1);
++
++ if (rc1 == NGX_OK) {
++ ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
++ "http slice header (main request, partial new content range) cr1.start: %uz, cr1.end: %uz",
++ cr1.start, cr1.end);
++
++ if (cr1.start != cr.start) {
++ ctx->read_a_head->skipped_first_slice =
++ cr1.start - (slcf->size * (cr1.start / slcf->size));
++
++ ngx_log_debug3(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
++ "http slice header (main request, partial) new cr.start: %uz, initial start: %uz, skipped first slice: %uz",
++ cr1.start, cr.start,
++ ctx->read_a_head->skipped_first_slice);
++ }
++ }
++ }
+ } else {
+ ctx->end = cr.complete_length;
++
++ /* Update the requested bytes for the new chunk. */
++ if (ctx->read_a_head != NULL) {
++ ngx_log_debug4(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
++ "http slice header (main request, full) requested_bytes: %uz, size: %uz, start/end (%O/%O)",
++ ctx->read_a_head->requested_bytes, slcf->size, ctx->start, ctx->end);
++
++ if (ctx->end != ctx->start) {
++ ctx->read_a_head->requested_bytes +=
++ ngx_min(slcf->size,
++ (size_t) ctx->end - (size_t) ctx->start);
++ }
++
++ ngx_log_debug4(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
++ "http slice header (main request, full) new requested_bytes: %uz, size: %uz, start/end (%O/%O)",
++ ctx->read_a_head->requested_bytes, slcf->size, ctx->start, ctx->end);
++ }
+ }
+
+ return rc;
+@@ -216,14 +319,31 @@ ngx_http_slice_body_filter(ngx_http_request_t *r, ngx_
+ ngx_chain_t *cl;
+ ngx_http_slice_ctx_t *ctx;
+ ngx_http_slice_loc_conf_t *slcf;
++ size_t received, read_a_head_window, read_a_head_size;
+
+ ctx = ngx_http_get_module_ctx(r, ngx_http_slice_filter_module);
+
+- if (ctx == NULL || r != r->main) {
++ if (ctx == NULL) {
+ return ngx_http_next_body_filter(r, in);
+ }
+
++ if (r != r->main) {
++ if (ctx->read_a_head != NULL) {
++ received = 0;
++ for (cl = in; cl; cl = cl->next) {
++ received = received + ngx_buf_size(cl->buf);
++ }
++
++ ctx->read_a_head->received_bytes += received;
++ }
++
++ return ngx_http_next_body_filter(r, in);
++ }
++
++ /* For the main request */
++ received = 0;
+ for (cl = in; cl; cl = cl->next) {
++ received = received + ngx_buf_size(cl->buf);
+ if (cl->buf->last_buf) {
+ cl->buf->last_buf = 0;
+ cl->buf->last_in_chain = 1;
+@@ -232,6 +352,10 @@ ngx_http_slice_body_filter(ngx_http_request_t *r, ngx_
+ }
+ }
+
++ if (ctx->read_a_head != NULL) {
++ ctx->read_a_head->received_bytes += received;
++ }
++
+ rc = ngx_http_next_body_filter(r, in);
+
+ if (rc == NGX_ERROR || !ctx->last) {
+@@ -258,6 +382,20 @@ ngx_http_slice_body_filter(ngx_http_request_t *r, ngx_
+ return rc;
+ }
+
++ slcf = ngx_http_get_module_loc_conf(r, ngx_http_slice_filter_module);
++
++ if (ctx->read_a_head != NULL) {
++ read_a_head_size = (size_t) (slcf->size * slcf->read_a_heads);
++ read_a_head_window = r->connection->sent + read_a_head_size;
++
++ if ((r->connection->sent != 0) &&
++ ((read_a_head_window + ctx->read_a_head->skipped_first_slice) < ctx->read_a_head->requested_bytes)) {
++ ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
++ "http slice body filter defer subrequest: returning NGX_AGAIN");
++ return NGX_AGAIN;
++ }
++ }
++
+ if (ngx_http_subrequest(r, &r->uri, &r->args, &ctx->sr, NULL,
+ NGX_HTTP_SUBREQUEST_CLONE)
+ != NGX_OK)
+@@ -267,8 +405,6 @@ ngx_http_slice_body_filter(ngx_http_request_t *r, ngx_
+
+ ngx_http_set_ctx(ctx->sr, ctx, ngx_http_slice_filter_module);
+
+- slcf = ngx_http_get_module_loc_conf(r, ngx_http_slice_filter_module);
+-
+ ctx->range.len = ngx_sprintf(ctx->range.data, "bytes=%O-%O", ctx->start,
+ ctx->start + (off_t) slcf->size - 1)
+ - ctx->range.data;
+@@ -287,6 +423,7 @@ ngx_http_slice_parse_content_range(ngx_http_request_t
+ ngx_http_slice_content_range_t *cr)
+ {
+ off_t start, end, complete_length, cutoff, cutlim;
++ ssize_t len;
+ u_char *p;
+ ngx_table_elt_t *h;
+
+@@ -300,6 +437,7 @@ ngx_http_slice_parse_content_range(ngx_http_request_t
+ }
+
+ p = h->value.data + 6;
++ len = h->value.len - 6;
+
+ cutoff = NGX_MAX_OFF_T_VALUE / 10;
+ cutlim = NGX_MAX_OFF_T_VALUE % 10;
+@@ -308,56 +446,62 @@ ngx_http_slice_parse_content_range(ngx_http_request_t
+ end = 0;
+ complete_length = 0;
+
+- while (*p == ' ') { p++; }
++ while ((*p == ' ') && (len != 0)) { p++; len--; }
+
+- if (*p < '0' || *p > '9') {
++ if ((len == 0) || (*p < '0' || *p > '9')) {
+ return NGX_ERROR;
+ }
+
+- while (*p >= '0' && *p <= '9') {
++ while ((len != 0) && (*p >= '0' && *p <= '9')) {
+ if (start >= cutoff && (start > cutoff || *p - '0' > cutlim)) {
+ return NGX_ERROR;
+ }
+
+ start = start * 10 + (*p++ - '0');
++ len--;
+ }
+
+- while (*p == ' ') { p++; }
++ while ((len != 0) && (*p == ' ')) { p++; len--; }
+
+- if (*p++ != '-') {
++ if ((len == 0) || (*p++ != '-')) {
+ return NGX_ERROR;
+ }
+
+- while (*p == ' ') { p++; }
++ len--;
+
+- if (*p < '0' || *p > '9') {
++ while ((len != 0) && (*p == ' ')) { p++; len--; }
++
++ if ((len == 0) || (*p < '0' || *p > '9')) {
+ return NGX_ERROR;
+ }
+
+- while (*p >= '0' && *p <= '9') {
++ while ((len != 0) && (*p >= '0' && *p <= '9')) {
+ if (end >= cutoff && (end > cutoff || *p - '0' > cutlim)) {
+ return NGX_ERROR;
+ }
+
+ end = end * 10 + (*p++ - '0');
++ len--;
+ }
+
+ end++;
+
+- while (*p == ' ') { p++; }
++ while ((len != 0) && (*p == ' ')) { p++; len--; }
+
+- if (*p++ != '/') {
++ if ((len == 0) || (*p++ != '/')) {
+ return NGX_ERROR;
+ }
+
+- while (*p == ' ') { p++; }
++ len--;
+
+- if (*p != '*') {
++ while ((len != 0) && (*p == ' ')) { p++; len--; }
++
++ if ((len != 0) && (*p != '*')) {
+ if (*p < '0' || *p > '9') {
+ return NGX_ERROR;
+ }
+
+- while (*p >= '0' && *p <= '9') {
++ while ((len != 0) && (*p >= '0' && *p <= '9')) {
+ if (complete_length >= cutoff
+ && (complete_length > cutoff || *p - '0' > cutlim))
+ {
+@@ -365,16 +509,18 @@ ngx_http_slice_parse_content_range(ngx_http_request_t
+ }
+
+ complete_length = complete_length * 10 + (*p++ - '0');
++ len--;
+ }
+
+ } else {
+ complete_length = -1;
+ p++;
++ len--;
+ }
+
+- while (*p == ' ') { p++; }
++ while ((len != 0) && (*p == ' ')) { p++; len--; }
+
+- if (*p != '\0') {
++ if (len != 0) {
+ return NGX_ERROR;
+ }
+
+@@ -390,9 +536,10 @@ static ngx_int_t
+ ngx_http_slice_range_variable(ngx_http_request_t *r,
+ ngx_http_variable_value_t *v, uintptr_t data)
+ {
+- u_char *p;
+- ngx_http_slice_ctx_t *ctx;
+- ngx_http_slice_loc_conf_t *slcf;
++ u_char *p;
++ ngx_http_slice_ctx_t *ctx;
++ ngx_http_slice_loc_conf_t *slcf;
++ ngx_http_slice_read_a_head_t *read_a_head;
+
+ ctx = ngx_http_get_module_ctx(r, ngx_http_slice_filter_module);
+
+@@ -414,6 +561,15 @@ ngx_http_slice_range_variable(ngx_http_request_t *r,
+ return NGX_ERROR;
+ }
+
++ if (slcf->read_a_heads != 0.0) {
++ read_a_head = ngx_pcalloc(r->pool, sizeof(ngx_http_slice_read_a_head_t));
++ if (read_a_head == NULL) {
++ return NGX_ERROR;
++ }
++
++ ctx->read_a_head = read_a_head;
++ }
++
+ ngx_http_set_ctx(r, ctx, ngx_http_slice_filter_module);
+
+ p = ngx_pnalloc(r->pool, sizeof("bytes=-") - 1 + 2 * NGX_OFF_T_LEN);
+@@ -488,6 +644,39 @@ ngx_http_slice_get_start(ngx_http_request_t *r)
+ }
+
+
++static char *
++ngx_conf_set_float_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
++{
++ char *p = conf;
++ float *np;
++ ngx_str_t *value;
++ ngx_conf_post_t *post;
++ ngx_int_t val;
++
++ np = (float *) (p + cmd->offset);
++
++ if (*np != (float) NGX_CONF_UNSET) {
++ return "is duplicate";
++ }
++
++ value = cf->args->elts;
++ val = ngx_atofp(value[1].data, value[1].len, 3);
++
++ *np = (float) val / 1000.0;
++
++ if (*np == (float) NGX_ERROR) {
++ return "invalid number";
++ }
++
++ if (cmd->post) {
++ post = cmd->post;
++ return post->post_handler(cf, post, np);
++ }
++
++ return NGX_CONF_OK;
++}
++
++
+ static void *
+ ngx_http_slice_create_loc_conf(ngx_conf_t *cf)
+ {
+@@ -499,6 +688,7 @@ ngx_http_slice_create_loc_conf(ngx_conf_t *cf)
+ }
+
+ slcf->size = NGX_CONF_UNSET_SIZE;
++ slcf->read_a_heads = (float) NGX_CONF_UNSET;
+
+ return slcf;
+ }
+@@ -511,6 +701,13 @@ ngx_http_slice_merge_loc_conf(ngx_conf_t *cf, void *pa
+ ngx_http_slice_loc_conf_t *conf = child;
+
+ ngx_conf_merge_size_value(conf->size, prev->size, 0);
++ ngx_conf_merge_value(conf->read_a_heads, prev->read_a_heads, 0.0);
++
++ if (conf->read_a_heads < 0.0) {
++ ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "read a head must be >= 0");
++ return NGX_CONF_ERROR;
++ }
++
+
+ return NGX_CONF_OK;
+ }
diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index faeb9f38b032..9c95f9dbe4fc 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -3,7 +3,7 @@
PORTNAME= nginx
PORTVERSION= 1.16.1
-PORTREVISION?= 2
+PORTREVISION?= 4
PORTEPOCH= 2
CATEGORIES= www
MASTER_SITES= https://nginx.org/download/ \
diff --git a/www/nginx/Makefile.extmod b/www/nginx/Makefile.extmod
index e50bc69611ee..dbc1728bd1f3 100644
--- a/www/nginx/Makefile.extmod
+++ b/www/nginx/Makefile.extmod
@@ -236,7 +236,7 @@ NAXSI_VARS= DSO_EXTMODS+=naxsi NAXSI_SUBDIR=/naxsi_src
NJS_GH_TUPLE= nginx:njs:08ccd37:njs
NJS_VARS= DSO_EXTMODS+=njs NJS_SUBDIR=/nginx
-PASSENGER_NGINX_VER= 6.0.2
+PASSENGER_NGINX_VER= 6.0.4
PASSENGER_CATEGORIES= ruby
PASSENGER_USE= ruby=yes
PASSENGER_BUILD_DEPENDS=${LOCALBASE}/bin/rake:devel/rubygem-rake
diff --git a/www/nginx/distinfo b/www/nginx/distinfo
index 5ceec8f18e7a..b2e9720a99cf 100644
--- a/www/nginx/distinfo
+++ b/www/nginx/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1568029112
+TIMESTAMP = 1568874104
SHA256 (nginx-1.16.1.tar.gz) = f11c2a6dd1d3515736f0324857957db2de98be862461b5a542a3ac6188dbe32b
SIZE (nginx-1.16.1.tar.gz) = 1032630
SHA256 (ngx_cache_purge-2.3.tar.gz) = 279e0d8a46d3b1521fd43b3f78bc1c08b263899142a7cc5058c1c0361a92c89c
@@ -15,8 +15,8 @@ SHA256 (08a395c66e42.tar.gz) = 53e440737ed1aff1f09fae150219a45f16add0c8d6e84546c
SIZE (08a395c66e42.tar.gz) = 120603
SHA256 (modsecurity-2.9.3.tar.gz) = 4192019d169d3f1dd82cc4714db6986df54c6ceb4ee1c8f253de78d1a6b62118
SIZE (modsecurity-2.9.3.tar.gz) = 4307670
-SHA256 (passenger-6.0.2.tar.gz) = 56b2273312e6dc9880f6ba83e381583b8759085a0b41338b782c9575d58346bc
-SIZE (passenger-6.0.2.tar.gz) = 7204982
+SHA256 (passenger-6.0.4.tar.gz) = ec1e4b555c176642c1c316897177d54b6f7d369490280e8ee3e54644e40b250b
+SIZE (passenger-6.0.4.tar.gz) = 7347803
SHA256 (ngx_slowfs_cache-1.10.tar.gz) = 1e81453942e5b0877de1f1f06c56ae82918ea9818255cb935bcb673c95a758a1
SIZE (ngx_slowfs_cache-1.10.tar.gz) = 11809
SHA256 (yaoweibin-nginx_ajp_module-bf6cd93_GH0.tar.gz) = 9e3f78ea73e2d606a95ee64fd3affa4c249f9b342e66b6b11b63061791f28316
@@ -71,6 +71,10 @@ SHA256 (alibaba-nginx-http-footer-filter-1.2.2_GH0.tar.gz) = 3493b54460c59370f9f
SIZE (alibaba-nginx-http-footer-filter-1.2.2_GH0.tar.gz) = 3934
SHA256 (leev-ngx_http_geoip2_module-3.2_GH0.tar.gz) = 15bd1005228cf2c869a6f09e8c41a6aaa6846e4936c473106786ae8ac860fab7
SIZE (leev-ngx_http_geoip2_module-3.2_GH0.tar.gz) = 8465
+SHA256 (ip2location-ip2location-nginx-d47d248_GH0.tar.gz) = ae45341c361fb4ab11f8415c5d85b51ea1aa1027f8ab4fa9524df2074080bb9c
+SIZE (ip2location-ip2location-nginx-d47d248_GH0.tar.gz) = 5542
+SHA256 (ip2location-ip2proxy-nginx-d6fd05a_GH0.tar.gz) = 7b8df48216cd258d770b084b1768d6963a1ec850a748944f896098ce0fa0d993
+SIZE (ip2location-ip2proxy-nginx-d6fd05a_GH0.tar.gz) = 4573
SHA256 (nginx-modules-ngx_http_json_status_module-1d2f303_GH0.tar.gz) = fdc34e0e712d28f4452ce3858ba05a38cc00703f14502095189c4a1063a36997
SIZE (nginx-modules-ngx_http_json_status_module-1d2f303_GH0.tar.gz) = 6736
SHA256 (kr-nginx-notice-3c95966_GH0.tar.gz) = e829fc94178cc8c91fef15a1fc44ee7ac162c13eddc0bba4c9427aaa23386885
@@ -137,7 +141,3 @@ SHA256 (tg123-websockify-nginx-module-e82d254_GH0.tar.gz) = 1ea0fd35e3bed61c822a
SIZE (tg123-websockify-nginx-module-e82d254_GH0.tar.gz) = 14378
SHA256 (openresty-xss-nginx-module-v0.05_GH0.tar.gz) = 958bd8de773601d8d3138501cc4be0420f1c818a3987a70cc9c0023371e432cf
SIZE (openresty-xss-nginx-module-v0.05_GH0.tar.gz) = 11477
-SHA256 (ip2location-ip2location-nginx-d47d248_GH0.tar.gz) = ae45341c361fb4ab11f8415c5d85b51ea1aa1027f8ab4fa9524df2074080bb9c
-SIZE (ip2location-ip2location-nginx-d47d248_GH0.tar.gz) = 5542
-SHA256 (ip2location-ip2proxy-nginx-d6fd05a_GH0.tar.gz) = 7b8df48216cd258d770b084b1768d6963a1ec850a748944f896098ce0fa0d993
-SIZE (ip2location-ip2proxy-nginx-d6fd05a_GH0.tar.gz) = 4573
diff --git a/www/nginx/files/extra-patch-passenger-build-nginx.rb b/www/nginx/files/extra-patch-passenger-build-nginx.rb
index 2b08ce51e08d..e5708b85275d 100644
--- a/www/nginx/files/extra-patch-passenger-build-nginx.rb
+++ b/www/nginx/files/extra-patch-passenger-build-nginx.rb
@@ -1,5 +1,5 @@
---- ../passenger-6.0.2/build/nginx.rb.orig 2018-05-20 08:43:19.389262000 +0200
-+++ ../passenger-6.0.2/build/nginx.rb 2018-05-20 09:11:27.500253000 +0200
+--- ../passenger-6.0.3/build/nginx.rb.orig 2018-05-20 08:43:19.389262000 +0200
++++ ../passenger-6.0.4/build/nginx.rb 2018-05-20 09:11:27.500253000 +0200
@@ -39,13 +39,12 @@ auto_generated_sources = %w(
desc "Build Nginx support files"
task :nginx => [
diff --git a/www/nginx/files/extra-patch-passenger-disable-telemetry b/www/nginx/files/extra-patch-passenger-disable-telemetry
index b532547abd2a..e0063c47eed9 100644
--- a/www/nginx/files/extra-patch-passenger-disable-telemetry
+++ b/www/nginx/files/extra-patch-passenger-disable-telemetry
@@ -1,5 +1,5 @@
---- ../passenger-6.0.2/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb.orig 2018-12-03 12:23:06.980728000 -0500
-+++ ../passenger-6.0.2/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb 2018-12-03 12:23:32.978924000 -0500
+--- ../passenger-6.0.3/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb.orig 2018-12-03 12:23:06.980728000 -0500
++++ ../passenger-6.0.4/src/ruby_supportlib/phusion_passenger/nginx/config_options.rb 2018-12-03 12:23:32.978924000 -0500
@@ -204,7 +204,7 @@
:name => 'passenger_disable_anonymous_telemetry',
:scope => :global,
diff --git a/www/node/Makefile b/www/node/Makefile
index 4bfca6795e0c..e6b9a0d53b9c 100644
--- a/www/node/Makefile
+++ b/www/node/Makefile
@@ -82,13 +82,6 @@ BROKEN_SSL+= base
CONFIGURE_ARGS+=--openssl-no-asm
.endif
-.include <bsd.port.pre.mk>
-
-.if ${CHOSEN_COMPILER_TYPE} == gcc
-# GCC does not expose std::snprintf() without this define
-CXXFLAGS+= -D_GLIBCXX_USE_C99
-.endif
-
post-patch:
@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
${WRKSRC}/tools/v8_gypfiles/v8.gyp
@@ -106,4 +99,4 @@ post-configure:
post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/node
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/node10/Makefile b/www/node10/Makefile
index 446ce62c05a5..57bc62cea32d 100644
--- a/www/node10/Makefile
+++ b/www/node10/Makefile
@@ -83,13 +83,6 @@ BROKEN_SSL+= base
CONFIGURE_ARGS+=--openssl-no-asm
.endif
-.include <bsd.port.pre.mk>
-
-.if ${CHOSEN_COMPILER_TYPE} == gcc
-# GCC does not expose std::snprintf() without this define
-CXXFLAGS+= -D_GLIBCXX_USE_C99
-.endif
-
post-patch:
@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
${WRKSRC}/deps/v8/gypfiles/v8.gyp
@@ -107,4 +100,4 @@ post-configure:
post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/node
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/node6/Makefile b/www/node6/Makefile
index b64351850061..3c93bbb0317b 100644
--- a/www/node6/Makefile
+++ b/www/node6/Makefile
@@ -82,13 +82,6 @@ BROKEN_SSL+= base
CONFIGURE_ARGS+=--openssl-no-asm
.endif
-.include <bsd.port.pre.mk>
-
-.if ${CHOSEN_COMPILER_TYPE} == gcc
-# GCC does not expose std::snprintf() without this define
-CXXFLAGS+= -D_GLIBCXX_USE_C99
-.endif
-
post-patch:
@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
${WRKSRC}/deps/v8/tools/gyp/v8.gyp
@@ -114,4 +107,4 @@ post-configure:
post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/node
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/node8/Makefile b/www/node8/Makefile
index 9e8cd581b84d..9ea800386bc7 100644
--- a/www/node8/Makefile
+++ b/www/node8/Makefile
@@ -77,13 +77,6 @@ LIB_DEPENDS+= libcares.so:dns/c-ares\
CONFIGURE_ARGS+=--openssl-no-asm
.endif
-.include <bsd.port.pre.mk>
-
-.if ${CHOSEN_COMPILER_TYPE} == gcc
-# GCC does not expose std::snprintf() without this define
-CXXFLAGS+= -D_GLIBCXX_USE_C99
-.endif
-
post-patch:
@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
${WRKSRC}/deps/v8/src/v8.gyp
@@ -101,4 +94,4 @@ post-configure:
post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/node
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/owncloud/Makefile b/www/owncloud/Makefile
index 58151598d63b..820cddd8e43e 100644
--- a/www/owncloud/Makefile
+++ b/www/owncloud/Makefile
@@ -17,6 +17,7 @@ USES= cpe php:flavors,web tar:bzip2
USE_PHP= bz2 ctype curl dom fileinfo filter gd hash iconv intl json \
mbstring pdo posix session simplexml xml xmlreader xmlwriter \
xsl wddx zip zlib
+IGNORE_WITH_PHP= 74
NO_ARCH= yes
NO_BUILD= yes
diff --git a/www/p5-HTML-Clean/Makefile b/www/p5-HTML-Clean/Makefile
index 72803bb13e76..5dc9dcd2b2b0 100644
--- a/www/p5-HTML-Clean/Makefile
+++ b/www/p5-HTML-Clean/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= HTML-Clean
-PORTVERSION= 1.2
+PORTVERSION= 1.4
CATEGORIES= www perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/www/p5-HTML-Clean/distinfo b/www/p5-HTML-Clean/distinfo
index 6e9cc5ad3470..b72752be10b8 100644
--- a/www/p5-HTML-Clean/distinfo
+++ b/www/p5-HTML-Clean/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1568200708
-SHA256 (HTML-Clean-1.2.tar.gz) = 525d3f6bf4034d5c10c3a0a30c7330bfce40e20e7c2128a793df5c2ec60a6eb2
-SIZE (HTML-Clean-1.2.tar.gz) = 48583
+TIMESTAMP = 1568456934
+SHA256 (HTML-Clean-1.4.tar.gz) = a67d4abda751fc3c6b4a35185377a88bca5b651c60b33379804b4e90a1788706
+SIZE (HTML-Clean-1.4.tar.gz) = 48598
diff --git a/www/pecl-http/Makefile b/www/pecl-http/Makefile
index e87f07b34abb..644f8c0a539c 100644
--- a/www/pecl-http/Makefile
+++ b/www/pecl-http/Makefile
@@ -26,6 +26,7 @@ LIB_DEPENDS= libcurl.so:ftp/curl \
USES= php:pecl
USE_PHP= zlib:build
+IGNORE_WITH_PHP= 74
CONFLICTS= pecl-http[12]*
diff --git a/www/pecl-solr/Makefile b/www/pecl-solr/Makefile
index dff3cb5d6407..806e967c6ef9 100644
--- a/www/pecl-solr/Makefile
+++ b/www/pecl-solr/Makefile
@@ -16,5 +16,6 @@ LIB_DEPENDS= libcurl.so:ftp/curl \
USES= php:pecl
USE_PHP= json:build
+IGNORE_WITH_PHP= 74
.include <bsd.port.mk>
diff --git a/www/pecl-yaf/Makefile b/www/pecl-yaf/Makefile
index 8ba57d21a774..435da9a2b3a9 100644
--- a/www/pecl-yaf/Makefile
+++ b/www/pecl-yaf/Makefile
@@ -15,5 +15,6 @@ LIB_DEPENDS= libpcre.so:devel/pcre
CONFIGURE_ARGS= --with-php-config=${LOCALBASE}/bin/php-config
USES= localbase php:pecl
+IGNORE_WITH_PHP= 74
.include <bsd.port.mk>
diff --git a/www/pecl-yar/Makefile b/www/pecl-yar/Makefile
index fadbe31c39bf..52a5b9fb1f0f 100644
--- a/www/pecl-yar/Makefile
+++ b/www/pecl-yar/Makefile
@@ -13,6 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
USES= localbase php:pecl
USE_PHP= json:build curl:build
+IGNORE_WITH_PHP= 74
OPTIONS_DEFINE= MSGPACK
MSGPACK_DESC= Enable MSGPACK module
diff --git a/www/phalcon/Makefile b/www/phalcon/Makefile
index 2b330577c90c..976f7ea7e675 100644
--- a/www/phalcon/Makefile
+++ b/www/phalcon/Makefile
@@ -16,6 +16,7 @@ ONLY_FOR_ARCHS= aarch64 amd64 armv6 armv7 i386
USES= php:ext
USE_PHP= hash:build json:build pdo:build
+IGNORE_WITH_PHP= 74
USE_GITHUB= yes
GH_ACCOUNT= phalcon
diff --git a/www/php-screw/Makefile b/www/php-screw/Makefile
index 1bd685e863bd..2d1c68550efb 100644
--- a/www/php-screw/Makefile
+++ b/www/php-screw/Makefile
@@ -17,6 +17,8 @@ LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
BROKEN= unfetchable
+DEPRECATED= Unfetchable, unmaintained
+EXPIRATION_DATE= 2019-10-16
CRYPTKEY?= 11152, 368, 192, 1281, 62
diff --git a/www/php74-opcache/Makefile b/www/php74-opcache/Makefile
new file mode 100644
index 000000000000..1f4b3cd2e3fe
--- /dev/null
+++ b/www/php74-opcache/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+CATEGORIES= www
+
+MASTERDIR= ${.CURDIR}/../../lang/php74
+
+PKGNAMESUFFIX= -opcache
+
+TEST_TARGET= test
+
+USES= php:zend,noflavors
+
+.include "${MASTERDIR}/Makefile"
diff --git a/www/php74-session/Makefile b/www/php74-session/Makefile
new file mode 100644
index 000000000000..cc926a5a0a12
--- /dev/null
+++ b/www/php74-session/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+CATEGORIES= www
+
+MASTERDIR= ${.CURDIR}/../../lang/php74
+
+PKGNAMESUFFIX= -session
+
+TEST_TARGET= test
+
+.include "${MASTERDIR}/Makefile"
diff --git a/www/php74-tidy/Makefile b/www/php74-tidy/Makefile
new file mode 100644
index 000000000000..2a850adf6eee
--- /dev/null
+++ b/www/php74-tidy/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+CATEGORIES= www
+
+MASTERDIR= ${.CURDIR}/../../lang/php74
+
+PKGNAMESUFFIX= -tidy
+
+TEST_TARGET= test
+
+.include "${MASTERDIR}/Makefile"
diff --git a/www/phproxy/Makefile b/www/phproxy/Makefile
index b10207d2690b..91904bc8e1ee 100644
--- a/www/phproxy/Makefile
+++ b/www/phproxy/Makefile
@@ -12,6 +12,8 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= PHP based web proxy
BROKEN= unfetchable
+DEPRECATED= Unfetchable, unmaintained
+EXPIRATION_DATE= 2019-10-16
NO_BUILD= YES
USES= php:web zip:infozip
diff --git a/www/pmwiki/Makefile b/www/pmwiki/Makefile
index b4be8d147682..7ba402aee5fd 100644
--- a/www/pmwiki/Makefile
+++ b/www/pmwiki/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= pmwiki
-PORTVERSION= 2.2.115
+PORTVERSION= 2.2.118
PORTEPOCH= 1
CATEGORIES= www
MASTER_SITES= http://www.pmwiki.org/pub/pmwiki/
diff --git a/www/pmwiki/distinfo b/www/pmwiki/distinfo
index 62f2eaa45895..5a48c1c4ce1f 100644
--- a/www/pmwiki/distinfo
+++ b/www/pmwiki/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1560701148
-SHA256 (pmwiki-2.2.115.tgz) = 91322adda2ccc2af86cffd18909bfcbe25c0ff3419b70304ebb2b1ff75bea82a
-SIZE (pmwiki-2.2.115.tgz) = 471069
+TIMESTAMP = 1568977594
+SHA256 (pmwiki-2.2.118.tgz) = 9b0772a4663bfc97888f1dce1f39a0ec1d35d3621f8a59d395955b4c619a9cdd
+SIZE (pmwiki-2.2.118.tgz) = 473003
diff --git a/www/py-httplib2/Makefile b/www/py-httplib2/Makefile
index e395900f99b9..9a7334f64dcc 100644
--- a/www/py-httplib2/Makefile
+++ b/www/py-httplib2/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= httplib2
-PORTVERSION= 0.13.0
+PORTVERSION= 0.13.1
CATEGORIES= www python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/www/py-httplib2/distinfo b/www/py-httplib2/distinfo
index a95df76516a3..63caec5885e2 100644
--- a/www/py-httplib2/distinfo
+++ b/www/py-httplib2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1563864267
-SHA256 (httplib2-0.13.0.tar.gz) = d1146939d270f1f1eb8cbf8f5aa72ff37d897faccca448582bb1e180aeb4c6b2
-SIZE (httplib2-0.13.0.tar.gz) = 219494
+TIMESTAMP = 1568762441
+SHA256 (httplib2-0.13.1.tar.gz) = 6901c8c0ffcf721f9ce270ad86da37bc2b4d32b8802d4a9cec38274898a64044
+SIZE (httplib2-0.13.1.tar.gz) = 219502
diff --git a/www/py-instabot/Makefile b/www/py-instabot/Makefile
index 64e3b2b0c024..f29d8ac71aef 100644
--- a/www/py-instabot/Makefile
+++ b/www/py-instabot/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= instabot
-PORTVERSION= 0.57.0
+PORTVERSION= 0.58.0
CATEGORIES= www python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/www/py-instabot/distinfo b/www/py-instabot/distinfo
index c489f302f22e..28fd4ed4a0a3 100644
--- a/www/py-instabot/distinfo
+++ b/www/py-instabot/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1568051703
-SHA256 (instabot-0.57.0.tar.gz) = da752e2f6f608d20173774e0eabc8e49f5873a653cd0f672bb10cc8f5dac8879
-SIZE (instabot-0.57.0.tar.gz) = 75884
+TIMESTAMP = 1568559786
+SHA256 (instabot-0.58.0.tar.gz) = 8948cab2f90f739a444b841b35d7b85ec78d3ca9e7acddeb39e84cb5c5c94cea
+SIZE (instabot-0.58.0.tar.gz) = 77031
diff --git a/www/py-prewikka/Makefile b/www/py-prewikka/Makefile
index f9c8de6e58f8..8d068970dbca 100644
--- a/www/py-prewikka/Makefile
+++ b/www/py-prewikka/Makefile
@@ -12,6 +12,8 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Frontend for the Prelude IDS
BROKEN= unfetchable
+DEPRECATED= Unfetchable, unmaintained
+EXPIRATION_DATE= 2019-10-16
BUILD_DEPENDS= cheetah-compile:devel/py-cheetah
LIB_DEPENDS= libprelude.so:security/libprelude \
diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_audio_pulse_pulse.sigs b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_audio_pulse_pulse.sigs
new file mode 100644
index 000000000000..e6253175f52a
--- /dev/null
+++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_audio_pulse_pulse.sigs
@@ -0,0 +1,143 @@
+gen/media/audio/pulse/pulse_stubs.cc:155:27: error: conflicting types for 'pa_context_get_state'
+extern pa_context_state_t pa_context_get_state(pa_context* c) __attribute__((weak));
+ ^
+../../../../../../../../../../usr/local/include/pulse/context.h:199:20: note: previous declaration is here
+pa_context_state_t pa_context_get_state(const pa_context *c);
+ ^
+gen/media/audio/pulse/pulse_stubs.cc:156:21: error: conflicting types for 'pa_context_get_state'
+pa_context_state_t pa_context_get_state(pa_context* c) {
+ ^
+../../../../../../../../../../usr/local/include/pulse/context.h:199:20: note: previous declaration is here
+pa_context_state_t pa_context_get_state(const pa_context *c);
+ ^
+gen/media/audio/pulse/pulse_stubs.cc:171:29: error: conflicting types for 'pa_operation_get_state'
+extern pa_operation_state_t pa_operation_get_state(pa_operation* o) __attribute__((weak));
+ ^
+../../../../../../../../../../usr/local/include/pulse/operation.h:52:22: note: previous declaration is here
+pa_operation_state_t pa_operation_get_state(const pa_operation *o);
+ ^
+gen/media/audio/pulse/pulse_stubs.cc:172:23: error: conflicting types for 'pa_operation_get_state'
+pa_operation_state_t pa_operation_get_state(pa_operation* o) {
+ ^
+../../../../../../../../../../usr/local/include/pulse/operation.h:52:22: note: previous declaration is here
+pa_operation_state_t pa_operation_get_state(const pa_operation *o);
+ ^
+gen/media/audio/pulse/pulse_stubs.cc:211:17: error: conflicting types for 'pa_stream_get_device_index'
+extern uint32_t pa_stream_get_device_index(pa_stream* s) __attribute__((weak));
+ ^
+../../../../../../../../../../usr/local/include/pulse/stream.h:366:10: note: previous declaration is here
+uint32_t pa_stream_get_device_index(const pa_stream *s);
+ ^
+gen/media/audio/pulse/pulse_stubs.cc:212:11: error: conflicting types for 'pa_stream_get_device_index'
+uint32_t pa_stream_get_device_index(pa_stream* s) {
+ ^
+../../../../../../../../../../usr/local/include/pulse/stream.h:366:10: note: previous declaration is here
+uint32_t pa_stream_get_device_index(const pa_stream *s);
+ ^
+gen/media/audio/pulse/pulse_stubs.cc:219:26: error: conflicting types for 'pa_stream_get_state'
+extern pa_stream_state_t pa_stream_get_state(pa_stream* p) __attribute__((weak));
+ ^
+../../../../../../../../../../usr/local/include/pulse/stream.h:345:19: note: previous declaration is here
+pa_stream_state_t pa_stream_get_state(const pa_stream *p);
+ ^
+gen/media/audio/pulse/pulse_stubs.cc:220:20: error: conflicting types for 'pa_stream_get_state'
+pa_stream_state_t pa_stream_get_state(pa_stream* p) {
+ ^
+../../../../../../../../../../usr/local/include/pulse/stream.h:345:19: note: previous declaration is here
+pa_stream_state_t pa_stream_get_state(const pa_stream *p);
+ ^
+gen/media/audio/pulse/pulse_stubs.cc:235:12: error: conflicting types for 'pa_proplist_contains'
+extern int pa_proplist_contains(pa_proplist* p, const char* key) __attribute__((weak));
+ ^
+../../../../../../../../../../usr/local/include/pulse/proplist.h:390:5: note: previous declaration is here
+int pa_proplist_contains(const pa_proplist *p, const char *key);
+ ^
+gen/media/audio/pulse/pulse_stubs.cc:236:6: error: conflicting types for 'pa_proplist_contains'
+int pa_proplist_contains(pa_proplist* p, const char* key) {
+ ^
+../../../../../../../../../../usr/local/include/pulse/proplist.h:390:5: note: previous declaration is here
+int pa_proplist_contains(const pa_proplist *p, const char *key);
+ ^
+gen/media/audio/pulse/pulse_stubs.cc:243:20: error: conflicting types for 'pa_proplist_gets'
+extern const char* pa_proplist_gets(pa_proplist* p, const char* key) __attribute__((weak));
+ ^
+../../../../../../../../../../usr/local/include/pulse/proplist.h:314:13: note: previous declaration is here
+const char *pa_proplist_gets(const pa_proplist *p, const char *key);
+ ^
+gen/media/audio/pulse/pulse_stubs.cc:244:14: error: conflicting types for 'pa_proplist_gets'
+const char* pa_proplist_gets(pa_proplist* p, const char* key) {
+ ^
+../../../../../../../../../../usr/local/include/pulse/proplist.h:314:13: note: previous declaration is here
+const char *pa_proplist_gets(const pa_proplist *p, const char *key);
+ ^
+gen/media/audio/pulse/pulse_stubs.cc:251:15: error: conflicting types for 'pa_stream_readable_size'
+extern size_t pa_stream_readable_size(pa_stream *p) __attribute__((weak));
+ ^
+../../../../../../../../../../usr/local/include/pulse/stream.h:574:8: note: previous declaration is here
+size_t pa_stream_readable_size(const pa_stream *p);
+ ^
+gen/media/audio/pulse/pulse_stubs.cc:252:9: error: conflicting types for 'pa_stream_readable_size'
+size_t pa_stream_readable_size(pa_stream *p) {
+ ^
+../../../../../../../../../../usr/local/include/pulse/stream.h:574:8: note: previous declaration is here
+size_t pa_stream_readable_size(const pa_stream *p);
+ ^
+gen/media/audio/pulse/pulse_stubs.cc:279:12: error: conflicting types for 'pa_context_errno'
+extern int pa_context_errno(pa_context *c) __attribute__((weak));
+ ^
+../../../../../../../../../../usr/local/include/pulse/context.h:193:5: note: previous declaration is here
+int pa_context_errno(const pa_context *c);
+ ^
+gen/media/audio/pulse/pulse_stubs.cc:280:6: error: conflicting types for 'pa_context_errno'
+int pa_context_errno(pa_context *c) {
+ ^
+../../../../../../../../../../usr/local/include/pulse/context.h:193:5: note: previous declaration is here
+int pa_context_errno(const pa_context *c);
+ ^
+
+--- src/3rdparty/chromium/media/audio/pulse/pulse.sigs.orig 2019-03-19 08:52:48 UTC
++++ src/3rdparty/chromium/media/audio/pulse/pulse.sigs
+@@ -24,11 +24,11 @@ pa_operation* pa_context_get_source_info_by_index(pa_c
+ pa_operation* pa_context_get_source_info_by_name(pa_context* c, const char* name, pa_source_info_cb_t cb, void *userdata);
+ pa_operation* pa_context_get_source_info_list(pa_context* c, pa_source_info_cb_t cb, void* userdata);
+ pa_operation* pa_context_get_sink_info_list(pa_context* c, pa_sink_info_cb_t cb, void* userdata);
+-pa_context_state_t pa_context_get_state(pa_context* c);
++pa_context_state_t pa_context_get_state(const pa_context *c);
+ pa_context* pa_context_new(pa_mainloop_api* mainloop, const char* name);
+ pa_operation* pa_context_set_source_volume_by_index(pa_context* c, uint32_t idx, const pa_cvolume* volume, pa_context_success_cb_t cb, void* userdata);
+ void pa_context_set_state_callback(pa_context* c, pa_context_notify_cb_t cb, void* userdata);
+-pa_operation_state_t pa_operation_get_state(pa_operation* o);
++pa_operation_state_t pa_operation_get_state(const pa_operation* o);
+ void pa_context_unref(pa_context* c);
+ void pa_operation_unref(pa_operation* o);
+ int pa_stream_begin_write(pa_stream* p, void** data, size_t* nbytes);
+@@ -38,23 +38,23 @@ pa_operation* pa_stream_cork(pa_stream* s, int b, pa_s
+ int pa_stream_disconnect(pa_stream* s);
+ int pa_stream_drop(pa_stream *p);
+ pa_operation* pa_stream_flush(pa_stream* s, pa_stream_success_cb_t cb, void* userdata);
+-uint32_t pa_stream_get_device_index(pa_stream* s);
++uint32_t pa_stream_get_device_index(const pa_stream* s);
+ int pa_stream_get_latency(pa_stream* s, pa_usec_t* r_usec, int* negative);
+-pa_stream_state_t pa_stream_get_state(pa_stream* p);
++pa_stream_state_t pa_stream_get_state(const pa_stream* p);
+ pa_stream* pa_stream_new(pa_context* c, const char* name, const pa_sample_spec* ss, const pa_channel_map * map);
+ pa_stream* pa_stream_new_with_proplist(pa_context* c, const char* name, const pa_sample_spec* ss, const pa_channel_map* map, pa_proplist* p);
+ pa_proplist* pa_proplist_new(void);
+-int pa_proplist_contains(pa_proplist* p, const char* key);
++int pa_proplist_contains(const pa_proplist* p, const char* key);
+ void pa_proplist_free(pa_proplist* p);
+-const char* pa_proplist_gets(pa_proplist* p, const char* key);
++const char* pa_proplist_gets(const pa_proplist* p, const char* key);
+ int pa_proplist_sets(pa_proplist* p, const char* key, const char* value);
+-size_t pa_stream_readable_size(pa_stream *p);
++size_t pa_stream_readable_size(const pa_stream *p);
+ int pa_stream_peek(pa_stream* p, const void** data, size_t* nbytes);
+ void pa_stream_set_read_callback(pa_stream* p, pa_stream_request_cb_t cb, void* userdata);
+ void pa_stream_set_state_callback(pa_stream* s, pa_stream_notify_cb_t cb, void* userdata);
+ int pa_stream_write(pa_stream* p, const void* data, size_t nbytes, pa_free_cb_t free_cb, int64_t offset, pa_seek_mode_t seek);
+ void pa_stream_set_write_callback(pa_stream *p, pa_stream_request_cb_t cb, void *userdata);
+ void pa_stream_unref(pa_stream* s);
+-int pa_context_errno(pa_context *c);
++int pa_context_errno(const pa_context *c);
+ const char* pa_strerror(int error);
+ pa_cvolume* pa_cvolume_set(pa_cvolume* a, unsigned channels, pa_volume_t v);
diff --git a/www/redmine-backlogs/Makefile b/www/redmine-backlogs/Makefile
index 4226142b3cab..a30b7bd04ea9 100644
--- a/www/redmine-backlogs/Makefile
+++ b/www/redmine-backlogs/Makefile
@@ -13,6 +13,8 @@ LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
BROKEN= unfetchable
+DEPRECATED= Unfetchable, unmaintained
+EXPIRATION_DATE= 2019-10-16
RUN_DEPENDS= rubygem-holidays>=1.0.3:devel/rubygem-holidays \
rubygem-icalendar>=0.4.2:devel/rubygem-icalendar \
diff --git a/www/rubygem-passenger/Makefile b/www/rubygem-passenger/Makefile
index 2cd0a4bb949d..80df183b6e4d 100644
--- a/www/rubygem-passenger/Makefile
+++ b/www/rubygem-passenger/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= passenger
-PORTVERSION= 6.0.2
+PORTVERSION= 6.0.4
PORTREVISION= 1
CATEGORIES= www rubygems
MASTER_SITES= RG
diff --git a/www/rubygem-passenger/distinfo b/www/rubygem-passenger/distinfo
index 39e31bb4bba1..5764dc627461 100644
--- a/www/rubygem-passenger/distinfo
+++ b/www/rubygem-passenger/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1551204088
-SHA256 (rubygem/passenger-6.0.2.gem) = 8762e72248cadf8a6d3fa2c02670c1fc6153852b9d161e9fe788a603f57aadea
-SIZE (rubygem/passenger-6.0.2.gem) = 7123456
+TIMESTAMP = 1568811279
+SHA256 (rubygem/passenger-6.0.4.gem) = 298806191e4e8995dbc0f94c3791b2b1916ca50b5993e04236df6f4108bfc2af
+SIZE (rubygem/passenger-6.0.4.gem) = 7262720
diff --git a/www/rubygem-passenger/files/patch-asio-libc++7 b/www/rubygem-passenger/files/patch-asio-libc++7
deleted file mode 100644
index acf2066bc50d..000000000000
--- a/www/rubygem-passenger/files/patch-asio-libc++7
+++ /dev/null
@@ -1,13 +0,0 @@
-https://github.com/boostorg/asio/pull/135
-
---- src/cxx_supportlib/vendor-modified/boost/asio/detail/config.hpp.orig 2018-04-11 13:49:00 UTC
-+++ src/cxx_supportlib/vendor-modified/boost/asio/detail/config.hpp
-@@ -777,7 +777,7 @@
- #if !defined(BOOST_ASIO_HAS_STD_STRING_VIEW)
- # if !defined(BOOST_ASIO_DISABLE_STD_STRING_VIEW)
- # if defined(__clang__)
--# if (__cplusplus >= 201703)
-+# if defined(BOOST_ASIO_HAS_CLANG_LIBCXX) || (__cplusplus >= 201703)
- # if __has_include(<string_view>)
- # define BOOST_ASIO_HAS_STD_STRING_VIEW 1
- # endif // __has_include(<string_view>)
diff --git a/www/rubygem-passenger/files/patch-freebsd13 b/www/rubygem-passenger/files/patch-freebsd13
new file mode 100644
index 000000000000..e05f91f21642
--- /dev/null
+++ b/www/rubygem-passenger/files/patch-freebsd13
@@ -0,0 +1,91 @@
+--- src/agent/Core/ApplicationPool/Pool/GarbageCollection.cpp.orig 2019-09-19 16:54:40.089339000 -0400
++++ src/agent/Core/ApplicationPool/Pool/GarbageCollection.cpp 2019-09-19 16:54:58.167526000 -0400
+@@ -55,7 +55,7 @@
+ self->garbageCollectionCond.timed_wait(lock,
+ posix_time::seconds(5));
+ }
+- while (!this_thread::interruption_requested()) {
++ while (!boost::this_thread::interruption_requested()) {
+ try {
+ UPDATE_TRACE_POINT();
+ unsigned long long sleepTime = self->realGarbageCollect();
+--- src/agent/Core/ApplicationPool/Group/ProcessListManagement.cpp.orig 2019-09-19 16:53:35.309791000 -0400
++++ src/agent/Core/ApplicationPool/Group/ProcessListManagement.cpp 2019-09-19 16:53:59.509027000 -0400
+@@ -305,7 +305,7 @@
+ while (true) {
+ assert(detachedProcessesCheckerActive);
+
+- if (getLifeStatus() == SHUT_DOWN || this_thread::interruption_requested()) {
++ if (getLifeStatus() == SHUT_DOWN || boost::this_thread::interruption_requested()) {
+ UPDATE_TRACE_POINT();
+ P_DEBUG("Stopping detached processes checker");
+ detachedProcessesCheckerActive = false;
+--- src/cxx_supportlib/oxt/system_calls.cpp.orig 2019-09-19 17:00:06.903986000 -0400
++++ src/cxx_supportlib/oxt/system_calls.cpp 2019-09-19 17:02:32.106158000 -0400
+@@ -132,15 +132,15 @@
+ _my_errno = errno; \
+ } while ((error_expression) \
+ && _my_errno == EINTR \
+- && (!this_thread::syscalls_interruptable() \
+- || !(_intr_requested = this_thread::interruption_requested())) \
++ && (!boost::this_thread::syscalls_interruptable() \
++ || !(_intr_requested = boost::this_thread::interruption_requested())) \
+ ); \
+ if (OXT_LIKELY(ctx != NULL)) { \
+ ctx->syscall_interruption_lock.lock(); \
+ } \
+ if ((error_expression) \
+ && _my_errno == EINTR \
+- && this_thread::syscalls_interruptable() \
++ && boost::this_thread::syscalls_interruptable() \
+ && _intr_requested) { \
+ throw thread_interrupted(); \
+ } \
+@@ -284,8 +284,8 @@
+ }
+ if (ret == -1
+ && errno == EINTR
+- && this_thread::syscalls_interruptable()
+- && this_thread::interruption_requested()) {
++ && boost::this_thread::syscalls_interruptable()
++ && boost::this_thread::interruption_requested()) {
+ throw thread_interrupted();
+ } else {
+ return ret;
+@@ -662,8 +662,8 @@
+ }
+ } while (ret == -1
+ && e == EINTR
+- && (!this_thread::syscalls_interruptable()
+- || !(intr_requested = this_thread::interruption_requested()))
++ && (!boost::this_thread::syscalls_interruptable()
++ || !(intr_requested = boost::this_thread::interruption_requested()))
+ );
+
+ if (OXT_UNLIKELY(ctx != NULL)) {
+@@ -672,7 +672,7 @@
+
+ if (ret == -1
+ && e == EINTR
+- && this_thread::syscalls_interruptable()
++ && boost::this_thread::syscalls_interruptable()
+ && intr_requested) {
+ throw thread_interrupted();
+ }
+@@ -748,14 +748,14 @@
+ * http://stackoverflow.com/questions/20410943/segmentation-fault-when-accessing-statically-initialized-thread-variable?noredirect=1#comment30483943_20410943
+ * https://bugzilla.redhat.com/show_bug.cgi?id=731228
+ */
+- __thread int this_thread::_syscalls_interruptable = 1;
++ __thread int boost::this_thread::_syscalls_interruptable = 1;
+
+ bool
+ boost::this_thread::syscalls_interruptable() {
+ return _syscalls_interruptable;
+ }
+ #else
+- boost::thread_specific_ptr<bool> this_thread::_syscalls_interruptable;
++ boost::thread_specific_ptr<bool> boost::this_thread::_syscalls_interruptable;
+
+ bool
+ boost::this_thread::syscalls_interruptable() {
diff --git a/www/rubygem-roda/Makefile b/www/rubygem-roda/Makefile
index 8aafc0a8ee24..0af4add2a92d 100644
--- a/www/rubygem-roda/Makefile
+++ b/www/rubygem-roda/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= roda
-PORTVERSION= 3.23.0
+PORTVERSION= 3.24.0
CATEGORIES= www rubygems
MASTER_SITES= RG
diff --git a/www/rubygem-roda/distinfo b/www/rubygem-roda/distinfo
index 14bc895afce4..18f6d06f3250 100644
--- a/www/rubygem-roda/distinfo
+++ b/www/rubygem-roda/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1565790555
-SHA256 (rubygem/roda-3.23.0.gem) = d382e60957edab6eef3ce07cc083886f85c5b5c3b927ef7da94c5db662534261
-SIZE (rubygem/roda-3.23.0.gem) = 284160
+TIMESTAMP = 1568437035
+SHA256 (rubygem/roda-3.24.0.gem) = 86da2aabfdeafa31dd1f7066c2f2158f120c615e0f44e7ac05058f3cf67c0632
+SIZE (rubygem/roda-3.24.0.gem) = 285184
diff --git a/www/sfnt2woff/Makefile b/www/sfnt2woff/Makefile
index ec00157ef9bd..db33d0ea2d7e 100644
--- a/www/sfnt2woff/Makefile
+++ b/www/sfnt2woff/Makefile
@@ -14,6 +14,8 @@ LICENSE= GPLv2 LGPL21 MPL11
LICENSE_COMB= multi
BROKEN= unfetchable
+DEPRECATED= Unfetchable, unmaintained
+EXPIRATION_DATE= 2019-10-16
NO_WRKSUBDIR= yes
USES= gmake zip
diff --git a/www/surf/Makefile b/www/surf/Makefile
index aca96831bfcf..a83de5bd5f3b 100644
--- a/www/surf/Makefile
+++ b/www/surf/Makefile
@@ -8,7 +8,7 @@ CATEGORIES= www
MASTER_SITES= http://dl.suckless.org/${PORTNAME}/
PKGNAMESUFFIX= -browser
-MAINTAINER= dg@syrec.org
+MAINTAINER= dmgk@FreeBSD.org
COMMENT= Simple Web browser based on WebKit2/GTK+
LICENSE= MIT
diff --git a/www/swfdec-plugin/Makefile b/www/swfdec-plugin/Makefile
index af2b8ad7570b..50a690e2ade3 100644
--- a/www/swfdec-plugin/Makefile
+++ b/www/swfdec-plugin/Makefile
@@ -12,6 +12,8 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Flash rendering plugin
BROKEN= unfetchable
+DEPRECATED= Unfetchable, unmaintained
+EXPIRATION_DATE= 2019-10-16
LIB_DEPENDS= libswfdec-0.8.so:graphics/swfdec
diff --git a/www/swish-e/Makefile b/www/swish-e/Makefile
index 862adc384170..b92615376e62 100644
--- a/www/swish-e/Makefile
+++ b/www/swish-e/Makefile
@@ -11,6 +11,8 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Simple web indexing for humans - enhanced
BROKEN= unfetchable
+DEPRECATED= Unfetchable, unmaintained
+EXPIRATION_DATE= 2019-10-16
USES= gmake libtool perl5 shebangfix
USE_LDCONFIG= yes
diff --git a/www/tikiwiki/Makefile b/www/tikiwiki/Makefile
index b844ba881404..e2a7bcbe2b60 100644
--- a/www/tikiwiki/Makefile
+++ b/www/tikiwiki/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= tikiwiki
-DISTVERSION= 20.0
+DISTVERSION= 20.1
CATEGORIES= www
MASTER_SITES= SF/${PORTNAME}/Tiki_20.x_Tarazed/${DISTVERSION}/
DISTNAME= tiki-${DISTVERSION}
diff --git a/www/tikiwiki/distinfo b/www/tikiwiki/distinfo
index 274505891aca..98203d08524c 100644
--- a/www/tikiwiki/distinfo
+++ b/www/tikiwiki/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1562585506
-SHA256 (tiki-20.0.tar.gz) = fb2717aac261853fa93d555a8adb573da5814abc08ba9af0db3e8c80c28d4a1e
-SIZE (tiki-20.0.tar.gz) = 75447643
+TIMESTAMP = 1568988464
+SHA256 (tiki-20.1.tar.gz) = da16212a7eb4c1766000f7065872f7aefa8ee098dbc66dd40c81c4bfbdea0f26
+SIZE (tiki-20.1.tar.gz) = 80614940
diff --git a/www/tikiwiki/pkg-descr b/www/tikiwiki/pkg-descr
index 7e0204a300a3..f5a8f638ad42 100644
--- a/www/tikiwiki/pkg-descr
+++ b/www/tikiwiki/pkg-descr
@@ -8,4 +8,4 @@ use it as GeoCMS (Geospatial Content Management System) too.
It's developed by a large number of contributors which forms
the TikiWiki Community.
-WWW: https://tikiwiki.org/
+WWW: https://tiki.org/
diff --git a/www/unit/Makefile b/www/unit/Makefile
index b5da3df3564d..7969199c3e77 100644
--- a/www/unit/Makefile
+++ b/www/unit/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= unit
-PORTVERSION= 1.10.0
+PORTVERSION= 1.11.0
CATEGORIES= www
MASTER_SITES= https://unit.nginx.org/download/
diff --git a/www/unit/distinfo b/www/unit/distinfo
index 18f2f52adcc7..ce5093143281 100644
--- a/www/unit/distinfo
+++ b/www/unit/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1566509077
-SHA256 (unit-1.10.0.tar.gz) = bf55cc04cc80114de99f412887466a4743dd821e5ff5c02c5c7d859cb8275311
-SIZE (unit-1.10.0.tar.gz) = 564348
+TIMESTAMP = 1568920490
+SHA256 (unit-1.11.0.tar.gz) = da52e884743a08a3ee202ebd1cc21154ac527427d195f0edc003c26e0779b5ca
+SIZE (unit-1.11.0.tar.gz) = 681333
diff --git a/www/varnish-libvmod-dynamic/Makefile b/www/varnish-libvmod-dynamic/Makefile
index 471181d8a915..abc74ffd9efb 100644
--- a/www/varnish-libvmod-dynamic/Makefile
+++ b/www/varnish-libvmod-dynamic/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= libvmod-dynamic
-PORTVERSION= 20190822
+PORTVERSION= 20190922
CATEGORIES= www
PKGNAMEPREFIX= varnish-
@@ -27,7 +27,7 @@ CFLAGS+= -I${WRKSRC}/src
USE_GITHUB= yes
GH_ACCOUNT= nigoroll
-GH_TAGNAME= 220fd64
+GH_TAGNAME= ed45871
OPTIONS_DEFINE= DOCS
diff --git a/www/varnish-libvmod-dynamic/distinfo b/www/varnish-libvmod-dynamic/distinfo
index 3c0120a97cf3..c405f3823566 100644
--- a/www/varnish-libvmod-dynamic/distinfo
+++ b/www/varnish-libvmod-dynamic/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1566493821
-SHA256 (nigoroll-libvmod-dynamic-20190822-220fd64_GH0.tar.gz) = 072e6c20cef5b8c9074d5c0eb4aaf9ba5f8b6a6b786be88421c18ada5d5d62e4
-SIZE (nigoroll-libvmod-dynamic-20190822-220fd64_GH0.tar.gz) = 40136
+TIMESTAMP = 1569159125
+SHA256 (nigoroll-libvmod-dynamic-20190922-ed45871_GH0.tar.gz) = 4d0aa0dfe7e43f0939d1a221e82b028b748e120169fe3e71183a2388091862be
+SIZE (nigoroll-libvmod-dynamic-20190922-ed45871_GH0.tar.gz) = 41255
diff --git a/www/varnish-libvmod-dynamic/files/patch-src_dyn__resolver__getdns.c b/www/varnish-libvmod-dynamic/files/patch-src_dyn__resolver__getdns.c
deleted file mode 100644
index 80e234c3ba5f..000000000000
--- a/www/varnish-libvmod-dynamic/files/patch-src_dyn__resolver__getdns.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/dyn_resolver_getdns.c.orig 2019-08-22 17:20:58 UTC
-+++ src/dyn_resolver_getdns.c
-@@ -33,6 +33,12 @@
- #include <sys/socket.h>
- #include <netdb.h>
-
-+#ifdef __FreeBSD__
-+#include <arpa/inet.h>
-+#include <netinet/in.h>
-+#include <resolv.h>
-+#endif
-+
- #include <cache/cache.h>
- #include <vsa.h>
-
diff --git a/www/varnish6/Makefile b/www/varnish6/Makefile
index 615a392e6e50..d6c7e3af76e1 100644
--- a/www/varnish6/Makefile
+++ b/www/varnish6/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= varnish
-PORTVERSION= 6.2.1
+PORTVERSION= 6.3.0
DISTVERSIONPREFIX= varnish-
CATEGORIES= www
PKGNAMESUFFIX= 6
diff --git a/www/varnish6/distinfo b/www/varnish6/distinfo
index a3a3aea97a59..75494389f863 100644
--- a/www/varnish6/distinfo
+++ b/www/varnish6/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567520215
-SHA256 (varnishcache-varnish-cache-varnish-6.2.1_GH0.tar.gz) = 0064717597058fa55b3b20f92a13bf04eeb2e766bcc3e7d5d0ba3a8b7abec208
-SIZE (varnishcache-varnish-cache-varnish-6.2.1_GH0.tar.gz) = 1453439
+TIMESTAMP = 1568843268
+SHA256 (varnishcache-varnish-cache-varnish-6.3.0_GH0.tar.gz) = c7170d4bc57f1d2454da046fc5e43e2d19a804448d2dd839fa5c33f76bd677bb
+SIZE (varnishcache-varnish-cache-varnish-6.3.0_GH0.tar.gz) = 1495686
diff --git a/www/wt/Makefile b/www/wt/Makefile
index 0be000c60a84..37d096b605a4 100644
--- a/www/wt/Makefile
+++ b/www/wt/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= wt
-DISTVERSION= 4.1.0
-PORTREVISION= 1
+DISTVERSION= 4.1.1
CATEGORIES= www
MAINTAINER= info@babaei.net
diff --git a/www/wt/distinfo b/www/wt/distinfo
index c6d8a3992b33..b2d36e1df446 100644
--- a/www/wt/distinfo
+++ b/www/wt/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1565657157
-SHA256 (emweb-wt-4.1.0_GH0.tar.gz) = 03a8b59e054780f13443e95b6acd01a4575db70f718aed39c8bdf830253823d6
-SIZE (emweb-wt-4.1.0_GH0.tar.gz) = 8746560
+TIMESTAMP = 1568504440
+SHA256 (emweb-wt-4.1.1_GH0.tar.gz) = e2dd571bbacf83b6da10dbe336832e21ec7e02057bdf752deb287570b726ba17
+SIZE (emweb-wt-4.1.1_GH0.tar.gz) = 8744334
diff --git a/www/wt/pkg-plist b/www/wt/pkg-plist
index 1186c78fbf94..83c0bf9964b2 100644
--- a/www/wt/pkg-plist
+++ b/www/wt/pkg-plist
@@ -381,23 +381,23 @@ lib/cmake/wt/wt-target-dbo.cmake
lib/cmake/wt/wt-target-wt-release.cmake
lib/cmake/wt/wt-target-wt.cmake
lib/libwt.so
-lib/libwt.so.4.1.0
+lib/libwt.so.4.1.1
%%DBO%%lib/libwtdbo.so
-%%DBO%%lib/libwtdbo.so.4.1.0
+%%DBO%%lib/libwtdbo.so.4.1.1
%%FIREBIRD%%lib/libwtdbofirebird.so
-%%FIREBIRD%%lib/libwtdbofirebird.so.4.1.0
+%%FIREBIRD%%lib/libwtdbofirebird.so.4.1.1
%%MYSQL%%lib/libwtdbomysql.so
-%%MYSQL%%lib/libwtdbomysql.so.4.1.0
+%%MYSQL%%lib/libwtdbomysql.so.4.1.1
%%POSTGRES%%lib/libwtdbopostgres.so
-%%POSTGRES%%lib/libwtdbopostgres.so.4.1.0
+%%POSTGRES%%lib/libwtdbopostgres.so.4.1.1
%%SQLITE3%%lib/libwtdbosqlite3.so
-%%SQLITE3%%lib/libwtdbosqlite3.so.4.1.0
+%%SQLITE3%%lib/libwtdbosqlite3.so.4.1.1
%%FCGI%%lib/libwtfcgi.so
-%%FCGI%%lib/libwtfcgi.so.4.1.0
+%%FCGI%%lib/libwtfcgi.so.4.1.1
%%WTHTTP%%lib/libwthttp.so
-%%WTHTTP%%lib/libwthttp.so.4.1.0
+%%WTHTTP%%lib/libwthttp.so.4.1.1
%%WTHTTP%%lib/libwttest.so
-%%WTHTTP%%lib/libwttest.so.4.1.0
+%%WTHTTP%%lib/libwttest.so.4.1.1
%%RESOURCES%%share/Wt/resources/ajax-loading.gif
%%RESOURCES%%share/Wt/resources/collapse-rtl.gif
%%RESOURCES%%share/Wt/resources/collapse.gif
diff --git a/www/wt3/Makefile b/www/wt3/Makefile
index 2183890f3d26..1b1d19fbe544 100644
--- a/www/wt3/Makefile
+++ b/www/wt3/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= wt3
-PORTVERSION= 3.4.0
-PORTREVISION= 1
+PORTVERSION= 3.4.1
CATEGORIES= www
MAINTAINER= info@babaei.net
@@ -12,8 +11,6 @@ COMMENT= Widget-centric C++ library for developing web applications
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE
-BROKEN_powerpc64= fails to link: libwthttp.so. undefined reference to boost::program_options::abstract_variables_map::operator
-
LIB_DEPENDS= libpng.so:graphics/png \
libboost_system.so:devel/boost-libs \
libGraphicsMagick.so:graphics/GraphicsMagick
diff --git a/www/wt3/distinfo b/www/wt3/distinfo
index 51239bcf140f..62bba34c1140 100644
--- a/www/wt3/distinfo
+++ b/www/wt3/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1564694523
-SHA256 (emweb-wt-3.4.0_GH0.tar.gz) = 4cc10f7354218152a56b39d60479eae8080e0607b5e436a9bbe3d5f84780d287
-SIZE (emweb-wt-3.4.0_GH0.tar.gz) = 8659808
+TIMESTAMP = 1568504454
+SHA256 (emweb-wt-3.4.1_GH0.tar.gz) = 19ea7fd93e47299b89aae7a7f73565c97d4ef0e57aff77b8e2a3a3d873b205e1
+SIZE (emweb-wt-3.4.1_GH0.tar.gz) = 8662262
diff --git a/www/wt3/pkg-plist b/www/wt3/pkg-plist
index b07a6ecea805..bf115202545f 100644
--- a/www/wt3/pkg-plist
+++ b/www/wt3/pkg-plist
@@ -371,25 +371,25 @@ include/Wt/WWebWidget
include/Wt/WWidget
include/Wt/WWidgetItem
lib/libwt.so
-lib/libwt.so.3.4.0
+lib/libwt.so.3.4.1
%%DBO%%lib/libwtdbo.so
-%%DBO%%lib/libwtdbo.so.3.4.0
+%%DBO%%lib/libwtdbo.so.3.4.1
%%FIREBIRD%%lib/libwtdbofirebird.so
-%%FIREBIRD%%lib/libwtdbofirebird.so.3.4.0
+%%FIREBIRD%%lib/libwtdbofirebird.so.3.4.1
%%MYSQL%%lib/libwtdbomysql.so
-%%MYSQL%%lib/libwtdbomysql.so.3.4.0
+%%MYSQL%%lib/libwtdbomysql.so.3.4.1
%%POSTGRES%%lib/libwtdbopostgres.so
-%%POSTGRES%%lib/libwtdbopostgres.so.3.4.0
+%%POSTGRES%%lib/libwtdbopostgres.so.3.4.1
%%SQLITE3%%lib/libwtdbosqlite3.so
-%%SQLITE3%%lib/libwtdbosqlite3.so.3.4.0
+%%SQLITE3%%lib/libwtdbosqlite3.so.3.4.1
%%EXT%%lib/libwtext.so
-%%EXT%%lib/libwtext.so.3.4.0
+%%EXT%%lib/libwtext.so.3.4.1
%%FCGI%%lib/libwtfcgi.so
-%%FCGI%%lib/libwtfcgi.so.3.4.0
+%%FCGI%%lib/libwtfcgi.so.3.4.1
%%WTHTTP%%lib/libwthttp.so
-%%WTHTTP%%lib/libwthttp.so.3.4.0
+%%WTHTTP%%lib/libwthttp.so.3.4.1
%%LIBWTTEST%%lib/libwttest.so
-%%LIBWTTEST%%lib/libwttest.so.3.4.0
+%%LIBWTTEST%%lib/libwttest.so.3.4.1
%%RESOURCES%%share/Wt/resources/ajax-loading.gif
%%RESOURCES%%share/Wt/resources/calendar_edit.png
%%RESOURCES%%share/Wt/resources/collapse-rtl.gif
diff --git a/www/xfce4-smartbookmark-plugin/Makefile b/www/xfce4-smartbookmark-plugin/Makefile
index d9d651e3e2ef..9d56ffeae5e2 100644
--- a/www/xfce4-smartbookmark-plugin/Makefile
+++ b/www/xfce4-smartbookmark-plugin/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= xfce4-smartbookmark-plugin
-PORTVERSION= 0.5.0
+PORTVERSION= 0.5.1
CATEGORIES= www xfce
MASTER_SITES= XFCE/panel-plugins
DIST_SUBDIR= xfce4
@@ -14,7 +14,7 @@ LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
USES= gettext-tools gmake gnome libtool pkgconfig tar:bzip2 \
- xfce:gtk3
+ xfce
USE_GNOME= cairo gdkpixbuf2 gtk30 intltool
USE_XFCE= panel
diff --git a/www/xfce4-smartbookmark-plugin/distinfo b/www/xfce4-smartbookmark-plugin/distinfo
index 95f150a0bef0..4e6df47f17bc 100644
--- a/www/xfce4-smartbookmark-plugin/distinfo
+++ b/www/xfce4-smartbookmark-plugin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1488046874
-SHA256 (xfce4/xfce4-smartbookmark-plugin-0.5.0.tar.bz2) = 139539c58d54d878de86ef8a882c793cd909981e6b888f7f9d5e230a8fe310a4
-SIZE (xfce4/xfce4-smartbookmark-plugin-0.5.0.tar.bz2) = 280988
+TIMESTAMP = 1565693710
+SHA256 (xfce4/xfce4-smartbookmark-plugin-0.5.1.tar.bz2) = 3e28fb7cd2e2251e89a8715684081b862406e3fb4e6d8c0caa1b798a97703600
+SIZE (xfce4/xfce4-smartbookmark-plugin-0.5.1.tar.bz2) = 302735
diff --git a/www/xfce4-smartbookmark-plugin/pkg-plist b/www/xfce4-smartbookmark-plugin/pkg-plist
index 47ecd403d4ea..eaf886a642d4 100644
--- a/www/xfce4-smartbookmark-plugin/pkg-plist
+++ b/www/xfce4-smartbookmark-plugin/pkg-plist
@@ -1,6 +1,7 @@
lib/xfce4/panel/plugins/libsmartbookmark.so
%%NLS%%share/locale/ar/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
%%NLS%%share/locale/ast/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
+%%NLS%%share/locale/be/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
%%NLS%%share/locale/bg/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
%%NLS%%share/locale/ca/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
%%NLS%%share/locale/cs/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
@@ -11,6 +12,7 @@ lib/xfce4/panel/plugins/libsmartbookmark.so
%%NLS%%share/locale/en_GB/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
%%NLS%%share/locale/es/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
%%NLS%%share/locale/eu/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
%%NLS%%share/locale/fr/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
%%NLS%%share/locale/gl/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
%%NLS%%share/locale/he/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
@@ -21,6 +23,7 @@ lib/xfce4/panel/plugins/libsmartbookmark.so
%%NLS%%share/locale/it/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
%%NLS%%share/locale/ja/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
%%NLS%%share/locale/ko/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
+%%NLS%%share/locale/ku/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
%%NLS%%share/locale/lt/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
%%NLS%%share/locale/lv/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
%%NLS%%share/locale/ms/LC_MESSAGES/xfce4-smartbookmark-plugin.mo
diff --git a/www/youtube_dl/Makefile b/www/youtube_dl/Makefile
index 30c0d4c9fabb..25b015627a7e 100644
--- a/www/youtube_dl/Makefile
+++ b/www/youtube_dl/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= youtube_dl
-PORTVERSION= 2019.09.01
+PORTVERSION= 2019.09.12.1
CATEGORIES= www
MASTER_SITES= https://yt-dl.org/downloads/${PORTVERSION}/
DISTNAME= youtube-dl-${PORTVERSION}
diff --git a/www/youtube_dl/distinfo b/www/youtube_dl/distinfo
index cd087d79e8e5..b573140e4d4d 100644
--- a/www/youtube_dl/distinfo
+++ b/www/youtube_dl/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1568080030
-SHA256 (youtube-dl-2019.09.01.tar.gz) = 19374ff7ea794c934f75d65be98dac5837f078adb063c4980a9ce7593af06b49
-SIZE (youtube-dl-2019.09.01.tar.gz) = 3179376
+TIMESTAMP = 1568789222
+SHA256 (youtube-dl-2019.09.12.1.tar.gz) = ce27a84e861e4d234768bf3a466d3e0f9af7c58f2aac84b940feb2ce6640fb40
+SIZE (youtube-dl-2019.09.12.1.tar.gz) = 3180312