Bump to gkrellm-1.2.3nb1: Make sure the themes directory is there,

and in a sane location (not /usr/share!).

I have a gkrellm-themes package to commit once the pkg/ issue is resolved.

4 files changed, 25 insertions, 8 deletions

diff --git a/sysutils/gkrellm/Makefile b/sysutils/gkrellm/Makefile
index 25f353b8cca..f829896fa4e 100644
--- a/sysutils/gkrellm/Makefile
+++ b/sysutils/gkrellm/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2001/10/31 01:15:36 hubertf Exp $
+# $NetBSD: Makefile,v 1.12 2001/11/01 14:08:00 hubertf Exp $
 #
 
 DISTNAME=	gkrellm-1.2.3
+PKGNAME=	${DISTNAME}nb1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://web.wt.net/~billw/gkrellm/
 
@@ -22,6 +23,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/gkrellm
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/gkrellm
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/gkrellm/plugins
+	${INSTALL_DATA_DIR} ${PREFIX}/share/gkrellm/themes
 
 .include "../../devel/pth/buildlink.mk"
 .include "../../graphics/imlib/buildlink.mk"
diff --git a/sysutils/gkrellm/distinfo b/sysutils/gkrellm/distinfo
index 47a36b6ce1d..0a3ae897ef7 100644
--- a/sysutils/gkrellm/distinfo
+++ b/sysutils/gkrellm/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.7 2001/10/30 13:31:47 damon Exp $
+$NetBSD: distinfo,v 1.8 2001/11/01 14:08:01 hubertf Exp $
 
 SHA1 (gkrellm-1.2.3.tar.gz) = d2fab7761683201dff4789ed0e6fe1dae9cac7d6
 Size (gkrellm-1.2.3.tar.gz) = 542641 bytes
 SHA1 (patch-aa) = 95fd62e2a12c376303046b7196b803c49ceeadc3
-SHA1 (patch-ab) = 274a69da75c369ab07cb5c1568cb1b787dbc267c
+SHA1 (patch-ab) = f303ec22ab0e990b7382143a6e3d7b0a05490954
diff --git a/sysutils/gkrellm/patches/patch-ab b/sysutils/gkrellm/patches/patch-ab
index 8570faac717..61163baabcf 100644
--- a/sysutils/gkrellm/patches/patch-ab
+++ b/sysutils/gkrellm/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.5 2001/10/30 13:31:48 damon Exp $
+$NetBSD: patch-ab,v 1.6 2001/11/01 14:08:02 hubertf Exp $
 
---- src/Makefile.src.orig	Fri Oct 12 09:01:04 2001
+--- src/Makefile.src.orig	Fri Oct 12 15:01:04 2001
 +++ src/Makefile.src
 @@ -1,10 +1,10 @@
  GTK_CONFIG ?= gtk-config
@@ -16,7 +16,7 @@ $NetBSD: patch-ab,v 1.5 2001/10/30 13:31:48 damon Exp $
  MANMODE ?= 644
  MANDIRMODE ?= 755
  INSTALL ?= install
-@@ -13,15 +13,17 @@
+@@ -13,15 +13,18 @@
  GKRELLM_INCLUDES = gkrellm.h gkrellm_public_proto.h
  
  GTK_INCLUDE = `$(GTK_CONFIG) --cflags gthread`
@@ -33,12 +33,13 @@ $NetBSD: patch-ab,v 1.5 2001/10/30 13:31:48 damon Exp $
  
 -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) -Wl,-E
  
  ifeq ($(debug),1)
      FLAGS += -g
-@@ -36,7 +38,7 @@
+@@ -36,7 +39,7 @@
  endif
  
  
@@ -47,7 +48,7 @@ $NetBSD: patch-ab,v 1.5 2001/10/30 13:31:48 damon Exp $
  
  OBJS =	main.o alerts.o apm.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 \
-@@ -59,8 +61,8 @@
+@@ -59,8 +62,8 @@
  		 SYS_LIBS="-lkvm -ldevstat" gkrellm
  
  netbsd:
diff --git a/sysutils/gkrellm/pkg/PLIST b/sysutils/gkrellm/pkg/PLIST
new file mode 100644
index 00000000000..db58b92f571
--- /dev/null
+++ b/sysutils/gkrellm/pkg/PLIST
@@ -0,0 +1,14 @@
+@comment $NetBSD: PLIST,v 1.6 2001/11/01 14:08:02 hubertf Exp $
+bin/gkrellm
+include/gkrellm/gkrellm.h
+include/gkrellm/gkrellm_public_proto.h
+man/man1/gkrellm.1
+share/gkrellm/README
+@exec ${MKDIR} %D/share/gkrellm/themes
+@unexec ${RMDIR} %D/share/gkrellm/themes
+@exec ${MKDIR} %D/lib/gkrellm/plugins
+@unexec ${RMDIR} %D/lib/gkrellm/plugins
+@dirrm include/gkrellm
+@dirrm lib/gkrellm/plugins
+@dirrm lib/gkrellm
+@dirrm share/gkrellm