Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 8 Apr 2021 11:55:30 GMT
From:      Renato Botelho <garga@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 97ea9a85b58f - main - mail/wmbiff: Fix build with GNUTLS
Message-ID:  <202104081155.138BtUD8046227@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by garga:

URL: https://cgit.FreeBSD.org/ports/commit/?id=97ea9a85b58f03a8b27483f5925fc3be9ad4bdea

commit 97ea9a85b58f03a8b27483f5925fc3be9ad4bdea
Author:     Renato Botelho <garga@FreeBSD.org>
AuthorDate: 2021-04-08 11:34:56 +0000
Commit:     Renato Botelho <garga@FreeBSD.org>
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



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