- Update to 2.1.01

PR:		ports/94274
Submitted by:	Johan van Selst <johans@stack.nl> (maintainer)

7 files changed, 33 insertions, 43 deletions

diff --git a/lang/yorick/Makefile b/lang/yorick/Makefile
index 70a8c21198e9..b453071b1207 100644
--- a/lang/yorick/Makefile
+++ b/lang/yorick/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	yorick
-PORTVERSION=	1.6.02
+PORTVERSION=	2.1.01
 CATEGORIES=	lang math
-MASTER_SITES=	ftp://ftp-icf.llnl.gov/pub/Yorick/ \
-		http://www.maumae.net/yorick/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	johans@stack.nl
@@ -23,17 +23,15 @@ MAN1=		yorick.1 gist.1
 INFO=		yorick
 
 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
+		library.doc math.doc refs.pdf refs.tex std.doc \
+		yorick.pdf yorick.tex
 
 do-configure:
 	@(cd ${CONFIGURE_WRKSRC}; ${SETENV} ${MAKE_ENV} \
 		${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ysite config)
 
 post-build:
-.if !defined(NOPORTDOCS)
 	cd ${WRKSRC}/doc; make yorick.info
-.endif
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/emacs/yorick.el ${WRKSRC}/relocatable
@@ -52,9 +50,9 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR}
 .endfor
 	@${LN} -sf ${DOCSDIR} ${PREFIX}/lib/${PORTNAME}/doc
+.endif
 	for f in ${WRKSRC}/doc/yorick.info*; do \
-	  ${INSTALL_DATA} $$f ${PREFIX}/info; \
+	  ${INSTALL_DATA} $$f ${PREFIX}/${INFO_PATH}; \
 	done
-.endif
 
 .include <bsd.port.mk>
diff --git a/lang/yorick/distinfo b/lang/yorick/distinfo
index c10d8b974d26..9024dca74138 100644
--- a/lang/yorick/distinfo
+++ b/lang/yorick/distinfo
@@ -1,3 +1,3 @@
-MD5 (yorick-1.6.02.tgz) = 9371c2a0d3ae11e9e8d75a8bf21210a7
-SHA256 (yorick-1.6.02.tgz) = 96a3d0f0b1c39483b7d464bee3f95bf66fd011fd1649de20dea41874ac7bf109
-SIZE (yorick-1.6.02.tgz) = 2234280
+MD5 (yorick-2.1.01.tgz) = 9d9e2a223bc03b420ccc4a00b5a7fc90
+SHA256 (yorick-2.1.01.tgz) = bbf2ff64aa3a58dababb47221e983ca5fca860b3df2f9da5e68a22c30de784b6
+SIZE (yorick-2.1.01.tgz) = 2009644
diff --git a/lang/yorick/files/patch-yorick_Makefile b/lang/yorick/files/patch-yorick_Makefile
index 6a727a591326..96fe257c0bfc 100644
--- a/lang/yorick/files/patch-yorick_Makefile
+++ b/lang/yorick/files/patch-yorick_Makefile
@@ -1,16 +1,16 @@
---- 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
+--- yorick/Makefile.orig	Mon Sep 19 00:04:08 2005
++++ yorick/Makefile	Thu Mar  9 14:59:53 2006
+@@ -15,7 +15,8 @@
    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 \
+   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 funcdef.o spawn.o fortrn.o
++  graph0.o style.o list.o pathfun.o autold.o funcdef.o spawn.o fortrn.o \
 +  ywrap.o yinit.o
  
- PKG_CLEAN=libyor main.c prmtyp.h codger lib$(PKG_NAME).a $(PKG_EXENAME) yorapi*
+ PKG_CLEAN=libyor main.* prmtyp.h codger lib$(PKG_NAME).a $(PKG_EXENAME) yorapi*
  
