diff options
| author | Mathieu Arnold <mat@FreeBSD.org> | 2016-06-16 13:23:13 +0000 |
|---|---|---|
| committer | Mathieu Arnold <mat@FreeBSD.org> | 2016-06-16 13:23:13 +0000 |
| commit | 5b55a8a53e383d5e641472b56a6d631e59da3967 (patch) | |
| tree | f5237f7173e7b9a5cbac11e6a57f460d84e79314 /security/hpenc | |
| parent | Add DEFAULT_VERSIONS=ssl=XXX (diff) | |
Fix usage of WITH_OPENSSL_BASE, WITH_OPENSSL_PORT and OPENSSL_PORT.
WITH_OPENSSL_* can't be set after bsd.port.pre.mk.
Fold all other usage into using SSL_DEFAULT == foo
PR: 210149
Submitted by: mat
Exp-run by: antoine
Sponsored by: The FreeBSD Foundation, Absolight
Differential Revision: https://reviews.freebsd.org/D6577
Notes
Notes:
svn path=/head/; revision=416966
Diffstat (limited to 'security/hpenc')
| -rw-r--r-- | security/hpenc/Makefile | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/security/hpenc/Makefile b/security/hpenc/Makefile index ce9ef1b50ebe..80ed20b43aee 100644 --- a/security/hpenc/Makefile +++ b/security/hpenc/Makefile @@ -28,21 +28,14 @@ CXXFLAGS+= -std=c++11 \ -I${OPENSSLINC} LDFLAGS+= -pthread -lcrypto -L${OPENSSLLIB} -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000036 WITH_OPENSSL_PORT= yes - -# XXX: brain damage warning -# we need to .include bsd.openssl.mk manually here.because USE_OPENSSL only -# works when it is defined before bsd.port{.pre}.mk is .included. -# This makes it currently impossible to combine this macro with OSVERSION to -# conditionally select WITH_OPENSSL_PORT for OSVERSIONS before 1000015 -.include "${PORTSDIR}/Mk/bsd.openssl.mk" .endif post-install: ${INSTALL_MAN} ${WRKSRC}/doc/hpenc.1 ${STAGEDIR}${MANPREFIX}/man/man1 ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/hpenc -.include <bsd.port.post.mk> +.include <bsd.port.mk> |