svn commit: r338825 - in head: etc secure/usr.bin/openssl

[Brad Davis]

Author: brd
Date: Thu Sep 20 09:34:55 2018
New Revision: 338825
URL: https://svnweb.freebsd.org/changeset/base/338825

Log:
  Move the openssl.cnf install to secure/usr.bin/openssl/
  
  This leverages CONFS to do the install
  
  Approved by:	re (pkgbase, blanket), bapt (mentor)
  Differential Revision:	https://reviews.freebsd.org/D17245

Modified:
  head/etc/Makefile
  head/secure/usr.bin/openssl/Makefile

Modified: head/etc/Makefile
==============================================================================
--- head/etc/Makefile	Thu Sep 20 09:31:27 2018	(r338824)
+++ head/etc/Makefile	Thu Sep 20 09:34:55 2018	(r338825)
@@ -22,10 +22,6 @@ BIN1=	\
 
 # NB: keep these sorted by MK_* knobs
 
-.if ${MK_OPENSSL} != "no"
-SSL=	${SRCTOP}/crypto/openssl/apps/openssl.cnf
-.endif
-
 .if ${MK_SENDMAIL} != "no"
 BIN1+=	rc.sendmail
 .endif
@@ -94,10 +90,6 @@ distribution:
 .endif
 .if ${MK_SENDMAIL} != "no"
 	${_+_}cd ${.CURDIR}/sendmail; ${MAKE} distribution
-.endif
-.if ${MK_OPENSSL} != "no"
-	cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
-	    ${SSL} ${DESTDIR}/etc/ssl
 .endif
 .if ${MK_KERBEROS} != "no"
 	cd ${.CURDIR}/root; \

Modified: head/secure/usr.bin/openssl/Makefile
==============================================================================
--- head/secure/usr.bin/openssl/Makefile	Thu Sep 20 09:31:27 2018	(r338824)
+++ head/secure/usr.bin/openssl/Makefile	Thu Sep 20 09:34:55 2018	(r338825)
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+CONFS=	openssl.cnf
+CONFSDIR=	/etc/ssl
 PROG=	openssl
 
 LIBADD=	ssl crypto