4 files changed, 15 insertions, 88 deletions

diff --git a/cad/magic/Makefile b/cad/magic/Makefile
index d2e416594a5b..b349c11a187c 100644
--- a/cad/magic/Makefile
+++ b/cad/magic/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	magic
-DISTVERSION=	8.3.245
+DISTVERSION=	8.3.315
 CATEGORIES=	cad
 MASTER_SITES=	http://opencircuitdesign.com/magic/archive/
 
@@ -34,6 +34,8 @@ 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
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
@@ -7,6 +7,7 @@ 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
@@ -38,9 +39,11 @@ 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
@@ -89,6 +92,7 @@ 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
@@ -116,6 +120,7 @@ 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
@@ -132,6 +137,8 @@ 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
@@ -145,6 +152,7 @@ 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
@@ -204,6 +212,7 @@ 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