Add --with-xpm-* to CONFIGURE_ARGS to make this port X11BASE-clean.

While I'm here, add --with-term=xterm-color to eliminate the need
for patch-ab, and delete the now irrelevant patch-aa.

x11/wterm/Makefile

@@ -23,7 +23,8 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-transparency --enable-xpm-background \
 		--disable-delete-key --disable-backspace-key \
 		--enable-next-scrollbar --enable-utmp --enable-wtmp \
-		--enable-menubar --enable-graphics
+		--enable-menubar --enable-graphics --with-term=xterm-color \
+		--with-xpm-includes=${X11BASE} --with-xpm-library=${X11BASE}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include/WINGs"
 
 MAN1=		wterm.1

x11/wterm/files/patch-aa

@@ -1,19 +0,0 @@
---- configure.orig	Tue Feb  2 13:07:34 1999
-+++ configure	Sun Jan  7 23:30:51 2001
-@@ -9,7 +9,7 @@
- 
- # Defaults:
- ac_help=
--ac_default_prefix=/usr/local
-+ac_default_prefix=/usr/X11R6
- # Any additions from configure.in:
- ac_help="$ac_help
-   --enable-utmp           enable utmp/utmpx support"
-@@ -3552,6 +3552,7 @@
- 
- fi
- 
-+wterm_cv_path_wtmp=/var/log/wtmp
- echo "$ac_t""$wterm_cv_path_wtmp" 1>&6
- if test "${wterm_cv_path_wtmp+set}" = set; then
-   cat >> confdefs.h <<EOF

x11/wterm/files/patch-ab

@@ -1,17 +0,0 @@
---- src/wterm.h.orig	Thu Aug 10 03:12:22 2000
-+++ src/wterm.h	Thu Aug 10 03:12:47 2000
-@@ -408,11 +408,13 @@
- #else
- # define COLORTERMENVFULL COLORTERMENV
- #endif
-+
-+#undef TERMENV
- #ifndef TERMENV
- # ifdef KANJI
- #  define TERMENV	"kterm"
- # else
--#  define TERMENV	"xterm"
-+#  define TERMENV	"xterm-color"
- # endif
- #endif
-