>Number:         21647
>Category:       pkg
>Synopsis:       Upgrade for x11/xterm
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Thu May 22 16:26:01 UTC 2003
>Closed-Date:
>Last-Modified:
>Originator:     Jonathan Perkin
>Release:        NetBSD 1.6R
>Organization:
	British Broadcasting Corporation
>Environment:
System: NetBSD batfink.intra.nut 1.6R NetBSD 1.6R (GENERIC) #1: Sun May 4 19:24:00 BST 2003 sketch@batfink.intra.nut:/usr/obj/sys/arch/i386/compile/GENERIC i386
Architecture: i386
Machine: i386
>Description:
	x11/xterm is a bit old and crufty, here's what I use locally for a
	nice shiny newer version (which also compiles, as the current one
	doesn't due to imake issues).
>How-To-Repeat:
>Fix:
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/xterm/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- Makefile	2002/09/04 12:57:56	1.5
+++ Makefile	2003/05/22 14:53:41
@@ -1,8 +1,9 @@
 # $NetBSD: Makefile,v 1.5 2002/09/04 12:57:56 tron Exp $
 
-DISTNAME=	xterm-164
+DISTNAME=	xterm-178
 CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_LOCAL}
+MASTER_SITES=	ftp://dickey.his.com/xterm/
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	tron@netbsd.org
 HOMEPAGE=	http://dickey.his.com/xterm/xterm.html
@@ -11,11 +12,16 @@
 ONLY_FOR_PLATFORM=	SunOS-*-*	# in NetBSD X11 distribution
 
 USE_BUILDLINK2=	YES
-USE_IMAKE=	YES
+GNU_CONFIGURE=	YES
 
+# Needed to find local Xpoll.h during configure.
+CPPFLAGS+=	-I.
+
 INSTALL_FILE=	${WRKDIR}/INSTALL
 DEINSTALL_FILE=	${INSTALL_FILE}
 
+INSTALL_TARGET=	${INSTALL} ${INSTALL}-ti
+
 post-extract:
 	@${MKDIR} ${WRKSRC}/X11
 	@${LN} -s ${FILESDIR}/Xpoll.h ${WRKSRC}/X11
@@ -30,6 +36,8 @@
 	${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL
 
 post-install:
+	${CP} ${WRKSRC}/terminfo ${PREFIX}/lib/X11/etc/xterm.terminfo
+	${CP} ${WRKSRC}/termcap ${PREFIX}/lib/X11/etc/xterm.termcap
 	${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
 
 .include "../../mk/bsd.pkg.mk"
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/x11/xterm/PLIST,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PLIST
--- PLIST	2001/12/17 14:34:17	1.1.1.1
+++ PLIST	2003/05/22 14:53:41
@@ -4,8 +4,8 @@
 bin/uxterm
 lib/X11/etc/xterm.termcap
 lib/X11/etc/xterm.terminfo
-lib/app-defaults/XTerm
-lib/app-defaults/UXTerm
-lib/app-defaults/XTerm-color
-share/man/man1/resize.1
-share/man/man1/xterm.1
+lib/X11/app-defaults/XTerm
+lib/X11/app-defaults/UXTerm
+lib/X11/app-defaults/XTerm-color
+man/man1/resize.1
+man/man1/xterm.1
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/x11/xterm/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- distinfo	2001/12/17 14:34:17	1.1.1.1
+++ distinfo	2003/05/22 14:53:41
@@ -1,4 +1,4 @@
 $NetBSD: distinfo,v 1.1.1.1 2001/12/17 14:34:17 tron Exp $
 
-SHA1 (xterm-164.tar.gz) = eb2698f9fc0e21295e31fd44f20b732088319cd2
-Size (xterm-164.tar.gz) = 602086 bytes
+SHA1 (xterm-178.tgz) = a8d28cc5ae488c76f4c51b9abe86f817f2a264ba
+Size (xterm-178.tgz) = 632539 bytes
>Release-Note:
>Audit-Trail:
>Unformatted: