View | Details | Raw Unified | Return to bug 210939 | Differences between
and this patch

Collapse All | Expand All

(-)/usr/local/poudriere/ports/default/multimedia/zoneminder/Makefile (-7 / +14 lines)
Lines 3-10 Link Here
3
PORTNAME=	zoneminder
3
PORTNAME=	zoneminder
4
PORTVERSION=	1.30.0
4
PORTVERSION=	1.30.0
5
DISTVERSIONPREFIX=v
5
DISTVERSIONPREFIX=v
6
DISTVERSIONSUFFIX=-rc1
6
DISTVERSIONSUFFIX=-rc2
7
PORTREVISION=	1
7
PORTREVISION=	2
8
CATEGORIES=	multimedia
8
CATEGORIES=	multimedia
9
9
10
MAINTAINER=	bsd@abinet.ru
10
MAINTAINER=	bsd@abinet.ru
Lines 31-43 Link Here
31
		zip:archivers/zip
31
		zip:archivers/zip
32
32
33
USE_GITHUB=	yes
33
USE_GITHUB=	yes
34
GH_ACCOUNT=	FriendsOfCake:crud
34
GH_TUPLE=	zoneminder:zoneminder:${DISTVERSIONPREFIX}${PORTVERSION}${DISTVERSIONSUFFIX} \
35
GH_PROJECT=	crud:crud
35
		FriendsOfCake:crud:c3976f1:crud
36
GH_TAGNAME=	c3976f1:crud
37
36
38
WRKSRC=		${WRKDIR}/ZoneMinder-${DISTVERSION}${DISTVERSIONSUFFIX}
37
WRKSRC=		${WRKDIR}/ZoneMinder-${DISTVERSION}${DISTVERSIONSUFFIX}
39
38
40
USES=		cmake jpeg mysql perl5 php shebangfix
39
USES=		cmake jpeg mysql perl5 php shebangfix ssl
41
USE_RC_SUBR=	zoneminder
40
USE_RC_SUBR=	zoneminder
42
USE_PHP=	json pdo_mysql session gd sockets
41
USE_PHP=	json pdo_mysql session gd sockets
43
42
Lines 76-81 Link Here
76
		-DZM_CGIDIR=${WWWDIR}/cgi-bin \
75
		-DZM_CGIDIR=${WWWDIR}/cgi-bin \
77
		-DZM_CONTENTDIR=${WWWDIR} \
76
		-DZM_CONTENTDIR=${WWWDIR} \
78
		-DHAVE_SENDFILE=0 \
77
		-DHAVE_SENDFILE=0 \
78
		-DZM_NO_CURL=ON \
79
		-DZM_NO_LIBVLC=ON \
80
		-DPCRE_LIBRARIES=0 \
81
		-DGNUTLS_LIBRARIES=0 \
79
		-DCMAKE_REQUIRED_INCLUDES:STRING="${LOCALBASE}/include"
82
		-DCMAKE_REQUIRED_INCLUDES:STRING="${LOCALBASE}/include"
80
83
81
.include <bsd.port.pre.mk>
84
.include <bsd.port.pre.mk>
Lines 84-89 Link Here
84
CFLAGS+=	-msse
87
CFLAGS+=	-msse
85
.endif
88
.endif
86
89
90
.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000
91
LIB_DEPENDS+=	libexecinfo.so:devel/libexecinfo
92
LDFLAGS+=	-L${LOCALBASE}/lib
93
.endif
94
87
PKGMESSAGE=	${WRKDIR}/pkg-message
95
PKGMESSAGE=	${WRKDIR}/pkg-message
88
96
89
post-extract:
97
post-extract:
Lines 92-98 Link Here
92
	${CP} ${FILESDIR}/README.FreeBSD ${PKGMESSAGE}
100
	${CP} ${FILESDIR}/README.FreeBSD ${PKGMESSAGE}
93
	${REINPLACE_CMD} -e 's|/dev/shm|/tmp|g' ${WRKSRC}/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
101
	${REINPLACE_CMD} -e 's|/dev/shm|/tmp|g' ${WRKSRC}/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
94
	${REINPLACE_CMD} -e 's|E_ALL|E_ALL^E_NOTICE|g' ${WRKSRC}/web/index.php
102
	${REINPLACE_CMD} -e 's|E_ALL|E_ALL^E_NOTICE|g' ${WRKSRC}/web/index.php
95
	${REINPLACE_CMD} -e 's|sizeof(loc_addr.sun_family))+1|sizeof(loc_addr.sun_family)+1)|g' ${WRKSRC}/src/zm_stream.cpp
96
103
97
pre-install:
104
pre-install:
98
	${MKDIR} ${STAGEDIR}${WWWDIR}/images
