18 files changed, 186 insertions, 317 deletions

diff --git a/MOVED b/MOVED
index ed4c317b6208..3424719be967 100644
--- a/MOVED
+++ b/MOVED
@@ -1439,3 +1439,5 @@ x11/wmessage||2005-02-18|port was broken or obsolete
 lang/aleph|lang/afnix|2005-02-19|project renamed
 net/ipw||2005-02-19|abandoned
 misc/pg|sysutils/heirloom|2005-02-21|abandoned
+science/cdcl-gtk|science/cdcl|2005-02-24|master port depend on gtk now
+science/ruby-dcl-gtk|science/ruby-dcl|2005-02-24|master port depend on gtk now
diff --git a/science/Makefile b/science/Makefile
index e0c735265b51..a3508ef5de2d 100644
--- a/science/Makefile
+++ b/science/Makefile
@@ -9,7 +9,6 @@
     SUBDIR += bblimage
     SUBDIR += buddy
     SUBDIR += cdcl
-    SUBDIR += cdcl-gtk
     SUBDIR += chemtool
     SUBDIR += chemtool-devel
     SUBDIR += clhep
@@ -51,7 +50,6 @@
     SUBDIR += py-scipy
     SUBDIR += qcl
     SUBDIR += ruby-dcl
-    SUBDIR += ruby-dcl-gtk
     SUBDIR += ruby-gphys
     SUBDIR += simlib
     SUBDIR += udunits
diff --git a/science/cdcl-gtk/Makefile b/science/cdcl-gtk/Makefile
deleted file mode 100644
index 8c20773e99ea..000000000000
--- a/science/cdcl-gtk/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# New ports collection makefile for:	DCL-C-Gtk
-# Date created:		15 February 2004
-# Whom:			Shin'ya Murakami <murakami@ahs.scitec.kobe-u.ac.jp>
-#
-# $FreeBSD$
-#
-
-PORTREVISION=	3
-
-MAINTAINER=	murakami@ahs.scitec.kobe-u.ac.jp
-COMMENT=	Scientific graphic library for geoscience (with gtk support)
-
-WITH_GTK=	yes
-
-MD5_FILE=	${.CURDIR}/../cdcl/distinfo
-DESCR=		${.CURDIR}/../cdcl/pkg-descr
-PLIST=		${.CURDIR}/../cdcl/pkg-plist
-
-MASTERDIR=	${.CURDIR}/../cdcl
-
-.include	"${MASTERDIR}/Makefile"
diff --git a/science/cdcl/Makefile b/science/cdcl/Makefile
index a1b79b0df9eb..5b8fb378b689 100644
--- a/science/cdcl/Makefile
+++ b/science/cdcl/Makefile
@@ -6,30 +6,38 @@
 #
 
 PORTNAME=	cdcl
-PORTVERSION=	5.2.3
+PORTVERSION=	5.3
 CATEGORIES=	science graphics
 MASTER_SITES=	http://www.gfd-dennou.org/arch/dcl/
-DISTNAME=	dcl-5.2-C.3
+DISTNAME=	dcl-5.3-C
 
-MAINTAINER?=	murakami@ahs.scitec.kobe-u.ac.jp
-COMMENT?=	Scientific graphic library for geoscience
+MAINTAINER=	murakami@ahs.scitec.kobe-u.ac.jp
+COMMENT=	Scientific graphic library for geoscience
 
-.if defined(WITH_GTK)
-PKGNAMESUFFIX=	-gtk
-PATCH_SITES=	http://www-mete.kugi.kyoto-u.ac.jp/seiya/dcl/tarball/
-PATCHFILES=	${DISTNAME}-gtk2-5.patch
-PATCH_DIST_STRIP=	-p1
+.if defined(WITHOUT_GTK)
+.else
 USE_GNOME=	gtk20
 .endif
 
-WRKSRC=		${WRKDIR}/dcl-5.2-C
 USE_X_PREFIX=	yes
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
-MAKE_ENV=	DCLDIR=${WRKDIR}
+CONFIGURE_ARGS=	--prefix=${PREFIX} --exec-prefix=${PREFIX} --libdir=${PREFIX}/lb/${PORTNAME}-${PORTVERSION} --with-x
 
-BINARIES=	cdclclr cdcldate cdcldbs cdclexec cdclfont cdclpara \
-		cdcltone cdcltrf cdclver
-DOCFILES=	CHECK CREDITS HISTORY README
+.if defined(WITHOUT_GTK)
+CUNFIGURE_ARGS+=	--disable-gtk --disable-gtk2
+.endif
+
+DCL_VERSION=	${PORTVERSION}-C
+PLIST_SUB=	DCL_VERSION=${DCL_VERSION}
+
+BINARIES=	cdclcmap cdclclr cdcldate cdcldbs cdclexec cdclfont \
+		cdclpara cdcltone cdcltrf cdclver
+PSLIBS=		dclps2kdraw dclpscat dclpsfix dclpsfont dclpsline \
+		dclpsmargin dclpsmerge dclpsnup dclpsrmcm dclpsrot \
+		dclpsselect dclpsseparate dclpsunrot
+DOCFILES=	CHECK CREDITS HISTORY README README_clrmap README_gt2dlib \
+		README_itr51 README_pslib README_umfmap
 DEMODIRS=	gokuraku grph1 grph2 math1 math2 misc1 misc2 rakuraku
 DEMOGOKUDIR=	hop jump layout step u1d u2d
 DEMOGRPH1DIR=	scpack sgpack slpack
@@ -43,6 +51,15 @@ DEMORAKUDIR=	color kihon layout map3d miss quick u2d uspack uxyz
 
 RESTRICTED=	"No commercial use"
 
+pre-build:
+	@cd ${WRKSRC}
+	@${REINPLACE_CMD} -e 's+dcldbase+dcldbase-${PORTVERSION}-C+' ${WRKSRC}/Mkinclude
+	@${REINPLACE_CMD} -e 's+dclps+cdclps+g' ${WRKSRC}/bin/Makefile
+	@${REINPLACE_CMD} -e 's+dclps+cdclps+g' ${WRKSRC}/src/env2/pslib/Makefile
+.for i in ${PSLIBS}
+	${MV} ${WRKSRC}/src/env2/pslib/${i} ${WRKSRC}/src/env2/pslib/c${i}
+.endfor
+
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${EXAMPLESDIR}
diff --git a/science/cdcl/distinfo b/science/cdcl/distinfo
index 7f0885878cf9..c060979e9ca5 100644
--- a/science/cdcl/distinfo
+++ b/science/cdcl/distinfo
@@ -1,4 +1,2 @@
-MD5 (dcl-5.2-C.3.tar.gz) = 70873b03c0dd854c52522013a7852c09
-SIZE (dcl-5.2-C.3.tar.gz) = 943976
-MD5 (dcl-5.2-C.3-gtk2-5.patch) = 6d3435a2fe26b1adc6b1f26b291523b7
-SIZE (dcl-5.2-C.3-gtk2-5.patch) = 427345
+MD5 (dcl-5.3-C.tar.gz) = abbf7e26f49ff95af6141ede9293181e
+SIZE (dcl-5.3-C.tar.gz) = 1052506
diff --git a/science/cdcl/pkg-plist b/science/cdcl/pkg-plist
index 9aebd5aa42c9..4831e5ba064d 100644
--- a/science/cdcl/pkg-plist
+++ b/science/cdcl/pkg-plist
@@ -1,509 +1,347 @@
 bin/cdclcc
+bin/cdclcmap
 bin/cdclclr
 bin/cdclconfig
-bin/cdclconfig52
+bin/cdclconfig53
 bin/cdcldate
 bin/cdcldbs
 bin/cdclexec
 bin/cdclfont
 bin/cdclpara
+bin/cdclps2kdraw
+bin/cdclpscat
+bin/cdclpsfix
+bin/cdclpsfont
+bin/cdclpsline
+bin/cdclpsmargin
+bin/cdclpsmerge
+bin/cdclpsnup
+bin/cdclpsrmcm
+bin/cdclpsrot
+bin/cdclpsselect
+bin/cdclpsseparate
+bin/cdclpsunrot
 bin/cdcltone
 bin/cdcltrf
 bin/cdclver
 bin/crepsl
 include/libtinyf2c.h
 include/cdcl.h
