svn commit: r328882 - head/multimedia/ffmpeg1

[William Grzybowski]

Author: wg
Date: Mon Sep 30 22:24:04 2013
New Revision: 328882
URL: http://svnweb.freebsd.org/changeset/ports/328882

Log:
  multimedia/ffmpeg1: get rid of MAN1
  
  - Get rid of MAN1
  - Fix plist for FFSERVER option

Modified:
  head/multimedia/ffmpeg1/Makefile
  head/multimedia/ffmpeg1/pkg-plist

Modified: head/multimedia/ffmpeg1/Makefile
==============================================================================
--- head/multimedia/ffmpeg1/Makefile	Mon Sep 30 22:11:00 2013	(r328881)
+++ head/multimedia/ffmpeg1/Makefile	Mon Sep 30 22:24:04 2013	(r328882)
@@ -183,7 +183,6 @@ FDK_AAC_CONFIGURE_ENABLE=	libfdk-aac
 # ffserver
 .if ${PORT_OPTIONS:MFFSERVER}
 PLIST_SUB+=	FFSERVER=""
-MAN1+=		ffserver${FFMPEG_SUFFIX}.1
 FFPROGS+=	ffserver
 . if ${PORT_OPTIONS:MDOCS}
 DOC_DOCFILES+=	ffserver.html
@@ -264,9 +263,8 @@ SCHROEDINGER_CONFIGURE_ENABLE=	libschroe
 # sdl
 .if ${PORT_OPTIONS:MSDL}
 USE_SDL+=	sdl
-PLIST_FILES+=	bin/ffplay${FFMPEG_SUFFIX}
+PLIST_FILES+=	bin/ffplay${FFMPEG_SUFFIX} man/man1/ffplay${FFMPEG_SUFFIX}.1.gz
 FFPROGS+=	ffplay
-MAN1+=	ffplay${FFMPEG_SUFFIX}.1
 .if ${PORT_OPTIONS:MDOCS}
 DOC_DOCFILES+=	ffplay.html
 .endif

Modified: head/multimedia/ffmpeg1/pkg-plist
==============================================================================
--- head/multimedia/ffmpeg1/pkg-plist	Mon Sep 30 22:11:00 2013	(r328881)
+++ head/multimedia/ffmpeg1/pkg-plist	Mon Sep 30 22:24:04 2013	(r328882)
@@ -127,7 +127,7 @@ libdata/pkgconfig/libswresample%%SUFF%%.
 libdata/pkgconfig/libswscale%%SUFF%%.pc
 man/man1/ffmpeg%%SUFF%%.1.gz
 man/man1/ffprobe%%SUFF%%.1.gz
-man/man1/ffserver%%SUFF%%.1.gz
+%%FFSERVER%%man/man1/ffserver%%SUFF%%.1.gz
 %%DATADIR%%/examples/Makefile
 %%DATADIR%%/examples/README
 %%DATADIR%%/examples/decoding_encoding.c