Date: Wed, 1 Sep 2021 11:21:12 GMT From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: e7ae31e2b9f1 - main - sysutils/pwsafe: the port had been improved (+) Message-ID: <202109011121.181BLCIA082818@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=e7ae31e2b9f1e56082369105f0c224a41a5de1e6 commit e7ae31e2b9f1e56082369105f0c224a41a5de1e6 Author: Alexey Dokuchaev <danfe@FreeBSD.org> AuthorDate: 2021-09-01 11:20:36 +0000 Commit: Alexey Dokuchaev <danfe@FreeBSD.org> CommitDate: 2021-09-01 11:20:37 +0000 sysutils/pwsafe: the port had been improved (+) - Expand creator name to avoid confusion (single words are typically reserved for FreeBSD committers) - Reword COMMENT to avoid contraction and improve readability - Adjust LICENSE (it is "GPLv2 or later" in the source code) - Simplify X11 disabling logic and convert to option helpers - Drop redundant (inferred) GH_PROJECT knob while here --- sysutils/pwsafe/Makefile | 32 ++++++++++---------------------- 1 file changed, 10 insertions(+), 22 deletions(-) diff --git a/sysutils/pwsafe/Makefile b/sysutils/pwsafe/Makefile index e7bcc82e7472..d84c11a9e963 100644 --- a/sysutils/pwsafe/Makefile +++ b/sysutils/pwsafe/Makefile @@ -1,4 +1,4 @@ -# Created by: donnex +# Created by: Daniel Johansson <donnex@donnex.net> PORTNAME= pwsafe DISTVERSION= 0.2.0-155 @@ -6,44 +6,32 @@ DISTVERSIONSUFFIX= -g1dbcfd0 CATEGORIES= sysutils MAINTAINER= m.ne@gmx.net -COMMENT= Cmdline program that manages encrypted password databases +COMMENT= Command-line encrypted password database manager -LICENSE= GPLv2 +LICENSE= GPLv2+ USES= autoreconf gmake ncurses readline ssl +GNU_CONFIGURE= yes +CONFIGURE_ENV= ac_cv_header_curses_h=yes USE_GITHUB= yes GH_ACCOUNT= nsd20463 -GH_PROJECT= pwsafe GH_TAGNAME= 1dbcfd0 -GNU_CONFIGURE= yes -CONFIGURE_ENV+= ac_cv_header_curses_h=yes - PLIST_FILES= bin/pwsafe \ man/man1/pwsafe.1.gz OPTIONS_DEFINE= SETUID X11 - SETUID_DESC= Install setuid pwsafe binary -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MX11} -CONFIGURE_ARGS= --with-x -USES+= xorg -USE_XORG= ice sm x11 xmu -.else -CONFIGURE_ARGS= ac_cv_have_x="have_x=no" \ - ac_cv_lib_ICE_IceConnectionNumber=no \ - ac_cv_lib_X11_XOpenDisplay=no \ - ac_cv_lib_Xmu_XmuInternAtom=no -.endif +X11_USES= xorg +X11_USE= XORG=ice,sm,x11,xmu +X11_CONFIGURE_OFF= --without-x do-install: ${INSTALL_PROGRAM} ${WRKSRC}/pwsafe ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/pwsafe.1 ${STAGEDIR}${MANPREFIX}/man/man1 -.if ${PORT_OPTIONS:MSETUID} + +post-install-SETUID-on: ${CHMOD} u+s ${STAGEDIR}${PREFIX}/bin/pwsafe -.endif .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202109011121.181BLCIA082818>