Update to Ruby/Qt2 0.12.

Introduce ruby-qt2/Makefile.common to share the variables.

10 files changed, 113 insertions, 78 deletions

diff --git a/graphics/ruby-qt2gl/Makefile b/graphics/ruby-qt2gl/Makefile
index 10b89652c16c..ece13250f31e 100644
--- a/graphics/ruby-qt2gl/Makefile
+++ b/graphics/ruby-qt2gl/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	qt2gl
-PORTVERSION=	0.11
+PORTVERSION=	${RUBY_QT2_PORTVERSION}
 CATEGORIES=	graphics x11-toolkits ruby
-MASTER_SITES=	http://sfns.u-shizuoka-ken.ac.jp/geneng/horie_hp/ruby/
+MASTER_SITES=	${RUBY_QT2_MASTER_SITES}
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
-DISTNAME=	ruby-qt2-${PORTVERSION}
+DISTNAME=	${RUBY_QT2_DISTNAME}
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
@@ -19,17 +19,15 @@ BUILD_DEPENDS=	${RUBY_SITEARCHLIBDIR}/qt2.so:${RUBY_QT2_PORTDIR}
 RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/qt2.so:${RUBY_QT2_PORTDIR} \
 		${RUBY_SITEARCHLIBDIR}/opengl.so:${PORTSDIR}/graphics/ruby-opengl
 
-RUBY_QT2_PORTDIR=	${PORTSDIR}/x11-toolkits/ruby-qt2
-
-MD5_FILE=	${RUBY_QT2_PORTDIR}/distinfo
-
 USE_MESA=	yes
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
 
 USE_GMAKE=	yes
 
-WRKSRC=		${WRKDIR}/qt2/modules/opengl
+.include "${.CURDIR}/../../x11-toolkits/ruby-qt2/Makefile.common"
+
+WRKSRC=		${RUBY_QT2_WRKSRC}/modules/opengl
 CONFIGURE_ARGS=	--with-qt2-include=${X11BASE}/include/qt2 \
 		--with-qt2-lib=${X11BASE}/lib \
 		--with-qt2=qt2 \
