Index: Makefile
===================================================================
--- Makefile	(revision 357750)
+++ Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	heartbeat
 PORTVERSION=	2.1.4
-PORTREVISION=	21
+PORTREVISION=	22
 CATEGORIES=	sysutils
 #MASTER_SITES=	http://hg.linux-ha.org/lha-2.1/archive/STABLE-2.1.4.tar.bz2
 MASTER_SITES=	${MASTER_SITE_LOCAL}
@@ -14,20 +14,22 @@
 MAINTAINER=	ports@encarnate.com
 COMMENT=	Subsystem for High-Availability Clustering
 
-BUILD_DEPENDS=	bison:${PORTSDIR}/devel/bison
+LICENSE=	GPLv2 LGPL21
+LICENSE_COMB=	multi
 
 LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls \
 		libnet.so:${PORTSDIR}/net/libnet \
 		libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid \
 		libxml2.so:${PORTSDIR}/textproc/libxml2
+BUILD_DEPENDS=	bison:${PORTSDIR}/devel/bison
 PATCH_DEPENDS=	libtool:${PORTSDIR}/devel/libtool
 
-USE_AUTOTOOLS=	autoconf autoheader automake aclocal libtool libltdl
+USE_AUTOTOOLS=	autoconf autoheader automake aclocal libltdl libtoolize
 AUTOMAKE_ARGS+=	--add-missing --include-deps --copy
 ACLOCAL_ARGS+=	-I ${LOCALBASE}/share/aclocal
 
-USE_BZIP2=	yes
-USES=		gettext gmake pkgconfig
+USES=		gettext gmake libtool pkgconfig tar:bzip2 shebangfix
+SHEBANG_FILES=	ldirectord/ldirectord.in
 USE_GNOME=	glib20
 USE_LDCONFIG=	yes
 USE_PYTHON=	yes
@@ -34,6 +36,9 @@
 
 GNU_CONFIGURE=	yes
 
+USERS=		hacluster
+GROUPS=		haclient
+
 CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/libnet11
 LDFLAGS+=	-L${LOCALBASE}/lib -L${LOCALBASE}/lib/libnet11
 
@@ -49,28 +54,22 @@
 		--disable-fatal-warnings
 
 SUB_FILES=	pkg-install pkg-message
-SUB_LIST=	BATCH=${BATCH}
 
 PKGDEINSTALL=	${PKGINSTALL}
 
+PLIST_SUB=	USER=${USERS} GROUP=${GROUPS}
 
-MAN1=		cl_status.1 ha_logger.1 hb_addnode.1 hb_delnode.1 hb_standby.1 hb_takeover.1
-MAN8=		apphbd.8 cibadmin.8 crm_resource.8 ha_logd.8 heartbeat.8 \
-		meatclient.8 stonith.8
-
-OPTIONS_DEFINE=MGMT LDIRECTORD APCSNMP DRAC3
+OPTIONS_DEFINE=		MGMT LDIRECTORD APCSNMP DRAC3
 MGMT_DESC=		Enable X11 Management Utilities
 LDIRECTORD_DESC=	Enable Linux Director Daemon
 APCSNMP_DESC=		Enable APC SNMP Stonith Device
 DRAC3_DESC=		Enable Dell DRACIII Stonith Device
 
-NO_STAGE=	yes
+APCSNMP_LIB_DEPENDS=	netsnmp:${PORTSDIR}/net-mgmt/net-snmp
+DRAC3_LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl
+
 .include <bsd.port.options.mk>
 
-.if !defined(BATCH)
-BATCH=NO
-.endif
-
 .if ${PORT_OPTIONS:MMGMT}
 BUILD_DEPENDS+=		swig:${PORTSDIR}/devel/swig13
 RUN_DEPENDS+=		${LOCALBASE}/libdata/pkgconfig/pygtk-2.0.pc:${PORTSDIR}/x11-toolkits/py-gtk2
@@ -86,41 +85,32 @@
 USES+=			perl5
 USE_PERL5=		run
 PLIST_SUB+=		LDIRECTORD=""
-MAN8+=			ldirectord.8
 .else
 CONFIGURE_ARGS+=	--disable-ldirectord
 PLIST_SUB+=		LDIRECTORD="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MAPCSNMP} || exists (${PREFIX}/lib/libnetsnmp.so)
-LIB_DEPENDS+=	netsnmp:${PORTSDIR}/net-mgmt/net-snmp
+.if ${PORT_OPTIONS:MAPCSNMP}
 PLIST_SUB+=	APCSNMP=""
 .else
 PLIST_SUB+=	APCSNMP="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MDRAC3} || exists (${PREFIX}/lib/libcurl.so)
