*/*: sync with upstream

Taken from: HardenedBSD

archivers/R-cran-zip/Makefile

@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	zip
-DISTVERSION=	1.0.0
-PORTREVISION=	1
+DISTVERSION=	2.0.1
 CATEGORIES=	archivers
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
@@ -11,7 +10,10 @@ COMMENT=	Cross-Platform 'zip' Compression
 
 LICENSE=	CC0-1.0
 
-TEST_DEPENDS=	R-cran-withr>0:devel/R-cran-withr
+TEST_DEPENDS=	R-cran-R6>0:devel/R-cran-R6 \
+		R-cran-covr>0:devel/R-cran-covr \
+		R-cran-testthat>0:devel/R-cran-testthat \
+		R-cran-withr>0:devel/R-cran-withr
 
 USES=		cran:auto-plist,compiles
 

archivers/R-cran-zip/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1537727310
-SHA256 (zip_1.0.0.tar.gz) = 6fa9ec7b093b8c717c50f205d4335c31c43c2ecb51c0242c9a0337d8d84df965
-SIZE (zip_1.0.0.tar.gz) = 60823
+TIMESTAMP = 1554053408
+SHA256 (zip_2.0.1.tar.gz) = 216a6fd02c289641502e42d6fe1bc8bf97199f7bbce164493e1f0b2dee5f9031
+SIZE (zip_2.0.1.tar.gz) = 95260

archivers/R-cran-zip/pkg-descr

@@ -1,4 +1,4 @@
 Cross-Platform 'zip' Compression Library. A replacement for the 'zip' function,
 that does not require any additional external tools on any platform.
 
-WWW: https://github.com/gaborcsardi/zip
+WWW: https://github.com/r-lib/zip#readme

astro/libosmpbf/Makefile

@@ -4,7 +4,7 @@
 PORTNAME=	libosmpbf
 PORTVERSION=	1.3.3
 DISTVERSIONPREFIX=	v
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	astro geography devel
 
 MAINTAINER=	[email protected]

astro/merkaartor/Makefile

@@ -3,7 +3,7 @@
 
 PORTNAME=	merkaartor
 PORTVERSION=	0.18.2
-PORTREVISION=	15
+PORTREVISION=	16
 CATEGORIES=	astro
 
 MAINTAINER=	[email protected]

astro/p5-Astro-Coords/Makefile

@@ -19,8 +19,9 @@ RUN_DEPENDS=	p5-Astro-PAL>=0:astro/p5-Astro-PAL \
 TEST_DEPENDS=	p5-Test-Number-Delta>=0:devel/p5-Test-Number-Delta \
 		p5-Test-Pod>=1:devel/p5-Test-Pod
 
-NO_ARCH=	yes
-USE_PERL5=	modbuild
 USES=		perl5
+USE_PERL5=	modbuild
+
+NO_ARCH=	yes
 
 .include <bsd.port.mk>

astro/xtide/distinfo

@@ -1,7 +1,9 @@
-TIMESTAMP = 1551465962
+TIMESTAMP = 1551830866
 SHA256 (xtide-2.15.2.tar.bz2) = c81c2e8fd1b655b6e798332097056654f2e9e97fb88052c1a5582ba13fa46931
 SIZE (xtide-2.15.2.tar.bz2) = 727048
 SHA256 (libtcd-2.2.7-r2.tar.bz2) = aff1f218b84106c572d094912cd11c828e1ea212db5661cdcc0e2e6253020a94
 SIZE (libtcd-2.2.7-r2.tar.bz2) = 308959
 SHA256 (harmonics-dwf-20151227-free.tar.bz2) = b382acfd94cefd6f6434ff3efdbecfd929abe3639e345979da7826a37ed5a7ac
 SIZE (harmonics-dwf-20151227-free.tar.bz2) = 499871
+SHA256 (wvs.tar.bz2) = 4e996ce2e608d612ba78e35cdf50c2c73b01fce06bd5b561a7fe957ea75d6d75
+SIZE (wvs.tar.bz2) = 37461520

audio/clementine-player/Makefile

@@ -4,7 +4,7 @@
 PORTNAME=	clementine
 DISTVERSION=	1.3.1-661
 DISTVERSIONSUFFIX=	-g4ff370ce1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 PKGNAMESUFFIX=	-player
 

audio/id3lib/Makefile

@@ -16,8 +16,9 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 BROKEN_mips=	fails to link: '_ZTSN12_GLOBAL__N_117ConstIteratorImplE' referenced in section '.data.rel.ro' of tag.lo: defined in discarded section
 BROKEN_mips64=	fails to link: '_ZTSN12_GLOBAL__N_117ConstIteratorImplE' referenced in section '.data.rel.ro' of tag.lo: defined in discarded section
 
-GNU_CONFIGURE=	yes
 USES=		iconv libtool localbase
+
+GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
 post-extract:

audio/libmatemixer/Makefile

@@ -2,6 +2,7 @@
 
 PORTNAME=	libmatemixer
 PORTVERSION=	1.20.1
+PORTREVISION=	1
 CATEGORIES=	audio mate
 MASTER_SITES=	MATE
 DIST_SUBDIR=	mate
@@ -24,6 +25,7 @@ CONFIGURE_ARGS=	--disable-null \
 INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=		PULSEAUDIO ALSA
+OPTIONS_DEFAULT=	PULSEAUDIO
 OPTIONS_SUB=		yes
 
 PULSEAUDIO_CONFIGURE_ENABLE=	pulseaudio

audio/mixxx/Makefile

@@ -4,7 +4,7 @@
 PORTNAME=	mixxx
 DISTVERSIONPREFIX=	release-
 DISTVERSION=	2.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 
 MAINTAINER=	[email protected]

audio/mixxx21/Makefile

@@ -4,6 +4,7 @@
 PORTNAME=	mixxx
 DISTVERSIONPREFIX=	release-
 DISTVERSION=	2.1.7
+PORTREVISION=	1
 CATEGORIES=	audio
 PKGNAMESUFFIX=  21
 

audio/mumble/Makefile

@@ -3,7 +3,7 @@
 
 PORTNAME=	mumble
 DISTVERSION=	1.3.0-rc1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 
 MAINTAINER=	[email protected]

audio/murmur/Makefile

@@ -3,7 +3,7 @@
 
 PORTNAME=	murmur
 DISTVERSION=	1.3.0-rc1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio net
 
 MAINTAINER=	[email protected]

biology/py-fastTSNE/Makefile

@@ -22,4 +22,6 @@ RUN_DEPENDS=	${PYNUMPY} \
 USES=		localbase:ldflags python:3.5+
 USE_PYTHON=	distutils autoplist
 
+PORTSCOUT=	skipv:0.2.14 # no such version, not sure where does portscout see it
+
 .include <bsd.port.mk>

cad/zcad/Makefile

@@ -2,42 +2,54 @@
 # $FreeBSD$
 
 PORTNAME=	zcad
-PORTVERSION=	0.9.8
-PORTREVISION=	3
+PORTVERSION=	0.9.8.4
 CATEGORIES=	cad
 PKGNAMESUFFIX=	${LAZARUS_PKGNAMESUFFIX}
-MASTER_SITES=	LOCAL/danfe
-DISTNAME=	${PORTNAME}-trunk-r2259
 
 MAINTAINER=	[email protected]
 COMMENT=	Simple CAD program
 
-BROKEN=		fails to build
-
 USES=		fpc lazarus:flavors tar:xz
+USE_GITHUB=	yes
+GH_ACCOUNT=	zamtmn
 USE_FPC=	cairo chm fcl-base fcl-image fcl-json fcl-stl fcl-xml opengl \
 		pasjpeg rtl-extra rtl-objpas x11
 
-EXTRACT_CMD=	LC_ALL=en_US.UTF-8 ${TAR}	# for non-ASCII filenames
-
 MAKE_ENV=	LAZBUILD_CMD="${LAZBUILD_CMD}" \
 		LAZBUILD_ARGS="${LAZBUILD_ARGS}" \
 		LCL_PLATFORM="${LCL_PLATFORM}" \
 		LAZARUS_DIR="${LAZARUS_DIR}" \
 		INSTANTFPCCACHE="${WRKSRC}/.cache"
 
-NO_LAZBUILD=	yes
-WRKSRC=		${WRKDIR}/trunk
 BUILD_WRKSRC=	${WRKSRC}/cad_source
 INSTALL_WRKSRC=	${WRKSRC}/cad
 
-LAZBUILD_ARGS=	-d --pcp=${WRKSRC}/tmppcp
-LAZARUS_NO_FLAVORS=qt5
+LAZARUS_PROJECT_FILES=	anchordocking/anchordocking.lpk \
+			fpvectorial/fpvectorialpkg.lpk \
+			lclextensions/lclextensions_package.lpk \
+			virtualtreeview/virtualtreeview_package.lpk \
+			other/rtl-generics_for_FPC304/rtl_generics.lpk \
+			components/zebase/zebase.lpk \
+			components/zcontainers/zcontainers.lpk \
+			components/zcontrols/zcontrols.lpk \
+			components/zmath/zmath.lpk \
+			components/zscriptbase/zscriptbase.lpk \
+			components/zscript/zscript.lpk \
+			components/zundostack/zundostack.lpk \
+			components/zobjectinspector/zobjectinspector.lpk \
+			components/ztoolbars/ztoolbars.lpk \
+			other/AGraphLaz/lazarus/ag_vectors.lpk \
+			other/AGraphLaz/lazarus/ag_attr.lpk \
+			other/AGraphLaz/lazarus/ag_math.lpk \
+			other/AGraphLaz/lazarus/ag_graph.lpk \
+			other/uniqueinstance/uniqueinstance_package.lpk \
+			utils/typeexporter.lpi
 
-gtk2_CONFLICTS_INSTALL=	${PORTNAME}-qt4
-qt4_CONFLICTS_INSTALL=	${PORTNAME}-gtk2
+LAZBUILD_ARGS=	-d --pcp=${WRKSRC}/tmppcp
+LLD_UNSAFE=	yes
 
-MAKE_JOBS_UNSAFE=	yes
+gtk2_CONFLICTS_INSTALL=	${PORTNAME}-qt5
+qt5_CONFLICTS_INSTALL=	${PORTNAME}-gtk2
 
 PORTDOCS=	UserGuide.odt UserGuide.pdf
 
@@ -48,16 +60,16 @@ MAKE_ENV+=	GUI=gtk2
 .endif
 
 post-patch:
-	@${EGREP} -lR 'IFN?DEF LINUX' ${BUILD_WRKSRC} | ${XARGS} \
+	@${EGREP} -lR 'IFN?DEF LINUX' ${WRKSRC} | ${XARGS} \
 		${REINPLACE_CMD} -E '/IFN?DEF LINUX/s,LINUX,UNIX,g'
 	@${REINPLACE_CMD} -e '/}Linux{/d' \
 		${BUILD_WRKSRC}/other/AGraphLaz/Vectors/VStream.pas \
 		${BUILD_WRKSRC}/other/AGraphLaz/Vectors/VFStream.pas \
 		${BUILD_WRKSRC}/other/AGraphLaz/Vectors/VFileSys.pas \
 		${BUILD_WRKSRC}/other/AGraphLaz/Vectors/VStrm64.pas
-	${CP} ${FILESDIR}/makefile ${BUILD_WRKSRC}/Makefile
+	@${REINPLACE_CMD} '1,6d' ${WRKSRC}/environment/makeenv_zcad.sh
 
-pre-build:
+post-configure:
 # OpenGL component must be fixed and rebuilt locally (to avoid touching
 # filesystem outside working directory)
 	${SED} -e 's,Linux,${OPSYS},' \
@@ -67,24 +79,27 @@ pre-build:
 		${LAZARUS_DIR}/components/opengl/glqtcontext.pas \
 		${LAZARUS_DIR}/components/opengl/openglcontext.res \
 		${BUILD_WRKSRC}
-# Build components that do not come with precompiled *.ppu files (also
-# copy them locally first for the same reason as above)
-	${CP} -a  ${LAZARUS_DIR}/components/fpvectorial \
-		${LAZARUS_DIR}/components/anchordocking ${WRKSRC}
-	${SETENV} ${MAKE_ENV} ${LAZBUILD_CMD} ${LAZBUILD_ARGS} --ws=${LCL_PLATFORM} \
-		--lazarusdir=${LAZARUS_DIR} \
-			${WRKSRC}/fpvectorial/fpvectorialpkg.lpk
-	${SETENV} ${MAKE_ENV} ${LAZBUILD_CMD} ${LAZBUILD_ARGS} --ws=${LCL_PLATFORM} \
-		--lazarusdir=${LAZARUS_DIR} \
-			${WRKSRC}/anchordocking/anchordocking.lpk
+	${CP} -a ${LAZARUS_DIR}/components/fpvectorial \
+		${LAZARUS_DIR}/components/anchordocking \
+		${LAZARUS_DIR}/components/virtualtreeview \
+		${LAZARUS_DIR}/components/lclextensions ${BUILD_WRKSRC}
+
+post-build:
+	@${MKDIR} ${WRKSRC}/cad
+	@${CP} -a ${WRKSRC}/environment/runtimefiles/common/* ${WRKSRC}/cad
+	@${CP} -a ${WRKSRC}/environment/runtimefiles/zcad/* ${WRKSRC}/cad
+	@cd ${WRKSRC}/environment && ${SH} makeenv_zcad.sh
+	@cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${LAZBUILD_CMD} \
+		${LAZBUILD_ARGS} --ws=${LCL_PLATFORM} \
+		--lazarusdir=${LAZARUS_DIR} zcad.lpi
 
 do-install:
 # Not ready for hier(7)-conforming installation yet
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${PORTNAME}
 	${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/${PORTNAME} \
 		${STAGEDIR}${PREFIX}/${PORTNAME}
-	cd ${INSTALL_WRKSRC} && ${COPYTREE_SHARE} "blocks components \
-		fonts images languages menu programdb rtl sample \
+	cd ${INSTALL_WRKSRC} && ${COPYTREE_SHARE} "autosave components \
+		fonts images languages log menu plugins rtl sample \
 		template" ${STAGEDIR}${PREFIX}/${PORTNAME}
 
 do-install-DOCS-on:
@@ -93,3 +108,5 @@ do-install-DOCS-on:
 		${INSTALL_WRKSRC}/UserGuide.pdf ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
+
+PATCH_ARGS+=	-l

cad/zcad/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1493632254
-SHA256 (zcad-trunk-r2259.tar.xz) = 9e441aee52313b8b6eb380dd3a92a9c61e35ff0c9f0bc9e71abc38c4579faff2
-SIZE (zcad-trunk-r2259.tar.xz) = 8789888
+TIMESTAMP = 1540234218
+SHA256 (zamtmn-zcad-0.9.8.4_GH0.tar.gz) = ba26a7d181712af104ae1c447b08ce48a3eb727c73d53e6cf80e1f4c2e3687f6
+SIZE (zamtmn-zcad-0.9.8.4_GH0.tar.gz) = 10040591

cad/zcad/files/patch-cad__source_zcad.lpi

@@ -2,10 +2,10 @@
 +++ cad_source/zcad.lpi
 @@ -220,7 +220,7 @@
          <PackageName Value="AnchorDocking"/>
-       </Item15>
-       <Item16>
--        <PackageName Value="LazOpenGLContext"/>
-+        <Filename Value="openglcontext.pas"/>
        </Item16>
        <Item17>
+-        <PackageName Value="LazOpenGLContext"/>
++        <Filename Value="openglcontext.pas"/>
+       </Item17>
+       <Item18>
          <PackageName Value="LCL"/>