- Update to 1.0.6.1

Notes: Please read the UPDATING!

PR:		ports/105066
Submitted by:	chinsan

3 files changed, 25 insertions, 24 deletions

diff --git a/chinese/tatter-tools/Makefile b/chinese/tatter-tools/Makefile
index 7d05e17d28a..28e1b86de16 100644
--- a/chinese/tatter-tools/Makefile
+++ b/chinese/tatter-tools/Makefile
@@ -6,16 +6,13 @@
 #
 
 PORTNAME=	tatter-tools
-PORTVERSION=	0.9.6
+PORTVERSION=	1.0.6.1
 CATEGORIES=	chinese www
-MASTER_SITES=	ftp://bbs.ilc.edu.tw/chinsan/distfiles/ \
-		http://bbs.ilc.edu.tw/~chinsan/ports/tatter-tools/ \
-		ftp://news.giga.net.tw/chinsan/distfiles/ \
-		http://www.twtt.org/ttfile/
-DISTNAME=	${PORTNAME}-${PORTVERSION}.zh_TW.UTF-8
+MASTER_SITES=	http://chinsan2.twbbs.org/distfiles/ \
+		ftp://chinsan2.twbbs.org/distfiles/
 
 MAINTAINER=	chinsan@FreeBSD.org
-COMMENT=	Cute and easy blog Tool with Traditional-Chinese(zh_TW.UTF-8)
+COMMENT=	Cute and easy blog tool with Traditional-Chinese(zh_TW.UTF-8)
 
 USE_PHP=	mysql pcre session xml
 NO_BUILD=	YES
@@ -24,10 +21,6 @@ WANT_PHP_WEB=	YES
 TMPDIR?=	${PORTNAME}-${PORTVERSION}
 WRKSRC=		${WRKDIR}/${TMPDIR}
 
-.if defined(WITH_MYSQL5)
-IGNORE=		take a look at http://www.twtt.org/viewtopic.php?t=192&highlight=bsd for soultion
-.endif
-
 .if !defined(TT_URL)
 pre-fetch:
 	@${ECHO_MSG} ""
@@ -35,16 +28,13 @@ pre-fetch:
 	@${ECHO_MSG} ""
 .endif
 
-WWWDOCROOT?=	www/data
+WWWDOCROOT?=	www
 TT_URL?=	tatter
 TT_DIR?=	${WWWDOCROOT}/${TT_URL}
 PLIST=		${WRKDIR}/pkg-plist
 
 .include <bsd.port.pre.mk>
 
-# Get HOSTNAME
-HOSTNAME!=	${SYSCTL} -n kern.hostname
-
 pre-install:
 	@cd ${WRKSRC} && ${FIND} -s . -type f | \
 		${SED} -e 's|^./||;s|^|${TT_DIR}/|' > ${PLIST} \
@@ -61,7 +51,7 @@ do-install:
 	@${CHMOD} 777 ${TARGETDIR}/${TT_DIR}/
 
 post-install:
-	@${SED} -e 's|%%HOSTNAME%%|${HOSTNAME}|; s|%%TT_URL%%|${TT_URL}|' \
-		${PKGMESSAGE}
+	@${SED} -e 's,%%TT_URL%%,${TT_URL},; s,%%PREFIX%%,${PREFIX},; \
+		s,%%TT_DIR%%,${TT_DIR},' ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/chinese/tatter-tools/distinfo b/chinese/tatter-tools/distinfo
index fd91267eeee..eede3c075ed 100644
--- a/chinese/tatter-tools/distinfo
+++ b/chinese/tatter-tools/distinfo
@@ -1,3 +1,3 @@
-MD5 (tatter-tools-0.9.6.zh_TW.UTF-8.tar.gz) = 125b2b7a50ab22009bdec7651aa05ad7
-SHA256 (tatter-tools-0.9.6.zh_TW.UTF-8.tar.gz) = bf4884472635d90512bdacf725b0b5b1f54766c1a3316dfccb76714720f110cd
-SIZE (tatter-tools-0.9.6.zh_TW.UTF-8.tar.gz) = 183120
+MD5 (tatter-tools-1.0.6.1.tar.gz) = 19794b67c6fb478fe50bd263e15f3e29
+SHA256 (tatter-tools-1.0.6.1.tar.gz) = 80e2670e624cb3098a25ed9c0a6a33058aa4250bc5b4101f800de3d60eed401c
+SIZE (tatter-tools-1.0.6.1.tar.gz) = 1862220
diff --git a/chinese/tatter-tools/pkg-message b/chinese/tatter-tools/pkg-message
index 55b702048ff..ffedd7d0e56 100644
--- a/chinese/tatter-tools/pkg-message
+++ b/chinese/tatter-tools/pkg-message
@@ -4,21 +4,32 @@ you may have to follow this steps to make it work correctly.
 
 1. Create the MySQL database:
 
-  # mysqladmin --user=root -p create tatter
+  # mysqladmin --user=root -p create tattertools
 
 2. Create a mysql user/password for tatter(database):
   (change user and/or password if requered)
 
   # mysql -u root -p
-  mysql> GRANT ALL ON tatter.* TO ttuser@localhost 
+  mysql> GRANT ALL ON tattertools.* TO ttuser@localhost 
 	 IDENTIFIED BY 'tt_password';
   mysql> FLUSH PRIVILEGES;
   mysql> QUIT;
 
-3.Open Tatter-Tools installation page in your web browser 
+3. Please add the following to your apache config, and restart.
+    #
+    # Directives to allow use of Tatter-Tools
+    #
+    Alias /%%TT_URL%% "%%PREFIX%%/%%TT_DIR%%/"
+
+   <Directory "%%PREFIX%%/%%TT_DIR%%">
+     Options FollowSymLinks
+     AllowOverride FileInfo
+   </Directory>
+
+4.Open Tatter-Tools installation page in your web browser 
   and fill with ttuser/tt_password
 
-  http://%%HOSTNAME%%/%%TT_URL%%/install.php
+  http://www.your.host/%%TT_URL%%/setup.php
 
   Have fun!
 ==================================================================