From owner-svn-ports-head@freebsd.org  Tue May 10 20:02:59 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id B36FFB36D6F;
 Tue, 10 May 2016 20:02:59 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6ABEA116E;
 Tue, 10 May 2016 20:02:59 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4AK2w2l053971;
 Tue, 10 May 2016 20:02:58 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4AK2wuB053969;
 Tue, 10 May 2016 20:02:58 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201605102002.u4AK2wuB053969@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to
 amdmi3@FreeBSD.org using -f
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Tue, 10 May 2016 20:02:58 +0000 (UTC)
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
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 May 2016 20:02:59 -0000

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