- Switch to use vendor_dir with Ruby 1.8.7.

Bump PKGREVISION.

4 files changed, 40 insertions, 21 deletions

diff --git a/multimedia/ruby-ming/Makefile b/multimedia/ruby-ming/Makefile
index 7a864e1a798..06ea7d1713e 100644
--- a/multimedia/ruby-ming/Makefile
+++ b/multimedia/ruby-ming/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2008/04/04 15:31:39 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2008/06/19 14:52:45 taca Exp $
 
 DISTNAME=	ming-ruby-${VER}
 PKGNAME=	${RUBY_PKGPREFIX}-ming-${VER}
+PKGREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://rubyforge.org/frs/download.php/15678/
 
@@ -12,15 +13,19 @@ COMMENT=	Ruby extension to drive the Ming SWF library
 USE_RUBY_SETUP=	yes
 VER=		0.1.8
 
+CONFIGURE_ARGS+=	--siteruby=${PREFIX}/${RUBY_VENDORLIB_BASE} \
+			--siterubyver=${PREFIX}/${RUBY_VENDORLIB} \
+			--siterubyverarch=${PREFIX}/${RUBY_VENDORARCHLIB}
+
 EXAMPLES=		README.examples action.rb drag.rb \
 			gradient.rb gradientxform.rb hello.rb keypress.rb \
 			mousetrack.rb movieclip.rb newbutton.rb shape.rb
 REPLACE_RUBY_DIRS=	examples
+INSTALLATION_DIRS=	${RUBY_EG}/ming
 
 post-install:
-		${INSTALL_DATA_DIR} ${RUBY_EXAMPLESDIR}/ming
 .for f in ${EXAMPLES}
-		${INSTALL_DATA} ${WRKSRC}/examples/${f} ${RUBY_EXAMPLESDIR}/ming
+		${INSTALL_DATA} ${WRKSRC}/examples/${f} ${DESTDIR}${PREFIX}/${RUBY_EG}/ming
 .endfor
 
 .include "../../multimedia/ming/buildlink3.mk"
diff --git a/multimedia/ruby-ming/PLIST b/multimedia/ruby-ming/PLIST
index cb30594ac66..ad361db1177 100644
--- a/multimedia/ruby-ming/PLIST
+++ b/multimedia/ruby-ming/PLIST
@@ -1,17 +1,17 @@
-@comment $NetBSD: PLIST,v 1.3 2006/09/13 15:58:48 obache Exp $
-${RUBY_SITEARCHLIBDIR}/ming/mingc.${RUBY_DLEXT}
-${RUBY_SITELIBDIR}/ming/ming.rb
-${RUBY_EXAMPLESDIR}/ming/README.examples
-${RUBY_EXAMPLESDIR}/ming/action.rb
-${RUBY_EXAMPLESDIR}/ming/drag.rb
-${RUBY_EXAMPLESDIR}/ming/gradient.rb
-${RUBY_EXAMPLESDIR}/ming/gradientxform.rb
-${RUBY_EXAMPLESDIR}/ming/hello.rb
-${RUBY_EXAMPLESDIR}/ming/keypress.rb
-${RUBY_EXAMPLESDIR}/ming/mousetrack.rb
-${RUBY_EXAMPLESDIR}/ming/movieclip.rb
-${RUBY_EXAMPLESDIR}/ming/newbutton.rb
-${RUBY_EXAMPLESDIR}/ming/shape.rb
-@dirrm ${RUBY_SITEARCHLIBDIR}/ming
-@dirrm ${RUBY_SITELIBDIR}/ming
-@dirrm ${RUBY_EXAMPLESDIR}/ming
+@comment $NetBSD: PLIST,v 1.4 2008/06/19 14:52:45 taca Exp $
+${RUBY_VENDORARCHLIB}/ming/mingc.${RUBY_DLEXT}
+${RUBY_VENDORLIB}/ming/ming.rb
+${RUBY_EG}/ming/README.examples
+${RUBY_EG}/ming/action.rb
+${RUBY_EG}/ming/drag.rb
+${RUBY_EG}/ming/gradient.rb
+${RUBY_EG}/ming/gradientxform.rb
+${RUBY_EG}/ming/hello.rb
+${RUBY_EG}/ming/keypress.rb
+${RUBY_EG}/ming/mousetrack.rb
+${RUBY_EG}/ming/movieclip.rb
+${RUBY_EG}/ming/newbutton.rb
+${RUBY_EG}/ming/shape.rb
+@dirrm ${RUBY_VENDORARCHLIB}/ming
+@dirrm ${RUBY_VENDORLIB}/ming
+@dirrm ${RUBY_EG}/ming
diff --git a/multimedia/ruby-ming/distinfo b/multimedia/ruby-ming/distinfo
index 560dea4844c..ab412750369 100644
--- a/multimedia/ruby-ming/distinfo
+++ b/multimedia/ruby-ming/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.4 2007/03/17 16:11:08 taca Exp $
+$NetBSD: distinfo,v 1.5 2008/06/19 14:52:45 taca Exp $
 
 SHA1 (ming-ruby-0.1.8.tar.gz) = 5c6bf4f84d578f5b9f0ede60bc2e45e7ac0bdbc2
 RMD160 (ming-ruby-0.1.8.tar.gz) = 43060ed6e903f27c17ca38512cfabaf747abcdcf
 Size (ming-ruby-0.1.8.tar.gz) = 158877 bytes
+SHA1 (patch-aa) = 6a4ef5dc3611ed3b8909bedca34f72c07241d44e
diff --git a/multimedia/ruby-ming/patches/patch-ab b/multimedia/ruby-ming/patches/patch-ab
new file mode 100644
index 00000000000..584bf0ede31
--- /dev/null
+++ b/multimedia/ruby-ming/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2008/06/19 14:52:45 taca Exp $
+
+--- setup.rb.orig	2004-10-30 14:17:39.000000000 +0000
++++ setup.rb
+@@ -1109,7 +1109,7 @@ class Installer
+ 
+   def extconf
+     opt = @options['config-opt'].join(' ')
+-    command "#{config('rubyprog')} #{curr_srcdir()}/extconf.rb #{opt}"
++    command "#{config('rubyprog')} #{curr_srcdir()}/extconf.rb #{opt} --vendor"
+   end
+ 
+   def config_dir_data(rel)