diff options
| author | dmcmahill <dmcmahill@pkgsrc.org> | 2003-03-09 22:00:54 +0000 |
|---|---|---|
| committer | dmcmahill <dmcmahill@pkgsrc.org> | 2003-03-09 22:00:54 +0000 |
| commit | 7310874f0c473c74d5bb7c79d94ec0c502847507 (patch) | |
| tree | 9cec2f76aa66fb6052be6600fe46c6f21f00c93d | |
| parent | bb2eef3041da167eeb23a1918bdfe214ef3ee237 (diff) | |
| download | pkgsrc-7310874f0c473c74d5bb7c79d94ec0c502847507.tar.gz | |
fix bug with generating a PCBboard type netlist. Bug seems to have
been caused by moving to the new guile.
| -rw-r--r-- | cad/gnetlist/Makefile | 3 | ||||
| -rw-r--r-- | cad/gnetlist/distinfo | 4 | ||||
| -rw-r--r-- | cad/gnetlist/patches/patch-aa | 24 |
3 files changed, 20 insertions, 11 deletions
diff --git a/cad/gnetlist/Makefile b/cad/gnetlist/Makefile index df447ca3d44..32bfa312377 100644 --- a/cad/gnetlist/Makefile +++ b/cad/gnetlist/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.15 2003/03/09 06:18:25 dmcmahill Exp $ +# $NetBSD: Makefile,v 1.16 2003/03/09 22:00:54 dmcmahill Exp $ # DISTNAME= geda-gnetlist-${PKGVERSION} PKGNAME= gnetlist-${PKGVERSION} +PKGREVISION= 1 CATEGORIES= cad MASTER_SITES= ftp://ftp.geda.seul.org/pub/geda/devel/${PKGVERSION}/ \ ftp://ieee.ing.uniroma1.it/pub/geda/devel/${PKGVERSION}/ \ diff --git a/cad/gnetlist/distinfo b/cad/gnetlist/distinfo index 0f8534e8263..8e26040a81f 100644 --- a/cad/gnetlist/distinfo +++ b/cad/gnetlist/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.8 2003/03/09 06:18:26 dmcmahill Exp $ +$NetBSD: distinfo,v 1.9 2003/03/09 22:00:55 dmcmahill Exp $ SHA1 (geda/geda-gnetlist-20030223.tar.gz) = ef46d25e0cfd516148833ae7d9fa4768a3e803c4 Size (geda/geda-gnetlist-20030223.tar.gz) = 255290 bytes -SHA1 (patch-aa) = 5ff82fea2ae9afb672fc1c270be57da1c5f4b293 +SHA1 (patch-aa) = ece7634bdc38dfcd190e0038172a728ee3bf4af0 diff --git a/cad/gnetlist/patches/patch-aa b/cad/gnetlist/patches/patch-aa index a6930e11cdc..e9f76f76bec 100644 --- a/cad/gnetlist/patches/patch-aa +++ b/cad/gnetlist/patches/patch-aa @@ -1,15 +1,23 @@ -$NetBSD: patch-aa,v 1.4 2002/06/01 20:11:55 dmcmahill Exp $ +$NetBSD: patch-aa,v 1.5 2003/03/09 22:00:55 dmcmahill Exp $ -needs GNU m4 +first patch is for guile-1.6.3. +second is because (a) gnu m4 is needed for 1.6 and earlier NetBSD and probably +all other OS's. and (b) we want to support site, user, and project config files +the same way as the cad/pcb package. ---- scheme/gnet-PCBboard.scm.orig Sun Jan 27 13:48:35 2002 -+++ scheme/gnet-PCBboard.scm -@@ -151,7 +151,7 @@ - ;; Original pipe command commented out by AVH (bugfix by Rich Walker) +--- scheme/gnet-PCBboard.scm.orig Sun Jan 27 14:43:54 2002 ++++ scheme/gnet-PCBboard.scm Sun Mar 9 15:51:29 2003 +@@ -139,5 +139,5 @@ + ;; To emulate popen. Guileish again. + ; Needed after guile ver. 1.3.2. To save 1.3a users, wrap it in. +-(false-if-exception (use-modules (ice-9 popen))) ++(use-modules (ice-9 popen)) + + (define (PCBboard output-filename) +@@ -152,5 +152,5 @@ ;; (let ((pipe (open-output-pipe (string-append "m4 " *m4-pcbdir* "/common.m4 - >> " output-filename)))) ;; Fixed pipe command (AVH 1/27/02) - (let ((pipe (open-output-pipe (string-append "m4 -d -I" *m4-pcbdir* " " *m4-pcbdir* "/common.m4 - >> " output-filename)))) -+ (let ((pipe (open-output-pipe (string-append "gm4 -d -I" *m4-pcbdir* " -I@pcb_confdir@ -I$HOME/.pcb -I. " *m4-pcbdir* "/common.m4 - >> " output-filename)))) ++ (let ((pipe (open-output-pipe (string-append "gm4 -d -I" *m4-pcbdir* " -I/usr/X11R6/etc/pcb -I$HOME/.pcb -I. " *m4-pcbdir* "/common.m4 - >> " output-filename)))) - ;; packages is a list with the different uref value |