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

Mathieu Arnold mat at FreeBSD.org
Tue Nov 11 17:53:38 UTC 2014 

Author: mat
Date: Tue Nov 11 17:53:36 2014
New Revision: 372457
URL: https://svnweb.freebsd.org/changeset/ports/372457
QAT: https://qat.redports.org/buildarchive/r372457/

Log:
  Fix build as a user.
  
  Sponsored by:	Absolight

Modified:
  head/multimedia/zoneminder/Makefile
  head/multimedia/zoneminder/files/patch-Makefile.in
  head/multimedia/zoneminder/pkg-plist

Modified: head/multimedia/zoneminder/Makefile
==============================================================================
--- head/multimedia/zoneminder/Makefile	Tue Nov 11 17:47:06 2014	(r372456)
+++ head/multimedia/zoneminder/Makefile	Tue Nov 11 17:53:36 2014	(r372457)
@@ -110,7 +110,6 @@ BROKEN=	does not compile on 7.X and 8.X
 .endif
 
 post-configure:
-	${MV} ${WRKSRC}/zm.conf ${WRKSRC}/zm.conf.sample
 
 post-patch:
 	${REINPLACE_CMD} -e 's,/bin:/usr/bin,/bin:/usr/bin:${LOCALBASE}/bin,g' ${WRKSRC}/scripts/*.pl.in
@@ -125,6 +124,8 @@ post-patch:
 		-e 's,^FFMPEG_CFLAGS=.*,,g' \
 		${WRKSRC}/configure
 	${REINPLACE_CMD} -e 's,ZM_V4L2,ZM_HAS_V4L2,g' ${WRKSRC}//web/skins/classic/views/monitorprobe.php
+	${REINPLACE_CMD} -e 's,chown,true chown,g' ${WRKSRC}/Makefile.in \
+		${WRKSRC}/src/Makefile.in ${WRKSRC}/web/Makefile.in
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
 pre-build:
@@ -135,22 +136,15 @@ pre-build:
 	${CP} ${FILESDIR}/README.FreeBSD  ${PKGMESSAGE}
 
 post-install:
+	${MV} ${STAGEDIR}${PREFIX}/etc/zm.conf ${STAGEDIR}${PREFIX}/etc/zm.conf.sample
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${CP} ${WRKSRC}/db/zm_create.sql ${STAGEDIR}${DOCSDIR}
 .for i in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/$i ${STAGEDIR}${DOCSDIR}
 .endfor
 	-${RM} -f ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH}/perllocal.pod
-	${MKDIR} -m 0700 -p ${STAGEDIR}${M_TMPDIR}
-	${CHOWN} ${WWWOWN}:${WWWGRP} ${STAGEDIR}${M_TMPDIR}
-	${MKDIR} -m 0755 -p ${STAGEDIR}${M_RUNDIR}
-	${CHOWN} ${WWWOWN}:${WWWGRP} ${STAGEDIR}${M_RUNDIR}
-	${MKDIR} -m 0755 -p ${STAGEDIR}${M_LOGDIR}
-	${CHOWN} ${WWWOWN}:${WWWGRP} ${STAGEDIR}${M_LOGDIR}
-
-pre-deinstall:
-	-${RMDIR} ${STAGEDIR}${M_RUNDIR}
-	-${RMDIR} ${STAGEDIR}${M_TMPDIR}
-	-${RMDIR} ${STAGEDIR}${M_LOGDIR}
+	${MKDIR} -p ${STAGEDIR}${M_TMPDIR}
+	${MKDIR} -p ${STAGEDIR}${M_RUNDIR}
+	${MKDIR} -p ${STAGEDIR}${M_LOGDIR}
 
 .include <bsd.port.post.mk>

Modified: head/multimedia/zoneminder/files/patch-Makefile.in
==============================================================================
--- head/multimedia/zoneminder/files/patch-Makefile.in	Tue Nov 11 17:47:06 2014	(r372456)
+++ head/multimedia/zoneminder/files/patch-Makefile.in	Tue Nov 11 17:53:36 2014	(r372457)
@@ -1,23 +1,5 @@
 --- Makefile.in.orig	2011-08-23 08:10:37.000000000 -0700
 +++ Makefile.in	2014-07-24 13:33:49.000000000 -0700
-@@ -275,7 +275,7 @@
- webuser = @WEB_USER@
- webgroup = @WEB_GROUP@
- sysconf_DATA = \
--	zm.conf
-+	zm.conf.sample
- 
- SUBDIRS = \
- 	src \
-@@ -343,7 +343,7 @@
- 
- distclean-hdr:
- 	-rm -f config.h stamp-h1
--zm.conf: $(top_builddir)/config.status $(srcdir)/zm.conf.in
-+zm.conf.sample: $(top_builddir)/config.status $(srcdir)/zm.conf.in
- 	cd $(top_builddir) && $(SHELL) ./config.status $@
- zmconfgen.pl: $(top_builddir)/config.status $(srcdir)/zmconfgen.pl.in
- 	cd $(top_builddir) && $(SHELL) ./config.status $@
 @@ -742,7 +742,6 @@
  
  install-data-am:

Modified: head/multimedia/zoneminder/pkg-plist
==============================================================================
--- head/multimedia/zoneminder/pkg-plist	Tue Nov 11 17:47:06 2014	(r372456)
+++ head/multimedia/zoneminder/pkg-plist	Tue Nov 11 17:53:36 2014	(r372457)
@@ -15,10 +15,7 @@ bin/zmupdate.pl
 bin/zmvideo.pl
 bin/zmwatch.pl
 bin/zmx10.pl
- at unexec if cmp -s %D/etc/zm.conf.sample %D/etc/zm.conf; then rm -f %D/etc/zm.conf; fi
- at mode 0600
-etc/zm.conf.sample
- at mode
+ at sample(,,600) etc/zm.conf.sample
 %%DOCSDIR%%/zm_create.sql
 %%PERL5_MAN3%%/ZoneMinder.3.gz
 %%PERL5_MAN3%%/ZoneMinder::Base.3.gz
@@ -302,60 +299,6 @@ etc/zm.conf.sample
 %%WWWDIR%%/data/tools/mootools/mootools-more.js
 %%WWWDIR%%/data/views/file.php
 %%WWWDIR%%/data/views/image.php
- at dirrm %%WWWDIR%%/data/views
- at dirrm %%WWWDIR%%/data/tools/mootools
- at dirrm %%WWWDIR%%/data/tools
- at dirrm %%WWWDIR%%/data/temp
- at dirrm %%WWWDIR%%/data/sounds
- at dirrm %%WWWDIR%%/data/skins/xml/views
- at dirrm %%WWWDIR%%/data/skins/xml/includes
- at dirrm %%WWWDIR%%/data/skins/xml
- at dirrm %%WWWDIR%%/data/skins/mobile/views/css
- at dirrm %%WWWDIR%%/data/skins/mobile/views
- at dirrm %%WWWDIR%%/data/skins/mobile/lang
- at dirrm %%WWWDIR%%/data/skins/mobile/includes
- at dirrm %%WWWDIR%%/data/skins/mobile/graphics
- at dirrm %%WWWDIR%%/data/skins/mobile/css
- at dirrm %%WWWDIR%%/data/skins/mobile/ajax
- at dirrm %%WWWDIR%%/data/skins/mobile
- at dirrm %%WWWDIR%%/data/skins/classic/views/js
- at dirrm %%WWWDIR%%/data/skins/classic/views/css
- at dirrm %%WWWDIR%%/data/skins/classic/views
- at dirrm %%WWWDIR%%/data/skins/classic/lang
- at dirrm %%WWWDIR%%/data/skins/classic/js
- at dirrm %%WWWDIR%%/data/skins/classic/includes
- at dirrm %%WWWDIR%%/data/skins/classic/graphics
- at dirrm %%WWWDIR%%/data/skins/classic/css
- at dirrm %%WWWDIR%%/data/skins/classic/ajax
- at dirrm %%WWWDIR%%/data/skins/classic
- at dirrm %%WWWDIR%%/data/skins
- at dirrm %%WWWDIR%%/data/lang
- at dirrm %%WWWDIR%%/data/js
- at dirrm %%WWWDIR%%/data/includes
- at dirrm %%WWWDIR%%/data/images
- at dirrm %%WWWDIR%%/data/graphics
- at dirrm %%WWWDIR%%/data/events
- at dirrm %%WWWDIR%%/data/css
- at dirrm %%WWWDIR%%/data/ajax
- at dirrm %%WWWDIR%%/data
- at dirrm %%WWWDIR%%/cgi-bin
- at dirrm %%WWWDIR%%
- at dirrm %%SITE_PERL%%/mach/auto/ZoneMinder
- at dirrm %%SITE_PERL%%/ZoneMinder/Trigger/Connection
- at dirrm %%SITE_PERL%%/ZoneMinder/Trigger/Channel
- at dirrm %%SITE_PERL%%/ZoneMinder/Trigger
- at dirrm %%SITE_PERL%%/ZoneMinder/Memory
- at dirrm %%SITE_PERL%%/ZoneMinder/Control
- at dirrm %%SITE_PERL%%/ZoneMinder
- at exec mkdir -m 0700 -p %%ZM_TMPDIR%%/fgfhfh
- at exec chown %%WEB_USER%% %%ZM_TMPDIR%%
- at exec chgrp %%WEB_GROUP%% %%ZM_TMPDIR%%
- at exec mkdir -m 0755 -p %%ZM_RUNDIR%%
- at exec chown %%WEB_USER%% %%ZM_RUNDIR%%
- at exec chgrp %%WEB_GROUP%% %%ZM_RUNDIR%%
- at exec mkdir -m 0755 -p %%ZM_LOGDIR%%
- at exec chown %%WEB_USER%% %%ZM_LOGDIR%%
- at exec chgrp %%WEB_GROUP%% %%ZM_LOGDIR%%
- at unexec rmdir %%ZM_RUNDIR%%
- at unexec rmdir %%ZM_TMPDIR%%
- at unexec rmdir %%ZM_LOGDIR%%
+ at dir(%%WEB_USER%%,%%WEB_GROUP%%,0700) %%ZM_TMPDIR%%
+ at dir(%%WEB_USER%%,%%WEB_GROUP%%,0755) %%ZM_RUNDIR%%
+ at dir(%%WEB_USER%%,%%WEB_GROUP%%,0755) %%ZM_LOGDIR%%

More information about the svn-ports-head mailing list