- Update to 1.6.02

- Transfer maintainership

PR:		ports/81254
Submitted by:	Johan van Selst <johans@stack.nl>
Approved by:	David H. Munro <munro@oldben.llnl.gov> (maintainer)

4 files changed, 188 insertions, 181 deletions

diff --git a/lang/yorick/Makefile b/lang/yorick/Makefile
index b0c17cd09b00..b76eed9f840a 100644
--- a/lang/yorick/Makefile
+++ b/lang/yorick/Makefile
@@ -5,45 +5,24 @@
 # $FreeBSD$
 #
 
-# History: 1.4.1 port by Pedro Giffuni <giffunip@asme.org>
-#          1.5.02 port by ports@FreeBSD.org,
-#                 from submission by Ed Alley <wea@llnl.gov>
-#          1.5.07 port by David H. Munro <munro1@llnl.gov>
-#          1.5.12 port by David H. Munro <munro1@llnl.gov>, 01/Nov/02
-#          1.5.14 port by David H. Munro <munro1@llnl.gov>, 01/Oct/03
-# 1.5.07 notes:
-# (1) info pages installed in PREFIX/info for consistency with other apps
-#     -- really should be in PREFIX/share/info
-# (2) several fixes to allow PREFIX for package install to be different
-#     from PREFIX at build time (which is compiled into yorick and gist):
-#     (a) PREFIX/bin/{yorick,gist} are softlinks, which allows
-#         yorick and gist to compute ${PREFIX}/lib/${PORTNAME} at runtime
-#     (b) softlink for g/ put in lib/${PORTNAME} for gist
-#     (c) softlink doc/ so yorick online help is correct
-#     (d) copy of paths.i put in lib/${PORTNAME}/bin for yorick
-#     (e) pkg-install script added to fiddle softlinks, paths.i, and
-#         Maketmpl if PREFIX has changed at install time
-#     -- assume DOCSDIR and DATADIR take default values as does pkg-plist
-#          1.5.08 replaces 1.5.07 infant mortality
-
 PORTNAME=	yorick
-PORTVERSION=	1.5.14
+PORTVERSION=	1.6.02
 CATEGORIES=	lang math
-MASTER_SITES=	ftp://ftp-icf.llnl.gov/pub/Yorick/
+MASTER_SITES=	ftp://ftp-icf.llnl.gov/pub/Yorick/ \
+		http://www.maumae.net/yorick/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	munro1@llnl.gov
+MAINTAINER=	johans@stack.nl
 COMMENT=	Interpreted language and scientific graphics
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
 
 USE_XLIB=	yes
-MAKE_ARGS=	Y_HOME="${PREFIX}/lib/${PORTNAME}" Y_SITE="${DATADIR}" \
-		Y_DOCDIR=/dev/null
+MAKE_ARGS=	Y_HOME=relocatable Y_DOCDIR=/dev/null
 MAN1=		yorick.1 gist.1
 INFO=		yorick
 
-PORTDOCS=	FILE_FORMATS README drat.doc drat.tex graph.doc hex.doc \
+PORTDOCS=	FILE_FORMATS README drat.doc graph.doc hex.doc \
 		library.doc math.doc refs.pdf refs.ps refs.tex std.doc \
 		yorick.pdf yorick.ps yorick.tex
 
@@ -57,21 +36,22 @@ post-build:
 .endif
 
 post-install:
+	${INSTALL_DATA} ${WRKSRC}/emacs/yorick.el ${WRKSRC}/relocatable
+	@${RM} -rf ${WRKSRC}/relocatable/doc
+	@${RM} -rf ${PREFIX}/lib/${PORTNAME}
+	@${MV} ${WRKSRC}/relocatable ${PREFIX}/lib/${PORTNAME}
 .for file in gist yorick
 	${INSTALL_MAN} ${WRKSRC}/doc/${file}.1 ${PREFIX}/man/man1
 	@${STRIP_CMD} ${PREFIX}/lib/${PORTNAME}/bin/${file}
 	@${LN} -sf ${PREFIX}/lib/${PORTNAME}/bin/${file} ${PREFIX}/bin/${file}
 .endfor
 	@${STRIP_CMD} ${PREFIX}/lib/${PORTNAME}/lib/codger
