3 files changed, 31 insertions, 18 deletions

diff --git a/science/ruby-dcl/Makefile b/science/ruby-dcl/Makefile
index 3976ded4fefd..375f88cf7fa9 100644
--- a/science/ruby-dcl/Makefile
+++ b/science/ruby-dcl/Makefile
@@ -6,37 +6,36 @@
 #
 
 PORTNAME=	dcl
-PORTVERSION=	1.4.0
-PORTREVISION=	1
+PORTVERSION=	1.5.0
 CATEGORIES=	science graphics ruby
 MASTER_SITES=	http://www.gfd-dennou.org/arch/ruby/products/ruby-dcl/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	ruby-${PORTNAME}-${PORTVERSION}
 DIST_SUBDIR=	ruby
 
-MAINTAINER?=	murakami@ahs.scitec.kobe-u.ac.jp
-COMMENT?=	A Ruby interface to the scientific graphic library DCL
+MAINTAINER=	murakami@ahs.scitec.kobe-u.ac.jp
+COMMENT=	A Ruby interface to the scientific graphic library DCL
 
 BUILD_DEPENDS=	${RUBY_SITEARCHLIBDIR}/narray.so:${PORTSDIR}/math/ruby-narray
 RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/narray.so:${PORTSDIR}/math/ruby-narray
 
-USE_RUBY=	yes
-USE_RUBY_EXTCONF=	yes
-
-.if defined(WITH_GTK)
-PKGNAMESUFFIX=	-gtk
+.if defined(WITHOUT_GTK)
+.else
 RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/gdk_pixbuf2.so:${PORTSDIR}/graphics/ruby-gdk_pixbuf2 \
 		${RUBY_SITEARCHLIBDIR}/gtk2.so:${PORTSDIR}/x11-toolkits/ruby-gtk2
-BUILD_DEPENDS+=	${X11BASE}/lib/libcdcl52.a:${PORTSDIR}/science/cdcl-gtk
-.else
-BUILD_DEPENDS+=	${X11BASE}/lib/libcdcl52.a:${PORTSDIR}/science/cdcl
+BUILD_DEPENDS+=	${X11BASE}/lib/libcdcl53.a:${PORTSDIR}/science/cdcl
 .endif
 
+USE_RUBY=	yes
+USE_RUBY_EXTCONF=	yes
+
 DOCS=		ChangeLog README ToDo
 DEMODIRS=	gokuraku grph1 grph2 math2 rakuraku
 DEMOGOKU=	hop jump layout step u1d u2d
 DEMOGRPH1=	scpack sgpack slpack
-DEMOGRPH2=	grpack ucpack udegpk ulpack umpack uspack uupack uxyzpk ximage
+DEMOGRPH2=	grpack g2pack ucpack udegpk ulpack umpack uspack uupack \
+		uxyzpk ximage
+DEMOMATH1=	gt2dlib
 DEMOMATH2=	fftlib intrlib rnmlib vstlib
 DEMORAKU=	color kihon layout map3d miss quick u2d uspack uxyz
 DEMODAT=	grph1/scpack/t810630.dat grph1/scpack/t811231.dat \
@@ -46,7 +45,8 @@ DEMODAT=	grph1/scpack/t810630.dat grph1/scpack/t811231.dat \
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "amd64"
-BROKEN=		"Does not build on amd64 (Needs to link against shared libraries)"
+BROKEN=	"Does not build on amd64 (Needs to link against shared libraries
+)"
 .endif
 
 post-install:
