Pullup ticket 2924 - requested by tron
security update

Revisions pulled up:
- pkgsrc/net/wireshark/Makefile 1.38
- pkgsrc/net/wireshark/distinfo 1.25

   -------------------------------------------------------------------------
   Module Name: pkgsrc
   Committed By: tron
   Date: Wed Oct 28 11:53:40 UTC 2009

   Modified Files:
    pkgsrc/net/wireshark: Makefile distinfo

   Log Message:
   Update "wireshark" package to version 1.2.3. Changes since version 1.2.2:
   - The following vulnerabilities have been fixed. See the security
     advisory for details and a workaround.
     o The Paltalk dissector could crash on alignment-sensitive
       processors. (Bug 3689)
       Versions affected: 1.2.0 to 1.2.2
     o The DCERPC/NT dissector could crash.
       Versions affected: 0.10.10 to 1.2.2
     o The SMB dissector could crash.
       Versions affected: 1.2.0 to 1.2.2
   - The following bugs have been fixed:
     o Wireshark memory leak with each file open and/or display
       filter change. (Bug 2375)
     o DHCP Dissector displays negative lease time. (Bug 2733)
     o Invalid advertised window line on tcptrace style graph. (Bug
       3417)
     o SMB get_dfs_referral referral entry is not dissected
       correctly. (Bug 3542)
     o Error dissecting eMule sourceOBFU message. (Bug 3848)
     o Typos in Diameter XML files. (Bug 3878)
     o RSL dissector for MS Power IE is broken. (Bug 4017)
     o Manifest problem in 1.2.2 Win64 build. (Bug 4024)
     o FIP dissector throws assertion. (Bug 4046)
     o TCAP problem with indefinite length 'components' SEQ OF. (Bug
       4053)
     o GSM MAP: an-APDU not decoded. (Bug 4095)
     o Add "Drag and Drop entries..." message on Columns preferences
       page. (Bug 4099)
     o Editcap -t and -w option parses fractional digits incorrectly.
       (Bug 4162)
   - Updated Protocol Support
     DCERPC NT, DHCP, Diameter, E.212, eDonkey, FIP, IPsec, MGCP, NCP,
     Paltalk, RADIUS, RSL, SBus, SMB, SNMP, SSL, TCP, Teamspeak2, WPS

   To generate a diff of this commit:
   cvs rdiff -u -r1.37 -r1.38 pkgsrc/net/wireshark/Makefile
   cvs rdiff -u -r1.24 -r1.25 pkgsrc/net/wireshark/distinfo

Pullup ticket #2925.

Pullup ticket #2925 - requested by martti
clamav: bug fix update

Revisions pulled up:
- mail/clamav/Makefile 1.97
- mail/clamav/distinfo 1.61
- mail/clamav/patches/patch-ad 1.19
- mail/clamav/patches/patch-af 1.10
---
Module Name: pkgsrc
Committed By: martti
Date: Thu Oct 29 07:06:09 UTC 2009

Modified Files:
pkgsrc/mail/clamav: Makefile distinfo
pkgsrc/mail/clamav/patches: patch-ad patch-af

Log Message:
Updated mail/clamav to 0.95.3

* bug fixes

Pullup ticket #2926.

Pullup ticket #2926 - requested by joerg
mk/pkginstall/usergroup: portability fix

Revisions pulled up:
- mk/pkginstall/usergroup 1.3
---
Module Name: pkgsrc
Committed By: joerg
Date: Thu Oct 29 20:19:28 UTC 2009

Modified Files:
pkgsrc/mk/pkginstall: usergroup

Log Message:
Make sure that MV is properly defined. From PR 42247.

Backout unintentional change which is not related to ticket #2923.

Pullup ticket #2923.

Pullup ticket #2923 - requested by tnn
xulrunner: security update
firefox: security update

