Index: heartbeat/Makefile =================================================================== RCS file: /home/ncvs/ports/sysutils/heartbeat/Makefile,v retrieving revision 1.1 diff -u -r1.1 Makefile --- heartbeat/Makefile 6 Apr 2005 07:36:41 -0000 1.1 +++ heartbeat/Makefile 11 Jun 2005 17:10:36 -0000 @@ -24,6 +24,11 @@ USE_REINPLACE= yes CONFIGURE_ARGS= --disable-fatal-warnings +.if defined(WITH_IPVS) +RUN_DEPENDS: ${LOCALBASE}/sbin/ipvsadm:${PORTSDIR}/net/ipvs +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-ldirectord__ldirectord +.endif + SUB_FILES= pkg-install PKGDEINSTALL= ${PKGINSTALL} @@ -35,6 +40,8 @@ post-patch: ${REINPLACE_CMD} -e "s#logrotate.d##" ${WRKSRC}/heartbeat/Makefile.in \ ${WRKSRC}/ldirectord/Makefile.in + @${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE}," \ + ${WRKSRC}/ldirectord/ldirectord post-deinstall: @${SH} ${PKGINSTALL} ${PKGNAME} DEINSTALL Index: heartbeat/files/extra-patch-ldirectord__ldirectord =================================================================== RCS file: heartbeat/files/extra-patch-ldirectord__ldirectord diff -N heartbeat/files/extra-patch-ldirectord__ldirectord --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ heartbeat/files/extra-patch-ldirectord__ldirectord 11 Jun 2005 17:11:32 -0000 @@ -0,0 +1,13 @@ +--- ldirectord/ldirectord.orig Sat Jun 11 18:59:08 2005 ++++ ldirectord/ldirectord Sat Jun 11 19:05:19 2005 +@@ -395,8 +395,8 @@ + } else { + if (-x "/sbin/ipvsadm") { + $IPVSADM="/sbin/ipvsadm"; +- } elsif (-x "/usr/sbin/ipvsadm") { +- $IPVSADM="/usr/sbin/ipvsadm"; ++ } elsif (-x "%%LOCALBASE%%/sbin/ipvsadm") { ++ $IPVSADM="%%LOCALBASE%%/sbin/ipvsadm"; + } else { + die "Can not find ipvsadm"; + }