Applied patch for maintainer's update.

PR:		ports/30875
Submitted by:	the maintainer
This commit is contained in:
Yoshio MITA 2001-10-09 11:21:39 +00:00
parent eaebd1bcbc
commit c4f8b80b14
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=48597
3 changed files with 395 additions and 427 deletions

View file

@ -7,7 +7,7 @@
PORTNAME= cider
PORTVERSION= 1.b1
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= cad
MASTER_SITES= ftp://ic.eecs.berkeley.edu/pub/Cider/new/
DISTNAME= cider1b1

View file

@ -1,8 +1,6 @@
*** spice/common/src/bin/main.c.orig Sat Mar 12 08:22:28 1994
--- spice/common/src/bin/main.c Tue Oct 24 03:32:20 2000
***************
*** 25,30 ****
--- 25,37 ----
--- spice/common/src/bin/main.c.orig Sat Mar 12 08:22:28 1994
+++ spice/common/src/bin/main.c Wed Sep 19 11:06:34 2001
@@ -25,6 +25,13 @@
#include <pwd.h>
#endif
@ -16,9 +14,7 @@
#ifdef HAS_UNIX_SIGS
#include <signal.h>
#endif
***************
*** 36,41 ****
--- 43,53 ----
@@ -36,6 +43,11 @@
#endif
#include "patchlev.h"
@ -30,9 +26,7 @@
#include "suffix.h"
/* (Virtual) Machine architecture parameters */
***************
*** 53,58 ****
--- 65,75 ----
@@ -53,6 +65,11 @@
bool ft_intrpt = false; /* Set by the (void) signal handlers. */
bool ft_setflag = false; /* Don't abort after an interrupt. */
@ -44,9 +38,7 @@
struct variable *(*if_getparam)( );
#ifdef BATCH
***************
*** 185,190 ****
--- 202,294 ----
@@ -185,6 +202,95 @@
#endif
@ -76,6 +68,8 @@
+ p += w;
+ n -= w;
+ break;
+ case '\\':
+ if (*(s + 1)) ++s;
+ default:
+ *p = strip(*s); ++p;
+ --n;
@ -140,9 +134,7 @@
char *hlp_filelist[] = { "spice", 0 };
void
***************
*** 216,221 ****
--- 320,329 ----
@@ -216,6 +322,10 @@
#endif
@ -153,9 +145,7 @@
/* MFB tends to jump to 0 on errors. This tends to catch it. */
if (started) {
fprintf(cp_err, "main: Internal Error: jump to zero\n");
***************
*** 236,241 ****
--- 344,356 ----
@@ -236,6 +346,13 @@
ARCHsize = 1;
#endif /* PARALLEL_ARCH */
@ -169,9 +159,7 @@
#ifdef HAS_MAC_ARGCARGV
ac = initmac(&av);
#endif
***************
*** 472,478 ****
--- 587,597 ----
@@ -472,7 +589,11 @@
# ifdef HAS_UNIX_SIGS
/* Set up (void) signal handling */
if (!ft_batchmode) {
@ -183,9 +171,7 @@
(void) signal(SIGFPE, sigfloat);
# ifdef SIGTSTP
(void) signal(SIGTSTP, sigstop);
***************
*** 668,674 ****
--- 787,797 ----
@@ -668,7 +789,11 @@
} else {
(void) setjmp(jbuf);
cp_interactive = true;
@ -197,9 +183,7 @@
}
# else /* if BATCH */
***************
*** 708,714 ****
--- 831,841 ----
@@ -708,7 +833,11 @@
/* Nutmeg "main" */
(void) setjmp(jbuf);
cp_interactive = true;

View file

@ -1,8 +1,6 @@
*** cider/common/src/bin/main.c.orig Sat Mar 12 08:20:59 1994
--- cider/common/src/bin/main.c Tue Oct 24 03:37:38 2000
***************
*** 25,30 ****
--- 25,37 ----
--- cider/common/src/bin/main.c.orig Sat Mar 12 08:20:59 1994
+++ cider/common/src/bin/main.c Wed Sep 19 11:07:47 2001
@@ -25,6 +25,13 @@
#include <pwd.h>
#endif
@ -16,9 +14,7 @@
#ifdef HAS_UNIX_SIGS
#include <signal.h>
#endif
***************
*** 36,41 ****
--- 43,53 ----
@@ -36,6 +43,11 @@
#endif
#include "patchlev.h"
@ -30,9 +26,7 @@
#include "suffix.h"
/* (Virtual) Machine architecture parameters */
***************
*** 53,58 ****
--- 65,75 ----
@@ -53,6 +65,11 @@
bool ft_intrpt = false; /* Set by the (void) signal handlers. */
bool ft_setflag = false; /* Don't abort after an interrupt. */
@ -44,9 +38,7 @@
struct variable *(*if_getparam)( );
#ifdef BATCH
***************
*** 185,190 ****
--- 202,294 ----
@@ -185,6 +202,95 @@
#endif
@ -76,6 +68,8 @@
+ p += w;
+ n -= w;
+ break;
+ case '\\':
+ if (*(s + 1)) ++s;
+ default:
+ *p = strip(*s); ++p;
+ --n;
@ -140,9 +134,7 @@
char *hlp_filelist[] = { "spice", "cider", 0 };
void
***************
*** 216,221 ****
--- 320,329 ----
@@ -216,6 +322,10 @@
#endif
@ -153,9 +145,7 @@
/* MFB tends to jump to 0 on errors. This tends to catch it. */
if (started) {
fprintf(cp_err, "main: Internal Error: jump to zero\n");
***************
*** 236,241 ****
--- 344,356 ----
@@ -236,6 +346,13 @@
ARCHsize = 1;
#endif /* PARALLEL_ARCH */
@ -169,9 +159,7 @@
#ifdef HAS_MAC_ARGCARGV
ac = initmac(&av);
#endif
***************
*** 472,478 ****
--- 587,597 ----
@@ -472,7 +589,11 @@
# ifdef HAS_UNIX_SIGS
/* Set up (void) signal handling */
if (!ft_batchmode) {
@ -183,9 +171,7 @@
(void) signal(SIGFPE, sigfloat);
# ifdef SIGTSTP
(void) signal(SIGTSTP, sigstop);
***************
*** 668,674 ****
--- 787,797 ----
@@ -668,7 +789,11 @@
} else {
(void) setjmp(jbuf);
cp_interactive = true;
@ -197,9 +183,7 @@
}
# else /* if BATCH */
***************
*** 708,714 ****
--- 831,841 ----
@@ -708,7 +833,11 @@
/* Nutmeg "main" */
(void) setjmp(jbuf);
cp_interactive = true;