- Update to 4.0.5

- USE WWWDIR
- USE SUB_DIR

Approved by:	maintainer implicit

4 files changed, 128 insertions, 113 deletions

diff --git a/www/textpattern/Makefile b/www/textpattern/Makefile
index cd2774af094b..03ab5a6d953c 100644
--- a/www/textpattern/Makefile
+++ b/www/textpattern/Makefile
@@ -6,24 +6,28 @@
 #
 
 PORTNAME=	textpattern
-PORTVERSION=	4.0.4
+PORTVERSION=	4.0.5
 CATEGORIES=	www
-MASTER_SITES=	http://www.farrokhi.net/distfiles/
+MASTER_SITES=	http://textpattern.com/file_download/37/
 
 MAINTAINER=	farrokhi@FreeBSD.org
 COMMENT=	A free, flexible, elegant, easy-to-use content management system
 
 NO_BUILD=	YES
 WANT_PHP_WEB=	YES
-TEXTPATTERN?=	www/${PORTNAME}
-PLIST_SUB+=	TEXTPATTERN=${TEXTPATTERN}
 USE_PHP=	mbstring xml mysql
 
-do-install:
-	-${MKDIR} ${PREFIX}/${TEXTPATTERN}
-	@(cd ${WRKSRC} && ${CP} -R * ${PREFIX}/${TEXTPATTERN}/ )
+SUB_FILES=	pkg-message
 
-post-install:
+do-install:
+	-${MKDIR} ${WWWDIR}
+	@${CP} -R ${WRKSRC}/ ${WWWDIR}/
 	@${CAT} ${PKGMESSAGE}
 
+create-plist:
+	@${FIND} -s ${WRKSRC}/${file} -not -type d \
+	| ${SED} -e 's,^${WRKSRC},%%WWWDIR%%,' > ${PLIST}
+	@${FIND} -ds ${WRKSRC}/${file} -type d \
+	| ${SED} -e 's,^${WRKSRC},@dirrm %%WWWDIR%%,' >> ${PLIST}
+
 .include <bsd.port.mk>
diff --git a/www/textpattern/distinfo b/www/textpattern/distinfo
index 68c83a61c5c8..46773773ea44 100644
--- a/www/textpattern/distinfo
+++ b/www/textpattern/distinfo
@@ -1,3 +1,3 @@
-MD5 (textpattern-4.0.4.tar.gz) = d182ecd7d7fc601a117bf7441bd18e30
-SHA256 (textpattern-4.0.4.tar.gz) = d3391e4ed19466940dcacf3a728b2a535e6740c9fe983fa0f6a8cdf5bc360e0f
-SIZE (textpattern-4.0.4.tar.gz) = 263671
+MD5 (textpattern-4.0.5.tar.gz) = 1759b05edb2654a033bb84ed0ccea2f6
+SHA256 (textpattern-4.0.5.tar.gz) = 67baf72408ab86984610972424425ab3f212099b757cfe44901d304e31d9d5de
+SIZE (textpattern-4.0.5.tar.gz) = 287817
diff --git a/www/textpattern/pkg-message b/www/textpattern/files/pkg-message.in
index 76833a3205ad..842929608b4f 100644
--- a/www/textpattern/pkg-message
+++ b/www/textpattern/files/pkg-message.in
@@ -1,10 +1,18 @@
 -----------------------------------------------------------
+textpattern has been installed into:
+
+    %%WWWDIR%%
+
+You will probably want to add an alias to your httpd.conf file,
+something like this:
+
+    Alias /textpattern "%%WWWDIR%%"
 
 For initial setup:
 
  - Setup an empty mysql database
  - Open web browser and browse textpattern directory
-     http://yourserver/subdir/textpattern/setup/
+     http://yourserver/textpattern/setup/
  - Follow steps on setup wizard
 
 -----------------------------------------------------------
