Attachment 132640 Details for Bug 176975 – froxlor-0.9.27.patch

[patch] froxlor-0.9.27.patch

froxlor-0.9.27.patch (text/plain), 6.21 KB, created by Marco Steinbach on 2013-03-14 23:30:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marco Steinbach

Created: 2013-03-14 23:30:00 UTC

Size: 6.21 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 314163)
>+++ Makefile	(working copy)
>@@ -1,83 +1,120 @@
>-# New ports collection makefile for:	froxlor
>-# Date created:		2010-10-13
>-# Whom:			Marco Steinbach <coco@executive-computing.de>
>-#
>+# Created by: Marco Steinbach <coco@executive-computing.de>
> # $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 <bsd.port.options.mk>
> 
>-.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 !defined(WITHOUT_POSTFIX)
>+.if ${PORT_OPTIONS:MNGINX}
>+RUN_DEPENDS+=	nginx:${PORTSDIR}/www/nginx
>+.endif
>+
>+.if ${PORT_OPTIONS:MMYSQLS}
>+USE_MYSQL=	server
>+.endif
>+
>+.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
> 
>Index: distinfo
>===================================================================
>--- distinfo	(revision 314163)
>+++ distinfo	(working copy)
>@@ -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
>Index: files/pkg-deinstall.in
>===================================================================
>--- files/pkg-deinstall.in	(revision 314163)
>+++ files/pkg-deinstall.in	(working copy)
>@@ -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 @@
> 	echo "-------------------------------------------------------"
> 	echo ""
> fi
>+fi
>Index: pkg-descr
>===================================================================
>--- pkg-descr	(revision 314163)
>+++ pkg-descr	(working copy)
>@@ -4,4 +4,4 @@
> 
> 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/
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 314163)
>+++ pkg-plist	(working copy)
>@@ -39,6 +39,7 @@
> 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.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

Actions: View | Diff

Attachments on bug 176975: 132640