Date: Tue, 10 May 2016 20:02:58 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r414961 - in head/net-mgmt/pandorafms_console: . files Message-ID: <201605102002.u4AK2wuB053969@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Tue May 10 20:02:58 2016 New Revision: 414961 URL: https://svnweb.freebsd.org/changeset/ports/414961 Log: - Fix syntax in newsyslog config file - While here, switch to options helpers PR: 208944 Submitted by: sohgo@sohgo.more.jp Approved by: maintainer timeout (koichiro@rworks.jp, 2 weeks) Modified: head/net-mgmt/pandorafms_console/Makefile head/net-mgmt/pandorafms_console/files/newsyslog.conf.in Modified: head/net-mgmt/pandorafms_console/Makefile ============================================================================== --- head/net-mgmt/pandorafms_console/Makefile Tue May 10 19:53:45 2016 (r414960) +++ head/net-mgmt/pandorafms_console/Makefile Tue May 10 20:02:58 2016 (r414961) @@ -35,15 +35,13 @@ USE_APACHE_RUN= 22+ SUB_FILES+= pandora_console.conf pkg-message newsyslog.conf SUB_LIST+= WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} -.include "${.CURDIR}/../pandorafms_server/bsd.pandora.mk" +PGSQL_USE= PHP=pgsql -PANDORA_INSTALLER_ARGS+= --destdir ${STAGEDIR} +.include "${.CURDIR}/../pandorafms_server/bsd.pandora.mk" -.include <bsd.port.pre.mk> +PORTREVISION= 2 -.if ${PORT_OPTIONS:MPGSQL} -USE_PHP+= pgsql -.endif +PANDORA_INSTALLER_ARGS+= --destdir ${STAGEDIR} post-patch: @${REINPLACE_CMD} \ @@ -62,12 +60,6 @@ post-install: attachment/downloads/.gitignore ${PORTDOCS} \ *.sql.bak extras/check_other_languages.sh.bak @cd ${STAGEDIR}${WWWDIR} && ${MV} install.php install_old.php -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${STAGEDIR}${DOCSDIR} -.for x in ${PORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/${x} ${STAGEDIR}${DOCSDIR} -.endfor -.endif @(d=${STAGEDIR}${PREFIX}/${APACHEETCDIR}/Includes; ${MKDIR} $$d; \ ${INSTALL_DATA} ${WRKDIR}/pandora_console.conf \ $$d/pandora_console.conf.sample) @@ -75,4 +67,10 @@ post-install: ${INSTALL_DATA} ${WRKDIR}/newsyslog.conf \ $$d/pandora_console.conf) -.include <bsd.port.post.mk> +post-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} +.for x in ${PORTDOCS} + ${INSTALL_DATA} ${WRKSRC}/${x} ${STAGEDIR}${DOCSDIR} +.endfor + +.include <bsd.port.mk> Modified: head/net-mgmt/pandorafms_console/files/newsyslog.conf.in ============================================================================== --- head/net-mgmt/pandorafms_console/files/newsyslog.conf.in Tue May 10 19:53:45 2016 (r414960) +++ head/net-mgmt/pandorafms_console/files/newsyslog.conf.in Tue May 10 20:02:58 2016 (r414961) @@ -3,4 +3,4 @@ # see newsyslog.conf(5) for details # # logfilename [owner:group] mode count size when flags [/pid_file] [sig_num] -%%WWWDIR%%/pandora_console.log %%WWWOWN%%:%%WWWGRP%% 644 3 100 W6D0 JN +%%WWWDIR%%/pandora_console.log %%WWWOWN%%:%%WWWGRP%% 644 3 100 $W6D0 JN
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605102002.u4AK2wuB053969>