-lib/dcldbase/bitmap.x11
-lib/dcldbase/border_world
-lib/dcldbase/cl2tnmap
-lib/dcldbase/coast_japan
-lib/dcldbase/coast_world
-lib/dcldbase/coast_world_1
-lib/dcldbase/colormap.x11
-lib/dcldbase/font1u
-lib/dcldbase/font2u
-lib/dcldbase/plate_world
-lib/dcldbase/pref_japan
-lib/dcldbase/state_usa
-lib/libcdcl52.a
+lib/dcldbase-%%DCL_VERSION%%/bitmap.x11
+lib/dcldbase-%%DCL_VERSION%%/border_world
+lib/dcldbase-%%DCL_VERSION%%/cl2tnmap
+lib/dcldbase-%%DCL_VERSION%%/cmaplist
+lib/dcldbase-%%DCL_VERSION%%/coast_japan
+lib/dcldbase-%%DCL_VERSION%%/coast_world
+lib/dcldbase-%%DCL_VERSION%%/coast_world_1
+lib/dcldbase-%%DCL_VERSION%%/colormap.x11
+lib/dcldbase-%%DCL_VERSION%%/colormap_01.x11
+lib/dcldbase-%%DCL_VERSION%%/colormap_02.x11
+lib/dcldbase-%%DCL_VERSION%%/colormap_03.x11
+lib/dcldbase-%%DCL_VERSION%%/colormap_04.x11
+lib/dcldbase-%%DCL_VERSION%%/colormap_05.x11
+lib/dcldbase-%%DCL_VERSION%%/colormap_06.x11
+lib/dcldbase-%%DCL_VERSION%%/colormap_07.x11
+lib/dcldbase-%%DCL_VERSION%%/colormap_08.x11
+lib/dcldbase-%%DCL_VERSION%%/colormap_09.x11
+lib/dcldbase-%%DCL_VERSION%%/colormap_10.x11
+lib/dcldbase-%%DCL_VERSION%%/colormap_11.x11
+lib/dcldbase-%%DCL_VERSION%%/colormap_12.x11
+lib/dcldbase-%%DCL_VERSION%%/colormap_13.x11
+lib/dcldbase-%%DCL_VERSION%%/font1u
+lib/dcldbase-%%DCL_VERSION%%/font2u
+lib/dcldbase-%%DCL_VERSION%%/plate_world
+lib/dcldbase-%%DCL_VERSION%%/pref_japan
+lib/dcldbase-%%DCL_VERSION%%/state_usa
+lib/libcdcl53.a
 lib/libf2c4dcl.a
 %%PORTDOCS%%share/doc/cdcl/CHECK
 %%PORTDOCS%%share/doc/cdcl/CREDITS
 %%PORTDOCS%%share/doc/cdcl/HISTORY
 %%PORTDOCS%%share/doc/cdcl/README
+%%PORTDOCS%%share/doc/cdcl/README_clrmap
+%%PORTDOCS%%share/doc/cdcl/README_gt2dlib
+%%PORTDOCS%%share/doc/cdcl/README_itr51
+%%PORTDOCS%%share/doc/cdcl/README_pslib
+%%PORTDOCS%%share/doc/cdcl/README_umfmap
 %%PORTDOCS%%@dirrm share/doc/cdcl
 %%PORTDOCS%%share/examples/cdcl/Makefile
 %%PORTDOCS%%share/examples/cdcl/gokuraku/Makefile
 %%PORTDOCS%%share/examples/cdcl/gokuraku/hop/Makefile
-%%PORTDOCS%%share/examples/cdcl/gokuraku/hop/hop.P
 %%PORTDOCS%%share/examples/cdcl/gokuraku/hop/hop.c
 %%PORTDOCS%%share/examples/cdcl/gokuraku/jump/Makefile
-%%PORTDOCS%%share/examples/cdcl/gokuraku/jump/jump1.P
 %%PORTDOCS%%share/examples/cdcl/gokuraku/jump/jump1.c
-%%PORTDOCS%%share/examples/cdcl/gokuraku/jump/jump2.P
 %%PORTDOCS%%share/examples/cdcl/gokuraku/jump/jump2.c
 %%PORTDOCS%%share/examples/cdcl/gokuraku/layout/Makefile
-%%PORTDOCS%%share/examples/cdcl/gokuraku/layout/lay1.P
 %%PORTDOCS%%share/examples/cdcl/gokuraku/layout/lay1.c
-%%PORTDOCS%%share/examples/cdcl/gokuraku/layout/lay2.P
 %%PORTDOCS%%share/examples/cdcl/gokuraku/layout/lay2.c
 %%PORTDOCS%%share/examples/cdcl/gokuraku/step/Makefile
-%%PORTDOCS%%share/examples/cdcl/gokuraku/step/step1.P
 %%PORTDOCS%%share/examples/cdcl/gokuraku/step/step1.c
-%%PORTDOCS%%share/examples/cdcl/gokuraku/step/step2.P
 %%PORTDOCS%%share/examples/cdcl/gokuraku/step/step2.c
 %%PORTDOCS%%share/examples/cdcl/gokuraku/u1d/Makefile
-%%PORTDOCS%%share/examples/cdcl/gokuraku/u1d/u1d1.P
 %%PORTDOCS%%share/examples/cdcl/gokuraku/u1d/u1d1.c
-%%PORTDOCS%%share/examples/cdcl/gokuraku/u1d/u1d2.P
 %%PORTDOCS%%share/examples/cdcl/gokuraku/u1d/u1d2.c
 %%PORTDOCS%%share/examples/cdcl/gokuraku/u2d/Makefile
-%%PORTDOCS%%share/examples/cdcl/gokuraku/u2d/u2d1.P
 %%PORTDOCS%%share/examples/cdcl/gokuraku/u2d/u2d1.c
-%%PORTDOCS%%share/examples/cdcl/gokuraku/u2d/u2d2.P
 %%PORTDOCS%%share/examples/cdcl/gokuraku/u2d/u2d2.c
-%%PORTDOCS%%share/examples/cdcl/gokuraku/u2d/u2d3.P
 %%PORTDOCS%%share/examples/cdcl/gokuraku/u2d/u2d3.c
-%%PORTDOCS%%share/examples/cdcl/gokuraku/u2d/u2d4.P
 %%PORTDOCS%%share/examples/cdcl/gokuraku/u2d/u2d4.c
 %%PORTDOCS%%share/examples/cdcl/grph1/Makefile
 %%PORTDOCS%%share/examples/cdcl/grph1/scpack/Makefile
-%%PORTDOCS%%share/examples/cdcl/grph1/scpack/scpkt1.P
 %%PORTDOCS%%share/examples/cdcl/grph1/scpack/scpkt1.c
-%%PORTDOCS%%share/examples/cdcl/grph1/scpack/scpkt2.P
 %%PORTDOCS%%share/examples/cdcl/grph1/scpack/scpkt2.c
-%%PORTDOCS%%share/examples/cdcl/grph1/scpack/scpkt3.P
 %%PORTDOCS%%share/examples/cdcl/grph1/scpack/scpkt3.c
-%%PORTDOCS%%share/examples/cdcl/grph1/scpack/scpkt4.P
 %%PORTDOCS%%share/examples/cdcl/grph1/scpack/scpkt4.c
-%%PORTDOCS%%share/examples/cdcl/grph1/scpack/scpkt5.P
 %%PORTDOCS%%share/examples/cdcl/grph1/scpack/scpkt5.c
-%%PORTDOCS%%share/examples/cdcl/grph1/scpack/scpkt6.P
 %%PORTDOCS%%share/examples/cdcl/grph1/scpack/scpkt6.c
-%%PORTDOCS%%share/examples/cdcl/grph1/scpack/scpkt7.P
 %%PORTDOCS%%share/examples/cdcl/grph1/scpack/scpkt7.c