Revisions pulled up:
- devel/xulrunner/Makefile 1.24-1.25
- devel/xulrunner/PLIST 1.17-1.18
- devel/xulrunner/distinfo 1.13-1.14
- devel/xulrunner/mozilla-common.mk 1.2
- devel/xulrunner/patches/patch-aa 1.2
- devel/xulrunner/patches/patch-aq 1.3
- devel/xulrunner/patches/patch-ay 1.1
- devel/xulrunner/patches/patch-mf 1.2
- devel/xulrunner/patches/patch-mn 1.2
- devel/xulrunner/patches/patch-nb delete
- devel/xulrunner/patches/patch-nc delete
- devel/xulrunner/patches/patch-pd 1.2
- devel/xulrunner/patches/patch-ra 1.1
- devel/xulrunner/patches/patch-rb 1.1
- devel/xulrunner/patches/patch-rc 1.1
- www/firefox/Makefile 1.60-1.61
- www/firefox/PLIST 1.39
- www/firefox/distinfo delete
- www/firefox/patches/patch-aa delete
- www/firefox/patches/patch-ao delete
- www/firefox/patches/patch-ma delete
- www/firefox/patches/patch-mi delete
- www/firefox/patches/patch-mk delete
- www/firefox/patches/patch-mm delete
- www/firefox/patches/patch-ra delete
- www/firefox/patches/patch-rb delete
- www/firefox/patches/patch-rc delete
---
Module Name: pkgsrc
Committed By: tnn
Date: Sun Oct 11 10:49:57 UTC 2009

Modified Files:
pkgsrc/devel/xulrunner: Makefile PLIST distinfo
pkgsrc/devel/xulrunner/patches: patch-aa
pkgsrc/www/firefox: Makefile
Added Files:
pkgsrc/devel/xulrunner/patches: patch-ay patch-ra patch-rb
patch-rc Removed Files:
pkgsrc/www/firefox: distinfo
pkgsrc/www/firefox/patches: patch-aa patch-ao patch-ma patch-mi
    patch-mk patch-mm patch-ra patch-rb patch-rc

Log Message:
- allow firefox and xulrunner to share some infrastructure
- install headers for plugin and liveconnect (needed by openjdk7-icedtea-plugin)
- bump revision for both packages
---
Module Name: pkgsrc
Committed By: tnn
Date: Wed Oct 28 11:36:36 UTC 2009

Modified Files:
pkgsrc/devel/xulrunner: Makefile PLIST distinfo
mozilla-common.mk pkgsrc/devel/xulrunner/patches: patch-aq patch-mf
patch-mn patch-pd pkgsrc/www/firefox: Makefile PLIST
Removed Files:
pkgsrc/devel/xulrunner/patches: patch-nb patch-nc

Log Message:
Security and bugfix update of firefox (to 3.5.4) and xulrunner (to
1.9.1.4) Also fix broken DESTDIR support.

Fixes the following security issues:
MFSA 2009-64 Crashes with evidence of memory corruption (rv:1.9.1.4/
1.9.0.15) MFSA 2009-63 Upgrade media libraries to fix memory safety bugs
MFSA 2009-62 Download filename spoofing with RTL override
MFSA 2009-61 Cross-origin data theft through document.getSelection()
MFSA 2009-59 Heap buffer overflow in string to number conversion
MFSA 2009-57 Chrome privilege escalation in XPCVariant::VariantDataToJS
() MFSA 2009-56 Heap buffer overflow in GIF color map parser
MFSA 2009-55 Crash in proxy auto-configuration regexp parsing
MFSA 2009-54 Crash with recursive web-worker calls
MFSA 2009-53 Local downloaded file tampering
MFSA 2009-52 Form history vulnerable to stealing

Pullup ticket #2921 - requested by joerg
pkg_install: bug fix

Revisions pulled up:
- pkgtools/pkg_install/files/lib/pkgdb.c 1.36
- pkgtools/pkg_install/files/lib/version.h 1.142
---
Module Name: pkgsrc
Committed By: joerg
Date: Thu Oct 22 22:51:29 UTC 2009

