ports/82200: [PATCH] sysutils/gkrelltop: gkrelltopd enhancements

[Jonathan Noack]

>Number:         82200
>Category:       ports
>Synopsis:       [PATCH] sysutils/gkrelltop: gkrelltopd enhancements
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jun 13 14:20:19 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Jonathan Noack
>Release:        FreeBSD 5.4-RELEASE-p2 i386
>Organization:
>Environment:
System: FreeBSD optimator.noacks.org 5.4-RELEASE-p2 FreeBSD 5.4-RELEASE-p2 #13: Wed Jun  8 22:55:47 CDT
>Description:
This work leverages ports/82197 to support GKRELLM_SERVER_ONLY.  The
gkrelltopd server plugin is installed to PREFIX instead of X11BASE.
This work allows server-only installation by the port.

Added file(s):
- files/server_only-patch-configure
- pkg-plist

Port maintainer (david at pinko.net) is cc'd.

Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:

--- gkrelltop-2.2.6_3.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/sysutils/gkrelltop/Makefile /usr/home/noackjr/port/sysutils/gkrelltop/Makefile
--- Makefile	Mon Jun 13 08:33:06 2005
+++ Makefile	Mon Jun 13 08:58:23 2005
@@ -15,17 +15,28 @@
 MAINTAINER=	david at pinko.net
 COMMENT=	Plugin for gkrellm 2.x shows top three processes, requires procfs
 
+.if defined(GKRELLM_SERVER_ONLY)
+RUN_DEPENDS=	gkrellmd:${PORTSDIR}/sysutils/gkrellm2
+BUILD_DEPENDS=	${LOCALBASE}/include/gkrellm2/gkrellmd.h:${PORTSDIR}/sysutils/gkrellm2
+.else
 RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm2
 BUILD_DEPENDS=	${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
+.endif
 
 USE_GMAKE=	yes
-MAKE_ARGS=	INSTALLDIR=${PREFIX}/libexec/gkrellm2/plugins \
-		INSTALLDIRD=${PREFIX}/libexec/gkrellm2/plugins
-USE_X_PREFIX=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+MAKE_ARGS=	INSTALLDIRD=${PREFIX}/libexec/gkrellm2/plugins-gkrellmd
+
+.if defined(GKRELLM_SERVER_ONLY)
+EXTRA_PATCHES=	${PATCHDIR}/server_only-patch-configure
+ALL_TARGET=	server
+INSTALL_TARGET=	install-server
+PLIST_SUB=	CLIENT="@comment "
+.else
+MAKE_ARGS+=	INSTALLDIR=${X11BASE}/libexec/gkrellm2/plugins
+PLIST_SUB=	CLIENT=""
+.endif
 
-PLIST_FILES=	libexec/gkrellm2/plugins/gkrelltop.so \
-		libexec/gkrellm2/plugins/gkrelltopd.so
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 .include <bsd.port.pre.mk>
 
diff -ruN --exclude=CVS /usr/ports/sysutils/gkrelltop/pkg-plist /usr/home/noackjr/port/sysutils/gkrelltop/pkg-plist
--- pkg-plist	Wed Dec 31 18:00:00 1969
+++ pkg-plist	Mon Jun 13 08:31:49 2005
@@ -0,0 +1,3 @@
+libexec/gkrellm2/plugins-gkrellmd/gkrelltopd.so
+%%CLIENT%%@cwd %%X11BASE%%
+%%CLIENT%%libexec/gkrellm2/plugins/gkrelltop.so
diff -ruN --exclude=CVS /usr/ports/sysutils/gkrelltop/files/patch-Makefile /usr/home/noackjr/port/sysutils/gkrelltop/files/patch-Makefile
--- files/patch-Makefile	Mon Jun 13 08:33:06 2005
+++ files/patch-Makefile	Mon Jun 13 08:31:49 2005
@@ -1,5 +1,5 @@
---- Makefile.orig	Sat Dec 11 12:50:39 2004
-+++ Makefile	Sat Dec 25 23:35:53 2004
+--- Makefile.orig	Fri Dec 10 19:50:39 2004
++++ Makefile	Mon Jun 13 08:29:12 2005
 @@ -28,9 +28,9 @@
  OSFLAG = `uname | tr '[:lower:]' '[:upper:]'`
  SHELL=/bin/sh
@@ -17,12 +17,12 @@
  
  ifeq ($(WANT_GLIB12),yes)
 -CFLAGSD = -I/usr/X11R6/include -D$(OSFLAG) -fPIC -Wall `glib-config --cflags`
-+CFLAGSD = -I${X11BASE}/include -D$(OSFLAG) -fPIC -Wall `glib-config --cflags`
++CFLAGSD = -I${PREFIX}/include -D$(OSFLAG) -fPIC -Wall `glib-config --cflags`
  LIBSD = `glib-config --libs`
  CONFIGURE_ARGS += --with-glib12
  else
 -CFLAGSD = -D$(OSFLAG) -fPIC -Wall `pkg-config glib-2.0 --cflags`
-+CFLAGSD = -D$(OSFLAG) -I${X11BASE}/include -fPIC -Wall `pkg-config glib-2.0 --cflags`
++CFLAGSD = -D$(OSFLAG) -I${PREFIX}/include -fPIC -Wall `pkg-config glib-2.0 --cflags`
  LIBSD = `pkg-config glib-2.0 --libs`
  endif
  INSTALLDIRD=$(HOME)/.gkrellm2/plugins-gkrellmd
diff -ruN --exclude=CVS /usr/ports/sysutils/gkrelltop/files/server_only-patch-configure /usr/home/noackjr/port/sysutils/gkrelltop/files/server_only-patch-configure
--- files/server_only-patch-configure	Wed Dec 31 18:00:00 1969
+++ files/server_only-patch-configure	Mon Jun 13 08:31:49 2005
@@ -0,0 +1,13 @@
+--- configure.orig	Sun May 23 23:36:52 2004
++++ configure	Thu Apr 28 03:50:00 2005
+@@ -17,8 +17,8 @@
+ done
+ 
+ 
+-PKG_INCLUDE=`pkg-config gkrellm --cflags --silence-errors`
+-PKG_LIBS=`pkg-config gkrellm --libs --silence-errors`
++PKG_INCLUDE=`pkg-config gkrellmd --cflags --silence-errors`
++PKG_LIBS=`pkg-config gkrellmd --libs --silence-errors`
+ 
+ if [ "$PKG_INCLUDE" = "" ]
+ then
--- gkrelltop-2.2.6_3.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: