5 files changed, 87 insertions, 49 deletions

diff --git a/cad/xcircuit/Makefile b/cad/xcircuit/Makefile
index ccbaf7061293..de9bd20b67d5 100644
--- a/cad/xcircuit/Makefile
+++ b/cad/xcircuit/Makefile
@@ -1,32 +1,30 @@
 # New ports collection makefile for:	xcircuit
-# Version required:	1.7
+# Version required:	2.0a10
 # Date created:		3 Apr 1998
 # Whom:			giffunip@asme.org
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xcircuit-1.7
+DISTNAME=	xcircuit-2.0a10
 CATEGORIES=	cad
-MASTER_SITES=	ftp://bach.ece.jhu.edu/pub/tim/	\
-		${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR=apps/circuits
+MASTER_SITES=	${MASTER_SITE_SUNSITE} \
+		ftp://bach.ece.jhu.edu/pub/tim/
+MASTER_SITE_SUBDIR=	apps/circuits
 
 MAINTAINER=     ports@FreeBSD.org
 
-BROKEN='bad MD5 checksum'
+LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 
 USE_IMAKE=	yes
 XMKMF=		xmkmf
-ALL_TARGET=
-INSTALL_TARGET=	install install.man
 
 MAN1=		xcircuit.1
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/examples/xcircuit
-	${CP} ${WRKSRC}/examples/*.ps ${PREFIX}/share/examples/xcircuit
+	@${MKDIR} ${PREFIX}/share/examples/xcircuit
+	${INSTALL_DATA} ${WRKSRC}/examples/* ${PREFIX}/share/examples/xcircuit
 .endif
 
 .include <bsd.port.mk>
diff --git a/cad/xcircuit/distinfo b/cad/xcircuit/distinfo
index 00f20418bad1..6425d9ad501b 100644
--- a/cad/xcircuit/distinfo
+++ b/cad/xcircuit/distinfo
@@ -1 +1 @@
-MD5 (xcircuit-1.7.tar.gz) = e4d06a0cc97e0a55dfa0452e731ef7a7
+MD5 (xcircuit-2.0a10.tar.gz) = f15459373be5d2a3c286539eccace182
diff --git a/cad/xcircuit/files/patch-aa b/cad/xcircuit/files/patch-aa
index 3bc7bbf96ca1..5852ac957805 100644
--- a/cad/xcircuit/files/patch-aa
+++ b/cad/xcircuit/files/patch-aa
@@ -1,19 +1,23 @@
-*** Imakefile.orig	Thu Mar 12 12:22:41 1998
---- Imakefile	Sun May 17 15:52:05 1998
+*** Imakefile.orig	Tue Jun 15 04:18:03 1999
+--- Imakefile	Tue Sep  7 01:11:09 1999
 ***************
-*** 31,37 ****
+*** 31,39 ****
   # Change the following as desired to suit your environment:
   #------------------------------------------------------------------------
   #
 ! PREFIX = /usr/local
-  XCIRCUIT_LIB_DIR = $(PREFIX)/lib/xcircuit
+  # XCIRCUIT_LIB_DIR = $(PREFIX)/src/xcircuit-2.0a10/psfiles
+! XCIRCUIT_LIB_DIR = $(PREFIX)/lib/xcircuit-2.0
   XCIRCUIT_BIN_DIR = $(PREFIX)/bin
   XCIRCUIT_MAN_DIR = $(PREFIX)/man/man1
---- 31,37 ----
+  
+--- 31,39 ----
   # Change the following as desired to suit your environment:
   #------------------------------------------------------------------------
   #
 ! PREFIX ?= /usr/local
-  XCIRCUIT_LIB_DIR = $(PREFIX)/lib/xcircuit
+  # XCIRCUIT_LIB_DIR = $(PREFIX)/src/xcircuit-2.0a10/psfiles
+! XCIRCUIT_LIB_DIR = $(PREFIX)/lib/X11/xcircuit
   XCIRCUIT_BIN_DIR = $(PREFIX)/bin
   XCIRCUIT_MAN_DIR = $(PREFIX)/man/man1
+  
diff --git a/cad/xcircuit/files/patch-ab b/cad/xcircuit/files/patch-ab
index f9d849eaba21..6ee29df6739c 100644
--- a/cad/xcircuit/files/patch-ab
+++ b/cad/xcircuit/files/patch-ab
@@ -1,23 +1,27 @@
---- xcircuit.c.orig	Thu May 21 16:43:03 1998
-+++ xcircuit.c	Tue Jan 26 18:20:21 1999
-@@ -30,6 +30,9 @@
- #include <sys/stat.h>
- #include <errno.h>
- #include <limits.h>
-+#ifdef __FreeBSD__
-+#include <machine/floatingpoint.h>
-+#endif
- 
- #undef FUNCPROTO
- #include <X11/Intrinsic.h>
-@@ -3575,6 +3578,10 @@
-    Arg		wargs[12];
-    short i, j, k = 0, n = 0, maxbuttons, maxcolors;
-    objectptr	*page;
-+
-+#ifdef __FreeBSD__
-+   fpsetmask(0);
-+#endif
- 
-    /*---------------------------*/
-    /* initialize user variables */
+*** xcircuit.c.orig	Fri Jun 25 23:25:12 1999
+--- xcircuit.c	Tue Sep  7 00:48:01 1999
+***************
+*** 17,22 ****
+--- 17,25 ----
+  #include <errno.h>
+  #include <limits.h>
+  #include <locale.h>
++ #ifdef __FreeBSD__
++ #include <machine/floatingpoint.h>
++ #endif
+  
+  #include <X11/Intrinsic.h>
+  #include <X11/StringDefs.h>
+***************
+*** 1384,1389 ****
+--- 1387,1396 ----
+     objectptr	*page;		/* -schem flag and renumbers argc! (bug?) */
+     Pixmap	icon, mask;
+     char		*argv0;		/* find root of argv[0] */
++ 
++ #ifdef __FreeBSD__
++    fpsetmask(0);
++ #endif
+  
+     /*-----------------------------------------------------------*/
+     /* Find the root of the command called from the command line */
diff --git a/cad/xcircuit/pkg-plist b/cad/xcircuit/pkg-plist
index a00b0360caa3..f7f8107ec2d6 100644
--- a/cad/xcircuit/pkg-plist
+++ b/cad/xcircuit/pkg-plist
@@ -1,15 +1,47 @@
 bin/xcircuit
-lib/xcircuit/builtins.lps
-lib/xcircuit/xcircps.pro
-lib/xcircuit/analog.lps
-lib/xcircuit/avlsi.lps
-lib/xcircuit/digital.lps
-lib/xcircuit/lgf.lps
-lib/xcircuit/signal.lps
-lib/xcircuit/musiclib.lps
+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
+lib/X11/xcircuit/digital.lps
+lib/X11/xcircuit/fonts/courier.lps
+lib/X11/xcircuit/fonts/courier.xfe
+lib/X11/xcircuit/fonts/courieriso.xfe
+lib/X11/xcircuit/fonts/courieriso2.lps
+lib/X11/xcircuit/fonts/courieriso2.xfe
+lib/X11/xcircuit/fonts/courieriso5.lps
+lib/X11/xcircuit/fonts/courieriso5.xfe
+lib/X11/xcircuit/fonts/helvetica.lps
+lib/X11/xcircuit/fonts/helvetica.xfe
+lib/X11/xcircuit/fonts/helveticaiso.xfe
+lib/X11/xcircuit/fonts/helveticaiso2.lps
+lib/X11/xcircuit/fonts/helveticaiso2.xfe
+lib/X11/xcircuit/fonts/helveticaiso5.lps
+lib/X11/xcircuit/fonts/helveticaiso5.xfe
+lib/X11/xcircuit/fonts/myfont.lps
+lib/X11/xcircuit/fonts/myfont.xfe
+lib/X11/xcircuit/fonts/symbol.lps
+lib/X11/xcircuit/fonts/symbol.xfe
+lib/X11/xcircuit/fonts/times_roman.lps
+lib/X11/xcircuit/fonts/times_roman.xfe
+lib/X11/xcircuit/fonts/times_romaniso.xfe
+lib/X11/xcircuit/fonts/times_romaniso2.lps
+lib/X11/xcircuit/fonts/times_romaniso2.xfe
+lib/X11/xcircuit/fonts/times_romaniso5.lps
+lib/X11/xcircuit/fonts/times_romaniso5.xfe
+lib/X11/xcircuit/lgf.lps
+lib/X11/xcircuit/musiclib.lps
+lib/X11/xcircuit/signal.lps
+lib/X11/xcircuit/xcircps2.pro
 share/examples/xcircuit/USAflag.ps
 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
-@dirrm lib/xcircuit
+@dirrm lib/X11/xcircuit/fonts
+@dirrm lib/X11/xcircuit