Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 21 Jan 2000 12:04:48 -0800 (PST)
From:      tkato@prontomail.ne.jp
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/16274: Update port: cad/xcircuit to 2.0b3
Message-ID:  <20000121200448.4789E154B8@hub.freebsd.org>

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

>Number:         16274
>Category:       ports
>Synopsis:       Update port: cad/xcircuit to 2.0b3
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jan 21 12:10:00 PST 2000
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        3.4-RELEASE i386
>Organization:
>Environment:
>Description:
- Update to version 2.0b3

New file:
patches/patch-ac  patches/patch-ad  patches/patch-ae  patches/patch-af
patches/patch-ag  patches/patch-ah  patches/patch-ai  patches/patch-aj
patches/patch-ak  patches/patch-al  patches/patch-am  patches/patch-an
patches/patch-ao  patches/patch-ap

Note:
This PR supersedes ports/16105.

>How-To-Repeat:

>Fix:
diff -urN /usr/ports/cad/xcircuit/Makefile cad/xcircuit/Makefile
--- /usr/ports/cad/xcircuit/Makefile	Fri Dec 24 08:12:57 1999
+++ cad/xcircuit/Makefile	Fri Jan 21 21:57:57 2000
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	xcircuit
-# Version required:	2.0b1
+# Version required:	2.0b3
 # Date created:		3 Apr 1998
 # Whom:			giffunip@asme.org
 #
 # $FreeBSD: ports/cad/xcircuit/Makefile,v 1.12 1999/12/23 17:26:57 jedgar Exp $
 #
 
-DISTNAME=	xcircuit-2.0b1
+DISTNAME=	xcircuit-2.0b3
 CATEGORIES=	cad
 MASTER_SITES=	ftp://bach.ece.jhu.edu/pub/tim/xcircuit/ \
 		http://bach.ece.jhu.edu/~tim/programs/xcircuit/archive/
@@ -22,9 +22,7 @@
 MAN1=		xcircuit.1
 
 post-install:
