diff --git a/cad/magic/Makefile b/cad/magic/Makefile index d2e416594a5b..b349c11a187c 100644 --- a/cad/magic/Makefile +++ b/cad/magic/Makefile @@ -1,59 +1,61 @@ PORTNAME= magic -DISTVERSION= 8.3.245 +DISTVERSION= 8.3.315 CATEGORIES= cad MASTER_SITES= http://opencircuitdesign.com/magic/archive/ MAINTAINER= yuri@FreeBSD.org COMMENT= Interactive editor for VLSI layouts LICENSE= MIT LICENSE_FILE= ${FILESDIR}/license.txt LIB_DEPENDS= libBLT25.so:x11-toolkits/blt \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 RUN_DEPENDS= bash:shells/bash USES= gmake gnome gl localbase python:3.6+,build shebangfix tk:tea tar:tgz xorg USE_GNOME= cairo USE_XORG= ice x11 xext xi xmu USE_GL= gl glu SHEBANG_FILES= scripts/preproc.py tcltk/magic.sh.in tcltk/ext2sim.sh.in tcltk/ext2spice.sh.in CONFIGURE_ARGS= --with-opengl CONFIGURE_WRKSRC= ${WRKSRC}/scripts ALL_TARGET= tcllibrary CFLAGS+= -Wno-return-type # workaround for https://github.com/RTimothyEdwards/magic/issues/67 CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib DESKTOP_ENTRIES="Magic" "" "" "${PORTNAME}" "" "" PORTSCOUT= limit:^8\. +BINARY_ALIAS= python3=${PYTHON_CMD} # this is needed, see https://github.com/RTimothyEdwards/magic/issues/173#issuecomment-1200065429 + post-patch: @${REINPLACE_CMD} -e \ 's|^#!.*|#!${AWK} -f|' ${WRKSRC}/ext2spice/spice2sim @${REINPLACE_CMD} -e \ '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$${TK_VERSION}|${WISH:T}|g ; \ s|tclsh$${TK_VERSION}|${TCLSH:T}|g ; \ s|-l/usr/X11R6/include|-I${LOCALBASE}/include|g' \ ${CONFIGURE_WRKSRC}/configure @${REINPLACE_CMD} -e \ 's|^#!.*|#!${TCLSH}|' ${WRKSRC}/tcltk/strip_reflibs.tcl @${REINPLACE_CMD} -e \ 's|^#!.*|#!${WISH}|' ${WRKSRC}/tcltk/tkshell.tcl pre-build: @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \ ${MAKEFILE} ${MAKE_ARGS} database/database.h post-install: @cd ${STAGEDIR}${PREFIX}/lib/magic/tcl && ${STRIP_CMD} magicexec magicdnull tclmagic.so .include diff --git a/cad/magic/distinfo b/cad/magic/distinfo index a035109443d4..c02c531e6426 100644 --- a/cad/magic/distinfo +++ b/cad/magic/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1640715032 -SHA256 (magic-8.3.245.tgz) = 8d0718dd6107648ad2fb65352ee44d3ccd1e8cd5259d571797888980c8fc7345 -SIZE (magic-8.3.245.tgz) = 4095189 +TIMESTAMP = 1659123533 +SHA256 (magic-8.3.315.tgz) = c9b5b86287bb286b5db391c31b7a55bf4212458b073942383ff947162d758e1e +SIZE (magic-8.3.315.tgz) = 4175094 diff --git a/cad/magic/files/patch-Makefile b/cad/magic/files/patch-Makefile deleted file mode 100644 index 8e8abef319dd..000000000000 --- a/cad/magic/files/patch-Makefile +++ /dev/null @@ -1,84 +0,0 @@ ---- Makefile.orig 2020-10-16 07:00:06 UTC -+++ Makefile -@@ -18,12 +18,10 @@ INSTALL_CAD_DIRS = windows doc ${TECH} - all: $(ALL_TARGET) - - standard: -- @echo --- errors and warnings logged in file make.log -- @${MAKE} mains 2>&1 | tee -a make.log | egrep -i "(.c:|Stop.|---)" -+ ${MAKE} mains - - tcl: -- @echo --- errors and warnings logged in file make.log -- @${MAKE} tcllibrary 2>&1 | tee -a make.log | egrep -i "(.c:|Stop.|---)" -+ ${MAKE} tcllibrary - - force: clean all - -@@ -36,12 +34,12 @@ config: - tcllibrary: database/database.h modules - @echo --- making Tcl shared libraries - for dir in ${PROGRAMS}; do \ -- (cd $$dir && ${MAKE} tcl-main); done -+ ${MAKE} -C $$dir tcl-main || exit 1 ; done - - mains: database/database.h modules libs - @echo --- making main programs - for dir in ${PROGRAMS}; do \ -- (cd $$dir && ${MAKE} main); done -+ ${MAKE} -C $$dir main || exit 1 ; done - - database/database.h: database/database.h.in - @echo --- making header file database/database.h -@@ -50,31 +48,31 @@ database/database.h: database/database.h.in - modules: database/database.h depend - @echo --- making modules - for dir in ${MODULES} ${PROGRAMS}; do \ -- (cd $$dir && ${MAKE} module); done -+ ${MAKE} -C $$dir module || exit 1 ; done - - libs: - @echo --- making libraries - for dir in ${LIBRARIES}; do \ -- (cd $$dir && ${MAKE} lib); done -+ ${MAKE} -C $$dir lib || exit 1 ; done - - depend: database/database.h - @echo --- making dependencies - ${RM} */Depend - for dir in ${MODULES} ${UNUSED_MODULES} ${PROGRAMS}; do \ -- (cd $$dir && ${MAKE} depend); done -+ ${MAKE} -C $$dir depend || exit 1 ; done - - install: $(INSTALL_TARGET) - - install-magic: - @echo --- installing executable to $(DESTDIR)${INSTALL_BINDIR} - @echo --- installing runtime files to $(DESTDIR)${INSTALL_LIBDIR} -- @${MAKE} install-real 2>&1 >> install.log -+ @${MAKE} install-real 2>&1 - - install-real: install-dirs - for dir in ${INSTALL_CAD_DIRS}; do \ -- (cd $$dir && ${MAKE} install); done -+ ${MAKE} -C $$dir install || exit 1 ; done - for dir in ${PROGRAMS}; do \ -- (cd $$dir && ${MAKE} install); done -+ ${MAKE} -C $$dir install || exit 1 ; done - - install-tcl-dirs: - ${MAGICDIR}/scripts/mkdirs $(DESTDIR)${INSTALL_BINDIR} \ -@@ -89,11 +87,11 @@ install-dirs: - install-tcl: - @echo --- installing executable to $(DESTDIR)${INSTALL_BINDIR} - @echo --- installing runtime files to $(DESTDIR)${INSTALL_LIBDIR} -- @${MAKE} install-tcl-real 2>&1 >> install.log -+ @${MAKE} install-tcl-real 2>&1 - - install-tcl-real: install-tcl-dirs - for dir in ${INSTALL_CAD_DIRS} ${PROGRAMS}; do \ -- (cd $$dir && ${MAKE} install-tcl); done -+ ${MAKE} -C $$dir install-tcl || exit 1 ; done - - clean: - for dir in ${MODULES} ${PROGRAMS} ${TECH} ${UNUSED_MODULES}; do \ diff --git a/cad/magic/pkg-plist b/cad/magic/pkg-plist index c17d0d189b3f..1e6b97ee8cb4 100644 --- a/cad/magic/pkg-plist +++ b/cad/magic/pkg-plist @@ -1,369 +1,378 @@ bin/ext2sim bin/ext2spice bin/magic @comment bin/spice2sim lib/magic/doc/addendum6_5.ps lib/magic/doc/copyright.ps lib/magic/doc/html/Makefile lib/magic/doc/html/addcommandentry.html lib/magic/doc/html/addpath.html +lib/magic/doc/html/antennacheck.html lib/magic/doc/html/array.html lib/magic/doc/html/box.html lib/magic/doc/html/calma.html lib/magic/doc/html/caption.html lib/magic/doc/html/cellmanager.html lib/magic/doc/html/cellname.html lib/magic/doc/html/cellsearch.html lib/magic/doc/html/center.html lib/magic/doc/html/changetool.html lib/magic/doc/html/channels.html lib/magic/doc/html/cif.html lib/magic/doc/html/clockwise.html lib/magic/doc/html/closewindow.html lib/magic/doc/html/closewrapper.html lib/magic/doc/html/color/color.html lib/magic/doc/html/color/load.html lib/magic/doc/html/color/pushbutton.html lib/magic/doc/html/color/save.html lib/magic/doc/html/commands.html lib/magic/doc/html/commands.list lib/magic/doc/html/contact.html lib/magic/doc/html/copy.html lib/magic/doc/html/corner.html lib/magic/doc/html/crash.html lib/magic/doc/html/crashbackups.html lib/magic/doc/html/crosshair.html lib/magic/doc/html/cursor.html lib/magic/doc/html/def.html lib/magic/doc/html/delete.html lib/magic/doc/html/deletecommandentry.html lib/magic/doc/html/direction.html +lib/magic/doc/html/display.html lib/magic/doc/html/distance.html lib/magic/doc/html/down.html lib/magic/doc/html/drc.html +lib/magic/doc/html/drop.html lib/magic/doc/html/dump.html lib/magic/doc/html/edit.html lib/magic/doc/html/element.html lib/magic/doc/html/erase.html lib/magic/doc/html/expand.html lib/magic/doc/html/ext.html lib/magic/doc/html/ext2sim.html lib/magic/doc/html/ext2spice.html lib/magic/doc/html/extract.html lib/magic/doc/html/extresist.html lib/magic/doc/html/exttosim.html lib/magic/doc/html/exttospice.html lib/magic/doc/html/feedback.html lib/magic/doc/html/fill.html lib/magic/doc/html/findbox.html lib/magic/doc/html/findlabel.html lib/magic/doc/html/flatten.html lib/magic/doc/html/flush.html lib/magic/doc/html/garoute.html lib/magic/doc/html/gds.html lib/magic/doc/html/get.html lib/magic/doc/html/getcell.html lib/magic/doc/html/getnode.html lib/magic/doc/html/goto.html lib/magic/doc/html/graphics/blpaper.gif lib/magic/doc/html/graphics/cellmgr.gif lib/magic/doc/html/graphics/cif_see.gif lib/magic/doc/html/graphics/corner1.gif lib/magic/doc/html/graphics/corner2.gif lib/magic/doc/html/graphics/email_address.png lib/magic/doc/html/graphics/line1.gif lib/magic/doc/html/graphics/magic_OGL_sm.gif lib/magic/doc/html/graphics/magic_title2.gif lib/magic/doc/html/graphics/techmgr.gif lib/magic/doc/html/graphics/toolbar.gif lib/magic/doc/html/graphics/writeall.gif lib/magic/doc/html/grid.html lib/magic/doc/html/help.html lib/magic/doc/html/identify.html lib/magic/doc/html/imacro.html lib/magic/doc/html/initialize.html lib/magic/doc/html/instance.html lib/magic/doc/html/invoke.html lib/magic/doc/html/iroute.html lib/magic/doc/html/irsim.html lib/magic/doc/html/label.html lib/magic/doc/html/lef.html lib/magic/doc/html/load.html +lib/magic/doc/html/locking.html lib/magic/doc/html/logcommands.html lib/magic/doc/html/macro.html lib/magic/doc/html/maketoolbar.html lib/magic/doc/html/measure.html lib/magic/doc/html/move.html lib/magic/doc/html/netlist.html lib/magic/doc/html/netlist/add.html lib/magic/doc/html/netlist/cleanup.html lib/magic/doc/html/netlist/cull.html lib/magic/doc/html/netlist/dnet.html lib/magic/doc/html/netlist/dterm.html lib/magic/doc/html/netlist/extract.html lib/magic/doc/html/netlist/find.html lib/magic/doc/html/netlist/flush.html lib/magic/doc/html/netlist/joinnets.html lib/magic/doc/html/netlist/netlist.html lib/magic/doc/html/netlist/print.html lib/magic/doc/html/netlist/pushbutton.html lib/magic/doc/html/netlist/ripup.html lib/magic/doc/html/netlist/savenetlist.html lib/magic/doc/html/netlist/shownet.html lib/magic/doc/html/netlist/showterms.html lib/magic/doc/html/netlist/trace.html lib/magic/doc/html/netlist/verify.html lib/magic/doc/html/netlist/writeall.html lib/magic/doc/html/openwindow.html lib/magic/doc/html/openwrapper.html +lib/magic/doc/html/orient.html lib/magic/doc/html/paint.html lib/magic/doc/html/path.html lib/magic/doc/html/peekbox.html lib/magic/doc/html/plot.html lib/magic/doc/html/plow.html lib/magic/doc/html/polygon.html lib/magic/doc/html/popbox.html lib/magic/doc/html/popstack.html lib/magic/doc/html/port.html lib/magic/doc/html/promptload.html lib/magic/doc/html/promptsave.html lib/magic/doc/html/property.html lib/magic/doc/html/pushbox.html lib/magic/doc/html/pushbutton.html lib/magic/doc/html/pushstack.html lib/magic/doc/html/quit.html +lib/magic/doc/html/random.html +lib/magic/doc/html/readspice.html lib/magic/doc/html/redo.html lib/magic/doc/html/redraw.html lib/magic/doc/html/render3d.html lib/magic/doc/html/resumeall.html lib/magic/doc/html/rotate.html lib/magic/doc/html/route.html lib/magic/doc/html/ruler.html lib/magic/doc/html/save.html lib/magic/doc/html/scalegrid.html lib/magic/doc/html/scroll.html lib/magic/doc/html/search.html lib/magic/doc/html/see.html lib/magic/doc/html/select.html +lib/magic/doc/html/setlabel.html lib/magic/doc/html/setpoint.html lib/magic/doc/html/shell.html lib/magic/doc/html/sideways.html lib/magic/doc/html/sleep.html lib/magic/doc/html/snap.html lib/magic/doc/html/specialopen.html lib/magic/doc/html/spliterase.html lib/magic/doc/html/splitpaint.html lib/magic/doc/html/startup.html lib/magic/doc/html/straighten.html lib/magic/doc/html/stretch.html lib/magic/doc/html/suspendall.html lib/magic/doc/html/tag.html lib/magic/doc/html/tech.html lib/magic/doc/html/techmanager.html lib/magic/doc/html/template.html lib/magic/doc/html/tk_path_name.html lib/magic/doc/html/tool.html lib/magic/doc/html/undo.html lib/magic/doc/html/unexpand.html lib/magic/doc/html/unmeasure.html lib/magic/doc/html/updatedisplay.html lib/magic/doc/html/upsidedown.html lib/magic/doc/html/version.html lib/magic/doc/html/view.html lib/magic/doc/html/what.html lib/magic/doc/html/wind3d/cif.html lib/magic/doc/html/wind3d/closewindow.html lib/magic/doc/html/wind3d/cutbox.html lib/magic/doc/html/wind3d/defaults.html lib/magic/doc/html/wind3d/help.html lib/magic/doc/html/wind3d/level.html lib/magic/doc/html/wind3d/refresh.html lib/magic/doc/html/wind3d/render.html lib/magic/doc/html/wind3d/scroll.html lib/magic/doc/html/wind3d/see.html lib/magic/doc/html/wind3d/view.html lib/magic/doc/html/wind3d/zoom.html lib/magic/doc/html/windowborder.html lib/magic/doc/html/windowcaption.html lib/magic/doc/html/windownames.html lib/magic/doc/html/windowscrollbars.html lib/magic/doc/html/wire.html lib/magic/doc/html/wizard/coord.html lib/magic/doc/html/wizard/crash.html lib/magic/doc/html/wizard/extract.html lib/magic/doc/html/wizard/files.html lib/magic/doc/html/wizard/grstats.html lib/magic/doc/html/wizard/pause.html lib/magic/doc/html/wizard/plow.html lib/magic/doc/html/wizard/psearch.html lib/magic/doc/html/wizard/showtech.html lib/magic/doc/html/wizard/tilestats.html lib/magic/doc/html/wizard/tsearch.html lib/magic/doc/html/wizard/watch.html lib/magic/doc/html/wizard/winddebug.html lib/magic/doc/html/wizard/winddump.html lib/magic/doc/html/writeall.html lib/magic/doc/html/xload.html +lib/magic/doc/html/xor.html lib/magic/doc/html/xview.html lib/magic/doc/html/zoom.html lib/magic/doc/introduction.ps lib/magic/doc/maint1.ps lib/magic/doc/maint2.ps lib/magic/doc/maint3.ps lib/magic/doc/maint4.ps lib/magic/doc/tut1.ps lib/magic/doc/tut10.ps lib/magic/doc/tut11.ps lib/magic/doc/tut2.ps lib/magic/doc/tut3.ps lib/magic/doc/tut4.ps lib/magic/doc/tut5.ps lib/magic/doc/tut6.ps lib/magic/doc/tut7.ps lib/magic/doc/tut8.ps lib/magic/doc/tut9.ps lib/magic/doc/tutscm1.ps lib/magic/doc/tutscm2.ps lib/magic/doc/tutscm3.ps lib/magic/doc/tutscm4.ps lib/magic/doc/tuttcl1.ps lib/magic/doc/tuttcl2.ps lib/magic/doc/tuttcl3.ps lib/magic/doc/tuttcl4.ps lib/magic/doc/tuttcl5.ps lib/magic/doc/tutwrl1.ps lib/magic/sys/.initrc lib/magic/sys/.magicrc lib/magic/sys/FreeMono.pt3 lib/magic/sys/FreeSans.pt3 lib/magic/sys/FreeSerif.pt3 lib/magic/sys/bw.glyphs lib/magic/sys/color.glyphs lib/magic/sys/gdsquery.tech lib/magic/sys/magicps.pro lib/magic/sys/minimum.tech lib/magic/sys/mos.24bit.dstyle lib/magic/sys/mos.24bit.std.cmap lib/magic/sys/mos.7bit.dstyle lib/magic/sys/mos.7bit.mraster.cmap lib/magic/sys/mos.7bit.mraster_dstyle lib/magic/sys/mos.7bit.std.cmap lib/magic/sys/mos.OpenGL.dstyle lib/magic/sys/mos.OpenGL.std.cmap lib/magic/sys/nmos.tech lib/magic/sys/scmos-sub.tech lib/magic/sys/scmos-tm.tech lib/magic/sys/scmos.tech lib/magic/sys/scmosWR.tech lib/magic/sys/vfont.B.12 lib/magic/sys/vfont.I.12 lib/magic/sys/vfont.R.8 lib/magic/sys/windows11.glyphs lib/magic/sys/windows14.glyphs lib/magic/sys/windows22.glyphs lib/magic/sys/windows7.glyphs lib/magic/tcl/bitmaps/down.gif lib/magic/tcl/bitmaps/left.gif lib/magic/tcl/bitmaps/lock.xbm lib/magic/tcl/bitmaps/right.gif lib/magic/tcl/bitmaps/up.gif lib/magic/tcl/bitmaps/zoom.gif lib/magic/tcl/bsitools.tcl lib/magic/tcl/cellmgr.tcl lib/magic/tcl/console.tcl lib/magic/tcl/drcmgr.tcl @comment lib/magic/tcl/exttosim.so @comment lib/magic/tcl/exttospice.so lib/magic/tcl/libmgr.tcl lib/magic/tcl/magic.tcl lib/magic/tcl/magicdnull lib/magic/tcl/magicexec lib/magic/tcl/mazeroute.tcl lib/magic/tcl/readspice.tcl lib/magic/tcl/socketcmd.tcl lib/magic/tcl/strip_reflibs.tcl lib/magic/tcl/tclmagic.so lib/magic/tcl/techbuilder.tcl lib/magic/tcl/texthelper.tcl lib/magic/tcl/tkcon.tcl lib/magic/tcl/tkshell.tcl lib/magic/tcl/toolkit.tcl lib/magic/tcl/toolkit_rev0.tcl lib/magic/tcl/tools.tcl lib/magic/tcl/wrapper.tcl lib/magic/tutorial/m3a.mag lib/magic/tutorial/maint2a.mag lib/magic/tutorial/tut1.mag lib/magic/tutorial/tut11a.al lib/magic/tutorial/tut11a.cmd lib/magic/tutorial/tut11a.ext lib/magic/tutorial/tut11a.mag lib/magic/tutorial/tut11a.nodes lib/magic/tutorial/tut11a.sim lib/magic/tutorial/tut11b.ext lib/magic/tutorial/tut11b.mag lib/magic/tutorial/tut11c.ext lib/magic/tutorial/tut11c.mag lib/magic/tutorial/tut11d.ext lib/magic/tutorial/tut11d.mag lib/magic/tutorial/tut2a.mag lib/magic/tutorial/tut2b.mag lib/magic/tutorial/tut2c.mag lib/magic/tutorial/tut2d.mag lib/magic/tutorial/tut3a.mag lib/magic/tutorial/tut3b.mag lib/magic/tutorial/tut3c.mag lib/magic/tutorial/tut3d.mag lib/magic/tutorial/tut3e.mag lib/magic/tutorial/tut3f.mag lib/magic/tutorial/tut3g.mag lib/magic/tutorial/tut3h.mag lib/magic/tutorial/tut4a.mag lib/magic/tutorial/tut4x.mag lib/magic/tutorial/tut4y.mag lib/magic/tutorial/tut4z.mag lib/magic/tutorial/tut5a.mag lib/magic/tutorial/tut5b.mag lib/magic/tutorial/tut6a.mag lib/magic/tutorial/tut6b.mag lib/magic/tutorial/tut6c.mag lib/magic/tutorial/tut6x.mag lib/magic/tutorial/tut6y.mag lib/magic/tutorial/tut7a.mag lib/magic/tutorial/tut7b.mag lib/magic/tutorial/tut7b.net lib/magic/tutorial/tut7c.mag lib/magic/tutorial/tut7d.mag lib/magic/tutorial/tut7d.net lib/magic/tutorial/tut8a.mag lib/magic/tutorial/tut8b.mag lib/magic/tutorial/tut8c.mag lib/magic/tutorial/tut8d.mag lib/magic/tutorial/tut8e.mag lib/magic/tutorial/tut8f.mag lib/magic/tutorial/tut8g.mag lib/magic/tutorial/tut8h.mag lib/magic/tutorial/tut8i.mag lib/magic/tutorial/tut8j.mag lib/magic/tutorial/tut8k.mag lib/magic/tutorial/tut8l.mag lib/magic/tutorial/tut8m.mag lib/magic/tutorial/tut8n.mag lib/magic/tutorial/tut8r.mag lib/magic/tutorial/tut9a.mag lib/magic/tutorial/tut9b.mag lib/magic/tutorial/tut9x.mag lib/magic/tutorial/tut9y.mag share/man/man1/ext2sim.1.gz share/man/man1/ext2spice.1.gz share/man/man1/extcheck.1.gz share/man/man1/magic.1.gz share/man/man5/cmap.5.gz share/man/man5/displays.5.gz share/man/man5/dlys.5.gz share/man/man5/dstyle.5.gz share/man/man5/ext.5.gz share/man/man5/glyphs.5.gz share/man/man5/mag.5.gz share/man/man5/net.5.gz share/man/man5/sim.5.gz