diff --git a/cad/xcircuit/Makefile b/cad/xcircuit/Makefile index dc34769c541b..cd99107ffdd9 100644 --- a/cad/xcircuit/Makefile +++ b/cad/xcircuit/Makefile @@ -1,44 +1,48 @@ # Created by: Pedro F. Giffuni # $FreeBSD$ PORTNAME= xcircuit -PORTVERSION= 3.8.83 +PORTVERSION= 3.10.1 PORTEPOCH= 1 CATEGORIES= cad MASTER_SITES= http://opencircuitdesign.com/xcircuit/archive/ \ http://fossies.org/unix/misc/ MAINTAINER= danilo@FreeBSD.org COMMENT= X11 circuit schematics drawing program LICENSE= GPLv2 +LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ + libfreetype.so:print/freetype2 + OPTIONS_DEFINE= EXAMPLES USE_XORG= ice sm x11 xpm xscrnsaver xt -USES= tk:tea ghostscript:x11,run gmake tar:tgz -MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOHEADER="${TRUE}" \ +USE_GNOME= cairo +USES= ghostscript:x11,run gmake pkgconfig tar:tgz tk:tea +MAKE_ARGS+= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOHEADER="${TRUE}" \ AUTOMAKE="${TRUE}" DESKTOP_ENTRIES="Xcircuit" "${COMMENT}" "${DATADIR}/pixmaps/${PORTNAME}.gif" \ "${PORTNAME}" "" false # Restrict to stable (even) versions, indicated by the second component. PORTSCOUT= limitw:1,even post-patch: @${REINPLACE_CMD} -e '/test/s| == | = |g ; \ s|TCL_LIB_NAME=.*$$|TCL_LIB_NAME="tcl${TCL_VER:S/.//}"|g ; \ s|TK_LIB_NAME=.*$$|TK_LIB_NAME="tk${TK_VER:S/.//}"|g ; \ s|wish |${WISH:T} |g ; \ s|-fpic|-fPIC|g' ${WRKSRC}/configure post-install: @${MKDIR} ${STAGEDIR}/${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/examples/.xcircuitrc ${STAGEDIR}/${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/examples/*.lgf ${STAGEDIR}/${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/examples/*.lps ${STAGEDIR}/${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/examples/*.ps ${STAGEDIR}/${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/examples/*.sim ${STAGEDIR}/${EXAMPLESDIR} .include diff --git a/cad/xcircuit/distinfo b/cad/xcircuit/distinfo index 52d701ed7477..d2ea303dd843 100644 --- a/cad/xcircuit/distinfo +++ b/cad/xcircuit/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1485548679 -SHA256 (xcircuit-3.8.83.tgz) = 263d54f455b0624b3497d375ebf1f557c9b99900a64cb21c013db8690d5248df -SIZE (xcircuit-3.8.83.tgz) = 1533560 +TIMESTAMP = 1494177970 +SHA256 (xcircuit-3.10.1.tgz) = ee3d695e57bf68f1509a331c88fec7fe029190a8832d76db4cd9f2f2a5aa6e10 +SIZE (xcircuit-3.10.1.tgz) = 1615503 diff --git a/cad/xcircuit/files/patch-tclxcircuit.c b/cad/xcircuit/files/patch-tclxcircuit.c new file mode 100644 index 000000000000..161c3d101dca --- /dev/null +++ b/cad/xcircuit/files/patch-tclxcircuit.c @@ -0,0 +1,11 @@ +--- tclxcircuit.c.orig 2017-04-25 12:36:04 UTC ++++ tclxcircuit.c +@@ -8947,7 +8947,7 @@ int defaultscript() + sprintf(_STR2, "%s/tcl/%s", SCRIPTS_DIR, STARTUP_FILE); + if ((fd = fopen(_STR2, "r")) == NULL) { + Wprintf("Failed to open startup script \"%s\"\n", STARTUP_FILE); +- return; ++ return TCL_ERROR; + } + } + } diff --git a/cad/xcircuit/pkg-plist b/cad/xcircuit/pkg-plist index 6de27470f5b3..ed6adc21b3eb 100644 --- a/cad/xcircuit/pkg-plist +++ b/cad/xcircuit/pkg-plist @@ -1,138 +1,145 @@ bin/xcircuit lib/X11/app-defaults/XCircuit man/man1/xcircuit.1.gz %%PORTEXAMPLES%%%%EXAMPLESDIR%%/.xcircuitrc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/FlareLED.ps %%PORTEXAMPLES%%%%EXAMPLESDIR%%/USAflag.ps %%PORTEXAMPLES%%%%EXAMPLESDIR%%/analog1.ps %%PORTEXAMPLES%%%%EXAMPLESDIR%%/analog2.ps %%PORTEXAMPLES%%%%EXAMPLESDIR%%/analoglib1.lps %%PORTEXAMPLES%%%%EXAMPLESDIR%%/border.ps %%PORTEXAMPLES%%%%EXAMPLESDIR%%/buses.ps %%PORTEXAMPLES%%%%EXAMPLESDIR%%/diffamp_test.ps %%PORTEXAMPLES%%%%EXAMPLESDIR%%/diffamp_test2.ps %%PORTEXAMPLES%%%%EXAMPLESDIR%%/diffamp_test3.ps %%PORTEXAMPLES%%%%EXAMPLESDIR%%/envelope.ps %%PORTEXAMPLES%%%%EXAMPLESDIR%%/fourttest.ps %%PORTEXAMPLES%%%%EXAMPLESDIR%%/logic.sim %%PORTEXAMPLES%%%%EXAMPLESDIR%%/logic8.ps %%PORTEXAMPLES%%%%EXAMPLESDIR%%/prelude.ps %%PORTEXAMPLES%%%%EXAMPLESDIR%%/systemd1.lgf %%PORTEXAMPLES%%%%EXAMPLESDIR%%/threestage.ps %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vcoblock.ps %%PORTEXAMPLES%%%%EXAMPLESDIR%%/xcclock.ps %%DATADIR%%/analog.lps %%DATADIR%%/analoglib2.lps %%DATADIR%%/analoglib3.lps %%DATADIR%%/asg_spice.lps %%DATADIR%%/avlsi.lps %%DATADIR%%/boot_xcircuit.tcl %%DATADIR%%/bparams.tcl %%DATADIR%%/console.tcl +%%DATADIR%%/cyrillic.enc %%DATADIR%%/digital.lps %%DATADIR%%/digitallib.lps %%DATADIR%%/digitaltcl.lps %%DATADIR%%/edif.tcl %%DATADIR%%/files.tcl %%DATADIR%%/fonts/courier.lps %%DATADIR%%/fonts/courier.xfe +%%DATADIR%%/fonts/courier_cyrillic.xfe %%DATADIR%%/fonts/courieriso.xfe %%DATADIR%%/fonts/courieriso2.lps %%DATADIR%%/fonts/courieriso2.xfe %%DATADIR%%/fonts/courieriso5.lps %%DATADIR%%/fonts/courieriso5.xfe %%DATADIR%%/fonts/helvetica.lps %%DATADIR%%/fonts/helvetica.xfe +%%DATADIR%%/fonts/helvetica_cyrillic.xfe %%DATADIR%%/fonts/helveticaiso.xfe %%DATADIR%%/fonts/helveticaiso2.lps %%DATADIR%%/fonts/helveticaiso2.xfe %%DATADIR%%/fonts/helveticaiso5.lps %%DATADIR%%/fonts/helveticaiso5.xfe %%DATADIR%%/fonts/myfont.lps %%DATADIR%%/fonts/myfont.xfe %%DATADIR%%/fonts/symbol.lps %%DATADIR%%/fonts/symbol.xfe %%DATADIR%%/fonts/times_roman.lps %%DATADIR%%/fonts/times_roman.xfe +%%DATADIR%%/fonts/times_roman_cyrillic.xfe %%DATADIR%%/fonts/times_romaniso.xfe %%DATADIR%%/fonts/times_romaniso2.lps %%DATADIR%%/fonts/times_romaniso2.xfe %%DATADIR%%/fonts/times_romaniso5.lps %%DATADIR%%/fonts/times_romaniso5.xfe %%DATADIR%%/generic.lps %%DATADIR%%/ic_templates.lps +%%DATADIR%%/isolatin2.enc +%%DATADIR%%/isolatin5.enc %%DATADIR%%/lgf.lps %%DATADIR%%/library.tcl %%DATADIR%%/matgen.tcl %%DATADIR%%/mousehint.tcl %%DATADIR%%/musiclib.lps %%DATADIR%%/ngspice.tcl %%DATADIR%%/panzoom.tcl %%DATADIR%%/pcb.lps %%DATADIR%%/pcb_layout.lps %%DATADIR%%/pcbout.tcl %%DATADIR%%/pixmaps/a.gif %%DATADIR%%/pixmaps/b.gif %%DATADIR%%/pixmaps/bd.gif %%DATADIR%%/pixmaps/ccw.gif %%DATADIR%%/pixmaps/co.gif %%DATADIR%%/pixmaps/cp.gif %%DATADIR%%/pixmaps/cw.gif %%DATADIR%%/pixmaps/d2.gif %%DATADIR%%/pixmaps/e.gif %%DATADIR%%/pixmaps/fi.gif %%DATADIR%%/pixmaps/fx.gif %%DATADIR%%/pixmaps/fy.gif %%DATADIR%%/pixmaps/i.gif %%DATADIR%%/pixmaps/li.gif %%DATADIR%%/pixmaps/mk.gif %%DATADIR%%/pixmaps/mv.gif %%DATADIR%%/pixmaps/pa.gif %%DATADIR%%/pixmaps/pl.gif %%DATADIR%%/pixmaps/pm.gif %%DATADIR%%/pixmaps/pn.gif %%DATADIR%%/pixmaps/po2.gif %%DATADIR%%/pixmaps/pu2.gif %%DATADIR%%/pixmaps/pz.gif %%DATADIR%%/pixmaps/q.gif %%DATADIR%%/pixmaps/r.gif %%DATADIR%%/pixmaps/s.gif %%DATADIR%%/pixmaps/solid.xbm %%DATADIR%%/pixmaps/stip12.xbm %%DATADIR%%/pixmaps/stip25.xbm %%DATADIR%%/pixmaps/stip38.xbm %%DATADIR%%/pixmaps/stip50.xbm %%DATADIR%%/pixmaps/stip62.xbm %%DATADIR%%/pixmaps/stip75.xbm %%DATADIR%%/pixmaps/stip88.xbm %%DATADIR%%/pixmaps/t.gif %%DATADIR%%/pixmaps/tg.gif %%DATADIR%%/pixmaps/ti.gif %%DATADIR%%/pixmaps/tp.gif %%DATADIR%%/pixmaps/uj.gif %%DATADIR%%/pixmaps/w.gif %%DATADIR%%/pixmaps/xcircuit.gif %%DATADIR%%/pixmaps/xcircuit.ico %%DATADIR%%/pixmaps/yp.gif %%DATADIR%%/pixmaps/z4.gif %%DATADIR%%/pixmaps/z5.gif %%DATADIR%%/pkgIndex.tcl %%DATADIR%%/quadparts.lps %%DATADIR%%/resource.tcl %%DATADIR%%/selection.tcl %%DATADIR%%/series74xx.lps %%DATADIR%%/signal.lps %%DATADIR%%/sinusoid.tcl %%DATADIR%%/standard_cells.cir %%DATADIR%%/standard_cells_3V.cir %%DATADIR%%/sue_xc.tcl %%DATADIR%%/symbol.tcl %%DATADIR%%/text.tcl %%DATADIR%%/tkcon.tcl %%DATADIR%%/wrapper.tcl %%DATADIR%%/xchelp.tcl %%DATADIR%%/xcircexec %%DATADIR%%/xcircps2.pro %%DATADIR%%/xcircuit.so %%DATADIR%%/xcircuit.tcl %%DATADIR%%/xcstartup.tcl +%%DATADIR%%/xspice.lps