Index: head/www/zenphoto/Makefile
===================================================================
--- head/www/zenphoto/Makefile	(revision 345866)
+++ head/www/zenphoto/Makefile	(revision 345867)
@@ -1,54 +1,53 @@
 # Created by: Philippe Audeoud <jadawin@tuxaco.net>
 # $FreeBSD$
 
 PORTNAME=	zenphoto
 PORTVERSION=	1.4.5.9
 PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/archive/
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Simpler web photo gallery
 
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
 NO_BUILD=	yes
 USE_PHP=	gd gettext json mbstring mysql pcre session
 WANT_PHP_WEB=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTNAME}-${PORTVERSION}
 
 PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 PKGMESSAGE=	${WRKDIR}/pkg-message
-SUB_FILES=	pkg-message pkg-deinstall
-SUB_LIST=	PORTNAME=${PORTNAME}
+SUB_FILES=	pkg-deinstall pkg-message
 
 post-extract:
 	@${MKDIR} ${WRKSRC}/cache/
 	@${FIND} ${WRKSRC} -name .gitignore -delete
 	@${FIND} -s ${WRKSRC}/ -type d -empty | ${XARGS} -I % ${TOUCH} %/.keepme
 	@${RM} ${WRKSRC}/doc_files/Zenphoto\ license.txt ${WRKSRC}/doc_files/README.html ${WRKSRC}/zp-core/Zenphoto.package
 
 do-install:
 	${MKDIR} ${STAGEDIR}${WWWDIR}/
 	cd ${WRKSRC}/ && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}/
 
 # maintainer section:
 
 MS_DIRRMTRY=	albums cache themes zp-core
 MS_PLIST=	${WRKDIR}/.ms-pkg-plist
 
 genplist: do-clean extract
-	${ECHO} "@owner www" > ${MS_PLIST}
-	${ECHO} "@group www" >> ${MS_PLIST}
+	${ECHO} '@owner www' > ${MS_PLIST}
+	${ECHO} '@group www' >> ${MS_PLIST}
 	cd ${WRKSRC}/ && ${FIND} -s * -type f | ${SED} 's|^|%%WWWDIR%%/|' >> ${MS_PLIST}
 	cd ${WRKSRC}/ && ${FIND} -s * -type d | ${TAIL} -r | ${SED} 's|^|@dirrm %%WWWDIR%%/|' >> ${MS_PLIST}
 	${ECHO} '@dirrmtry %%WWWDIR%%' >> ${MS_PLIST}
-	${ECHO} "@owner" >> ${MS_PLIST}
-	${ECHO} "@group" >> ${MS_PLIST}
+	${ECHO} '@owner' >> ${MS_PLIST}
+	${ECHO} '@group' >> ${MS_PLIST}
 .for dir in ${MS_DIRRMTRY}
 	${REINPLACE_CMD} '/^@dirrm %%WWWDIR%%\/${dir:C/\//\\\//g}$$/ s|@dirrm|&try|' ${MS_PLIST}
 .endfor
 	${INSTALL} -m 600 ${MS_PLIST} ${PLIST}
 
 .include <bsd.port.mk>
Index: head/www/zenphoto/files/pkg-message.in
===================================================================
--- head/www/zenphoto/files/pkg-message.in	(revision 345866)
+++ head/www/zenphoto/files/pkg-message.in	(revision 345867)
@@ -1,27 +1,27 @@
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-Browse http://your.host.tld/%%PORTNAME%%/ to configure your gallery
+Browse http://your.host.tld/zenphoto/ to configure your gallery
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 To make zenphoto available through your web site, I suggest
 that you add something like the following to httpd.conf:
 
     Alias /zenphoto/ "%%WWWDIR%%/"
 
     <Directory "%%WWWDIR%%/">
         Options none
         AllowOverride Limit
         Order Deny,Allow
         Allow from all
     </Directory>
 
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 Zenphoto 1.4 - Important Notes
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 This release includes some major internal restructuring of the object model.
 This also involves the Zenpage plugin whose categories are now objects like the
 articles and pages already were.
 
 Additionally the root RSS files have been removed which results in new links to
 call the RSS feeds. Although we have added htaccess redirection so the links
 should not break (given you have mod_rewrite of course) you should inform your
 subscribers about the new links. The same applies to the sitemap-extended
 plugin.