From owner-svn-ports-all@freebsd.org Wed Jul 27 08:01:06 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 25AD4BA6989; Wed, 27 Jul 2016 08:01:06 +0000 (UTC) (envelope-from tz@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id F2C101741; Wed, 27 Jul 2016 08:01:05 +0000 (UTC) (envelope-from tz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u6R815GA003804; Wed, 27 Jul 2016 08:01:05 GMT (envelope-from tz@FreeBSD.org) Received: (from tz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6R814L2003792; Wed, 27 Jul 2016 08:01:04 GMT (envelope-from tz@FreeBSD.org) Message-Id: <201607270801.u6R814L2003792@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tz set sender to tz@FreeBSD.org using -f From: Torsten Zuehlsdorff Date: Wed, 27 Jul 2016 08:01:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r419167 - in head/multimedia/zoneminder: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Jul 2016 08:01:06 -0000 Author: tz Date: Wed Jul 27 08:01:04 2016 New Revision: 419167 URL: https://svnweb.freebsd.org/changeset/ports/419167 Log: multimedia/zoneminder: Upgrade from 1.30.0-rc1 to 1.30.0-rc2 Changes: https://github.com/ZoneMinder/ZoneMinder/releases/tag/v1.30.0-rc2 PR: 210939 Submitted by: Ivan Approved by: pi (mentor) Deleted: head/multimedia/zoneminder/files/patch-src_zm__local__camera.h Modified: head/multimedia/zoneminder/Makefile head/multimedia/zoneminder/distinfo head/multimedia/zoneminder/pkg-plist Modified: head/multimedia/zoneminder/Makefile ============================================================================== --- head/multimedia/zoneminder/Makefile Wed Jul 27 07:53:45 2016 (r419166) +++ head/multimedia/zoneminder/Makefile Wed Jul 27 08:01:04 2016 (r419167) @@ -3,8 +3,8 @@ PORTNAME= zoneminder PORTVERSION= 1.30.0 DISTVERSIONPREFIX=v -DISTVERSIONSUFFIX=-rc1 -PORTREVISION= 1 +DISTVERSIONSUFFIX=-rc2 +PORTREVISION= 2 CATEGORIES= multimedia MAINTAINER= bsd@abinet.ru @@ -31,13 +31,12 @@ RUN_DEPENDS= ${ZM_DEPENDS} \ zip:archivers/zip USE_GITHUB= yes -GH_ACCOUNT= FriendsOfCake:crud -GH_PROJECT= crud:crud -GH_TAGNAME= c3976f1:crud +GH_TUPLE= zoneminder:zoneminder:${DISTVERSIONPREFIX}${PORTVERSION}${DISTVERSIONSUFFIX} \ + FriendsOfCake:crud:c3976f1:crud WRKSRC= ${WRKDIR}/ZoneMinder-${DISTVERSION}${DISTVERSIONSUFFIX} -USES= cmake jpeg mysql perl5 php shebangfix +USES= cmake jpeg mysql perl5 php shebangfix ssl USE_RC_SUBR= zoneminder USE_PHP= json pdo_mysql session gd sockets @@ -76,6 +75,10 @@ CMAKE_ARGS+= -DZM_PERL_MM_PARMS=INSTALLD -DZM_CGIDIR=${WWWDIR}/cgi-bin \ -DZM_CONTENTDIR=${WWWDIR} \ -DHAVE_SENDFILE=0 \ + -DZM_NO_CURL=ON \ + -DZM_NO_LIBVLC=ON \ + -DPCRE_LIBRARIES=0 \ + -DGNUTLS_LIBRARIES=0 \ -DCMAKE_REQUIRED_INCLUDES:STRING="${LOCALBASE}/include" .include @@ -84,6 +87,11 @@ CMAKE_ARGS+= -DZM_PERL_MM_PARMS=INSTALLD CFLAGS+= -msse .endif +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 +LIB_DEPENDS+= libexecinfo.so:devel/libexecinfo +LDFLAGS+= -L${LOCALBASE}/lib +.endif + PKGMESSAGE= ${WRKDIR}/pkg-message post-extract: @@ -92,7 +100,6 @@ post-extract: ${CP} ${FILESDIR}/README.FreeBSD ${PKGMESSAGE} ${REINPLACE_CMD} -e 's|/dev/shm|/tmp|g' ${WRKSRC}/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in ${REINPLACE_CMD} -e 's|E_ALL|E_ALL^E_NOTICE|g' ${WRKSRC}/web/index.php - ${REINPLACE_CMD} -e 's|sizeof(loc_addr.sun_family))+1|sizeof(loc_addr.sun_family)+1)|g' ${WRKSRC}/src/zm_stream.cpp pre-install: ${MKDIR} ${STAGEDIR}${WWWDIR}/images Modified: head/multimedia/zoneminder/distinfo ============================================================================== --- head/multimedia/zoneminder/distinfo Wed Jul 27 07:53:45 2016 (r419166) +++ head/multimedia/zoneminder/distinfo Wed Jul 27 08:01:04 2016 (r419167) @@ -1,5 +1,5 @@ -TIMESTAMP = 1464895954 -SHA256 (zoneminder-zoneminder-v1.30.0-rc1_GH0.tar.gz) = 22d2d80c473b1c00fb36fb70bf352cf72601fc839fcefe87ffa4f5fd5bd5e853 -SIZE (zoneminder-zoneminder-v1.30.0-rc1_GH0.tar.gz) = 9373740 +TIMESTAMP = 1467872384 +SHA256 (zoneminder-zoneminder-v1.30.0-rc2_GH0.tar.gz) = 1dada2d5a622a8c963c27a2a0c1e33487310ba2bdf36a2a19c8e1ea97b904aa3 +SIZE (zoneminder-zoneminder-v1.30.0-rc2_GH0.tar.gz) = 9758905 SHA256 (FriendsOfCake-crud-c3976f1_GH0.tar.gz) = 7dfa29dd6dd95f05bca61bb05033f813828b7ab66f9d8793d306df0dd72471ce SIZE (FriendsOfCake-crud-c3976f1_GH0.tar.gz) = 72961 Modified: head/multimedia/zoneminder/pkg-plist ============================================================================== --- head/multimedia/zoneminder/pkg-plist Wed Jul 27 07:53:45 2016 (r419166) +++ head/multimedia/zoneminder/pkg-plist Wed Jul 27 08:01:04 2016 (r419167) @@ -2973,7 +2973,6 @@ bin/zmx10.pl %%SITE_PERL%%/ZoneMinder.pm %%SITE_PERL%%/ZoneMinder/Base.pm %%SITE_PERL%%/ZoneMinder/Config.pm -%%SITE_PERL%%/ZoneMinder/ConfigAdmin.pm %%SITE_PERL%%/ZoneMinder/ConfigData.pm %%SITE_PERL%%/ZoneMinder/Control.pm %%SITE_PERL%%/ZoneMinder/Control/3S.pm @@ -5968,7 +5967,6 @@ bin/zmx10.pl %%PERL5_MAN3%%/ZoneMinder.3.gz %%PERL5_MAN3%%/ZoneMinder::Base.3.gz %%PERL5_MAN3%%/ZoneMinder::Config.3.gz -%%PERL5_MAN3%%/ZoneMinder::ConfigAdmin.3.gz %%PERL5_MAN3%%/ZoneMinder::ConfigData.3.gz %%PERL5_MAN3%%/ZoneMinder::Control.3.gz %%PERL5_MAN3%%/ZoneMinder::Control::3S.3.gz