Index: branches/2015Q2/devel/p4/Makefile
===================================================================
--- branches/2015Q2/devel/p4/Makefile	(revision 383523)
+++ branches/2015Q2/devel/p4/Makefile	(revision 383524)
@@ -1,36 +1,38 @@
 # Created by: gordon@FreeBSD.org
 # $FreeBSD$
 
 PORTNAME=	p4
 PORTVERSION=	2014.2.978861
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/ \
 		http://filehost.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/
 DISTNAME=	p4
 EXTRACT_SUFX=
 EXTRACT_ONLY=	# none
 
 MAINTAINER=	gordon@FreeBSD.org
 COMMENT=	Perforce client
 
+BROKEN=		Checksum mismatch
+
 ONLY_FOR_ARCHS=	amd64 i386
 
 P4VERSION=	r${PORTVERSION:S/^20//:C/\.[0-9]+$//}
 DIST_SUBDIR=	perforce/${PORTVERSION}/bin.${PLATFORM}
 DISTINFO_FILE=	${MASTERDIR}/distinfo.${PLATFORM}
 
 RESTRICTED=	Restricted distribution
 
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
 PLIST_FILES=	bin/p4
 
 .include <bsd.port.pre.mk>
 
 .include "Makefile.inc"
 
 do-install:
 	${INSTALL_PROGRAM} ${DISTDIR}/${DIST_SUBDIR}/p4 ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.post.mk>
Index: branches/2015Q2/devel/p4web/Makefile
===================================================================
--- branches/2015Q2/devel/p4web/Makefile	(revision 383523)
+++ branches/2015Q2/devel/p4web/Makefile	(revision 383524)
@@ -1,71 +1,73 @@
 # Created by: gordon@FreeBSD.org
 # $FreeBSD$
 
 PORTNAME=	p4web
 PORTVERSION=	2012.1.732581
 PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/ \
 		http://filehost.perforce.com/perforce/r${P4VERSION}/bin.${PLATFORM}/
 DISTNAME=	p4web
 EXTRACT_SUFX=
 EXTRACT_ONLY=	# none
 
 MAINTAINER=	gordon@FreeBSD.org
 COMMENT=	Perforce server
 
+BROKEN=		No public distfiles
+
 ONLY_FOR_ARCHS=	amd64 i386
 
 P4VERSION=	r${PORTVERSION:S/^20//:C/\.[0-9]+$//}
 DIST_SUBDIR=	perforce/${PORTVERSION}/bin.${PLATFORM}
 DISTINFO_FILE=	${MASTERDIR}/distinfo.${PLATFORM}
 
 RESTRICTED=	Restricted distribution
 
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
 P4LOG?=		/var/log/p4web.log
 
 SUB_LIST=	P4LOG=${P4LOG}
 
 USE_RC_SUBR=	p4web
 
 .include <bsd.port.pre.mk>
 
 # 10.x (and higher) needs compat libs
 .if ${OSVERSION} >= 1000054
 LIB_DEPENDS+=	libstdc++.so.6:${PORTSDIR}/misc/compat9x
 .endif
 
 # Figure out what to install
 .if ${ARCH} == amd64
 . if ${OSVERSION} >= 700043
 PLATFORM=	freebsd70x86_64
 . else
 IGNORE=		unsupported OS release, sorry
 . endif
 
 .elif ${ARCH} == i386
 . if ${OSVERSION} >= 700043
 PLATFORM=	freebsd70x86
 . else
 IGNORE=		unsupported OS release, sorry
 . endif
 
 .else
 IGNORE=		unsupported OS release, sorry
 .endif
 
 USERS=	p4admin
 GROUPS=	p4admin
 
 do-install:
 	${INSTALL_PROGRAM} ${_DISTDIR}/p4web ${STAGEDIR}${PREFIX}/sbin/
 
 post-install:
 	@${ECHO_CMD} "@exec ${TOUCH} ${P4LOG}" >> ${TMPPLIST}
 	@${ECHO_CMD} "@exec ${CHOWN} p4admin:p4admin ${P4LOG}" >> ${TMPPLIST}
 	@${ECHO_CMD} "@exec ${CHMOD} 640 ${P4LOG}" >> ${TMPPLIST}
 
 .include <bsd.port.post.mk>
Index: branches/2015Q2/sysutils/bashburn/Makefile
===================================================================
--- branches/2015Q2/sysutils/bashburn/Makefile	(revision 383523)
+++ branches/2015Q2/sysutils/bashburn/Makefile	(revision 383524)
@@ -1,57 +1,59 @@
 # Created by: Martin Tournoij <carpetsmoker@xs4all.nl>
 # $FreeBSD$
 
 PORTNAME=	bashburn
 PORTVERSION=	3.1.0
 CATEGORIES=	sysutils
 MASTER_SITES=	http://bashburn.dose.se/
 DISTNAME=	'index.php?s=file_download&id=25'
 EXTRACT_SUFX=
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	CD burning bash script
 
 LICENSE=	GPLv2
 
+BROKEN=		No public distfiles
+
 RUN_DEPENDS=	${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash \
 		cdrecord:${PORTSDIR}/sysutils/cdrtools
 
 WRKSRC=		${WRKDIR}/BashBurn-${PORTVERSION}
 
 NO_BUILD=	yes
 
 USES=		shebangfix
 SHEBANG_FILES=	BashBurn.sh
 
 OPTIONS_DEFINE=	CDRDAO DVDTOOLS EJECT FLAC LAME MPG123 NORMALIZE SUDO VORBIS DOCS
 OPTIONS_DEFAULT=	CDRDAO DVDTOOLS EJECT FLAC LAME MPG123 NORMALIZE SUDO VORBIS
 CDRDAO_DESC=	Disk-At-Once Recording
 DVDTOOLS_DESC=	Frontend to master DVD media
 EJECT_DESC=	Ejecting the CD/DVD drive
 NORMALIZE_DESC=	An audio file volume normalizer
 SUDO_DESC=	To allow non-privileged users to burn CD's
 
 CDRDAO_RUN_DEPENDS=	cdrdao:${PORTSDIR}/sysutils/cdrdao
 DVDTOOLS_RUN_DEPENDS=	dvd+rw-mediainfo:${PORTSDIR}/sysutils/dvd+rw-tools
 EJECT_RUN_DEPENDS=	eject:${PORTSDIR}/sysutils/eject
 FLAC_RUN_DEPENDS=	flac:${PORTSDIR}/audio/flac
 LAME_RUN_DEPENDS=	lame:${PORTSDIR}/audio/lame
 MPG123_RUN_DEPENDS=	mpg123:${PORTSDIR}/audio/mpg123
 NORMALIZE_RUN_DEPENDS=	normalize:${PORTSDIR}/audio/normalize
 SUDO_RUN_DEPENDS=	sudo:${PORTSDIR}/security/sudo
 VORBIS_RUN_DEPENDS=	ogg123:${PORTSDIR}/audio/vorbis-tools
 
 post-patch:
 	@${REINPLACE_CMD} 's|@@BBROOTDIR@@|${DATADIR}|' \
 		${WRKSRC}/BashBurn.sh
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/BashBurn.sh ${STAGEDIR}${PREFIX}/bin/bashburn
 .for dir in burning config convert func lang menus misc
 	@cd ${WRKSRC}/${dir} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/${dir}
 .endfor
 	@cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} "! -name COPYING"
 	${INSTALL_MAN} ${WRKSRC}/bashburn_man/bashburn.1 ${STAGEDIR}${MANPREFIX}/man/man1
 
 .include <bsd.port.mk>
Index: branches/2015Q2
===================================================================
--- branches/2015Q2	(revision 383523)
+++ branches/2015Q2	(revision 383524)

Property changes on: branches/2015Q2
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r383523