Modified Files:
pkgsrc/pkgtools/pkg_install/files/lib: pkgdb.c version.h

Log Message:
pkg_install-20091009:
Do not overwrite a string with itself using snprintf. This breaks
setting the pkgdb directory internally on Linux. Explicitly check
if the string is the same and otherwise just use xstrdup.

Pullup tickets #2920 and #2921.

Pullup ticket #2920 - requested by taca
typo3: security update

Revisions pulled up:
- www/typo3/Makefile 1.16
- www/typo3/PLIST 1.8
- www/typo3/distinfo 1.10
---
Module Name: pkgsrc
Committed By: taca
Date: Thu Oct 22 14:53:09 UTC 2009

Modified Files:
pkgsrc/www/typo3: Makefile PLIST distinfo

Log Message:
Update www/typo3 package to 4.2.10.  It fixes multiple security issues
found in TYPO3 core.

      http://typo3.org/teams/security/security-bulletins/typo3-sa-2009-016/

2009-10-22  Oliver Hader  <oliver@typo3.org>

* Release of TYPO3 4.2.10

2009-10-22  Ernesto Baschny <ernst@cron-it.de>

* Security Issue #11664: Updated RemoveXSS code to the latest knowledge in this area (thanks to Jigal van Hemert)
* Fixed bug #11586: Potential SQL injection in frontend editing (thanks to Oliver Klee)
* Fixed bug #12309: It was possible to gain access to the Install Tool by only knowing the md5 hash of the password.
* Fixed bug #12310: Encryption key can be recalculated when using normal mailform when [FE][strictFormmail] == 0 (thanks to Oliver Klee)
* Fixed bug #12090: Filenames should be escaped with escapeshellarg before passing them to imagemagick (thanks to Oliver Klee)
* Fixed bug #12303: XSS vulnerability due to not proper sanitizing in function t3lib_div::quoteJSvalue (thanks to Oliver Klee)
* Fixed bug #12304: Frame inclusion in the backend through alt_mod_frameset (thanks to Oliver Klee)
* Fixed bug #12305: XSS vulnerability in view_help.php / tfID parameter (thanks to Oliver Klee)
* Fixed bug #12306: XSS vulnerability in module dispatcher
* Fixed bug #12307: XSS vulnerability in alt_palette (thanks to Oliver Klee)
* Fixed bug #12308: XSS vulnerability in "DB > Full search" functionality
* Fixed bug #10501: XSS vulnerability in the install tool (thanks to Oliver Klee)

2009-10-21  Rupert Germann  <rupi@gmx.li>

* Fixed bug #12280: Error Message while creating empty Folders (thanks to Daniel Schmitzer)
* Fixed bug #12300 (Follow-up to 11995): Output compression breaks prompt for keyboard input in CLI scripts

2009-10-21  Steffen Kamper  <info@sk-typo3.de>

* Fixed bug #12272: Steps disregarded in t3lib_lock (thanks to Dan Osipov)

2009-10-15  Rupert Germann  <rupi@gmx.li>

  * Fixed bug #8728: PHP Warning, if SQL error occurs in class t3lib_db in functions which depend on an existing resultset (thanks to Felix Oertel)

2009-10-11  Rupert Germann  <rupi@gmx.li>

* Fixed bug #10971: Fatal error in impexp module: Call to a member function includeLLFile() on a non-object (thanks to Andre Steiling)

2009-10-10  Rupert Germann  <rupi@gmx.li>

* Fixed bug #12129 (follow-up to bug #11986): Translation update broken with activated output compression (thanks to Steffen Gebert)

2009-09-29  Oliver Hader  <oliver@typo3.org>

* Fixed bug #11433: touch(): Utime failed in install tool (thanks to Steffen Gebert)

Pullup tickets #2918 and #2919.

Pullup ticket #2919 - requested by taca
gd: security patch

Revisions pulled up:
- graphics/gd/Makefile 1.81
- graphics/gd/distinfo 1.30-1.31
- graphics/gd/patches/patch-ad 1.1
---
Module Name: pkgsrc
Committed By: taca
Date: Thu Oct 22 14:39:55 UTC 2009

