ports/121741: LIB_DEPENDS does not work for libraries with '+' in a name

[Max Khon]

>Number:         121741
>Category:       ports
>Synopsis:       LIB_DEPENDS does not work for libraries with '+' in a name
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat Mar 15 17:30:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Max Khon
>Release:        FreeBSD 7.0-STABLE i386
>Organization:
FreeBSD.org
>Environment:

>Description:

LIB_DEPENDS does not work if library name contains '+'

>How-To-Repeat:

Replace BUILD_DEPENDS/RUN_DEPENDS in audio/esperanza with
appropriate LIB_DEPENDS: the depend does not work -- the xmmsclient++.1 library
can not be found during build.

>Fix:

Index: Mk/bsd.port.mk
===================================================================
RCS file: /home/pcvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.591
diff -u -p -r1.591 bsd.port.mk
--- Mk/bsd.port.mk	11 Mar 2008 23:45:04 -0000	1.591
+++ Mk/bsd.port.mk	15 Mar 2008 17:15:56 -0000
@@ -4872,11 +4872,7 @@ lib-depends:
 .if defined(LIB_DEPENDS) && !defined(NO_DEPENDS)
 	@for i in ${LIB_DEPENDS}; do \
 		lib=$${i%%:*}; \
-		case $$lib in \
-			*.*.*)	pattern="`${ECHO_CMD} $$lib | ${SED} -e 's/\./\\\\./g'`" ;;\
-			*.*)	pattern="$${lib%%.*}\.$${lib#*.}" ;;\
-			*)	pattern="$$lib" ;;\
-		esac; \
+		pattern="`${ECHO_CMD} $$lib | ${SED} -e 's/\./\\\\./g' -e 's/+/\\\\+/g'`"\
 		dir=$${i#*:}; \
 		target=$${i##*:}; \
 		if ${TEST} $$dir = $$target; then \


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