Update to 6.2.9.

Changes since rxvt 2.4.8:
fixed paths for WINGs includes to work with latest Window Maker code.
many bugs fixed in patch from suse src.rpm.
utmp/wtmp, glibc, pty support etc...
fixed bugs fg/bg cursor color code
added wmaker app menu
fixed xpm-background compile errors
fixed misc config errors
changed --enable-xpm-background --enable-transparency
--enable-next scroll to defaults.
added transparent scroller trough
fixed 1 pixel border in main window
fixed updating for root bg change
added many advanced options to app menu for shading, font
color, shade color, font size, cloning, etc.
more speed fixes
fixed bug with restart killing terms.
changed NEXT_SCROLLBAR code to produce real NEXTSTEP scrollers

4 files changed, 18 insertions, 45 deletions

diff --git a/x11/wterm/Makefile b/x11/wterm/Makefile
index 2cbcb088244..7c76d3d9888 100644
--- a/x11/wterm/Makefile
+++ b/x11/wterm/Makefile
@@ -1,30 +1,30 @@
-# $NetBSD: Makefile,v 1.12 2001/09/27 23:19:03 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2001/10/05 13:33:28 wiz Exp $
 #
 
-DISTNAME=	wterm-6.2.6
+DISTNAME=	wterm-6.2.9
 CATEGORIES=	x11
-MASTER_SITES=	http://wm.current.nu/files/
+MASTER_SITES=	http://largo.windowmaker.org/files/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	rh@netbsd.org
-HOMEPAGE=	http://wm.current.nu/files.php\#wterm
+HOMEPAGE=	http://largo.windowmaker.org/files.php\#wterm
 COMMENT=	NeXTStep(tm) style X11 terminal emulator for WindowMaker
 
-DEPENDS+=	windowmaker-[0-9]*:../../wm/windowmaker
-
-USE_X11BASE=	YES
-GNU_CONFIGURE=	YES
-
-CFLAGS+=	-I${LOCALBASE}/include -I${X11BASE}/include/WINGs
+GNU_CONFIGURE=		YES
+# some /usr/X11R6/lib references sneak in
+# USE_BUILDLINK_ONLY=	YES
 
 CONFIGURE_ARGS+= --enable-utmp --enable-wtmp --enable-xpm-background
 CONFIGURE_ARGS+= --enable-menubar --enable-graphics --enable-next-scroll
 CONFIGURE_ARGS+= --enable-half-shadow
 
 post-install:
-		${INSTALL_DATA} ${WRKSRC}/wterm.tiff \
-			${PREFIX}/share/WindowMaker/Icons
-		${INSTALL_DATA} ${WRKSRC}/wtermthai.tiff \
-			${PREFIX}/share/WindowMaker/Icons
-
+	${CHMOD} 4755 ${PREFIX}/bin/wterm
+	${INSTALL_DATA} ${WRKSRC}/wterm.tiff \
+		${PREFIX}/share/WindowMaker/Icons
+	${INSTALL_DATA} ${WRKSRC}/wtermthai.tiff \
+		${PREFIX}/share/WindowMaker/Icons
+
+.include "../../wm/windowmaker/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/wterm/distinfo b/x11/wterm/distinfo
index 92a204532ef..95b988bb202 100644
--- a/x11/wterm/distinfo
+++ b/x11/wterm/distinfo
@@ -1,6 +1,4 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 11:07:47 skrll Exp $
+$NetBSD: distinfo,v 1.3 2001/10/05 13:33:28 wiz Exp $
 
-SHA1 (wterm-6.2.6.tar.bz2) = d0bed9b5d338dbd1a156207ccce9dfa4c121dbf3
-Size (wterm-6.2.6.tar.bz2) = 239386 bytes
-SHA1 (patch-aa) = 893933197184c47342984e39b8ba023539fb114f
-SHA1 (patch-ab) = 4d24a9005f6332b512dc46bf86e6d5a9478abb19
+SHA1 (wterm-6.2.9.tar.bz2) = e759dea038d07146d70e9cd88ff4c68e4b0fd5b2
+Size (wterm-6.2.9.tar.bz2) = 262049 bytes
diff --git a/x11/wterm/patches/patch-aa b/x11/wterm/patches/patch-aa
deleted file mode 100644
index 80e76453761..00000000000
--- a/x11/wterm/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/05/03 18:03:29 rh Exp $
-
---- doc/Makefile.in.orig	Sun Jan 10 10:32:31 1999
-+++ doc/Makefile.in	Sat Apr  3 08:52:21 1999
-@@ -57,7 +57,7 @@
- distclean:
- 
- install: rxvt.1
--	$(INSTALL_DATA) rxvt.1 $(DESTDIR)$(mandir)/$(manprefix)rxvt.$(manext)
-+	$(INSTALL_DATA) rxvt.1 $(DESTDIR)$(mandir)/$(manprefix)wterm.$(manext)
- 
- uninstall:
- 	-cd $(mandir); $(RMF) $(manprefix)rxvt.$(manext)
diff --git a/x11/wterm/patches/patch-ab b/x11/wterm/patches/patch-ab
deleted file mode 100644
index b1926dcb272..00000000000
--- a/x11/wterm/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.1 1999/10/07 20:48:54 dante Exp $
-
---- src/Makefile.in.orig	Thu Oct  7 22:26:11 1999
-+++ src/Makefile.in	Thu Oct  7 22:25:13 1999
-@@ -69,6 +69,7 @@
- 
- install: allbin alldoc
- 	$(INSTALL_PROGRAM) wterm $(DESTDIR)$(bindir)/$(binprefix)wterm
-+	chmod 4755 $(DESTDIR)$(bindir)/$(binprefix)wterm
- 
- uninstall:
- 	(cd $(bindir); $(RMF) $(binprefix)wterm)