From owner-svn-ports-head@FreeBSD.ORG Tue Oct 8 23:25:26 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id E822098E; Tue, 8 Oct 2013 23:25:26 +0000 (UTC) (envelope-from wg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id BB2A32A65; Tue, 8 Oct 2013 23:25:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r98NPQEd039382; Tue, 8 Oct 2013 23:25:26 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r98NPQJZ039381; Tue, 8 Oct 2013 23:25:26 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201310082325.r98NPQJZ039381@svn.freebsd.org> From: William Grzybowski Date: Tue, 8 Oct 2013 23:25:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r329850 - head/multimedia/zoneminder X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Oct 2013 23:25:27 -0000 Author: wg Date: Tue Oct 8 23:25:26 2013 New Revision: 329850 URL: http://svnweb.freebsd.org/changeset/ports/329850 Log: multimedia/zoneminder: link using ffmpeg0 - Link using ffmpeg0 Modified: head/multimedia/zoneminder/Makefile Modified: head/multimedia/zoneminder/Makefile ============================================================================== --- head/multimedia/zoneminder/Makefile Tue Oct 8 23:07:39 2013 (r329849) +++ head/multimedia/zoneminder/Makefile Tue Oct 8 23:25:26 2013 (r329850) @@ -3,7 +3,7 @@ PORTNAME= zoneminder PORTVERSION= 1.25.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia MASTER_SITES= http://www2.zoneminder.com/downloads/ \ http://www.zoneminder.com/downloads/ @@ -18,7 +18,7 @@ RUN_DEPENDS= ${LOCALBASE}/bin/sudo:${POR LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \ netpbm.1:${PORTSDIR}/graphics/netpbm \ pcre.3:${PORTSDIR}/devel/pcre \ - avutil.1:${PORTSDIR}/multimedia/ffmpeg + libavutil0.so:${PORTSDIR}/multimedia/ffmpeg0 BUILD_DEPENDS= ${LOCALBASE}/bin/php-config:${PORTSDIR}/lang/php5-extensions \ p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \ p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql \ @@ -36,6 +36,8 @@ USE_PHP= json mysql session USE_MYSQL= yes USE_RC_SUBR= zoneminder +CFLAGS+= -I${LOCALBASE}/include/ffmpeg0 -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib/ffmpeg0 CONFIGURE_ARGS= --with-mysql=${LOCALBASE} \ --with-webdir=${WWWDIR}/data \ --with-cgidir=${WWWDIR}/cgi-bin \ @@ -110,7 +112,15 @@ post-configure: post-patch: ${REINPLACE_CMD} -e 's,/bin:/usr/bin,/bin:/usr/bin:${LOCALBASE}/bin,g' ${WRKSRC}/scripts/*.pl.in ${REINPLACE_CMD} -e 's,sudo,${LOCALBASE}/bin/sudo,g' ${WRKSRC}/scripts/zmpkg.pl.in - ${REINPLACE_CMD} -e 's," == "," = ",g' ${WRKSRC}/configure + ${REINPLACE_CMD} \ + -e 's," == "," = ",g' \ + -e 's,lavcodec,lavcodec0,g' \ + -e 's,lavformat,lavformat0,g' \ + -e 's,lavutil,lavutil0,g' \ + -e 's,lavdevice,lavdevice0,g' \ + -e 's,lswscale,lswscale0,g' \ + -e 's,^FFMPEG_CFLAGS=.*,,g' \ + ${WRKSRC}/configure ${REINPLACE_CMD} -e 's,ZM_V4L2,ZM_HAS_V4L2,g' ${WRKSRC}//web/skins/classic/views/monitorprobe.php pre-build: