From owner-svn-ports-all@FreeBSD.ORG Wed Jun 18 18:09:41 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2E957B59; Wed, 18 Jun 2014 18:09:41 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 1BF242037; Wed, 18 Jun 2014 18:09:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5II9ekS084054; Wed, 18 Jun 2014 18:09:40 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5II9e3t084052; Wed, 18 Jun 2014 18:09:40 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201406181809.s5II9e3t084052@svn.freebsd.org> From: William Grzybowski Date: Wed, 18 Jun 2014 18:09:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r358296 - head/sysutils/froxlor X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Jun 2014 18:09:41 -0000 Author: wg Date: Wed Jun 18 18:09:40 2014 New Revision: 358296 URL: http://svnweb.freebsd.org/changeset/ports/358296 QAT: https://qat.redports.org/buildarchive/r358296/ Log: sysutils/froxlor: minor fixes - Add WANT_PHP_CLI, since froxlor cron jobs rely on the cli sapi - Add WANT_PHP_MOD due to separation of Apache PHP5 module - Use WWWGRP/WWWOWN in pkg-plist - Add option for depending on dns/bind99 - Remove superfluous NEED_ROOT - Bump PORTREVISION PR: 191102 Submitted by: maintainer Modified: head/sysutils/froxlor/Makefile head/sysutils/froxlor/pkg-plist Modified: head/sysutils/froxlor/Makefile ============================================================================== --- head/sysutils/froxlor/Makefile Wed Jun 18 18:09:08 2014 (r358295) +++ head/sysutils/froxlor/Makefile Wed Jun 18 18:09:40 2014 (r358296) @@ -3,6 +3,7 @@ PORTNAME= froxlor PORTVERSION= 0.9.32 +PORTREVISION= 1 CATEGORIES= sysutils www MASTER_SITES= http://files.froxlor.org/releases/ @@ -13,25 +14,28 @@ LICENSE= GPLv2 WRKSRC= ${WRKDIR} -NEED_ROOT= YES - NO_BUILD= YES SUB_FILES+= pkg-message pkg-deinstall +SUB_LIST+= WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} +PLIST_SUB+= ${SUB_LIST} USE_PHP= xml bcmath posix filter session ftp mysql mysqli +WANT_PHP_CLI= YES + USES= shebangfix SHEBANG_FILES= froxlor/install/tsmarty2c.php -OPTIONS_DEFINE= POWERDNS LIBNSS LOGROTATE MYSQLS DKIM PCNTL NLS +OPTIONS_DEFINE= LIBNSS LOGROTATE MYSQLS DKIM PCNTL NLS -OPTIONS_RADIO= WEB SMTP IMAPPOP3 FTP +OPTIONS_RADIO= WEB SMTP IMAPPOP3 FTP DNS OPTIONS_RADIO_WEB= APACHE LIGHTTPD NGINX OPTIONS_RADIO_SMTP= POSTFIX EXIM OPTIONS_RADIO_IMAPPOP3= DOVECOT COURIER OPTIONS_RADIO_FTP= PROFTPD PUREFTPD +OPTIONS_RADIO_DNS= POWERDNS ISCDNS OPTIONS_MULTI= WWWST OPTIONS_MULTI_WWWST= WEBALIZER AWSTATS @@ -39,6 +43,7 @@ WWWST_DESC= Web access and traffic stati WEB_DESC= Web server dependency SMTP_DESC= SMTP server dependency IMAPPOP3_DESC= IMAP/POP3 server dependency +DNS_DESC= DNS server dependency FTP_DESC= FTP server dependency APACHE_DESC= Apache (2.2) as HTTP/HTTPS server LIGHTTPD_DESC= Lighttpd as HTTP/HTTPS server @@ -53,6 +58,7 @@ COURIER_DESC= Courier as IMAP/POP3 serve PROFTPD_DESC= ProFTPd as FTP server PUREFTPD_DESC= Pure-FTPd as FTP server POWERDNS_DESC= Powerdns as DNS server +ISCDNS_DESC= ISC BIND 9.9 from ports as DNS server PCNTL_DESC= Use php-pcntl (speeds up statistics creation) LIBNSS_DESC= Libnss-mysql for authentication WEBALIZER_DESC= Webalizer (small, fast, static result pages) @@ -79,6 +85,8 @@ PUREFTPD_RUN_DEPENDS= pure-ftpd:${PORTSD POWERDNS_RUN_DEPENDS= powerdns:${PORTSDIR}/dns/powerdns +ISCDNS_RUN_DEPENDS= bind>=9.9.0.0:${PORTSDIR}/dns/bind99 + LIBNSS_RUN_DEPENDS= ${LOCALBASE}/lib/nss_mysql.so:${PORTSDIR}/net/libnss-mysql WEBALIZER_RUN_DEPENDS= webalizer:${PORTSDIR}/www/webalizer @@ -100,6 +108,12 @@ PCNTL_USE= PHP=pcntl NLS_USES= gettext:run NLS_USE= PHP=gettext +.include + +.if ${PORT_OPTIONS:MAPACHE} +WANT_PHP_MOD= YES +.endif + do-install: cd ${WRKDIR}/${PORTNAME} && \ ${FIND} . ! -name .gitignore | \ Modified: head/sysutils/froxlor/pkg-plist ============================================================================== --- head/sysutils/froxlor/pkg-plist Wed Jun 18 18:09:08 2014 (r358295) +++ head/sysutils/froxlor/pkg-plist Wed Jun 18 18:09:40 2014 (r358296) @@ -1,5 +1,5 @@ -@owner www -@group www +@group %%WWWGRP%% +@owner %%WWWOWN%% %%WWWDIR%%/COPYING %%WWWDIR%%/README.md %%WWWDIR%%/actions/admin/settings/000.version.php @@ -1727,5 +1727,3 @@ @dirrmtry %%WWWDIR%%/templates @dirrmtry %%WWWDIR%%/templates_c @dirrmtry %%WWWDIR%% -@group -@owner