*/*: sync with upstream

Taken from: HardenedBSD

accessibility/rubygem-atk/Makefile

@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	atk
-PORTVERSION=	3.1.4
+PORTVERSION=	3.1.6
 CATEGORIES=	accessibility rubygems
 MASTER_SITES=	RG
 

accessibility/rubygem-atk/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1496171827
-SHA256 (rubygem/atk-3.1.4.gem) = 4dc9bd7225d76411bfabc4a296357db989bf4d7e3b6e2f9cf24cbbd7f09a2a33
-SIZE (rubygem/atk-3.1.4.gem) = 6656
+TIMESTAMP = 1499522761
+SHA256 (rubygem/atk-3.1.6.gem) = cbd1c61cadb79ee4dda060866a2f0687beebf8b223ad613b50b9dfd4fca9a6c6
+SIZE (rubygem/atk-3.1.6.gem) = 6656

archivers/peazip/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	peazip
-PORTVERSION=	6.4.0
+PORTVERSION=	6.4.1
 CATEGORIES=	archivers
 MASTER_SITES=	https://github.com/giorgiotani/PeaZip/releases/download/${PORTVERSION}/
 DISTNAME=	${PORTNAME}-${PORTVERSION}.src

archivers/peazip/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1491922968
-SHA256 (peazip-6.4.0.src.zip) = e54e29c703ab18beadf3cc27242a8b2f25c411c7aee5da2a51594a4beab83608
-SIZE (peazip-6.4.0.src.zip) = 4098849
+TIMESTAMP = 1499397491
+SHA256 (peazip-6.4.1.src.zip) = 6be126675c83df95b020da6221cf5063aed83510783d55254f4923c29a5245d0
+SIZE (peazip-6.4.1.src.zip) = 4098287

archivers/zstd/Makefile

@@ -4,6 +4,7 @@
 PORTNAME=	zstd
 PORTVERSION=	1.3.0
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	archivers
 
 MAINTAINER=	[email protected]
@@ -14,6 +15,8 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ALL_TARGET=	default
 MAKE_ARGS=	INCLUDEDIR="${PREFIX}/include" LIBDIR="${PREFIX}/lib" MANDIR="${PREFIX}/man/man1"
+TEST_TARGET=	test
+USE_LDCONFIG=	yes
 USES=		gmake
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}

astro/josm/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	josm
-PORTVERSION=	12275
+PORTVERSION=	12450
 CATEGORIES=	astro java
 MASTER_SITES=	http://josm.openstreetmap.de/download/ \
 		http://mirror.amdmi3.ru/distfiles/

astro/josm/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1497545107
-SHA256 (josm-snapshot-12275.jar) = 0aa1d81d50f657ec15f8696007399529a86db836c1aac73e1922e9f1827ac893
-SIZE (josm-snapshot-12275.jar) = 11155406
+TIMESTAMP = 1499427970
+SHA256 (josm-snapshot-12450.jar) = 329d34eda44b952b118361446f3c069f85113193099b007db2d1ff45593d01d1
+SIZE (josm-snapshot-12450.jar) = 11227509

audio/dir2ogg/pkg-descr

@@ -1,4 +1,4 @@
 dir2ogg is a python script which converts mp3, m4a, wma and wav files into
 OGG Vorbis format.  It was inspired by the perl script mp32ogg.
 
-WWW: http://jak-linux.org/projects/dir2ogg/
+WWW: https://jak-linux.org/projects/dir2ogg/

databases/R-cran-RMySQL/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	RMySQL
-DISTVERSION=	0.10.11
+DISTVERSION=	0.10.12
 CATEGORIES=	databases
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 

databases/R-cran-RMySQL/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1494133301
-SHA256 (RMySQL_0.10.11.tar.gz) = da405e38d08bb728586c2b9c969f222b0b83fe1df33ad9308eba820b8f03ea88
-SIZE (RMySQL_0.10.11.tar.gz) = 54186
+TIMESTAMP = 1499569145
+SHA256 (RMySQL_0.10.12.tar.gz) = 7099708f137b6912df6994cf60bf03aa085163500950d5b274e78846b853f97d
+SIZE (RMySQL_0.10.12.tar.gz) = 52539

databases/mongodb34/Makefile

@@ -2,7 +2,7 @@
 
 PORTNAME=	mongodb
 DISTVERSIONPREFIX=	r
-DISTVERSION=	3.4.5
+DISTVERSION=	3.4.6
 CATEGORIES=	databases net
 MASTER_SITES=	https://fastdl.mongodb.org/src/ \
 		http://fastdl.mongodb.org/src/ \

databases/mongodb34/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1498771362
-SHA256 (mongodb-src-r3.4.5.tar.gz) = 84806e5496a1a0a8fe9a59d6eab0acfab0e68476437e94e2772f898677bb21f0
-SIZE (mongodb-src-r3.4.5.tar.gz) = 39905053
+TIMESTAMP = 1499359915
+SHA256 (mongodb-src-r3.4.6.tar.gz) = 8170360f6dfede9c19c131f3d76831e952b3f1494925aa7e2a3a2f95b58ad901
+SIZE (mongodb-src-r3.4.6.tar.gz) = 39922209

databases/mongodb34/files/patch-src_mongo_crypto_crypto__openssl.cpp → databases/mongodb34/files/patch-src_mongo_crypto_sha1__block__openssl.cpp

@@ -1,6 +1,6 @@
---- src/mongo/crypto/crypto_openssl.cpp.orig	2017-06-08 16:11:03 UTC
-+++ src/mongo/crypto/crypto_openssl.cpp
-@@ -41,7 +41,7 @@
+--- src/mongo/crypto/sha1_block_openssl.cpp.orig	2017-06-27 19:02:43 UTC
++++ src/mongo/crypto/sha1_block_openssl.cpp
+@@ -42,7 +42,7 @@
  #include <openssl/evp.h>
  #include <openssl/hmac.h>
  #include <openssl/sha.h>

databases/p5-Mojo-Pg/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	Mojo-Pg
-PORTVERSION=	3.06
+PORTVERSION=	4.0
 CATEGORIES=	databases www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SRI

databases/p5-Mojo-Pg/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1496418359
-SHA256 (Mojo-Pg-3.06.tar.gz) = e642b3b0446bd9ec55c98073c73173ae17e9d409d5eeaad491d759332457873c
-SIZE (Mojo-Pg-3.06.tar.gz) = 30582
+TIMESTAMP = 1499438994
+SHA256 (Mojo-Pg-4.0.tar.gz) = c30de035118948df73200de6e29f2a99dd41f7b91ef997c9b113707b4399659c
+SIZE (Mojo-Pg-4.0.tar.gz) = 30913

deskutils/Makefile

@@ -225,10 +225,12 @@
     SUBDIR += tagutils
     SUBDIR += taskcoach
     SUBDIR += taskd
+    SUBDIR += tasksh
     SUBDIR += taskwarrior
     SUBDIR += teapot
     SUBDIR += tel
     SUBDIR += thinkingrock
+    SUBDIR += timewarrior
     SUBDIR += tine20
     SUBDIR += tnote
     SUBDIR += todo

deskutils/calibre/Makefile

@@ -2,7 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	calibre
-PORTVERSION=	3.2.1
+PORTVERSION=	3.3.0
+PORTREVISION=	1
 CATEGORIES=	deskutils python
 MASTER_SITES=	http://download.calibre-ebook.com/${PORTVERSION}/
 
@@ -50,10 +51,9 @@ EXTRACT_BEFORE_ARGS=	-x -s '/^calibre/~-src/' -f
 
 USES=		desktop-file-utils gettext-runtime gnome localbase:ldflags pkgconfig \
 		python:2 pyqt:5 shared-mime-info shebangfix ssl tar:xz
-SHEBANG_FILES=	resources/calibre-portable.sh \
-		src/calibre/ebooks/metadata/odt.py \
-		src/calibre/utils/*.py \
-		src/odf/*.py
+SHEBANG_GLOB=	*.sh *.py
+python_OLD_CMD=	"/usr/bin/env python" /bin/python /usr/bin/python /usr/local/bin/python \
+		"/usr/bin/env python2" /bin/python2 /usr/bin/python2 /usr/local/bin/python2
 USE_PYQT=	core gui network sip svg webkit widgets webkitwidgets xmlpatterns
 USE_QT5=	buildtools_build core dbus gui qmake_build widgets
 USE_GL=		egl gl
@@ -73,7 +73,9 @@ MAKE_ENV+=	FC_INC_DIR="${LOCALBASE}/include/fontconfig" \
 		XDG_UTILS_INSTALL_MODE=system \
 		QMAKE=${QMAKE}
 
-.include <bsd.port.pre.mk>
+post-patch:
+	@${REINPLACE_CMD} -e "s|#!/usr/bin/env python2|#!${PYTHON_CMD}|" \
+		${WRKSRC}/setup/install.py
 
 do-build:
 	@${MKDIR} ${WRKDIR}/calibre-config ${WRKDIR}/xdg-config
@@ -96,4 +98,4 @@ do-install:
 	@${RMDIR} ${STAGEDIR}${PREFIX}/share/desktop-directories
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/calibre/calibre/plugins/*
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

deskutils/calibre/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1498827761
-SHA256 (calibre-3.2.1.tar.xz) = cacaaebeaa5dd6c706cd6ce4b0bcbbad2fe35e1e97bd317a76b5f3a1acbfa657
-SIZE (calibre-3.2.1.tar.xz) = 35918324
+TIMESTAMP = 1499412918
+SHA256 (calibre-3.3.0.tar.xz) = 0cd42109f432995a75bd921a37444c142cc25d178083857efbac756f615403ff
+SIZE (calibre-3.3.0.tar.xz) = 36308116

deskutils/calibre/files/calibre.in

@@ -43,8 +43,8 @@ load_rc_config $name
 : ${calibre_logsize:=10}
 
 pidfile=/var/run/${name}/${name}.pid
-command=/usr/local/bin/calibre-server
-command_interpreter=python2
+command=%%PREFIX%%/bin/calibre-server
+command_interpreter=%%LOCALBASE%%/bin/python2.7
 required_dirs=${calibre_library}
 
 start_precmd=calibre_prestart

deskutils/calibre/pkg-plist

@@ -1629,6 +1629,7 @@ lib/calibre/tinycss/version.py
 %%DATADIR%%/images/format-text-bold.png
 %%DATADIR%%/images/format-text-color.png
 %%DATADIR%%/images/format-text-heading.png
+%%DATADIR%%/images/format-text-hr.png
 %%DATADIR%%/images/format-text-italic.png
 %%DATADIR%%/images/format-text-strikethrough.png
 %%DATADIR%%/images/format-text-subscript.png
@@ -1720,6 +1721,7 @@ lib/calibre/tinycss/version.py
 %%DATADIR%%/images/previous.png
 %%DATADIR%%/images/print.png
 %%DATADIR%%/images/publisher.png
+%%DATADIR%%/images/quickview.png
 %%DATADIR%%/images/random.png
 %%DATADIR%%/images/rating.png
 %%DATADIR%%/images/reader.png

deskutils/tasksh/Makefile

@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME=	tasksh
+PORTVERSION=	1.2.0
+CATEGORIES=	deskutils
+MASTER_SITES=	http://taskwarrior.org/download/
+
+MAINTAINER=	[email protected]
+COMMENT=	Shell command that wraps Taskwarrior commands
+
+USES=		cmake readline
+
+.include <bsd.port.mk>

deskutils/tasksh/distinfo

@@ -0,0 +1,3 @@
+TIMESTAMP = 1499468972
+SHA256 (tasksh-1.2.0.tar.gz) = 6e42f949bfd7fbdde4870af0e7b923114cc96c4344f82d9d924e984629e21ffd
+SIZE (tasksh-1.2.0.tar.gz) = 449323

deskutils/tasksh/pkg-descr

@@ -0,0 +1,4 @@
+Tasksh is a shell command that wraps Taskwarrior commands. It is intended to
+provide simpler Taskwarrior access, and add a few new features of its own.
+
+WWW: https://tasktools.org/projects/tasksh.html

deskutils/tasksh/pkg-plist

@@ -0,0 +1,7 @@
+bin/tasksh
+man/man1/tasksh.1.gz
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/NEWS

deskutils/timewarrior/Makefile

@@ -0,0 +1,14 @@
+# $FreeBSD$
+
+PORTNAME=	timewarrior
+PORTVERSION=	1.0.0
+CATEGORIES=	deskutils
+MASTER_SITES=	https://taskwarrior.org/download/
+DISTNAME=	timew-${PORTVERSION}
+
+MAINTAINER=	[email protected]
+COMMENT=	Track time from the command line
+
+USES=		cmake
+
+.include <bsd.port.mk>

deskutils/timewarrior/distinfo

@@ -0,0 +1,3 @@
+TIMESTAMP = 1499471464
+SHA256 (timew-1.0.0.tar.gz) = ac027910e1e8365bdd218a8b42389b26d017d38d3c96516c408db6d5a44e0bb5
+SIZE (timew-1.0.0.tar.gz) = 140539

deskutils/timewarrior/pkg-descr

@@ -0,0 +1,4 @@
+Timewarrior is Free and Open Source Software that tracks time from the command
+line.
+
+WWW: https://timewarrior.net/

deskutils/timewarrior/pkg-plist

@@ -0,0 +1,16 @@
+bin/timew
+man/man1/timew.1.gz
+share/doc/timew/AUTHORS
+share/doc/timew/COPYING
+share/doc/timew/ChangeLog
+share/doc/timew/INSTALL
+share/doc/timew/LICENSE
+share/doc/timew/NEWS
+share/doc/timew/README.md
+share/doc/timew/doc/holidays/README
+share/doc/timew/doc/holidays/holidays.en-US
+share/doc/timew/doc/holidays/refresh
+share/doc/timew/doc/themes/README
+share/doc/timew/doc/themes/dark.theme
+share/doc/timew/ext/on-modify.timewarrior
+share/doc/timew/ext/totals.py

deskutils/treesheets/Makefile

@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	treesheets
-PORTVERSION=	0.0.20161120
-PORTREVISION=	1
+PORTVERSION=	0.0.20170625
 CATEGORIES=	deskutils
 
 MAINTAINER=	[email protected]
@@ -12,23 +11,26 @@ COMMENT=	Free form data organizer
 LICENSE=	ZLIB
 LICENSE_FILE=	${WRKSRC}/ZLIB_LICENSE.txt
 
+USES=		compiler:c++11-lib desktop-file-utils
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	aardappel
-GH_TAGNAME=	7baabf3
+GH_TAGNAME=	8c8d5e0
+
+USE_WX=		3.0+
+INSTALLS_ICONS=	yes
 
 BUILD_WRKSRC=	${WRKSRC}/src
 PACKAGE_VERSION=	\"${PORTVERSION}\"
 MAKE_ENV=	PACKAGE_VERSION=${PACKAGE_VERSION:Q}
 
-USES=		compiler:c++11-lib desktop-file-utils
-USE_WX=		3.0+
-
 PORTDATA=	images
 PORTDOCS=	docs *.html
 PORTEXAMPLES=	*
 
 PLIST_FILES=	bin/${PORTNAME} \
 		share/applications/treesheets.desktop \
+		share/icons/hicolor/scalable/apps/treesheets.svg \
 		share/pixmaps/treesheets.png
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
@@ -40,12 +42,17 @@ post-patch: .SILENT
 		${BUILD_WRKSRC}/myframe.h
 	${REINPLACE_CMD} -e 's|frame->GetPath(L"examples|(L"${EXAMPLESDIR}|' \
 		${BUILD_WRKSRC}/system.h
+	${REINPLACE_CMD} -e 's|^\(Icon=\).*|\1${PORTNAME}|' \
+		${WRKSRC}/TS/treesheets.desktop
 
 do-install:
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	(cd ${WRKSRC}/TS && ${COPYTREE_SHARE} "${PORTDATA}" ${STAGEDIR}${DATADIR})
 	${INSTALL_DATA} ${WRKSRC}/TS/treesheets.desktop \
 		${STAGEDIR}${PREFIX}/share/applications
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps
+	${INSTALL_DATA} ${WRKSRC}/TS/images/treesheets.svg \
+		${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps
 	${INSTALL_DATA} ${WRKSRC}/TS/images/icon32.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png
 

deskutils/treesheets/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1479663653
-SHA256 (aardappel-treesheets-0.0.20161120-7baabf3_GH0.tar.gz) = 50fc7ecc1fe15fae310bb8a64af504dfc56e959905b4f13a8d51ebb6e992753a
-SIZE (aardappel-treesheets-0.0.20161120-7baabf3_GH0.tar.gz) = 1792180
+TIMESTAMP = 1498411816
+SHA256 (aardappel-treesheets-0.0.20170625-8c8d5e0_GH0.tar.gz) = ed24f04019d7fd5f9663d359ab57756744031c58a3f1669cca6bac2d45bffd7a
+SIZE (aardappel-treesheets-0.0.20170625-8c8d5e0_GH0.tar.gz) = 1992345

devel/Makefile

@@ -568,7 +568,8 @@
     SUBDIR += erlang-unicode_util_compat
     SUBDIR += es-eric6
     SUBDIR += etcd
-    SUBDIR += etcd3
+    SUBDIR += etcd31
+    SUBDIR += etcd32
     SUBDIR += etl
     SUBDIR += euca2ools
     SUBDIR += eventxx
@@ -5211,6 +5212,7 @@
     SUBDIR += rubygem-axiom-types
     SUBDIR += rubygem-backports
     SUBDIR += rubygem-bacon
+    SUBDIR += rubygem-baf
     SUBDIR += rubygem-benelux
     SUBDIR += rubygem-bin_utils
     SUBDIR += rubygem-bindata
@@ -5409,6 +5411,7 @@
     SUBDIR += rubygem-jbuilder-rails5
     SUBDIR += rubygem-jbuilder-rails50
     SUBDIR += rubygem-jekyll-coffeescript
+    SUBDIR += rubygem-jenkins_api_client
     SUBDIR += rubygem-jeweler
     SUBDIR += rubygem-jira-ruby
     SUBDIR += rubygem-jmespath
@@ -5581,6 +5584,7 @@
     SUBDIR += rubygem-rspec-core
     SUBDIR += rubygem-rspec-expectations
     SUBDIR += rubygem-rspec-logsplit
+    SUBDIR += rubygem-rspec-its
     SUBDIR += rubygem-rspec-mocks
     SUBDIR += rubygem-rspec-rails
     SUBDIR += rubygem-rspec-support