Index: head/sysutils/gkrelltop/Makefile
===================================================================
--- head/sysutils/gkrelltop/Makefile	(revision 148114)
+++ head/sysutils/gkrelltop/Makefile	(revision 148115)
@@ -1,33 +1,44 @@
 # New ports collection makefile for:	gkrelltop
 # Date created:				12 April 2004
 # Whom:					David Gardner
 #
 # $FreeBSD$
 #
 
 PORTNAME=	gkrelltop
 PORTVERSION=	2.2.6
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	sysutils
 MASTER_SITES=	http://psychology.rutgers.edu/~zaimi/html/gkrelltop/
 DISTNAME=	${PORTNAME}_2.2-6
 
 MAINTAINER=	david@pinko.net
 COMMENT=	Plugin for gkrellm 2.x shows top three processes, requires procfs
 
-RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm2
-BUILD_DEPENDS=	${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
+RUN_DEPENDS=	gkrellmd:${PORTSDIR}/sysutils/gkrellm2
+BUILD_DEPENDS=	${RUN_DEPENDS}
 
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
-MAKE_ARGS=	INSTALLDIR=${PREFIX}/libexec/gkrellm2/plugins \
-		INSTALLDIRD=${PREFIX}/libexec/gkrellm2/plugins
-USE_X_PREFIX=	yes
+MAKE_ARGS=	INSTALLDIR=${X11BASE}/libexec/gkrellm2/plugins \
+		INSTALLDIRD=${PREFIX}/libexec/gkrellm2/plugins-gkrellmd
+
+.if defined(GKRELLM_SERVER_ONLY)
+ALL_TARGET=	server
+INSTALL_TARGET=	install-server
+PLIST_SUB+=	CLIENT="@comment "
+.else
+PLIST_SUB+=	CLIENT=""
+.endif
+
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-PLIST_FILES=	libexec/gkrellm2/plugins/gkrelltop.so \
-		libexec/gkrellm2/plugins/gkrelltopd.so
+post-patch:
+.if defined(GKRELLM_SERVER_ONLY)
+	${REINPLACE_CMD} 's/^\(PKG.*\)gkrellm/\1gkrellmd/' ${WRKSRC}/configure
+.endif
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>

Property changes on: head/sysutils/gkrelltop/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.11
\ No newline at end of property
+1.12
\ No newline at end of property
Index: head/sysutils/gkrelltop/files/patch-Makefile
===================================================================
--- head/sysutils/gkrelltop/files/patch-Makefile	(revision 148114)
+++ head/sysutils/gkrelltop/files/patch-Makefile	(revision 148115)
@@ -1,28 +1,28 @@
---- 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
  
 -GKRELL1FLAG=1
 +GKRELL1FLAG=0
  #find out if we have gkrellm 2 or 1 (from the gtk+ version)
 -GKRELL1FLAG=$(shell bash -c 'pkg-config gtk+-2.0 --cflags &>/dev/null && echo 0')
 +#GKRELL1FLAG=$(shell sh -c 'pkg-config gtk+-2.0 --cflags &>/dev/null && echo 0')
  GKRELLTOP= gkrelltop.so
  OBJ = top_three.o gkrelltop.o 
  EXTRA = krell_panel1.xpm
 @@ -61,11 +61,11 @@
  endif
  
  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

Property changes on: head/sysutils/gkrelltop/files/patch-Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property
Index: head/sysutils/gkrelltop/pkg-plist
===================================================================
--- head/sysutils/gkrelltop/pkg-plist	(nonexistent)
+++ head/sysutils/gkrelltop/pkg-plist	(revision 148115)
@@ -0,0 +1,3 @@
+libexec/gkrellm2/plugins-gkrellmd/gkrelltopd.so
+%%CLIENT%%@cwd %%X11BASE%%
+%%CLIENT%%libexec/gkrellm2/plugins/gkrelltop.so

Property changes on: head/sysutils/gkrelltop/pkg-plist
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property