@@ -67,6 +67,10 @@ post-install:
 	${MKDIR} ${RUBY_MODEXAMPLESDIR}/grph2/${f}
 	${INSTALL_DATA} ${WRKSRC}/demo/grph2/${f}/*.rb ${RUBY_MODEXAMPLESDIR}/grph2/${f}
 .endfor
+.for f in ${DEMOMATH1}
+	${MKDIR} ${RUBY_MODEXAMPLESDIR}/math1/${f}
+	${INSTALL_DATA} ${WRKSRC}/demo/math1/${f}/*.rb ${RUBY_MODEXAMPLESDIR}/math1/${f}
+.endfor
 .for f in ${DEMOMATH2}
 	${MKDIR} ${RUBY_MODEXAMPLESDIR}/math2/${f}
 	${INSTALL_DATA} ${WRKSRC}/demo/math2/${f}/*.rb ${RUBY_MODEXAMPLESDIR}/math2/${f}
diff --git a/science/ruby-dcl/distinfo b/science/ruby-dcl/distinfo
index d65f4856ad47..e22a3fe81cf5 100644
--- a/science/ruby-dcl/distinfo
+++ b/science/ruby-dcl/distinfo
@@ -1,2 +1,2 @@
-MD5 (ruby/ruby-dcl-1.4.0.tar.gz) = 3046e5896fb52b3a94d604c8d585a8b9
-SIZE (ruby/ruby-dcl-1.4.0.tar.gz) = 255368
+MD5 (ruby/ruby-dcl-1.5.0.tar.gz) = 3ccbe7e5539499f45502497de21c6cdc
+SIZE (ruby/ruby-dcl-1.5.0.tar.gz) = 245389
diff --git a/science/ruby-dcl/pkg-plist b/science/ruby-dcl/pkg-plist
index 2d90e8252040..5695e5aac6bc 100644
--- a/science/ruby-dcl/pkg-plist
+++ b/science/ruby-dcl/pkg-plist
@@ -1,5 +1,7 @@
 %%RUBY_SITEARCHLIBDIR%%/numru/dcl_raw.so
+@unexec rmdir %B 2>/dev/null || true
 %%RUBY_SITELIBDIR%%/numru/dcl.rb
+@unexec rmdir %B 2>/dev/null || true
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gokuraku/hop/hop.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gokuraku/jump/jump1.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gokuraku/jump/jump2.rb
@@ -46,6 +48,8 @@
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/grph1/slpack/slpk03.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/grph1/slpack/slpk04.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/grph2/grpack/grpk01.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/grph2/g2pack/g2pk01.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/grph2/g2pack/g2pk02.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/grph2/ucpack/ucpk01.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/grph2/ucpack/ucpk02.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/grph2/udegpk/u2df01.rb
@@ -57,7 +61,9 @@
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/grph2/udegpk/u2df07.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/grph2/udegpk/u2df08.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/grph2/ulpack/ulpk01.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/grph2/ulpack/ulpk01n.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/grph2/ulpack/ulpk02.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/grph2/ulpack/ulpk02n.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/grph2/umpack/t811231.dat
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/grph2/umpack/test01.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/grph2/umpack/test02.rb
@@ -67,6 +73,7 @@
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/grph2/umpack/test06.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/grph2/umpack/test07.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/grph2/umpack/test08.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/grph2/umpack/test09.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/grph2/umpack/umpk01.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/grph2/umpack/umpk02.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/grph2/umpack/umpk03.rb
@@ -104,6 +111,7 @@
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/grph2/ximage/MEMO
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/grph2/ximage/tomsclm.dat
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/grph2/ximage/ximg01.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/math1/gt2dlib/gt2d01.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/math2/fftlib/fftl01.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/math2/fftlib/fftl02.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/math2/intrlib/intr01.rb
@@ -173,6 +181,7 @@
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/grph1/slpack
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/grph1
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/grph2/grpack
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/grph2/g2pack
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/grph2/ucpack
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/grph2/udegpk
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/grph2/ulpack
@@ -182,6 +191,8 @@
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/grph2/uxyzpk
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/grph2/ximage
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/grph2
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/math1/gt2dlib
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/math1
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/math2/fftlib
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/math2/intrlib
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/math2/rnmlib
@@ -202,5 +213,3 @@
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ToDo
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
-@dirrm %%RUBY_SITEARCHLIBDIR%%/numru
-@dirrm %%RUBY_SITELIBDIR%%/numru