Mon Aug 11 23:10:51 2014 UTC ()
Remove ffplay, ffmpeg; add ffplay1, ffmpeg1 to Makefile.


(wiz)
diff -r1.226 -r1.227 pkgsrc/multimedia/Makefile
diff -r1.2 -r0 pkgsrc/multimedia/ffmpeg/DESCR
diff -r1.123 -r0 pkgsrc/multimedia/ffmpeg/Makefile
diff -r1.39 -r0 pkgsrc/multimedia/ffmpeg/Makefile.common
diff -r1.21 -r0 pkgsrc/multimedia/ffmpeg/PLIST
diff -r1.24 -r0 pkgsrc/multimedia/ffmpeg/buildlink3.mk
diff -r1.75 -r0 pkgsrc/multimedia/ffmpeg/distinfo
diff -r1.28 -r0 pkgsrc/multimedia/ffmpeg/options.mk
diff -r1.13 -r0 pkgsrc/multimedia/ffmpeg/patches/patch-aa
diff -r1.14 -r0 pkgsrc/multimedia/ffmpeg/patches/patch-ac
diff -r1.6 -r0 pkgsrc/multimedia/ffmpeg/patches/patch-ap
diff -r1.19 -r0 pkgsrc/multimedia/ffmpeg/patches/patch-configure
diff -r1.4 -r0 pkgsrc/multimedia/ffplay/DESCR
diff -r1.14 -r0 pkgsrc/multimedia/ffplay/Makefile
diff -r1.2 -r0 pkgsrc/multimedia/ffplay/PLIST

cvs diff -r1.226 -r1.227 pkgsrc/multimedia/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/Makefile 2014/08/09 20:26:40 1.226
+++ pkgsrc/multimedia/Makefile 2014/08/11 23:10:51 1.227
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.226 2014/08/09 20:26:40 wiz Exp $ 1# $NetBSD: Makefile,v 1.227 2014/08/11 23:10:51 wiz Exp $
2# 2#
3 3
4COMMENT= Multimedia utilities 4COMMENT= Multimedia utilities
5 5
6SUBDIR+= acidrip 6SUBDIR+= acidrip
7SUBDIR+= adobe-flash-plugin 7SUBDIR+= adobe-flash-plugin
8SUBDIR+= adobe-flash-plugin11 8SUBDIR+= adobe-flash-plugin11
9SUBDIR+= alevt 9SUBDIR+= alevt
10SUBDIR+= audiocd-kio 10SUBDIR+= audiocd-kio
11SUBDIR+= avidemux 11SUBDIR+= avidemux
12SUBDIR+= bitstream 12SUBDIR+= bitstream
13SUBDIR+= bsdav 13SUBDIR+= bsdav
14SUBDIR+= ccxstream 14SUBDIR+= ccxstream
@@ -17,33 +17,33 @@ SUBDIR+= clutter-gst @@ -17,33 +17,33 @@ SUBDIR+= clutter-gst
17SUBDIR+= deforaos-player 17SUBDIR+= deforaos-player
18SUBDIR+= dirac 18SUBDIR+= dirac
19SUBDIR+= divxplayer 19SUBDIR+= divxplayer
20SUBDIR+= dragon 20SUBDIR+= dragon
21SUBDIR+= dumpmpeg 21SUBDIR+= dumpmpeg
22SUBDIR+= dvb-apps 22SUBDIR+= dvb-apps
23SUBDIR+= dvd-slideshow 23SUBDIR+= dvd-slideshow
24SUBDIR+= dvdauthor 24SUBDIR+= dvdauthor
25SUBDIR+= dvdbackup 25SUBDIR+= dvdbackup
26SUBDIR+= dvdrip 26SUBDIR+= dvdrip
27SUBDIR+= dvdstyler 27SUBDIR+= dvdstyler
28SUBDIR+= dvdview 28SUBDIR+= dvdview
29SUBDIR+= farsight2 29SUBDIR+= farsight2
30SUBDIR+= ffmpeg 
31SUBDIR+= ffmpeg010 30SUBDIR+= ffmpeg010
 31SUBDIR+= ffmpeg1
32SUBDIR+= ffmpeg2 32SUBDIR+= ffmpeg2
33SUBDIR+= ffmpeg2theora 33SUBDIR+= ffmpeg2theora
34SUBDIR+= ffmpegthumbnailer 34SUBDIR+= ffmpegthumbnailer
35SUBDIR+= ffmpegthumbs 35SUBDIR+= ffmpegthumbs
36SUBDIR+= ffplay 36SUBDIR+= ffplay1
37SUBDIR+= ffplay2 37SUBDIR+= ffplay2
38SUBDIR+= flashplayer 38SUBDIR+= flashplayer
39SUBDIR+= fuppes 39SUBDIR+= fuppes
40SUBDIR+= fxtv 40SUBDIR+= fxtv
41SUBDIR+= gecko-mediaplayer 41SUBDIR+= gecko-mediaplayer
42SUBDIR+= ggrab 42SUBDIR+= ggrab
43SUBDIR+= gmediaserver 43SUBDIR+= gmediaserver
44SUBDIR+= gmencoder 44SUBDIR+= gmencoder
45SUBDIR+= gmplayer 45SUBDIR+= gmplayer
46SUBDIR+= gnash 46SUBDIR+= gnash
47SUBDIR+= gnome-media 47SUBDIR+= gnome-media
48SUBDIR+= gnome-mplayer 48SUBDIR+= gnome-mplayer
49SUBDIR+= goggles 49SUBDIR+= goggles

File Deleted: pkgsrc/multimedia/ffmpeg/Attic/DESCR

File Deleted: pkgsrc/multimedia/ffmpeg/Attic/Makefile

File Deleted: pkgsrc/multimedia/ffmpeg/Attic/Makefile.common

File Deleted: pkgsrc/multimedia/ffmpeg/Attic/PLIST

File Deleted: pkgsrc/multimedia/ffmpeg/Attic/buildlink3.mk

File Deleted: pkgsrc/multimedia/ffmpeg/Attic/distinfo

File Deleted: pkgsrc/multimedia/ffmpeg/Attic/options.mk

File Deleted: pkgsrc/multimedia/ffmpeg/patches/Attic/patch-aa

File Deleted: pkgsrc/multimedia/ffmpeg/patches/Attic/patch-ac

File Deleted: pkgsrc/multimedia/ffmpeg/patches/Attic/patch-ap

File Deleted: pkgsrc/multimedia/ffmpeg/patches/Attic/patch-configure

File Deleted: pkgsrc/multimedia/ffplay/Attic/DESCR

File Deleted: pkgsrc/multimedia/ffplay/Attic/Makefile

File Deleted: pkgsrc/multimedia/ffplay/Attic/PLIST