-	${INSTALL_DATA} ${WRKSRC}/emacs/yorick.el ${DATADIR}
-	@${LN} -sf ../../share/${PORTNAME}/g ${PREFIX}/lib/${PORTNAME}/g
-	@${CP} ${DATADIR}/i0/paths.i ${PREFIX}/lib/${PORTNAME}/bin/paths.i
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for file in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR}
 .endfor
-	@${LN} -sf ../doc/${PORTNAME} ${DATADIR}/doc
+	@${LN} -sf ${DOCSDIR} ${PREFIX}/lib/${PORTNAME}/doc
 	for f in ${WRKSRC}/doc/yorick.info*; do \
 	  ${INSTALL_DATA} $$f ${PREFIX}/info; \
 	done
diff --git a/lang/yorick/distinfo b/lang/yorick/distinfo
index 5d3a997ae754..b03d92f52aa6 100644
--- a/lang/yorick/distinfo
+++ b/lang/yorick/distinfo
@@ -1,2 +1,2 @@
-MD5 (yorick-1.5.14.tgz) = 6308d6616610654df834d8e2b1e4c82a
-SIZE (yorick-1.5.14.tgz) = 2167929
+MD5 (yorick-1.6.02.tgz) = 9371c2a0d3ae11e9e8d75a8bf21210a7
+SIZE (yorick-1.6.02.tgz) = 2234280
diff --git a/lang/yorick/files/patch-yorick_Makefile b/lang/yorick/files/patch-yorick_Makefile
new file mode 100644
index 000000000000..6a727a591326
--- /dev/null
+++ b/lang/yorick/files/patch-yorick_Makefile
@@ -0,0 +1,20 @@
+--- yorick/Makefile.orig	Sun May 15 11:30:16 2005
++++ yorick/Makefile	Sun May 15 11:31:25 2005
+@@ -16,7 +16,8 @@ OBJS = opsv.o task.o yorick.o yinput.o p
+   array.o range.o ops.o ops0.o ops1.o ops2.o ops3.o nonc.o debug.o \
+   std0.o std1.o std2.o ascio.o defmem.o yhash.o  yrdwr.o bcast.o \
+   binio.o binobj.o binstd.o cache.o convrt.o binpdb.o clog.o ystr.o \
+-  graph.o graph0.o style.o list.o pathfun.o autold.o fortrn.o
++  graph.o graph0.o style.o list.o pathfun.o autold.o fortrn.o \
++  ywrap.o yinit.o
+ 
+ PKG_CLEAN=libyor main.c prmtyp.h codger lib$(PKG_NAME).a $(PKG_EXENAME) yorapi*
+ 
+@@ -60,6 +61,7 @@ libyor: $(BUILTIN_PKGS)
+ 	cd ../matrix; $(MAKE) "COPT=$(COPT)" oinsert
+ 	cd ../fft; $(MAKE) "COPT=$(COPT)" oinsert
+ 	touch $@
++	$(AR) r ../yorick/libyor.a $(OBJS)
+ ../gist/libgist.a:
+ 	@cd ../gist; $(MAKE) "COPT=$(COPT)" libgist.a
+ ../regexp/libyor:
diff --git a/lang/yorick/pkg-plist b/lang/yorick/pkg-plist
index 7bf31e438ac6..6dc0696d87d9 100644
--- a/lang/yorick/pkg-plist
+++ b/lang/yorick/pkg-plist
@@ -1,157 +1,164 @@
-bin/gist
 bin/yorick
