*/*: sync with upstream

Taken from: FreeBSD

audio/shoutcast/Makefile

@@ -3,7 +3,7 @@
 
 PORTNAME=	shoutcast
 PORTVERSION=	2.4.7.256
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio net
 MASTER_SITES=	http://download.nullsoft.com/shoutcast/tools/ \
 		http://people.freebsd.org/~sbruno/shoutcast/distfiles/
@@ -28,30 +28,33 @@ NO_BUILD=	yes
 
 OPTIONS_DEFINE=	SERVERSETUP DOCS EXAMPLES
 OPTIONS_DEFAULT=	SERVERSETUP
-OPTIONS_SUB=	yes
-SETUPSERVER_DESC=	SHOUTcast Server Setup Tools
+SERVERSETUP_DESC=	SHOUTcast Server Setup Tools
 EXAMPLE_DESC=	SHOUTcast Server Example Configuration Files
 
-SHOUTCASTUSER=	${PORTNAME}
-SHOUTCASTGROUP=	${PORTNAME}
-
+DATADIR=		${WWWDIR}
 SHOUTCASTLDIR=	/var/log/${PORTNAME}
 SHOUTCASTDIR=	/var/run/${PORTNAME}
 
-SHOUTCAST_SUB=	SHOUTCASTUSER=${SHOUTCASTUSER} \
-		SHOUTCASTGROUP=${SHOUTCASTGROUP} \
-		SHOUTCASTLDIR=${SHOUTCASTLDIR} \
-		SHOUTCASTDIR=${SHOUTCASTDIR}
-
-PLIST_SUB=	${SHOUTCAST_SUB}
-
-SUB_FILES=	pkg-message
-
-SUB_LIST=	${SHOUTCAST_SUB}
-
+SHOUTCASTUSER=	${PORTNAME}
+SHOUTCASTGROUP=	${PORTNAME}
 USERS=		${SHOUTCASTUSER}
 GROUPS=		${SHOUTCASTGROUP}
 
+SUB_FILES=	pkg-message
+SUB_LIST=	SHOUTCASTUSER=${SHOUTCASTUSER} SHOUTCASTDIR=${SHOUTCASTDIR}
+
+PORTDATA=		*
+PORTDOCS=		docs *.html *.pem *.txt
+PORTEXAMPLES=	*.conf
+
+PLIST_DIRS=		${ETCDIR} ${SHOUTCASTLDIR} ${SHOUTCASTDIR} \
+		${SHOUTCASTDIR}/control ${SHOUTCASTDIR}/logs
+PLIST_FILES=	sbin/sc_serv
+.for ext in ban rip
+PLIST_FILES+=	"@postunexec if [ ! -s ${SHOUTCASTDIR}/sc_serv.${ext} ];\
+		then ${RM} ${SHOUTCASTDIR}/sc_serv.${ext}; fi"
+.endfor
+
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000010
@@ -63,79 +66,25 @@ RUN_DEPENDS+=	${LOCALBASE}/lib32/compat/libstdc++.so.6:misc/compat9x
 .endif
 
 post-patch:
-.for _file in basic public relay simple
 	@${REINPLACE_CMD} -e '/sc_serv2 directory/d' \
 		-e 's#=.*/\([^\.]*.log\)#=${SHOUTCASTLDIR}/\1#g' \
