cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- use SUBST_CMD

Browse Source 
- fix PATHs in documentation
- add a default gkrellmd.conf
- make the server use the unpriviledged _gkrellmd user by default
- add sparc64 to the list of apm(4) capable arches and s/powerpc/macppc
This commit is contained in:
ajacoutot 2008-08-21 07:23:44 +00:00
parent 8bd6e8e1ac
commit 5ececfcc55
7 changed files with 168 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sysutils/gkrellm/gkrellm/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.39 2008/07/01 10:17:35 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.40 2008/08/21 07:23:44 ajacoutot Exp $
SHARED_ONLY= Yes
@ -7,8 +7,8 @@ COMMENT-client= single process stack of system monitors for GTK+2
V= 2.3.1
DISTNAME= gkrellm-${V}
PKGNAME-main= gkrellm-server-${V}p1
PKGNAME-client= gkrellm-${V}p2
PKGNAME-main= gkrellm-server-${V}p2
PKGNAME-client= gkrellm-${V}p3
CATEGORIES= sysutils sysutils/gkrellm
MAINTAINER= Antoine Jacoutot <ajacoutot@openbsd.org>
@ -56,7 +56,19 @@ INSTALL_TARGET= install_openbsd
MAKE_ENV+= without_gnutls=yes
# not all powerpc support apm(4), hence the use of ${MACHINE} and macppc
# (patches/patch-src_sysdeps_openbsd_c)
.if ${MACHINE} == "macppc"
CFLAGS+= -D__macppc__
.endif
pre-configure:
${SUBST_CMD} ${WRKSRC}/server/gkrellmd.h
${SUBST_CMD} ${WRKSRC}/server/gkrellmd.h \
${WRKSRC}/gkrellm.1 ${WRKSRC}/gkrellmd.1
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/gkrellm-server
${INSTALL_DATA} ${WRKSRC}/server/gkrellmd.conf \
${PREFIX}/share/examples/gkrellm-server
.include <bsd.port.mk>

75
sysutils/gkrellm/gkrellm/patches/patch-gkrellm_1 Normal file
View File

@ -0,0 +1,75 @@
$OpenBSD: patch-gkrellm_1,v 1.1 2008/08/21 07:23:44 ajacoutot Exp $
--- gkrellm.1.orig Tue Jul 29 10:10:38 2008
+++ gkrellm.1 Tue Jul 29 10:12:27 2008
@@ -758,7 +758,7 @@ any correction factors and offsets for each of the sen
(see below and lm_sensor documentation). For Linux, default values are
automatically provided for many sensor chips.
.PP
-But if using libsenors, it is not possible to enter correction factors and
+But if using libsensors, it is not possible to enter correction factors and
offsets on the Sensors config page because libsensors configuration is
done in the /etc/sensors.conf file. To get sensor debug output and to find
out the sensor data source, run:
@@ -1088,8 +1088,7 @@ several locations:
.RS
.nf
~/.gkrellm2/themes
-/usr/local/share/gkrellm2/themes
-/usr/share/gkrellm2/themes
+${PREFIX}/share/gkrellm2/themes
.fi
.RE
.PP
@@ -1100,7 +1099,7 @@ theme may also be installed as:
.RS
.nf
~/.themes/THEME_NAME/gkrellm2
-/usr/share/themes/THEME_NAME/gkrellm2
+${PREFIX}/share/themes/THEME_NAME/gkrellm2
.fi
.RE
.PP
@@ -1125,11 +1124,9 @@ and there you will find a Theme making reference.
tries to load all plugins (shared object files ending in .so)
it finds in your plugin directory
.IR ~/.gkrellm2/plugins.
-The directories
-.IR /usr/local/lib/gkrellm2/plugins
-and
-.IR /usr/lib/gkrellm2/plugins
-are also searched for plugins to install.
+The directory
+.IR ${PREFIX}/lib/gkrellm2/plugins
+is also searched for plugins to install.
.PP
Some plugins may be available only as source files and they will
have to be compiled before installation. There should be instructions
@@ -1164,25 +1161,19 @@ and user's themes.
.I ~/.gkrellm2/plugins
User plugin directory.
.TP
-.I /usr/lib/gkrellm2/plugins
+.I ${PREFIX}/lib/gkrellm2/plugins
System wide plugin directory.
.TP
-.I /usr/local/lib/gkrellm2/plugins
-Local plugin directory.
-.TP
.I ~/.gkrellm2/themes
User theme directory.
.TP
.I ~/.themes/THEME_NAME/gkrellm2
User theme packaged as part of a user Gtk theme.
.TP
-.I /usr/share/gkrellm2/themes
+.I ${PREFIX}/share/gkrellm2/themes
System wide theme directory.
.TP
-.I /usr/local/share/gkrellm2/themes
-Local theme directory.
-.TP
-.I /usr/share/themes/THEME_NAME/gkrellm2
+.I ${PREFIX}/share/themes/THEME_NAME/gkrellm2
System wide theme packaged as part of a system wide Gtk theme.
.SH "AUTHORS"

34
sysutils/gkrellm/gkrellm/patches/patch-gkrellmd_1 Normal file
View File

@ -0,0 +1,34 @@
$OpenBSD: patch-gkrellmd_1,v 1.1 2008/08/21 07:23:44 ajacoutot Exp $
--- gkrellmd.1.orig Tue Jul 29 10:12:40 2008
+++ gkrellmd.1 Tue Jul 29 10:13:51 2008
@@ -362,7 +362,7 @@ to see a log of the plugin install process.
.SH "FILES"
.TP
-.I /etc/gkrellmd.conf
+.I ${SYSCONFDIR}/gkrellmd.conf
System server config which is read first.
The config file may contain lines similar to the command line args.
For example:
@@ -401,20 +401,14 @@ command line args will override options in gkrellmd.co
.RE
.TP
-.I /usr/local/etc/gkrellmd.conf
-Local server config file which is read second.
-.TP
.I ~/.gkrellmd.conf
User server config file which is read last.
.TP
.I ~/.gkrellm2/plugins-gkrellmd
User server plugin directory.
.TP
-.I /usr/lib/gkrellm2/plugins-gkrellmd
+.I ${PREFIX}/lib/gkrellm2/plugins-gkrellmd
System wide server plugin directory.
-.TP
-.I /usr/local/lib/gkrellm2/plugins-gkrellmd
-Local server plugin directory.
.PP

20
sysutils/gkrellm/gkrellm/patches/patch-server_gkrellmd_conf Normal file
View File

@ -0,0 +1,20 @@
$OpenBSD: patch-server_gkrellmd_conf,v 1.1 2008/08/21 07:23:44 ajacoutot Exp $
--- server/gkrellmd.conf.orig Tue Jul 29 10:02:02 2008
+++ server/gkrellmd.conf Tue Jul 29 10:05:18 2008
@@ -29,14 +29,14 @@ port 19150
# Drop privileges after startup (you must start gkrellmd as root to do it).
#
-#user nobody
+user _gkrellmd
#group proc
# Create a PID file for the running gkrellmd. Default is no PID file.
#pidfile /var/run/gkrellmd.pid
# Run in background and detach from the controlling terminal
-#detach
+detach
# Time interval between checks for various monitors. If nfs-interval
# is <= 0 then gkrellmd will not read data for nfs file system types.

22
sysutils/gkrellm/gkrellm/patches/patch-server_gkrellmd_h
View File

