- Update to 2.0.10

PR:		ports/84077
Submitted by:	Tobias Roth <ports@fsck.ch> (maintainer)
Approved by:	flz (mentor)

4 files changed, 14 insertions, 43 deletions

diff --git a/net/gkrellmmultiping2/Makefile b/net/gkrellmmultiping2/Makefile
index 58d6e3de20f..7ed3ded9649 100644
--- a/net/gkrellmmultiping2/Makefile
+++ b/net/gkrellmmultiping2/Makefile
@@ -3,12 +3,10 @@
 # Whom:			Jean-Yves Lefort <jylefort@brutele.be>
 #
 # $FreeBSD$
-# $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 @@ BUILD_DEPENDS=	${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrell
 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 @@ MAKE_ENV+=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		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 --git a/net/gkrellmmultiping2/distinfo b/net/gkrellmmultiping2/distinfo
index 4915f6b8ec8..6a8c6b0d34b 100644
--- a/net/gkrellmmultiping2/distinfo
+++ b/net/gkrellmmultiping2/distinfo
@@ -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 --git a/net/gkrellmmultiping2/files/patch-Makefile b/net/gkrellmmultiping2/files/patch-Makefile
index f441049d48b..2f6adcfba81 100644
--- a/net/gkrellmmultiping2/files/patch-Makefile
+++ b/net/gkrellmmultiping2/files/patch-Makefile
@@ -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	Fri Mar 25 12:34:41 2005
++++ Makefile	Tue Jul 26 08:25:26 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
  
@@ -14,17 +12,19 @@
  
  pinger: pinger.c
 -	$(CC) `pkg-config glib-2.0 --cflags` $(OPT) -lpthread `pkg-config glib-2.0 --libs` -Wall -o pinger pinger.c
-+	$(CC) `pkg-config glib-2.0 --cflags` $(OPT) ${PTHREAD_CFLAGS} ${PTHREAD_LIBS} `pkg-config glib-2.0 --libs` -Wall -o pinger pinger.c
++	$(CC) $(CFLAGS) `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) \
++	$(CC) $(CFLAGS) -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
++	$(CC) $(CFLAGS) -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 --git a/net/gkrellmmultiping2/files/patch-multiping.c b/net/gkrellmmultiping2/files/patch-multiping.c
deleted file mode 100644
index fb74b776987..00000000000
--- a/net/gkrellmmultiping2/files/patch-multiping.c
+++ /dev/null
@@ -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;