4 files changed, 37 insertions, 50 deletions

diff --git a/x11/wterm/Makefile b/x11/wterm/Makefile
index 5d4623022464..28e15de5fbe7 100644
--- a/x11/wterm/Makefile
+++ b/x11/wterm/Makefile
@@ -6,22 +6,25 @@
 #
 
 PORTNAME=	wterm
-PORTVERSION= 	6.2.6
+PORTVERSION=	6.2.7a1
 CATEGORIES=	x11
 MASTER_SITES= 	http://wm.current.nu/files/ \
-		ftp://ftp.kddlabs.co.jp/pub/X11/acontrib/wterm/ \
-		ftp://ftp.riken.go.jp/pub/X11/acontrib/wterm/
+		ftp://ftp.sunsite.auc.dk/disk1/linuxberg.com/files/x11/system/ \
+		ftp://ftp.vision.net.au/ftp7/linuxberg/files/x11/system/ \
+		ftp://ftp.cadvision.com/pub/linuxberg/files/x11/system/
 
 MAINTAINER=	cpiazza@FreeBSD.org
 
 BUILD_DEPENDS=	${X11BASE}/lib/libWINGs.a:${PORTSDIR}/x11-wm/windowmaker
 
+WRKSRC=		${WRKDIR}/wterm-6.2.7
 USE_X_PREFIX=	yes
 USE_XPM=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-transparency --enable-xpm-background \
+CONFIGURE_ARGS= --enable-transparency --enable-xpm-background \
 		--disable-delete-key --disable-backspace-key \
-		--enable-next-scrollbar --enable-utmp --enable-wtmp
+		--enable-next-scrollbar --enable-utmp --enable-wtmp \
+#		--enable-menubar --enable-graphics
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include"
 
 MAN1=		wterm.1
diff --git a/x11/wterm/distinfo b/x11/wterm/distinfo
index d6062639bffa..db1af30125ff 100644
--- a/x11/wterm/distinfo
+++ b/x11/wterm/distinfo
@@ -1 +1 @@
-MD5 (wterm-6.2.6.tar.gz) = 0a3e7a63e9440de446fa961643687f30
+MD5 (wterm-6.2.7a1.tar.gz) = f34ccbcfe8d2ca67fb334157ea870a45
diff --git a/x11/wterm/files/patch-aa b/x11/wterm/files/patch-aa
index 4fc69d786397..266d0e305a64 100644
--- a/x11/wterm/files/patch-aa
+++ b/x11/wterm/files/patch-aa
@@ -1,44 +1,11 @@
---- doc/Makefile.in.orig	Thu Feb 25 20:04:04 1999
-+++ doc/Makefile.in	Thu Feb 25 20:05:24 1999
-@@ -20,7 +20,7 @@
- DIST_MENU = menu/menu menu/example.menu menu/rxvt.menu menu/terminal.menu\
- 	    menu/jedmenu.sl
- DIST	  = Makefile.in README.greek README.menu README.xvt BUGS FAQ TODO\
--	    changes.txt xterm.seq LSM.in rxvt.1 rxvt.pretbl rxvtRef.txt\
-+	    changes.txt xterm.seq LSM.in wterm.1 rxvt.pretbl rxvtRef.txt\
- 	    rxvtRef.html rxvtRef-frame.html rxvtRef-toc.html rxvt.html 
- 
- #-------------------------------------------------------------------------
-@@ -41,26 +41,26 @@
- 
- tags allbin:
- 
--alldoc:	$(basedir)/$(VERNAME).lsm rxvt.1 rxvt.html rxvtRef.html rxvtRef.txt
-+alldoc:	$(basedir)/$(VERNAME).lsm wterm.1 rxvt.html rxvtRef.html rxvtRef.txt
- 
- $(basedir)/$(VERNAME).lsm: LSM.in ../autoconf/Make.common.in
- 	$(SED) $(SEDREPLACE) < LSM.in > $@
- 
--rxvt.1: rxvt.pretbl
-+wterm.1: rxvt.pretbl
- 	tbl rxvt.pretbl > $@
- clean:
- 	$(RMF) rxvt.man *~ 
- 
- realclean: clean
--	$(RMF) tags rxvt.1 rxvt.html rxvtRef.html rxvtRef.txt
-+	$(RMF) tags wterm.1 rxvt.html rxvtRef.html rxvtRef.txt
- 
- distclean:
- 
--install: rxvt.1
--	$(INSTALL_DATA) rxvt.1 $(DESTDIR)$(mandir)/$(manprefix)rxvt.$(manext)
-+install: wterm.1
-+	$(INSTALL_DATA) wterm.1 $(DESTDIR)$(mandir)/$(manprefix)wterm.$(manext)
- 
- uninstall:
--	-cd $(mandir); $(RMF) $(manprefix)rxvt.$(manext)
-+	-cd $(mandir); $(RMF) $(manprefix)wterm.$(manext)
- 
- distdirs:
- 	mkdir $(basedir)/../$(VERNAME)/$(thisdir)
+--- configure.orig	Sat Apr  8 14:33:32 2000
++++ configure	Sat Apr  8 14:35:05 2000
+@@ -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"
diff --git a/x11/wterm/files/patch-ab b/x11/wterm/files/patch-ab
new file mode 100644
index 000000000000..96aba37b8ecb
--- /dev/null
+++ b/x11/wterm/files/patch-ab
@@ -0,0 +1,17 @@
+--- 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
+