Index: branches/2015Q2/japanese/wordpress/Makefile
===================================================================
--- branches/2015Q2/japanese/wordpress/Makefile	(revision 386554)
+++ branches/2015Q2/japanese/wordpress/Makefile	(revision 386555)
@@ -1,55 +1,55 @@
 # Created by: Takefu
 # $FreeBSD$
 
 PORTNAME=	wordpress
-PORTVERSION=	4.1
+PORTVERSION=	4.2.2
+DISTVERSIONSUFFIX=	-ja
 CATEGORIES=	japanese www
 MASTER_SITES=	http://ja.wordpress.org/
-DISTNAME=	${PORTNAME}-${PORTVERSION}-ja
 
 MAINTAINER=	joehorn@gmail.com
 COMMENT=	State-of-the-art semantic personal publishing platform
 
 LICENSE=	GPLv2
 
 CONFLICTS_INSTALL=	wordpress-[0-9].* de-wordpress-[0-9].* ru-wordpress-[0-9].*
 
 NO_BUILD=	yes
 USES=		cpe
 USE_PHP=	curl gd mysql pcre tokenizer xml zip zlib
 WANT_PHP_WEB=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 CPE_LANG=	ja
 .if ${PORTVERSION:N*.*.*}
 CPE_VERSION=	${PORTVERSION}.0
 .endif
 
 SUB_FILES=	pkg-message
 PLIST=		${WRKDIR}/pkg-plist
 PORTDOCS=	license.txt readme.html
 
 OPTIONS_DEFINE=	DOCS
 
 pre-everything::
 	@${ECHO_CMD} "If you want to upgrade, you must read upgrade document."
 	@${ECHO_CMD} ""
 	@sleep 1
 
 pre-install:
 	${ECHO_CMD} '@owner www' > ${PLIST}
 	${ECHO_CMD} '@group www' >> ${PLIST}
 	cd ${WRKSRC}/ && ${FIND} -s * -type f | ${SED} -e 's|^|%%WWWDIR%%/|' >> ${PLIST}
 	${ECHO_CMD} '@owner' >> ${PLIST}
 	${ECHO_CMD} '@group' >> ${PLIST}
 	if [ ! -f ${WRKSRC}/wp-config-sample.php ]; then ${CP} \
 		${WRKSRC}/wp-config.php.sample ${WRKSRC}/wp-config.php; fi
 
 do-install:
 	${INSTALL} -d -m 755 ${STAGEDIR}${WWWDIR}/
 	${CP} -R ${WRKSRC}/ ${STAGEDIR}${WWWDIR}/
 	${FIND} ${STAGEDIR}${WWWDIR}/ -type d -exec ${CHMOD} g+w '{}' \;
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/
 	cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>
Index: branches/2015Q2/japanese/wordpress/distinfo
===================================================================
--- branches/2015Q2/japanese/wordpress/distinfo	(revision 386554)
+++ branches/2015Q2/japanese/wordpress/distinfo	(revision 386555)
@@ -1,2 +1,2 @@
-SHA256 (wordpress-4.1-ja.tar.gz) = 07e89c373e102f55fb451f80b2dff384a6ad2a506b6fd021e9ea0d5bcea0a655
-SIZE (wordpress-4.1-ja.tar.gz) = 6620693
+SHA256 (wordpress-4.2.2-ja.tar.gz) = 7e34ba580aed16c4fd769f033b0e7fa79b7c5813ba52e4496f14da0ac4451373
+SIZE (wordpress-4.2.2-ja.tar.gz) = 6773205
Index: branches/2015Q2
===================================================================
--- branches/2015Q2	(revision 386554)
+++ branches/2015Q2	(revision 386555)

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