Index: head/multimedia/gpac-libgpac/Makefile
===================================================================
--- head/multimedia/gpac-libgpac/Makefile	(revision 296938)
+++ head/multimedia/gpac-libgpac/Makefile	(revision 296939)
@@ -1,91 +1,101 @@
 # New ports collection makefile for:	gpac-libm4systems
 # Date created:		2005-05-04
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	gpac
 PORTVERSION=	0.4.5
-PORTREVISION=	4
+PORTREVISION=	5
 PORTEPOCH=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/${PORTNAME}/GPAC/GPAC%20${PORTVERSION}
 PKGNAMESUFFIX=	-libgpac
 
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Gpac MPEG-4 Systems library and headers
 
 WRKSRC=		${WRKDIR}/gpac
 ALL_TARGET=	lib
 USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
 HAS_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
 BUILD_WRKSRC=	${WRKSRC}/src
 INSTALL_WRKSRC=	${WRKSRC}/bin/gcc
 LIBVER=	1
 
 OPTIONS=	IPV6 "IPv6 support"		on \
 		JPEG "JPEG support"		on \
-		OPENGL "OpenGL support"		on \
+		OPENGL "OpenGL support"		off \
 		OPENSSL "OpenSSL support"	on \
-		PNG "PNG support"		on
+		PNG "PNG support"		on \
+		XVIDEO "Xvideo support (libXv)"	off
 
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-CONFIGURE_ARGS=	--cc="${CC}" --X11-path="${X11BASE}" \
+CONFIGURE_ARGS=	--cc="${CC}" --X11-path="${LOCALBASE}" \
 		--extra-cflags="${CFLAGS}" --extra-ldflags="${LDFLAGS}" \
 		--enable-pic \
+		--disable-wx \
 		--use-js=no --use-a52=no --use-faad=no --use-ffmpeg=no \
 		--use-ft=no --use-mad=no --use-ogg=no \
 		--use-openjpeg=no --use-theora=no --usr-vorbis=no
 
 CONFIGURE_ENV+=	LIBVER="${LIBVER}" PTHREAD_LIBS="${PTHREAD_LIBS}"
 
+.include <bsd.port.options.mk>
+
+.if !defined(WITHOUT_OPENSSL)
+USE_OPENSSL=	yes
+.else
+CONFIGURE_ARGS+=	--disable-ssl
+.endif
+
+.if defined(WITH_OPENGL)
+USE_GL=		gl glu
+.else
+CONFIGURE_ARGS+=	--disable-opengl
+.endif
+
+.if defined(WITH_XVIDEO)
+LIB_DEPENDS+=	Xv.1:${PORTSDIR}/x11/libXv
+.else
+CONFIGURE_ARGS+=	--disable-x11-xv --disable-x11-shm
+.endif
+
 .include <bsd.port.pre.mk>
 
 .if defined(WITHOUT_IPV6)
 CONFIGURE_ARGS+=	--disable-ipv6
 .endif
 
 .if !defined(WITHOUT_JPEG)
 LIB_DEPENDS+=	jpeg.11:${PORTSDIR}/graphics/jpeg
 CONFIGURE_ARGS+=	--use-jpeg=local
 .else
 CONFIGURE_ARGS+=	--use-jpeg=no
-.endif
-
-.if defined(WITHOUT_OPENGL)
-CONFIGURE_ARGS+=	--disable-opengl
-.else
-USE_GL=		gl glu
-.endif
-
-.if !defined(WITHOUT_OPENSSL)
-USE_OPENSSL=	yes
-.else
-CONFIGURE_ARGS+=	--disable-ssl
 .endif
 
 .if !defined(WITHOUT_PNG)
 LIB_DEPENDS+=	png.6:${PORTSDIR}/graphics/png
 CONFIGURE_ARGS+=	--use-png=local
 .else
 CONFIGURE_ARGS+=	--use-png=no
 .endif
 
 post-patch:
 	${CHMOD} +x ${WRKSRC}/configure
 
 do-install:
 	${MKDIR} ${PREFIX}/include/gpac
 	cd ${WRKSRC}/include/gpac && ${FIND} . | \
 		${CPIO} -vpdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/include/gpac
 	${INSTALL_DATA} ${INSTALL_WRKSRC}/libgpac.so.${LIBVER} ${PREFIX}/lib
 	${LN} -sf libgpac.so.${LIBVER} ${PREFIX}/lib/libgpac.so
 	${INSTALL_DATA} ${INSTALL_WRKSRC}/libgpac_static.a ${PREFIX}/lib
 
 .include <bsd.port.post.mk>

Property changes on: head/multimedia/gpac-libgpac/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.23
\ No newline at end of property
+1.24
\ No newline at end of property