Updated to version 1.2.13.

Changes:

- USE_PKGLOCALEDIR
- don't hardcode -Wl,-E

1.2.13:
=======
- Very minor changes: enforce no message popups during init_plugin(),
  and allow a " in mailbox passwords.
- Contributions
  - Ben Hines <bhines--at--alumni.ucsd.edu> added Mac OS X code
    so monitors now have a native Mac interface.

1.2.12:
=======
- Theme changing keyboard shortcuts changed to Page_Up/Page_Down.
- Fix Linux APM to use ac_online status when battery status is
  unknown.
- Allow spaces in remote mailbox username and password.
- Get data for remote fs mounts in a thread.
- Use data-suffix directories when running gkrellm -c or when in
  force-host-config mode.
- Contributions
  o Nick Mitchell <firepile@speakeasy.net> patch:
    Fix IMAP login fail if password had certain chars.
  o Christian Rose <menthos--at--menthos.com> sv.po update.
  o Przemyslaw Sulek <pbs--at--linux.net.pl> pl.po update.
  o de.po translation update.
  o Jerome UZEL <jerome.uzel--at--wanadoo.fr> fr.po update.
  o Grigory Batalov <bga--at--altlinux.ru> ru.po update.
  o Chris <chris@starforge.co.uk> patch adds clock chime option.

5 files changed, 40 insertions, 36 deletions

diff --git a/sysutils/gkrellm/Makefile b/sysutils/gkrellm/Makefile
index 2a337548eb5..49f98bad7ec 100644
--- a/sysutils/gkrellm/Makefile
+++ b/sysutils/gkrellm/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2002/11/07 15:07:46 fredb Exp $
+# $NetBSD: Makefile,v 1.23 2003/02/15 09:33:03 salo Exp $
 #
 
-DISTNAME=	gkrellm-1.2.11
-PKGREVISION=	2
+DISTNAME=	gkrellm-1.2.13
 CATEGORIES=	sysutils
 MASTER_SITES=	http://web.wt.net/~billw/gkrellm/
 EXTRACT_SUFX=	.tar.bz2
@@ -17,11 +16,13 @@ OSVERSION_SPECIFIC=	YES
 USE_BUILDLINK2=		YES
 USE_X11=		YES
 USE_GMAKE=		YES
+USE_PKGLOCALEDIR=	YES
 
 ALL_TARGET=		netbsd
 INSTALL_TARGET=		install_netbsd
 
 MAKE_ENV+=	PTHREAD_INC="-I${LOCALBASE}/include"
+MAKE_ENV+=	EXPORT_SYMBOLS_LDFLAGS="${EXPORT_SYMBOLS_LDFLAGS}"
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/gkrellm
diff --git a/sysutils/gkrellm/PLIST b/sysutils/gkrellm/PLIST
index 134a97a5502..f6902fcba63 100644
--- a/sysutils/gkrellm/PLIST
+++ b/sysutils/gkrellm/PLIST
@@ -1,18 +1,18 @@
-@comment $NetBSD: PLIST,v 1.4 2002/05/02 20:45:35 fredb Exp $
+@comment $NetBSD: PLIST,v 1.5 2003/02/15 09:33:03 salo Exp $
 bin/gkrellm
 include/gkrellm/gkrellm.h
 include/gkrellm/gkrellm_public_proto.h
 man/man1/gkrellm.1
-share/gkrellm/README
-share/locale/de/LC_MESSAGES/gkrellm.mo
-share/locale/es/LC_MESSAGES/gkrellm.mo
-share/locale/fr/LC_MESSAGES/gkrellm.mo
-share/locale/ja/LC_MESSAGES/gkrellm.mo
-share/locale/pl/LC_MESSAGES/gkrellm.mo
-share/locale/ru/LC_MESSAGES/gkrellm.mo
-share/locale/sv/LC_MESSAGES/gkrellm.mo
 @exec ${MKDIR} %D/share/gkrellm/themes
 @exec ${MKDIR} %D/lib/gkrellm/plugins
+share/gkrellm/README
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gkrellm.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gkrellm.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gkrellm.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gkrellm.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gkrellm.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gkrellm.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gkrellm.mo
 @dirrm include/gkrellm
 @dirrm lib/gkrellm/plugins
 @dirrm lib/gkrellm
diff --git a/sysutils/gkrellm/distinfo b/sysutils/gkrellm/distinfo
index 195cb13ef35..23811534f09 100644
--- a/sysutils/gkrellm/distinfo
+++ b/sysutils/gkrellm/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.14 2002/11/07 15:07:46 fredb Exp $
+$NetBSD: distinfo,v 1.15 2003/02/15 09:33:03 salo Exp $
 
-SHA1 (gkrellm-1.2.11.tar.bz2) = 809d4bb0c983d65651919b7fd483b64b097a7bf3
-Size (gkrellm-1.2.11.tar.bz2) = 434998 bytes
-SHA1 (patch-aa) = 275ca080072fd6cda3def1d60cc094b09bf0bd25
-SHA1 (patch-ab) = f9fa96e47ad7fd47c2eaaf6b2a25b55cf1acb947
+SHA1 (gkrellm-1.2.13.tar.bz2) = ab0282e663b69ecf0d622ad7c02db0c72b793bd3
+Size (gkrellm-1.2.13.tar.bz2) = 438917 bytes
+SHA1 (patch-aa) = c2656b0d5372ef1e26479ccedcbd05f4e6dbb5e3
+SHA1 (patch-ab) = a2f1d4b4a253323b6623200c1fca4e0cee0d46f2
 SHA1 (patch-ac) = 0bdbe9b788e62e4732ec87a1d6d8dbcacde7da82
diff --git a/sysutils/gkrellm/patches/patch-aa b/sysutils/gkrellm/patches/patch-aa
index 58ca932550b..31d4d80c56a 100644
--- a/sysutils/gkrellm/patches/patch-aa
+++ b/sysutils/gkrellm/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.8 2002/08/25 21:51:00 jlam Exp $
+$NetBSD: patch-aa,v 1.9 2003/02/15 09:33:03 salo Exp $
 
 --- Makefile.top_enable_nls.orig	Wed Dec  5 08:41:15 2001
 +++ Makefile.top_enable_nls
@@ -30,7 +30,7 @@ $NetBSD: patch-aa,v 1.8 2002/08/25 21:51:00 jlam Exp $
 +GTOP_LIBS =
 +PTHREAD_INC ?= -I/usr/pkg/include
 +EXTRAOBJS =
-+LINK_FLAGS = -Wl,-E
++LINK_FLAGS = $(EXPORT_SYMBOLS_LDFLAGS)
 +LOCALEDIR = ${PREFIX}/share/locale
 +MANDIR = ${PREFIX}/man/man1
 +BINMODE = 2755
diff --git a/sysutils/gkrellm/patches/patch-ab b/sysutils/gkrellm/patches/patch-ab
index 445bb1cd8ca..bc14e7334b0 100644
--- a/sysutils/gkrellm/patches/patch-ab
+++ b/sysutils/gkrellm/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.7 2002/05/02 20:45:35 fredb Exp $
+$NetBSD: patch-ab,v 1.8 2003/02/15 09:33:03 salo Exp $
 
---- src/Makefile.src.orig	Thu Dec 20 13:09:48 2001
-+++ src/Makefile.src
-@@ -1,11 +1,14 @@
+--- src/Makefile.src.orig	Mon Jul  1 04:13:04 2002
++++ src/Makefile.src	Sat Feb 15 10:06:54 2003
+@@ -1,30 +1,36 @@
  GTK_CONFIG ?= gtk-config
 +IMLIB_CONFIG ?= imlib-config
 +PREFIX ?= /usr/local
@@ -20,7 +20,11 @@ $NetBSD: patch-ab,v 1.7 2002/05/02 20:45:35 fredb Exp $
  MANMODE ?= 644
  MANDIRMODE ?= 755
  INSTALL ?= install