-LIB_DEPENDS+=	curl:${PORTSDIR}/ftp/curl
+.if ${PORT_OPTIONS:MDRAC3}
 PLIST_SUB+=	DRAC3=""
 .else
 PLIST_SUB+=	DRAC3="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MDOCS}
-PLIST_SUB+=		NOPORTDOCS=""
-.else
-PLIST_SUB+=		NOPORTDOCS="@comment "
-.endif
-
 # BladeHPI Stonith Automagic Building
-.if exists (${PREFIX}/include/openhpi/SaHpi.h)
+.if exists (${STAGEDIR}${PREFIX}/include/openhpi/SaHpi.h)
 PLIST_SUB+=	HPI=""
 .else
 PLIST_SUB+=	HPI="@comment "
 .endif
 
-# IPMI Lan Stonight Automagic Building
-.if exists (${PREFIX}/include/ipmilan.h)
+# IPMI Lan Stonith Automagic Building
+.if exists (${STAGEDIR}${PREFIX}/include/ipmilan.h)
 PLIST_SUB+=	IPMI=""
 .else
 PLIST_SUB+=	IPMI="@comment "
@@ -127,13 +117,13 @@
 .endif
 
 # VACM Stonith Automagic Building
-.if exists (${PREFIX}/include/vacmclient_api.h)
+.if exists (${STAGEDIR}${PREFIX}/include/vacmclient_api.h)
 PLIST_SUB+=	VACM=""
 .else
 PLIST_SUB+=	VACM="@comment "
 .endif
 
-pre-patch:
+post-extract:
 	@${MV} ${WRKDIR}/Heartbeat-STABLE-2-1-${DISTNAME} ${WRKSRC}
 	@${CP} -f ${FILESDIR}/heartbeat.in ${WRKSRC}/heartbeat/init.d/
 