-		-e 's#=control/#=${SHOUTCASTDIR}/#g' ${WRKSRC}/examples/sc_serv_${_file}.conf
-.endfor
+		-e 's#=control/#=${SHOUTCASTDIR}/#g' ${WRKSRC}/examples/sc_serv_*.conf
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/sc_serv ${STAGEDIR}${PREFIX}/sbin
-	${MKDIR} ${STAGEDIR}${ETCDIR}
-	${MKDIR} ${STAGEDIR}${SHOUTCASTLDIR}
-	${MKDIR} ${STAGEDIR}${SHOUTCASTDIR}
-	${MKDIR} ${STAGEDIR}${SHOUTCASTDIR}/logs
-	${MKDIR} ${STAGEDIR}${SHOUTCASTDIR}/control
+	@${MKDIR} ${STAGEDIR}${ETCDIR}
+	@${MKDIR} ${STAGEDIR}${SHOUTCASTLDIR}
+	@${MKDIR} ${STAGEDIR}${SHOUTCASTDIR}/control
+	@${MKDIR} ${STAGEDIR}${SHOUTCASTDIR}/logs
 
 do-install-DOCS-on:
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/DNAS_Server_Changelog.html ${STAGEDIR}${DOCSDIR}/DNAS_Server_Changelog.html
-	${INSTALL_DATA} ${WRKSRC}/Readme_DNAS_Server.html ${STAGEDIR}${DOCSDIR}/Readme_DNAS_Server.html
-	${INSTALL_DATA} ${WRKSRC}/tos.txt ${STAGEDIR}${DOCSDIR}/tos.txt
-	${INSTALL_DATA} ${WRKSRC}/cacert.pem ${STAGEDIR}${DOCSDIR}/cacert.pem
-	${MKDIR} ${STAGEDIR}${DOCSDIR}/docs
-	${INSTALL_DATA} ${WRKSRC}/docs/Getting_Started.html ${STAGEDIR}${DOCSDIR}/docs/Getting_Started.html
-	${INSTALL_DATA} ${WRKSRC}/docs/DNAS_Server_XML_Responses.html ${STAGEDIR}${DOCSDIR}/docs/DNAS_Server_XML_Responses.html
-	${INSTALL_DATA} ${WRKSRC}/docs/DNAS_Server_Authhash_Management.html ${STAGEDIR}${DOCSDIR}/docs/DNAS_Server_Authhash_Management.html
-	${INSTALL_DATA} ${WRKSRC}/docs/DNAS_Server.html ${STAGEDIR}${DOCSDIR}/docs/DNAS_Server.html
-	${INSTALL_DATA} ${WRKSRC}/docs/DNAS_Server_JSON_Responses.html ${STAGEDIR}${DOCSDIR}/docs/DNAS_Server_JSON_Responses.html
-	${INSTALL_DATA} ${WRKSRC}/docs/DNAS_Server_CDN_Management.html ${STAGEDIR}${DOCSDIR}/docs/DNAS_Server_CDN_Management.html
-	${INSTALL_DATA} ${WRKSRC}/docs/DNAS_Server_Source_Support.html ${STAGEDIR}${DOCSDIR}/docs/DNAS_Server_Source_Support.html
-	${MKDIR} ${STAGEDIR}${DOCSDIR}/docs/res
-	${INSTALL_DATA} ${WRKSRC}/docs/res/Linux_Console.png ${STAGEDIR}${DOCSDIR}/docs/res/Linux_Console.png
-	${INSTALL_DATA} ${WRKSRC}/docs/res/Output_tag_configuration_error.png ${STAGEDIR}${DOCSDIR}/docs/res/Output_tag_configuration_error.png
-	${INSTALL_DATA} ${WRKSRC}/docs/res/Stream_Ban_List_Page.png ${STAGEDIR}${DOCSDIR}/docs/res/Stream_Ban_List_Page.png
-	${INSTALL_DATA} ${WRKSRC}/docs/res/Stream_Blocked_User_Agent_List_Page.png ${STAGEDIR}${DOCSDIR}/docs/res/Stream_Blocked_User_Agent_List_Page.png
-	${INSTALL_DATA} ${WRKSRC}/docs/res/Start.png ${STAGEDIR}${DOCSDIR}/docs/res/Start.png
-	${INSTALL_DATA} ${WRKSRC}/docs/res/Server_Bandwidth_Page.png ${STAGEDIR}${DOCSDIR}/docs/res/Server_Bandwidth_Page.png
-	${INSTALL_DATA} ${WRKSRC}/docs/res/Manual.png ${STAGEDIR}${DOCSDIR}/docs/res/Manual.png
-	${INSTALL_DATA} ${WRKSRC}/docs/res/Completed.png ${STAGEDIR}${DOCSDIR}/docs/res/Completed.png
-	${INSTALL_DATA} ${WRKSRC}/docs/res/Simple.png ${STAGEDIR}${DOCSDIR}/docs/res/Simple.png
-	${INSTALL_DATA} ${WRKSRC}/docs/res/Console_Error.png ${STAGEDIR}${DOCSDIR}/docs/res/Console_Error.png
-	${INSTALL_DATA} ${WRKSRC}/docs/res/Server_Log_Page.png ${STAGEDIR}${DOCSDIR}/docs/res/Server_Log_Page.png
-	${INSTALL_DATA} ${WRKSRC}/docs/res/Server_Source_Connection_Page.png ${STAGEDIR}${DOCSDIR}/docs/res/Server_Source_Connection_Page.png
-	${INSTALL_DATA} ${WRKSRC}/docs/res/Select_Source_DSP_in_Winamp.png ${STAGEDIR}${DOCSDIR}/docs/res/Select_Source_DSP_in_Winamp.png
-	${INSTALL_DATA} ${WRKSRC}/docs/res/Console_Linux.png ${STAGEDIR}${DOCSDIR}/docs/res/Console_Linux.png
-	${INSTALL_DATA} ${WRKSRC}/docs/res/Windows_Service_Install_Failure.png ${STAGEDIR}${DOCSDIR}/docs/res/Windows_Service_Install_Failure.png
-	${INSTALL_DATA} ${WRKSRC}/docs/res/Stream_Summary_Page.png ${STAGEDIR}${DOCSDIR}/docs/res/Stream_Summary_Page.png
-	${INSTALL_DATA} ${WRKSRC}/docs/res/Stream_Admin_Page.png ${STAGEDIR}${DOCSDIR}/docs/res/Stream_Admin_Page.png
-	${INSTALL_DATA} ${WRKSRC}/docs/res/Streams_Summary_Page.png ${STAGEDIR}${DOCSDIR}/docs/res/Streams_Summary_Page.png
-	${INSTALL_DATA} ${WRKSRC}/docs/res/Console_Setup_Mode.png ${STAGEDIR}${DOCSDIR}/docs/res/Console_Setup_Mode.png
-	${INSTALL_DATA} ${WRKSRC}/docs/res/Invalid_Configuration_Item.png ${STAGEDIR}${DOCSDIR}/docs/res/Invalid_Configuration_Item.png
-	${INSTALL_DATA} ${WRKSRC}/docs/res/Server_Summary_Page.png ${STAGEDIR}${DOCSDIR}/docs/res/Server_Summary_Page.png
-	${INSTALL_DATA} ${WRKSRC}/docs/res/Example_Windows_Console.png ${STAGEDIR}${DOCSDIR}/docs/res/Example_Windows_Console.png
-	${INSTALL_DATA} ${WRKSRC}/docs/res/Example_Linux_Console.png ${STAGEDIR}${DOCSDIR}/docs/res/Example_Linux_Console.png
-	${INSTALL_DATA} ${WRKSRC}/docs/res/Linux_Daemon_Mode.png ${STAGEDIR}${DOCSDIR}/docs/res/Linux_Daemon_Mode.png
-	${INSTALL_DATA} ${WRKSRC}/docs/res/Windows_Console.png ${STAGEDIR}${DOCSDIR}/docs/res/Windows_Console.png
-	${INSTALL_DATA} ${WRKSRC}/docs/res/Stream_Reserved_List_Page.png ${STAGEDIR}${DOCSDIR}/docs/res/Stream_Reserved_List_Page.png
-	${INSTALL_DATA} ${WRKSRC}/docs/res/Summary.png ${STAGEDIR}${DOCSDIR}/docs/res/Summary.png
-	${INSTALL_DATA} ${WRKSRC}/docs/res/Setup_Mode_Error.png ${STAGEDIR}${DOCSDIR}/docs/res/Setup_Mode_Error.png
-	${INSTALL_DATA} ${WRKSRC}/docs/res/Editing.png ${STAGEDIR}${DOCSDIR}/docs/res/Editing.png
-	${INSTALL_DATA} ${WRKSRC}/docs/res/Console_Windows.png ${STAGEDIR}${DOCSDIR}/docs/res/Console_Windows.png
-	${INSTALL_DATA} ${WRKSRC}/docs/res/View_Source_Connection_Details.png ${STAGEDIR}${DOCSDIR}/docs/res/View_Source_Connection_Details.png
-
-do-install-SERVERSETUP-on:
-	${MKDIR} ${STAGEDIR}${WWWDIR}/setup
-	${INSTALL_DATA} ${WRKSRC}/setup.sh ${STAGEDIR}${WWWDIR}/setup.sh
-	${INSTALL_DATA} ${WRKSRC}/setup/setup.js ${STAGEDIR}${WWWDIR}/setup/setup.js
-	${INSTALL_DATA} ${WRKSRC}/setup/setup.html ${STAGEDIR}${WWWDIR}/setup/setup.html
-	${INSTALL_DATA} ${WRKSRC}/setup/setup.txt ${STAGEDIR}${WWWDIR}/setup/setup.txt
+	(cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDOCS}" ${STAGEDIR}${DOCSDIR})
 
 do-install-EXAMPLES-on:
