Module Name:	pkgsrc
Committed By:	ben
Date:		Sun Jan 29 04:25:58 UTC 2006

Modified Files:
	pkgsrc/multimedia/mjpegtools: Makefile PLIST distinfo
Removed Files:
	pkgsrc/multimedia/mjpegtools/patches: patch-aa patch-ab
	pkgsrc/multimedia/mplex: DESCR Makefile PLIST distinfo

Log Message:
Include mplex in the mjpegtools package, and bump PKGREVISION.
Remove mplex as a standalone package, to reduce maintenance.


To generate a diff of this commit:
cvs rdiff -r1.24 -r1.25 pkgsrc/multimedia/mjpegtools/Makefile
cvs rdiff -r1.7 -r1.8 pkgsrc/multimedia/mjpegtools/PLIST
cvs rdiff -r1.9 -r1.10 pkgsrc/multimedia/mjpegtools/distinfo
cvs rdiff -r1.4 -r0 pkgsrc/multimedia/mjpegtools/patches/patch-aa \
    pkgsrc/multimedia/mjpegtools/patches/patch-ab
cvs rdiff -r1.1.1.1 -r0 pkgsrc/multimedia/mplex/DESCR
cvs rdiff -r1.10 -r0 pkgsrc/multimedia/mplex/Makefile
cvs rdiff -r1.3 -r0 pkgsrc/multimedia/mplex/PLIST
cvs rdiff -r1.4 -r0 pkgsrc/multimedia/mplex/distinfo

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