Date: Thu, 31 Oct 2013 19:40:12 GMT From: KATO Tsuguru <tkato432@yahoo.com> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/181059: sysutils/gkrelltop: Update to version 2.2.13 Message-ID: <201310311940.r9VJeCXC065498@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/181059; it has been noted by GNATS.
From: KATO Tsuguru <tkato432@yahoo.com>
To: bug-followup@FreeBSD.org
Cc:
Subject: Re: ports/181059: sysutils/gkrelltop: Update to version 2.2.13
Date: Fri, 1 Nov 2013 04:25:50 +0900
This is a multi-part message in MIME format.
--Multipart=_Fri__1_Nov_2013_04_25_50_+0900_P_2s0T7fRvTXYFRn
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Remake of the patch against current tree.
--Multipart=_Fri__1_Nov_2013_04_25_50_+0900_P_2s0T7fRvTXYFRn
Content-Type: text/x-diff;
name="sysutils_gkrelltop.diff"
Content-Disposition: attachment;
filename="sysutils_gkrelltop.diff"
Content-Transfer-Encoding: 7bit
diff -urN /usr/ports/sysutils/gkrelltop/Makefile sysutils/gkrelltop/Makefile
--- /usr/ports/sysutils/gkrelltop/Makefile 2013-09-22 04:15:57.000000000 +0900
+++ sysutils/gkrelltop/Makefile 2013-11-01 00:00:00.000000000 +0900
@@ -2,7 +2,7 @@
# $FreeBSD: head/sysutils/gkrelltop/Makefile 327772 2013-09-20 23:05:58Z bapt $
PORTNAME= gkrelltop
-PORTVERSION= 2.2.10
+PORTVERSION= 2.2.13
CATEGORIES= sysutils
MASTER_SITES= SF
DISTNAME= ${PORTNAME}_${PORTVERSION}.orig
@@ -10,30 +10,37 @@
MAINTAINER= ports@FreeBSD.org
COMMENT= Plugin for gkrellm 2.x shows top three processes, requires procfs
-RUN_DEPENDS= gkrellmd:${PORTSDIR}/sysutils/gkrellm2
-BUILD_DEPENDS:= ${RUN_DEPENDS}
+LICENSE= GPLv2
+
+BUILD_DEPENDS= gkrellmd:${PORTSDIR}/sysutils/gkrellm2
+RUN_DEPENDS:= ${BUILD_DEPENDS}
+
+WRKSRC= ${WRKDIR}/${DISTNAME:S/_/-/}
USES= gmake pkgconfig
-MAKE_ARGS= INSTALLDIR=${LOCALBASE}/libexec/gkrellm2/plugins \
+MAKE_ARGS= CC="${CC} ${CFLAGS} $$(pkg-config gtk+-2.0 --cflags)" \
+ CCD="${CC} ${CFLAGS} $$(pkg-config glib-2.0 --cflags)" \
+ INSTALLDIR=${PREFIX}/libexec/gkrellm2/plugins \
INSTALLDIRD=${PREFIX}/libexec/gkrellm2/plugins-gkrellmd
+CFLAGS+= -fPIC -DFREEBSD -DGKRELLM2
+
+PLIST_FILES= libexec/gkrellm2/plugins-gkrellmd/gkrelltopd.so
+
.if defined(GKRELLM_SERVER_ONLY)
ALL_TARGET= server
-INSTALL_TARGET= install-server
-PLIST_SUB+= CLIENT="@comment "
.else
-PLIST_SUB+= CLIENT=""
+PLIST_FILES+= libexec/gkrellm2/plugins/gkrelltop.so
.endif
-WRKSRC= ${WRKDIR}/${DISTNAME:S/_/-/}
-
-NO_STAGE= yes
-post-patch:
-.if defined(GKRELLM_SERVER_ONLY)
- ${REINPLACE_CMD} 's/^\(PKG.*\)gkrellm/\1gkrellmd/' ${WRKSRC}/configure
+do-install:
+ @${MKDIR} ${STAGEDIR}${PREFIX}/libexec/gkrellm2/plugins-gkrellmd
+ (cd ${WRKSRC} && ${INSTALL_DATA} gkrelltopd.so \
+ ${STAGEDIR}${PREFIX}/libexec/gkrellm2/plugins-gkrellmd)
+.if !defined(GKRELLM_SERVER_ONLY)
+ @${MKDIR} ${STAGEDIR}${PREFIX}/libexec/gkrellm2/plugins
+ (cd ${WRKSRC} && ${INSTALL_DATA} gkrelltop.so \
+ ${STAGEDIR}${PREFIX}/libexec/gkrellm2/plugins)
.endif
-post-install:
- @${CAT} ${PKGMESSAGE}
-
.include <bsd.port.mk>
diff -urN /usr/ports/sysutils/gkrelltop/distinfo sysutils/gkrelltop/distinfo
--- /usr/ports/sysutils/gkrelltop/distinfo 2013-07-23 04:32:27.000000000 +0900
+++ sysutils/gkrelltop/distinfo 2013-11-01 00:00:00.000000000 +0900
@@ -1,2 +1,2 @@
-SHA256 (gkrelltop_2.2.10.orig.tar.gz) = 7975dcd2b242639948ad69d07b347037dd6074b37eead80aaf544aa48ec45c6c
-SIZE (gkrelltop_2.2.10.orig.tar.gz) = 46018
+SHA256 (gkrelltop_2.2.13.orig.tar.gz) = b2585c4186cc3805fcde73645a71d8eb3f798358caeb31cf3f598795e6ea42e6
+SIZE (gkrelltop_2.2.13.orig.tar.gz) = 49023
diff -urN /usr/ports/sysutils/gkrelltop/files/patch-Makefile sysutils/gkrelltop/files/patch-Makefile
--- /usr/ports/sysutils/gkrelltop/files/patch-Makefile 2013-07-23 04:32:27.000000000 +0900
+++ sysutils/gkrelltop/files/patch-Makefile 1970-01-01 09:00:00.000000000 +0900
@@ -1,28 +0,0 @@
---- Makefile.orig 2007-07-21 04:52:00.000000000 +0000
-+++ Makefile
-@@ -28,9 +28,9 @@
- OSFLAG = $(shell 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 bash -c 'pkg-config gtk+-2.0 --cflags &>/dev/null && echo 0')
- GKRELLTOP = gkrelltop.so
- OBJ = top_three.o gkrelltop.o
- EXTRA = krell_panel1.xpm
-@@ -65,11 +65,11 @@ WANT_GLIB12 = yes
- endif
-
- ifeq ($(WANT_GLIB12),yes)
--CFLAGSD = -I/usr/X11R6/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${PREFIX}/include -fPIC -Wall `pkg-config glib-2.0 --cflags`
- LIBSD = `pkg-config glib-2.0 --libs`
- endif
- INSTALLDIRD ?= $(PREFIXD)/$(DESTDIR)
diff -urN /usr/ports/sysutils/gkrelltop/files/patch-gkrelltop.c sysutils/gkrelltop/files/patch-gkrelltop.c
--- /usr/ports/sysutils/gkrelltop/files/patch-gkrelltop.c 1970-01-01 09:00:00.000000000 +0900
+++ sysutils/gkrelltop/files/patch-gkrelltop.c 2013-11-01 00:00:00.000000000 +0900
@@ -0,0 +1,18 @@
+--- gkrelltop.c.orig
++++ gkrelltop.c
+@@ -354,6 +354,7 @@
+ if(pluginMode == cpu)
+ snprintf(tmp,sizeof(tmp), "%d: %4.1f%c %6.2d %.30s%c",
+ i+1, best[i]->amount, '%', best[i]->pid, best[i]->name, ch);
++#if defined(LINUX)
+ else if(pluginMode == mem)
+ snprintf(tmp,sizeof(tmp), "%d: %4.1f%c %6.2dMB %6.2d %.30s%c",
+ i+1, best[i]->amount, '%', best[i]->rss/MEG,
+@@ -365,6 +366,7 @@
+ (float)(best[i]->io_read - best[i]->previous_io_read)/KIL,
+ (float)(best[i]->io_write - best[i]->previous_io_write)/KIL,
+ best[i]->pid, best[i]->name, ch);
++#endif
+
+ strncat(g_tooltip_text,tmp,sizeof(g_tooltip_text)-strlen(g_tooltip_text));
+ }
diff -urN /usr/ports/sysutils/gkrelltop/pkg-descr sysutils/gkrelltop/pkg-descr
--- /usr/ports/sysutils/gkrelltop/pkg-descr 2013-06-21 03:42:27.000000000 +0900
+++ sysutils/gkrelltop/pkg-descr 2013-11-01 00:00:00.000000000 +0900
@@ -2,5 +2,5 @@
Plugin that displays top three processes. Requires /proc to be mounted.
-Author: Adi Zaimi <zaimi@pegasus.rutgers.edu>
-WWW: http://psychology.rutgers.edu/~zaimi/software.html
+Author: Adi Zaimi <adizaimi-at-users.sourceforge.net>
+WWW: http://sourceforge.net/projects/gkrelltop/
diff -urN /usr/ports/sysutils/gkrelltop/pkg-plist sysutils/gkrelltop/pkg-plist
--- /usr/ports/sysutils/gkrelltop/pkg-plist 2013-06-21 03:42:27.000000000 +0900
+++ sysutils/gkrelltop/pkg-plist 1970-01-01 09:00:00.000000000 +0900
@@ -1,2 +0,0 @@
-libexec/gkrellm2/plugins-gkrellmd/gkrelltopd.so
-%%CLIENT%%libexec/gkrellm2/plugins/gkrelltop.so
--Multipart=_Fri__1_Nov_2013_04_25_50_+0900_P_2s0T7fRvTXYFRn--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310311940.r9VJeCXC065498>