-%%PORTDOCS%%share/examples/cdcl/grph1/scpack/scpkt8.P
 %%PORTDOCS%%share/examples/cdcl/grph1/scpack/scpkt8.c
 %%PORTDOCS%%share/examples/cdcl/grph1/scpack/t810630.dat
 %%PORTDOCS%%share/examples/cdcl/grph1/scpack/t811231.dat
 %%PORTDOCS%%share/examples/cdcl/grph1/sgpack/Makefile
-%%PORTDOCS%%share/examples/cdcl/grph1/sgpack/sgfont.P
 %%PORTDOCS%%share/examples/cdcl/grph1/sgpack/sgfont.c
-%%PORTDOCS%%share/examples/cdcl/grph1/sgpack/sgfonz.P
 %%PORTDOCS%%share/examples/cdcl/grph1/sgpack/sgfonz.c
-%%PORTDOCS%%share/examples/cdcl/grph1/sgpack/sgksx1.P
 %%PORTDOCS%%share/examples/cdcl/grph1/sgpack/sgksx1.c
-%%PORTDOCS%%share/examples/cdcl/grph1/sgpack/sgksx2.P
 %%PORTDOCS%%share/examples/cdcl/grph1/sgpack/sgksx2.c
-%%PORTDOCS%%share/examples/cdcl/grph1/sgpack/sgksx3.P
 %%PORTDOCS%%share/examples/cdcl/grph1/sgpack/sgksx3.c
-%%PORTDOCS%%share/examples/cdcl/grph1/sgpack/sglidx.P
 %%PORTDOCS%%share/examples/cdcl/grph1/sgpack/sglidx.c
-%%PORTDOCS%%share/examples/cdcl/grph1/sgpack/sgltyp.P
 %%PORTDOCS%%share/examples/cdcl/grph1/sgpack/sgltyp.c
-%%PORTDOCS%%share/examples/cdcl/grph1/sgpack/sgpk01.P
 %%PORTDOCS%%share/examples/cdcl/grph1/sgpack/sgpk01.c
-%%PORTDOCS%%share/examples/cdcl/grph1/sgpack/sgpk02.P
 %%PORTDOCS%%share/examples/cdcl/grph1/sgpack/sgpk02.c
-%%PORTDOCS%%share/examples/cdcl/grph1/sgpack/sgpk03.P
 %%PORTDOCS%%share/examples/cdcl/grph1/sgpack/sgpk03.c
-%%PORTDOCS%%share/examples/cdcl/grph1/sgpack/sgpk04.P
 %%PORTDOCS%%share/examples/cdcl/grph1/sgpack/sgpk04.c
-%%PORTDOCS%%share/examples/cdcl/grph1/sgpack/sgpk05.P
 %%PORTDOCS%%share/examples/cdcl/grph1/sgpack/sgpk05.c
-%%PORTDOCS%%share/examples/cdcl/grph1/sgpack/sgpk06.P
 %%PORTDOCS%%share/examples/cdcl/grph1/sgpack/sgpk06.c
-%%PORTDOCS%%share/examples/cdcl/grph1/sgpack/sgpk07.P
 %%PORTDOCS%%share/examples/cdcl/grph1/sgpack/sgpk07.c
-%%PORTDOCS%%share/examples/cdcl/grph1/sgpack/sgpk08.P
 %%PORTDOCS%%share/examples/cdcl/grph1/sgpack/sgpk08.c
-%%PORTDOCS%%share/examples/cdcl/grph1/sgpack/sgpk09.P
 %%PORTDOCS%%share/examples/cdcl/grph1/sgpack/sgpk09.c
-%%PORTDOCS%%share/examples/cdcl/grph1/sgpack/sgpk10.P
 %%PORTDOCS%%share/examples/cdcl/grph1/sgpack/sgpk10.c
-%%PORTDOCS%%share/examples/cdcl/grph1/sgpack/sgtclr.P
 %%PORTDOCS%%share/examples/cdcl/grph1/sgpack/sgtclr.c
-%%PORTDOCS%%share/examples/cdcl/grph1/sgpack/sgtone.P
 %%PORTDOCS%%share/examples/cdcl/grph1/sgpack/sgtone.c
-%%PORTDOCS%%share/examples/cdcl/grph1/sgpack/sgtonz.P
 %%PORTDOCS%%share/examples/cdcl/grph1/sgpack/sgtonz.c
 %%PORTDOCS%%share/examples/cdcl/grph1/slpack/Makefile
-%%PORTDOCS%%share/examples/cdcl/grph1/slpack/slpk01.P
 %%PORTDOCS%%share/examples/cdcl/grph1/slpack/slpk01.c
-%%PORTDOCS%%share/examples/cdcl/grph1/slpack/slpk02.P
 %%PORTDOCS%%share/examples/cdcl/grph1/slpack/slpk02.c
-%%PORTDOCS%%share/examples/cdcl/grph1/slpack/slpk03.P
 %%PORTDOCS%%share/examples/cdcl/grph1/slpack/slpk03.c
-%%PORTDOCS%%share/examples/cdcl/grph1/slpack/slpk04.P
 %%PORTDOCS%%share/examples/cdcl/grph1/slpack/slpk04.c
 %%PORTDOCS%%share/examples/cdcl/grph2/Makefile
 %%PORTDOCS%%share/examples/cdcl/grph2/grpack/Makefile
-%%PORTDOCS%%share/examples/cdcl/grph2/grpack/grpk01.P
 %%PORTDOCS%%share/examples/cdcl/grph2/grpack/grpk01.c
 %%PORTDOCS%%share/examples/cdcl/grph2/ucpack/Makefile
-%%PORTDOCS%%share/examples/cdcl/grph2/ucpack/ucpk01.P
 %%PORTDOCS%%share/examples/cdcl/grph2/ucpack/ucpk01.c
-%%PORTDOCS%%share/examples/cdcl/grph2/ucpack/ucpk02.P
 %%PORTDOCS%%share/examples/cdcl/grph2/ucpack/ucpk02.c
 %%PORTDOCS%%share/examples/cdcl/grph2/udegpk/Makefile
-%%PORTDOCS%%share/examples/cdcl/grph2/udegpk/u2df01.P
 %%PORTDOCS%%share/examples/cdcl/grph2/udegpk/u2df01.c
-%%PORTDOCS%%share/examples/cdcl/grph2/udegpk/u2df02.P
 %%PORTDOCS%%share/examples/cdcl/grph2/udegpk/u2df02.c
-%%PORTDOCS%%share/examples/cdcl/grph2/udegpk/u2df03.P
 %%PORTDOCS%%share/examples/cdcl/grph2/udegpk/u2df03.c
-%%PORTDOCS%%share/examples/cdcl/grph2/udegpk/u2df04.P
 %%PORTDOCS%%share/examples/cdcl/grph2/udegpk/u2df04.c
-%%PORTDOCS%%share/examples/cdcl/grph2/udegpk/u2df05.P
 %%PORTDOCS%%share/examples/cdcl/grph2/udegpk/u2df05.c
-%%PORTDOCS%%share/examples/cdcl/grph2/udegpk/u2df06.P
 %%PORTDOCS%%share/examples/cdcl/grph2/udegpk/u2df06.c
-%%PORTDOCS%%share/examples/cdcl/grph2/udegpk/u2df07.P
 %%PORTDOCS%%share/examples/cdcl/grph2/udegpk/u2df07.c
-%%PORTDOCS%%share/examples/cdcl/grph2/udegpk/u2df08.P
 %%PORTDOCS%%share/examples/cdcl/grph2/udegpk/u2df08.c
 %%PORTDOCS%%share/examples/cdcl/grph2/ulpack/Makefile
-%%PORTDOCS%%share/examples/cdcl/grph2/ulpack/ulpk01.P
 %%PORTDOCS%%share/examples/cdcl/grph2/ulpack/ulpk01.c
-%%PORTDOCS%%share/examples/cdcl/grph2/ulpack/ulpk02.P
+%%PORTDOCS%%share/examples/cdcl/grph2/ulpack/ulpk01n.c
 %%PORTDOCS%%share/examples/cdcl/grph2/ulpack/ulpk02.c
+%%PORTDOCS%%share/examples/cdcl/grph2/ulpack/ulpk02n.c
 %%PORTDOCS%%share/examples/cdcl/grph2/umpack/Makefile
 %%PORTDOCS%%share/examples/cdcl/grph2/umpack/t811231.dat
-%%PORTDOCS%%share/examples/cdcl/grph2/umpack/test01.P
 %%PORTDOCS%%share/examples/cdcl/grph2/umpack/test01.c
-%%PORTDOCS%%share/examples/cdcl/grph2/umpack/test02.P
 %%PORTDOCS%%share/examples/cdcl/grph2/umpack/test02.c
-%%PORTDOCS%%share/examples/cdcl/grph2/umpack/test03.P
 %%PORTDOCS%%share/examples/cdcl/grph2/umpack/test03.c
-%%PORTDOCS%%share/examples/cdcl/grph2/umpack/test04.P
 %%PORTDOCS%%share/examples/cdcl/grph2/umpack/test04.c
-%%PORTDOCS%%share/examples/cdcl/grph2/umpack/test05.P
 %%PORTDOCS%%share/examples/cdcl/grph2/umpack/test05.c
-%%PORTDOCS%%share/examples/cdcl/grph2/umpack/test06.P
 %%PORTDOCS%%share/examples/cdcl/grph2/umpack/test06.c
-%%PORTDOCS%%share/examples/cdcl/grph2/umpack/test07.P
 %%PORTDOCS%%share/examples/cdcl/grph2/umpack/test07.c
-%%PORTDOCS%%share/examples/cdcl/grph2/umpack/test08.P
 %%PORTDOCS%%share/examples/cdcl/grph2/umpack/test08.c
-%%PORTDOCS%%share/examples/cdcl/grph2/umpack/umpk01.P
+%%PORTDOCS%%share/examples/cdcl/grph2/umpack/test09.c
 %%PORTDOCS%%share/examples/cdcl/grph2/umpack/umpk01.c
-%%PORTDOCS%%share/examples/cdcl/grph2/umpack/umpk02.P
 %%PORTDOCS%%share/examples/cdcl/grph2/umpack/umpk02.c
-%%PORTDOCS%%share/examples/cdcl/grph2/umpack/umpk03.P
 %%PORTDOCS%%share/examples/cdcl/grph2/umpack/umpk03.c
-%%PORTDOCS%%share/examples/cdcl/grph2/umpack/umpk04.P
 %%PORTDOCS%%share/examples/cdcl/grph2/umpack/umpk04.c
-%%PORTDOCS%%share/examples/cdcl/grph2/umpack/umpk05.P
 %%PORTDOCS%%share/examples/cdcl/grph2/umpack/umpk05.c
 %%PORTDOCS%%share/examples/cdcl/grph2/uspack/Makefile
-%%PORTDOCS%%share/examples/cdcl/grph2/uspack/uspk01.P
 %%PORTDOCS%%share/examples/cdcl/grph2/uspack/uspk01.c
-%%PORTDOCS%%share/examples/cdcl/grph2/uspack/uspk02.P
 %%PORTDOCS%%share/examples/cdcl/grph2/uspack/uspk02.c
-%%PORTDOCS%%share/examples/cdcl/grph2/uspack/uspk03.P
 %%PORTDOCS%%share/examples/cdcl/grph2/uspack/uspk03.c
-%%PORTDOCS%%share/examples/cdcl/grph2/uspack/uspk04.P
 %%PORTDOCS%%share/examples/cdcl/grph2/uspack/uspk04.c
-%%PORTDOCS%%share/examples/cdcl/grph2/uspack/uspk05.P
 %%PORTDOCS%%share/examples/cdcl/grph2/uspack/uspk05.c
-%%PORTDOCS%%share/examples/cdcl/grph2/uspack/uspk06.P
 %%PORTDOCS%%share/examples/cdcl/grph2/uspack/uspk06.c
-%%PORTDOCS%%share/examples/cdcl/grph2/uspack/uspk07.P
 %%PORTDOCS%%share/examples/cdcl/grph2/uspack/uspk07.c
-%%PORTDOCS%%share/examples/cdcl/grph2/uspack/uspk08.P
 %%PORTDOCS%%share/examples/cdcl/grph2/uspack/uspk08.c
-%%PORTDOCS%%share/examples/cdcl/grph2/uspack/uspk09.P
 %%PORTDOCS%%share/examples/cdcl/grph2/uspack/uspk09.c
-%%PORTDOCS%%share/examples/cdcl/grph2/uspack/uspk10.P
 %%PORTDOCS%%share/examples/cdcl/grph2/uspack/uspk10.c
-%%PORTDOCS%%share/examples/cdcl/grph2/uspack/uspk11.P
 %%PORTDOCS%%share/examples/cdcl/grph2/uspack/uspk11.c
-%%PORTDOCS%%share/examples/cdcl/grph2/uspack/uspk12.P
 %%PORTDOCS%%share/examples/cdcl/grph2/uspack/uspk12.c
 %%PORTDOCS%%share/examples/cdcl/grph2/uupack/Makefile
-%%PORTDOCS%%share/examples/cdcl/grph2/uupack/uupk01.P
 %%PORTDOCS%%share/examples/cdcl/grph2/uupack/uupk01.c
-%%PORTDOCS%%share/examples/cdcl/grph2/uupack/uupk02.P
 %%PORTDOCS%%share/examples/cdcl/grph2/uupack/uupk02.c
-%%PORTDOCS%%share/examples/cdcl/grph2/uupack/uupk03.P
 %%PORTDOCS%%share/examples/cdcl/grph2/uupack/uupk03.c
-%%PORTDOCS%%share/examples/cdcl/grph2/uupack/uupk04.P
 %%PORTDOCS%%share/examples/cdcl/grph2/uupack/uupk04.c
-%%PORTDOCS%%share/examples/cdcl/grph2/uupack/uupk05.P
 %%PORTDOCS%%share/examples/cdcl/grph2/uupack/uupk05.c
-%%PORTDOCS%%share/examples/cdcl/grph2/uupack/uupk06.P
 %%PORTDOCS%%share/examples/cdcl/grph2/uupack/uupk06.c
-%%PORTDOCS%%share/examples/cdcl/grph2/uupack/uupk07.P
 %%PORTDOCS%%share/examples/cdcl/grph2/uupack/uupk07.c
 %%PORTDOCS%%share/examples/cdcl/grph2/uxyzpk/Makefile
-%%PORTDOCS%%share/examples/cdcl/grph2/uxyzpk/uxyz01.P
 %%PORTDOCS%%share/examples/cdcl/grph2/uxyzpk/uxyz01.c
-%%PORTDOCS%%share/examples/cdcl/grph2/uxyzpk/uxyz02.P
 %%PORTDOCS%%share/examples/cdcl/grph2/uxyzpk/uxyz02.c
-%%PORTDOCS%%share/examples/cdcl/grph2/uxyzpk/uxyz03.P
 %%PORTDOCS%%share/examples/cdcl/grph2/uxyzpk/uxyz03.c
-%%PORTDOCS%%share/examples/cdcl/grph2/uxyzpk/uxyz04.P
 %%PORTDOCS%%share/examples/cdcl/grph2/uxyzpk/uxyz04.c
-%%PORTDOCS%%share/examples/cdcl/grph2/uxyzpk/uxyz05.P
 %%PORTDOCS%%share/examples/cdcl/grph2/uxyzpk/uxyz05.c
-%%PORTDOCS%%share/examples/cdcl/grph2/uxyzpk/uxyz06.P
 %%PORTDOCS%%share/examples/cdcl/grph2/uxyzpk/uxyz06.c
-%%PORTDOCS%%share/examples/cdcl/grph2/uxyzpk/uxyz07.P
 %%PORTDOCS%%share/examples/cdcl/grph2/uxyzpk/uxyz07.c
-%%PORTDOCS%%share/examples/cdcl/grph2/uxyzpk/uxyz08.P
 %%PORTDOCS%%share/examples/cdcl/grph2/uxyzpk/uxyz08.c
-%%PORTDOCS%%share/examples/cdcl/grph2/uxyzpk/uxyz09.P
 %%PORTDOCS%%share/examples/cdcl/grph2/uxyzpk/uxyz09.c
