From 20a9e2344405ca6d84952a48a99b66080efe3a75 Mon Sep 17 00:00:00 2001
From: TAKATSU Tomonari <tota@FreeBSD.org>
Date: Sun, 29 Jun 2014 08:34:51 +0000
Subject: [PATCH] - Update to 4.0.4 - Make use of PLIST_SUB and pkg-plist
 instead of TMPPLIST

---
 www/tdiary/Makefile  | 19 ++++++++++---------
 www/tdiary/distinfo  |  4 ++--
 www/tdiary/pkg-plist |  9 +++++++--
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/www/tdiary/Makefile b/www/tdiary/Makefile
index ed66f4f48255..939ef920ba5e 100644
--- a/www/tdiary/Makefile
+++ b/www/tdiary/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	tdiary
-PORTVERSION=	4.0.3
-PORTREVISION=	1
+PORTVERSION=	4.0.4
 CATEGORIES?=	www ruby
 MASTER_SITES=	http://www.tdiary.org/download/
 DISTNAME=	${PORTNAME}-full-v${PORTVERSION}
@@ -42,6 +41,9 @@ HTML=	${DOCFILES:S/$/.html/}
 MD=	${DOCFILES:S/$/.md/}
 PORTDOCS=	ChangeLog doc.css ${HTML} ${MD}
 
+PLIST_SUB=	TDIARY_SCRIPT=${TDIARY_SCRIPT} \
+		WWWOWN=${WWWOWN} \
+		WWWGRP=${WWWGRP}
 SUB_FILES=	pkg-message tdiaryinst.rb
 SUB_LIST+=	TDIARY_LANG=${TDIARY_LANG} \
 		TDIARY_SCRIPT=${TDIARY_SCRIPT}
@@ -70,9 +72,10 @@ pre-patch:
 	@${RM} ${WRKSRC}/Procfile
 	@${RM} ${WRKSRC}/Rakefile
 	@${RM} ${WRKSRC}/config.ru
+	@${RM} ${WRKSRC}/tdiary.gemspec
 	@${RM} ${WRKSRC}/tmp/.gitkeep
 	@${RM} -rf ${WRKSRC}/.bundle
-	@${RM} -r ${WRKSRC}/misc/lib/bundler-1.6.0.rc
+	@${RM} -r ${WRKSRC}/misc/lib/bundler-1.6.2
 	@${RM} -r ${WRKSRC}/public
 	@${RM} -r ${WRKSRC}/spec
 	@${RM} -r ${WRKSRC}/test
@@ -93,16 +96,14 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/${TDIARY_SCRIPT} ${STAGEDIR}${PREFIX}/bin
 	@-${MKDIR} ${STAGEDIR}${WWWDIR}
 	${TAR} --exclude "doc" -C ${WRKSRC} -cf - . | ${TAR} --unlink -C ${STAGEDIR}${WWWDIR} -xf -
-
-post-install:
-	@${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}' >> ${TMPPLIST}
-	@${ECHO_CMD} bin/${TDIARY_SCRIPT} >> ${TMPPLIST}
 	@${INSTALL} -d ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
-	@${CAT} ${PKGMESSAGE}
 
 x-generate-plist: stage
-	${FIND} ${STAGEDIR}${WWWDIR} -type f -o -type l | ${SORT} | ${SED} -e 's,${STAGEDIR}${WWWDIR},%%WWWDIR%%,g' > pkg-plist.new
+	${ECHO_CMD} bin/%%TDIARY_SCRIPT%% > pkg-plist.new
+	${FIND} ${STAGEDIR}${WWWDIR} -type f -o -type l | ${SORT} | ${SED} -e 's,${STAGEDIR}${WWWDIR},%%WWWDIR%%,g' >> pkg-plist.new
 	${FIND} ${STAGEDIR}${WWWDIR} -type d -depth | ${SORT} -r | ${SED} -e 's,${STAGEDIR}${WWWDIR},@dirrm %%WWWDIR%%,g' >> pkg-plist.new
+	${ECHO_CMD} @exec mkdir -p %D/%%WWWDIR%%/tmp >> pkg-plist.new
+	${ECHO_CMD} @exec chown -R %%WWWOWN%%:%%WWWGRP%% %D/%%WWWDIR%% >> pkg-plist.new
 
 .include <bsd.port.mk>
diff --git a/www/tdiary/distinfo b/www/tdiary/distinfo
index 94f011c184b2..607cc19a7c8a 100644
--- a/www/tdiary/distinfo
+++ b/www/tdiary/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tdiary-full-v4.0.3.tar.gz) = e766d1017221336125b595a92ec16c21436a9dbbec36eafa75488e4a032968f5
-SIZE (tdiary-full-v4.0.3.tar.gz) = 77485225
+SHA256 (tdiary-full-v4.0.4.tar.gz) = af1d001391b9a921697870a4232db5cb4e8fb0509905bb41ebfbcf46cf202b84
+SIZE (tdiary-full-v4.0.4.tar.gz) = 23849957
diff --git a/www/tdiary/pkg-plist b/www/tdiary/pkg-plist
index be2c51719076..101907b09d1e 100644
--- a/www/tdiary/pkg-plist
+++ b/www/tdiary/pkg-plist
@@ -1,4 +1,7 @@
+bin/%%TDIARY_SCRIPT%%
+%%WWWDIR%%/Gruntfile.js
 %%WWWDIR%%/bin/tdiary
+%%WWWDIR%%/bower.json
 %%WWWDIR%%/data/.htaccess
 %%WWWDIR%%/dot.htaccess
 %%WWWDIR%%/index.fcgi
@@ -168,6 +171,7 @@
 %%WWWDIR%%/misc/theme_convert/Readme.rd
 %%WWWDIR%%/misc/theme_convert/append.rcss
 %%WWWDIR%%/misc/theme_convert/theme_convert.rb
+%%WWWDIR%%/package.json
 %%WWWDIR%%/plugin/00default.rb
 %%WWWDIR%%/plugin/05referer.rb
 %%WWWDIR%%/plugin/10spamfilter.rb
@@ -216,7 +220,6 @@
 %%WWWDIR%%/tdiary.conf.beginner
 %%WWWDIR%%/tdiary.conf.sample
 %%WWWDIR%%/tdiary.conf.sample-en
-%%WWWDIR%%/tdiary.gemspec
 %%WWWDIR%%/tdiary.rb
 %%WWWDIR%%/tdiary/admin.rb
 %%WWWDIR%%/tdiary/application.rb
@@ -1389,6 +1392,7 @@
 %%WWWDIR%%/theme/ocha/ocha_div_day.png
 %%WWWDIR%%/theme/ocha/ocha_h2.png
 %%WWWDIR%%/theme/ocha/ocha_panchor.png
+%%WWWDIR%%/theme/ogimage.png
 %%WWWDIR%%/theme/old-pavement/README
 %%WWWDIR%%/theme/old-pavement/old-pavement.css
 %%WWWDIR%%/theme/old-pavement/old-pavement_back.png
@@ -1893,7 +1897,6 @@
 %%WWWDIR%%/theme/zef/zef.css
 %%WWWDIR%%/update.fcgi
 %%WWWDIR%%/update.rb
-@exec mkdir -p %D/%%WWWDIR%%/tmp
 @dirrm %%WWWDIR%%/tmp
 @dirrm %%WWWDIR%%/theme/zef
 @dirrm %%WWWDIR%%/theme/yukon
@@ -2280,3 +2283,5 @@
 @dirrm %%WWWDIR%%/data
 @dirrm %%WWWDIR%%/bin
 @dirrm %%WWWDIR%%
+@exec mkdir -p %D/%%WWWDIR%%/tmp
+@exec chown -R %%WWWOWN%%:%%WWWGRP%% %D/%%WWWDIR%%