From e41f2b4d1e9fe040f296d6aed382642c73356613 Mon Sep 17 00:00:00 2001
From: steven <steven@openbsd.org>
Date: Sat, 10 Oct 2009 22:41:40 +0000
Subject: [PATCH] update to 3.4.30 and switch it to tcl/tk 8.5

---
 cad/xcircuit/Makefile  | 14 +++++++-------
 cad/xcircuit/distinfo  | 10 +++++-----
 cad/xcircuit/pkg/PLIST |  4 ++--
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/cad/xcircuit/Makefile b/cad/xcircuit/Makefile
index 9c841744bf4..9df0c5c088a 100644
--- a/cad/xcircuit/Makefile
+++ b/cad/xcircuit/Makefile
@@ -1,12 +1,11 @@
-# $OpenBSD: Makefile,v 1.11 2009/08/10 06:30:30 kili Exp $
+# $OpenBSD: Makefile,v 1.12 2009/10/10 22:41:40 steven Exp $
 
 SHARED_ONLY=		Yes
 
 COMMENT=		circuit drawing and schematic capture
 
 BASEVER=		3.4
-DISTNAME=		xcircuit-${BASEVER}.27
-PKGNAME=		${DISTNAME}p3
+DISTNAME=		xcircuit-${BASEVER}.30
 CATEGORIES=		cad
 
 HOMEPAGE=		http://opencircuitdesign.com/xcircuit/
@@ -17,7 +16,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB=		c m z ICE Xt X11 SM Xpm pthread-stubs tcl84 xcb
+WANTLIB=		c m z ICE Xt X11 SM Xpm
 
 MASTER_SITES=		${HOMEPAGE}archive/
 EXTRACT_SUFX=		.tgz
@@ -25,10 +24,11 @@ EXTRACT_SUFX=		.tgz
 CONFIGURE_STYLE=	autoconf no-autoheader
 AUTOCONF_VERSION=	2.59
 CONFIGURE_ARGS+=	${CONFIGURE_SHARED} \
-			--with-tcl=${LOCALBASE}/lib/tcl8.4 \
-			--with-tk=${LOCALBASE}/lib/tk8.4
+			--with-tcl=${MODTCL_LIBDIR} \
+			--with-tk=${MODTK_LIBDIR}
 
-LIB_DEPENDS+=		tk84:tk->=8.4,<8.5:x11/tk/8.4
+MODULES=		x11/tk
+LIB_DEPENDS+=		${MODTK_LIB_DEPENDS}
 
 USE_X11=		Yes
 USE_GMAKE=		Yes
diff --git a/cad/xcircuit/distinfo b/cad/xcircuit/distinfo
index 3adf30f3be5..9b09b504b82 100644
--- a/cad/xcircuit/distinfo
+++ b/cad/xcircuit/distinfo
@@ -1,5 +1,5 @@
-MD5 (xcircuit-3.4.27.tgz) = ewbxd4B6WCNHbLBukeXhqA==
-RMD160 (xcircuit-3.4.27.tgz) = GbHD1Ki6TgwdzCQI0WP9H7VmhUs=
-SHA1 (xcircuit-3.4.27.tgz) = slWYScVyqNpIm+YE1EUTgXT+kGs=
-SHA256 (xcircuit-3.4.27.tgz) = PBRlCnH8mTt5MSXfpp3xEtrTsOHSA8lCvz5aADz+Yqo=
-SIZE (xcircuit-3.4.27.tgz) = 1055591
+MD5 (xcircuit-3.4.30.tgz) = rav6hDKtTJU0TRKoIZAugQ==
+RMD160 (xcircuit-3.4.30.tgz) = /GAGM21pjEn14S9N2ImyxSOtaN0=
+SHA1 (xcircuit-3.4.30.tgz) = d42QPz2vJkK+Ntaiyak97oJ4sT0=
+SHA256 (xcircuit-3.4.30.tgz) = Z7WOhvXGnf4UhysA50OyEVCATfYK0z2jBTPg/RjoKNg=
+SIZE (xcircuit-3.4.30.tgz) = 1055721
diff --git a/cad/xcircuit/pkg/PLIST b/cad/xcircuit/pkg/PLIST
index 597074e7986..8a9e7f50122 100644
--- a/cad/xcircuit/pkg/PLIST
+++ b/cad/xcircuit/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.4 2007/11/19 17:18:41 okan Exp $
+@comment $OpenBSD: PLIST,v 1.5 2009/10/10 22:41:40 steven Exp $
 bin/xcircuit
 lib/xcircuit-${BASEVER}/
 lib/xcircuit-${BASEVER}/analog.lps
@@ -136,7 +136,7 @@ lib/xcircuit-${BASEVER}/signal.lps
 lib/xcircuit-${BASEVER}/sue_xc.tcl
 lib/xcircuit-${BASEVER}/tkcon.tcl
 lib/xcircuit-${BASEVER}/wrapper.tcl
-lib/xcircuit-${BASEVER}/xcircexec
+@bin lib/xcircuit-${BASEVER}/xcircexec
 lib/xcircuit-${BASEVER}/xcircps2.pro
 lib/xcircuit-${BASEVER}/xcircuit.so
 lib/xcircuit-${BASEVER}/xcircuit.tcl