-%%PORTDOCS%%share/examples/cdcl/grph2/uxyzpk/uxyz10.P
 %%PORTDOCS%%share/examples/cdcl/grph2/uxyzpk/uxyz10.c
 %%PORTDOCS%%share/examples/cdcl/grph2/ximage/MEMO
 %%PORTDOCS%%share/examples/cdcl/grph2/ximage/Makefile
 %%PORTDOCS%%share/examples/cdcl/grph2/ximage/tomsclm.dat
-%%PORTDOCS%%share/examples/cdcl/grph2/ximage/ximg01.P
 %%PORTDOCS%%share/examples/cdcl/grph2/ximage/ximg01.c
 %%PORTDOCS%%share/examples/cdcl/math1/Makefile
 %%PORTDOCS%%share/examples/cdcl/math1/blklib/Makefile
-%%PORTDOCS%%share/examples/cdcl/math1/blklib/blkl01.P
 %%PORTDOCS%%share/examples/cdcl/math1/blklib/blkl01.c
 %%PORTDOCS%%share/examples/cdcl/math1/chrlib/Makefile
-%%PORTDOCS%%share/examples/cdcl/math1/chrlib/chrl01.P
 %%PORTDOCS%%share/examples/cdcl/math1/chrlib/chrl01.c
 %%PORTDOCS%%share/examples/cdcl/math1/fnclib/Makefile
-%%PORTDOCS%%share/examples/cdcl/math1/fnclib/fncl01.P
 %%PORTDOCS%%share/examples/cdcl/math1/fnclib/fncl01.c
 %%PORTDOCS%%share/examples/cdcl/math1/gnmlib/Makefile
-%%PORTDOCS%%share/examples/cdcl/math1/gnmlib/gnml01.P
 %%PORTDOCS%%share/examples/cdcl/math1/gnmlib/gnml01.c
 %%PORTDOCS%%share/examples/cdcl/math1/ifalib/Makefile
-%%PORTDOCS%%share/examples/cdcl/math1/ifalib/ifal01.P
 %%PORTDOCS%%share/examples/cdcl/math1/ifalib/ifal01.c
 %%PORTDOCS%%share/examples/cdcl/math1/indxlib/Makefile
-%%PORTDOCS%%share/examples/cdcl/math1/indxlib/indx01.P
 %%PORTDOCS%%share/examples/cdcl/math1/indxlib/indx01.c
-%%PORTDOCS%%share/examples/cdcl/math1/indxlib/indx02.P
 %%PORTDOCS%%share/examples/cdcl/math1/indxlib/indx02.c
 %%PORTDOCS%%share/examples/cdcl/math1/intlib/Makefile
-%%PORTDOCS%%share/examples/cdcl/math1/intlib/intl01.P
 %%PORTDOCS%%share/examples/cdcl/math1/intlib/intl01.c
 %%PORTDOCS%%share/examples/cdcl/math1/lrllib/Makefile
-%%PORTDOCS%%share/examples/cdcl/math1/lrllib/lrll01.P
 %%PORTDOCS%%share/examples/cdcl/math1/lrllib/lrll01.c
-%%PORTDOCS%%share/examples/cdcl/math1/lrllib/lrll02.P
 %%PORTDOCS%%share/examples/cdcl/math1/lrllib/lrll02.c
 %%PORTDOCS%%share/examples/cdcl/math1/oslib/Makefile
-%%PORTDOCS%%share/examples/cdcl/math1/oslib/oslb01.P
 %%PORTDOCS%%share/examples/cdcl/math1/oslib/oslb01.c
-%%PORTDOCS%%share/examples/cdcl/math1/oslib/oslb02.P
 %%PORTDOCS%%share/examples/cdcl/math1/oslib/oslb02.c
 %%PORTDOCS%%share/examples/cdcl/math1/rfalib/Makefile
-%%PORTDOCS%%share/examples/cdcl/math1/rfalib/rfal01.P
 %%PORTDOCS%%share/examples/cdcl/math1/rfalib/rfal01.c
 %%PORTDOCS%%share/examples/cdcl/math1/rfblib/Makefile
-%%PORTDOCS%%share/examples/cdcl/math1/rfblib/rfbl01.P
 %%PORTDOCS%%share/examples/cdcl/math1/rfblib/rfbl01.c
 %%PORTDOCS%%share/examples/cdcl/math1/sublib/Makefile
-%%PORTDOCS%%share/examples/cdcl/math1/sublib/subl01.P
 %%PORTDOCS%%share/examples/cdcl/math1/sublib/subl01.c
 %%PORTDOCS%%share/examples/cdcl/math1/syslib/Makefile
-%%PORTDOCS%%share/examples/cdcl/math1/syslib/sysl01.P
 %%PORTDOCS%%share/examples/cdcl/math1/syslib/sysl01.c
-%%PORTDOCS%%share/examples/cdcl/math1/syslib/sysl02.P
 %%PORTDOCS%%share/examples/cdcl/math1/syslib/sysl02.c
 %%PORTDOCS%%share/examples/cdcl/math1/vialib/Makefile
-%%PORTDOCS%%share/examples/cdcl/math1/vialib/vial01.P
 %%PORTDOCS%%share/examples/cdcl/math1/vialib/vial01.c
-%%PORTDOCS%%share/examples/cdcl/math1/vialib/vial02.P
 %%PORTDOCS%%share/examples/cdcl/math1/vialib/vial02.c
 %%PORTDOCS%%share/examples/cdcl/math1/viblib/Makefile
-%%PORTDOCS%%share/examples/cdcl/math1/viblib/vibl01.P
 %%PORTDOCS%%share/examples/cdcl/math1/viblib/vibl01.c
 %%PORTDOCS%%share/examples/cdcl/math1/vralib/Makefile
-%%PORTDOCS%%share/examples/cdcl/math1/vralib/vral01.P
 %%PORTDOCS%%share/examples/cdcl/math1/vralib/vral01.c
-%%PORTDOCS%%share/examples/cdcl/math1/vralib/vral02.P
 %%PORTDOCS%%share/examples/cdcl/math1/vralib/vral02.c
 %%PORTDOCS%%share/examples/cdcl/math1/vrblib/Makefile
-%%PORTDOCS%%share/examples/cdcl/math1/vrblib/vrbl01.P
 %%PORTDOCS%%share/examples/cdcl/math1/vrblib/vrbl01.c
 %%PORTDOCS%%share/examples/cdcl/math2/Makefile
 %%PORTDOCS%%share/examples/cdcl/math2/fftlib/Makefile
-%%PORTDOCS%%share/examples/cdcl/math2/fftlib/fftl01.P
 %%PORTDOCS%%share/examples/cdcl/math2/fftlib/fftl01.c
-%%PORTDOCS%%share/examples/cdcl/math2/fftlib/fftl02.P
 %%PORTDOCS%%share/examples/cdcl/math2/fftlib/fftl02.c
 %%PORTDOCS%%share/examples/cdcl/math2/intrlib/Makefile
-%%PORTDOCS%%share/examples/cdcl/math2/intrlib/intr01.P
 %%PORTDOCS%%share/examples/cdcl/math2/intrlib/intr01.c
 %%PORTDOCS%%share/examples/cdcl/math2/rnmlib/Makefile
-%%PORTDOCS%%share/examples/cdcl/math2/rnmlib/rnml01.P
 %%PORTDOCS%%share/examples/cdcl/math2/rnmlib/rnml01.c
 %%PORTDOCS%%share/examples/cdcl/math2/vstlib/Makefile
-%%PORTDOCS%%share/examples/cdcl/math2/vstlib/vstl01.P
 %%PORTDOCS%%share/examples/cdcl/math2/vstlib/vstl01.c
-%%PORTDOCS%%share/examples/cdcl/math2/vstlib/vstl02.P
 %%PORTDOCS%%share/examples/cdcl/math2/vstlib/vstl02.c
 %%PORTDOCS%%share/examples/cdcl/misc1/Makefile
 %%PORTDOCS%%share/examples/cdcl/misc1/bitlib/Makefile
-%%PORTDOCS%%share/examples/cdcl/misc1/bitlib/bitl01.P
 %%PORTDOCS%%share/examples/cdcl/misc1/bitlib/bitl01.c
 %%PORTDOCS%%share/examples/cdcl/misc1/chglib/Makefile
