Subject: pkg/18369: math/grace - pkg update
To: None <gnats-bugs@gnats.netbsd.org>
From: None <wolfgang@wsrcc.com>
List: netbsd-bugs
Date: 09/21/2002 15:58:22
>Number:         18369
>Category:       pkg
>Synopsis:       math/grace - pkg update
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sat Sep 21 15:59:00 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator:     Wolfgang Rupprecht
>Release:        NetBSD 1.6H
>Organization:
W S Rupprecht Computer Consulting, Fremont CA
>Environment:
System: NetBSD capsicum.wsrcc.com 1.6H NetBSD 1.6H (WSRCC_ATHLON) #111: Sat Sep 21 08:25:29 PDT 2002 wolfgang@capsicum.wsrcc.com:/v/src/netbsd/src/sys/arch/i386/compile/WSRCC_ATHLON i386
Architecture: i386
Machine: i386
>Description:
	grace is out of date and the rabble wanted me to update it.

>How-To-Repeat:
	inspection.

>Fix:
	
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/math/grace/Makefile,v
retrieving revision 1.19
diff -u -r1.19 Makefile
--- Makefile	2002/07/19 12:43:51	1.19
+++ Makefile	2002/09/21 22:55:32
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2002/07/19 12:43:51 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2002/04/23 02:08:53 jlam Exp $
 #
 
-DISTNAME=	grace-5.1.4
-PKGREVISION=	1
+DISTNAME=	grace-5.1.10
 CATEGORIES=	math graphics x11
 MASTER_SITES=	ftp://plasma-gate.weizmann.ac.il/pub/grace/src/ \
 		ftp://linux.mathematik.tu-darmstadt.de/pub/linux/mirrors/misc/grace/src/ \
@@ -25,6 +24,9 @@
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--enable-grace-home=${PREFIX}/grace
 CONFIGURE_ARGS+=	--with-extra-incpath=${BUILDLINK_DIR}/include
+# The bundled xbae doesn't link correctly.  Use the installed one. -wsr
+# undefined: XbaeGetXmVersionTxt, XbaeGetXmVersionNum
+CONFIGURE_ARGS+=	--with-bundled-xbae=no
 MAKE_ENV+=		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
 post-install:
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/math/grace/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo	2001/07/29 15:19:15	1.3
+++ distinfo	2002/09/21 22:55:32
@@ -1,6 +1,6 @@
 $NetBSD: distinfo,v 1.3 2001/07/29 15:19:15 wiz Exp $
 
-SHA1 (grace-5.1.4.tar.gz) = 64ec51327bc45c866b61df38e12865ba6e9b61e2
-Size (grace-5.1.4.tar.gz) = 2385006 bytes
-SHA1 (patch-aa) = 542ba023a03fbf102fda1722447a0a53e79415b2
-SHA1 (patch-ab) = b7fb08b589d79960acc038628003b0baabdadf68
+SHA1 (grace-5.1.10.tar.gz) = 074e998a04cd12d68ea70bedce54e0dd48174396
+Size (grace-5.1.10.tar.gz) = 2418504 bytes
+SHA1 (patch-aa) = 32f296779b5dc89cb50a1c0334f714dcd1277ec1
+SHA1 (patch-ab) = 748fc51a1e1cf839d2ab1403c64bfa0c920242d8
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/math/grace/patches/patch-aa,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-aa
--- patches/patch-aa	2000/02/03 19:47:41	1.1.1.1
+++ patches/patch-aa	2002/09/21 22:55:32
@@ -1,13 +1,11 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/02/03 19:47:41 drochner Exp $
-
---- examples/Makefile.orig	Sat Oct 23 00:36:31 1999
-+++ examples/Makefile	Thu Feb  3 11:52:37 2000
-@@ -32,7 +32,7 @@
+--- examples/Makefile.~1~	Sat Sep 21 15:14:07 2002
++++ examples/Makefile	Sat Sep 21 15:15:41 2002
+@@ -33,7 +33,7 @@
  install : $(EXAMPLES) $(DOTEST)
- 	$(MKINSTALLDIRS) $(GRACE_HOME)/examples
- 	for i in $(EXAMPLES); do $(INSTALL_DATA) $$i $(GRACE_HOME)/examples; done
--	$(INSTALL_PROGRAM) $(DOTEST) $(GRACE_HOME)/examples/$(DOTEST)
-+	$(INSTALL_SCRIPT) $(DOTEST) $(GRACE_HOME)/examples/$(DOTEST)
+ 	$(MKINSTALLDIRS) $(DESTDIR)$(GRACE_HOME)/examples
+ 	for i in $(EXAMPLES); do $(INSTALL_DATA) $$i $(DESTDIR)$(GRACE_HOME)/examples; done
+-	$(INSTALL_PROGRAM) $(DOTEST) $(DESTDIR)$(GRACE_HOME)/examples/$(DOTEST)
++	$(INSTALL_SCRIPT) $(DOTEST) $(DESTDIR)$(GRACE_HOME)/examples/$(DOTEST)
  
  links : dummy
  
Index: patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/math/grace/patches/patch-ab,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-ab
--- patches/patch-ab	2000/02/03 19:47:41	1.1.1.1
+++ patches/patch-ab	2002/09/21 22:55:32
@@ -1,22 +1,11 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/02/03 19:47:41 drochner Exp $
-
---- auxiliary/Makefile.orig	Fri Sep 24 23:23:51 1999
-+++ auxiliary/Makefile	Thu Feb  3 12:00:25 2000
-@@ -9,7 +9,8 @@
- include $(TOP)/Make.conf
- 
- AUXILIARIES = README convcal.c magic.grace
--PROGRAMS = fdf2fit convcal$(EXE)
-+PROGRAMS = convcal$(EXE)
-+SCRIPTS = fdf2fit
- 
- all : convcal$(EXE)
- 
-@@ -26,6 +27,7 @@
- 	$(MKINSTALLDIRS) $(GRACE_HOME)/auxiliary
- 	for i in $(AUXILIARIES); do $(INSTALL_DATA) $$i $(GRACE_HOME)/auxiliary; done
- 	for i in $(PROGRAMS); do $(INSTALL_PROGRAM) $$i $(GRACE_HOME)/bin; done
-+	for i in $(SCRIPTS); do $(INSTALL_SCRIPT) $$i $(GRACE_HOME)/bin; done
+--- auxiliary/Makefile.~1~	Sat Sep 21 15:35:11 2002
++++ auxiliary/Makefile	Sat Sep 21 15:44:59 2002
+@@ -28,7 +28,7 @@
+ 	$(MKINSTALLDIRS) $(DESTDIR)$(GRACE_HOME)/auxiliary
+ 	for i in $(AUXILIARIES); do $(INSTALL_DATA) $$i $(DESTDIR)$(GRACE_HOME)/auxiliary; done
+ 	for i in $(PROGRAMS); do $(INSTALL_PROGRAM) -s $$i $(DESTDIR)$(GRACE_HOME)/bin; done
+-	for i in $(SCRIPTS); do $(INSTALL_PROGRAM) $$i $(DESTDIR)$(GRACE_HOME)/bin; done
++	for i in $(SCRIPTS); do $(INSTALL_SCRIPT) $$i $(DESTDIR)$(GRACE_HOME)/bin; done
  
  tests : dummy
  


>Release-Note:
>Audit-Trail:
>Unformatted: