Received: by mail.netbsd.org (Postfix, from userid 605) id 67F1A84E06; Sat, 25 Apr 2020 12:45:44 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id E3FE184DF3 for ; Sat, 25 Apr 2020 12:45:43 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id cuWBXGmQMp-I for ; Sat, 25 Apr 2020 12:45:43 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 55B4984D3C for ; Sat, 25 Apr 2020 12:45:43 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 4FBF0FB27; Sat, 25 Apr 2020 12:45:43 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1587818743123200" MIME-Version: 1.0 Date: Sat, 25 Apr 2020 12:45:43 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/www/neon To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20200425124543.4FBF0FB27@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1587818743123200 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Sat Apr 25 12:45:43 UTC 2020 Modified Files: pkgsrc/www/neon: Makefile buildlink3.mk options.mk Log Message: neon: Add gnutls support. This probably makes more sense as a default given that neon is GPLv2. To generate a diff of this commit: cvs rdiff -u -r1.74 -r1.75 pkgsrc/www/neon/Makefile cvs rdiff -u -r1.20 -r1.21 pkgsrc/www/neon/buildlink3.mk cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/neon/options.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1587818743123200 Content-Disposition: inline Content-Length: 2883 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/www/neon/Makefile diff -u pkgsrc/www/neon/Makefile:1.74 pkgsrc/www/neon/Makefile:1.75 --- pkgsrc/www/neon/Makefile:1.74 Sat Jan 18 21:48:30 2020 +++ pkgsrc/www/neon/Makefile Sat Apr 25 12:45:43 2020 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.74 2020/01/18 21:48:30 jperkin Exp $ +# $NetBSD: Makefile,v 1.75 2020/04/25 12:45:43 nia Exp $ DISTNAME= neon-0.30.2 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= www #MASTER_SITES= http://www.webdav.org/neon/ @@ -15,7 +15,6 @@ USE_TOOLS+= pkg-config msgfmt GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-shared CONFIGURE_ARGS+= --with-expat -CONFIGURE_ARGS+= --with-ssl=yes PKGCONFIG_OVERRIDE= neon.pc.in TEST_TARGET= check @@ -28,6 +27,5 @@ LDFLAGS.SunOS+= -lintl .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" -.include "../../security/openssl/buildlink3.mk" .include "../../textproc/expat/buildlink3.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/www/neon/buildlink3.mk diff -u pkgsrc/www/neon/buildlink3.mk:1.20 pkgsrc/www/neon/buildlink3.mk:1.21 --- pkgsrc/www/neon/buildlink3.mk:1.20 Sat Jan 18 21:48:30 2020 +++ pkgsrc/www/neon/buildlink3.mk Sat Apr 25 12:45:43 2020 @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.20 2020/01/18 21:48:30 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.21 2020/04/25 12:45:43 nia Exp $ BUILDLINK_TREE+= neon @@ -9,8 +9,18 @@ BUILDLINK_API_DEPENDS.neon+= neon>=0.24. BUILDLINK_ABI_DEPENDS.neon+= neon>=0.30.2nb3 BUILDLINK_PKGSRCDIR.neon?= ../../www/neon -.include "../../devel/zlib/buildlink3.mk" +pkgbase := neon +.include "../../mk/pkg-build-options.mk" + +.if ${PKG_BUILD_OPTIONS.neon:Mgnutls} +.include "../../security/gnutls/buildlink3.mk" +.endif + +.if ${PKG_BUILD_OPTIONS.neon:Mopenssl} .include "../../security/openssl/buildlink3.mk" +.endif + +.include "../../devel/zlib/buildlink3.mk" .include "../../textproc/expat/buildlink3.mk" .endif # NEON_BUILDLINK3_MK Index: pkgsrc/www/neon/options.mk diff -u pkgsrc/www/neon/options.mk:1.1 pkgsrc/www/neon/options.mk:1.2 --- pkgsrc/www/neon/options.mk:1.1 Tue Jan 31 04:15:29 2006 +++ pkgsrc/www/neon/options.mk Sat Apr 25 12:45:43 2020 @@ -1,7 +1,12 @@ -# $NetBSD: options.mk,v 1.1 2006/01/31 04:15:29 epg Exp $ +# $NetBSD: options.mk,v 1.2 2020/04/25 12:45:43 nia Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.neon + +PKG_OPTIONS_REQUIRED_GROUPS= ssl +PKG_OPTIONS_GROUP.ssl= gnutls openssl + PKG_SUPPORTED_OPTIONS= gssapi +PKG_SUGGESTED_OPTIONS= gnutls .include "../../mk/bsd.options.mk" @@ -11,3 +16,11 @@ CONFIGURE_ARGS+= --with-gssapi .else CONFIGURE_ARGS+= --without-gssapi .endif + +.if !empty(PKG_OPTIONS:Mopenssl) +. include "../../security/openssl/buildlink3.mk" +CONFIGURE_ARGS+= --with-ssl=openssl +.elif !empty(PKG_OPTIONS:Mgnutls) +. include "../../security/gnutls/buildlink3.mk" +CONFIGURE_ARGS+= --with-ssl=gnutls +.endif --_----------=_1587818743123200--