From root@cyberbotx.com  Thu Jun 21 19:53:58 2007
Return-Path: <root@cyberbotx.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 4173216A468
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 21 Jun 2007 19:53:58 +0000 (UTC)
	(envelope-from root@cyberbotx.com)
Received: from alnrmhc11.comcast.net (alnrmhc11.comcast.net [204.127.225.91])
	by mx1.freebsd.org (Postfix) with ESMTP id 0658813C469
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 21 Jun 2007 19:53:57 +0000 (UTC)
	(envelope-from root@cyberbotx.com)
Received: from samus.cyberbotx.com ([68.62.97.217])
          by comcast.net (alnrmhc11) with ESMTP
          id <20070621195357b1100js13ve>; Thu, 21 Jun 2007 19:53:57 +0000
Received: from localhost (localhost.cyberbotx.com [127.0.0.1])
	by samus.cyberbotx.com (Postfix) with ESMTP id 5DFB1170D4;
	Thu, 21 Jun 2007 15:53:56 -0400 (EDT)
Received: from samus.cyberbotx.com ([127.0.0.1])
	by localhost (samus.cyberbotx.com [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id CKLn0DfBuso2; Thu, 21 Jun 2007 15:53:42 -0400 (EDT)
Received: from kirby.cyberbotx.com (unknown [192.168.2.2])
	by samus.cyberbotx.com (Postfix) with ESMTP id 7F75117061;
	Thu, 21 Jun 2007 15:53:42 -0400 (EDT)
Received: from localhost (localhost [127.0.0.1])
	by kirby.cyberbotx.com (Postfix) with ESMTP id DFA57C130;
	Thu, 21 Jun 2007 15:54:19 -0400 (EDT)
Received: from kirby.cyberbotx.com ([127.0.0.1])
	by localhost (kirby.cyberbotx.com [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id GddE4oZuqKas; Thu, 21 Jun 2007 15:53:35 -0400 (EDT)
Received: by kirby.cyberbotx.com (Postfix, from userid 0)
	id 8E819C133; Thu, 21 Jun 2007 15:53:35 -0400 (EDT)
Message-Id: <20070621195335.8E819C133@kirby.cyberbotx.com>
Date: Thu, 21 Jun 2007 15:53:35 -0400 (EDT)
From: Naram Qashat <cyberbotx@cyberbotx.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc: multimedia@FreeBSD.org
Subject: [PATCH] multimedia/transcode: chase multimedia/mjpegtools update
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         113921
>Category:       ports
>Synopsis:       [PATCH] multimedia/transcode: chase multimedia/mjpegtools update
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-multimedia
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jun 21 20:00:11 GMT 2007
>Closed-Date:    Thu Jun 28 17:52:22 GMT 2007
>Last-Modified:  Thu Jun 28 18:00:10 GMT 2007
>Originator:     Naram Qashat
>Release:        FreeBSD 6.2-RELEASE-p5 i386
>Organization:
>Environment:
System: FreeBSD kirby.cyberbotx.com 6.2-RELEASE-p5 FreeBSD 6.2-RELEASE-p5 #9: Fri Jun 15 22:26:29 EDT 2007
>Description:
Update to multimedia/transcode to chase the recent multimedia/mjpegtools update
as well as make the port knobs more customizable for users (so they can disable
options even if the respective libraries are installed).

Port maintainer (multimedia@FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- transcode-1.0.3_2.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/multimedia/transcode/Makefile /celes/transcode/Makefile
--- /usr/ports/multimedia/transcode/Makefile	Thu May 31 01:49:09 2007
+++ /celes/transcode/Makefile	Thu Jun 21 15:28:41 2007
@@ -7,7 +7,7 @@
 
 PORTNAME=	transcode
 PORTVERSION=	1.0.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	http://fromani.exit1.org/
 
@@ -48,82 +48,83 @@
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_FREETYPE) || exists(${LOCALBASE}/lib/libfreetype.so)
+.if defined(WITH_FREETYPE) || (exists(${LOCALBASE}/lib/libfreetype.so) && !defined(WITHOUT_FREETYPE))
 LIB_DEPENDS+=	freetype.9:${PORTSDIR}/print/freetype2
 CONFIGURE_ARGS+=	--with-ft-prefix=${LOCALBASE} --enable-freetype2
 .else
 CONFIGURE_ARGS+=	--disable-fttest --enable-freetype=no
 .endif
 
-.if defined(WITH_OGG) || exists(${LOCALBASE}/lib/libogg.so)
+.if defined(WITH_OGG) || (exists(${LOCALBASE}/lib/libogg.so) && !defined(WITHOUT_OGG))
 LIB_DEPENDS+=	ogg.5:${PORTSDIR}/audio/libogg
 CONFIGURE_ARGS+=	--with-ogg-prefix=${LOCALBASE} --enable-ogg
 .else
 CONFIGURE_ARGS+=	--enable-ogg=no
 .endif
 
-.if defined(WITH_BKTR)
+.if defined(WITH_BKTR) && !defined(WITHOUT_BKTR)
 CONFIGURE_ARGS+=	--enable-bktr
 .endif
 
-.if defined(WITH_VORBIS) || exists(${LOCALBASE}/lib/libvorbis.so)
+.if defined(WITH_VORBIS) || (exists(${LOCALBASE}/lib/libvorbis.so) && !defined(WITHOUT_VORBIS))
 LIB_DEPENDS+=	vorbis.3:${PORTSDIR}/audio/libvorbis
 CONFIGURE_ARGS+=	--with-vorbis-prefix=${LOCALBASE} --enable-vorbis
 .else
 CONFIGURE_ARGS+=	--enable-vorbis=no
 .endif
 
-.if defined(WITH_THEORA) || exists(${LOCALBASE}/lib/libtheora.so)
+.if defined(WITH_THEORA) || (exists(${LOCALBASE}/lib/libtheora.so) && !defined(WITHOUT_THEORA))
 LIB_DEPENDS+=	theora.2:${PORTSDIR}/multimedia/libtheora
 CONFIGURE_ARGS+=	--with-theora-prefix=${LOCALBASE} --enable-theora
 .else
 CONFIGURE_ARGS+=	--enable-theora=no
 .endif
 
-.if defined(WITH_IMAGEMAGICK) || exists(${LOCALBASE}/lib/libMagick.so)
+.if defined(WITH_IMAGEMAGICK) || (exists(${LOCALBASE}/lib/libMagick.so) && !defined(WITHOUT_IMAGEMAGICK))
 LIB_DEPENDS+=	Magick.10:${PORTSDIR}/graphics/ImageMagick
 CONFIGURE_ARGS+=	--enable-imagemagick --with-imagemagick-prefix=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=	--enable-imagemagick=no
 .endif
 
-.if defined(WITH_MJPEG) || exists(${LOCALBASE}/lib/liblavjpeg.so)
-LIB_DEPENDS+=	lavjpeg-1.8.0:${PORTSDIR}/multimedia/mjpegtools
+.if defined(WITH_MJPEG) || (exists(${LOCALBASE}/lib/liblavjpeg.so) && !defined(WITHOUT_MJPEG))
+LIB_DEPENDS+=	lavjpeg-1.9:${PORTSDIR}/multimedia/mjpegtools
 CONFIGURE_ARGS+=	--enable-mjpegtools
 .else
 CONFIGURE_ARGS+=	--enable-mjpegtools=no
 .endif
 
-.if defined(WITH_AVIFILE) || exists(${LOCALBASE}/lib/libaviplay.so)
+.if defined(WITH_AVIFILE) || (exists(${LOCALBASE}/lib/libaviplay.so) && !defined(WITHOUT_AVIFILE))
 LIB_DEPENDS+=	aviplay:${PORTSDIR}/multimedia/avifile
 CONFIGURE_ARGS+=	--with-avifile-prefix=${LOCALBASE} --enable-avifile
 .else
 CONFIGURE_ARGS+=	--enable-avifile=no
 .endif
 
-.if defined(WITH_SDL) || ${HAVE_SDL:Msdl}!=""
+.if defined(WITH_SDL) || (${HAVE_SDL:Msdl}!="" && !defined(WITHOUT_SDL))
 USE_SDL+=	sdl
 WITH_LIBDV=	yes
+.undef WITHOUT_LIBDV
 CONFIGURE_ARGS+=	--enable-sdl --with-sdl-prefix=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=	--enable-sdl=no
 .endif
 
-.if !defined(WITHOUT_XML) || ${HAVE_GNOME:Mlibxml2}!=""
+.if defined(WITH_XML) || (${HAVE_GNOME:Mlibxml2}!="" && !defined(WITHOUT_XML))
 USE_GNOME+=	libxml2
 CONFIGURE_ARGS+=	--enable-libxml2 --with-libxml2-prefix=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=	--enable-libxml2=no
 .endif
 
-.if defined(WITH_LIBDV) || exists(${LOCALBASE}/lib/libdv.so)
+.if defined(WITH_LIBDV) || (exists(${LOCALBASE}/lib/libdv.so) && !defined(WITHOUT_LIBDV))
 LIB_DEPENDS+=	dv.4:${PORTSDIR}/multimedia/libdv
 CONFIGURE_ARGS+=	--with-pal-yuv=YV12 --enable-libdv
 .else
 CONFIGURE_ARGS+=	--enable-libdv=no
 .endif
 
-.if defined(WITH_QUICKTIME) || exists(${LOCALBASE}/lib/libquicktime.so)
+.if defined(WITH_QUICKTIME) || (exists(${LOCALBASE}/lib/libquicktime.so) && !defined(WITHOUT_QUICKTIME))
 LIB_DEPENDS+=	quicktime.0:${PORTSDIR}/multimedia/libquicktime
 CONFIGURE_ARGS+=	--enable-libquicktime \
 					--with-libquicktime-prefix=${LOCALBASE} \
@@ -132,17 +133,17 @@
 CONFIGURE_ARGS+=	--enable-libquicktime=no
 .endif
 
-.if defined(WITH_FAME) # Disable.. meh # || exists(${LOCALBASE}/lib/libfame.so)
+.if defined(WITH_FAME) # Disable.. meh # || (exists(${LOCALBASE}/lib/libfame.so) && !defined(WITHOUT_FAME))
 LIB_DEPENDS+=	fame-0.9:${PORTSDIR}/multimedia/libfame
 CONFIGURE_ARGS+=	--with-libfame-prefix=${LOCALBASE} --enable-libfame
 .endif
 
-.if defined(WITH_XVID) || exists(${LOCALBASE}/lib/libxvidcore.so)
+.if defined(WITH_XVID) || (exists(${LOCALBASE}/lib/libxvidcore.so) && !defined(WITHOUT_XVID))
 LIB_DEPENDS+=	xvidcore.4:${PORTSDIR}/multimedia/xvid
 RUN_DEPENDS+=	xvid4conf:${PORTSDIR}/multimedia/xvid4conf
 .endif
 
-.if defined(WITH_LIBA52_DEFAULT) || exists(${LOCALBASE}/lib/liba52.so)
+.if defined(WITH_LIBA52_DEFAULT) || (exists(${LOCALBASE}/lib/liba52.so) && !defined(WITHOUT_LIBA52))
 WITH_LIBA52=	yes
 CONFIGURE_ARGS+=	--enable-a52-default-decoder
 .endif
@@ -154,14 +155,14 @@
 CONFIGURE_ARGS+=	--with-a52=no
 .endif
 
-.if defined(WITH_LAME) || exists(${LOCALBASE}/lib/libmp3lame.so)
+.if defined(WITH_LAME) || (exists(${LOCALBASE}/lib/libmp3lame.so) && !defined(WITHOUT_LAME))
 LIB_DEPENDS+=	mp3lame.0:${PORTSDIR}/audio/lame
 CONFIGURE_ARGS+=	--with-lame-prefix=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=	--disable-lame
 .endif
 
-.if defined(WITH_LZO) || exists(${LOCALBASE}/lib/liblzo.so)
+.if defined(WITH_LZO) || (exists(${LOCALBASE}/lib/liblzo.so) && !defined(WITHOUT_LZO))
 LIB_DEPENDS+=	lzo.1:${PORTSDIR}/archivers/lzo
 CONFIGURE_ARGS+=	--enable-lzo --with-lzo-prefix=${LOCALBASE} \
 					--with-lzo-includes=${LOCALBASE}
@@ -169,7 +170,7 @@
 CONFIGURE_ARGS+=	--enable-lzo=no
 .endif
 
-.if (defined(WITH_DIVX5) && ${ARCH}=="i386") || exists(${LINUXBASE}/usr/lib/libdivxdecore.so)
+.if (defined(WITH_DIVX5) && ${ARCH}=="i386") || (exists(${LINUXBASE}/usr/lib/libdivxdecore.so) && !defined(WITHOUT_DIVX5))
 BUILD_DEPENDS+=	${LINUXBASE}/usr/lib/libdivxdecore.so:${PORTSDIR}/multimedia/linux-divx4linux
 CFLAGS+=	-I${LINUXBASE}/usr/include/divx
 .else
@@ -209,9 +210,9 @@
 	@${ECHO_MSG} "You can enable realtime-previewing by defining WITH_SDL."
 	@${ECHO_MSG} "This implies WITH_LIBDV."
 .endif
-.if !defined(WITHOUT_XML)
+.if !defined(WITH_XML)
 	@${ECHO_MSG}
-	@${ECHO_MSG} "You can disable libxml2-dependent modules by defining WITHOUT_XML."
+	@${ECHO_MSG} "You can enable libxml2-dependent modules by defining WITH_XML."
 .endif
 .if !defined(WITH_LAME)
 	@${ECHO_MSG}
--- transcode-1.0.3_2.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->freebsd-multimedia 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Thu Jun 21 20:00:21 UTC 2007 
Responsible-Changed-Why:  
Over to maintainer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=113921 

From: Edwin Groothuis <edwin@mavetju.org>
To: Naram Qashat <cyberbotx@cyberbotx.com>
Cc: FreeBSD-gnats-submit@FreeBSD.org
Subject: Re: ports/113921: [PATCH] multimedia/transcode: chase multimedia/mjpegtools update
Date: Fri, 22 Jun 2007 07:45:34 +1000

 On Thu, Jun 21, 2007 at 03:53:35PM -0400, Naram Qashat wrote:
 > >Synopsis:       [PATCH] multimedia/transcode: chase multimedia/mjpegtools update
 
 As I did the damage with the mjpegtools update, I've chased the
 library update. I haven't done the rest of this PR.
 
 Edwin
 -- 
 Edwin Groothuis      |            Personal website: http://www.mavetju.org
 edwin@mavetju.org    |              Weblog: http://www.mavetju.org/weblog/
State-Changed-From-To: open->closed  
State-Changed-By: ahze 
State-Changed-When: Thu Jun 28 17:51:40 UTC 2007 
State-Changed-Why:  
Committed, Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=113921 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/113921: commit references a PR
Date: Thu, 28 Jun 2007 17:51:37 +0000 (UTC)

 ahze        2007-06-28 17:51:32 UTC
 
   FreeBSD ports repository
 
   Modified files:
     multimedia/transcode Makefile 
   Log:
   Add WITHOUT_knob to each WITH_knob/test
   
   PR:             ports/113921
   Subbmitted by:  Naram Qashat <cyberbotx@cyberbotx.com>
   
   Revision  Changes    Path
   1.91      +9 -9      ports/multimedia/transcode/Makefile
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
