From hoss@lodestone.org  Sat Jan 24 14:45:57 2004
Return-Path: <hoss@lodestone.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 19AC116A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 24 Jan 2004 14:45:57 -0800 (PST)
Received: from magnet.lodestone.org (boole.math.rochester.edu [128.151.231.14])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6ED8D43D39
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 24 Jan 2004 14:45:50 -0800 (PST)
	(envelope-from hoss@lodestone.org)
Received: by magnet.lodestone.org (Postfix, from userid 1000)
	id 614FC30A; Sat, 24 Jan 2004 17:45:48 -0500 (EST)
Message-Id: <20040124224548.614FC30A@magnet.lodestone.org>
Date: Sat, 24 Jan 2004 17:45:48 -0500 (EST)
From: Hoss Firooznia <hoss@lodestone.org>
Reply-To: Hoss Firooznia <hoss@lodestone.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: amistry@am-productions.biz
Subject: New port skeleton for multimedia/avidemux2 (version 2.0.20)
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         61850
>Category:       ports
>Synopsis:       New port skeleton for multimedia/avidemux2 (version 2.0.20)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pav
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jan 24 14:50:14 PST 2004
>Closed-Date:    Mon Jan 26 17:12:04 PST 2004
>Last-Modified:  Mon Jan 26 17:12:04 PST 2004
>Originator:     Hoss Firooznia
>Release:        FreeBSD 5.2-RELEASE i386
>Organization:
>Environment:
System: FreeBSD compass.lodestone.org 5.2-RELEASE FreeBSD 5.2-RELEASE #2: Wed Jan 14 00:22:49 EST 2004 i386
	
>Description:
   The currently-available port skeleton for multimedia/avidemux2 builds
   version 2.0.18 of the software.  This slightly modified port builds
   the latest version, 2.0.20.
>How-To-Repeat:
	
>Fix:

# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#	avidemux2.0.20
#	avidemux2.0.20/Makefile
#	avidemux2.0.20/distinfo
#	avidemux2.0.20/pkg-descr
#	avidemux2.0.20/pkg-message
#	avidemux2.0.20/pkg-plist
#	avidemux2.0.20/files
#	avidemux2.0.20/files/patch-aa
#	avidemux2.0.20/files/patch-ab
#
echo c - avidemux2.0.20
mkdir -p avidemux2.0.20 > /dev/null 2>&1
echo x - avidemux2.0.20/Makefile
sed 's/^X//' >avidemux2.0.20/Makefile << 'END-of-avidemux2.0.20/Makefile'
X# New ports collection makefile for:    avidemux2
X# Date created:         16 April 2003
X# Whom:                 Anish Mistry
X#                       with help from mean
X#                       updated to 2.0.20 on 24 Jan 2004, <hoss@lodestone.org>
X# $FreeBSD: ports/multimedia/avidemux2/Makefile,v 1.4 2003/12/07 01:27:06 marcus Exp $
X#
X
XPORTNAME=	avidemux2
XPORTVERSION=	2.0.20
XPORTREVISION=	1
XCATEGORIES=	multimedia
XMASTER_SITES=	http://fixounet.free.fr/avidemux/
XDISTNAME=	avidemux-2.0.20
X
XMAINTAINER=	amistry@am-productions.biz
XCOMMENT=	Simple GUI based video editor
X
XLIB_DEPENDS=	mp3lame.0:${PORTSDIR}/audio/lame \
X		mad.2:${PORTSDIR}/audio/mad
XBUILD_DEPENDS=	\
X	${X11BASE}/include/X11/extensions/Xvlib.h:${PORTSDIR}/graphics/xv
X
XUSE_REINPLACE=	yes
XUSE_X_PREFIX=	yes
XUSE_LIBTOOL=	yes
XUSE_GNOME=	gnomeprefix gnomehack gtk20
XGNU_CONFIGURE=	yes
XCONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include \
X		-I${LOCALBASE}/include/ffmpeg \
X		-I${LOCALBASE}/include/a52dec" \
X		LIBFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
X		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
X		PTHREAD_LIBS=${PTHREAD_LIBS} \
X		PTHREAD_CFLAGS=${PTHREAD_CFLAGS}
XCONFIGURE_ARGS=	--disable-warnings
XUSE_GMAKE=	yes
X
X.include <bsd.port.pre.mk>
X
X.if exists(${LOCALBASE}/bin/mpeg2enc)
XWITH_MPEGENC=	yes
X.endif
X
X.if exists(${LOCALBASE}/lib/liba52.so.0)
XWITH_A52=	yes
X.endif
X
X.if exists(${LOCALBASE}/lib/libxvidcore.so.2)
XWITH_XVID=	yes
X.endif
X
X.if defined(WITH_MPEGENC)
XRUN_DEPENDS+=	mpeg2enc:${PORTSDIR}/multimedia/mjpegtools
X.endif
X
X.if defined(WITH_XVID)
XLIB_DEPENDS+=	xvidcore.2:${PORTSDIR}/multimedia/xvid
XCONFIGURE_ARGS+=	--with-xvid-as-decoder
X.endif
X
X.if ${MACHINE_ARCH} != "i386"
XCONFIGURE_ARGS+=	--disable-mmx
X.endif
X
X.if defined(WITH_A52)
XLIB_DEPENDS+=	a52.0:${PORTSDIR}/audio/liba52
X.endif
X
Xpre-everything::
X.if !defined(WITH_MPEGENC)
X	@${ECHO_MSG} "To enable mpeg support define WITH_MPEGENC."
X.endif
X
X.if !defined(WITH_XVID)
X	@${ECHO_MSG} "To enable xvid as the decoder define WITH_XVID."
X.endif
X
X.if !defined(WITH_A52)
X	@${ECHO_MSG} "To enable A/52 support define WITH_A52."
X.endif
X
Xpost-patch:
X	@${TOUCH} ${WRKSRC}/*
X	@${REINPLACE_CMD} 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure ${WRKSRC}/*/*/Makefile
Xpost-configure:
X#	@${SH} ${WRKSRC}/buildLavCodec.sh
X
X.include <bsd.port.post.mk>
END-of-avidemux2.0.20/Makefile
echo x - avidemux2.0.20/distinfo
sed 's/^X//' >avidemux2.0.20/distinfo << 'END-of-avidemux2.0.20/distinfo'
XMD5 (avidemux-2.0.20.tar.gz) = c7070e0a4b506e688d653d159cceeb31
END-of-avidemux2.0.20/distinfo
echo x - avidemux2.0.20/pkg-descr
sed 's/^X//' >avidemux2.0.20/pkg-descr << 'END-of-avidemux2.0.20/pkg-descr'
XAn simple video editor that is built around Xvid and ffmpeg.  Contains
Xvarious filters for deinterlacing, cropping, resizing, etc.  Allows for
Xcutting without re-encoding.  Has the ability to re-encode and re-sample.
X
XWWW: http://fixounet.free.fr/avidemux/
X
X- Anish Mistry
Xamistry@am-productions.biz
XAM Productions http://am-productions.biz
END-of-avidemux2.0.20/pkg-descr
echo x - avidemux2.0.20/pkg-message
sed 's/^X//' >avidemux2.0.20/pkg-message << 'END-of-avidemux2.0.20/pkg-message'
XRemove any encore2.h, encore.h, and decore.h that you may have moved to the
X${PREFIX}/include directory since it may cause the built program to crash
Xwhen opening a file.  
END-of-avidemux2.0.20/pkg-message
echo x - avidemux2.0.20/pkg-plist
sed 's/^X//' >avidemux2.0.20/pkg-plist << 'END-of-avidemux2.0.20/pkg-plist'
Xbin/avidemux2
END-of-avidemux2.0.20/pkg-plist
echo c - avidemux2.0.20/files
mkdir -p avidemux2.0.20/files > /dev/null 2>&1
echo x - avidemux2.0.20/files/patch-aa
sed 's/^X//' >avidemux2.0.20/files/patch-aa << 'END-of-avidemux2.0.20/files/patch-aa'
X--- adm_lavcodec/config.h.orig  Sat Jan 24 16:50:22 2004
X+++ adm_lavcodec/config.h       Sat Jan 24 16:50:38 2004
X@@ -12,8 +12,8 @@
X */
X #define CONFIG_ZLIB 1
X 
X-#define HAVE_MALLOC_H 1
X /*
X+#define HAVE_MALLOC_H 1
X #define HAVE_MEMALIGN 1
X */
X #define SIMPLE_IDCT 1
END-of-avidemux2.0.20/files/patch-aa
echo x - avidemux2.0.20/files/patch-ab
sed 's/^X//' >avidemux2.0.20/files/patch-ab << 'END-of-avidemux2.0.20/files/patch-ab'
X--- configure.orig	Sat Jan 24 17:06:07 2004
X+++ configure	Sat Jan 24 17:06:21 2004
X@@ -22770,10 +22770,6 @@
X _ACEOF
X 
X 
X-cat >>confdefs.h <<\_ACEOF
X-#define EMULATE_FAST_INT 1
X-_ACEOF
X-
X 		echo "BSD uses lrintf"
X 
X else
END-of-avidemux2.0.20/files/patch-ab
exit
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: pav 
State-Changed-When: Sun Jan 25 12:41:06 PST 2004 
State-Changed-Why:  
Could you please resubmit as a unified diff (diff -ruN) ? 

http://www.freebsd.org/cgi/query-pr.cgi?pr=61850 
Responsible-Changed-From-To: freebsd-ports-bugs->pav 
Responsible-Changed-By: pav 
Responsible-Changed-When: Sun Jan 25 12:41:34 PST 2004 
Responsible-Changed-Why:  
I'll handle this. 

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

From: Hoss Firooznia <hoss@lodestone.org>
To: freebsd-gnats-submit@FreeBSD.org
Cc: Pav Lucistnik <pav@FreeBSD.org>, freebsd-ports-bugs@FreeBSD.org
Subject: Re: ports/61850: New port skeleton for multimedia/avidemux2 (version
 2.0.20)
Date: Sun, 25 Jan 2004 15:55:58 -0500 (EST)

 Pav Lucistnik writes:
 
 > Could you please resubmit as a unified diff (diff -ruN) ?
 
 Sure.  Sorry about that.  Here's the diff:
 
 diff -ruN avidemux2/Makefile avidemux2.0.20/Makefile
 --- avidemux2/Makefile	Sat Dec  6 20:27:06 2003
 +++ avidemux2.0.20/Makefile	Sat Jan 24 17:27:04 2004
 @@ -2,15 +2,16 @@
  # Date created:         16 April 2003
  # Whom:                 Anish Mistry
  #                       with help from mean
 +#                       updated to 2.0.20 on 24 Jan 2004, <hoss@lodestone.org>
  # $FreeBSD: ports/multimedia/avidemux2/Makefile,v 1.4 2003/12/07 01:27:06 marcus Exp $
  #
 
  PORTNAME=	avidemux2
 -PORTVERSION=	2.0.18
 +PORTVERSION=	2.0.20
  PORTREVISION=	1
  CATEGORIES=	multimedia
  MASTER_SITES=	http://fixounet.free.fr/avidemux/
 -DISTNAME=	avidemux-2.0.18
 +DISTNAME=	avidemux-2.0.20
 
  MAINTAINER=	amistry@am-productions.biz
  COMMENT=	Simple GUI based video editor
 diff -ruN avidemux2/distinfo avidemux2.0.20/distinfo
 --- avidemux2/distinfo	Thu Dec  4 01:46:36 2003
 +++ avidemux2.0.20/distinfo	Sat Jan 24 16:47:23 2004
 @@ -1 +1 @@
 -MD5 (avidemux-2.0.18.tar.gz) = 5236a00d4a56b25df2c5f28fa8a40ce8
 +MD5 (avidemux-2.0.20.tar.gz) = c7070e0a4b506e688d653d159cceeb31
 diff -ruN avidemux2/files/patch-aa avidemux2.0.20/files/patch-aa
 --- avidemux2/files/patch-aa	Wed Dec 31 19:00:00 1969
 +++ avidemux2.0.20/files/patch-aa	Sat Jan 24 16:53:04 2004
 @@ -0,0 +1,12 @@
 +--- adm_lavcodec/config.h.orig  Sat Jan 24 16:50:22 2004
 ++++ adm_lavcodec/config.h       Sat Jan 24 16:50:38 2004
 +@@ -12,8 +12,8 @@
 + */
 + #define CONFIG_ZLIB 1
 +
 +-#define HAVE_MALLOC_H 1
 + /*
 ++#define HAVE_MALLOC_H 1
 + #define HAVE_MEMALIGN 1
 + */
 + #define SIMPLE_IDCT 1
 diff -ruN avidemux2/files/patch-ab avidemux2.0.20/files/patch-ab
 --- avidemux2/files/patch-ab	Wed Dec 31 19:00:00 1969
 +++ avidemux2.0.20/files/patch-ab	Sat Jan 24 17:06:50 2004
 @@ -0,0 +1,13 @@
 +--- configure.orig	Sat Jan 24 17:06:07 2004
 ++++ configure	Sat Jan 24 17:06:21 2004
 +@@ -22770,10 +22770,6 @@
 + _ACEOF
 +
 +
 +-cat >>confdefs.h <<\_ACEOF
 +-#define EMULATE_FAST_INT 1
 +-_ACEOF
 +-
 + 		echo "BSD uses lrintf"
 +
 + else

