ports/80636: MAINTAINER-UPDATE: www/bricolage

[Rod Taylor]

>Number:         80636
>Category:       ports
>Synopsis:       MAINTAINER-UPDATE: www/bricolage
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu May 05 04:20:02 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Rod Taylor
>Release:        FreeBSD 5.3-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD home 5.3-RELEASE FreeBSD 5.3-RELEASE #7: Tue Jan 25 02:28:10 EST 2005 root at home:/usr/obj/usr/src/sys/HOME amd64


	
>Description:

	Bump the upgrade file structure to deal with a nonexistant directory without complaining.

	Depends on ports/80625.

>How-To-Repeat:
	
>Fix:

	

--- bric.patch2 begins here ---
diff -crN bricolage.new/files/bric_upgrade.sh bricolage/files/bric_upgrade.sh
*** bricolage.new/files/bric_upgrade.sh	Wed May  4 23:51:08 2005
--- bricolage/files/bric_upgrade.sh	Tue Jan 25 01:16:25 2005
***************
*** 12,18 ****
  
  # Ensure the old version exists at the end of the argument list
  OLDVERSION=`echo "$*" | sed -e "s/^.* \([^ ]*\)/\1/"`
! VTEST=`echo "$OLDVERSION" | sed -e "s/^1\.8\.[01234]$/OKAY/"`
  if [ "${VTEST}" != "OKAY" ]
  then
  	echo "The final argument should be the old version of the port, in the format."
--- 12,18 ----
  
  # Ensure the old version exists at the end of the argument list
  OLDVERSION=`echo "$*" | sed -e "s/^.* \([^ ]*\)/\1/"`
! VTEST=`echo "$OLDVERSION" | sed -e "s/^1\.8\.[012]$/OKAY/"`
  if [ "${VTEST}" != "OKAY" ]
  then
  	echo "The final argument should be the old version of the port, in the format."
***************
*** 31,43 ****
  # Now try to upgrade it
  for ver in `grep -A 1000 ${OLDVERSION} ${BRICUPGRADE}/versions.txt | tail -n +2`
  do
! 	if [ -d ${BRICUPGRADE}/${ver} ]
! 	then
! 		for file in `ls ${BRICUPGRADE}/${ver}`
! 		do
! 			${BRICUPGRADE}/${ver}/${file} $@ # Run with our args
! 		done
! 	fi
  done
  
  echo "Upgrade complete"
--- 31,40 ----
  # Now try to upgrade it
  for ver in `grep -A 1000 ${OLDVERSION} ${BRICUPGRADE}/versions.txt | tail -n +2`
  do
! 	for file in `ls ${BRICUPGRADE}/${ver}`
! 	do
! 		${BRICUPGRADE}/${ver}/${file} $@ # Run with our args
! 	done
  done
  
  echo "Upgrade complete"
--- bric.patch2 ends here ---


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