View | Details | Raw Unified | Return to bug 91513
Collapse All | Expand All

(-)Makefile (-3 / +3 lines)
Lines 6-14 Link Here
6
#
6
#
7
7
8
PORTNAME=	gkrellmmultiping
8
PORTNAME=	gkrellmmultiping
9
PORTVERSION=	2.0.10
9
PORTVERSION=	2.0.11
10
PORTREVISION=	1
10
CATEGORIES=	net-mgmt
11
CATEGORIES=	net
12
MASTER_SITES=	http://kmlinux.fjfi.cvut.cz/~makovick/gkrellm/ \
11
MASTER_SITES=	http://kmlinux.fjfi.cvut.cz/~makovick/gkrellm/ \
13
		http://depot.fsck.ch/mirror/distfiles/
12
		http://depot.fsck.ch/mirror/distfiles/
14
DISTNAME=	gkrellm-multiping-${PORTVERSION}
13
DISTNAME=	gkrellm-multiping-${PORTVERSION}
Lines 21-26 Link Here
21
RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm2
20
RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm2
22
21
23
USE_X_PREFIX=	yes
22
USE_X_PREFIX=	yes
23
USE_GMAKE=	yes
24
PLIST_FILES=	libexec/gkrellm2/plugins/multiping.so libexec/gkrellm2/plugins/pinger
24
PLIST_FILES=	libexec/gkrellm2/plugins/multiping.so libexec/gkrellm2/plugins/pinger
25
25
26
MAKE_ENV+=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
26
MAKE_ENV+=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
(-)distinfo (-2 / +3 lines)
Lines 1-2 Link Here
1
MD5 (gkrellm-multiping-2.0.10.tgz) = e6f83bc7d91c04792ff967ae56381c75
1
MD5 (gkrellm-multiping-2.0.11.tgz) = e9c31f1a829d8c16c43eb921c430ab77
2
SIZE (gkrellm-multiping-2.0.10.tgz) = 15038
2
SHA256 (gkrellm-multiping-2.0.11.tgz) = 5dd57a4b65397b6aa3d4b56a3ad384be7f5329f12baec9f9d6e0413dee52e581
3
SIZE (gkrellm-multiping-2.0.11.tgz) = 16427
(-)pkg-descr (+1 lines)
Lines 1-4 Link Here
1
This plugin pings several machines and shows the current
1
This plugin pings several machines and shows the current
2
round-trip and status.
2
round-trip and status.
3
3
4
Author: Jindrich Makovicka
4
WWW: http://kmlinux.fjfi.cvut.cz/~makovick/gkrellm/
5
WWW: http://kmlinux.fjfi.cvut.cz/~makovick/gkrellm/
(-)files/patch-Makefile (-16 / +29 lines)
Lines 1-13 Link Here
1
--- Makefile.orig	Fri Mar 25 12:34:41 2005
1
--- Makefile.orig	Sat Dec 17 15:46:48 2005
2
+++ Makefile	Tue Jul 26 08:25:26 2005
2
+++ Makefile	Sat Jan  7 00:53:35 2006
3
@@ -1,28 +1,28 @@
3
@@ -1,15 +1,11 @@
4
-INSTALLDIR = /usr/local/lib/gkrellm2/plugins
4
 ifeq ($(INSTALLROOT),)
5
+INSTALLDIR = ${PREFIX}/libexec/gkrellm2/plugins
5
 INSTALLROOT = /usr/local
6
 VERSION = 2.0.10
6
 endif
7
-ifeq ($(PLUGINDIR),)
8
-PLUGINDIR=$(INSTALLROOT)/lib/gkrellm2/plugins
9
-endif
10
-ifeq ($(HELPERDIR),)
11
-HELPERDIR=$(INSTALLROOT)/lib/gkrellm2/exec
12
-endif
13
+PLUGINDIR=${PREFIX}/libexec/gkrellm2/plugins
14
+HELPERDIR=$(PLUGINDIR)
15
 VERSION = 2.0.11
7
 PKGNAME = gkrellm-multiping
16
 PKGNAME = gkrellm-multiping
8
-CC = gcc
17
-CC = gcc
9
+CC ?= gcc
18
+CC ?= gcc
10
 
19
 
20
 DISTFILES = \
21
 	AUTHORS Makefile multiping.c pinger.c decal_multiping_status.xpm \
22
@@ -22,24 +18,23 @@
11
 all: pinger multiping.so
23
 all: pinger multiping.so
12
 
24
 
13
 pinger: pinger.c
25
 pinger: pinger.c
Lines 16-23 Link Here
16
 
28
 
17
 multiping.o: multiping.c decal_multiping_status.xpm
29
 multiping.o: multiping.c decal_multiping_status.xpm
18
-	$(CC) -Wall -fPIC -Wall `pkg-config gtk+-2.0 --cflags` $(OPT) \
30
-	$(CC) -Wall -fPIC -Wall `pkg-config gtk+-2.0 --cflags` $(OPT) \
19
+	$(CC) $(CFLAGS) -Wall -fPIC -Wall `pkg-config gtk+-2.0 --cflags` $(OPT) \
31
+	$(CC) $(CFLAGS) -fPIC -Wall `pkg-config gtk+-2.0 --cflags` $(OPT) \
20
 	-DINSTALLDIR=\"$(INSTALLDIR)\" -DVERSION=\"$(VERSION)\" -c multiping.c
32
 	-DHELPERDIR=\"$(HELPERDIR)\" -DVERSION=\"$(VERSION)\" -c multiping.c
21
 
33
 
22
 multiping.so: multiping.o
34
 multiping.so: multiping.o
23
-	$(CC) -shared -Wl -ggdb `pkg-config gtk+-2.0 --libs`-o multiping.so multiping.o
35
-	$(CC) -shared -Wl -ggdb `pkg-config gtk+-2.0 --libs`-o multiping.so multiping.o
Lines 27-40 Link Here
27
 	rm -f *.o *.so pinger core
39
 	rm -f *.o *.so pinger core
28
 
40
 
29
 install: pinger multiping.so
41
 install: pinger multiping.so
30
-	install -d $(INSTALLDIR)
42
-	install -d $(PLUGINDIR)
31
-	install -c -s -m 644 multiping.so $(INSTALLDIR)
43
-	install -d $(HELPERDIR)
32
-	install -c -s -m 4755 pinger $(INSTALLDIR)
44
-	install -c -s -m 644 multiping.so $(PLUGINDIR)
45
-	install -c -s -m 4755 pinger $(HELPERDIR)
33
-	echo "pinger helper is installed suid root"
46
-	echo "pinger helper is installed suid root"
34
+	${MKDIR} ${INSTALLDIR}
47
+	${MKDIR} ${PLUGINDIR}
35
+	${INSTALL_DATA} multiping.so ${INSTALLDIR}
48
+	${INSTALL_DATA} multiping.so ${PLUGINDIR}
36
+	${INSTALL_PROGRAM} pinger ${INSTALLDIR}
49
+	${INSTALL_PROGRAM} pinger ${PLUGINDIR}
37
+	${CHMOD} 4755 ${INSTALLDIR}/pinger
50
+	${CHMOD} 4755 ${PLUGINDIR}/pinger
38
 
51
 
39
 dist:
52
 dist:
40
 	rm -rf $(PKGNAME)-$(VERSION)
53
 	rm -rf $(DISTDIR)

Return to bug 91513