From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Jun 2 09:40:05 2007 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7E84C16A421 for ; Sat, 2 Jun 2007 09:40:05 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.freebsd.org (Postfix) with ESMTP id 5FCA713C468 for ; Sat, 2 Jun 2007 09:40:05 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id l529e5jd073577 for ; Sat, 2 Jun 2007 09:40:05 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id l529e56R073573; Sat, 2 Jun 2007 09:40:05 GMT (envelope-from gnats) Resent-Date: Sat, 2 Jun 2007 09:40:05 GMT Resent-Message-Id: <200706020940.l529e56R073573@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Sunpoet Po-Chuan Hsieh Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id EBC2B16A468 for ; Sat, 2 Jun 2007 09:36:30 +0000 (UTC) (envelope-from sunpoet@sunpoet.net) Received: from sunpoet.net (sunpoet.net [203.204.205.212]) by mx1.freebsd.org (Postfix) with ESMTP id BFFC813C448 for ; Sat, 2 Jun 2007 09:36:30 +0000 (UTC) (envelope-from sunpoet@sunpoet.net) Received: by sunpoet.net (Postfix, from userid 1000) id 869A31701D; Sat, 2 Jun 2007 17:19:27 +0800 (CST) Message-Id: <20070602091927.869A31701D@sunpoet.net> Date: Sat, 2 Jun 2007 17:19:27 +0800 (CST) From: Sunpoet Po-Chuan Hsieh To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/113245: [multimedia/ffmpeg] fix NOPORTDOCS and remove conflicts in Makefile X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Sunpoet Po-Chuan Hsieh List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Jun 2007 09:40:05 -0000 >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: