Date: Thu, 13 Nov 2003 15:04:53 -0800 (PST) From: Brooks Davis <brooks@one-eyed-alien.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/59268: [maintainer update] ganglia-monitor-core fixes Message-ID: <200311132304.hADN4rie004099@minya.sea.one-eyed-alien.net> Resent-Message-ID: <200311132310.hADNAHeA090346@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 59268
>Category: ports
>Synopsis: [maintainer update] ganglia-monitor-core fixes
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Thu Nov 13 15:10:17 PST 2003
>Closed-Date:
>Last-Modified:
>Originator: Brooks Davis
>Release: FreeBSD 5.1-CURRENT i386
>Organization:
Aerospace Corp.
>Environment:
System: FreeBSD minya.sea.one-eyed-alien.net 5.1-CURRENT FreeBSD 5.1-CURRENT #25: Fri Nov 7 11:48:13 PST 2003 root@minya.sea.one-eyed-alien.net:/usr/obj/usr/src/sys/GENERIC i386
Fix the location of the gmetad state files. I missed the fact that it
the string defining the default moved from one file to another in the
last update so the documentation was corrected, but the actual default
was not.
Fix PTHREAD_LIBS support so it works if there's a libpthread installed.
>Description:
>How-To-Repeat:
>Fix:
Index: Makefile
===================================================================
RCS file: /usr/cvs/ports/sysutils/ganglia-monitor-core/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile 8 Nov 2003 23:02:06 -0000 1.5
+++ Makefile 13 Nov 2003 23:00:35 -0000
@@ -7,6 +7,7 @@
PORTNAME= ganglia-monitor-core
PORTVERSION= 2.5.5
+PORTREVISION= 1
CATEGORIES= sysutils net parallel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ganglia
@@ -24,7 +25,7 @@ LIB_DEPENDS= rrd.0:${PORTSDIR}/net/rrdto
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+LDFLAGS= -L${LOCALBASE}/lib
.if !defined (WITHOUT_GMETAD)
CONFIGURE_ARGS+= --with-gmetad
@@ -53,7 +54,7 @@ FIX_CONF_FILES= ${WRKSRC}/lib/ganglia/gm
${WRKSRC}/gmetad/cmdline.h \
${WRKSRC}/gmond/cmdline.c \
${WRKSRC}/gmond/cmdline.h
-FIX_DB_FILES= ${WRKSRC}/gmetad/gmetad.c \
+FIX_DB_FILES= ${WRKSRC}/gmetad/conf.c \
${WRKSRC}/gmetad/gmetad.conf
post-patch:
@@ -62,6 +63,7 @@ post-patch:
${REINPLACE_CMD} -e "s|/var/lib/ganglia|/var/db/ganglia|g" \
${FIX_DB_FILES}
${REINPLACE_CMD} -e 's|-pthread||g' ${WRKSRC}/configure
+ ${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
# Post-install
#
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200311132304.hADN4rie004099>