- Update to 2.0.19

PR:		ports/92734
Submitted by:	maintainer

5 files changed, 37 insertions, 22 deletions

diff --git a/chinese/phpbb-tw/Makefile b/chinese/phpbb-tw/Makefile
index dbe048570fe4..f05ba884fbed 100644
--- a/chinese/phpbb-tw/Makefile
+++ b/chinese/phpbb-tw/Makefile
@@ -6,12 +6,10 @@
 #
 
 PORTNAME=	phpbb
-PORTVERSION=	2.0.18
+PORTVERSION=	2.0.19
 CATEGORIES=	chinese www
-MASTER_SITES=	ftp://bbs.ilc.edu.tw/chinsan/distfiles/ \
-		http://bbs.ilc.edu.tw/~chinsan/ports/phpbb/ \
-		ftp://news.giga.net.tw/chinsan/distfiles/ \
-		http://phpbb-tw.net/phpbb/download/
+MASTER_SITES=	http://chinsan2.twbbs.org/distfiles/ \
+		ftp://chinsan2.twbbs.org/distfiles/
 PKGNAMESUFFIX=	-tw
 DISTNAME=	phpBB-${PORTVERSION}
 
@@ -22,13 +20,18 @@ RUN_DEPENDS=	${LOCALBASE}/share/pear/System.php:${PORTSDIR}/devel/pear
 
 CONFLICTS=	phpbb-[0-9]*
 
-USE_ZIP=	yes
+# Get HOSTNAME
+.if exists(/sbin/sysctl)
+HOSTNAME!=	/sbin/sysctl -n kern.hostname
+.else
+HOSTNAME!=	/usr/sbin/sysctl -n kern.hostname
+.endif
 
 # The phpBB2 port supports a number of variables that may be tweaked at build
 # time.  Perform a "make options" to see more information on these variables.
 #
 WWWDOCROOT?=	www/data
-PHPBBURL?=	phpBB2
+PHPBB_URL?=	phpBB2
 WWWOWN?=	www
 WWWGRP?=	www
 #
@@ -40,7 +43,7 @@ WRKSRC=		${WRKDIR}/phpBB2
 NO_BUILD=	yes
 USE_REINPLACE=	yes
 SUB_FILES=	pkg-message
