Index: head/devel/bloaty/Makefile
===================================================================
--- head/devel/bloaty/Makefile	(revision 500650)
+++ head/devel/bloaty/Makefile	(revision 500651)
@@ -1,33 +1,32 @@
 # $FreeBSD$
 
 PORTNAME=	bloaty
 PORTVERSION=	1.0
 DISTVERSIONPREFIX=	v
 PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Size profiler for binaries
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	go:lang/go \
 		cmake:devel/cmake \
 		ninja:devel/ninja
 LIB_DEPENDS=	libre2.so:devel/re2 \
 		libcapstone.so:devel/capstone4 \
 		libprotobuf.so:devel/protobuf
 
 USES=		cmake pkgconfig
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	google
-GH_TUPLE=	google:${PORTNAME}:${DISTVERSIONPREFIX}${PORTVERSION}:DEFAULT \
-		abseil:abseil-cpp:bea85b5:abseil/third_party/abseil-cpp \
+GH_TUPLE=	abseil:abseil-cpp:bea85b5:abseil/third_party/abseil-cpp \
 		nico:demumble:01098ea:demumble/third_party/demumble
 CMAKE_OFF=	BLOATY_ENABLE_CMAKETARGETS BLOATY_ENABLE_BUILDID
 
 PLIST_FILES=	bin/bloaty
 
 .include <bsd.port.mk>
