Fix mismerge by synching with the version in head.

Approved by:	portmgr (erwin)


git-svn-id: svn+ssh://svn.freebsd.org/ports/branches/2014Q2@359243 35697150-7ecd-e111-bb59-0022644237b5
MFH: r354559

Update to r44807 of the FreeBSD docset.

Approved by:	doceng (implicit)


git-svn-id: svn+ssh://svn.freebsd.org/ports/branches/2014Q2@359456 35697150-7ecd-e111-bb59-0022644237b5
MFH: r357873

Update to r45038 of the FreeBSD docset.

Approved by:	doceng (implicit)


git-svn-id: svn+ssh://svn.freebsd.org/ports/branches/2014Q2@359457 35697150-7ecd-e111-bb59-0022644237b5
MFH: r359083

Update to r45106 of the FreeBSD docset (a.k.a. 9.3-R version).

Approved by:	doceng (implicit)


git-svn-id: svn+ssh://svn.freebsd.org/ports/branches/2014Q2@359458 35697150-7ecd-e111-bb59-0022644237b5
MFH: r359687

Add vuln entries for mplayer and mencoder for CVE-2014-4610
(integer overflow in ffmpeg's lzo code)

Approved by:	portmgr(miwi), mentors (implicit)


git-svn-id: svn+ssh://svn.freebsd.org/ports/branches/2014Q2@359698 35697150-7ecd-e111-bb59-0022644237b5