sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-06-06 05:10:29 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

sysutils/gkrellm2: update to 2.4.0

Browse source 
Relnotes:	https://git.srcbox.net/gkrellm/gkrellm/releases/tag/gkrellm-2.4.0
This commit is contained in:
Hajimu UMEMOTO 2025-01-27 23:22:50 +09:00
parent 13e72696e6
commit 1b0c480e70
8 changed files with 157 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sysutils/gkrellm2/Makefile
View file

@ -1,6 +1,6 @@
PORTNAME= gkrellm PORTNAME= gkrellm
PORTVERSION= 2.3.11 PORTVERSION= 2.4.0
PORTREVISION= 2 PORTREVISION= 0
CATEGORIES= sysutils CATEGORIES= sysutils
MASTER_SITES= http://gkrellm.srcbox.net/releases/ \ MASTER_SITES= http://gkrellm.srcbox.net/releases/ \
LOCAL/ume LOCAL/ume

6
sysutils/gkrellm2/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1564576588 TIMESTAMP = 1737978638
SHA256 (gkrellm-2.3.11.tar.bz2) = 1ee0643ed9ed99f88c1504c89d9ccb20780cf29319c904b68e80a8e7c8678c06 SHA256 (gkrellm-2.4.0.tar.bz2) = 6f83665760b936ad4b55f9182b1ec7601faf38a0f25ea1e4bddc9965088f032d
SIZE (gkrellm-2.3.11.tar.bz2) = 783123 SIZE (gkrellm-2.4.0.tar.bz2) = 790070

8
sysutils/gkrellm2/files/patch-Makefile
View file

@ -1,4 +1,4 @@
--- Makefile.orig 2016-09-05 18:22:42 UTC --- Makefile.orig 2025-01-19 16:02:37 UTC
+++ Makefile +++ Makefile
@@ -3,7 +3,9 @@ @@ -3,7 +3,9 @@
# make # make
@ -11,7 +11,7 @@
# make freebsd # make freebsd
# For NetBSD 1.5 - 1.6.X # For NetBSD 1.5 - 1.6.X
# make netbsd1 # make netbsd1
@@ -118,7 +120,7 @@ export INSTALLDIR SINSTALLDIR INCLUDEDIR @@ -117,7 +119,7 @@ export OS_RELEASE
export MANDIR SMANDIR MANDIRMODE MANMODE export MANDIR SMANDIR MANDIRMODE MANMODE
export OS_RELEASE export OS_RELEASE
@ -20,8 +20,8 @@
debug=0 debug=0
export enable_nls export enable_nls
export debug export debug
@@ -151,8 +153,8 @@ uninstall: @@ -155,8 +157,8 @@ install_gkrellm.pc: gkrellm.pc
rm -f $(PKGCONFIGDIR)/gkrellm.pc $(RM) $(PKGCONFIGDIR)/gkrellm.pc
install_gkrellm.pc: gkrellm.pc install_gkrellm.pc: gkrellm.pc
- $(INSTALL) -d $(PKGCONFIGDIR) - $(INSTALL) -d $(PKGCONFIGDIR)

22
sysutils/gkrellm2/files/patch-gkrellm.1
View file

