- update to 1.5

- according to ports/76602, submitter now become maintainer

PR:		ports/77659
Submitted by:	Yuan-Chung Hsiao (maintainer)

4 files changed, 21 insertions, 170 deletions

diff --git a/www/wordpress/Makefile b/www/wordpress/Makefile
index 25d0521d63c2..2b3c2d31ea8b 100644
--- a/www/wordpress/Makefile
+++ b/www/wordpress/Makefile
@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	wordpress
-PORTVERSION=	1.2.2
+PORTVERSION=	1.5
 CATEGORIES=	www
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
-		http://www.tobez.org/download/port-mirrors/www/wordpress/
+MASTER_SITES=	ftp://ftp.stu.edu.tw/pub/wordpress/
 MASTER_SITE_SUBDIR=	cafelog
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	ychsiao@ychsiao.org
 COMMENT=	A state-of-the-art semantic personal publishing platform
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
@@ -23,11 +22,19 @@ NO_BUILD=	YES
 WANT_PHP_WEB=	YES
 WORDPRESS?=	www/data-dist/wordpress
 PLIST_SUB+=	WORDPRESS=${WORDPRESS}
+PLIST=		${WRKDIR}/pkg-plist
 
 .if !defined(NOPORTDOCS)
 PORTDOCS=	license.txt readme.html
 .endif
 
+pre-install:
+	cd ${WRKSRC} && ${FIND} -s * -type f | \
+		${SED} -e 's|^|${WORDPRESS}/|' > ${PLIST} \
+		&& ${FIND} -d * -type d | \
+		${SED} -e 's|^|@dirrm ${WORDPRESS}/|' >> ${PLIST} \
+		&& ${ECHO_CMD} @dirrm ${WORDPRESS} >> ${PLIST}
+
 do-install:
 	-${MKDIR} ${PREFIX}/${WORDPRESS}
 	@${CHOWN} www:www ${PREFIX}/${WORDPRESS}
@@ -41,12 +48,6 @@ do-install:
 .endif
 
 post-install:
