Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 30 Jan 2019 19:47:49 +0000 (UTC)
From:      Rene Ladan <rene@FreeBSD.org>
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
Message-ID:  <201901301947.x0UJlnH0032448@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201901301947.x0UJlnH0032448>