diff options
Diffstat (limited to 'sysutils/gkrellm2/files/patch-server__Makefile')
| -rw-r--r-- | sysutils/gkrellm2/files/patch-server__Makefile | 127 |
1 files changed, 10 insertions, 117 deletions
diff --git a/sysutils/gkrellm2/files/patch-server__Makefile b/sysutils/gkrellm2/files/patch-server__Makefile index c26b0f30603e..fd9473d17460 100644 --- a/sysutils/gkrellm2/files/patch-server__Makefile +++ b/sysutils/gkrellm2/files/patch-server__Makefile @@ -1,120 +1,13 @@ ---- server/Makefile.orig 2025-01-19 16:02:37 UTC +--- server/Makefile.orig 2025-12-14 15:28:26 UTC +++ server/Makefile -@@ -42,7 +42,7 @@ PKG_LIB := $(shell $(PKG_CONFIG) --libs $(PKG_MODULES) - endif - PKG_LIB := $(shell $(PKG_CONFIG) --libs $(PKG_MODULES)) +@@ -164,8 +164,8 @@ install_freebsd: --FLAGS = -O2 $(PKG_INCLUDE) -+FLAGS = $(PKG_INCLUDE) + install_freebsd: + $(MAKE) install_unix +- chgrp kmem $(DESTDIR)$(SINSTALLDIR)/$(PACKAGE_D) +- chmod g+s $(DESTDIR)$(SINSTALLDIR)/$(PACKAGE_D) ++ # chgrp kmem $(DESTDIR)$(SINSTALLDIR)/$(PACKAGE_D) ++ # chmod g+s $(DESTDIR)$(SINSTALLDIR)/$(PACKAGE_D) - FLAGS += $(GTOP_INCLUDE) $(PTHREAD_INC) -I.. -I$(SHARED_PATH) -DGSEAL_ENABLED -DGTK_DISABLE_DEPRECATED -DGKRELLM_SERVER - -@@ -80,20 +80,31 @@ all: gkrellmd$(BINEXT) $(SERVICE_FILE) - - all: gkrellmd$(BINEXT) $(SERVICE_FILE) - --gkrellmd$(BINEXT): $(OBJS) $(EXTRAOBJS) -+gkrellmd$(BINEXT): gkrellmd.pc $(OBJS) $(EXTRAOBJS) - $(CC) $(OBJS) $(EXTRAOBJS) -o $@ \ - $(LDFLAGS) $(LIBS) $(LINK_FLAGS) - --static: $(OBJS) $(EXTRAOBJS) -+static: gkrellmd.pc $(OBJS) $(EXTRAOBJS) - $(CC) $(OBJS) $(EXTRAOBJS) -o gkrellmd.static -static \ - $(LDFLAGS) $(LIBS) $(LINK_FLAGS) - -+gkrellmd.pc: Makefile -+ echo "prefix=$(INSTALLROOT)" > gkrellmd.pc -+ echo "Name: GKrellMd" >> gkrellmd.pc -+ echo "Description: Extensible GLIB system monitoring application server" >> gkrellmd.pc -+ echo "Version: $(VERSION)" >> gkrellmd.pc -+ echo "Requires: glib-2.0" >> gkrellmd.pc -+ echo "Cflags: -I$(INCLUDEDIR)" >> gkrellmd.pc -+ - freebsd2: - $(MAKE) EXTRAOBJS= SYS_LIBS="-lkvm -lmd" gkrellmd - --freebsd3 freebsd: -+freebsd3 freebsd4: - $(MAKE) EXTRAOBJS= SYS_LIBS="-lkvm -ldevstat -lmd" gkrellmd - -+freebsd5 freebsd6 freebsd7 freebsd8 freebsd: -+ $(MAKE) EXTRAOBJS= SYS_LIBS="-ldevstat -lmd" gkrellmd -+ - # Darwin target for systems that still have libkvm - darwin: - $(MAKE) \ -@@ -152,42 +163,49 @@ uninstall-service: - uninstall-service: - $(RM) -f $(SERVICE_DIR)/$(SERVICE_FILE) - --install: install_bin install_inc install_man install_cfg install-service -+install: install_bin install_inc install_man install_cfg install_gkrellmd.pc - - install-strip: - $(MAKE) STRIP="-s" install - - install_bin: -- $(INSTALL) -d -m $(INSTALLDIRMODE) $(SINSTALLDIR) -- $(INSTALL) -c $(STRIP) -m $(BINMODE) $(PACKAGE_D)$(BINEXT) $(SINSTALLDIR)/$(PACKAGE_D)$(BINEXT) -+ $(INSTALL) -d -m $(INSTALLDIRMODE) $(DESTDIR)$(SINSTALLDIR) -+ $(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) -d -m $(INCLUDEDIRMODE) $(INCLUDEDIR)/gkrellm2 -- $(INSTALL) -c -m $(INCLUDEMODE) $(GKRELLMD_INCLUDES) $(INCLUDEDIR)/gkrellm2 -+ $(INSTALL) -d -m $(INCLUDEDIRMODE) $(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) -d -m $(MANDIRMODE) $(SMANDIR) -- $(INSTALL) -c -m $(MANMODE) ../gkrellmd.1 $(SMANDIR)/$(PACKAGE_D).1 -+ $(INSTALL) -d -m $(MANDIRMODE) $(DESTDIR)$(SMANDIR) -+ $(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) -d -m $(CFGDIRMODE) $(CFGDIR) -- $(INSTALL) -c -m $(CFGMODE) gkrellmd.conf $(CFGDIR)/gkrellmd.conf -+ $(INSTALL) -d -m $(CFGDIRMODE) $(DESTDIR)$(CFGDIR) -+ $(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) -d $(DESTDIR)$(PKGCONFIGDIR) -+ $(INSTALL) -c -m $(INCLUDEMODE) gkrellmd.pc $(DESTDIR)$(PKGCONFIGDIR) - -+uninstall_gkrellmd.pc: -+ $(RM) $(DESTDIR)$(PKGCONFIGDIR)/gkrellmd.pc -+ -+uninstall: uninstall_bin uninstall_inc uninstall_man uninstall_cfg uninstall_gkrellmd.pc -+ - install_darwin install_darwin9 install_macosx: - $(MAKE) install - -@@ -227,7 +245,8 @@ clean: - gkrellmd-version.h \ - gkrellmd.exe \ - libgkrellmd.a \ -- win32-resource.rc -+ win32-resource.rc \ -+ gkrellmd.pc - - SYSDEPS = ../src/sysdeps/bsd-common.c ../src/sysdeps/bsd-net-open.c \ - ../src/sysdeps/darwin.c \ + install_netbsd: + $(MAKE) SMANDIR="$(PREFIX)/man/man1" install_unix |