-@@ -60,6 +61,7 @@ libyor: $(BUILTIN_PKGS)
+@@ -59,6 +60,7 @@
  	cd ../matrix; $(MAKE) "COPT=$(COPT)" oinsert
  	cd ../fft; $(MAKE) "COPT=$(COPT)" oinsert
  	touch $@
diff --git a/lang/yorick/files/patch-yorick_spawn.c b/lang/yorick/files/patch-yorick_spawn.c
new file mode 100644
index 000000000000..710ce48d7e1b
--- /dev/null
+++ b/lang/yorick/files/patch-yorick_spawn.c
@@ -0,0 +1,10 @@
+--- yorick/spawn.c.orig	Thu Mar  9 15:02:01 2006
++++ yorick/spawn.c	Thu Mar  9 15:02:07 2006
+@@ -14,6 +14,7 @@
+ #include "yio.h"
+ 
+ #include <string.h>
++#include <unistd.h>
+ 
+ /* FIXME -- things not in any .h file */
+ extern void (*CleanUpForExit)(void);
diff --git a/lang/yorick/pkg-descr b/lang/yorick/pkg-descr
index c843e87299cf..ef9804178754 100644
--- a/lang/yorick/pkg-descr
+++ b/lang/yorick/pkg-descr
@@ -16,4 +16,4 @@ This package includes an emacs-based development environment, which
 you can launch by typing M-x yorick in emacs, if you load
 .../share/yorick/yorick.el in your ~/.emacs file.
 
-WWW: ftp://ftp-icf.llnl.gov/pub/Yorick/doc/index.html
+WWW: http://yorick.sourceforge.net/
diff --git a/lang/yorick/pkg-install b/lang/yorick/pkg-install
deleted file mode 100644
index 5e1e39c3d452..000000000000
--- a/lang/yorick/pkg-install
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-if test "$2" = "POST-INSTALL"; then
-  YS=$PKG_PREFIX/share/yorick
-  YH=$PKG_PREFIX/lib/yorick
-  x=`grep "^Y_HOME = $YH" $YH/Maketmpl`
-  if test -z "$x"; then
-    YB=$PKG_PREFIX/lib/yorick/bin
-    ln -sf $YB/gist $PKG_PREFIX/bin/gist
-    ln -sf $YB/yorick $PKG_PREFIX/bin/yorick
-    s="s%^...set_site,.*%set_site, \"$YS\", \"$YH\"\\;%g"
-    sed -e "$s" $YB/paths.i >$YB/paths.tmp
-    mv -f $YB/paths.tmp $YB/paths.i
-    sed -e "s%^Y_SITE = .*%Y_SITE = $YS%g" $YH/Maketmpl >$YH/Maketmpl.tmp
-    rm -f $YH/Maketmpl
-    sed -e "s%^Y_HOME = .*%Y_HOME = $YH%g" $YH/Maketmpl.tmp >$YH/Maketmpl
-    rm -f $YH/Maketmpl.tmp
-  fi
-fi
-true
diff --git a/lang/yorick/pkg-plist b/lang/yorick/pkg-plist
index 6dc0696d87d9..e53b267e95cf 100644
--- a/lang/yorick/pkg-plist
+++ b/lang/yorick/pkg-plist
@@ -53,6 +53,7 @@ lib/yorick/i/roots.i
 lib/yorick/i/romberg.i
 lib/yorick/i/rkutta.i
 lib/yorick/i/rezone.i
+lib/yorick/i/regress.i
 lib/yorick/i/readn.i
 lib/yorick/i/rays.i
 lib/yorick/i/random.i
@@ -71,7 +72,6 @@ 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
@@ -153,7 +153,8 @@ lib/yorick/Makedll
 lib/yorick/Makeexe
 lib/yorick/Makepkg
 lib/yorick/Make.cfg
-lib/yorick/doc
+lib/yorick/LICENSE
+%%PORTDOCS%%lib/yorick/doc
 @dirrm lib/yorick/g
 @dirrm lib/yorick/i0
 @dirrm lib/yorick/i