From owner-dev-commits-ports-all@freebsd.org Wed May 5 08:34:01 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C98386357B2; Wed, 5 May 2021 08:34:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FZqkK5KxSz3KsM; Wed, 5 May 2021 08:34:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A9CA821BD5; Wed, 5 May 2021 08:34:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1458Y1rQ042920; Wed, 5 May 2021 08:34:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1458Y1hm042919; Wed, 5 May 2021 08:34:01 GMT (envelope-from git) Date: Wed, 5 May 2021 08:34:01 GMT Message-Id: <202105050834.1458Y1hm042919@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?B?RmVybmFuZG8gQXBlc3RlZ3XDrWE=?= Subject: git: b112172fafc3 - main - net/self-service-password: add missing run dependency MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b112172fafc321675b6f822f6cc93b01cd73d10d Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 May 2021 08:34:01 -0000 The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=b112172fafc321675b6f822f6cc93b01cd73d10d commit b112172fafc321675b6f822f6cc93b01cd73d10d Author: Fernando ApesteguĂ­a AuthorDate: 2021-05-04 06:25:41 +0000 Commit: Fernando ApesteguĂ­a CommitDate: 2021-05-05 08:29:31 +0000 net/self-service-password: add missing run dependency Add www/smarty3 as run dependency While here, pet linters PR: 255554 Reported by: ports@bsdserwis.com (maintainer) --- net/self-service-password/Makefile | 16 +++++++++++----- net/self-service-password/files/pkg-message.in | 8 ++++---- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/net/self-service-password/Makefile b/net/self-service-password/Makefile index 0c5adb053a27..d9ba59350c0d 100644 --- a/net/self-service-password/Makefile +++ b/net/self-service-password/Makefile @@ -2,6 +2,7 @@ PORTNAME= self-service-password DISTVERSION= 1.4 +PORTREVISION= 1 CATEGORIES= net www MASTER_SITES= http://ltb-project.org/archives/ PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX} @@ -13,20 +14,22 @@ COMMENT= Set of PHP-scripts to change LDAP password over the web LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENCE +RUN_DEPENDS= ${LOCALBASE}/share/smarty3-${PHP_FLAVOR}/Smarty.class.php:www/smarty3@${PHP_FLAVOR} + USES= php:flavors,web USE_PHP= filter hash ldap mbstring openssl phar session -NO_BUILD= yes NO_ARCH= yes +NO_BUILD= yes -CFGDIR= conf -CFGFILE= config.inc.php +SUB_FILES= pkg-message +SUB_LIST+= PKGNAME=${PKGNAME} PLIST_SUB+= SSP_OWN=${WWWOWN} PLIST_SUB+= SSP_GRP=${WWWGRP} -SUB_LIST+= PKGNAME=${PKGNAME} -SUB_FILES= pkg-message +CFGDIR= conf +CFGFILE= config.inc.php .include @@ -38,6 +41,9 @@ USE_PHP+= mcrypt post-extract: @${FIND} ${WRKSRC}/ -name '*.sig' -delete @${MV} ${WRKSRC}/${CFGDIR}/${CFGFILE} ${WRKSRC}/${CFGDIR}/${CFGFILE}.sample + @${REINPLACE_CMD} \ + -e 's;/usr/share/php/smarty3;${PREFIX}/share/smarty3-${PHP_FLAVOR};' \ + ${WRKSRC}/${CFGDIR}/${CFGFILE}.sample do-install: @cd ${WRKSRC}/ && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}/ diff --git a/net/self-service-password/files/pkg-message.in b/net/self-service-password/files/pkg-message.in index fccbd5814d81..8cdd010ea0ac 100644 --- a/net/self-service-password/files/pkg-message.in +++ b/net/self-service-password/files/pkg-message.in @@ -5,14 +5,14 @@ %%WWWDIR%% -Please edit config.inc.php to suit your needs. +Please edit config.inc.php or create config.inc.local.php to suit your needs. To make Self Service Password available through your web site, I suggest that you add something like the following to httpd.conf: - Alias /ssp/ "%%WWWDIR%%/" + Alias /ssp/ "%%WWWDIR%%/htdocs/" - + Options none AllowOverride none @@ -26,7 +26,7 @@ To make Self Service Password available through your web site, I suggest that you add something like the following to nginx.conf: location /ssp/ { - alias %%WWWDIR%%/; + alias %%WWWDIR%%/htdocs/; index index.php; location ~ \.php$ {