From owner-svn-ports-branches@freebsd.org Fri Mar 9 11:45:17 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4F8D0F45E6C; Fri, 9 Mar 2018 11:45:17 +0000 (UTC) (envelope-from koobs.freebsd@gmail.com) Received: from mail-pf0-x235.google.com (mail-pf0-x235.google.com [IPv6:2607:f8b0:400e:c00::235]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C659E72833; Fri, 9 Mar 2018 11:45:13 +0000 (UTC) (envelope-from koobs.freebsd@gmail.com) Received: by mail-pf0-x235.google.com with SMTP id x1so1174696pfh.7; Fri, 09 Mar 2018 03:45:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:subject:from:to:references:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=VqSv+FDaUeQM63rRwU+yo3jsko1fu/PDc7VbklZudSc=; b=U/dghNXeBApMgH7otOotpNIIs3Bh7MrOK0qIN+ZsKZea9GFRwc6TRARfdyScdNTblx FX/ZUGYvF9ca10BMz7m33rWixDCK5lGEUGuL0Cu9ps5jIneNz28TN2HXYRBE0Cg24g4H DDnaYXL2IAj06Wi5mfSovek7JIW4fEmSr4D4zsYE77kcAijqCiRpZF+8y7FkChnht1dD XMbv/G4+cx8d5L4tMGN6PHynWKaxznO2ufOfo1Uv0BgF0tbSZHXIQprn67jZBgejfVvL 96giu3dm0grSJ3ageBGN2r+8XPLldC+hJ0/WrK+0xmI6NVf5B7oNMCtDhrYXyWNUDZps /Veg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:subject:from:to:references:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=VqSv+FDaUeQM63rRwU+yo3jsko1fu/PDc7VbklZudSc=; b=eF7aBODjAHOBokWBE+LHgMQAMdoh+77Dxq6z9cvnQJcC4n/sY6o6su7H9t+gB3MZ3y 4pV47TzzSCRLt7msk80N1fzM3CuF0btfNP0hCnR8YIKHjWcdaBO/Z6zPsnb4o8AehoLj x/wmfoVDS5vUdDwE97byisI8t1z0XVbqACIxz7DGtVcl2DwsEruBFwLbKVJV/3JFVw32 E1I9K7v4uDTt8Uq+M58ODdrwJzuK8AczmtipyhUm7jqSpNQoRwxv0+9Boo5nuAQhDKmC jo9jHc+thYl3FAJ3ki9SdV5OUjvYE6nTS9MrYqR0tXobttBJH3Zs4liRojxDcDwGHl35 VV9g== X-Gm-Message-State: APf1xPA1RAAcK5+GR4/J6DFgOT2vUW78Aj+k0k8UkRKTqvWOamQAmTY3 Fg+HaxnuahthvEWgsYKDHhU4+074 X-Google-Smtp-Source: AG47ELtu9hPoqxoogRGkG1DTdI0USt6Mgf2BAMNfS1R/F6aOYZ2TbXrf7VaIQ9HHsAFKeolcB7bmXg== X-Received: by 10.101.97.135 with SMTP id c7mr23969060pgv.425.1520595912595; Fri, 09 Mar 2018 03:45:12 -0800 (PST) Received: from [192.168.1.105] (152.94.214.218.sta.wbroadband.net.au. [218.214.94.152]) by smtp.gmail.com with ESMTPSA id a5sm2510757pfn.66.2018.03.09.03.45.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Mar 2018 03:45:12 -0800 (PST) Sender: Kubilay Kocak Subject: Re: svn commit: r463954 - branches/2018Q1/sysutils/froxlor From: Kubilay Kocak To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org References: <201803091141.w29Bff55026860@repo.freebsd.org> Message-ID: Date: Fri, 9 Mar 2018 22:44:35 +1100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:59.0) Gecko/20100101 Thunderbird/59.0 MIME-Version: 1.0 In-Reply-To: <201803091141.w29Bff55026860@repo.freebsd.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-AU Content-Transfer-Encoding: 7bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Mar 2018 11:45:17 -0000 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 >