Skip site navigation (1)Skip section navigation (2)
Date:      Fri,  8 Sep 2000 14:34:00 -0700 (PDT)
From:      tkato@prontomail.ne.jp
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/21135: Update port: cad/xcircuit to 2.1b3
Message-ID:  <20000908213400.18AF937B509@hub.freebsd.org>

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

>Number:         21135
>Category:       ports
>Synopsis:       Update port: cad/xcircuit to 2.1b3
>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 Sep 08 14:40:01 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        4.1-RELEASE i386
>Organization:
>Environment:
>Description:
- Update to version 2.1b3

New file:
patches/patch-aq

>How-To-Repeat:

>Fix:
diff -urN /usr/ports/cad/xcircuit/Makefile cad/xcircuit/Makefile
--- /usr/ports/cad/xcircuit/Makefile	Thu Aug  3 21:06:17 2000
+++ cad/xcircuit/Makefile	Thu Sep  7 00:00:09 2000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xcircuit
-PORTVERSION=	2.0b4
+PORTVERSION=	2.1b3
 CATEGORIES=	cad
 MASTER_SITES=	http://bach.ece.jhu.edu/~tim/programs/xcircuit/archive/
 
@@ -21,11 +21,9 @@
 
 MAN1=		xcircuit.1
 
-post-patch:
-	@${PERL} -pi -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/Imakefile
-
 post-install:
 	@${MKDIR} ${PREFIX}/share/examples/xcircuit
-	${INSTALL_DATA} ${WRKSRC}/examples/* ${PREFIX}/share/examples/xcircuit
+	${TAR} -C ${WRKSRC}/examples --exclude CVS -cf - . | \
+		${TAR} -C ${PREFIX}/share/examples/xcircuit --unlink -xf -
 
 .include <bsd.port.mk>
diff -urN /usr/ports/cad/xcircuit/files/md5 cad/xcircuit/files/md5
--- /usr/ports/cad/xcircuit/files/md5	Fri Jul 14 21:43:05 2000
+++ cad/xcircuit/files/md5	Thu Aug 17 04:47:06 2000
@@ -1 +1 @@
-MD5 (xcircuit-2.0b4.tar.bz2) = 66d4b8983fef4f74b8dde99b935a3a5f
+MD5 (xcircuit-2.1b3.tar.bz2) = 88d2191c7f1f5f1632e77be9f87e09e3
diff -urN /usr/ports/cad/xcircuit/patches/patch-aa cad/xcircuit/patches/patch-aa
--- /usr/ports/cad/xcircuit/patches/patch-aa	Tue Mar 21 06:43:02 2000
+++ cad/xcircuit/patches/patch-aa	Thu Aug 17 04:56:14 2000
@@ -1,7 +1,7 @@
-*** Imakefile.orig	Wed Mar  1 00:41:35 2000
---- Imakefile	Mon Mar 13 01:45:29 2000
+*** Imakefile.orig	Tue Aug  8 05:53:00 2000
+--- Imakefile	Thu Aug 17 04:55:48 2000
 ***************
-*** 26,44 ****
+*** 28,46 ****
   #CCOPTIONS = -O2
   #
   # for debugging purposes uncomment the following line:
@@ -14,14 +14,14 @@
   #------------------------------------------------------------------------
   #
 ! PREFIX = /usr/local
-  # XCIRCUIT_LIB_DIR = $(PREFIX)/src/xcircuit-2.0b2/psfiles
-! XCIRCUIT_LIB_DIR = $(PREFIX)/lib/xcircuit-2.0
+  # XCIRCUIT_LIB_DIR = $(PREFIX)/src/xcircuit-2.1b1/psfiles
+! XCIRCUIT_LIB_DIR = $(PREFIX)/lib/xcircuit-2.1
 ! XCIRCUIT_BIN_DIR = $(PREFIX)/bin
 ! XCIRCUIT_MAN_DIR = $(PREFIX)/man/man1
   
   #------------------------------------------------------------------------
   # Support for graphics double-buffering (A memory hog, but yields fastest
---- 26,44 ----
+--- 28,46 ----
   #CCOPTIONS = -O2
   #
   # for debugging purposes uncomment the following line:
@@ -34,7 +34,7 @@
   #------------------------------------------------------------------------
   #
 ! #PREFIX = /usr/local
-  # XCIRCUIT_LIB_DIR = $(PREFIX)/src/xcircuit-2.0b2/psfiles
+  # XCIRCUIT_LIB_DIR = $(PREFIX)/src/xcircuit-2.1b1/psfiles
 ! XCIRCUIT_LIB_DIR = $(LIBDIR)/xcircuit
 ! XCIRCUIT_BIN_DIR = $(BINDIR)
 ! XCIRCUIT_MAN_DIR = $(MANDIR)
@@ -42,7 +42,7 @@
   #------------------------------------------------------------------------
   # Support for graphics double-buffering (A memory hog, but yields fastest
 ***************
-*** 56,62 ****
+*** 58,64 ****
   # Support for background rendering through ghostscript.  Change this
   # to the path where gs can be found.
   # GS_EXEC= /usr/local/src/gs5.50/obj/gs
@@ -50,11 +50,11 @@
   
   #------------------------------------------------------------------------
   # Window manager bug workaround---If you don't like xcircuit grabbing kbd
---- 56,62 ----
+--- 58,64 ----
   # Support for background rendering through ghostscript.  Change this
   # to the path where gs can be found.
   # GS_EXEC= /usr/local/src/gs5.50/obj/gs
-! GS_EXEC= %%LOCALBASE%%/bin/gs
+! GS_EXEC= ${LOCALBASE}/bin/gs
   
   #------------------------------------------------------------------------
   # Window manager bug workaround---If you don't like xcircuit grabbing kbd
diff -urN /usr/ports/cad/xcircuit/patches/patch-ab cad/xcircuit/patches/patch-ab
--- /usr/ports/cad/xcircuit/patches/patch-ab	Mon Jan 24 15:04:04 2000
+++ cad/xcircuit/patches/patch-ab	Thu Aug 17 05:01:02 2000
@@ -1,14 +1,15 @@
-*** xcircuit.c.orig	Fri Jan 14 00:21:21 2000
---- xcircuit.c	Fri Jan 21 12:00:00 2000
+*** xcircuit.c.orig	Tue Aug  8 06:08:18 2000
+--- xcircuit.c	Thu Aug 17 05:00:16 2000
 ***************
-*** 11,22 ****
---- 11,27 ----
+*** 11,23 ****
+--- 11,28 ----
   #include <stdio.h>
   #include <stdlib.h>
   #include <string.h>
 + #ifndef __STDC__
   #include <malloc.h>
 + #endif
+  #include <signal.h>
   #include <sys/types.h>
   #include <sys/stat.h>
   #include <errno.h>
@@ -21,8 +22,8 @@
   #include <X11/Intrinsic.h>
   #include <X11/StringDefs.h>
 ***************
-*** 1435,1440 ****
---- 1440,1449 ----
+*** 1701,1706 ****
+--- 1706,1715 ----
      char		*argv0;		/* find root of argv[0] */
      short initargc = argc;	/* because XtInitialize() absorbs the     */
      				/* -schem flag and renumbers argc! (bug?) */
diff -urN /usr/ports/cad/xcircuit/patches/patch-aq cad/xcircuit/patches/patch-aq
--- /usr/ports/cad/xcircuit/patches/patch-aq	Thu Jan  1 09:00:00 1970
+++ cad/xcircuit/patches/patch-aq	Wed Sep  6 23:02:58 2000
@@ -0,0 +1,14 @@
+*** render.c.orig	Thu May 11 00:29:51 2000
+--- render.c	Thu Aug 17 05:25:28 2000
+***************
+*** 10,16 ****
+--- 10,18 ----
+  #include <stdio.h>
+  #include <stdlib.h>
+  #include <string.h>
++ #ifndef __STDC__
+  #include <malloc.h>
++ #endif
+  #include <time.h>
+  #include <sys/types.h>
+  #include <signal.h>
diff -urN /usr/ports/cad/xcircuit/pkg/PLIST cad/xcircuit/pkg/PLIST
--- /usr/ports/cad/xcircuit/pkg/PLIST	Tue Mar 21 06:43:03 2000
+++ cad/xcircuit/pkg/PLIST	Thu Sep  7 00:00:33 2000
@@ -34,6 +34,7 @@
 lib/X11/xcircuit/musiclib.lps
 lib/X11/xcircuit/signal.lps
 lib/X11/xcircuit/xcircps2.pro
+share/examples/xcircuit/.xcircuitrc
 share/examples/xcircuit/USAflag.ps
 share/examples/xcircuit/analog1.ps
 share/examples/xcircuit/analog2.ps


>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?20000908213400.18AF937B509>