Index: branches/2015Q2/www/coppermine/Makefile
===================================================================
--- branches/2015Q2/www/coppermine/Makefile	(revision 385793)
+++ branches/2015Q2/www/coppermine/Makefile	(revision 385794)
@@ -1,49 +1,49 @@
 # $FreeBSD$
 
 PORTNAME=	coppermine
-PORTVERSION=	1.5.34
+PORTVERSION=	1.5.36
 CATEGORIES=	www
 MASTER_SITES=	SF/${PORTNAME}/Coppermine/1.5.x/
 DISTNAME=	cpg${PORTVERSION}
 
 MAINTAINER=	danilo@FreeBSD.org
 COMMENT=	Web picture gallery script
 
 LICENSE=	GPLv3
 
 OPTIONS_DEFINE=	DOCS IMAGEMAGICK
 IMAGEMAGICK_DESC=	Use ImageMagick instead of PHP GD extension
 
 IMAGEMAGICK_RUN_DEPENDS+=	convert:${PORTSDIR}/graphics/ImageMagick
 
 USE_PHP=	mysql pcre ctype
 USES=		zip
 
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/cpg${PORTVERSION:R:R}${PORTVERSION:R:E}x
 DOCFILES=	CHANGELOG.txt COPYING.txt README.txt
 
 SUB_FILES+=	pkg-message
 
 .include <bsd.port.options.mk>
 
 .if empty(PORT_OPTIONS:MIMAGEMAGICK)
 USE_PHP+=	gd
 .endif
 
 pre-everything::
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "By default, coppermine depends on PHP with GD support."
 	@${ECHO_MSG} "You may select IMAGEMAGICK to depend on ImageMagick instead of GD."
 	@${ECHO_MSG} ""
 
 post-extract:
 	@${CHMOD} -R o-w ${WRKSRC}/
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCFILES} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/ && ${RM} ${DOCFILES}
 	cd ${WRKSRC}/ && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}/
 
 .include <bsd.port.mk>
Index: branches/2015Q2/www/coppermine/distinfo
===================================================================
--- branches/2015Q2/www/coppermine/distinfo	(revision 385793)
+++ branches/2015Q2/www/coppermine/distinfo	(revision 385794)
@@ -1,2 +1,2 @@
-SHA256 (cpg1.5.34.zip) = 145041da2935bbe1b7eaa449922afbf151920ccc861fc69f389000eeb06b9101
-SIZE (cpg1.5.34.zip) = 18996844
+SHA256 (cpg1.5.36.zip) = 227e013dceffdaf6e9eebfff40f0dc83bae323e468cc3edcb5af5706ccd4b55d
+SIZE (cpg1.5.36.zip) = 18998760
Index: branches/2015Q2
===================================================================
--- branches/2015Q2	(revision 385793)
+++ branches/2015Q2	(revision 385794)

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