svn commit: r515849 - in branches/2019Q4/dns: libasr libasr-devel

[Dima Panov]

Author: fluffy
Date: Mon Oct 28 09:11:34 2019
New Revision: 515849
URL: https://svnweb.freebsd.org/changeset/ports/515849

Log:
  MFH: r515713
  
  - LibASR doesn't need to depend on *SSL but optional CAroots package
  
  Approved by:	ports-secteam (miwi)

Modified:
  branches/2019Q4/dns/libasr-devel/Makefile
  branches/2019Q4/dns/libasr/Makefile
Directory Properties:
  branches/2019Q4/   (props changed)

Modified: branches/2019Q4/dns/libasr-devel/Makefile
==============================================================================
--- branches/2019Q4/dns/libasr-devel/Makefile	Mon Oct 28 08:09:34 2019	(r515848)
+++ branches/2019Q4/dns/libasr-devel/Makefile	Mon Oct 28 09:11:34 2019	(r515849)
@@ -3,10 +3,9 @@
 
 PORTNAME=	libasr
 PORTVERSION=	201602131606
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	dns
-MASTER_SITES=	http://www.opensmtpd.org/archives/ \
-		http://distfiles.pirateparty.in/ashish/
+MASTER_SITES=	http://www.opensmtpd.org/archives/
 PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	fluffy at FreeBSD.org
@@ -16,14 +15,26 @@ LICENSE=	ISCL BSD4CLAUSE BSD3CLAUSE BSD2CLAUSE
 LICENSE_COMB=	multi
 LICENSE_FILE=	${WRKSRC}/LICENCE
 
+USES=		cpe groff libtool
+
 CONFLICTS=	libasr-[0-9]*
 
-USES=		groff libtool ssl:build
+OPTIONS_DEFINE=	CA_BUNDLE
+OPTIONS_DEFAULT=	CA_BUNDLE
+
+CA_BUNDLE_DESC=	Use NSS CA bundle for SSL instead of /etc/ssl/cert.pem
+
+CPE_VENDOR=	openbsd
+
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--with-mantype="man"
 INSTALL_TARGET=	install-strip
 
-CFLAGS+=	-I${OPENSSLINC}
+CA_BUNDLE_CONFIGURE_WITH=	ca-file=${LOCALBASE}/share/certs/ca-root-nss.crt
+CA_BUNDLE_RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
+
+post-patch:
+	${REINPLACE_CMD} -e '/opensslv.h/d' ${WRKSRC}/openbsd-compat/includes.h
 
 .include <bsd.port.mk>

Modified: branches/2019Q4/dns/libasr/Makefile
==============================================================================
--- branches/2019Q4/dns/libasr/Makefile	Mon Oct 28 08:09:34 2019	(r515848)
+++ branches/2019Q4/dns/libasr/Makefile	Mon Oct 28 09:11:34 2019	(r515849)
@@ -3,10 +3,9 @@
 
 PORTNAME=	libasr
 PORTVERSION=	1.0.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	dns
-MASTER_SITES=	http://www.opensmtpd.org/archives/ \
-		http://distfiles.pirateparty.in/ashish/
+MASTER_SITES=	http://www.opensmtpd.org/archives/
 
 MAINTAINER=	fluffy at FreeBSD.org
 COMMENT=	Asynchronous DNS resolver library
@@ -15,14 +14,26 @@ LICENSE=	ISCL BSD4CLAUSE BSD3CLAUSE BSD2CLAUSE
 LICENSE_COMB=	multi
 LICENSE_FILE=	${WRKSRC}/LICENCE
 
+USES=		cpe groff libtool
+
 CONFLICTS=	libasr-devel-[0-9]*
 
-USES=		groff libtool ssl:build
+OPTIONS_DEFINE=	CA_BUNDLE
+OPTIONS_DEFAULT=	CA_BUNDLE
+
+CA_BUNDLE_DESC=	Use NSS CA bundle for SSL instead of /etc/ssl/cert.pem
+
+CPE_VENDOR=	openbsd
+
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--with-mantype="man"
 INSTALL_TARGET=	install-strip
 
-CFLAGS+=	-I${OPENSSLINC}
+CA_BUNDLE_CONFIGURE_WITH=	ca-file=${LOCALBASE}/share/certs/ca-root-nss.crt
+CA_BUNDLE_RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
+
+post-patch:
+	${REINPLACE_CMD} -e '/opensslv.h/d' ${WRKSRC}/openbsd-compat/includes.h
 
 .include <bsd.port.mk>