View | Details | Raw Unified | Return to bug 171972 | Differences between
and this patch

Collapse All | Expand All

(-)cad/magic/Makefile (-7 / +3 lines)
Lines 1-12 Link Here
1
# New ports collection makefile for:    magic
1
# Created by: swallace
2
# Date created:         18 Dec 1994
3
# Whom:                 swallace
4
#
5
# $FreeBSD: ports/cad/magic/Makefile,v 1.40 2012/05/21 03:10:12 miwi Exp $
2
# $FreeBSD: ports/cad/magic/Makefile,v 1.40 2012/05/21 03:10:12 miwi Exp $
6
#
7
3
8
PORTNAME=	magic
4
PORTNAME=	magic
9
PORTVERSION=	7.5.220
5
PORTVERSION=	7.5.225
10
CATEGORIES=	cad
6
CATEGORIES=	cad
11
MASTER_SITES=	http://opencircuitdesign.com/magic/archive/ \
7
MASTER_SITES=	http://opencircuitdesign.com/magic/archive/ \
12
		http://fossies.org/linux/misc/
8
		http://fossies.org/linux/misc/
Lines 17-23 Link Here
17
13
18
LICENSE=	BSD
14
LICENSE=	BSD
19
15
20
LIB_DEPENDS=	BLT24.3:${PORTSDIR}/x11-toolkits/blt
16
LIB_DEPENDS=	BLT24:${PORTSDIR}/x11-toolkits/blt
21
17
22
CONFIGURE_WRKSRC=	${WRKSRC}/scripts
18
CONFIGURE_WRKSRC=	${WRKSRC}/scripts
23
19
(-)cad/magic/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (magic-7.5.220.tgz) = a6a9c2bcd3e16942165a40cdcda28937f2cc122a47d92812f47e46dd67d0f69e
1
SHA256 (magic-7.5.225.tgz) = a08a52697fed5b55701a66de14c8957ee4a8c667ee11fc3d581769aec6e03ddb
2
SIZE (magic-7.5.220.tgz) = 3746889
2
SIZE (magic-7.5.225.tgz) = 3750690
(-)cad/magic/files/patch-netmenu__NMshowcell.c (+38 lines)
Line 0 Link Here
1
--- netmenu/NMshowcell.c.orig	2006-04-11 07:03:14.000000000 +0900
2
+++ netmenu/NMshowcell.c	2012-09-13 00:21:50.000000000 +0900
3
@@ -92,7 +92,7 @@
4
      * this window.
5
      */
6
 
7
-    if (((CellUse *)(window->w_surfaceID))->cu_def != nmscRootDef) return;
8
+    if (((CellUse *)(window->w_surfaceID))->cu_def != nmscRootDef) return 0;
9
 
10
     /* If this window is zoomed way out (less than 1 pixel per lambda)
11
      * use solid highlighting to maximize visibility.  It the window
12
@@ -109,7 +109,7 @@
13
      * redraw.
14
      */
15
 
16
-    if (!DBBoundPlane(plane, &area)) return;
17
+    if (!DBBoundPlane(plane, &area)) return 0;
18
     nmscPlane = plane;
19
     for (i = PL_TECHDEPBASE; i < DBNumPlanes; i += 1)
20
     {
21
@@ -330,7 +330,7 @@
22
 	if (NMCurNetName == NULL)
23
 	{
24
 	    TxError("You must select a net before you can trace it.\n");
25
-	    return;
26
+	    return 0;
27
 	}
28
 	else netName = NMCurNetName;
29
     }
30
@@ -344,7 +344,7 @@
31
     {
32
 	TxError("The net list has no net containing the terminal \"%s\"\n",
33
 	    netName);
34
-	return;
35
+	return 0;
36
     }
37
     (void) NMEnumTerms(NMCurNetName, nmShowRoutedNetFunc,
38
 	    (ClientData) EditCellUse);
(-)cad/magic/files/patch-netmenu__NMshowpt.c (+13 lines)
Line 0 Link Here
1
--- netmenu/NMshowpt.c.orig	2006-04-11 07:03:14.000000000 +0900
2
+++ netmenu/NMshowpt.c	2012-09-13 00:10:41.000000000 +0900
3
@@ -86,8 +86,8 @@
4
      * root definition for this window is the edit's root definition.
5
      */
6
 
7
-    if (nmspArrayUsed == 0) return;
8
-    if (((CellUse *)(window->w_surfaceID))->cu_def != EditRootDef) return;
9
+    if (nmspArrayUsed == 0) return 0;
10
+    if (((CellUse *)(window->w_surfaceID))->cu_def != EditRootDef) return 0;
11
 
12
     for (i = 0; i < nmspArrayUsed; i += 1)
13
     {
(-)cad/magic/files/patch-netmenu__NMwiring.c (+20 lines)
Line 0 Link Here
1
--- netmenu/NMwiring.c.orig	2006-04-11 07:03:14.000000000 +0900
2
+++ netmenu/NMwiring.c	2012-09-13 00:30:35.000000000 +0900
3
@@ -162,7 +162,7 @@
4
     /* Collect all the connected areas together into a list. */
5
 
6
     list = NULL;
7
-    if (!ToolGetEditBox(&area)) return;
8
+    if (!ToolGetEditBox(&area)) return 0;
9
 
10
     /* Expand the box to get everything touching it. */
11
 
12
@@ -537,7 +537,7 @@
13
     Rect area;
14
     char *net = NULL;
15
 
16
-    if (!ToolGetEditBox(&area)) return;
17
+    if (!ToolGetEditBox(&area)) return 0;
18
 
19
     /* Expand the box area so we'll pick up everything touching it. */
20
 
(-)cad/magic/files/patch-plow__PlowRules2.c (+29 lines)
Line 0 Link Here
1
--- plow/PlowRules2.c.orig	2007-04-21 02:57:00.000000000 +0900
2
+++ plow/PlowRules2.c	2012-09-13 00:39:42.000000000 +0900
3
@@ -250,7 +250,7 @@
4
     tp = TiSrPointNoHint(plowYankDef->cd_planes[edge->e_pNum], &p);
5
     pr = plowSpacingRulesTbl[edge->e_ltype][TiGetTypeExact(tp)];
6
     if (pr == (PlowRule *) NULL)
7
-	return;
8
+	return (0);
9
 
10
     searchRect.r_xbot = edge->e_x - 1;
11
     searchRect.r_ytop = edge->e_ybot;
12
@@ -514,7 +514,7 @@
13
     startPoint.p_y = edge->e_ybot - 1;
14
     tp = TiSrPointNoHint(plowYankDef->cd_planes[edge->e_pNum], &startPoint);
15
     if (TiGetTypeExact(tp) == TT_SPACE)
16
-	return;
17
+	return (0);
18
 
19
     ltype = edge->e_ltype;
20
     rtype = TiGetTypeExact(tp);
21
@@ -604,7 +604,7 @@
22
 		GMASK_EAST|GMASK_WEST|GMASK_NORTH|GMASK_SOUTH,
23
 		plowIllegalBotProc, (ClientData) &ar);
24
     if (ar.ar_slivtype == (TileType) -1)
25
-	return;
26
+	return (0);
27
 
28
     startPoint.p_x = ar.ar_mustmove;
29
     TTMaskSetOnlyType(&insideTypes, ar.ar_slivtype);

Return to bug 171972