From owner-svn-ports-all@freebsd.org  Sat Sep 10 05:09:00 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id AC3EBBD5EBF;
 Sat, 10 Sep 2016 05:09:00 +0000 (UTC)
 (envelope-from marino@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 547CB7FD;
 Sat, 10 Sep 2016 05:09:00 +0000 (UTC)
 (envelope-from marino@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8A58x1x053140;
 Sat, 10 Sep 2016 05:08:59 GMT (envelope-from marino@FreeBSD.org)
Received: (from marino@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8A58xlD053139;
 Sat, 10 Sep 2016 05:08:59 GMT (envelope-from marino@FreeBSD.org)
Message-Id: <201609100508.u8A58xlD053139@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: marino set sender to
 marino@FreeBSD.org using -f
From: John Marino <marino@FreeBSD.org>
Date: Sat, 10 Sep 2016 05:08:59 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r421665 - head/security/yafic
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Sep 2016 05:09:00 -0000

Author: marino
Date: Sat Sep 10 05:08:59 2016
New Revision: 421665
URL: https://svnweb.freebsd.org/changeset/ports/421665

Log:
  security/yafic: Document SSL requirement, convert to options
  
  This port was using the WITHOUT_OPENSSL knob.  Convert it to a default
  option "CRYPTO" and bump the port revision.  THere's a build dependency
  on OpenSSL headers when this option is on.
  
  Note that the WWW value is obsolete.
  
  Approved by:	SSL blanket

Modified:
  head/security/yafic/Makefile

Modified: head/security/yafic/Makefile
==============================================================================
--- head/security/yafic/Makefile	Sat Sep 10 04:48:58 2016	(r421664)
+++ head/security/yafic/Makefile	Sat Sep 10 05:08:59 2016	(r421665)
@@ -3,7 +3,7 @@
 
 PORTNAME=	yafic
 PORTVERSION=	1.2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	SF
 
@@ -14,27 +14,32 @@ GNU_CONFIGURE=	yes
 USES=		gmake
 LDFLAGS+=	-static
 
-.if defined(WITHOUT_OPENSSL)
-CONFIGURE_ARGS=	--disable-crypto
-PLIST_SUB+=	CRYPTO="@comment "
-.else
-PLIST_SUB+=	CRYPTO=""
-.endif
+OPTIONS_DEFINE=	CRYPTO
+OPTIONS_DEFAULT=	CRYPTO
+OPTIONS_SUB=	yes
+
+CRYPTO_DESC=			Cryptographic support
+CRYPTO_USES=			ssl:build
+CRYPTO_CONFIGURE_ENABLE=	crypto
+CRYPTO_LDFLAGS=			-L${OPENSSLLIB}
+CRYPTO_CFLAGS=			-I${OPENSSLINC}
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
+.include <bsd.port.options.mk>
+
 post-patch:
 	@${SED} -e "s;@@PREFIX@@;${PREFIX};g" \
 		${.CURDIR}/pkg-message > ${PKGMESSAGE}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/yafic ${STAGEDIR}${PREFIX}/bin
-.if !defined(WITHOUT_OPENSSL)
+.if ${PORT_OPTIONS:MCRYPTO}
 	${INSTALL_PROGRAM} ${WRKSRC}/yafic-sign ${STAGEDIR}${PREFIX}/bin
 	${LN} -sf yafic-sign ${STAGEDIR}${PREFIX}/bin/yafic-check
 .endif
 	${INSTALL_MAN} ${WRKSRC}/yafic.1 ${STAGEDIR}${PREFIX}/man/man1
-.if !defined(WITHOUT_OPENSSL)
+.if ${PORT_OPTIONS:MCRYPTO}
 	${INSTALL_MAN} ${WRKSRC}/yafic-sign.1 ${STAGEDIR}${PREFIX}/man/man1
 	${LN} -sf yafic-sign.1 ${STAGEDIR}${PREFIX}/man/man1/yafic-check.1
 .endif