svn commit: r463954 - branches/2018Q1/sysutils/froxlor
Kubilay Kocak
koobs at FreeBSD.org
Fri Mar 9 11:45:17 UTC 2018
On 9/03/2018 10:41 pm, Kubilay Kocak wrote:
> Author: koobs
> Date: Fri Mar 9 11:41:41 2018
> New Revision: 463954
> URL: https://svnweb.freebsd.org/changeset/ports/463954
>
> Log:
> MFH: r463710
>
> sysutils/froxlor: Fix packaging when APACHE option is unset
>
> The pkg-plist for some entries relied on the AP_NAME variable, which is
> only defined when the APACHE option is set (the default), via
> bsd.apache.mk. The variables value is the ports name, so replace it with
> PORTNAME accordingly.
>
> While I'm here, fix misspelled PORTREVIION.
>
> Reported by: z3dm4n (via IRC)
> Approved by: portmgr (blanket)
There was supposed to be an additional:
Approved by: riggs (ports-secteam)'
but I exited EDITOR during mfh without saving, assuming it would abort
so I could redo it, and it didn't (abort).
Since Approved by: portmgr existed, it committed without failing the
pre-commit hook that looks for portmgr|ports-secteam.
> Modified:
> branches/2018Q1/sysutils/froxlor/Makefile
> branches/2018Q1/sysutils/froxlor/pkg-plist
> Directory Properties:
> branches/2018Q1/ (props changed)
>
> Modified: branches/2018Q1/sysutils/froxlor/Makefile
> ==============================================================================
> --- branches/2018Q1/sysutils/froxlor/Makefile Fri Mar 9 11:37:45 2018 (r463953)
> +++ branches/2018Q1/sysutils/froxlor/Makefile Fri Mar 9 11:41:41 2018 (r463954)
> @@ -3,7 +3,7 @@
>
> PORTNAME= froxlor
> PORTVERSION= 0.9.38.7
> -PORTREVIION= 2
> +PORTREVISION= 2
> CATEGORIES= sysutils www
> MASTER_SITES= http://files.froxlor.org/releases/
>
> @@ -15,7 +15,7 @@ LICENSE= GPLv2
> WRKSRC= ${WRKDIR}
>
> SUB_FILES+= pkg-message pkg-deinstall
> -SUB_LIST+= WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
> +SUB_LIST+= WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} PORTNAME=${PORTNAME}
> PLIST_SUB+= ${SUB_LIST}
>
> USE_PHP= bcmath curl filter ftp json pdo_mysql posix session xml zip
>
> Modified: branches/2018Q1/sysutils/froxlor/pkg-plist
> ==============================================================================
> --- branches/2018Q1/sysutils/froxlor/pkg-plist Fri Mar 9 11:37:45 2018 (r463953)
> +++ branches/2018Q1/sysutils/froxlor/pkg-plist Fri Mar 9 11:41:41 2018 (r463954)
> @@ -6,7 +6,7 @@
> %%WWWDIR%%/actions/admin/settings/100.panel.php
> %%WWWDIR%%/actions/admin/settings/110.accounts.php
> %%WWWDIR%%/actions/admin/settings/120.system.php
> -%%WWWDIR%%/actions/admin/settings/122.%%AP_NAME%%vhost.php
> +%%WWWDIR%%/actions/admin/settings/122.%%PORTNAME%%vhost.php
> %%WWWDIR%%/actions/admin/settings/125.cronjob.php
> %%WWWDIR%%/actions/admin/settings/130.webserver.php
> %%WWWDIR%%/actions/admin/settings/131.ssl.php
> @@ -68,7 +68,7 @@
> %%WWWDIR%%/customer_traffic.php
> %%WWWDIR%%/dns_editor.php
> %%WWWDIR%%/index.php
> -%%WWWDIR%%/install/%%AP_NAME%%.sql
> +%%WWWDIR%%/install/%%PORTNAME%%.sql
> %%WWWDIR%%/install/install.php
> %%WWWDIR%%/install/lib/class.FroxlorInstall.php
> %%WWWDIR%%/install/lng/english.lng.php
> @@ -93,8 +93,8 @@
> %%WWWDIR%%/install/templates/page.tpl
> %%WWWDIR%%/install/templates/pagebottom.tpl
> %%WWWDIR%%/install/templates/textarea.tpl
> -%%WWWDIR%%/install/updates/%%AP_NAME%%/0.9/update_0.9.inc.php
> -%%WWWDIR%%/install/updates/%%AP_NAME%%/upgrade_syscp.inc.php
> +%%WWWDIR%%/install/updates/%%PORTNAME%%/0.9/update_0.9.inc.php
> +%%WWWDIR%%/install/updates/%%PORTNAME%%/upgrade_syscp.inc.php
> %%WWWDIR%%/install/updates/preconfig.php
> %%WWWDIR%%/install/updates/preconfig/0.9/preconfig_0.9.inc.php
> %%WWWDIR%%/install/updatesql.php
> @@ -258,32 +258,32 @@
> %%WWWDIR%%/lib/functions/formfields/text/function.getFormFieldDataText.php
> %%WWWDIR%%/lib/functions/formfields/text/function.getFormFieldOutputText.php
> %%WWWDIR%%/lib/functions/formfields/text/function.validateFormFieldText.php
> -%%WWWDIR%%/lib/functions/%%AP_NAME%%/function.CorrectErrorDocument.php
> -%%WWWDIR%%/lib/functions/%%AP_NAME%%/function.CronjobFunctions.php
> -%%WWWDIR%%/lib/functions/%%AP_NAME%%/function.checkCrondConfigurationFile.php
> -%%WWWDIR%%/lib/functions/%%AP_NAME%%/function.checkMailAccDeletionState.php
> -%%WWWDIR%%/lib/functions/%%AP_NAME%%/function.createAWStatsConf.php
> -%%WWWDIR%%/lib/functions/%%AP_NAME%%/function.customerHasPerlEnabled.php
> -%%WWWDIR%%/lib/functions/%%AP_NAME%%/function.domainHasMainSubDomains.php
> -%%WWWDIR%%/lib/functions/%%AP_NAME%%/function.domainHasSslIpPort.php
> -%%WWWDIR%%/lib/functions/%%AP_NAME%%/function.generatePassword.php
> -%%WWWDIR%%/lib/functions/%%AP_NAME%%/function.getCustomerDetail.php
> -%%WWWDIR%%/lib/functions/%%AP_NAME%%/function.getFilesystemQuota.php
> -%%WWWDIR%%/lib/functions/%%AP_NAME%%/function.getIpAddresses.php
> -%%WWWDIR%%/lib/functions/%%AP_NAME%%/function.getIpPortCombinations.php
> -%%WWWDIR%%/lib/functions/%%AP_NAME%%/function.getLanguages.php
> -%%WWWDIR%%/lib/functions/%%AP_NAME%%/function.getLoginNameByUid.php
> -%%WWWDIR%%/lib/functions/%%AP_NAME%%/function.getPhpConfigs.php
> -%%WWWDIR%%/lib/functions/%%AP_NAME%%/function.getThemes.php
> -%%WWWDIR%%/lib/functions/%%AP_NAME%%/function.inserttask.php
> -%%WWWDIR%%/lib/functions/%%AP_NAME%%/function.isCustomerStdSubdomain.php
> -%%WWWDIR%%/lib/functions/%%AP_NAME%%/function.loadConfigArrayDir.php
> -%%WWWDIR%%/lib/functions/%%AP_NAME%%/function.moveCustomerToAdmin.php
> -%%WWWDIR%%/lib/functions/%%AP_NAME%%/function.phpErrHandler.php
> -%%WWWDIR%%/lib/functions/%%AP_NAME%%/function.triggerLetsEncryptCSRForAliasDestinationDomain.php
> -%%WWWDIR%%/lib/functions/%%AP_NAME%%/function.updateCounters.php
> -%%WWWDIR%%/lib/functions/%%AP_NAME%%/function.updateFunctions.php
> -%%WWWDIR%%/lib/functions/%%AP_NAME%%/function.version_compare2.php
> +%%WWWDIR%%/lib/functions/%%PORTNAME%%/function.CorrectErrorDocument.php
> +%%WWWDIR%%/lib/functions/%%PORTNAME%%/function.CronjobFunctions.php
> +%%WWWDIR%%/lib/functions/%%PORTNAME%%/function.checkCrondConfigurationFile.php
> +%%WWWDIR%%/lib/functions/%%PORTNAME%%/function.checkMailAccDeletionState.php
> +%%WWWDIR%%/lib/functions/%%PORTNAME%%/function.createAWStatsConf.php
> +%%WWWDIR%%/lib/functions/%%PORTNAME%%/function.customerHasPerlEnabled.php
> +%%WWWDIR%%/lib/functions/%%PORTNAME%%/function.domainHasMainSubDomains.php
> +%%WWWDIR%%/lib/functions/%%PORTNAME%%/function.domainHasSslIpPort.php
> +%%WWWDIR%%/lib/functions/%%PORTNAME%%/function.generatePassword.php
> +%%WWWDIR%%/lib/functions/%%PORTNAME%%/function.getCustomerDetail.php
> +%%WWWDIR%%/lib/functions/%%PORTNAME%%/function.getFilesystemQuota.php
> +%%WWWDIR%%/lib/functions/%%PORTNAME%%/function.getIpAddresses.php
> +%%WWWDIR%%/lib/functions/%%PORTNAME%%/function.getIpPortCombinations.php
> +%%WWWDIR%%/lib/functions/%%PORTNAME%%/function.getLanguages.php
> +%%WWWDIR%%/lib/functions/%%PORTNAME%%/function.getLoginNameByUid.php
> +%%WWWDIR%%/lib/functions/%%PORTNAME%%/function.getPhpConfigs.php
> +%%WWWDIR%%/lib/functions/%%PORTNAME%%/function.getThemes.php
> +%%WWWDIR%%/lib/functions/%%PORTNAME%%/function.inserttask.php
> +%%WWWDIR%%/lib/functions/%%PORTNAME%%/function.isCustomerStdSubdomain.php
> +%%WWWDIR%%/lib/functions/%%PORTNAME%%/function.loadConfigArrayDir.php
> +%%WWWDIR%%/lib/functions/%%PORTNAME%%/function.moveCustomerToAdmin.php
> +%%WWWDIR%%/lib/functions/%%PORTNAME%%/function.phpErrHandler.php
> +%%WWWDIR%%/lib/functions/%%PORTNAME%%/function.triggerLetsEncryptCSRForAliasDestinationDomain.php
> +%%WWWDIR%%/lib/functions/%%PORTNAME%%/function.updateCounters.php
> +%%WWWDIR%%/lib/functions/%%PORTNAME%%/function.updateFunctions.php
> +%%WWWDIR%%/lib/functions/%%PORTNAME%%/function.version_compare2.php
> %%WWWDIR%%/lib/functions/logger/constant.logger.php
> %%WWWDIR%%/lib/functions/logger/function.getLogLevelDesc.php
> %%WWWDIR%%/lib/functions/output/function.RedirectCode.php
> @@ -348,7 +348,7 @@
> %%WWWDIR%%/lib/functions/validate/function.validateUsername.php
> %%WWWDIR%%/lib/functions/validate/function.validate_ip.php
> %%WWWDIR%%/lib/init.php
> -%%WWWDIR%%/lib/navigation/00.%%AP_NAME%%.main.php
> +%%WWWDIR%%/lib/navigation/00.%%PORTNAME%%.main.php
> %%WWWDIR%%/lib/navigation/10.tickets.php
> %%WWWDIR%%/lib/tables.inc.php
> %%WWWDIR%%/lib/version.inc.php
> @@ -364,7 +364,7 @@
> %%WWWDIR%%/logs/index.html
> %%WWWDIR%%/scripts/classes/class.DnsBase.php
> %%WWWDIR%%/scripts/classes/class.HttpConfigBase.php
> -%%WWWDIR%%/scripts/%%AP_NAME%%_master_cronjob.php
> +%%WWWDIR%%/scripts/%%PORTNAME%%_master_cronjob.php
> %%WWWDIR%%/scripts/jobs/cron_backup.php
> %%WWWDIR%%/scripts/jobs/cron_letsencrypt.php
> %%WWWDIR%%/scripts/jobs/cron_mailboxsize.php
> @@ -483,7 +483,7 @@
> %%WWWDIR%%/templates/Sparkle/admin/update/update_end.tpl
> %%WWWDIR%%/templates/Sparkle/admin/update/update_start.tpl
> %%WWWDIR%%/templates/Sparkle/assets/css/dark.css
> -%%WWWDIR%%/templates/Sparkle/assets/css/%%AP_NAME%%.css
> +%%WWWDIR%%/templates/Sparkle/assets/css/%%PORTNAME%%.css
> %%WWWDIR%%/templates/Sparkle/assets/css/main.css
> %%WWWDIR%%/templates/Sparkle/assets/css/main_ie.css
> %%WWWDIR%%/templates/Sparkle/assets/img/favicon.ico
> @@ -684,7 +684,7 @@
> %%WWWDIR%%/templates/Sparkle/ssl_certificates/certs_cert.tpl
> %%WWWDIR%%/templates/Sparkle/ssl_certificates/certs_error.tpl
> %%WWWDIR%%/templates/Sparkle/ssl_certificates/certs_list.tpl
> -%%WWWDIR%%/templates/misc/awstats/awstats.%%AP_NAME%%.model.conf
> +%%WWWDIR%%/templates/misc/awstats/awstats.%%PORTNAME%%.model.conf
> %%WWWDIR%%/templates/misc/awstats/index.html
> %%WWWDIR%%/templates/misc/awstats/nav.html
> %%WWWDIR%%/templates/misc/standardcustomer/index.html
>
More information about the svn-ports-all
mailing list