-%%PORTDOCS%%share/examples/cdcl/misc1/chglib/chgl01.P
 %%PORTDOCS%%share/examples/cdcl/misc1/chglib/chgl01.c
 %%PORTDOCS%%share/examples/cdcl/misc1/chklib/Makefile
-%%PORTDOCS%%share/examples/cdcl/misc1/chklib/chkl01.P
 %%PORTDOCS%%share/examples/cdcl/misc1/chklib/chkl01.c
 %%PORTDOCS%%share/examples/cdcl/misc1/chnlib/Makefile
-%%PORTDOCS%%share/examples/cdcl/misc1/chnlib/chnl01.P
 %%PORTDOCS%%share/examples/cdcl/misc1/chnlib/chnl01.c
-%%PORTDOCS%%share/examples/cdcl/misc1/chnlib/chnl02.P
 %%PORTDOCS%%share/examples/cdcl/misc1/chnlib/chnl02.c
-%%PORTDOCS%%share/examples/cdcl/misc1/chnlib/chnl03.P
 %%PORTDOCS%%share/examples/cdcl/misc1/chnlib/chnl03.c
 %%PORTDOCS%%share/examples/cdcl/misc1/clcklib/Makefile
-%%PORTDOCS%%share/examples/cdcl/misc1/clcklib/clck01.P
 %%PORTDOCS%%share/examples/cdcl/misc1/clcklib/clck01.c
 %%PORTDOCS%%share/examples/cdcl/misc1/datelib/Makefile
-%%PORTDOCS%%share/examples/cdcl/misc1/datelib/date01.P
 %%PORTDOCS%%share/examples/cdcl/misc1/datelib/date01.c
-%%PORTDOCS%%share/examples/cdcl/misc1/datelib/date02.P
 %%PORTDOCS%%share/examples/cdcl/misc1/datelib/date02.c
-%%PORTDOCS%%share/examples/cdcl/misc1/datelib/date03.P
 %%PORTDOCS%%share/examples/cdcl/misc1/datelib/date03.c
-%%PORTDOCS%%share/examples/cdcl/misc1/datelib/date04.P
 %%PORTDOCS%%share/examples/cdcl/misc1/datelib/date04.c
 %%PORTDOCS%%share/examples/cdcl/misc1/fmtlib/Makefile
-%%PORTDOCS%%share/examples/cdcl/misc1/fmtlib/fmtl01.P
 %%PORTDOCS%%share/examples/cdcl/misc1/fmtlib/fmtl01.c
 %%PORTDOCS%%share/examples/cdcl/misc1/hexlib/Makefile
-%%PORTDOCS%%share/examples/cdcl/misc1/hexlib/hexl01.P
 %%PORTDOCS%%share/examples/cdcl/misc1/hexlib/hexl01.c
 %%PORTDOCS%%share/examples/cdcl/misc1/misclib/Makefile
-%%PORTDOCS%%share/examples/cdcl/misc1/misclib/fncl01.P
 %%PORTDOCS%%share/examples/cdcl/misc1/misclib/fncl01.c
 %%PORTDOCS%%share/examples/cdcl/misc1/randlib/Makefile
-%%PORTDOCS%%share/examples/cdcl/misc1/randlib/rand01.P
 %%PORTDOCS%%share/examples/cdcl/misc1/randlib/rand01.c
 %%PORTDOCS%%share/examples/cdcl/misc1/timelib/Makefile
-%%PORTDOCS%%share/examples/cdcl/misc1/timelib/time01.P
 %%PORTDOCS%%share/examples/cdcl/misc1/timelib/time01.c
-%%PORTDOCS%%share/examples/cdcl/misc1/timelib/time02.P
 %%PORTDOCS%%share/examples/cdcl/misc1/timelib/time02.c
 %%PORTDOCS%%share/examples/cdcl/misc2/Makefile
 %%PORTDOCS%%share/examples/cdcl/rakuraku/Makefile
 %%PORTDOCS%%share/examples/cdcl/rakuraku/color/Makefile
-%%PORTDOCS%%share/examples/cdcl/rakuraku/color/color1.P
 %%PORTDOCS%%share/examples/cdcl/rakuraku/color/color1.c
-%%PORTDOCS%%share/examples/cdcl/rakuraku/color/color2.P
 %%PORTDOCS%%share/examples/cdcl/rakuraku/color/color2.c
-%%PORTDOCS%%share/examples/cdcl/rakuraku/color/color3.P
 %%PORTDOCS%%share/examples/cdcl/rakuraku/color/color3.c
 %%PORTDOCS%%share/examples/cdcl/rakuraku/color/colormap1.x11
 %%PORTDOCS%%share/examples/cdcl/rakuraku/color/colormap2.x11
 %%PORTDOCS%%share/examples/cdcl/rakuraku/color/colormap3.x11
 %%PORTDOCS%%share/examples/cdcl/rakuraku/color/colormap4.x11
 %%PORTDOCS%%share/examples/cdcl/rakuraku/kihon/Makefile
-%%PORTDOCS%%share/examples/cdcl/rakuraku/kihon/kihon1.P
 %%PORTDOCS%%share/examples/cdcl/rakuraku/kihon/kihon1.c
-%%PORTDOCS%%share/examples/cdcl/rakuraku/kihon/kihon2.P
 %%PORTDOCS%%share/examples/cdcl/rakuraku/kihon/kihon2.c
-%%PORTDOCS%%share/examples/cdcl/rakuraku/kihon/kihon3.P
 %%PORTDOCS%%share/examples/cdcl/rakuraku/kihon/kihon3.c
-%%PORTDOCS%%share/examples/cdcl/rakuraku/kihon/kihon4.P
 %%PORTDOCS%%share/examples/cdcl/rakuraku/kihon/kihon4.c
-%%PORTDOCS%%share/examples/cdcl/rakuraku/kihon/kihon5.P
 %%PORTDOCS%%share/examples/cdcl/rakuraku/kihon/kihon5.c
-%%PORTDOCS%%share/examples/cdcl/rakuraku/kihon/kihon6.P
 %%PORTDOCS%%share/examples/cdcl/rakuraku/kihon/kihon6.c
-%%PORTDOCS%%share/examples/cdcl/rakuraku/kihon/kihon7.P
 %%PORTDOCS%%share/examples/cdcl/rakuraku/kihon/kihon7.c
-%%PORTDOCS%%share/examples/cdcl/rakuraku/kihon/kihon8.P
 %%PORTDOCS%%share/examples/cdcl/rakuraku/kihon/kihon8.c
-%%PORTDOCS%%share/examples/cdcl/rakuraku/kihon/kihon9.P
 %%PORTDOCS%%share/examples/cdcl/rakuraku/kihon/kihon9.c
-%%PORTDOCS%%share/examples/cdcl/rakuraku/kihon/kihona.P
 %%PORTDOCS%%share/examples/cdcl/rakuraku/kihon/kihona.c
-%%PORTDOCS%%share/examples/cdcl/rakuraku/kihon/kihonb.P
 %%PORTDOCS%%share/examples/cdcl/rakuraku/kihon/kihonb.c
-%%PORTDOCS%%share/examples/cdcl/rakuraku/kihon/kihonc.P
 %%PORTDOCS%%share/examples/cdcl/rakuraku/kihon/kihonc.c
 %%PORTDOCS%%share/examples/cdcl/rakuraku/layout/Makefile
-%%PORTDOCS%%share/examples/cdcl/rakuraku/layout/lay1.P
 %%PORTDOCS%%share/examples/cdcl/rakuraku/layout/lay1.c
-%%PORTDOCS%%share/examples/cdcl/rakuraku/layout/lay2.P
 %%PORTDOCS%%share/examples/cdcl/rakuraku/layout/lay2.c
-%%PORTDOCS%%share/examples/cdcl/rakuraku/layout/lay3.P
 %%PORTDOCS%%share/examples/cdcl/rakuraku/layout/lay3.c
 %%PORTDOCS%%share/examples/cdcl/rakuraku/map3d/Makefile
