- Update to 2.1.4

PR:		ports/106209
Submitted by:	TAKATSU Tomonari <tota@rtfm.jp> (maintainer)
Security:	http://www.vuxml.org/freebsd/666b8c9e-8212-11db-851e-0016179b2dd5.html

www/tdiary-devel/Makefile

@@ -7,6 +7,7 @@
 
 PORTNAME=	tdiary
 PORTVERSION=	2.1.4
+PORTREVISION=	1
 CATEGORIES?=	www ruby
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.tdiary.org/download/
@@ -14,11 +15,16 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 PKGNAMESUFFIX=	-devel
 DISTNAME=	${PORTNAME}-full-${PORTVERSION}
 
+PATCH_SITES=	http://www.tdiary.org/download/
+PATCHFILES=	tdiary.20061126.patch
+
 MAINTAINER=	tota@rtfm.jp
 COMMENT=	A Web-based diary system (like weblog) written in Ruby
 
 NO_BUILD=	yes
-CONFLICTS?=	ja-tdiary-devel-[0-9]*
+CONFLICTS?=	tdiary-[0-9]* \
+		ja-tdiary-[0-9]* \
+		ja-tdiary-devel-[0-9]*
 PKGMESSAGE=	${WRKDIR}/pkg-message
 USE_RUBY=	yes
 RUBY_VER=	1.8
@@ -33,7 +39,7 @@ PLIST_FILES=	${TDIARYDIR:S|${LOCALBASE}/||}/tdiaryinst.rb
 TDIARYDIR=	${EXAMPLESDIR}${PKGNAMESUFFIX}
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-.if  !defined(TDIARY_LANG)
+.if !defined(TDIARY_LANG) || ${TDIARY_LANG} != ja
 TDIARY_LANG=	en
 .endif
 .if defined(WITH_TDIARY_UCONV)
@@ -45,12 +51,16 @@ RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/web/escape_ext.so:${PORTSDIR}/www/ruby-nora
 .include <bsd.port.pre.mk>
 
 .if ${RUBY_VERSION_CODE} < 182
-IGNORE=		needs ruby 1.8.2 or higher, install lang/ruby18 and try again
+IGNORE=		only works with Ruby 1.8.2 or later
 .endif
 
+post-patch:
+	@${FIND} ${WRKSRC} -name "*.orig" -type f -exec ${RM} -f {} \;
+
 do-install:
 	@-${MKDIR} ${TDIARYDIR}
-	@${SED} -e 's,@@@@PREFIX@@@@,${PREFIX},g' \
+	@${SED} -e 's,#!/usr/bin/env ruby,#!${RUBY},' \
+		-e 's,@@@@PREFIX@@@@,${PREFIX},g' \
 		-e 's,@@@@TDIARY@@@@,${PORTNAME}${PKGNAMESUFFIX},g' \
 		-e 's,@@@@LANG@@@@,${TDIARY_LANG},g' \
 		${FILESDIR}/tdiaryinst.rb.in > ${TDIARYDIR}/tdiaryinst.rb

www/tdiary-devel/distinfo

@@ -1,3 +1,6 @@
 MD5 (tdiary-full-2.1.4.tar.gz) = 49414c4453906c75d6a48f952dc0307a
 SHA256 (tdiary-full-2.1.4.tar.gz) = 4a4aed40bbcb05eae200f715c0d8f118e5aa0bc82d17d62f11b15975141976f1
 SIZE (tdiary-full-2.1.4.tar.gz) = 3490011
+MD5 (tdiary.20061126.patch) = 1148b22805b912dfd8bf566ed068e360
+SHA256 (tdiary.20061126.patch) = 9633e718c35b62857849711f58692257fdfd84b93c34d3ff783c2708d04d8f1c
+SIZE (tdiary.20061126.patch) = 879

www/tdiary-devel/files/pkg-message.in

@@ -11,11 +11,9 @@ This script should be run manually.
 	   --help   Display Help information
 
 ---
-There is a document by English in the following directories.
+There are documents in the following directories.
   See ...
+  %%EXAMPLESDIR%%/doc/
   %%EXAMPLESDIR%%/misc/i18n/
-   and
-  Explanation by English of a tDiary system can refer to the following page :
-
-  http://tdiary-users.sourceforge.jp/cgi-bin/wiki.cgi?FrontPage_en
 =============================================================================
+