diff options
| -rw-r--r-- | net/gkrellmmultiping2/Makefile | 6 | ||||
| -rw-r--r-- | net/gkrellmmultiping2/distinfo | 5 | ||||
| -rw-r--r-- | net/gkrellmmultiping2/files/patch-Makefile | 45 | ||||
| -rw-r--r-- | net/gkrellmmultiping2/pkg-descr | 1 |
4 files changed, 36 insertions, 21 deletions
diff --git a/net/gkrellmmultiping2/Makefile b/net/gkrellmmultiping2/Makefile index 641d1a3e88b3..55c2fe5e92d7 100644 --- a/net/gkrellmmultiping2/Makefile +++ b/net/gkrellmmultiping2/Makefile @@ -6,9 +6,8 @@ # PORTNAME= gkrellmmultiping -PORTVERSION= 2.0.10 -PORTREVISION= 1 -CATEGORIES= net +PORTVERSION= 2.0.11 +CATEGORIES= net-mgmt MASTER_SITES= http://kmlinux.fjfi.cvut.cz/~makovick/gkrellm/ \ http://depot.fsck.ch/mirror/distfiles/ DISTNAME= gkrellm-multiping-${PORTVERSION} @@ -21,6 +20,7 @@ BUILD_DEPENDS= ${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrell RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2 USE_X_PREFIX= yes +USE_GMAKE= yes PLIST_FILES= libexec/gkrellm2/plugins/multiping.so libexec/gkrellm2/plugins/pinger MAKE_ENV+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ diff --git a/net/gkrellmmultiping2/distinfo b/net/gkrellmmultiping2/distinfo index 6a8c6b0d34be..c9ee88f162b6 100644 --- a/net/gkrellmmultiping2/distinfo +++ b/net/gkrellmmultiping2/distinfo @@ -1,2 +1,3 @@ -MD5 (gkrellm-multiping-2.0.10.tgz) = e6f83bc7d91c04792ff967ae56381c75 -SIZE (gkrellm-multiping-2.0.10.tgz) = 15038 +MD5 (gkrellm-multiping-2.0.11.tgz) = e9c31f1a829d8c16c43eb921c430ab77 +SHA256 (gkrellm-multiping-2.0.11.tgz) = 5dd57a4b65397b6aa3d4b56a3ad384be7f5329f12baec9f9d6e0413dee52e581 +SIZE (gkrellm-multiping-2.0.11.tgz) = 16427 diff --git a/net/gkrellmmultiping2/files/patch-Makefile b/net/gkrellmmultiping2/files/patch-Makefile index 2f6adcfba813..32aa8c842a84 100644 --- a/net/gkrellmmultiping2/files/patch-Makefile +++ b/net/gkrellmmultiping2/files/patch-Makefile @@ -1,13 +1,25 @@ ---- 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.10 +--- Makefile.orig Sat Dec 17 15:46:48 2005 ++++ Makefile Sat Jan 7 00:53:35 2006 +@@ -1,15 +1,11 @@ + ifeq ($(INSTALLROOT),) + INSTALLROOT = /usr/local + endif +-ifeq ($(PLUGINDIR),) +-PLUGINDIR=$(INSTALLROOT)/lib/gkrellm2/plugins +-endif +-ifeq ($(HELPERDIR),) +-HELPERDIR=$(INSTALLROOT)/lib/gkrellm2/exec +-endif ++PLUGINDIR=${PREFIX}/libexec/gkrellm2/plugins ++HELPERDIR=$(PLUGINDIR) + VERSION = 2.0.11 PKGNAME = gkrellm-multiping -CC = gcc +CC ?= gcc + DISTFILES = \ + AUTHORS Makefile multiping.c pinger.c decal_multiping_status.xpm \ +@@ -22,24 +18,23 @@ all: pinger multiping.so pinger: pinger.c @@ -16,8 +28,8 @@ multiping.o: multiping.c decal_multiping_status.xpm - $(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 ++ $(CC) $(CFLAGS) -fPIC -Wall `pkg-config gtk+-2.0 --cflags` $(OPT) \ + -DHELPERDIR=\"$(HELPERDIR)\" -DVERSION=\"$(VERSION)\" -c multiping.c multiping.so: multiping.o - $(CC) -shared -Wl -ggdb `pkg-config gtk+-2.0 --libs`-o multiping.so multiping.o @@ -27,14 +39,15 @@ rm -f *.o *.so pinger core install: pinger multiping.so -- install -d $(INSTALLDIR) -- install -c -s -m 644 multiping.so $(INSTALLDIR) -- install -c -s -m 4755 pinger $(INSTALLDIR) +- install -d $(PLUGINDIR) +- install -d $(HELPERDIR) +- install -c -s -m 644 multiping.so $(PLUGINDIR) +- install -c -s -m 4755 pinger $(HELPERDIR) - echo "pinger helper is installed suid root" -+ ${MKDIR} ${INSTALLDIR} -+ ${INSTALL_DATA} multiping.so ${INSTALLDIR} -+ ${INSTALL_PROGRAM} pinger ${INSTALLDIR} -+ ${CHMOD} 4755 ${INSTALLDIR}/pinger ++ ${MKDIR} ${PLUGINDIR} ++ ${INSTALL_DATA} multiping.so ${PLUGINDIR} ++ ${INSTALL_PROGRAM} pinger ${PLUGINDIR} ++ ${CHMOD} 4755 ${PLUGINDIR}/pinger dist: - rm -rf $(PKGNAME)-$(VERSION) + rm -rf $(DISTDIR) diff --git a/net/gkrellmmultiping2/pkg-descr b/net/gkrellmmultiping2/pkg-descr index 23d24f5a2b2f..21fccbb20cb9 100644 --- a/net/gkrellmmultiping2/pkg-descr +++ b/net/gkrellmmultiping2/pkg-descr @@ -1,4 +1,5 @@ This plugin pings several machines and shows the current round-trip and status. +Author: Jindrich Makovicka WWW: http://kmlinux.fjfi.cvut.cz/~makovick/gkrellm/ |