Date: Mon, 25 Jul 2005 17:23:12 +0200 (CEST) From: Tobias Roth <ports@fsck.ch> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/84077: [maintainer-update] net/gkrellmmultiping 2.0.8 -> 2.0.10 Message-ID: <200507251523.j6PFNCLQ084397@secure.socket.ch> Resent-Message-ID: <200507251530.j6PFUEPX067501@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 84077 >Category: ports >Synopsis: [maintainer-update] net/gkrellmmultiping 2.0.8 -> 2.0.10 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Mon Jul 25 15:30:14 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Tobias Roth >Release: FreeBSD 5.4-STABLE i386 >Organization: >Environment: System: FreeBSD localhost 5.4-STABLE FreeBSD 5.4-STABLE #16: Fri May 20 16:42:27 CEST 2005 roth@localhost:/opt/obj/usr/src/sys/FOOBAR i386 >Description: This updates net/gkrellmmultiping from 2.0.8 to 2.0.10 Added files: none Deleted files: files/patch-multiping.c >How-To-Repeat: >Fix: diff -ruN gkrellmmultiping2.orig/Makefile gkrellmmultiping2/Makefile --- gkrellmmultiping2.orig/Makefile Sat May 21 15:26:30 2005 +++ gkrellmmultiping2/Makefile Sat May 21 15:26:41 2005 @@ -3,12 +3,10 @@ # Whom: Jean-Yves Lefort <jylefort@brutele.be> # # $FreeBSD: ports/net/gkrellmmultiping2/Makefile,v 1.7 2005/03/12 10:52:21 marcus Exp $ -# $Id: Makefile,v 1.1.1.1 2002/11/24 23:19:28 jylefort Exp $ # PORTNAME= gkrellmmultiping -PORTVERSION= 2.0.8 -PORTREVISION= 1 +PORTVERSION= 2.0.10 CATEGORIES= net MASTER_SITES= http://kmlinux.fjfi.cvut.cz/~makovick/gkrellm/ \ http://depot.fsck.ch/mirror/distfiles/ @@ -22,7 +20,6 @@ RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2 USE_X_PREFIX= yes -USE_REINPLACE= yes PLIST_FILES= libexec/gkrellm2/plugins/multiping.so libexec/gkrellm2/plugins/pinger MAKE_ENV+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ @@ -32,11 +29,4 @@ INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ INSTALL_DATA="${INSTALL_DATA}" -.include <bsd.port.pre.mk> - -post-patch: - ${REINPLACE_CMD} -e \ - "s,@COMMAND@,${PREFIX}/libexec/gkrellm2/plugins/pinger," \ - ${WRKSRC}/multiping.c - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff -ruN gkrellmmultiping2.orig/distinfo gkrellmmultiping2/distinfo --- gkrellmmultiping2.orig/distinfo Sat May 21 15:26:30 2005 +++ gkrellmmultiping2/distinfo Sat May 21 15:27:11 2005 @@ -1,2 +1,2 @@ -MD5 (gkrellm-multiping-2.0.8.tgz) = ec70ac9e13b1ed041813868a70045941 -SIZE (gkrellm-multiping-2.0.8.tgz) = 14377 +MD5 (gkrellm-multiping-2.0.10.tgz) = e6f83bc7d91c04792ff967ae56381c75 +SIZE (gkrellm-multiping-2.0.10.tgz) = 15038 diff -ruN gkrellmmultiping2.orig/files/patch-Makefile gkrellmmultiping2/files/patch-Makefile --- gkrellmmultiping2.orig/files/patch-Makefile Sat May 21 15:26:30 2005 +++ gkrellmmultiping2/files/patch-Makefile Sat May 21 15:26:41 2005 @@ -1,12 +1,10 @@ ---- Makefile.orig Sat Jan 8 13:41:09 2005 -+++ Makefile Sat Jan 8 13:55:03 2005 -@@ -1,29 +1,29 @@ +--- Makefile.orig Sat May 21 12:47:07 2005 ++++ Makefile Sat May 21 12:50:56 2005 +@@ -1,28 +1,28 @@ -INSTALLDIR = /usr/local/lib/gkrellm2/plugins +INSTALLDIR = ${PREFIX}/libexec/gkrellm2/plugins - VERSION = 2.0.8 + VERSION = 2.0.10 PKGNAME = gkrellm-multiping - #OPT = -march=athlon -O2 - #CC = gcc-3.0 -CC = gcc +CC ?= gcc @@ -17,14 +15,15 @@ + $(CC) `pkg-config glib-2.0 --cflags` $(OPT) ${PTHREAD_CFLAGS} ${PTHREAD_LIBS} `pkg-config glib-2.0 --libs` -Wall -o pinger pinger.c multiping.o: multiping.c decal_multiping_status.xpm - $(CC) -Wall -fPIC -Wall `pkg-config gtk+-2.0 --cflags` $(OPT) -DVERSION=\"$(VERSION)\" -c multiping.c + $(CC) -Wall -fPIC -Wall `pkg-config gtk+-2.0 --cflags` $(OPT) \ + -DINSTALLDIR=\"$(INSTALLDIR)\" -DVERSION=\"$(VERSION)\" -c multiping.c multiping.so: multiping.o - $(CC) -shared -Wl -ggdb `pkg-config gtk+-2.0 --libs`-o multiping.so multiping.o + $(CC) -shared -Wl `pkg-config gtk+-2.0 --libs`-o multiping.so multiping.o clean: - rm -f *.o *.so core + rm -f *.o *.so pinger core install: pinger multiping.so - install -d $(INSTALLDIR) diff -ruN gkrellmmultiping2.orig/files/patch-multiping.c gkrellmmultiping2/files/patch-multiping.c --- gkrellmmultiping2.orig/files/patch-multiping.c Sat May 21 15:26:30 2005 +++ gkrellmmultiping2/files/patch-multiping.c Thu Jan 1 01:00:00 1970 @@ -1,19 +0,0 @@ ---- multiping.c.orig Mon Sep 1 06:40:12 2003 -+++ multiping.c Mon Sep 8 00:19:31 2003 -@@ -21,6 +21,7 @@ - - #include <stdio.h> - #include <string.h> -+#include <signal.h> - #include <gkrellm2/gkrellm.h> - #include <sys/types.h> - #include <sys/wait.h> -@@ -30,7 +31,7 @@ - #define CONFIG_NAME "Multiping" - #define STYLE_NAME "multiping" - --#define COMMAND "/usr/local/lib/gkrellm2/plugins/pinger" -+#define COMMAND "@COMMAND@" - - static GkrellmMonitor *monitor; - static GkrellmPanel *panel; >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200507251523.j6PFNCLQ084397>