From owner-svn-ports-head@freebsd.org  Sun Sep 11 04:20:21 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@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 1AE9EBD446E;
 Sun, 11 Sep 2016 04:20:21 +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 DFF9112C;
 Sun, 11 Sep 2016 04:20:20 +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 u8B4KKFF085993;
 Sun, 11 Sep 2016 04:20:20 GMT (envelope-from marino@FreeBSD.org)
Received: (from marino@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8B4KK96085992;
 Sun, 11 Sep 2016 04:20:20 GMT (envelope-from marino@FreeBSD.org)
Message-Id: <201609110420.u8B4KK96085992@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: Sun, 11 Sep 2016 04:20:20 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r421788 - head/security/pam_ocra
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 11 Sep 2016 04:20:21 -0000

Author: marino
Date: Sun Sep 11 04:20:19 2016
New Revision: 421788
URL: https://svnweb.freebsd.org/changeset/ports/421788

Log:
  security/pam_ocra: Fix SSL handling especially wrt FreeBSD 9
  
  The SSL flags were moved to show unconditionally as they are always
  correct.  The WITH_OPENSSL_PORT=yes variable was replaced with an
  SSL version check so that the port is marked broken if built on
  FreeBSD 9 with the base OpenSSL libary selected.  This fixes other
  values of SSL_DEFAULT on all platforms.
  
  Approved by:	SSL blanket

Modified:
  head/security/pam_ocra/Makefile

Modified: head/security/pam_ocra/Makefile
==============================================================================
--- head/security/pam_ocra/Makefile	Sun Sep 11 04:09:29 2016	(r421787)
+++ head/security/pam_ocra/Makefile	Sun Sep 11 04:20:19 2016	(r421788)
@@ -10,25 +10,23 @@ COMMENT=	RFC6287 (OCRA) PAM module
 
 LICENSE=	BSD2CLAUSE
 
-USES=		uidfix
-USE_OPENSSL=	yes
-
+USES=		ssl uidfix
 USE_GITHUB=	yes
-
 GH_ACCOUNT=	sg2342
 
+CFLAGS+=	-I${OPENSSLINC}
+LDFLAGS+=	-L${OPENSSLLIB}
+
 PLIST_FILES=	lib/pam_ocra.so \
 		lib/pam_ocra.so.0 \
 		sbin/ocra_tool \
 		man/man8/pam_ocra.8.gz \
 		man/man8/ocra_tool.8.gz
 
-.include <bsd.port.options.mk>
+.include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 1000015
-WITH_OPENSSL_PORT=	yes
-CFLAGS+=	-I${OPENSSLINC}
-LDFLAGS+=	-L${OPENSSLLIB}
+.if ${SSL_DEFAULT} == base
+BROKEN_FreeBSD_9=	does not build with 9.x base OpenSSL
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>