Index: head/games/90secondportraits/Makefile
===================================================================
--- head/games/90secondportraits/Makefile	(revision 500650)
+++ head/games/90secondportraits/Makefile	(revision 500651)
@@ -1,53 +1,53 @@
 # Created by: Dmitry Marakasov <amdmi3@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	90secondportraits
 PORTVERSION=	1.01b
 PORTREVISION=	1
 CATEGORIES=	games
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Silly speed painting game
 
 LICENSE=	ZLIB MIT CC-BY-SA-4.0 CC-BY-3.0
 LICENSE_COMB=	multi
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	love10:devel/love10
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	SimonLarsen:DEFAULT
-GH_PROJECT=	90-Second-Portraits:DEFAULT
+GH_ACCOUNT=	SimonLarsen
+GH_PROJECT=	90-Second-Portraits
 GH_TUPLE=	vrld:hump:537ca76:hump/hump \
 		kikito:middleclass:f670920:middleclass/middleclass
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 PLIST_FILES=	bin/${PORTNAME} \
 		share/pixmaps/${PORTNAME}.png
 PORTDOCS=	*
 PORTDATA=	*
 
 SUB_FILES=	${PORTNAME}
 
 DESKTOP_ENTRIES="${PORTNAME}" \
 		"" \
 		"${PREFIX}/share/pixmaps/${PORTNAME}.png" \
 		"${PORTNAME}" \
 		"Game;Art;" \
 		""
 
 OPTIONS_DEFINE=	DOCS
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/data/android-icons/drawable-xhdpi/ic_launcher.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/*.md ${WRKSRC}/*.txt ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>
Index: head/graphics/opencv/Makefile
===================================================================
--- head/graphics/opencv/Makefile	(revision 500650)
+++ head/graphics/opencv/Makefile	(revision 500651)
@@ -1,395 +1,394 @@
 # Created by: Marc Abramowitz (http://marc.abramowitz.info)
 # $FreeBSD$
 
 PORTNAME=	opencv
 PORTVERSION=	3.4.1
 PORTREVISION=	17
 CATEGORIES=	graphics
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Open Source Computer Vision library
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 NOT_FOR_ARCHS=	sparc64
 NOT_FOR_ARCHS_REASON_sparc64=	does not compile on sparc64
 
 .if defined(OCV_CORE)
 BUILD_DEPENDS=	protoc:devel/protobuf
 .else
 LIB_DEPENDS=	libprotobuf.so:devel/protobuf \
 		libtesseract.so:graphics/tesseract
 .endif
 
 USES=		cmake compiler:c++14-lang localbase:ldflags pkgconfig
 
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 USE_CXXSTD=	c++11
 
 DATADIR=	${PREFIX}/share/OpenCV
 PLIST_SUB+=	SOVERSION=${DISTVERSION:R} VERSION=${DISTVERSION}
 
 # 3rd party libs
 CMAKE_ON=	ENABLE_CXX11
 CMAKE_OFF=	BUILD_ZLIB BUILD_TIFF BUILD_JASPER BUILD_JPEG BUILD_PNG BUILD_OPENEXR BUILD_TBB BUILD_IPP_IW BUILD_ITT BUILD_PROTOBUF
 # Optional 3rd party components
 CMAKE_ARGS+=	-DWITH_1394:BOOL=OFF \
 		-DWITH_CAROTENE:BOOL=OFF \
 		-DWITH_CPUFEATURES:BOOL=OFF \
 		-DWITH_VTK:BOOL=OFF \
 		-DWITH_CUDA:BOOL=OFF \
 		-DWITH_CUFFT:BOOL=OFF \
 		-DWITH_CUBLAS:BOOL=OFF \
 		-DWITH_NVCUVID:BOOL=OFF \
 		-DWITH_EIGEN:BOOL=OFF \
 		-DWITH_VFW:BOOL=OFF \
 		-DWITH_FFMPEG:BOOL=OFF \
 		-DWITH_GSTREAMER:BOOL=OFF \
 		-DWITH_GSTREAMER_0_10:BOOL=OFF \
 		-DWITH_GTK:BOOL=OFF \
 		-DWITH_GTK_2_X:BOOL=ON \
 		-DWITH_IPP:BOOL=OFF \
 		-DWITH_IPP_A:BOOL=OFF \
 		-DWITH_HALIDE:BOOL=OFF \
 		-DWITH_JASPER:BOOL=OFF \
 		-DWITH_JPEG:BOOL=OFF \
 		-DWITH_WEBP:BOOL=OFF \
 		-DWITH_OPENEXR:BOOL=OFF \
 		-DWITH_OPENGL:BOOL=OFF \
 		-DWITH_OPENVX:BOOL=OFF \
 		-DWITH_OPENNI:BOOL=OFF \
 		-DWITH_OPENNI2:BOOL=OFF \
 		-DWITH_PNG:BOOL=OFF \
 		-DWITH_GDCM:BOOL=OFF \
 		-DWITH_PVAPI:BOOL=OFF \
 		-DWITH_GIGEAPI:BOOL=OFF \
 		-DWITH_ARAVIS:BOOL=OFF \
 		-DWITH_QT:BOOL=OFF \
 		-DWITH_WIN32UI:BOOL=OFF \
 		-DWITH_TBB:BOOL=OFF \
 		-DWITH_OPENMP:BOOL=OFF \
 		-DWITH_CSTRIPES:BOOL=ON \
 		-DWITH_PTHREADS_PF:BOOL=OFF \
 		-DWITH_TIFF:BOOL=OFF \
 		-DWITH_UNICAP:BOOL=OFF \
 		-DWITH_V4L:BOOL=OFF \
 		-DWITH_LIBV4L:BOOL=OFF \
 		-DWITH_DSHOW:BOOL=OFF \
 		-DWITH_MSMF:BOOL=OFF \
 		-DWITH_XIMEA:BOOL=OFF \
 		-DWITH_XINE:BOOL=OFF \
 		-DWITH_CLP:BOOL=OFF \
 		-DWITH_OPENCL:BOOL=OFF \
 		-DWITH_OPENCL_SVM:BOOL=OFF \
 		-DWITH_OPENCLAMDFFT:BOOL=OFF \
 		-DWITH_OPENCLAMDBLAS:BOOL=OFF \
 		-DWITH_DIRECTX:BOOL=OFF \
 		-DWITH_INTELPERC:BOOL=OFF \
 		-DWITH_MATLAB:BOOL=OFF \
 		-DWITH_VA:BOOL=OFF \
 		-DWITH_VA_INTEL:BOOL=OFF \
 		-DWITH_MFX:BOOL=OFF \
 		-DWITH_GDAL:BOOL=OFF \
 		-DWITH_GPHOTO2:BOOL=OFF \
 		-DWITH_LAPACK:BOOL=OFF \
 		-DWITH_ITT:BOOL=OFF
 # OpenCV build components
 CMAKE_ARGS+=	-DBUILD_SHARED_LIBS:BOOL=ON \
 		-DBUILD_opencv_apps:BOOL=ON \
 		-DBUILD_opencv_js:BOOL=OFF \
 		-DBUILD_ANDROID_EXAMPLES:BOOL=OFF \
 		-DBUILD_DOCS:BOOL=OFF \
 		-DBUILD_EXAMPLES:BOOL=OFF \
 		-DBUILD_PACKAGE:BOOL=OFF \
 		-DBUILD_PERF_TESTS:BOOL=OFF \
 		-DBUILD_TESTS:BOOL=OFF \
 		-DBUILD_WITH_DEBUG_INFO:BOOL=OFF \
 		-DBUILD_WITH_DYNAMIC_IPP:BOOL=OFF \
 		-DBUILD_FAT_JAVA_LIB:BOOL=OFF \
 		-DBUILD_CUDA_STUBS:BOOL=OFF \
 		-DBUILD_ANDROID_SERVICE:BOOL=OFF \
 		-DBUILD_opencv_ts:BOOL=OFF \
 		-DBUILD_opencv_cnn_3dobj_INIT:BOOL=OFF \
 		-DBUILD_opencv_world:BOOL=OFF
 # OpenCV installation options
 CMAKE_ARGS+=	-DINSTALL_CREATE_DISTRIB:BOOL=OFF \
 		-DINSTALL_C_EXAMPLES:BOOL=OFF \
 		-DINSTALL_PYTHON_EXAMPLES:BOOL=OFF \
 		-DINSTALL_TO_MANGLED_PATHS:BOOL=OFF \
 		-DINSTALL_TESTS:BOOL=OFF
 # OpenCV build options
 CMAKE_ARGS+=	-DENABLE_CCACHE:BOOL=OFF \
 		-DENABLE_PRECOMPILED_HEADERS:BOOL=OFF \
 		-DENABLE_SOLUTION_FOLDERS:BOOL=OFF \
 		-DENABLE_PROFILING:BOOL=OFF \
 		-DENABLE_COVERAGE:BOOL=OFF \
 		-DENABLE_OMIT_FRAME_POINTER:BOOL=ON \
 		-DENABLE_POWERPC:BOOL=OFF \
 		-DENABLE_VSX:BOOL=OFF \
 		-DENABLE_FAST_MATH:BOOL=OFF \
 		-DENABLE_NEON:BOOL=OFF \
 		-DENABLE_VFPV3:BOOL=OFF \
 		-DENABLE_NOISY_WARNINGS:BOOL=OFF \
 		-DOPENCV_WARNINGS_ARE_ERRORS:BOOL=OFF \
 		-DENABLE_IMPL_COLLECTION:BOOL=OFF \
 		-DENABLE_INSTRUMENTATION:BOOL=OFF \
 		-DENABLE_GNU_STL_DEBUG:BOOL=OFF \
 		-DENABLE_BUILD_HARDENING:BOOL=OFF \
 		-DENABLE_LTO:BOOL=OFF \
 		-DGENERATE_ABI_DESCRIPTOR:BOOL=OFF \
 		-DCV_ENABLE_INTRINSICS:BOOL=ON \
 		-DCV_DISABLE_OPTIMIZATION:BOOL=OFF \
 		-DCV_TRACE:BOOL=OFF \
 		-DENABLE_PYLINT:BOOL=OFF
 
 SUB_FILES=	FindOpenCVCore.cmake
 SUB_LIST=	OCV_VERSION=${DISTVERSION}
 
 OCV_CORE_MODS=		core imgproc
 OCV_MODS=		apps calib3d contrib dnn features2d flann highgui \
 			imgcodecs ml objdetect photo shape stitching \
 			superres ts video videoio videostab
 OCV_JAVA_MODS=		java
 OCV_PYTHON_MODS=	python${PYTHON_MAJOR_VER}
 
 OPTIONS_DEFINE=		EXAMPLES EXTRA_MODULES OPENGL GTK2
 OPTIONS_GROUP=		PERFORMANCE IMAGE VIDEO
 OPTIONS_GROUP_PERFORMANCE=	EIGEN3 OPENCL TBB
 OPTIONS_GROUP_IMAGE=	GDAL GDCM JASPER JPEG OPENEXR PNG TIFF WEBP
 OPTIONS_GROUP_VIDEO=	ARAVIS DC1394 FFMPEG GPHOTO2 GSTREAMER V4L XINE
 # EXTRA_MODULES required for libopencv_dnn which is required by py-opencv
 OPTIONS_DEFAULT=	EIGEN3 EXTRA_MODULES FFMPEG JASPER JPEG PNG TIFF WEBP V4L \
 			${MACHINE_CPU:tu}
 OPTIONS_SUB=		yes
 .if defined(OCV_CORE)
 OPTIONS_EXCLUDE=	ARAVIS DC1394 EXAMPLES EXTRA_MODULES FFMPEG \
 			GDAL GDCM GPHOTO2 GSTREAMER GTK2 JASPER JPEG \
 			OPENEXR OPENGL PNG TIFF WEBP V4L XINE
 .elif defined(OCV_SLAVE)
 OPTIONS_EXCLUDE=	EXAMPLES
 .endif
 
 DC1394_DESC=		IEEE 1394 camera support
 DC1394_LIB_DEPENDS=	libdc1394.so:multimedia/libdc1394
 DC1394_CMAKE_BOOL=	WITH_1394
 
 EXAMPLES_CMAKE_BOOL=	INSTALL_C_EXAMPLES
 
 PERFORMANCE_DESC=	Performance enhancing libraries
 
 EIGEN3_DESC=		Eigen 3 support
 EIGEN3_BUILD_DEPENDS=	${LOCALBASE}/include/eigen3/Eigen/Eigen:math/eigen3
 EIGEN3_CMAKE_BOOL=	WITH_EIGEN
 
 OPENCL_DESC=		OpenCL support
 OPENCL_BUILD_DEPENDS=	opencl>=0:devel/opencl
 OPENCL_RUN_DEPENDS=	opencl>=0:devel/opencl
 OPENCL_CMAKE_BOOL=	WITH_OPENCL
 
 TBB_DESC=		TBB support
 TBB_LIB_DEPENDS=	libtbb.so:devel/tbb
 TBB_CMAKE_BOOL=		WITH_TBB
 
 IMAGE_DESC=		Image format support
 
 JASPER_LIB_DEPENDS=	libjasper.so:graphics/jasper
 JASPER_CMAKE_BOOL=	WITH_JASPER
 
 JPEG_USES=		jpeg
 JPEG_CMAKE_BOOL=	WITH_JPEG
 
 GDAL_DESC=		Geospatial Data Abstraction Library
 GDAL_LIB_DEPENDS=	libgdal.so:graphics/gdal
 GDAL_CMAKE_BOOL=	WITH_GDAL
 
 GDCM_DESC=		Open source DICOM library
 GDCM_LIB_DEPENDS=	libgdcmMSFF.so:devel/gdcm
 GDCM_CMAKE_BOOL=	WITH_GDCM
 
 OPENEXR_LIB_DEPENDS=	libIlmImf.so:graphics/openexr
 OPENEXR_CMAKE_BOOL=	WITH_OPENEXR
 
 PNG_LIB_DEPENDS=	libpng.so:graphics/png
 PNG_CMAKE_BOOL=		WITH_PNG
 
 TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
 TIFF_CMAKE_BOOL=	WITH_TIFF
 
 WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
 WEBP_CMAKE_BOOL=	WITH_WEBP
 
 VIDEO_DESC=		Video support
 
 ARAVIS_DESC=		Aravis SDK
 ARAVIS_LIB_DEPENDS=	libaravis-0.6.so:devel/libaravis
 ARAVIS_CMAKE_BOOL=	WITH_ARAVIS
 
 FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
 FFMPEG_CMAKE_BOOL=	WITH_FFMPEG
 
 GPHOTO2_DESC=		Gphoto2 camera support
 GPHOTO2_LIB_DEPENDS=	libgphoto2.so:graphics/libgphoto2
 GPHOTO2_CMAKE_BOOL=	WITH_GPHOTO2
 
 GSTREAMER_USE=		GSTREAMER1=yes
 GSTREAMER_CMAKE_BOOL=	WITH_GSTREAMER
 
 V4L_BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
 V4L_LIB_DEPENDS=	libv4l2.so:multimedia/libv4l
 V4L_CMAKE_BOOL=		WITH_V4L WITH_LIBV4L
 V4L_CMAKE_ON=		CMAKE_REQUIRED_INCLUDES:STRING="${LOCALBASE}/include"
 
 XINE_LIB_DEPENDS=	libxine.so:multimedia/libxine
 XINE_CMAKE_BOOL=	WITH_XINE
 
 EXTRA_MODULES_DESC=		Extra modules
-EXTRA_MODULES_GH_ACCOUNT=	opencv:DEFAULT \
-				tiny-dnn:extra_mod_3rdparty_tiny_dnn
+EXTRA_MODULES_GH_ACCOUNT=	tiny-dnn:extra_mod_3rdparty_tiny_dnn
 EXTRA_MODULES_GH_PROJECT=	opencv_contrib:extra_mod \
 				tiny-dnn:extra_mod_3rdparty_tiny_dnn \
 				opencv_3rdparty:extra_mod_3rdparty_face_landmark_model \
 				opencv_3rdparty:extra_mod_3rdparty_boost_descr \
 				opencv_3rdparty:extra_mod_3rdparty_vgg_descr
 EXTRA_MODULES_GH_TAGNAME=	${PORTVERSION}:extra_mod \
 				2a2b50caa437a5964a61e45ffc83e70558e2bc68:extra_mod_3rdparty_tiny_dnn \
 				8afa57abc8229d611c4937165d20e2a2d9fc5a12:extra_mod_3rdparty_face_landmark_model \
 				34e4206aef44d50e6bbcd0ab06354b52e7466d26:extra_mod_3rdparty_boost_descr \
 				fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d:extra_mod_3rdparty_vgg_descr
 EXTRA_MODULES_LIB_DEPENDS=	libgflags.so:devel/gflags \
 				libglog.so:devel/glog \
 				libhdf5.so:science/hdf5
 EXTRA_MODULES_EXTRA_PATCHES+=	${FILESDIR}/extra-patch-modules_dnn__modern_CMakeLists.txt \
 				${FILESDIR}/extra-patch-modules_sfm_src__libmv__light_libmv_numeric_numeric.h \
 				${FILESDIR}/extra-patch-modules_stereo_src_descriptor.cpp
 
 OPENGL_DESC=		OpenGL (requires GTK2)
 OPENGL_CMAKE_BOOL=	WITH_OPENGL
 OPENGL_LIB_DEPENDS=	${PORT_OPTIONS:MGTK2:C,.+,libgtkglext-x11-1.0.so:x11-toolkits/gtkglext,}
 
 # GUI
 
 GTK2_USE=		GNOME=cairo,gdkpixbuf2,gtk20
 GTK2_CMAKE_BOOL=	WITH_GTK
 GTK2_LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 			libharfbuzz.so:print/harfbuzz \
 			libsz.so:science/szip \
 			libfontconfig.so:x11-fonts/fontconfig \
 			liblept.so:graphics/leptonica
 
 .if defined(OCV_CORE)
 . for module in ${OCV_MODS} ${OCV_JAVA_MODS} ${OCV_PYTHON_MODS}
 CMAKE_ARGS+=	-DBUILD_opencv_${module}:BOOL=OFF
 . endfor
 .elif defined(OCV_PYTHON)
 LIB_DEPENDS+=	libopencv_core.so:graphics/opencv-core \
 		libopencv_imgproc.so:graphics/opencv-core \
 		libopencv_ml.so:graphics/opencv
 BUILD_DEPENDS+=	${PYNUMPY}
 RUN_DEPENDS+=	${PYNUMPY}
 USES+=		python:2.7
 USE_PYTHON=	flavors
 CMAKE_ARGS+=	-DBUILD_opencv_python${PYTHON_MAJOR_VER}:BOOL=ON
 . for module in apps java stitching superres videostab
 CMAKE_ARGS+=	-DBUILD_opencv_${module}:BOOL=OFF
 . endfor
 INSTALL_WRKSRC=	${WRKDIR}/.build/modules/python${PYTHON_MAJOR_VER}
 .elif defined(OCV_JAVA)
 BUILD_DEPENDS+=	ant:devel/apache-ant
 LIB_DEPENDS+=	libopencv_ml.so:graphics/opencv
 USES+=		python:build
 USE_JAVA=	yes
 CMAKE_ARGS+=	-DBUILD_opencv_java:BOOL=ON
 . for module in apps python stitching superres videostab
 CMAKE_ARGS+=	-DBUILD_opencv_${module}:BOOL=OFF
 . endfor
 CONFIGURE_ENV+=	JAVA_HOME="${JAVA_HOME}"
 INSTALL_WRKSRC=	${WRKDIR}/.build/modules/java
 .else
 LIB_DEPENDS+=	libopencv_core.so:graphics/opencv-core
 . for module in ${OCV_JAVA_MODS} ${OCV_PYTHON_MODS}
 CMAKE_ARGS+=	-DBUILD_opencv_${module}:BOOL=OFF
 . endfor
 .endif
 
 .if !defined(OCV_JAVA)
 CMAKE_ARGS+=	-DBUILD_JAVA:BOOL=OFF
 .endif
 
 post-extract-EXTRA_MODULES-on:
 	@${MV} ${WRKSRC_extra_mod}/doc/tutorials/* ${WRKSRC}/doc/tutorials/
 	@${MV} ${WRKSRC_extra_mod}/modules/* ${WRKSRC}/modules/
 	@${CP} -RpP ${WRKSRC_extra_mod}/samples/* ${WRKSRC}/samples/
 	@${MKDIR} ${CONFIGURE_WRKSRC}/3rdparty/tinydnn/tiny-dnn-1.0.0a3/
 	@${MV} ${WRKSRC_extra_mod_3rdparty_tiny_dnn}/* ${CONFIGURE_WRKSRC}/3rdparty/tinydnn/tiny-dnn-1.0.0a3/
 	@${MKDIR} ${CONFIGURE_WRKSRC}/share/OpenCV/testdata/cv/face/
 	@${MV} ${WRKSRC_extra_mod_3rdparty_face_landmark_model}/* ${CONFIGURE_WRKSRC}/share/OpenCV/testdata/cv/face/
 	@${MKDIR} ${CONFIGURE_WRKSRC}/downloads/xfeatures2d/
 	@${MV} ${WRKSRC_extra_mod_3rdparty_boost_descr}/* ${CONFIGURE_WRKSRC}/downloads/xfeatures2d/
 	@${MV} ${WRKSRC_extra_mod_3rdparty_vgg_descr}/* ${CONFIGURE_WRKSRC}/downloads/xfeatures2d/
 
 post-patch:
 	@${REINPLACE_CMD} -e '/pkgconfig/s|$${OPENCV_LIB_INSTALL_PATH}|libdata|' \
 		 ${WRKSRC}/cmake/OpenCVGenPkgconfig.cmake
 	@${REINPLACE_CMD} -e 's|$${OpenCV_SOURCE_DIR}/3rdparty/include/opencl/1.2|${LOCALBASE}/include/CL|g' \
 		 ${WRKSRC}/cmake/OpenCVDetectOpenCL.cmake
 	@${REINPLACE_CMD} -e 's|share/OpenCV/doc|${DOCSDIR_REL}|g' \
 		-e 's|share/OpenCV/samples|${EXAMPLESDIR_REL}|g' \
 		${WRKSRC}/CMakeLists.txt
 	@${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|g' \
 		${WRKSRC}/modules/dnn/src/torch/THGeneral.cpp
 .if defined(OCV_CORE)
 	@${REINPLACE_CMD} -e 's|opencv.pc|opencv-core.pc|g' \
 		${WRKSRC}/cmake/OpenCVGenPkgconfig.cmake
 	@${REINPLACE_CMD} -e 's|Name:.*|Name: OpenCV-core|' \
 		${WRKSRC}/cmake/templates/opencv-XXX.pc.in
 .endif
 .if defined(OCV_SLAVE)
 	@${REINPLACE_CMD} -e 's|add_subdirectory(data)||g' \
 		${WRKSRC}/CMakeLists.txt
 .endif
 	@${FIND} ${WRKSRC} -name '*.bak' -exec ${RM} {} \;
 
 pre-build:
 	protoc --proto_path=${WRKSRC}/modules/dnn/src/caffe/ --cpp_out=${WRKSRC}/modules/dnn/misc/caffe/ ${WRKSRC}/modules/dnn/src/caffe/*.proto
 	protoc --proto_path=${WRKSRC}/modules/dnn/src/tensorflow/ --cpp_out=${WRKSRC}/modules/dnn/misc/tensorflow/ ${WRKSRC}/modules/dnn/src/tensorflow/*.proto
 
 post-install:
 .if !defined(OCV_SLAVE)
 	(cd ${STAGEDIR}${PREFIX} && \
 		${RM} -r include/opencv2/core include/opencv2/core.hpp include/opencv2/imgproc \
 			include/opencv2/imgproc.hpp \
 			include/opencv2/cvconfig.h lib/libopencv_core* lib/libopencv_imgproc*)
 .endif
 .if defined(OCV_CORE)
 	${RM} -r ${STAGEDIR}${PREFIX}/include/opencv
 	${RM} -r ${STAGEDIR}${DATADIR}
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/cmake/Modules
 	${INSTALL_DATA} ${WRKDIR}/FindOpenCVCore.cmake ${STAGEDIR}${PREFIX}/share/cmake/Modules
 .endif
 .if defined(OCV_PYTHON)
 	(cd ${STAGEDIR}${PREFIX} && \
 	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
 		-d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S|${PREFIX}/||} && \
 	${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
 		-d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S|${PREFIX}/||})
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/samples/python && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}/python
 .endif
 .if defined(OCV_JAVA)
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/samples/java && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}/java
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if !defined(OCV_CORE)
 .if (${OPSYS} == FreeBSD && ${OSVERSION} < 1200000)
 EXTRA_PATCHES+=			${FILESDIR}/extra-patch-modules_sfm_src_libmv__light_libmv_numeric_numeric.cc
 .endif
 .endif
 
 .include <bsd.port.post.mk>
Index: head/lang/python-doc-html/Makefile
===================================================================
--- head/lang/python-doc-html/Makefile	(revision 500650)
+++ head/lang/python-doc-html/Makefile	(revision 500651)
@@ -1,67 +1,67 @@
 # Created by: Thomas Gellekum <tg@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	python-doc-${DOCFORMAT}
 PORTVERSION=	${PYTHON_PORTVERSION}
 CATEGORIES=	lang python
 MASTER_SITES=	PYTHON/ftp/python/doc/${PORTVERSION} \
 		PYTHON/ftp/python/doc/current
 DISTNAME=	python-${PORTVERSION}-docs-${DOCFORMAT}
 DIST_SUBDIR=	python
 
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	Documentation for the Python programming language
 
 PORTSCOUT=	ignore:1
 
 USES=		python:env tar:bzip2
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 DOCSDIR=	${PREFIX}/share/doc/${PYTHON_VERSION}
 PLIST=		${WRKDIR}/pkg-plist.${DOCFORMAT}
 
 DOCFORMATS=	html pdf-a4 pdf-letter text
 DOCFORMAT?=	html
 
 .if empty(DOCFORMATS:M${DOCFORMAT})
 IGNORE=		invalid value for DOCFORMAT: "${DOCFORMAT}", possible values are: ${DOCFORMATS:ts,:S/,/, /g}
 .endif
 
 .if ${DOCFORMAT} != "html" && ${DOCFORMAT} != "text"
 WRKSRC=		${WRKDIR}/docs-pdf
 .endif
 
 .if make(all_python_versions)
 _VERS!=		${MAKE} -V _PYTHON_VERSIONS:O
 .endif
 
 all_python_versions:
 .for v in ${_VERS}
 	@${MAKE} -V PYTHON_PORTVERSION DEFAULT_VERSIONS=python=${v}
 .endfor
 
 .if make(makesum)
 ALL_PYTHON_VERSIONS!=	${MAKE} all_python_versions
 .endif
 
 .if make(makesum)
 MASTER_SITES=
 .for v in ${ALL_PYTHON_VERSIONS}
 MASTER_SITES+=	PYTHON/ftp/python/doc/${v}:${v:S/./x/g}
 .for f in ${DOCFORMATS}
 DISTFILES+=	python-${v}-docs-${f}${EXTRACT_SUFX}:${v:S/./x/g},DEFAULT
 .endfor
 .endfor
-MASTER_SITES+=	PYTHON/ftp/python/doc/current:DEFAULT
+MASTER_SITES+=	PYTHON/ftp/python/doc/current
 .endif
 
 pre-install:
 	@${FIND} ${WRKSRC} -type f | ${SED} -e 's|^${WRKSRC}|%%DOCSDIR%%|' | ${SORT} > ${PLIST}
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/
 	cd ${WRKSRC}/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/lang/swift/Makefile
===================================================================
--- head/lang/swift/Makefile	(revision 500650)
+++ head/lang/swift/Makefile	(revision 500651)
@@ -1,117 +1,116 @@
 # $FreeBSD$
 
 PORTNAME=	swift
 PORTVERSION=	3.1.1
 DISTVERSIONPREFIX=	swift-
 DISTVERSIONSUFFIX=	-RELEASE
 PORTREVISION=	11
 CATEGORIES=	lang
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Swift programing language
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/swift/LICENSE.txt
 
 BROKEN=		fails to build
 DEPRECATED=	Broken for more than 6 months
 EXPIRATION_DATE=	2019-05-08
 
 BUILD_DEPENDS=	cmake:devel/cmake \
 		bash:shells/bash \
 		swig3.0:devel/swig30 \
 		binutils>=2.25.1:devel/binutils
 LIB_DEPENDS=	libicudata.so:devel/icu \
 		libuuid.so:misc/e2fsprogs-libuuid \
 		libobjc.so:lang/libobjc2
 
 REL_SNAP=	2017-04-22-a
 USE_GITHUB=	yes
 BINARY_ALIAS=	swig=swig3.0 python=${PYTHON_CMD}
 
-GH_ACCOUNT=	apple:DEFAULT,llvm,clang,dispatch,lldb,cmark,llbuild,swiftpm,xctest,xcfound
-GH_PROJECT=	swift:DEFAULT swift-llvm:llvm swift-clang:clang swift-lldb:lldb \
+GH_ACCOUNT=	apple
+GH_PROJECT=	swift swift-llvm:llvm swift-clang:clang swift-lldb:lldb \
 		swift-cmark:cmark swift-llbuild:llbuild swift-package-manager:swiftpm \
 		swift-corelibs-xctest:xctest swift-corelibs-foundation:xcfound \
 		swift-corelibs-libdispatch:dispatch
-GH_TAGNAME=	swift-${PORTVERSION}-RELEASE:llbuild,swiftpm,xctest,xcfound,dispatch
 GH_SUBDIR=	llvm:llvm clang:clang lldb:lldb cmark:cmark llbuild:llbuild \
 		swiftpm:swiftpm swift-corelibs-xctest:xctest \
 		swift-corelibs-foundation:xcfound \
 		swift-corelibs-libdispatch:dispatch
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USES=		autoreconf:build compiler:c++14-lang libtool localbase:ldflags iconv libedit \
 		ninja perl5 pkgconfig python:build sqlite
 
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 ONLY_FOR_ARCHS=	amd64
 CONFLICTS_BUILD=	googletest
 LDFLAGS+=	-lobjc
 
 OPTIONS_DEFINE=	DOCS
 DOCS_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
 DOCS_CMAKE_BOOL=	SWIFT_INCLUDE_DOCS
 
 PORTDOCS=	*
 
 STRIP_FILES=	bin/sil-func-extractor bin/sil-nm bin/sil-opt \
 		bin/sil-passpipeline-dumper bin/swift \
 		bin/swift-api-digester bin/swift-build-tool \
 		bin/swift-demangle bin/swift-ide-test \
 		bin/swift-llvm-opt bin/swift-reflection-dump \
 		bin/swift-remoteast-test lib/swift/freebsd/libswiftCore.so \
 		lib/swift/freebsd/libswiftGlibc.so \
 		lib/swift/freebsd/libswiftRemoteMirror.so \
 		lib/swift/freebsd/libswiftSwiftOnoneSupport.so
 
 .include <bsd.port.pre.mk>
 
 CC_ONLY=	${CC:C/.*\///}
 CPP_ONLY=	${CPP:C/.*\///}
 CXX_ONLY=	${CXX:C/.*\///}
 
 post-extract:
 	@${MKDIR} ${WRKSRC}
 	@${MV} ${WRKDIR}/${PORTNAME}-${PORTNAME}-${PORTVERSION}-RELEASE ${WRKSRC}/swift
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/swift/cmake/modules/SwiftSharedCMakeConfig.cmake
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
 		-e 's|%%CPP_ONLY%%|${CPP_ONLY}|g' \
 		-e 's|%%CC_ONLY%%|${CC_ONLY}|g' \
 		-e 's|%%CXX_ONLY%%|${CXX_ONLY}|g' \
 		${WRKSRC}/swift/utils/build-presets.ini \
 		${WRKSRC}/swift/utils/build-script-impl
 
 do-build:
 	@${MKDIR} ${STAGEDIR}${PREFIX}
 	cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} \
 		./swift/utils/build-script --preset=mixin_freebsd_installation \
 		-j ${MAKE_JOBS_NUMBER} \
 		install_destdir=${STAGEDIR} \
 		-- \
 		${EXTRA_FLAGS} \
 		--skip-build-llvm=1 \
 		--install_prefix=${PREFIX} \
 		--install_destdir=${STAGEDIR} \
 		--verbose-build=1 \
 		--install-llbuild=1 \
 		--skip-test-llbuild=1
 	@${RM} /var/run/libuuid/clock.txt /var/run/libuuid/request /var/run/libuuid/uuidd.pid
 
 do-install:
 	${MV} ${STAGEDIR}${PREFIX}/share/man/man1/swift.1 ${STAGEDIR}${PREFIX}/man/man1/swift.1
 	${RM} -r ${STAGEDIR}${PREFIX}/share/man
 	${GZIP_CMD} ${STAGEDIR}${PREFIX}/man/man1/swift.1
 .for FILE in ${STRIP_FILES}
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${FILE}
 .endfor
 
 do-install-DOCS-on:
 	cd ${WRKSRC}/build/Ninja-ReleaseAssert+stdlib-Release/swift-freebsd-x86_64/docs/html ; \
 		${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.post.mk>
Index: head/net/ceph12/Makefile
===================================================================
--- head/net/ceph12/Makefile	(revision 500650)
+++ head/net/ceph12/Makefile	(revision 500651)
@@ -1,152 +1,151 @@
 # Created by: Willem Jan Withagen <wjw@digiware.nl>
 # $FreeBSD$
 
 PORTNAME=	ceph
 DISTVERSIONPREFIX=	v
 DISTVERSION=	12.2.11
 PORTREVISION=	1
 CATEGORIES=	net
 PKGNAMESUFFIX=	12
 
 MAINTAINER=	wjw@digiware.nl
 COMMENT=	Ceph delivers object, block, and file storage in a unified system
 
 LICENSE=	GPLv2 LGPL3
 LICENSE_COMB=	dual
 
 # even though i386 will build, it is not really advised.
 ONLY_FOR_ARCHS=	amd64
 
 BUILD_DEPENDS=	\
 	yasm:devel/yasm \
 	${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx@${PY_FLAVOR} \
 	gperf:devel/gperf \
 	${LOCALBASE}/lib/libatomic_ops.a:devel/libatomic_ops
 LIB_DEPENDS=	\
 	${PY_BOOST} \
 	libboost_thread.so:devel/boost-libs \
 	libleveldb.so:databases/leveldb \
 	libnss3.so:security/nss \
 	libsnappy.so:archivers/snappy \
 	libcurl.so:ftp/curl \
 	libxml2.so:textproc/libxml2 \
 	libexpat.so:textproc/expat2 \
 	liblz4.so:archivers/liblz4 \
 	libplds4.so:devel/nspr \
 	libtcmalloc.so:devel/google-perftools
 RUN_DEPENDS=	\
 	bash:shells/bash \
 	${LOCALBASE}/bin/getopt:misc/getopt \
 	xml:textproc/xmlstarlet \
 	jq:textproc/jq \
 	flock:sysutils/flock \
 	${PYTHON_PKGNAMEPREFIX}virtualenv>=0:devel/py-virtualenv@${PY_FLAVOR} \
 	${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable@${PY_FLAVOR}
 
 CONFLICTS_INSTALL=	ceph-devel
 PORTSCOUT=	limit:^v12\.
 
 USES=		cmake:noninja fuse gettext-runtime gmake \
 		pkgconfig python:2.7 shebangfix ssl
 USE_PYTHON=	cython
 USE_OPENLDAP=	yes
 USE_GITHUB=	yes
-GH_ACCOUNT=	ceph:DEFAULT
 
 GH_TUPLE+=	ceph:ceph-erasure-code-corpus:2d7d78b:ceph_erasure_code_corpus/ceph-erasure-code-corpus
 GH_TUPLE+=	ceph:ceph-object-corpus:e32bf8c:ceph_object_corpus/ceph-object-corpus
 GH_TUPLE+=	ceph:civetweb:de23828:civetweb/src/civetweb
 GH_TUPLE+=	01org:isa-l_crypto:603529a:isa_l_crypto/src/crypto/isa-l/isa-l_crypto
 GH_TUPLE+=	ceph:gf-complete:7e61b44:gf_complete/src/erasure-code/jerasure/gf-complete
 GH_TUPLE+=	ceph:jerasure:96c76b8:jerasure/src/erasure-code/jerasure/jerasure
 GH_TUPLE+=	ceph:googletest:fdb8504:googletest/src/googletest
 GH_TUPLE+=	ceph:isa-l:7e1a337:isa_l/src/isa-l
 GH_TUPLE+=	ceph:lua:1fce39c:lua/src/lua
 GH_TUPLE+=	ceph:rapidjson:f54b0e4:rapidjson/src/rapidjson
 GH_TUPLE+=	ceph:rocksdb:e15382c:rocksdb/src/rocksdb
 GH_TUPLE+=	ceph:xxHash:1f40c65:xxHash/src/xxHash
 GH_TUPLE+=	facebook:zstd:f4340f4:zstd/src/zstd
 
 CMAKE_ARGS=	\
 	-D WITH_SYSTEM_BOOST:BOOL=ON \
 	-D CEPH_MAN_DIR:STRING=man \
 	-D WITH_LTTNG:BOOL=OFF \
 	-D WITH_BABELTRACE:BOOL=OFF \
 	-D WITH_KRBD:BOOL=OFF \
 	-D WITH_XFS:BOOL=OFF \
 	-D WITH_KVS:BOOL=OFF \
 	-D WITH_BLKID:BOOL=OFF \
 	-D WITH_SPDK:BOOL=OFF \
 	-D WITH_RDMA=OFF \
 	-D WITH_BLUESTORE:BOOL=OFF \
 	-D WITH_LIBCEPHFS:BOOL=OFF \
 	-D WITH_CEPHFS:BOOL=OFF \
 	-D WITH_EMBEDDED:BOOL=OFF \
 	-D WITH_SYSTEM_BOOST:BOOL=ON \
 	-D WITH_BOOST_CONTEXT:BOOL=OFF \
 	-D WITH_FUSE:BOOL=ON \
 	-D WITH_MANPAGE:BOOL=ON \
 	-D WITH_RADOSGW_BEAST_FRONTEND:BOOL=OFF \
 	-D WITH_MGR_DASHBOARD_FRONTEND:BOOL=OFF
 
 SHEBANG_FILES=src/rbdmap src/ceph-post-file.in src/rbd-replay-many \
 	src/brag/client/ceph-brag src/ceph-rest-api \
 	src/tools/ceph-monstore-update-crush.sh src/mount.fuse.ceph \
 	src/ceph-create-keys
 
 USE_RC_SUBR=	ceph
 USE_LDCONFIG=	yes
 
 USERS=		ceph
 GROUPS=		ceph
 
 post-patch:
 	${REINPLACE_CMD} 's|sphinx-build|sphinx-build-${PYTHON_VER}|g' ${WRKSRC}/CMakeLists.txt
 
 pre-configure:
 	${LN} -s ${CONFIGURE_WRKSRC} ${WRKSRC}/build
 	${CP} ${FILESDIR}/file-git_version ${WRKSRC}/src/.git_version
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/ceph
 	${MKDIR} ${STAGEDIR}/var/lib/ceph/bootstrap-mds
 	${MKDIR} ${STAGEDIR}/var/lib/ceph/bootstrap-osd
 	${MKDIR} ${STAGEDIR}/var/lib/ceph/bootstrap-rgw
 	${MKDIR} ${STAGEDIR}/var/lib/ceph/bootstrap-mgr
 	${MKDIR} ${STAGEDIR}/var/lib/ceph/mds
 	${MKDIR} ${STAGEDIR}/var/lib/ceph/mon
 	${MKDIR} ${STAGEDIR}/var/lib/ceph/osd
 	${MKDIR} ${STAGEDIR}/var/lib/ceph/mgr
 	${MKDIR} ${STAGEDIR}/var/lib/ceph/tmp
 	${MKDIR} ${STAGEDIR}/var/lib/ceph/radosgw
 	${MKDIR} ${STAGEDIR}/var/log/ceph
 	${MKDIR} ${STAGEDIR}/var/run/ceph
 	# Use the Ceph init.d script as the interface to regular
 	# starting and stopping daemons. rc.d work is done thru
 	# a separate rc.d/ceph script calling init-ceph again.
 	${MV} ${STAGEDIR}${PREFIX}/etc/init.d/ceph ${STAGEDIR}${PREFIX}/bin/init-ceph
 	# remove files not packaged
 	${RM} ${STAGEDIR}${DOCSDIR}/sample.fetch_config
 	${RM} ${STAGEDIR}${DOCSDIR}/sample.ceph.conf
 	${RMDIR} ${STAGEDIR}${DOCSDIR}
 	${RM} ${STAGEDIR}${PREFIX}/bin/ceph_bench_log
 	${RM} ${STAGEDIR}${PREFIX}/bin/ceph_multi_stress_watch
 	${RM} ${STAGEDIR}${PREFIX}/bin/ceph_perf*
 	${RM} ${STAGEDIR}${PREFIX}/bin/ceph_psim
 	${RM} ${STAGEDIR}${PREFIX}/bin/ceph_scratchtoolpp
 	${RM} ${STAGEDIR}${PREFIX}/bin/ceph_smalliobench*
 	${RM} ${STAGEDIR}${PREFIX}/bin/ceph_test*
 	${RM} ${STAGEDIR}${PREFIX}/bin/ceph_tpbench
 	${RM} ${STAGEDIR}${PREFIX}/bin/ceph_xattr_bench
 	${RM} ${STAGEDIR}${PREFIX}/sbin/ceph-disk-udev
 	# ceph-volume does not support ZFS
 	${RM} -rf ${STAGEDIR}${PYTHON_SITELIBDIR}/ceph_volume-*
 	${RM} -rf ${STAGEDIR}${PYTHON_SITELIBDIR}/ceph_volume/
 	${RM} ${STAGEDIR}${PREFIX}/sbin/ceph-volume
 	${RM} ${STAGEDIR}${PREFIX}/sbin/ceph-volume-systemd
 	${RM} ${STAGEDIR}${PREFIX}/man/man8/ceph-volume*
 
 	${RMDIR} ${STAGEDIR}${PREFIX}/etc/init.d
 	${INSTALL_DATA} ${WRKSRC}/src/sample.ceph.conf ${STAGEDIR}${PREFIX}/etc/ceph/ceph.conf.sample
 
 .include <bsd.port.mk>
Index: head/net/ceph13/Makefile
===================================================================
--- head/net/ceph13/Makefile	(revision 500650)
+++ head/net/ceph13/Makefile	(revision 500651)
@@ -1,158 +1,157 @@
 # Created by: Willem Jan Withagen <wjw@digiware.nl>
 # $FreeBSD$
 
 PORTNAME=	ceph
 DISTVERSIONPREFIX=	v
 DISTVERSION=	13.2.1
 PORTREVISION=	1
 PKGNAMESUFFIX=	13
 CATEGORIES=	net
 
 MAINTAINER=	wjw@digiware.nl
 COMMENT=	Ceph delivers object, block, and file storage in a unified system
 
 LICENSE=	GPLv2 LGPL3
 LICENSE_COMB=	dual
 
 # even though i386 will build, it is not really advised.
 ONLY_FOR_ARCHS=	amd64
 
 BUILD_DEPENDS=	\
 	bash:shells/bash \
 	git:devel/git \
 	yasm:devel/yasm \
 	sphinx-build:textproc/py-sphinx \
 	gperf:devel/gperf \
 	${LOCALBASE}/lib/libatomic_ops.a:devel/libatomic_ops
 LIB_DEPENDS=	\
 	${PY_BOOST} \
 	libboost_thread.so:devel/boost-libs \
 	libleveldb.so:databases/leveldb \
 	libnss3.so:security/nss \
 	libcryptopp.so:security/cryptopp \
 	liboath.so:security/oath-toolkit \
 	libsnappy.so:archivers/snappy \
 	libcurl.so:ftp/curl \
 	libxml2.so:textproc/libxml2 \
 	libexpat.so:textproc/expat2 \
 	liblz4.so:archivers/liblz4 \
 	libplds4.so:devel/nspr \
 	libtcmalloc.so:devel/google-perftools
 RUN_DEPENDS=	\
 	bash:shells/bash \
 	${LOCALBASE}/bin/getopt:misc/getopt \
 	xml:textproc/xmlstarlet \
 	jq:textproc/jq \
 	flock:sysutils/flock \
 	${PYTHON_PKGNAMEPREFIX}virtualenv>=0:devel/py-virtualenv@${PY_FLAVOR} \
 	${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable@${PY_FLAVOR}
 
 USES=		cmake:noninja fuse gettext-runtime gmake pkgconfig python:2.7 \
 		shebangfix ssl
 USE_PYTHON=	cython
 USE_OPENLDAP=	yes
 USE_GITHUB=	yes
-GH_ACCOUNT=	ceph:DEFAULT
 
 CONFLICTS_INSTALL=	ceph
 PORTSCOUT=	limit:^v13\.
 
 GH_TUPLE+=	ceph:ceph-erasure-code-corpus:2d7d78b:ceph_erasure_code_corpus/ceph-erasure-code-corpus
 GH_TUPLE+=	ceph:ceph-object-corpus:e32bf8c:ceph_object_corpus/ceph-object-corpus
 GH_TUPLE+=	ceph:civetweb:de23828:civetweb/src/civetweb
 GH_TUPLE+=	01org:isa-l_crypto:603529a:isa_l_crypto/src/crypto/isa-l/isa-l_crypto
 GH_TUPLE+=	ceph:gf-complete:7e61b44:gf_complete/src/erasure-code/jerasure/gf-complete
 GH_TUPLE+=	ceph:jerasure:96c76b8:jerasure/src/erasure-code/jerasure/jerasure
 GH_TUPLE+=	ceph:googletest:fdb8504:googletest/src/googletest
 GH_TUPLE+=	ceph:isa-l:7e1a337:isa_l/src/isa-l
 GH_TUPLE+=	ceph:lua:1fce39c:lua/src/lua
 GH_TUPLE+=	ceph:rapidjson:f54b0e4:rapidjson/src/rapidjson
 GH_TUPLE+=	ceph:rocksdb:f4a857d:rocksdb/src/rocksdb
 GH_TUPLE+=	ceph:xxHash:1f40c65:xxHash/src/xxHash
 GH_TUPLE+=	facebook:zstd:f4340f4:zstd/src/zstd
 
 # oude hashes
 # GH_TUPLE+=	ceph:rocksdb:e15382c:rocksdb/src/rocksdb
 # GH_TUPLE+=      ceph:rocksdb:9090ae3:rocksdb/src/rocksdb
 
 CMAKE_BUILD_TYPE=	Release
 CMAKE_ARGS=	\
 	-D WITH_SYSTEM_BOOST:BOOL=ON \
 	-D CEPH_MAN_DIR:STRING=man \
 	-D WITH_LTTNG:BOOL=OFF \
 	-D WITH_BABELTRACE:BOOL=OFF \
 	-D WITH_KRBD:BOOL=OFF \
 	-D WITH_XFS:BOOL=OFF \
 	-D WITH_KVS:BOOL=OFF \
 	-D WITH_BLKID:BOOL=OFF \
 	-D WITH_SPDK:BOOL=OFF \
 	-D WITH_RDMA=OFF \
 	-D WITH_BLUESTORE:BOOL=OFF \
 	-D WITH_LIBCEPHFS:BOOL=OFF \
 	-D WITH_CEPHFS:BOOL=OFF \
 	-D WITH_EMBEDDED:BOOL=OFF \
 	-D WITH_SYSTEM_BOOST:BOOL=ON \
 	-D WITH_BOOST_CONTEXT:BOOL=OFF \
 	-D WITH_FUSE:BOOL=ON \
 	-D WITH_MANPAGE:BOOL=ON \
 	-D WITH_RADOSGW_BEAST_FRONTEND:BOOL=OFF \
 	-D WITH_MGR_DASHBOARD_FRONTEND:BOOL=OFF
 
 SHEBANG_FILES=src/rbdmap src/ceph-post-file.in src/rbd-replay-many \
 	src/tools/ceph-monstore-update-crush.sh src/mount.fuse.ceph \
 	src/ceph-create-keys
 
 USE_RC_SUBR=	ceph
 USE_LDCONFIG=	yes
 
 USERS=		ceph
 GROUPS=		ceph
 
 pre-configure:
 	${LN} -s ${CONFIGURE_WRKSRC} ${WRKSRC}/build
 	${CP} files/file-git_version ${WRKSRC}/src/.git_version
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/ceph
 	${MKDIR} ${STAGEDIR}/var/lib/ceph/bootstrap-mds
 	${MKDIR} ${STAGEDIR}/var/lib/ceph/bootstrap-osd
 	${MKDIR} ${STAGEDIR}/var/lib/ceph/bootstrap-rgw
 	${MKDIR} ${STAGEDIR}/var/lib/ceph/bootstrap-mgr
 	${MKDIR} ${STAGEDIR}/var/lib/ceph/mds
 	${MKDIR} ${STAGEDIR}/var/lib/ceph/mon
 	${MKDIR} ${STAGEDIR}/var/lib/ceph/osd
 	${MKDIR} ${STAGEDIR}/var/lib/ceph/mgr
 	${MKDIR} ${STAGEDIR}/var/lib/ceph/tmp
 	${MKDIR} ${STAGEDIR}/var/lib/ceph/radosgw
 	${MKDIR} ${STAGEDIR}/var/log/ceph
 	${MKDIR} ${STAGEDIR}/var/run/ceph
 	# Use the Ceph init.d script as the interface to regular
 	# starting and stopping daemons. rc.d work is done thru
 	# a separate rc.d/ceph script calling init-ceph again.
 	${MV} ${STAGEDIR}${PREFIX}/etc/init.d/ceph ${STAGEDIR}${PREFIX}/bin/init-ceph
 	# remove files not packaged
 	${RM} ${STAGEDIR}${DOCSDIR}/sample.fetch_config
 	${RM} ${STAGEDIR}${DOCSDIR}/sample.ceph.conf
 	${RMDIR} ${STAGEDIR}${DOCSDIR}
 	${RM} ${STAGEDIR}${PREFIX}/bin/ceph_bench_log
 	${RM} ${STAGEDIR}${PREFIX}/bin/ceph_multi_stress_watch
 	${RM} ${STAGEDIR}${PREFIX}/bin/ceph_perf*
 	${RM} ${STAGEDIR}${PREFIX}/bin/ceph_psim
 	${RM} ${STAGEDIR}${PREFIX}/bin/ceph_scratchtoolpp
 	${RM} ${STAGEDIR}${PREFIX}/bin/ceph_smalliobench*
 	${RM} ${STAGEDIR}${PREFIX}/bin/ceph_test*
 	${RM} ${STAGEDIR}${PREFIX}/bin/ceph_tpbench
 	${RM} ${STAGEDIR}${PREFIX}/bin/ceph_xattr_bench
 	${RM} ${STAGEDIR}${PREFIX}/sbin/ceph-disk-udev
 	# ceph-volume does not support ZFS
 	${RM} -rf ${STAGEDIR}${PYTHON_SITELIBDIR}/ceph_volume-*
 	${RM} -rf ${STAGEDIR}${PYTHON_SITELIBDIR}/ceph_volume/
 	${RM} ${STAGEDIR}${PREFIX}/sbin/ceph-volume
 	${RM} ${STAGEDIR}${PREFIX}/man/man8/ceph-volume*
 	${RM} ${STAGEDIR}${PREFIX}/sbin/ceph-volume-systemd
 	${RM} -rf ${STAGEDIR}${PREFIX}/libexec/systemd
 
 	${RMDIR} ${STAGEDIR}${PREFIX}/etc/init.d
 	${INSTALL_DATA} ${WRKSRC}/src/sample.ceph.conf ${STAGEDIR}${PREFIX}/etc/ceph/ceph.conf.sample
 
 .include <bsd.port.mk>
Index: head/net/gobgp/Makefile
===================================================================
--- head/net/gobgp/Makefile	(revision 500650)
+++ head/net/gobgp/Makefile	(revision 500651)
@@ -1,85 +1,85 @@
 # $FreeBSD$
 
 PORTNAME=	gobgp
 PORTVERSION=	1.33
 DISTVERSIONPREFIX=	v
 CATEGORIES=	net
 DIST_SUBDIR=	gobgp
 
 MAINTAINER=	nork@ninth-nine.com
 COMMENT=	BGP implementation in Go
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go
 GO_PKGNAME=	github.com/${GH_ACCOUNT}/${PORTNAME}
 GO_TARGET=	${GO_PKGNAME}/gobgp \
 		${GO_PKGNAME}/gobgpd
 USE_GITHUB=	yes
-GH_ACCOUNT=	osrg:DEFAULT
+GH_ACCOUNT=	osrg
 GH_TUPLE=	BurntSushi:toml:a368813:toml/../src/github.com/BurntSushi/toml \
 		armon:go-radix:1fca145:radix/../src/github.com/armon/go-radix \
 		davecgh:go-spew:8991bc2:spew/../src/github.com/davecgh/go-spew \
 		dgryski:go-farm:2de3383:farm/../src/github.com/dgryski/go-farm \
 		eapache:channels:47238d5:channels/../src/github.com/eapache/channels \
 		eapache:queue:093482f:queue/../src/github.com/eapache/queue \
 		fsnotify:fsnotify:c282820:fsnotify/../src/github.com/fsnotify/fsnotify \
 		golang:protobuf:14aad3d:protobuf/../src/github.com/golang/protobuf \
 		hashicorp:hcl:ef8a98b:hcl/../src/github.com/hashicorp/hcl \
 		inconshreveable:mousetrap:76626ae:mousetrap/../src/github.com/inconshreveable/mousetrap \
 		influxdata:influxdb:62ab18a:influxdb/../src/github.com/influxdata/influxdb \
 		jessevdk:go-flags:1c38ed7:flags/../src/github.com/jessevdk/go-flags \
 		kr:pretty:73f6ac0:pretty/../src/github.com/kr/pretty \
 		kr:text:e2ffdb1:krtext/../src/github.com/kr/text \
 		magiconair:properties:c235336:properties/../src/github.com/magiconair/properties \
 		mitchellh:mapstructure:f15292f:mapstructure/../src/github.com/mitchellh/mapstructure \
 		pelletier:go-buffruneio:e2f66f8:buffruneio/../src/github.com/pelletier/go-buffruneio \
 		pelletier:go-toml:c01d127:toml/../src/github.com/pelletier/go-toml \
 		pmezard:go-difflib:792786c:difflib/../src/github.com/pmezard/go-difflib \
 		satori:go.uuid:36e9d2e:uuid/../src/github.com/satori/go.uuid \
 		sirupsen:logrus:9205268:logrus/../src/github.com/sirupsen/logrus \
 		spf13:afero:787d034:afero/../src/github.com/spf13/afero \
 		spf13:cast:8965335:cast/../src/github.com/spf13/cast \
 		spf13:cobra:a114f31:cobra/../src/github.com/spf13/cobra \
 		spf13:jWalterWeatherman:7c0cea3:jwalterweatherman/../src/github.com/spf13/jwalterweatherman \
 		spf13:pflag:3ebe029:pflag/../src/github.com/spf13/pflag \
 		spf13:viper:d493c32:viper/../src/github.com/spf13/viper \
 		stretchr:testify:f35b8ab:testify/../src/github.com/stretchr/testify \
 		vishvananda:netlink:d77c86a:netlink/../src/github.com/vishvananda/netlink \
 		vishvananda:netns:be1fbed:netns/../src/github.com/vishvananda/netns \
 		golang:net:db08ff0:gonet/../src/golang.org/x/net \
 		golang:sys:ac767d6:gosys/../src/golang.org/x/sys \
 		golang:text:0605a83:gotext/../src/golang.org/x/text \
 		google:go-genproto:e92b116:genproto/../src/google.golang.org/genproto \
 		grpc:grpc-go:168a619:grpc/../src/google.golang.org/grpc \
 		go-tomb:tomb:d5d1b58:tombv2/../src/gopkg.in/tomb.v2 \
 		go-yaml:yaml:5420a8b:yamlv2/../src/gopkg.in/yaml.v2 \
 		golang:crypto:a49355c:gocrypto/../src/golang.org/x/crypto
 
 PLIST_FILES=	bin/gobgp libexec/gobgpd
 
 OPTIONS_DEFINE=	BASH ZSH
 OPTIONS_DEFAULT=BASH ZSH
 
 BASH_PLIST_FILES=	etc/bash_completion.d/gobgp-completion.bash \
 			etc/bash_completion.d/gobgp-dynamic-completion.bash \
 			etc/bash_completion.d/gobgp-static-completion.bash
 ZSH_PLIST_FILES=	share/zsh/site-functions/_gobgp
 
 USE_RC_SUBR=	gobgpd
 SUB_FILES=	gobgpd
 
 do-install:
 	${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/gobgp  ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/gobgpd ${STAGEDIR}${PREFIX}/libexec
 
 post-install-BASH-on:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
 	${INSTALL_DATA} ${GO_WRKSRC}/tools/completion/gobgp*-completion.bash ${STAGEDIR}${PREFIX}/etc/bash_completion.d/
 
 post-install-ZSH-on:
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions
 	${INSTALL_DATA} ${GO_WRKSRC}/tools/completion/zsh/_gobgp ${STAGEDIR}${PREFIX}/share/zsh/site-functions/
 
 .include <bsd.port.mk>
Index: head/net-im/telegram-purple/Makefile
===================================================================
--- head/net-im/telegram-purple/Makefile	(revision 500650)
+++ head/net-im/telegram-purple/Makefile	(revision 500651)
@@ -1,43 +1,43 @@
 # Created by: Kris Moore <kmoore@freebsd.org>
 # $FreeBSD$
 
 PORTNAME=	telegram-purple
 PORTVERSION=	1.3.1
 DISTVERSIONPREFIX=	v
 PORTREVISION=	4
 CATEGORIES=	net-im
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Libpurple plugin for Telegram messenger
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	pidgin:net-im/pidgin
 RUN_DEPENDS=	pidgin:net-im/pidgin
 LIB_DEPENDS=	libgcrypt.so:security/libgcrypt \
 		libwebp.so:graphics/webp \
 		libpurple.so:net-im/libpurple
 
 BROKEN_armv6=		fails to link: undefined reference to 'backtrace'
 BROKEN_sparc64=		fails to compile: assertion fails
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
 
 USES=		gettext gmake pkgconfig
 USE_GNOME=	glib20 libxml2
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	majn:DEFAULT,tgl vysheng:tlparser
+GH_ACCOUNT=	majn vysheng:tlparser
 GH_PROJECT=	tgl:tgl tl-parser:tlparser
 GH_TAGNAME?=	624cf5a:tgl 36bf190:tlparser
 GH_SUBDIR=	tgl:tgl tgl/tl-parser:tlparser
 
 pre-configure:
 	@${REINPLACE_CMD} -e 's|/etc/telegram-purple/server.tglpub|${PREFIX}/etc/telegram-purple/server.tglpub|g' \
 		 ${WRKSRC}/telegram-purple.c
 
 .include <bsd.port.mk>
Index: head/net-p2p/bitcoin/Makefile
===================================================================
--- head/net-p2p/bitcoin/Makefile	(revision 500650)
+++ head/net-p2p/bitcoin/Makefile	(revision 500651)
@@ -1,133 +1,133 @@
 # Created by: Shaun Amott <shaun@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	bitcoin
 PORTVERSION=	0.17.1
 PORTREVISION?=	4
 CATEGORIES=	net-p2p finance
-MASTER_SITES=	https://bitcoincore.org/bin/bitcoin-core-${PORTVERSION}/:DEFAULT \
+MASTER_SITES=	https://bitcoincore.org/bin/bitcoin-core-${PORTVERSION}/ \
 		LOCAL/swills:icon
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} bitcoin128.png:icon
 DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY=	${_DISTFILES:N*.png}
 
 MAINTAINER=	kbowling@FreeBSD.org
 COMMENT?=	Virtual Peer-to-Peer Currency Client (QT)
 
 LICENSE=	MIT
 
 LIB_DEPENDS=	libboost_date_time.so:devel/boost-libs \
 		libevent.so:devel/libevent
 
 USES=		autoreconf compiler:c++11-lib gmake libtool pkgconfig qt:5 shebangfix ssl
 
 GNU_CONFIGURE=	yes
 
 SLAVE_PORT?=	no
 
 .if defined(SLAVE_PORT) && ${SLAVE_PORT} == "no"
 USES+=		desktop-file-utils
 USE_QT=		core gui network widgets \
 		buildtools_build linguisttools_build qmake_build
 
 BUILD_DEPENDS+=	protoc:devel/protobuf
 LIB_DEPENDS+=	libprotobuf.so:devel/protobuf
 
 TESTS_USES=	qt:5
 TESTS_USE=		QT=testlib
 TESTS_PLIST_FILES=	bin/test_bitcoin-qt \
 			bin/test_bitcoin
 .endif
 
 OPTIONS_DEFINE?=	DBUS DEBUG HARDENING QRCODES TESTS UPNP ZMQ
 OPTIONS_RADIO?=		WALLET
 OPTIONS_RADIO_WALLET?=	WALLET_BDB48 WALLET_BDBMODERN
 OPTIONS_DEFAULT?=	DBUS HARDENING QRCODES UPNP WALLET_BDBMODERN ZMQ
 OPTIONS_SUB=		yes
 
 HARDENING_DESC=	Attempt to harden binaries (PIE for ASLR, NX Stack)
 QRCODES_DESC=	Display QR Codes
 TESTS_DESC=	Build test binary and unit tests
 WALLET_DESC=	Wallet Management Support
 WALLET_BDB48_DESC=	Wallet using BDB 4.8
 WALLET_BDBMODERN_DESC=	Wallet using modern BDB 5.x or 6.x
 ZMQ_DESC=	Block and transaction broadcasting with ZeroMQ
 
 DBUS_CONFIGURE_WITH=	dbus
 DBUS_USES=	qt:5
 DBUS_USE=		QT=dbus
 
 DEBUG_CONFIGURE_ENABLE=		debug
 DEBUG_INSTALL_TARGET_OFF=	install-strip
 
 HARDENING_CONFIGURE_ENABLE=	hardening
 
 TESTS_CONFIGURE_ENABLE=	tests bench
 .if defined(SLAVE_PORT) && ${SLAVE_PORT} == "yes"
 TESTS_PLIST_FILES=	bin/test_bitcoin
 .endif
 TESTS_PLIST_FILES+=	bin/bench_bitcoin
 
 UPNP_CONFIGURE_WITH=	miniupnpc
 UPNP_LIB_DEPENDS=	libminiupnpc.so:net/miniupnpc
 UPNP_CPPFLAGS=		-I${LOCALBASE}/include
 UPNP_LIBS=		-L${LOCALBASE}/lib
 
 QRCODES_CONFIGURE_WITH=	qrencode
 QRCODES_LIB_DEPENDS=	libqrencode.so:graphics/libqrencode
 
 ZMQ_CONFIGURE_ENABLE=	zmq
 ZMQ_BUILD_DEPENDS=	libzmq4>0:net/libzmq4
 ZMQ_RUN_DEPENDS=	libzmq4>0:net/libzmq4
 
 GH_ACCOUNT=	bitcoin
 
 CONFIGURE_ARGS?=	--without-libs \
 			--with-gui=qt5 \
 			--without-daemon \
 			--without-utils
 
 CONFIGURE_ENV=	CRYPTO_CFLAGS="-I${OPENSSLINC}" CRYPTO_LIBS="-L${OPENSSLLIB} -lcrypto" \
 		SSL_CFLAGS="-I${OPENSSLINC}" SSL_LIBS="-L${OPENSSLLIB} -lssl" \
 		OBJCXX="${CXX}" OBJCXXFLAGS="${CXXFLAGS}"
 MAKE_ENV+=	V=1
 
 PLIST_FILES?=	bin/bitcoin-qt man/man1/bitcoin-qt.1.gz \
 		share/applications/bitcoin-qt.desktop share/pixmaps/bitcoin128.png
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MWALLET_BDB48}
 CONFIGURE_ARGS+=	--enable-wallet
 USES+=			bdb:48
 .elif ${PORT_OPTIONS:MWALLET_BDBMODERN}
 CONFIGURE_ARGS+=	--enable-wallet --with-incompatible-bdb
 USES+=			bdb:5+
 .else
 CONFIGURE_ARGS+=	--disable-wallet
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MWALLET_BDB48} || ${PORT_OPTIONS:MWALLET_BDBMODERN}
 CPPFLAGS+=	-I${BDB_INCLUDE_DIR}
 LIBS+=		-L${BDB_LIB_DIR}
 .endif
 
 .if defined(SLAVE_PORT) && ${SLAVE_PORT} == "no"
 
 post-install:
 	${INSTALL} ${FILESDIR}/bitcoin-qt.desktop \
 		${STAGEDIR}${PREFIX}/share/applications
 	${INSTALL} ${DISTDIR}/${DIST_SUBDIR}/bitcoin128.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/
 
 .endif
 
 regression-test: build
 	# To use this sucessfully, remove --without-daemon and --without-utils
 	# from CONFIGURE_ARGS above.
 
 	@cd ${WRKSRC} && ${GMAKE} check
 
 .include <bsd.port.post.mk>
Index: head/sysutils/logstalgia/Makefile
===================================================================
--- head/sysutils/logstalgia/Makefile	(revision 500650)
+++ head/sysutils/logstalgia/Makefile	(revision 500651)
@@ -1,40 +1,40 @@
 # Created by: Emanuel Haupt <ehaupt@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	logstalgia
 DISTVERSIONPREFIX=	${PORTNAME}-
 DISTVERSION=	1.1.2
 PORTREVISION=	6
 CATEGORIES=	sysutils www
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Website access log visualization tool
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${LOCALBASE}/include/glm/glm.hpp:math/glm
 LIB_DEPENDS=	libboost_regex.so:devel/boost-libs \
 		libfreetype.so:print/freetype2 \
 		libpcre.so:devel/pcre \
 		libpng.so:graphics/png \
 		libftgl.so:graphics/ftgl
 
 GNU_CONFIGURE=	yes
 USES=		autoreconf compiler:c++0x gmake jpeg localbase:ldflags pkgconfig
 USE_GL=		gl glu glew
 USE_SDL=	image2 sdl2
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	acaudwell
-GH_PROJECT=	Logstalgia:DEFAULT Core:core
+GH_PROJECT=	Logstalgia Core:core
 GH_TAGNAME=	1534074:core
 
 post-extract:
 	@${MV} ${WRKDIR}/Core-*/* ${WRKSRC}/src/core/
 
 post-patch:
 	@${REINPLACE_CMD} -e 's| -Wno-unused-but-set-variable||' \
 		${WRKSRC}/Makefile.am
 
 .include <bsd.port.mk>
Index: head/textproc/ibus/Makefile
===================================================================
--- head/textproc/ibus/Makefile	(revision 500650)
+++ head/textproc/ibus/Makefile	(revision 500651)
@@ -1,122 +1,122 @@
 # Created by: Henry Hu <henry.hu.sh@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	ibus
 PORTVERSION=	1.5.18
 PORTREVISION=	3
 CATEGORIES=	textproc
-MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${PORTVERSION}/:DEFAULT
-DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:DEFAULT
+MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${PORTVERSION}/
+DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
 EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	henry.hu.sh@gmail.com
 COMMENT=	Intelligent Input Bus for Linux / Unix OS
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>=0.83.0:devel/py-dbus@${PY_FLAVOR} \
 		${LOCALBASE}/share/unicode/ucd/NamesList.txt:textproc/UCD \
 		${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:misc/iso-codes
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>=0.83.0:devel/py-dbus@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/gtk-2.0/pynotify/__init__.py:devel/py-notify@${PY_FLAVOR} \
 		${LOCALBASE}/share/xml/iso-codes/iso_639.xml:misc/iso-codes \
 		setxkbmap:x11/setxkbmap
 
 USES=		compiler cpe gmake gnome libtool localbase pathfix pkgconfig python:2.7
 USE_GNOME=	glib20 intltool librsvg2 pygobject3
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 OPTIONS_SUB=	yes
 INSTALL_TARGET=	install-strip
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc	\
 		--with-ucd-dir=${LOCALBASE}/share/unicode/ucd
 
 OPTIONS_DEFINE=	NLS GTK2 GTK3 VALA GINTRO PYTHON_LIB DOCS XIM ENGINE EMOJI
 OPTIONS_RADIO=	CONFIG
 OPTIONS_RADIO_CONFIG=	GCONF DCONF
 OPTIONS_DEFAULT=	GTK2 GTK3 VALA GINTRO PYTHON_LIB DCONF XIM ENGINE EMOJI
 
 GTK2_DESC=	Install GTK2 client
 GTK3_DESC=	Install GTK3 client and panel
 VALA_DESC=	Install vala binding
 GINTRO_DESC=	Install GObject Introspection data
 PYTHON_LIB_DESC=	Install ibus Python libraries
 GCONF_DESC=	Use GConf for configuration
 DCONF_DESC=	Use dconf for configuration
 XIM_DESC=	Install XIM server
 ENGINE_DESC=	Install ibus simple engine
 EMOJI_DESC=	Install emoji dictionary
 CPE_VENDOR=	ibus_project
 
 NLS_USES=		gettext
 NLS_USES_OFF=		gettext-tools
 NLS_CONFIGURE_ENABLE=	nls
 
 GTK2_USE=		GNOME=cairo,gtk20
 GTK2_CONFIGURE_ENABLE=	gtk2
 GTK2_LIB_DEPENDS=	libdbus-1.so:devel/dbus \
 			libfontconfig.so:x11-fonts/fontconfig \
 			libfreetype.so:print/freetype2
 
 GTK3_USE=		GNOME=cairo,gtk30 XORG=x11,xi
 GTK3_CONFIGURE_ENABLE=	gtk3 libnotify
 GTK3_LIB_DEPENDS=	libdbus-1.so:devel/dbus \
 			libnotify.so:devel/libnotify
 GTK3_LIBS=		-lX11
 
 VALA_BUILD_DEPENDS=	vala>=0.20:lang/vala
 VALA_CONFIGURE_ENABLE=	vala
 VALA_IMPLIES=		GINTRO
 
 GINTRO_BUILD_DEPENDS=	gobject-introspection>=0.6.8:devel/gobject-introspection
 GINTRO_RUN_DEPENDS=	gobject-introspection>=0.6.8:devel/gobject-introspection
 GINTRO_CONFIGURE_ENABLE=	introspection
 
 PYTHON_LIB_USE=			GNOME=pygtk2
 PYTHON_LIB_CONFIGURE_ENABLE=	python-library
 
 GCONF_USE=		GNOME=gconf2
 GCONF_CONFIGURE_ENABLE=	gconf
 GCONF_VARS=		GCONF_SCHEMAS=ibus.schemas
 
 DCONF_USE=		GNOME=dconf,gconf2
 DCONF_CONFIGURE_ENABLE=	dconf
 DCONF_VARS=		GLIB_SCHEMAS=org.freedesktop.ibus.gschema.xml
 
 DOCS_CONFIGURE_ENABLE=	gtk-doc-html
 
 XIM_CONFIGURE_ENABLE=	xim
 
 ENGINE_CONFIGURE_ENABLE=	engine
 
 EMOJIONE_TAG=		ba845a7e24aac26cf3cf22abc19bea215d94fbf3 # 2.2.7
 EMOJI_CONFIGURE_ON=	--with-unicode-emoji-dir=${LOCALBASE}/share/unicode/emoji \
 			--with-emoji-annotation-dir=${LOCALBASE}/share/unicode/cldr/common/annotations
 EMOJI_CONFIGURE_ENABLE=	emoji-dict
 EMOJI_BUILD_DEPENDS=	json-glib>=0:devel/json-glib \
 			unicode-emoji>0:misc/unicode-emoji \
 			cldr-emoji-annotation>0:misc/cldr-emoji-annotation
 
 .include <bsd.port.pre.mk>
 
 .if ${COMPILER_TYPE} == gcc && ${COMPILER_VERSION} < 46
 USE_GCC=	yes
 .endif
 
 .if ${PORT_OPTIONS:MENGINE} || ${PORT_OPTIONS:MGTK3} || ${PORT_OPTIONS:MGCONF} || ${PORT_OPTIONS:MDCONF}
 PLIST_SUB+=	COMPDIR=""
 .else
 PLIST_SUB+=	COMPDIR="@comment "
 .endif
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/xdg/autostart
 	${INSTALL_DATA} ${PATCHDIR}/ibus.desktop ${STAGEDIR}${PREFIX}/etc/xdg/autostart
 
 do-test:
 	${MAKE} -C ${WRKSRC}/src/tests check
 
 .include <bsd.port.post.mk>
Index: head/www/go-www/Makefile
===================================================================
--- head/www/go-www/Makefile	(revision 500650)
+++ head/www/go-www/Makefile	(revision 500651)
@@ -1,36 +1,36 @@
 # Created by: Nicolas de Bari Embriz Garcia Rojas <nbari@tequila.io>
 # $FreeBSD$
 
 PORTNAME=	www
 PORTVERSION=	2.0.0
 CATEGORIES=	www
 PKGNAMEPREFIX=	go-
 
 MAINTAINER=	nbari@tequila.io
 COMMENT=	Web server for static content
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	nbari:DEFAULT
+GH_ACCOUNT=	nbari
 GH_TUPLE=	golang:crypto:505ab14:crypto/src/golang.org/x/crypto
 GH_SUBDIR=	src/github.com/nbari/${PORTNAME}
 
 PLIST_FILES=	bin/www
 
 post-patch:
 	@${MKDIR} ${WRKSRC}/src/golang.org
 	@${LN} -sf ${LOCALBASE}/share/go/src/golang.org/x ${WRKSRC}/src/golang.org/x
 
 do-build:
 	@cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}; \
 	${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -ldflags \
 	"-s -w" -o www;
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/www ${STAGEDIR}${PREFIX}/bin/www
 
 .include <bsd.port.mk>
Index: head/www/mattermost-server/Makefile
===================================================================
--- head/www/mattermost-server/Makefile	(revision 500650)
+++ head/www/mattermost-server/Makefile	(revision 500651)
@@ -1,53 +1,53 @@
 # $FreeBSD$
 
 PORTNAME=	mattermost-server
 PORTVERSION=	5.6.2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www
 
 MAINTAINER=	loic.blot@unix-experience.fr
 COMMENT=	Open source Slack-alternative in Golang and React
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 ONLY_FOR_ARCHS=	amd64 armv6 armv7 i386
 
 BUILD_DEPENDS=	go>=1.8.1:lang/go
 RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss \
 		mattermost-webapp>=${PORTVERSION}:www/mattermost-webapp
 
 GO_LDFLAGS=	-X github.com/mattermost/mattermost-server/model.BuildNumber=${PORTVERSION}
 
 USE_RC_SUBR=	mattermostd
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	mattermost:DEFAULT
+GH_ACCOUNT=	mattermost
 
 WWWDIR=		${PREFIX}/www/mattermost
 
 MATTERMOSTD_USER=	mattermost
 MATTERMOSTD_GROUP=	mattermost
 
 USERS=		${MATTERMOSTD_USER}
 GROUPS=		${MATTERMOSTD_GROUP}
 
 pre-build:
 	@${MKDIR} ${WRKSRC}/src/github.com/${GH_ACCOUNT_DEFAULT}/${PORTNAME}
 	@cd ${WRKSRC} && \
 		${MV} api4 app cmd doc einterfaces imports jobs manualtesting \
 		mlog migrations model plugin services store utils web wsapi vendor \
 		${WRKSRC}/src/github.com/${GH_ACCOUNT_DEFAULT}/${PORTNAME}
 
 do-build:
 	@cd ${WRKSRC}/src/github.com/${GH_ACCOUNT_DEFAULT}/${GH_PROJECT} && \
 		${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go install -ldflags="${GO_LDFLAGS}" ./...
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/mattermost ${STAGEDIR}${PREFIX}/bin/mattermostd
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/mattermost
 	${INSTALL_DATA} ${WRKSRC}/config/default.json ${STAGEDIR}${PREFIX}/etc/mattermost/config.json.sample
 	${MKDIR} ${STAGEDIR}${WWWDIR}
 	cd ${WRKSRC} && ${COPYTREE_SHARE} 'fonts i18n templates' ${STAGEDIR}${WWWDIR}
 
 .include <bsd.port.mk>
Index: head/www/uchiwa/Makefile
===================================================================
--- head/www/uchiwa/Makefile	(revision 500650)
+++ head/www/uchiwa/Makefile	(revision 500651)
@@ -1,71 +1,71 @@
 # $FreeBSD$
 
 PORTNAME=		uchiwa
 PORTVERSION=	0.18.2
 CATEGORIES=		www
 MASTER_SITES=	http://uchiwa.io/
 
 MAINTAINER=	alexander@treg.io
 COMMENT=	Simple dashboard for Sensu
 
 LICENSE=	MIT
 
 BUILD_DEPENDS=	go>=1.6.0:lang/go
 
 UCHIWA_LOGDIR=		/var/log/uchiwa
 UCHIWA_CONFDIR=		${PREFIX}/etc/uchiwa
 UCHIWA_SHAREDIR=	${PREFIX}/share/uchiwa/public
 
 USE_RC_SUBR=	${PORTNAME}
 USE_GITHUB=	yes
-GH_ACCOUNT=	sensu:DEFAULT
+GH_ACCOUNT=	sensu
 GH_TUPLE=	dgrijalva:jwt-go:61124b62ad244d655f87d944aefaa2ae5a0d2f16:jwtgo/src/github.com/dgrijalva/jwt-go
 GH_TUPLE+=	gorilla:context:215affda49addc4c8ef7e2534915df2c8c35c6cd:context/src/github.com/gorilla/context
 GH_TUPLE+=	mitchellh:mapstructure:f7d28d5aeab42b9b95d2e6d6b956f73a290077fc:mapstructure/src/github.com/mitchellh/mapstructure
 GH_TUPLE+=	palourde:mergo:d931ffd2c07cb4caf7194e0f6af9ac6771c26d54:mergo/src/github.com/palourde/mergo
 GH_TUPLE+=	stretchr:objx:cbeaeb16a013161a98496fad62933b1d21786672:objx/src/github.com/stretchr/objx
 GH_TUPLE+=	stretchr:testify:e4ec8152c15fc46bd5056ce65997a07c7d415325:testify/src/github.com/stretchr/testify
 GH_TUPLE+=	sensu:uchiwa-web:${PORTVERSION}:uchiwaweb/public/bower_components/uchiwa-web
 GH_TUPLE+=	angular:bower-angular-cookies:b89821e37d3011ad0bca9a4847a8fcc59f90fabb:bowerangularcookies/public/bower_components/angular-cookies
 GH_TUPLE+=	urish:angular-moment:0.9.2:urishangularmoment/public/bower_components/angular-moment
 GH_TUPLE+=	angular:bower-angular:v1.4.11:angularbowerangular/public/bower_components/angular
 GH_TUPLE+=	angular:bower-angular-route:v1.4.11:angularbowerangularroute/public/bower_components/angular-route
 GH_TUPLE+=	angular:bower-angular-sanitize:v1.4.11:angularbowerangularsanitize/public/bower_components/angular-sanitize
 GH_TUPLE+=	twbs:bootstrap:v3.1.1:bootstrap/public/bower_components/bootstrap
 GH_TUPLE+=	twbs:bootstrap-sass:v3.1.1:bootstrapsass/public/bower_components/bootstrap-sass-official
 GH_TUPLE+=	foxandxss:angular-toastr:1.6.0:forandxssangulartoastr/public/bower_components/angular-toastr
 GH_TUPLE+=	wallin:angular-gravatar:0.3.2:wallinangulargravatar/public/bower_components/angular-gravatar
 GH_TUPLE+=	fortawesome:Font-Awesome:v4.4.0:fortawesomefontawesome/public/bower_components/fontawesome
 GH_TUPLE+=	components:highlightjs:08edd75426b52b165cc2b8a569870df4794c36dc:componentshighlightjs/public/bower_components/highlightjs
 GH_TUPLE+=	angular-ui:bootstrap-bower:0.13.4:angularuibootstrapbower/public/bower_components/angular-bootstrap
 GH_TUPLE+=	moment:moment:2.8.4:momentmoment/public/bower_components/moment
 GH_TUPLE+=	jquery:jquery-dist:3.0.0:jqueryjquery/public/bower_components/jquery
 GH_TUPLE+=	jashkenas:underscore:1f4bf626f23a99f7a676f5076dc1b1475554c8f7:jashkenasunderscore/public/bower_components/underscore
 GH_TUPLE+=	kless:osutil:3ac994847c4376a4b905fc0a19f450c5a4bec647:klessosutil/src/github.com/kless/osutil
 
 USERS=	uchiwa
 GROUPS=	uchiwa
 
 post-extract:
 	@${MKDIR} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}
 .for src in .travis.yml Gruntfile.js bower.json package.json uchiwa \
 	Dockerfile LICENSE config.json.example public uchiwa.go .bowerrc \
 	Godeps README.md fixtures
 	@${MV} ${WRKSRC}/${src} \
 		${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}
 .endfor
 
 do-build:
 	@cd ${WRKSRC}/src/github.com/sensu && ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go install ./...
 
 do-install:
 	${MKDIR} ${STAGEDIR}${UCHIWA_LOGDIR} \
 	${STAGEDIR}${UCHIWA_CONFDIR} \
 	${STAGEDIR}${UCHIWA_SHAREDIR}
 
 post-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/uchiwa ${STAGEDIR}${PREFIX}/bin/uchiwa
 	${INSTALL_DATA} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}/config.json.example ${STAGEDIR}${PREFIX}/etc/uchiwa/config.json.sample
 	(cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}/public && ${COPYTREE_SHARE} . ${STAGEDIR}${UCHIWA_SHAREDIR})
 
 .include <bsd.port.mk>