portmaster patch failing in 3 places

[mexas]

updating to portmaster 3.12.1
the patch is from:
https://github.com/pkgng/pkgng/blob/master/ports/patch-portmaster-pkgng

patch < /home/mexas/patch-portmaster-pkgng

Hmm... Looks like a unified diff to me...

The text leading up to this was:

|--- portmaster.sh.in.orig 2012-05-12 12:32:59.760289065 +0200

|+++ portmaster.sh.in 2012-05-12 16:10:44.050502931 +0200

Patching file portmaster.sh.in using Plan A...
Hunk #1 failed at 49.
Hunk #2 succeeded at 136 (offset 11 lines).
Hunk #3 succeeded at 178 (offset 12 lines).
Hunk #4 succeeded at 228 (offset 9 lines).
Hunk #5 succeeded at 315 (offset 12 lines).
Hunk #6 succeeded at 366 (offset 9 lines).
Hunk #7 succeeded at 529 (offset 12 lines).
Hunk #8 succeeded at 546 (offset 9 lines).
Hunk #9 succeeded at 719 (offset 12 lines).
Hunk #10 succeeded at 808 (offset 9 lines).
Hunk #11 succeeded at 883 (offset 13 lines).
Hunk #12 succeeded at 941 (offset 9 lines).
Hunk #13 succeeded at 977 (offset 13 lines).
Hunk #14 succeeded at 1057 (offset 9 lines).
Hunk #15 succeeded at 1161 (offset 13 lines).
Hunk #16 succeeded at 1192 (offset 9 lines).
Hunk #17 succeeded at 1207 (offset 13 lines).
Hunk #18 succeeded at 1304 (offset 9 lines).
Hunk #19 succeeded at 1394 (offset 13 lines).
Hunk #20 succeeded at 1447 (offset 9 lines).
Hunk #21 succeeded at 1475 (offset 13 lines).
Hunk #22 succeeded at 1503 (offset 9 lines).
Hunk #23 succeeded at 1557 (offset 13 lines).
Hunk #24 succeeded at 1603 (offset 9 lines).
Hunk #25 succeeded at 1743 (offset 13 lines).
Hunk #26 succeeded at 1756 (offset 9 lines).
Hunk #27 succeeded at 1783 (offset 13 lines).
Hunk #28 succeeded at 1808 (offset 9 lines).
Hunk #29 succeeded at 1869 (offset 13 lines).
Hunk #30 succeeded at 2210 (offset 9 lines).
Hunk #31 succeeded at 2230 (offset 13 lines).
Hunk #32 succeeded at 2253 (offset 9 lines).
Hunk #33 succeeded at 2273 (offset 13 lines).
Hunk #34 succeeded at 2296 (offset 9 lines).
Hunk #35 succeeded at 2348 (offset 13 lines).
Hunk #36 succeeded at 2361 (offset 9 lines).
Hunk #37 succeeded at 2470 (offset 18 lines).
Hunk #38 succeeded at 2616 (offset 4 lines).
Hunk #39 succeeded at 2711 with fuzz 1 (offset 18 lines).
Hunk #40 failed at 2850.
Hunk #41 succeeded at 2873 (offset 11 lines).
Hunk #42 succeeded at 2890 (offset 18 lines).
Hunk #43 succeeded at 2913 (offset 11 lines).
Hunk #44 succeeded at 2965 (offset 18 lines).
Hunk #45 succeeded at 3075 (offset 15 lines).
Hunk #46 succeeded at 3309 (offset 16 lines).
Hunk #47 succeeded at 3350 (offset 15 lines).
Hunk #48 succeeded at 3366 (offset 20 lines).
Hunk #49 succeeded at 3407 (offset 15 lines).
Hunk #50 succeeded at 3820 (offset 20 lines).
Hunk #51 succeeded at 3836 (offset 15 lines).
Hunk #52 succeeded at 3945 (offset 20 lines).
Hunk #53 succeeded at 3968 (offset 15 lines).
Hunk #54 succeeded at 3993 (offset 21 lines).
Hunk #55 succeeded at 4034 (offset 15 lines).
Hunk #56 failed at 4063.
Hunk #57 succeeded at 4110 (offset 21 lines).
Hunk #58 succeeded at 4172 (offset 15 lines).
Hunk #59 succeeded at 4201 (offset 21 lines).
Hunk #60 succeeded at 4208 with fuzz 1 (offset 15 lines).
Hunk #61 succeeded at 4259 (offset 21 lines).
3 out of 61 hunks failed--saving rejects to portmaster.sh.in.rej
done

