bl3ify, update to 2.0.8 (ChangeLog is short but unhelpful, the author only

states that bugs are fixed).  Untested yet.
This commit is contained in:
Quentin Garnier 2004-02-18 08:48:41 +00:00 committed by Thomas Klausner
parent a691cb012f
commit 1bdb619162
3 changed files with 19 additions and 17 deletions

View file

@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.4 2003/12/31 10:52:15 cubidou Exp $
# $NetBSD: Makefile,v 1.5 2004/02/18 08:48:41 cubidou Exp $
#
DISTNAME= gkrellm-multiping-2.0.6
DISTNAME= gkrellm-multiping-2.0.8
CATEGORIES= net
MASTER_SITES= http://kmlinux.fjfi.cvut.cz/~makovick/gkrellm/
EXTRACT_SUFX= .tgz
@ -10,13 +10,17 @@ MAINTAINER= cube@NetBSD.org
HOMEPAGE= http://kmlinux.fjfi.cvut.cz/~makovick/gkrellm/index.html
COMMENT= Pings several machines and prints out stats
USE_BUILDLINK2= YES
USE_BUILDLINK3= YES
USE_PKGINSTALL= YES
SPECIAL_PERMS+= ${PREFIX}/lib/gkrellm2/plugins/pinger ${SETUID_ROOT_PERMS}
PTHREAD_OPTS= require
MAKE_ENV+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" PTHREAD_LDFLAGS="${PTHREAD_LDFLAGS}"
post-patch:
${SED} -e s,@@PREFIX@@,${PREFIX}, ${WRKSRC}/multiping.c > ${WRKSRC}/multiping.c.sed
${CP} ${WRKSRC}/multiping.c.sed ${WRKSRC}/multiping.c
.include "../../wip/gkrellm2/buildlink2.mk"
.include "../../wip/gkrellm2/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

View file

@ -1,7 +1,7 @@
$NetBSD: distinfo,v 1.3 2003/12/31 10:52:15 cubidou Exp $
$NetBSD: distinfo,v 1.4 2004/02/18 08:48:41 cubidou Exp $
SHA1 (gkrellm-multiping-2.0.6.tgz) = 87be2705c19d857b89ef1e5f0e66b2c1a6ba7b16
Size (gkrellm-multiping-2.0.6.tgz) = 13990 bytes
SHA1 (patch-aa) = 74bf6b951967a92b410fea0437207a22b5dfed93
SHA1 (gkrellm-multiping-2.0.8.tgz) = 88de3cda0e55ba33ed5c0d0c2d0aaa2c56ebf69d
Size (gkrellm-multiping-2.0.8.tgz) = 14377 bytes
SHA1 (patch-aa) = a1628341a804afb21116d7c6f70847e4ed66dcec
SHA1 (patch-ab) = 465567eb777db1d144d23e7fc457fb63db8ff23c
SHA1 (patch-ac) = 4151e6d76665d33293038832c9cba4c4f56b3a56

View file

@ -1,15 +1,13 @@
$NetBSD: patch-aa,v 1.3 2003/12/31 10:52:16 cubidou Exp $
$NetBSD: patch-aa,v 1.4 2004/02/18 08:48:42 cubidou Exp $
--- Makefile.orig 2003-11-09 12:33:31.000000000 +0100
--- Makefile.orig 2004-01-16 08:48:09.000000000 +0100
+++ Makefile
@@ -1,27 +1,28 @@
@@ -1,26 +1,27 @@
-INSTALLDIR = /usr/local/lib/gkrellm2/plugins
+INSTALLDIR = $(PREFIX)/lib/gkrellm2/plugins
VERSION = 2.0.6
VERSION = 2.0.8
PKGNAME = gkrellm-multiping
#OPT = -march=athlon -O2
-OPT=-ggdb
+#OPT=-ggdb
#CC = gcc-3.0
-CC = gcc
+#CC = gcc
@ -18,8 +16,8 @@ $NetBSD: patch-aa,v 1.3 2003/12/31 10:52:16 cubidou Exp $
all: pinger multiping.so
pinger: pinger.c
- $(CC) `pkg-config glib-2.0 --cflags` $(OPT) -lpthread `pkg-config glib-2.0 gthread-2.0 --libs` -Wall -o pinger pinger.c
+ $(CC) $(CFLAGS) `pkg-config glib-2.0 --cflags` $(OPT) -lpthread `pkg-config glib-2.0 gthread-2.0 --libs` -Wall -o pinger pinger.c
- $(CC) `pkg-config glib-2.0 --cflags` $(OPT) -lpthread `pkg-config glib-2.0 --libs` -Wall -o pinger pinger.c
+ $(CC) $(PTHREAD_CFLAGS) $(CFLAGS) `pkg-config glib-2.0 --cflags` $(OPT) $(PTHREAD_DFLAGS) `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
@ -27,7 +25,7 @@ $NetBSD: patch-aa,v 1.3 2003/12/31 10:52:16 cubidou Exp $
multiping.so: multiping.o
- $(CC) -shared -Wl -ggdb `pkg-config gtk+-2.0 --libs`-o multiping.so multiping.o
+ $(CC) $(CFLAGS) -shared -Wl `pkg-config gtk+-2.0 --libs` $(OPT) -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