5 files changed, 201 insertions, 172 deletions

diff --git a/lang/yorick/Makefile b/lang/yorick/Makefile
index eb98ada6abd2..0fedda033ac6 100644
--- a/lang/yorick/Makefile
+++ b/lang/yorick/Makefile
@@ -6,30 +6,43 @@
 #
 
 PORTNAME=	yorick
-PORTVERSION=	1.4.1
+PORTVERSION=	1.5.02
 CATEGORIES=	lang math
-MASTER_SITES=	ftp://ftp-icf.llnl.gov/pub/Yorick/		\
+MASTER_SITES=	ftp://ftp-icf.llnl.gov/pub/Yorick/ \
 		ftp://wuarchive.wustl.edu/languages/yorick/
-DISTNAME=	yorick-1.4
-
-PATCH_SITES=	ftp://ftp-icf.llnl.gov/pub/Yorick/
-PATCHFILES=	yorick-1.4.diff.gz
-PATCH_DIST_STRIP=-p1
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
+
 USE_XLIB=	yes
-HAS_CONFIGURE=	yes
-ALL_TARGET=
+MAKE_ARGS=	Y_HOME="${PREFIX}/lib/${PORTNAME}" Y_SITE="${DATADIR}" 
 MAN1=		yorick.1 gist.1
 
+PORTDOCS=	FILE_FORMATS README drat.doc drat.tex graph.doc hex.doc \
+		library.doc math.doc refs.ps refs.tex std.doc yorick.pdf \
+		yorick.ps yorick.tex
+
+post-patch:
+	@${PERL} -pi -e \
+		's|/usr/X11R6|${X11BASE}|g' ${WRKSRC}/play/x11/xconfig.sh
+
+do-configure:
+	@(cd ${CONFIGURE_WRKSRC}; ${SETENV} ${MAKE_ENV} \
+		${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ysite config)
+
 post-install:
-	strip	$(PREFIX)/bin/yorick
-	strip	$(PREFIX)/bin/gist
-	@${INSTALL_MAN} ${WRKSRC}/yorick.1 ${PREFIX}/man/man1/
-	@${INSTALL_MAN} ${WRKSRC}/gist.1 ${PREFIX}/man/man1/
-.if defined(NOPORTDOCS)
-	${RM} -rf $(PREFIX)/share/yorick/1.4/doc
+.for file in gist yorick 
+	${INSTALL_MAN} ${WRKSRC}/doc/${file}.1 ${PREFIX}/man/man1
+	@strip ${PREFIX}/lib/${PORTNAME}/bin/${file}
+	@${LN} -sf ${PREFIX}/lib/${PORTNAME}/bin/${file} ${PREFIX}/bin/${file}
+.endfor
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+.for file in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR}
+.endfor
 .endif
 
 .include <bsd.port.mk>
