From appleboy@freebsd.ee.ccu.edu.tw  Fri Jul 25 08:33:26 2008
Return-Path: <appleboy@freebsd.ee.ccu.edu.tw>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BC574106567C;
	Fri, 25 Jul 2008 08:33:26 +0000 (UTC)
	(envelope-from appleboy@freebsd.ee.ccu.edu.tw)
Received: from freebsd.ee.ccu.edu.tw (freebsd.ee.ccu.edu.tw [140.123.107.202])
	by mx1.freebsd.org (Postfix) with ESMTP id C2F638FC2D;
	Fri, 25 Jul 2008 08:33:25 +0000 (UTC)
	(envelope-from appleboy@freebsd.ee.ccu.edu.tw)
Received: from freebsd.ee.ccu.edu.tw (localhost.ee.ccu.edu.tw [127.0.0.1])
	by freebsd.ee.ccu.edu.tw (Postfix) with ESMTP id C8162171A7;
	Fri, 25 Jul 2008 16:15:32 +0800 (CST)
Received: (from root@localhost)
	by freebsd.ee.ccu.edu.tw (8.13.8/8.13.8/Submit) id m6P8FW6W082675;
	Fri, 25 Jul 2008 16:15:32 +0800 (CST)
	(envelope-from appleboy)
Message-Id: <200807250815.m6P8FW6W082675@freebsd.ee.ccu.edu.tw>
Date: Fri, 25 Jul 2008 16:15:32 +0800 (CST)
From: appleboy <appleboy.tw@gmail.com>
Reply-To: appleboy <appleboy.tw@gmail.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc: chinsan@freebsd.org
Subject: [PATCH] chinese/phpbb-tw
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         125950
>Category:       ports
>Synopsis:       [PATCH] chinese/phpbb-tw
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    chinsan
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jul 25 08:40:01 UTC 2008
>Closed-Date:    Fri Aug 08 14:18:43 UTC 2008
>Last-Modified:  Fri Aug  8 14:20:07 UTC 2008
>Originator:     appleboy
>Release:        FreeBSD 7.0-RELEASE i386
>Organization:
>Environment:
System: FreeBSD freebsd.ee.ccu.edu.tw 7.0-RELEASE FreeBSD 7.0-RELEASE #0: Fri Mar 14 10:34:00 CST 2008 root@freebsd.ee.ccu.edu.tw:/usr/obj/usr/src/sys/GENERIC i386


	
>Description:
	update chinese/phpbb-tw ports patch
>How-To-Repeat:
	
>Fix:

	

--- phpbb-tw.diff begins here ---
diff -ruN phpbb-tw.org/Makefile phpbb-tw/Makefile
--- phpbb-tw.org/Makefile	2008-07-20 22:02:20.000000000 +0800
+++ phpbb-tw/Makefile	2008-07-25 13:49:38.000000000 +0800
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	phpbb
-PORTVERSION=	2.0.21
+PORTVERSION=	2.0.23
 CATEGORIES=	chinese www
-MASTER_SITES=	LOCAL/chinsan
+MASTER_SITES=	http://freebsd.ee.ccu.edu.tw/
 PKGNAMESUFFIX=	-tw
 DISTNAME=	phpBB-tw-${PORTVERSION}
 
@@ -30,7 +30,7 @@
 # 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
+WWWDOCROOT?=	www
 PHPBB_URL?=	phpBB2
 #
 # End of user-configurable variables.