From: Pav Lucistnik <pav@FreeBSD.org>
To: freebsd-gnats-submit@FreeBSD.org, hoss@lodestone.org,
	amistry@am-productions.biz
Cc:  
Subject: Re: ports/61850: New port skeleton for multimedia/avidemux2
	(version 2.0.20)
Date: Sun, 25 Jan 2004 22:15:09 +0100

 Dear maintainer of FreeBSD port multimedia/avidemux2, please take a look
 at update at
 
 http://www.freebsd.org/cgi/query-pr.cgi?pr=61850
 
 Do you approve this change?
 
 -- 
 Pav Lucistnik <pav@oook.cz>
               <pav@FreeBSD.org>
 
 Every man is as God made him, ay, and often worse.
   -- Miguel de Cervantes

From: Anish Mistry <amistry@am-productions.biz>
To: pav@FreeBSD.org
Cc: freebsd-gnats-submit@FreeBSD.org, hoss@lodestone.org,
	kris@obsecurity.org
Subject: Re: ports/61850: New port skeleton for multimedia/avidemux2 (version 2.0.20)
Date: Mon, 26 Jan 2004 03:07:39 -0500

 --Boundary-02=_TrMFA1P5+YKWNsu
 Content-Type: text/plain;
   charset="iso-8859-1"
 Content-Transfer-Encoding: quoted-printable
 Content-Description: signed data
 Content-Disposition: inline
 
 On Sunday 25 January 2004 04:15 pm, you wrote:
 > http://www.freebsd.org/cgi/query-pr.cgi?pr=3D61850
 I don't approve of this update.  It doesn't compile correctly on -CURRENT. =
 =20
 I'll follow up with a -CURRENT compatible diff against the 2.0.18_1=20
 skeleton tomorrow.  It will contain the update to 2.0.20 as well as the=20
 libxml2 build failure fix.
 
 =2D-=20
 Anish Mistry
 amistry@am-productions.biz
 AM Productions http://am-productions.biz/
 
 --Boundary-02=_TrMFA1P5+YKWNsu
 Content-Type: application/pgp-signature
 Content-Description: signature
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.3 (FreeBSD)
 
 iD8DBQBAFMrTxqA5ziudZT0RAkTWAJ92bvXeRzbgdtoBBrdPnNtaIC3CKQCfTy+B
 wGjfW9X6KW+rOl+rS/L9Pvg=
 =omq8
 -----END PGP SIGNATURE-----
 
 --Boundary-02=_TrMFA1P5+YKWNsu--
 

From: Anish Mistry <amistry@am-productions.biz>
To: pav@FreeBSD.org
Cc: freebsd-gnats-submit@FreeBSD.org, hoss@lodestone.org,
	kris@obsecurity.org
