[pkgsrc/trunk]: pkgsrc/math/sc Fix a small annoyance: make the default file n...

[he <he%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/42e716268afe
branches:  trunk
changeset: 519067:42e716268afe
user:      he <he%pkgsrc.org@localhost>
date:      Fri Sep 29 15:55:26 2006 +0000

description:
Fix a small annoyance: make the default file name in 'W' actually work.
Pkgrevision bumped to 1.

diffstat:

 math/sc/Makefile         |   3 ++-
 math/sc/distinfo         |   4 ++--
 math/sc/patches/patch-ad |  33 ++++++++++++++++++++++++++++++---
 3 files changed, 34 insertions(+), 6 deletions(-)

diffs (73 lines):

diff -r c41a7bb8ccc3 -r 42e716268afe math/sc/Makefile
--- a/math/sc/Makefile  Fri Sep 29 15:17:43 2006 +0000
+++ b/math/sc/Makefile  Fri Sep 29 15:55:26 2006 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2006/06/20 22:15:15 minskim Exp $
+# $NetBSD: Makefile,v 1.11 2006/09/29 15:55:26 he Exp $
 
 DISTNAME=               sc-6.21
+PKGREVISION=           1
 CATEGORIES=             math
 MASTER_SITES=           ftp://gatekeeper.dec.com/pub/misc/
 EXTRACT_SUFX=          .tar.Z
diff -r c41a7bb8ccc3 -r 42e716268afe math/sc/distinfo
--- a/math/sc/distinfo  Fri Sep 29 15:17:43 2006 +0000
+++ b/math/sc/distinfo  Fri Sep 29 15:55:26 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2005/11/10 17:23:17 joerg Exp $
+$NetBSD: distinfo,v 1.5 2006/09/29 15:55:26 he Exp $
 
 SHA1 (sc-6.21.tar.Z) = 80d8972bcd1b5adcbc00345b6866954603dadf31
 RMD160 (sc-6.21.tar.Z) = 24abfaea2e5ef644394efd5e13ad1850280abbd6
@@ -6,4 +6,4 @@
 SHA1 (patch-aa) = d9092f0d2b996f2e9b89b708bc59d3bcffe8f18a
 SHA1 (patch-ab) = 2055f81bbabaa2752ed6dc18ce66ca857b9654f4
 SHA1 (patch-ac) = 2d18b5f318fe556b65bc6bf8b3a0a17c495ab5e5
-SHA1 (patch-ad) = cf0585a0616874d318d46d1a30af146f48a85e51
+SHA1 (patch-ad) = e579f8e29ebba4d653e83741a829262c2b7d8d2b
diff -r c41a7bb8ccc3 -r 42e716268afe math/sc/patches/patch-ad
--- a/math/sc/patches/patch-ad  Fri Sep 29 15:17:43 2006 +0000
+++ b/math/sc/patches/patch-ad  Fri Sep 29 15:55:26 2006 +0000
@@ -1,8 +1,16 @@
-$NetBSD: patch-ad,v 1.1 2005/11/10 17:23:18 joerg Exp $
+$NetBSD: patch-ad,v 1.2 2006/09/29 15:55:27 he Exp $
 
---- cmds.c.orig        2005-11-10 17:17:35.000000000 +0000
+--- cmds.c.orig        1992-05-11 20:43:34.000000000 +0200
 +++ cmds.c
-@@ -39,8 +39,6 @@ void openrow();
+@@ -28,6 +28,7 @@
+ #include "sc.h"
+ #include <signal.h>
+ #include <errno.h>
++#include <limits.h>
+ 
+ #ifdef SYSV3
+ extern void exit();
+@@ -39,8 +40,6 @@ void openrow();
  void  syncref();
  void  unspecial();
  
@@ -11,3 +19,22 @@
  /* a linked list of free [struct ent]'s, uses .next as the pointer */
  extern        struct ent *freeents;
  
+@@ -700,12 +699,18 @@ int r0, c0, rn, cn;
+     int fieldlen, nextcol;
+     register row, col;
+     register struct ent **pp;
++    char fnbuf[PATH_MAX];
+ 
+     if ((strcmp(fname, curfile) == 0) &&
+       !yn_ask("Confirm that you want to destroy the data base: (y,n)")) {
+       return;
+     }
+ 
++    if (*fname == '\0') {
++      snprintf(fnbuf, sizeof fnbuf, "%s.asc", curfile);
++      fname = fnbuf;
++    }
++
+     if (!pline && (pline = scxmalloc((unsigned)(FBUFLEN *
+                                       ++fbufs_allocated))) == (char *)NULL)
+     {   error("Malloc failed in printfile()");