[pkgsrc/trunk]: pkgsrc/cad/xcircuit Upgrade to latest stable release 3.9.72, ...

[hauke <hauke%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d7772f7df15e
branches:  trunk
changeset: 375264:d7772f7df15e
user:      hauke <hauke%pkgsrc.org@localhost>
date:      Wed Feb 07 11:58:31 2018 +0000

description:
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.

diffstat:

 cad/xcircuit/Makefile         |   17 +-
 cad/xcircuit/PLIST            |  244 +++++++++++++++++++++--------------------
 cad/xcircuit/distinfo         |   14 +-
 cad/xcircuit/patches/patch-aa |  135 ++++++++++++++++++----
 cad/xcircuit/patches/patch-ab |  132 ++++++++++++++++++---
 5 files changed, 363 insertions(+), 179 deletions(-)

diffs (truncated from 635 to 300 lines):

diff -r b26f413a7611 -r d7772f7df15e cad/xcircuit/Makefile
--- a/cad/xcircuit/Makefile     Wed Feb 07 11:53:12 2018 +0000
+++ b/cad/xcircuit/Makefile     Wed Feb 07 11:58:31 2018 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.44 2014/12/17 06:35:13 obache Exp $
+# $NetBSD: Makefile,v 1.45 2018/02/07 11:58:31 hauke Exp $
 
-DISTNAME=      xcircuit-3.7.50
-PKGREVISION=   2
+DISTNAME=      xcircuit-3.9.72
+#PKGREVISION=  1
 CATEGORIES=    cad graphics
 MASTER_SITES=  http://opencircuitdesign.com/xcircuit/archive/
 EXTRACT_SUFX=  .tgz
@@ -12,9 +12,11 @@
 LICENSE=       gnu-gpl-v2
 
 WRKSRC=                ${WRKDIR}/${DISTNAME}
-USE_TOOLS+=    gmake gs:run
+USE_TOOLS+=    gmake pkg-config gs:run
 GNU_CONFIGURE= yes
 
+EGDIR=         share/examples/xcircuit
+
 .include "../../lang/tcl/Makefile.version"
 .include "../../x11/tk/Makefile.version"
 
@@ -28,17 +30,18 @@
 
 BUILD_TARGET=  tcl
 INSTALL_TARGET= install-tcl
-INSTALLATION_DIRS=     ${PKGMANDIR}/man1 share/examples/xcircuit
+INSTALLATION_DIRS=     ${PKGMANDIR}/man1 ${EGDIR}
 
 post-extract:
        ${MV} -f ${WRKSRC}/examples/.xcircuitrc ${WRKSRC}/examples/xcircuitrc
        ${TOUCH} ${WRKSRC}/menudep.h
 
 post-install:
-       ${INSTALL_DATA} ${WRKSRC}/examples/*.* ${DESTDIR}${PREFIX}/share/examples/xcircuit/
-       ${INSTALL_DATA} ${WRKSRC}/examples/xcircuitrc ${DESTDIR}${PREFIX}/share/examples/xcircuit/
+       ${INSTALL_DATA} ${WRKSRC}/examples/*.* ${DESTDIR}${PREFIX}/${EGDIR}
+       ${INSTALL_DATA} ${WRKSRC}/examples/xcircuitrc ${DESTDIR}${PREFIX}/${EGDIR}
 
 .include "../../lang/tcl/buildlink3.mk"
+.include "../../graphics/cairo/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../x11/tk/buildlink3.mk"
diff -r b26f413a7611 -r d7772f7df15e cad/xcircuit/PLIST
--- a/cad/xcircuit/PLIST        Wed Feb 07 11:53:12 2018 +0000
+++ b/cad/xcircuit/PLIST        Wed Feb 07 11:58:31 2018 +0000
@@ -1,122 +1,129 @@
-@comment $NetBSD: PLIST,v 1.7 2013/06/11 13:31:58 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.8 2018/02/07 11:58:31 hauke Exp $
 bin/xcircuit
-lib/xcircuit-3.7/analog.lps
-lib/xcircuit-3.7/analoglib2.lps
-lib/xcircuit-3.7/analoglib3.lps
-lib/xcircuit-3.7/app-defaults/XCircuit
-lib/xcircuit-3.7/asg_spice.lps
-lib/xcircuit-3.7/avlsi.lps
-lib/xcircuit-3.7/boot_xcircuit.tcl
-lib/xcircuit-3.7/bparams.tcl
-lib/xcircuit-3.7/console.tcl
-lib/xcircuit-3.7/digital.lps
-lib/xcircuit-3.7/digitallib.lps
-lib/xcircuit-3.7/digitaltcl.lps
-lib/xcircuit-3.7/edif.tcl
-lib/xcircuit-3.7/files.tcl
-lib/xcircuit-3.7/fonts/courier.lps
-lib/xcircuit-3.7/fonts/courier.xfe
-lib/xcircuit-3.7/fonts/courieriso.xfe
-lib/xcircuit-3.7/fonts/courieriso2.lps
-lib/xcircuit-3.7/fonts/courieriso2.xfe
-lib/xcircuit-3.7/fonts/courieriso5.lps
-lib/xcircuit-3.7/fonts/courieriso5.xfe
-lib/xcircuit-3.7/fonts/helvetica.lps
-lib/xcircuit-3.7/fonts/helvetica.xfe
-lib/xcircuit-3.7/fonts/helveticaiso.xfe
-lib/xcircuit-3.7/fonts/helveticaiso2.lps
-lib/xcircuit-3.7/fonts/helveticaiso2.xfe
-lib/xcircuit-3.7/fonts/helveticaiso5.lps
-lib/xcircuit-3.7/fonts/helveticaiso5.xfe
-lib/xcircuit-3.7/fonts/myfont.lps
-lib/xcircuit-3.7/fonts/myfont.xfe
-lib/xcircuit-3.7/fonts/symbol.lps
-lib/xcircuit-3.7/fonts/symbol.xfe
-lib/xcircuit-3.7/fonts/times_roman.lps
-lib/xcircuit-3.7/fonts/times_roman.xfe
-lib/xcircuit-3.7/fonts/times_romaniso.xfe
-lib/xcircuit-3.7/fonts/times_romaniso2.lps
-lib/xcircuit-3.7/fonts/times_romaniso2.xfe
-lib/xcircuit-3.7/fonts/times_romaniso5.lps
-lib/xcircuit-3.7/fonts/times_romaniso5.xfe
-lib/xcircuit-3.7/generic.lps
-lib/xcircuit-3.7/ic_templates.lps
-lib/xcircuit-3.7/lgf.lps
-lib/xcircuit-3.7/library.tcl
-lib/xcircuit-3.7/man/xcircuit.1
-lib/xcircuit-3.7/matgen.tcl
-lib/xcircuit-3.7/mousehint.tcl
-lib/xcircuit-3.7/musiclib.lps
-lib/xcircuit-3.7/ngspice.tcl
-lib/xcircuit-3.7/panzoom.tcl
-lib/xcircuit-3.7/pcb.lps
-lib/xcircuit-3.7/pcb_layout.lps
-lib/xcircuit-3.7/pcbout.tcl
-lib/xcircuit-3.7/pixmaps/a.gif
-lib/xcircuit-3.7/pixmaps/b.gif
-lib/xcircuit-3.7/pixmaps/bd.gif
-lib/xcircuit-3.7/pixmaps/ccw.gif
-lib/xcircuit-3.7/pixmaps/co.gif
-lib/xcircuit-3.7/pixmaps/cp.gif
-lib/xcircuit-3.7/pixmaps/cw.gif
-lib/xcircuit-3.7/pixmaps/d2.gif
-lib/xcircuit-3.7/pixmaps/e.gif
-lib/xcircuit-3.7/pixmaps/fi.gif
-lib/xcircuit-3.7/pixmaps/fx.gif
-lib/xcircuit-3.7/pixmaps/fy.gif
-lib/xcircuit-3.7/pixmaps/i.gif
-lib/xcircuit-3.7/pixmaps/li.gif
-lib/xcircuit-3.7/pixmaps/mk.gif
-lib/xcircuit-3.7/pixmaps/mv.gif
-lib/xcircuit-3.7/pixmaps/pa.gif
-lib/xcircuit-3.7/pixmaps/pl.gif
-lib/xcircuit-3.7/pixmaps/pm.gif
-lib/xcircuit-3.7/pixmaps/pn.gif
-lib/xcircuit-3.7/pixmaps/po2.gif
-lib/xcircuit-3.7/pixmaps/pu2.gif
-lib/xcircuit-3.7/pixmaps/pz.gif
-lib/xcircuit-3.7/pixmaps/q.gif
-lib/xcircuit-3.7/pixmaps/r.gif
-lib/xcircuit-3.7/pixmaps/s.gif
-lib/xcircuit-3.7/pixmaps/solid.xbm
-lib/xcircuit-3.7/pixmaps/stip12.xbm
-lib/xcircuit-3.7/pixmaps/stip25.xbm
-lib/xcircuit-3.7/pixmaps/stip38.xbm
-lib/xcircuit-3.7/pixmaps/stip50.xbm
-lib/xcircuit-3.7/pixmaps/stip62.xbm
-lib/xcircuit-3.7/pixmaps/stip75.xbm
-lib/xcircuit-3.7/pixmaps/stip88.xbm
-lib/xcircuit-3.7/pixmaps/t.gif
-lib/xcircuit-3.7/pixmaps/tg.gif
-lib/xcircuit-3.7/pixmaps/ti.gif
-lib/xcircuit-3.7/pixmaps/tp.gif
-lib/xcircuit-3.7/pixmaps/uj.gif
-lib/xcircuit-3.7/pixmaps/w.gif
-lib/xcircuit-3.7/pixmaps/xcircuit.gif
-lib/xcircuit-3.7/pixmaps/xcircuit.ico
-lib/xcircuit-3.7/pixmaps/yp.gif
-lib/xcircuit-3.7/pixmaps/z4.gif
-lib/xcircuit-3.7/pixmaps/z5.gif
-lib/xcircuit-3.7/pkgIndex.tcl
-lib/xcircuit-3.7/quadparts.lps
-lib/xcircuit-3.7/resource.tcl
-lib/xcircuit-3.7/selection.tcl
-lib/xcircuit-3.7/series74xx.lps
-lib/xcircuit-3.7/signal.lps
-lib/xcircuit-3.7/sinusoid.tcl
-lib/xcircuit-3.7/standard_cells.cir
-lib/xcircuit-3.7/standard_cells_3V.cir
-lib/xcircuit-3.7/sue_xc.tcl
-lib/xcircuit-3.7/symbol.tcl
-lib/xcircuit-3.7/text.tcl
-lib/xcircuit-3.7/tkcon.tcl
-lib/xcircuit-3.7/wrapper.tcl
-lib/xcircuit-3.7/xchelp.tcl
-lib/xcircuit-3.7/xcircexec
-lib/xcircuit-3.7/xcircps2.pro
-lib/xcircuit-3.7/xcircuit.so
-lib/xcircuit-3.7/xcircuit.tcl
-lib/xcircuit-3.7/xcstartup.tcl
+lib/xcircuit-3.9/analog.lps
+lib/xcircuit-3.9/analoglib2.lps
+lib/xcircuit-3.9/analoglib3.lps
+lib/xcircuit-3.9/app-defaults/XCircuit
+lib/xcircuit-3.9/asg_spice.lps
+lib/xcircuit-3.9/avlsi.lps
+lib/xcircuit-3.9/boot_xcircuit.tcl
+lib/xcircuit-3.9/bparams.tcl
+lib/xcircuit-3.9/console.tcl
+lib/xcircuit-3.9/cyrillic.enc
+lib/xcircuit-3.9/digital.lps
+lib/xcircuit-3.9/digitallib.lps
+lib/xcircuit-3.9/digitaltcl.lps
+lib/xcircuit-3.9/edif.tcl
+lib/xcircuit-3.9/files.tcl
+lib/xcircuit-3.9/fonts/courier.lps
+lib/xcircuit-3.9/fonts/courier.xfe
+lib/xcircuit-3.9/fonts/courier_cyrillic.xfe
+lib/xcircuit-3.9/fonts/courieriso.xfe
+lib/xcircuit-3.9/fonts/courieriso2.lps
+lib/xcircuit-3.9/fonts/courieriso2.xfe
+lib/xcircuit-3.9/fonts/courieriso5.lps
+lib/xcircuit-3.9/fonts/courieriso5.xfe
+lib/xcircuit-3.9/fonts/helvetica.lps
+lib/xcircuit-3.9/fonts/helvetica.xfe
+lib/xcircuit-3.9/fonts/helvetica_cyrillic.xfe
+lib/xcircuit-3.9/fonts/helveticaiso.xfe
+lib/xcircuit-3.9/fonts/helveticaiso2.lps
+lib/xcircuit-3.9/fonts/helveticaiso2.xfe
+lib/xcircuit-3.9/fonts/helveticaiso5.lps
+lib/xcircuit-3.9/fonts/helveticaiso5.xfe
+lib/xcircuit-3.9/fonts/myfont.lps
+lib/xcircuit-3.9/fonts/myfont.xfe
+lib/xcircuit-3.9/fonts/symbol.lps
+lib/xcircuit-3.9/fonts/symbol.xfe
+lib/xcircuit-3.9/fonts/times_roman.lps
+lib/xcircuit-3.9/fonts/times_roman.xfe
+lib/xcircuit-3.9/fonts/times_roman_cyrillic.xfe
+lib/xcircuit-3.9/fonts/times_romaniso.xfe
+lib/xcircuit-3.9/fonts/times_romaniso2.lps
+lib/xcircuit-3.9/fonts/times_romaniso2.xfe
+lib/xcircuit-3.9/fonts/times_romaniso5.lps
+lib/xcircuit-3.9/fonts/times_romaniso5.xfe
+lib/xcircuit-3.9/generic.lps
+lib/xcircuit-3.9/ic_templates.lps
+lib/xcircuit-3.9/isolatin2.enc
+lib/xcircuit-3.9/isolatin5.enc
+lib/xcircuit-3.9/lgf.lps
+lib/xcircuit-3.9/library.tcl
+lib/xcircuit-3.9/man/xcircuit.1
+lib/xcircuit-3.9/matgen.tcl
+lib/xcircuit-3.9/mousehint.tcl
+lib/xcircuit-3.9/musiclib.lps
+lib/xcircuit-3.9/ngspice.tcl
+lib/xcircuit-3.9/panzoom.tcl
+lib/xcircuit-3.9/pcb.lps
+lib/xcircuit-3.9/pcb_layout.lps
+lib/xcircuit-3.9/pcbout.tcl
+lib/xcircuit-3.9/pixmaps/a.gif
+lib/xcircuit-3.9/pixmaps/b.gif
+lib/xcircuit-3.9/pixmaps/bd.gif
+lib/xcircuit-3.9/pixmaps/ccw.gif
+lib/xcircuit-3.9/pixmaps/co.gif
+lib/xcircuit-3.9/pixmaps/cp.gif
+lib/xcircuit-3.9/pixmaps/cw.gif
+lib/xcircuit-3.9/pixmaps/d2.gif
+lib/xcircuit-3.9/pixmaps/e.gif
+lib/xcircuit-3.9/pixmaps/fi.gif
+lib/xcircuit-3.9/pixmaps/fx.gif
+lib/xcircuit-3.9/pixmaps/fy.gif
+lib/xcircuit-3.9/pixmaps/i.gif
+lib/xcircuit-3.9/pixmaps/li.gif
+lib/xcircuit-3.9/pixmaps/mk.gif
+lib/xcircuit-3.9/pixmaps/mv.gif
+lib/xcircuit-3.9/pixmaps/pa.gif
+lib/xcircuit-3.9/pixmaps/pl.gif
+lib/xcircuit-3.9/pixmaps/pm.gif
+lib/xcircuit-3.9/pixmaps/pn.gif
+lib/xcircuit-3.9/pixmaps/po2.gif
+lib/xcircuit-3.9/pixmaps/pu2.gif
+lib/xcircuit-3.9/pixmaps/pz.gif
+lib/xcircuit-3.9/pixmaps/q.gif
+lib/xcircuit-3.9/pixmaps/r.gif
+lib/xcircuit-3.9/pixmaps/s.gif
+lib/xcircuit-3.9/pixmaps/solid.xbm
+lib/xcircuit-3.9/pixmaps/stip12.xbm
+lib/xcircuit-3.9/pixmaps/stip25.xbm
+lib/xcircuit-3.9/pixmaps/stip38.xbm
+lib/xcircuit-3.9/pixmaps/stip50.xbm
+lib/xcircuit-3.9/pixmaps/stip62.xbm
+lib/xcircuit-3.9/pixmaps/stip75.xbm
+lib/xcircuit-3.9/pixmaps/stip88.xbm
+lib/xcircuit-3.9/pixmaps/t.gif
+lib/xcircuit-3.9/pixmaps/tg.gif
+lib/xcircuit-3.9/pixmaps/ti.gif
+lib/xcircuit-3.9/pixmaps/tp.gif
+lib/xcircuit-3.9/pixmaps/uj.gif
+lib/xcircuit-3.9/pixmaps/w.gif
+lib/xcircuit-3.9/pixmaps/xcircuit.gif
+lib/xcircuit-3.9/pixmaps/xcircuit.ico
+lib/xcircuit-3.9/pixmaps/yp.gif
+lib/xcircuit-3.9/pixmaps/z4.gif
+lib/xcircuit-3.9/pixmaps/z5.gif
+lib/xcircuit-3.9/pkgIndex.tcl
+lib/xcircuit-3.9/quadparts.lps
+lib/xcircuit-3.9/resource.tcl
+lib/xcircuit-3.9/selection.tcl
+lib/xcircuit-3.9/series74xx.lps
+lib/xcircuit-3.9/signal.lps
+lib/xcircuit-3.9/sinusoid.tcl
+lib/xcircuit-3.9/standard_cells.cir
+lib/xcircuit-3.9/standard_cells_3V.cir
+lib/xcircuit-3.9/sue_xc.tcl
+lib/xcircuit-3.9/symbol.tcl
+lib/xcircuit-3.9/text.tcl
+lib/xcircuit-3.9/tkcon.tcl
+lib/xcircuit-3.9/wrapper.tcl
+lib/xcircuit-3.9/xchelp.tcl
+lib/xcircuit-3.9/xcircexec
+lib/xcircuit-3.9/xcircps2.pro
+lib/xcircuit-3.9/xcircuit.so
+lib/xcircuit-3.9/xcircuit.tcl
+lib/xcircuit-3.9/xcstartup.tcl
+lib/xcircuit-3.9/xspice.lps
 share/examples/xcircuit/FlareLED.ps
 share/examples/xcircuit/USAflag.ps
 share/examples/xcircuit/analog1.ps