update to magic-8.3.316, from Brad, ok maintainer
This commit is contained in:
parent
06b4906180
commit
2f97429c61
@ -1,5 +1,5 @@
|
||||
COMMENT = interactive system for VLSI circuit layouts
|
||||
DISTNAME = magic-8.3.137
|
||||
DISTNAME = magic-8.3.316
|
||||
EXTRACT_SUFX = .tgz
|
||||
|
||||
CATEGORIES = cad
|
||||
@ -7,38 +7,42 @@ HOMEPAGE = http://opencircuitdesign.com/magic/
|
||||
MAINTAINER = Alessandro De Laurenzis <just22@atlantide.mooo.com>
|
||||
|
||||
# MIT (Magic, scmos), GPLv2 only (readline)
|
||||
PERMIT_PACKAGE = Yes
|
||||
PERMIT_PACKAGE = Yes
|
||||
|
||||
WANTLIB = ${MODTK_WANTLIB} c cairo fontconfig freetype m GL GLU X11
|
||||
WANTLIB = ${MODTK_WANTLIB} GL GLU X11 Xext Xi Xmu c cairo fontconfig \
|
||||
freetype m z
|
||||
|
||||
MASTER_SITES = http://opencircuitdesign.com/magic/archive/
|
||||
|
||||
# The cpp preprocessor is used to generate .tech files; clang's breaks
|
||||
# newlines: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=698760
|
||||
COMPILER = ports-gcc
|
||||
COMPILER = base-clang ports-gcc
|
||||
COMPILER_LANGS = c
|
||||
|
||||
MODULES = x11/tk
|
||||
MODULES = lang/python \
|
||||
x11/tk
|
||||
MODPY_RUNDEP = No
|
||||
|
||||
LIB_DEPENDS = ${MODTK_LIB_DEPENDS} \
|
||||
graphics/cairo
|
||||
|
||||
RUN_DEPENDS = shells/bash
|
||||
|
||||
WRKCONF = ${WRKSRC}/scripts
|
||||
CONFIGURE_STYLE = gnu
|
||||
CONFIGURE_ARGS += --with-distdir=${PREFIX} \
|
||||
--with-tcl=${MODTCL_LIBDIR} \
|
||||
--with-tk=${MODTK_LIBDIR} \
|
||||
--with-cairo=${LOCALBASE}/include \
|
||||
--enable-cairo-offscreen
|
||||
WRKCONF = ${WRKSRC}/scripts
|
||||
|
||||
USE_GMAKE = Yes
|
||||
USE_GMAKE= Yes
|
||||
CONFIGURE_STYLE = gnu
|
||||
CONFIGURE_ARGS += --enable-cairo-offscreen \
|
||||
--with-distdir=${PREFIX} \
|
||||
--with-tcl=${MODTCL_LIBDIR} \
|
||||
--with-tk=${MODTK_LIBDIR}
|
||||
CONFIGURE_ENV += CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
|
||||
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
|
||||
|
||||
# Not so noisy with Clang
|
||||
CFLAGS += -Wno-parentheses
|
||||
|
||||
NO_TEST = Yes
|
||||
|
||||
post-patch:
|
||||
@${SUBST_CMD} ${WRKSRC}/scripts/configure
|
||||
@${SUBST_CMD} ${WRKSRC}/utils/paths.h
|
||||
|
||||
post-install:
|
||||
|
@ -1,2 +1,2 @@
|
||||
SHA256 (magic-8.3.137.tgz) = lXHTB4JIPUUXohngkJ4IKsVIAOttOhuMDePx/JtVNKw=
|
||||
SIZE (magic-8.3.137.tgz) = 4064629
|
||||
SHA256 (magic-8.3.316.tgz) = gAlgrV0lr0DJUINxl4J8Djd3rqvSTaIdMl4+6y4Sd08=
|
||||
SIZE (magic-8.3.316.tgz) = 4177392
|
||||
|
@ -1,36 +0,0 @@
|
||||
Index: Makefile
|
||||
--- Makefile.orig
|
||||
+++ 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
|
||||
|
||||
@@ -68,7 +66,7 @@ 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
|
||||
|
||||
install-real: install-dirs
|
||||
for dir in ${INSTALL_CAD_DIRS}; do \
|
||||
@@ -89,7 +87,7 @@ 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
|
||||
|
||||
install-tcl-real: install-tcl-dirs
|
||||
for dir in ${INSTALL_CAD_DIRS} ${PROGRAMS}; do \
|
@ -1,268 +0,0 @@
|
||||
Index: magic/proto.magicrc.in
|
||||
--- magic/proto.magicrc.in.orig
|
||||
+++ magic/proto.magicrc.in
|
||||
@@ -1,44 +1,44 @@
|
||||
-# $(CAD_ROOT)/magic/sys/.magicrc
|
||||
-# System wide start up file for magic, defines default macros.
|
||||
-#
|
||||
-#
|
||||
-# Source file proto.magicrc.in
|
||||
-# Process this file with the cpp macro processor
|
||||
-#
|
||||
+/* $(CAD_ROOT)/magic/sys/.magicrc */
|
||||
+/* System wide start up file for magic, defines default macros. */
|
||||
+/* */
|
||||
+/* */
|
||||
+/* Source file proto.magicrc.in */
|
||||
+/* Process this file with the cpp macro processor */
|
||||
+/* */
|
||||
#ifdef MAGIC_WRAPPER
|
||||
puts stdout "Processing system .magicrc file"
|
||||
#endif /* MAGIC_WRAPPER */
|
||||
#ifdef USE_NEW_MACROS
|
||||
-###############################################################################
|
||||
-# Default .magicrc macro file (new macros)
|
||||
-###############################################################################
|
||||
-# A key
|
||||
+/* ############################################################################### */
|
||||
+/* # Default .magicrc macro file (new macros) */
|
||||
+/* ############################################################################### */
|
||||
+/* # A key */
|
||||
macro a "select visible"
|
||||
macro A "select more visible"
|
||||
macro ^A "select less visible"
|
||||
-# B key
|
||||
+/* # B key */
|
||||
macro b "box"
|
||||
macro B "findbox"
|
||||
-# C key
|
||||
+/* # C key */
|
||||
macro c "copy"
|
||||
-# D key
|
||||
+/* # D key */
|
||||
macro d "delete"
|
||||
macro ^D "erase $"
|
||||
-# E key
|
||||
+/* # E key */
|
||||
macro e "edit"
|
||||
-# F key
|
||||
+/* # F key */
|
||||
macro f "sideways"
|
||||
macro F "upsidedown"
|
||||
-# G key
|
||||
+/* # G key */
|
||||
macro g "grid"
|
||||
macro G "grid 2"
|
||||
-# I key
|
||||
+/* # I key */
|
||||
macro i "select cell"
|
||||
macro I "select more cell"
|
||||
#ifdef XLIB
|
||||
macro Control_XK_i "select less cell"
|
||||
#endif
|
||||
-# L key
|
||||
+/* # L key */
|
||||
#ifdef USE_READLINE
|
||||
imacro l "label "
|
||||
#endif /* (USE_READLINE) */
|
||||
@@ -47,74 +47,74 @@ imacro l "label "
|
||||
#endif /* (MAGIC_WRAPPER) */
|
||||
macro L "shell ls"
|
||||
macro ^L "redraw"
|
||||
-# M key
|
||||
+/* # M key */
|
||||
macro m "move"
|
||||
macro M "stretch"
|
||||
-# N key
|
||||
+/* # N key */
|
||||
macro ^N ""
|
||||
-# O key
|
||||
+/* # O key */
|
||||
macro o "openwindow"
|
||||
macro O "closewindow"
|
||||
-# P key
|
||||
+/* # P key */
|
||||
#ifdef USE_READLINE
|
||||
imacro p "paint "
|
||||
#endif /* (USE_READLINE) */
|
||||
#ifdef MAGIC_WRAPPER
|
||||
imacro p "paint "
|
||||
#endif /* (MAGIC_WRAPPER) */
|
||||
-# Q key
|
||||
+/* # Q key */
|
||||
#ifdef XLIB
|
||||
macro Control_Shift_XK_q "quit"
|
||||
#endif /* (XLIB) */
|
||||
-# R key
|
||||
+/* # R key */
|
||||
macro r "clockwise"
|
||||
macro R "clockwise 270"
|
||||
macro ^R "clockwise 180"
|
||||
-# S key
|
||||
+/* # S key */
|
||||
macro s "select"
|
||||
macro S "select more"
|
||||
macro ^S "select less"
|
||||
#ifdef XLIB
|
||||
macro Control_Shift_XK_s "undo ; select"
|
||||
#endif /* (XLIB) */
|
||||
-# U key
|
||||
+/* # U key */
|
||||
macro u "undo"
|
||||
macro U "redo"
|
||||
-# V key
|
||||
+/* # V key */
|
||||
macro v "view"
|
||||
macro V "xview"
|
||||
-# W key
|
||||
+/* # W key */
|
||||
macro w "writeall"
|
||||
macro W "writeall force"
|
||||
-# X key
|
||||
+/* # X key */
|
||||
macro x "expand"
|
||||
macro X "unexpand"
|
||||
macro ^X "expand toggle"
|
||||
-# Z key
|
||||
+/* # Z key */
|
||||
macro z "zoom .5"
|
||||
macro Z "zoom 2"
|
||||
macro ^Z "findbox zoom"
|
||||
#ifdef XLIB
|
||||
macro Control_Shift_XK_z "center"
|
||||
#endif /* (XLIB) */
|
||||
-# Question mark
|
||||
+/* # Question mark */
|
||||
macro ? "drc why"
|
||||
macro / "select area; what ; select clear"
|
||||
-# Comma key
|
||||
+/* # Comma key */
|
||||
macro , "select clear"
|
||||
-# Exclamation mark
|
||||
+/* # Exclamation mark */
|
||||
#ifdef USE_READLINE
|
||||
imacro ! "shell "
|
||||
#endif /* (USE_READLINE) */
|
||||
-# Space bar
|
||||
+/* # Space bar */
|
||||
macro " " "tool"
|
||||
-# Colon and semicolon (interactive command)
|
||||
+/* # Colon and semicolon (interactive command) */
|
||||
imacro XK_colon ":"
|
||||
imacro XK_semicolon ":"
|
||||
#ifdef XLIB
|
||||
macro Shift_XK_space "tool box"
|
||||
macro Control_XK_space "tool wiring"
|
||||
-# Arrow keys (X11 versions only)
|
||||
+/* # Arrow keys (X11 versions only) */
|
||||
macro XK_Left "scroll l .1 w"
|
||||
macro Shift_XK_Left "scroll l 1 w"
|
||||
macro Control_XK_Left "box grow w 1"
|
||||
@@ -131,8 +131,8 @@ macro XK_Down "scroll d .1 w"
|
||||
macro Shift_XK_Down "scroll d 1 w"
|
||||
macro Control_XK_Down "box grow s 1"
|
||||
macro Control_Shift_XK_Down "box shrink n 1"
|
||||
-# Keypad keys (X11 versions only)
|
||||
-# Functions duplicated for use both with Num_Lock ON and OFF
|
||||
+/* # Keypad keys (X11 versions only) */
|
||||
+/* # Functions duplicated for use both with Num_Lock ON and OFF */
|
||||
macro XK_KP_Delete "box size 0 0"
|
||||
macro XK_KP_Insert "box size 4 4"
|
||||
macro XK_KP_0 "box size 7 2"
|
||||
@@ -184,9 +184,9 @@ macro XK_F11 "paint pc"
|
||||
macro XK_F12 "paint via"
|
||||
#endif /* (XLIB) */
|
||||
#else /* USE_NEW_MACROS */
|
||||
-###############################################################################
|
||||
-# Default .magicrc macro file (original)
|
||||
-###############################################################################
|
||||
+/* ############################################################################### */
|
||||
+/* # Default .magicrc macro file (original) */
|
||||
+/* ############################################################################### */
|
||||
echo ""
|
||||
macro s "select"
|
||||
macro S "select more"
|
||||
@@ -232,12 +232,12 @@ imacro XK_semicolon ":"
|
||||
macro ^R "iroute route -dBox"
|
||||
macro ^N "iroute route -dSelection"
|
||||
#endif /* USE_NEW_MACROS */
|
||||
-# Allow some box manipulation from all tools.
|
||||
+/* # Allow some box manipulation from all tools. */
|
||||
#ifdef MAGIC_WRAPPER
|
||||
macro Control_Button1 "*bypass box move bl cursor"
|
||||
macro Control_Button2 "*bypass paint cursor"
|
||||
macro Control_Button3 "*bypass box corner ur cursor"
|
||||
-# Box tool button bindings
|
||||
+/* # Box tool button bindings */
|
||||
macro Button1 "*bypass box move bl cursor"
|
||||
macro Shift_Button1 "*bypass box corner bl cursor"
|
||||
macro Button2 "*bypass paint 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"
|
||||
-# Box tool button bindings
|
||||
+/* # Box tool button bindings */
|
||||
macro Button1 "box move bl cursor"
|
||||
macro Shift_Button1 "box corner bl cursor"
|
||||
macro Button2 "paint 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) */
|
||||
-# Color window button bindings
|
||||
+/* # Color window button bindings */
|
||||
macro color Button1 "pushbutton left"
|
||||
macro color Button2 "pushbutton middle"
|
||||
macro color Button3 "pushbutton right"
|
||||
@@ -264,11 +264,11 @@ macro color u "undo"
|
||||
macro color U "redo"
|
||||
macro color plus "color next"
|
||||
macro color minus "color last"
|
||||
-# Netlist window button bindings
|
||||
+/* # Netlist window button bindings */
|
||||
macro netlist Button1 "pushbutton left"
|
||||
macro netlist Button2 "pushbutton middle"
|
||||
macro netlist Button3 "pushbutton right"
|
||||
-# Wind3D window key bindings
|
||||
+/* # Wind3D window key bindings */
|
||||
macro wind3d L "level up"
|
||||
macro wind3d l "level down"
|
||||
macro wind3d C "cif"
|
||||
@@ -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) */
|
||||
-#
|
||||
-# Load basic set of fonts
|
||||
-#
|
||||
+/* # */
|
||||
+/* # Load basic set of fonts */
|
||||
+/* # */
|
||||
setlabel font FreeSans.pt3 0.58
|
||||
setlabel font FreeSerif.pt3 0.58
|
||||
setlabel font FreeMono.pt3 0.6
|
||||
-#
|
||||
-# Additions for Tcl GUI wrapper
|
||||
-#
|
||||
+/* # */
|
||||
+/* # Additions for Tcl GUI wrapper */
|
||||
+/* # */
|
||||
#ifdef MAGIC_WRAPPER
|
||||
magic::suspendout
|
||||
if {![catch {set Opts(tools)}]} { magic::enable_tools }
|
||||
@@ -313,11 +313,10 @@ set VDD "vdd!"
|
||||
magic::resumeout
|
||||
catch {source ${CAD_ROOT}/magic/sys/site.def}
|
||||
#endif /* (!MAGIC_WRAPPER) */
|
||||
-#
|
||||
#ifdef SCHEME_INTERPRETER
|
||||
-#
|
||||
-# additions for default scm path
|
||||
-#
|
||||
+/* # */
|
||||
+/* # additions for default scm path */
|
||||
+/* # */
|
||||
define scm-library-path "CAD_DIR/lib/magic/scm"
|
||||
load-scm "default.scm"
|
||||
load-scm "layout.scm"
|
@ -1,51 +0,0 @@
|
||||
Index: scripts/configure
|
||||
--- scripts/configure.orig
|
||||
+++ scripts/configure
|
||||
@@ -834,7 +834,7 @@ pdfdir='${docdir}'
|
||||
psdir='${docdir}'
|
||||
libdir='${exec_prefix}/lib'
|
||||
localedir='${datarootdir}/locale'
|
||||
-mandir='${datarootdir}/man'
|
||||
+mandir='${prefix}/man'
|
||||
|
||||
ac_prev=
|
||||
ac_dashdash=
|
||||
@@ -8034,7 +8034,7 @@ fi
|
||||
CFLAGS="${CFLAGS} -L/usr/X11R6/include"
|
||||
;;
|
||||
|
||||
- *-netbsd*|*-openbsd*)
|
||||
+ *-netbsd*)
|
||||
# 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 :
|
||||
@@ -8050,6 +8050,12 @@ fi
|
||||
fi
|
||||
;;
|
||||
|
||||
+ *-openbsd*)
|
||||
+ SHLIB_CFLAGS="-fPIC"
|
||||
+ LDDL_FLAGS="-shared ${LIB_SPEC}"
|
||||
+ CFLAGS="${CFLAGS} -I${X11BASE}/include"
|
||||
+ ;;
|
||||
+
|
||||
*-nextstep*)
|
||||
LDDL_FLAGS="-nostdlib -r"
|
||||
;;
|
||||
@@ -9485,16 +9491,5 @@ else
|
||||
echo
|
||||
fi
|
||||
fi
|
||||
-
|
||||
-echo "-----------------------------------------------------------"
|
||||
-echo
|
||||
-
|
||||
-echo "Use 'make' to compile and 'make install' to install."
|
||||
-echo
|
||||
-echo "Errors may not be printed to stdout: see files 'make.log' "
|
||||
-echo " and 'install.log' for complete error summary."
|
||||
-echo
|
||||
-echo "-----------------------------------------------------------"
|
||||
-echo
|
||||
|
||||
cp defs.mak ..
|
@ -26,12 +26,3 @@ Index: utils/paths.h
|
||||
#define HELPER_PATH ". BIN_DIR" /* Used by graphics drivers */
|
||||
|
||||
/*
|
||||
@@ -58,7 +58,7 @@
|
||||
# endif
|
||||
# endif
|
||||
#else
|
||||
-# if defined(linux) || defined(__FreeBSD__)
|
||||
+# if defined(linux) || defined(__FreeBSD__) || defined(__OpenBSD__)
|
||||
# define PAGERDIR "/usr/bin/more"
|
||||
# elif defined(CYGWIN)
|
||||
# define PAGERDIR "./less"
|
||||
|
@ -82,6 +82,7 @@ share/doc/magic/html/
|
||||
share/doc/magic/html/Makefile
|
||||
share/doc/magic/html/addcommandentry.html
|
||||
share/doc/magic/html/addpath.html
|
||||
share/doc/magic/html/antennacheck.html
|
||||
share/doc/magic/html/array.html
|
||||
share/doc/magic/html/box.html
|
||||
share/doc/magic/html/calma.html
|
||||
@ -114,9 +115,11 @@ share/doc/magic/html/def.html
|
||||
share/doc/magic/html/delete.html
|
||||
share/doc/magic/html/deletecommandentry.html
|
||||
share/doc/magic/html/direction.html
|
||||
share/doc/magic/html/display.html
|
||||
share/doc/magic/html/distance.html
|
||||
share/doc/magic/html/down.html
|
||||
share/doc/magic/html/drc.html
|
||||
share/doc/magic/html/drop.html
|
||||
share/doc/magic/html/dump.html
|
||||
share/doc/magic/html/edit.html
|
||||
share/doc/magic/html/element.html
|
||||
@ -166,6 +169,7 @@ share/doc/magic/html/irsim.html
|
||||
share/doc/magic/html/label.html
|
||||
share/doc/magic/html/lef.html
|
||||
share/doc/magic/html/load.html
|
||||
share/doc/magic/html/locking.html
|
||||
share/doc/magic/html/logcommands.html
|
||||
share/doc/magic/html/macro.html
|
||||
share/doc/magic/html/maketoolbar.html
|
||||
@ -194,6 +198,7 @@ share/doc/magic/html/netlist/verify.html
|
||||
share/doc/magic/html/netlist/writeall.html
|
||||
share/doc/magic/html/openwindow.html
|
||||
share/doc/magic/html/openwrapper.html
|
||||
share/doc/magic/html/orient.html
|
||||
share/doc/magic/html/paint.html
|
||||
share/doc/magic/html/path.html
|
||||
share/doc/magic/html/peekbox.html
|
||||
@ -210,6 +215,8 @@ share/doc/magic/html/pushbox.html
|
||||
share/doc/magic/html/pushbutton.html
|
||||
share/doc/magic/html/pushstack.html
|
||||
share/doc/magic/html/quit.html
|
||||
share/doc/magic/html/random.html
|
||||
share/doc/magic/html/readspice.html
|
||||
share/doc/magic/html/redo.html
|
||||
share/doc/magic/html/redraw.html
|
||||
share/doc/magic/html/render3d.html
|
||||
@ -223,6 +230,7 @@ share/doc/magic/html/scroll.html
|
||||
share/doc/magic/html/search.html
|
||||
share/doc/magic/html/see.html
|
||||
share/doc/magic/html/select.html
|
||||
share/doc/magic/html/setlabel.html
|
||||
share/doc/magic/html/setpoint.html
|
||||
share/doc/magic/html/shell.html
|
||||
share/doc/magic/html/sideways.html
|
||||
@ -284,6 +292,7 @@ share/doc/magic/html/wizard/winddebug.html
|
||||
share/doc/magic/html/wizard/winddump.html
|
||||
share/doc/magic/html/writeall.html
|
||||
share/doc/magic/html/xload.html
|
||||
share/doc/magic/html/xor.html
|
||||
share/doc/magic/html/xview.html
|
||||
share/doc/magic/html/zoom.html
|
||||
share/doc/magic/introduction.ps
|
||||
|
Loading…
Reference in New Issue
Block a user