From owner-dev-commits-ports-all@freebsd.org Thu Apr 8 11:55:30 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 83AA15D9983; Thu, 8 Apr 2021 11:55:30 +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 4FGKTG3HMBz4qcd; Thu, 8 Apr 2021 11:55:30 +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 62B311D93; Thu, 8 Apr 2021 11:55:30 +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 138BtUQO046228; Thu, 8 Apr 2021 11:55:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 138BtUD8046227; Thu, 8 Apr 2021 11:55:30 GMT (envelope-from git) Date: Thu, 8 Apr 2021 11:55:30 GMT Message-Id: <202104081155.138BtUD8046227@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Renato Botelho Subject: git: 97ea9a85b58f - main - mail/wmbiff: Fix build with GNUTLS MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: garga X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 97ea9a85b58f03a8b27483f5925fc3be9ad4bdea 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: Thu, 08 Apr 2021 11:55:30 -0000 The branch main has been updated by garga: URL: https://cgit.FreeBSD.org/ports/commit/?id=97ea9a85b58f03a8b27483f5925fc3be9ad4bdea commit 97ea9a85b58f03a8b27483f5925fc3be9ad4bdea Author: Renato Botelho AuthorDate: 2021-04-08 11:34:56 +0000 Commit: Renato Botelho CommitDate: 2021-04-08 11:55:07 +0000 mail/wmbiff: Fix build with GNUTLS While here, stop installing debian script Sponsored by: Rubicon Communications, LLC ("Netgate") --- mail/wmbiff/Makefile | 13 +++++++++---- mail/wmbiff/pkg-plist | 1 - 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/mail/wmbiff/Makefile b/mail/wmbiff/Makefile index 79b04a298a85..e76ee18c4a99 100644 --- a/mail/wmbiff/Makefile +++ b/mail/wmbiff/Makefile @@ -2,6 +2,7 @@ PORTNAME= wmbiff PORTVERSION= 0.4.36 +PORTREVISION= 1 CATEGORIES= mail windowmaker afterstep MASTER_SITES= https://www.dockapps.net/download/ @@ -10,10 +11,9 @@ COMMENT= xbiff-like Window Maker dock app LICENSE= GPLv2 -USES= shebangfix xorg +USES= pkgconfig xorg USE_XORG= x11 xext xpm -SHEBANG_FILES= scripts/security.debian.rb GNU_CONFIGURE= yes SUB_FILES= pkg-message @@ -23,10 +23,15 @@ OPTIONS_DEFAULT=GNUTLS GNUTLS_LIB_DEPENDS= libgcrypt.so:security/libgcrypt \ libgnutls.so:security/gnutls \ libgpg-error.so:security/libgpg-error -GNUTLS_CONFIGURE_ON= --with-libgnutls-prefix=${LOCALBASE} \ - --with-libgcrypt-prefix=${LOCALBASE} +GNUTLS_CONFIGURE_ON= --with-libgcrypt-prefix=${LOCALBASE} GNUTLS_CONFIGURE_OFF= --disable-crypto +post-patch: + @${REINPLACE_CMD} -e '/^SUBDIRS *=/ s/scripts//' \ + ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e '/security.debian.rb/ s/^/# /' \ + ${WRKSRC}/wmbiff/sample.wmbiffrc + post-install: ${INSTALL_DATA} ${WRKSRC}/wmbiff/sample.wmbiffrc ${STAGEDIR}${DATADIR} diff --git a/mail/wmbiff/pkg-plist b/mail/wmbiff/pkg-plist index 11d5eedfb36d..c4f4b8831cc6 100644 --- a/mail/wmbiff/pkg-plist +++ b/mail/wmbiff/pkg-plist @@ -1,5 +1,4 @@ bin/wmbiff -lib/wmbiff/security.debian.rb man/man1/wmbiff.1.gz man/man5/wmbiffrc.5.gz %%DATADIR%%/sample.wmbiffrc