Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 22 Jul 2015 11:03:39 +0000 (UTC)
From:      Michael Gmelin <grembo@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r392672 - in head/sysutils/heartbeat: . files
Message-ID:  <201507221103.t6MB3doo095676@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: grembo
Date: Wed Jul 22 11:03:38 2015
New Revision: 392672
URL: https://svnweb.freebsd.org/changeset/ports/392672

Log:
  sysutils/heartbeat: Add perl dependency and fix path to perl
  
  PR:		201222
  Approved by:	maintainers (implicit)

Modified:
  head/sysutils/heartbeat/Makefile
  head/sysutils/heartbeat/files/patch-resources-OCF-IPaddr

Modified: head/sysutils/heartbeat/Makefile
==============================================================================
--- head/sysutils/heartbeat/Makefile	Wed Jul 22 10:52:49 2015	(r392671)
+++ head/sysutils/heartbeat/Makefile	Wed Jul 22 11:03:38 2015	(r392672)
@@ -3,7 +3,7 @@
 
 PORTNAME=	heartbeat
 PORTVERSION=	2.1.4
-PORTREVISION=	24
+PORTREVISION=	25
 CATEGORIES=	sysutils
 #MASTER_SITES=	http://hg.linux-ha.org/lha-2.1/archive/STABLE-2.1.4.tar.bz2
 MASTER_SITES=	LOCAL/kuriyama/heartbeat
@@ -23,7 +23,7 @@ LIB_DEPENDS=	libltdl.so:${PORTSDIR}/deve
 		libxml2.so:${PORTSDIR}/textproc/libxml2
 BUILD_DEPENDS=	bison:${PORTSDIR}/devel/bison
 
-USES=		autoreconf cpe gettext gmake libtool pkgconfig python tar:bzip2 \
+USES=		autoreconf cpe gettext gmake libtool perl5 pkgconfig python tar:bzip2 \
 		shebangfix
 SHEBANG_FILES=	ldirectord/ldirectord.in
 USE_GNOME=	glib20
@@ -125,6 +125,8 @@ post-extract:
 	@${CP} -f ${FILESDIR}/heartbeat.in ${WRKSRC}/heartbeat/init.d/
 
 post-patch:
+	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
+		${WRKSRC}/resources/OCF/IPaddr
 .if ${PORT_OPTIONS:MDOCS}
 	@${REINPLACE_CMD} -e 's|^\(docdir.*doc/\).*|\1${PORTNAME}|' \
 		${WRKSRC}/configure.in \

Modified: head/sysutils/heartbeat/files/patch-resources-OCF-IPaddr
==============================================================================
--- head/sysutils/heartbeat/files/patch-resources-OCF-IPaddr	Wed Jul 22 10:52:49 2015	(r392671)
+++ head/sysutils/heartbeat/files/patch-resources-OCF-IPaddr	Wed Jul 22 11:03:38 2015	(r392672)
@@ -26,7 +26,7 @@ Patch attached with submission follows:
 +    ipaddr="$1";
 +
 +    /sbin/ifconfig \
-+       | /usr/bin/perl -w -e '
++       | %%LOCALBASE%%/bin/perl -w -e '
 +
 +            my $ip = $ARGV[0];
 +



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201507221103.t6MB3doo095676>