- 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 <don@na.rim.or.jp> (maintainer)

2 files changed, 24 insertions, 23 deletions

diff --git a/japanese/ruby-ming/Makefile b/japanese/ruby-ming/Makefile
index 94edd9965184..db505f3efc54 100644
--- a/japanese/ruby-ming/Makefile
+++ b/japanese/ruby-ming/Makefile
@@ -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=${PREFIX}/include/ming --with-ming-lib=${
 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 <bsd.port.pre.mk>
+
+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 <bsd.port.pre.mk>
-.if ${RUBY_VER} == 1.9
-BROKEN=	does not build with ruby 1.9
-.endif
 .include <bsd.port.post.mk>
diff --git a/japanese/ruby-ming/pkg-plist b/japanese/ruby-ming/pkg-plist
index c3c7c444f119..f29e299e3460 100644
--- a/japanese/ruby-ming/pkg-plist
+++ b/japanese/ruby-ming/pkg-plist
@@ -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