From owner-svn-ports-all@freebsd.org Wed Jan 30 19:50:01 2019 Return-Path: Delivered-To: svn-ports-all@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 5E60E6C2; Wed, 30 Jan 2019 19:50:01 +0000 (UTC) (envelope-from rene@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8C40F83B49; Wed, 30 Jan 2019 19:47:49 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7C59323E51; Wed, 30 Jan 2019 19:47:49 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x0UJlnZq032450; Wed, 30 Jan 2019 19:47:49 GMT (envelope-from rene@FreeBSD.org) Received: (from rene@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x0UJlnH0032448; Wed, 30 Jan 2019 19:47:49 GMT (envelope-from rene@FreeBSD.org) Message-Id: <201901301947.x0UJlnH0032448@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rene set sender to rene@FreeBSD.org using -f From: Rene Ladan Date: Wed, 30 Jan 2019 19:47:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r491655 - in head/sysutils/password-store: . files X-SVN-Group: ports-head X-SVN-Commit-Author: rene X-SVN-Commit-Paths: in head/sysutils/password-store: . files X-SVN-Commit-Revision: 491655 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 8C40F83B49 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.97)[-0.973,0]; NEURAL_HAM_LONG(-1.00)[-0.999,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 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: Wed, 30 Jan 2019 19:50:01 -0000 Author: rene Date: Wed Jan 30 19:47:48 2019 New Revision: 491655 URL: https://svnweb.freebsd.org/changeset/ports/491655 Log: sysutils/password-store: install extensions into libexec instead of lib This is more in line with hier(7) PR: 235255 Submitted by: tobias.rehbein@web.de Modified: head/sysutils/password-store/Makefile head/sysutils/password-store/files/pass.in head/sysutils/password-store/pkg-plist Modified: head/sysutils/password-store/Makefile ============================================================================== --- head/sysutils/password-store/Makefile Wed Jan 30 19:35:10 2019 (r491654) +++ head/sysutils/password-store/Makefile Wed Jan 30 19:47:48 2019 (r491655) @@ -2,6 +2,7 @@ PORTNAME= password-store PORTVERSION= 1.7.3 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= https://git.zx2c4.com/password-store/snapshot/ @@ -42,14 +43,15 @@ SUB_FILES= pass post-patch: @${REINPLACE_CMD} -Ee 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/src/platform/freebsd.sh - @${REINPLACE_CMD} -Ee 's|^SYSTEM_EXTENSION_DIR=""|SYSTEM_EXTENSION_DIR="${PREFIX}/lib/password-store/extensions"|g' \ + @${REINPLACE_CMD} -Ee 's|^SYSTEM_EXTENSION_DIR=""|SYSTEM_EXTENSION_DIR="${PREFIX}/libexec/password-store/extensions"|g' \ ${WRKSRC}/src/password-store.sh do-install: ${INSTALL_SCRIPT} ${WRKDIR}/pass ${STAGEDIR}${PREFIX}/bin/ - ${INSTALL_SCRIPT} ${WRKSRC}/src/password-store.sh ${STAGEDIR}${PREFIX}/libexec/pass - ${MKDIR} ${STAGEDIR}${PREFIX}/libexec/platform - ${INSTALL_SCRIPT} ${WRKSRC}/src/platform/freebsd.sh ${STAGEDIR}${PREFIX}/libexec/platform/ + ${MKDIR} ${STAGEDIR}${PREFIX}/libexec/password-store/extensions + ${MKDIR} ${STAGEDIR}${PREFIX}/libexec/password-store/platform + ${INSTALL_SCRIPT} ${WRKSRC}/src/password-store.sh ${STAGEDIR}${PREFIX}/libexec/password-store/pass + ${INSTALL_SCRIPT} ${WRKSRC}/src/platform/freebsd.sh ${STAGEDIR}${PREFIX}/libexec/password-store/platform/ ${INSTALL_MAN} ${WRKSRC}/man/pass.1 ${STAGEDIR}${MANPREFIX}/man/man1/pass.1 do-install-CONTRIB-on: Modified: head/sysutils/password-store/files/pass.in ============================================================================== --- head/sysutils/password-store/files/pass.in Wed Jan 30 19:35:10 2019 (r491654) +++ head/sysutils/password-store/files/pass.in Wed Jan 30 19:47:48 2019 (r491655) @@ -1,4 +1,4 @@ #!/bin/sh -cd %%PREFIX%%/libexec -exec %%PREFIX%%/libexec/pass "$@" +cd %%PREFIX%%/libexec/password-store +exec %%PREFIX%%/libexec/password-store/pass "$@" Modified: head/sysutils/password-store/pkg-plist ============================================================================== --- head/sysutils/password-store/pkg-plist Wed Jan 30 19:35:10 2019 (r491654) +++ head/sysutils/password-store/pkg-plist Wed Jan 30 19:47:48 2019 (r491655) @@ -1,6 +1,6 @@ bin/pass -libexec/pass -libexec/platform/freebsd.sh +libexec/password-store/pass +libexec/password-store/platform/freebsd.sh man/man1/pass.1.gz %%CONTRIB%%%%DATADIR%%/dmenu/README.md %%CONTRIB%%%%DATADIR%%/dmenu/passmenu @@ -32,3 +32,4 @@ man/man1/pass.1.gz %%CONTRIB%%share/fish/completions/password-store.fish %%CONTRIB%%share/zsh/site-functions/_pass %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-filter.sh +@dir libexec/password-store/extensions