Attachment 85152 Details for Bug 121253 – file.diff

[patch] file.diff

file.diff (text/plain), 12.79 KB, created by TAKATSU Tomonari on 2008-03-01 04:50:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: TAKATSU Tomonari

Created: 2008-03-01 04:50:00 UTC

Size: 12.79 KB

patch

obsolete

>diff -urN tdiary.orig/Makefile tdiary/Makefile
>--- tdiary.orig/Makefile	2008-01-03 11:33:24.000000000 +0900
>+++ tdiary/Makefile	2008-03-01 10:44:14.000000000 +0900
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	tdiary
>-PORTVERSION=	2.2.0
>+PORTVERSION=	2.2.1
> CATEGORIES?=	www ruby
> MASTER_SITES=	SF \
> 		http://www.tdiary.org/download/
>@@ -51,12 +51,6 @@
> 		-e 's,@@@@LANG@@@@,${TDIARY_LANG},g' \
> 		${FILESDIR}/tdiaryinst.rb.in > ${TDIARYDIR}/tdiaryinst.rb
> 	@${CP} -pR ${WRKSRC}/ ${TDIARYDIR}
>-.if ${TDIARY_LANG} == ja
>-	@${ECHO_MSG} "===>  TDIARY : Japanese Language messages support"
>-	@${RUBY} -i -pe 'sub(/%Y-%m-%d/, "%Y-%m-%d [%J]")' ${TDIARYDIR}/tdiary.conf.sample
>-.else
>-	@${RUBY} -i -pe 'sub(/%Y-%m-%d/, "%Y-%m-%d [%a]")' ${TDIARYDIR}/misc/i18n/tdiary.conf.sample-en
>-.endif
> 	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${TDIARYDIR}
> 
> post-install:
>diff -urN tdiary.orig/distinfo tdiary/distinfo
>--- tdiary.orig/distinfo	2008-01-03 11:33:24.000000000 +0900
>+++ tdiary/distinfo	2008-03-01 10:42:40.000000000 +0900
>@@ -1,3 +1,3 @@
>-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
>+MD5 (tdiary-full-2.2.1.tar.gz) = 281b87613ce778c46b91c89bb660ea65
>+SHA256 (tdiary-full-2.2.1.tar.gz) = bdfee031ccd223ffc5b6d76a1cad1e4fbfcc98e584ad0097e042009a369f1c38
>+SIZE (tdiary-full-2.2.1.tar.gz) = 3865468
>diff -urN tdiary.orig/files/tdiaryinst.rb.in tdiary/files/tdiaryinst.rb.in
>--- tdiary.orig/files/tdiaryinst.rb.in	2008-01-03 11:33:24.000000000 +0900
>+++ tdiary/files/tdiaryinst.rb.in	2008-03-01 13:29:15.000000000 +0900
>@@ -17,64 +17,6 @@
> $OPT_TDIARYMASTER = "@@@@PREFIX@@@@/share/examples/tdiary"
> $OPT_LANG         = '@@@@LANG@@@@'
> 
>-module FileUtils16
>-  def FileUtils16.mkdir_p(dir, *options)
>-    begin
>-      FileUtils.mkdir_p(dir, *options)
>-    rescue TypeError
>-      optionhash = {}
>-      options.each { |o| optionhash[o] = true }
>-      FileUtils.mkdir_p(dir, optionhash)
>-    end
>-  end
>-  def FileUtils16.cp(src, dest, *options)
>-    begin
>-      FileUtils.cp(src, dest, *options)
>-      FileUtils.chmod(0644, dest, *options)
>-    rescue TypeError
>-      optionhash = {}
>-      options.each { |o| optionhash[o] = true }
>-      FileUtils.cp(src, dest, optionhash)
>-    end
>-  end
>-  def FileUtils16.cp_r(src, dest, *options)
>-    begin
>-      FileUtils.cp_r(src, dest, *options)
>-    rescue TypeError
>-      optionhash = {}
>-      options.each { |o| optionhash[o] = true }
>-      FileUtils.cp_r(src, dest, optionhash)
>-    end
>-  end
>-  def FileUtils16.rm(list, *options)
>-    begin
>-      FileUtils.rm(list, *options)
>-    rescue TypeError
>-      optionhash = {}
>-      options.each { |o| optionhash[o] = true }
>-      FileUtils.rm(list, optionhash)
>-    end
>-  end
>-  def FileUtils16.ln_s(list, destdir, *options)
>-    begin
>-      FileUtils.ln_s(list, destdir, *options)
>-    rescue TypeError
>-      optionhash = {}
>-      options.each { |o| optionhash[o] = true }
>-      FileUtils.ln_s(list, destdir, optionhash)
>-    end
>-  end
>-  def FileUtils16.chmod(mode, list, *options)
>-    begin
>-      FileUtils.chmod(mode, list, *options)
>-    rescue TypeError
>-      optionhash = {}
>-      options.each { |o| optionhash[o] = true }
>-      FileUtils.chmod(mode, list, optionhash)
>-    end
>-  end
>-end
>-
> def usage
>   STDERR.print "Usage: #{File.basename($0)} [options]\n"
>   STDERR.print "Options:\n"
>@@ -137,7 +79,7 @@
>     @username =(@passwd.name)
>     @diarydir = 'diary'
>     @httpdir  = 'public_html'
>-    @fileutilOptions = []
>+    @fileutilOptions = {}
>     @author_name = @passwd.gecos
>     @author_host = "#{`hostname`.chomp}"
>     @author_mail = "#{@username}@#{`hostname`.chomp}"
>@@ -193,80 +135,78 @@
> 
>   def prepareDirs
>     if ! FileTest.exist?("#{@passwd.dir}/#{@diarydir}")
>-      FileUtils16.mkdir_p("#{@passwd.dir}/#{@diarydir}", *@fileutilOptions)
>+      FileUtils.mkdir_p("#{@passwd.dir}/#{@diarydir}", @fileutilOptions)
>     end
>     if ! FileTest.exist?("#{@passwd.dir}/#{@httpdir}/#{@diarydir}")
>-      FileUtils16.mkdir_p("#{@passwd.dir}/#{@httpdir}/#{@diarydir}", *@fileutilOptions)
>+      FileUtils.mkdir_p("#{@passwd.dir}/#{@httpdir}/#{@diarydir}", @fileutilOptions)
>     end
>   end
> 
>   def linkBaseFile
>-    FileUtils16.cp_r("#{@tdiarymaster}/plugin", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}", :preserve, *@fileutilOptions)
>-    FileUtils16.ln_s("#{@tdiarymaster}/theme", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}", *@fileutilOptions)
>-    FileUtils16.ln_s("#{@tdiarymaster}/doc", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}", *@fileutilOptions)
>+    FileUtils.ln_s("#{@tdiarymaster}/theme", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}", @fileutilOptions)
>+    FileUtils.ln_s("#{@tdiarymaster}/doc", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}", @fileutilOptions)
>     tempfile = Tempfile.new("index.rb")
>     tempfile.write "#!/usr/local/bin/ruby\nrequire '#{@tdiarymaster}/index'\n"
>     tempfile.close
>-    FileUtils16.cp(tempfile.path, "#{@passwd.dir}/#{@httpdir}/#{@diarydir}/index.rb", *@fileutilOptions)
>-    FileUtils16.chmod(0755, "#{@passwd.dir}/#{@httpdir}/#{@diarydir}/index.rb", *@fileutilOptions)
>+    FileUtils.cp(tempfile.path, "#{@passwd.dir}/#{@httpdir}/#{@diarydir}/index.rb", @fileutilOptions)
>+    FileUtils.chmod(0755, "#{@passwd.dir}/#{@httpdir}/#{@diarydir}/index.rb", @fileutilOptions)
>     tempfile = Tempfile.new("update.rb")
>     tempfile.write "#!/usr/local/bin/ruby\nrequire '#{@tdiarymaster}/update'\n"
>     tempfile.close
>-    FileUtils16.cp(tempfile.path, "#{@passwd.dir}/#{@httpdir}/#{@diarydir}/update.rb", *@fileutilOptions)
>-    FileUtils16.chmod(0755, "#{@passwd.dir}/#{@httpdir}/#{@diarydir}/update.rb", *@fileutilOptions)
>+    FileUtils.cp(tempfile.path, "#{@passwd.dir}/#{@httpdir}/#{@diarydir}/update.rb", @fileutilOptions)
>+    FileUtils.chmod(0755, "#{@passwd.dir}/#{@httpdir}/#{@diarydir}/update.rb", @fileutilOptions)
>   end
> 
>   def copyBaseFile
>-    FileUtils16.cp_r("#{@tdiarymaster}/doc", "#{@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)
>-    FileUtils16.cp_r("#{@tdiarymaster}/tdiary", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}", :preserve, *@fileutilOptions)
>-    FileUtils16.cp_r("#{@tdiarymaster}/theme", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}", :preserve, *@fileutilOptions)
>-    FileUtils16.cp("#{@tdiarymaster}/index.rb", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}/index.rb", *@fileutilOptions)
>-    FileUtils16.chmod(0755, "#{@passwd.dir}/#{@httpdir}/#{@diarydir}/index.rb", *@fileutilOptions)
>-    FileUtils16.cp("#{@tdiarymaster}/update.rb", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}/update.rb", *@fileutilOptions)
>-    FileUtils16.chmod(0755, "#{@passwd.dir}/#{@httpdir}/#{@diarydir}/update.rb", *@fileutilOptions)
>-    FileUtils16.cp("#{@tdiarymaster}/tdiary.rb", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}/tdiary.rb", *@fileutilOptions)
>-    FileUtils16.cp("#{@tdiarymaster}/README", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}/README", *@fileutilOptions)
>-    if @lang == 'ja' then
>-       FileUtils16.ln_s("#{@passwd.dir}/#{@httpdir}/#{@diarydir}/misc/plugin/jdate.rb", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}/plugin/000jdate.rb", *@fileutilOptions)
>-    end
>+    opts = @fileutilOptions.dup
>+    opts.store(:preserve, true)
>+    FileUtils.cp_r("#{@tdiarymaster}/doc", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}", opts)
>+    FileUtils.cp_r("#{@tdiarymaster}/misc", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}", opts)
>+    FileUtils.cp_r("#{@tdiarymaster}/plugin", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}", opts)
>+    FileUtils.cp_r("#{@tdiarymaster}/skel", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}", opts)
>+    FileUtils.cp_r("#{@tdiarymaster}/tdiary", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}", opts)
>+    FileUtils.cp_r("#{@tdiarymaster}/theme", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}", opts)
>+    FileUtils.cp("#{@tdiarymaster}/index.rb", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}/index.rb", @fileutilOptions)
>+    FileUtils.chmod(0755, "#{@passwd.dir}/#{@httpdir}/#{@diarydir}/index.rb", @fileutilOptions)
>+    FileUtils.cp("#{@tdiarymaster}/update.rb", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}/update.rb", @fileutilOptions)
>+    FileUtils.chmod(0755, "#{@passwd.dir}/#{@httpdir}/#{@diarydir}/update.rb", @fileutilOptions)
>+    FileUtils.cp("#{@tdiarymaster}/tdiary.rb", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}/tdiary.rb", @fileutilOptions)
>+    FileUtils.cp("#{@tdiarymaster}/README", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}/README", @fileutilOptions)
>   end
> 
>   def installConfig
>     tempfile = Tempfile.new("tdiary.conf-ja")
>     tempfile.write tdiaryConfReplace("#{@tdiarymaster}/tdiary.conf.sample")
>     tempfile.close
>-    FileUtils16.cp(tempfile.path, "#{@passwd.dir}/#{@httpdir}/#{@diarydir}/tdiary.conf-ja", *@fileutilOptions)
>+    FileUtils.cp(tempfile.path, "#{@passwd.dir}/#{@httpdir}/#{@diarydir}/tdiary.conf-ja", @fileutilOptions)
> 
>     tempfile = Tempfile.new("tdiary.conf-en") # sample configuration for English Environment
>     tempfile.write tdiaryConfReplace("#{@tdiarymaster}/misc/i18n/tdiary.conf.sample-en")
>     tempfile.close
>-    FileUtils16.cp(tempfile.path, "#{@passwd.dir}/#{@httpdir}/#{@diarydir}/tdiary.conf-en", *@fileutilOptions)
>+    FileUtils.cp(tempfile.path, "#{@passwd.dir}/#{@httpdir}/#{@diarydir}/tdiary.conf-en", @fileutilOptions)
> 
>     if ! FileTest.exist?("#{@passwd.dir}/#{@httpdir}/#{@diarydir}/tdiary.conf")
>-      FileUtils16.cp("#{@passwd.dir}/#{@httpdir}/#{@diarydir}/#{@tdconfig}", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}/tdiary.conf", *@fileutilOptions)
>+      FileUtils.cp("#{@passwd.dir}/#{@httpdir}/#{@diarydir}/#{@tdconfig}", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}/tdiary.conf", @fileutilOptions)
>     end
> 
>     tempfile = Tempfile.new("dot.htaccess")
>     tempfile.write dothtaccessReplace("#{@tdiarymaster}/dot.htaccess")
>     tempfile.close
>-    FileUtils16.cp(tempfile.path, "#{@passwd.dir}/#{@httpdir}/#{@diarydir}/dot.htaccess", *@fileutilOptions)
>+    FileUtils.cp(tempfile.path, "#{@passwd.dir}/#{@httpdir}/#{@diarydir}/dot.htaccess", @fileutilOptions)
>     if ! FileTest.exist?("#{@passwd.dir}/#{@httpdir}/#{@diarydir}/.htaccess")
>-      FileUtils16.cp("#{@passwd.dir}/#{@httpdir}/#{@diarydir}/dot.htaccess", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}/.htaccess", *@fileutilOptions)
>+      FileUtils.cp("#{@passwd.dir}/#{@httpdir}/#{@diarydir}/dot.htaccess", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}/.htaccess", @fileutilOptions)
>     end
>   end
> 
>   def setPermissions
>-    FileUtils16.chmod(0777, "#{@passwd.dir}/#{@diarydir}", *@fileutilOptions) if ! defined?($OPT_SUEXEC)
>-    FileUtils16.chmod(0777, "#{@passwd.dir}/#{@httpdir}/#{@diarydir}", *@fileutilOptions) if ! defined?($OPT_SUEXEC)
>-    FileUtils16.rm("#{@passwd.dir}/#{@httpdir}/#{@diarydir}/tdiary-FreeBSD.sh", :force, *@fileutilOptions)
>-
>-    FileUtils16.chmod(0701, "#{@passwd.dir}/#{@diarydir}", *@fileutilOptions) if defined?($OPT_SUEXEC)
>-    FileUtils16.chmod(0701, "#{@passwd.dir}/#{@httpdir}/#{@diarydir}", *@fileutilOptions) if defined?($OPT_SUEXEC)
>-    FileUtils16.chmod(0700, "#{@passwd.dir}/#{@httpdir}/#{@diarydir}/index.rb", *@fileutilOptions) if defined?($OPT_SUEXEC)
>-    FileUtils16.chmod(0700, "#{@passwd.dir}/#{@httpdir}/#{@diarydir}/update.rb", *@fileutilOptions) if defined?($OPT_SUEXEC)
>+    FileUtils.chmod(0777, "#{@passwd.dir}/#{@diarydir}", @fileutilOptions) if ! defined?($OPT_SUEXEC)
>+    FileUtils.chmod(0777, "#{@passwd.dir}/#{@httpdir}/#{@diarydir}", @fileutilOptions) if ! defined?($OPT_SUEXEC)
>+
>+    FileUtils.chmod(0701, "#{@passwd.dir}/#{@diarydir}", @fileutilOptions) if defined?($OPT_SUEXEC)
>+    FileUtils.chmod(0701, "#{@passwd.dir}/#{@httpdir}/#{@diarydir}", @fileutilOptions) if defined?($OPT_SUEXEC)
>+    FileUtils.chmod(0604, "#{@passwd.dir}/#{@httpdir}/#{@diarydir}/.htaccess", @fileutilOptions) if defined?($OPT_SUEXEC)
>+    FileUtils.chmod(0700, "#{@passwd.dir}/#{@httpdir}/#{@diarydir}/index.rb", @fileutilOptions) if defined?($OPT_SUEXEC)
>+    FileUtils.chmod(0700, "#{@passwd.dir}/#{@httpdir}/#{@diarydir}/update.rb", @fileutilOptions) if defined?($OPT_SUEXEC)
> 
>     if @euid == 0 then
>       Find.find("#{@passwd.dir}/#{@diarydir}", "#{@passwd.dir}/#{@httpdir}/#{@diarydir}") do |f|
>@@ -320,8 +260,8 @@
> tdiaryinst.httpdir = $OPT_HTTPDIR if defined?($OPT_HTTPDIR)
> tdiaryinst.author_name = $OPT_NAME if defined?($OPT_NAME)
> tdiaryinst.author_mail = $OPT_MAIL if defined?($OPT_MAIL)
>-tdiaryinst.fileutilOptions.push(:noop) if defined?($OPT_NOOP)
>-tdiaryinst.fileutilOptions.push(:verbose) if defined?($OPT_VERBOSE)
>+tdiaryinst.fileutilOptions.store(:noop, true) if defined?($OPT_NOOP)
>+tdiaryinst.fileutilOptions.store(:verbose, true) if defined?($OPT_VERBOSE)
> 
> tdiaryinst.installAll

Actions: View | Diff

Attachments on bug 121253: 85152