-	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/examples/sc_serv_basic.conf ${STAGEDIR}${EXAMPLESDIR}/sc_serv_basic.conf
-	${INSTALL_DATA} ${WRKSRC}/examples/sc_serv_public.conf ${STAGEDIR}${EXAMPLESDIR}/sc_serv_public.conf
-	${INSTALL_DATA} ${WRKSRC}/examples/sc_serv_relay.conf ${STAGEDIR}${EXAMPLESDIR}/sc_serv_relay.conf
-	${INSTALL_DATA} ${WRKSRC}/examples/sc_serv_simple.conf ${STAGEDIR}${EXAMPLESDIR}/sc_serv_simple.conf
+	(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} "${PORTEXAMPLES}" \
+		${STAGEDIR}${EXAMPLESDIR})
+
+do-install-SERVERSETUP-on:
+	(cd ${WRKSRC} && ${COPYTREE_SHARE} "setup setup.sh" ${STAGEDIR}${DATADIR})
 
 .include <bsd.port.mk>

benchmarks/stress-ng/Makefile

@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	stress-ng
-PORTVERSION=	0.06.05
+PORTVERSION=	0.06.06
 CATEGORIES=	benchmarks
 MASTER_SITES=	http://kernel.ubuntu.com/~cking/tarballs/stress-ng/
 

