Changes 4.2:

* Minor small improvements reported by users
* Change to make autoheader shut up with its warnings
* Include help headers in distribution

5 files changed, 16 insertions, 46 deletions

diff --git a/sysutils/xps/Makefile b/sysutils/xps/Makefile
index 8285370d146..01b59091ae7 100644
--- a/sysutils/xps/Makefile
+++ b/sysutils/xps/Makefile
@@ -1,19 +1,17 @@
-# $NetBSD: Makefile,v 1.26 2004/10/03 00:18:17 tv Exp $
+# $NetBSD: Makefile,v 1.27 2004/11/09 12:30:40 adam Exp $
 
-DISTNAME=	xps-3.14
-PKGREVISION=	1
+DISTNAME=	xps-4.2
 CATEGORIES=	sysutils
-MASTER_SITES=	ftp://ftp.netwinder.org/users/r/rocky/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=motif-pstree/}
 
 MAINTAINER=	tech-pkg@NetBSD.org
-HOMEPAGE=	http://www.netwinder.org/~rocky/xps-home/
+HOMEPAGE=	http://motif-pstree.sourceforge.net/
 COMMENT=	Displays the Unix process list as a hierarchical tree
 
-GNU_CONFIGURE=	# defined
-USE_BUILDLINK3=	yes
-USE_GNU_TOOLS+=	make
-USE_PERL5=	build
-USE_X11BASE=	# defined
+USE_BUILDLINK3=		yes
+USE_GNU_TOOLS+=		make
+USE_PERL5=		build
+GNU_CONFIGURE=		yes
 
 .include "../../mk/motif.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/xps/distinfo b/sysutils/xps/distinfo
index cba87c64651..85d6eb09d5b 100644
--- a/sysutils/xps/distinfo
+++ b/sysutils/xps/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.4 2003/06/17 15:31:40 fredb Exp $
+$NetBSD: distinfo,v 1.5 2004/11/09 12:30:40 adam Exp $
 
-SHA1 (xps-3.14.tar.gz) = 0c21a13b99f3375d8fc1b94b9bdabec2dd232a59
-Size (xps-3.14.tar.gz) = 168772 bytes
-SHA1 (patch-aa) = 53b9c9a7b6cf3f24b3667a9b528f378392d45507
-SHA1 (patch-ab) = 7dc58c1627b61f85e5656d364dd67c33281ce82f
-SHA1 (patch-ac) = b65deba1ffa57fdfd64ea2df9e1c20315f81a688
+SHA1 (xps-4.2.tar.gz) = 55c9176086e019a58d632580a31d70618235e149
+Size (xps-4.2.tar.gz) = 279690 bytes
+SHA1 (patch-ac) = 6a94bd17251f440c2af8302b0c842191420e4efc
diff --git a/sysutils/xps/patches/patch-aa b/sysutils/xps/patches/patch-aa
deleted file mode 100644
index 472b3f4be83..00000000000
--- a/sysutils/xps/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2003/06/17 15:30:52 fredb Exp $
-
---- common.c.orig	1999-06-16 22:44:56.000000000 -0500
-+++ common.c
-@@ -950,7 +950,7 @@ usage(int exitcode)
- \t-zombie    color     Color for zombie   processes\n\
- \t-stopped   color     Color for stopped  processes\n\
- \t-kill                Enable Quick Kill\n\
--\t-metoo               Show me running too.
-+\t-metoo               Show me running too.\n\
- \t-pscmdline string    Command to give ps cmdline. Should have %%d for pid\n\
- \t-pscmdinfo string    Command to give ps info. Should have %%d for pid\n\
- \t-version             Print version information and build info\n\
diff --git a/sysutils/xps/patches/patch-ab b/sysutils/xps/patches/patch-ab
deleted file mode 100644
index c0d1dd6c550..00000000000
--- a/sysutils/xps/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2001/07/03 01:46:07 jlam Exp $
-
---- Makefile.in.orig	Mon Jul  5 18:32:56 1999
-+++ Makefile.in
-@@ -57,7 +57,7 @@
- INCLUDES        = -I. @XINCLUDES@
- LIBS            = @LIBS@
- ALL_CFLAGS      = $(CFLAGS) $(X_CFLAGS) $(INCLUDES) 
--ALL_LIBS	= $(LIBS) $(X_LIBS) $(X_PRE_LIBS) $(X_EXTRA_LIBS)
-+ALL_LIBS	= $(LDFLAGS) $(LIBS) $(X_LIBS) $(X_PRE_LIBS) $(X_EXTRA_LIBS)
- 
- PERL 		= perl
- 
diff --git a/sysutils/xps/patches/patch-ac b/sysutils/xps/patches/patch-ac
index 7e68b4032ee..3e52b92f0a9 100644
--- a/sysutils/xps/patches/patch-ac
+++ b/sysutils/xps/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1 2003/06/17 15:31:40 fredb Exp $
+$NetBSD: patch-ac,v 1.2 2004/11/09 12:30:40 adam Exp $
 
---- NetBSD/xps.c.orig	1999-05-22 15:56:46.000000000 -0500
-+++ NetBSD/xps.c
-@@ -162,8 +162,10 @@ GetStatus(ProcInfo *p)
+--- src/NetBSD/os.c.orig	2003-04-24 00:21:29.000000000 +0000
++++ src/NetBSD/os.c
+@@ -166,8 +166,10 @@ GetStatus(ProcInfo *p)
  
    if (proc->kp_proc.p_pid == MyPid && !cmd_options.me_too)
      pstat = SSLEEP;