-lib/yorick/Make.cfg
-lib/yorick/Maketmpl
-lib/yorick/bin/gist
-lib/yorick/bin/paths.i
-lib/yorick/bin/yorick
-lib/yorick/include/bcast.h
-lib/yorick/include/binio.h
-lib/yorick/include/cgm.h
-lib/yorick/include/cgmin.h
-lib/yorick/include/clip.h
-lib/yorick/include/config.h
-lib/yorick/include/defmem.h
-lib/yorick/include/draw.h
-lib/yorick/include/engine.h
-lib/yorick/include/eps.h
-lib/yorick/include/extern_c.h
-lib/yorick/include/gist.h
-lib/yorick/include/gtext.h
-lib/yorick/include/hash.h
-lib/yorick/include/hlevel.h
-lib/yorick/include/parse.h
-lib/yorick/include/phash.h
-lib/yorick/include/play.h
-lib/yorick/include/playgl.h
-lib/yorick/include/pmin.h
+bin/gist
+lib/yorick/g/README
+lib/yorick/g/ps.ps
+lib/yorick/g/yarg.gp
+lib/yorick/g/stern.gp
+lib/yorick/g/rainbow.gp
+lib/yorick/g/ncar.gp
+lib/yorick/g/heat.gp
+lib/yorick/g/gray.gp
+lib/yorick/g/earth.gp
+lib/yorick/g/work2.gs
+lib/yorick/g/work.gs
+lib/yorick/g/vgbox.gs
+lib/yorick/g/vg.gs
+lib/yorick/g/nobox.gs
+lib/yorick/g/l_nobox.gs
+lib/yorick/g/boxed2.gs
+lib/yorick/g/boxed.gs
+lib/yorick/g/axes.gs
+lib/yorick/i0/README
+lib/yorick/i0/stdx.i
+lib/yorick/i0/std.i
+lib/yorick/i0/paths.i
+lib/yorick/i0/matrix.i
+lib/yorick/i0/hex.i
+lib/yorick/i0/graph.i
+lib/yorick/i0/fft.i
+lib/yorick/i0/drat.i
+lib/yorick/i/README
+lib/yorick/i/zroots.i
+lib/yorick/i/ylmdec.i
+lib/yorick/i/txpath.i
+lib/yorick/i/teststr.i
+lib/yorick/i/testp.i
+lib/yorick/i/testm.i
+lib/yorick/i/testlp.i
+lib/yorick/i/testg.i
+lib/yorick/i/testfull.i
+lib/yorick/i/testb.i
+lib/yorick/i/test3.i
+lib/yorick/i/test2.i
+lib/yorick/i/test1.i
+lib/yorick/i/sysafe.i
+lib/yorick/i/style.i
+lib/yorick/i/string.i
+lib/yorick/i/spline.i
+lib/yorick/i/slice3.i
+lib/yorick/i/silo.i
+lib/yorick/i/show.i
+lib/yorick/i/series.i
+lib/yorick/i/roots.i
+lib/yorick/i/romberg.i
+lib/yorick/i/rkutta.i
+lib/yorick/i/rezone.i
+lib/yorick/i/readn.i
+lib/yorick/i/rays.i
+lib/yorick/i/random.i
+lib/yorick/i/prefix.i
+lib/yorick/i/pnm.i
+lib/yorick/i/plwf.i
+lib/yorick/i/plclab.i
+lib/yorick/i/plato.i
+lib/yorick/i/pl3d.i
+lib/yorick/i/pixels.i
+lib/yorick/i/netcdf.i
+lib/yorick/i/multi.i
+lib/yorick/i/msort.i
+lib/yorick/i/movie.i
+lib/yorick/i/mkdoc.i
+lib/yorick/i/md5.i
+lib/yorick/i/make.i
+lib/yorick/i/legndr.i
+lib/yorick/i/legal.i
+lib/yorick/i/kepler.i
+lib/yorick/i/ieee.i
+lib/yorick/i/idlsave.i
+lib/yorick/i/hydra.i
+lib/yorick/i/gcd.i
+lib/yorick/i/gammp.i
+lib/yorick/i/gamma.i
+lib/yorick/i/fits.i
+lib/yorick/i/fitrat.i
+lib/yorick/i/fitlsq.i
+lib/yorick/i/filter.i
+lib/yorick/i/fermii.i
+lib/yorick/i/fermi.i
+lib/yorick/i/elliptic.i
+lib/yorick/i/ellipse.i
+lib/yorick/i/digit2.i
+lib/yorick/i/demo5.i
+lib/yorick/i/demo4.i
+lib/yorick/i/demo3.i
+lib/yorick/i/demo2.i
+lib/yorick/i/demo1.i
+lib/yorick/i/dawson.i
+lib/yorick/i/custom.i
+lib/yorick/i/copyb.i
+lib/yorick/i/convol.i
+lib/yorick/i/color.i
+lib/yorick/i/collec.i
+lib/yorick/i/cheby.i
+lib/yorick/i/button.i
+lib/yorick/i/bowtie.i
+lib/yorick/i/bessel.i
+lib/yorick/i/basfix.i
+lib/yorick/include/yio.h
+lib/yorick/include/ydata.h
+lib/yorick/include/yasync.h
 lib/yorick/include/prmtyp.h