-@@ -14,15 +17,18 @@
+-LINK_FLAGS ?= -Wl,-E
++LINK_FLAGS ?= $(EXPORT_SYMBOLS_LDFLAGS)
+ CC ?= gcc
+ STRIP ?= -s
+ 
  GKRELLM_INCLUDES = gkrellm.h gkrellm_public_proto.h
  
  GTK_INCLUDE = `$(GTK_CONFIG) --cflags gthread`
@@ -34,30 +38,29 @@ $NetBSD: patch-ab,v 1.7 2002/05/02 20:45:35 fredb Exp $
 -FLAGS = -O2 -I.. $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(GTOP_INCLUDE)
 +FLAGS = -I.. $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(GTOP_INCLUDE)
  FLAGS+= $(PTHREAD_INC)
- 
--LIBS = $(GTK_LIB) $(IMLIB_LIB) $(GTOP_LIBS) $(SYS_LIBS)
 +FLAGS+= -DSYSTEM_PLUGINS_DIR=\"${PREFIX}/lib/gkrellm/plugins\"
 +FLAGS+= -DSYSTEM_THEMES_DIR=\"${PREFIX}/share/gkrellm/themes\"
 +
 +LIBS = $(GTK_LIB) $(IMLIB_LIB) $(GTOP_LIBS) $(SYS_LIBS) $(LINK_FLAGS)
  
+-LIBS = $(GTK_LIB) $(IMLIB_LIB) $(GTOP_LIBS) $(SYS_LIBS)
+ 
  ifeq ($(debug),1)
      FLAGS += -g
-@@ -36,8 +42,9 @@
+@@ -38,7 +44,9 @@
      FLAGS += -DHAVE_GETADDRINFO
  endif
  
--
--CC = gcc -Wall $(FLAGS) $(CFLAGS)
+-CC += -Wall $(FLAGS)
 +CC ?= gcc
 +CFLAGS ?= -O2
 +CC += -Wall $(FLAGS) $(CFLAGS)
  
  OBJS =	main.o alerts.o apm.o base64.o clock.o cpu.o disk.o fs.o hostname.o \
  	inet.o mail.o meminfo.o net.o proc.o sensors.o uptime.o \
-@@ -61,15 +68,14 @@
- 		EXTRAOBJS= SYS_LIBS="-lkvm -ldevstat -lmd" gkrellm
- 
+@@ -68,15 +76,14 @@
+ 		gkrellm
+ 		
  netbsd:
 -	$(MAKE) PTHREAD_INC=-I/usr/local/include \
 -	GTK_CONFIG=gtk-config GTOP_LIBS= EXTRAOBJS= SYS_LIBS="-lkvm" gkrellm
@@ -68,13 +71,13 @@ $NetBSD: patch-ab,v 1.7 2002/05/02 20:45:35 fredb Exp $
  		SYS_LIBS="-lkstat -lkvm -ldevinfo" gkrellm
  
  install:
--	$(INSTALL) -c -s -m $(BINMODE) gkrellm $(INSTALLDIR)/gkrellm
-+	$(INSTALL) -c -s -m $(BINMODE) -g $(BINGRP) gkrellm $(INSTALLDIR)/gkrellm
+-	$(INSTALL) -c $(STRIP) -m $(BINMODE) gkrellm $(INSTALLDIR)/gkrellm
++	$(INSTALL) -c $(STRIP) -m $(BINMODE) -g $(BINGRP) gkrellm $(INSTALLDIR)/gkrellm
  	$(INSTALL) -d -m $(INCLUDEDIRMODE) $(INCLUDEDIR)/gkrellm
  	$(INSTALL) -c -m $(INCLUDEMODE) $(GKRELLM_INCLUDES) $(INCLUDEDIR)/gkrellm
  	$(INSTALL) -d -m $(MANDIRMODE) $(MANDIR)
-@@ -77,8 +83,6 @@
- 
+@@ -87,8 +94,6 @@
+     
  install_netbsd:
  	$(MAKE) install
 -	chgrp kmem $(INSTALLDIR)/gkrellm