-	@${ECHO_MSG}
-	@${ECHO_MSG} "          **** NOTE ****"
-	@${ECHO_MSG} "Before the first use of WordPress, copy wp-config-sample.php to wp-config.php"
-	@${ECHO_MSG} "in ${PREFIX}/${WORDPRESS}"
-	@${ECHO_MSG} "And Modify it to fit your MySQL."
-	@${ECHO_MSG} "Maybe you need 'mysqladmin create wordpress' first"
-	@${ECHO_MSG}
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/www/wordpress/distinfo b/www/wordpress/distinfo
index 9262b971bf83..6759035c9319 100644
--- a/www/wordpress/distinfo
+++ b/www/wordpress/distinfo
@@ -1,2 +1,2 @@
-MD5 (wordpress-1.2.2.tar.gz) = f93edddd547a06cc0fa2a7264b64fdf6
-SIZE (wordpress-1.2.2.tar.gz) = 250794
+MD5 (wordpress-1.5.tar.gz) = df6dc18a7a0d93fa6bb187eb48b41612
+SIZE (wordpress-1.5.tar.gz) = 280251
diff --git a/www/wordpress/pkg-message b/www/wordpress/pkg-message
new file mode 100644
index 000000000000..b34f38bb3896
--- /dev/null
+++ b/www/wordpress/pkg-message
@@ -0,0 +1,6 @@
+
+                  **** NOTE ****
+        Before the first use of WordPress, copy wp-config-sample.php to wp-config.php
+        in ${PREFIX}/${WORDPRESS}
+        And Modify it to fit your MySQL.
+        Maybe you need 'mysqladmin create wordpress' first
diff --git a/www/wordpress/pkg-plist b/www/wordpress/pkg-plist
index 984171d89dae..d0ac09258d04 100644
--- a/www/wordpress/pkg-plist
+++ b/www/wordpress/pkg-plist
@@ -1,157 +1 @@
-@comment $FreeBSD$
-%%WORDPRESS%%/wp-content/plugins/google-hilite.php
-%%WORDPRESS%%/wp-content/plugins/hello.php
-%%WORDPRESS%%/wp-content/plugins/markdown.php
-%%WORDPRESS%%/wp-content/plugins/textile1.php
-%%WORDPRESS%%/wp-content/plugins/textile2.php
-%%WORDPRESS%%/wp-content/link-update-cache.xml
-%%WORDPRESS%%/wp-content/links-update-cache.xml
-%%WORDPRESS%%/wp-admin/wp-admin.css
-%%WORDPRESS%%/wp-admin/admin-functions.php
-%%WORDPRESS%%/wp-admin/admin-header.php
-%%WORDPRESS%%/wp-admin/auth.php
-%%WORDPRESS%%/wp-admin/bookmarklet.php
-%%WORDPRESS%%/wp-admin/categories.php
-%%WORDPRESS%%/wp-admin/edit-comments.php
-%%WORDPRESS%%/wp-admin/edit-form-advanced.php
-%%WORDPRESS%%/wp-admin/edit-form-comment.php
-%%WORDPRESS%%/wp-admin/edit-form.php
-%%WORDPRESS%%/wp-admin/edit.php
-%%WORDPRESS%%/wp-admin/import-b2.php
-%%WORDPRESS%%/wp-admin/import-blogger.php
-%%WORDPRESS%%/wp-admin/import-greymatter.php
-%%WORDPRESS%%/wp-admin/import-livejournal.php
-%%WORDPRESS%%/wp-admin/import-mt.php
-%%WORDPRESS%%/wp-admin/import-rss.php
-%%WORDPRESS%%/wp-admin/import-textpattern.php
-%%WORDPRESS%%/wp-admin/index.php
-%%WORDPRESS%%/wp-admin/install-helper.php
-%%WORDPRESS%%/wp-admin/install.php
-%%WORDPRESS%%/wp-admin/link-add.php
-%%WORDPRESS%%/wp-admin/link-categories.php
-%%WORDPRESS%%/wp-admin/link-import.php
-%%WORDPRESS%%/wp-admin/link-manager.php
-%%WORDPRESS%%/wp-admin/link-parse-opml.php
-%%WORDPRESS%%/wp-admin/menu.php
-%%WORDPRESS%%/wp-admin/moderation.php
-%%WORDPRESS%%/wp-admin/optionhandler.php
-%%WORDPRESS%%/wp-admin/options-discussion.php
-%%WORDPRESS%%/wp-admin/options-general.php
-%%WORDPRESS%%/wp-admin/options-head.php
-%%WORDPRESS%%/wp-admin/options-misc.php
-%%WORDPRESS%%/wp-admin/options-permalink.php
-%%WORDPRESS%%/wp-admin/options-reading.php
-%%WORDPRESS%%/wp-admin/options-writing.php
-%%WORDPRESS%%/wp-admin/options.php
-%%WORDPRESS%%/wp-admin/plugins.php
-%%WORDPRESS%%/wp-admin/post.php
-%%WORDPRESS%%/wp-admin/profile.php
-%%WORDPRESS%%/wp-admin/quicktags.js
-%%WORDPRESS%%/wp-admin/quicktags.php
-%%WORDPRESS%%/wp-admin/setup-config.php
-%%WORDPRESS%%/wp-admin/sidebar.php
-%%WORDPRESS%%/wp-admin/templates.php
-%%WORDPRESS%%/wp-admin/upgrade-functions.php
-%%WORDPRESS%%/wp-admin/upgrade.php
-%%WORDPRESS%%/wp-admin/upload.php
-%%WORDPRESS%%/wp-admin/users.php
-%%WORDPRESS%%/wp-admin/admin-footer.php
-%%WORDPRESS%%/wp-images/links/tick.png
-%%WORDPRESS%%/wp-images/links/rating-1.gif
-%%WORDPRESS%%/wp-images/links/rating-2.gif
-%%WORDPRESS%%/wp-images/links/rating-3.gif
-%%WORDPRESS%%/wp-images/links/rating-4.gif
-%%WORDPRESS%%/wp-images/links/rating-5.gif
-%%WORDPRESS%%/wp-images/links/rating-6.gif
-%%WORDPRESS%%/wp-images/links/rating-7.gif
-%%WORDPRESS%%/wp-images/links/rating-8.gif
-%%WORDPRESS%%/wp-images/links/rating-9.gif
-%%WORDPRESS%%/wp-images/links/star.gif
-%%WORDPRESS%%/wp-images/links/rating-0.gif
-%%WORDPRESS%%/wp-images/smilies/icon_wink.gif
-%%WORDPRESS%%/wp-images/smilies/icon_biggrin.gif
-%%WORDPRESS%%/wp-images/smilies/icon_confused.gif
-%%WORDPRESS%%/wp-images/smilies/icon_cool.gif
-%%WORDPRESS%%/wp-images/smilies/icon_cry.gif
-%%WORDPRESS%%/wp-images/smilies/icon_eek.gif
-%%WORDPRESS%%/wp-images/smilies/icon_evil.gif
-%%WORDPRESS%%/wp-images/smilies/icon_exclaim.gif
-%%WORDPRESS%%/wp-images/smilies/icon_idea.gif
-%%WORDPRESS%%/wp-images/smilies/icon_lol.gif
-%%WORDPRESS%%/wp-images/smilies/icon_mad.gif
-%%WORDPRESS%%/wp-images/smilies/icon_mrgreen.gif
-%%WORDPRESS%%/wp-images/smilies/icon_neutral.gif
-%%WORDPRESS%%/wp-images/smilies/icon_question.gif
-%%WORDPRESS%%/wp-images/smilies/icon_razz.gif
-%%WORDPRESS%%/wp-images/smilies/icon_redface.gif
-%%WORDPRESS%%/wp-images/smilies/icon_rolleyes.gif
-%%WORDPRESS%%/wp-images/smilies/icon_sad.gif
-%%WORDPRESS%%/wp-images/smilies/icon_smile.gif
-%%WORDPRESS%%/wp-images/smilies/icon_surprised.gif
-%%WORDPRESS%%/wp-images/smilies/icon_twisted.gif
-%%WORDPRESS%%/wp-images/smilies/icon_arrow.gif
-%%WORDPRESS%%/wp-images/header-shadow.png
-%%WORDPRESS%%/wp-images/wp-favicon.png
-%%WORDPRESS%%/wp-images/wp-small.png
-%%WORDPRESS%%/wp-images/wpminilogo.png
-%%WORDPRESS%%/wp-images/xml.gif
-%%WORDPRESS%%/wp-images/fade-butt.png
-%%WORDPRESS%%/wp-includes/wp-l10n.php
-%%WORDPRESS%%/wp-includes/class-smarty.php
-%%WORDPRESS%%/wp-includes/class-xmlrpc.php
-%%WORDPRESS%%/wp-includes/class-xmlrpcs.php
-%%WORDPRESS%%/wp-includes/functions-formatting.php
-%%WORDPRESS%%/wp-includes/functions.php
-%%WORDPRESS%%/wp-includes/gettext.php
-%%WORDPRESS%%/wp-includes/kses.php
-%%WORDPRESS%%/wp-includes/links-update-xml.php
-%%WORDPRESS%%/wp-includes/links.php
-%%WORDPRESS%%/wp-includes/locale.php
-%%WORDPRESS%%/wp-includes/streams.php
-%%WORDPRESS%%/wp-includes/template-functions-author.php
-%%WORDPRESS%%/wp-includes/template-functions-category.php
-%%WORDPRESS%%/wp-includes/template-functions-comment.php
-%%WORDPRESS%%/wp-includes/template-functions-general.php
-%%WORDPRESS%%/wp-includes/vars.php
-%%WORDPRESS%%/wp-includes/template-functions-geo.php
-%%WORDPRESS%%/wp-includes/template-functions-links.php
-%%WORDPRESS%%/wp-includes/template-functions-post.php
-%%WORDPRESS%%/wp-includes/template-functions.php
-%%WORDPRESS%%/wp-includes/version.php
-%%WORDPRESS%%/wp-includes/wp-db.php
-%%WORDPRESS%%/wp-includes/class-pop3.php
-%%WORDPRESS%%/index.php
-%%WORDPRESS%%/wp-atom.php
-%%WORDPRESS%%/wp-blog-header.php
-%%WORDPRESS%%/wp-comments-popup.php
-%%WORDPRESS%%/wp-comments-post.php
-%%WORDPRESS%%/wp-comments-reply.php
-%%WORDPRESS%%/wp-comments.php
-%%WORDPRESS%%/wp-commentsrss2.php
-%%WORDPRESS%%/wp-config-sample.php
-%%WORDPRESS%%/wp-feed.php
-%%WORDPRESS%%/wp-layout.css
-%%WORDPRESS%%/wp-links-opml.php
-%%WORDPRESS%%/wp-locations.php
-%%WORDPRESS%%/wp-login.php
-%%WORDPRESS%%/wp-mail.php
-%%WORDPRESS%%/wp.php
-%%WORDPRESS%%/wp-pass.php
-%%WORDPRESS%%/wp-rdf.php
-%%WORDPRESS%%/wp-register.php
-%%WORDPRESS%%/wp-rss.php
-%%WORDPRESS%%/wp-rss2.php
-%%WORDPRESS%%/wp-settings.php
-%%WORDPRESS%%/wp-trackback.php
-%%WORDPRESS%%/print.css
-%%WORDPRESS%%/xmlrpc.php
-%%WORDPRESS%%/license.txt
-%%WORDPRESS%%/readme.html
-@dirrm %%WORDPRESS%%/wp-admin
-@dirrm %%WORDPRESS%%/wp-content/plugins
-@dirrm %%WORDPRESS%%/wp-content
-@dirrm %%WORDPRESS%%/wp-images/links
-@dirrm %%WORDPRESS%%/wp-images/smilies
-@dirrm %%WORDPRESS%%/wp-images
-@dirrm %%WORDPRESS%%/wp-includes
-@unexec rmdir %D/%%WORDPRESS%% 2>/dev/null || true
+@comment real PLIST will be generated in pre-install phase