Update lavaps to 1.15. Changes from version 1.10:

*   The display can now be lozenge-shaped (the way a real lava lamp
    is). This is controlled by the "lozenge" resource.
*   FreeBSD now drops setgid privileges.
*   Fixed bugs in handling .lavapsrc files.
*   In some cases lavaps would go into infinite blob growth or shrinkage.
*   Process control (nice, renice, kill) added.
*   Some of the "halo" around lozenge windows fixed.
*   Dependence on an external ``whoami'' program removed.
*   Process name added to proc menu.
*   Handling of window decorations (the ``halo'' bug) mostly cleaned up.
*   Shaped windows can now be disabled completely.
*   Fix for the "infinite growth on start" bug that occurred if no
    geometry was specified.

4 files changed, 25 insertions, 15 deletions

diff --git a/sysutils/lavaps/Makefile b/sysutils/lavaps/Makefile
index 0878c3d1914..b8da4c9e316 100644
--- a/sysutils/lavaps/Makefile
+++ b/sysutils/lavaps/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2000/09/06 16:09:50 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2000/10/15 02:33:13 jlam Exp $
 #
 
-DISTNAME=	lavaps-1.10
+DISTNAME=	lavaps-1.15
 CATEGORIES=	sysutils x11
 MASTER_SITES=	http://www.isi.edu/~johnh/SOFTWARE/LAVAPS/
 
@@ -10,10 +10,11 @@ HOMEPAGE=	http://www.isi.edu/~johnh/SOFTWARE/LAVAPS/
 
 DEPENDS+=	tk-8.3.2:../../x11/tk
 
-USE_X11=	YES
-GNU_CONFIGURE=	YES
+USE_X11=	# defined
+GNU_CONFIGURE=	# defined
 CONFIGURE_ARGS=	--with-additional-includes='-I${LOCALBASE}/include' \
 		--with-additional-libs='-L${LOCALBASE}/lib' \
-		--with-tcl-ver=8.3.2 --with-tk-ver=8.3.2
+		--with-tcl-ver=8.3.2 --with-tk-ver=8.3.2 \
+		--with-tcltk-lib-suffix-type=nodot
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/lavaps/files/md5 b/sysutils/lavaps/files/md5
index 858adcd6a69..4329a2c69ad 100644
--- a/sysutils/lavaps/files/md5
+++ b/sysutils/lavaps/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 2000/02/17 00:51:21 hubertf Exp $
+$NetBSD: md5,v 1.3 2000/10/15 02:33:14 jlam Exp $
 
-MD5 (lavaps-1.10.tar.gz) = 85f17812d30715318bf98504057e3b97
+MD5 (lavaps-1.15.tar.gz) = 36ad2964f9462a6f8194a9ced31680fc
diff --git a/sysutils/lavaps/files/patch-sum b/sysutils/lavaps/files/patch-sum
index 5a0b8672073..4b6df0e4ef0 100644
--- a/sysutils/lavaps/files/patch-sum
+++ b/sysutils/lavaps/files/patch-sum
@@ -1,3 +1,3 @@
-$NetBSD: patch-sum,v 1.4 2000/09/06 16:09:51 jlam Exp $
+$NetBSD: patch-sum,v 1.5 2000/10/15 02:33:14 jlam Exp $
 
-MD5 (patch-aa) = 7134b5196ea1210ddd57798077063e07
+MD5 (patch-aa) = edc983b4afb881270db87e201f52be46
diff --git a/sysutils/lavaps/patches/patch-aa b/sysutils/lavaps/patches/patch-aa
index a6fab2dfcab..1c183cced0a 100644
--- a/sysutils/lavaps/patches/patch-aa
+++ b/sysutils/lavaps/patches/patch-aa
@@ -1,7 +1,16 @@
-$NetBSD: patch-aa,v 1.2 2000/02/05 06:54:30 wiz Exp $
---- process_scan_freebsd.cc.orig	Tue Nov  2 16:27:39 1999
-+++ process_scan_freebsd.cc	Tue Nov  2 16:53:24 1999
-@@ -112,7 +112,7 @@
+$NetBSD: patch-aa,v 1.3 2000/10/15 02:33:15 jlam Exp $
+
+--- process_scan_freebsd.cc.orig	Tue Jun  6 16:25:25 2000
++++ process_scan_freebsd.cc	Wed Sep  6 05:16:59 2000
+@@ -39,6 +39,7 @@
+ #include <sys/user.h>
+ #include <fcntl.h>
+ #include <kvm.h>
++#include <unistd.h>
+ }
+ 
+ #include "process_scan.hh"
+@@ -116,7 +117,7 @@
  	ENTRY_TRACE(__FILE__,__LINE__);
  	static int pages_per_kb = 0;
  	if (!pages_per_kb)
@@ -10,7 +19,7 @@ $NetBSD: patch-aa,v 1.2 2000/02/05 06:54:30 wiz Exp $
  	return pages * pages_per_kb;
  }
  
-@@ -246,6 +246,16 @@
+@@ -250,6 +251,16 @@
  	// xxx: skip p_iticks
  
  	int size, resident;
@@ -18,7 +27,7 @@ $NetBSD: patch-aa,v 1.2 2000/02/05 06:54:30 wiz Exp $
 +#ifdef __NetBSD__
 +#  ifndef UPAGES
 +#    ifdef USPACE
-+#      define UPAGES	( USPACE / sysconf(_SC_PAGESIZE) )
++#      define UPAGES   ( USPACE / sysconf(_SC_PAGESIZE) )
 +#    else /* !USPACE */
 +#      error No UPAGES, no USPACE, no fun!
 +#    endif /* USPACE */