ports/99969: [patch] shells/bash2

[Gabor Kovesdan]

>Number:         99969
>Category:       ports
>Synopsis:       [patch] shells/bash2
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jul 09 17:10:15 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Gabor Kovesdan
>Release:        FreeBSD 5.3-RELEASE-p25 amd64
>Organization:
n/a
>Environment:
>Description:

- Add shells/bash as a conflicting package since they install files to the same
  location
- Bump PORTREVISION
- Portlint cleanup

>How-To-Repeat:
>Fix:

--- shells-bash2.diff begins here ---
Index: Makefile
===================================================================
RCS file: /usr/cvs/ports/shells/bash2/Makefile,v
retrieving revision 1.80
diff -u -r1.80 Makefile
--- Makefile	13 May 2006 04:15:20 -0000	1.80
+++ Makefile	8 Jul 2006 01:32:45 -0000
@@ -8,7 +8,7 @@
 
 PORTNAME=	bash
 PORTVERSION=	2.05b.007
-PORTREVISION?=	4
+PORTREVISION?=	5
 CATEGORIES=	shells
 MASTER_SITES=	${MASTER_SITE_GNU} \
 		ftp://ftp.cwru.edu/pub/bash/
@@ -29,11 +29,14 @@
 MAINTAINER=	obrien at FreeBSD.org
 COMMENT=	The GNU Bourne Again Shell
 
+CONFLICTS=	bash-3*
+
 .include <bsd.port.pre.mk>
 
 LATEST_LINK=	${PORTNAME}2
 WRKSRC=		${WRKDIR}/bash-${PORTVERSION:C/\....$//}
 GNU_CONFIGURE=	Yes
+CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-installed-readline
 .if defined(WITH_STATIC_BASH) || defined(NO_DYNAMICROOT) || (defined(NOSHARED) && ( ${NOSHARED} != "no" && ${NOSHARED} != "NO" ))
 CONFIGURE_ARGS+= --enable-static-link
@@ -61,7 +64,7 @@
 	${LN} -f ${PREFIX}/bin/bash ${PREFIX}/bin/bash2
 	@${MKDIR} ${EXAMPLESDIR}
 	@cd ${WRKSRC}/examples ; ${PAX} -rw . ${EXAMPLESDIR}
-	@${FIND} ${EXAMPLESDIR} -type d -print | xargs chmod a+rx
+	@${FIND} ${EXAMPLESDIR} -type d -print | ${XARGS} ${CHMOD} a+rx
 	@${CHMOD} -R a+r ${EXAMPLESDIR}
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
@@ -76,5 +79,3 @@
 .endif
 
 .include <bsd.port.post.mk>
-
-CONFIGURE_TARGET:=	--build=${CONFIGURE_TARGET}
--- shells-bash2.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: