diff options
| author | dmcmahill <dmcmahill> | 2010-03-03 03:40:00 +0000 |
|---|---|---|
| committer | dmcmahill <dmcmahill> | 2010-03-03 03:40:00 +0000 |
| commit | 418d0e8fd1d0d4699ec5ddab5be7a3be3ae5285d (patch) | |
| tree | ea70095e98595adfe5bb3488f80b99b29cf8588f /cad | |
| parent | 0d87b9a51cdb0a58e005564923d6c1aede5876a7 (diff) | |
| download | pkgsrc-418d0e8fd1d0d4699ec5ddab5be7a3be3ae5285d.tar.gz | |
Update to magic-7.5.188. There have been many changes since this package
was last updated.
Besides the upstream changes listed below, also add DESTDIR support
(which is enabled by better upstream support for it).
4. Version 7.5 Release Notes:
---------------------------------
Version 7.5 is the development branch. Version 7.5.0 is the same as
7.4.2, which is essentially the same as 7.3.123, plus some
documentation updates. Intended development is as follows:
1) Use a finely spaced grid for the database, but keep the concept
of "lambda" for layout. Keep backwards compatibility, and resolve
issues with layout that does not work well on the lambda grid.
Item #1 implemented in 7.5.1 by allowing a DRC "scalefactor" line,
which declares that all DRC rules are in units of (lambda /
scalefactor). Rules "in use" are scaled to lambda and rounded to
the nearest integer. The original value is retained, however, so
that any call to "scalegrid" will recompute the DRC distances based
on the current internal grid. Thus, we can define DRC rules in
fractional lambda and therefore match vendor DRC rule distances
while still maintaining magic's concept of "lambda". This means
that users working entirely within magic have scalable CMOS rules,
but if a "vendor cell" (3rd party GDS or CIF) is loaded, the DRC
rules will be correct with respect to it.
2) Create tile-based DRC functions that work like cifoutput: perform
tile operations, for which the resulting plane, instead of being
output as a file like CIF or GDS, simply becomes an error result
plane. This will become an extra built-in plane. Try to keep the
plane numbers down by removing the built-in routing planes when they
are not used.
Basically, this means that the top of the DRC section defines a set
of "templayer" blocks just like "cifinput" and "cifoutput" (but at the
same scaling as the layout (thus the main reason for item #1 above)),
where the templayer types can be used in the DRC section.
3) Add "cifoutput" operators as needed to form a complete DRC. Add DRC
rule types as needed to form a complete DRC (for example, it needs a
"copy" function that declares that the templayer itself represents the
error condition).
4. Version 7.4 Release Notes:
---------------------------------
Version 7.4 is the new stable distribution version of magic.
Apart from changes to the release notes, it is identical to
the last revision (123) of development version 7.3. Revisions
of 7.4 will be made as necessary to fix bugs in the code. All
new additions and major changes will be done to the new
development distribution, version 7.5. Therefore there will
not be a "What's new in 7.4" section, as there is not supposed
to be anything new in version 7.4.
5. Version 7.3 Release Notes:
---------------------------------
Magic release 7.3 incorporates a stacked contact model which is,
for the most part, backwardly compatible with Magic releases
7.2 and earlier. Information about this developmental release
can be found at:
http://opencircuitdesign.com/magic/magic7_3.html
What's new in 7.3:
------------------
Provided by Tim Edwards (MultiGiG, Inc.):
1) Stacked contact model allowing arbitrary stacking of
contact types.
2) A separate "undo/redo" method for network selection, to
remove the memory overhead associated with selecting and
unselecting large networks. Also removes some time overhead
as well, especially when unselecting networks.
3) Much improved "plot pnm" function.
4) Improved transistor and resistor extraction.
5) LEF format reader; improved LEF/DEF input/output handling
6) New style and colormap file formats
7) Vendor GDS read/write capability
8) "wire segment" drawing function
9) Handling of path records in CIF and GDS input
10) Handling of cell scaling in GDS input
11) Pi-network device extraction for resistors
12) Option to write contacts as cell arrays in GDS output
13) New "widespacing" and "maxwidth" DRC algorithms.
14) "polygon" command
15) New cifoutput operator "bloat-all"
16) Backing-store for 24-bit and OpenGL graphics
17) New "pick" tool for interactive selection move and copy
18) New interactive "wire" tool
19) Crosshair
20) New cifoutput operator "slots"
21) New fcntl-based file locking mechanism
22) "angstroms" units supported in cifinput/cifoutput
23) Non-Manhattan device extraction support
24) New "feedback" mechanism
25) Proper support for > 32 planes (up to 64)
26) Fixed array interaction CIF/GDS generation
27) Added executable "magicdnull" for streamlined batch-mode use
28) New method for crash backups, including restore with "magic -r"
29) A number of other technology file additions and enhancements
6. Version 7.2 Release Notes:
---------------------------------
Magic release 7.2 incorporates the capability to run magic from the Tcl
interpreter with graphics handled by Tk. Instructions for compiling
and installing this version are in README.Tcl. Information about
this release can be found at:
http://opencircuitdesign.com/magic/magic7_2.html
What's new in 7.2:
------------------
Provided by Tim Edwards (MultiGiG, Inc., and JHU Applied Physics Lab):
1) Tcl interpreter extension option
2) Cygwin compile option
3) Memory resources cleaned up
4) GUI interface to Tcl version of Magic
5) Readline update to version 4.3
6) OpenGL fixes and refinements
7) Nonmanhattan geometry fixes and extensions
8) Threaded graphics in non-Tcl environments
9) Inductance extraction
10) CIF and GDS input/output support for deep submicron technologies
11) Different internal and lambda grids, including automatic or
induced ("scalegrid" command) grid subdivision and expansion.
"snap" and "grid" functions and extensions aid layout when
lambda and internal units differ.
12) Removed commands "list", "listall", "parent", and "child",
replacing them with the more general-purpose "cellname"
and "instance" commands.
13) Added command "tech", and re-loadable technologies.
14) Revamped the "dstyle" files and updated the dstyle version
15) Added "element" types for layout annotation.
16) Extended extract section of techfile to include "device"
keyword and devices "mosfet", "bjt", "capacitor", and "resistor".
New model resistor and mosfet use width/length instead of area/
perimeter.
17) Added 3D rendering window invoked by command "specialopen wind3d",
for the Tcl version compiled with OpenGL graphics.
18) Added "height" keyword to tech file for height/thickness values
19) Added "windowname" command for managing multiple wrapper windows
under Tcl.
20) Added extraction extension for annular (ring) MOSFETs.
21) Added "widespacing" DRC rule.
22) Added GNU autoconf compile
23) New command "property" for setting key:value pair properties
in cell definitions that can be interpreted by other routines
(such as LEF/DEF).
24) General-purpose subcircuit method using the "port" command to
declare a cell to be a subcircuit and to mark the position and
orientation of connections into the subcell. This replaces a
method previously built into version 7.2 using a "subcircuit"
layer; that method is now considered obsolete.
25) LEF and DEF format readers, LEF format writer.
26) Improved techfile format with asterisk-notation and DRC
"surround", "overhang", and "rect_only" statements.
Diffstat (limited to 'cad')
32 files changed, 491 insertions, 913 deletions
diff --git a/cad/magic/Makefile b/cad/magic/Makefile index e67619c7a1d..02ac4cc0a1a 100644 --- a/cad/magic/Makefile +++ b/cad/magic/Makefile @@ -1,28 +1,26 @@ -# $NetBSD: Makefile,v 1.21 2009/06/30 00:07:11 joerg Exp $ +# $NetBSD: Makefile,v 1.22 2010/03/03 03:40:00 dmcmahill Exp $ # -DISTNAME= magic-7.1 -PKGREVISION= 5 +DISTNAME= magic-7.5.188 CATEGORIES= cad -MASTER_SITES= http://vlsi.cornell.edu/magic/ +MASTER_SITES= http://opencircuitdesign.com/magic/archive/ +EXTRACT_SUFX= .tgz -MAINTAINER= dmcmahill@NetBSD.org -HOMEPAGE= http://vlsi.cornell.edu/magic/ +MAINTAINER= pkgsrc-users@NetBSD.org +HOMEPAGE= http://opencircuitdesign.com/magic/index.html COMMENT= Integrated circuit layout system MAKE_JOBS_SAFE= no +PKG_DESTDIR_SUPPORT= user-destdir USE_TOOLS+= gmake printf -USE_GNU_READLINE= # uses rl_*_completion_function +USE_GNU_READLINE=yes # uses rl_*_completion_function MAKE_ENV+= MAGIC_HOME=${PREFIX:Q} MAKE_FLAGS+= MANDIR=${PREFIX}/${PKGMANDIR} +GNU_CONFIGURE= yes +CONFIG_DIRS= scripts -.include "../../mk/endian.mk" -.if ${MACHINE_ENDIAN} == "big" -CPPFLAGS+= -DIS_BIG_ENDIAN -.else -CPPFLAGS+= -DIS_LITTLE_ENDIAN -.endif +MAKE_ENV+= X11_LDFLAGS=${X11_LDFLAGS:Q} USE_TOOLS+= awk:run REPLACE_INTERPRETER+= awk @@ -30,18 +28,22 @@ REPLACE.awk.old= /bin/awk REPLACE.awk.new= ${TOOLS_PATH.awk} REPLACE_FILES.awk= ext2spice/spice2sim -post-patch: - cd ${WRKSRC} && for f in `${FIND} . -type f -exec ${GREP} -l CAD_HOME {} /dev/null \\;` ; do \ - ${ECHO} "Replacing CAD_HOME in $$f" ; \ - ${MV} -f $$f $$f.bak ; ${SED} 's;CAD_HOME;MAGIC_HOME;g' $$f.bak > $$f ; \ - ${RM} $$f.bak ; \ - done - ${CHMOD} 755 ${WRKSRC}/scripts/config +USE_TOOLS+= tclsh:run +REPLACE_INTERPRETER+= tclsh +REPLACE.tclsh.old= .*tclsh +REPLACE.tclsh.new= ${PREFIX}/bin/tclsh +REPLACE_FILES.tclsh= tcltk/strip_reflibs.tcl -do-configure: - cd ${WRKSRC} && ${PRINTF} '1\n2\n6\n\n\n\n\n\n\n\n\n\n\n' | \ - ${SETENV} ${MAKE_ENV} ./scripts/config +USE_TOOLS+= wish:run +REPLACE_INTERPRETER+= wish +REPLACE.wish.old= .*wish +REPLACE.wish.new= ${PREFIX}/bin/wish +REPLACE_FILES.wish= tcltk/tkshell.tcl .include "../../devel/readline/buildlink3.mk" +.include "../../lang/tcl/buildlink3.mk" +.include "../../x11/blt/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" +.include "../../x11/tk/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/cad/magic/PLIST b/cad/magic/PLIST index 8c6d9d80658..54ccb07b079 100644 --- a/cad/magic/PLIST +++ b/cad/magic/PLIST @@ -1,15 +1,212 @@ -@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:35:54 joerg Exp $ -bin/XHelper7 +@comment $NetBSD: PLIST,v 1.3 2010/03/03 03:40:00 dmcmahill Exp $ bin/ext2sim bin/ext2spice -bin/extcheck bin/magic -bin/magicusage -bin/net2ir bin/spice2sim -lib/libmpack.a lib/magic/doc/addendum6_5.ps 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/array.html +lib/magic/doc/html/box.html +lib/magic/doc/html/calma.html +lib/magic/doc/html/caption.html +lib/magic/doc/html/cellmanager.html +lib/magic/doc/html/cellname.html +lib/magic/doc/html/cellsearch.html +lib/magic/doc/html/center.html +lib/magic/doc/html/changetool.html +lib/magic/doc/html/channels.html +lib/magic/doc/html/cif.html +lib/magic/doc/html/clockwise.html +lib/magic/doc/html/closewindow.html +lib/magic/doc/html/closewrapper.html +lib/magic/doc/html/color/color.html +lib/magic/doc/html/color/load.html +lib/magic/doc/html/color/pushbutton.html +lib/magic/doc/html/color/save.html +lib/magic/doc/html/commands.html +lib/magic/doc/html/commands.list +lib/magic/doc/html/contact.html +lib/magic/doc/html/copy.html +lib/magic/doc/html/corner.html +lib/magic/doc/html/crash.html +lib/magic/doc/html/crashbackups.html +lib/magic/doc/html/crosshair.html +lib/magic/doc/html/cursor.html +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/distance.html +lib/magic/doc/html/down.html +lib/magic/doc/html/drc.html +lib/magic/doc/html/dump.html +lib/magic/doc/html/edit.html +lib/magic/doc/html/element.html +lib/magic/doc/html/erase.html +lib/magic/doc/html/expand.html +lib/magic/doc/html/ext.html +lib/magic/doc/html/ext2sim.html +lib/magic/doc/html/ext2spice.html +lib/magic/doc/html/extract.html +lib/magic/doc/html/extresist.html +lib/magic/doc/html/exttosim.html +lib/magic/doc/html/exttospice.html +lib/magic/doc/html/feedback.html +lib/magic/doc/html/fill.html +lib/magic/doc/html/findbox.html +lib/magic/doc/html/findlabel.html +lib/magic/doc/html/flatten.html +lib/magic/doc/html/flush.html +lib/magic/doc/html/garoute.html +lib/magic/doc/html/gds.html +lib/magic/doc/html/get.html +lib/magic/doc/html/getcell.html +lib/magic/doc/html/getnode.html +lib/magic/doc/html/goto.html +lib/magic/doc/html/graphics/blpaper.gif +lib/magic/doc/html/graphics/cellmgr.gif +lib/magic/doc/html/graphics/cif_see.gif +lib/magic/doc/html/graphics/corner1.gif +lib/magic/doc/html/graphics/corner2.gif +lib/magic/doc/html/graphics/email_address.png +lib/magic/doc/html/graphics/line1.gif +lib/magic/doc/html/graphics/magic_OGL_sm.gif +lib/magic/doc/html/graphics/magic_title2.gif +lib/magic/doc/html/graphics/techmgr.gif +lib/magic/doc/html/graphics/toolbar.gif +lib/magic/doc/html/graphics/writeall.gif +lib/magic/doc/html/grid.html +lib/magic/doc/html/help.html +lib/magic/doc/html/identify.html +lib/magic/doc/html/imacro.html +lib/magic/doc/html/initialize.html +lib/magic/doc/html/instance.html +lib/magic/doc/html/invoke.html +lib/magic/doc/html/iroute.html +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/logcommands.html +lib/magic/doc/html/macro.html +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 +lib/magic/doc/html/netlist/dnet.html +lib/magic/doc/html/netlist/dterm.html +lib/magic/doc/html/netlist/extract.html +lib/magic/doc/html/netlist/find.html +lib/magic/doc/html/netlist/flush.html +lib/magic/doc/html/netlist/joinnets.html +lib/magic/doc/html/netlist/netlist.html +lib/magic/doc/html/netlist/print.html +lib/magic/doc/html/netlist/pushbutton.html +lib/magic/doc/html/netlist/ripup.html +lib/magic/doc/html/netlist/savenetlist.html +lib/magic/doc/html/netlist/shownet.html +lib/magic/doc/html/netlist/showterms.html +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/openwindow.html +lib/magic/doc/html/openwrapper.html +lib/magic/doc/html/paint.html +lib/magic/doc/html/path.html +lib/magic/doc/html/peekbox.html +lib/magic/doc/html/plot.html +lib/magic/doc/html/plow.html +lib/magic/doc/html/polygon.html +lib/magic/doc/html/popbox.html +lib/magic/doc/html/popstack.html +lib/magic/doc/html/port.html +lib/magic/doc/html/promptload.html +lib/magic/doc/html/promptsave.html +lib/magic/doc/html/property.html +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/redo.html +lib/magic/doc/html/redraw.html +lib/magic/doc/html/render3d.html +lib/magic/doc/html/resumeall.html +lib/magic/doc/html/rotate.html +lib/magic/doc/html/route.html +lib/magic/doc/html/ruler.html +lib/magic/doc/html/save.html +lib/magic/doc/html/scalegrid.html +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/setpoint.html +lib/magic/doc/html/shell.html +lib/magic/doc/html/sideways.html +lib/magic/doc/html/sleep.html +lib/magic/doc/html/snap.html +lib/magic/doc/html/specialopen.html +lib/magic/doc/html/spliterase.html +lib/magic/doc/html/splitpaint.html +lib/magic/doc/html/startup.html +lib/magic/doc/html/straighten.html +lib/magic/doc/html/stretch.html +lib/magic/doc/html/suspendall.html +lib/magic/doc/html/tag.html +lib/magic/doc/html/tech.html +lib/magic/doc/html/techmanager.html +lib/magic/doc/html/template.html +lib/magic/doc/html/tk_path_name.html +lib/magic/doc/html/tool.html +lib/magic/doc/html/undo.html +lib/magic/doc/html/unexpand.html +lib/magic/doc/html/unmeasure.html +lib/magic/doc/html/updatedisplay.html +lib/magic/doc/html/upsidedown.html +lib/magic/doc/html/version.html +lib/magic/doc/html/view.html +lib/magic/doc/html/what.html +lib/magic/doc/html/wind3d/cif.html +lib/magic/doc/html/wind3d/closewindow.html +lib/magic/doc/html/wind3d/cutbox.html +lib/magic/doc/html/wind3d/defaults.html +lib/magic/doc/html/wind3d/help.html +lib/magic/doc/html/wind3d/level.html +lib/magic/doc/html/wind3d/refresh.html +lib/magic/doc/html/wind3d/render.html +lib/magic/doc/html/wind3d/scroll.html +lib/magic/doc/html/wind3d/see.html +lib/magic/doc/html/wind3d/view.html +lib/magic/doc/html/wind3d/zoom.html +lib/magic/doc/html/windowborder.html +lib/magic/doc/html/windowcaption.html +lib/magic/doc/html/windownames.html +lib/magic/doc/html/windowscrollbars.html +lib/magic/doc/html/wire.html +lib/magic/doc/html/wizard/coord.html +lib/magic/doc/html/wizard/crash.html +lib/magic/doc/html/wizard/extract.html +lib/magic/doc/html/wizard/files.html +lib/magic/doc/html/wizard/grstats.html +lib/magic/doc/html/wizard/pause.html +lib/magic/doc/html/wizard/plow.html +lib/magic/doc/html/wizard/psearch.html +lib/magic/doc/html/wizard/showtech.html +lib/magic/doc/html/wizard/tilestats.html +lib/magic/doc/html/wizard/tsearch.html +lib/magic/doc/html/wizard/watch.html +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/xview.html +lib/magic/doc/html/zoom.html lib/magic/doc/introduction.ps lib/magic/doc/maint1.ps lib/magic/doc/maint2.ps @@ -30,42 +227,57 @@ lib/magic/doc/tutscm1.ps lib/magic/doc/tutscm2.ps lib/magic/doc/tutscm3.ps lib/magic/doc/tutscm4.ps +lib/magic/doc/tuttcl1.ps +lib/magic/doc/tuttcl2.ps +lib/magic/doc/tuttcl3.ps +lib/magic/doc/tuttcl4.ps +lib/magic/doc/tuttcl5.ps lib/magic/doc/tutwrl1.ps -lib/magic/scm/box.scm -lib/magic/scm/default.scm -lib/magic/scm/draw.scm -lib/magic/scm/drc.scm -lib/magic/scm/gate.scm -lib/magic/scm/help.scm -lib/magic/scm/label.scm -lib/magic/scm/layout.scm -lib/magic/scm/prs.scm -lib/magic/scm/sel.scm -lib/magic/scm/stack.scm -lib/magic/sys/.magic +lib/magic/sys/.magicrc lib/magic/sys/bw.glyphs lib/magic/sys/color.glyphs +lib/magic/sys/gdsquery.tech lib/magic/sys/magicps.pro -lib/magic/sys/mos.24bit.dstyle5 -lib/magic/sys/mos.7bit.dstyle5 -lib/magic/sys/mos.7bit.mraster.cmap1 -lib/magic/sys/mos.7bit.mraster_dstyle5 -lib/magic/sys/mos.7bit.std.cmap1 -lib/magic/sys/mos.OpenGL.dstyle5 -lib/magic/sys/mos.OpenGL.std.cmap1 -lib/magic/sys/scmos-sub.tech26 -lib/magic/sys/scmos-sub.tech27 -lib/magic/sys/scmos-tm.tech26 -lib/magic/sys/scmos-tm.tech27 +lib/magic/sys/minimum.tech +lib/magic/sys/mos.24bit.dstyle +lib/magic/sys/mos.24bit.std.cmap +lib/magic/sys/mos.7bit.dstyle +lib/magic/sys/mos.7bit.mraster.cmap +lib/magic/sys/mos.7bit.mraster_dstyle +lib/magic/sys/mos.7bit.std.cmap +lib/magic/sys/mos.OpenGL.dstyle +lib/magic/sys/mos.OpenGL.std.cmap +lib/magic/sys/scmos-sub.tech +lib/magic/sys/scmos-tm.tech lib/magic/sys/scmos.tech -lib/magic/sys/scmos.tech26 -lib/magic/sys/scmos.tech27 -lib/magic/sys/scmosWR.tech26 -lib/magic/sys/scmosWR.tech27 +lib/magic/sys/scmosWR.tech +lib/magic/sys/vfont.B.12 +lib/magic/sys/vfont.I.12 +lib/magic/sys/vfont.R.8 lib/magic/sys/windows11.glyphs 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/console.tcl +lib/magic/tcl/exttosim.so +lib/magic/tcl/exttospice.so +lib/magic/tcl/magic.tcl +lib/magic/tcl/magicdnull +lib/magic/tcl/magicexec +lib/magic/tcl/mazeroute.tcl +lib/magic/tcl/strip_reflibs.tcl +lib/magic/tcl/tclmagic.so +lib/magic/tcl/techbuilder.tcl +lib/magic/tcl/tkcon.tcl +lib/magic/tcl/tkshell.tcl +lib/magic/tcl/toolkit.tcl +lib/magic/tcl/tools.tcl +lib/magic/tcl/wrapper.tcl lib/magic/tutorial/m3a.mag lib/magic/tutorial/maint2a.mag lib/magic/tutorial/tut1.mag @@ -74,7 +286,6 @@ lib/magic/tutorial/tut11a.cmd lib/magic/tutorial/tut11a.ext lib/magic/tutorial/tut11a.mag lib/magic/tutorial/tut11a.nodes -lib/magic/tutorial/tut11a.rsm lib/magic/tutorial/tut11a.sim lib/magic/tutorial/tut11b.ext lib/magic/tutorial/tut11b.mag @@ -130,34 +341,16 @@ lib/magic/tutorial/tut9a.mag lib/magic/tutorial/tut9b.mag lib/magic/tutorial/tut9x.mag lib/magic/tutorial/tut9y.mag -lib/mpack.h man/man1/ext2sim.1 man/man1/ext2spice.1 man/man1/extcheck.1 man/man1/magic.1 -man/man1/magicusage.1 -man/man3/dqueue.3 -man/man3/extflat.3 -man/man3/geometry.3 -man/man3/hash.3 -man/man3/heap.3 -man/man3/libmalloc.3 -man/man3/list.3 -man/man3/magicutils.3 -man/man3/malloc.3 -man/man3/path.3 -man/man3/runstats.3 -man/man3/set.3 -man/man3/show.3 -man/man3/stack.3 -man/man3/string.3 man/man5/cmap.5 man/man5/displays.5 man/man5/dlys.5 man/man5/dstyle.5 man/man5/ext.5 man/man5/glyphs.5 -man/man5/magic.5 +man/man5/mag.5 man/man5/net.5 man/man5/sim.5 -man/man8/prleak.8 diff --git a/cad/magic/distinfo b/cad/magic/distinfo index 384564ffd6a..b3e7356d289 100644 --- a/cad/magic/distinfo +++ b/cad/magic/distinfo @@ -1,34 +1,16 @@ -$NetBSD: distinfo,v 1.11 2006/02/16 18:06:46 wiz Exp $ +$NetBSD: distinfo,v 1.12 2010/03/03 03:40:00 dmcmahill Exp $ -SHA1 (magic-7.1.tar.gz) = 176eb4c6a0ff33c6e265e61360c02da4f454f101 -RMD160 (magic-7.1.tar.gz) = 7ab03ba23243817b168254f8c6f7a50d8ea2a4db -Size (magic-7.1.tar.gz) = 3860487 bytes -SHA1 (patch-aa) = 30eb68f2cd768345d6b91359cdd4c7d23bdf892f -SHA1 (patch-ab) = 7edbc90a01fdee0569733cad965f9b397e684547 -SHA1 (patch-ac) = 270cbb68cb3b1ff5e635490ac1dfe13e3dcfc0d0 -SHA1 (patch-ad) = e9db83580fc1b34906d9f5e151479e46f7da444a -SHA1 (patch-ae) = 27555db8f06d1f8a7a6f002e7dfccf14a4db2765 -SHA1 (patch-af) = 415c0252b38dab9460697e2b3d87af83518ea980 -SHA1 (patch-ag) = b8dcf69daab42dfd24bdb2038733f88f269cc7dc -SHA1 (patch-ah) = 31654bb19cf41bbd07d8ecd3d8b5c529684638a2 -SHA1 (patch-ai) = 2957ca1596b267d4476ab38893c23c8f14b2660d -SHA1 (patch-aj) = bc04ec87ba55efc44438e240a07c16e9f029ba9d -SHA1 (patch-ak) = 18c5a23f334c9878160c104d12be4f4e71da6d59 -SHA1 (patch-al) = 1ef7780a48da86d690b9cf8a31bd9dc416087a09 -SHA1 (patch-am) = c4e695c370db01775b321970a327ea0851fdf437 -SHA1 (patch-an) = 83e9e5242b483f398962a6237551b860749e70f0 -SHA1 (patch-ao) = 747c18b5e997d652054d17acbdb1fee0748d77a8 -SHA1 (patch-ap) = b2b9e1c45dbefd1d93205bcc15ea713c38181598 -SHA1 (patch-aq) = e21eebcb604f26f1669237c752f39d77f3dec100 -SHA1 (patch-ar) = 1d9b4c63dd6156fc02dfcbdd946ecca3d44847f2 -SHA1 (patch-as) = 5ddeac5797f34b6e951241e4d891efd0aea5f15d -SHA1 (patch-at) = 6caeb2a9c455792b4ec0930b199df4880f42ce47 -SHA1 (patch-au) = 37f6106787f363e1d40b8feb8c2b1912dd987c71 -SHA1 (patch-av) = 5c5bc8a5add515ab2d9d55bbf96b5c23e1a178a6 -SHA1 (patch-aw) = 557bf1993732183b6738ec12539736ebd9aaa900 -SHA1 (patch-ax) = 8bc1938b4435d7724a666ad283c0aef93abdabf1 -SHA1 (patch-ay) = 8555fe87e07468bdefd0b1e6c0855d9d0572f843 -SHA1 (patch-az) = 59373bad51817333b3c82b0a35e34e39dc60ea21 -SHA1 (patch-ba) = 330dcb13dde5ef871d5d807f40915b2e14842808 -SHA1 (patch-bb) = ca5366ffdd343ce2e15a2636aadca803e7a1d46e -SHA1 (patch-bc) = 7d02f22aa3507b2c5573b3fc655da76eca34cea5 +SHA1 (magic-7.5.188.tgz) = f7a8dfb90f1d1416bdaf4b056972bc6d406c75d4 +RMD160 (magic-7.5.188.tgz) = b677df676ba2aa9f9e9b211445d577a85a309e27 +Size (magic-7.5.188.tgz) = 3691582 bytes +SHA1 (patch-aa) = ae0737be98822ea02953becd1535ec35bc539a25 +SHA1 (patch-ab) = 47c9b1b835350f0bb28b21cf74c7b532decda3ac +SHA1 (patch-ac) = 133d924663b0866c011ae98e7c54c0587723f167 +SHA1 (patch-ad) = a6882499d36a5171dc30274bd2e3e2cd2683e005 +SHA1 (patch-ae) = a07c2f7600e93abc133847d614be27e674f4a54f +SHA1 (patch-af) = e014e55c6e716faa850bcad02c3b51edfef3bfc5 +SHA1 (patch-ag) = a720eb0140b387cde6091a9596742b8fd51c7d0f +SHA1 (patch-ah) = adabd09e0baddbb73b747d6824112129807ce957 +SHA1 (patch-ai) = cf2be159436739ca1216f2b8f7e32f514f87576d +SHA1 (patch-aj) = b5ce9aab892ec639fac5d006aa0bd3127a1a623c +SHA1 (patch-ak) = 730d99368d05cd48a3d698e51de3a64f874ea294 diff --git a/cad/magic/patches/patch-aa b/cad/magic/patches/patch-aa index d5c38bad397..5df9c2a63ad 100644 --- a/cad/magic/patches/patch-aa +++ b/cad/magic/patches/patch-aa @@ -1,94 +1,54 @@ -$NetBSD: patch-aa,v 1.4 2006/01/06 18:14:06 joerg Exp $ +$NetBSD: patch-aa,v 1.5 2010/03/03 03:40:00 dmcmahill Exp $ ---- misc/magic.h.orig 2001-09-21 15:15:45.000000000 +0000 -+++ misc/magic.h -@@ -99,7 +99,7 @@ extern char *SysLibPath; /* Path for fin - : FALSE) - #else - #define ASSERT(p, where) (FALSE) --#endif PARANOID -+#endif /* PARANOID */ +--- scripts/configure.in.orig 2009-12-30 13:45:48.000000000 +0000 ++++ scripts/configure.in +@@ -641,9 +641,10 @@ if test $usingTcl ; then + fi + fi ++# FIXME -- why are we not using TCL_LIB_FILE FROM tclConfig.sh? + if test $usingTcl ; then + case $target in +- *-sunos4*|*-*-netbsd|NetBSD-*|FreeBSD-*|OpenBSD-*) ++ *-sunos4*|*-*-netbsd*|NetBSD-*|FreeBSD-*|OpenBSD-*) + TCL_LIB_NAME="tcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}" + TK_LIB_NAME="tk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}" + ;; +@@ -653,7 +654,7 @@ if test $usingTcl ; then + ;; + esac - /* ------------------------ Malloc/free ------------------------------- */ -@@ -146,71 +146,6 @@ extern char AbortMessage[]; - * - */ +- loclib=`echo ${TCL_LIB_SPEC} | cut -d ' ' -f 1 | sed -e 's/-L//'` ++ loclib=`echo ${TCL_LIB_SPEC} | sed -e 's/.*-L//' -e 's/ .*//'` --#ifdef i386 --#define IS_LITTLE_ENDIAN /* Intel x86 processors. */ --#endif -- --#ifdef linux --#define IS_LITTLE_ENDIAN /* Intel x86 processors running Linux >=.99p7. */ --#endif -- --#ifdef vax --#define IS_LITTLE_ENDIAN /* The good 'ol VAX. */ --#endif -- --#ifdef MIPSEL --#define IS_LITTLE_ENDIAN /* MIPS processors in little-endian mode. */ --#endif -- --#ifdef wrltitan --#define IS_LITTLE_ENDIAN /* A DEC-WRL titan research machine (only 20 exist). */ -- /* NOT intended for the Ardent titan machine. */ --#endif -- --#ifdef MIPSEB --#define IS_BIG_ENDIAN /* MIPS processors in big-endian mode. */ --#endif -- --#ifdef mc68000 --#define IS_BIG_ENDIAN /* All 68xxx machines, such as Sun2's and Sun3's. */ --#endif -- --#ifdef macII --#define IS_BIG_ENDIAN /* Apple MacII (also a 68000, but being safe here.) */ --#endif -- --#ifdef sparc --#define IS_BIG_ENDIAN /* All SPARC-based machines. */ --#endif -- --#ifdef ibm032 --#define IS_BIG_ENDIAN /* IBM PC-RT and related machines. */ --#endif -- --#ifdef hp9000s300 --#define IS_BIG_ENDIAN /* HP 9000 machine. */ --#endif -- --#ifdef hp9000s800 --#define IS_BIG_ENDIAN /* HP 9000 machine. */ --#endif -- --#ifdef hp9000s820 --#define IS_BIG_ENDIAN /* HP 9000 machine. */ --#endif -- --#ifdef ALPHA --#define IS_LITTLE_ENDIAN /* Digital Alpha AXP */ --#endif -- --/* Well, how'd we do? */ -- --#if !defined(IS_BIG_ENDIAN) && !defined(IS_LITTLE_ENDIAN) -- You_need_to_define_IS_LITTLE_ENDIAN_or_IS_BIG_ENDIAN_for_your_machine. --#endif --#if defined(IS_BIG_ENDIAN) && defined(IS_LITTLE_ENDIAN) -- You_should_not_define_both_IS_LITTLE_ENDIAN_and_IS_BIG_ENDIAN. --#endif + TCL_LIB_SPEC="-l${TCL_LIB_NAME}" + TK_LIB_SPEC="-l${TK_LIB_NAME}" +@@ -910,7 +911,7 @@ AC_ARG_ENABLE(readline, + use_system_readline=no) + AC_CHECK_LIB(readline, rl_attempted_completion_over,, + use_system_readline=no) +- if test $use_system_readline == yes ; then ++ if test $use_system_readline = yes ; then + AC_DEFINE(HAVE_READLINE) + rl_libs="-lreadline" + else +@@ -1389,8 +1390,8 @@ if test $usingTcl ; then + # Not available on all versions: check for include file. + AC_CHECK_HEADER(dlfcn.h, test_ok=yes, test_ok=no) + if test "$test_ok" = yes; then +- SHLIB_CFLAGS="-fpic" +- LDDL_FLAGS="-Bshareable -x ${LIB_SPEC}" ++ SHLIB_CFLAGS="-fPIC" ++ LDDL_FLAGS="-shared ${LIB_SPEC}" + fi + ;; - /* ------- Configuration: Handle Missing Routines/Definitions ------- */ - -@@ -285,7 +220,7 @@ extern char AbortMessage[]; - #include <errno.h> - #define sys_errlist _sys_errlist - #define sys_nerr _sys_nerr --#elif !defined(__FreeBSD__) && !defined(__NetBSD__) -+#elif !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__) - extern int errno; - /* extern char *sys_errlist[]; */ - extern int sys_nerr; +@@ -1614,7 +1615,7 @@ if test $usingTcl ; then + EOF + usingBLT=`cat temp.out` + rm -f temp.out +- if test "x${usingBLT}" == "xyes" ; then ++ if test "x${usingBLT}" = "xyes" ; then + echo "yes" + else + echo "no" diff --git a/cad/magic/patches/patch-ab b/cad/magic/patches/patch-ab index 69f668d6048..6eaafedad8e 100644 --- a/cad/magic/patches/patch-ab +++ b/cad/magic/patches/patch-ab @@ -1,59 +1,51 @@ -$NetBSD: patch-ab,v 1.7 2006/02/16 18:06:46 wiz Exp $ +$NetBSD: patch-ab,v 1.8 2010/03/03 03:40:00 dmcmahill Exp $ ---- scripts/config.orig 2006-02-16 11:01:27.000000000 +0000 -+++ scripts/config -@@ -52,7 +52,7 @@ Magic works with the following window co - CAT_EOF +--- scripts/configure.orig 2009-12-30 13:45:48.000000000 +0000 ++++ scripts/configure +@@ -8833,7 +8833,7 @@ fi - set cflags= --set cppflags='-I. -I${MAGICDIR}' -+set cppflags="${CPPFLAGS} "'-I. -I${MAGICDIR}' - set dflags= - set oflags= + if test $usingTcl ; then + case $target in +- *-sunos4*|*-*-netbsd|NetBSD-*|FreeBSD-*|OpenBSD-*) ++ *-sunos4*|*-*-netbsd*|NetBSD-*|FreeBSD-*|OpenBSD-*) + TCL_LIB_NAME="tcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}" + TK_LIB_NAME="tk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}" + ;; +@@ -8843,7 +8843,7 @@ if test $usingTcl ; then + ;; + esac -@@ -191,15 +191,21 @@ case "1": - breaksw - case "2": - echo "NetBSD 1.x selected" -- set cpp = "/usr/libexec/cpp -P -traditional" -+ if (-f xx/usr/libexec/cpp) then -+ set cpp = "/usr/libexec/cpp -P -traditional" -+ else if (-f xx/usr/libexec/cpp0) then -+ set cpp = "/usr/libexec/cpp0 -P -traditional" -+ else -+ set cpp = "cc -E -traditional" -+ endif - if ($?usingX11) then - echo "NOTE: Since you are running NetBSD using X11, we're assuming" - echo " that you want to get the X11 library from either the normal" - echo " library area or from the directory /usr/X11R6/lib. If this" - echo " is not correct, edit the defs.mak file by hand after this" - echo " script completes." -- set gr_cflags=("$gr_cflags" -I/usr/X11R6/include) -- set gr_libs=(-L/usr/X11R6/lib "$gr_libs") -+ set gr_cflags=("$gr_cflags" -I${X11BASE}/include) -+ set gr_libs=(-L${X11BASE}/lib -R${X11BASE}/lib "$gr_libs") - endif - breaksw - case "3": -@@ -453,16 +459,10 @@ endif - set have_readline="no" - if ($readline == "y" || $readline == "yes") then - set dflags=("$dflags" -DUSE_READLINE) -- if ( -f /usr/lib/libreadline.so ) then -- if ( `nm /usr/lib/libreadline.so | grep pre_input | wc -l` > 0 ) then -- set have_readline="yes" -- set dflags=($dflags -DHAVE_READLINE) -- set rl_libs=($rl_libs -lreadline -ltermcap) -- if ( `nm /usr/lib/libreadline.so | grep rl_filename_completion_function | wc -l` > 0) then -- set dflags=($dflags -DREADLINE_4_DOT_2_PLUS) -- endif -- endif -- endif -+ set have_readline="yes" -+ set dflags=($dflags -DHAVE_READLINE) -+ set rl_libs=($rl_libs '-Wl,-R${LOCALBASE}/lib' -lreadline -ltermcap) -+ set dflags=($dflags -DREADLINE_4_DOT_2_PLUS) - if ($?compileIRIX) then - echo "NOTE: Must compile with GNU make (gmake), not the IRIX make" - endif +- loclib=`echo ${TCL_LIB_SPEC} | cut -d ' ' -f 1 | sed -e 's/-L//'` ++ loclib=`echo ${TCL_LIB_SPEC} | sed -e 's/.*-L//' -e 's/ .*//'` + + TCL_LIB_SPEC="-l${TCL_LIB_NAME}" + TK_LIB_SPEC="-l${TK_LIB_NAME}" +@@ -9461,7 +9461,7 @@ else + use_system_readline=no + fi + +- if test $use_system_readline == yes ; then ++ if test $use_system_readline = yes ; then + cat >>confdefs.h <<\_ACEOF + #define HAVE_READLINE 1 + _ACEOF +@@ -10586,8 +10586,8 @@ fi + + + if test "$test_ok" = yes; then +- SHLIB_CFLAGS="-fpic" +- LDDL_FLAGS="-Bshareable -x ${LIB_SPEC}" ++ SHLIB_CFLAGS="-fPIC" ++ LDDL_FLAGS="-shared ${LIB_SPEC}" + fi + ;; + +@@ -12141,7 +12143,7 @@ if test $usingTcl ; then + EOF + usingBLT=`cat temp.out` + rm -f temp.out +- if test "x${usingBLT}" == "xyes" ; then ++ if test "x${usingBLT}" = "xyes" ; then + echo "yes" + else + echo "no" diff --git a/cad/magic/patches/patch-ac b/cad/magic/patches/patch-ac index 31283bf6273..ccab99484a4 100644 --- a/cad/magic/patches/patch-ac +++ b/cad/magic/patches/patch-ac @@ -1,30 +1,13 @@ -$NetBSD: patch-ac,v 1.1 2004/01/23 11:43:33 agc Exp $ +$NetBSD: patch-ac,v 1.2 2010/03/03 03:40:00 dmcmahill Exp $ ---- database/database.h.in 2004/01/23 09:50:02 1.1 -+++ database/database.h.in 2004/01/23 09:50:45 -@@ -26,13 +26,13 @@ - - #ifndef _MAGIC - int err0 = Need_to_include_misc/magic_header; --#endif _MAGIC -+#endif /* _MAGIC */ - #ifndef _TILES - int err1 = Need_to_include_tiles/tile_header; --#endif _TILES -+#endif /* _TILES */ - #ifndef _HASH - int err2 = Need_to_include_utils/hash_header; --#endif _HASH -+#endif /* _HASH */ - - /* ----------------------- Tunable constants -------------------------- */ - -@@ -412,7 +412,7 @@ - bool side; - } DiagInfo; - --#endif NONMANHATTAN -+#endif /* NONMANHATTAN */ - - /* - * Structure to pass to dbcUnconnectFunc(), containing the overlap +--- utils/signals.c.orig 2006-09-13 21:02:54.000000000 +0000 ++++ utils/signals.c +@@ -669,7 +669,7 @@ SigInit() + void + sigSetAction(int signo, sigRetVal (*handler)(int)) + { +-#if defined(SYSV) || defined(CYGWIN) ++#if defined(SYSV) || defined(CYGWIN) || defined(__NetBSD__) + struct sigaction sa; + + sa.sa_handler = handler; diff --git a/cad/magic/patches/patch-ad b/cad/magic/patches/patch-ad index 6c4a6ff3086..3a869609df1 100644 --- a/cad/magic/patches/patch-ad +++ b/cad/magic/patches/patch-ad @@ -1,33 +1,13 @@ -$NetBSD: patch-ad,v 1.1 2004/01/23 11:43:33 agc Exp $ +$NetBSD: patch-ad,v 1.2 2010/03/03 03:40:00 dmcmahill Exp $ ---- tech/tech.c 2004/01/23 09:51:59 1.1 -+++ tech/tech.c 2004/01/23 09:52:54 -@@ -31,8 +31,8 @@ - #include "utils/malloc.h" - - #ifndef NO_VARARGS --#include <varargs.h> --#endif NO_VARARGS -+#include <stdarg.h> -+#endif /* NO_VARARGS */ - - global char *TechDefault = NULL; - -@@ -415,15 +415,12 @@ - /*VARARGS0*/ - - void --TechError(va_alist) --va_dcl -+TechError(char *fmt, ...) - { - va_list args; -- char *fmt; - - TechPrintLine(); -- va_start(args); -- fmt = va_arg(args, char *); -+ va_start(args, fmt); - (void) GrVfprintf(stderr, fmt, args); - va_end(args); - } +--- scripts/defs.mak.in.orig 2006-04-10 22:03:14.000000000 +0000 ++++ scripts/defs.mak.in +@@ -77,7 +77,7 @@ EXEEXT = @EXEEXT@ + + GR_CFLAGS = @X_CFLAGS@ @gr_cflags@ + GR_DFLAGS = @gr_dflags@ -DNDEBUG +-GR_LIBS = @gr_libs@ @X_LIBS@ ++GR_LIBS = @gr_libs@ ${X11_LDFLAGS} @X_LIBS@ + GR_SRCS = @gr_srcs@ + GR_HELPER_SRCS = @gr_hsrcs@ + GR_HELPER_PROG = @gr_hprog@ diff --git a/cad/magic/patches/patch-ae b/cad/magic/patches/patch-ae index dfd1430ed27..80d2a0066d2 100644 --- a/cad/magic/patches/patch-ae +++ b/cad/magic/patches/patch-ae @@ -1,13 +1,13 @@ -$NetBSD: patch-ae,v 1.1 2004/01/23 11:43:33 agc Exp $ +$NetBSD: patch-ae,v 1.2 2010/03/03 03:40:00 dmcmahill Exp $ ---- ext2sim/ext2sim.c 2004/01/23 09:53:44 1.1 -+++ ext2sim/ext2sim.c 2004/01/23 09:54:02 -@@ -19,7 +19,7 @@ - #include <stdio.h> - #include <ctype.h> - #include <stdlib.h> --#include <varargs.h> -+#include <stdarg.h> - #include "misc/magic.h" - #include "utils/geometry.h" - #include "utils/hash.h" +--- utils/magic.h.orig 2006-10-04 17:30:19.000000000 +0000 ++++ utils/magic.h +@@ -280,7 +280,7 @@ extern char AbortMessage[]; + #ifdef CYGWIN + #include <errno.h> + #define sys_errlist _sys_errlist +-#elif !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(macosx) ++#elif !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__) && !defined(macosx) + extern int errno; + /* extern char *sys_errlist[]; */ + #elif defined(macosx) diff --git a/cad/magic/patches/patch-af b/cad/magic/patches/patch-af index d1d44e611b3..82df7990511 100644 --- a/cad/magic/patches/patch-af +++ b/cad/magic/patches/patch-af @@ -1,39 +1,14 @@ -$NetBSD: patch-af,v 1.1 2004/01/23 11:43:33 agc Exp $ +$NetBSD: patch-af,v 1.2 2010/03/03 03:40:00 dmcmahill Exp $ ---- ext2spice/ext2spice.c 2004/01/23 09:54:56 1.1 -+++ ext2spice/ext2spice.c 2004/01/23 09:56:01 -@@ -18,7 +18,7 @@ - - #include <stdio.h> - #include <ctype.h> --#include <varargs.h> -+#include <stdarg.h> - #include "misc/magic.h" - #include "utils/malloc.h" - #include "utils/geometry.h" -@@ -1586,22 +1586,19 @@ - } - - /* debugging stuff */ --#include <varargs.h> -+#include <stdarg.h> - - #define DBG 1 - --DBPRINT( va_alist ) -- va_dcl -+DBPRINT( char *fmt, ... ) - { - va_list args; -- char *fmt; - FILE *fp; - char buff[ 300 ]; - - if ( DBG ) { -- va_start( args ); -+ va_start( args, fmt ); - fp = stderr ; -- fmt = va_arg( args, char * ); - (void) vsprintf( buff, fmt, args ); - va_end( args ); - +--- drc/DRCmain.c.orig 2009-09-11 15:47:14.000000000 +0000 ++++ drc/DRCmain.c +@@ -37,9 +37,6 @@ static char rcsid[] __attribute__ ((unus + #include "drc/drc.h" + #include "utils/undo.h" + +-extern void TxPrintf(char *, ...); +-extern void TxError(char *, ...); +- + /* The global variables defined below are parameters between + * the DRC error routines (drcPaintError and drcPrintError) + * and the higher-level routines that start up DRC error checks. diff --git a/cad/magic/patches/patch-ag b/cad/magic/patches/patch-ag index 1e825e9712a..1c7ca110524 100644 --- a/cad/magic/patches/patch-ag +++ b/cad/magic/patches/patch-ag @@ -1,12 +1,22 @@ -$NetBSD: patch-ag,v 1.1 2004/01/23 11:43:33 agc Exp $ +$NetBSD: patch-ag,v 1.2 2010/03/03 03:40:00 dmcmahill Exp $ ---- extcheck/extcheck.c 2004/01/23 09:56:51 1.1 -+++ extcheck/extcheck.c 2004/01/23 09:57:23 -@@ -28,7 +28,6 @@ +--- utils/getrect.c.orig 2006-11-02 23:44:07.000000000 +0000 ++++ utils/getrect.c +@@ -97,6 +97,7 @@ GetRect(fin, skip, rect, scalen, scaled) + int dir = 0x1; + #endif + ++#if !defined(__DragonFly__) + if (FILE_CNT(fin) < RECTBUFTHRESHOLD) goto slow; + /* + * Fast version of GetRect -- read directly from buffer. +@@ -178,6 +179,9 @@ fastbad: + + /* Slow version of GetRect -- read via getc */ + slow: ++ ++#endif /* __DragonFly__ */ ++ + while (skip-- > 0) + (void) getc(fin); - #include <stdio.h> - #include <ctype.h> --#include <varargs.h> - #include "misc/magic.h" - #include "misc/paths.h" - #include "utils/geometry.h" diff --git a/cad/magic/patches/patch-ah b/cad/magic/patches/patch-ah index ecdace8464b..e4f832af5e5 100644 --- a/cad/magic/patches/patch-ah +++ b/cad/magic/patches/patch-ah @@ -1,12 +1,10 @@ -$NetBSD: patch-ah,v 1.1 2004/01/23 11:43:33 agc Exp $ +$NetBSD: patch-ah,v 1.2 2010/03/03 03:40:00 dmcmahill Exp $ ---- extflat/EFargs.c 2004/01/23 09:58:12 1.1 -+++ extflat/EFargs.c 2004/01/23 09:58:38 -@@ -24,7 +24,6 @@ +--- textio/txMain.c.orig 2006-04-10 22:03:13.000000000 +0000 ++++ textio/txMain.c +@@ -22,4 +22,5 @@ static char rcsid[] __attribute__ ((unus + #endif /* not lint */ + ++#include <sys/types.h> #include <stdio.h> - #include <ctype.h> - #include <stdlib.h> --#include <varargs.h> - #ifdef SYSV #include <string.h> - #endif diff --git a/cad/magic/patches/patch-ai b/cad/magic/patches/patch-ai index 22fab144fb7..5a2f80fa2f2 100644 --- a/cad/magic/patches/patch-ai +++ b/cad/magic/patches/patch-ai @@ -1,40 +1,12 @@ -$NetBSD: patch-ai,v 1.3 2006/02/03 02:19:42 rillig Exp $ +$NetBSD: patch-ai,v 1.4 2010/03/03 03:40:00 dmcmahill Exp $ ---- extflat/EFread.c.orig 2001-01-12 22:12:35.000000000 +0000 -+++ extflat/EFread.c -@@ -24,7 +24,7 @@ - #include <stdio.h> - #include <ctype.h> - #include <stdlib.h> --#include <varargs.h> -+#include <stdarg.h> - #include "misc/magic.h" - #include "utils/geometry.h" - #include "utils/hash.h" -@@ -33,6 +33,9 @@ - #include "extflat/EFint.h" - #include "misc/paths.h" +--- graphics/grMain.c.orig 2008-02-03 21:23:56.000000000 +0000 ++++ graphics/grMain.c +@@ -439,7 +439,6 @@ grFgets(str, n, stream, name) + fd_set fn; + char *newstr; + struct timeval threeSec, twentySecs; +- extern int errno; -+int efReadError(char *, ...); -+ -+ - /* - * The following table describes the kinds of lines - * that may be read in a .ext file. -@@ -534,14 +537,12 @@ start: - */ - - /*VARARGS1*/ --efReadError(fmt, va_alist) -- char *fmt; -- va_dcl -+efReadError(char *fmt, ...) - { - va_list args; - - (void) printf("%s, line %d: ", efReadFileName, efReadLineNum); -- va_start(args); -+ va_start(args, fmt); - vfprintf(stdout, fmt, args); - va_end(args); - (void) fflush(stdout); + threeSec.tv_sec = 3; + threeSec.tv_usec = 0; diff --git a/cad/magic/patches/patch-aj b/cad/magic/patches/patch-aj index 59a5a5c56a5..9101743404d 100644 --- a/cad/magic/patches/patch-aj +++ b/cad/magic/patches/patch-aj @@ -1,85 +1,13 @@ -$NetBSD: patch-aj,v 1.3 2006/02/03 02:19:42 rillig Exp $ +$NetBSD: patch-aj,v 1.4 2010/03/03 03:40:00 dmcmahill Exp $ ---- graphics/grMain.c.orig 2001-04-16 14:43:40.000000000 +0000 -+++ graphics/grMain.c -@@ -117,14 +117,7 @@ - #ifdef SUNVIEW - #include <pixrect/pixrect.h> - #endif --#endif sun -- --#ifndef NO_VARARGS --#include <varargs.h> --#endif NO_VARARGS -- --extern char *getenv(); --extern int errno; -+#endif /* sun */ +--- plot/plotInt.h.orig 2008-11-16 22:06:54.000000000 +0000 ++++ plot/plotInt.h +@@ -28,7 +28,7 @@ + #define VERSATEC /* Add this for HP plotter support */ - #define FAVORITE_DISPLAY "NULL" /* Default display type */ - -@@ -153,21 +146,21 @@ static char *grDisplayTypes[] = { - "SUN110", - "SUN160", - "SUNBW", --#endif SUNVIEW -+#endif /* SUNVIEW */ - #ifdef SUN120 - "SUN120", --#endif SUN120 -+#endif /* SUN120 */ - #ifdef AED - "UCB512", - "UCB512N", - "AED767", - "AED1024", - "UCB1024", --#endif AED -+#endif /* AED */ - #ifdef X10 - "XWIND", - "X10", --#endif X10 -+#endif /* X10 */ - #ifdef X11 - "XWIND", - "X11", -@@ -194,25 +187,25 @@ static (*(grInitProcs[]))() = { - sunWSetDisplay, - sunWSetDisplay, - sunWSetDisplay, --#endif SUNVIEW -+#endif /* SUNVIEW */ - #ifdef SUN120 - sunSetDisplay, --#endif SUN120 -+#endif /* SUN120 */ - #ifdef AED - aedSetDisplay, /* Handles all AEDs (UCB512s, AED767s, and AED1024s) */ - aedSetDisplay, - aedSetDisplay, - aedSetDisplay, - aedSetDisplay, --#endif AED -+#endif /* AED */ - #ifdef X10 - x10aSetDisplay, - x10aSetDisplay, --#endif X10 -+#endif /* X10 */ - #ifdef X11 - x11suSetDisplay, - x11suSetDisplay, --#endif X11 -+#endif /* X11 */ - #ifdef OGL - oglSetDisplay, - oglSetDisplay, -@@ -581,7 +574,6 @@ grFgets(str, n, stream, name) - fd_set fn; - char *newstr; - struct timeval threeSec, twentySecs; -- extern int errno; - - threeSec.tv_sec = 3; - threeSec.tv_usec = 0; + /* system V machines lack vfont.h, so include the defs below. */ +-#if !defined(SYSV) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(CYGWIN) && !defined(macosx) ++#if !defined(SYSV) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(CYGWIN) && !defined(macosx) && !defined(__DragonFly__) + #include <vfont.h> + #else + struct header { diff --git a/cad/magic/patches/patch-ak b/cad/magic/patches/patch-ak index 324d5605990..6f2e72c3fbc 100644 --- a/cad/magic/patches/patch-ak +++ b/cad/magic/patches/patch-ak @@ -1,95 +1,13 @@ -$NetBSD: patch-ak,v 1.1 2004/01/23 11:43:33 agc Exp $ +$NetBSD: patch-ak,v 1.2 2010/03/03 03:40:00 dmcmahill Exp $ ---- textio/txOutput.c 2004/01/23 10:03:21 1.1 -+++ textio/txOutput.c 2004/01/23 10:05:43 -@@ -42,7 +42,7 @@ - #include "utils/malloc.h" +--- resis/ResRex.c.orig 2009-08-03 13:43:58.000000000 +0000 ++++ resis/ResRex.c +@@ -12,7 +12,7 @@ static char rcsid[] __attribute__ ((unus + /* It is hard to get the value of MAXFLOAT in a portable manner. */ + #if defined(ibm032) + #define MAXFLOAT ((float)3.40282346638528860e+38) +-#elif !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(CYGWIN) && !defined(macosx) ++#elif !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(CYGWIN) && !defined(macosx) && !defined(__DragonFly__) + #include <values.h> + #endif - #ifndef NO_VARARGS --#include <varargs.h> -+#include <stdarg.h> - #endif NO_VARARGS - - /* When a pipe has been opened to "more", the following variables -@@ -82,16 +82,11 @@ - /*VARARGS0*/ - - void --txFprintfBasic(va_alist) --va_dcl -+txFprintfBasic(FILE *f, char *fmt, ...) - { - va_list args; -- char *fmt; -- FILE *f; - -- va_start(args); -- f = va_arg(args, FILE *); -- fmt = va_arg(args, char *); -+ va_start(args, fmt); - (void) GrVfprintf(f, fmt, args); - va_end(args); - } -@@ -135,11 +130,9 @@ - /*VARARGS0*/ - - void --TxPrintf(va_alist) --va_dcl -+TxPrintf(char *fmt, ...) - { - va_list args; -- char *fmt; - FILE *f; - - if (txPrintFlag) -@@ -156,16 +149,14 @@ - if (txHavePrompt) - { - TxUnPrompt(); -- va_start(args); -- fmt = va_arg(args, char *); -+ va_start(args, fmt); - (void) GrVfprintf(f, fmt, args); - va_end(args); - TxPrompt(); - } - else - { -- va_start(args); -- fmt = va_arg(args, char *); -+ va_start(args, fmt); - (void) GrVfprintf(f, fmt, args); - va_end(args); - } -@@ -306,11 +297,9 @@ - #ifndef NO_VARARGS - - void --TxError(va_alist) --va_dcl -+TxError(char *fmt, ...) - { - va_list args; -- char *fmt; - FILE *f; - - (void) fflush(stdout); -@@ -321,15 +310,13 @@ - if (txHavePrompt) - { - TxUnPrompt(); -- va_start(args); -- fmt = va_arg(args, char *); -+ va_start(args, fmt); - (void) GrVfprintf(f, fmt, args); - va_end(args); - TxPrompt(); - } - else { -- va_start(args); -- fmt = va_arg(args, char *); -+ va_start(args, fmt); - (void) GrVfprintf(f, fmt, args); - va_end(args); - } diff --git a/cad/magic/patches/patch-al b/cad/magic/patches/patch-al deleted file mode 100644 index 3c4f78e4a42..00000000000 --- a/cad/magic/patches/patch-al +++ /dev/null @@ -1,49 +0,0 @@ -$NetBSD: patch-al,v 1.1 2004/01/23 11:43:33 agc Exp $ - ---- utils/LIBtextio.c 2004/01/23 10:06:25 1.1 -+++ utils/LIBtextio.c 2004/01/23 10:07:23 -@@ -22,7 +22,7 @@ - #endif not lint - - #include <stdio.h> --#include <varargs.h> -+#include <stdarg.h> - - /* - * ---------------------------------------------------------------------------- -@@ -65,15 +65,13 @@ - */ - - /*VARARGS*/ --TxError(fmt, va_alist) -- char *fmt; -- va_dcl -+TxError(char *fmt, ...) - { - va_list ap; - - (void) fflush(stdout); - (void) fflush(stderr); -- va_start(ap); -+ va_start(ap, fmt); - vfprintf(stderr, fmt, ap); - va_end(ap); - (void) fflush(stderr); -@@ -96,15 +94,13 @@ - */ - - /*VARARGS*/ --TxPrintf(fmt, va_alist) -- char *fmt; -- va_dcl -+TxPrintf(char *fmt, ...) - { - va_list ap; - - (void) fflush(stderr); - (void) fflush(stdout); -- va_start(ap); -+ va_start(ap, fmt); - vfprintf(stdout, fmt, ap); - va_end(ap); - (void) fflush(stdout); diff --git a/cad/magic/patches/patch-am b/cad/magic/patches/patch-am deleted file mode 100644 index 109bf68db9b..00000000000 --- a/cad/magic/patches/patch-am +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-am,v 1.1 2004/01/23 11:43:33 agc Exp $ - ---- textio/textio.h 2004/01/23 10:23:44 1.1 -+++ textio/textio.h 2004/01/23 10:25:00 -@@ -29,10 +29,10 @@ - #endif - - /* printing procedures */ --extern void TxPrintf(); -+extern void TxPrintf(char *, ...); - extern bool TxPrintOn(); /* enables TxPrintf output */ - extern bool TxPrintOff(); /* disables TxPrintf output */ --extern void TxError(); -+extern void TxError(char *, ...); - extern void TxFlush(); - extern void TxVisChar(); - extern void TxUseMore(); diff --git a/cad/magic/patches/patch-an b/cad/magic/patches/patch-an deleted file mode 100644 index 0c6800b0798..00000000000 --- a/cad/magic/patches/patch-an +++ /dev/null @@ -1,10 +0,0 @@ -$NetBSD: patch-an,v 1.1 2004/01/23 11:43:33 agc Exp $ - ---- textio/textioInt.h 2004/01/23 11:06:03 1.1 -+++ textio/textioInt.h 2004/01/23 11:07:01 -@@ -56,4 +56,4 @@ - #endif SYSV - - extern int TxGetInputEvent(); --extern void txFprintfBasic(); -+extern void txFprintfBasic(FILE *, char *, ...); diff --git a/cad/magic/patches/patch-ao b/cad/magic/patches/patch-ao deleted file mode 100644 index ab68a618e8a..00000000000 --- a/cad/magic/patches/patch-ao +++ /dev/null @@ -1,47 +0,0 @@ -$NetBSD: patch-ao,v 1.1 2004/01/23 11:43:33 agc Exp $ - ---- mpack/magicStubs.c 2004/01/23 11:08:24 1.1 -+++ mpack/magicStubs.c 2004/01/23 11:11:30 -@@ -14,6 +14,7 @@ - #endif not lint - - #include <stdio.h> -+#include <stdarg.h> - #include "misc/magic.h" - #include "utils/hash.h" - #include "utils/geometry.h" -@@ -54,22 +55,26 @@ - /* TEXTIO */ - /*VARARGS1*/ - void --TxError(format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20) --char *format; -+TxError(char *format, ...) - { -+ va_list vp; -+ - (void) fflush(stdout); -- (void) fprintf(stderr, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, -- a11, a12, a13, a14, a15, a16, a17, a18, a19, a20); -+ va_start(vp, format); -+ (void) vfprintf(stderr, format, vp); -+ va_end(vp); - (void) fflush(stderr); - } - - /*VARARGS1*/ - void --TxPrintf(format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20) --char *format; -+TxPrintf(char *format, ...) - { -- (void) fprintf(stdout, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, -- a11, a12, a13, a14, a15, a16, a17, a18, a19, a20); -+ va_list vp; -+ -+ va_start(vp, format); -+ (void) vfprintf(stdout, format, vp); -+ va_end(vp); - } - - void diff --git a/cad/magic/patches/patch-ap b/cad/magic/patches/patch-ap deleted file mode 100644 index 9cc3c7268c8..00000000000 --- a/cad/magic/patches/patch-ap +++ /dev/null @@ -1,10 +0,0 @@ -$NetBSD: patch-ap,v 1.1 2004/01/23 11:43:33 agc Exp $ - ---- tech/tech.h 2004/01/23 11:13:01 1.1 -+++ tech/tech.h 2004/01/23 11:13:41 -@@ -23,4 +23,4 @@ - /* ----------------- Exported variables and procedures ---------------- */ - - extern char *TechDefault; /* Name of default technology */ --extern void TechError(); -+extern void TechError(char *, ...); diff --git a/cad/magic/patches/patch-aq b/cad/magic/patches/patch-aq deleted file mode 100644 index b44137b0aaf..00000000000 --- a/cad/magic/patches/patch-aq +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aq,v 1.2 2006/02/16 18:06:46 wiz Exp $ - ---- readline/readline/rltty.c.orig 2000-04-03 16:10:33.000000000 +0000 -+++ readline/readline/rltty.c -@@ -190,7 +190,7 @@ save_tty_chars (tiop) - _rl_tty_chars.t_intr = tiop->tchars.t_intrc; - _rl_tty_chars.t_quit = tiop->tchars.t_quitc; - _rl_tty_chars.t_start = tiop->tchars.t_startc; -- _rl_tty_chars.t_stop = tiop->tchars.t_stopc -+ _rl_tty_chars.t_stop = tiop->tchars.t_stopc; - _rl_tty_chars.t_eof = tiop->tchars.t_eofc; - _rl_tty_chars.t_eol = '\n'; - _rl_tty_chars.t_eol2 = tiop->tchars.t_brkc; diff --git a/cad/magic/patches/patch-ar b/cad/magic/patches/patch-ar deleted file mode 100644 index 449e4da34cd..00000000000 --- a/cad/magic/patches/patch-ar +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ar,v 1.2 2006/02/03 02:19:42 rillig Exp $ - ---- database/DBio.c.orig 2005-12-20 16:39:18.000000000 +0000 -+++ database/DBio.c -@@ -46,7 +46,6 @@ - #include "utils/malloc.h" - #include "signals/signals.h" - --extern int errno; - extern char *Path; - - /* Suffix for all Magic files */ diff --git a/cad/magic/patches/patch-as b/cad/magic/patches/patch-as deleted file mode 100644 index 3f427ba003d..00000000000 --- a/cad/magic/patches/patch-as +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-as,v 1.2 2006/02/03 02:19:42 rillig Exp $ - ---- drc/DRCmain.c.orig 2005-12-20 16:40:25.000000000 +0000 -+++ drc/DRCmain.c -@@ -35,8 +35,6 @@ - #include "drc/drc.h" - #include "undo/undo.h" - --extern void TxPrintf(), TxError(); -- - /* The global variables defined below are parameters between - * the DRC error routines (drcPaintError and drcPrintError) - * and the higher-level routines that start up DRC error checks. diff --git a/cad/magic/patches/patch-at b/cad/magic/patches/patch-at deleted file mode 100644 index cff921fca29..00000000000 --- a/cad/magic/patches/patch-at +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-at,v 1.1 2006/01/06 18:14:06 joerg Exp $ - ---- utils/getrect.c.orig 2005-12-20 16:47:57.000000000 +0000 -+++ utils/getrect.c -@@ -92,6 +92,7 @@ GetRect(fin, skip, rect) - register dir = 0x1; - #endif - -+#if !defined(__DragonFly__) - if (FILE_CNT(fin) < RECTBUFTHRESHOLD) goto slow; - /* - * Fast version of GetRect -- read directly from buffer. -@@ -158,6 +159,8 @@ fastbad: - - /* Slow version of GetRect -- read via getc */ - slow: -+ -+#endif /* __DragonFly__ */ - while (skip-- > 0) - (void) getc(fin); - diff --git a/cad/magic/patches/patch-au b/cad/magic/patches/patch-au deleted file mode 100644 index bbaa8e3c631..00000000000 --- a/cad/magic/patches/patch-au +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-au,v 1.2 2006/02/03 02:19:42 rillig Exp $ - ---- textio/txCommands.c.orig 2005-12-20 16:51:34.000000000 +0000 -+++ textio/txCommands.c -@@ -46,8 +46,6 @@ - #include "utils/utils.h" - #include "lisp/lisp.h" - --extern int errno; -- - /* Turning this flag on prints out input events and commands as they - * are processed. - */ diff --git a/cad/magic/patches/patch-av b/cad/magic/patches/patch-av deleted file mode 100644 index 7e4ab4c5d78..00000000000 --- a/cad/magic/patches/patch-av +++ /dev/null @@ -1,10 +0,0 @@ -$NetBSD: patch-av,v 1.2 2006/02/03 02:19:42 rillig Exp $ - ---- textio/txMain.c.orig 2001-04-16 14:43:50.000000000 +0000 -+++ textio/txMain.c -@@ -22,4 +22,5 @@ - #endif not lint - -+#include <sys/types.h> - #include <stdio.h> - #ifdef SYSV diff --git a/cad/magic/patches/patch-aw b/cad/magic/patches/patch-aw deleted file mode 100644 index a0ca154bbce..00000000000 --- a/cad/magic/patches/patch-aw +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-aw,v 1.1 2006/01/06 18:14:06 joerg Exp $ - ---- sim/SimRsim.c.orig 2005-12-20 16:53:40.000000000 +0000 -+++ sim/SimRsim.c -@@ -41,7 +41,6 @@ - #include "sim/sim.h" - #include <errno.h> - --extern int errno; - static bool InitRsim(); - - #define BUF_SIZE 1024 diff --git a/cad/magic/patches/patch-ax b/cad/magic/patches/patch-ax deleted file mode 100644 index 23983d78daa..00000000000 --- a/cad/magic/patches/patch-ax +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ax,v 1.1 2006/01/06 18:14:06 joerg Exp $ - ---- plot/plotInt.h.orig 2005-12-20 17:17:26.000000000 +0000 -+++ plot/plotInt.h -@@ -27,7 +27,7 @@ int err1 = Need_to_include_utils/geometr - #endif _GEOMETRY - - /* system V machines lack vfont.h, so include the defs below. */ --#if !defined(SYSV) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(CYGWIN) -+#if !defined(SYSV) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(CYGWIN) && !defined(__DragonFly__) - #include <vfont.h> - #else - struct header { diff --git a/cad/magic/patches/patch-ay b/cad/magic/patches/patch-ay deleted file mode 100644 index bb091f11cb7..00000000000 --- a/cad/magic/patches/patch-ay +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ay,v 1.2 2006/02/03 02:19:42 rillig Exp $ - ---- resis/ResRex.c.orig 2005-12-20 17:21:13.000000000 +0000 -+++ resis/ResRex.c -@@ -10,7 +10,7 @@ - /* It is hard to get the value of MAXFLOAT in a portable manner. */ - #if defined(ibm032) || defined(CYGWIN) - #define MAXFLOAT ((float)3.40282346638528860e+38) --#elif !defined(__NetBSD__) -+#elif !defined(__NetBSD__) && !defined(__DragonFly__) - #include <values.h> - #endif - diff --git a/cad/magic/patches/patch-az b/cad/magic/patches/patch-az deleted file mode 100644 index 38d7dc78880..00000000000 --- a/cad/magic/patches/patch-az +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-az,v 1.2 2006/02/03 02:19:42 rillig Exp $ - ---- textio/txInput.c.orig 2006-01-13 18:28:21.000000000 +0000 -+++ textio/txInput.c -@@ -26,9 +26,7 @@ - #include <unistd.h> - #include <ctype.h> - #include <dirent.h> --#ifdef SYSV - #include <string.h> --#endif - - - #include "misc/magsgtty.h" diff --git a/cad/magic/patches/patch-ba b/cad/magic/patches/patch-ba deleted file mode 100644 index d1c455155ff..00000000000 --- a/cad/magic/patches/patch-ba +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ba,v 1.1 2006/02/16 18:06:46 wiz Exp $ - ---- database/DBmain.c.orig 2001-09-21 15:15:31.000000000 +0000 -+++ database/DBmain.c -@@ -81,7 +81,7 @@ void dbMainDummyClient(); - DBMainInit(techName) - char *techName; - { --#if !defined(SYSV) && !defined(CYGWIN) -+#if !defined(SYSV) && !defined(CYGWIN) && !defined(__NetBSD__) - static struct sigvec vec = {0, 0, 0}; - #endif - SectionID sec_tech, sec_planes, sec_types; -@@ -96,7 +96,7 @@ DBMainInit(techName) - DBVerbose = FALSE; - - /* Handle termination (mainly for case where we run out of memory) */ --#if defined(SYSV) || defined(CYGWIN) -+#if defined(SYSV) || defined(CYGWIN) || defined(__NetBSD__) - signal(SIGTERM,dbMainOnTerm); - #else - vec.sv_handler = dbMainOnTerm; diff --git a/cad/magic/patches/patch-bb b/cad/magic/patches/patch-bb deleted file mode 100644 index 597d37f19ec..00000000000 --- a/cad/magic/patches/patch-bb +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-bb,v 1.1 2006/02/16 18:06:46 wiz Exp $ - ---- signals/signals.c.orig 2001-10-25 19:02:44.000000000 +0000 -+++ signals/signals.c -@@ -539,7 +539,7 @@ SigInit() - void - sigSetAction(int signo, sigRetVal (*handler)(int)) - { --#if defined(SYSV) || defined(CYGWIN) -+#if defined(SYSV) || defined(CYGWIN) || defined(__NetBSD__) - struct sigaction sa; - - sa.sa_handler = handler; diff --git a/cad/magic/patches/patch-bc b/cad/magic/patches/patch-bc deleted file mode 100644 index d45bdac8043..00000000000 --- a/cad/magic/patches/patch-bc +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-bc,v 1.1 2006/02/16 18:06:46 wiz Exp $ - ---- graphics/X11Helper.c.orig 2001-09-21 15:15:41.000000000 +0000 -+++ graphics/X11Helper.c -@@ -296,7 +296,7 @@ MapWindow(int signo) - void - sigSetAction(int signo, sigRetVal (*handler)(int)) - { --#if defined(SYSV) || defined(CYGWIN) -+#if defined(SYSV) || defined(CYGWIN) || defined(__NetBSD__) - struct sigaction sa; - - sa.sa_handler = handler; |