diff -ruN phpbb-tw.org/distinfo phpbb-tw/distinfo
--- phpbb-tw.org/distinfo	2008-07-20 22:02:20.000000000 +0800
+++ phpbb-tw/distinfo	2008-07-25 14:31:36.000000000 +0800
@@ -1,3 +1,3 @@
-MD5 (phpBB-tw-2.0.21.tar.gz) = d8189b577925125e1fc4206d68203b7a
-SHA256 (phpBB-tw-2.0.21.tar.gz) = 221e9e76480fd059eb2d4cc56600f591a54d992a4b821002d6a8ce29400260fc
-SIZE (phpBB-tw-2.0.21.tar.gz) = 620058
+MD5 (phpBB-tw-2.0.23.tar.gz) = a3f6c899a08f41b7c892d8473ad277cc
+SHA256 (phpBB-tw-2.0.23.tar.gz) = ed5da82dd7e372806dbf7afbb57d5f7d3e5d23eae1911b8b119bda6fc3bea561
+SIZE (phpBB-tw-2.0.23.tar.gz) = 536701
diff -ruN phpbb-tw.org/files/pkg-message.in phpbb-tw/files/pkg-message.in
--- phpbb-tw.org/files/pkg-message.in	2008-07-20 22:02:20.000000000 +0800
+++ phpbb-tw/files/pkg-message.in	2008-07-25 15:56:29.000000000 +0800
@@ -17,6 +17,21 @@
 
   http://%%HOSTNAME%%/%%PHPBB_URL%%
 
+To make phpBB available through your web site, I suggest
+that you add something like the following to httpd.conf:
+
+    Alias /%%PHPBB_URL%%/ "%%PREFIX%%/%%PHPBBDIR%%/"
+
+    <Directory "%%PREFIX%%/%%PHPBBDIR%%/">
+        Options none
+        AllowOverride Limit
+
+        Order Deny,Allow
+        Deny from All
+        Allow from All 
+    </Directory>
+
+
 
 After configuring phpBB2 and ensuring that it is operational, you **MUST**
 delete the following files manually for security purposes:
diff -ruN phpbb-tw.org/pkg-plist phpbb-tw/pkg-plist
--- phpbb-tw.org/pkg-plist	2008-07-20 22:02:20.000000000 +0800
+++ phpbb-tw/pkg-plist	2008-07-25 16:05:32.000000000 +0800
@@ -1,4 +1,3 @@
-@unexec [ -s %D/%%PHPBBDIR%%/config.php ] || rm -f %D/%%PHPBBDIR%%/config.php
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG.html
 %%PORTDOCS%%%%DOCSDIR%%/FAQ.html
@@ -36,6 +35,7 @@
 %%PHPBBDIR%%/cache/.htaccess
 %%PHPBBDIR%%/cache/index.htm
 %%PHPBBDIR%%/common.php
+%%PHPBBDIR%%/config.php
 %%PHPBBDIR%%/db/db2.php
 %%PHPBBDIR%%/db/index.htm
 %%PHPBBDIR%%/db/msaccess.php
@@ -50,7 +50,6 @@
 %%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
@@ -90,8 +89,6 @@
 %%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
@@ -118,27 +115,6 @@
 %%PHPBBDIR%%/install/update_to_latest.php
 %%PHPBBDIR%%/install/upgrade.php
 %%PHPBBDIR%%/language/index.htm
-%%PHPBBDIR%%/language/lang_chinese_traditional_taiwan/email/admin_activate.tpl
-%%PHPBBDIR%%/language/lang_chinese_traditional_taiwan/email/admin_send_email.tpl
-%%PHPBBDIR%%/language/lang_chinese_traditional_taiwan/email/admin_welcome_activated.tpl
-%%PHPBBDIR%%/language/lang_chinese_traditional_taiwan/email/admin_welcome_inactive.tpl
-%%PHPBBDIR%%/language/lang_chinese_traditional_taiwan/email/coppa_welcome_inactive.tpl
-%%PHPBBDIR%%/language/lang_chinese_traditional_taiwan/email/group_added.tpl
-%%PHPBBDIR%%/language/lang_chinese_traditional_taiwan/email/group_approved.tpl
-%%PHPBBDIR%%/language/lang_chinese_traditional_taiwan/email/group_request.tpl
-%%PHPBBDIR%%/language/lang_chinese_traditional_taiwan/email/index.htm
-%%PHPBBDIR%%/language/lang_chinese_traditional_taiwan/email/privmsg_notify.tpl
-%%PHPBBDIR%%/language/lang_chinese_traditional_taiwan/email/profile_send_email.tpl
-%%PHPBBDIR%%/language/lang_chinese_traditional_taiwan/email/topic_notify.tpl
-%%PHPBBDIR%%/language/lang_chinese_traditional_taiwan/email/user_activate.tpl
-%%PHPBBDIR%%/language/lang_chinese_traditional_taiwan/email/user_activate_passwd.tpl
-%%PHPBBDIR%%/language/lang_chinese_traditional_taiwan/email/user_welcome.tpl
-%%PHPBBDIR%%/language/lang_chinese_traditional_taiwan/email/user_welcome_inactive.tpl
-%%PHPBBDIR%%/language/lang_chinese_traditional_taiwan/index.htm
-%%PHPBBDIR%%/language/lang_chinese_traditional_taiwan/lang_admin.php
-%%PHPBBDIR%%/language/lang_chinese_traditional_taiwan/lang_bbcode.php
-%%PHPBBDIR%%/language/lang_chinese_traditional_taiwan/lang_faq.php
-%%PHPBBDIR%%/language/lang_chinese_traditional_taiwan/lang_main.php
 %%PHPBBDIR%%/language/lang_english/email/admin_activate.tpl
 %%PHPBBDIR%%/language/lang_english/email/admin_send_email.tpl
 %%PHPBBDIR%%/language/lang_english/email/admin_welcome_activated.tpl
