Wed Feb 7 11:58:31 2018 UTC ()
Upgrade to latest stable release 3.9.72, prodded by a buffer-overflow
induced core dump.

See <http://opencircuitdesign.com/xcircuit/changes.html> for upstream's changelog.


(hauke)
diff -r1.44 -r1.45 pkgsrc/cad/xcircuit/Makefile
diff -r1.7 -r1.8 pkgsrc/cad/xcircuit/PLIST
diff -r1.18 -r1.19 pkgsrc/cad/xcircuit/distinfo
diff -r1.11 -r1.12 pkgsrc/cad/xcircuit/patches/patch-aa
diff -r1.13 -r1.14 pkgsrc/cad/xcircuit/patches/patch-ab
cvs diff -r1.44 -r1.45 pkgsrc/cad/xcircuit/Makefile (expand / switch to unified diff)

--- pkgsrc/cad/xcircuit/Makefile 2014/12/17 06:35:13 1.44
+++ pkgsrc/cad/xcircuit/Makefile 2018/02/07 11:58:31 1.45
@@ -1,45 +1,48 @@ @@ -1,45 +1,48 @@
1# $NetBSD: Makefile,v 1.44 2014/12/17 06:35:13 obache Exp $ 1# $NetBSD: Makefile,v 1.45 2018/02/07 11:58:31 hauke Exp $
2 2
3DISTNAME= xcircuit-3.7.50 3DISTNAME= xcircuit-3.9.72
4PKGREVISION= 2 4#PKGREVISION= 1
5CATEGORIES= cad graphics 5CATEGORIES= cad graphics
6MASTER_SITES= http://opencircuitdesign.com/xcircuit/archive/ 6MASTER_SITES= http://opencircuitdesign.com/xcircuit/archive/
7EXTRACT_SUFX= .tgz 7EXTRACT_SUFX= .tgz
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://opencircuitdesign.com/xcircuit/ 10HOMEPAGE= http://opencircuitdesign.com/xcircuit/
11COMMENT= Drawing program for X11 (especially for circuits) 11COMMENT= Drawing program for X11 (especially for circuits)
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14WRKSRC= ${WRKDIR}/${DISTNAME} 14WRKSRC= ${WRKDIR}/${DISTNAME}
15USE_TOOLS+= gmake gs:run 15USE_TOOLS+= gmake pkg-config gs:run
16GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
17 17
 18EGDIR= share/examples/xcircuit
 19
18.include "../../lang/tcl/Makefile.version" 20.include "../../lang/tcl/Makefile.version"
19.include "../../x11/tk/Makefile.version" 21.include "../../x11/tk/Makefile.version"
20 22
21CONFIGURE_ARGS+=--with-tcl=${BUILDLINK_PREFIX.tcl}/lib 23CONFIGURE_ARGS+=--with-tcl=${BUILDLINK_PREFIX.tcl}/lib
22CONFIGURE_ARGS+=--with-tk=${BUILDLINK_PREFIX.tk}/lib 24CONFIGURE_ARGS+=--with-tk=${BUILDLINK_PREFIX.tk}/lib
23CONFIGURE_ARGS+=--with-tclincls=${BUILDLINK_PREFIX.tcl}/include 25CONFIGURE_ARGS+=--with-tclincls=${BUILDLINK_PREFIX.tcl}/include
24CONFIGURE_ARGS+=--with-tcllibs=${BUILDLINK_PREFIX.tcl}/lib 26CONFIGURE_ARGS+=--with-tcllibs=${BUILDLINK_PREFIX.tcl}/lib
25CONFIGURE_ARGS+=--with-tkincls=${BUILDLINK_PREFIX.tk}/include 27CONFIGURE_ARGS+=--with-tkincls=${BUILDLINK_PREFIX.tk}/include
26CONFIGURE_ARGS+=--with-tklibs=${BUILDLINK_PREFIX.tk}/lib 28CONFIGURE_ARGS+=--with-tklibs=${BUILDLINK_PREFIX.tk}/lib
27#CFLAGS+= -DBUILTINS_DIR=${PREFIX}/lib/${DISTNAME:C/\.[^\.]*$//} 29#CFLAGS+= -DBUILTINS_DIR=${PREFIX}/lib/${DISTNAME:C/\.[^\.]*$//}
28 30
29BUILD_TARGET= tcl 31BUILD_TARGET= tcl
30INSTALL_TARGET= install-tcl 32INSTALL_TARGET= install-tcl
31INSTALLATION_DIRS= ${PKGMANDIR}/man1 share/examples/xcircuit 33INSTALLATION_DIRS= ${PKGMANDIR}/man1 ${EGDIR}
32 34
33post-extract: 35post-extract:
34 ${MV} -f ${WRKSRC}/examples/.xcircuitrc ${WRKSRC}/examples/xcircuitrc 36 ${MV} -f ${WRKSRC}/examples/.xcircuitrc ${WRKSRC}/examples/xcircuitrc
35 ${TOUCH} ${WRKSRC}/menudep.h 37 ${TOUCH} ${WRKSRC}/menudep.h
36 38
37post-install: 39post-install:
38 ${INSTALL_DATA} ${WRKSRC}/examples/*.* ${DESTDIR}${PREFIX}/share/examples/xcircuit/ 40 ${INSTALL_DATA} ${WRKSRC}/examples/*.* ${DESTDIR}${PREFIX}/${EGDIR}
39 ${INSTALL_DATA} ${WRKSRC}/examples/xcircuitrc ${DESTDIR}${PREFIX}/share/examples/xcircuit/ 41 ${INSTALL_DATA} ${WRKSRC}/examples/xcircuitrc ${DESTDIR}${PREFIX}/${EGDIR}
40 42
41.include "../../lang/tcl/buildlink3.mk" 43.include "../../lang/tcl/buildlink3.mk"
 44.include "../../graphics/cairo/buildlink3.mk"
42.include "../../x11/libXpm/buildlink3.mk" 45.include "../../x11/libXpm/buildlink3.mk"
43.include "../../x11/libXt/buildlink3.mk" 46.include "../../x11/libXt/buildlink3.mk"
44.include "../../x11/tk/buildlink3.mk" 47.include "../../x11/tk/buildlink3.mk"
45.include "../../mk/bsd.pkg.mk" 48.include "../../mk/bsd.pkg.mk"
cvs diff -r1.7 -r1.8 pkgsrc/cad/xcircuit/PLIST (expand / switch to unified diff)

--- pkgsrc/cad/xcircuit/PLIST 2013/06/11 13:31:58 1.7
+++ pkgsrc/cad/xcircuit/PLIST 2018/02/07 11:58:31 1.8
@@ -1,142 +1,150 @@ @@ -1,142 +1,150 @@
1@comment $NetBSD: PLIST,v 1.7 2013/06/11 13:31:58 ryoon Exp $ 1@comment $NetBSD: PLIST,v 1.8 2018/02/07 11:58:31 hauke Exp $
2bin/xcircuit 2bin/xcircuit
3lib/xcircuit-3.7/analog.lps 3lib/xcircuit-3.9/analog.lps
4lib/xcircuit-3.7/analoglib2.lps 4lib/xcircuit-3.9/analoglib2.lps
5lib/xcircuit-3.7/analoglib3.lps 5lib/xcircuit-3.9/analoglib3.lps
6lib/xcircuit-3.7/app-defaults/XCircuit 6lib/xcircuit-3.9/app-defaults/XCircuit
7lib/xcircuit-3.7/asg_spice.lps 7lib/xcircuit-3.9/asg_spice.lps
8lib/xcircuit-3.7/avlsi.lps 8lib/xcircuit-3.9/avlsi.lps
9lib/xcircuit-3.7/boot_xcircuit.tcl 9lib/xcircuit-3.9/boot_xcircuit.tcl
10lib/xcircuit-3.7/bparams.tcl 10lib/xcircuit-3.9/bparams.tcl
11lib/xcircuit-3.7/console.tcl 11lib/xcircuit-3.9/console.tcl
12lib/xcircuit-3.7/digital.lps 12lib/xcircuit-3.9/cyrillic.enc
13lib/xcircuit-3.7/digitallib.lps 13lib/xcircuit-3.9/digital.lps
14lib/xcircuit-3.7/digitaltcl.lps 14lib/xcircuit-3.9/digitallib.lps
15lib/xcircuit-3.7/edif.tcl 15lib/xcircuit-3.9/digitaltcl.lps
16lib/xcircuit-3.7/files.tcl 16lib/xcircuit-3.9/edif.tcl
17lib/xcircuit-3.7/fonts/courier.lps 17lib/xcircuit-3.9/files.tcl
18lib/xcircuit-3.7/fonts/courier.xfe 18lib/xcircuit-3.9/fonts/courier.lps
19lib/xcircuit-3.7/fonts/courieriso.xfe 19lib/xcircuit-3.9/fonts/courier.xfe
20lib/xcircuit-3.7/fonts/courieriso2.lps 20lib/xcircuit-3.9/fonts/courier_cyrillic.xfe
21lib/xcircuit-3.7/fonts/courieriso2.xfe 21lib/xcircuit-3.9/fonts/courieriso.xfe
22lib/xcircuit-3.7/fonts/courieriso5.lps 22lib/xcircuit-3.9/fonts/courieriso2.lps
23lib/xcircuit-3.7/fonts/courieriso5.xfe 23lib/xcircuit-3.9/fonts/courieriso2.xfe
24lib/xcircuit-3.7/fonts/helvetica.lps 24lib/xcircuit-3.9/fonts/courieriso5.lps
25lib/xcircuit-3.7/fonts/helvetica.xfe 25lib/xcircuit-3.9/fonts/courieriso5.xfe
26lib/xcircuit-3.7/fonts/helveticaiso.xfe 26lib/xcircuit-3.9/fonts/helvetica.lps
27lib/xcircuit-3.7/fonts/helveticaiso2.lps 27lib/xcircuit-3.9/fonts/helvetica.xfe
28lib/xcircuit-3.7/fonts/helveticaiso2.xfe 28lib/xcircuit-3.9/fonts/helvetica_cyrillic.xfe
29lib/xcircuit-3.7/fonts/helveticaiso5.lps 29lib/xcircuit-3.9/fonts/helveticaiso.xfe
30lib/xcircuit-3.7/fonts/helveticaiso5.xfe 30lib/xcircuit-3.9/fonts/helveticaiso2.lps
31lib/xcircuit-3.7/fonts/myfont.lps 31lib/xcircuit-3.9/fonts/helveticaiso2.xfe
32lib/xcircuit-3.7/fonts/myfont.xfe 32lib/xcircuit-3.9/fonts/helveticaiso5.lps
33lib/xcircuit-3.7/fonts/symbol.lps 33lib/xcircuit-3.9/fonts/helveticaiso5.xfe
34lib/xcircuit-3.7/fonts/symbol.xfe 34lib/xcircuit-3.9/fonts/myfont.lps
35lib/xcircuit-3.7/fonts/times_roman.lps 35lib/xcircuit-3.9/fonts/myfont.xfe
36lib/xcircuit-3.7/fonts/times_roman.xfe 36lib/xcircuit-3.9/fonts/symbol.lps
37lib/xcircuit-3.7/fonts/times_romaniso.xfe 37lib/xcircuit-3.9/fonts/symbol.xfe
38lib/xcircuit-3.7/fonts/times_romaniso2.lps 38lib/xcircuit-3.9/fonts/times_roman.lps
39lib/xcircuit-3.7/fonts/times_romaniso2.xfe 39lib/xcircuit-3.9/fonts/times_roman.xfe
40lib/xcircuit-3.7/fonts/times_romaniso5.lps 40lib/xcircuit-3.9/fonts/times_roman_cyrillic.xfe
41lib/xcircuit-3.7/fonts/times_romaniso5.xfe 41lib/xcircuit-3.9/fonts/times_romaniso.xfe
42lib/xcircuit-3.7/generic.lps 42lib/xcircuit-3.9/fonts/times_romaniso2.lps
43lib/xcircuit-3.7/ic_templates.lps 43lib/xcircuit-3.9/fonts/times_romaniso2.xfe
44lib/xcircuit-3.7/lgf.lps 44lib/xcircuit-3.9/fonts/times_romaniso5.lps
45lib/xcircuit-3.7/library.tcl 45lib/xcircuit-3.9/fonts/times_romaniso5.xfe
46lib/xcircuit-3.7/man/xcircuit.1 46lib/xcircuit-3.9/generic.lps
47lib/xcircuit-3.7/matgen.tcl 47lib/xcircuit-3.9/ic_templates.lps
48lib/xcircuit-3.7/mousehint.tcl 48lib/xcircuit-3.9/isolatin2.enc
49lib/xcircuit-3.7/musiclib.lps 49lib/xcircuit-3.9/isolatin5.enc
50lib/xcircuit-3.7/ngspice.tcl 50lib/xcircuit-3.9/lgf.lps
51lib/xcircuit-3.7/panzoom.tcl 51lib/xcircuit-3.9/library.tcl
52lib/xcircuit-3.7/pcb.lps 52lib/xcircuit-3.9/man/xcircuit.1
53lib/xcircuit-3.7/pcb_layout.lps 53lib/xcircuit-3.9/matgen.tcl
54lib/xcircuit-3.7/pcbout.tcl 54lib/xcircuit-3.9/mousehint.tcl
55lib/xcircuit-3.7/pixmaps/a.gif 55lib/xcircuit-3.9/musiclib.lps
56lib/xcircuit-3.7/pixmaps/b.gif 56lib/xcircuit-3.9/ngspice.tcl
57lib/xcircuit-3.7/pixmaps/bd.gif 57lib/xcircuit-3.9/panzoom.tcl
58lib/xcircuit-3.7/pixmaps/ccw.gif 58lib/xcircuit-3.9/pcb.lps
59lib/xcircuit-3.7/pixmaps/co.gif 59lib/xcircuit-3.9/pcb_layout.lps
60lib/xcircuit-3.7/pixmaps/cp.gif 60lib/xcircuit-3.9/pcbout.tcl
61lib/xcircuit-3.7/pixmaps/cw.gif 61lib/xcircuit-3.9/pixmaps/a.gif
62lib/xcircuit-3.7/pixmaps/d2.gif 62lib/xcircuit-3.9/pixmaps/b.gif
63lib/xcircuit-3.7/pixmaps/e.gif 63lib/xcircuit-3.9/pixmaps/bd.gif
64lib/xcircuit-3.7/pixmaps/fi.gif 64lib/xcircuit-3.9/pixmaps/ccw.gif
65lib/xcircuit-3.7/pixmaps/fx.gif 65lib/xcircuit-3.9/pixmaps/co.gif
66lib/xcircuit-3.7/pixmaps/fy.gif 66lib/xcircuit-3.9/pixmaps/cp.gif
67lib/xcircuit-3.7/pixmaps/i.gif 67lib/xcircuit-3.9/pixmaps/cw.gif
68lib/xcircuit-3.7/pixmaps/li.gif 68lib/xcircuit-3.9/pixmaps/d2.gif
69lib/xcircuit-3.7/pixmaps/mk.gif 69lib/xcircuit-3.9/pixmaps/e.gif
70lib/xcircuit-3.7/pixmaps/mv.gif 70lib/xcircuit-3.9/pixmaps/fi.gif
71lib/xcircuit-3.7/pixmaps/pa.gif 71lib/xcircuit-3.9/pixmaps/fx.gif
72lib/xcircuit-3.7/pixmaps/pl.gif 72lib/xcircuit-3.9/pixmaps/fy.gif
73lib/xcircuit-3.7/pixmaps/pm.gif 73lib/xcircuit-3.9/pixmaps/i.gif
74lib/xcircuit-3.7/pixmaps/pn.gif 74lib/xcircuit-3.9/pixmaps/li.gif
75lib/xcircuit-3.7/pixmaps/po2.gif 75lib/xcircuit-3.9/pixmaps/mk.gif
76lib/xcircuit-3.7/pixmaps/pu2.gif 76lib/xcircuit-3.9/pixmaps/mv.gif
77lib/xcircuit-3.7/pixmaps/pz.gif 77lib/xcircuit-3.9/pixmaps/pa.gif
78lib/xcircuit-3.7/pixmaps/q.gif 78lib/xcircuit-3.9/pixmaps/pl.gif
79lib/xcircuit-3.7/pixmaps/r.gif 79lib/xcircuit-3.9/pixmaps/pm.gif
80lib/xcircuit-3.7/pixmaps/s.gif 80lib/xcircuit-3.9/pixmaps/pn.gif
81lib/xcircuit-3.7/pixmaps/solid.xbm 81lib/xcircuit-3.9/pixmaps/po2.gif
82lib/xcircuit-3.7/pixmaps/stip12.xbm 82lib/xcircuit-3.9/pixmaps/pu2.gif
83lib/xcircuit-3.7/pixmaps/stip25.xbm 83lib/xcircuit-3.9/pixmaps/pz.gif
84lib/xcircuit-3.7/pixmaps/stip38.xbm 84lib/xcircuit-3.9/pixmaps/q.gif
85lib/xcircuit-3.7/pixmaps/stip50.xbm 85lib/xcircuit-3.9/pixmaps/r.gif
86lib/xcircuit-3.7/pixmaps/stip62.xbm 86lib/xcircuit-3.9/pixmaps/s.gif
87lib/xcircuit-3.7/pixmaps/stip75.xbm 87lib/xcircuit-3.9/pixmaps/solid.xbm
88lib/xcircuit-3.7/pixmaps/stip88.xbm 88lib/xcircuit-3.9/pixmaps/stip12.xbm
89lib/xcircuit-3.7/pixmaps/t.gif 89lib/xcircuit-3.9/pixmaps/stip25.xbm
90lib/xcircuit-3.7/pixmaps/tg.gif 90lib/xcircuit-3.9/pixmaps/stip38.xbm
91lib/xcircuit-3.7/pixmaps/ti.gif 91lib/xcircuit-3.9/pixmaps/stip50.xbm
92lib/xcircuit-3.7/pixmaps/tp.gif 92lib/xcircuit-3.9/pixmaps/stip62.xbm
93lib/xcircuit-3.7/pixmaps/uj.gif 93lib/xcircuit-3.9/pixmaps/stip75.xbm
94lib/xcircuit-3.7/pixmaps/w.gif 94lib/xcircuit-3.9/pixmaps/stip88.xbm
95lib/xcircuit-3.7/pixmaps/xcircuit.gif 95lib/xcircuit-3.9/pixmaps/t.gif
96lib/xcircuit-3.7/pixmaps/xcircuit.ico 96lib/xcircuit-3.9/pixmaps/tg.gif
97lib/xcircuit-3.7/pixmaps/yp.gif 97lib/xcircuit-3.9/pixmaps/ti.gif
98lib/xcircuit-3.7/pixmaps/z4.gif 98lib/xcircuit-3.9/pixmaps/tp.gif
99lib/xcircuit-3.7/pixmaps/z5.gif 99lib/xcircuit-3.9/pixmaps/uj.gif
100lib/xcircuit-3.7/pkgIndex.tcl 100lib/xcircuit-3.9/pixmaps/w.gif
101lib/xcircuit-3.7/quadparts.lps 101lib/xcircuit-3.9/pixmaps/xcircuit.gif
102lib/xcircuit-3.7/resource.tcl 102lib/xcircuit-3.9/pixmaps/xcircuit.ico
103lib/xcircuit-3.7/selection.tcl 103lib/xcircuit-3.9/pixmaps/yp.gif
104lib/xcircuit-3.7/series74xx.lps 104lib/xcircuit-3.9/pixmaps/z4.gif
105lib/xcircuit-3.7/signal.lps 105lib/xcircuit-3.9/pixmaps/z5.gif
106lib/xcircuit-3.7/sinusoid.tcl 106lib/xcircuit-3.9/pkgIndex.tcl
107lib/xcircuit-3.7/standard_cells.cir 107lib/xcircuit-3.9/quadparts.lps
108lib/xcircuit-3.7/standard_cells_3V.cir 108lib/xcircuit-3.9/resource.tcl
109lib/xcircuit-3.7/sue_xc.tcl 109lib/xcircuit-3.9/selection.tcl
110lib/xcircuit-3.7/symbol.tcl 110lib/xcircuit-3.9/series74xx.lps
111lib/xcircuit-3.7/text.tcl 111lib/xcircuit-3.9/signal.lps
112lib/xcircuit-3.7/tkcon.tcl 112lib/xcircuit-3.9/sinusoid.tcl
113lib/xcircuit-3.7/wrapper.tcl 113lib/xcircuit-3.9/standard_cells.cir
114lib/xcircuit-3.7/xchelp.tcl 114lib/xcircuit-3.9/standard_cells_3V.cir
115lib/xcircuit-3.7/xcircexec 115lib/xcircuit-3.9/sue_xc.tcl
116lib/xcircuit-3.7/xcircps2.pro 116lib/xcircuit-3.9/symbol.tcl
117lib/xcircuit-3.7/xcircuit.so 117lib/xcircuit-3.9/text.tcl
118lib/xcircuit-3.7/xcircuit.tcl 118lib/xcircuit-3.9/tkcon.tcl
119lib/xcircuit-3.7/xcstartup.tcl 119lib/xcircuit-3.9/wrapper.tcl
 120lib/xcircuit-3.9/xchelp.tcl
 121lib/xcircuit-3.9/xcircexec
 122lib/xcircuit-3.9/xcircps2.pro
 123lib/xcircuit-3.9/xcircuit.so
 124lib/xcircuit-3.9/xcircuit.tcl
 125lib/xcircuit-3.9/xcstartup.tcl
 126lib/xcircuit-3.9/xspice.lps
120share/examples/xcircuit/FlareLED.ps 127share/examples/xcircuit/FlareLED.ps
121share/examples/xcircuit/USAflag.ps 128share/examples/xcircuit/USAflag.ps
122share/examples/xcircuit/analog1.ps 129share/examples/xcircuit/analog1.ps
123share/examples/xcircuit/analog2.ps 130share/examples/xcircuit/analog2.ps
124share/examples/xcircuit/analoglib1.lps 131share/examples/xcircuit/analoglib1.lps
125share/examples/xcircuit/border.ps 132share/examples/xcircuit/border.ps
126share/examples/xcircuit/buses.ps 133share/examples/xcircuit/buses.ps
127share/examples/xcircuit/diffamp_test.ps 134share/examples/xcircuit/diffamp_test.ps
128share/examples/xcircuit/diffamp_test2.ps 135share/examples/xcircuit/diffamp_test2.ps
129share/examples/xcircuit/diffamp_test3.ps 136share/examples/xcircuit/diffamp_test3.ps
130share/examples/xcircuit/envelope.ps 137share/examples/xcircuit/envelope.ps
131share/examples/xcircuit/fourttest.ps 138share/examples/xcircuit/fourttest.ps
132share/examples/xcircuit/logic.sim 139share/examples/xcircuit/logic.sim
133share/examples/xcircuit/logic8.ps 140share/examples/xcircuit/logic8.ps
134share/examples/xcircuit/panzoom.py 141share/examples/xcircuit/panzoom.py
135share/examples/xcircuit/prelude.ps 142share/examples/xcircuit/prelude.ps
136share/examples/xcircuit/systemd1.lgf 143share/examples/xcircuit/systemd1.lgf
137share/examples/xcircuit/test.py 144share/examples/xcircuit/test.py
138share/examples/xcircuit/threestage.ps 145share/examples/xcircuit/threestage.ps
139share/examples/xcircuit/vcoblock.ps 146share/examples/xcircuit/vcoblock.ps
140share/examples/xcircuit/xc_remote.sh 147share/examples/xcircuit/xc_remote.sh
141share/examples/xcircuit/xcclock.ps 148share/examples/xcircuit/xcclock.ps
142share/examples/xcircuit/xcircuitrc 149share/examples/xcircuit/xcircuitrc
 150@pkgdir man/man1
cvs diff -r1.18 -r1.19 pkgsrc/cad/xcircuit/distinfo (expand / switch to unified diff)

--- pkgsrc/cad/xcircuit/distinfo 2015/11/03 00:21:20 1.18
+++ pkgsrc/cad/xcircuit/distinfo 2018/02/07 11:58:31 1.19
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.18 2015/11/03 00:21:20 agc Exp $ 1$NetBSD: distinfo,v 1.19 2018/02/07 11:58:31 hauke Exp $
2 2
3SHA1 (xcircuit-3.7.50.tgz) = f3d0d7213d42bf7db1110454f8a3f74239d338f5 3SHA1 (xcircuit-3.9.72.tgz) = d08137afb8f990e1b06aa842f1e80c0e00d8c0d7
4RMD160 (xcircuit-3.7.50.tgz) = 2c416e939810a3e0fd82fa7411e89c3f12bc890e 4RMD160 (xcircuit-3.9.72.tgz) = abb7eb3ffb1bfcd2c515537d43f4ba240c6f1508
5SHA512 (xcircuit-3.7.50.tgz) = 2407b8d5f71d4fd28aabcbddeba7f2e31451c0516f2aec1c0b956dc8dbb27331fbc266ae0875020bbb73c76c49f4a47dc3ed98f3d5d7949854527f5390598c0a 5SHA512 (xcircuit-3.9.72.tgz) = daaca69bdd29f5ffb345498ca15dc5a46c478a4e9cea50724c2f5e667588466c9f7fc3a8a6d6b7a24091ded643b1a26488c76eac19e88bb2764b621b39db1d17
6Size (xcircuit-3.7.50.tgz) = 1649046 bytes 6Size (xcircuit-3.9.72.tgz) = 1620798 bytes
7SHA1 (patch-aa) = 27b15c9105873f5ebe4b2ae7c04ed041a480d0f4 7SHA1 (patch-aa) = 40e5caea7f6e6294eebff214f47aa9dc01498133
8SHA1 (patch-ab) = cc339aaa2ceda954c43efc8e76c96cbe253ee032 8SHA1 (patch-ab) = 8c4d87dbd67b302f530b4f09201c82fcbec22dd5
cvs diff -r1.11 -r1.12 pkgsrc/cad/xcircuit/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/cad/xcircuit/patches/patch-aa 2014/12/15 08:58:52 1.11
+++ pkgsrc/cad/xcircuit/patches/patch-aa 2018/02/07 11:58:31 1.12
@@ -1,51 +1,136 @@ @@ -1,51 +1,136 @@
1$NetBSD: patch-aa,v 1.11 2014/12/15 08:58:52 obache Exp $ 1$NetBSD: patch-aa,v 1.12 2018/02/07 11:58:31 hauke Exp $
2 2
3* portability fix 3Hunt down, stomp out and eradicate bashisms.
4* match to pkgsrc shlib name 
5 4
6--- configure.in.orig 2012-08-15 11:45:19.000000000 +0000 5--- configure.in.orig 2016-07-21 15:18:45.000000000 +0000
7+++ configure.in 6+++ configure.in
8@@ -164,7 +164,7 @@ AC_ARG_WITH(opengl, 7@@ -286,7 +286,7 @@ AC_ARG_WITH([cairo],
9 dnl Graphics double-buffering? Enabled by default unless OpenGL used. 8 [Use cairo graphics library @<:@default=yes@:>@])],
10 AC_ARG_ENABLE(double-buffer, 9 [
11 [ --disable-double-buffer disable graphics double-buffering], , [ 10 xc_with_cairo=$withval
12- if test "x$xc_with_GL" == "x" ; then 11- if test "$withval" == "no" -o "$withval" == "NO"; then
13+ if test "x$xc_with_GL" = "x" ; then 12+ if test "$withval" = "no" -o "$withval" = "NO"; then
14 AC_DEFINE(DOUBLEBUFFER) 13 xc_with_cairo=""
15 else 14 fi
16 AC_MSG_WARN(Double-buffering option not applicable to OpenGL version.) 15 ], )
17@@ -303,7 +303,7 @@ xc_with_tk_libraries="" 16@@ -314,7 +314,7 @@ dnl ------------------------------------
18 AC_ARG_WITH(tcl, 17 AC_ARG_WITH(tcl,
19 [ --with-tcl=DIR Find tclConfig.sh in DIR], [ 18 [ --with-tcl=DIR Find tclConfig.sh in DIR], [
20 xc_with_tcl=$withval 19 xc_with_tcl=$withval
21- if test "$withval" == "no" -o "$withval" == "NO"; then 20- if test "$withval" == "no" -o "$withval" == "NO"; then
22+ if test "$withval" = "no" -o "$withval" = "NO"; then 21+ if test "$withval" = "no" -o "$withval" = "NO"; then
23 xc_with_tcl="" 22 xc_with_tcl=""
24 fi 23 fi
25 ], )  24 ], )
26@@ -585,12 +585,12 @@ if test "x$xc_with_tcl" != "x" ; then 25@@ -558,12 +558,12 @@ if test "x$xc_with_tcl" != "x" ; then
27 if test "x${xc_with_tcl_includes}" != "x" ; then 26 if test "x${xc_with_tcl_includes}" != "x" ; then
28 if test -r "${xc_with_tcl_includes}/tcl.h" ; then 27 if test -r "${xc_with_tcl_includes}/tcl.h" ; then
29 TCL_INC_DIR=${xc_with_tcl_includes} 28 TCL_INC_DIR=${xc_with_tcl_includes}
30- elif test "x${TCL_INCLUDE_SPEC}" == "x" ; then 29- elif test "x${TCL_INCLUDE_SPEC}" == "x" ; then
31+ elif test "x${TCL_INCLUDE_SPEC}" = "x" ; then 30+ elif test "x${TCL_INCLUDE_SPEC}" = "x" ; then
32 echo "Can't find tcl.h in \"${xc_with_tcl_includes}\"" 31 echo "Can't find tcl.h in \"${xc_with_tcl_includes}\""
33 echo "Reverting to non-Tcl compilation" 32 echo "Reverting to non-Tcl compilation"
34 xc_with_tcl="" 33 xc_with_tcl=""
35 fi 34 fi
36- elif test "x${TCL_INCLUDE_SPEC}" == "x" ; then 35- elif test "x${TCL_INCLUDE_SPEC}" == "x" ; then
37+ elif test "x${TCL_INCLUDE_SPEC}" = "x" ; then 36+ elif test "x${TCL_INCLUDE_SPEC}" = "x" ; then
38 for dir in \ 37 for dir in \
39 ${TCL_PREFIX}/include/tcl${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION} \ 38 ${TCL_PREFIX}/include/tcl${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION} \
40 ${TCL_PREFIX}/include \ 39 ${TCL_PREFIX}/include \
41@@ -649,8 +649,8 @@ if test "x$xc_with_tcl" != "x" ; then 40@@ -595,12 +595,12 @@ if test "x$xc_with_tcl" != "x" ; then
42 TK_LIB_NAME="tk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}" 41 if test "x${xc_with_tk_includes}" != "x" ; then
43 ;; 42 if test -r "${xc_with_tk_includes}/tk.h" ; then
44 *) 43 TK_INC_DIR=${xc_with_tk_includes}
45- TCL_LIB_NAME="tcl${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION}" 44- elif test "x${TK_INCLUDE_SPEC}" == "x" ; then
46- TK_LIB_NAME="tk${TK_MAJOR_VERSION}.${TK_MINOR_VERSION}" 45+ elif test "x${TK_INCLUDE_SPEC}" = "x" ; then
47+ TCL_LIB_NAME="tcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}" 46 echo "Can't find tk.h in \"${xc_with_tk_includes}\""
48+ TK_LIB_NAME="tk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}" 47 echo "Reverting to non-Tcl compilation"
49 ;; 48 xc_with_tcl=""
50 esac 49 fi
 50- elif test "x${TK_INCLUDE_SPEC}" == "x" ; then
 51+ elif test "x${TK_INCLUDE_SPEC}" = "x" ; then
 52 for dir in \
 53 ${TK_PREFIX}/include/tcl${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION} \
 54 ${TK_PREFIX}/include/tk${TK_MAJOR_VERSION}.${TK_MINOR_VERSION} \
 55@@ -640,12 +640,12 @@ if test "x$xc_with_tcl" != "x" ; then
 56 break
 57 fi
 58 done
 59- if test "x${TCL_LIB_DIR}" == "x" ; then
 60+ if test "x${TCL_LIB_DIR}" = "x" ; then
 61 echo "Can't find tcl library in \"${xc_with_tcl_libraries}\""
 62 echo "Reverting to non-Tcl compile"
 63 xc_with_tcl=""
 64 fi
 65- elif test "x${TCL_LIB_SPEC}" == "x" ; then
 66+ elif test "x${TCL_LIB_SPEC}" = "x" ; then
 67 for libpfix in "lib64" "lib"
 68 do
 69 libname="${TCL_EXEC_PREFIX}/${libpfix}/lib${TCL_LIB_NAME}${SHDLIB_EXT}"
 70@@ -680,12 +680,12 @@ if test "x$xc_with_tcl" != "x" ; then
 71 break
 72 fi
 73 done
 74- if test "x${TK_LIB_DIR}" == "x" ; then
 75+ if test "x${TK_LIB_DIR}" = "x" ; then
 76 echo "Can't find tk library in \"${xc_with_tk_libraries}\""
 77 echo "Reverting to non-Tcl compile"
 78 xc_with_tcl=""
 79 fi
 80- elif test "x${TK_LIB_SPEC}" == "x" ; then
 81+ elif test "x${TK_LIB_SPEC}" = "x" ; then
 82 for libpfix in "lib64" "lib"
 83 do
 84 libname="${TK_EXEC_PREFIX}/${libpfix}/lib${TK_LIB_NAME}${SHDLIB_EXT}"
 85@@ -709,7 +709,7 @@ fi
 86 #--------------------------------------------------------------------
 87
 88 if test "x$xc_with_tcl" != "x" ; then
 89- if test "x${TCL_LIB_SPEC}" == "x" ; then
 90+ if test "x${TCL_LIB_SPEC}" = "x" ; then
 91 case $target in
 92 *-sunos4*|*-*-netbsd|NetBSD-*|FreeBSD-*|*-*-openbsd*|OpenBSD-*)
 93 TCL_LIB_NAME="tcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}"
 94@@ -721,7 +721,7 @@ if test "x$xc_with_tcl" != "x" ; then
 95 TCL_LIB_SPEC="-L${TCL_LIB_DIR} -l${TCL_LIB_NAME}"
 96 fi
 97
 98- if test "x${TK_LIB_SPEC}" == "x" ; then
 99+ if test "x${TK_LIB_SPEC}" = "x" ; then
 100 case $target in
 101 *-sunos4*|*-*-netbsd|NetBSD-*|FreeBSD-*|*-*-openbsd*|OpenBSD-*)
 102 TK_LIB_NAME="tk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}"
 103@@ -814,13 +814,13 @@ if test "x$xc_with_tcl" != "x" ; then
 104
 105 # Initialize shared library build variables
 106
 107- if test "x${TCL_SHLIB_SUFFIX}" == "x" ; then
 108+ if test "x${TCL_SHLIB_SUFFIX}" = "x" ; then
 109 SHDLIB_EXT=".so"
 110 else
 111 SHDLIB_EXT="${TCL_SHLIB_SUFFIX}"
 112 fi
 113
 114- if test "x${TCL_SHLIB_LD}" == "x" ; then
 115+ if test "x${TCL_SHLIB_LD}" = "x" ; then
 116
 117 # Construct shared library build arguments the painful way
 118 # This is not expected to be necessary, so the number of
 119@@ -1141,7 +1141,7 @@ echo "Configuration results:"
 120 echo "----------------------------------------------------"
 121 echo ""
 122
 123-if test "x$xc_with_tcl" == "x" ; then
 124+if test "x$xc_with_tcl" = "x" ; then
 125 if test "x$PYTHON" != x; then
 126 echo "Using Python interface (not recommended)"
 127 else
 128@@ -1154,7 +1154,7 @@ else
 129 fi
 130 echo ""
51  131
 132-if test "x$xc_with_cairo" == "x" ; then
 133+if test "x$xc_with_cairo" = "x" ; then
 134 echo "No Cairo graphics."
 135 echo "If that is not what you wanted, then make sure"
 136 echo "you have libcairo and fontconfig installed."
cvs diff -r1.13 -r1.14 pkgsrc/cad/xcircuit/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/cad/xcircuit/patches/patch-ab 2014/12/15 09:00:32 1.13
+++ pkgsrc/cad/xcircuit/patches/patch-ab 2018/02/07 11:58:31 1.14
@@ -1,48 +1,136 @@ @@ -1,48 +1,136 @@
1$NetBSD: patch-ab,v 1.13 2014/12/15 09:00:32 obache Exp $ 1$NetBSD: patch-ab,v 1.14 2018/02/07 11:58:31 hauke Exp $
2 2
3--- configure.orig 2012-08-15 11:45:19.000000000 +0000 3Hunt down, stomp out and eradicate bashisms.
 4
 5--- configure.orig 2016-07-21 15:18:45.000000000 +0000
4+++ configure 6+++ configure
5@@ -6006,7 +6006,7 @@ if test "${enable_double_buffer+set}" =  7@@ -6371,7 +6371,7 @@ xc_with_cairo="yes"
6 enableval=$enable_double_buffer; 8 if test "${with_cairo+set}" = set; then :
7 else 9 withval=$with_cairo;
8  10 xc_with_cairo=$withval
9- if test "x$xc_with_GL" == "x" ; then 11- if test "$withval" == "no" -o "$withval" == "NO"; then
10+ if test "x$xc_with_GL" = "x" ; then 12+ if test "$withval" = "no" -o "$withval" = "NO"; then
11 $as_echo "#define DOUBLEBUFFER 1" >>confdefs.h 13 xc_with_cairo=""
 14 fi
12  15
13 else 16@@ -6715,7 +6715,7 @@ fi
14@@ -6223,7 +6223,7 @@ xc_with_tk_libraries="" 
15 if test "${with_tcl+set}" = set; then : 17 if test "${with_tcl+set}" = set; then :
16 withval=$with_tcl; 18 withval=$with_tcl;
17 xc_with_tcl=$withval 19 xc_with_tcl=$withval
18- if test "$withval" == "no" -o "$withval" == "NO"; then 20- if test "$withval" == "no" -o "$withval" == "NO"; then
19+ if test "$withval" = "no" -o "$withval" = "NO"; then 21+ if test "$withval" = "no" -o "$withval" = "NO"; then
20 xc_with_tcl="" 22 xc_with_tcl=""
21 fi 23 fi
22  24
23@@ -6625,12 +6625,12 @@ if test "x$xc_with_tcl" != "x" ; then 25@@ -6982,12 +6982,12 @@ if test "x$xc_with_tcl" != "x" ; then
24 if test "x${xc_with_tcl_includes}" != "x" ; then 26 if test "x${xc_with_tcl_includes}" != "x" ; then
25 if test -r "${xc_with_tcl_includes}/tcl.h" ; then 27 if test -r "${xc_with_tcl_includes}/tcl.h" ; then
26 TCL_INC_DIR=${xc_with_tcl_includes} 28 TCL_INC_DIR=${xc_with_tcl_includes}
27- elif test "x${TCL_INCLUDE_SPEC}" == "x" ; then 29- elif test "x${TCL_INCLUDE_SPEC}" == "x" ; then
28+ elif test "x${TCL_INCLUDE_SPEC}" = "x" ; then 30+ elif test "x${TCL_INCLUDE_SPEC}" = "x" ; then
29 echo "Can't find tcl.h in \"${xc_with_tcl_includes}\"" 31 echo "Can't find tcl.h in \"${xc_with_tcl_includes}\""
30 echo "Reverting to non-Tcl compilation" 32 echo "Reverting to non-Tcl compilation"
31 xc_with_tcl="" 33 xc_with_tcl=""
32 fi 34 fi
33- elif test "x${TCL_INCLUDE_SPEC}" == "x" ; then 35- elif test "x${TCL_INCLUDE_SPEC}" == "x" ; then
34+ elif test "x${TCL_INCLUDE_SPEC}" = "x" ; then 36+ elif test "x${TCL_INCLUDE_SPEC}" = "x" ; then
35 for dir in \ 37 for dir in \
36 ${TCL_PREFIX}/include/tcl${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION} \ 38 ${TCL_PREFIX}/include/tcl${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION} \
37 ${TCL_PREFIX}/include \ 39 ${TCL_PREFIX}/include \
38@@ -6689,8 +6689,8 @@ if test "x$xc_with_tcl" != "x" ; then 40@@ -7019,12 +7019,12 @@ if test "x$xc_with_tcl" != "x" ; then
39 TK_LIB_NAME="tk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}" 41 if test "x${xc_with_tk_includes}" != "x" ; then
40 ;; 42 if test -r "${xc_with_tk_includes}/tk.h" ; then
41 *) 43 TK_INC_DIR=${xc_with_tk_includes}
42- TCL_LIB_NAME="tcl${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION}" 44- elif test "x${TK_INCLUDE_SPEC}" == "x" ; then
43- TK_LIB_NAME="tk${TK_MAJOR_VERSION}.${TK_MINOR_VERSION}" 45+ elif test "x${TK_INCLUDE_SPEC}" = "x" ; then
44+ TCL_LIB_NAME="tcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}" 46 echo "Can't find tk.h in \"${xc_with_tk_includes}\""
45+ TK_LIB_NAME="tk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}" 47 echo "Reverting to non-Tcl compilation"
46 ;; 48 xc_with_tcl=""
47 esac 49 fi
 50- elif test "x${TK_INCLUDE_SPEC}" == "x" ; then
 51+ elif test "x${TK_INCLUDE_SPEC}" = "x" ; then
 52 for dir in \
 53 ${TK_PREFIX}/include/tcl${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION} \
 54 ${TK_PREFIX}/include/tk${TK_MAJOR_VERSION}.${TK_MINOR_VERSION} \
 55@@ -7064,12 +7064,12 @@ if test "x$xc_with_tcl" != "x" ; then
 56 break
 57 fi
 58 done
 59- if test "x${TCL_LIB_DIR}" == "x" ; then
 60+ if test "x${TCL_LIB_DIR}" = "x" ; then
 61 echo "Can't find tcl library in \"${xc_with_tcl_libraries}\""
 62 echo "Reverting to non-Tcl compile"
 63 xc_with_tcl=""
 64 fi
 65- elif test "x${TCL_LIB_SPEC}" == "x" ; then
 66+ elif test "x${TCL_LIB_SPEC}" = "x" ; then
 67 for libpfix in "lib64" "lib"
 68 do
 69 libname="${TCL_EXEC_PREFIX}/${libpfix}/lib${TCL_LIB_NAME}${SHDLIB_EXT}"
 70@@ -7104,12 +7104,12 @@ if test "x$xc_with_tcl" != "x" ; then
 71 break
 72 fi
 73 done
 74- if test "x${TK_LIB_DIR}" == "x" ; then
 75+ if test "x${TK_LIB_DIR}" = "x" ; then
 76 echo "Can't find tk library in \"${xc_with_tk_libraries}\""
 77 echo "Reverting to non-Tcl compile"
 78 xc_with_tcl=""
 79 fi
 80- elif test "x${TK_LIB_SPEC}" == "x" ; then
 81+ elif test "x${TK_LIB_SPEC}" = "x" ; then
 82 for libpfix in "lib64" "lib"
 83 do
 84 libname="${TK_EXEC_PREFIX}/${libpfix}/lib${TK_LIB_NAME}${SHDLIB_EXT}"
 85@@ -7133,7 +7133,7 @@ fi
 86 #--------------------------------------------------------------------
 87
 88 if test "x$xc_with_tcl" != "x" ; then
 89- if test "x${TCL_LIB_SPEC}" == "x" ; then
 90+ if test "x${TCL_LIB_SPEC}" = "x" ; then
 91 case $target in
 92 *-sunos4*|*-*-netbsd|NetBSD-*|FreeBSD-*|*-*-openbsd*|OpenBSD-*)
 93 TCL_LIB_NAME="tcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}"
 94@@ -7145,7 +7145,7 @@ if test "x$xc_with_tcl" != "x" ; then
 95 TCL_LIB_SPEC="-L${TCL_LIB_DIR} -l${TCL_LIB_NAME}"
 96 fi
 97
 98- if test "x${TK_LIB_SPEC}" == "x" ; then
 99+ if test "x${TK_LIB_SPEC}" = "x" ; then
 100 case $target in
 101 *-sunos4*|*-*-netbsd|NetBSD-*|FreeBSD-*|*-*-openbsd*|OpenBSD-*)
 102 TK_LIB_NAME="tk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}"
 103@@ -7239,13 +7239,13 @@ if test "x$xc_with_tcl" != "x" ; then
 104
 105 # Initialize shared library build variables
 106
 107- if test "x${TCL_SHLIB_SUFFIX}" == "x" ; then
 108+ if test "x${TCL_SHLIB_SUFFIX}" = "x" ; then
 109 SHDLIB_EXT=".so"
 110 else
 111 SHDLIB_EXT="${TCL_SHLIB_SUFFIX}"
 112 fi
 113
 114- if test "x${TCL_SHLIB_LD}" == "x" ; then
 115+ if test "x${TCL_SHLIB_LD}" = "x" ; then
 116
 117 # Construct shared library build arguments the painful way
 118 # This is not expected to be necessary, so the number of
 119@@ -9046,7 +9048,7 @@ echo "Configuration results:"
 120 echo "----------------------------------------------------"
 121 echo ""
 122
 123-if test "x$xc_with_tcl" == "x" ; then
 124+if test "x$xc_with_tcl" = "x" ; then
 125 if test "x$PYTHON" != x; then
 126 echo "Using Python interface (not recommended)"
 127 else
 128@@ -9059,7 +9061,7 @@ else
 129 fi
 130 echo ""
48  131
 132-if test "x$xc_with_cairo" == "x" ; then
 133+if test "x$xc_with_cairo" = "x" ; then
 134 echo "No Cairo graphics."
 135 echo "If that is not what you wanted, then make sure"
 136 echo "you have libcairo and fontconfig installed."