git: e52c0266c99e - main - net/tintin++: Add GNUTLS option

Po-Chuan Hsieh sunpoet at FreeBSD.org
Sun Aug 8 22:10:43 UTC 2021


The branch main has been updated by sunpoet:

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

commit e52c0266c99e9b5de18af55c2bb9bd4a208df7b6
Author:     Tobias Rehbein <tobias.rehbein at web.de>
AuthorDate: 2021-08-08 21:42:16 +0000
Commit:     Po-Chuan Hsieh <sunpoet at FreeBSD.org>
CommitDate: 2021-08-08 21:46:40 +0000

    net/tintin++: Add GNUTLS option
    
    PR:             257592
---
 net/tintin++/Makefile | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/net/tintin++/Makefile b/net/tintin++/Makefile
index 252621df09cb..a3b72baf4169 100644
--- a/net/tintin++/Makefile
+++ b/net/tintin++/Makefile
@@ -15,19 +15,12 @@ LICENSE_FILE=	${WRKSRC}/../COPYING
 
 LIB_DEPENDS=	libpcre.so:devel/pcre
 
-CONFLICTS_INSTALL?=	zh-tintin++
-
-OPTIONS_DEFINE=	BIG5 DOCS
-BIG5_DESC=	Big5 support
-
 USES=		gmake localbase
 
 CONFIGURE_ARGS=	--includedir=${LOCALBASE}/include \
 		--libdir=${LOCALBASE}/lib \
 		--prefix=${PREFIX}
-CONFIGURE_ENV=	ac_cv_file__dev_ptmx=no \
-		ac_cv_header_gnutls_gnutls_h=no \
-		ac_cv_lib_gnutls_gnutls_init=no
+CONFIGURE_ENV=	ac_cv_file__dev_ptmx=no
 GNU_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}/tt/src
 
@@ -36,9 +29,17 @@ DOCS=		CREDITS FAQ README SCRIPTS TODO \
 PLIST_FILES=	bin/tt++
 PORTDOCS=	${DOCS:T}
 
+CONFLICTS_INSTALL?=	zh-tintin++
+
 SLAVEDIRS=	chinese/tintin++
 
+OPTIONS_DEFINE=	BIG5 DOCS GNUTLS
+BIG5_DESC=	Big5 support
+
 BIG5_CONFIGURE_ENABLE=	big5
+GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
+GNUTLS_CONFIGURE_ENV_OFF=	ac_cv_header_gnutls_gnutls_h=no \
+				ac_cv_lib_gnutls_gnutls_init=no
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/tt++ ${STAGEDIR}${PREFIX}/bin/


More information about the dev-commits-ports-main mailing list