svn commit: r360408 - head/security/openssl

[Dirk Meyer]

Author: dinoex
Date: Thu Jul  3 16:49:37 2014
New Revision: 360408
URL: http://svnweb.freebsd.org/changeset/ports/360408
QAT: https://qat.redports.org/buildarchive/r360408/

Log:
  - allow OPENSSLDIR be changed in /etc/make.conf or Makefile.local

Modified:
  head/security/openssl/Makefile
  head/security/openssl/pkg-plist

Modified: head/security/openssl/Makefile
==============================================================================
--- head/security/openssl/Makefile	Thu Jul  3 16:49:13 2014	(r360407)
+++ head/security/openssl/Makefile	Thu Jul  3 16:49:37 2014	(r360408)
@@ -56,7 +56,6 @@ USE_PERL5=	build
 MAKE_ARGS+=	WHOLE_ARCHIVE_FLAG=--whole-archive
 MAKE_ENV+=	LIBRPATH="${PREFIX}/lib" GREP_OPTIONS=
 SUB_FILES=	pkg-message
-OPENSSLDIR=	${PREFIX}/openssl
 
 FIX_POD=apps/cms.pod \
 	apps/smime.pod \
@@ -84,6 +83,9 @@ FIX_POD=apps/cms.pod \
 IGNORE=	OpenSSL can not be installed over the base version
 .endif
 
+OPENSSLDIR?=	${PREFIX}/openssl
+PLIST_SUB+=	OPENSSLDIR=${OPENSSLDIR:S=^${PREFIX}/==}
+
 OPENSSL_BASE_SONAME!=	readlink ${DESTDIR}/usr/lib/libcrypto.so || true
 OPENSSL_SHLIBVER_BASE=	${OPENSSL_BASE_SONAME:E}
 OPENSSL_BASE_SOPATH=	${OPENSSL_BASE_SONAME:H}

Modified: head/security/openssl/pkg-plist
==============================================================================
--- head/security/openssl/pkg-plist	Thu Jul  3 16:49:13 2014	(r360407)
+++ head/security/openssl/pkg-plist	Thu Jul  3 16:49:37 2014	(r360408)
@@ -1323,18 +1323,18 @@ man/man3/x509.3.gz
 man/man5/config.5.gz
 man/man5/x509v3_config.5.gz
 man/man7/des_modes.7.gz
-openssl/misc/CA.pl
-openssl/misc/CA.sh
-openssl/misc/c_hash
-openssl/misc/c_info
-openssl/misc/c_issuer
-openssl/misc/c_name
-openssl/misc/tsget
-openssl/openssl.cnf.sample
+%%OPENSSLDIR%%/misc/CA.pl
+%%OPENSSLDIR%%/misc/CA.sh
+%%OPENSSLDIR%%/misc/c_hash
+%%OPENSSLDIR%%/misc/c_info
+%%OPENSSLDIR%%/misc/c_issuer
+%%OPENSSLDIR%%/misc/c_name
+%%OPENSSLDIR%%/misc/tsget
+%%OPENSSLDIR%%/openssl.cnf.sample
 %%PORTDOCS%%%%DOCSDIR%%/openssl.txt
 @dirrm include/openssl
- at dirrmtry openssl/certs
- at dirrm openssl/misc
- at dirrmtry openssl/private
- at dirrm openssl
+ at dirrmtry %%OPENSSLDIR%%/certs
+ at dirrm %%OPENSSLDIR%%/misc
+ at dirrmtry %%OPENSSLDIR%%/private
+ at dirrm %%OPENSSLDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%