From owner-svn-ports-all@FreeBSD.ORG Thu Mar 21 00:37:35 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 08CBDF2; Thu, 21 Mar 2013 00:37:35 +0000 (UTC) (envelope-from jgh@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id EE0E9DDC; Thu, 21 Mar 2013 00:37:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2L0bY1S049561; Thu, 21 Mar 2013 00:37:34 GMT (envelope-from jgh@svn.freebsd.org) Received: (from jgh@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2L0bYg7049556; Thu, 21 Mar 2013 00:37:34 GMT (envelope-from jgh@svn.freebsd.org) Message-Id: <201303210037.r2L0bYg7049556@svn.freebsd.org> From: Jason Helfman Date: Thu, 21 Mar 2013 00:37:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r314793 - in head/sysutils/froxlor: . 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-all@freebsd.org X-Mailman-Version: 2.1.14 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: Thu, 21 Mar 2013 00:37:35 -0000 Author: jgh Date: Thu Mar 21 00:37:33 2013 New Revision: 314793 URL: http://svnweb.freebsd.org/changeset/ports/314793 Log: - update to 0.9.27 - adopt optionsNG PR: 176975 Submitted by: maintainer, coco@executive-computing.de Modified: head/sysutils/froxlor/Makefile head/sysutils/froxlor/distinfo head/sysutils/froxlor/files/pkg-deinstall.in head/sysutils/froxlor/pkg-descr head/sysutils/froxlor/pkg-plist Modified: head/sysutils/froxlor/Makefile ============================================================================== --- head/sysutils/froxlor/Makefile Thu Mar 21 00:29:59 2013 (r314792) +++ head/sysutils/froxlor/Makefile Thu Mar 21 00:37:33 2013 (r314793) @@ -1,83 +1,120 @@ -# New ports collection makefile for: froxlor -# Date created: 2010-10-13 -# Whom: Marco Steinbach -# +# Created by: Marco Steinbach # $FreeBSD$ -# PORTNAME= froxlor -DISTVERSION= 0.9.26 +DISTVERSION= 0.9.27 CATEGORIES= sysutils www MASTER_SITES= http://files.froxlor.org/releases/ MAINTAINER= coco@executive-computing.de COMMENT= PHP-based ISP Server Management Panel +LICENSE= GPLv2 + WRKSRC= ${WRKDIR} NO_BUILD= YES SUB_FILES+= pkg-message pkg-deinstall -USE_PHP= xml bcmath posix filter session ftp mysqli gettext +USE_PHP= xml bcmath posix filter session ftp mysql mysqli gettext USE_GETTEXT= RUN -OPTIONS= APACHE "Use Apache (2.2) as http server" On \ - MYSQL "Use MySQL as database server" On \ - POSTFIX "Use Postfix as smtp server" On \ - DKIM "Use OpenDKIM" Off \ - DOVECOT "Use Dovecot as imap/pop3 server" On \ - PROFTPD "Use Proftpd-mysql as ftp server (implies MySQL)" On \ - POWERDNS "Use Powerdns as dns server" Off \ - LIBNSS "Use Libnss-mysql for authentication (impl. MySQL)" Off \ - WEBALIZER "Use webalizer" On \ - AWSTATS "Use awstats" Off \ - LOGROTATE "Use logrotate" Off +OPTIONS_DEFINE= POWERDNS LIBNSS LOGROTATE MYSQLS DKIM + +OPTIONS_SINGLE= WEB SMTP IMAPPOP3 FTP +OPTIONS_SINGLE_WEB= APACHE LIGHTTPD NGINX +OPTIONS_SINGLE_SMTP= POSTFIX EXIM +OPTIONS_SINGLE_IMAPPOP3= DOVECOT COURIER +OPTIONS_SINGLE_FTP= PROFTPD PUREFTPD +OPTIONS_MULTI= WWWST +OPTIONS_MULTI_WWWST= WEBALIZER AWSTATS + +APACHE_DESC= Apache (2.2) as HTTP server +LIGHTTPD_DESC= Lighttpd as HTTP server +NGINX_DESC= Nginx as HTTP server +MYSQLC_DESC= MySQL database client only +MYSQLS_DESC= MySQL database server and client +POSTFIX_DESC= Postfix as SMTP server +EXIM_DESC= Exim as SMTP server +DKIM_DESC= OpenDKIM for DomainKeys Identified Mail +DOVECOT_DESC= Dovecot as IMAP/POP3 server +COURIER_DESC= Courier as IMAP/POP3 server +PROFTPD_DESC= ProFTPd as FTP server +PUREFTPD_DESC= Pure-FTPd as FTP server +POWERDNS_DESC= Powerdns as DNS server +LIBNSS_DESC= Libnss-mysql for authentication +WEBALIZER_DESC= Webalizer for web statistics +AWSTATS_DESC= Awstats for web statistics +LOGROTATE_DESC= Logrotate for log rotation +MYSQLS_DESC= Install/depend on MySQL server + +OPTIONS_DEFAULT= APACHE MYSQLS POSTFIX DOVECOT PROFTPD WEBALIZER MYSQLS .include -.if !defined(WITHOUT_APACHE) +.if ${PORT_OPTIONS:MAPACHE} USE_APACHE_RUN= 22 .endif -.if !defined(WITHOUT_MYSQL) -USE_PHP+= mysql +.if ${PORT_OPTIONS:MLIGHTTPD} +RUN_DEPENDS+= lighttpd:${PORTSDIR}/www/lighttpd +.endif + +.if ${PORT_OPTIONS:MNGINX} +RUN_DEPENDS+= nginx:${PORTSDIR}/www/nginx +.endif + +.if ${PORT_OPTIONS:MMYSQLS} +USE_MYSQL= server .endif -.if !defined(WITHOUT_POSTFIX) +.if ${PORT_OPTIONS:MPOSTFIX} RUN_DEPENDS+= postfix:${PORTSDIR}/mail/postfix .endif -.if defined(WITH_DKIM) +.if ${PORT_OPTIONS:MEXIM} +RUN_DEPENDS+= exim:${PORTSDIR}/mail/exim +.endif + +.if ${PORT_OPTIONS:MDKIM} RUN_DEPENDS+= opendkim:${PORTSDIR}/mail/opendkim .endif -.if !defined(WITHOUT_DOVECOT) +.if ${PORT_OPTIONS:MDOVECOT} RUN_DEPENDS+= dovecot:${PORTSDIR}/mail/dovecot .endif -.if !defined(WITHOUT_PROFTPD) +.if ${PORT_OPTIONS:MCOURIER} +RUN_DEPENDS+= courier:${PORTSDIR}/mail/courier +.endif + +.if ${PORT_OPTIONS:MPROFTPD} RUN_DEPENDS+= ${LOCALBASE}/libexec/proftpd/mod_sql_mysql.so:${PORTSDIR}/databases/proftpd-mod_sql_mysql .endif -.if defined(WITH_POWERDNS) +.if ${PORT_OPTIONS:MPUREFTPD} +RUN_DEPENDS+= pure-ftpd:${PORTSDIR}/ftp/pure-ftpd +.endif + +.if ${PORT_OPTIONS:MPOWERDNS} RUN_DEPENDS+= powerdns:${PORTSDIR}/dns/powerdns .endif -.if defined(WITH_LIBNSS) +.if ${PORT_OPTIONS:MLIBNSS} RUN_DEPENDS+= ${LOCALBASE}/lib/nss_mysql.so:${PORTSDIR}/net/libnss-mysql .endif -.if !defined(WITHOUT_WEBALIZER) +.if ${PORT_OPTIONS:MWEBALIZER} RUN_DEPENDS+= webalizer:${PORTSDIR}/www/webalizer .endif -.if defined(WITH_AWSTATS) +.if ${PORT_OPTIONS:MAWSTATS} RUN_DEPENDS+= awstats>=6.8:${PORTSDIR}/www/awstats .endif -.if defined(WITH_LOGROTATE) +.if ${PORT_OPTIONS:MLOGROTATE} RUN_DEPENDS+= logrotate:${PORTSDIR}/sysutils/logrotate .endif Modified: head/sysutils/froxlor/distinfo ============================================================================== --- head/sysutils/froxlor/distinfo Thu Mar 21 00:29:59 2013 (r314792) +++ head/sysutils/froxlor/distinfo Thu Mar 21 00:37:33 2013 (r314793) @@ -1,2 +1,2 @@ -SHA256 (froxlor-0.9.26.tar.gz) = 99c47a7127d672778e898e1916b0a1be74378ae7694669bb9c01f4b887951e5c -SIZE (froxlor-0.9.26.tar.gz) = 1602312 +SHA256 (froxlor-0.9.27.tar.gz) = 0468811f545d93ca98e9346e4c207b57fbbcd7669fa4435cb37cf046e2e3c031 +SIZE (froxlor-0.9.27.tar.gz) = 1662621 Modified: head/sysutils/froxlor/files/pkg-deinstall.in ============================================================================== --- head/sysutils/froxlor/files/pkg-deinstall.in Thu Mar 21 00:29:59 2013 (r314792) +++ head/sysutils/froxlor/files/pkg-deinstall.in Thu Mar 21 00:37:33 2013 (r314793) @@ -1,7 +1,8 @@ #!/bin/sh # $FreeBSD$ -if [ "$2" = DEINSTALL ]; then +if [ "$2" == "POST-DEINSTALL" ]; then +if [ -d %%WWWDIR%% ]; then echo "" echo "-------------------------------------------------------" echo "Run the following command, if you plan to permanently" @@ -11,3 +12,4 @@ if [ "$2" = DEINSTALL ]; then echo "-------------------------------------------------------" echo "" fi +fi Modified: head/sysutils/froxlor/pkg-descr ============================================================================== --- head/sysutils/froxlor/pkg-descr Thu Mar 21 00:29:59 2013 (r314792) +++ head/sysutils/froxlor/pkg-descr Thu Mar 21 00:37:33 2013 (r314793) @@ -4,4 +4,4 @@ more. Froxlor is a fork of SysCP. Froxlor saw its first release on February 15 2010. -WWW: http://www.froxlor.org/ +WWW: http://www.froxlor.org/ Modified: head/sysutils/froxlor/pkg-plist ============================================================================== --- head/sysutils/froxlor/pkg-plist Thu Mar 21 00:29:59 2013 (r314792) +++ head/sysutils/froxlor/pkg-plist Thu Mar 21 00:37:33 2013 (r314793) @@ -39,6 +39,7 @@ www/froxlor/admin_updates.php www/froxlor/cache/.keep www/froxlor/css/jquery.jqplot.css www/froxlor/css/jquery.jqplot.min.css +www/froxlor/css/jquery.jquery-ui.css www/froxlor/customer_aps.php www/froxlor/customer_autoresponder.php www/froxlor/customer_domains.php @@ -239,6 +240,8 @@ www/froxlor/install/updates/syscp/1.2/up www/froxlor/install/updates/syscp/1.4/update_1.4.inc.php www/froxlor/install/updatesql.php www/froxlor/js/excanvas.min.js +www/froxlor/js/jquery-ui-1.8.13.min.js +www/froxlor/js/jquery-ui.min.js www/froxlor/js/jquery.jqplot.min.js www/froxlor/js/jquery.min.js www/froxlor/js/jquery.tablesorter.min.js