Change to work with new version of yorick.

4 files changed, 23 insertions, 14 deletions

diff --git a/graphics/yplot/Makefile b/graphics/yplot/Makefile
index a7bd3aa51de..be4f7653fcd 100644
--- a/graphics/yplot/Makefile
+++ b/graphics/yplot/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2002/09/21 23:46:52 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2003/04/29 22:55:33 jtb Exp $
 
 DISTNAME=		yplot-1.1.0
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		graphics math
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=yplot/}
 
@@ -9,7 +9,7 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://yplot.sourceforge.net/
 COMMENT=		Yorick interface to PLplot
 
-DEPENDS+=		yorick-1.4*:../../math/yorick
+DEPENDS+=		yorick-1.5*:../../math/yorick
 DEPENDS+=		plplot>=5.0.3:../../graphics/plplot
 BUILD_DEPENDS+=		teTeX>=1.0:../../print/teTeX
 
@@ -20,7 +20,7 @@ BROKEN=			Compiling hangs, needs attention.
 EVAL_PREFIX+=		PLPLOT_PREFIX=plplot
 CONFIGURE_ENV+=		PLPLOT_PREFIX=${PLPLOT_PREFIX}
 EVAL_PREFIX+=		YORICK_PREFIX=yorick
-CONFIGURE_ENV+=		YORICK_CONTRIB_PREFIX=${YORICK_PREFIX}/lib/yorick/1.4
+CONFIGURE_ENV+=		YORICK_CONTRIB_PREFIX=${YORICK_PREFIX}/lib/yorick/1.5
 
 GNU_CONFIGURE=		yes
 MAKEFILE=		Makefile.build
diff --git a/graphics/yplot/PLIST b/graphics/yplot/PLIST
index 888d5bdf504..3b7093b3484 100644
--- a/graphics/yplot/PLIST
+++ b/graphics/yplot/PLIST
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.3 2002/12/09 16:01:30 tron Exp $
+@comment $NetBSD: PLIST,v 1.4 2003/04/29 22:55:34 jtb Exp $
 bin/yplot
 bin/yplotl
-share/yorick/1.4/contrib/yplot.i
-share/yorick/1.4/contrib/yplotl.i
+share/yorick/1.5/contrib/yplot.i
+share/yorick/1.5/contrib/yplotl.i
 share/examples/yplot/demo1.i
 share/examples/yplot/demo2.i
 share/examples/yplot/demo3.i
@@ -46,4 +46,4 @@ share/doc/yplot/ytut.dvi
 share/doc/yplot/ytut.ps.gz
 @dirrm share/doc/yplot
 @dirrm share/examples/yplot
-@unexec ${RMDIR} %D/share/yorick/1.4/contrib 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/share/yorick/1.5/contrib 2>/dev/null || ${TRUE}
diff --git a/graphics/yplot/distinfo b/graphics/yplot/distinfo
index bc93a6a41c4..517e9bef9d4 100644
--- a/graphics/yplot/distinfo
+++ b/graphics/yplot/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2002/01/19 13:40:54 drochner Exp $
+$NetBSD: distinfo,v 1.6 2003/04/29 22:55:34 jtb Exp $
 
 SHA1 (yplot-1.1.0.tar.gz) = f1b6d91c6ee1939144ba61eaa74a5a951f724372
 Size (yplot-1.1.0.tar.gz) = 71736 bytes
 SHA1 (patch-aa) = f9c538f5e262ac10b00a6669162f3336f4285f7a
-SHA1 (patch-ab) = 4ff489cfafd112398dbe55d1ece83e9cca142c27
+SHA1 (patch-ab) = 520dfe7b9382b03a9d1db03efe53799d2fbb1f4d
diff --git a/graphics/yplot/patches/patch-ab b/graphics/yplot/patches/patch-ab
index 79f953fbc6e..bb52f5f7f17 100644
--- a/graphics/yplot/patches/patch-ab
+++ b/graphics/yplot/patches/patch-ab
@@ -1,7 +1,16 @@
-$NetBSD: patch-ab,v 1.3 2001/06/22 14:05:37 jtb Exp $
+$NetBSD: patch-ab,v 1.4 2003/04/29 22:55:34 jtb Exp $
 
---- Makefile.build.in.orig	Wed Jun 20 03:59:57 2001
+--- Makefile.build.in.orig
 +++ Makefile.build.in
+@@ -27,7 +27,7 @@
+ # so don't use -O option.
+ CFLAGS = -DSTDC_HEADERS=1 -DPAD_ARRAY=1 \
+ 	`$(PLPLOT_PREFIX)/bin/plplot-config --cflags` \
+-	-I$(YORICK_CONTRIB_PREFIX)/h \
++	-I$(YORICK_CONTRIB_PREFIX)/include \
+ 	-DDOUBLE
+ 
+ ##############################################
 @@ -299,19 +299,16 @@
  ##############################################
  
@@ -26,8 +35,8 @@ $NetBSD: patch-ab,v 1.3 2001/06/22 14:05:37 jtb Exp $
 +	$(BSD_INSTALL_DATA_DIR) $(ROOT)$(YPLOT_PREFIX)/share/examples/yplot
 +	$(BSD_INSTALL_DATA) doc/*.i doc/test.dat \
 +	$(ROOT)$(YPLOT_PREFIX)/share/examples/yplot
-+	$(BSD_INSTALL_DATA_DIR) $(PREFIX)/share/yorick/1.4/contrib
-+	$(BSD_INSTALL_DATA) yplot.i yplotl.i $(PREFIX)/share/yorick/1.4/contrib
++	$(BSD_INSTALL_DATA_DIR) $(PREFIX)/share/yorick/1.5/contrib
++	$(BSD_INSTALL_DATA) yplot.i yplotl.i $(PREFIX)/share/yorick/1.5/contrib
  
  ##############################################