2 files changed, 70 insertions, 77 deletions

diff --git a/x11/ruby-kde/Makefile b/x11/ruby-kde/Makefile
index f446fc5f457b..95112fab5616 100644
--- a/x11/ruby-kde/Makefile
+++ b/x11/ruby-kde/Makefile
@@ -9,29 +9,24 @@ PORTNAME=	kde
 PORTVERSION=	0.12
 CATEGORIES=	x11 kde ruby
 MASTER_SITES=	http://sfns.u-shizuoka-ken.ac.jp/geneng/horie_hp/ruby/
-PKGNAMEPREFIX=	ruby-
+PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
 
-BUILD_DEPENDS=	ruby:${PORTSDIR}/lang/ruby
 LIB_DEPENDS=	kdecore.${KDELIB_SHLIBVER}:${PORTSDIR}/x11/${KDE_PORTNAME}
-RUN_DEPENDS=	ruby:${PORTSDIR}/lang/ruby \
-		${LOCALBASE}/lib/ruby/site_ruby/${RUBY_VER}/qt.rb:${PORTSDIR}/x11-toolkits/${RUBY_QT_PORTNAME}
+RUN_DEPENDS=	${LOCALBASE}/lib/ruby/site_ruby/${RUBY_VER}/qt.rb:${PORTSDIR}/x11-toolkits/${RUBY_QT_PORTNAME}
 
-INSTALL_TARGET=	site-install
+USE_RUBY=	yes
+USE_RUBY_EXTCONF=	yes
+
+WRKSRC=		${WRKDIR}/${PORTNAME}
 CONFIGURE_ARGS=	--with-x-dir=${X11BASE} \
 		--with-qt-include=${X11BASE}/include/X11/qt \
 		--with-qt-lib=${X11BASE}/lib \
 		--with-kde-dir=${LOCALBASE}
-
-WRKSRC=		${WRKDIR}/${PORTNAME}
-PLIST_SUB=	RUBY_VER="${RUBY_VER}" RUBY_ARCH="${RUBY_ARCH}"
-
-RUBY?=		${LOCALBASE}/bin/ruby
-RUBY_VER?=	1.4
-RUBY_ARCH?=	${ARCH}-freebsd${OSREL}
+INSTALL_TARGET=	site-install
 
 .if defined(WITH_I18N)
 QTLIB=		qti18n
@@ -46,17 +41,15 @@ KDE_PORTNAME=	kdelibs11
 RUBY_QT_PORTNAME=	ruby-qt
 .endif
 