@ -1,12 +1,12 @@
--- gkrellm.1.orig 2010-10-05 16:21:55 UTC --- gkrellm.1.orig 2025-01-19 16:02:37 UTC
+++ gkrellm.1 +++ gkrellm.1
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
-.TH gkrellm 1 "Sep 15, 2010" "GNU/Linux" "User's Manual" -.TH gkrellm 1 "Jan 07, 2025" "" "User's Manual"
+.TH gkrellm 1 "June 7, 2003" "FreeBSD" "User's Manual" +.TH gkrellm 1 "June 7, 2003" "FreeBSD" "User's Manual"
.SH "NAME" .SH "NAME"
gkrellm \- The GNU Krell Monitors gkrellm \- The GNU Krell Monitors
@@ -429,7 +429,7 @@ @@ -429,7 +429,7 @@ lock file
ppp is connecting, and the on state is the ppp link connected. ppp is connecting, and the on state is the ppp link connected.
The phone line lock is determined by the existence of the modem The phone line lock is determined by the existence of the modem
lock file lock file
@ -15,12 +15,12 @@
which assumes pppd is using which assumes pppd is using
.IR /dev/modem. .IR /dev/modem.
However, if your pppd setup does not use However, if your pppd setup does not use
@@ -438,11 +438,11 @@ @@ -438,11 +438,11 @@ then you can configure an alternative with:
.PP .PP
.RS .RS
.nf .nf
-ln -s /var/lock/LCK..ttySx ~/.gkrellm2/LCK..modem -ln \-s /var/lock/LCK..ttySx ~/.gkrellm2/LCK..modem
+ln -s /var/spool/lock/LCK..cuaaS ~/.gkrellm2/LCK..modem +ln \-s /var/spool/lock/LCK..cuaaS ~/.gkrellm2/LCK..modem
.fi .fi
.RE .RE
.IP .IP
@ -29,7 +29,7 @@
state is detected by the existence of state is detected by the existence of
.IR /var/run/pppX.pid .IR /var/run/pppX.pid
and the time stamp of this file is the base for the on line time. and the time stamp of this file is the base for the on line time.
@@ -1138,7 +1138,7 @@ @@ -1138,7 +1138,7 @@ several locations:
.nf .nf
~/.gkrellm2/themes ~/.gkrellm2/themes
/usr/local/share/gkrellm2/themes /usr/local/share/gkrellm2/themes
@ -38,7 +38,7 @@
.fi .fi
.RE .RE
.PP .PP
@@ -1149,7 +1149,7 @@ @@ -1149,7 +1149,7 @@ theme may also be installed as:
.RS .RS
.nf .nf
~/.themes/THEME_NAME/gkrellm2 ~/.themes/THEME_NAME/gkrellm2
@ -47,7 +47,7 @@
.fi .fi
.RE .RE
.PP .PP
@@ -1177,7 +1177,7 @@ @@ -1177,7 +1177,7 @@ and
The directories The directories
.IR /usr/local/lib/gkrellm2/plugins .IR /usr/local/lib/gkrellm2/plugins
and and
@ -56,7 +56,7 @@
are also searched for plugins to install. are also searched for plugins to install.
.PP .PP
Some plugins may be available only as source files and they will Some plugins may be available only as source files and they will
@@ -1213,7 +1213,7 @@ @@ -1213,7 +1213,7 @@ User plugin directory.
.I ~/.gkrellm2/plugins .I ~/.gkrellm2/plugins
User plugin directory. User plugin directory.
.TP .TP
@ -65,7 +65,7 @@
System wide plugin directory. System wide plugin directory.
.TP .TP
.I /usr/local/lib/gkrellm2/plugins .I /usr/local/lib/gkrellm2/plugins
@@ -1225,13 +1225,13 @@ @@ -1225,13 +1225,13 @@ User theme packaged as part of a user Gtk theme.
.I ~/.themes/THEME_NAME/gkrellm2 .I ~/.themes/THEME_NAME/gkrellm2
User theme packaged as part of a user Gtk theme. User theme packaged as part of a user Gtk theme.
.TP .TP

86
sysutils/gkrellm2/files/patch-server__Makefile
View file

