Greetings,
The attached diff updates cad/magic to the latest release.
What's new upstream
===================
This is a big jump. For a complete changelog, see [1].
What's new in the port
======================
Trivial update (DISTNAME, distinfo, results of 'make update-patches' and
new PLIST).
Slightly tested on amd64 only.
All the best
[1] http://opencircuitdesign.com/magic/history.html
--
Alessandro De Laurenzis
[mailto:jus...@atlantide.mooo.com]
Web: http://www.atlantide.mooo.com
LinkedIn: http://it.linkedin.com/in/delaurenzis
Index: Makefile
===================================================================
RCS file: /cvs/ports/cad/magic/Makefile,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 Makefile
--- Makefile 8 Mar 2020 12:47:35 -0000 1.5
+++ Makefile 6 Mar 2021 10:45:24 -0000
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.5 2020/03/08 12:47:35 sthen Exp $
COMMENT = interactive system for VLSI circuit layouts
-DISTNAME = magic-8.2.190
+DISTNAME = magic-8.3.137
EXTRACT_SUFX = .tgz
CATEGORIES = cad
Index: distinfo
===================================================================
RCS file: /cvs/ports/cad/magic/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- distinfo 8 Mar 2020 12:47:35 -0000 1.2
+++ distinfo 6 Mar 2021 10:45:24 -0000
@@ -1,2 +1,2 @@
-SHA256 (magic-8.2.190.tgz) = BWy27LRp60DPIR6976S2l18qdGeLNx0sL26ZJ2r6Axc=
-SIZE (magic-8.2.190.tgz) = 4031738
+SHA256 (magic-8.3.137.tgz) = lXHTB4JIPUUXohngkJ4IKsVIAOttOhuMDePx/JtVNKw=
+SIZE (magic-8.3.137.tgz) = 4064629
Index: patches/patch-magic_proto_magicrc_in
===================================================================
RCS file: /cvs/ports/cad/magic/patches/patch-magic_proto_magicrc_in,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-magic_proto_magicrc_in
--- patches/patch-magic_proto_magicrc_in 8 Mar 2020 12:47:36 -0000 1.1
+++ patches/patch-magic_proto_magicrc_in 6 Mar 2021 10:45:24 -0000
@@ -1,4 +1,4 @@
-$OpenBSD: patch-magic_proto_magicrc_in,v 1.1 2020/03/08 12:47:36 sthen Exp $
+$OpenBSD$
Index: magic/proto.magicrc.in
--- magic/proto.magicrc.in.orig
@@ -171,20 +171,7 @@ Index: magic/proto.magicrc.in
macro XK_KP_Delete "box size 0 0"
macro XK_KP_Insert "box size 4 4"
macro XK_KP_0 "box size 7 2"
-@@ -164,10 +164,10 @@ macro XK_KP_8 "stretch u 1"
- macro Shift_XK_KP_8 "stretch u 1"
- macro XK_8 "stretch u 1"
- macro XK_KP_Prior "move ne 1"
--# Scroll wheel bindings
-+/* # Scroll wheel bindings */
- macro XK_Pointer_Button4 "scroll u .05 w"
- macro XK_Pointer_Button5 "scroll d .05 w"
--# Quick macro function keys for scmos tech (X11 versions only)
-+/* # Quick macro function keys for scmos tech (X11 versions only) */
- macro XK_F1 "paint ndiff"
- macro XK_F2 "paint pdiff"
- macro XK_F3 "paint poly"
-@@ -182,9 +182,9 @@ macro XK_F11 "paint pc"
+@@ -184,9 +184,9 @@ macro XK_F11 "paint pc"
macro XK_F12 "paint via"
#endif /* (XLIB) */
#else /* USE_NEW_MACROS */
@@ -197,7 +184,7 @@ Index: magic/proto.magicrc.in
echo ""
macro s "select"
macro S "select more"
-@@ -230,12 +230,12 @@ imacro XK_semicolon ":"
+@@ -232,12 +232,12 @@ imacro XK_semicolon ":"
macro ^R "iroute route -dBox"
macro ^N "iroute route -dSelection"
#endif /* USE_NEW_MACROS */
@@ -212,7 +199,7 @@ Index: magic/proto.magicrc.in
macro Button1 "*bypass box move bl cursor"
macro Shift_Button1 "*bypass box corner bl cursor"
macro Button2 "*bypass paint cursor"
-@@ -246,7 +246,7 @@ macro Shift_Button3 "*bypass box move ur cursor"
+@@ -248,7 +248,7 @@ macro Shift_Button3 "*bypass box move ur cursor"
macro Control_Button1 "box move bl cursor"
macro Control_Button2 "paint cursor"
macro Control_Button3 "box corner ur cursor"
@@ -221,7 +208,7 @@ Index: magic/proto.magicrc.in
macro Button1 "box move bl cursor"
macro Shift_Button1 "box corner bl cursor"
macro Button2 "paint cursor"
-@@ -254,7 +254,7 @@ macro Shift_Button2 "erase cursor"
+@@ -256,7 +256,7 @@ macro Shift_Button2 "erase cursor"
macro Button3 "box corner ur cursor"
macro Shift_Button3 "box move ur cursor"
#endif /* (!MAGIC_WRAPPER) */
@@ -230,7 +217,7 @@ Index: magic/proto.magicrc.in
macro color Button1 "pushbutton left"
macro color Button2 "pushbutton middle"
macro color Button3 "pushbutton right"
-@@ -262,11 +262,11 @@ macro color u "undo"
+@@ -264,11 +264,11 @@ macro color u "undo"
macro color U "redo"
macro color plus "color next"
macro color minus "color last"
@@ -244,7 +231,7 @@ Index: magic/proto.magicrc.in
macro wind3d L "level up"
macro wind3d l "level down"
macro wind3d C "cif"
-@@ -294,15 +294,15 @@ macro wind3d XK_equal "view 0 0 -1 rel"
+@@ -296,15 +296,15 @@ macro wind3d XK_equal "view 0 0 -1 rel"
macro wind3d XK_greater "zoom 1 2.0 rel"
macro wind3d XK_less "zoom 1 0.5 rel"
#endif /* (XLIB) */
@@ -266,7 +253,7 @@ Index: magic/proto.magicrc.in
#ifdef MAGIC_WRAPPER
magic::suspendout
if {![catch {set Opts(tools)}]} { magic::enable_tools }
-@@ -311,11 +311,10 @@ set VDD "vdd!"
+@@ -313,11 +313,10 @@ set VDD "vdd!"
magic::resumeout
catch {source ${CAD_ROOT}/magic/sys/site.def}
#endif /* (!MAGIC_WRAPPER) */
Index: patches/patch-scripts_configure
===================================================================
RCS file: /cvs/ports/cad/magic/patches/patch-scripts_configure,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-scripts_configure
--- patches/patch-scripts_configure 8 Mar 2020 12:47:36 -0000 1.2
+++ patches/patch-scripts_configure 6 Mar 2021 10:45:24 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-scripts_configure,v 1.2
Index: scripts/configure
--- scripts/configure.orig
+++ scripts/configure
-@@ -836,7 +836,7 @@ pdfdir='${docdir}'
+@@ -834,7 +834,7 @@ pdfdir='${docdir}'
psdir='${docdir}'
libdir='${exec_prefix}/lib'
localedir='${datarootdir}/locale'
@@ -12,7 +12,7 @@ Index: scripts/configure
ac_prev=
ac_dashdash=
-@@ -8047,7 +8047,7 @@ fi
+@@ -8034,7 +8034,7 @@ fi
CFLAGS="${CFLAGS} -L/usr/X11R6/include"
;;
@@ -21,7 +21,7 @@ Index: scripts/configure
# Not available on all versions: check for include file.
ac_fn_c_check_header_mongrel "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default"
if test "x$ac_cv_header_dlfcn_h" = xyes; then :
-@@ -8063,6 +8063,12 @@ fi
+@@ -8050,6 +8050,12 @@ fi
fi
;;
@@ -34,7 +34,7 @@ Index: scripts/configure
*-nextstep*)
LDDL_FLAGS="-nostdlib -r"
;;
-@@ -9501,16 +9507,5 @@ else
+@@ -9485,16 +9491,5 @@ else
echo
fi
fi
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/cad/magic/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 PLIST
--- pkg/PLIST 8 Mar 2020 12:47:36 -0000 1.2
+++ pkg/PLIST 6 Mar 2021 10:45:24 -0000
@@ -22,6 +22,7 @@ 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
@@ -50,6 +51,7 @@ lib/magic/tcl/magic.tcl
@bin lib/magic/tcl/magicdnull
@bin 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
@so lib/magic/tcl/tclmagic.so
