From owner-dev-commits-ports-all@freebsd.org Wed Sep 1 11:21:13 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 005316687E0; Wed, 1 Sep 2021 11:21:12 +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 4H01pJ6QmSz4ZGW; Wed, 1 Sep 2021 11:21:12 +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 C4E5F2417E; Wed, 1 Sep 2021 11:21:12 +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 181BLCNx082819; Wed, 1 Sep 2021 11:21:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 181BLCIA082818; Wed, 1 Sep 2021 11:21:12 GMT (envelope-from git) Date: Wed, 1 Sep 2021 11:21:12 GMT Message-Id: <202109011121.181BLCIA082818@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: e7ae31e2b9f1 - main - sysutils/pwsafe: the port had been improved (+) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e7ae31e2b9f1e56082369105f0c224a41a5de1e6 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, 01 Sep 2021 11:21:13 -0000 The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=e7ae31e2b9f1e56082369105f0c224a41a5de1e6 commit e7ae31e2b9f1e56082369105f0c224a41a5de1e6 Author: Alexey Dokuchaev AuthorDate: 2021-09-01 11:20:36 +0000 Commit: Alexey Dokuchaev 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 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 - -.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