-SUB_LIST=	PHPBBURL="${PHPBBURL}" \
+SUB_LIST=	PHPBB_URL="${PHPBB_URL}" \
 		PHPBBDIR="${PHPBBDIR}" \
 		DELETEFILES="${EXCEPTFILES}"
 PHPBB_VER=	${PORTVERSION:S/.//g:S/.//g}
@@ -49,7 +52,7 @@ PLIST_SUB+=	PHPBB_VER=${PHPBB_VER}
 
 # Set custom variables:
 #
-PHPBBDIR=	${WWWDOCROOT}/${PHPBBURL}
+PHPBBDIR=	${WWWDOCROOT}/${PHPBB_URL}
 PKGOPTS=	${FILESDIR}/pkg-opts
 EXCEPTFILES=	${PREFIX}/${PHPBBDIR}/install/install.php \
 		${PREFIX}/${PHPBBDIR}/install/upgrade.php \
@@ -68,7 +71,7 @@ pre-everything::
 .endif
 
 post-patch:
-	@ ${REINPLACE_CMD} -e "s#\.\./templates#/${PHPBBURL}/templates#" \
+	@ ${REINPLACE_CMD} -e "s#\.\./templates#/${PHPBB_URL}/templates#" \
 	  ${WRKSRC}/docs/*.html
 	@${RM} -f `${FIND} ${WRKSRC} -name '*.orig'`
 
@@ -92,7 +95,8 @@ post-install:
 	@ cd ${WRKSRC}/docs && ${FIND} * -type f -maxdepth 0 \! -name \*.bak \
 	  \! -name COPYING -exec ${INSTALL_DATA} {} ${DOCSDIR} \;
 .if !defined(BATCH)
-	@ ${CAT} ${PKGMESSAGE}
+	@${SED} -e 's|%%HOSTNAME%%|${HOSTNAME}|; s|%%PHPBB_URL%%|${PHPBB_URL}|' \
+		${PKGMESSAGE}
 .endif
 .endif
 
diff --git a/chinese/phpbb-tw/distinfo b/chinese/phpbb-tw/distinfo
index c043d520afd1..7c38264ef0f4 100644
--- a/chinese/phpbb-tw/distinfo
+++ b/chinese/phpbb-tw/distinfo
@@ -1,3 +1,3 @@
-MD5 (phpBB-2.0.18.zip) = 58e119dbf057aaaf46e9716fdefe89ba
-SHA256 (phpBB-2.0.18.zip) = 2e155b985dfa9582b9c37b29af1a9863b5b2a879684a76d76c3938f2c58c0017
-SIZE (phpBB-2.0.18.zip) = 746724
+MD5 (phpBB-2.0.19.tar.gz) = 264fb61192aeb5b9bc7d15785908d53f
+SHA256 (phpBB-2.0.19.tar.gz) = 4143b404534c8eddf256dba7aaf33c5326cff8584afd4652916fdb710dfdc229
+SIZE (phpBB-2.0.19.tar.gz) = 647038
diff --git a/chinese/phpbb-tw/files/pkg-message.in b/chinese/phpbb-tw/files/pkg-message.in
index d8de0457cca9..bfb1ff3b4820 100644
--- a/chinese/phpbb-tw/files/pkg-message.in
+++ b/chinese/phpbb-tw/files/pkg-message.in
@@ -11,16 +11,18 @@ installation procedures may be found in:
 
   %%DOCSDIR%%/README.html
 
+
 Once these steps have been taken, you may connect to the following URL to
 configure your installation of phpBB2:
 
-  http://localhost/%%PHPBBURL%%/
+  http://%%HOSTNAME%%/%%PHPBB_URL%%
+
+
+After configuring phpBB2 and ensuring that it is operational, you **MUST**
+delete the following files manually for security purposes:
 
-After configuring phpBB2 and ensuring that it is operational, you MUST
-delete the following files manually for security purposes from
-%%PREFIX%%/%%PHPBBDIR%%:
+  # rm -rf %%PREFIX%%/%%PHPBBDIR%%/install
 
-  %%DELETEFILES%%
 
 Duplicates of these files have been installed to %%DATADIR%%.
 %%DATADIR%%/contrib contains contributed software for phpBB2.
diff --git a/chinese/phpbb-tw/files/pkg-opts b/chinese/phpbb-tw/files/pkg-opts
index 9d25a45069c4..d454edbd0d08 100644
--- a/chinese/phpbb-tw/files/pkg-opts
+++ b/chinese/phpbb-tw/files/pkg-opts
@@ -2,11 +2,11 @@
 * WWWDOCROOT [www/data]
   The DocumentRoot of your webserver under ${PREFIX}
 
-* PHPBBURL [phpBB2]
+* PHPBB_URL [phpBB2]
   The base URL of phpBB2 on your webserver
 
-    phpBB2 will be installed under ${PREFIX}/${WWWDOCROOT}/${PHPBBURL},
-    and will be visible as http://<hostname>/${PHPBBURL}/
+    phpBB2 will be installed under ${PREFIX}/${WWWDOCROOT}/${PHPBB_URL},
+    and will be visible as http://<hostname>/${PHPBB_URL}/
 
 * WWWOWN [www]
   The user ID under which your webserver executes
diff --git a/chinese/phpbb-tw/pkg-plist b/chinese/phpbb-tw/pkg-plist
index b627736bde44..6833e24fd0f7 100644
--- a/chinese/phpbb-tw/pkg-plist
+++ b/chinese/phpbb-tw/pkg-plist
@@ -50,6 +50,7 @@
 %%PHPBBDIR%%/images/avatars/gallery/index.htm
 %%PHPBBDIR%%/images/avatars/index.htm
 %%PHPBBDIR%%/images/index.htm
+%%PHPBBDIR%%/images/rss.gif
 %%PHPBBDIR%%/images/smiles/icon_arrow.gif
 %%PHPBBDIR%%/images/smiles/icon_biggrin.gif
 %%PHPBBDIR%%/images/smiles/icon_confused.gif
@@ -89,6 +90,8 @@
 %%PHPBBDIR%%/includes/page_header.php
 %%PHPBBDIR%%/includes/page_tail.php
 %%PHPBBDIR%%/includes/prune.php
+%%PHPBBDIR%%/includes/rss_config.php
+%%PHPBBDIR%%/includes/rss_functions.php
 %%PHPBBDIR%%/includes/sessions.php
 %%PHPBBDIR%%/includes/smtp.php
 %%PHPBBDIR%%/includes/sql_parse.php
@@ -167,8 +170,10 @@
 %%PHPBBDIR%%/posting.php
 %%PHPBBDIR%%/privmsg.php
 %%PHPBBDIR%%/profile.php
+%%PHPBBDIR%%/rss.php
 %%PHPBBDIR%%/search.php
 %%PHPBBDIR%%/templates/index.htm
+%%PHPBBDIR%%/templates/rss.xsl
 %%PHPBBDIR%%/templates/subSilver/admin/admin_message_body.tpl
 %%PHPBBDIR%%/templates/subSilver/admin/auth_forum_body.tpl
 %%PHPBBDIR%%/templates/subSilver/admin/auth_select_body.tpl
@@ -209,6 +214,7 @@
 %%PHPBBDIR%%/templates/subSilver/admin/words_edit_body.tpl
 %%PHPBBDIR%%/templates/subSilver/admin/words_list_body.tpl
 %%PHPBBDIR%%/templates/subSilver/agreement.tpl
+%%PHPBBDIR%%/templates/subSilver/atom_body.tpl
 %%PHPBBDIR%%/templates/subSilver/bbcode.tpl
 %%PHPBBDIR%%/templates/subSilver/confirm_body.tpl
 %%PHPBBDIR%%/templates/subSilver/error_body.tpl
@@ -217,6 +223,7 @@
 %%PHPBBDIR%%/templates/subSilver/groupcp_info_body.tpl
 %%PHPBBDIR%%/templates/subSilver/groupcp_pending_info.tpl
 %%PHPBBDIR%%/templates/subSilver/groupcp_user_body.tpl
+%%PHPBBDIR%%/templates/subSilver/images/Thumbs.db
 %%PHPBBDIR%%/templates/subSilver/images/cellpic.gif
 %%PHPBBDIR%%/templates/subSilver/images/cellpic1.gif
 %%PHPBBDIR%%/templates/subSilver/images/cellpic2.jpg
@@ -266,6 +273,7 @@
 %%PHPBBDIR%%/templates/subSilver/images/lang_chinese_traditional_taiwan/post.gif
 %%PHPBBDIR%%/templates/subSilver/images/lang_chinese_traditional_taiwan/reply-locked.gif
 %%PHPBBDIR%%/templates/subSilver/images/lang_chinese_traditional_taiwan/reply.gif
+%%PHPBBDIR%%/templates/subSilver/images/lang_english/Thumbs.db
 %%PHPBBDIR%%/templates/subSilver/images/lang_english/icon_aim.gif
 %%PHPBBDIR%%/templates/subSilver/images/lang_english/icon_edit.gif
 %%PHPBBDIR%%/templates/subSilver/images/lang_english/icon_email.gif
@@ -324,6 +332,7 @@
 %%PHPBBDIR%%/templates/subSilver/profile_send_email.tpl
 %%PHPBBDIR%%/templates/subSilver/profile_send_pass.tpl
 %%PHPBBDIR%%/templates/subSilver/profile_view_body.tpl
+%%PHPBBDIR%%/templates/subSilver/rss_body.tpl
 %%PHPBBDIR%%/templates/subSilver/search_body.tpl
 %%PHPBBDIR%%/templates/subSilver/search_results_posts.tpl
 %%PHPBBDIR%%/templates/subSilver/search_results_topics.tpl