@@ -42,10 +40,10 @@ post-extract:
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_EXAMPLESDIR}/qt2gl
-	${CP} -R ${WRKSRC}/examples/* ${RUBY_EXAMPLESDIR}/qt2gl/
-	${MKDIR} ${RUBY_DOCDIR}/qt2gl
-	${INSTALL_DATA} ${WRKSRC}/README ${RUBY_DOCDIR}/qt2gl/
+	${MKDIR} ${RUBY_EXAMPLESDIR}/${PORTNAME}
+	${CP} -R ${WRKSRC}/examples/* ${RUBY_EXAMPLESDIR}/${PORTNAME}/
+	${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}
+	${INSTALL_DATA} ${WRKSRC}/README ${RUBY_DOCDIR}/${PORTNAME}/
 .endif
 
 .include <bsd.port.mk>
diff --git a/graphics/ruby-qt2gl/files/patch-extconf.rb b/graphics/ruby-qt2gl/files/patch-extconf.rb
deleted file mode 100644
index 66a127f2a652..000000000000
--- a/graphics/ruby-qt2gl/files/patch-extconf.rb
+++ /dev/null
@@ -1,11 +0,0 @@
---- extconf.rb.orig	Mon Jan 15 13:37:15 2001
-+++ extconf.rb	Wed Feb  7 14:53:24 2001
-@@ -20,7 +20,7 @@
- 
- $CFLAGS += ' -I. -O -w '
- 
--if have_header('qapplication.h') and have_header('qgl.h') and have_library('qt','qGLVersion__Fv')
-+if have_header('qapplication.h') and have_header('qgl.h') and have_library(qt2,'qGLVersion__Fv')
-   create_makefile('qt2gl')
- else
-   print "You do not seem to have qt(+qgl) library. Plrease check qt or extconf.rb.\n"
diff --git a/textproc/ruby-qt2xml/Makefile b/textproc/ruby-qt2xml/Makefile
index 9d6431223225..a76afd1fcac9 100644
--- a/textproc/ruby-qt2xml/Makefile
+++ b/textproc/ruby-qt2xml/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	qt2xml
-PORTVERSION=	0.11
+PORTVERSION=	${RUBY_QT2_PORTVERSION}
 CATEGORIES=	textproc x11-toolkits ruby
-MASTER_SITES=	http://sfns.u-shizuoka-ken.ac.jp/geneng/horie_hp/ruby/
+MASTER_SITES=	${RUBY_QT2_MASTER_SITES}
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
-DISTNAME=	ruby-qt2-${PORTVERSION}
+DISTNAME=	${RUBY_QT2_DISTNAME}
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
@@ -18,16 +18,14 @@ MAINTAINER=	knu@FreeBSD.org
 BUILD_DEPENDS=	${RUBY_SITEARCHLIBDIR}/qt2.so:${RUBY_QT2_PORTDIR}
 RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/qt2.so:${RUBY_QT2_PORTDIR}
 
-RUBY_QT2_PORTDIR=	${PORTSDIR}/x11-toolkits/ruby-qt2
-
-MD5_FILE=	${RUBY_QT2_PORTDIR}/distinfo
-
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
 
 USE_GMAKE=	yes
 
-WRKSRC=		${WRKDIR}/qt2/modules/xml
+.include "${.CURDIR}/../../x11-toolkits/ruby-qt2/Makefile.common"
+
+WRKSRC=		${RUBY_QT2_WRKSRC}/modules/xml
 CONFIGURE_ARGS=	--with-qt2-include=${X11BASE}/include/qt2 \
 		--with-qt2-lib=${X11BASE}/lib \
 		--with-qt2=qt2 \
@@ -35,14 +33,10 @@ CONFIGURE_ARGS=	--with-qt2-include=${X11BASE}/include/qt2 \
 MAKE_ARGS=	LOCAL_LIBS=-lgcc
 INSTALL_TARGET=	site-install
 
-post-extract:
-	cd ${WRKSRC}/examples/domexample && \
-	${RM} domtest1.cc domtest1
-
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_EXAMPLESDIR}/qt2xml
-	${CP} -R ${WRKSRC}/examples/* ${RUBY_EXAMPLESDIR}/qt2xml/
+	${MKDIR} ${RUBY_EXAMPLESDIR}/${PORTNAME}
+	${CP} -R ${WRKSRC}/examples/* ${RUBY_EXAMPLESDIR}/${PORTNAME}/
 .endif
 
 .include <bsd.port.mk>
diff --git a/textproc/ruby-qt2xml/pkg-plist b/textproc/ruby-qt2xml/pkg-plist
index 9766e7b5a0b3..92d153a2206b 100644
--- a/textproc/ruby-qt2xml/pkg-plist
+++ b/textproc/ruby-qt2xml/pkg-plist
@@ -1,9 +1,31 @@
 %%RUBY_SITEARCHLIBDIR%%/qt2xml.so
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2xml/domexample/quotes.xml
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2xml/domexample/domtest1.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2xml/qui2rb/examples/example1/example1.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2xml/qui2rb/examples/example1/example1.ui
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2xml/qui2rb/examples/example2/example2.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2xml/qui2rb/examples/example2/example2.ui
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2xml/qui2rb/examples/example2/example2j.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2xml/qui2rb/examples/example2/example2j.ui
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2xml/qui2rb/examples/example3/example3.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2xml/qui2rb/examples/example3/example3.ui
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2xml/qui2rb/examples/example4/example4.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2xml/qui2rb/examples/example4/example4.ui
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2xml/qui2rb/examples/example5/example5.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2xml/qui2rb/examples/example5/example5.ui
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2xml/qui2rb/examples/example6/example6.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2xml/qui2rb/examples/example6/example6.ui
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2xml/qui2rb/formmaker.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2xml/qui2rb/ui2rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2xml/saxsample/sax.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2xml/saxsample/sample.xml
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2xml/saxsample/sample1.ui
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2xml/xml/tagreader-with-features/fnord.xml
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2xml/xml/tagreader-with-features/structureparser.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2xml/xml/tagreader-with-features/tagreader.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2xml/xml/tagreader/animals.xml
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2xml/xml/tagreader/structureparser.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2xml/xml/tagreader/tagreader.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2xml/xmlquotes/README.orig
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2xml/xmlquotes/quotes.xml
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2xml/xmlquotes/richtext.h.rb
@@ -12,6 +34,17 @@
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2xml/xmlquotes/xmlquotes.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2xml/xmlquotes/marble.png
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/qt2xml/domexample
+%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/qt2xml/qui2rb/examples/example1
+%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/qt2xml/qui2rb/examples/example2
+%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/qt2xml/qui2rb/examples/example3
+%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/qt2xml/qui2rb/examples/example4
+%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/qt2xml/qui2rb/examples/example5
+%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/qt2xml/qui2rb/examples/example6
+%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/qt2xml/qui2rb/examples
+%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/qt2xml/qui2rb
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/qt2xml/saxsample
+%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/qt2xml/xml/tagreader
+%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/qt2xml/xml/tagreader-with-features
+%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/qt2xml/xml
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/qt2xml/xmlquotes
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/qt2xml
diff --git a/x11-toolkits/ruby-qt2/Makefile b/x11-toolkits/ruby-qt2/Makefile
index ac6db0977192..68f13879d1f1 100644
--- a/x11-toolkits/ruby-qt2/Makefile
+++ b/x11-toolkits/ruby-qt2/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	qt2
-PORTVERSION=	0.11
-PORTREVISION=	1
+PORTVERSION=	${RUBY_QT2_PORTVERSION}
 CATEGORIES=	x11-toolkits ruby
-MASTER_SITES=	http://sfns.u-shizuoka-ken.ac.jp/geneng/horie_hp/ruby/
+MASTER_SITES=	${RUBY_QT2_MASTER_SITES}
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
-DISTNAME=	ruby-${PORTNAME}-${PORTVERSION}
+DISTNAME=	${RUBY_QT2_DISTNAME}
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
@@ -23,7 +22,9 @@ USE_RUBY_EXTCONF=	yes
 
 USE_GMAKE=	yes
 
-WRKSRC=		${WRKDIR}/${PORTNAME}
+.include "${.CURDIR}/Makefile.common"
+
+WRKSRC=		${RUBY_QT2_WRKSRC}
 CONFIGURE_ARGS=	--with-qt2-include=${X11BASE}/include/qt2 \
 		--with-qt2-lib=${X11BASE}/lib \
 		--with-qt2=qt2 \
@@ -39,12 +40,12 @@ post-patch:
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_EXAMPLESDIR}/qt2
-	${CP} -R ${WRKSRC}/examples/* ${RUBY_EXAMPLESDIR}/qt2/
-	${MKDIR} ${RUBY_DOCDIR}/qt2/ja
-	${CP} -R ${WRKSRC}/tutorial ${RUBY_DOCDIR}/qt2/
-	${INSTALL_DATA} ${WRKSRC}/README.txt ${RUBY_DOCDIR}/qt2/
-	${INSTALL_DATA} ${WRKSRC}/README.jp ${RUBY_DOCDIR}/qt2/ja/
+	${MKDIR} ${RUBY_EXAMPLESDIR}/${PORTNAME}
+	${CP} -R ${WRKSRC}/examples/* ${RUBY_EXAMPLESDIR}/${PORTNAME}/
+	${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}/ja
+	${CP} -R ${WRKSRC}/tutorial ${RUBY_DOCDIR}/${PORTNAME}/
+	${INSTALL_DATA} ${WRKSRC}/README.txt ${RUBY_DOCDIR}/${PORTNAME}/
+	${INSTALL_DATA} ${WRKSRC}/README.jp ${RUBY_DOCDIR}/${PORTNAME}/ja/
 .endif
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/ruby-qt2/Makefile.common b/x11-toolkits/ruby-qt2/Makefile.common
new file mode 100644
index 000000000000..27b6ce208b43
--- /dev/null
+++ b/x11-toolkits/ruby-qt2/Makefile.common
@@ -0,0 +1,12 @@
+# $FreeBSD$
+
+RUBY_QT2_VERSION=	0.12
+RUBY_QT2_PORTVERSION=	${RUBY_QT2_VERSION}
+RUBY_QT2_MASTER_SITES=	http://sfns.u-shizuoka-ken.ac.jp/geneng/horie_hp/ruby/
+RUBY_QT2_DISTNAME=	ruby-qt2-${RUBY_QT2_VERSION}
+
+RUBY_QT2_PORTDIR=	${PORTSDIR}/x11-toolkits/ruby-qt2
+
+RUBY_QT2_WRKSRC=	${WRKDIR}/qt2
+
+MD5_FILE=		${RUBY_QT2_PORTDIR}/distinfo
diff --git a/x11-toolkits/ruby-qt2/distinfo b/x11-toolkits/ruby-qt2/distinfo
index 6f523781f801..738a1b713197 100644
--- a/x11-toolkits/ruby-qt2/distinfo
+++ b/x11-toolkits/ruby-qt2/distinfo
@@ -1 +1 @@
-MD5 (ruby/ruby-qt2-0.11.tar.gz) = 32cd4dfb786c6cc9d8a0a88cb6c0a421
+MD5 (ruby/ruby-qt2-0.12.tar.gz) = 1b6b6678fd994e835ec8e2dff54ca577
diff --git a/x11-toolkits/ruby-qt2/pkg-plist b/x11-toolkits/ruby-qt2/pkg-plist
index 1bffac4f480e..820ae9bd4f7c 100644
--- a/x11-toolkits/ruby-qt2/pkg-plist
+++ b/x11-toolkits/ruby-qt2/pkg-plist
@@ -19,9 +19,15 @@
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2/classbrows/classtree.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2/classbrows/qt2brows3.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2/classbrows/qt2brows4.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2/classbrows/qt2brows5.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2/codec/codec.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2/codec/codec2.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2/colorButton/colorButton.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2/colorButton/colorButton2.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2/cursor/cursor.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2/dclock/README.orig
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2/dclock/dclock.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2/dclock/dclock_lib.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2/deleteQObj/test1.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2/deleteQObj/test2.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2/deleteQObj/test3.rb
@@ -42,6 +48,8 @@
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2/helpviewer/htmlviewer.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2/helpviewer/htmlwindow_lib.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2/layout/layout.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2/listview/flag_ja.xpm
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2/listview/listview.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2/mdi/document.xpm
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2/mdi/fileopen.xpm
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2/mdi/fileprint.xpm
@@ -53,8 +61,6 @@
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2/movies/movies.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2/popup/README
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2/popup/popup.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2/rubyedit/test.ps
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2/rubyedit/temp.txt
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2/rubyedit/editcopy.xpm
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2/rubyedit/editcut.xpm
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2/rubyedit/editpaste.xpm
@@ -62,14 +68,20 @@
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2/rubyedit/fileprint.xpm
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2/rubyedit/filesave.xpm
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2/rubyedit/kde2ps
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2/rubyedit/readme.txt
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2/rubyedit/rubyedit2.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2/rubyedit/rubyedit2_lib.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2/scribble2/qtscribble.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2/scribble2/qtscribble_win.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2/scribble2/qtscribble_ex.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2/signal/hello_signal.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2/signal/hello_signal_jp.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2/thread/dclock_lib.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2/thread/dclock_sub.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2/thread/iqt
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2/thread/iqt2.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2/thread/memoclock.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2/translate/translate.po
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2/translate/translate.qm
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2/translate/translate.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2/widgets/README.orig
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2/widgets/fileopen.xpm
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2/widgets/aclock_lib.rb
@@ -82,10 +94,6 @@
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2/widgets/tt-logo.png
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2/widgets/filesave.xpm
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2/widgets/widgets.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2/widgets/listview/flag_ja.xpm
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2/widgets/listview/listview.cpp
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2/widgets/listview/listview.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2/widgets/listview/listview2.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2/xform/README.orig
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2/xform/image.any
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/qt2/xform/picture.any
@@ -95,20 +103,24 @@
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/qt2/application_ruby
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/qt2/buttongroups
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/qt2/classbrows
+%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/qt2/codec
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/qt2/colorButton
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/qt2/cursor
+%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/qt2/dclock
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/qt2/deleteQObj
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/qt2/hello
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/qt2/hello_ruby
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/qt2/helpviewer
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/qt2/layout
+%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/qt2/listview
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/qt2/mdi
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/qt2/movies
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/qt2/popup
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/qt2/rubyedit
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/qt2/scribble2
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/qt2/signal
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/qt2/widgets/listview
+%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/qt2/thread
+%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/qt2/translate
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/qt2/widgets
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/qt2/xform
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/qt2
diff --git a/x11-toolkits/ruby-qt2canvas/Makefile b/x11-toolkits/ruby-qt2canvas/Makefile
index 3ad98badb64a..ad9e7f41ae19 100644
--- a/x11-toolkits/ruby-qt2canvas/Makefile
+++ b/x11-toolkits/ruby-qt2canvas/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	qt2canvas
-PORTVERSION=	0.11
+PORTVERSION=	${RUBY_QT2_PORTVERSION}
 CATEGORIES=	x11-toolkits ruby
-MASTER_SITES=	http://sfns.u-shizuoka-ken.ac.jp/geneng/horie_hp/ruby/
+MASTER_SITES=	${RUBY_QT2_MASTER_SITES}
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
-DISTNAME=	ruby-qt2-${PORTVERSION}
+DISTNAME=	${RUBY_QT2_DISTNAME}
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
@@ -18,16 +18,14 @@ MAINTAINER=	knu@FreeBSD.org
 BUILD_DEPENDS=	${RUBY_SITEARCHLIBDIR}/qt2.so:${RUBY_QT2_PORTDIR}
 RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/qt2.so:${RUBY_QT2_PORTDIR}
 
-RUBY_QT2_PORTDIR=	${PORTSDIR}/x11-toolkits/ruby-qt2
-
-MD5_FILE=	${RUBY_QT2_PORTDIR}/distinfo
-
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
 
 USE_GMAKE=	yes
 
-WRKSRC=		${WRKDIR}/qt2/modules/canvas
+.include "${.CURDIR}/../ruby-qt2/Makefile.common"
+
+WRKSRC=		${RUBY_QT2_WRKSRC}/modules/canvas
 CONFIGURE_ARGS=	--with-qt2-include=${X11BASE}/include/qt2 \
 		--with-qt2-lib=${X11BASE}/lib \
 		--with-qt2=qt2 \
@@ -37,8 +35,8 @@ INSTALL_TARGET=	site-install
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_EXAMPLESDIR}/qt2canvas
-	${CP} -R ${WRKSRC}/examples/* ${RUBY_EXAMPLESDIR}/qt2canvas/
+	${MKDIR} ${RUBY_EXAMPLESDIR}/${PORTNAME}
+	${CP} -R ${WRKSRC}/examples/* ${RUBY_EXAMPLESDIR}/${PORTNAME}/
 .endif
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/ruby-qt2table/Makefile b/x11-toolkits/ruby-qt2table/Makefile
index 7bdd0904e1a3..dddb8fb4a4f7 100644
--- a/x11-toolkits/ruby-qt2table/Makefile
+++ b/x11-toolkits/ruby-qt2table/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	qt2table
-PORTVERSION=	0.11
+PORTVERSION=	${RUBY_QT2_PORTVERSION}
 CATEGORIES=	x11-toolkits ruby
-MASTER_SITES=	http://sfns.u-shizuoka-ken.ac.jp/geneng/horie_hp/ruby/
+MASTER_SITES=	${RUBY_QT2_MASTER_SITES}
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
-DISTNAME=	ruby-qt2-${PORTVERSION}
+DISTNAME=	${RUBY_QT2_DISTNAME}
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
@@ -18,16 +18,14 @@ MAINTAINER=	knu@FreeBSD.org
 BUILD_DEPENDS=	${RUBY_SITEARCHLIBDIR}/qt2.so:${RUBY_QT2_PORTDIR}
 RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/qt2.so:${RUBY_QT2_PORTDIR}
 
-RUBY_QT2_PORTDIR=	${PORTSDIR}/x11-toolkits/ruby-qt2
-
-MD5_FILE=	${RUBY_QT2_PORTDIR}/distinfo
-
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
 
 USE_GMAKE=	yes
 
-WRKSRC=		${WRKDIR}/qt2/modules/table
+.include "${.CURDIR}/../ruby-qt2/Makefile.common"
+
+WRKSRC=		${RUBY_QT2_WRKSRC}/modules/table
 CONFIGURE_ARGS=	--with-qt2-include=${X11BASE}/include/qt2 \
 		--with-qt2-lib=${X11BASE}/lib \
 		--with-qt2=qt2 \
@@ -37,8 +35,8 @@ INSTALL_TARGET=	site-install
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_EXAMPLESDIR}/qt2table
-	${CP} -R ${WRKSRC}/examples/* ${RUBY_EXAMPLESDIR}/qt2table/
+	${MKDIR} ${RUBY_EXAMPLESDIR}/${PORTNAME}
+	${CP} -R ${WRKSRC}/examples/* ${RUBY_EXAMPLESDIR}/${PORTNAME}/
 .endif
 
 .include <bsd.port.mk>