*/*: sync with upstream

Taken from: FreeBSD

archivers/py-attic/Makefile

@@ -24,12 +24,6 @@ USE_OPENSSL=	yes
 STRIP_FILES=	hashindex.so platform_freebsd.so chunker.so crypto.so
 PYDISTUTILS_BUILDPATH=${BUILD_WRKSRC}/build/lib.${OPSYS:tl}-${UNAMER}-${ARCH}-${PYTHON_VER}
 
-.include <bsd.port.options.mk>
-
-.if ${OSVERSION} < 1000015
-WITH_OPENSSL_PORT=	yes
-.endif
-
 .include <bsd.port.pre.mk>
 
 .if defined(PACKAGE_BUILDING) && ${PYTHON_VER} != ${PYTHON_DEFAULT}

archivers/py-borgbackup/Makefile

@@ -26,13 +26,6 @@ FUSE_RUN_DEPENDS=	${PYTHONPREFIX_SITELIBDIR}/llfuse.so:devel/py-llfuse
 USES=		python:3.4+ ssl
 USE_PYTHON=	autoplist distutils
 
-.include <bsd.port.options.mk>
-
-# borg requires openssl>=1.0.0
-.if ${OSVERSION} < 1000015
-WITH_OPENSSL_PORT=yes
-.endif
-
 .include <bsd.port.pre.mk>
 
 .if defined(PACKAGE_BUILDING) && ${PYTHON_VER} != ${PYTHON_DEFAULT}

astro/cfitsio/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	cfitsio
-PORTVERSION=	3.390
+PORTVERSION=	3.410
 CATEGORIES=	astro
 MASTER_SITES=	http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/ \
 		http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/oldvers/ \

astro/cfitsio/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1473144718
-SHA256 (cfitsio3390.tar.gz) = 62d3d8f38890275cc7a78f5e9a4b85d7053e75ae43e988f1e2390e539ba7f409
-SIZE (cfitsio3390.tar.gz) = 4755390
+TIMESTAMP = 1483380083
+SHA256 (cfitsio3410.tar.gz) = a556ac7ea1965545dcb4d41cfef8e4915eeb8c0faa1b52f7ff70870f8bb5734c
+SIZE (cfitsio3410.tar.gz) = 4755428

astro/cfitsio/pkg-descr

@@ -1,10 +1,8 @@
-CFITSIO is a library of C and Fortran subroutines for reading and writing
-data files in FITS (Flexible Image Transport System) data format. CFITSIO
-simplifies the task of writing software that deals with FITS files by
-providing an easy to use set of high-level routines that insulate the
-programmer from the internal complexities of the FITS file format. At
-the same time, CFITSIO provides many advanced features that have made
-it the most widely used FITS file programming interface in the
-astronomical community.
+CFITSIO is a library of C and Fortran subroutines for reading and writing data
+files in FITS (Flexible Image Transport System) data format. CFITSIO provides
+simple high-level routines for reading and writing FITS files that insulate the
+programmer from the internal complexities of the FITS format. CFITSIO also
+provides many advanced features for manipulating and filtering the information
+in FITS files.
 
-WWW: http://heasarc.gsfc.nasa.gov/docs/software/fitsio/
+WWW: https://heasarc.gsfc.nasa.gov/docs/software/fitsio/

audio/asterisk-espeak/Makefile

@@ -15,11 +15,10 @@ LIB_DEPENDS=	libespeak.so:audio/espeak \
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	zaf
-GH_PROJECT=	Asterisk-Espeak
+GH_PROJECT=	Asterisk-eSpeak
 
 USES=		compiler gmake localbase
 INSTALL_TARGET=	install samples
-WRKSRC=		${WRKDIR}/Asterisk-eSpeak-${PORTVERSION}
 
 OPTIONS_SINGLE=		ASTVER
 OPTIONS_SINGLE_ASTVER=	ASTERISK11 ASTERISK13

audio/asterisk-espeak/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1474384491
-SHA256 (zaf-Asterisk-Espeak-v3.0_GH0.tar.gz) = 47c7629853ad54a2f3b50a5407db356ab7806f5fa40f9811a129208d6eeec398
-SIZE (zaf-Asterisk-Espeak-v3.0_GH0.tar.gz) = 13758
+TIMESTAMP = 1483464333
+SHA256 (zaf-Asterisk-eSpeak-v3.0_GH0.tar.gz) = 47c7629853ad54a2f3b50a5407db356ab7806f5fa40f9811a129208d6eeec398
+SIZE (zaf-Asterisk-eSpeak-v3.0_GH0.tar.gz) = 13758

audio/aureal-kmod/Makefile

@@ -13,7 +13,9 @@ DISTNAME=	au88x0-${PORTVERSION}_4
 MAINTAINER=	[email protected]
 COMMENT=	Driver for Aureal Vortex based soundcards
 
-BROKEN=		Unfetchable (google code has gone away)
+BROKEN=		does not build (and fetch)
+DEPRECATED=	${BROKEN}
+EXPIRATION_DATE=	2017-01-15
 
 ONLY_FOR_ARCHS=	i386
 STRAYFILES=	au88x0.h au88x0.c asp10.o asp20.o asp30.o
@@ -36,10 +38,6 @@ USES=		kmod
 
 EXTRA_PATCHES+=	${PATCHDIR}/extra_800000_patch-au88x0.c
 
-.if ${OSVERSION} >= 1000000
-BROKEN=	does not build
-.endif
-
 pre-everything::
 .for STRAY in ${STRAYFILES}
 .if exists(${SRC_BASE}/sys/dev/sound/pci/${STRAY})

audio/festalon/Makefile

@@ -14,6 +14,8 @@ COMMENT?=	Command line player for .nsf and .hes audio files
 
 LICENSE=	GPLv2
 
+BROKEN_i386=	does not build on i386 FreeBSD 10.x and later
+
 LIB_DEPENDS+=	libsamplerate.so:audio/libsamplerate
 
 USES+=		libtool pkgconfig tar:bzip2
@@ -25,12 +27,6 @@ ONLY_FOR_ARCHS=	i386 amd64
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000
-BROKEN_i386=	does not build on i386 FreeBSD 10.x and later
-.endif
-
 .if ${PKGNAMEPREFIX} == ""
 
 USE_SDL=	yes

audio/forked-daapd/Makefile

@@ -53,14 +53,7 @@ LASTFM_CONFIGURE_ENABLE=lastfm
 LASTFM_LIB_DEPENDS=	libcurl.so:ftp/curl
 MPD_CONFIGURE_ENABLE=	mpd
 
-.include <bsd.port.pre.mk>
-
-# Ensure FreeBSD 9 can find zlib library
-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000712
-CONFIGURE_ENV+=	ZLIB_CFLAGS="-I/usr/include" ZLIB_LIBS="-lz"
-.endif
-
 post-install:
 	@${MV} ${STAGEDIR}${PREFIX}/etc/forked-daapd.conf ${STAGEDIR}${PREFIX}/etc/forked-daapd.conf.sample
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

audio/murmur/Makefile

@@ -10,6 +10,7 @@ MAINTAINER=	[email protected]
 COMMENT=	Murmur is the server component of Mumble
 
 LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/function.hpp:devel/boost-libs
 LIB_DEPENDS=	libprotobuf.so:devel/protobuf
@@ -62,10 +63,6 @@ CONFIG+=	no-bonjour
 CONFIG+=	no-pch
 .endif
 
-.if ${OSVERSION} < 1000510
-EXTRA_PATCHES=	${FILESDIR}/FreeBSD9-patch-src_SSL.cpp
-.endif
-
 post-patch:
 	@${ECHO_CMD} 'QMAKE_LFLAGS += -fstack-protector' >> ${WRKSRC}/src/murmur/murmur.pro
 
@@ -80,11 +77,11 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/scripts/murmur.ini ${STAGEDIR}${PREFIX}/etc/murmur.ini.sample
 	${MKDIR} ${STAGEDIR}${MAN1PREFIX}/man/man1
 	${CP} ${WRKSRC}/man/murmurd.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for f in CHANGES INSTALL LICENSE README README.Linux
+
+do-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for f in CHANGES INSTALL README README.Linux
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 
 .include <bsd.port.post.mk>

audio/murmur/pkg-plist

@@ -3,6 +3,5 @@ man/man1/murmurd.1.gz
 sbin/murmurd
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/README.Linux

audio/puddletag/Makefile

@@ -23,7 +23,7 @@ GH_ACCOUNT=	keithgg
 USES=		python:2 pyqt:4
 USE_PYTHON=	autoplist distutils
 USE_PYQT=	gui_run svg_run
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/source
+WRKSRC_SUBDIR=	source
 NO_BUILD=	yes
 NO_ARCH=	yes
 

audio/sayonara/Makefile

@@ -30,9 +30,5 @@ post-patch:
 		${WRKSRC}/resources/CMakeLists.txt
 	@${REINPLACE_CMD} -e '/DESTINATION/s,/usr/,,' \
 		${WRKSRC}/src/GUI/Resources/Icons/CMakeLists.txt
-.if !exists(/usr/libdata/pkgconfig/zlib.pc)
-	@${REINPLACE_CMD} -e '/zlib/s/PKG_CHECK_MODULES/FIND_PACKAGE/' \
-		${WRKSRC}/src/Helper/Compressor/CMakeLists.txt
-.endif
 
 .include <bsd.port.mk>

audio/xmms-openspc/Makefile

@@ -12,6 +12,10 @@ DISTNAME=	xmms-OpenSPC-${PORTVERSION}
 MAINTAINER=	[email protected]
 COMMENT=	SPC player for XMMS using OpenSPC
 
+BROKEN=		does not build on FreeBSD 10.x and later
+DEPRECATED=	${BROKEN}
+EXPIRATION_DATE=	2017-01-15
+
 BUILD_DEPENDS=	nasm:devel/nasm \
 		xmms:multimedia/xmms
 RUN_DEPENDS=	xmms:multimedia/xmms
@@ -23,10 +27,4 @@ PLIST_FILES=	lib/xmms/Input/openspc.so
 
 ONLY_FOR_ARCHS=	i386	# contains x86 assembler code
 
-.include <bsd.port.options.mk>
-
-.if ${OSVERSION} >= 1000000
-BROKEN=		does not build on FreeBSD 10.x and later
-.endif
-
 .include <bsd.port.mk>

benchmarks/stress-ng/Makefile

@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	stress-ng
-PORTVERSION=	0.07.11
+PORTVERSION=	0.07.13
 CATEGORIES=	benchmarks
 MASTER_SITES=	http://kernel.ubuntu.com/~cking/tarballs/stress-ng/
 
@@ -18,15 +18,8 @@ ALL_TARGET=	# empty
 
 PLIST_FILES=	bin/stress-ng man/man1/stress-ng.1.gz
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 1000000
-EXTRA_PATCHES+=	${FILESDIR}/extrapatch-stress-cpu.h \
-		${FILESDIR}/extrapatch-Makefile
-.endif
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/stress-ng ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/stress-ng.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

benchmarks/stress-ng/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1482269395
-SHA256 (stress-ng-0.07.11.tar.gz) = cd75a64c585dc47e71641e4e654d7689ede0294b6beca7eec174a42462f57381
-SIZE (stress-ng-0.07.11.tar.gz) = 345544
+TIMESTAMP = 1483386553
+SHA256 (stress-ng-0.07.13.tar.gz) = 1fc8e60653ab75f288ce58b63ed162eedda2d5a2b254f0ad47ed6283deeddfe8
+SIZE (stress-ng-0.07.13.tar.gz) = 349935

biology/fastool/Makefile

@@ -14,8 +14,6 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	fstrozzi
 GH_PROJECT=	Fastool
 
-WRKSRC=		${WRKDIR}/Fastool-${PORTVERSION}
-
 PLIST_FILES=	bin/fastool
 
 CFLAGS+=	-std=c99

biology/p5-transdecoder/Makefile

@@ -26,8 +26,6 @@ SHEBANG_FILES=	sample_data/cufflinks_example/runMe.sh \
 USE_GITHUB=	yes
 GH_PROJECT=	TransDecoder
 
-WRKSRC=		${WRKDIR}/${GH_PROJECT}-${PORTVERSION}
-
 PERL_MOD_DIR=	${PREFIX}/${SITE_PERL_REL}/${PORTNAME}
 PERL_UTIL_DIR=	${PREFIX}/libexec/${PORTNAME}
 

biology/vcftools/Makefile

@@ -14,9 +14,6 @@ LICENSE=	LGPL3
 USES=		autoreconf gmake perl5 pkgconfig
 
 GNU_CONFIGURE=	yes
-# No zlib.pc on 9.x
-CONFIGURE_ENV=	ZLIB_CFLAGS=" " ZLIB_LIBS="-lz"
-
 USE_GITHUB=	yes
 
 .include <bsd.port.mk>

cad/linuxcnc-devel/Makefile

@@ -1,10 +1,11 @@
 # Created by: Edward Tomasz Napierala <[email protected]>
 # $FreeBSD$
 
-PORTNAME=	linuxcnc-devel
+PORTNAME=	linuxcnc
 PORTVERSION=	20160626
 PORTREVISION=	1
 CATEGORIES=	cad
+PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	[email protected]
 COMMENT=	Open Source CNC machine controller
@@ -30,7 +31,7 @@ BUILD_DEPENDS=	${RUN_DEPENDS}
 
 NO_PACKAGE=	Licensing conflict between LinuxCNC (GPL2) and readline (GPL3)
 
-WRKSRC=		${WRKDIR}/linuxcnc-${GH_TAGNAME}/src
+WRKSRC_SUBDIR=		src
 PATCH_WRKSRC=	${WRKDIR}/linuxcnc-${GH_TAGNAME}
 ALL_TARGET=	default
 
@@ -47,7 +48,6 @@ USE_XORG=	ice sm x11 xext xft xinerama xmu xrender xscrnsaver xt
 USE_LDCONFIG=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	LinuxCNC
-GH_PROJECT=	linuxcnc
 GH_TAGNAME=	fe7b155c03fe77d6eb301bcfdc3d7c1acdea73e4
 
 post-patch:

cad/openvsp/Makefile

@@ -33,23 +33,9 @@ USE_GITHUB=	yes
 GH_PROJECT=	OpenVSP
 GH_ACCOUNT=	${GH_PROJECT}
 
-WRKSRC=		${WRKDIR}/${GH_PROJECT}-${GH_PROJECT}_${PORTVERSION}
-
 CMAKE_SOURCE_PATH=	${WRKSRC}/SuperProject
 CMAKE_INSTALL_PREFIX=	${STAGEDIR}${PREFIX}
-USES=		cmake:outsource jpeg
-
-.include <bsd.port.options.mk>
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000 && ${OSVERSION} < 1002000
-# Fails to build with GCC 4.9 in 10.1
-USE_GCC=	4.8
-LDFLAGS+=	-L${LOCALBASE}/lib/c++
-CXXFLAGS+=	-nostdinc++ -isystem ${LOCALBASE}/include/c++/v1
-BUILD_DEPENDS+=	${LOCALBASE}/lib/c++/libstdc++.so:devel/libc++
-.else
-USES +=		compiler:gcc-c++11-lib
-.endif
+USES=		cmake:outsource compiler:gcc-c++11-lib jpeg
 
 CMAKE_ARGS=	-DVSP_USE_SYSTEM_CMINPACK:BOOLEAN=yes \
 		-DVSP_USE_SYSTEM_CPPTEST:BOOLEAN=yes \

comms/Makefile

@@ -25,6 +25,7 @@
     SUBDIR += cqrlog
     SUBDIR += cutecom
     SUBDIR += cwdaemon
+    SUBDIR += cwstudio
     SUBDIR += dabstick-radio
     SUBDIR += dcf77pi
     SUBDIR += deforaos-phone