sync1 script: extend to MERGED area
www/jetty: FreeBSD took our modification, remove
www/bins: FreeBSD took modification, remove
www/sarg: FreeBSD took modification, remove
graphics/pgplot: FreeBSD took modification: remove
news/noffle: FreeBSD took modification: remove
japanese/kanji1: regenerate diff