diff --git a/cad/magic/Makefile b/cad/magic/Makefile index 68d5c883cb3f..b38ab911fe01 100644 --- a/cad/magic/Makefile +++ b/cad/magic/Makefile @@ -1,67 +1,65 @@ PORTNAME= magic -DISTVERSION= 8.3.459 +DISTVERSION= 8.3.474 CATEGORIES= cad MASTER_SITES= http://opencircuitdesign.com/magic/archive/ MAINTAINER= yuri@FreeBSD.org 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 \ libfreetype.so:print/freetype2 RUN_DEPENDS= bash:shells/bash USES= gmake gnome gl localbase:ldflags python: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 \ --enable-modular # --enable-modular should fix build on 15, when failures were due to missing symbols defined in *.sym but not in code 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\. BINARY_ALIAS= python3=${PYTHON_CMD} # this is needed, see https://github.com/RTimothyEdwards/magic/issues/173#issuecomment-1200065429 .include .if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) CFLAGS+= -Wno-error=int-conversion .endif 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 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 @@ -1,6 +1,6 @@ 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.