From owner-svn-ports-all@FreeBSD.ORG Tue Apr 29 04:57:56 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4FE64BB3; Tue, 29 Apr 2014 04:57:56 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3CF251043; Tue, 29 Apr 2014 04:57:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3T4vusp036584; Tue, 29 Apr 2014 04:57:56 GMT (envelope-from tota@svn.freebsd.org) Received: (from tota@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3T4vtdU036581; Tue, 29 Apr 2014 04:57:55 GMT (envelope-from tota@svn.freebsd.org) Message-Id: <201404290457.s3T4vtdU036581@svn.freebsd.org> From: TAKATSU Tomonari Date: Tue, 29 Apr 2014 04:57:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r352570 - in head/textproc/ruby-rttool: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Apr 2014 04:57:56 -0000 Author: tota Date: Tue Apr 29 04:57:55 2014 New Revision: 352570 URL: http://svnweb.freebsd.org/changeset/ports/352570 QAT: https://qat.redports.org/buildarchive/r352570/ Log: - Unbreak - Add LICENSE - Support STAGEDIR - Make DOCS and EXAMPLES unconditional to stage - Replace tab with a single space after WWW: in pkg-descr Added: head/textproc/ruby-rttool/files/ head/textproc/ruby-rttool/files/patch-setup.rb (contents, props changed) Modified: head/textproc/ruby-rttool/Makefile head/textproc/ruby-rttool/pkg-descr Modified: head/textproc/ruby-rttool/Makefile ============================================================================== --- head/textproc/ruby-rttool/Makefile Tue Apr 29 04:16:12 2014 (r352569) +++ head/textproc/ruby-rttool/Makefile Tue Apr 29 04:57:55 2014 (r352570) @@ -12,7 +12,7 @@ DIST_SUBDIR= ${RUBY_PKGNAMEPREFIX:S|${RU MAINTAINER= tota@FreeBSD.org COMMENT= RT into HTML and plain text converter -BROKEN= not staged +LICENSE= RUBY USE_RUBY= yes USE_RUBY_SETUP= yes @@ -24,20 +24,17 @@ RUBY_MODNAME= rt DOCS_EN= rttool.en.html rttool.en.rd DOCS_JA= rttool.ja.html rttool.ja.rd -NO_STAGE= yes +OPTIONS_DEFINE= DOCS EXAMPLES + post-install: -.if !defined(NOPORTDOCS) - ${MKDIR} ${RUBY_MODDOCDIR}/ja + @${MKDIR} ${STAGEDIR}${RUBY_MODDOCDIR}/ja .for f in ${DOCS_EN} - ${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/ + ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${RUBY_MODDOCDIR}/ .endfor .for f in ${DOCS_JA} - ${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/ja/ + ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${RUBY_MODDOCDIR}/ja/ .endfor -.endif -.if !defined(NOPORTEXAMPLES) - ${MKDIR} ${RUBY_MODEXAMPLESDIR} - cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${RUBY_MODEXAMPLESDIR} -.endif + @${MKDIR} ${STAGEDIR}${RUBY_MODEXAMPLESDIR} + cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${RUBY_MODEXAMPLESDIR} .include Added: head/textproc/ruby-rttool/files/patch-setup.rb ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/ruby-rttool/files/patch-setup.rb Tue Apr 29 04:57:55 2014 (r352570) @@ -0,0 +1,51 @@ +--- setup.rb.orig 2009-01-22 02:19:43.000000000 +0900 ++++ setup.rb 2014-04-29 06:10:59.000000000 +0900 +@@ -169,6 +169,11 @@ + args.each do |i| + if i == '--no-harm' then + @no_harm = true ++ elsif /\A--prefix=(.*)\z/ =~ i then ++ path = $1 ++ path = File.expand_path(path) unless path[0,1] == '/' ++ @config['prefix'] = path ++ @config.save + else + raise InstallError, "install: unknown option #{i}" + end +@@ -320,7 +325,7 @@ + + class ConfigTable + +- c = ::Config::CONFIG ++ c = ::RbConfig::CONFIG + + rubypath = c['bindir'] + '/' + c['ruby_install_name'] + +@@ -581,15 +586,15 @@ + # + + def install_bin +- install_all isdir(@config['bin-dir']), 0555 ++ install_all isdir(@config['prefix'] + @config['bin-dir']), 0555 + end + + def install_rb( dir ) +- install_all isdir(@config['rb-dir'] + '/' + dir), 0644 ++ install_all isdir(@config['prefix'] + @config['rb-dir'] + '/' + dir), 0644 + end + + def install_dat( dir ) +- install_all isdir(@config['data-dir'] + '/' + dir), 0644 ++ install_all isdir(@config['prefix'] + @config['data-dir'] + '/' + dir), 0644 + end + + def install_all( dest, mode ) +@@ -635,7 +640,7 @@ + end + end + +- DLEXT = ::Config::CONFIG['DLEXT'] ++ DLEXT = ::RbConfig::CONFIG['DLEXT'] + + def find_so( dir ) + fnames = nil Modified: head/textproc/ruby-rttool/pkg-descr ============================================================================== --- head/textproc/ruby-rttool/pkg-descr Tue Apr 29 04:16:12 2014 (r352569) +++ head/textproc/ruby-rttool/pkg-descr Tue Apr 29 04:57:55 2014 (r352570) @@ -5,4 +5,4 @@ RT can be incorporated into RD. At this time, RTtool can convert RT into HTML and plain text. To convert into plain text, you need w3m. -WWW: http://www.rubyist.net/~rubikitch/computer/rttool/index.en.html +WWW: http://www.rubyist.net/~rubikitch/computer/rttool/index.en.html