-lib/yorick/include/ps.h
-lib/yorick/include/pstdio.h
-lib/yorick/include/pstdlib.h
-lib/yorick/include/xbasic.h
+lib/yorick/include/parse.h
+lib/yorick/include/hash.h
+lib/yorick/include/defmem.h
+lib/yorick/include/binio.h
+lib/yorick/include/bcast.h
 lib/yorick/include/xfancy.h
-lib/yorick/include/yasync.h
-lib/yorick/include/ydata.h
-lib/yorick/include/yio.h
+lib/yorick/include/xbasic.h
+lib/yorick/include/ps.h
+lib/yorick/include/hlevel.h
+lib/yorick/include/gtext.h
+lib/yorick/include/gist.h
+lib/yorick/include/eps.h
+lib/yorick/include/engine.h
+lib/yorick/include/draw.h
+lib/yorick/include/clip.h
+lib/yorick/include/cgmin.h
+lib/yorick/include/cgm.h
 lib/yorick/include/yversion.h
-lib/yorick/lib/codger
-lib/yorick/lib/libdrat.a
+lib/yorick/include/pstdlib.h
+lib/yorick/include/pstdio.h
+lib/yorick/include/pmin.h
+lib/yorick/include/plugin.h
+lib/yorick/include/playwin.h
+lib/yorick/include/play.h
+lib/yorick/include/phash.h
+lib/yorick/include/config.h
+lib/yorick/i-start/README
+lib/yorick/i-start/70hex.i
+lib/yorick/i-start/70drat.i
+lib/yorick/i-start/50i.i
 lib/yorick/lib/libhex.a
-lib/yorick/lib/libyor.a
+lib/yorick/lib/libdep.sh
+lib/yorick/lib/install.sh
+lib/yorick/lib/codger
 lib/yorick/lib/main.o
-lib/yorick/g
-%%PORTDOCS%%share/yorick/doc
-share/yorick/g/README
-share/yorick/g/axes.gs
-share/yorick/g/boxed.gs
-share/yorick/g/boxed2.gs
-share/yorick/g/earth.gp
-share/yorick/g/gray.gp
-share/yorick/g/heat.gp
-share/yorick/g/l_nobox.gs
-share/yorick/g/ncar.gp
-share/yorick/g/nobox.gs
-share/yorick/g/ps.ps
-share/yorick/g/rainbow.gp
-share/yorick/g/stern.gp
-share/yorick/g/vg.gs
-share/yorick/g/vgbox.gs
-share/yorick/g/work.gs
-share/yorick/g/work2.gs
-share/yorick/g/yarg.gp
-share/yorick/i/README
-share/yorick/i/basfix.i
-share/yorick/i/bessel.i
-share/yorick/i/bowtie.i
-share/yorick/i/button.i
-share/yorick/i/cheby.i
-share/yorick/i/collec.i
-share/yorick/i/color.i
-share/yorick/i/convol.i
-share/yorick/i/copyb.i
-share/yorick/i/custom.i
-share/yorick/i/dawson.i
-share/yorick/i/demo1.i
-share/yorick/i/demo2.i
-share/yorick/i/demo3.i
-share/yorick/i/demo4.i
-share/yorick/i/demo5.i
-share/yorick/i/digit2.i
-share/yorick/i/ellipse.i
-share/yorick/i/elliptic.i
-share/yorick/i/fermi.i
-share/yorick/i/fermii.i
-share/yorick/i/filter.i
-share/yorick/i/fitlsq.i
-share/yorick/i/fitrat.i
-share/yorick/i/fits.i
-share/yorick/i/gamma.i
-share/yorick/i/gammp.i
-share/yorick/i/gcd.i
-share/yorick/i/hydra.i
-share/yorick/i/idlsave.i
-share/yorick/i/ieee.i
-share/yorick/i/kepler.i
-share/yorick/i/legal.i
-share/yorick/i/legndr.i
-share/yorick/i/make.i
-share/yorick/i/mkdoc.i
-share/yorick/i/movie.i
-share/yorick/i/msort.i
-share/yorick/i/multi.i
-share/yorick/i/netcdf.i
-share/yorick/i/pixels.i
-share/yorick/i/pl3d.i
-share/yorick/i/plato.i
-share/yorick/i/plclab.i
-share/yorick/i/plwf.i
-share/yorick/i/pnm.i
-share/yorick/i/prefix.i
-share/yorick/i/prmtyp.i
-share/yorick/i/random.i
-share/yorick/i/rays.i
-share/yorick/i/readn.i
-share/yorick/i/rezone.i
-share/yorick/i/rkutta.i
-share/yorick/i/romberg.i
-share/yorick/i/roots.i
-share/yorick/i/series.i
-share/yorick/i/show.i
-share/yorick/i/silo.i
-share/yorick/i/slice3.i
-share/yorick/i/spline.i
-share/yorick/i/string.i
-share/yorick/i/style.i
-share/yorick/i/sysafe.i
-share/yorick/i/test1.i
-share/yorick/i/test2.i
-share/yorick/i/test3.i
-share/yorick/i/testb.i
-share/yorick/i/testfull.i
-share/yorick/i/testg.i
-share/yorick/i/testlp.i
-share/yorick/i/testm.i
-share/yorick/i/testp.i
-share/yorick/i/txpath.i
-share/yorick/i/ylmdec.i
-share/yorick/i/zroots.i
-share/yorick/i0/README
-share/yorick/i0/drat.i
-share/yorick/i0/fft.i
-share/yorick/i0/graph.i
-share/yorick/i0/hex.i
-share/yorick/i0/matrix.i
-share/yorick/i0/mpy.i
-share/yorick/i0/paths.i
-share/yorick/i0/std.i
-share/yorick/i0/stdx.i
-share/yorick/yorick.el
-@dirrm share/yorick/i0
-@dirrm share/yorick/i
-@dirrm share/yorick/g
-@dirrm share/yorick
-@dirrm lib/yorick/lib
+lib/yorick/lib/libyor.a
+lib/yorick/lib/libdrat.a
+lib/yorick/lib/install.grp
+lib/yorick/bin/yorick
+lib/yorick/bin/gist
+lib/yorick/yorick.el
+lib/yorick/Makedll
+lib/yorick/Makeexe
+lib/yorick/Makepkg
+lib/yorick/Make.cfg
+lib/yorick/doc
+@dirrm lib/yorick/g
+@dirrm lib/yorick/i0
+@dirrm lib/yorick/i
 @dirrm lib/yorick/include
+@dirrm lib/yorick/i-start
+@dirrm lib/yorick/lib
 @dirrm lib/yorick/bin
 @dirrm lib/yorick