Date: Sat, 2 Jun 2007 17:19:27 +0800 (CST) From: Sunpoet Po-Chuan Hsieh <sunpoet@sunpoet.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/113245: [multimedia/ffmpeg] fix NOPORTDOCS and remove conflicts in Makefile Message-ID: <20070602091927.869A31701D@sunpoet.net> Resent-Message-ID: <200706020940.l529e56R073573@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 113245
>Category: ports
>Synopsis: [multimedia/ffmpeg] fix NOPORTDOCS and remove conflicts in Makefile
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Sat Jun 02 09:40:04 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: Sunpoet Po-Chuan Hsieh
>Release: FreeBSD 6.2-STABLE i386
>Organization:
SUNPOET.net
>Environment:
System: FreeBSD IRIS.sunpoet.net 6.2-STABLE FreeBSD 6.2-STABLE #4: Sat Jun 2 09:25:54 CST 2007 sunpoet@IRIS.sunpoet.net:/usr/obj/usr/src/sys/sunpoet i386
>Description:
1. Fix make build if NOPORTDOCS is set.
2. Remove conflicts of WITH/WITHOUT IPV6/VORBIS/THEORA.
(according to help messages in pre-everything::)
>How-To-Repeat:
>Fix:
--- /usr/ports/multimedia/ffmpeg/Makefile.orig Fri Jun 1 18:07:24 2007
+++ /usr/ports/multimedia/ffmpeg/Makefile Sat Jun 2 17:07:23 2007
@@ -40,7 +40,7 @@
CONFLICTS= ffmpeg-[0-9]*
-MAN1= ffmpeg.1
+FFMPEG_MAN1= ffmpeg.1
##
DOC_FILES= COPYING Changelog README
@@ -102,7 +102,7 @@
--enable-libfaadbin
.endif
USE_RC_SUBR= ffserver
-MAN1+= ffserver.1
+FFMPEG_MAN1+= ffserver.1
#### BROKEN LIST #####
WITHOUT_THEORA= yes
@@ -135,7 +135,7 @@
.ifdef(WITH_SDL) || ${HAVE_SDL:Msdl}
USE_SDL+= sdl
-MAN1+= ffplay.1
+FFMPEG_MAN1+= ffplay.1
PLIST_FILES+= bin/ffplay
.else
@@ -185,6 +185,10 @@
CONFIGURE_ARGS+= --enable-xvid
.endif
+.ifndef(NOPORTDOCS)
+MAN1= ${FFMPEG_MAN1}
+.endif
+
pre-everything::
.ifndef(WITHOUT_A52)
@${ECHO_MSG} 'You can disable liba52 support by defining WITHOUT_LIBA52'
@@ -223,8 +227,8 @@
@${ECHO_MSG} 'by defining WITH_OPTIMIZED_CFLAGS'
@${ECHO_MSG}
.endif
-.ifndef(WITH_VORBIS)
- @${ECHO_MSG} 'Define WITH_VORBIS to enable libvorbisenc VORBIS codec'
+.ifndef(WITHOUT_VORBIS)
+ @${ECHO_MSG} 'Define WITHOUT_VORBIS to enable libvorbisenc VORBIS codec'
@${ECHO_MSG}
.endif
.ifndef(WITH_X264)
@@ -273,7 +277,7 @@
-e 's|(-lImlib2)|-L ${LOCALBASE}/lib \1|' \
${WRKSRC}/vhook/Makefile
.endif
-.if defined(WITH_IPV6)
+.if !defined(WITHOUT_IPV6)
@${REINPLACE_CMD} -E \
-e 's|^(ipv6).*$$|\1=yes|' \
${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
@@ -304,7 +308,7 @@
${WRKSRC}/config.mak \
${WRKSRC}/libavcodec/Makefile
.endif
-.ifndef(WITH_THEORA)
+.ifdef(WITHOUT_THEORA)
@${REINPLACE_CMD} -E \
-e 's|^(CONFIG_LIBTHEORA).*$$|\1=no|' \
${WRKSRC}/config.mak
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20070602091927.869A31701D>