* Updated version 2.0a11 to 2.0b1

* Added secondary site to MASTER_SITES

PR:		15465
Submitted by:	KATO Tsuguru <tkato@prontomail.ne.jp>

4 files changed, 51 insertions, 12 deletions

diff --git a/cad/xcircuit/Makefile b/cad/xcircuit/Makefile
index b140eabb249d..450658a510d8 100644
--- a/cad/xcircuit/Makefile
+++ b/cad/xcircuit/Makefile
@@ -1,14 +1,15 @@
 # New ports collection makefile for:	xcircuit
-# Version required:	2.0a11
+# Version required:	2.0b1
 # Date created:		3 Apr 1998
 # Whom:			giffunip@asme.org
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xcircuit-2.0a11
+DISTNAME=	xcircuit-2.0b1
 CATEGORIES=	cad
-MASTER_SITES=	ftp://bach.ece.jhu.edu/pub/tim/xcircuit/
+MASTER_SITES=	ftp://bach.ece.jhu.edu/pub/tim/xcircuit/ \
+		http://bach.ece.jhu.edu/~tim/programs/xcircuit/archive/
 
 MAINTAINER=	ports@FreeBSD.org
 
diff --git a/cad/xcircuit/distinfo b/cad/xcircuit/distinfo
index 7b5230f1d0e5..923d07be4a31 100644
--- a/cad/xcircuit/distinfo
+++ b/cad/xcircuit/distinfo
@@ -1 +1 @@
-MD5 (xcircuit-2.0a11.tar.bz2) = 89e19e56d9b61a520c90cd2878b27d68
+MD5 (xcircuit-2.0b1.tar.bz2) = e3cd348d7221891dc693fe5cae3d6d0d
diff --git a/cad/xcircuit/files/patch-aa b/cad/xcircuit/files/patch-aa
index 8c08bb370e4f..f732fba4d2d6 100644
--- a/cad/xcircuit/files/patch-aa
+++ b/cad/xcircuit/files/patch-aa
@@ -1,23 +1,60 @@
-*** Imakefile.orig	Tue Oct 26 22:43:27 1999
---- Imakefile	Wed Oct 27 04:11:29 1999
+*** Imakefile.orig	Thu Nov 25 07:05:35 1999
+--- Imakefile	Tue Dec 14 04:46:02 1999
 ***************
-*** 31,39 ****
+*** 24,40 ****
+  #CCOPTIONS = -O2
+  #
+  # for debugging purposes uncomment the following line:
+! CDEBUGFLAGS = -g
+! STD_INCLUDES = -I. -I/usr/X11R6/include/X11
+  
+  #------------------------------------------------------------------------
+  # Installation directories:
   # Change the following as desired to suit your environment:
   #------------------------------------------------------------------------
   #
 ! PREFIX = /usr/local
-  # XCIRCUIT_LIB_DIR = $(PREFIX)/src/xcircuit-2.0a11/psfiles
+  # XCIRCUIT_LIB_DIR = $(PREFIX)/src/xcircuit-2.0b1/psfiles
 ! XCIRCUIT_LIB_DIR = $(PREFIX)/lib/xcircuit-2.0
   XCIRCUIT_BIN_DIR = $(PREFIX)/bin
   XCIRCUIT_MAN_DIR = $(PREFIX)/man/man1
   
---- 31,39 ----
+--- 24,40 ----
+  #CCOPTIONS = -O2
+  #
+  # for debugging purposes uncomment the following line:
+! #CDEBUGFLAGS = -g
+! #STD_INCLUDES = -I. -I/usr/X11R6/include/X11
+  
+  #------------------------------------------------------------------------
+  # Installation directories:
   # Change the following as desired to suit your environment:
   #------------------------------------------------------------------------
   #
 ! PREFIX ?= /usr/local
-  # XCIRCUIT_LIB_DIR = $(PREFIX)/src/xcircuit-2.0a11/psfiles
+  # 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
   
+***************
+*** 87,95 ****
+  # DEC Alpha, Solaris and other SVR4 systems need the following,
+  # or if you have compilation errors about "dp->d_name" being
+  # undefined:
+! #DIRENT = -DSVR4_DIRENT
+  # Otherwise,
+! DIRENT =
+  
+  # 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 ----
+  # DEC Alpha, Solaris and other SVR4 systems need the following,
+  # or if you have compilation errors about "dp->d_name" being
+  # undefined:
+! DIRENT = -DSVR4_DIRENT
+  # Otherwise,
+! #DIRENT =
+  
+  # My DECstation (Ultrix) has something funny going on in XLib. . . if there
+  # is a compile-time error "ld: Undefined: XUniqueContext *** Error code 1"
diff --git a/cad/xcircuit/pkg-plist b/cad/xcircuit/pkg-plist
index f7f8107ec2d6..d7c88a47fa96 100644
--- a/cad/xcircuit/pkg-plist
+++ b/cad/xcircuit/pkg-plist
@@ -1,6 +1,5 @@
 bin/xcircuit
 lib/X11/app-defaults/XCircuit
-lib/X11/app-defaults/XSchema
 lib/X11/xcircuit/analog.lps
 lib/X11/xcircuit/avlsi.lps
 lib/X11/xcircuit/builtins.lps
@@ -35,11 +34,13 @@ lib/X11/xcircuit/musiclib.lps
 lib/X11/xcircuit/signal.lps
 lib/X11/xcircuit/xcircps2.pro
 share/examples/xcircuit/USAflag.ps
+share/examples/xcircuit/analog1.ps
+share/examples/xcircuit/analog2.ps
+share/examples/xcircuit/analoglib.lps
 share/examples/xcircuit/border.ps
 share/examples/xcircuit/logic8.ps
 share/examples/xcircuit/prelude.ps
 share/examples/xcircuit/systemd1.lgf
-share/examples/xcircuit/test.ps
 share/examples/xcircuit/threestage.ps
 share/examples/xcircuit/vcoblock.ps
 @dirrm share/examples/xcircuit