-%%PORTDOCS%%share/examples/cdcl/rakuraku/map3d/map3d1.P
 %%PORTDOCS%%share/examples/cdcl/rakuraku/map3d/map3d1.c
-%%PORTDOCS%%share/examples/cdcl/rakuraku/map3d/map3d2.P
 %%PORTDOCS%%share/examples/cdcl/rakuraku/map3d/map3d2.c
-%%PORTDOCS%%share/examples/cdcl/rakuraku/map3d/map3d3.P
 %%PORTDOCS%%share/examples/cdcl/rakuraku/map3d/map3d3.c
-%%PORTDOCS%%share/examples/cdcl/rakuraku/map3d/map3d4.P
 %%PORTDOCS%%share/examples/cdcl/rakuraku/map3d/map3d4.c
-%%PORTDOCS%%share/examples/cdcl/rakuraku/map3d/map3d5.P
 %%PORTDOCS%%share/examples/cdcl/rakuraku/map3d/map3d5.c
-%%PORTDOCS%%share/examples/cdcl/rakuraku/map3d/map3d6.P
 %%PORTDOCS%%share/examples/cdcl/rakuraku/map3d/map3d6.c
 %%PORTDOCS%%share/examples/cdcl/rakuraku/miss/Makefile
-%%PORTDOCS%%share/examples/cdcl/rakuraku/miss/miss1.P
 %%PORTDOCS%%share/examples/cdcl/rakuraku/miss/miss1.c
-%%PORTDOCS%%share/examples/cdcl/rakuraku/miss/miss2.P
 %%PORTDOCS%%share/examples/cdcl/rakuraku/miss/miss2.c
 %%PORTDOCS%%share/examples/cdcl/rakuraku/quick/Makefile
-%%PORTDOCS%%share/examples/cdcl/rakuraku/quick/quick1+.P
 %%PORTDOCS%%share/examples/cdcl/rakuraku/quick/quick1+.c
-%%PORTDOCS%%share/examples/cdcl/rakuraku/quick/quick1.P
 %%PORTDOCS%%share/examples/cdcl/rakuraku/quick/quick1.c
-%%PORTDOCS%%share/examples/cdcl/rakuraku/quick/quick2.P
 %%PORTDOCS%%share/examples/cdcl/rakuraku/quick/quick2.c
-%%PORTDOCS%%share/examples/cdcl/rakuraku/quick/quick3.P
 %%PORTDOCS%%share/examples/cdcl/rakuraku/quick/quick3.c
-%%PORTDOCS%%share/examples/cdcl/rakuraku/quick/quick4.P
 %%PORTDOCS%%share/examples/cdcl/rakuraku/quick/quick4.c
-%%PORTDOCS%%share/examples/cdcl/rakuraku/quick/quick5.P
 %%PORTDOCS%%share/examples/cdcl/rakuraku/quick/quick5.c
 %%PORTDOCS%%share/examples/cdcl/rakuraku/u2d/Makefile
-%%PORTDOCS%%share/examples/cdcl/rakuraku/u2d/u2d1.P
 %%PORTDOCS%%share/examples/cdcl/rakuraku/u2d/u2d1.c
-%%PORTDOCS%%share/examples/cdcl/rakuraku/u2d/u2d2.P
 %%PORTDOCS%%share/examples/cdcl/rakuraku/u2d/u2d2.c
-%%PORTDOCS%%share/examples/cdcl/rakuraku/u2d/u2d3.P
 %%PORTDOCS%%share/examples/cdcl/rakuraku/u2d/u2d3.c
-%%PORTDOCS%%share/examples/cdcl/rakuraku/u2d/u2d4.P
 %%PORTDOCS%%share/examples/cdcl/rakuraku/u2d/u2d4.c
-%%PORTDOCS%%share/examples/cdcl/rakuraku/u2d/u2d5.P
 %%PORTDOCS%%share/examples/cdcl/rakuraku/u2d/u2d5.c
-%%PORTDOCS%%share/examples/cdcl/rakuraku/u2d/u2d6.P
 %%PORTDOCS%%share/examples/cdcl/rakuraku/u2d/u2d6.c
-%%PORTDOCS%%share/examples/cdcl/rakuraku/u2d/u2d7.P
 %%PORTDOCS%%share/examples/cdcl/rakuraku/u2d/u2d7.c
 %%PORTDOCS%%share/examples/cdcl/rakuraku/uspack/Makefile
-%%PORTDOCS%%share/examples/cdcl/rakuraku/uspack/uspac1.P
 %%PORTDOCS%%share/examples/cdcl/rakuraku/uspack/uspac1.c
-%%PORTDOCS%%share/examples/cdcl/rakuraku/uspack/uspac2.P
 %%PORTDOCS%%share/examples/cdcl/rakuraku/uspack/uspac2.c
-%%PORTDOCS%%share/examples/cdcl/rakuraku/uspack/uspac3.P
 %%PORTDOCS%%share/examples/cdcl/rakuraku/uspack/uspac3.c
-%%PORTDOCS%%share/examples/cdcl/rakuraku/uspack/uspac4.P
 %%PORTDOCS%%share/examples/cdcl/rakuraku/uspack/uspac4.c
 %%PORTDOCS%%share/examples/cdcl/rakuraku/uxyz/Makefile
-%%PORTDOCS%%share/examples/cdcl/rakuraku/uxyz/uxyz1.P
 %%PORTDOCS%%share/examples/cdcl/rakuraku/uxyz/uxyz1.c
-%%PORTDOCS%%share/examples/cdcl/rakuraku/uxyz/uxyz2.P
 %%PORTDOCS%%share/examples/cdcl/rakuraku/uxyz/uxyz2.c
-%%PORTDOCS%%share/examples/cdcl/rakuraku/uxyz/uxyz3.P
 %%PORTDOCS%%share/examples/cdcl/rakuraku/uxyz/uxyz3.c
-%%PORTDOCS%%share/examples/cdcl/rakuraku/uxyz/uxyz4.P
 %%PORTDOCS%%share/examples/cdcl/rakuraku/uxyz/uxyz4.c
-%%PORTDOCS%%share/examples/cdcl/rakuraku/uxyz/uxyz5.P
 %%PORTDOCS%%share/examples/cdcl/rakuraku/uxyz/uxyz5.c
-%%PORTDOCS%%share/examples/cdcl/rakuraku/uxyz/uxyz6.P
 %%PORTDOCS%%share/examples/cdcl/rakuraku/uxyz/uxyz6.c
-%%PORTDOCS%%share/examples/cdcl/rakuraku/uxyz/uxyz7.P
 %%PORTDOCS%%share/examples/cdcl/rakuraku/uxyz/uxyz7.c
-%%PORTDOCS%%share/examples/cdcl/rakuraku/uxyz/uxyz8.P
 %%PORTDOCS%%share/examples/cdcl/rakuraku/uxyz/uxyz8.c
 %%PORTDOCS%%@dirrm share/examples/cdcl/gokuraku/hop
 %%PORTDOCS%%@dirrm share/examples/cdcl/gokuraku/jump
@@ -573,4 +411,4 @@ lib/libf2c4dcl.a
 %%PORTDOCS%%@dirrm share/examples/cdcl/rakuraku/uxyz
 %%PORTDOCS%%@dirrm share/examples/cdcl/rakuraku
 %%PORTDOCS%%@dirrm share/examples/cdcl
-@dirrm lib/dcldbase
+@dirrm lib/dcldbase-%%DCL_VERSION%%
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
diff --git a/science/ruby-dcl-gtk/Makefile b/science/ruby-dcl-gtk/Makefile
deleted file mode 100644
index 70b14f3b6662..000000000000
--- a/science/ruby-dcl-gtk/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# New ports collection makefile for:	RubyDCL-Gtk
-# Date created:		15 Febrary 2004
-# Whom:			Shin'ya Murakami <murakami@ahs.scitec.kobe-u.ac.jp>
-#
-# $FreeBSD$
-#
-
-PKGNAMESUFFIX=	-gtk
-
-MAINTAINER=	murakami@ahs.scitec.kobe-u.ac.jp
-CATEGORIES=	science graphics ruby
-
-WITH_GTK=	yes
-
-MD5_FILE=	${.CURDIR}/../ruby-dcl/distinfo
-DESCR=		${.CURDIR}/../ruby-dcl/pkg-descr
-PLIST=		${.CURDIR}/../ruby-dcl/pkg-plist
-
-MASTERDIR=	${.CURDIR}/../ruby-dcl
-
-.include 	"${MASTERDIR}/Makefile"
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
diff --git a/science/ruby-gphys/Makefile b/science/ruby-gphys/Makefile
index 76e8794c7c8e..2f5902b35aed 100644
--- a/science/ruby-gphys/Makefile
+++ b/science/ruby-gphys/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gphys
-PORTVERSION=	0.3.3
-PORTREVISION=	1
+PORTVERSION=	0.3.5
 CATEGORIES=	science ruby
 MASTER_SITES=	ftp://www.gfd-dennou.org/arch/ruby/products/gphys/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