@@ -163,47 +153,26 @@
 	@${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so.*
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/heartbeat/plugins/*/*.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/pils/plugins/InterfaceMgr/generic.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/stonith/plugins/stonith2/*.so
+	${MKDIR} -m 0750 ${STAGEDIR}/var/run/heartbeat/pengine
+	${TOUCH} ${STAGEDIR}/var/run/heartbeat.pid
+
+.if ${PORT_OPTIONS:MMGMT}
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/heartbeat-gui/_pymgmt.so.0.0.0
+.endif
+
 .if ${PORT_OPTIONS:MDOCS}
 	# Install sample configuration
-	@if [ ! -f ${PREFIX}/etc/ha.d/authkeys ]; then \
-		${CP} -p ${DOCSDIR}/authkeys ${PREFIX}/etc/ha.d/authkeys ; \
-	fi
-	${CP} -p ${DOCSDIR}/authkeys ${PREFIX}/etc/ha.d/authkeys.sample
-	${CHMOD} 600 ${PREFIX}/etc/ha.d/authkeys*
-
-	@if [ ! -f ${PREFIX}/etc/ha.d/ha.cf ]; then \
-		${CP} -p ${DOCSDIR}/ha.cf ${PREFIX}/etc/ha.d/ha.cf ; \
-	fi
-	${CP} -p ${DOCSDIR}/ha.cf ${PREFIX}/etc/ha.d/ha.cf.sample
-
-	@if [ ! -f ${PREFIX}/etc/ha.d/logd.cf ]; then \
-		${CP} -p ${DOCSDIR}/logd.cf ${PREFIX}/etc/ha.d/logd.cf ; \
-	fi
-	${CP} -p ${DOCSDIR}/logd.cf ${PREFIX}/etc/ha.d/logd.cf.sample
+	${CP} -p ${STAGEDIR}${DOCSDIR}/authkeys ${STAGEDIR}${PREFIX}/etc/ha.d/authkeys.sample
+	${CP} -p ${STAGEDIR}${DOCSDIR}/ha.cf ${STAGEDIR}${PREFIX}/etc/ha.d/ha.cf.sample
+	${CP} -p ${STAGEDIR}${DOCSDIR}/logd.cf ${STAGEDIR}${PREFIX}/etc/ha.d/logd.cf.sample
 .endif
 
 .if ${PORT_OPTIONS:MLDIRECTORD}
-	@if [ ! -f ${PREFIX}/etc/ha.d/ldirectord.cf ]; then \
-		${CP} -p ${WRKSRC}/ldirectord/ldirectord.cf ${PREFIX}/etc/ha.d/ldirectord.cf ; \
-		${CP} -p ${WRKSRC}/ldirectord/ldirectord.cf ${PREFIX}/etc/ha.d/ldirectord.cf.sample ; \
-	fi
+	${CP} -p ${WRKSRC}/ldirectord/ldirectord.cf ${STAGEDIR}${PREFIX}/etc/ha.d/ldirectord.cf.sample
 .endif
 
-	# Some subdirs treat man as documentation, therefor we have to install
-	# those man pages manually if NOPORTDOCS is defined.
-
-.if ${PORT_OPTIONS:MDOCS}
-	# Some subdirs treat man as documentation, therefor we have to install
-	# those man pages manually if NOPORTDOCS is defined.
-
-.for f in ${MAN1}
-	${INSTALL_MAN} ${WRKSRC}/doc/${f} ${MANPREFIX}/man/man1
-.endfor
-.for f in apphbd.8 cibadmin.8 crm_resource.8 ha_logd.8 heartbeat.8
-	${INSTALL_MAN} ${WRKSRC}/doc/${f} ${MANPREFIX}/man/man8
-.endfor
-.endif
-
-	@${CAT} ${PKGMESSAGE}
-
 .include <bsd.port.mk>
Index: files/patch-tools-Makefile.am
===================================================================
--- files/patch-tools-Makefile.am	(revision 357750)
+++ files/patch-tools-Makefile.am	(working copy)
@@ -1,5 +1,5 @@
---- tools/Makefile.am.orig	2008-08-18 12:32:19.000000000 +0000
-+++ tools/Makefile.am	2013-11-08 13:57:58.000000000 +0000
+--- tools/Makefile.am.orig	2008-08-18 14:32:19.000000000 +0200
++++ tools/Makefile.am	2014-06-14 22:45:13.793133353 +0200
 @@ -43,7 +43,7 @@
  
  ## SOURCES
@@ -9,3 +9,11 @@
  
  cl_status_SOURCES	= cl_status.c
  # A little trick. Now ccdv can be auto-built but not auto-cleaned.
+@@ -85,7 +85,5 @@
+ 		  $(LIBRT)
+ 
+ install-data-hook:    # install-exec-hook doesn't work (!)
+-	-chgrp $(apigid) $(DESTDIR)/$(habindir)/cl_status
+-	-chmod g+s,a-w $(DESTDIR)/$(habindir)/cl_status
+ 
+ .PHONY: install-exec-hook
Index: files/pkg-install.in
===================================================================
--- files/pkg-install.in	(revision 357750)
+++ files/pkg-install.in	(working copy)
@@ -1,80 +1,9 @@
 #!/bin/sh
 
-USER=hacluster
-GROUP=haclient
-UID=275
-GID=${UID}
-
-BATCH=${BATCH:-%%BATCH%%}
 PREFIX=${PREFIX:-%%PREFIX%%}
 
 case $2 in
 
-PRE-INSTALL)
-
-	echo -e "\n\n"
-
-	# Create account
-	echo -n "Creating heartbeat user group... "
-	if pw group show "${GROUP}" >/dev/null 2>&1; then
-		echo "Group \"${GROUP}\" already exists."
-	else
-		if pw groupadd ${GROUP} -g ${GID}; then
-			echo "Added group \"${GROUP}\"."
-		else
-			echo "Adding group \"${GROUP}\" failed..."
-			exit 1
-		fi
-	fi
-
-	echo -n "Creating heartbeat user id... "
-	if pw user show "${USER}" >/dev/null 2>&1; then
-		echo "User \"${USER}\" already exists."
-	else
-		if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
-			-d /nonexistent -s /sbin/nologin -c "Heartbeat Daemon"
-		then
-			echo "Added user \"${USER}\"."
-		else
-			echo "Adding user \"${USER}\" failed..."
-			exit 1
-		fi
-	fi
-
-
-	# Create /var environment
-	echo -n "Creating /var environment... "
-	test -d /var/run/heartbeat/ccm || \
-		install -d -m 750 -o ${USER} -g ${GROUP} /var/run/heartbeat/ccm
-	test -d /var/run/heartbeat/crm || \
-		install -d -m 750 -o ${USER} -g ${GROUP} /var/run/heartbeat/crm
-	test -d /var/lib/heartbeat/cores || \
-		install -d -m 755 /var/lib/heartbeat/cores
-	test -d /var/lib/heartbeat/cores/hacluster || \
-		install -d -m 700 -o ${USER} /var/lib/heartbeat/cores/hacluster
-	test -d /var/lib/heartbeat/cores/nobody || \
-		install -d -m 700 -o nobody /var/lib/heartbeat/cores/nobody
-	test -d /var/lib/heartbeat/cores/root || \
-		install -d -m 700 /var/lib/heartbeat/cores/root
-	test -d /var/lib/heartbeat/crm || \
-		install -d -m 750 -o ${USER} -g ${GROUP} /var/lib/heartbeat/crm
-	test -d /var/lib/heartbeat/fencing || \
-		install -d -m 770 -g ${GROUP} /var/lib/heartbeat/fencing
-	test -d /var/lib/heartbeat/lrm || \
-		install -d -m 770 -g ${GROUP} /var/lib/heartbeat/lrm
-	test -d /var/lib/heartbeat/mgmt || \
-		install -d -m 770 -g ${GROUP} /var/lib/heartbeat/mgmt
-	test -d /var/lib/heartbeat/pengine || \
-		install -d -m 750 -o ${USER} -g ${GROUP} /var/run/heartbeat/pengine
-	test -f /var/run/heartbeat.pid || \
-		install -m 644 -o ${USER} -g ${GROUP} /dev/null \
-			/var/run/heartbeat.pid
-	echo "DONE"
-
-	echo -e "\n\n"
-
-	;;
-
 DEINSTALL)
 
 	echo -e "\n\n"
@@ -88,46 +17,4 @@
 	else
 		echo "NO"
 	fi
-
-	# Remove Heartbeat account
-	echo -n "Removing heartbeat account... "
-	pw groupdel -n ${GROUP}
-	pw userdel -n ${USER}
-	echo "DONE"
-
-	# Cleanup /var environment
-	echo -n "Cleaning up /var environment... "
-
-	if [ "$BATCH" = "NO" ]; then
-		echo ""
-		default="n"
-		read -p "    Remove runtime files (cluster config)? [yn]: " answer
-
-		case "$answer" in
-			[Yy]*)	answer=y ;;
-			[Nn]*)	answer=n ;;
-			*)		answer=n ;;
-		esac
-
-		if [ "$answer" = "y" ]; then
-			echo -n "    Removing runtime files... "
-			test -d /var/run/heartbeat && \
-				rm -r /var/run/heartbeat
-			test -d /var/lib/heartbeat && \
-				rm -r /var/lib/heartbeat
-			test -f /var/lock/subsys/heartbeat && \
-				rm /var/lock/subsys/heartbeat
-			test -f /var/run/heartbeat.pid && \
-				rm /var/run/heartbeat.pid
-			echo "DONE"
-		else
-			echo "Preserving runtime files... DONE"
-		fi
-	else
-		echo "NA"
-	fi
-
-	echo -e "\n\n"
-
-	;;
 esac
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 357750)
+++ pkg-plist	(working copy)
@@ -1,17 +1,23 @@
 bin/cl_respawn
+@group %%GROUP%%
+@mode 2555
 bin/cl_status
+@group
+@mode
 %%MGMT%%bin/hb_gui
 etc/ha.d/README.config
-%%NOPORTDOCS%%@unexec if cmp -s %D/etc/ha.d/authkeys.sample %D/etc/ha.d/authkeys; then rm -f %D/etc/ha.d/authkeys; fi
-%%NOPORTDOCS%%etc/ha.d/authkeys.sample
-%%NOPORTDOCS%%@exec if [ ! -f %D/etc/ha.d/authkeys ]; then cp -p %D/%F %B/authkeys; fi
-%%NOPORTDOCS%%@unexec if cmp -s %D/etc/ha.d/ha.cf.sample %D/etc/ha.d/ha.cf; then rm -f %D/etc/ha.d/ha.cf; fi
-%%NOPORTDOCS%%etc/ha.d/ha.cf.sample
-%%NOPORTDOCS%%@exec if [ ! -f %D/etc/ha.d/ha.cf ]; then cp -p %D/%F %B/ha.cf; fi
+%%PORTDOCS%%@unexec if cmp -s %D/etc/ha.d/authkeys.sample %D/etc/ha.d/authkeys; then rm -f %D/etc/ha.d/authkeys; fi
+@mode 0600
+%%PORTDOCS%%etc/ha.d/authkeys.sample
+@mode
+%%PORTDOCS%%@exec if [ ! -f %D/etc/ha.d/authkeys ]; then cp -p %D/%F %B/authkeys; fi
+%%PORTDOCS%%@unexec if cmp -s %D/etc/ha.d/ha.cf.sample %D/etc/ha.d/ha.cf; then rm -f %D/etc/ha.d/ha.cf; fi
+%%PORTDOCS%%etc/ha.d/ha.cf.sample
+%%PORTDOCS%%@exec if [ ! -f %D/etc/ha.d/ha.cf ]; then cp -p %D/%F %B/ha.cf; fi
 etc/ha.d/harc
-%%NOPORTDOCS%%@unexec if cmp -s %D/etc/ha.d/logd.cf.sample %D/etc/ha.d/logd.cf; then rm -f %D/etc/ha.d/logd.cf; fi
-%%NOPORTDOCS%%etc/ha.d/logd.cf.sample
-%%NOPORTDOCS%%@exec if [ ! -f %D/etc/ha.d/logd.cf ]; then cp -p %D/%F %B/logd.cf; fi
+%%PORTDOCS%%@unexec if cmp -s %D/etc/ha.d/logd.cf.sample %D/etc/ha.d/logd.cf; then rm -f %D/etc/ha.d/logd.cf; fi
+%%PORTDOCS%%etc/ha.d/logd.cf.sample
+%%PORTDOCS%%@exec if [ ! -f %D/etc/ha.d/logd.cf ]; then cp -p %D/%F %B/logd.cf; fi
 %%LDIRECTORD%%@unexec if cmp -s %D/etc/ha.d/ldirectord.cf.sample %D/etc/ha.d/ldirectord.cf; then rm -f %D/etc/ha.d/ldirectord.cf; fi
 %%LDIRECTORD%%etc/ha.d/ldirectord.cf.sample
 %%LDIRECTORD%%@exec if [ ! -f %D/etc/ha.d/ldirectord.cf ]; then cp -p %D/%F %B/ldirectord.cf; fi
@@ -99,8 +105,9 @@
 etc/ocf/resource.d/heartbeat/portblock
 etc/ocf/resource.d/heartbeat/rsyncd
 etc/ocf/resource.d/heartbeat/tomcat
+%%MGMT%%etc/pam.d/hbmgmtd
 etc/rc.d/heartbeat
-%%LDIRECTORD%%etc/rc.d/ldirectord.sh
+%%LDIRECTORD%%etc/rc.d/ldirectord
 include/clplumbing/GSource.h
 include/clplumbing/GSource_internal.h
 include/clplumbing/Gmain_timeout.h
@@ -189,10 +196,11 @@
 include/stonith/stonith.h
 include/stonith/stonith_plugin.h
 %%MGMT%%lib/heartbeat-gui/_pymgmt.a
-%%MGMT%%lib/heartbeat-gui/_pymgmt.la
 %%MGMT%%lib/heartbeat-gui/_pymgmt.so
 %%MGMT%%lib/heartbeat-gui/_pymgmt.so.0
+%%MGMT%%lib/heartbeat-gui/_pymgmt.so.0.0.0
 %%MGMT%%lib/heartbeat-gui/haclient.py
+%%MGMT%%lib/heartbeat-gui/pymgmt.py
 lib/heartbeat/BasicSanityCheck
 lib/heartbeat/ResourceManager
 lib/heartbeat/TestHeartbeatComm
@@ -249,73 +257,50 @@
 lib/heartbeat/pengine
 lib/heartbeat/pingd
 lib/heartbeat/plugins/AppHBNotification/recmgr.a
-lib/heartbeat/plugins/AppHBNotification/recmgr.la
 lib/heartbeat/plugins/AppHBNotification/recmgr.so
 lib/heartbeat/plugins/HBauth/crc.a
-lib/heartbeat/plugins/HBauth/crc.la
 lib/heartbeat/plugins/HBauth/crc.so
 lib/heartbeat/plugins/HBauth/md5.a
-lib/heartbeat/plugins/HBauth/md5.la
 lib/heartbeat/plugins/HBauth/md5.so
 lib/heartbeat/plugins/HBauth/sha1.a
-lib/heartbeat/plugins/HBauth/sha1.la
 lib/heartbeat/plugins/HBauth/sha1.so
 lib/heartbeat/plugins/HBcomm/bcast.a
-lib/heartbeat/plugins/HBcomm/bcast.la
 lib/heartbeat/plugins/HBcomm/bcast.so
 lib/heartbeat/plugins/HBcomm/mcast.a
-lib/heartbeat/plugins/HBcomm/mcast.la
 lib/heartbeat/plugins/HBcomm/mcast.so
 lib/heartbeat/plugins/HBcomm/ping.a
-lib/heartbeat/plugins/HBcomm/ping.la
 lib/heartbeat/plugins/HBcomm/ping.so
 lib/heartbeat/plugins/HBcomm/ping_group.a
-lib/heartbeat/plugins/HBcomm/ping_group.la
 lib/heartbeat/plugins/HBcomm/ping_group.so
 lib/heartbeat/plugins/HBcomm/serial.a
-lib/heartbeat/plugins/HBcomm/serial.la
 lib/heartbeat/plugins/HBcomm/serial.so
 lib/heartbeat/plugins/HBcomm/ucast.a
-lib/heartbeat/plugins/HBcomm/ucast.la
 lib/heartbeat/plugins/HBcomm/ucast.so
 lib/heartbeat/plugins/HBcompress/bz2.a
-lib/heartbeat/plugins/HBcompress/bz2.la
 lib/heartbeat/plugins/HBcompress/bz2.so
 lib/heartbeat/plugins/HBcompress/zlib.a
-lib/heartbeat/plugins/HBcompress/zlib.la
 lib/heartbeat/plugins/HBcompress/zlib.so
 lib/heartbeat/plugins/RAExec/heartbeat.a
-lib/heartbeat/plugins/RAExec/heartbeat.la
 lib/heartbeat/plugins/RAExec/heartbeat.so
 lib/heartbeat/plugins/RAExec/lsb.a
-lib/heartbeat/plugins/RAExec/lsb.la
 lib/heartbeat/plugins/RAExec/lsb.so
 lib/heartbeat/plugins/RAExec/ocf.a
-lib/heartbeat/plugins/RAExec/ocf.la
 lib/heartbeat/plugins/RAExec/ocf.so
 lib/heartbeat/plugins/RAExec/stonith.a
-lib/heartbeat/plugins/RAExec/stonith.la
 lib/heartbeat/plugins/RAExec/stonith.so
 lib/heartbeat/plugins/quorum/majority.a
-lib/heartbeat/plugins/quorum/majority.la
 lib/heartbeat/plugins/quorum/majority.so
 lib/heartbeat/plugins/quorum/quorumd.a
-lib/heartbeat/plugins/quorum/quorumd.la
 lib/heartbeat/plugins/quorum/quorumd.so
 lib/heartbeat/plugins/quorum/twonodes.a
-lib/heartbeat/plugins/quorum/twonodes.la
 lib/heartbeat/plugins/quorum/twonodes.so
 lib/heartbeat/plugins/quorum/weight.a
-lib/heartbeat/plugins/quorum/weight.la
 lib/heartbeat/plugins/quorum/weight.so
 lib/heartbeat/plugins/quorumd/2_0_8.a
-lib/heartbeat/plugins/quorumd/2_0_8.la
 lib/heartbeat/plugins/quorumd/2_0_8.so
 lib/heartbeat/plugins/test/test.a
-lib/heartbeat/plugins/test/test.la
 lib/heartbeat/plugins/test/test.so
 lib/heartbeat/plugins/tiebreaker/twonodes.a
-lib/heartbeat/plugins/tiebreaker/twonodes.la
 lib/heartbeat/plugins/tiebreaker/twonodes.so
 lib/heartbeat/quorumd
 lib/heartbeat/quorumdtest
@@ -330,91 +315,90 @@
 lib/heartbeat/ttest
 lib/heartbeat/utillib.sh
 lib/libapphb.a
-lib/libapphb.la
 lib/libapphb.so
 lib/libapphb.so.0
+lib/libapphb.so.0.0.0
 lib/libccmclient.a
-lib/libccmclient.la
 lib/libccmclient.so
 lib/libccmclient.so.1
+lib/libccmclient.so.1.0.0
 lib/libcib.a
-lib/libcib.la
 lib/libcib.so
 lib/libcib.so.1
+lib/libcib.so.1.0.1
 lib/libclm.a
-lib/libclm.la
 lib/libclm.so
 lib/libclm.so.1
+lib/libclm.so.1.0.0
 lib/libcrmcommon.a
-lib/libcrmcommon.la
 lib/libcrmcommon.so
 lib/libcrmcommon.so.1
+lib/libcrmcommon.so.1.0.1
 lib/libhbclient.a
-lib/libhbclient.la
 lib/libhbclient.so
 lib/libhbclient.so.1
+lib/libhbclient.so.1.0.0
 %%MGMT%%lib/libhbmgmt.a
-%%MGMT%%lib/libhbmgmt.la
 %%MGMT%%lib/libhbmgmt.so
 %%MGMT%%lib/libhbmgmt.so.0
+%%MGMT%%lib/libhbmgmt.so.0.0.0
 %%MGMT%%lib/libhbmgmtclient.a
-%%MGMT%%lib/libhbmgmtclient.la
 %%MGMT%%lib/libhbmgmtclient.so
 %%MGMT%%lib/libhbmgmtclient.so.0
+%%MGMT%%lib/libhbmgmtclient.so.0.0.0
 %%MGMT%%lib/libhbmgmtcommon.a
-%%MGMT%%lib/libhbmgmtcommon.la
 %%MGMT%%lib/libhbmgmtcommon.so
 %%MGMT%%lib/libhbmgmtcommon.so.0
+%%MGMT%%lib/libhbmgmtcommon.so.0.0.0
 %%MGMT%%lib/libhbmgmttls.a
-%%MGMT%%lib/libhbmgmttls.la
 %%MGMT%%lib/libhbmgmttls.so
 %%MGMT%%lib/libhbmgmttls.so.0
+%%MGMT%%lib/libhbmgmttls.so.0.0.0
 lib/liblrm.a
-lib/liblrm.la
 lib/liblrm.so
 lib/liblrm.so.0
+lib/liblrm.so.0.0.0
 lib/libpe_rules.a
-lib/libpe_rules.la
 lib/libpe_rules.so
 lib/libpe_rules.so.2
+lib/libpe_rules.so.2.0.0
 lib/libpe_status.a
-lib/libpe_status.la
 lib/libpe_status.so
 lib/libpe_status.so.2
+lib/libpe_status.so.2.0.0
 lib/libpengine.a
-lib/libpengine.la
 lib/libpengine.so
 lib/libpengine.so.3
+lib/libpengine.so.3.0.0
 lib/libpils.a
-lib/libpils.la
 lib/libpils.so
 lib/libpils.so.1
+lib/libpils.so.1.0.0
 lib/libplumb.a
-lib/libplumb.la
 lib/libplumb.so
 lib/libplumb.so.1
+lib/libplumb.so.1.0.0
 lib/libplumbgpl.a
-lib/libplumbgpl.la
 lib/libplumbgpl.so
 lib/libplumbgpl.so.1
+lib/libplumbgpl.so.1.0.0
 lib/librecoverymgr.a
-lib/librecoverymgr.la
 lib/librecoverymgr.so
 lib/librecoverymgr.so.1
+lib/librecoverymgr.so.1.0.0
 lib/libstonith.a
-lib/libstonith.la
 lib/libstonith.so
 lib/libstonith.so.1
+lib/libstonith.so.1.0.0
 lib/libstonithd.a
-lib/libstonithd.la
 lib/libstonithd.so
 lib/libstonithd.so.0
+lib/libstonithd.so.0.0.0
 lib/libtransitioner.a
-lib/libtransitioner.la
 lib/libtransitioner.so
 lib/libtransitioner.so.1
+lib/libtransitioner.so.1.0.0
 lib/pils/plugins/InterfaceMgr/generic.a
-lib/pils/plugins/InterfaceMgr/generic.la
 lib/pils/plugins/InterfaceMgr/generic.so
 lib/stonith/plugins/external/hmchttp
 lib/stonith/plugins/external/ibmrsa
@@ -427,64 +411,59 @@
 lib/stonith/plugins/external/xen0
 lib/stonith/plugins/external/xen0-ha
 lib/stonith/plugins/stonith2/apcmaster.a
-lib/stonith/plugins/stonith2/apcmaster.la
 lib/stonith/plugins/stonith2/apcmaster.so
 %%APCSNMP%%lib/stonith/plugins/stonith2/apcmastersnmp.a
-%%APCSNMP%%lib/stonith/plugins/stonith2/apcmastersnmp.la
 %%APCSNMP%%lib/stonith/plugins/stonith2/apcmastersnmp.so
 lib/stonith/plugins/stonith2/apcsmart.a
-lib/stonith/plugins/stonith2/apcsmart.la
 lib/stonith/plugins/stonith2/apcsmart.so
 lib/stonith/plugins/stonith2/baytech.a
-lib/stonith/plugins/stonith2/baytech.la
 lib/stonith/plugins/stonith2/baytech.so
 %%HPI%%lib/stonith/plugins/stonith2/bladehpi.a
-%%HPI%%lib/stonith/plugins/stonith2/bladehpi.la
 %%HPI%%lib/stonith/plugins/stonith2/bladehpi.so
 lib/stonith/plugins/stonith2/cyclades.a
-lib/stonith/plugins/stonith2/cyclades.la
 lib/stonith/plugins/stonith2/cyclades.so
 %%DRAC3%%lib/stonith/plugins/stonith2/drac3.a
-%%DRAC3%%lib/stonith/plugins/stonith2/drac3.la
 %%DRAC3%%lib/stonith/plugins/stonith2/drac3.so
 lib/stonith/plugins/stonith2/external.a
-lib/stonith/plugins/stonith2/external.la
 lib/stonith/plugins/stonith2/external.so
 lib/stonith/plugins/stonith2/ibmhmc.a
-lib/stonith/plugins/stonith2/ibmhmc.la
 lib/stonith/plugins/stonith2/ibmhmc.so
 %%IPMI%%lib/stonith/plugins/stonith2/ipmilan.a
-%%IPMI%%lib/stonith/plugins/stonith2/ipmilan.la
 %%IPMI%%lib/stonith/plugins/stonith2/ipmilan.so
 lib/stonith/plugins/stonith2/meatware.a
-lib/stonith/plugins/stonith2/meatware.la
 lib/stonith/plugins/stonith2/meatware.so
 lib/stonith/plugins/stonith2/null.a
-lib/stonith/plugins/stonith2/null.la
 lib/stonith/plugins/stonith2/null.so
 lib/stonith/plugins/stonith2/nw_rpc100s.a
-lib/stonith/plugins/stonith2/nw_rpc100s.la
 lib/stonith/plugins/stonith2/nw_rpc100s.so
 lib/stonith/plugins/stonith2/rcd_serial.a
-lib/stonith/plugins/stonith2/rcd_serial.la
 lib/stonith/plugins/stonith2/rcd_serial.so
 lib/stonith/plugins/stonith2/ribcl.py
 lib/stonith/plugins/stonith2/rps10.a
-lib/stonith/plugins/stonith2/rps10.la
 lib/stonith/plugins/stonith2/rps10.so
 lib/stonith/plugins/stonith2/ssh.a
-lib/stonith/plugins/stonith2/ssh.la
 lib/stonith/plugins/stonith2/ssh.so
 lib/stonith/plugins/stonith2/suicide.a
-lib/stonith/plugins/stonith2/suicide.la
 lib/stonith/plugins/stonith2/suicide.so
 %%VACM%%lib/stonith/plugins/stonith2/vacm.a
-%%VACM%%lib/stonith/plugins/stonith2/vacm.la
 %%VACM%%lib/stonith/plugins/stonith2/vacm.so
 lib/stonith/plugins/stonith2/wti_nps.a
-lib/stonith/plugins/stonith2/wti_nps.la
 lib/stonith/plugins/stonith2/wti_nps.so
 lib/stonith/plugins/xen0-ha-dom0-stonith-helper
+man/man1/cl_status.1.gz
+man/man1/ha_logger.1.gz
+man/man1/hb_addnode.1.gz
+man/man1/hb_delnode.1.gz
+man/man1/hb_standby.1.gz
+man/man1/hb_takeover.1.gz
+man/man8/apphbd.8.gz
+man/man8/cibadmin.8.gz
+man/man8/crm_resource.8.gz
+man/man8/ha_logd.8.gz
+man/man8/heartbeat.8.gz
+%%LDIRECTORD%%man/man8/ldirectord.8.gz
+man/man8/meatclient.8.gz
+man/man8/stonith.8.gz
 sbin/attrd_updater
 sbin/ccm_tool
 sbin/cibadmin
@@ -673,3 +652,32 @@
 @dirrmtry etc/ha.d/resource.d
 @dirrmtry etc/ha.d/rc.d
 @dirrmtry etc/ha.d
+@unexec rmdir "/var/lib/heartbeat/cores/%%USER%%" >/dev/null 2>&1 || :
+@exec install -d -m 700 -o %%USER%% /var/lib/heartbeat/cores/%%USER%%
+@unexec rmdir "/var/lib/heartbeat/cores/nobody" >/dev/null 2>&1 || :
+@exec install -d -m 700 -o nobody /var/lib/heartbeat/cores/nobody
+@unexec rmdir "/var/lib/heartbeat/cores/root" >/dev/null 2>&1 || :
+@exec install -d -m 700 /var/lib/heartbeat/cores/root
+@unexec rmdir "/var/lib/heartbeat/cores" >/dev/null 2>&1 || :
+@exec install -d -m 755 /var/lib/heartbeat/cores
+@unexec rmdir "/var/lib/heartbeat/crm" >/dev/null 2>&1 || :
+@exec install -d -m 750 -o %%USER%% -g %%GROUP%% /var/lib/heartbeat/crm
+@unexec rmdir "/var/lib/heartbeat/fencing" >/dev/null 2>&1 || :
+@exec install -d -m 770 -g %%GROUP%% /var/lib/heartbeat/fencing
+@unexec rmdir "/var/lib/heartbeat/lrm" >/dev/null 2>&1 || :
+@exec install -d -m 770 -g %%GROUP%% /var/lib/heartbeat/lrm
+%%MGMT%%@unexec rmdir "/var/lib/heartbeat/mgmt" >/dev/null 2>&1 || :
+%%MGMT%%@exec install -d -m 770 -g %%GROUP%% /var/lib/heartbeat/mgmt
+@unexec rmdir "/var/lib/heartbeat/pengine" >/dev/null 2>&1 || :
+@unexec rmdir "/var/lib/heartbeat" >/dev/null 2>&1 || :
+@unexec rmdir "/var/lib" >/dev/null 2>&1 || :
+@unexec rmdir "/var/run/heartbeat/pengine" >/dev/null 2>&1 || :
+@exec install -d -m 750 -o %%USER%% -g %%GROUP%% /var/run/heartbeat/pengine
+@unexec rmdir "/var/run/heartbeat/ccm" >/dev/null 2>&1 || :
+@exec install -d -m 750 -o %%USER%% -g %%GROUP%% /var/run/heartbeat/ccm
+@unexec rmdir "/var/run/heartbeat/crm" >/dev/null 2>&1 || :
+@exec install -d -m 750 -o %%USER%% -g %%GROUP%% /var/run/heartbeat/crm
+@unexec rmdir "/var/run/heartbeat" >/dev/null 2>&1 || :
+@exec install -d -m 750 -o %%USER%% -g %%GROUP%% /var/run/heartbeat
+@cwd /
+var/run/heartbeat.pid