Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 26 Sep 2012 02:21:11 +0900
From:      KATO Tsuguru <tkato432@yahoo.com>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/171972: cad/magic: Update to version 7.5.221
Message-ID:  <20120926022111.053993ca6f3ccbb48e3c79d5@yahoo.com>
Resent-Message-ID: <201209251810.q8PIADeN017897@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         171972
>Category:       ports
>Synopsis:       cad/magic: Update to version 7.5.221
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Sep 25 18:10:13 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 7.4-RELEASE-p10 i386
>Organization:
>Environment:
>Description:
- Update to version 7.5.221

New file:
files/patch-calma__CalmaRdcl.c
files/patch-calma__CalmaRead.c
files/patch-cif__CIFrdtech.c
files/patch-ext2sim__ext2sim.c
files/patch-ext2spice__ext2spice.c
files/patch-extflat__EFvisit.c
files/patch-grouter__grouteChan.c
files/patch-grouter__grouteDens.c
files/patch-lef__defRead.c
files/patch-mzrouter__mzDebug.c
files/patch-netmenu__NMmain.c
files/patch-netmenu__NMnetlist.c
files/patch-netmenu__NMshowpt.c
files/patch-netmenu__NMshwcell.c
files/patch-netmenu__NMwiring.c
files/patch-plow__PlowMain.c
files/patch-plow__PlowRules1.c
files/patch-plow__PlowRules2.c
files/patch-windows__windDisp.c

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/cad/magic/Makefile cad/magic/Makefile
--- /usr/ports/cad/magic/Makefile	2012-05-21 12:10:12.000000000 +0900
+++ cad/magic/Makefile	2012-09-25 03:17:43.000000000 +0900
@@ -1,12 +1,8 @@
-# New ports collection makefile for:    magic
-# Date created:         18 Dec 1994
-# Whom:                 swallace
-#
+# Created by: swallace
 # $FreeBSD: ports/cad/magic/Makefile,v 1.40 2012/05/21 03:10:12 miwi Exp $
-#
 
 PORTNAME=	magic
-PORTVERSION=	7.5.220
+PORTVERSION=	7.5.221
 CATEGORIES=	cad
 MASTER_SITES=	http://opencircuitdesign.com/magic/archive/ \
 		http://fossies.org/linux/misc/
@@ -17,7 +13,7 @@
 
 LICENSE=	BSD
 
-LIB_DEPENDS=	BLT24.3:${PORTSDIR}/x11-toolkits/blt
+LIB_DEPENDS=	BLT24:${PORTSDIR}/x11-toolkits/blt
 
 CONFIGURE_WRKSRC=	${WRKSRC}/scripts
 