@ -1,18 +1,22 @@
$OpenBSD: patch-server_gkrellmd_h,v 1.5 2008/07/01 10:17:35 ajacoutot Exp $
--- server/gkrellmd.h.orig Thu Jul 19 23:22:16 2007
+++ server/gkrellmd.h Fri Oct 26 15:52:38 2007
@@ -110,9 +110,11 @@ GKRELLMD_VERSION_REV >= (rev)))
$OpenBSD: patch-server_gkrellmd_h,v 1.6 2008/08/21 07:23:44 ajacoutot Exp $
--- server/gkrellmd.h.orig Tue Jul 29 09:59:22 2008
+++ server/gkrellmd.h Tue Jul 29 10:00:52 2008
@@ -104,14 +104,14 @@ GKRELLMD_VERSION_REV >= (rev)))
#define GKRELLMD_CONFIG "gkrellmd.conf"
#define GKRELLMD_PLUGINS_DIR ".gkrellm2/plugins-gkrellmd"
-#define GKRELLMD_LOCAL_PLUGINS_DIR "/usr/local/lib/gkrellm2/plugins-gkrellmd"
+#define GKRELLMD_LOCAL_PLUGINS_DIR "${PREFIX}/lib/gkrellm2/plugins-gkrellmd"
#if !defined(GKRELLMD_SYSTEM_PLUGINS_DIR)
-#define GKRELLMD_SYSTEM_PLUGINS_DIR "/usr/lib/gkrellm2/plugins-gkrellmd"
+#define GKRELLMD_SYSTEM_PLUGINS_DIR "${PREFIX}/lib/gkrellm2/plugins-gkrellmd"
#endif
#if !defined(WIN32)
-#define GKRELLMD_SYS_ETC "/etc"
-#define GKRELLMD_LOCAL_ETC "/usr/local/etc"
-#endif
+#if !defined(GKRELLMD_SYS_ETC)
+#define GKRELLMD_SYS_ETC "${SYSCONFDIR}"
+#endif /* GKRELLMD_SYS_ETC */
+#define GKRELLMD_LOCAL_ETC "${SYSCONFDIR}"
+#endif /* WIN32 */
#endif
typedef struct _GkrellmdClient

4
sysutils/gkrellm/gkrellm/patches/patch-src_sysdeps_openbsd_c
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-src_sysdeps_openbsd_c,v 1.9 2008/07/01 10:17:35 ajacoutot Exp $
$OpenBSD: patch-src_sysdeps_openbsd_c,v 1.10 2008/08/21 07:23:44 ajacoutot Exp $
--- src/sysdeps/openbsd.c.orig Sat Jul 7 01:54:22 2007
+++ src/sysdeps/openbsd.c Tue Jul 1 10:48:13 2008
@@ -53,41 +53,71 @@ gkrellm_sys_main_cleanup(void)
@ -98,7 +98,7 @@ $OpenBSD: patch-src_sysdeps_openbsd_c,v 1.9 2008/07/01 10:17:35 ajacoutot Exp $
#include <sys/ioctl.h>
-#if defined(__i386__) || defined(__powerpc__)
+#if defined(__i386__) || defined(__powerpc__) || defined(__amd64__) || defined(__arm__) || (defined(__sparc__) && !defined(__sparc64__))
+#if defined(__i386__) || defined(__macppc__) || defined(__amd64__) || defined(__arm__) || defined(__sparc__) || defined(__sparc64__)
#include <machine/apmvar.h>
#define APMDEV "/dev/apm"

9
sysutils/gkrellm/gkrellm/pkg/PLIST-main
View File

@ -1,9 +1,16 @@
@comment $OpenBSD: PLIST-main,v 1.1 2006/11/25 20:12:10 espie Exp $
@comment $OpenBSD: PLIST-main,v 1.2 2008/08/21 07:23:44 ajacoutot Exp $
@pkgpath sysutils/gkrellm/gkrellm
@pkgpath sysutils/gkrellm/gkrellm,no_client
@newgroup _gkrellmd:607
@newuser _gkrellmd:607:_gkrellmd::GKrellM Daemon:/var/empty:/sbin/nologin
include/gkrellm2/
include/gkrellm2/gkrellmd.h
@man man/man1/gkrellmd.1
@mode 2755
@group kmem
sbin/gkrellmd
@mode
@group
share/examples/gkrellm-server/
share/examples/gkrellm-server/gkrellmd.conf
@sample ${SYSCONFDIR}/gkrellmd.conf