diff --git a/lang/yorick/distinfo b/lang/yorick/distinfo
index 101f080cdac0..0bbc317c6f67 100644
--- a/lang/yorick/distinfo
+++ b/lang/yorick/distinfo
@@ -1,2 +1 @@
-MD5 (yorick-1.4.tar.gz) = 7cf50b3dee2e1fd54e832d52abd2b88c
-MD5 (yorick-1.4.diff.gz) = afa51c80cec45e1d40b3337179e42b1f
+MD5 (yorick-1.5.02.tgz) = 0b8db7534b52e9fbaf9ab80d9d826a80
diff --git a/lang/yorick/files/patch-aa b/lang/yorick/files/patch-aa
deleted file mode 100644
index 75862b0ba6a5..000000000000
--- a/lang/yorick/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- Yorick/sysdep.c.orig	Mon Aug 30 20:26:38 1999
-+++ Yorick/sysdep.c	Mon Aug 30 20:27:02 1999
-@@ -95,7 +95,7 @@
-   set_fpc_csr(csr | 0x0103c000);  /* core dumps */
- # endif
- #endif
--#ifndef linux
-+#if !defined(linux) && !defined(__FreeBSD__)
- # ifdef sgi
-   /* See man page on handle_sigfpes -- must link with -lfpe */
- #include <sigfpe.h>
diff --git a/lang/yorick/files/patch-ab b/lang/yorick/files/patch-ab
new file mode 100644
index 000000000000..419e8d12ce20
--- /dev/null
+++ b/lang/yorick/files/patch-ab
@@ -0,0 +1,18 @@
+--- install.sh.orig	Sat May 12 03:56:33 2001
++++ install.sh	Wed Sep 19 23:40:58 2001
+@@ -91,7 +91,6 @@
+ if test ! -d $Y_SITE/i; then mkdir $Y_SITE/i; fi
+ if test ! -d $Y_SITE/i0; then mkdir $Y_SITE/i0; fi
+ if test ! -d $Y_SITE/g; then mkdir $Y_SITE/g; fi
+-if test ! -d $Y_SITE/doc; then mkdir $Y_SITE/doc; fi
+ rm -f $Y_SITE/junk.tst
+ touch ./junk.tst
+ if test -f $Y_SITE/junk.tst; then
+@@ -100,7 +99,6 @@
+   cp -f i/*.i i/README $Y_SITE/i
+   cp -f i0/*.i i0/README $Y_SITE/i0
+   cp -f g/*.gs g/*.gp g/ps.ps g/README $Y_SITE/g
+-  cp -f doc/*.tex doc/*.ps doc/*.pdf doc/FILE_FORMATS doc/README doc/*.doc $Y_SITE/doc
+ fi
+ rm -f ./junk.tst
+ 
diff --git a/lang/yorick/pkg-plist b/lang/yorick/pkg-plist
index e789c020e3a4..adf2a99bd5fa 100644
--- a/lang/yorick/pkg-plist
+++ b/lang/yorick/pkg-plist
@@ -1,147 +1,157 @@
 bin/gist
 bin/yorick
-lib/yorick/1.4/Make-cxx
-lib/yorick/1.4/Maketmpl
-lib/yorick/1.4/h/bcast.h
-lib/yorick/1.4/h/binio.h
-lib/yorick/1.4/h/cgm.h
-lib/yorick/1.4/h/clip.h
-lib/yorick/1.4/h/defmem.h
-lib/yorick/1.4/h/defstr.h
-lib/yorick/1.4/h/dispas.h
-lib/yorick/1.4/h/dispat.h
-lib/yorick/1.4/h/dispax.h
-lib/yorick/1.4/h/draw.h
-lib/yorick/1.4/h/engine.h
-lib/yorick/1.4/h/gist.h
-lib/yorick/1.4/h/gtext.h
-lib/yorick/1.4/h/hash.h
-lib/yorick/1.4/h/hlevel.h
-lib/yorick/1.4/h/main.c
-lib/yorick/1.4/h/osys.h
-lib/yorick/1.4/h/parse.h
-lib/yorick/1.4/h/prmtyp.h
-lib/yorick/1.4/h/ps.h
-lib/yorick/1.4/h/sysdep.h
-lib/yorick/1.4/h/xbasic.h
-lib/yorick/1.4/h/xfancy.h
-lib/yorick/1.4/h/xfont.h
-lib/yorick/1.4/h/xicky.h
-lib/yorick/1.4/h/yasync.h
-lib/yorick/1.4/h/ydata.h
-lib/yorick/1.4/h/yio.h
-lib/yorick/1.4/lib/codger
-lib/yorick/1.4/lib/libdrat.a
-lib/yorick/1.4/lib/libgist.a
-lib/yorick/1.4/lib/libyor.a
-lib/yorick/1.4/lib/libyorm.a
-lib/yorick/1.4/lib/main.o
-share/yorick/1.4/doc/FILE_FORMATS
-share/yorick/1.4/doc/README
-share/yorick/1.4/doc/drat.doc
-share/yorick/1.4/doc/graph.doc
-share/yorick/1.4/doc/library.doc
-share/yorick/1.4/doc/math.doc
-share/yorick/1.4/doc/refs.ps
-share/yorick/1.4/doc/refs.tex
-share/yorick/1.4/doc/std.doc
-share/yorick/1.4/doc/texinfo.tex
-share/yorick/1.4/doc/yorick.ps
-share/yorick/1.4/doc/yorick.tex
-share/yorick/1.4/gist/axes.gs
-share/yorick/1.4/gist/boxed.gs
-share/yorick/1.4/gist/boxed2.gs
-share/yorick/1.4/gist/earth.gp
-share/yorick/1.4/gist/gray.gp
-share/yorick/1.4/gist/heat.gp
-share/yorick/1.4/gist/l_nobox.gs
-share/yorick/1.4/gist/ncar.gp
-share/yorick/1.4/gist/nobox.gs
-share/yorick/1.4/gist/ps.ps
-share/yorick/1.4/gist/rainbow.gp
-share/yorick/1.4/gist/stern.gp
-share/yorick/1.4/gist/vg.gs
-share/yorick/1.4/gist/vgbox.gs
-share/yorick/1.4/gist/work.gs
-share/yorick/1.4/gist/work2.gs
-share/yorick/1.4/gist/yarg.gp
-share/yorick/1.4/include/README
-share/yorick/1.4/include/basfix.i
-share/yorick/1.4/include/bessel.i
-share/yorick/1.4/include/bowtie.i
-share/yorick/1.4/include/button.i
-share/yorick/1.4/include/collec.i
-share/yorick/1.4/include/color.i
-share/yorick/1.4/include/copyb.i
-share/yorick/1.4/include/custom.i
-share/yorick/1.4/include/demo1.i
-share/yorick/1.4/include/demo2.i
-share/yorick/1.4/include/demo3.i
-share/yorick/1.4/include/demo4.i
-share/yorick/1.4/include/demo5.i
-share/yorick/1.4/include/digit2.i
-share/yorick/1.4/include/ellipse.i
-share/yorick/1.4/include/elliptic.i
-share/yorick/1.4/include/filter.i
-share/yorick/1.4/include/fitlsq.i
-share/yorick/1.4/include/fitrat.i
-share/yorick/1.4/include/fits.i
-share/yorick/1.4/include/gamma.i
-share/yorick/1.4/include/gcd.i
-share/yorick/1.4/include/legal.i
-share/yorick/1.4/include/legndr.i
-share/yorick/1.4/include/make.i
-share/yorick/1.4/include/mkdoc.i
-share/yorick/1.4/include/movie.i
-share/yorick/1.4/include/msort.i
-share/yorick/1.4/include/multi.i
-share/yorick/1.4/include/netcdf.i
-share/yorick/1.4/include/pixels.i
-share/yorick/1.4/include/pl3d.i
-share/yorick/1.4/include/plclab.i
-share/yorick/1.4/include/plwf.i
-share/yorick/1.4/include/pnm.i
-share/yorick/1.4/include/prefix.i
-share/yorick/1.4/include/prmtyp.i
-share/yorick/1.4/include/random.i
-share/yorick/1.4/include/rays.i
-share/yorick/1.4/include/readn.i
-share/yorick/1.4/include/rezone.i
-share/yorick/1.4/include/rkutta.i
-share/yorick/1.4/include/romberg.i
-share/yorick/1.4/include/roots.i
-share/yorick/1.4/include/series.i
-share/yorick/1.4/include/show.i
-share/yorick/1.4/include/slice3.i
-share/yorick/1.4/include/spline.i
-share/yorick/1.4/include/string.i
-share/yorick/1.4/include/style.i
-share/yorick/1.4/include/sysafe.i
-share/yorick/1.4/include/test1.i
-share/yorick/1.4/include/test2.i
-share/yorick/1.4/include/test3.i
-share/yorick/1.4/include/testb.i
-share/yorick/1.4/include/testfull.i
-share/yorick/1.4/include/testg.i
-share/yorick/1.4/include/testlp.i
-share/yorick/1.4/include/testm.i
-share/yorick/1.4/include/testp.i
-share/yorick/1.4/include/txpath.i
-share/yorick/1.4/include/zroots.i
-share/yorick/1.4/startup/drat.i
-share/yorick/1.4/startup/fft.i
-share/yorick/1.4/startup/graph.i
-share/yorick/1.4/startup/matrix.i
-share/yorick/1.4/startup/paths.i
-share/yorick/1.4/startup/std.i
-share/yorick/1.4/startup/stdx.i
-@dirrm lib/yorick/1.4/lib
-@dirrm lib/yorick/1.4/h
-@dirrm lib/yorick/1.4
+lib/yorick/Make.cfg
+lib/yorick/Maketmpl
+lib/yorick/bin/gist
+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/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/xfancy.h
+lib/yorick/include/yasync.h
+lib/yorick/include/ydata.h
+lib/yorick/include/yio.h
+lib/yorick/lib/codger
+lib/yorick/lib/libyor.a
+lib/yorick/lib/main.o
+%%PORTDOCS%%share/doc/yorick/FILE_FORMATS
+%%PORTDOCS%%share/doc/yorick/README
+%%PORTDOCS%%share/doc/yorick/drat.doc
+%%PORTDOCS%%share/doc/yorick/drat.tex
+%%PORTDOCS%%share/doc/yorick/graph.doc
+%%PORTDOCS%%share/doc/yorick/hex.doc
+%%PORTDOCS%%share/doc/yorick/library.doc
+%%PORTDOCS%%share/doc/yorick/math.doc
+%%PORTDOCS%%share/doc/yorick/refs.ps
+%%PORTDOCS%%share/doc/yorick/refs.tex
+%%PORTDOCS%%share/doc/yorick/std.doc
+%%PORTDOCS%%share/doc/yorick/yorick.pdf
+%%PORTDOCS%%share/doc/yorick/yorick.ps
+%%PORTDOCS%%share/doc/yorick/yorick.tex
+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/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/gcd.i
+share/yorick/i/hydra.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/paths.i
+share/yorick/i0/std.i
+share/yorick/i0/stdx.i
+@dirrm share/yorick/i0
+@dirrm share/yorick/i
+@dirrm share/yorick/g
+@dirrm share/yorick
+%%PORTDOCS%%@dirrm share/doc/yorick
+@dirrm lib/yorick/lib
+@dirrm lib/yorick/include
+@dirrm lib/yorick/bin
 @dirrm lib/yorick
-@dirrm share/yorick/1.4/startup
-@dirrm share/yorick/1.4/include
-@dirrm share/yorick/1.4/gist
-@dirrm share/yorick/1.4/doc
-@dirrm share/yorick/1.4
-@dirrm share/yorick/