diff -urN /usr/ports/cad/magic/distinfo cad/magic/distinfo
--- /usr/ports/cad/magic/distinfo	2012-05-21 12:10:12.000000000 +0900
+++ cad/magic/distinfo	2012-09-12 05:30:07.000000000 +0900
@@ -1,2 +1,2 @@
-SHA256 (magic-7.5.220.tgz) = a6a9c2bcd3e16942165a40cdcda28937f2cc122a47d92812f47e46dd67d0f69e
-SIZE (magic-7.5.220.tgz) = 3746889
+SHA256 (magic-7.5.221.tgz) = 7f028ba6e2ed35861d4b3256c5b0f87491901283769257432943be4372fcb42b
+SIZE (magic-7.5.221.tgz) = 3746873
diff -urN /usr/ports/cad/magic/files/patch-calma__CalmaRdcl.c cad/magic/files/patch-calma__CalmaRdcl.c
--- /usr/ports/cad/magic/files/patch-calma__CalmaRdcl.c	1970-01-01 09:00:00.000000000 +0900
+++ cad/magic/files/patch-calma__CalmaRdcl.c	2012-09-13 00:56:19.000000000 +0900
@@ -0,0 +1,99 @@
+--- calma/CalmaRdcl.c.orig	2010-06-25 22:59:51.000000000 +0900
++++ calma/CalmaRdcl.c	2012-09-13 00:54:14.000000000 +0900
+@@ -540,7 +540,7 @@
+     calmaSkipSet(calmaElementIgnore);
+ 
+     /* Read subcell name */
+-    if (!calmaReadStringRecord(CALMA_SNAME, &sname)) return;
++    if (!calmaReadStringRecord(CALMA_SNAME, &sname)) return 0;
+ 
+     /*
+      * Create a new cell use with this transform.  If the
+@@ -618,20 +618,20 @@
+ 			def->cd_name, cifReadCellDef->cd_name);
+ 	calmaReadError(" and can't be used as a subcell.\n");
+ 	calmaReadError("(Use skipped)\n");
+-	return;
++	return 0;
+     }
+ 
+     /* Read subcell transform */
+     if (!calmaReadTransform(&trans, sname))
+     {
+ 	printf("Couldn't read transform.\n");
+-	return;
++	return 0;
+     }
+ 
+     /* Get number of columns and rows if array */
+     cols = rows = 0;  /* For half-smart compilers that complain otherwise. */
+     READRH(nbytes, rtype);
+-    if (nbytes < 0) return;
++    if (nbytes < 0) return 0;
+     if (rtype == CALMA_COLROW)
+     {
+ 	isArray = TRUE;
+@@ -639,7 +639,7 @@
+ 	READI2(rows);
+ 	xlo = 0; xhi = cols - 1;
+ 	ylo = 0; yhi = rows - 1;
+-	if (feof(calmaInputFile)) return;
++	if (feof(calmaInputFile)) return 0;
+ 	(void) calmaSkipBytes(nbytes - CALMAHEADERLENGTH - 4);
+     }
+     else
+@@ -653,11 +653,11 @@
+      * For arrays, there will be three; for their meanings, see below.
+      */
+     READRH(nbytes, rtype)
+-    if (nbytes < 0) return;
++    if (nbytes < 0) return 0;
+     if (rtype != CALMA_XY)
+     {
+ 	calmaUnexpected(CALMA_XY, rtype);
+-	return;
++	return 0;
+     }
+ 
+     /* Length of remainder of record */
+@@ -695,7 +695,7 @@
+ 	{
+ 	    calmaReadPoint(&refarray[n], 1);
+ 	    if (feof(calmaInputFile))
+-		return;
++		return 0;
+ 	}
+     }
+     else
+@@ -726,7 +726,7 @@
+ 	    }
+ 
+ 	    if (feof(calmaInputFile))
+-		return;
++		return 0;
+ 	}
+     }
+ 
+@@ -787,19 +787,19 @@
+     while (1)
+     {
+ 	READRH(nbytes, rtype);
+-	if (nbytes < 0) return;
++	if (nbytes < 0) return 0;
+ 	if (rtype == CALMA_PROPATTR)
+ 	{
+ 	    READI2(propAttrType);
+ 	    if (propAttrType == CALMA_PROP_USENAME)
+ 	    {
+ 		if (!calmaReadStringRecord(CALMA_PROPVALUE, &useid))
+-		    return;
++		    return 0;
+ 	    }
+ 	    else if (propAttrType == CALMA_PROP_ARRAY_LIMITS)
+ 	    {
+ 		if (!calmaReadStringRecord(CALMA_PROPVALUE, &arraystr))
+-		    return;
++		    return 0;
+ 		else if (arraystr)
+ 		{
+ 		    int xl, xh, yl, yh;
diff -urN /usr/ports/cad/magic/files/patch-calma__CalmaRead.c cad/magic/files/patch-calma__CalmaRead.c
--- /usr/ports/cad/magic/files/patch-calma__CalmaRead.c	1970-01-01 09:00:00.000000000 +0900
+++ cad/magic/files/patch-calma__CalmaRead.c	2012-09-13 00:52:07.000000000 +0900
@@ -0,0 +1,11 @@
+--- calma/CalmaRead.c.orig	2008-01-16 02:08:40.000000000 +0900
++++ calma/CalmaRead.c	2012-09-13 00:51:41.000000000 +0900
+@@ -442,7 +442,7 @@
+     char *a1, *a2, *a3, *a4, *a5, *a6, *a7, *a8, *a9, *a10;
+ {
+     calmaTotalErrors++;
+-    if (CIFWarningLevel == CIF_WARN_NONE) return;
++    if (CIFWarningLevel == CIF_WARN_NONE) return 0;
+ 
+     if ((calmaTotalErrors < 100) || (CIFWarningLevel != CIF_WARN_LIMIT))
+     {
diff -urN /usr/ports/cad/magic/files/patch-cif__CIFrdtech.c cad/magic/files/patch-cif__CIFrdtech.c
--- /usr/ports/cad/magic/files/patch-cif__CIFrdtech.c	1970-01-01 09:00:00.000000000 +0900
+++ cad/magic/files/patch-cif__CIFrdtech.c	2012-09-13 00:58:47.000000000 +0900
@@ -0,0 +1,11 @@
+--- cif/CIFrdtech.c.orig	2010-09-16 00:45:09.000000000 +0900
++++ cif/CIFrdtech.c	2012-09-13 00:58:26.000000000 +0900
+@@ -1218,7 +1218,7 @@
+ 
+     lgcf = FindGCF(istyle->crs_scaleFactor, istyle->crs_multiplier);
+     if (lgcf < lmult) lmult = lgcf;
+-    if (lmult == 0) return;
++    if (lmult == 0) return 0;
+ 
+     /* fprintf(stderr, "Multiplier goes from %d to %d\n", istyle->crs_multiplier,
+ 		istyle->crs_multiplier / lmult); */
diff -urN /usr/ports/cad/magic/files/patch-ext2sim__ext2sim.c cad/magic/files/patch-ext2sim__ext2sim.c
--- /usr/ports/cad/magic/files/patch-ext2sim__ext2sim.c	1970-01-01 09:00:00.000000000 +0900
+++ cad/magic/files/patch-ext2sim__ext2sim.c	2012-09-13 00:45:40.000000000 +0900
@@ -0,0 +1,20 @@
+--- ext2sim/ext2sim.c.orig	2012-04-20 23:12:44.000000000 +0900
++++ ext2sim/ext2sim.c	2012-09-13 00:45:15.000000000 +0900
+@@ -1209,7 +1209,7 @@
+     	if (he == NULL)
+     	{
+ 		fprintf(outf, "errGnd!");
+-		return;
++		return 0;
+     	}
+     	/* Canonical name */
+     	nn = (EFNodeName *) HashGetValue(he);
+@@ -1338,7 +1338,7 @@
+     if (he == NULL)
+     {
+ 	fprintf(outf, " GND");
+-	return;
++	return 0;
+     }
+ 
+     /* Canonical name */
diff -urN /usr/ports/cad/magic/files/patch-ext2spice__ext2spice.c cad/magic/files/patch-ext2spice__ext2spice.c
--- /usr/ports/cad/magic/files/patch-ext2spice__ext2spice.c	1970-01-01 09:00:00.000000000 +0900
+++ cad/magic/files/patch-ext2spice__ext2spice.c	2012-09-13 00:48:24.000000000 +0900
@@ -0,0 +1,29 @@
+--- ext2spice/ext2spice.c.orig	2012-04-30 21:17:37.000000000 +0900
++++ ext2spice/ext2spice.c	2012-09-13 00:48:02.000000000 +0900
+@@ -2119,7 +2119,7 @@
+ 	if ((node == NULL) || (node->efnode_client == (ClientData)NULL))
+ 	{
+ 	    TxError("spcnAP: major internal inconsistency\n");
+-	    return;
++	    return 0;
+ 	}
+ 
+ 	if ( esScale < 0 )
+@@ -2138,7 +2138,7 @@
+ 	    ((float)node->efnode_pa[resClass].pa_area*scale*scale)
+ 	    *esScale*esScale*dsc,
+ 	    ((float)node->efnode_pa[resClass].pa_perim*scale)*esScale*dsc);
+-	return;
++	return 0;
+ 
+ oldFmt:
+ 	if ( resClass == NO_RESCLASS ||
+@@ -2226,7 +2226,7 @@
+     if (he == NULL)
+     {
+ 	fprintf(outf, " errGnd!");
+-	return;
++	return 0;
+     }
+     nn = (EFNodeName *) HashGetValue(he);
+     fprintf(outf, " %s", nodeSpiceName(nn->efnn_node->efnode_name->efnn_hier));
diff -urN /usr/ports/cad/magic/files/patch-extflat__EFvisit.c cad/magic/files/patch-extflat__EFvisit.c
--- /usr/ports/cad/magic/files/patch-extflat__EFvisit.c	1970-01-01 09:00:00.000000000 +0900
+++ cad/magic/files/patch-extflat__EFvisit.c	2012-09-12 23:55:47.000000000 +0900
@@ -0,0 +1,11 @@
+--- extflat/EFvisit.c.orig	2009-07-01 22:38:11.000000000 +0900
++++ extflat/EFvisit.c	2012-09-12 23:54:40.000000000 +0900
+@@ -576,7 +576,7 @@
+ 	return 0;
+ 
+     if ((he = EFHNLook(hc->hc_hierName, name2, "resist(2)")) == NULL)
+-	return;
++	return 0;
+     n2 = ((EFNodeName *) HashGetValue(he))->efnn_node;
+     if (n2->efnode_flags & EF_KILLED)
+ 	return 0;
diff -urN /usr/ports/cad/magic/files/patch-grouter__grouteChan.c cad/magic/files/patch-grouter__grouteChan.c
--- /usr/ports/cad/magic/files/patch-grouter__grouteChan.c	1970-01-01 09:00:00.000000000 +0900
+++ cad/magic/files/patch-grouter__grouteChan.c	2012-09-13 01:04:50.000000000 +0900
@@ -0,0 +1,20 @@
+--- grouter/grouteChan.c.orig	2007-04-21 02:57:00.000000000 +0900
++++ grouter/grouteChan.c	2012-09-13 01:04:14.000000000 +0900
+@@ -446,7 +446,7 @@
+     WindUpdate();
+     (void) sprintf(m, "%s: --more-- (t for tiles): ", mesg);
+     if (TxGetLinePrompt(answer, sizeof answer, m) == NULL || answer[0] != 't')
+-	return;
++	return 0;
+ 
+     (void) DBSrPaintArea((Tile *) NULL, glChanPlane, &TiPlaneRect,
+ 	    &DBAllTypeBits, glChanShowFunc, (ClientData) NULL);
+@@ -467,7 +467,7 @@
+     TxMore(mesg);
+     ShowRect(EditCellUse->cu_def, &r, STYLE_ERASEHIGHLIGHTS);
+     if (tile->ti_client == (ClientData) CLIENTDEFAULT)
+-	return;
++	return 0;
+     ch = (GCRChannel *) tile->ti_client;
+     ShowRect(EditCellUse->cu_def, &ch->gcr_area, STYLE_MEDIUMHIGHLIGHTS);
+     (void) sprintf(mesg, "chan %x type=%d", ch, ch->gcr_type);
diff -urN /usr/ports/cad/magic/files/patch-grouter__grouteDens.c cad/magic/files/patch-grouter__grouteDens.c
--- /usr/ports/cad/magic/files/patch-grouter__grouteDens.c	1970-01-01 09:00:00.000000000 +0900
+++ cad/magic/files/patch-grouter__grouteDens.c	2012-09-13 01:07:08.000000000 +0900
@@ -0,0 +1,11 @@
+--- grouter/grouteDens.c.orig	2006-04-11 07:03:14.000000000 +0900
++++ grouter/grouteDens.c	2012-09-13 01:06:43.000000000 +0900
+@@ -78,7 +78,7 @@
+     ASSERT(srcPin->gcr_ch == dstPin->gcr_ch, "glDensAdjust");
+ 
+     if (DebugIsSet(glDebugID, glDebGreedy))
+-	return;
++	return 0;
+ 
+     /*
+      * Find the first and last column where this net (netId)
diff -urN /usr/ports/cad/magic/files/patch-lef__defRead.c cad/magic/files/patch-lef__defRead.c
--- /usr/ports/cad/magic/files/patch-lef__defRead.c	1970-01-01 09:00:00.000000000 +0900
+++ cad/magic/files/patch-lef__defRead.c	2012-09-13 01:01:56.000000000 +0900
@@ -0,0 +1,11 @@
+--- lef/defRead.c.orig	2008-05-11 05:13:05.000000000 +0900
++++ lef/defRead.c	2012-09-13 01:01:24.000000000 +0900
+@@ -599,7 +599,7 @@
+     if (keyword < 0)
+     {
+ 	LefError("Unknown macro orientation \"%s\".\n", token);
+-	return;
++	return 0;
+     }
+ 
+     /* The standard transformations are all defined to rotate	*/
diff -urN /usr/ports/cad/magic/files/patch-mzrouter__mzDebug.c cad/magic/files/patch-mzrouter__mzDebug.c
--- /usr/ports/cad/magic/files/patch-mzrouter__mzDebug.c	1970-01-01 09:00:00.000000000 +0900
+++ cad/magic/files/patch-mzrouter__mzDebug.c	2012-09-13 01:09:40.000000000 +0900
@@ -0,0 +1,11 @@
+--- mzrouter/mzDebug.c.orig	2007-04-21 02:57:00.000000000 +0900
++++ mzrouter/mzDebug.c	2012-09-13 01:09:14.000000000 +0900
+@@ -457,7 +457,7 @@
+ 
+ 	TxPrintf("}\n");
+     }
+-    return;
++    return 0;
+ }
+ 
+ /*
diff -urN /usr/ports/cad/magic/files/patch-netmenu__NMmain.c cad/magic/files/patch-netmenu__NMmain.c
--- /usr/ports/cad/magic/files/patch-netmenu__NMmain.c	1970-01-01 09:00:00.000000000 +0900
+++ cad/magic/files/patch-netmenu__NMmain.c	2012-09-13 00:00:49.000000000 +0900
@@ -0,0 +1,29 @@
+--- netmenu/NMmain.c.orig	2006-04-11 07:03:14.000000000 +0900
++++ netmenu/NMmain.c	2012-09-12 23:59:37.000000000 +0900
+@@ -256,7 +256,7 @@
+      * can be called before the window exists).
+      */
+     
+-    if (NMWindow == (MagWindow *) NULL) return;
++    if (NMWindow == (MagWindow *) NULL) return 0;
+ 
+     GrLock(w, TRUE);
+ 
+@@ -372,7 +372,7 @@
+ 	goto done;
+     }
+ 
+-    if (w == NULL) return;
++    if (w == NULL) return 0;
+ 
+     WindPointToSurface(w, &cmd->tx_p, &surfacePoint, (Rect *) NULL);
+ 
+@@ -432,7 +432,7 @@
+ 
+     done:
+     UndoNext();
+-    return;
++    return 0;
+ }
+ 	    
+ 
diff -urN /usr/ports/cad/magic/files/patch-netmenu__NMnetlist.c cad/magic/files/patch-netmenu__NMnetlist.c
--- /usr/ports/cad/magic/files/patch-netmenu__NMnetlist.c	1970-01-01 09:00:00.000000000 +0900
+++ cad/magic/files/patch-netmenu__NMnetlist.c	2012-09-13 00:07:59.000000000 +0900
@@ -0,0 +1,139 @@
+--- netmenu/NMnetlist.c.orig	2006-04-11 07:03:14.000000000 +0900
++++ netmenu/NMnetlist.c	2012-09-13 00:05:02.000000000 +0900
+@@ -223,12 +223,12 @@
+     HashEntry *h;
+     NetEntry *entry;
+ 
+-    if ((name == 0) || (nmCurrentNetlist == NULL)) return;
++    if ((name == 0) || (nmCurrentNetlist == NULL)) return 0;
+ 
+     h = HashLookOnly(&nmCurrentNetlist->nl_table, name);
+-    if (h == NULL) return;
++    if (h == NULL) return 0;
+     entry = (NetEntry *) HashGetValue(h);
+-    if (entry == 0) return;
++    if (entry == 0) return 0;
+     nmCurrentNetlist->nl_flags |= NL_MODIFIED;
+     HashSetValue(h, 0);
+     NMUndo(entry->ne_name, entry->ne_next->ne_name, NMUE_REMOVE);
+@@ -264,8 +264,8 @@
+     HashEntry *ha, *hb;
+     NetEntry *netA, *netB, *tmp;
+ 
+-    if ((termA == NULL) || (termB == NULL)) return;
+-    if (nmCurrentNetlist == NULL) return;
++    if ((termA == NULL) || (termB == NULL)) return 0;
++    if (nmCurrentNetlist == NULL) return 0;
+ 
+     /* Lookup the two nets, and make sure that they both exist
+      * and aren't already the same.
+@@ -275,12 +275,12 @@
+     netA = (NetEntry *) HashGetValue(ha);
+     hb = HashFind(&nmCurrentNetlist->nl_table, termB);
+     netB = (NetEntry *) HashGetValue(hb);
+-    if ((netA == 0) || (netB == 0)) return;
++    if ((netA == 0) || (netB == 0)) return 0;
+     nmCurrentNetlist->nl_flags |= NL_MODIFIED;
+     tmp = netA;
+     while (TRUE)
+     {
+-	if (tmp == netB) return;
++	if (tmp == netB) return 0;
+ 	tmp = tmp->ne_next;
+ 	if (tmp == netA) break;
+     }
+@@ -336,11 +336,11 @@
+     HashEntry *h;
+     NetEntry *ne, *next;
+ 
+-    if ((net == NULL) || (nmCurrentNetlist == NULL)) return;
++    if ((net == NULL) || (nmCurrentNetlist == NULL)) return 0;
+     h = HashLookOnly(&nmCurrentNetlist->nl_table, net);
+-    if (h == NULL) return;
++    if (h == NULL) return 0;
+     ne = (NetEntry *) HashGetValue(h);
+-    if (ne == 0) return;
++    if (ne == 0) return 0;
+     nmCurrentNetlist->nl_flags |= NL_MODIFIED;
+ 
+     /* The order of processing is a bit tricky.  Since we use net for
+@@ -402,7 +402,7 @@
+     if ((name == NULL) || (name[0] == 0))
+     {
+ 	nmCurrentNetlist = NULL;
+-	return;
++	return 0;
+     }
+ 
+     /* First of all, see if this netlist is already loaded. */
+@@ -412,7 +412,7 @@
+ 	if (strcmp(name, new->nl_name) == 0)
+ 	{
+ 	    nmCurrentNetlist = new;
+-	    return;
++	    return 0;
+ 	}
+     }
+ 
+@@ -440,7 +440,7 @@
+ 	TxError("Creating new netlist.\n");
+ 	new->nl_fileName = mallocMagic((unsigned) (5 + strlen(name)));
+ 	(void) sprintf(new->nl_fileName, "%s.net", name);
+-	return;
++	return 0;
+     }
+     (void) StrDup(&new->nl_fileName, fullName);
+     if ((fgets(line, MAXLINESIZE, file) == NULL)
+@@ -450,7 +450,7 @@
+ 	TxError("%s isn't a legal netlist file.\n", new->nl_fileName);
+ 	TxError("Creating new netlist.\n");
+ 	(void) fclose(file);
+-	return;
++	return 0;
+     }
+ 
+     /* Read nets from the file one at a time.  Each net consists of
+@@ -756,7 +756,7 @@
+     if (nmCurrentNetlist == NULL)
+     {
+ 	TxError("There isn't a current net list to write.\n");
+-	return;
++	return 0;
+     }
+ 
+     /* Decide what file to use to write the file (if an explicit name
+@@ -776,8 +776,8 @@
+ 	    (void) fclose(file);
+ 	    TxPrintf("Net list file %s already exists.", realName);
+ 	    TxPrintf("  Should I overwrite it? [no] ");
+-	    if (TxGetLine(line, 50) == (char *) NULL) return;
+-	    if ((strcmp(line, "y") != 0) && (strcmp(line, "yes") != 0)) return;
++	    if (TxGetLine(line, 50) == (char *) NULL) return 0;
++	    if ((strcmp(line, "y") != 0) && (strcmp(line, "yes") != 0)) return 0;
+ 	}
+     }
+ 
+@@ -786,7 +786,7 @@
+     if (file == NULL)
+     {
+ 	TxError("Couldn't write file %s.\n", realName);
+-	return;
++	return 0;
+     }
+     fprintf(file, " Netlist File\n");
+     (void) NMEnumNets(nmWriteNetsFunc, (ClientData) file);
+@@ -906,12 +906,12 @@
+ 	    case 1:
+ 		break;
+ 	    case 2:
+-		return;
++		return 0;
+ 	}
+     }
+ 
+     nmCurrentNetlist = saveCurrent;
+-    return;
++    return 0;
+ }
+ 
+ /*
diff -urN /usr/ports/cad/magic/files/patch-netmenu__NMshowpt.c cad/magic/files/patch-netmenu__NMshowpt.c
--- /usr/ports/cad/magic/files/patch-netmenu__NMshowpt.c	1970-01-01 09:00:00.000000000 +0900
+++ cad/magic/files/patch-netmenu__NMshowpt.c	2012-09-13 00:11:20.000000000 +0900
@@ -0,0 +1,13 @@
+--- netmenu/NMshowpt.c.orig	2006-04-11 07:03:14.000000000 +0900
++++ netmenu/NMshowpt.c	2012-09-13 00:10:41.000000000 +0900
+@@ -86,8 +86,8 @@
+      * root definition for this window is the edit's root definition.
+      */
+ 
+-    if (nmspArrayUsed == 0) return;
+-    if (((CellUse *)(window->w_surfaceID))->cu_def != EditRootDef) return;
++    if (nmspArrayUsed == 0) return 0;
++    if (((CellUse *)(window->w_surfaceID))->cu_def != EditRootDef) return 0;
+ 
+     for (i = 0; i < nmspArrayUsed; i += 1)
+     {
diff -urN /usr/ports/cad/magic/files/patch-netmenu__NMshwcell.c cad/magic/files/patch-netmenu__NMshwcell.c
--- /usr/ports/cad/magic/files/patch-netmenu__NMshwcell.c	1970-01-01 09:00:00.000000000 +0900
+++ cad/magic/files/patch-netmenu__NMshwcell.c	2012-09-13 00:24:51.000000000 +0900
@@ -0,0 +1,38 @@
+--- netmenu/NMshowcell.c.orig	2006-04-11 07:03:14.000000000 +0900
++++ netmenu/NMshowcell.c	2012-09-13 00:21:50.000000000 +0900
+@@ -92,7 +92,7 @@
+      * this window.
+      */
+ 
+-    if (((CellUse *)(window->w_surfaceID))->cu_def != nmscRootDef) return;
++    if (((CellUse *)(window->w_surfaceID))->cu_def != nmscRootDef) return 0;
+ 
+     /* If this window is zoomed way out (less than 1 pixel per lambda)
+      * use solid highlighting to maximize visibility.  It the window
+@@ -109,7 +109,7 @@
+      * redraw.
+      */
+ 
+-    if (!DBBoundPlane(plane, &area)) return;
++    if (!DBBoundPlane(plane, &area)) return 0;
+     nmscPlane = plane;
+     for (i = PL_TECHDEPBASE; i < DBNumPlanes; i += 1)
+     {
+@@ -330,7 +330,7 @@
+ 	if (NMCurNetName == NULL)
+ 	{
+ 	    TxError("You must select a net before you can trace it.\n");
+-	    return;
++	    return 0;
+ 	}
+ 	else netName = NMCurNetName;
+     }
+@@ -344,7 +344,7 @@
+     {
+ 	TxError("The net list has no net containing the terminal \"%s\"\n",
+ 	    netName);
+-	return;
++	return 0;
+     }
+     (void) NMEnumTerms(NMCurNetName, nmShowRoutedNetFunc,
+ 	    (ClientData) EditCellUse);
diff -urN /usr/ports/cad/magic/files/patch-netmenu__NMwiring.c cad/magic/files/patch-netmenu__NMwiring.c
--- /usr/ports/cad/magic/files/patch-netmenu__NMwiring.c	1970-01-01 09:00:00.000000000 +0900
+++ cad/magic/files/patch-netmenu__NMwiring.c	2012-09-13 00:31:09.000000000 +0900
@@ -0,0 +1,20 @@
+--- netmenu/NMwiring.c.orig	2006-04-11 07:03:14.000000000 +0900
++++ netmenu/NMwiring.c	2012-09-13 00:30:35.000000000 +0900
+@@ -162,7 +162,7 @@
+     /* Collect all the connected areas together into a list. */
+ 
+     list = NULL;
+-    if (!ToolGetEditBox(&area)) return;
++    if (!ToolGetEditBox(&area)) return 0;
+ 
+     /* Expand the box to get everything touching it. */
+ 
+@@ -537,7 +537,7 @@
+     Rect area;
+     char *net = NULL;
+ 
+-    if (!ToolGetEditBox(&area)) return;
++    if (!ToolGetEditBox(&area)) return 0;
+ 
+     /* Expand the box area so we'll pick up everything touching it. */
+ 
diff -urN /usr/ports/cad/magic/files/patch-plow__PlowMain.c cad/magic/files/patch-plow__PlowMain.c
--- /usr/ports/cad/magic/files/patch-plow__PlowMain.c	1970-01-01 09:00:00.000000000 +0900
+++ cad/magic/files/patch-plow__PlowMain.c	2012-09-13 00:34:41.000000000 +0900
@@ -0,0 +1,11 @@
+--- plow/PlowMain.c.orig	2006-04-11 07:03:13.000000000 +0900
++++ plow/PlowMain.c	2012-09-13 00:34:13.000000000 +0900
+@@ -1182,7 +1182,7 @@
+     Rect r, newEdgeR;
+ 
+     if (PlowJogHorizon == 0)
+-	return;
++	return 0;
+ 
+     horizonTop = edge->e_ytop + PlowJogHorizon;
+     horizonBot = edge->e_ybot - PlowJogHorizon;
diff -urN /usr/ports/cad/magic/files/patch-plow__PlowRules1.c cad/magic/files/patch-plow__PlowRules1.c
--- /usr/ports/cad/magic/files/patch-plow__PlowRules1.c	1970-01-01 09:00:00.000000000 +0900
+++ cad/magic/files/patch-plow__PlowRules1.c	2012-09-13 00:36:52.000000000 +0900
@@ -0,0 +1,11 @@
+--- plow/PlowRules1.c.orig	2006-04-11 07:03:13.000000000 +0900
++++ plow/PlowRules1.c	2012-09-13 00:36:26.000000000 +0900
+@@ -547,7 +547,7 @@
+      * we play conservative and just use the maximum halo size.
+      */
+     if (plowMaxDist[edge->e_ltype] == 0)
+-	return;
++	return 0;
+     ar.ar_clip.p_x = edge->e_newx;
+     ar.ar_clip.p_y = edge->e_ybot - plowMaxDist[edge->e_ltype];
+     startPoint.p_x = edge->e_x;
diff -urN /usr/ports/cad/magic/files/patch-plow__PlowRules2.c cad/magic/files/patch-plow__PlowRules2.c
--- /usr/ports/cad/magic/files/patch-plow__PlowRules2.c	1970-01-01 09:00:00.000000000 +0900
+++ cad/magic/files/patch-plow__PlowRules2.c	2012-09-13 00:39:52.000000000 +0900
@@ -0,0 +1,29 @@
+--- plow/PlowRules2.c.orig	2007-04-21 02:57:00.000000000 +0900
++++ plow/PlowRules2.c	2012-09-13 00:39:42.000000000 +0900
+@@ -250,7 +250,7 @@
+     tp = TiSrPointNoHint(plowYankDef->cd_planes[edge->e_pNum], &p);
+     pr = plowSpacingRulesTbl[edge->e_ltype][TiGetTypeExact(tp)];
+     if (pr == (PlowRule *) NULL)
+-	return;
++	return 0;
+ 
+     searchRect.r_xbot = edge->e_x - 1;
+     searchRect.r_ytop = edge->e_ybot;
+@@ -514,7 +514,7 @@
+     startPoint.p_y = edge->e_ybot - 1;
+     tp = TiSrPointNoHint(plowYankDef->cd_planes[edge->e_pNum], &startPoint);
+     if (TiGetTypeExact(tp) == TT_SPACE)
+-	return;
++	return 0;
+ 
+     ltype = edge->e_ltype;
+     rtype = TiGetTypeExact(tp);
+@@ -604,7 +604,7 @@
+ 		GMASK_EAST|GMASK_WEST|GMASK_NORTH|GMASK_SOUTH,
+ 		plowIllegalBotProc, (ClientData) &ar);
+     if (ar.ar_slivtype == (TileType) -1)
+-	return;
++	return 0;
+ 
+     startPoint.p_x = ar.ar_mustmove;
+     TTMaskSetOnlyType(&insideTypes, ar.ar_slivtype);
diff -urN /usr/ports/cad/magic/files/patch-windows__windDisp.c cad/magic/files/patch-windows__windDisp.c
--- /usr/ports/cad/magic/files/patch-windows__windDisp.c	1970-01-01 09:00:00.000000000 +0900
+++ cad/magic/files/patch-windows__windDisp.c	2012-09-13 00:42:39.000000000 +0900
@@ -0,0 +1,11 @@
+--- windows/windDisp.c.orig	2006-04-11 07:03:14.000000000 +0900
++++ windows/windDisp.c	2012-09-13 00:42:00.000000000 +0900
+@@ -81,7 +81,7 @@
+     MagWindow *sw, *tw;
+     int wct = 0;
+ 
+-    if (*w != NULL) return;
++    if (*w != NULL) return 0;
+ 
+     if (windTopWindow != NULL)
+     {
>Release-Note:
>Audit-Trail:
>Unformatted:



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