From 87322bc35eb708df42a9887670c010b6c62828b5 Mon Sep 17 00:00:00 2001
From: arved <arved@FreeBSD.org>
Date: Fri, 14 Nov 2003 14:22:31 +0000
Subject: "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."

PR:		59268
Submitted by:	brooks
---
 sysutils/ganglia-monitor-core/Makefile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'sysutils')

diff --git a/sysutils/ganglia-monitor-core/Makefile b/sysutils/ganglia-monitor-core/Makefile
index f0ab98ff52c7..1ed58a53193e 100644
--- a/sysutils/ganglia-monitor-core/Makefile
+++ b/sysutils/ganglia-monitor-core/Makefile
@@ -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/rrdtool
 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/gmond_config.h \
 		${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
 #
-- 
cgit