1 files changed, 43 insertions, 35 deletions

diff --git a/www/tdiary/Makefile b/www/tdiary/Makefile
index 719715532f90..d20d027262ef 100644
--- a/www/tdiary/Makefile
+++ b/www/tdiary/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tdiary
 PORTVERSION=	1.5.5
-#PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES?=	www ruby
 MASTER_SITES=	\
 		${MASTER_SITE_SOURCEFORGE} \
@@ -18,39 +18,41 @@ DISTNAME=	${PORTNAME}-full-${PORTVERSION}
 MAINTAINER=	jfkimura@yahoo.co.jp
 COMMENT=	A Web-based diary system (like weblog) written in Ruby
 
-.if defined(WITH_TDIARY_UCONV)
-RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/uconv.so:${PORTSDIR}/japanese/ruby-uconv
-.endif
-.if defined(WITH_TDIARY_NORA)
-RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/web/escape_ext.so:${PORTSDIR}/www/ruby-nora
+NO_BUILD=		yes
+USE_RUBY=		yes
+.if  !defined(WITHOUT_RUBY_FEATURES)
+USE_RUBY_FEATURES=	fileutils
 .endif
 
-NO_BUILD=	yes
-USE_RUBY=	yes
 RUBY_SHEBANG_FILES=	index.rb update.rb misc/convert2.rb misc/posttdiary.rb misc/plugin/squeeze.rb misc/plugin/weather.rb \
 misc/plugin/windex.rb misc/plugin/a/a_conf.rb misc/plugin/todo/todo.rb misc/plugin/trackback/tb.rb
 
 TDIARYDIR=	${EXAMPLESDIR}
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
 .if  !defined(TDIARY_LANG)
 TDIARY_LANG=	tdiary.conf-en
 .endif
 
+.if defined(WITH_TDIARY_UCONV)
+RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/uconv.so:${PORTSDIR}/japanese/ruby-uconv
+.endif
+.if defined(WITH_TDIARY_NORA)
+RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/web/escape_ext.so:${PORTSDIR}/www/ruby-nora
+.endif
+
 pre-everything::
+.if ! ${TDIARY_LANG} == "tdiary.conf-en"
 	@${ECHO_MSG}
-	@${ECHO_MSG} "============================================================="
+	@${ECHO_MSG} "============================================================================="
 	@${ECHO_MSG} "You may use the following options:"
+	@${ECHO_MSG} "  WITH_TDIARY_UCONV=yes	(RDF file creates  with UTF-8 : output_rdf.rb)"
+	@${ECHO_MSG} "  WITH_TDIARY_NORA=yes	(with Referer header support  : disp_referrer.rb)"
+	@${ECHO_MSG} "============================================================================="
 	@${ECHO_MSG}
-	@${ECHO_MSG} "WITH_TDIARY_UCONV=yes	(with UTF-8 support : output_rdf.rb)"
-	@${ECHO_MSG} "WITH_TDIARY_NORA=yes	(with Referer header support : disp_referrer.rb)"
-	@${ECHO_MSG}
-	@${ECHO_MSG} "============================================================="
-	@${ECHO_MSG}
+.endif
 
 do-install:
-#	@if [ -d ${TDIARYDIR} ]; then ${RM} -rf ${TDIARYDIR}; fi
-	-${MKDIR} ${TDIARYDIR}
+	@-${MKDIR} ${TDIARYDIR}
 	@${SED} -e 's,@@@@PREFIX@@@@,${PREFIX},g' \
 		-e 's,@@@@LANG@@@@,${TDIARY_LANG},g' \
 		${FILESDIR}/tdiaryinst.rb.in > ${TDIARYDIR}/tdiaryinst.rb
@@ -58,32 +60,38 @@ do-install:
 		-e 's,@@@@LANG@@@@,${TDIARY_LANG},g' \
 		${FILESDIR}/tdiary-FreeBSD.sh.in > ${TDIARYDIR}/tdiary-FreeBSD.sh
 	@${CHMOD} ugo=rx ${TDIARYDIR}/tdiary-FreeBSD.sh
-	${CP} -pR ${WRKSRC}/ ${TDIARYDIR}
+	@${CP} -pR ${WRKSRC}/ ${TDIARYDIR}
 .if defined(WITH_TDIARY_UCONV)