Modified Files:
pkgsrc/graphics/gd: Makefile distinfo
Added Files:
pkgsrc/graphics/gd/patches: patch-ad

Log Message:
Fix gd library security problem refering PHP's SVN repositry.

http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-3546

Bump PKGREVISION.
(This fix is for php5 only and I don't know about php4.)
---
Module Name: pkgsrc
Committed By: taca
Date: Thu Oct 22 15:20:53 UTC 2009

Modified Files:
pkgsrc/graphics/gd: distinfo

Log Message:
Oops, update distinfo.

Pullup ticket #2918 - requested by taca:
php-gd: security patch

Revisions pulled up:
- graphics/php-gd/Makefile 1.20
- lang/php5/distinfo 1.68
- lang/php5/patches/patch-ay 1.1
---
Module Name: pkgsrc
Committed By: taca
Date: Thu Oct 22 14:37:47 UTC 2009

Modified Files:
pkgsrc/graphics/php-gd: Makefile
pkgsrc/lang/php5: distinfo
Added Files:
pkgsrc/lang/php5/patches: patch-ay

Log Message:
Add a patch from PHP's SVN repositry to fix gd library security problem.

http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-3546>

Pullup ticket #2916.

Pullup ticket #2916 - requested by he
parrot: build fix

Revisions pulled up:
- lang/parrot/Makefile 1.23
- lang/parrot/PLIST.Darwin 1.1
- lang/parrot/PLIST.shared 1.1
- lang/parrot/distinfo 1.17-1.18
- lang/parrot/patches/patch-af 1.3
- lang/parrot/patches/patch-ag 1.3
- lang/parrot/patches/patch-ai 1.1
- lang/parrot/patches/patch-aj 1.1
---
Module Name: pkgsrc
Committed By: he
Date: Wed Oct 21 14:23:14 UTC 2009

Modified Files:
pkgsrc/lang/parrot: Makefile distinfo
Added Files:
pkgsrc/lang/parrot/patches: patch-af patch-ag patch-ai patch-aj

Log Message:
Update parrot from version 1.6.0 to 1.6.0nb1.

Pkgsrc changes:
 o Enable shared libraries for NetBSD, and deal with the resulting
   fallout: tests which are written in C need to point their run-path
   to the build version of the shared libraries.
 o The default is shared libs with .so, except for on Darwin, where
   shared libs are named differently.  The Darwin part is untested.
---
Module Name: pkgsrc
Committed By: he
Date: Thu Oct 22 11:31:44 UTC 2009

Modified Files:
pkgsrc/lang/parrot: distinfo

Log Message:
I'm terribly sorry, patch-ai had the incorrect checksum.
This update fixes it.
---
Module Name: pkgsrc
Committed By: he
Date: Thu Oct 22 12:59:58 UTC 2009

Added Files:
pkgsrc/lang/parrot: PLIST.Darwin PLIST.shared

Log Message:
Sorry once again, these two files should have been committed
as part of the 1.6.0nb1 update.

Pullup ticket #2917.

Pullup ticket #2917 - requested by joerg
nbpatch: portability fix

Revisions pulled up:
- devel/nbpatch/Makefile 1.4
- devel/nbpatch/files/inp.c 1.6
---
Module Name: pkgsrc
Committed By: joerg
Date: Wed Oct 21 17:17:04 UTC 2009

Modified Files:
pkgsrc/devel/nbpatch: Makefile
pkgsrc/devel/nbpatch/files: inp.c

Log Message:
nbpatch-20091021:
Do not try to mmap a zero length file. This can fail e.g. on Solaris.

Pullup ticket #2915.

Pullup ticket #2915 - requested by sborrill
xlockmore: build fix
xlockmore-lite: build fix

Revisions pulled up:
- x11/xlockmore-lite/Makefile 1.12
- x11/xlockmore/Makefile 1.80
- x11/xlockmore/Makefile.common 1.55
---
Module Name: pkgsrc
Committed By: sborrill
Date: Tue Oct 20 13:15:29 UTC 2009

Modified Files:
pkgsrc/x11/xlockmore: Makefile Makefile.common
pkgsrc/x11/xlockmore-lite: Makefile

Log Message:
Set app-defaults folder so it is in  (previously tried to install
in /usr/lib).
Bump PKGREVISION

Pullup tickets #2913 and #2914.

Pullup ticket #2914 - requested by joerg
unbound: security update

Revisions pulled up:
- net/unbound/Makefile 1.5
- net/unbound/distinfo 1.5
---
Module Name: pkgsrc
Committed By: joerg
Date: Mon Oct 19 17:03:33 UTC 2009

Modified Files:
pkgsrc/net/unbound: Makefile distinfo

Log Message:
Update to unbound-1.3.4:
- Fixed bug where NSEC3 signature was not checked. This meant that
  a DS could be spoofed away by a carefully crafted packet.
  A downgrade attack on existing secure delegations.
- updated iana port list.

Pullup ticket #2913 - requested by tez
xpdf: security patch

Revisions pulled up:
- print/xpdf/Makefile 1.68
- print/xpdf/distinfo 1.35
---
Module Name:    pkgsrc
Committed By:   tez
Date:           Fri Oct 16 19:36:29 UTC 2009

Modified Files:
        pkgsrc/print/xpdf: Makefile distinfo

Log Message:
update to xpdf-3.02pl4 to fix CVE-2009-3603, CVE-2009-3604, CVE-2009-3606,
CVE-2009-3608 & CVE-2009-3609

Pullup tickets #2911 and #2912.

Pullup ticket #2912 - requested by hasso
perl5: portability patch

Revisions pulled up:
- lang/perl5/distinfo 1.61
- lang/perl5/patches/patch-db 1.1
---
Module Name:    pkgsrc
Committed By:   hasso
Date:           Tue Oct 13 10:38:31 UTC 2009

Modified Files:
        pkgsrc/lang/perl5: distinfo
Added Files:
        pkgsrc/lang/perl5/patches: patch-db

Log Message:
Fix thread library detection on DragonFly. From corecode via PR 42170.

Pullup ticket #2911 - requested by joerg
py-django: bug-fix update

Revisions pulled up:
- www/py-django/Makefile 1.20
- www/py-django/distinfo 1.11
---
Module Name: pkgsrc
Committed By: joerg
Date: Tue Oct 13 18:19:24 UTC 2009

Modified Files:
pkgsrc/www/py-django: Makefile distinfo

Log Message:
Django 1.0.4:
Fix a regular expression used by the form validation code to not trigger
pathologoical performance cases for certain inputs.

Add a file to track changes on the pkgsrc-2009Q3 branch.

Add files from parent branch HEAD:
doc/TODO

Add files from parent branch HEAD:
devel/xulrunner/mozilla-common.mk

Add files from parent branch HEAD:
doc/CHANGES-2009

Add files from parent branch HEAD:
www/ikiwiki/Makefile
www/ikiwiki/PLIST
www/ikiwiki/distinfo

Add files from parent branch HEAD:
sysutils/gkrellm/distinfo
sysutils/gkrellm/patches/patch-ap

Add files from parent branch HEAD:
meta-pkgs/kde3/DESCR
meta-pkgs/kde4/DESCR
meta-pkgs/matchbox/DESCR
meta-pkgs/php4-extensions/DESCR
meta-pkgs/php5-extensions/DESCR
meta-pkgs/web-server/DESCR
meta-pkgs/windowmaker-desktop/DESCR

Add files from parent branch HEAD:
audio/abcmidi/Makefile

Add files from parent branch HEAD:
filesystems/fuse-encfs/Makefile

Add files from parent branch HEAD:
www/typolight27-translations/Makefile
www/typolight27-translations/PLIST.no
www/typolight27-translations/distinfo
www/typolight27-translations/options.mk

Add files from parent branch HEAD:
www/firefox/Makefile

Add files from parent branch HEAD:
databases/php-sqlite/Makefile

Add files from parent branch HEAD:
print/py-Pdf/Makefile

Add files from parent branch HEAD:
print/tex-prosper/Makefile

Add files from parent branch HEAD:
lang/php5/Makefile.common

Add files from parent branch HEAD:
databases/php-pdo/Makefile

Add files from parent branch HEAD:
textproc/php5-xsl/Makefile

Add files from parent branch HEAD:
textproc/xt/Makefile

Add files from parent branch HEAD:
cad/verilog/distinfo
cad/verilog/patches/patch-aa

Add files from parent branch HEAD:
math/octave/distinfo
math/octave/patches/patch-aa
math/octave/patches/patch-an
math/octave/patches/patch-ao

Add files from parent branch HEAD:
pkgtools/pkg_install/files/admin/main.c
pkgtools/pkg_install/files/lib/version.h

Add files from parent branch HEAD:
devel/generate/Makefile

Add files from parent branch HEAD:
databases/gnats/Makefile
databases/gnats/distinfo
databases/gnats/patches/patch-ah

Add files from parent branch HEAD:
devel/gnustep-make/Makefile
devel/gnustep-make/gnustep.mk

Add files from parent branch HEAD:
mail/getmail/Makefile
mail/getmail/distinfo

Add files from parent branch HEAD:
meta-pkgs/Makefile

Add files from parent branch HEAD:
graphics/Makefile
misc/Makefile
x11/Makefile

Add files from parent branch HEAD:
lang/ocaml/hacks.mk

Add files from parent branch HEAD:
math/scilab/Makefile

Add files from parent branch HEAD:
lang/tcl-itcl-current/Makefile

Add files from parent branch HEAD:
security/libprelude/Makefile.common
security/libpreludedb/Makefile.common

Add files from parent branch HEAD:
security/libprelude-lua/Makefile
security/libprelude-perl/Makefile
security/libprelude-python/Makefile
security/libprelude-ruby/Makefile
security/libprelude/Makefile
security/libpreludedb-mysql/Makefile
security/libpreludedb-perl/Makefile
security/libpreludedb-pgsql/Makefile
security/libpreludedb-python/Makefile
security/libpreludedb-sqlite3/Makefile
security/libpreludedb/Makefile

Add files from parent branch HEAD:
devel/silc-toolkit/distinfo
devel/silc-toolkit/patches/patch-ab

Add files from parent branch HEAD:
www/jalbum/Makefile

Add files from parent branch HEAD:
mail/faces/distinfo
mail/faces/patches/patch-ab
mail/faces/patches/patch-ac

Add files from parent branch HEAD:
security/cy2-saml/Makefile

Add files from parent branch HEAD:
print/tex-musixtex/Makefile

Add files from parent branch HEAD:
ham/usrp-docs/Makefile
ham/usrp-docs/PLIST

Add files from parent branch HEAD:
mbone/vic-devel/Makefile

Add files from parent branch HEAD:
math/vista/Makefile

Add files from parent branch HEAD:
multimedia/xfmedia/Makefile

Add files from parent branch HEAD:
games/xgalaga/Makefile

Add files from parent branch HEAD:
audio/xmms-dflowers/distinfo
audio/xmms-dflowers/patches/patch-aa

Add files from parent branch HEAD:
audio/xmms-dscope/distinfo
audio/xmms-dscope/patches/patch-aa

Add files from parent branch HEAD:
audio/xmms-dspectogram/distinfo
audio/xmms-dspectogram/patches/patch-aa

Add files from parent branch HEAD:
audio/xmms-dspectral/distinfo
audio/xmms-dspectral/patches/patch-aa

Add files from parent branch HEAD:
audio/xmms-vismsa/distinfo
audio/xmms-vismsa/patches/patch-aa

Add files from parent branch HEAD:
x11/xjman/Makefile

Add files from parent branch HEAD:
www/typolight27-translations/PLIST.ru
www/typolight27-translations/PLIST.uk

Add files from parent branch HEAD:
pkgtools/pkg_install/files/add/add.h
pkgtools/pkg_install/files/add/main.c
pkgtools/pkg_install/files/add/perform.c
pkgtools/pkg_install/files/admin/pkg_admin.1
pkgtools/pkg_install/files/admin/pkg_admin.cat1
pkgtools/pkg_install/files/lib/parse-config.c
pkgtools/pkg_install/files/lib/pkg_install.conf.5.in
pkgtools/pkg_install/files/lib/pkg_install.conf.cat5.in

Add files from parent branch HEAD:
editors/emacs-nox11/Makefile
editors/emacs/Makefile
editors/emacs/distinfo
editors/emacs/patches/patch-aa
editors/emacs/patches/patch-ab
editors/emacs/patches/patch-ac
editors/emacs/patches/patch-af

Add files from parent branch HEAD:
editors/emacs22-nox11/Makefile
editors/emacs22/Makefile
editors/emacs22/distinfo
editors/emacs22/patches/patch-ac

Add files from parent branch HEAD:
devel/libgnomeui/Makefile

Add files from parent branch HEAD:
databases/php-pdo_dblib/Makefile
databases/php-pdo_mysql/Makefile
databases/php-pdo_odbc/Makefile
databases/php-pdo_pgsql/Makefile
databases/php-pdo_sqlite/Makefile

Add files from parent branch HEAD:
devel/ruby-mode/Makefile

Add files from parent branch HEAD:
textproc/convertlit/Makefile
textproc/convertlit/distinfo

Add files from parent branch HEAD:
textproc/halibut/Makefile

Add files from parent branch HEAD:
x11/matchbox-panel/Makefile

Add files from parent branch HEAD:
security/botan/Makefile
security/botan/PLIST.NetBSD
security/botan/PLIST.common

Add files from parent branch HEAD:
lang/gauche/Makefile
lang/gauche/PLIST

Add files from parent branch HEAD:
inputmethod/sj3-lib/distinfo
inputmethod/sj3-lib/patches/patch-az
inputmethod/sj3-lib/patches/patch-ba
inputmethod/sj3-lib/patches/patch-bb
inputmethod/sj3-lib/patches/patch-bc
inputmethod/sj3-lib/patches/patch-bd
inputmethod/sj3-lib/patches/patch-be

Add files from parent branch HEAD:
audio/rplay/distinfo
audio/rplay/patches/patch-aj
audio/rplay/patches/patch-ak
audio/rplay/patches/patch-al
audio/rplay/patches/patch-ap

Add files from parent branch HEAD:
devel/xulrunner/PLIST

Add files from parent branch HEAD:
devel/gnustep-objc/Makefile

Add files from parent branch HEAD:
x11/kdebase-runtime4/Makefile
x11/kdebase-runtime4/PLIST

Add files from parent branch HEAD:
mk/install/install.mk

Add files from parent branch HEAD:
www/elinks/Makefile

Add files from parent branch HEAD:
www/typolight27/Makefile.version
www/typolight27/distinfo

Add files from parent branch HEAD:
cad/gnucap/distinfo
cad/gnucap/patches/patch-aa
cad/gnucap/patches/patch-ab
graphics/inkscape/distinfo
graphics/inkscape/patches/patch-al
graphics/inkscape/patches/patch-am
graphics/inkscape/patches/patch-an
graphics/inkscape/patches/patch-ao
graphics/inkscape/patches/patch-ap

Add files from parent branch HEAD:
devel/netcdf/distinfo
devel/netcdf/patches/patch-aa

Add files from parent branch HEAD:
x11/gtk2/Makefile

Add files from parent branch HEAD:
security/libprelude-perl/distinfo

Add files from parent branch HEAD:
mk/buildlink3/show-buildlink3.sh

Add files from parent branch HEAD:
net/openntpd/Makefile