8 files changed, 44 insertions, 38 deletions

diff --git a/x11/ruby-gnome/Makefile b/x11/ruby-gnome/Makefile
index f98ffa4fe2c7..ecc1821115ca 100644
--- a/x11/ruby-gnome/Makefile
+++ b/x11/ruby-gnome/Makefile
@@ -7,9 +7,9 @@
 
 PORTNAME=	gnome
 PORTVERSION=	${RUBY_GNOME_PORTVERSION}
-PORTREVISION=	1
 CATEGORIES=	x11 ruby
 MASTER_SITES=	${RUBY_GNOME_MASTER_SITES}
+MASTER_SITE_SUBDIR=	${RUBY_GNOME_MASTER_SITE_SUBDIR}
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	${RUBY_GNOME_DISTNAME}
 DIST_SUBDIR=	ruby
@@ -31,25 +31,22 @@ CONFIGURE_ARGS=	${GNOME_CONFIG}
 INSTALL_TARGET=	site-install
 
 DOCS_EN=	ChangeLog \
-		ENVIRONMENT \
-		README
-DOCS_JA=	README.ja
+		NEWS \
+		README \
+		ToDo
 
 post-extract:
 	${MKDIR} ${WRKSRC}/sample/browser
-	${MV} ${WRKSRC}/doc/rbbr.rb ${WRKSRC}/sample/browser
+	${MV} ${WRKSRC}/doc/*.rb ${WRKSRC}/sample/browser
 
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${RUBY_EXAMPLESDIR}/${PORTNAME}
 	${CP} -R ${WRKSRC}/sample/* ${RUBY_EXAMPLESDIR}/${PORTNAME}/
-	${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}/ja
+	${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}
 .for f in ${DOCS_EN}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/${PORTNAME}/
 .endfor
-.for f in ${DOCS_JA}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/${PORTNAME}/ja/
-.endfor
 .endif
 
 .include <bsd.port.mk>
diff --git a/x11/ruby-gnome/Makefile.common b/x11/ruby-gnome/Makefile.common
index 38c3cc9bc1ba..a00bb121c0c9 100644
--- a/x11/ruby-gnome/Makefile.common
+++ b/x11/ruby-gnome/Makefile.common
@@ -1,19 +1,22 @@
 # $FreeBSD$
 
-RUBY_GNOME_VERSION=		0.25
+RUBY_GNOME_VERSION=		0.26
 #RUBY_GNOME_SNAPSHOTDATE=	20010224
 .if defined(RUBY_GNOME_SNAPSHOTDATE)
 RUBY_GNOME_PORTVERSION=		${RUBY_GNOME_VERSION}.${RUBY_GNOME_SNAPSHOTDATE}
 .else
 RUBY_GNOME_PORTVERSION=		${RUBY_GNOME_VERSION}
 .endif
-RUBY_GNOME_MASTER_SITES=	http://www.ruby-lang.org/gtk/download/
-RUBY_GNOME_DISTNAME=		gnome-ruby-${RUBY_GNOME_VERSION}
+RUBY_GNOME_MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+RUBY_GNOME_MASTER_SITE_SUBDIR=	ruby-gnome
+RUBY_GNOME_DISTNAME=		ruby-gnome-${RUBY_GNOME_VERSION}
 
 .if defined(RUBY_GNOME_SNAPSHOTDATE)
-RUBY_GNOME_WRKSRC=		${WRKDIR}/gnome-ruby-snapshot-${RUBY_GNOME_SNAPSHOTDATE}
+RUBY_GNOME_WRKSRC=	${WRKDIR}/ruby-gnome-snapshot-${RUBY_GNOME_SNAPSHOTDATE}
 .else
-RUBY_GNOME_WRKSRC=		${WRKDIR}/${RUBY_GNOME_DISTNAME}
+RUBY_GNOME_WRKSRC=	${WRKDIR}/${RUBY_GNOME_DISTNAME}
 .endif
 
-MD5_FILE=	${PORTSDIR}/x11/ruby-gnome/distinfo
+RUBY_GNOME_PORTDIR=	${PORTSDIR}/x11/ruby-gnome
+
+MD5_FILE=	${RUBY_GNOME_PORTDIR}/distinfo
diff --git a/x11/ruby-gnome/distinfo b/x11/ruby-gnome/distinfo
index a6f2755bd73a..9a42c99e3be7 100644
--- a/x11/ruby-gnome/distinfo
+++ b/x11/ruby-gnome/distinfo
@@ -1 +1 @@
-MD5 (ruby/gnome-ruby-0.25.tar.gz) = ddd47c525f1441eed598ec5091de2a89
+MD5 (ruby/ruby-gnome-0.26.tar.gz) = 99e7afbe89ee2c74303563cd768b0e27
diff --git a/x11/ruby-gnome/pkg-plist b/x11/ruby-gnome/pkg-plist
index e561fc8f2922..f36eb5ffad5a 100644
--- a/x11/ruby-gnome/pkg-plist
+++ b/x11/ruby-gnome/pkg-plist
@@ -1,7 +1,11 @@
 %%RUBY_SITEARCHLIBDIR%%/gnome.so
 %%RUBY_SITELIBDIR%%/gnome.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gnome/animator_demo.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gnome/browser/gnobrows.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gnome/browser/rbbr.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gnome/browser/rbbr_gnome.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gnome/browser/rbbr_rb.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gnome/browser/rbdump.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gnome/gnome-hello/README.ja
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gnome/gnome-hello/gnoconfig.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gnome/gnome-hello/gnome-hello-0-basic.rb
@@ -28,8 +32,7 @@
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/gnome/browser
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/gnome
 %%PORTDOCS%%%%RUBY_DOCDIR%%/gnome/ChangeLog
-%%PORTDOCS%%%%RUBY_DOCDIR%%/gnome/ENVIRONMENT
+%%PORTDOCS%%%%RUBY_DOCDIR%%/gnome/NEWS
 %%PORTDOCS%%%%RUBY_DOCDIR%%/gnome/README
-%%PORTDOCS%%%%RUBY_DOCDIR%%/gnome/ja/README.ja
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/gnome/ja
+%%PORTDOCS%%%%RUBY_DOCDIR%%/gnome/ToDo
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/gnome
diff --git a/x11/ruby-gnome2/Makefile b/x11/ruby-gnome2/Makefile
index f98ffa4fe2c7..ecc1821115ca 100644
--- a/x11/ruby-gnome2/Makefile
+++ b/x11/ruby-gnome2/Makefile
@@ -7,9 +7,9 @@
 
 PORTNAME=	gnome
 PORTVERSION=	${RUBY_GNOME_PORTVERSION}
-PORTREVISION=	1
 CATEGORIES=	x11 ruby
 MASTER_SITES=	${RUBY_GNOME_MASTER_SITES}
+MASTER_SITE_SUBDIR=	${RUBY_GNOME_MASTER_SITE_SUBDIR}
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	${RUBY_GNOME_DISTNAME}
 DIST_SUBDIR=	ruby
@@ -31,25 +31,22 @@ CONFIGURE_ARGS=	${GNOME_CONFIG}
 INSTALL_TARGET=	site-install
 
 DOCS_EN=	ChangeLog \
-		ENVIRONMENT \
-		README
-DOCS_JA=	README.ja
+		NEWS \
+		README \
+		ToDo
 
 post-extract:
 	${MKDIR} ${WRKSRC}/sample/browser
-	${MV} ${WRKSRC}/doc/rbbr.rb ${WRKSRC}/sample/browser
+	${MV} ${WRKSRC}/doc/*.rb ${WRKSRC}/sample/browser
 
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${RUBY_EXAMPLESDIR}/${PORTNAME}
 	${CP} -R ${WRKSRC}/sample/* ${RUBY_EXAMPLESDIR}/${PORTNAME}/
-	${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}/ja
+	${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}
 .for f in ${DOCS_EN}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/${PORTNAME}/
 .endfor
-.for f in ${DOCS_JA}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/${PORTNAME}/ja/
-.endfor
 .endif
 
 .include <bsd.port.mk>
diff --git a/x11/ruby-gnome2/Makefile.common b/x11/ruby-gnome2/Makefile.common
index 38c3cc9bc1ba..a00bb121c0c9 100644
--- a/x11/ruby-gnome2/Makefile.common
+++ b/x11/ruby-gnome2/Makefile.common
@@ -1,19 +1,22 @@
 # $FreeBSD$
 
-RUBY_GNOME_VERSION=		0.25
+RUBY_GNOME_VERSION=		0.26
 #RUBY_GNOME_SNAPSHOTDATE=	20010224
 .if defined(RUBY_GNOME_SNAPSHOTDATE)
 RUBY_GNOME_PORTVERSION=		${RUBY_GNOME_VERSION}.${RUBY_GNOME_SNAPSHOTDATE}
 .else
 RUBY_GNOME_PORTVERSION=		${RUBY_GNOME_VERSION}
 .endif
-RUBY_GNOME_MASTER_SITES=	http://www.ruby-lang.org/gtk/download/
-RUBY_GNOME_DISTNAME=		gnome-ruby-${RUBY_GNOME_VERSION}
+RUBY_GNOME_MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+RUBY_GNOME_MASTER_SITE_SUBDIR=	ruby-gnome
+RUBY_GNOME_DISTNAME=		ruby-gnome-${RUBY_GNOME_VERSION}
 
 .if defined(RUBY_GNOME_SNAPSHOTDATE)
-RUBY_GNOME_WRKSRC=		${WRKDIR}/gnome-ruby-snapshot-${RUBY_GNOME_SNAPSHOTDATE}
+RUBY_GNOME_WRKSRC=	${WRKDIR}/ruby-gnome-snapshot-${RUBY_GNOME_SNAPSHOTDATE}
 .else
-RUBY_GNOME_WRKSRC=		${WRKDIR}/${RUBY_GNOME_DISTNAME}
+RUBY_GNOME_WRKSRC=	${WRKDIR}/${RUBY_GNOME_DISTNAME}
 .endif
 
-MD5_FILE=	${PORTSDIR}/x11/ruby-gnome/distinfo
+RUBY_GNOME_PORTDIR=	${PORTSDIR}/x11/ruby-gnome
+
+MD5_FILE=	${RUBY_GNOME_PORTDIR}/distinfo
diff --git a/x11/ruby-gnome2/distinfo b/x11/ruby-gnome2/distinfo
index a6f2755bd73a..9a42c99e3be7 100644
--- a/x11/ruby-gnome2/distinfo
+++ b/x11/ruby-gnome2/distinfo
@@ -1 +1 @@
-MD5 (ruby/gnome-ruby-0.25.tar.gz) = ddd47c525f1441eed598ec5091de2a89
+MD5 (ruby/ruby-gnome-0.26.tar.gz) = 99e7afbe89ee2c74303563cd768b0e27
diff --git a/x11/ruby-gnome2/pkg-plist b/x11/ruby-gnome2/pkg-plist
index e561fc8f2922..f36eb5ffad5a 100644
--- a/x11/ruby-gnome2/pkg-plist
+++ b/x11/ruby-gnome2/pkg-plist
@@ -1,7 +1,11 @@
 %%RUBY_SITEARCHLIBDIR%%/gnome.so
 %%RUBY_SITELIBDIR%%/gnome.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gnome/animator_demo.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gnome/browser/gnobrows.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gnome/browser/rbbr.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gnome/browser/rbbr_gnome.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gnome/browser/rbbr_rb.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gnome/browser/rbdump.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gnome/gnome-hello/README.ja
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gnome/gnome-hello/gnoconfig.rb
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/gnome/gnome-hello/gnome-hello-0-basic.rb
@@ -28,8 +32,7 @@
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/gnome/browser
 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/gnome
 %%PORTDOCS%%%%RUBY_DOCDIR%%/gnome/ChangeLog
-%%PORTDOCS%%%%RUBY_DOCDIR%%/gnome/ENVIRONMENT
+%%PORTDOCS%%%%RUBY_DOCDIR%%/gnome/NEWS
 %%PORTDOCS%%%%RUBY_DOCDIR%%/gnome/README
-%%PORTDOCS%%%%RUBY_DOCDIR%%/gnome/ja/README.ja
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/gnome/ja
+%%PORTDOCS%%%%RUBY_DOCDIR%%/gnome/ToDo
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/gnome