diff options
| author | jlam <jlam@pkgsrc.org> | 2004-11-12 06:39:19 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-11-12 06:39:19 +0000 |
| commit | af591191d2b91375c67ab57df64d383e66055294 (patch) | |
| tree | ddbacf3026d39d6b23e622ac51745a4f7db32d44 /net/gkrellm-multiping | |
| parent | 675d464c92282081571087f8ad824d1cae9d8414 (diff) | |
| download | pkgsrc-af591191d2b91375c67ab57df64d383e66055294.tar.gz | |
Remove redundant uses of PTHREAD_{CFLAGS,LDFLAGS} now that they're added
automatically by pthread.buildlink3.mk. Also, factor out the pthread
library out of PTHREAD_LDFLAGS into a standalone variable PTHREAD_LIBS
and use it in packages where necessary (usually the ones that don't
have a GNU configure script).
Diffstat (limited to 'net/gkrellm-multiping')
| -rw-r--r-- | net/gkrellm-multiping/Makefile | 4 | ||||
| -rw-r--r-- | net/gkrellm-multiping/distinfo | 4 | ||||
| -rw-r--r-- | net/gkrellm-multiping/patches/patch-aa | 6 |
3 files changed, 6 insertions, 8 deletions
diff --git a/net/gkrellm-multiping/Makefile b/net/gkrellm-multiping/Makefile index 92a70dfaec6..26e1deb470f 100644 --- a/net/gkrellm-multiping/Makefile +++ b/net/gkrellm-multiping/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2004/10/03 00:17:52 tv Exp $ +# $NetBSD: Makefile,v 1.5 2004/11/12 06:39:20 jlam Exp $ # DISTNAME= gkrellm-multiping-2.0.8 @@ -16,8 +16,6 @@ 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 diff --git a/net/gkrellm-multiping/distinfo b/net/gkrellm-multiping/distinfo index 0bc29a26803..9cb1e60e109 100644 --- a/net/gkrellm-multiping/distinfo +++ b/net/gkrellm-multiping/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.1.1.1 2004/02/24 23:41:55 cube Exp $ +$NetBSD: distinfo,v 1.2 2004/11/12 06:39:20 jlam Exp $ SHA1 (gkrellm-multiping-2.0.8.tgz) = 88de3cda0e55ba33ed5c0d0c2d0aaa2c56ebf69d Size (gkrellm-multiping-2.0.8.tgz) = 14377 bytes -SHA1 (patch-aa) = a1628341a804afb21116d7c6f70847e4ed66dcec +SHA1 (patch-aa) = a4da915eccae50d254deb8c67d1c398df6189662 SHA1 (patch-ab) = 465567eb777db1d144d23e7fc457fb63db8ff23c SHA1 (patch-ac) = 4151e6d76665d33293038832c9cba4c4f56b3a56 diff --git a/net/gkrellm-multiping/patches/patch-aa b/net/gkrellm-multiping/patches/patch-aa index 5c88db0199b..781a4458e04 100644 --- a/net/gkrellm-multiping/patches/patch-aa +++ b/net/gkrellm-multiping/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.1.1.1 2004/02/24 23:41:56 cube Exp $ +$NetBSD: patch-aa,v 1.2 2004/11/12 06:39:20 jlam Exp $ --- Makefile.orig 2004-01-16 08:48:09.000000000 +0100 +++ Makefile @@ -17,7 +17,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/02/24 23:41:56 cube Exp $ 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 ++ $(CC) $(CFLAGS) `pkg-config glib-2.0 --cflags` $(OPT) $(LDFLAGS) `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 @@ -25,7 +25,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/02/24 23:41:56 cube 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`-o multiping.so multiping.o ++ $(CC) $(LDFLAGS) -shared -Wl `pkg-config gtk+-2.0 --libs` -o multiping.so multiping.o clean: rm -f *.o *.so core |