benchmarks/stress-ng/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1464688254
-SHA256 (stress-ng-0.06.05.tar.gz) = fd7ad40955a277f1391fc1fd4e3af97cfacc552f0d6403412563816fe033e208
-SIZE (stress-ng-0.06.05.tar.gz) = 321633
+TIMESTAMP = 1465804234
+SHA256 (stress-ng-0.06.06.tar.gz) = cc58c8fd63490b20c8313c47c30ecb1543a0abd092b09bc9011c161b1a2c0e50
+SIZE (stress-ng-0.06.06.tar.gz) = 328205

cad/kicad-devel/Makefile

@@ -162,8 +162,10 @@ PLIST_SHAREDDIR_LIST=	share/mimelnk/application \
 
 .include <bsd.port.pre.mk>
 
+.if ${OPSYS} == FreeBSD
 .if ${OSVERSION} < 1000000 || ${COMPILER_TYPE} == "gcc"
   IGNORE= builds only on greater than 10 and with clang
 .endif
+.endif
 
 .include <bsd.port.post.mk>

databases/elixir-calecto/Makefile

@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	calecto
-PORTVERSION=	0.6.0
+PORTVERSION=	0.6.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	databases
 PKGNAMEPREFIX=	elixir-

databases/elixir-calecto/distinfo

@@ -1,2 +1,3 @@
-SHA256 (lau-calecto-v0.6.0_GH0.tar.gz) = dfe6096b7079fb8e2c281722e01f0827471b442fb590966f43eb33c614cfcabb
-SIZE (lau-calecto-v0.6.0_GH0.tar.gz) = 11911
+TIMESTAMP = 1465934976
+SHA256 (lau-calecto-v0.6.1_GH0.tar.gz) = a05607e3ca8fe3ecbb86500459d3ea4f88745deae207993811f569d8483a4752
+SIZE (lau-calecto-v0.6.1_GH0.tar.gz) = 12146

databases/innotop/Makefile

@@ -2,10 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	innotop
-PORTVERSION=	1.9.1
-PORTREVISION=	2
+PORTVERSION=	1.11.1
 CATEGORIES=	databases
-MASTER_SITES=	GOOGLE_CODE
 
 MAINTAINER=	[email protected]
 COMMENT=	MySQL and InnoDB monitoring program
@@ -16,9 +14,12 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 BUILD_DEPENDS=	p5-DBD-mysql>=0:databases/p5-DBD-mysql \
 		p5-DBI>=1.46:databases/p5-DBI \
 		p5-Term-ReadKey>=2.10:devel/p5-Term-ReadKey
-RUN_DEPENDS=	p5-DBD-mysql>=0:databases/p5-DBD-mysql \
-		p5-DBI>=1.46:databases/p5-DBI \
-		p5-Term-ReadKey>=2.10:devel/p5-Term-ReadKey
+RUN_DEPENDS:=	${BUILD_DEPENDS}
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	innotop
+GH_PROJECT=	innotop
+GH_TAGNAME=	v${PORTVERSION}
 
 USES=		perl5
 USE_PERL5=	configure

databases/innotop/distinfo

@@ -1,2 +1,3 @@
-SHA256 (innotop-1.9.1.tar.gz) = 117e5af58a83af79b6cf99877b25b1479197597be5a7d51b245a0ad9c69f4d3d
-SIZE (innotop-1.9.1.tar.gz) = 147677
+TIMESTAMP = 1465911515
+SHA256 (innotop-innotop-1.11.1-v1.11.1_GH0.tar.gz) = c93a4fb496ce1749aaaf0a70f0899ed1fa1aa5cd231208b6b3424285c77dc1b7
+SIZE (innotop-innotop-1.11.1-v1.11.1_GH0.tar.gz) = 178295

devel/Makefile

@@ -4041,6 +4041,7 @@
     SUBDIR += py-coverage
     SUBDIR += py-crcmod
     SUBDIR += py-ctags
+    SUBDIR += py-cuisine
     SUBDIR += py-curtsies
     SUBDIR += py-cxx
     SUBDIR += py-cycler

devel/editline/Makefile

@@ -9,7 +9,7 @@ COMMENT=	Minix editline: A free readline() for UNIX
 
 LICENSE=	BSD4CLAUSE
 
-USES=		autoreconf libtool
+USES=		autoreconf libtool ncurses
 USE_GITHUB=	yes
 GH_ACCOUNT=	troglobit
 
@@ -20,7 +20,6 @@ INSTALL_TARGET=	install-strip
 PORTDOCS=	*
 
 post-patch:
-	${REINPLACE_CMD} 's|-ltermcap||' ${WRKSRC}/examples/Makefile.am
 	${REINPLACE_CMD} '/^pkgconfigdir/s|=.*|= ${PREFIX}/libdata/pkgconfig|' \
 		${WRKSRC}/Makefile.am
 	# rename to libeditline.3 to avoid conflict with libedit

devel/elixir-calendar/Makefile

@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	calendar
-PORTVERSION=	0.14.0
+PORTVERSION=	0.14.2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 PKGNAMEPREFIX=	elixir-

devel/elixir-calendar/distinfo

@@ -1,2 +1,3 @@
-SHA256 (lau-calendar-v0.14.0_GH0.tar.gz) = 31b154ae516fc4253ad8a2b9362828de0cd5a07ca1ebbbc5a8bc39e94ae1c0a0
-SIZE (lau-calendar-v0.14.0_GH0.tar.gz) = 43561
+TIMESTAMP = 1465899863
+SHA256 (lau-calendar-v0.14.2_GH0.tar.gz) = a52a53767469444594541a482582bbb33b9e0e9047826b0cdaebd574dce4a493
+SIZE (lau-calendar-v0.14.2_GH0.tar.gz) = 44539

devel/jenkins/Makefile

@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	jenkins
-PORTVERSION=	2.8
+PORTVERSION=	2.9
 CATEGORIES=	devel java
 MASTER_SITES=	http://mirrors.jenkins-ci.org/war/${PORTVERSION}/
 DISTNAME=	jenkins

devel/jenkins/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1465263087
-SHA256 (jenkins/2.8/jenkins.war) = 2fead2f4aa0a8ba7d76b43fdb4ff5350bdd686bc21371f600861b7a85c51c605
-SIZE (jenkins/2.8/jenkins.war) = 68816058
+TIMESTAMP = 1465881976
+SHA256 (jenkins/2.9/jenkins.war) = a2fa588244f82ee82ba8951a9611629109bd35a63ce48d15dae7c925c2da0a51
+SIZE (jenkins/2.9/jenkins.war) = 68822161

devel/ninja-ide/Makefile

@@ -13,8 +13,6 @@ COMMENT=	Cross-platform integrated development environment (IDE)
 
 LICENSE=	GPLv3
 
-BROKEN=		fails to configure
-
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-network>=4.8.5,1:net/py-qt4-network \
 		${PYTHON_PKGNAMEPREFIX}qt4-webkit>=4.8.5:www/py-qt4-webkit
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-declarative>=4.10.2:devel/py-qt4-declarative \

devel/pep8/Makefile

@@ -3,6 +3,7 @@
 
 PORTNAME=	pep8
 PORTVERSION=	1.7.0
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -14,9 +15,9 @@ LICENSE=	MIT
 
 NO_ARCH=	yes
 USES=		python
-USE_PYTHON=	autoplist distutils
+USE_PYTHON=	autoplist concurrent distutils py3kplist
 
-regression-test: extract
+do-test: extract
 	@(cd ${WRKSRC}; ${PYTHON_CMD} ${PORTNAME}.py \
 		--doctest --testsuite=testsuite)
 

devel/pep8/distinfo

@@ -1,2 +1,3 @@
+TIMESTAMP = 1465936744
 SHA256 (pep8-1.7.0.tar.gz) = a113d5f5ad7a7abacef9df5ec3f2af23a20a28005921577b15dd584d099d5900
 SIZE (pep8-1.7.0.tar.gz) = 79704