- add a no_tk FLAVOR.

- remove separate config.guess.
--
The FLAVOR from: Chad Loder <cloder@acm.org>

lang/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.53 2002/06/29 13:27:31 espie Exp $
+# $OpenBSD: Makefile,v 1.54 2002/06/30 17:50:28 brad Exp $
 # $FreeBSD: Makefile,v 1.89 1997/11/24 09:24:06 tg Exp $
 #
 
@@ -17,6 +17,7 @@
 #    SUBDIR += eperl
      SUBDIR += erlang
      SUBDIR += expect
+     SUBDIR += expect,no_tk
      SUBDIR += ezm3
 #    SUBDIR += forth
 #    SUBDIR += g77

lang/expect/Makefile

@@ -1,15 +1,14 @@
-# $OpenBSD: Makefile,v 1.35 2002/04/15 07:25:31 espie Exp $
+# $OpenBSD: Makefile,v 1.36 2002/06/30 17:50:28 brad Exp $
 
 COMMENT=	"sophisticated scripter based on Tcl/Tk"
 
 DISTNAME=	expect-5.32.1
 CATEGORIES=	lang
-NEED_VERSION=	1.402
 MASTER_SITES=	http://expect.nist.gov/old/
 
 HOMEPAGE=	http://expect.nist.gov/
 
-LIB_DEPENDS=	tk83.1.3::x11/tk/8.3
+LIB_DEPENDS+=	tcl83.1::lang/tcl/8.3
 
 MAINTAINER=	Niklas Hallqvist <niklas@openbsd.org>
 
@@ -20,19 +19,23 @@ PERMIT_DISTFILES_FTP=	Yes
 
 FAKE_FLAGS=	INSTALL_ROOT="${WRKINST}"
 
+FLAVORS=	no_tk
+FLAVOR?=
+
 SEPARATE_BUILD=	concurrent
 CONFIGURE_STYLE= gnu
 CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
 CONFIGURE_ARGS+=--with-tclconfig="${LOCALBASE}/lib/tcl8.3" \
-		--with-tclinclude="${LOCALBASE}/include/tcl8.3" \
-		--with-tkconfig="${LOCALBASE}/lib/tk8.3" \
+		--with-tclinclude="${LOCALBASE}/include/tcl8.3"
+
+.if !${FLAVOR:L:Mno_tk}
+LIB_DEPENDS+=	tk83.1.3::x11/tk/8.3
+CONFIGURE_ARGS+=--with-tkconfig="${LOCALBASE}/lib/tk8.3" \
 		--with-tkinclude="${LOCALBASE}/include/tk8.3"
+.endif
 
 WRKDIST=	${WRKDIR}/expect-5.32
 
-post-extract:
-	@cp -f ${FILESDIR}/config.guess ${WRKSRC}
-
 # make sure configure is newer than Makefile.in, since we patch Makefile.in
 # as well.
 post-patch:

lang/expect/pkg/DESCR

@@ -4,4 +4,7 @@ interactive programs.  It is briefly described by its man page, expect(1).
 It uses pseudo-tty's to control the child processes, so it is not affected
 by programs that refuse to read from stdin or pipes. (eg: passwd(1) etc).
 
+Flavors:
+	no_tk - Do not build with Tk support.
+
 WWW: ${HOMEPAGE}

lang/expect/pkg/PFRAG.no-no_tk

@@ -0,0 +1,10 @@
+@comment $OpenBSD: PFRAG.no-no_tk,v 1.1 2002/06/30 17:50:28 brad Exp $
+bin/expectk
+bin/tknewsbiff
+bin/tkpasswd
+bin/xkibitz
+man/man1/expect.1
+man/man1/expectk.1
+man/man1/tknewsbiff.1
+man/man1/xkibitz.1
+

lang/expect/pkg/PLIST

@@ -1,11 +1,10 @@
-@comment $OpenBSD: PLIST,v 1.13 2002/03/29 22:18:46 naddy Exp $
+@comment $OpenBSD: PLIST,v 1.14 2002/06/30 17:50:28 brad Exp $
 bin/autoexpect
 bin/autopasswd
 bin/cryptdir
 bin/decryptdir
 bin/dislocate
 bin/expect
-bin/expectk
 bin/ftp-rfc
 bin/kibitz
 bin/lpunlock
@@ -14,11 +13,8 @@ bin/rftp
 bin/rlogin-cwd
 bin/timed-read
 bin/timed-run
-bin/tknewsbiff
-bin/tkpasswd
 bin/unbuffer
 bin/weather
-bin/xkibitz
 bin/xpstat
 include/expect.h
 include/expect_comm.h
@@ -32,11 +28,9 @@ man/man1/cryptdir.1
 man/man1/decryptdir.1
 man/man1/dislocate.1
 man/man1/expect.1
-man/man1/expectk.1
 man/man1/kibitz.1
 man/man1/passmass.1
-man/man1/tknewsbiff.1
 man/man1/unbuffer.1
-man/man1/xkibitz.1
 man/man3/libexpect.3
+!%%no_tk%%
 @dirrm lib/expect5.32