From owner-svn-ports-all@FreeBSD.ORG Mon May 27 19:52:01 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 4D7AD4F1; Mon, 27 May 2013 19:52:01 +0000 (UTC) (envelope-from cs@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 3F16C8F0; Mon, 27 May 2013 19:52:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4RJq1Bk034280; Mon, 27 May 2013 19:52:01 GMT (envelope-from cs@svn.freebsd.org) Received: (from cs@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4RJq01K034278; Mon, 27 May 2013 19:52:00 GMT (envelope-from cs@svn.freebsd.org) Message-Id: <201305271952.r4RJq01K034278@svn.freebsd.org> From: Carlo Strub Date: Mon, 27 May 2013 19:52:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r319283 - head/japanese/ruby-ming 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.14 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: Mon, 27 May 2013 19:52:01 -0000 Author: cs Date: Mon May 27 19:52:00 2013 New Revision: 319283 URL: http://svnweb.freebsd.org/changeset/ports/319283 Log: - Fix to work with Ruby 1.9 - Use better macro/function/class for Ruby 1.9 and later. - Use OPTIONS instead of NOPORTDOCS. PR: ports/178022 Submitted by: Hiroyuki Iwatsuki (maintainer) Modified: head/japanese/ruby-ming/Makefile head/japanese/ruby-ming/pkg-plist Modified: head/japanese/ruby-ming/Makefile ============================================================================== --- head/japanese/ruby-ming/Makefile Mon May 27 19:46:50 2013 (r319282) +++ head/japanese/ruby-ming/Makefile Mon May 27 19:52:00 2013 (r319283) @@ -8,17 +8,13 @@ PORTEPOCH= 1 CATEGORIES= japanese graphics ruby MASTER_SITES= RF MASTER_SITE_SUBDIR= mingruby -PKGNAMEPREFIX= ja-${RUBY_PKGNAMEPREFIX} DISTNAME= ${PORTNAME}-ruby-${RUBY_MING_VERSION} DIST_SUBDIR= ruby MAINTAINER= don@na.rim.or.jp COMMENT= Yet another Ming module for Ruby built with Japanese support -DEPRECATED= Does not work with Ruby 1.9 -EXPIRATION_DATE= 2013-05-02 - -LIB_DEPENDS= ming.3:${PORTSDIR}/japanese/ming +LIB_DEPENDS= ming:${PORTSDIR}/japanese/ming RUBY_MING_VERSION= 0.1.6 @@ -29,10 +25,19 @@ CONFIGURE_ARGS= -- --with-ming-include=$ DOCS_EN= ChangeLog README.en Usage_en.txt fonts.en DOCS_JA= README.ja Usage_ja.txt fonts.ja progress.rd +OPTIONS_DEFINE= DOCS EXAMPLES +OPTIONSFILE= ${PORT_DBDIR}/ja-ruby-${PORTNAME}/options + +.include + +PKGNAMEPREFIX:= ${PKGNAMEPREFIX}${RUBY_PKGNAMEPREFIX} + post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MEXAMPLES} ${MKDIR} ${RUBY_MODEXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/examples/* ${RUBY_MODEXAMPLESDIR}/ +.endif +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${RUBY_MODDOCDIR}/ja .for f in ${DOCS_EN} ${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/ @@ -42,8 +47,4 @@ post-install: .endfor .endif -.include -.if ${RUBY_VER} == 1.9 -BROKEN= does not build with ruby 1.9 -.endif .include Modified: head/japanese/ruby-ming/pkg-plist ============================================================================== --- head/japanese/ruby-ming/pkg-plist Mon May 27 19:46:50 2013 (r319282) +++ head/japanese/ruby-ming/pkg-plist Mon May 27 19:52:00 2013 (r319283) @@ -1,18 +1,18 @@ %%RUBY_SITEARCHLIBDIR%%/ming/ming.so @dirrm %%RUBY_SITEARCHLIBDIR%%/ming -%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/README -%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/action.rb -%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/button.rb -%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/drag.rb -%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gradient.rb -%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gradientxform.rb -%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/keypress.rb -%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/mousetrack.rb -%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/newbutton.rb -%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/shape.rb -%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/sparks.rb -%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/sprite.rb -%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%% +%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/README +%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/action.rb +%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/button.rb +%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/drag.rb +%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/gradient.rb +%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/gradientxform.rb +%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/keypress.rb +%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/mousetrack.rb +%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/newbutton.rb +%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/shape.rb +%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/sparks.rb +%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/sprite.rb +%%PORTEXAMPLES%%@dirrm %%RUBY_MODEXAMPLESDIR%% %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog %%PORTDOCS%%%%RUBY_MODDOCDIR%%/README.en %%PORTDOCS%%%%RUBY_MODDOCDIR%%/Usage_en.txt