105
	${MKDIR} ${STAGEDIR}${WWWDIR}/images
(-)/usr/local/poudriere/ports/default/multimedia/zoneminder/distinfo (-3 / +3 lines)
Lines 1-5 Link Here
1
TIMESTAMP = 1464895954
1
TIMESTAMP = 1467872384
2
SHA256 (zoneminder-zoneminder-v1.30.0-rc1_GH0.tar.gz) = 22d2d80c473b1c00fb36fb70bf352cf72601fc839fcefe87ffa4f5fd5bd5e853
2
SHA256 (zoneminder-zoneminder-v1.30.0-rc2_GH0.tar.gz) = 1dada2d5a622a8c963c27a2a0c1e33487310ba2bdf36a2a19c8e1ea97b904aa3
3
SIZE (zoneminder-zoneminder-v1.30.0-rc1_GH0.tar.gz) = 9373740
3
SIZE (zoneminder-zoneminder-v1.30.0-rc2_GH0.tar.gz) = 9758905
4
SHA256 (FriendsOfCake-crud-c3976f1_GH0.tar.gz) = 7dfa29dd6dd95f05bca61bb05033f813828b7ab66f9d8793d306df0dd72471ce
4
SHA256 (FriendsOfCake-crud-c3976f1_GH0.tar.gz) = 7dfa29dd6dd95f05bca61bb05033f813828b7ab66f9d8793d306df0dd72471ce
5
SIZE (FriendsOfCake-crud-c3976f1_GH0.tar.gz) = 72961
5
SIZE (FriendsOfCake-crud-c3976f1_GH0.tar.gz) = 72961
(-)/usr/local/poudriere/ports/default/multimedia/zoneminder/files/patch-src_zm__local__camera.h (-14 lines)
Lines 1-14 Link Here
1
--- src/zm_local_camera.h.orig 2016-06-07 07:18:44 UTC
2
+++ src/zm_local_camera.h
3
@@ -36,6 +36,11 @@
4
 #include <linux/videodev2.h>
5
 #endif // HAVE_LINUX_VIDEODEV2_H
6
7
+// Required on systems with v4l1 but without v4l2 headers
8
+#ifndef VIDEO_MAX_FRAME
9
+#define VIDEO_MAX_FRAME	32
10
+#endif
11
+
12
 #include "zm_ffmpeg.h"
13
14
 //
(-)/usr/local/poudriere/ports/default/multimedia/zoneminder/pkg-plist (-2 lines)
Lines 2973-2979 Link Here
2973
%%SITE_PERL%%/ZoneMinder.pm
2973
%%SITE_PERL%%/ZoneMinder.pm
2974
%%SITE_PERL%%/ZoneMinder/Base.pm
2974
%%SITE_PERL%%/ZoneMinder/Base.pm
2975
%%SITE_PERL%%/ZoneMinder/Config.pm
2975
%%SITE_PERL%%/ZoneMinder/Config.pm
2976
%%SITE_PERL%%/ZoneMinder/ConfigAdmin.pm
2977
%%SITE_PERL%%/ZoneMinder/ConfigData.pm
2976
%%SITE_PERL%%/ZoneMinder/ConfigData.pm
2978
%%SITE_PERL%%/ZoneMinder/Control.pm
2977
%%SITE_PERL%%/ZoneMinder/Control.pm
2979
%%SITE_PERL%%/ZoneMinder/Control/3S.pm
2978
%%SITE_PERL%%/ZoneMinder/Control/3S.pm
Lines 5968-5974 Link Here
5968
%%PERL5_MAN3%%/ZoneMinder.3.gz
5967
%%PERL5_MAN3%%/ZoneMinder.3.gz
5969
%%PERL5_MAN3%%/ZoneMinder::Base.3.gz
5968
%%PERL5_MAN3%%/ZoneMinder::Base.3.gz
5970
%%PERL5_MAN3%%/ZoneMinder::Config.3.gz
5969
%%PERL5_MAN3%%/ZoneMinder::Config.3.gz
5971
%%PERL5_MAN3%%/ZoneMinder::ConfigAdmin.3.gz
5972
%%PERL5_MAN3%%/ZoneMinder::ConfigData.3.gz
5970
%%PERL5_MAN3%%/ZoneMinder::ConfigData.3.gz
5973
%%PERL5_MAN3%%/ZoneMinder::Control.3.gz
5971
%%PERL5_MAN3%%/ZoneMinder::Control.3.gz
5974
%%PERL5_MAN3%%/ZoneMinder::Control::3S.3.gz
5972
%%PERL5_MAN3%%/ZoneMinder::Control::3S.3.gz

Return to bug 210939