diff options
Diffstat (limited to 'cad/gnetlist')
| -rw-r--r-- | cad/gnetlist/Makefile | 22 | ||||
| -rw-r--r-- | cad/gnetlist/PLIST | 8 | ||||
| -rw-r--r-- | cad/gnetlist/distinfo | 9 | ||||
| -rw-r--r-- | cad/gnetlist/patches/patch-aa | 13 | ||||
| -rw-r--r-- | cad/gnetlist/patches/patch-ab | 23 |
5 files changed, 53 insertions, 22 deletions
diff --git a/cad/gnetlist/Makefile b/cad/gnetlist/Makefile index 3627d739623..fdb17297ae3 100644 --- a/cad/gnetlist/Makefile +++ b/cad/gnetlist/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2003/07/17 21:25:01 grant Exp $ +# $NetBSD: Makefile,v 1.21 2003/09/10 23:43:35 dmcmahill Exp $ # DISTNAME= geda-gnetlist-${PKGVERSION} @@ -13,27 +13,31 @@ MAINTAINER= dmcmahill@NetBSD.org HOMEPAGE= http://www.geda.seul.org/ COMMENT= Netlist generation program -DIST_SUBDIR= geda -PKGVERSION= 20030525 - DEPENDS+= geda-symbols-${PKGVERSION}:../../cad/geda-symbols # needs GNU m4 for the PCBboard netlister DEPENDS+= m4>=1.4:../../devel/m4 +DIST_SUBDIR= geda +PKGVERSION= 20030901 + CONFLICTS+= gEDA<19991011 GNU_CONFIGURE= YES -USE_X11BASE= YES USE_LIBTOOL= YES USE_GMAKE= YES USE_BUILDLINK2= YES LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig +EVAL_PREFIX+= PCBDIR=pcb + post-patch: - ${MV} -f ${WRKSRC}/scheme/gnet-PCBboard.scm ${WRKSRC}/scheme/gnet-PCBboard.scm.bak - ${SED} 's;@pcb_confdir@;${PKG_SYSCONFDIR}/pcb;g' \ - ${WRKSRC}/scheme/gnet-PCBboard.scm.bak > ${WRKSRC}/scheme/gnet-PCBboard.scm - ${RM} -f ${WRKSRC}/scheme/gnet-PCBboard.scm.bak +.for f in gnet-PCBboard.scm gnet-gsch2pcb.scm + ${MV} -f ${WRKSRC}/scheme/${f} ${WRKSRC}/scheme/${f}.bak + ${SED} -e 's;@pcb_confdir@;${PKG_SYSCONFDIR}/pcb;g' \ + -e 's;@pcb_m4dir@;${PCBDIR}/share/pcb/m4;g' \ + ${WRKSRC}/scheme/${f}.bak > ${WRKSRC}/scheme/${f} + ${RM} -f ${WRKSRC}/scheme/${f}.bak +.endfor .include "../../cad/libgeda/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/cad/gnetlist/PLIST b/cad/gnetlist/PLIST index 277f93649ef..3cb39c77a98 100644 --- a/cad/gnetlist/PLIST +++ b/cad/gnetlist/PLIST @@ -1,10 +1,9 @@ -@comment $NetBSD: PLIST,v 1.5 2003/07/15 09:23:34 dmcmahill Exp $ +@comment $NetBSD: PLIST,v 1.6 2003/09/10 23:43:35 dmcmahill Exp $ bin/gnetlist bin/gschem2pcb bin/mk_verilog_syms bin/sw2asc man/man1/gnetlist.1 -share/gEDA/system-gnetlistrc share/gEDA/scheme/gnet-PCB.scm share/gEDA/scheme/gnet-PCBboard.scm share/gEDA/scheme/gnet-allegro.scm @@ -12,8 +11,10 @@ share/gEDA/scheme/gnet-bae.scm share/gEDA/scheme/gnet-bom.scm share/gEDA/scheme/gnet-bom2.scm share/gEDA/scheme/gnet-drc.scm +share/gEDA/scheme/gnet-drc2.scm share/gEDA/scheme/gnet-geda.scm share/gEDA/scheme/gnet-gossip.scm +share/gEDA/scheme/gnet-gsch2pcb.scm share/gEDA/scheme/gnet-maxascii.scm share/gEDA/scheme/gnet-pads.scm share/gEDA/scheme/gnet-partslist-common.scm @@ -21,8 +22,8 @@ share/gEDA/scheme/gnet-partslist1.scm share/gEDA/scheme/gnet-partslist2.scm share/gEDA/scheme/gnet-partslist3.scm share/gEDA/scheme/gnet-protelII.scm -share/gEDA/scheme/gnet-spice.scm share/gEDA/scheme/gnet-spice-sdb.scm +share/gEDA/scheme/gnet-spice.scm share/gEDA/scheme/gnet-switcap.scm share/gEDA/scheme/gnet-tango.scm share/gEDA/scheme/gnet-vams.scm @@ -30,5 +31,6 @@ share/gEDA/scheme/gnet-verilog.scm share/gEDA/scheme/gnet-vhdl.scm share/gEDA/scheme/gnet-vipec.scm share/gEDA/scheme/gnetlist.scm +share/gEDA/system-gnetlistrc @unexec ${RMDIR} %D/share/gEDA/scheme 2>/dev/null || ${TRUE} @unexec ${RMDIR} %D/share/gEDA 2>/dev/null || ${TRUE} diff --git a/cad/gnetlist/distinfo b/cad/gnetlist/distinfo index ddf14b38932..ad32db7fb64 100644 --- a/cad/gnetlist/distinfo +++ b/cad/gnetlist/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.10 2003/07/15 09:23:34 dmcmahill Exp $ +$NetBSD: distinfo,v 1.11 2003/09/10 23:43:35 dmcmahill Exp $ -SHA1 (geda/geda-gnetlist-20030525.tar.gz) = 9888301831446dffcdf728b7ca46abc4d217382b -Size (geda/geda-gnetlist-20030525.tar.gz) = 286441 bytes -SHA1 (patch-aa) = 29dbe6b993dcf6e3c29ce8710b81aafd230ffc50 +SHA1 (geda/geda-gnetlist-20030901.tar.gz) = e0e997fa2043befb0abce8b60f780f8e22fcadfb +Size (geda/geda-gnetlist-20030901.tar.gz) = 259134 bytes +SHA1 (patch-aa) = bb6db6fe92e8c3d32ee13b47d42ade1d1a83ecc4 +SHA1 (patch-ab) = b31951b7162621262a7e2c923a4a383b4e7c0f1e diff --git a/cad/gnetlist/patches/patch-aa b/cad/gnetlist/patches/patch-aa index bfcb3e49c9d..e4f3ebe6892 100644 --- a/cad/gnetlist/patches/patch-aa +++ b/cad/gnetlist/patches/patch-aa @@ -1,22 +1,23 @@ -$NetBSD: patch-aa,v 1.6 2003/07/15 09:23:34 dmcmahill Exp $ +$NetBSD: patch-aa,v 1.7 2003/09/10 23:43:36 dmcmahill Exp $ ---- scheme/gnet-PCBboard.scm.orig Mon Mar 10 02:56:44 2003 +--- scheme/gnet-PCBboard.scm.orig Sun Aug 24 01:36:06 2003 +++ scheme/gnet-PCBboard.scm -@@ -134,7 +134,7 @@ +@@ -134,7 +134,8 @@ ;; ;; -(define *m4-pcbdir* "/usr/X11R6/lib/X11/pcb/m4") -+(define *m4-pcbdir* "@pcb_confdir@") ++(define *m4-pcbdir* "@pcb_m4dir@") ++(define *m4-pcbconfdir* "@pcb_confdir@") ;; To emulate popen. Guileish again. ; Needed after guile ver. 1.3.2. To save 1.3a users, wrap it in. -@@ -153,7 +153,7 @@ +@@ -153,7 +154,7 @@ ;; Original pipe command commented out by AVH (bugfix by Rich Walker) ;; (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" *m4-pcbconfdir* " -I$HOME/.pcb -I. " *m4-pcbdir* "/common.m4 - >> " output-filename)))) ;; packages is a list with the different uref value diff --git a/cad/gnetlist/patches/patch-ab b/cad/gnetlist/patches/patch-ab new file mode 100644 index 00000000000..6eeb9a96d7f --- /dev/null +++ b/cad/gnetlist/patches/patch-ab @@ -0,0 +1,23 @@ +$NetBSD: patch-ab,v 1.5 2003/09/10 23:43:36 dmcmahill Exp $ + +--- scheme/gnet-gsch2pcb.scm.orig Wed Sep 10 16:26:08 2003 ++++ scheme/gnet-gsch2pcb.scm +@@ -133,7 +133,8 @@ + ;; + ;; + +-(define *m4-pcbdir* "/usr/X11R6/lib/X11/pcb/m4") ++(define *m4-pcbdir* "@pcb_m4dir@") ++(define *m4-pcbconfdir* "@pcb_confdir@") + + ;; To emulate popen. Guileish again. + ; Needed after guile ver. 1.3.2. To save 1.3a users, wrap it in. +@@ -150,7 +151,7 @@ + ;; Original pipe command commented out by AVH (bugfix by Rich Walker) + ;; (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" *m4-pcbconfdir* " -I$HOME/.pcb -I. " *m4-pcbdir* "/common.m4 - >> " output-filename)))) + + + ;; packages is a list with the different refdes value |