Module Name:	pkgsrc
Committed By:	salo
Date:		Sat Apr 10 12:23:55 UTC 2004

Modified Files:
	pkgsrc/multimedia/mencoder: Makefile
	pkgsrc/multimedia/mplayer-share: Makefile.common Makefile.depends

Log Message:
Make Matroska support optional, enabled by default.  Per request by veego@

mencoder:
- ride the cdparanoia-related PKGREVISION++
- remove superfluous --disable-nas, already pulled in from Makefile.common


To generate a diff of this commit:
cvs rdiff -r1.7 -r1.8 pkgsrc/multimedia/mencoder/Makefile
cvs rdiff -r1.5 -r1.6 pkgsrc/multimedia/mplayer-share/Makefile.common
cvs rdiff -r1.6 -r1.7 pkgsrc/multimedia/mplayer-share/Makefile.depends

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.