@ -1,27 +1,25 @@
Index: server/Makefile --- server/Makefile.orig 2025-01-19 16:02:37 UTC
diff -u server/Makefile.orig server/Makefile +++ server/Makefile
--- server/Makefile.orig 2016-02-03 08:37:50.000000000 +0900 @@ -42,7 +42,7 @@ PKG_LIB := $(shell $(PKG_CONFIG) --libs $(PKG_MODULES)
+++ server/Makefile 2016-06-06 01:46:16.352492000 +0900 endif
@@ -31,7 +31,7 @@ PKG_LIB := $(shell $(PKG_CONFIG) --libs $(PKG_MODULES))
PKG_INCLUDE := $(shell $(PKG_CONFIG) --cflags glib-2.0 gmodule-2.0 gthread-2.0)
PKG_LIB := $(shell $(PKG_CONFIG) --libs glib-2.0 gmodule-2.0 gthread-2.0)
-FLAGS = -O2 $(PKG_INCLUDE) -FLAGS = -O2 $(PKG_INCLUDE)
+FLAGS = $(PKG_INCLUDE) +FLAGS = $(PKG_INCLUDE)
FLAGS += $(GTOP_INCLUDE) $(PTHREAD_INC) -I.. -I$(SHARED_PATH) -DGKRELLM_SERVER FLAGS += $(GTOP_INCLUDE) $(PTHREAD_INC) -I.. -I$(SHARED_PATH) -DGSEAL_ENABLED -DGTK_DISABLE_DEPRECATED -DGKRELLM_SERVER
@@ -73,20 +73,31 @@ @@ -80,20 +80,31 @@ all: gkrellmd$(BINEXT) $(SERVICE_FILE)
all: gkrellmd$(BINEXT) all: gkrellmd$(BINEXT) $(SERVICE_FILE)
-gkrellmd$(BINEXT): check_env $(OBJS) $(EXTRAOBJS) -gkrellmd$(BINEXT): $(OBJS) $(EXTRAOBJS)
+gkrellmd$(BINEXT): check_env gkrellmd.pc $(OBJS) $(EXTRAOBJS) +gkrellmd$(BINEXT): gkrellmd.pc $(OBJS) $(EXTRAOBJS)
$(CC) $(OBJS) $(EXTRAOBJS) -o $@ \ $(CC) $(OBJS) $(EXTRAOBJS) -o $@ \
$(LDFLAGS) $(LIBS) $(LINK_FLAGS) $(LDFLAGS) $(LIBS) $(LINK_FLAGS)
-static: check_env $(OBJS) $(EXTRAOBJS) -static: $(OBJS) $(EXTRAOBJS)
+static: check_env gkrellmd.pc $(OBJS) $(EXTRAOBJS) +static: gkrellmd.pc $(OBJS) $(EXTRAOBJS)
$(CC) $(OBJS) $(EXTRAOBJS) -o gkrellmd.static -static \ $(CC) $(OBJS) $(EXTRAOBJS) -o gkrellmd.static -static \
$(LDFLAGS) $(LIBS) $(LINK_FLAGS) $(LDFLAGS) $(LIBS) $(LINK_FLAGS)
@ -45,13 +43,16 @@ diff -u server/Makefile.orig server/Makefile
+ +
# Darwin target for systems that still have libkvm # Darwin target for systems that still have libkvm
darwin: darwin:
$(MAKE) STRIP= HAVE_GETADDRINFO=1 \ $(MAKE) \
@@ -135,27 +146,32 @@ @@ -152,42 +163,49 @@ uninstall-service:
SYS_LIBS="-lws2_32 -lwtsapi32 -lpdh -lnetapi32 -liphlpapi -lintl" \ uninstall-service:
all $(RM) -f $(SERVICE_DIR)/$(SERVICE_FILE)
-install: install_bin install_inc install_man -install: install_bin install_inc install_man install_cfg install-service
+install: install_bin install_inc install_man install_gkrellmd.pc +install: install_bin install_inc install_man install_cfg install_gkrellmd.pc
install-strip:
$(MAKE) STRIP="-s" install
install_bin: install_bin:
- $(INSTALL) -d -m $(INSTALLDIRMODE) $(SINSTALLDIR) - $(INSTALL) -d -m $(INSTALLDIRMODE) $(SINSTALLDIR)
@ -59,40 +60,61 @@ diff -u server/Makefile.orig server/Makefile
+ $(INSTALL) -d -m $(INSTALLDIRMODE) $(DESTDIR)$(SINSTALLDIR) + $(INSTALL) -d -m $(INSTALLDIRMODE) $(DESTDIR)$(SINSTALLDIR)
+ $(INSTALL) -c $(STRIP) -m $(BINMODE) $(PACKAGE_D)$(BINEXT) $(DESTDIR)$(SINSTALLDIR)/$(PACKAGE_D)$(BINEXT) + $(INSTALL) -c $(STRIP) -m $(BINMODE) $(PACKAGE_D)$(BINEXT) $(DESTDIR)$(SINSTALLDIR)/$(PACKAGE_D)$(BINEXT)
uninstall_bin:
- $(RM) $(SINSTALLDIR)/$(PACKAGE_D)$(BINEXT)
+ $(RM) $(DESTDIR)$(SINSTALLDIR)/$(PACKAGE_D)$(BINEXT)
install_inc: install_inc:
- $(INSTALL) -d -m $(INCLUDEDIRMODE) $(INCLUDEDIR)/gkrellm2 - $(INSTALL) -d -m $(INCLUDEDIRMODE) $(INCLUDEDIR)/gkrellm2
- $(INSTALL) -c -m $(INCLUDEMODE) $(GKRELLMD_INCLUDES) $(INCLUDEDIR)/gkrellm2 - $(INSTALL) -c -m $(INCLUDEMODE) $(GKRELLMD_INCLUDES) $(INCLUDEDIR)/gkrellm2
+ $(INSTALL) -d -m $(INCLUDEDIRMODE) $(DESTDIR)$(INCLUDEDIR)/gkrellm2 + $(INSTALL) -d -m $(INCLUDEDIRMODE) $(DESTDIR)$(INCLUDEDIR)/gkrellm2
+ $(INSTALL) -c -m $(INCLUDEMODE) $(GKRELLMD_INCLUDES) $(DESTDIR)$(INCLUDEDIR)/gkrellm2 + $(INSTALL) -c -m $(INCLUDEMODE) $(GKRELLMD_INCLUDES) $(DESTDIR)$(INCLUDEDIR)/gkrellm2
# FIXME: may remove too many files, overlaps with uninstall_inc from client
uninstall_inc:
- $(RM) -r $(INCLUDEDIR)/gkrellm2
+ $(RM) -r $(DESTDIR)$(INCLUDEDIR)/gkrellm2
install_man: install_man:
- $(INSTALL) -d -m $(MANDIRMODE) $(SMANDIR) - $(INSTALL) -d -m $(MANDIRMODE) $(SMANDIR)
- $(INSTALL) -c -m $(MANMODE) ../gkrellmd.1 $(SMANDIR)/$(PACKAGE_D).1 - $(INSTALL) -c -m $(MANMODE) ../gkrellmd.1 $(SMANDIR)/$(PACKAGE_D).1
+ $(INSTALL) -d -m $(MANDIRMODE) $(DESTDIR)$(SMANDIR) + $(INSTALL) -d -m $(MANDIRMODE) $(DESTDIR)$(SMANDIR)
+ $(INSTALL) -c -m $(MANMODE) ../gkrellmd.1 $(DESTDIR)$(SMANDIR)/$(PACKAGE_D).8 + $(INSTALL) -c -m $(MANMODE) ../gkrellmd.1 $(DESTDIR)$(SMANDIR)/$(PACKAGE_D).8
uninstall_man:
- $(RM) $(SMANDIR)/$(PACKAGE_D).1
+ $(RM) $(DESTDIR)$(SMANDIR)/$(PACKAGE_D).1
install_cfg: install_cfg:
- $(INSTALL) -d -m $(CFGDIRMODE) $(CFGDIR) - $(INSTALL) -d -m $(CFGDIRMODE) $(CFGDIR)
- $(INSTALL) -c -m $(CFGMODE) gkrellmd.conf $(CFGDIR)/gkrellmd.conf - $(INSTALL) -c -m $(CFGMODE) gkrellmd.conf $(CFGDIR)/gkrellmd.conf
+ $(INSTALL) -d -m $(CFGDIRMODE) $(DESTDIR)$(CFGDIR) + $(INSTALL) -d -m $(CFGDIRMODE) $(DESTDIR)$(CFGDIR)
+ $(INSTALL) -c -m $(CFGMODE) gkrellmd.conf $(DESTDIR)$(CFGDIR)/gkrellmd.conf + $(INSTALL) -c -m $(CFGMODE) gkrellmd.conf $(DESTDIR)$(CFGDIR)/gkrellmd.conf
+
uninstall_cfg:
- $(RM) $(CFGDIR)/gkrellmd.conf
+ $(RM) $(DESTDIR)$(CFGDIR)/gkrellmd.conf
-uninstall: uninstall_bin uninstall_inc uninstall_man uninstall_cfg uninstall-service
+install_gkrellmd.pc: +install_gkrellmd.pc:
+ $(INSTALL) -d $(DESTDIR)$(PKGCONFIGDIR) + $(INSTALL) -d $(DESTDIR)$(PKGCONFIGDIR)
+ $(INSTALL) -c -m $(INCLUDEMODE) gkrellmd.pc $(DESTDIR)$(PKGCONFIGDIR) + $(INSTALL) -c -m $(INCLUDEMODE) gkrellmd.pc $(DESTDIR)$(PKGCONFIGDIR)
uninstall: +uninstall_gkrellmd.pc:
rm -f $(SINSTALLDIR)/$(PACKAGE_D) + $(RM) $(DESTDIR)$(PKGCONFIGDIR)/gkrellmd.pc
rm -f $(SMANDIR)/$(PACKAGE_D).1 +
+ rm -f $(PKGCONFIGDIR)/gkrellmd.pc +uninstall: uninstall_bin uninstall_inc uninstall_man uninstall_cfg uninstall_gkrellmd.pc
+
install_darwin install_darwin9 install_macosx: install_darwin install_darwin9 install_macosx:
$(MAKE) install STRIP= $(MAKE) install
@@ -186,6 +202,7 @@
clean: @@ -227,7 +245,8 @@ clean:
$(RM) *.o *~ *.bak configure.h configure.log gkrellmd gkrellmd.exe \ gkrellmd-version.h \
libgkrellmd.a core gkrellmd.exe \
+ $(RM) gkrellmd.pc libgkrellmd.a \
- win32-resource.rc
+ win32-resource.rc \
+ gkrellmd.pc
SYSDEPS = ../src/sysdeps/bsd-common.c ../src/sysdeps/bsd-net-open.c \ SYSDEPS = ../src/sysdeps/bsd-common.c ../src/sysdeps/bsd-net-open.c \
../src/sysdeps/darwin.c \ ../src/sysdeps/darwin.c \

81
sysutils/gkrellm2/files/patch-src__Makefile
View file

@ -1,6 +1,6 @@
--- src/Makefile.orig 2010-10-02 16:21:01 UTC --- src/Makefile.orig 2025-01-19 16:02:37 UTC
+++ src/Makefile +++ src/Makefile
@@ -53,7 +53,8 @@ @@ -38,7 +38,8 @@ endif
CONFIGURE_ARGS += --without-ntlm CONFIGURE_ARGS += --without-ntlm
endif endif
# run configure shell script # run configure shell script
@ -10,16 +10,16 @@
# pull in variables set by configure script # pull in variables set by configure script
include configure.mk include configure.mk
@@ -68,7 +69,7 @@ @@ -51,7 +52,7 @@ PKG_LIB := $(shell $(PKG_CONFIG) --libs $(PKG_MODULES)
PKG_INCLUDE = `$(PKG_CONFIG) --cflags gtk+-2.0 gthread-2.0` endif
PKG_LIB = `$(PKG_CONFIG) --libs gtk+-2.0 gthread-2.0` PKG_LIB := $(shell $(PKG_CONFIG) --libs $(PKG_MODULES))
-FLAGS = -O2 -I.. -I$(SHARED_PATH) $(PKG_INCLUDE) $(GTOP_INCLUDE) $(PTHREAD_INC)\ -FLAGS = -O2 -I.. -I$(SHARED_PATH) $(PKG_INCLUDE) $(GTOP_INCLUDE) $(PTHREAD_INC)\
+FLAGS = -I.. -I$(SHARED_PATH) $(PKG_INCLUDE) $(GTOP_INCLUDE) $(PTHREAD_INC)\ +FLAGS = -I.. -I$(SHARED_PATH) $(PKG_INCLUDE) $(GTOP_INCLUDE) $(PTHREAD_INC)\
${SSL_INCLUDE} ${NTLM_INCLUDE} -DGKRELLM_CLIENT ${SSL_INCLUDE} ${NTLM_INCLUDE} -DGSEAL_ENABLED -DGTK_DISABLE_DEPRECATED -DGKRELLM_CLIENT
LIBS = $(PKG_LIB) $(GTOP_LIBS) $(X11_LIBS) $(SYS_LIBS) $(SSL_LIBS) $(SENSORS_LIBS)\ LIBS = $(PKG_LIB) $(GTOP_LIBS) $(X11_LIBS) $(SYS_LIBS) $(SSL_LIBS) $(SENSORS_LIBS)\
@@ -131,13 +132,20 @@ @@ -107,13 +108,20 @@ endif
$(MAKE) EXTRAOBJS= SYS_LIBS="-lkvm -lmd" gkrellm $(MAKE) EXTRAOBJS= SYS_LIBS="-lkvm -lmd" gkrellm
endif endif
@ -41,8 +41,8 @@
# Darwin target for systems that still have libkvm # Darwin target for systems that still have libkvm
darwin: darwin:
ifeq ($(HAVE_SSL),1) ifeq ($(HAVE_SSL),1)
@@ -201,16 +209,16 @@ @@ -181,51 +189,51 @@ install_bin:
install: install_bin install_inc install_man $(MAKE) STRIP="-s" install
install_bin: install_bin:
- $(INSTALL) -d -m $(INSTALLDIRMODE) $(INSTALLDIR) - $(INSTALL) -d -m $(INSTALLDIRMODE) $(INSTALLDIR)
@ -50,17 +50,76 @@
+ $(INSTALL) -d -m $(INSTALLDIRMODE) $(DESTDIR)$(INSTALLDIR) + $(INSTALL) -d -m $(INSTALLDIRMODE) $(DESTDIR)$(INSTALLDIR)
+ $(INSTALL) -c $(STRIP) -m $(BINMODE) $(PACKAGE)$(BINEXT) $(DESTDIR)$(INSTALLDIR)/$(PACKAGE)$(BINEXT) + $(INSTALL) -c $(STRIP) -m $(BINMODE) $(PACKAGE)$(BINEXT) $(DESTDIR)$(INSTALLDIR)/$(PACKAGE)$(BINEXT)
uninstall_bin:
- $(RM) $(INSTALLDIR)/$(PACKAGE)$(BINEXT)
+ $(RM) $(DESTDIR)$(INSTALLDIR)/$(PACKAGE)$(BINEXT)
install_inc: install_inc:
- $(INSTALL) -d -m $(INCLUDEDIRMODE) $(INCLUDEDIR)/gkrellm2 - $(INSTALL) -d -m $(INCLUDEDIRMODE) $(INCLUDEDIR)/gkrellm2
- $(INSTALL) -c -m $(INCLUDEMODE) $(GKRELLM_INCLUDES) $(INCLUDEDIR)/gkrellm2 - $(INSTALL) -c -m $(INCLUDEMODE) $(GKRELLM_INCLUDES) $(INCLUDEDIR)/gkrellm2
+ $(INSTALL) -d -m $(INCLUDEDIRMODE) $(DESTDIR)$(INCLUDEDIR)/gkrellm2 + $(INSTALL) -d -m $(INCLUDEDIRMODE) $(DESTDIR)$(INCLUDEDIR)/gkrellm2
+ $(INSTALL) -c -m $(INCLUDEMODE) $(GKRELLM_INCLUDES) $(DESTDIR)$(INCLUDEDIR)/gkrellm2 + $(INSTALL) -c -m $(INCLUDEMODE) $(GKRELLM_INCLUDES) $(DESTDIR)$(INCLUDEDIR)/gkrellm2
# FIXME: may remove too many files, overlaps with uninstall_inc from server
uninstall_inc:
- $(RM) -r $(INCLUDEDIR)/gkrellm2
+ $(RM) -r $(DESTDIR)$(INCLUDEDIR)/gkrellm2
install_man: install_man:
- $(INSTALL) -d -m $(MANDIRMODE) $(MANDIR) - $(INSTALL) -d -m $(MANDIRMODE) $(MANDIR)
- $(INSTALL) -c -m $(MANMODE) ../gkrellm.1 $(MANDIR)/$(PACKAGE).1 - $(INSTALL) -c -m $(MANMODE) ../gkrellm.1 $(MANDIR)/$(PACKAGE).1
+ $(INSTALL) -d -m $(MANDIRMODE) $(DESTDIR)$(MANDIR) + $(INSTALL) -d -m $(MANDIRMODE) $(DESTDIR)$(MANDIR)
+ $(INSTALL) -c -m $(MANMODE) ../gkrellm.1 $(DESTDIR)$(MANDIR)/$(PACKAGE).1 + $(INSTALL) -c -m $(MANMODE) ../gkrellm.1 $(DESTDIR)$(MANDIR)/$(PACKAGE).1
uninstall: uninstall_man:
$(RM) $(INSTALLDIR)/$(PACKAGE) - $(RM) $(MANDIR)/$(PACKAGE).1
+ $(RM) $(DESTDIR)$(MANDIR)/$(PACKAGE).1
install-data:
- $(INSTALL) -d -m 755 $(MENUDIR)
- $(INSTALL) -c -m 644 ../data/gkrellm.desktop $(MENUDIR)/
- $(INSTALL) -d -m 755 $(ICONDIR)/hicolor/16x16/apps
- $(INSTALL) -c -m 644 ../data/icons/16/gkrellm.png $(ICONDIR)/hicolor/16x16/apps/
- $(INSTALL) -d -m 755 $(ICONDIR)/hicolor/24x24/apps
- $(INSTALL) -c -m 644 ../data/icons/24/gkrellm.png $(ICONDIR)/hicolor/24x24/apps/
- $(INSTALL) -d -m 755 $(ICONDIR)/hicolor/32x32/apps
- $(INSTALL) -c -m 644 ../data/icons/32/gkrellm.png $(ICONDIR)/hicolor/32x32/apps/
- $(INSTALL) -d -m 755 $(ICONDIR)/hicolor/48x48/apps
- $(INSTALL) -c -m 644 ../data/icons/48/gkrellm.png $(ICONDIR)/hicolor/48x48/apps/
- $(INSTALL) -d -m 755 $(ICONDIR)/hicolor/64x64/apps
- $(INSTALL) -c -m 644 ../data/icons/64/gkrellm.png $(ICONDIR)/hicolor/64x64/apps/
- $(INSTALL) -d -m 755 $(METAINFODIR)
- $(INSTALL) -c -m 644 ../data/net.srcbox.gkrellm.GKrellM.metainfo.xml $(METAINFODIR)/
+ $(INSTALL) -d -m 755 $(DESTDIR)$(MENUDIR)
+ $(INSTALL) -c -m 644 ../data/gkrellm.desktop $(DESTDIR)$(MENUDIR)/
+ $(INSTALL) -d -m 755 $(DESTDIR)$(ICONDIR)/hicolor/16x16/apps
+ $(INSTALL) -c -m 644 ../data/icons/16/gkrellm.png $(DESTDIR)$(ICONDIR)/hicolor/16x16/apps/
+ $(INSTALL) -d -m 755 $(DESTDIR)$(ICONDIR)/hicolor/24x24/apps
+ $(INSTALL) -c -m 644 ../data/icons/24/gkrellm.png $(DESTDIR)$(ICONDIR)/hicolor/24x24/apps/
+ $(INSTALL) -d -m 755 $(DESTDIR)$(ICONDIR)/hicolor/32x32/apps
+ $(INSTALL) -c -m 644 ../data/icons/32/gkrellm.png $(DESTDIR)$(ICONDIR)/hicolor/32x32/apps/
+ $(INSTALL) -d -m 755 $(DESTDIR)$(ICONDIR)/hicolor/48x48/apps
+ $(INSTALL) -c -m 644 ../data/icons/48/gkrellm.png $(DESTDIR)$(ICONDIR)/hicolor/48x48/apps/
+ $(INSTALL) -d -m 755 $(DESTDIR)$(ICONDIR)/hicolor/64x64/apps
+ $(INSTALL) -c -m 644 ../data/icons/64/gkrellm.png $(DESTDIR)$(ICONDIR)/hicolor/64x64/apps/
+ $(INSTALL) -d -m 755 $(DESTDIR)$(METAINFODIR)
+ $(INSTALL) -c -m 644 ../data/net.srcbox.gkrellm.GKrellM.metainfo.xml $(DESTDIR)$(METAINFODIR)/
uninstall-data:
- $(RM) $(MENUDIR)/gkrellm.desktop
- $(RM) $(ICONDIR)/hicolor/16x16/apps/gkrellm.png
- $(RM) $(ICONDIR)/hicolor/24x24/apps/gkrellm.png
- $(RM) $(ICONDIR)/hicolor/32x32/apps/gkrellm.png
- $(RM) $(ICONDIR)/hicolor/48x48/apps/gkrellm.png
- $(RM) $(ICONDIR)/hicolor/64x64/apps/gkrellm.png
- $(RM) $(METAINFODIR)/net.srcbox.gkrellm.GKrellM.metainfo.xml
+ $(RM) $(DESTDIR)$(MENUDIR)/gkrellm.desktop
+ $(RM) $(DESTDIR)$(ICONDIR)/hicolor/16x16/apps/gkrellm.png
+ $(RM) $(DESTDIR)$(ICONDIR)/hicolor/24x24/apps/gkrellm.png
+ $(RM) $(DESTDIR)$(ICONDIR)/hicolor/32x32/apps/gkrellm.png
+ $(RM) $(DESTDIR)$(ICONDIR)/hicolor/48x48/apps/gkrellm.png
+ $(RM) $(DESTDIR)$(ICONDIR)/hicolor/64x64/apps/gkrellm.png
+ $(RM) $(DESTDIR)$(METAINFODIR)/net.srcbox.gkrellm.GKrellM.metainfo.xml
uninstall: uninstall_bin uninstall_inc uninstall_man uninstall-data

8
sysutils/gkrellm2/files/patch-src__configure
View file

@ -1,11 +1,11 @@
--- src/configure.orig 2014-10-11 14:00:45 UTC --- src/configure.orig 2025-01-19 16:02:37 UTC
+++ src/configure +++ src/configure
@@ -46,8 +46,8 @@ then @@ -46,8 +46,8 @@ echo "Checking for OpenSSL... " 1>& 5
echo -n "Checking for OpenSSL... " echo -n "Checking for OpenSSL... "
echo "Checking for OpenSSL... " 1>& 5 echo "Checking for OpenSSL... " 1>& 5
-OPENSSL_INCLUDE="$(${PKG_CONFIG} openssl --cflags 2>& 5 || true)" -OPENSSL_INCLUDE="$(${PKG_CONFIG} 'openssl >= 1.1.0' --cflags 2>& 5 || true)"
-OPENSSL_LIBS="$(${PKG_CONFIG} openssl --libs 2>& 5 || true)" -OPENSSL_LIBS="$(${PKG_CONFIG} 'openssl >= 1.1.0' --libs 2>& 5 || true)"
+OPENSSL_INCLUDE="-I${OPENSSLINC}" +OPENSSL_INCLUDE="-I${OPENSSLINC}"
+OPENSSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto" +OPENSSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto"
if [ -z "$OPENSSL_LIBS" ] if [ -z "$OPENSSL_LIBS" ]

9
sysutils/gkrellm2/pkg-plist
View file

@ -1,6 +1,8 @@
%%CLIENT%%bin/gkrellm %%CLIENT%%bin/gkrellm
%%CLIENT%%include/gkrellm2/gkrellm-public-proto.h %%CLIENT%%include/gkrellm2/gkrellm-public-proto.h
%%CLIENT%%include/gkrellm2/gkrellm-version.h
%%CLIENT%%include/gkrellm2/gkrellm.h %%CLIENT%%include/gkrellm2/gkrellm.h
include/gkrellm2/gkrellmd-version.h
include/gkrellm2/gkrellmd.h include/gkrellm2/gkrellmd.h
include/gkrellm2/log.h include/gkrellm2/log.h
%%CLIENT%%libdata/pkgconfig/gkrellm.pc %%CLIENT%%libdata/pkgconfig/gkrellm.pc
@ -9,6 +11,12 @@ libdata/pkgconfig/gkrellmd.pc
share/man/man8/gkrellmd.8.gz share/man/man8/gkrellmd.8.gz
sbin/gkrellmd sbin/gkrellmd
@sample %%EXAMPLESDIR%%/gkrellmd.conf etc/gkrellmd.conf @sample %%EXAMPLESDIR%%/gkrellmd.conf etc/gkrellmd.conf
%%CLIENT%%share/applications/gkrellm.desktop
%%CLIENT%%share/icons/hicolor/16x16/apps/gkrellm.png
%%CLIENT%%share/icons/hicolor/24x24/apps/gkrellm.png
%%CLIENT%%share/icons/hicolor/32x32/apps/gkrellm.png
%%CLIENT%%share/icons/hicolor/48x48/apps/gkrellm.png
%%CLIENT%%share/icons/hicolor/64x64/apps/gkrellm.png
%%CLIENT%%%%NLS%%share/locale/bg/LC_MESSAGES/gkrellm.mo %%CLIENT%%%%NLS%%share/locale/bg/LC_MESSAGES/gkrellm.mo
%%CLIENT%%%%NLS%%share/locale/cs/LC_MESSAGES/gkrellm.mo %%CLIENT%%%%NLS%%share/locale/cs/LC_MESSAGES/gkrellm.mo
%%CLIENT%%%%NLS%%share/locale/da/LC_MESSAGES/gkrellm.mo %%CLIENT%%%%NLS%%share/locale/da/LC_MESSAGES/gkrellm.mo
@ -25,6 +33,7 @@ sbin/gkrellmd
%%CLIENT%%%%NLS%%share/locale/sl/LC_MESSAGES/gkrellm.mo %%CLIENT%%%%NLS%%share/locale/sl/LC_MESSAGES/gkrellm.mo
%%CLIENT%%%%NLS%%share/locale/sv/LC_MESSAGES/gkrellm.mo %%CLIENT%%%%NLS%%share/locale/sv/LC_MESSAGES/gkrellm.mo
%%CLIENT%%%%NLS%%share/locale/uk/LC_MESSAGES/gkrellm.mo %%CLIENT%%%%NLS%%share/locale/uk/LC_MESSAGES/gkrellm.mo
%%CLIENT%%share/metainfo/net.srcbox.gkrellm.GKrellM.metainfo.xml
%%CLIENT%%@dir libexec/gkrellm2/plugins %%CLIENT%%@dir libexec/gkrellm2/plugins
@dir libexec/gkrellm2/plugins-gkrellmd @dir libexec/gkrellm2/plugins-gkrellmd
%%CLIENT%%@dir %%DATADIR%%2/themes %%CLIENT%%@dir %%DATADIR%%2/themes