Attachment 99924 Details for Bug 139132 – heartbeat-139132-p3.diff.txt

heartbeat-139132-p3.diff.txt

heartbeat-139132-p3.diff.txt (text/plain; charset=US-ASCII), 2.11 KB, created by ports on 2009-11-18 13:03:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: ports

Created: 2009-11-18 13:03:42 UTC

Size: 2.11 KB

patch

obsolete

>--- Makefile.orig	2009-11-17 09:43:28.772219000 +0000
>+++ Makefile	2009-11-18 12:49:39.312935795 +0000
>@@ -62,7 +62,8 @@
> 		meatclient.8 stonith.8
> 
> OPTIONS=	MGMT "Enable X11 Management Utilities" Off \
>-		LDIRECTORD "Enable Linux Director Daemon" Off
>+		LDIRECTORD "Enable Linux Director Daemon" Off \
>+		DRAC3 "Enable Dell DRACIII Stonith Device" Off
> 
> .include <bsd.port.pre.mk>
> 
>@@ -91,6 +92,19 @@
> PLIST_SUB+=		LDIRECTORD="@comment "
> .endif
> 
>+.if defined(WITH_DRAC3) || exists (${PREFIX}/lib/libcurl.so)
>+USE_CURL=	yes
>+PLIST_SUB+=	DRAC3=""
>+.else
>+PLIST_SUB+=	DRAC3="@comment"
>+.endif
>+
>+.if defined(NOPORTDOCS)
>+PLIST_SUB+=		NOPORTDOCS="@comment "
>+.else
>+PLIST_SUB+=		NOPORTDOCS=""
>+.endif
>+
> pre-patch:
> 	@${MV} ${WRKDIR}/Heartbeat-STABLE-2-1-${DISTNAME} ${WRKSRC}
> 
>@@ -107,7 +121,10 @@
> 	${TAR} -cf libltdl.tar libltdl && \
> 	${RM} -rf libltdl
> 
>-.if !defined(NOPORTDOCS)
>+.if defined(NOPORTDOCS)
>+	@${REINPLACE_CMD} -e 's| doc | |' \
>+		${WRKSRC}/Makefile.am
>+.else
> 	@${REINPLACE_CMD} -e 's|^$docdir.*doc/$.*|\1${PORTNAME}|' \
> 		${WRKSRC}/configure.in \
> 		${WRKSRC}/doc/Makefile.am
>@@ -117,6 +134,10 @@
> 	@${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
> 
> post-install:
>+
>+	# Install sample configuration if documenation installed
>+
>+.if !defined(NOPORTDOCS)
> 	@if [ ! -f ${PREFIX}/etc/ha.d/authkeys ]; then \
> 		${CP} -p ${DOCSDIR}/authkeys ${PREFIX}/etc/ha.d/authkeys ; \
> 	fi
>@@ -132,6 +153,7 @@
> 		${CP} -p ${DOCSDIR}/logd.cf ${PREFIX}/etc/ha.d/logd.cf ; \
> 	fi
> 	${CP} -p ${DOCSDIR}/logd.cf ${PREFIX}/etc/ha.d/logd.cf.sample
>+.endif
> 
> .if defined(WITH_LDIRECTORD)
> 	@if [ ! -f ${PREFIX}/etc/ha.d/ldirectord.cf ]; then \
>--- pkg-plist.orig	2009-11-17 11:45:53.219361090 +0000
>+++ pkg-plist	2009-11-18 05:14:19.028638377 +0000
>@@ -438,6 +438,9 @@
> 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

Actions: View

Attachments on bug 139132: 99922 | 99923 | 99924 | 99925