Subject: Re: ports/61850: New port skeleton for multimedia/avidemux2 (version 2.0.20)
Date: Mon, 26 Jan 2004 18:33:39 -0500

 --Boundary-00=_TPaFAAss8p58pOY
 Content-Type: multipart/signed;
   charset="iso-8859-1";
   protocol="application/pgp-signature";
   micalg=pgp-sha1;
   boundary="Boundary-02=_ePaFA+l1jMf7aw7";
   name=" "
 Content-Transfer-Encoding: 7bit
 
 --Boundary-02=_ePaFA+l1jMf7aw7
 Content-Type: text/plain;
   charset="iso-8859-1"
 Content-Transfer-Encoding: quoted-printable
 Content-Description: signed data
 Content-Disposition: inline
 
 Update skeleton to 2.0.20.  Fixed libxml2 problem.  Fixed libmad problem. =
 =20
 Uses an ugly hack to compile on -CURRENT, but this is fixed the in=20
 author's CVS.  Use new PLIST_FILES.
 =2D-=20
 Anish Mistry
 amistry@am-productions.biz
 AM Productions http://am-productions.biz/
 
 --Boundary-02=_ePaFA+l1jMf7aw7
 Content-Type: application/pgp-signature
 Content-Description: signature
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.3 (FreeBSD)
 
 iD8DBQBAFaPexqA5ziudZT0RAjnEAKDG7pzQREwz3Z8IddJDa3pGMfcjXwCgx5el
 lu7bslBbBtJBkNvDcDq7avo=
 =OW/Y
 -----END PGP SIGNATURE-----
 
 --Boundary-02=_ePaFA+l1jMf7aw7--
 
 --Boundary-00=_TPaFAAss8p58pOY
 Content-Type: text/x-diff;
   charset="iso-8859-1";
   name="avidemux2-2.0.20.patch"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
 	filename="avidemux2-2.0.20.patch"
 
 diff -ruN avidemux2.orig/Makefile avidemux2/Makefile
 --- avidemux2.orig/Makefile	Mon Jan 26 17:52:11 2004
 +++ avidemux2/Makefile	Mon Jan 26 17:55:25 2004
 @@ -6,17 +6,17 @@
  #
  
  PORTNAME=	avidemux2
 -PORTVERSION=	2.0.18
 -PORTREVISION=	1
 +PORTVERSION=	2.0.20
  CATEGORIES=	multimedia
  MASTER_SITES=	http://fixounet.free.fr/avidemux/
 -DISTNAME=	avidemux-2.0.18
 +DISTNAME=	avidemux-2.0.20
  
  MAINTAINER=	amistry@am-productions.biz
  COMMENT=	Simple GUI based video editor
  
  LIB_DEPENDS=	mp3lame.0:${PORTSDIR}/audio/lame \
 -		mad.2:${PORTSDIR}/audio/mad
 +		mad.2:${PORTSDIR}/audio/libmad \
 +		xml2.5:${PORTSDIR}/textproc/libxml2
  BUILD_DEPENDS=	\
  	${X11BASE}/include/X11/extensions/Xvlib.h:${PORTSDIR}/graphics/xv
  
 @@ -35,6 +35,8 @@
  CONFIGURE_ARGS=	--disable-warnings
  USE_GMAKE=	yes
  
 +PLIST_FILES=	bin/avidemux2
 +
  .include <bsd.port.pre.mk>
  
  .if exists(${LOCALBASE}/bin/mpeg2enc)
 @@ -82,7 +84,10 @@
  post-patch:
  	@${TOUCH} ${WRKSRC}/*
  	@${REINPLACE_CMD} 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure ${WRKSRC}/*/*/Makefile
 -post-configure:
 -#	@${SH} ${WRKSRC}/buildLavCodec.sh
 +	@${REINPLACE_CMD} 's|<malloc.h>|<stdlib.h>|g' ${WRKSRC}/adm_lavcodec/*.c
 +.if ${OSVERSION} >= 500000
 +	@${ECHO_MSG} "Remove this ugly hack!"
 +	@${REINPLACE_CMD} 's|#define EMULATE_FAST_INT 1||g' ${WRKSRC}/configure
 +.endif
  
  .include <bsd.port.post.mk>
 diff -ruN avidemux2.orig/distinfo avidemux2/distinfo
 --- avidemux2.orig/distinfo	Mon Jan 26 17:52:11 2004
 +++ avidemux2/distinfo	Mon Jan 26 02:08:40 2004
 @@ -1 +1 @@
 -MD5 (avidemux-2.0.18.tar.gz) = 5236a00d4a56b25df2c5f28fa8a40ce8
 +MD5 (avidemux-2.0.20.tar.gz) = c7070e0a4b506e688d653d159cceeb31
 diff -ruN avidemux2.orig/pkg-plist avidemux2/pkg-plist
 --- avidemux2.orig/pkg-plist	Mon Jan 26 17:52:11 2004
 +++ avidemux2/pkg-plist	Wed Dec 31 19:00:00 1969
 @@ -1 +0,0 @@
 -bin/avidemux2
 
 --Boundary-00=_TPaFAAss8p58pOY--
 
State-Changed-From-To: feedback->closed 
State-Changed-By: pav 
State-Changed-When: Mon Jan 26 17:11:50 PST 2004 
State-Changed-Why:  
I committed maintainer's version, thank for your contribution anyway. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=61850 
>Unformatted:
