From nobody Sat Jul 30 07:34:43 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Lvx3m2K74z4XgkS; Sat, 30 Jul 2022 07:34:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Lvx3m1V7Wz3dCS; Sat, 30 Jul 2022 07:34:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659166484; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J4Kv57Gbw6LI3eu3lqI/dzPLkTPsR9PCW8KU3d1/4yA=; b=hGXhDHpFRyolzva0eFvehIkMyfxvhMsx5e7UaWv6nUDIPAP00fpbp2cBH2GvOU3i8G7BSA vnhUuiGSQQIZ2o4LsPYZheGeRQHhpAaClAmCk6tdLVAB2JFNDgrF2UdjXqzdOJKObhazuY S7hrgePoCYlv+jaqkbvVGdNhhqz62BRbOOsuaeE+I3mrwyiBk/41vDNKcSymPBfx58tCgc NXqPLEGrF8x+8d4wL6YYPZ+nR3Qc20ws5PKLBRCRUDqloj56DblpfbdCwfVXXUxeCcf3bv z1IkkQxnF9zJAxQ/vOq86udWhOOAkDBFuLETJdKuWzAukdsv/GFNWU0MXBcAEg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Lvx3m0QTSz165G; Sat, 30 Jul 2022 07:34:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 26U7YhkZ073945; Sat, 30 Jul 2022 07:34:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26U7YhQm073944; Sat, 30 Jul 2022 07:34:43 GMT (envelope-from git) Date: Sat, 30 Jul 2022 07:34:43 GMT Message-Id: <202207300734.26U7YhQm073944@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 9639e9c599c2 - main - cad/magic: Update 8.3.245 -> 8.3.315 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9639e9c599c2b95cad747edc6c69f91a33b3638c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659166484; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J4Kv57Gbw6LI3eu3lqI/dzPLkTPsR9PCW8KU3d1/4yA=; b=MReZiw0tRZQ4UZtYb7aatX5c6jpP5V6z2EWyV2ZURXMtb2pwUPchKMTOpwvcP4ZYmIkWhq YjiuMJbABw5eXVv3ek4+ET3+y9TT7+p2oF7ZMU4N081C/tFftrkQ3oBGmUcbPmzWW0mguT JprEQUeZ+y8rGHweFhqfz0jaWlIbwnbqfBCN4NeOzGrDTzTrqDDY4s05Cvt1AwUqUb7TDI 26gLkgFy4rc9VgMJ75xP3+0hJvWjxqHLQ46MHgpMi/ErP6LSKWqEcBkpwsQdAR+xkTfKbf mqc8eZBVUfeL6+0OxqBr2bA5Di2P7Uc6lEsXBs5InIaVCzpgU2TmUwJN4Vfv6w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659166484; a=rsa-sha256; cv=none; b=XOMS/KV+nArTqJrH0c7ngfB5z57oKkPm3uFiKI91k3A7bru0vD/f+s7aMHPySQneI63CkM JUHI6Lhg7sls/yUBrBeIYcwgwOwwO40VAm4/tLtIX0OuIJ8d18o1EcuCoobc9t9ljFcB/g MNB9AxsY8dBpgCU4nSXazGS3go10Oy9mKq0E0cGgPMwXZzg1Qq4I1jGNO3mcGjZfZLaMVp yl8HgHFjKUXxz+R+TxULT9MDp/nBwOF9wBGVv/0RCrA4nDM1z9AgxTWbWpfKAdDIV51kLh w87tdaO4+BOgTbCPOFjObeZxgZUbUebWBODiWbaH6BlXcRsVWiURSh0b7oDjGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=9639e9c599c2b95cad747edc6c69f91a33b3638c commit 9639e9c599c2b95cad747edc6c69f91a33b3638c Author: Yuri Victorovich AuthorDate: 2022-07-30 06:38:02 +0000 Commit: Yuri Victorovich CommitDate: 2022-07-30 07:34:33 +0000 cad/magic: Update 8.3.245 -> 8.3.315 --- cad/magic/Makefile | 4 +- cad/magic/distinfo | 6 +-- cad/magic/files/patch-Makefile | 84 ------------------------------------------ cad/magic/pkg-plist | 9 +++++ 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