diff options
| author | amdmi3 <amdmi3@FreeBSD.org> | 2016-05-10 20:02:58 +0000 |
|---|---|---|
| committer | amdmi3 <amdmi3@FreeBSD.org> | 2016-05-10 20:02:58 +0000 |
| commit | aec94cab421cc74a09a937d30dbca657c2bd76a2 (patch) | |
| tree | a78a8d9353a39804b72d84870dc67dcbf91a5be4 | |
| parent | dd243dc8e0ead158250793eb866e3ed75c87916c (diff) | |
| download | FreeBSD-ports-aec94cab421cc74a09a937d30dbca657c2bd76a2.zip FreeBSD-ports-aec94cab421cc74a09a937d30dbca657c2bd76a2.tar.gz | |
- 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)
| -rw-r--r-- | net-mgmt/pandorafms_console/Makefile | 24 | ||||
| -rw-r--r-- | net-mgmt/pandorafms_console/files/newsyslog.conf.in | 2 |
2 files changed, 12 insertions, 14 deletions
diff --git a/net-mgmt/pandorafms_console/Makefile b/net-mgmt/pandorafms_console/Makefile index f2a9fae..2dec706 100644 --- a/net-mgmt/pandorafms_console/Makefile +++ b/net-mgmt/pandorafms_console/Makefile @@ -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> diff --git a/net-mgmt/pandorafms_console/files/newsyslog.conf.in b/net-mgmt/pandorafms_console/files/newsyslog.conf.in index fa9124d..6c48fc2 100644 --- a/net-mgmt/pandorafms_console/files/newsyslog.conf.in +++ b/net-mgmt/pandorafms_console/files/newsyslog.conf.in @@ -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 |