diff --git a/www/textpattern/pkg-plist b/www/textpattern/pkg-plist
index b0743f98184d..6e7d80b595bf 100644
--- a/www/textpattern/pkg-plist
+++ b/www/textpattern/pkg-plist
@@ -1,101 +1,104 @@
-%%TEXTPATTERN%%/HISTORY.txt
-%%TEXTPATTERN%%/README.txt
-%%TEXTPATTERN%%/images/1.gif
-%%TEXTPATTERN%%/index.php
-%%TEXTPATTERN%%/textpattern/checksums.txt
-%%TEXTPATTERN%%/textpattern/config-dist.php
-%%TEXTPATTERN%%/textpattern/css.php
-%%TEXTPATTERN%%/textpattern/include/import/BloggerImportTemplate.txt
-%%TEXTPATTERN%%/textpattern/include/import/import_b2.php
-%%TEXTPATTERN%%/textpattern/include/import/import_blogger.php
-%%TEXTPATTERN%%/textpattern/include/import/import_mt.php
-%%TEXTPATTERN%%/textpattern/include/import/import_mtdb.php
-%%TEXTPATTERN%%/textpattern/include/import/import_wp.php
-%%TEXTPATTERN%%/textpattern/include/txp_admin.php
-%%TEXTPATTERN%%/textpattern/include/txp_article.php
-%%TEXTPATTERN%%/textpattern/include/txp_auth.php
-%%TEXTPATTERN%%/textpattern/include/txp_category.php
-%%TEXTPATTERN%%/textpattern/include/txp_css.php
-%%TEXTPATTERN%%/textpattern/include/txp_diag.php
-%%TEXTPATTERN%%/textpattern/include/txp_discuss.php
-%%TEXTPATTERN%%/textpattern/include/txp_file.php
-%%TEXTPATTERN%%/textpattern/include/txp_form.php
-%%TEXTPATTERN%%/textpattern/include/txp_image.php
-%%TEXTPATTERN%%/textpattern/include/txp_import.php
-%%TEXTPATTERN%%/textpattern/include/txp_link.php
-%%TEXTPATTERN%%/textpattern/include/txp_list.php
-%%TEXTPATTERN%%/textpattern/include/txp_log.php
-%%TEXTPATTERN%%/textpattern/include/txp_page.php
-%%TEXTPATTERN%%/textpattern/include/txp_plugin.php
-%%TEXTPATTERN%%/textpattern/include/txp_prefs.php
-%%TEXTPATTERN%%/textpattern/include/txp_preview.php
-%%TEXTPATTERN%%/textpattern/include/txp_section.php
-%%TEXTPATTERN%%/textpattern/include/txp_tag.php
-%%TEXTPATTERN%%/textpattern/index.php
-%%TEXTPATTERN%%/textpattern/lang/README
-%%TEXTPATTERN%%/textpattern/lang/en-gb.txt
-%%TEXTPATTERN%%/textpattern/lib/IXRClass.php
-%%TEXTPATTERN%%/textpattern/lib/admin_config.php
-%%TEXTPATTERN%%/textpattern/lib/class.thumb.php
-%%TEXTPATTERN%%/textpattern/lib/classTextile.php
-%%TEXTPATTERN%%/textpattern/lib/constants.php
-%%TEXTPATTERN%%/textpattern/lib/i18n-ascii.txt
-%%TEXTPATTERN%%/textpattern/lib/taglib.php
-%%TEXTPATTERN%%/textpattern/lib/txplib_db.php
-%%TEXTPATTERN%%/textpattern/lib/txplib_forms.php
-%%TEXTPATTERN%%/textpattern/lib/txplib_head.php
-%%TEXTPATTERN%%/textpattern/lib/txplib_html.php
-%%TEXTPATTERN%%/textpattern/lib/txplib_misc.php
-%%TEXTPATTERN%%/textpattern/lib/txplib_update.php
-%%TEXTPATTERN%%/textpattern/lib/txplib_wrapper.php
-%%TEXTPATTERN%%/textpattern/license.txt
-%%TEXTPATTERN%%/textpattern/publish.php
-%%TEXTPATTERN%%/textpattern/publish/atom.php
-%%TEXTPATTERN%%/textpattern/publish/comment.php
-%%TEXTPATTERN%%/textpattern/publish/log.php
-%%TEXTPATTERN%%/textpattern/publish/rss.php
-%%TEXTPATTERN%%/textpattern/publish/search.php
-%%TEXTPATTERN%%/textpattern/publish/taghandlers.php
-%%TEXTPATTERN%%/textpattern/setup/en-gb.php
-%%TEXTPATTERN%%/textpattern/setup/index.php
-%%TEXTPATTERN%%/textpattern/setup/setup-langs.php
-%%TEXTPATTERN%%/textpattern/setup/txpsql.php
-%%TEXTPATTERN%%/textpattern/textpattern.css
-%%TEXTPATTERN%%/textpattern/textpattern.js
-%%TEXTPATTERN%%/textpattern/txp_img/carver.gif
-%%TEXTPATTERN%%/textpattern/txp_img/down.gif
-%%TEXTPATTERN%%/textpattern/txp_img/down2.gif
-%%TEXTPATTERN%%/textpattern/txp_img/htmldown.gif
-%%TEXTPATTERN%%/textpattern/txp_img/htmlup.gif
-%%TEXTPATTERN%%/textpattern/txp_img/previewdown.gif
-%%TEXTPATTERN%%/textpattern/txp_img/previewup.gif
-%%TEXTPATTERN%%/textpattern/txp_img/tabs.gif
-%%TEXTPATTERN%%/textpattern/txp_img/tabshadow.gif
-%%TEXTPATTERN%%/textpattern/txp_img/textdown.gif
-%%TEXTPATTERN%%/textpattern/txp_img/textpattern.gif
-%%TEXTPATTERN%%/textpattern/txp_img/texttabshadow.gif
-%%TEXTPATTERN%%/textpattern/txp_img/textup.gif
-%%TEXTPATTERN%%/textpattern/txp_img/txp_slug105x45.gif
-%%TEXTPATTERN%%/textpattern/txp_img/txp_slug105x70.gif
-%%TEXTPATTERN%%/textpattern/txp_img/up.gif
-%%TEXTPATTERN%%/textpattern/txp_img/up2.gif
-%%TEXTPATTERN%%/textpattern/update/_to_1.0.0.php
-%%TEXTPATTERN%%/textpattern/update/_to_4.0.2.php
-%%TEXTPATTERN%%/textpattern/update/_to_4.0.3.php
-%%TEXTPATTERN%%/textpattern/update/_to_4.0.4.php
-%%TEXTPATTERN%%/textpattern/update/_update.php
-%%TEXTPATTERN%%/textpattern/update/index.html
-@dirrm %%TEXTPATTERN%%/textpattern/update
-@dirrm %%TEXTPATTERN%%/textpattern/txp_img
-@dirrm %%TEXTPATTERN%%/textpattern/tmp
-@dirrm %%TEXTPATTERN%%/textpattern/setup
-@dirrm %%TEXTPATTERN%%/textpattern/publish
-@dirrm %%TEXTPATTERN%%/textpattern/lib
-@dirrm %%TEXTPATTERN%%/textpattern/lang
-@dirrm %%TEXTPATTERN%%/textpattern/include/import
-@dirrm %%TEXTPATTERN%%/textpattern/include
-@dirrm %%TEXTPATTERN%%/textpattern
-@dirrm %%TEXTPATTERN%%/images
-@dirrm %%TEXTPATTERN%%/files
-@dirrm %%TEXTPATTERN%%
-@dirrmtry www/data-dist
+%%WWWDIR%%/.htaccess
+%%WWWDIR%%/HISTORY.txt
+%%WWWDIR%%/README.txt
+%%WWWDIR%%/images/1.gif
+%%WWWDIR%%/index.php
+%%WWWDIR%%/textpattern/checksums.txt
+%%WWWDIR%%/textpattern/config-dist.php
+%%WWWDIR%%/textpattern/css.php
+%%WWWDIR%%/textpattern/include/import/BloggerImportTemplate.txt
+%%WWWDIR%%/textpattern/include/import/import_b2.php
+%%WWWDIR%%/textpattern/include/import/import_blogger.php
+%%WWWDIR%%/textpattern/include/import/import_mt.php
+%%WWWDIR%%/textpattern/include/import/import_mtdb.php
+%%WWWDIR%%/textpattern/include/import/import_wp.php
+%%WWWDIR%%/textpattern/include/txp_admin.php
+%%WWWDIR%%/textpattern/include/txp_article.php
+%%WWWDIR%%/textpattern/include/txp_auth.php
+%%WWWDIR%%/textpattern/include/txp_category.php
+%%WWWDIR%%/textpattern/include/txp_css.php
+%%WWWDIR%%/textpattern/include/txp_diag.php
+%%WWWDIR%%/textpattern/include/txp_discuss.php
+%%WWWDIR%%/textpattern/include/txp_file.php
+%%WWWDIR%%/textpattern/include/txp_form.php
+%%WWWDIR%%/textpattern/include/txp_image.php
+%%WWWDIR%%/textpattern/include/txp_import.php
+%%WWWDIR%%/textpattern/include/txp_link.php
+%%WWWDIR%%/textpattern/include/txp_list.php
+%%WWWDIR%%/textpattern/include/txp_log.php
+%%WWWDIR%%/textpattern/include/txp_page.php
+%%WWWDIR%%/textpattern/include/txp_plugin.php
+%%WWWDIR%%/textpattern/include/txp_prefs.php
+%%WWWDIR%%/textpattern/include/txp_preview.php
+%%WWWDIR%%/textpattern/include/txp_section.php
+%%WWWDIR%%/textpattern/include/txp_tag.php
+%%WWWDIR%%/textpattern/index.php
+%%WWWDIR%%/textpattern/jquery.js
+%%WWWDIR%%/textpattern/lang/README
+%%WWWDIR%%/textpattern/lang/en-gb.txt
+%%WWWDIR%%/textpattern/lib/IXRClass.php
+%%WWWDIR%%/textpattern/lib/admin_config.php
+%%WWWDIR%%/textpattern/lib/class.thumb.php
+%%WWWDIR%%/textpattern/lib/classTextile.php
+%%WWWDIR%%/textpattern/lib/constants.php
+%%WWWDIR%%/textpattern/lib/i18n-ascii.txt
+%%WWWDIR%%/textpattern/lib/taglib.php
+%%WWWDIR%%/textpattern/lib/txplib_db.php
+%%WWWDIR%%/textpattern/lib/txplib_forms.php
+%%WWWDIR%%/textpattern/lib/txplib_head.php
+%%WWWDIR%%/textpattern/lib/txplib_html.php
+%%WWWDIR%%/textpattern/lib/txplib_misc.php
+%%WWWDIR%%/textpattern/lib/txplib_update.php
+%%WWWDIR%%/textpattern/lib/txplib_wrapper.php
+%%WWWDIR%%/textpattern/license.txt
+%%WWWDIR%%/textpattern/publish/atom.php
+%%WWWDIR%%/textpattern/publish/comment.php
+%%WWWDIR%%/textpattern/publish/log.php
+%%WWWDIR%%/textpattern/publish/rss.php
+%%WWWDIR%%/textpattern/publish/search.php
+%%WWWDIR%%/textpattern/publish/taghandlers.php
+%%WWWDIR%%/textpattern/publish.php
+%%WWWDIR%%/textpattern/setup/en-gb.php
+%%WWWDIR%%/textpattern/setup/index.php
+%%WWWDIR%%/textpattern/setup/setup-langs.php
+%%WWWDIR%%/textpattern/setup/txpsql.php
+%%WWWDIR%%/textpattern/textpattern.css
+%%WWWDIR%%/textpattern/textpattern.js
+%%WWWDIR%%/textpattern/txp_img/arrowupdn.gif
+%%WWWDIR%%/textpattern/txp_img/carver.gif
+%%WWWDIR%%/textpattern/txp_img/down.gif
+%%WWWDIR%%/textpattern/txp_img/down2.gif
+%%WWWDIR%%/textpattern/txp_img/htmldown.gif
+%%WWWDIR%%/textpattern/txp_img/htmlup.gif
+%%WWWDIR%%/textpattern/txp_img/previewdown.gif
+%%WWWDIR%%/textpattern/txp_img/previewup.gif
+%%WWWDIR%%/textpattern/txp_img/tabs.gif
+%%WWWDIR%%/textpattern/txp_img/tabshadow.gif
+%%WWWDIR%%/textpattern/txp_img/textdown.gif
+%%WWWDIR%%/textpattern/txp_img/textpattern.gif
+%%WWWDIR%%/textpattern/txp_img/texttabshadow.gif
+%%WWWDIR%%/textpattern/txp_img/textup.gif
+%%WWWDIR%%/textpattern/txp_img/txp_slug105x45.gif
+%%WWWDIR%%/textpattern/txp_img/txp_slug105x70.gif
+%%WWWDIR%%/textpattern/txp_img/up.gif
+%%WWWDIR%%/textpattern/txp_img/up2.gif
+%%WWWDIR%%/textpattern/update/_to_1.0.0.php
+%%WWWDIR%%/textpattern/update/_to_4.0.2.php
+%%WWWDIR%%/textpattern/update/_to_4.0.3.php
+%%WWWDIR%%/textpattern/update/_to_4.0.4.php
+%%WWWDIR%%/textpattern/update/_to_4.0.5.php
+%%WWWDIR%%/textpattern/update/_update.php
+%%WWWDIR%%/textpattern/update/index.html
+@dirrm %%WWWDIR%%/files
+@dirrm %%WWWDIR%%/images
+@dirrm %%WWWDIR%%/textpattern/include/import
+@dirrm %%WWWDIR%%/textpattern/include
+@dirrm %%WWWDIR%%/textpattern/lang
+@dirrm %%WWWDIR%%/textpattern/lib
+@dirrm %%WWWDIR%%/textpattern/publish
+@dirrm %%WWWDIR%%/textpattern/setup
+@dirrm %%WWWDIR%%/textpattern/tmp
+@dirrm %%WWWDIR%%/textpattern/txp_img
+@dirrm %%WWWDIR%%/textpattern/update
+@dirrm %%WWWDIR%%/textpattern
+@dirrmtry %%WWWDIR%%