Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 26 Apr 2024 09:10:49 GMT
From:      Yuri Victorovich <yuri@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: bce7369199cc - main - cad/magic: update 8.3.459 =?utf-8?Q?=E2=86=92?= 8.3.474
Message-ID:  <202404260910.43Q9AnGb014869@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=bce7369199cc0175df1e31e0035e7192d3a2e64d

commit bce7369199cc0175df1e31e0035e7192d3a2e64d
Author:     Andrey Korobkov <alster@vinterdalen.se>
AuthorDate: 2024-04-26 09:04:48 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2024-04-26 09:10:44 +0000

    cad/magic: update 8.3.459 → 8.3.474
    
    PR:     278561
---
 cad/magic/Makefile          |  6 ++----
 cad/magic/distinfo          |  6 +++---
 cad/magic/files/license.txt | 10 ----------
 cad/magic/pkg-descr         |  4 ++--
 4 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/cad/magic/Makefile b/cad/magic/Makefile
index 68d5c883cb3f..b38ab911fe01 100644
--- a/cad/magic/Makefile
+++ b/cad/magic/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	magic
-DISTVERSION=	8.3.459
+DISTVERSION=	8.3.474
 CATEGORIES=	cad
 MASTER_SITES=	http://opencircuitdesign.com/magic/archive/
 
@@ -8,7 +8,7 @@ COMMENT=	Interactive editor for VLSI layouts
 WWW=		http://opencircuitdesign.com/magic/
 
 LICENSE=	MIT
-LICENSE_FILE=	${FILESDIR}/license.txt
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libBLT25.so:x11-toolkits/blt \
 		libfontconfig.so:x11-fonts/fontconfig \
@@ -28,8 +28,6 @@ CONFIGURE_WRKSRC=	${WRKSRC}/scripts
 
 ALL_TARGET=	tcllibrary
 
-CFLAGS+=	-Wno-return-type # workaround for https://github.com/RTimothyEdwards/magic/issues/67
-
 DESKTOP_ENTRIES="Magic" "" "" "${PORTNAME}" "" ""
 
 PORTSCOUT=	limit:^8\.
diff --git a/cad/magic/distinfo b/cad/magic/distinfo
index d50a52ecdd2b..05b31ff1b378 100644
--- a/cad/magic/distinfo
+++ b/cad/magic/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1706064662
-SHA256 (magic-8.3.459.tgz) = 12b34564766227e0b0f1039044463da6ce7ff16a196045308fc688bb8d9d4fd4
-SIZE (magic-8.3.459.tgz) = 4237442
+TIMESTAMP = 1713926449
+SHA256 (magic-8.3.474.tgz) = 36354f6737827226136159a32e552f506ca8c6ac170e7c923131986f096eccf8
+SIZE (magic-8.3.474.tgz) = 4239643
diff --git a/cad/magic/files/license.txt b/cad/magic/files/license.txt
deleted file mode 100644
index 015556c5f97b..000000000000
--- a/cad/magic/files/license.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Copyright (C) 1985, 1990 Regents of the University of California.
-
-Permission to use, copy, modify, and distribute this
-software and its documentation for any purpose and without
-fee is hereby granted, provided that the above copyright
-notice appear in all copies.  The University of California
-makes no representations about the suitability of this
-software for any purpose.  It is provided "as is" without
-express or implied warranty.  Export of this software outside
-of the United States of America may require an export license.
diff --git a/cad/magic/pkg-descr b/cad/magic/pkg-descr
index c3b5ffa84fc8..484a58a4db63 100644
--- a/cad/magic/pkg-descr
+++ b/cad/magic/pkg-descr
@@ -2,5 +2,5 @@ Magic is an interactive editor for VLSI layouts that runs under BSD.
 
 To run magic, users should set CAD_HOME to the base installation directory
 where magic was installed, e.g. /usr/local.  Alternatively, the system
-administrator can create a dummy user named 'cad' with its home
-directory set to the installation directory.
+administrator can create a dummy user named 'cad' with its home directory
+set to the installation directory.



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202404260910.43Q9AnGb014869>