diff --git a/sysutils/ganglia-monitor-core/Makefile b/sysutils/ganglia-monitor-core/Makefile
index 0b5d18181e61..79f99de0d52a 100644
--- a/sysutils/ganglia-monitor-core/Makefile
+++ b/sysutils/ganglia-monitor-core/Makefile
@@ -1,112 +1,111 @@
 PORTNAME=	monitor-core
 PORTVERSION=	3.7.2
 CATEGORIES=	sysutils net
 MASTER_SITES=	SF/ganglia/ganglia%20monitoring%20core/${PORTVERSION}
 PKGNAMEPREFIX=	ganglia-
 .if defined(CLUSTER)
 PKGNAMESUFFIX=	-${CLUSTER}
 .endif
 DISTNAME=	ganglia-${PORTVERSION}
 
 MAINTAINER=	jwb@FreeBSD.org
 COMMENT=	Ganglia cluster monitor, monitoring daemon
 WWW=		http://ganglia.info/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libapr-1.so:devel/apr1 \
 		libconfuse.so:devel/libconfuse \
 		libpcre.so:devel/pcre \
 		libexpat.so:textproc/expat2
 
-USES=		libtool pkgconfig
+USES=		libtool localbase:ldflags pkgconfig
+USE_LDCONFIG=	yes
+USE_RC_SUBR=	gmond
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-setuid=ganglia --enable-setgid=ganglia \
 		--disable-python
 CONFIGURE_ENV=	GANGLIA_ACK_SYSCONFDIR=1
-CFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+
+INSTALL_TARGET=	install-strip
+
+SUB_FILES+=	pkg-message
 
 USERS=		ganglia
 GROUPS=		ganglia
 
-OPTIONS_DEFINE=	GMETAD
-OPTIONS_DEFAULT=	GMETAD
-GMETAD_DESC=	include gmetad
-
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 
-SUB_FILES+=	pkg-message
+OPTIONS_DEFINE=	GMETAD
+OPTIONS_DEFAULT=	GMETAD
+OPTIONS_SUB=	yes
 
-INSTALL_TARGET=	install-strip
+GMETAD_DESC=	include gmetad
 
-USE_RC_SUBR=	gmond
+GMETAD_LIB_DEPENDS=	librrd.so:databases/rrdtool
+GMETAD_CONFIGURE_ON=	--with-gmetad
+GMETAD_SUB_LIST=	GMETAD=""
+GMETAD_SUB_LIST_OFF=	GMETAD="\#"
 
 .include <bsd.port.options.mk>
 
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
+CFLAGS+=	-Wno-error=incompatible-function-pointer-types
+.endif
+
 .if ${PORT_OPTIONS:MGMETAD}
 USE_RC_SUBR+=	gmetad
-
-LIB_DEPENDS+=	librrd.so:databases/rrdtool
-CONFIGURE_ARGS+=	--with-gmetad
-PLIST_SUB+=	GMETAD=""
-SUB_LIST+=	GMETAD=""
-.else
-PLIST_SUB+=	GMETAD="@comment "
-SUB_LIST+=	GMETAD="\#"
 .endif
 
-USE_LDCONFIG=	yes
-
 CONF_DIR=	${PREFIX}/etc
 
 MODULES=	modcpu.so \
 		moddisk.so \
 		modload.so \
 		modmem.so \
 		modmulticpu.so \
 		modnet.so \
 		modproc.so \
 		modsys.so
 
 # gmond.conf.5 and gmond.conf.html can be generated from conf.pod, but
 # doing so requires perl installed in the build stage.
 pre-configure:
 	@${REINPLACE_CMD} \
 		-e "s|/etc/ganglia/\(gm[a-z]*d.conf\)|${PREFIX}/etc/\1|g" \
 		${WRKSRC}/README \
 		${WRKSRC}/mans/gmetad.1 \
 		${WRKSRC}/mans/gmond.1
 	@${REINPLACE_CMD} -e "s|nobody|ganglia|g" \
 		${WRKSRC}/gmetad/gmetad.conf.in \
 		${WRKSRC}/gmond/conf.pod \
 		${WRKSRC}/gmond/gmond.conf.5 \
 		${WRKSRC}/gmond/gmond.conf.html
 
 post-build:
 	@${WRKSRC}/gmond/gmond -t > ${WRKDIR}/gmond.conf
 
 post-install:
 	${INSTALL_DATA} ${WRKDIR}/gmond.conf \
 		${STAGEDIR}${PREFIX}/etc/gmond.conf.sample
-.if ${PORT_OPTIONS:MGMETAD}
-	${INSTALL_SCRIPT} ${FILESDIR}/gmetasnap.sh \
-		${STAGEDIR}${PREFIX}/sbin/gmetasnap
-	${INSTALL_DATA} ${WRKSRC}/gmetad/gmetad.conf \
-		${STAGEDIR}${PREFIX}/etc/gmetad.conf.sample
-	${INSTALL_MAN} ${WRKSRC}/mans/gmetad.1 \
-		${STAGEDIR}${MANPREFIX}/man/man1
-.endif
 	${INSTALL_MAN} \
 		${WRKSRC}/mans/gmetric.1 \
 		${WRKSRC}/mans/gmond.1 \
 		${WRKSRC}/mans/gstat.1 \
 		${STAGEDIR}${MANPREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/gmond/gmond.conf.5 \
 		${STAGEDIR}${MANPREFIX}/man/man5
 	${MKDIR} ${STAGEDIR}/var/db/ganglia/rrds
 	@${CHMOD} -R a+rX ${STAGEDIR}/var/db/ganglia
 
+post-install-GMETAD-on:
+	${INSTALL_SCRIPT} ${FILESDIR}/gmetasnap.sh \
+		${STAGEDIR}${PREFIX}/sbin/gmetasnap
+	${INSTALL_DATA} ${WRKSRC}/gmetad/gmetad.conf \
+		${STAGEDIR}${PREFIX}/etc/gmetad.conf.sample
+	${INSTALL_MAN} ${WRKSRC}/mans/gmetad.1 \
+		${STAGEDIR}${MANPREFIX}/man/man1
+
 .include <bsd.port.mk>