diff --git a/cad/xcircuit/Makefile b/cad/xcircuit/Makefile index 8e8c85799a76..961d2c0a257a 100644 --- a/cad/xcircuit/Makefile +++ b/cad/xcircuit/Makefile @@ -1,52 +1,52 @@ PORTNAME= xcircuit -PORTVERSION= 3.10.30 -PORTREVISION= 2 +DISTVERSION= 3.10.44 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 WWW= http://opencircuitdesign.com/xcircuit/ LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYRIGHT LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 -USES= ghostscript:x11,run gmake gnome pkgconfig tar:tgz tk:tea xorg +USES= ghostscript:x11,run gmake gnome pkgconfig tk:tea xorg +USE_GITHUB= yes +GH_ACCOUNT= RTimothyEdwards +GH_PROJECT= XCircuit -OPTIONS_DEFINE= EXAMPLES - -USE_XORG= ice sm x11 xpm xscrnsaver xt USE_GNOME= cairo +USE_XORG= ice sm x11 xpm xscrnsaver xt GNU_CONFIGURE= yes -GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share + 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 +OPTIONS_DEFINE= EXAMPLES +OPTIONS_SUB= yes + 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: - cd ${STAGEDIR}${PREFIX}/share/xcircuit && ${STRIP_CMD} xcircuit.so xcircexec xcircdnull - @${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} + cd ${STAGEDIR}${DATADIR} && ${STRIP_CMD} xcircdnull xcircexec xcircuit.so + +post-install-EXAMPLES-on: + ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + cd ${WRKSRC}/examples && ${INSTALL_DATA} \ + *.lgf *.lps *.ps *.sim .xcircuitrc ${STAGEDIR}${EXAMPLESDIR} .include diff --git a/cad/xcircuit/distinfo b/cad/xcircuit/distinfo index 8e0457d5dc9a..a1f8b0472278 100644 --- a/cad/xcircuit/distinfo +++ b/cad/xcircuit/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1615921447 -SHA256 (xcircuit-3.10.30.tgz) = b2f63cba605e79cc2a08714bf3888f7be7174384ed724db3c70f8bf25c36f554 -SIZE (xcircuit-3.10.30.tgz) = 1619256 +TIMESTAMP = 1779048237 +SHA256 (RTimothyEdwards-XCircuit-3.10.44_GH0.tar.gz) = 231eea39eb6062adb73ca69c3feaf3dacc7cfd0e3cb66d13b6e82f596b1b3cbf +SIZE (RTimothyEdwards-XCircuit-3.10.44_GH0.tar.gz) = 1578189 diff --git a/cad/xcircuit/files/patch-xcircuit.h b/cad/xcircuit/files/patch-xcircuit.h new file mode 100644 index 000000000000..82f90b94e5d0 --- /dev/null +++ b/cad/xcircuit/files/patch-xcircuit.h @@ -0,0 +1,11 @@ +--- xcircuit.h.orig 2026-04-28 14:26:52 UTC ++++ xcircuit.h +@@ -26,7 +26,7 @@ typedef unsigned long long u_long_long; + + /* In addition, caddr_t is deprecated but will just be recast here to */ + /* the recommended void *. */ +-typedef void * caddr_t; ++// typedef void * caddr_t; + #endif + #endif + diff --git a/cad/xcircuit/pkg-descr b/cad/xcircuit/pkg-descr index 87dbb3ca6989..3edd9120bea3 100644 --- a/cad/xcircuit/pkg-descr +++ b/cad/xcircuit/pkg-descr @@ -1 +1,14 @@ -xcircuit is software for drawing electrical circuits. +XCircuit is a UNIX/X11 program for drawing publishable-quality electrical +circuit schematic diagrams and related figures, and produce circuit netlists +through schematic capture. XCircuit regards circuits as inherently hierarchical, +and writes both hierarchical PostScript output and hierarchical SPICE +netlists. Circuit components are saved in and retrieved from libraries which are +fully editable. XCircuit does not separate artistic expression from circuit +drawing; it maintains flexibility in style without compromising the power of +schematic capture. + +XCircuit is flexible enough to be used as a generic program for drawing just +about anything, and is competitive with powerful programs such as "xfig". It is +especially good for any task requiring repeated use of a standard set of +graphical objects, including architectural drawing, printed circuit board +layouts, and even music typography. diff --git a/cad/xcircuit/pkg-plist b/cad/xcircuit/pkg-plist index da9aeb328fc5..68cd82478ddd 100644 --- a/cad/xcircuit/pkg-plist +++ b/cad/xcircuit/pkg-plist @@ -1,148 +1,148 @@ bin/xcircuit lib/X11/app-defaults/XCircuit +%%EXAMPLES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/.xcircuitrc +%%EXAMPLES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/FlareLED.ps +%%EXAMPLES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/USAflag.ps +%%EXAMPLES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/analog1.ps +%%EXAMPLES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/analog2.ps +%%EXAMPLES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/analoglib1.lps +%%EXAMPLES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/border.ps +%%EXAMPLES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/buses.ps +%%EXAMPLES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/diffamp_test.ps +%%EXAMPLES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/diffamp_test2.ps +%%EXAMPLES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/diffamp_test3.ps +%%EXAMPLES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/envelope.ps +%%EXAMPLES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fourttest.ps +%%EXAMPLES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/logic.sim +%%EXAMPLES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/logic8.ps +%%EXAMPLES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/prelude.ps +%%EXAMPLES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/systemd1.lgf +%%EXAMPLES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/threestage.ps +%%EXAMPLES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vcoblock.ps +%%EXAMPLES%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xcclock.ps share/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.lps %%DATADIR%%/sue_xc.tcl %%DATADIR%%/symbol.tcl %%DATADIR%%/synopsys.tcl %%DATADIR%%/text.tcl %%DATADIR%%/tkcon.tcl %%DATADIR%%/wrapper.tcl %%DATADIR%%/xchelp.tcl %%DATADIR%%/xcircdnull %%DATADIR%%/xcircexec %%DATADIR%%/xcircps2.pro %%DATADIR%%/xcircuit.so %%DATADIR%%/xcircuit.tcl %%DATADIR%%/xcstartup.tcl %%DATADIR%%/xspice.lps