Index: branches/2014Q4/www/wordpress/Makefile
===================================================================
--- branches/2014Q4/www/wordpress/Makefile	(revision 374067)
+++ branches/2014Q4/www/wordpress/Makefile	(revision 374068)
@@ -1,56 +1,54 @@
 # Created by: Elvis Chiang <elvis@sslab.cs.ccu.edu.tw>
 # $FreeBSD$
 
 PORTNAME=	wordpress
-PORTVERSION=	4.0
-PORTREVISION=	1
+PORTVERSION=	4.0.1
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	http://wordpress.org/
 
 MAINTAINER=	ychsiao@ychsiao.org
 COMMENT=	State-of-the-art semantic personal publishing platform
 
 LICENSE=	GPLv2
 
-CONFLICTS_INSTALL=	de-wordpress-3.* ja-wordpress-3.* ru-wordpress-3.*
+CONFLICTS_INSTALL=	de-wordpress-[0-9].* ja-wordpress-[0-9].* ru-wordpress-[0-9].*
 
 NO_BUILD=	yes
 USES=		cpe
 USE_PHP=	curl gd hash mysql pcre tokenizer xml zip zlib
 WANT_PHP_WEB=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 .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}
-	cd ${WRKSRC}/ && ${FIND} -d . -type d | ${SED} -e 's|^\.|@dirrm %%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/2014Q4/www/wordpress/distinfo
===================================================================
--- branches/2014Q4/www/wordpress/distinfo	(revision 374067)
+++ branches/2014Q4/www/wordpress/distinfo	(revision 374068)
@@ -1,2 +1,2 @@
-SHA256 (wordpress-4.0.tar.gz) = 03a8437ca9ae14c9a7f6d4062672e9685d45e1aaad6c020af2673cb42a34c0ac
-SIZE (wordpress-4.0.tar.gz) = 6051082
+SHA256 (wordpress-4.0.1.tar.gz) = 94ce5402f6ab5662c37916825f7725c517f6f9328ff3de7aaf2840551ac32f16
+SIZE (wordpress-4.0.1.tar.gz) = 6054753
Index: branches/2014Q4/www/wordpress/files/pkg-message.in
===================================================================
--- branches/2014Q4/www/wordpress/files/pkg-message.in	(revision 374067)
+++ branches/2014Q4/www/wordpress/files/pkg-message.in	(revision 374068)
@@ -1,6 +1,6 @@
                   **** NOTE ****
 Before the first use of WordPress, copy wp-config-sample.php to wp-config.php
 in %%WWWDIR%% and modify it to fit your MySQL.
 Maybe you need 'mysqladmin create wordpress' first.
-If you are upgrading from 1.x or 2.x to 3.x, please run
-http://your.site/wordpress/wp-admin/upgrade.php to upgrade to WordPress 3.x
+If you are upgrading from 1.x or 2.x or 3.x to 4.x, please run
+http://your.site/wordpress/wp-admin/upgrade.php to upgrade to WordPress 4.x
Index: branches/2014Q4
===================================================================
--- branches/2014Q4	(revision 374067)
+++ branches/2014Q4	(revision 374068)

Property changes on: branches/2014Q4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r373917