Unbreak by updating to the latest release 2.6. Gnome people may

wish to make it buildable with GTK2/Gnome -- it is an untested option
for now.

The program crashes when a process exits -- author contacted.

7 files changed, 92 insertions, 10 deletions

diff --git a/sysutils/lavaps/Makefile b/sysutils/lavaps/Makefile
index 175ad35e05d8..e0ecc300bf69 100644
--- a/sysutils/lavaps/Makefile
+++ b/sysutils/lavaps/Makefile
@@ -6,24 +6,44 @@
 #
 
 PORTNAME=	lavaps
-PORTVERSION=	1.20
+PORTVERSION=	2.6
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.isi.edu/~johnh/SOFTWARE/LAVAPS/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A lava lamp of currently running processes
 
-LIB_DEPENDS=	tk83.1:${PORTSDIR}/x11-toolkits/tk83
+OPTIONS=	GTK2 "Use GTK2 instead of TCL/TK for GUI (untested!)" off
 
-.include <bsd.port.pre.mk>
-.if ${OSVERSION} >= 500014
-BROKEN=		Changes to process info structs returned by kernel renders \
-		lavaps unbuildable - author has been made aware of this
+TCL_VER?=	8.4
+.ifdef WITH_GTK2
+LIB_DEPENDS=	intl:${PORTSDIR}/devel/gettext	\
+		iconv:${PORTSDIR}/converters/libiconv
+USE_GNOME=	gtk2
+CONFIGURE_ARGS+=--with-gtk
+PLIST_SUB+=	MO=''
+
+post-configure:
+	${MV} ${WRKSRC}/po/Makefile.in ${WRKSRC}/po/Makefile
+.else
+LIB_DEPENDS+=	tk${TCL_VER:S/.//}:${PORTSDIR}/x11-toolkits/tk${TCL_VER:S/.//}
+CONFIGURE_ARGS+=--with-tcltk
+USE_REINPLACE=	yes
+PLIST_SUB+=	MO='@comment '
+
+post-configure:
+	${REINPLACE_CMD} -e 's/ po / /' ${WRKSRC}/Makefile
 .endif
 
+BUILD_PERL=	yes, for documentation
+
+.include <bsd.port.pre.mk>
+
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" CPPFLAGS="-I${LOCALBASE}/include"
-CONFIGURE_ARGS=	--with-tcl-ver=8.3 --with-tk-ver=8.3
+CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" USE_NLS=yes
+CONFIGURE_ENV+=	TK_DOTTED_HI_VERS=${TCL_VER} TCL_DOTTED_HI_VERS=${TCL_VER}
+CONFIGURE_ARGS+=--with-tcl-ver=${TCL_VER} --with-tk-ver=${TCL_VER}
+CONFIGURE_ARGS+=--with-libintl --with-libiconv
 MAN1=		lavaps.1
 
 .include <bsd.port.post.mk>
diff --git a/sysutils/lavaps/distinfo b/sysutils/lavaps/distinfo
index 15ad6f0f1c93..e3952b4ff8e2 100644
--- a/sysutils/lavaps/distinfo
+++ b/sysutils/lavaps/distinfo
@@ -1,2 +1,2 @@
-MD5 (lavaps-1.20.tar.gz) = 947fda00fd65162fdf0d02d7ef9b76c5
-SIZE (lavaps-1.20.tar.gz) = 160724
+MD5 (lavaps-2.6.tar.gz) = 008a63f3fb9b06676cca9ac085aee9e2
+SIZE (lavaps-2.6.tar.gz) = 318054
diff --git a/sysutils/lavaps/files/patch-aa b/sysutils/lavaps/files/patch-aa
new file mode 100644
index 000000000000..2130f7769d3c
--- /dev/null
+++ b/sysutils/lavaps/files/patch-aa
@@ -0,0 +1,15 @@
+--- src/change_tracking.hh	Tue Jul 15 00:42:06 2003
++++ src/change_tracking.hh	Sat Nov 20 08:35:14 2004
+@@ -77,9 +77,9 @@
+ protected:
+ 	static SUM s_;
+-	void update_sum() { s_.sum_ += change_; }
++	void update_sum() { s_.sum_ += change_tracking<T>::change_; }
+ public:
+ 	sum_change_tracking() {};
+-	sum_change_tracking(T first) : change_tracking<T>(first) { update_sum(frst); };
+-	~sum_change_tracking() { tick_incr(-last_); };
++	sum_change_tracking(T first) : change_tracking<T>(first) { update_sum(first); };
++	~sum_change_tracking() { tick_incr(-change_tracking<T>::last_); };
+ 
+ 
diff --git a/sysutils/lavaps/files/patch-configure b/sysutils/lavaps/files/patch-configure
new file mode 100644
index 000000000000..a40ceb29d38e
--- /dev/null
+++ b/sysutils/lavaps/files/patch-configure
@@ -0,0 +1,9 @@
+--- configure	Sun Jun  6 22:20:50 2004
++++ configure	Sat Nov 20 07:37:39 2004
+@@ -6494,5 +6494,5 @@
+ TCLTK_INCLUDES=${PLATFORM_SPECIFIC_TCLTK_INCLUDES:-""}
+ TCLTK_LIBS=${PLATFORM_SPECIFIC_TCLTK_LIBS:-"tba"}
+-TCLTK_DL_LIB=${PLATFORM_SPECIFIC_TCLTK_DL_LIB:-"-ldl"}
++TCLTK_DL_LIB=${PLATFORM_SPECIFIC_TCLTK_DL_LIB}
+ 
+ echo "$as_me:$LINENO: checking for platform-specific tcl/tk code" >&5
diff --git a/sysutils/lavaps/files/patch-gconf b/sysutils/lavaps/files/patch-gconf
new file mode 100644
index 000000000000..b2dca85bfd16
--- /dev/null
+++ b/sysutils/lavaps/files/patch-gconf
@@ -0,0 +1,24 @@
+--- src/Makefile.in	Sun Jun  6 22:20:46 2004
++++ src/Makefile.in	Sat Nov 20 09:08:06 2004
+@@ -249,5 +249,5 @@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mkdir_p = @mkdir_p@
++mkdir_p = mkdir -p
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+@@ -459,11 +459,11 @@
+ install-schemaDATA: $(schema_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(schemadir)" || $(mkdir_p) "$(DESTDIR)$(schemadir)"
+-	@list='$(schema_DATA)'; for p in $$list; do \
++	test -z "$(schemadir)" || ($(mkdir_p) "$(DESTDIR)$(schemadir)"; \
++	list='$(schema_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+ 	  echo " $(schemaDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(schemadir)/$$f'"; \
+ 	  $(schemaDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(schemadir)/$$f"; \
+-	done
++	done)
+ 
+ uninstall-schemaDATA:
diff --git a/sysutils/lavaps/files/patch-po b/sysutils/lavaps/files/patch-po
new file mode 100644
index 000000000000..bf9726a610f4
--- /dev/null
+++ b/sysutils/lavaps/files/patch-po
@@ -0,0 +1,12 @@
+We fix this Makefile and install the .gmo even though lavaps does
+not use them yet -- not without Gnome, anyway. May be, this will
+change...
+--- po/Makefile.in.in	Sun Jun  6 22:19:05 2004
++++ po/Makefile.in.in	Sat Nov 20 08:46:31 2004
+@@ -60,5 +60,5 @@
+ POTFILES = \
+ 
+-CATALOGS = @CATALOGS@
++CATALOGS != echo *.gmo
+ 
+ # Makevars gets inserted here. (Don't remove this line!)
diff --git a/sysutils/lavaps/pkg-plist b/sysutils/lavaps/pkg-plist
index 9566de3bf4c0..91262031b6de 100644
--- a/sysutils/lavaps/pkg-plist
+++ b/sysutils/lavaps/pkg-plist
@@ -1,3 +1,5 @@
 bin/lavaps
+%%MO%%share/locale/es/LC_MESSAGES/lavaps.mo
+%%MO%%share/locale/ru/LC_MESSAGES/lavaps.mo
 @exec chgrp kmem %D/bin/lavaps
 @exec chmod g+s %D/bin/lavaps