diff --git a/net/pacemaker1/Makefile b/net/pacemaker1/Makefile
index 81bbb8ce86b8..da2a3734e572 100644
--- a/net/pacemaker1/Makefile
+++ b/net/pacemaker1/Makefile
@@ -1,37 +1,42 @@
 # Created by: David Shane Holden <dpejesh@yahoo.com>
 
 PORTVERSION=		1.1.24
+PORTREVISION=		1
 PKGNAMESUFFIX=		1
 
 .include "${.CURDIR}/Makefile.common"
 
 CONFLICTS+=		pacemaker2-[0-9]*
 
 SHEBANG_FILES+=		cts/cts \
 			cts/lxc_autogen.sh.in \
 			fencing/* \
 			lrmd/* \
 			mcp/* \
 			tools/* \
 			xml/* \
 			BasicSanity.sh \
 			coverage.sh.in \
 			cts/CTSlab.py \
 			pengine/regression.sh
 
 REPLACE_ARGS_GETOPT=	-e 's,getopt,${LOCALBASE}/bin/getopt,'
 
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} >= 1300000
+BROKEN=	"includes <sys/timeb.h> which is deprecated"
+.endif
+
 .if ${PYTHON_SUFFIX} > 36
 EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-cts_remote.py \
 		${PATCHDIR}/extra-patch-cts_watcher.py
 .endif
 
 post-patch: post-patch-common
 	@${REINPLACE_CMD} ${REPLACE_ARGS_GETOPT} ${WRKSRC}/tools/crm_failcount
 	@${REINPLACE_CMD} ${REPLACE_ARGS_GETOPT} ${WRKSRC}/tools/crm_master
 	@${REINPLACE_CMD} ${REPLACE_ARGS_GETOPT} ${WRKSRC}/tools/crm_report.in
 	@${REINPLACE_CMD} ${REPLACE_ARGS_GETOPT} ${WRKSRC}/tools/crm_standby
 
 .include <bsd.port.post.mk>
diff --git a/net/pacemaker1/Makefile.common b/net/pacemaker1/Makefile.common
index a49355190113..ca702b94b28e 100644
--- a/net/pacemaker1/Makefile.common
+++ b/net/pacemaker1/Makefile.common
@@ -1,92 +1,92 @@
 # Created by: David Shane Holden <dpejesh@yahoo.com>
 
 PORTNAME=		pacemaker
 DISTVERSIONPREFIX=	Pacemaker-
 CATEGORIES=		net
 
 MAINTAINER=		egypcio@FreeBSD.org
 COMMENT=		Scalable High-Availability cluster resource manager
 
 LICENSE=		GPLv2
 LICENSE_FILE=		${WRKSRC}/COPYING
 
 BUILD_DEPENDS=		bash:shells/bash \
 			getopt>=0:misc/getopt
 LIB_DEPENDS=		libgnutls.so:security/gnutls \
 			libltdl.so:devel/libltdl \
 			libqb.so:devel/libqb \
 			libuuid.so:misc/e2fsprogs-libuuid \
 			libxml2.so:textproc/libxml2 \
 			libxslt.so:textproc/libxslt
 RUN_DEPENDS=		bash:shells/bash \
 			getopt>=0:misc/getopt \
 			ocf-tester:net-mgmt/resource-agents
 
 CONFLICTS=		heartbeat-[0-9]*
 
 USERS=			hacluster
 GROUPS=			haclient
 
 USE_GITHUB=		yes
 GH_ACCOUNT=		ClusterLabs
 GH_PROJECT=		pacemaker
 
 USES=			autoreconf corosync gmake gnome libtool ncurses pathfix \
 			pkgconfig python:3.6+ shebangfix
 USE_BINUTILS=		yes
 USE_GNOME=		glib20
 USE_LDCONFIG=		yes
 USE_PYTHON=		py3kplist
 USE_RC_SUBR=		${PORTNAME}
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS=		--disable-fatal-warnings \
 			--disable-hardening \
 			--with-corosync \
 			--without-heartbeat
 CONFIGURE_ENV=		BASH_PATH=${LOCALBASE}/bin/bash
 LDFLAGS+=		-B${LOCALBASE}/bin
 
 INSTALL_TARGET=		install-strip
 TEST_TARGET=		check
 
 PATHFIX_MAKEFILEIN=	Makefile.am
 
 SHEBANG_LANG=		sh
 sh_OLD_CMD=		${SH}
 sh_CMD=			${LOCALBASE}/bin/bash
 SHEBANG_FILES=		extra/resources/*
 
-REPLACE_ARGS_OCF=	-e 's,/usr/lib/ocf,${PREFIX}/lib/ocf,'
-
 OPTIONS_DEFINE=		DBUS DOCS MANPAGES SNMP
-
 OPTIONS_DEFAULT=	MANPAGES
 OPTIONS_SUB=		yes
 
 DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
-DBUS_VARS_OFF=		REPLACE_ARGS+="-e 's/HAVE_dbus=1/HAVE_dbus=0/'"
+DBUS_VARS_OFF=		REPLACE_ARGS_DBUS="-e 's/HAVE_dbus=1/HAVE_dbus=0/'"
 
 DOCS_BUILD_DEPENDS=	asciidoc:textproc/asciidoc
 
 MANPAGES_BUILD_DEPENDS=	docbook-xsl>0:textproc/docbook-xsl \
 			help2man:misc/help2man \
 			xsltproc:textproc/libxslt
 
 SNMP_LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
 SNMP_CONFIGURE_WITH=	snmp
 SNMP_USES=		ssl
 
+REPLACE_CMD_ARGS=	-e 's,/usr/lib/ocf,${PREFIX}/lib/ocf,' \
+			${REPLACE_ARGS_DBUS}
+
 # python default version must be set to 2.7 to generate a
 # correct pkg-plist
 maintainer-plist: stage
 	@${MAKE} makeplist \
 	| ${SED} -e '/^\/you/d' \
 		-e '/^etc\/rc.d\/pacemaker/d' \
 		-e 's,^man,%%MANPAGES%%man,g' \
 		-e 's,%%PYTHON_VER%%,2.7,g' \
 		-e 's,^@dir \/var\/lib\/pacemaker\/\(.*\),@dir(\,haclient\,770) \/var\/lib\/pacemaker\/\1,g' \
 		-e 's,^@dir \/var\/log\/pacemaker\(.*\),@dir(\,haclient\,770) \/var\/log\/pacemaker\1,g' \
 	> pkg-plist
 
 post-patch-common:
-	@${REINPLACE_CMD} ${REPLACE_ARGS_OCF} ${WRKSRC}/configure.ac
+	@${REINPLACE_CMD} ${REPLACE_CMD_ARGS} ${WRKSRC}/configure.ac