1 files changed, 33 insertions, 28 deletions

diff --git a/multimedia/avifile/pkg-plist b/multimedia/avifile/pkg-plist
index 4c1ff3dc05f4..47a18bdfca9e 100644
--- a/multimedia/avifile/pkg-plist
+++ b/multimedia/avifile/pkg-plist
@@ -2,8 +2,7 @@ bin/avibench
 bin/avicat
 bin/avifile-config
 bin/avimake
-bin/aviplay
-bin/avirecompress
+%%QT%%bin/aviplay
 bin/avitype
 %%WIN32%%bin/mmxnow-config
 include/avifile/Locker.h
@@ -16,7 +15,6 @@ include/avifile/aviplay.h
 include/avifile/avm_map.h
 include/avifile/avm_output.h
 include/avifile/avm_stl.h
-include/avifile/config.h
 include/avifile/configfile.h
 include/avifile/cpuinfo.h
 include/avifile/creators.h
@@ -26,7 +24,7 @@ include/avifile/formats.h
 include/avifile/fourcc.h
 include/avifile/image.h
 include/avifile/infotypes.h
-include/avifile/mmx.h
+%%WIN32%%include/avifile/mmx.h
 include/avifile/playerwidget.h
 include/avifile/plugin.h
 include/avifile/renderer.h
@@ -35,34 +33,41 @@ include/avifile/utils.h
 include/avifile/version.h
 include/avifile/videodecoder.h
 include/avifile/videoencoder.h
-%%WIN32%%include/mmxnow.h
-lib/avifile/libac3pass.la
-lib/avifile/libac3pass.so
-lib/avifile/libaudiodec.la
-lib/avifile/libaudiodec.so
-%%FFMPEG%%lib/avifile/libffmpeg.la
-%%FFMPEG%%lib/avifile/libffmpeg.so
-%%MAD%%lib/avifile/libmad_audiodec.la
-%%MAD%%lib/avifile/libmad_audiodec.so
-lib/avifile/libmjpeg.la
-lib/avifile/libmjpeg.so
-lib/avifile/libmp3lame_audioenc.la
-lib/avifile/libmp3lame_audioenc.so
-lib/avifile/libmpeg_audiodec.la
-lib/avifile/libmpeg_audiodec.so
-%%VORBIS%%lib/avifile/libvorbis_audio.la
-%%VORBIS%%lib/avifile/libvorbis_audio.so
-%%WIN32%%lib/avifile/libwin32.la
-%%WIN32%%lib/avifile/libwin32.so
+include/mmxnow.h
+%%AC3_PASS%%lib/avifile/ac3pass.la
+%%AC3_PASS%%lib/avifile/ac3pass.so
+lib/avifile/audiodec.la
+lib/avifile/audiodec.so
+%%FFMPEG%%lib/avifile/ffmpeg.la
+%%FFMPEG%%lib/avifile/ffmpeg.so
+%%MAD%%lib/avifile/mad_audiodec.la
+%%MAD%%lib/avifile/mad_audiodec.so
+lib/avifile/mjpeg.la
+lib/avifile/mjpeg.so
+%%NOLAME%%lib/avifile/mp3lame_audioenc.la
+%%NOLAME%%lib/avifile/mp3lame_audioenc.so
+%%LAME%%lib/avifile/mp3lamebin_audioenc.la
+%%LAME%%lib/avifile/mp3lamebin_audioenc.so
+lib/avifile/mpeg_audiodec.la
+lib/avifile/mpeg_audiodec.so
+%%VORBIS%%lib/avifile/vorbis_audio.la
+%%VORBIS%%lib/avifile/vorbis_audio.so
+%%WIN32%%lib/avifile/win32.la
+%%WIN32%%lib/avifile/win32.so
+%%XVID%%lib/avifile/xvid.la
+%%XVID%%lib/avifile/xvid.so
+lib/libaviplay-0.7.so.0
+lib/libaviplay.a
 lib/libaviplay.la
 lib/libaviplay.so
-lib/libaviplay.so.6
-lib/libavqt.la
-lib/libavqt.so
-lib/libavqt.so.6
+%%WIN32%%lib/libmmxnow-0.1.so
+%%WIN32%%lib/libmmxnow-0.1.so.0
 %%WIN32%%lib/libmmxnow.la
 %%WIN32%%lib/libmmxnow.so
-%%WIN32%%lib/libmmxnow.so.1
+%%QT%%lib/libqavm-0.7.so.0
+%%QT%%lib/libqavm.a
+%%QT%%lib/libqavm.la
+%%QT%%lib/libqavm.so
 share/avifile/about.ppm
 share/avifile/mute.ppm
 share/avifile/open.ppm