Date: Tue, 11 Nov 2014 17:53:37 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r372457 - in head/multimedia/zoneminder: . files Message-ID: <201411111753.sABHrb5r019689@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 -@unexec if cmp -s %D/etc/zm.conf.sample %D/etc/zm.conf; then rm -f %D/etc/zm.conf; fi -@mode 0600 -etc/zm.conf.sample -@mode +@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 -@dirrm %%WWWDIR%%/data/views -@dirrm %%WWWDIR%%/data/tools/mootools -@dirrm %%WWWDIR%%/data/tools -@dirrm %%WWWDIR%%/data/temp -@dirrm %%WWWDIR%%/data/sounds -@dirrm %%WWWDIR%%/data/skins/xml/views -@dirrm %%WWWDIR%%/data/skins/xml/includes -@dirrm %%WWWDIR%%/data/skins/xml -@dirrm %%WWWDIR%%/data/skins/mobile/views/css -@dirrm %%WWWDIR%%/data/skins/mobile/views -@dirrm %%WWWDIR%%/data/skins/mobile/lang -@dirrm %%WWWDIR%%/data/skins/mobile/includes -@dirrm %%WWWDIR%%/data/skins/mobile/graphics -@dirrm %%WWWDIR%%/data/skins/mobile/css -@dirrm %%WWWDIR%%/data/skins/mobile/ajax -@dirrm %%WWWDIR%%/data/skins/mobile -@dirrm %%WWWDIR%%/data/skins/classic/views/js -@dirrm %%WWWDIR%%/data/skins/classic/views/css -@dirrm %%WWWDIR%%/data/skins/classic/views -@dirrm %%WWWDIR%%/data/skins/classic/lang -@dirrm %%WWWDIR%%/data/skins/classic/js -@dirrm %%WWWDIR%%/data/skins/classic/includes -@dirrm %%WWWDIR%%/data/skins/classic/graphics -@dirrm %%WWWDIR%%/data/skins/classic/css -@dirrm %%WWWDIR%%/data/skins/classic/ajax -@dirrm %%WWWDIR%%/data/skins/classic -@dirrm %%WWWDIR%%/data/skins -@dirrm %%WWWDIR%%/data/lang -@dirrm %%WWWDIR%%/data/js -@dirrm %%WWWDIR%%/data/includes -@dirrm %%WWWDIR%%/data/images -@dirrm %%WWWDIR%%/data/graphics -@dirrm %%WWWDIR%%/data/events -@dirrm %%WWWDIR%%/data/css -@dirrm %%WWWDIR%%/data/ajax -@dirrm %%WWWDIR%%/data -@dirrm %%WWWDIR%%/cgi-bin -@dirrm %%WWWDIR%% -@dirrm %%SITE_PERL%%/mach/auto/ZoneMinder -@dirrm %%SITE_PERL%%/ZoneMinder/Trigger/Connection -@dirrm %%SITE_PERL%%/ZoneMinder/Trigger/Channel -@dirrm %%SITE_PERL%%/ZoneMinder/Trigger -@dirrm %%SITE_PERL%%/ZoneMinder/Memory -@dirrm %%SITE_PERL%%/ZoneMinder/Control -@dirrm %%SITE_PERL%%/ZoneMinder -@exec mkdir -m 0700 -p %%ZM_TMPDIR%%/fgfhfh -@exec chown %%WEB_USER%% %%ZM_TMPDIR%% -@exec chgrp %%WEB_GROUP%% %%ZM_TMPDIR%% -@exec mkdir -m 0755 -p %%ZM_RUNDIR%% -@exec chown %%WEB_USER%% %%ZM_RUNDIR%% -@exec chgrp %%WEB_GROUP%% %%ZM_RUNDIR%% -@exec mkdir -m 0755 -p %%ZM_LOGDIR%% -@exec chown %%WEB_USER%% %%ZM_LOGDIR%% -@exec chgrp %%WEB_GROUP%% %%ZM_LOGDIR%% -@unexec rmdir %%ZM_RUNDIR%% -@unexec rmdir %%ZM_TMPDIR%% -@unexec rmdir %%ZM_LOGDIR%% +@dir(%%WEB_USER%%,%%WEB_GROUP%%,0700) %%ZM_TMPDIR%% +@dir(%%WEB_USER%%,%%WEB_GROUP%%,0755) %%ZM_RUNDIR%% +@dir(%%WEB_USER%%,%%WEB_GROUP%%,0755) %%ZM_LOGDIR%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411111753.sABHrb5r019689>