add flavors to build

- with 256-color support
- without Tektronix 4014 emulation
- with Xaw3d
requested by espie@

switch from imake to autoconf to support flavors

x11/xterm/Makefile

@@ -1,21 +1,37 @@
-# $OpenBSD: Makefile,v 1.3 2000/06/20 13:08:21 naddy Exp $
+# $OpenBSD: Makefile,v 1.4 2000/07/11 00:15:28 naddy Exp $
 
 DISTNAME=	xterm-139
 CATEGORIES=	x11
-NEED_VERSION=	1.299
+NEED_VERSION=	1.312
 
 HOMEPAGE=	http://dickey.his.com/xterm/xterm.html
 
-MAINTAINER=	naddy@unix-ag.uni-kl.de
+MAINTAINER=	naddy@openbsd.org
 
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
+FLAVORS=	col256 no_tek xaw3d
+FLAVOR?=
+
 MASTER_SITES=	ftp://dickey.his.com/xterm/
 EXTRACT_SUFX=	.tgz
 
-CONFIGURE_STYLE=	imake
+CONFIGURE_STYLE=	gnu
+CONFIGURE_ARGS=		--enable-wide-chars
+CFLAGS+=		-DUSE_POSIX_TERMIOS=1
+
+.if ${FLAVOR:L:Mcol256}
+CONFIGURE_ARGS+=	--enable-256-color
+.endif
+.if ${FLAVOR:L:Mno_tek}
+CONFIGURE_ARGS+=	--disable-tek4014
+.endif
+.if ${FLAVOR:L:Mxaw3d}
+LIB_DEPENDS+=		Xaw3d.6.1::x11/Xaw3d
+CONFIGURE_ARGS+=	--with-Xaw3d
+.endif
 
 .include <bsd.port.mk>

x11/xterm/patches/patch-configure

@@ -0,0 +1,13 @@
+$OpenBSD: patch-configure,v 1.1 2000/07/11 00:15:28 naddy Exp $
+--- configure.orig	Sat Jun 24 18:16:27 2000
++++ configure	Sat Jun 24 18:21:15 2000
+@@ -4310,7 +4310,8 @@ cf_x_athena_lib=""
+ for cf_path in default \
+ 	/usr/contrib/X11R6 \
+ 	/usr/contrib/X11R5 \
+-	/usr/lib/X11R5
++	/usr/lib/X11R5 \
++	/usr/local
+ do
+ 
+ 	if test -z "$cf_x_athena_include" ; then

x11/xterm/pkg/DESCR

@@ -2,3 +2,5 @@ The xterm program is a terminal emulator for the X Window System.
 It provides DEC VT102/VT220 (VTxxx) and Tektronix 4014 compatible
 terminals for programs that can't use the window system directly.
 This version adds Unicode (UTF-8) support.
+
+WWW: ${HOMEPAGE}

x11/xterm/pkg/PLIST

@@ -2,5 +2,5 @@ bin/xterm
 bin/resize
 lib/X11/app-defaults/XTerm
 lib/X11/app-defaults/XTerm-color
-man/cat1/xterm.0
-man/cat1/resize.0
+man/man1/xterm.1
+man/man1/resize.1