@@ -18,7 +17,7 @@ COMMENT=	A multi-purpose class to handle gridded physical quantities
 
 RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/narray.so:${PORTSDIR}/math/ruby-narray \
 		${RUBY_SITELIBDIR}/narray_miss.rb:${PORTSDIR}/math/ruby-narray_miss \
-		${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_SITEARCHLIBDIR}/numru/fftw3.so:${PORTSDIR}/math/ruby-fftw3 \
 		${RUBY_SITELIBDIR}/numru/misc.rb:${PORTSDIR}/math/ruby-numru_misc \
@@ -27,7 +26,9 @@ RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/narray.so:${PORTSDIR}/math/ruby-narray \
 USE_RUBY=	yes
 NO_BUILD=	yes
 
-DOCS=		ChangeLog README doc/*
+DOCS=		ChangeLog README TODO_ep_flux doc/*.html
+DOCS_DR=	doc/derivative/*.html doc/derivative/math-doc/document.pdf
+DOCS_EP=	doc/ep_flux/*.html doc/ep_flux/math-doc/document.pdf
 
 do-install:
 	@cd ${WRKSRC}/ && ${RUBY} ./install.rb
@@ -35,14 +36,26 @@ do-install:
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${RUBY_MODEXAMPLESDIR}
+	${MKDIR} ${RUBY_MODEXAMPLESDIR}/test
 	${MKDIR} ${RUBY_MODEXAMPLESDIR}/testdata
 	${MKDIR} ${RUBY_MODEXAMPLESDIR}/sample
+	${MKDIR} ${RUBY_MODEXAMPLESDIR}/sample/ep_flux
+	${INSTALL_DATA} ${WRKSRC}/test/* ${RUBY_MODEXAMPLESDIR}/test
 	${INSTALL_DATA} ${WRKSRC}/testdata/* ${RUBY_MODEXAMPLESDIR}/testdata
-	${INSTALL_DATA} ${WRKSRC}/sample/* ${RUBY_MODEXAMPLESDIR}/sample
+	${INSTALL_DATA} ${WRKSRC}/sample/*.rb ${RUBY_MODEXAMPLESDIR}/sample
+	${INSTALL_DATA} ${WRKSRC}/sample/ep_flux/* ${RUBY_MODEXAMPLESDIR}/sample/ep_flux
 	${MKDIR} ${RUBY_MODDOCDIR}
+	${MKDIR} ${RUBY_MODDOCDIR}/derivative
+	${MKDIR} ${RUBY_MODDOCDIR}/ep_flux
 .for f in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}
 .endfor
+.for f in ${DOCS_DR}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/derivative
+.endfor
+.for f in ${DOCS_EP}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/ep_flux
+.endfor
 .endif
 
 .include <bsd.port.mk>
diff --git a/science/ruby-gphys/distinfo b/science/ruby-gphys/distinfo
index 602d1b02069e..4d8c6d53a8a7 100644
--- a/science/ruby-gphys/distinfo
+++ b/science/ruby-gphys/distinfo
@@ -1,2 +1,2 @@
-MD5 (ruby/gphys-0.3.3.tar.gz) = 22ca8fbfc52f87e515e8d1cf67bdc35e
-SIZE (ruby/gphys-0.3.3.tar.gz) = 178865
+MD5 (ruby/gphys-0.3.5.tar.gz) = 4ed58d402d6fc2ab751b233960726ae3
+SIZE (ruby/gphys-0.3.5.tar.gz) = 571467
diff --git a/science/ruby-gphys/pkg-descr b/science/ruby-gphys/pkg-descr
index 86e37e694caa..e34f45538d56 100644
--- a/science/ruby-gphys/pkg-descr
+++ b/science/ruby-gphys/pkg-descr
@@ -1,4 +1,3 @@
 GPhys -- a multi-purpose class to handle Gridded Physical quantities
 
-Author:	Takeshi Horinouchi <horinout@kurasc.kyoto-u.ac.jp>
 WWW:	http://ruby.gfd-dennou.org/products/gphys/
diff --git a/science/ruby-gphys/pkg-plist b/science/ruby-gphys/pkg-plist
index 2f1126c8c31e..39437d337f38 100644
--- a/science/ruby-gphys/pkg-plist
+++ b/science/ruby-gphys/pkg-plist
@@ -1,16 +1,22 @@
+bin/gpprint
+bin/gpview
+bin/grads2nc_with_gphys
+%%RUBY_SITELIBDIR%%/numru/derivative.rb
 %%RUBY_SITELIBDIR%%/numru/ggraph.rb
-%%RUBY_SITELIBDIR%%/numru/ggraph_old.rb
+%%RUBY_SITELIBDIR%%/numru/ggraph_on_merdional_section.rb
 %%RUBY_SITELIBDIR%%/numru/gphys.rb
 %%RUBY_SITELIBDIR%%/numru/gphys/attribute.rb
 %%RUBY_SITELIBDIR%%/numru/gphys/attributenetcdf.rb
 %%RUBY_SITELIBDIR%%/numru/gphys/axis.rb
 %%RUBY_SITELIBDIR%%/numru/gphys/coordmapping.rb
 %%RUBY_SITELIBDIR%%/numru/gphys/coordtransform.rb
+%%RUBY_SITELIBDIR%%/numru/gphys/derivative.rb
+%%RUBY_SITELIBDIR%%/numru/gphys/ep_flux.rb
 %%RUBY_SITELIBDIR%%/numru/gphys/gphys.rb
 %%RUBY_SITELIBDIR%%/numru/gphys/gphys_fft.rb
+%%RUBY_SITELIBDIR%%/numru/gphys/gphys_grads_io.rb
 %%RUBY_SITELIBDIR%%/numru/gphys/gphys_io.rb
 %%RUBY_SITELIBDIR%%/numru/gphys/gphys_io_common.rb
-%%RUBY_SITELIBDIR%%/numru/gphys/gphys_grads_io.rb
 %%RUBY_SITELIBDIR%%/numru/gphys/gphys_netcdf_io.rb
 %%RUBY_SITELIBDIR%%/numru/gphys/grads_gridded.rb
 %%RUBY_SITELIBDIR%%/numru/gphys/grid.rb
@@ -28,26 +34,46 @@
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/sample/druby_cli2.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/sample/druby_serv1.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/sample/druby_serv2.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/sample/map_projection.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/sample/ep_flux/demo_NCEP_1.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/sample/ep_flux/demo_NCEP_2.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/sample/ep_flux/demo_NCEP_3.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test/test_ep_flux.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/testdata/T.jan.ctl
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/testdata/T.jan.dat
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/testdata/T.jan.nc
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/testdata/cira86.dat
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/sample/ep_flux
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/sample
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/test
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/testdata
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/TODO_ep_flux
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/coordtransform.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ggraph.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/gphys.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/gphys_fft.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/gphys_grads_io.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/gphys_netcdf_io.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/gpprint.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/gpview.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/grads2nc_with_gphys.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/grads_gridded.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/index.html
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/index.rd
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/netcdf_convention.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/unumeric.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/varray.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/varraycomposite.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/derivative/gphys-derivative.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/derivative/index.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/derivative/numru-derivative.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/derivative/document.pdf
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/derivative
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ep_flux/ep_flux.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ep_flux/index.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ep_flux/ggraph_on_merdional_section.html
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ep_flux/document.pdf
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ep_flux
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%