@@ -168,10 +144,8 @@
 %%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
@@ -213,7 +187,6 @@
 %%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
@@ -254,22 +227,6 @@
 %%PHPBBDIR%%/templates/subSilver/images/icon_minipost_new.gif
 %%PHPBBDIR%%/templates/subSilver/images/icon_newest_reply.gif
 %%PHPBBDIR%%/templates/subSilver/images/index.htm
-%%PHPBBDIR%%/templates/subSilver/images/lang_chinese_traditional_taiwan/icon_aim.gif
-%%PHPBBDIR%%/templates/subSilver/images/lang_chinese_traditional_taiwan/icon_edit.gif
-%%PHPBBDIR%%/templates/subSilver/images/lang_chinese_traditional_taiwan/icon_email.gif
-%%PHPBBDIR%%/templates/subSilver/images/lang_chinese_traditional_taiwan/icon_icq_add.gif
-%%PHPBBDIR%%/templates/subSilver/images/lang_chinese_traditional_taiwan/icon_ip.gif
-%%PHPBBDIR%%/templates/subSilver/images/lang_chinese_traditional_taiwan/icon_msnm.gif
-%%PHPBBDIR%%/templates/subSilver/images/lang_chinese_traditional_taiwan/icon_pm.gif
-%%PHPBBDIR%%/templates/subSilver/images/lang_chinese_traditional_taiwan/icon_profile.gif
-%%PHPBBDIR%%/templates/subSilver/images/lang_chinese_traditional_taiwan/icon_quote.gif
-%%PHPBBDIR%%/templates/subSilver/images/lang_chinese_traditional_taiwan/icon_search.gif
-%%PHPBBDIR%%/templates/subSilver/images/lang_chinese_traditional_taiwan/icon_www.gif
-%%PHPBBDIR%%/templates/subSilver/images/lang_chinese_traditional_taiwan/icon_yim.gif
-%%PHPBBDIR%%/templates/subSilver/images/lang_chinese_traditional_taiwan/msg_newpost.gif
-%%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/icon_aim.gif
 %%PHPBBDIR%%/templates/subSilver/images/lang_english/icon_edit.gif
 %%PHPBBDIR%%/templates/subSilver/images/lang_english/icon_email.gif
@@ -328,7 +285,6 @@
 %%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
@@ -346,33 +302,26 @@
 %%PHPBBDIR%%/viewforum.php
 %%PHPBBDIR%%/viewonline.php
 %%PHPBBDIR%%/viewtopic.php