-.if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/examples/xcircuit
 	${INSTALL_DATA} ${WRKSRC}/examples/* ${PREFIX}/share/examples/xcircuit
-.endif
 
 .include <bsd.port.mk>
diff -urN /usr/ports/cad/xcircuit/files/md5 cad/xcircuit/files/md5
--- /usr/ports/cad/xcircuit/files/md5	Fri Dec 24 08:12:57 1999
+++ cad/xcircuit/files/md5	Fri Jan 21 21:43:32 2000
@@ -1 +1 @@
-MD5 (xcircuit-2.0b1.tar.bz2) = e3cd348d7221891dc693fe5cae3d6d0d
+MD5 (xcircuit-2.0b3.tar.bz2) = 3a471732d39e51b9689419337f4a66e5
diff -urN /usr/ports/cad/xcircuit/patches/patch-aa cad/xcircuit/patches/patch-aa
--- /usr/ports/cad/xcircuit/patches/patch-aa	Fri Dec 24 08:12:57 1999
+++ cad/xcircuit/patches/patch-aa	Fri Jan 21 21:49:19 2000
@@ -1,7 +1,7 @@
-*** Imakefile.orig	Thu Nov 25 07:05:35 1999
---- Imakefile	Tue Dec 14 04:46:02 1999
+*** Imakefile.orig	Thu Jan  6 03:15:52 2000
+--- Imakefile	Fri Jan 21 12:00:00 2000
 ***************
-*** 24,40 ****
+*** 26,44 ****
   #CCOPTIONS = -O2
   #
   # for debugging purposes uncomment the following line:
@@ -14,12 +14,14 @@
   #------------------------------------------------------------------------
   #
 ! PREFIX = /usr/local
-  # XCIRCUIT_LIB_DIR = $(PREFIX)/src/xcircuit-2.0b1/psfiles
+  # XCIRCUIT_LIB_DIR = $(PREFIX)/src/xcircuit-2.0b2/psfiles
 ! XCIRCUIT_LIB_DIR = $(PREFIX)/lib/xcircuit-2.0
-  XCIRCUIT_BIN_DIR = $(PREFIX)/bin
-  XCIRCUIT_MAN_DIR = $(PREFIX)/man/man1
+! XCIRCUIT_BIN_DIR = $(PREFIX)/bin
+! XCIRCUIT_MAN_DIR = $(PREFIX)/man/man1
   
---- 24,40 ----
+  #------------------------------------------------------------------------
+  # Support for graphics double-buffering (A memory hog, but yields fastest
+--- 26,44 ----
   #CCOPTIONS = -O2
   #
   # for debugging purposes uncomment the following line:
@@ -31,14 +33,16 @@
   # Change the following as desired to suit your environment:
   #------------------------------------------------------------------------
   #
-! PREFIX ?= /usr/local
-  # XCIRCUIT_LIB_DIR = $(PREFIX)/src/xcircuit-2.0b1/psfiles
-! XCIRCUIT_LIB_DIR = $(PREFIX)/lib/X11/xcircuit
-  XCIRCUIT_BIN_DIR = $(PREFIX)/bin
-  XCIRCUIT_MAN_DIR = $(PREFIX)/man/man1
+! #PREFIX = /usr/local
+  # XCIRCUIT_LIB_DIR = $(PREFIX)/src/xcircuit-2.0b2/psfiles
+! XCIRCUIT_LIB_DIR = $(LIBDIR)/xcircuit
+! XCIRCUIT_BIN_DIR = $(BINDIR)
+! XCIRCUIT_MAN_DIR = $(MANDIR)
   
+  #------------------------------------------------------------------------
+  # Support for graphics double-buffering (A memory hog, but yields fastest
 ***************
-*** 87,95 ****
+*** 89,97 ****
   # DEC Alpha, Solaris and other SVR4 systems need the following,
   # or if you have compilation errors about "dp->d_name" being
   # undefined:
@@ -48,7 +52,7 @@
   
   # My DECstation (Ultrix) has something funny going on in XLib. . . if there
   # is a compile-time error "ld: Undefined: XUniqueContext *** Error code 1"
---- 87,95 ----
+--- 89,97 ----
   # DEC Alpha, Solaris and other SVR4 systems need the following,
   # or if you have compilation errors about "dp->d_name" being
   # undefined:
diff -urN /usr/ports/cad/xcircuit/patches/patch-ab cad/xcircuit/patches/patch-ab
--- /usr/ports/cad/xcircuit/patches/patch-ab	Sun Sep 26 07:13:39 1999
+++ cad/xcircuit/patches/patch-ab	Fri Jan 21 21:49:30 2000
@@ -1,8 +1,16 @@
-*** xcircuit.c.orig	Fri Jun 25 23:25:12 1999
---- xcircuit.c	Tue Sep  7 00:48:01 1999
+*** xcircuit.c.orig	Fri Jan 14 00:21:21 2000
+--- xcircuit.c	Fri Jan 21 12:00:00 2000
 ***************
-*** 17,22 ****
---- 17,25 ----
+*** 11,22 ****
+--- 11,27 ----
+  #include <stdio.h>
+  #include <stdlib.h>
+  #include <string.h>
++ #ifndef __STDC__
+  #include <malloc.h>
++ #endif
+  #include <sys/types.h>
+  #include <sys/stat.h>
   #include <errno.h>
   #include <limits.h>
   #include <locale.h>
@@ -13,11 +21,11 @@
   #include <X11/Intrinsic.h>
   #include <X11/StringDefs.h>
 ***************
-*** 1384,1389 ****
---- 1387,1396 ----
-     objectptr	*page;		/* -schem flag and renumbers argc! (bug?) */
-     Pixmap	icon, mask;
+*** 1435,1440 ****
+--- 1440,1449 ----
      char		*argv0;		/* find root of argv[0] */
+     short initargc = argc;	/* because XtInitialize() absorbs the     */
+     				/* -schem flag and renumbers argc! (bug?) */
 + 
 + #ifdef __FreeBSD__
 +    fpsetmask(0);
diff -urN /usr/ports/cad/xcircuit/patches/patch-ac cad/xcircuit/patches/patch-ac
--- /usr/ports/cad/xcircuit/patches/patch-ac	Thu Jan  1 09:00:00 1970
+++ cad/xcircuit/patches/patch-ac	Fri Jan 21 21:49:55 2000
@@ -0,0 +1,14 @@
+*** elements.c.orig	Sat Jan  8 01:32:22 2000
+--- elements.c	Fri Jan 21 12:00:00 2000
+***************
+*** 9,15 ****
+--- 9,17 ----
+  
+  #include <stdio.h>
+  #include <string.h>
++ #ifndef __STDC__
+  #include <malloc.h>
++ #endif
+  
+  #include <X11/Intrinsic.h>
+  #include <X11/StringDefs.h>
diff -urN /usr/ports/cad/xcircuit/patches/patch-ad cad/xcircuit/patches/patch-ad
--- /usr/ports/cad/xcircuit/patches/patch-ad	Thu Jan  1 09:00:00 1970
+++ cad/xcircuit/patches/patch-ad	Fri Jan 21 21:50:34 2000
@@ -0,0 +1,14 @@
+*** events.c.orig	Tue Jan 11 03:54:04 2000
+--- events.c	Fri Jan 2l 12:00:00 2000
+***************
+*** 9,15 ****
+--- 9,17 ----
+  
+  #include <stdio.h>
+  #include <string.h>
++ #ifndef __STDC__
+  #include <malloc.h>
++ #endif
+  #include <math.h>
+  
+  #include <X11/Intrinsic.h>
diff -urN /usr/ports/cad/xcircuit/patches/patch-ae cad/xcircuit/patches/patch-ae
--- /usr/ports/cad/xcircuit/patches/patch-ae	Thu Jan  1 09:00:00 1970
+++ cad/xcircuit/patches/patch-ae	Fri Jan 21 21:50:26 2000
@@ -0,0 +1,14 @@
+*** filelist.c.orig	Thu Jan  6 03:16:39 2000
+--- filelist.c	Fri Jan 21 12:00:00 2000
+***************
+*** 5,11 ****
+--- 5,13 ----
+  
+  #include <stdio.h>
+  #include <string.h>
++ #ifndef __STDC__
+  #include <malloc.h>
++ #endif
+  #include <sys/types.h>
+  #ifdef linux
+  #include <dirent.h>
diff -urN /usr/ports/cad/xcircuit/patches/patch-af cad/xcircuit/patches/patch-af
--- /usr/ports/cad/xcircuit/patches/patch-af	Thu Jan  1 09:00:00 1970
+++ cad/xcircuit/patches/patch-af	Fri Jan 21 21:50:51 2000
@@ -0,0 +1,14 @@
+*** files.c.orig	Tue Jan 11 03:57:52 2000
+--- files.c	Fri Jan 21 12:00:00 2000
+***************
+*** 6,12 ****
+--- 6,14 ----
+  #include <stdio.h>
+  #include <stdlib.h>
+  #include <string.h>
++ #ifndef __STDC__
+  #include <malloc.h>
++ #endif
+  #include <time.h>
+  #include <pwd.h>
+  #include <sys/types.h>
diff -urN /usr/ports/cad/xcircuit/patches/patch-ag cad/xcircuit/patches/patch-ag
--- /usr/ports/cad/xcircuit/patches/patch-ag	Thu Jan  1 09:00:00 1970
+++ cad/xcircuit/patches/patch-ag	Fri Jan 21 21:51:41 2000
@@ -0,0 +1,14 @@
+*** fontfile.c.orig	Fri Jan  7 12:11:03 2000
+--- fontfile.c	Fri Jan 21 12:00:00 2000
+***************
+*** 6,12 ****
+--- 6,14 ----
+  #include <stdio.h>
+  #include <stdlib.h>
+  #include <string.h>
++ #ifndef __STDC__
+  #include <malloc.h>
++ #endif
+  
+  #include <X11/Intrinsic.h>
+  #include <X11/StringDefs.h>
diff -urN /usr/ports/cad/xcircuit/patches/patch-ah cad/xcircuit/patches/patch-ah
--- /usr/ports/cad/xcircuit/patches/patch-ah	Thu Jan  1 09:00:00 1970
+++ cad/xcircuit/patches/patch-ah	Fri Jan 21 21:51:34 2000
@@ -0,0 +1,14 @@
+*** formats.c.orig	Tue Jan 11 02:25:57 2000
+--- formats.c	Fri Jan 21 12:00:00 2000
+***************
+*** 5,11 ****
+--- 5,13 ----
+  
+  #include <stdio.h>
+  #include <string.h>
++ #ifndef __STDC__
+  #include <malloc.h>
++ #endif
+  #include <X11/Intrinsic.h>
+  #include <X11/StringDefs.h>
+  
diff -urN /usr/ports/cad/xcircuit/patches/patch-ai cad/xcircuit/patches/patch-ai
--- /usr/ports/cad/xcircuit/patches/patch-ai	Thu Jan  1 09:00:00 1970
+++ cad/xcircuit/patches/patch-ai	Fri Jan 21 21:51:27 2000
@@ -0,0 +1,14 @@
+*** functions.c.orig	Tue Jan 11 04:40:36 2000
+--- functions.c	Fri Jan 21 12:00:00 2000
+***************
+*** 9,15 ****
+--- 9,17 ----
+  
+  #include <stdio.h>
+  #include <string.h>
++ #ifndef __STDC__
+  #include <malloc.h>
++ #endif
+  #include <math.h>
+  
+  #include <X11/Intrinsic.h>
diff -urN /usr/ports/cad/xcircuit/patches/patch-aj cad/xcircuit/patches/patch-aj
--- /usr/ports/cad/xcircuit/patches/patch-aj	Thu Jan  1 09:00:00 1970
+++ cad/xcircuit/patches/patch-aj	Fri Jan 21 21:51:58 2000
@@ -0,0 +1,14 @@
+*** libraries.c.orig	Tue Jan 11 03:26:12 2000
+--- libraries.c	Fri Jan 21 12:00:00 2000
+***************
+*** 9,15 ****
+--- 9,17 ----
+  
+  #include <stdio.h>
+  #include <string.h>
++ #ifndef __STDC__
+  #include <malloc.h>
++ #endif
+  
+  #include <X11/Intrinsic.h>
+  #include <X11/StringDefs.h>
diff -urN /usr/ports/cad/xcircuit/patches/patch-ak cad/xcircuit/patches/patch-ak
--- /usr/ports/cad/xcircuit/patches/patch-ak	Thu Jan  1 09:00:00 1970
+++ cad/xcircuit/patches/patch-ak	Fri Jan 21 21:52:09 2000
@@ -0,0 +1,14 @@
+*** menucalls.c.orig	Tue Jan 11 01:41:59 2000
+--- menucalls.c	Fri Jan 21 12:00:00 2000
+***************
+*** 6,12 ****
+--- 6,14 ----
+  
+  #include <stdio.h>
+  #include <string.h>
++ #ifndef __STDC__
+  #include <malloc.h>
++ #endif
+  #include <sys/types.h>
+  #include <errno.h>
+  #include <limits.h>
diff -urN /usr/ports/cad/xcircuit/patches/patch-al cad/xcircuit/patches/patch-al
--- /usr/ports/cad/xcircuit/patches/patch-al	Thu Jan  1 09:00:00 1970
+++ cad/xcircuit/patches/patch-al	Fri Jan 21 21:52:22 2000
@@ -0,0 +1,14 @@
+*** netlist.c.orig	Thu Jan  6 05:09:34 2000
+--- netlist.c	Fri Jan 21 12:00:00 2000
+***************
+*** 10,16 ****
+--- 10,18 ----
+  
+  #include <stdio.h>
+  #include <string.h>
++ #ifndef __STDC__
+  #include <malloc.h>
++ #endif
+  
+  #include <X11/Intrinsic.h>
+  #include <X11/StringDefs.h>
diff -urN /usr/ports/cad/xcircuit/patches/patch-am cad/xcircuit/patches/patch-am
--- /usr/ports/cad/xcircuit/patches/patch-am	Thu Jan  1 09:00:00 1970
+++ cad/xcircuit/patches/patch-am	Fri Jan 21 21:52:34 2000
@@ -0,0 +1,14 @@
+*** parameter.c.orig	Sat Jan  8 01:24:21 2000
+--- parameter.c	Fri Jan 21 12:00:00 2000
+***************
+*** 9,15 ****
+--- 9,17 ----
+  
+  #include <stdio.h>
+  #include <string.h>
++ #ifndef __STDC__
+  #include <malloc.h>
++ #endif
+  
+  #include <X11/Intrinsic.h>
+  #include <X11/StringDefs.h>
diff -urN /usr/ports/cad/xcircuit/patches/patch-an cad/xcircuit/patches/patch-an
--- /usr/ports/cad/xcircuit/patches/patch-an	Thu Jan  1 09:00:00 1970
+++ cad/xcircuit/patches/patch-an	Fri Jan 21 21:52:50 2000
@@ -0,0 +1,14 @@
+*** rcfile.c.orig	Sat Jan  8 01:24:10 2000
+--- rcfile.c	Fri Jan 21 12:00:00 2000
+***************
+*** 10,16 ****
+--- 10,18 ----
+  #include <stdio.h>
+  #include <stdlib.h>
+  #include <string.h>
++ #ifndef __STDC__
+  #include <malloc.h>
++ #endif
+  
+  #include <X11/Intrinsic.h>
+  #include <X11/StringDefs.h>
diff -urN /usr/ports/cad/xcircuit/patches/patch-ao cad/xcircuit/patches/patch-ao
--- /usr/ports/cad/xcircuit/patches/patch-ao	Thu Jan  1 09:00:00 1970
+++ cad/xcircuit/patches/patch-ao	Fri Jan 21 21:53:03 2000
@@ -0,0 +1,14 @@
+*** schema.c.orig	Tue Jan 11 03:53:16 2000
+--- schema.c	Fri Jan 21 12:00:00 2000
+***************
+*** 9,15 ****
+--- 9,17 ----
+  
+  #include <stdio.h>
+  #include <string.h>
++ #ifndef __STDC__
+  #include <malloc.h>
++ #endif
+  
+  #include <X11/Intrinsic.h>
+  #include <X11/StringDefs.h>
diff -urN /usr/ports/cad/xcircuit/patches/patch-ap cad/xcircuit/patches/patch-ap
--- /usr/ports/cad/xcircuit/patches/patch-ap	Thu Jan  1 09:00:00 1970
+++ cad/xcircuit/patches/patch-ap	Fri Jan 21 21:53:16 2000
@@ -0,0 +1,14 @@
+*** selection.c.orig	Tue Jan 11 04:27:36 2000
+--- selection.c	Fri Jan 21 12:00:00 2000
+***************
+*** 9,15 ****
+--- 9,17 ----
+  
+  #include <stdio.h>
+  #include <string.h>
++ #ifndef __STDC__
+  #include <malloc.h>
++ #endif
+  #include <math.h>
+  
+  #include <X11/Intrinsic.h>
diff -urN /usr/ports/cad/xcircuit/pkg/PLIST cad/xcircuit/pkg/PLIST
--- /usr/ports/cad/xcircuit/pkg/PLIST	Fri Dec 24 08:12:57 1999
+++ cad/xcircuit/pkg/PLIST	Sat Jan 15 00:00:00 2000
@@ -4,6 +4,7 @@
 lib/X11/xcircuit/avlsi.lps
 lib/X11/xcircuit/builtins.lps
 lib/X11/xcircuit/digital.lps
+lib/X11/xcircuit/generic.lps
 lib/X11/xcircuit/fonts/courier.lps
 lib/X11/xcircuit/fonts/courier.xfe
 lib/X11/xcircuit/fonts/courieriso.xfe
@@ -38,6 +39,7 @@
 share/examples/xcircuit/analog2.ps
 share/examples/xcircuit/analoglib.lps
 share/examples/xcircuit/border.ps
+share/examples/xcircuit/diffamp_test.ps
 share/examples/xcircuit/logic8.ps
 share/examples/xcircuit/prelude.ps
 share/examples/xcircuit/systemd1.lgf


>Release-Note:
>Audit-Trail:
>Unformatted:


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




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