Index: head/x11/electricsheep/Makefile
===================================================================
--- head/x11/electricsheep/Makefile	(revision 109462)
+++ head/x11/electricsheep/Makefile	(revision 109463)
@@ -1,65 +1,66 @@
 # New ports collection makefile for:	electricsheep
 # Date created:				11 Feb 2002
 # Whom:					David Yeske <dyeske@yahoo.com>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	electricsheep
-PORTVERSION=	2.4
-PORTREVISION=	3
+PORTVERSION=	2.5
+PORTREVISION=	0
 CATEGORIES=	x11
 MASTER_SITES=	http://electricsheep.org/
 
 MAINTAINER=	dyeske@yahoo.com
 COMMENT=	A nice distributed screensaver
 
-LIB_DEPENDS=	expat.5:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	expat.5:${PORTSDIR}/textproc/expat2 \
+		jpeg.9:${PORTSDIR}/graphics/jpeg
 RUN_DEPENDS=	xloadimage:${PORTSDIR}/x11/xloadimage \
 		xsetbg:${PORTSDIR}/graphics/xli \
 		curl:${PORTSDIR}/ftp/curl
 
 USE_X_PREFIX=	yes
 USE_SDL=	sdl
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 USE_LIBTOOL_VER=13
 
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} ${PTHREAD_CFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include" \
 		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -L${X11BASE}/lib"
 
 LIBTOOLFILES=	configure mpeg2dec/configure flame/configure
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|sdl-config|sdl11-config|' \
 		${WRKSRC}/mpeg2dec/configure
 
 	@${REINPLACE_CMD} -e \
 		's|/usr/X11R6/lib/xscreensaver/config|${X11BASE}/share/xscreensaver/config|' \
 		${WRKSRC}/Makefile.in
 
 	@${REINPLACE_CMD} -e \
 		's|<SDL/SDL.h>|<SDL11/SDL.h>|' \
 		${WRKSRC}/mpeg2dec/libvo/video_out_sdl.c
 
 	@${REINPLACE_CMD} -e \
 		's|/usr/local/share|${PREFIX}/share/electricsheep|' \
 		${WRKSRC}/electricsheep.c
 
 	@${REINPLACE_CMD} -e \
 		's|-Wall||; \
 		s|CFLAGS=\$$OPT_CFLAGS|#CFLAGS=\$$OPT_CFLAGS|' \
 		${WRKSRC}/mpeg2dec/configure
 
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/electricsheep ${PREFIX}/bin
 	@${INSTALL_PROGRAM} ${WRKSRC}/flame/anim-flame ${PREFIX}/bin
 	@${INSTALL_PROGRAM} ${WRKSRC}/flame/convert-flame ${PREFIX}/bin
 	@${INSTALL_PROGRAM} ${WRKSRC}/flame/hqi-flame ${PREFIX}/bin
 	@${INSTALL_PROGRAM} ${WRKSRC}/flame/pick-flame ${PREFIX}/bin
 	@${INSTALL_PROGRAM} ${WRKSRC}/mpeg2dec/src/mpeg2dec_onroot ${PREFIX}/bin
 	@${INSTALL} -d -m 0755 ${PREFIX}/share/electricsheep
 	@${INSTALL_DATA} ${WRKSRC}/*.tif ${PREFIX}/share/electricsheep
 
 .include <bsd.port.mk>

Property changes on: head/x11/electricsheep/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.11
\ No newline at end of property
+1.12
\ No newline at end of property
Index: head/x11/electricsheep/distinfo
===================================================================
--- head/x11/electricsheep/distinfo	(revision 109462)
+++ head/x11/electricsheep/distinfo	(revision 109463)
@@ -1,2 +1,2 @@
-MD5 (electricsheep-2.4.tar.gz) = 36886181194de0b9776665fb9e8820f4
-SIZE (electricsheep-2.4.tar.gz) = 591369
+MD5 (electricsheep-2.5.tar.gz) = 310aad5d3e4d58e823b24a28791aa553
+SIZE (electricsheep-2.5.tar.gz) = 618906

Property changes on: head/x11/electricsheep/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.4
\ No newline at end of property
+1.5
\ No newline at end of property
Index: head/x11/electricsheep/files/patch-mpeg2dec_libvo_vroot.h
===================================================================
--- head/x11/electricsheep/files/patch-mpeg2dec_libvo_vroot.h	(revision 109462)
+++ head/x11/electricsheep/files/patch-mpeg2dec_libvo_vroot.h	(nonexistent)
@@ -1,14 +0,0 @@
---- mpeg2dec/libvo/vroot.h.orig	Thu Dec 12 04:33:33 2002
-+++ mpeg2dec/libvo/vroot.h	Sun Jan 25 00:42:03 2004
-@@ -98,7 +98,11 @@
- 					__SWM_VROOT, 0, 1, False, XA_WINDOW,
- 					&actual_type, &actual_format,
- 					&nitems, &bytesafter,
-+#ifdef __FreeBSD__		
-+					(void *)&newRoot) == Success
-+#else
- 					(unsigned char **) &newRoot) == Success
-+#endif
- 				    && newRoot) {
- 				    root = *newRoot;
- 				    break;

Property changes on: head/x11/electricsheep/files/patch-mpeg2dec_libvo_vroot.h
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property