Attachment 221852 Details for Bug 252954 – patch

[patch] patch

magic.patch (text/plain), 12.48 KB, created by Yuri Victorovich on 2021-01-23 20:07:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yuri Victorovich

Created: 2021-01-23 20:07:04 UTC

Size: 12.48 KB

patch

obsolete

>Index: cad/magic/Makefile
>===================================================================
>--- cad/magic/Makefile	(revision 562412)
>+++ cad/magic/Makefile	(working copy)
>@@ -2,11 +2,9 @@
> # $FreeBSD$
> 
> PORTNAME=	magic
>-PORTVERSION=	7.5.240
>-PORTREVISION=	2
>+DISTVERSION=	8.3.120
> CATEGORIES=	cad
>-MASTER_SITES=	http://opencircuitdesign.com/magic/archive/ \
>-		http://fossies.org/linux/misc/
>+MASTER_SITES=	http://opencircuitdesign.com/magic/archive/
> 
> MAINTAINER=	hrs@FreeBSD.org
> COMMENT=	Interactive editor for VLSI layouts
>@@ -14,13 +12,21 @@
> LICENSE=	MIT
> LICENSE_FILE=	${FILESDIR}/license.txt
> 
>-LIB_DEPENDS=	libBLT25.so:x11-toolkits/blt
>+LIB_DEPENDS=	libBLT25.so:x11-toolkits/blt \
>+		libfontconfig.so:x11-fonts/fontconfig \
>+		libfreetype.so:print/freetype2
>+RUN_DEPENDS=	bash:shells/bash
> 
>-USES=		gmake gl tk:tea tar:tgz xorg
>-USE_XORG=	ice xext xi xmu
>-USE_GL=		gl
>+USES=		gmake gnome gl localbase python:3.6+,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
> CONFIGURE_WRKSRC=	${WRKSRC}/scripts
>+
> ALL_TARGET=	tcllibrary
> 
> CPPFLAGS+=	-I${LOCALBASE}/include
>@@ -28,7 +34,7 @@
> 
> DESKTOP_ENTRIES="Magic" "" "" "${PORTNAME}" "" ""
> 
>-PORTSCOUT=	limit:^7\.
>+PORTSCOUT=	limit:^8\.
> 
> post-patch:
> 	@${REINPLACE_CMD} -e \
>@@ -41,14 +47,15 @@
> 		 s|-l/usr/X11R6/include|-I${LOCALBASE}/include|g' \
> 	    ${CONFIGURE_WRKSRC}/configure
> 	@${REINPLACE_CMD} -e \
>-		'/CFLAGS/s| -pg | |' ${WRKSRC}/tcltk/Makefile
>-	@${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)
>+	@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 <bsd.port.mk>
>Index: cad/magic/distinfo
>===================================================================
>--- cad/magic/distinfo	(revision 562412)
>+++ cad/magic/distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (magic-7.5.240.tgz) = c34134fb47aaa58c2f1b45454f1ab53069fc80d1e85a1def313c2e7695b901f7
>-SIZE (magic-7.5.240.tgz) = 3753069
>+TIMESTAMP = 1611430470
>+SHA256 (magic-8.3.120.tgz) = 5b5defbfb045fae0477c55d0c664a05ee613f9b0df8ab8ae5e9392eaf05a3332
>+SIZE (magic-8.3.120.tgz) = 4059169
>Index: cad/magic/files/patch-Makefile
>===================================================================
>--- cad/magic/files/patch-Makefile	(revision 562412)
>+++ cad/magic/files/patch-Makefile	(working copy)
>@@ -1,6 +1,6 @@
>---- Makefile.orig	2012-01-17 02:17:06.000000000 +0900
>-+++ Makefile	2012-01-17 02:18:32.000000000 +0900
>-@@ -18,12 +18,10 @@
>+--- Makefile.orig	2020-10-16 07:00:06 UTC
>++++ Makefile
>+@@ -18,12 +18,10 @@ INSTALL_CAD_DIRS = windows doc ${TECH}
>  all:	$(ALL_TARGET)
>  
>  standard:
>@@ -15,7 +15,7 @@
>  
>  force: clean all
>  
>-@@ -36,12 +34,12 @@
>+@@ -36,12 +34,12 @@ config:
>  tcllibrary: database/database.h modules
>  	@echo --- making Tcl shared libraries
>  	for dir in ${PROGRAMS}; do \
>@@ -30,8 +30,8 @@
>  
>  database/database.h: database/database.h.in
>  	@echo --- making header file database/database.h
>-@@ -50,30 +48,30 @@
>- modules:
>+@@ -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
>@@ -44,6 +44,7 @@
> +		${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
>@@ -52,8 +53,8 @@
>  install: $(INSTALL_TARGET)
>  
>  install-magic:
>- 	@echo --- installing executable to $(DESTDIR)${BINDIR}
>- 	@echo --- installing runtime files to $(DESTDIR)${LIBDIR}
>+ 	@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
>  
>@@ -66,13 +67,13 @@
> +		${MAKE} -C $$dir install || exit 1 ; done
>  
>  install-tcl-dirs:
>- 	${MAGICDIR}/scripts/mkdirs $(DESTDIR)${BINDIR} $(DESTDIR)${MANDIR} \
>-@@ -86,11 +84,11 @@
>+ 	${MAGICDIR}/scripts/mkdirs $(DESTDIR)${INSTALL_BINDIR} \
>+@@ -89,11 +87,11 @@ install-dirs:
>  install-tcl:
>- 	@echo --- installing executable to $(DESTDIR)${BINDIR}
>- 	@echo --- installing runtime files to $(DESTDIR)${LIBDIR}
>+ 	@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
>++	@${MAKE} install-tcl-real 2>&1
>  
>  install-tcl-real: install-tcl-dirs
>  	for dir in ${INSTALL_CAD_DIRS} ${PROGRAMS}; do \
>Index: cad/magic/files/patch-commands__Makefile
>===================================================================
>--- cad/magic/files/patch-commands__Makefile	(revision 562412)
>+++ cad/magic/files/patch-commands__Makefile	(working copy)
>@@ -1,6 +1,6 @@
>---- commands/Makefile.orig	2006-05-24 04:18:33.000000000 +0900
>-+++ commands/Makefile	2012-01-17 02:11:59.000000000 +0900
>-@@ -10,12 +10,7 @@
>+--- commands/Makefile.orig	2020-04-08 15:45:13 UTC
>++++ commands/Makefile
>+@@ -10,12 +10,7 @@ SRCS      = CmdSubrs.c CmdAB.c CmdCD.c CmdE.c CmdFI.c 
>  # Force the module to regenerate the symbolic link in the readline
>  # directory, as it may be needed by CmdFI.c (in the non-Tcl compile)
>  
>Index: cad/magic/files/patch-textio__textioInt.h
>===================================================================
>--- cad/magic/files/patch-textio__textioInt.h	(revision 562412)
>+++ cad/magic/files/patch-textio__textioInt.h	(working copy)
>@@ -1,6 +1,6 @@
>---- textio/textioInt.h.orig	2006-04-11 07:03:13.000000000 +0900
>-+++ textio/textioInt.h	2012-01-17 02:37:35.000000000 +0900
>-@@ -41,7 +41,7 @@
>+--- textio/textioInt.h.orig	2020-05-24 07:00:08 UTC
>++++ textio/textioInt.h
>+@@ -41,7 +41,7 @@ typedef struct {
>  #define TX_CMD_PROMPT	":"
>  
>  /* all of the state associated with a tty terminal */
>Index: cad/magic/files/patch-textio__txInput.c
>===================================================================
>--- cad/magic/files/patch-textio__txInput.c	(revision 562412)
>+++ cad/magic/files/patch-textio__txInput.c	(working copy)
>@@ -1,6 +1,14 @@
>---- textio/txInput.c.orig	2012-01-17 02:40:11.000000000 +0900
>-+++ textio/txInput.c	2012-01-17 02:45:26.000000000 +0900
>-@@ -1204,14 +1204,14 @@
>+--- textio/txInput.c.orig	2020-05-24 07:00:08 UTC
>++++ textio/txInput.c
>+@@ -28,6 +28,7 @@ static char rcsid[] __attribute__ ((unused)) = "$Heade
>+ #include <unistd.h>
>+ #include <ctype.h>
>+ #include <dirent.h>
>++#include <termios.h>
>+ 
>+ 
>+ #include "utils/magsgtty.h"
>+@@ -1205,14 +1206,14 @@ TxGetLine(dest, maxChars)
>   * ----------------------------------------------------------------------------
>   */
>  
>@@ -18,7 +26,7 @@
>  }
>  
>  #else
>-@@ -1244,14 +1244,14 @@
>+@@ -1245,14 +1246,14 @@ txGetTermState(buf)
>  
>  void
>  txSetTermState(buf)
>@@ -37,7 +45,7 @@
>  #else
>      /* set the current terminal characteristics */
>      (void) ioctl(fileno(stdin), TIOCSETN, (char *) &(buf->tx_i_sgtty) );
>-@@ -1279,13 +1279,13 @@
>+@@ -1280,13 +1281,13 @@ txSetTermState(buf)
>  
>  void
>  txInitTermRec(buf)
>@@ -54,10 +62,10 @@
>      buf->c_lflag = ISIG;    /* raw: no echo and no processing, allow signals */
>      buf->c_cc[ VMIN ] = 1;
>      buf->c_cc[ VTIME ] = 0;
>-@@ -1300,8 +1300,8 @@
>+@@ -1301,8 +1302,8 @@ txInitTermRec(buf)
>  
>- 
>  
>+ 
> -#if defined(SYSV) || defined(CYGWIN)
> -struct termio closeTermState;
> +#if defined(SYSV) || defined(CYGWIN) || defined(__FreeBSD__)
>@@ -65,7 +73,7 @@
>  #else
>  static txTermState closeTermState;
>  #endif /* SYSV */
>-@@ -1327,8 +1327,8 @@
>+@@ -1328,8 +1329,8 @@ static bool haveCloseState = FALSE;
>  void
>  txSaveTerm()
>  {
>@@ -76,7 +84,7 @@
>      txEraseChar = closeTermState.c_cc[VERASE];
>      txKillChar =  closeTermState.c_cc[VKILL];
>      TxEOFChar = closeTermState.c_cc[VEOF];
>-@@ -1368,8 +1368,8 @@
>+@@ -1369,8 +1370,8 @@ txSaveTerm()
>  void
>  TxSetTerminal()
>  {
>Index: cad/magic/files/patch-utils__magsgtty.h
>===================================================================
>--- cad/magic/files/patch-utils__magsgtty.h	(revision 562412)
>+++ cad/magic/files/patch-utils__magsgtty.h	(nonexistent)
>@@ -1,20 +0,0 @@
>---- ./utils/magsgtty.h.orig	2011-09-02 12:36:19.000000000 +0200
>-+++ ./utils/magsgtty.h	2011-09-02 12:39:00.000000000 +0200
>-@@ -21,14 +21,10 @@
>- #ifndef	_MAGSGTTY_H
>- #define _MAGSGTTY_H
>- 
>--#if !defined(SYSV) && !defined(CYGWIN)
>--# ifdef	ALPHA
>--# undef MAX
>--# undef MIN
>--# endif
>--#include <sgtty.h>
>-+#if defined(__FreeBSD__)
>-+#include <termios.h>
>- #else
>--#include <termio.h>
>-+#include <sgtty.h>
>- #endif
>- 
>- #endif	/* _MAGSGTTY_H */
>
>Property changes on: cad/magic/files/patch-utils__magsgtty.h
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: cad/magic/pkg-plist
>===================================================================
>--- cad/magic/pkg-plist	(revision 562412)
>+++ cad/magic/pkg-plist	(working copy)
>@@ -2,19 +2,6 @@
> bin/ext2spice
> bin/magic
> @comment bin/spice2sim
>-man/man1/ext2sim.1.gz
>-man/man1/ext2spice.1.gz
>-man/man1/extcheck.1.gz
>-man/man1/magic.1.gz
>-man/man5/cmap.5.gz
>-man/man5/displays.5.gz
>-man/man5/dlys.5.gz
>-man/man5/dstyle.5.gz
>-man/man5/ext.5.gz
>-man/man5/glyphs.5.gz
>-man/man5/mag.5.gz
>-man/man5/net.5.gz
>-man/man5/sim.5.gz
> lib/magic/doc/addendum6_5.ps
> lib/magic/doc/copyright.ps
> lib/magic/doc/html/Makefile
>@@ -107,6 +94,7 @@
> lib/magic/doc/html/maketoolbar.html
> lib/magic/doc/html/measure.html
> lib/magic/doc/html/move.html
>+lib/magic/doc/html/netlist.html
> lib/magic/doc/html/netlist/add.html
> lib/magic/doc/html/netlist/cleanup.html
> lib/magic/doc/html/netlist/cull.html
>@@ -126,7 +114,6 @@
> lib/magic/doc/html/netlist/trace.html
> lib/magic/doc/html/netlist/verify.html
> lib/magic/doc/html/netlist/writeall.html
>-lib/magic/doc/html/netlist.html
> lib/magic/doc/html/openwindow.html
> lib/magic/doc/html/openwrapper.html
> lib/magic/doc/html/paint.html
>@@ -245,7 +232,11 @@
> lib/magic/doc/tuttcl4.ps
> lib/magic/doc/tuttcl5.ps
> lib/magic/doc/tutwrl1.ps
>+lib/magic/sys/.initrc
> lib/magic/sys/.magicrc
>+lib/magic/sys/FreeMono.pt3
>+lib/magic/sys/FreeSans.pt3
>+lib/magic/sys/FreeSerif.pt3
> lib/magic/sys/bw.glyphs
> lib/magic/sys/color.glyphs
> lib/magic/sys/gdsquery.tech
>@@ -259,6 +250,7 @@
> 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
>@@ -270,24 +262,33 @@
> lib/magic/sys/windows14.glyphs
> lib/magic/sys/windows22.glyphs
> lib/magic/sys/windows7.glyphs
>-lib/magic/tcl/bitmaps/down.xbm
>-lib/magic/tcl/bitmaps/left.xbm
>-lib/magic/tcl/bitmaps/right.xbm
>-lib/magic/tcl/bitmaps/up.xbm
>-lib/magic/tcl/bitmaps/zoom.xbm
>+lib/magic/tcl/bitmaps/down.gif
>+lib/magic/tcl/bitmaps/left.gif
>+lib/magic/tcl/bitmaps/lock.xbm
>+lib/magic/tcl/bitmaps/right.gif
>+lib/magic/tcl/bitmaps/up.gif
>+lib/magic/tcl/bitmaps/zoom.gif
>+lib/magic/tcl/bsitools.tcl
>+lib/magic/tcl/cellmgr.tcl
> lib/magic/tcl/console.tcl
>+lib/magic/tcl/drcmgr.tcl
> @comment lib/magic/tcl/exttosim.so
> @comment lib/magic/tcl/exttospice.so
>+lib/magic/tcl/libmgr.tcl
> lib/magic/tcl/magic.tcl
> lib/magic/tcl/magicdnull
> 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
> lib/magic/tcl/tclmagic.so
> lib/magic/tcl/techbuilder.tcl
>+lib/magic/tcl/texthelper.tcl
> lib/magic/tcl/tkcon.tcl
> lib/magic/tcl/tkshell.tcl
> lib/magic/tcl/toolkit.tcl
>+lib/magic/tcl/toolkit_rev0.tcl
> lib/magic/tcl/tools.tcl
> lib/magic/tcl/wrapper.tcl
> lib/magic/tutorial/m3a.mag
>@@ -353,3 +354,16 @@
> lib/magic/tutorial/tut9b.mag
> lib/magic/tutorial/tut9x.mag
> lib/magic/tutorial/tut9y.mag
>+share/man/man1/ext2sim.1.gz
>+share/man/man1/ext2spice.1.gz
>+share/man/man1/extcheck.1.gz
>+share/man/man1/magic.1.gz
>+share/man/man5/cmap.5.gz
>+share/man/man5/displays.5.gz
>+share/man/man5/dlys.5.gz
>+share/man/man5/dstyle.5.gz
>+share/man/man5/ext.5.gz
>+share/man/man5/glyphs.5.gz
>+share/man/man5/mag.5.gz
>+share/man/man5/net.5.gz
>+share/man/man5/sim.5.gz

Actions: View | Diff

Attachments on bug 252954: 221852