-do-configure:
-	@cd ${WRKSRC}; \
-	${SETENV} ${CONFIGURE_ENV} ${RUBY} extconf.rb ${CONFIGURE_ARGS}
-
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/examples/ruby/kde
-	${CP} -R ${WRKSRC}/examples/ ${PREFIX}/share/examples/ruby/kde/
-	${MKDIR} ${PREFIX}/share/doc/ruby/kde/ja
-	${INSTALL_DATA} ${WRKSRC}/README.txt ${PREFIX}/share/doc/ruby/kde/
-	${INSTALL_DATA} ${WRKSRC}/README.jp.txt ${PREFIX}/share/doc/ruby/kde/ja/
+	${MKDIR} ${RUBY_EXAMPLESDIR}/kde
+	${CP} -R ${WRKSRC}/examples/ ${RUBY_EXAMPLESDIR}/kde/
+	${MKDIR} ${RUBY_DOCDIR}/kde/ja
+	${INSTALL_DATA} ${WRKSRC}/README.txt ${RUBY_DOCDIR}/kde/
+	${INSTALL_DATA} ${WRKSRC}/README.jp.txt ${RUBY_DOCDIR}/kde/ja/
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/Mk/bsd.ruby.mk"
+.include <bsd.port.post.mk>
diff --git a/x11/ruby-kde/pkg-plist b/x11/ruby-kde/pkg-plist
index 30a6d47fa30c..61340fe23d65 100644
--- a/x11/ruby-kde/pkg-plist
+++ b/x11/ruby-kde/pkg-plist
@@ -1,55 +1,55 @@
-lib/ruby/site_ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/kde.so
-lib/ruby/site_ruby/%%RUBY_VER%%/kde.rb
-share/examples/ruby/kde/classbrows/kdebrows.rb
-share/examples/ruby/kde/classbrows/rbbr_qt.rb
-share/examples/ruby/kde/classbrows/rbbr_rb.rb
-share/examples/ruby/kde/classbrows/rbdump.rb
-share/examples/ruby/kde/classbrows/kdebrows2.rb
-share/examples/ruby/kde/kapp/kapp1.rb
-share/examples/ruby/kde/kredit/kredit_lib.pot
-share/examples/ruby/kde/kredit/kde2ps
-share/examples/ruby/kde/kredit/kredit.rb
-share/examples/ruby/kde/kredit/kredit.rb.po
-share/examples/ruby/kde/kredit/kredit.rb.pot
-share/examples/ruby/kde/kredit/kredit_lib.rb
-share/examples/ruby/kde/kredit/readme.txt
-share/examples/ruby/kde/kredit/kredit.po
-share/examples/ruby/kde/kredit/kredit.mo
-share/examples/ruby/kde/kredit/kredit.rb.mo
-share/examples/ruby/kde/kredit/make_pot
-share/examples/ruby/kde/ksc/pics/circle_fill.xpm
-share/examples/ruby/kde/ksc/pics/fileopen.xpm
-share/examples/ruby/kde/ksc/pics/filefloppy.xpm
-share/examples/ruby/kde/ksc/pics/fileprint.xpm
-share/examples/ruby/kde/ksc/pics/editcopy.xpm
-share/examples/ruby/kde/ksc/pics/editcut.xpm
-share/examples/ruby/kde/ksc/pics/editpaste.xpm
-share/examples/ruby/kde/ksc/pics/arrow.xpm
-share/examples/ruby/kde/ksc/pics/pen.xpm
-share/examples/ruby/kde/ksc/pics/line.xpm
-share/examples/ruby/kde/ksc/pics/circle.xpm
-share/examples/ruby/kde/ksc/pics/rectangle.xpm
-share/examples/ruby/kde/ksc/pics/erase.xpm
-share/examples/ruby/kde/ksc/pics/filenew.xpm
-share/examples/ruby/kde/ksc/scarea.rb
-share/examples/ruby/kde/ksc/scglobal.rb
-share/examples/ruby/kde/ksc/scwindow.rb
-share/examples/ruby/kde/ksc/ksc.rb.pot
-share/examples/ruby/kde/ksc/ksc.rb.po
-share/examples/ruby/kde/ksc/ksc.rb.mo
-share/examples/ruby/kde/ksc/ksc.rb
-share/examples/ruby/kde/ksc/make_pot
-share/examples/ruby/kde/kwidgets/kwid.rb
-share/examples/ruby/kde/slider/kslider3.rb
-@dirrm share/examples/ruby/kde/classbrows
-@dirrm share/examples/ruby/kde/kapp
-@dirrm share/examples/ruby/kde/kredit
-@dirrm share/examples/ruby/kde/ksc/pics
-@dirrm share/examples/ruby/kde/ksc
-@dirrm share/examples/ruby/kde/kwidgets
-@dirrm share/examples/ruby/kde/slider
-@dirrm share/examples/ruby/kde
-share/doc/ruby/kde/README.txt
-share/doc/ruby/kde/ja/README.jp.txt
-@dirrm share/doc/ruby/kde/ja
-@dirrm share/doc/ruby/kde
+%%RUBY_SITEARCHLIBDIR%%/kde.so
+%%RUBY_SITELIBDIR%%/kde.rb
+%%RUBY_EXAMPLESDIR%%/kde/classbrows/kdebrows.rb
+%%RUBY_EXAMPLESDIR%%/kde/classbrows/rbbr_qt.rb
+%%RUBY_EXAMPLESDIR%%/kde/classbrows/rbbr_rb.rb
+%%RUBY_EXAMPLESDIR%%/kde/classbrows/rbdump.rb
+%%RUBY_EXAMPLESDIR%%/kde/classbrows/kdebrows2.rb
+%%RUBY_EXAMPLESDIR%%/kde/kapp/kapp1.rb
+%%RUBY_EXAMPLESDIR%%/kde/kredit/kredit_lib.pot
+%%RUBY_EXAMPLESDIR%%/kde/kredit/kde2ps
+%%RUBY_EXAMPLESDIR%%/kde/kredit/kredit.rb
+%%RUBY_EXAMPLESDIR%%/kde/kredit/kredit.rb.po
+%%RUBY_EXAMPLESDIR%%/kde/kredit/kredit.rb.pot
+%%RUBY_EXAMPLESDIR%%/kde/kredit/kredit_lib.rb
+%%RUBY_EXAMPLESDIR%%/kde/kredit/readme.txt
+%%RUBY_EXAMPLESDIR%%/kde/kredit/kredit.po
+%%RUBY_EXAMPLESDIR%%/kde/kredit/kredit.mo
+%%RUBY_EXAMPLESDIR%%/kde/kredit/kredit.rb.mo
+%%RUBY_EXAMPLESDIR%%/kde/kredit/make_pot
+%%RUBY_EXAMPLESDIR%%/kde/ksc/pics/circle_fill.xpm
+%%RUBY_EXAMPLESDIR%%/kde/ksc/pics/fileopen.xpm
+%%RUBY_EXAMPLESDIR%%/kde/ksc/pics/filefloppy.xpm
+%%RUBY_EXAMPLESDIR%%/kde/ksc/pics/fileprint.xpm
+%%RUBY_EXAMPLESDIR%%/kde/ksc/pics/editcopy.xpm
+%%RUBY_EXAMPLESDIR%%/kde/ksc/pics/editcut.xpm
+%%RUBY_EXAMPLESDIR%%/kde/ksc/pics/editpaste.xpm
+%%RUBY_EXAMPLESDIR%%/kde/ksc/pics/arrow.xpm
+%%RUBY_EXAMPLESDIR%%/kde/ksc/pics/pen.xpm
+%%RUBY_EXAMPLESDIR%%/kde/ksc/pics/line.xpm
+%%RUBY_EXAMPLESDIR%%/kde/ksc/pics/circle.xpm
+%%RUBY_EXAMPLESDIR%%/kde/ksc/pics/rectangle.xpm
+%%RUBY_EXAMPLESDIR%%/kde/ksc/pics/erase.xpm
+%%RUBY_EXAMPLESDIR%%/kde/ksc/pics/filenew.xpm
+%%RUBY_EXAMPLESDIR%%/kde/ksc/scarea.rb
+%%RUBY_EXAMPLESDIR%%/kde/ksc/scglobal.rb
+%%RUBY_EXAMPLESDIR%%/kde/ksc/scwindow.rb
+%%RUBY_EXAMPLESDIR%%/kde/ksc/ksc.rb.pot
+%%RUBY_EXAMPLESDIR%%/kde/ksc/ksc.rb.po
+%%RUBY_EXAMPLESDIR%%/kde/ksc/ksc.rb.mo
+%%RUBY_EXAMPLESDIR%%/kde/ksc/ksc.rb
+%%RUBY_EXAMPLESDIR%%/kde/ksc/make_pot
+%%RUBY_EXAMPLESDIR%%/kde/kwidgets/kwid.rb
+%%RUBY_EXAMPLESDIR%%/kde/slider/kslider3.rb
+@dirrm %%RUBY_EXAMPLESDIR%%/kde/classbrows
+@dirrm %%RUBY_EXAMPLESDIR%%/kde/kapp
+@dirrm %%RUBY_EXAMPLESDIR%%/kde/kredit
+@dirrm %%RUBY_EXAMPLESDIR%%/kde/ksc/pics
+@dirrm %%RUBY_EXAMPLESDIR%%/kde/ksc
+@dirrm %%RUBY_EXAMPLESDIR%%/kde/kwidgets
+@dirrm %%RUBY_EXAMPLESDIR%%/kde/slider
+@dirrm %%RUBY_EXAMPLESDIR%%/kde
+%%RUBY_DOCDIR%%/kde/README.txt
+%%RUBY_DOCDIR%%/kde/ja/README.jp.txt
+@dirrm %%RUBY_DOCDIR%%/kde/ja
+@dirrm %%RUBY_DOCDIR%%/kde