1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-22 20:41:26 +00:00

Update GKrellM to 2.0.0 after repocopy.

This commit is contained in:
Hajimu UMEMOTO 2002-09-02 18:22:56 +00:00
parent fcc4359a5c
commit c67c3e607c
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=65503
13 changed files with 168 additions and 152 deletions

View File

@ -6,7 +6,7 @@
#
PORTNAME= gkrellm
PORTVERSION= 1.2.13
PORTVERSION= 2.0.0
CATEGORIES= sysutils ipv6
MASTER_SITES= http://web.wt.net/~billw/gkrellm/ \
${MASTER_SITE_LOCAL}
@ -14,22 +14,15 @@ MASTER_SITE_SUBDIR= ume
MAINTAINER= ume@FreeBSD.org
LIB_DEPENDS= gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GNOMENG= yes
USE_GNOME= imlib
USE_GMAKE= yes
INCLUDES= gkrellm.h gkrellm_public_proto.h
MAN1= gkrellm.1
DOCS= COPYRIGHT README Themes.html
# If you want to support LM78/79 feature, set this to `yes'. You
# should aware that GKrellM must be setuid root to obtain
# temperatures. Furthermore, this causes problem on some
# motherboards. If your motherboard doesn't support LM78/79 feature,
# you should not enable this.
# WITH_SENSOR=yes
MAN8= gkrellmd.8
DOCS= COPYRIGHT CREDITS README Themes.html
.include <bsd.port.pre.mk>
@ -38,41 +31,33 @@ ALL_TARGET= freebsd2
.else
ALL_TARGET= freebsd
.endif
INSTALL_TARGET= install_netbsd
BINGRP= kmem
.if defined(WITH_SENSOR)
BINOWN= root
BINMODE= 4111
.else
BINMODE= 2111
.endif
MAKE_ENV+= LOCALEDIR=${PREFIX}/share/locale INCLUDEDIR=${PREFIX}/include \
INSTALLDIR=${PREFIX}/bin SINSTALLDIR=${PREFIX}/sbin \
MANDIR=${MANPREFIX}/man/man1 SMANDIR=${MANPREFIX}/man/man8
MAKE_ENV+= LOCALEDIR=${PREFIX}/share/locale
CFLAGS+= -DSYSTEM_THEMES_DIR='\"${PREFIX}/share/gkrellm/themes\"' \
-DSYSTEM_PLUGINS_DIR='\"${PREFIX}/libexec/gkrellm/plugins\"'
CFLAGS+= -DSYSTEM_THEMES_DIR='\"${PREFIX}/share/gkrellm2/themes\"' \
-DSYSTEM_PLUGINS_DIR='\"${PREFIX}/libexec/gkrellm2/plugins\"' \
-DGKRELLMD_SYS_ETC='\"${PREFIX}/etc\"'
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/src/gkrellm ${PREFIX}/bin/gkrellm
@cd ${WRKSRC}/po && \
${GMAKE} install enable_nls=1 LOCALEDIR=${PREFIX}/share/locale
@${MKDIR} ${PREFIX}/include/gkrellm
.for file in ${INCLUDES}
${INSTALL_DATA} ${WRKSRC}/src/${file} ${PREFIX}/include/gkrellm
.endfor
@${MKDIR} ${PREFIX}/libexec/gkrellm/plugins
@${MKDIR} ${PREFIX}/share/gkrellm/themes
.for file in ${MAN1}
${INSTALL_MAN} ${WRKSRC}/${file} ${MANPREFIX}/man/man1/${file}
.endfor
post-install:
@${MKDIR} ${PREFIX}/libexec/gkrellm2/plugins
@${MKDIR} ${PREFIX}/share/gkrellm2/themes
@${SED} -e "s;%%PREFIX%%;${PREFIX};g" \
${FILESDIR}/gkrellmd.sh > ${PREFIX}/etc/rc.d/gkrellmd.sh.sample
@${CHMOD} ${BINMODE} ${PREFIX}/etc/rc.d/gkrellmd.sh.sample
${INSTALL_DATA} ${WRKSRC}/server/gkrellmd.conf \
${PREFIX}/etc/gkrellmd.conf.sample
if [ ! -f ${PREFIX}/etc/gkrellmd.conf ]; then \
${CP} -p ${PREFIX}/etc/gkrellmd.conf.sample \
${PREFIX}/etc/gkrellmd.conf; \
fi
.if !defined(NOPORTDOCS)
@${MKDIR} ${PREFIX}/share/doc/gkrellm
.for file in ${DOCS}
${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/gkrellm
.endfor
.endif
.if !defined(WITH_SENSOR)
@${CAT} ${PKGMESSAGE}
.endif
.include <bsd.port.post.mk>

View File

@ -1 +1 @@
MD5 (gkrellm-1.2.13.tar.bz2) = cdd4d60bea17ac6b36cb0c4b1f5279cb
MD5 (gkrellm-2.0.0.tar.bz2) = 88fbbc1f24edda03573b7f07e20fcf7e

View File

@ -0,0 +1,24 @@
#!/bin/sh
# Start or stop gkrellmd
# $FreeBSD$
PREFIX=%%PREFIX%%
case "$1" in
start)
if [ -x ${PREFIX}/sbin/gkrellmd -a \
-f ${PREFIX}/etc/gkrellmd.conf ]; then
${PREFIX}/sbin/gkrellmd &
echo -n ' gkrellmd'
fi
;;
stop)
killall gkrellmd && echo -n ' gkrellmd'
;;
*)
echo "Usage: `basename $0` {start|stop}" >&2
;;
esac
exit 0

View File

@ -0,0 +1,23 @@
Index: Makefile
diff -u Makefile.orig Makefile
--- Makefile.orig Fri Aug 2 11:56:08 2002
+++ Makefile Fri Aug 30 01:12:10 2002
@@ -74,13 +74,13 @@
#GTOP_LIBS_D = -L$(GTOP_PREFIX)/lib -lgtop -lgtop_common -lgtop_sysdeps
#export GTOP_INCLUDE GTOP_LIBS GTOP_LIBS_D
-INSTALLDIR = /usr/local/bin
-SINSTALLDIR = $(INSTALLDIR)
-MANDIR = /usr/local/share/man/man1
-SMANDIR = $(MANDIR)
+INSTALLDIR ?= /usr/local/bin
+SINSTALLDIR ?= $(INSTALLDIR)
+MANDIR ?= /usr/local/share/man/man1
+SMANDIR ?= $(MANDIR)
MANMODE = 644
MANDIRMODE = 755
-INCLUDEDIR = /usr/local/include
+INCLUDEDIR ?= /usr/local/include
INCLUDEMODE = 644
INCLUDEDIRMODE = 755

View File

@ -1,28 +0,0 @@
Index: Makefile.top
diff -u Makefile.top.orig Makefile.top
--- Makefile.top.orig Thu Dec 6 01:25:04 2001
+++ Makefile.top Thu Dec 6 03:33:13 2001
@@ -30,7 +30,7 @@
#
# Default
#--------
-GTK_CONFIG = gtk-config
+#GTK_CONFIG = gtk-config
EXTRAOBJS = md5c.o
BINMODE = 755
@@ -122,12 +122,12 @@
freebsd2:
(cd po && ${MAKE} all)
- (cd src && ${MAKE} GTK_CONFIG=gtk12-config GTOP_LIBS= GTOP_INCLUDE= \
+ (cd src && ${MAKE} GTK_CONFIG=${GTK_CONFIG} GTOP_LIBS= GTOP_INCLUDE= \
EXTRAOBJS= SYS_LIBS="-lkvm -lmd" gkrellm )
freebsd3 freebsd4 freebsd5 freebsd:
(cd po && ${MAKE} all)
- (cd src && ${MAKE} GTK_CONFIG=gtk12-config GTOP_LIBS= GTOP_INCLUDE= \
+ (cd src && ${MAKE} GTK_CONFIG=${GTK_CONFIG} GTOP_LIBS= GTOP_INCLUDE= \
EXTRAOBJS= SYS_LIBS="-lkvm -ldevstat -lmd" gkrellm )
netbsd:

View File

@ -1,13 +0,0 @@
Index: src/Makefile.src
diff -u src/Makefile.src.orig src/Makefile.src
--- src/Makefile.src.orig Mon Jul 1 11:13:04 2002
+++ src/Makefile.src Mon Jul 1 20:50:11 2002
@@ -21,7 +21,7 @@
GTK_LIB = `$(GTK_CONFIG) --libs gthread`
IMLIB_LIB = `imlib-config --libs-gdk`
-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)

View File

@ -1,14 +1,14 @@
Index: gkrellm.1
diff -u gkrellm.1.orig gkrellm.1
--- gkrellm.1.orig Thu Jul 12 08:23:47 2001
+++ gkrellm.1 Mon Jul 30 20:51:15 2001
--- gkrellm.1.orig Sun Aug 11 08:23:17 2002
+++ gkrellm.1 Thu Aug 29 16:41:57 2002
@@ -1,4 +1,4 @@
-.TH gkrellm 1 "Febuary 3, 2001" "Olympus GNU/Linux" "User's Manual"
+.TH gkrellm 1 "Febuary 3, 2001" "FreeBSD" "User's Manual"
-.TH gkrellm 1 "March 14, 2002" "GNU/Linux" "User's Manual"
+.TH gkrellm 1 "March 14, 2001" "FreeBSD" "User's Manual"
.SH "NAME"
gkrellm \- The GNU Krell Monitors
@@ -365,7 +365,7 @@
@@ -399,7 +399,7 @@
ppp is connecting, and the on state is the ppp link connected.
The phone line lock is determined by the existence of the modem
lock file
@ -17,12 +17,12 @@ diff -u gkrellm.1.orig gkrellm.1
which assumes pppd is using
.IR /dev/modem.
However, if your pppd setup does not use
@@ -374,11 +374,11 @@
@@ -408,11 +408,11 @@
.PP
.RS
.nf
-ln -s /var/lock/LCK..ttySx ~/.gkrellm/LCK..modem
+ln -s /var/spool/lock/LCK..cuaaS ~/.gkrellm/LCK..modem
-ln -s /var/lock/LCK..ttySx ~/.gkrellm2/LCK..modem
+ln -s /var/spool/lock/LCK..cuaaS ~/.gkrellm2/LCK..modem
.fi
.RE
.IP
@ -31,45 +31,39 @@ diff -u gkrellm.1.orig gkrellm.1
state is detected by the existence of
.IR /var/run/pppX.pid
and the time stamp of this file is the base for the on line time.
@@ -839,7 +839,7 @@
@@ -1059,7 +1059,7 @@
.PP
.B gkrellm
also searches
-.IR /usr/share/gkrellm/themes
+.IR /usr/X11R6/share/gkrellm/themes
-.IR /usr/share/gkrellm2/themes
+.IR /usr/X11R6/share/gkrellm2/themes
for any system wide themes installed as part of a distribution.
Finally, a theme you simply want to check out can be untarred anywhere and
used by running:
@@ -864,12 +864,12 @@
@@ -1085,7 +1085,7 @@
The directories
.IR /usr/local/lib/gkrellm/plugins
.IR /usr/local/lib/gkrellm2/plugins
and
-.IR /usr/lib/gkrellm/plugins
+.IR /usr/X11R6/libexec/gkrellm/plugins
-.IR /usr/lib/gkrellm2/plugins
+.IR /usr/X11R6/libexec/gkrellm2/plugins
are also searched for plugins to install.
For compatibility with pre 1.0.6 versions, plugins from the directories
.IR /usr/local/share/gkrellm/plugins
and
-.IR /usr/share/gkrellm/plugins
+.IR /usr/X11R6/libexec/gkrellm/plugins
are still installed, but this is not compatible with the FHS.
.PP
Some plugins may be available only as source files and they will
@@ -890,7 +890,7 @@
.I ~/.gkrellm/plugins
@@ -1127,7 +1127,7 @@
.I ~/.gkrellm2/plugins
User plugin directory.
.TP
-.I /usr/lib/gkrellm/plugins
+.I /usr/X11R6/libexec/gkrellm/plugins
-.I /usr/lib/gkrellm2/plugins
+.I /usr/X11R6/libexec/gkrellm2/plugins
System wide plugin directory.
.TP
.I /usr/local/lib/gkrellm/plugins
@@ -899,7 +899,7 @@
.I ~/.gkrellm/themes
.I /usr/local/lib/gkrellm2/plugins
@@ -1136,7 +1136,7 @@
.I ~/.gkrellm2/themes
User theme directory.
.TP
-.I /usr/share/gkrellm/themes
+.I /usr/X11R6/share/gkrellm/themes
-.I /usr/share/gkrellm2/themes
+.I /usr/X11R6/share/gkrellm2/themes
System wide theme directory.
.TP
.I /usr/local/share/gkrellm/themes
.I /usr/local/share/gkrellm2/themes

View File

@ -1,28 +0,0 @@
Index: Makefile.top_enable_nls
diff -u Makefile.top_enable_nls.orig Makefile.top_enable_nls
--- Makefile.top_enable_nls.orig Wed Dec 5 16:41:15 2001
+++ Makefile.top_enable_nls Thu Dec 6 03:35:21 2001
@@ -30,7 +30,7 @@
#
# Default
#--------
-GTK_CONFIG = gtk-config
+#GTK_CONFIG = gtk-config
EXTRAOBJS = md5c.o
BINMODE = 755
@@ -122,12 +122,12 @@
freebsd2:
(cd po && ${MAKE} all)
- (cd src && ${MAKE} GTK_CONFIG=gtk12-config GTOP_LIBS= GTOP_INCLUDE= \
+ (cd src && ${MAKE} GTK_CONFIG=${GTK_CONFIG} GTOP_LIBS= GTOP_INCLUDE= \
EXTRAOBJS= SYS_LIBS="-lkvm -lmd" gkrellm )
freebsd3 freebsd4 freebsd5 freebsd:
(cd po && ${MAKE} all)
- (cd src && ${MAKE} GTK_CONFIG=gtk12-config GTOP_LIBS= GTOP_INCLUDE= \
+ (cd src && ${MAKE} GTK_CONFIG=${GTK_CONFIG} GTOP_LIBS= GTOP_INCLUDE= \
EXTRAOBJS= SYS_LIBS="-lkvm -ldevstat -lmd" gkrellm )
netbsd:

View File

@ -0,0 +1,16 @@
Index: server/Makefile
diff -u server/Makefile.orig server/Makefile
--- server/Makefile.orig Tue Aug 6 21:56:11 2002
+++ server/Makefile Thu Aug 29 17:03:46 2002
@@ -13,9 +13,9 @@
GLIB12_INCLUDE = `glib-config --cflags gthread`
GLIB12_LIB = `glib-config --libs gthread`
-FLAGS = -O2 -I.. $(PKG_INCLUDE) $(GTOP_INCLUDE)
+FLAGS = -I.. $(PKG_INCLUDE) $(GTOP_INCLUDE) -I$(LOCALBASE)/include
ifeq ($(glib12),1)
-FLAGS = -O2 -I.. $(GLIB12_INCLUDE) $(GTOP_INCLUDE)
+FLAGS = -I.. $(GLIB12_INCLUDE) $(GTOP_INCLUDE) -I$(LOCALBASE)/include
endif
FLAGS+= $(PTHREAD_INC)

View File

@ -0,0 +1,14 @@
Index: server/gkrellmd.h
diff -u server/gkrellmd.h.orig server/gkrellmd.h
--- server/gkrellmd.h.orig Tue Aug 13 01:58:55 2002
+++ server/gkrellmd.h Thu Aug 29 18:47:14 2002
@@ -107,7 +107,9 @@
#define GKRELLMD_CONFIG "gkrellmd.conf"
#if !defined(WIN32)
+#if !defined(GKRELLMD_SYS_ETC)
#define GKRELLMD_SYS_ETC "/etc"
+#endif
#define GKRELLMD_LOCAL_ETC "/usr/local/etc"
#endif

View File

@ -0,0 +1,22 @@
Index: src/Makefile
diff -u src/Makefile.orig src/Makefile
--- src/Makefile.orig Sat Aug 10 13:29:09 2002
+++ src/Makefile Thu Aug 29 23:40:18 2002
@@ -21,7 +21,7 @@
PKG_LIB = `$(PKG_CONFIG) --libs gtk+-2.0 gthread-2.0`
-FLAGS = -O2 -I.. $(PKG_INCLUDE) $(GTOP_INCLUDE)
+FLAGS = -I.. $(PKG_INCLUDE) $(GTOP_INCLUDE)
FLAGS+= $(PTHREAD_INC)
LIBS = $(PKG_LIB) $(GTOP_LIBS) $(SMC_LIBS) $(SYS_LIBS)
@@ -85,7 +85,7 @@
$(INSTALL) -c -m $(INCLUDEMODE) $(GKRELLM_INCLUDES) $(INCLUDEDIR)/gkrellm2
$(INSTALL) -d -m $(MANDIRMODE) $(MANDIR)
$(INSTALL) -c -m $(MANMODE) ../gkrellm.1 $(MANDIR)/gkrellm.1
- $(INSTALL) -c -m $(MANMODE) ../gkrellmd.1 $(SMANDIR)/gkrellmd.1
+ $(INSTALL) -c -m $(MANMODE) ../gkrellmd.1 $(SMANDIR)/gkrellmd.8
install_darwin:
$(MAKE) install STRIP=

View File

@ -1,12 +1,11 @@
GKrellM - GNU (or Gtk) Krell Monitors (or Meters)
(with an understood 'I' somewhere in appreciation for Imlib)
=======================================================================
Author: Bill Wilson
Email: bill@gkrellm.net
WWW: http://gkrellm.net
Copyright (c) 1999-2000 by Bill Wilson. This program is free software
Copyright (c) 1999-2002 by Bill Wilson. This program is free software
which I release under the GNU General Public License.
Read the COPYRIGHT file for more info.
@ -29,7 +28,7 @@ GKrellM Features
* Clock/calendar and hostname display.
* APM laptop battery monitor.
* CPU/motherboard temperature/fan/voltages display if lm_sensors modules
installed.
installed. Warnings and alarms can be set.
* Multiple monitors managed by a single process to reduce system load.
* A timer button that can execute PPP or ISDN logon/logoff scripts.
@ -40,6 +39,7 @@ GKrellM Features
is used for CPU sys time, disk write, load, and net transmit data.
* Commands can be configured to run when monitor labels are clicked.
* GKrellM is plugin capable so special interest monitors can be created.
* Data can be collected from a gkrellmd server running on a remote machine.
* Many themes are available.

View File

@ -1,7 +1,9 @@
bin/gkrellm
include/gkrellm/gkrellm.h
include/gkrellm/gkrellm_public_proto.h
sbin/gkrellmd
include/gkrellm2/gkrellm.h
include/gkrellm2/gkrellm-public-proto.h
%%PORTDOCS%%share/doc/gkrellm/COPYRIGHT
%%PORTDOCS%%share/doc/gkrellm/CREDITS
%%PORTDOCS%%share/doc/gkrellm/README
%%PORTDOCS%%share/doc/gkrellm/Themes.html
share/locale/de/LC_MESSAGES/gkrellm.mo
@ -10,12 +12,17 @@ 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/sl/LC_MESSAGES/gkrellm.mo
share/locale/sv/LC_MESSAGES/gkrellm.mo
%%PORTDOCS%%@dirrm share/doc/gkrellm
@dirrm include/gkrellm
@exec mkdir -p %D/libexec/gkrellm/plugins
@exec mkdir -p %D/share/gkrellm/themes
@unexec rmdir %D/libexec/gkrellm/plugins 2>/dev/null || true
@unexec rmdir %D/libexec/gkrellm 2>/dev/null || true
@unexec rmdir %D/share/gkrellm/themes 2>/dev/null || true
@unexec rmdir %D/share/gkrellm 2>/dev/null || true
@unexec if cmp -s %D/etc/gkrellmd.conf %D/etc/gkrellmd.conf.sample; then rm -f %D/etc/gkrellmd.conf; fi
etc/gkrellmd.conf.sample
@exec [ -f %B/gkrellmd.conf ] || cp %B/%f %B/gkrellmd.conf
etc/rc.d/gkrellmd.sh.sample
@dirrm include/gkrellm2
@exec mkdir -p %D/libexec/gkrellm2/plugins
@exec mkdir -p %D/share/gkrellm2/themes
@unexec rmdir %D/libexec/gkrellm2/plugins 2>/dev/null || true
@unexec rmdir %D/libexec/gkrellm2 2>/dev/null || true
@unexec rmdir %D/share/gkrellm2/themes 2>/dev/null || true
@unexec rmdir %D/share/gkrellm2 2>/dev/null || true