diff options
author | Hajimu UMEMOTO <ume@FreeBSD.org> | 2005-11-04 19:20:01 +0000 |
---|---|---|
committer | Hajimu UMEMOTO <ume@FreeBSD.org> | 2005-11-04 19:20:01 +0000 |
commit | b7ed2603c5beedbdb3206120992ca33c28bc3521 (patch) | |
tree | 1568049fa3e48a6f35297dd184e9f3c78b1bb23b /sysutils/gkrellm2/files | |
parent | da5e912e2a351382df7059d5d049d1aa95578bbe (diff) |
Notes
Diffstat (limited to 'sysutils/gkrellm2/files')
-rw-r--r-- | sysutils/gkrellm2/files/patch-gkrellmd.1 | 2 | ||||
-rw-r--r-- | sysutils/gkrellm2/files/patch-server::Makefile | 63 |
2 files changed, 58 insertions, 7 deletions
diff --git a/sysutils/gkrellm2/files/patch-gkrellmd.1 b/sysutils/gkrellm2/files/patch-gkrellmd.1 index 88a710cad591..13896c7e4ea8 100644 --- a/sysutils/gkrellm2/files/patch-gkrellmd.1 +++ b/sysutils/gkrellm2/files/patch-gkrellmd.1 @@ -4,7 +4,7 @@ diff -u gkrellmd.1.orig gkrellmd.1 +++ gkrellmd.1 Tue Apr 13 17:14:02 2004 @@ -1,4 +1,4 @@ -.TH gkrellmd 1 "June 7, 2003" "GNU/Linux" "User's Manual" -+.TH gkrellmd 1 "June 7, 2003" "FreeBSD" "User's Manual" ++.TH gkrellmd 8 "June 7, 2003" "FreeBSD" "User's Manual" .SH "NAME" gkrellmd \- The GNU Krell Monitors Server diff --git a/sysutils/gkrellm2/files/patch-server::Makefile b/sysutils/gkrellm2/files/patch-server::Makefile index cf4d5b4dead6..91706c2b4273 100644 --- a/sysutils/gkrellm2/files/patch-server::Makefile +++ b/sysutils/gkrellm2/files/patch-server::Makefile @@ -1,8 +1,14 @@ -Index: server/Makefile -diff -u server/Makefile.orig server/Makefile ---- server/Makefile.orig Mon Apr 12 22:30:48 2004 -+++ server/Makefile Tue Apr 13 14:15:40 2004 -@@ -27,18 +27,18 @@ +--- server/Makefile.orig Mon Apr 12 08:30:48 2004 ++++ server/Makefile Mon Jun 13 07:45:44 2005 +@@ -18,6 +18,7 @@ + MANMODE ?= 644 + MANDIRMODE ?= 755 + INSTALL ?= install ++PKGCONFIGDIR ?= $(INSTALLROOT)/lib/pkgconfig + LINK_FLAGS ?= -Wl,-E + CC ?= gcc + STRIP ?= -s +@@ -27,18 +28,18 @@ PKG_INCLUDE = `$(PKG_CONFIG) --cflags glib-2.0 gthread-2.0` PKG_LIB = `$(PKG_CONFIG) --libs glib-2.0 gmodule-2.0 gthread-2.0` @@ -27,7 +33,35 @@ diff -u server/Makefile.orig server/Makefile LIBS = $(PKG_LIB) $(GTOP_LIBS_D) $(SYS_LIBS) ifeq ($(glib12),1) -@@ -133,7 +133,7 @@ +@@ -87,10 +88,18 @@ + + all: gkrellmd + +-gkrellmd: $(OBJS) ++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 ++ ++gkrellmd: gkrellmd.pc $(OBJS) + $(CC) $(OBJS) -o gkrellmd $(LIBS) $(LINK_FLAGS) + +-static: $(OBJS) ++static: gkrellmd.pc $(OBJS) + $(CC) $(OBJS) -o gkrellmd.static -static \ + $(LIBS) $(LINK_FLAGS) + +@@ -127,17 +136,22 @@ + LINK_FLAGS="" gkrellmd + endif + +-install: ++install: install_gkrellmd.pc + $(INSTALL) -d -m $(INSTALLDIRMODE) $(SINSTALLDIR) + $(INSTALL) -c $(STRIP) -m $(BINMODE) gkrellmd $(SINSTALLDIR)/$(PACKAGE_D) $(INSTALL) -d -m $(INCLUDEDIRMODE) $(INCLUDEDIR)/gkrellm2 $(INSTALL) -c -m $(INCLUDEMODE) $(GKRELLMD_INCLUDES) $(INCLUDEDIR)/gkrellm2 $(INSTALL) -d -m $(MANDIRMODE) $(SMANDIR) @@ -36,3 +70,20 @@ diff -u server/Makefile.orig server/Makefile uninstall: rm -f $(SINSTALLDIR)/$(PACKAGE_D) + rm -f $(SMANDIR)/$(PACKAGE_D).1 ++ rm -f $(PKGCONFIGDIR)/gkrellmd.pc ++ ++install_gkrellmd.pc: ++ $(INSTALL) -d $(PKGCONFIGDIR) ++ $(INSTALL) -c -m $(INCLUDEMODE) gkrellmd.pc $(PKGCONFIGDIR) + + install_darwin: + $(MAKE) install STRIP= +@@ -162,6 +176,7 @@ + + clean: + rm -f *.o *~ *.bak gkrellmd core ++ rm -f gkrellmd.pc + + SYSDEPS = ../src/sysdeps/bsd-common.c ../src/sysdeps/bsd-net-open.c \ + ../src/sysdeps/freebsd.c ../src/sysdeps/gtop.c \ |