-@exec touch %B/config.php
-@exec chown -R %%WWWOWN%%:%%WWWGRP%% %B
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrmtry share/doc
-@dirrm %%DATADIR%%/contrib
-@dirrm %%DATADIR%%
-@dirrm %%PHPBBDIR%%/admin
-@dirrm %%PHPBBDIR%%/cache
-@dirrm %%PHPBBDIR%%/db
-@dirrm %%PHPBBDIR%%/images/smiles
-@dirrmtry %%PHPBBDIR%%/images/avatars/gallery
-@dirrmtry %%PHPBBDIR%%/images/avatars/upload
-@dirrmtry %%PHPBBDIR%%/images/avatars
-@dirrmtry %%PHPBBDIR%%/images
-@dirrm %%PHPBBDIR%%/includes
-@dirrm %%PHPBBDIR%%/install/schemas
-@dirrm %%PHPBBDIR%%/install
-@dirrm %%PHPBBDIR%%/language/lang_chinese_traditional_taiwan/email
-@dirrm %%PHPBBDIR%%/language/lang_chinese_traditional_taiwan
+@dirrm %%PHPBBDIR%%/templates/subSilver/images/lang_english
+@dirrm %%PHPBBDIR%%/templates/subSilver/images
+@dirrm %%PHPBBDIR%%/templates/subSilver/admin
+@dirrm %%PHPBBDIR%%/templates/subSilver
+@dirrm %%PHPBBDIR%%/templates
 @dirrm %%PHPBBDIR%%/language/lang_english/email
 @dirrm %%PHPBBDIR%%/language/lang_english
-@dirrmtry %%PHPBBDIR%%/language
-@dirrm %%PHPBBDIR%%/templates/subSilver/admin
-@dirrm %%PHPBBDIR%%/templates/subSilver/images/lang_chinese_traditional_taiwan/
-@dirrm %%PHPBBDIR%%/templates/subSilver/images/lang_english
-@dirrmtry %%PHPBBDIR%%/templates/subSilver/images
-@dirrmtry %%PHPBBDIR%%/templates/subSilver
-@dirrmtry %%PHPBBDIR%%/templates
-@dirrmtry %%PHPBBDIR%% || echo "Note: %D/%%PHPBBDIR%% not empty -- not deleted!"
-@dirrmtry www/data
+@dirrm %%PHPBBDIR%%/language
+@dirrm %%PHPBBDIR%%/install/schemas
+@dirrm %%PHPBBDIR%%/install
+@dirrm %%PHPBBDIR%%/includes
+@dirrm %%PHPBBDIR%%/images/smiles
+@dirrm %%PHPBBDIR%%/images/avatars/gallery
+@dirrm %%PHPBBDIR%%/images/avatars
+@dirrm %%PHPBBDIR%%/images
+@dirrm %%PHPBBDIR%%/db
+@dirrm %%PHPBBDIR%%/cache
+@dirrm %%PHPBBDIR%%/admin
+@dirrm %%PHPBBDIR%%
+@dirrm %%DATADIR%%/contrib
+@dirrm %%DATADIR%%
+@dirrm %%PORTDOCS%%%%DOCSDIR%%
--- phpbb-tw.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->chinsan 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Fri Jul 25 08:40:35 UTC 2008 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=125950 
State-Changed-From-To: open->closed 
State-Changed-By: chinsan 
State-Changed-When: Fri Aug 8 14:18:42 UTC 2008 
State-Changed-Why:  
Committed with some modified, thanks. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=125950 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/125950: commit references a PR
Date: Fri,  8 Aug 2008 14:17:44 +0000 (UTC)

 chinsan     2008-08-08 14:17:31 UTC
 
   FreeBSD ports repository
 
   Modified files:
     .                    UPDATING 
     chinese/phpbb-tw     Makefile distinfo pkg-plist 
     chinese/phpbb-tw/files pkg-message.in pkg-opts 
   Log:
   - Update to 2.0.23
   - Use standard $WWWDIR
   
   PR:             ports/125950
   Submitted by:   appleboy <appleboy.tw at gmail.com>
   Approved by:    maintainer (me)
   
   Revision  Changes    Path
   1.694     +15 -1     ports/UPDATING
   1.10      +4 -3      ports/chinese/phpbb-tw/Makefile
   1.5       +3 -3      ports/chinese/phpbb-tw/distinfo
   1.3       +15 -0     ports/chinese/phpbb-tw/files/pkg-message.in
   1.3       +1 -1      ports/chinese/phpbb-tw/files/pkg-opts
   1.6       +21 -72    ports/chinese/phpbb-tw/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
