- Update to 20080127.

This commit is contained in:
Stanislav Sedov 2009-06-09 11:16:58 +00:00
parent 335cea952a
commit 40acafa07e
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=235486
8 changed files with 5 additions and 139 deletions

View File

@ -6,8 +6,8 @@
#
PORTNAME= gwave
PORTVERSION= 20060606
PORTREVISION= 5
PORTVERSION= 20080127
PORTREVISION= 0
CATEGORIES= cad
MASTER_SITES= http://geda.seul.org/dist/

View File

@ -1,3 +1,3 @@
MD5 (gwave-20060606.tar.gz) = 43816379d75c17a8302df14350365b00
SHA256 (gwave-20060606.tar.gz) = 4e69e31f261cf020b91fe66588ec85b58333adc70a38c7d96ff565b40faca92e
SIZE (gwave-20060606.tar.gz) = 490107
MD5 (gwave-20080127.tar.gz) = 8b9fc493aeb12e5b6d6e70f679a7ff0f
SHA256 (gwave-20080127.tar.gz) = 1715b097f5cca250095656d95944bcb8c276f02c375c09627f7ca0c03eca036c
SIZE (gwave-20080127.tar.gz) = 430053

View File

@ -1,13 +0,0 @@
--- src/guile-compat.h.orig 2008-03-02 16:22:11.000000000 -0500
+++ src/guile-compat.h 2008-03-02 16:22:22.000000000 -0500
@@ -33,8 +33,8 @@ extern "C" {
#define DEREF_LAST_STACK scm_fluid_ref(SCM_VARIABLE_REF (scm_the_last_stack_fluid_var))
SCM
-scm_internal_cwdr_no_unwind (scm_catch_body_t body, void *body_data,
- scm_catch_handler_t handler, void *handler_data,
+scm_internal_cwdr_no_unwind (scm_t_catch_body body, void *body_data,
+ scm_t_catch_handler handler, void *handler_data,
SCM_STACKITEM *stack_start);
SCM make_output_strport(char *fname);

View File

@ -1,29 +0,0 @@
--- src/rgeval.c.orig 2008-03-02 16:15:23.000000000 -0500
+++ src/rgeval.c 2008-03-02 16:16:35.000000000 -0500
@@ -26,7 +26,6 @@ remote_guile_eval(char *req, char **outp
unsigned char *ret, *output, *error;
int rlen, olen, elen;
SCM o_port, e_port;
- SCM saved_def_e_port;
/* Temporarily redirect output and error to string ports.
Note that the port setting functions return the current previous
@@ -34,10 +33,6 @@ remote_guile_eval(char *req, char **outp
o_port = scm_set_current_output_port(make_output_strport(FUNC_NAME));
e_port = scm_set_current_error_port(make_output_strport(FUNC_NAME));
- /* Workaround for a problem with older Guiles */
- saved_def_e_port = scm_def_errp;
- scm_def_errp = scm_current_error_port();
-
/* Evaluate the request expression and free it. */
val = scwm_safe_eval_str((char *) req);
@@ -48,7 +43,6 @@ remote_guile_eval(char *req, char **outp
below for getting the strings back */
o_port = scm_set_current_output_port(o_port);
e_port = scm_set_current_error_port(e_port);
- scm_def_errp = saved_def_e_port;
/* Retrieve output and errors */
if(outp) {

View File

@ -1,35 +0,0 @@
--- src/scwm_guile.c.orig 2008-03-02 16:15:27.000000000 -0500
+++ src/scwm_guile.c 2008-03-02 16:15:35.000000000 -0500
@@ -78,9 +78,9 @@ scwm_body_apply (void *body_data)
struct cwssdr_data
{
SCM tag;
- scm_catch_body_t body;
+ scm_t_catch_body body;
void *data;
- scm_catch_handler_t handler;
+ scm_t_catch_handler handler;
};
static SCM
@@ -92,9 +92,9 @@ cwssdr_body (void *data)
}
SCM
-scm_internal_stack_cwdr (scm_catch_body_t body,
+scm_internal_stack_cwdr (scm_t_catch_body body,
void *body_data,
- scm_catch_handler_t handler,
+ scm_t_catch_handler handler,
void *handler_data,
SCM_STACKITEM *stack_item)
{
@@ -336,7 +336,7 @@ scwm_handle_error (void *ARG_IGNORE(data
SCM_OPN | SCM_WRTNG,
"error-handler");
#else
- SCM port = scm_def_errp;
+ SCM port = scm_i_cur_errp ();
#endif
/* GJB:FIXME:MS: is this a guile compatibility test that can be dropped

View File

@ -1,29 +0,0 @@
--- src/xsnarf.h.orig 2008-03-02 16:15:31.000000000 -0500
+++ src/xsnarf.h 2008-03-02 16:15:35.000000000 -0500
@@ -83,22 +83,22 @@ XSCM_SNARF_DOCS(concept, name, 0, 0, 0,
#define XSCM_VCELL(c_name, scheme_name, docstring) \
XSCM_SNARF_HERE(static SCM c_name) \
-XSCM_SNARF_INIT(c_name = scm_permanent_object (scm_intern0 (scheme_name)); SCM_SETCDR (c_name, SCM_BOOL_F)); \
+XSCM_SNARF_INIT(c_name = scm_permanent_object (scm_str2symbol (scheme_name)); SCM_SETCDR (c_name, SCM_BOOL_F)); \
XSCM_SNARF_DOCS(vcell, scheme_name, 0, 0, 0, 0, docstring)
#define XSCM_GLOBAL_VCELL(c_name, scheme_name, docstring) \
XSCM_SNARF_HERE(SCM c_name) \
-XSCM_SNARF_INIT(c_name = scm_permanent_object (scm_intern0 (scheme_name)); SCM_SETCDR (c_name, SCM_BOOL_F)); \
+XSCM_SNARF_INIT(c_name = scm_permanent_object (scm_str2symbol (scheme_name)); SCM_SETCDR (c_name, SCM_BOOL_F)); \
XSCM_SNARF_DOCS(vcell, scheme_name, 0, 0, 0, 0, docstring)
#define XSCM_VCELL_INIT(c_name, scheme_name, init_val, docstring) \
XSCM_SNARF_HERE(static SCM c_name) \
-XSCM_SNARF_INIT(c_name = scm_permanent_object (scm_intern0 (scheme_name)); SCM_SETCDR (c_name, init_val));\
+XSCM_SNARF_INIT(c_name = scm_permanent_object (scm_str2symbol (scheme_name)); SCM_SETCDR (c_name, init_val));\
XSCM_SNARF_DOCS(vcell, scheme_name, 0, 0, 0, 0, docstring)
#define XSCM_GLOBAL_VCELL_INIT(c_name, scheme_name, init_val, docstring) \
XSCM_SNARF_HERE(SCM c_name) \
-XSCM_SNARF_INIT(c_name = scm_permanent_object (scm_intern0 (scheme_name)); SCM_SETCDR (c_name, init_val));\
+XSCM_SNARF_INIT(c_name = scm_permanent_object (scm_str2symbol (scheme_name)); SCM_SETCDR (c_name, init_val));\
XSCM_SNARF_DOCS(vcell, scheme_name, 0, 0, 0, 0, docstring)
#endif /* GUILE_EXT_H__ */

View File

@ -1,10 +0,0 @@
--- utilities/doc-split.in.orig 2008-03-02 16:20:02.000000000 -0500
+++ utilities/doc-split.in 2008-03-02 16:20:09.000000000 -0500
@@ -9,6 +9,7 @@
(ice-9 common-list)
(ice-9 format)
(ice-9 regex)
+ (ice-9 rdelim)
(srfi srfi-13))
;(display "doc-split running\n")

View File

@ -13,41 +13,23 @@ bin/sweepsplit
%%PORTDOCS%%%%DOCSDIR%%/spice3.txt
%%EXAMPLES%%%%EXAMPLESDIR%%/Readme
%%EXAMPLES%%%%EXAMPLESDIR%%/aoi.W
%%EXAMPLES%%%%EXAMPLESDIR%%/aoi.W.gw
%%EXAMPLES%%%%EXAMPLESDIR%%/aoi.W.tr0
%%EXAMPLES%%%%EXAMPLESDIR%%/aoi.W.tr0.gw
%%EXAMPLES%%%%EXAMPLESDIR%%/aoi.W1
%%EXAMPLES%%%%EXAMPLESDIR%%/deespectre.raw
%%EXAMPLES%%%%EXAMPLESDIR%%/diffpair.braw
%%EXAMPLES%%%%EXAMPLESDIR%%/diffpair.sp
%%EXAMPLES%%%%EXAMPLESDIR%%/gw
%%EXAMPLES%%%%EXAMPLESDIR%%/gwave.gw
%%EXAMPLES%%%%EXAMPLESDIR%%/gwplot.dat
%%EXAMPLES%%%%EXAMPLESDIR%%/gwplot.dat.0
%%EXAMPLES%%%%EXAMPLESDIR%%/gwplot.dat.1
%%EXAMPLES%%%%EXAMPLESDIR%%/gwplot.dat.gnuplot
%%EXAMPLES%%%%EXAMPLESDIR%%/lpf.ac0
%%EXAMPLES%%%%EXAMPLESDIR%%/lpf.sp
%%EXAMPLES%%%%EXAMPLESDIR%%/nand.N.tr0
%%EXAMPLES%%%%EXAMPLESDIR%%/nfet.N.sw0
%%EXAMPLES%%%%EXAMPLESDIR%%/nfet.N.sw0.binary
%%EXAMPLES%%%%EXAMPLESDIR%%/nisrc.N.sw0
%%EXAMPLES%%%%EXAMPLESDIR%%/pd1.N.tr0
%%EXAMPLES%%%%EXAMPLESDIR%%/pd2.N
%%EXAMPLES%%%%EXAMPLESDIR%%/pd2.N.gw
%%EXAMPLES%%%%EXAMPLESDIR%%/pd2long.N
%%EXAMPLES%%%%EXAMPLESDIR%%/quickAC.ac0
%%EXAMPLES%%%%EXAMPLESDIR%%/quickINV.tr0
%%EXAMPLES%%%%EXAMPLESDIR%%/quickTRAN.tr0
%%EXAMPLES%%%%EXAMPLESDIR%%/rcsq.raw
%%EXAMPLES%%%%EXAMPLESDIR%%/rcsq.sp
%%EXAMPLES%%%%EXAMPLESDIR%%/rlc.braw
%%EXAMPLES%%%%EXAMPLESDIR%%/rlc.raw
%%EXAMPLES%%%%EXAMPLESDIR%%/rlc.sp
%%EXAMPLES%%%%EXAMPLESDIR%%/test1.tr0.binary
%%EXAMPLES%%%%EXAMPLESDIR%%/tlong.tr0.9601
%%EXAMPLES%%%%EXAMPLESDIR%%/tpwl.acs
%%EXAMPLES%%%%EXAMPLESDIR%%/tscript
share/guile/app/gwave/cmds.scm
share/guile/app/gwave/dynlink.scm
share/guile/app/gwave/export-gnugraph.scm