From d3a1b2b72b96d6f832bb39566e2c1f081383f176 Mon Sep 17 00:00:00 2001 From: Adam Weinberger Date: Mon, 6 Sep 2010 20:30:14 +0000 Subject: The rsync completion plugin causes the shell to freeze on amd64. Until that gets resolved, I'm disconnecting the rsync plugin from the build on amd64. PR: ports/150322 Submitted by: ehaupt --- shells/bash-completion/Makefile | 15 +++++++++++++-- shells/bash-completion/pkg-plist | 2 +- 2 files changed, 14 insertions(+), 3 deletions(-) (limited to 'shells/bash-completion') diff --git a/shells/bash-completion/Makefile b/shells/bash-completion/Makefile index 6fffcfb66900..ad0cec8ca4d6 100644 --- a/shells/bash-completion/Makefile +++ b/shells/bash-completion/Makefile @@ -7,6 +7,7 @@ PORTNAME= bash-completion PORTVERSION= 1.2 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= shells MASTER_SITES= http://bash-completion.alioth.debian.org/files/ @@ -21,6 +22,15 @@ RUN_DEPENDS+= bash:${PORTSDIR}/shells/bash GNU_CONFIGURE= yes +.include + +.if ${ARCH} == "amd64" +AMD64_REMOVE_RSYNC= /contrib\/rsync/d +PLIST_SUB+= NOAMD64="@comment " +.else +PLIST_SUB+= NOAMD64="" +.endif + post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g; \ s|/etc/bash_completion|${PREFIX}&|g; \ @@ -31,10 +41,11 @@ post-patch: s|/usr/lib\(/aspell\)|${PREFIX}/share\1|g; \ s|/usr/share/info|&:${PREFIX}/info|g; \ s|\$$(sysconfdir)/profile.d|${PREFIX}/bin|g; \ - s|\(FLAC\)|\1\|flv\|FLV|' \ + s|\(FLAC\)|\1\|flv\|FLV|; \ + ${AMD64_REMOVE_RSYNC}' \ ${WRKSRC}/bash_completion ${WRKSRC}/Makefile.in ${WRKSRC}/contrib/* post-install: @${CAT} ${PKGMESSAGE} -.include +.include diff --git a/shells/bash-completion/pkg-plist b/shells/bash-completion/pkg-plist index 5fc2329a0750..da9385be9452 100644 --- a/shells/bash-completion/pkg-plist +++ b/shells/bash-completion/pkg-plist @@ -124,7 +124,7 @@ etc/bash_completion.d/rpcdebug etc/bash_completion.d/rpm etc/bash_completion.d/rpmcheck etc/bash_completion.d/rrdtool -etc/bash_completion.d/rsync +%%NOAMD64%%etc/bash_completion.d/rsync etc/bash_completion.d/rtcwake etc/bash_completion.d/samba etc/bash_completion.d/sbcl -- cgit v1.2.3