cat portmaster.sh.in.rej

---

*** 49,55 ****
#=============== Begin functions we always want to have ===============

version () {

•   echo '' ; echo "===>>> Version 3.11"
  #svn='$FreeBSD: user/dougb/portmaster/portmaster 228452 2011-12-13 06:51:56Z dougb $'
  

  }

--- 49,55 ----
#=============== Begin functions we always want to have ===============

version () {

•   echo '' ; echo "===>>> Version 3.11 (pkgng patch 1.0)"
  #svn='$FreeBSD: user/dougb/portmaster/portmaster 228452 2011-12-13 06:51:56Z dougb $'
  

  }

---

*** 2619,2626 ****
done

            for dep in $build_only_dl_g; do

•                   grep -q "@comment DEPORIGIN:${dep#$pd/}$" $pdb/*/+CONTENTS ||
  

•                           temp_bodlg="$temp_bodlg $dep"
          done
  
          build_only_dl_g=" `uniquify_list $temp_bodlg` "
  

  --- 2850,2862 ----
  done

          for dep in $build_only_dl_g; do
  

•                   if [ -z "$use_pkgng" ]; then
  

•                           grep -q "@comment DEPORIGIN:${dep#$pd/}$" $pdb/*/+CONTENTS ||
  

•                                   temp_bodlg="$temp_bodlg $dep"
  

•                   else
  

•                           [ "`pkg query "%?r" ${dep#$pd/}`" = "1" ] ||
  

•                                   temp_bodlg="$temp_bodlg $dep"
  

•                   fi
          done
  
          build_only_dl_g=" `uniquify_list $temp_bodlg` "
  

  ---

  *** 3758,3786 ****
  fi
  fi

• for file in $preserve_port_files; do

•   mv $file ${file}-new
  

•   mv ${preserve_dir}/${file##*/} $file
  

- oldmd5="MD5:md5 -q $file"

•   new_cont=`pm_mktemp contents`
  

•   while read left right; do
  

•           case "$left" in
  

•           @cwd)           short_file="${file#${right}/}" ;;
  

•           $short_file)    found_it=found_it ; continue;;
  

•           @comment)       if [ -n "$found_it" ]; then
  

•                                   echo -e "${short_file}-new\n$left $right"
  

•                                   echo -e "$short_file\n@comment $oldmd5"
  

•                                   unset found_it
  

•                                   continue
  

•                           fi ;;
  

•           esac
  

•           echo "$left $right"
  

•   done < $pdb/$new_port/+CONTENTS > $new_cont
  

•   pm_install_s $new_cont $contents
  

•   pm_unlink $new_cont
  

•   unset file oldmd5 new_cont left right short_file
  

• done
  if [ -n "$preserve_dir" ]; then
  rmdir $preserve_dir 2>/dev/null
  unset preserve_dir preserve_port_files
  --- 4063,4094 ----
  fi
  fi

• TODO

• if [ -z "$use_pkgng" ]; then

•   for file in $preserve_port_files; do
  

•           mv $file ${file}-new
  

•           mv ${preserve_dir}/${file##*/} $file
  

•           oldmd5="MD5:`md5 -q $file`"
  

•           new_cont=`pm_mktemp contents`
  

•           while read left right; do
  

•                   case "$left" in
  

•                   @cwd)           short_file="${file#${right}/}" ;;
  

•                   $short_file)    found_it=found_it ; continue;;
  

•                   @comment)       if [ -n "$found_it" ]; then
  

•                                           echo -e "${short_file}-new\n$left $right"
  

•                                           echo -e "$short_file\n@comment $oldmd5"
  

•                                           unset found_it
  

•                                           continue
  

•                                   fi ;;
  

•                   esac
  

•                   echo "$left $right"
  

•           done < $pdb/$new_port/+CONTENTS > $new_cont
  

•           pm_install_s $new_cont $contents
  

•           pm_unlink $new_cont
  

•           unset file oldmd5 new_cont left right short_file
  

•   done
  

• fi
  if [ -n "$preserve_dir" ]; then
  rmdir $preserve_dir 2>/dev/null
  unset preserve_dir preserve_port_files

[bdrewery]

This is now fixed. The patch has been updated.

[mexas]

On Sun, Jun 17, 2012 at 06:07:20AM -0700, Bryan Drewery wrote:

This is now fixed. The patch has been updated.

Thanks, now works ok