Attachment 83105 Details for Bug 118772 – file.diff

[patch] file.diff

file.diff (text/plain), 3.65 KB, created by TAKATSU Tomonari on 2007-12-17 11:40:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: TAKATSU Tomonari

Created: 2007-12-17 11:40:01 UTC

Size: 3.65 KB

patch

obsolete

>diff -urN tdiary.orig/Makefile tdiary/Makefile
>--- tdiary.orig/Makefile	2006-12-14 20:06:41.000000000 +0900
>+++ tdiary/Makefile	2007-12-16 16:15:34.000000000 +0900
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	tdiary
>-PORTVERSION=	2.0.4
>+PORTVERSION=	2.2.0
> CATEGORIES?=	www ruby
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
> 		http://www.tdiary.org/download/
>@@ -23,13 +23,11 @@
> PKGMESSAGE=	${WRKDIR}/pkg-message
> USE_RUBY=	yes
> 
>-.if !defined(WITHOUT_RUBY_FEATURES)
>-USE_RUBY_FEATURES=	fileutils
>-.endif
>-
>-RUBY_SHEBANG_FILES=	index.rb update.rb misc/convert2.rb misc/plugin/squeeze.rb \
>-			misc/plugin/windex.rb \
>-			misc/plugin/trackback/tb.rb misc/style/etdiary/etdiary_test.rb
>+RUBY_SHEBANG_FILES=	index.rb update.rb misc/convert2.rb \
>+			misc/plugin/amazon/amazonimg.rb misc/plugin/pingback/pb.rb \
>+			misc/plugin/squeeze.rb misc/plugin/trackback/tb.rb \
>+			misc/plugin/xmlrpc/xmlrpc.rb misc/style/etdiary/etdiary_test.rb \
>+			tdiary/wiki_style_test.rb
> 
> PLIST_FILES=	${TDIARYDIR:S|${LOCALBASE}/||}/tdiaryinst.rb
> TDIARYDIR=	${EXAMPLESDIR}
>@@ -43,16 +41,10 @@
> .if defined(WITH_TDIARY_UCONV)
> RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/uconv.so:${PORTSDIR}/japanese/ruby-uconv
> .endif
>-.if defined(WITH_TDIARY_NORA)
>+.if !defined(WITHOUT_TDIARY_NORA)
> RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/web/escape_ext.so:${PORTSDIR}/www/ruby-nora
> .endif
> 
>-.include <bsd.port.pre.mk>
>-
>-.if ${RUBY_VERSION_CODE} < 167
>-IGNORE=		only works with Ruby 1.6.7 or later
>-.endif
>-
> do-install:
> 	@-${MKDIR} ${TDIARYDIR}
> 	@${SED} -e 's,#!/usr/bin/env ruby,#!${RUBY},' \
>@@ -74,4 +66,4 @@
> 	@${SED}	-e 's|%%EXAMPLESDIR%%|${EXAMPLESDIR}|' < ${FILESDIR}/pkg-message.in > ${PKGMESSAGE}
> 	@${CAT} ${PKGMESSAGE}
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>diff -urN tdiary.orig/distinfo tdiary/distinfo
>--- tdiary.orig/distinfo	2006-12-14 20:06:41.000000000 +0900
>+++ tdiary/distinfo	2007-12-16 14:52:23.000000000 +0900
>@@ -1,3 +1,3 @@
>-MD5 (tdiary-full-2.0.4.tar.gz) = 8c6a5768cdbcedaa5e643ef79d8713a7
>-SHA256 (tdiary-full-2.0.4.tar.gz) = 850f7b78ff0bfd35f533226f69064cc189628dda96e823d924ec28f5931acfe6
>-SIZE (tdiary-full-2.0.4.tar.gz) = 2128834
>+MD5 (tdiary-full-2.2.0.tar.gz) = 3fffc82a8ff3972a3bb036ed74202220
>+SHA256 (tdiary-full-2.2.0.tar.gz) = 7b9089a2a879df283f5958caa34e632434a06daa321ccfe3c498bf59241e7f9b
>+SIZE (tdiary-full-2.2.0.tar.gz) = 3862083
>diff -urN tdiary.orig/files/tdiaryinst.rb.in tdiary/files/tdiaryinst.rb.in
>--- tdiary.orig/files/tdiaryinst.rb.in	2006-01-30 00:41:09.000000000 +0900
>+++ tdiary/files/tdiaryinst.rb.in	2007-12-16 16:35:08.000000000 +0900
>@@ -218,7 +218,6 @@
> 
>   def copyBaseFile
>     FileUtils16.cp_r("#{@tdiarymaster}/doc", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}", :preserve, *@fileutilOptions)
>-    FileUtils16.cp_r("#{@tdiarymaster}/erb", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}", :preserve, *@fileutilOptions)
>     FileUtils16.cp_r("#{@tdiarymaster}/misc", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}", :preserve, *@fileutilOptions)
>     FileUtils16.cp_r("#{@tdiarymaster}/plugin", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}", :preserve, *@fileutilOptions)
>     FileUtils16.cp_r("#{@tdiarymaster}/skel", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}", :preserve, *@fileutilOptions)
>diff -urN tdiary.orig/pkg-descr tdiary/pkg-descr
>--- tdiary.orig/pkg-descr	2005-07-25 23:31:40.000000000 +0900
>+++ tdiary/pkg-descr	2007-12-16 16:51:41.000000000 +0900
>@@ -1,7 +1,7 @@
> tDiary is a Web-based interface system that works as a personal diary. 
> It is possible for diary readers to add comments to your diary.
> 
>-     -  require Ruby 1.6.7 or later
>+     -  require Ruby 1.8.0 or later
>      -  currently supported: Japanese, English, Traditional-Chinese
>  
>     tDiary is developed on http://sourceforge.net/projects/tdiary/ .

Actions: View | Diff

Attachments on bug 118772: 83105