From owner-svn-ports-all@freebsd.org  Sun Sep 11 03:54:08 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 6641ABD5E20;
 Sun, 11 Sep 2016 03:54:08 +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 2E1076E7;
 Sun, 11 Sep 2016 03:54:08 +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 u8B3s70Q077921;
 Sun, 11 Sep 2016 03:54:07 GMT (envelope-from marino@FreeBSD.org)
Received: (from marino@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8B3s7mH077920;
 Sun, 11 Sep 2016 03:54:07 GMT (envelope-from marino@FreeBSD.org)
Message-Id: <201609110354.u8B3s7mH077920@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 03:54:07 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r421784 - head/security/netpgp
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: Sun, 11 Sep 2016 03:54:08 -0000

Author: marino
Date: Sun Sep 11 03:54:07 2016
New Revision: 421784
URL: https://svnweb.freebsd.org/changeset/ports/421784

Log:
  security/netpgp: Document SSL requirement and support ports SSL libraries
  
  The FreeBSD 10+ check for IDEA was hardcoded against the base library.
  While all ports SSL library options likely have idea.h, extending the
  check generically enables the port to build correctly on all platforms
  when SSL_DEFAULT is set to something other than "base".
  
  Approved by:	SSL blanket

Modified:
  head/security/netpgp/Makefile

Modified: head/security/netpgp/Makefile
==============================================================================
--- head/security/netpgp/Makefile	Sun Sep 11 03:28:18 2016	(r421783)
+++ head/security/netpgp/Makefile	Sun Sep 11 03:54:07 2016	(r421784)
@@ -8,15 +8,18 @@ MASTER_SITES=	ftp://ftp.netbsd.org/pub/p
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	PGP signing, verification, encryption, and decryption program
 
-USES=		libtool
-USE_OPENSSL=	yes
+USES=		libtool ssl
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 
-CFLAGS+=	-Wno-error
-.if !exists(/usr/include/openssl/idea.h)
+.include <bsd.port.pre.mk>
+
+CPPFLAGS+=	-I${OPENSSLINC}
+CFLAGS+=	-I${OPENSSLINC} -Wno-error
+LDFLAGS+=	-L${OPENSSLLIB}
+.if !exists(${OPENSSLINC}/openssl/idea.h)
 CFLAGS+=	-DOPENSSL_NO_IDEA
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>