svn commit: r419167 - in head/multimedia/zoneminder: . files

[Torsten Zuehlsdorff]

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 <bsd at abinet.ru>
  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 at 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 <bsd.port.pre.mk>
@@ -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