-	${INSTALL_DATA} ${WRKSRC}/misc/plugin/output_rdf.rb ${TDIARYDIR}/plugin
+	@${ECHO_MSG} "===>  Option : WITH_TDIARY_UCONV .. Done."
+	@${INSTALL_DATA} ${WRKSRC}/misc/plugin/output_rdf.rb ${TDIARYDIR}/plugin
+	@${TOUCH} ${TDIARYDIR}/t.rdf
+	@${CHMOD} 706 ${TDIARYDIR}/t.rdf
+	@${ECHO_CMD} '${TDIARYDIR:S|${LOCALBASE}/||}/plugin/output_rdf.rb' >> ${TMPPLIST}
+	@${ECHO_CMD} '${TDIARYDIR:S|${LOCALBASE}/||}/t.rdf' >> ${TMPPLIST}
 .endif
 .if defined(WITH_TDIARY_NORA)
-	${INSTALL_DATA} ${WRKSRC}/misc/plugin/disp_referrer.rb ${TDIARYDIR}/plugin
+	@${ECHO_MSG} "===>  Option : WITH_TDIARY_NORA  .. Done."
+	@${INSTALL_DATA} ${WRKSRC}/misc/plugin/disp_referrer.rb ${TDIARYDIR}/plugin
+	@${ECHO_CMD} '${TDIARYDIR:S|${LOCALBASE}/||}/plugin/disp_referrer.rb' >> ${TMPPLIST}
 .endif
-	${INSTALL_DATA} ${WRKSRC}/misc/plugin/comment_mail-sendmail.rb ${TDIARYDIR}/plugin
+	@${INSTALL_DATA} ${WRKSRC}/misc/plugin/comment_mail-sendmail.rb ${TDIARYDIR}/plugin
+	@${ECHO_CMD} '${TDIARYDIR:S|${LOCALBASE}/||}/plugin/comment_mail-sendmail.rb' >> ${TMPPLIST}
 .if ${TDIARY_LANG} == tdiary.conf-en
-	${INSTALL_DATA} ${WRKSRC}/misc/i18n/00lang.en.rb ${TDIARYDIR}/plugin
+	@${ECHO_MSG} "===>  TDIARY : English Language messages support"
+	@${INSTALL_DATA} ${WRKSRC}/misc/i18n/00lang.en.rb ${TDIARYDIR}/plugin
+	@${ECHO_CMD} '${TDIARYDIR:S|${LOCALBASE}/||}/plugin/00lang.en.rb' >> ${TMPPLIST}
+	@${RUBY} -i -pe 'sub(/%Y-%m-%d/, "%Y-%m-%d [%a]")' ${TDIARYDIR}/misc/i18n/tdiary.conf.sample-en
+.else
+	@${ECHO_MSG} "===>  TDIARY : Japanese Language messages support"
+	@${INSTALL_DATA} ${WRKSRC}/misc/plugin/jdate.rb ${TDIARYDIR}/plugin
+	@${ECHO_CMD} '${TDIARYDIR:S|${LOCALBASE}/||}/plugin/jdate.rb' >> ${TMPPLIST}
+	@${RUBY} -i -pe 'sub(/%Y-%m-%d/, "%Y-%m-%d [%J]")' ${TDIARYDIR}/tdiary.conf.sample
 .endif
 	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${TDIARYDIR}
 
 post-install:
-	@cd ${WRKSRC} && ${FIND} . -type f -o -type l | ${SED} -e 's,^\.,share/examples/${PORTNAME},' >> ${TMPPLIST}
-.if defined(WITH_TDIARY_UCONV)
-	@${ECHO} 'share/examples/${PORTNAME}/plugin/output_rdf.rb' >> ${TMPPLIST}
-.endif
-.if defined(WITH_TDIARY_NORA)
-	@${ECHO} 'share/examples/${PORTNAME}/plugin/disp_referrer.rb' >> ${TMPPLIST}
-.endif
-	@${ECHO} 'share/examples/${PORTNAME}/plugin/comment_mail-sendmail.rb' >> ${TMPPLIST}
-.if ${TDIARY_LANG} == tdiary.conf-en
-	@${ECHO} 'share/examples/${PORTNAME}/plugin/00lang.en.rb' >> ${TMPPLIST}
-.endif
-	@cd ${WRKSRC} && ${FIND} . -type d -depth  | ${SED} -e 's,^\.,@dirrm share/examples/${PORTNAME},' >> ${TMPPLIST}
-	@${SED} -e "s,@@@@PREFIX@@@@,${PREFIX},g" ${PKGMESSAGE}
+	@cd ${WRKSRC} && ${FIND} . -type f -o -type l | ${SED} -e 's,^\.,${TDIARYDIR:S|${LOCALBASE}/||},' >> ${TMPPLIST}
+	@cd ${WRKSRC} && ${FIND} . -type d -depth  | ${SED} -e 's,^\.,@dirrm ${TDIARYDIR:S|${LOCALBASE}/||},' >> ${TMPPLIST}
+	@${SED} -e "s,%%EXAMPLESDIR%%,${EXAMPLESDIR},g" ${PKGMESSAGE}
 
 .include <bsd.port.mk>