science/cdcl -> update to 5.3 and use gtk by default

science/cdcl-gtk     -> delete
science/ruby-dcl     -> update to 1.5 and use gtk by default
science/ruby-dcl-gtk -> delete
science/ruby-gphys   -> update to 0.3.5 and fix dependency
science/gave         -> update to 1.1.3 and fix dependency

PR:		ports/76853
Submitted by:	maintainer

4 files changed, 20 insertions, 13 deletions

diff --git a/science/gave/Makefile b/science/gave/Makefile
index 2a5a98e7e641..37daa54f225d 100644
--- a/science/gave/Makefile
+++ b/science/gave/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gave
-PORTVERSION=	1.0.3
-PORTREVISION=	1
+PORTVERSION=	1.1.3
 CATEGORIES=	science graphics ruby
 MASTER_SITES=	http://ruby.gfd-dennou.org/products/gave/
 DIST_SUBDIR=	ruby
@@ -16,7 +15,7 @@ MAINTAINER=	murakami@ahs.scitec.kobe-u.ac.jp
 COMMENT=	A gtk+ based grid data analyser and viewer written in Ruby
 
 RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/narray.so:${PORTSDIR}/math/ruby-narray \
-		${RUBY_SITEARCHLIBDIR}/numru/dcl_raw.so:${PORTSDIR}/science/ruby-dcl-gtk \
+		${RUBY_SITEARCHLIBDIR}/numru/dcl_raw.so:${PORTSDIR}/science/ruby-dcl \
 		${RUBY_SITEARCHLIBDIR}/numru/netcdfraw.so:${PORTSDIR}/math/ruby-netcdf \
 		${RUBY_SITELIBDIR}/numru/gphys.rb:${PORTSDIR}/science/ruby-gphys \
 		${RUBY_SITEARCHLIBDIR}/libglade2.so:${PORTSDIR}/devel/ruby-libglade2 \
@@ -24,8 +23,7 @@ RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/narray.so:${PORTSDIR}/math/ruby-narray \
 		${RUBY_SITEARCHLIBDIR}/gnomevfs.so:${PORTSDIR}/devel/ruby-gnomevfs
 
 USE_RUBY=	yes
-NO_BUILD=	yes
-USE_REINPLACE=	yes
+USE_RUBY_SETUP=	yes
 
 .include <bsd.port.pre.mk>
 
@@ -38,10 +36,14 @@ RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/iconv.so:${PORTSDIR}/converters/ruby-iconv
 .endif
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e 's/sitelibdir\+\"\/numru\/\"\+package/sitelibdir\+\"\/\"\+package/' ${WRKSRC}/install.rb
+DOCS=		ChangeLog README
 
-do-install:
-	@cd ${WRKSRC}/ && ${RUBY} ./install.rb --localedir=${PREFIX}/share/locale/
+post-install:
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${PREFIX}/share/doc/gave
+.for f in ${DOCS}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/gave
+.endfor
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/science/gave/distinfo b/science/gave/distinfo
index c7b77f0a6682..ae6009ca6a3d 100644
--- a/science/gave/distinfo
+++ b/science/gave/distinfo
@@ -1,2 +1,2 @@
-MD5 (ruby/gave-1.0.3.tar.gz) = 00249814b6c5572f91de2a01d62f4339
-SIZE (ruby/gave-1.0.3.tar.gz) = 21366
+MD5 (ruby/gave-1.1.3.tar.gz) = e98ad5d9c68f075e0552d400ca08ca43
+SIZE (ruby/gave-1.1.3.tar.gz) = 37044
diff --git a/science/gave/pkg-descr b/science/gave/pkg-descr
index f4cd8f36cd68..f6734380d07e 100644
--- a/science/gave/pkg-descr
+++ b/science/gave/pkg-descr
@@ -1,4 +1,3 @@
 Gave is a gtk+ based grid data analyser and viewer writen on Ruby.
 
-Author:	Seiya Nishizawa <seiya@kugi.kyoto-u.ac.jp>
 WWW:	http://ruby.gfd-dennou.org/products/gave/
diff --git a/science/gave/pkg-plist b/science/gave/pkg-plist
index 2a633e130ee5..a7b955df9be8 100644
--- a/science/gave/pkg-plist
+++ b/science/gave/pkg-plist
@@ -1,7 +1,13 @@
 bin/gave
 %%RUBY_SITELIBDIR%%/numru/gave/draw.rb
 %%RUBY_SITELIBDIR%%/numru/gave/fileselection.rb
-%%RUBY_SITELIBDIR%%/numru/gave/fileselection.glade
+%%RUBY_SITELIBDIR%%/numru/gave/gave_config.rb
 @dirrm %%RUBY_SITELIBDIR%%/numru/gave
 @unexec rmdir %B 2>/dev/null || true
+share/gave/glade/fileselection.glade
+@dirrm share/gave/glade
+@dirrm share/gave
 share/locale/ja/LC_MESSAGES/gave.mo
+%%PORTDOCS%%share/doc/gave/ChangeLog
+%%PORTDOCS%%share/doc/gave/README
+%%PORTDOCS%%@dirrm share/doc/gave