svn commit: r374068 - in branches/2014Q4/www/wordpress: . files

[Sunpoet Po-Chuan Hsieh]

Author: sunpoet
Date: Fri Dec  5 18:01:08 2014
New Revision: 374068
URL: https://svnweb.freebsd.org/changeset/ports/374068
QAT: https://qat.redports.org/buildarchive/r374068/

Log:
  MFH: r373917
  
  - Update to 4.0.1
  - Update CONFLICTS_INSTALL
  - Update PKGMESSAGE
  
  Changes:	https://wordpress.org/news/2014/11/wordpress-4-0-1/
  PR:		ports/195355
  Submitted by:	sunpoet (myself)
  Approved by:	Yuan-Chung Hsiao <ychsiao at ychsiao.org> (maintainer)
  
  Approved by:	ports-secteam (delphij)

Modified:
  branches/2014Q4/www/wordpress/Makefile
  branches/2014Q4/www/wordpress/distinfo
  branches/2014Q4/www/wordpress/files/pkg-message.in
Directory Properties:
  branches/2014Q4/   (props changed)

Modified: branches/2014Q4/www/wordpress/Makefile
==============================================================================
--- branches/2014Q4/www/wordpress/Makefile	Fri Dec  5 17:59:11 2014	(r374067)
+++ branches/2014Q4/www/wordpress/Makefile	Fri Dec  5 18:01:08 2014	(r374068)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	wordpress
-PORTVERSION=	4.0
-PORTREVISION=	1
+PORTVERSION=	4.0.1
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	http://wordpress.org/
@@ -13,7 +12,7 @@ COMMENT=	State-of-the-art semantic perso
 
 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
@@ -40,7 +39,6 @@ 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} \

Modified: branches/2014Q4/www/wordpress/distinfo
==============================================================================
--- branches/2014Q4/www/wordpress/distinfo	Fri Dec  5 17:59:11 2014	(r374067)
+++ branches/2014Q4/www/wordpress/distinfo	Fri Dec  5 18:01:08 2014	(r374068)
@@ -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

Modified: branches/2014Q4/www/wordpress/files/pkg-message.in
==============================================================================
--- branches/2014Q4/www/wordpress/files/pkg-message.in	Fri Dec  5 17:59:11 2014	(r374067)
+++ branches/2014Q4/www/wordpress/files/pkg-message.in	Fri Dec  5 18:01:08 2014	(r374068)
@@ -2,5 +2,5 @@
 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