3 files changed, 51 insertions, 6 deletions

diff --git a/src/lib/libssl/Makefile b/src/lib/libssl/Makefile
index 04baaccb45..16d08731eb 100644
--- a/src/lib/libssl/Makefile
+++ b/src/lib/libssl/Makefile
@@ -1,11 +1,56 @@
-# $OpenBSD: Makefile,v 1.19 2014/04/11 22:51:53 miod Exp $
+# $OpenBSD: Makefile,v 1.20 2016/09/03 12:42:42 beck Exp $
 
-SUBDIR=ssl man
+SUBDIR= man
 PC_FILES=openssl.pc libssl.pc
 
 CLEANFILES=${PC_FILES}
 
+LIB=    ssl
+
+.include <bsd.own.mk>
+CFLAGS+= -Wall -Wundef
+.if ${COMPILER_VERSION:L} != "gcc3"
+CFLAGS+= -Werror
+.endif
+CFLAGS+= -DLIBRESSL_INTERNAL
+CFLAGS+= -I${.CURDIR}
+
+LDADD+= -L${BSDOBJDIR}/lib/libcrypto/crypto -lcrypto
+
+SRCS=\
+        s3_srvr.c s3_clnt.c s3_lib.c s3_pkt.c s3_both.c \
+        s23_srvr.c s23_clnt.c s23_lib.c s23_pkt.c \
+        t1_meth.c t1_srvr.c t1_clnt.c t1_lib.c t1_enc.c \
+        d1_meth.c d1_srvr.c d1_clnt.c d1_lib.c d1_pkt.c \
+        d1_both.c d1_enc.c d1_srtp.c \
+        ssl_lib.c ssl_err2.c ssl_cert.c ssl_sess.c \
+        ssl_ciph.c ssl_stat.c ssl_rsa.c \
+        ssl_asn1.c ssl_txt.c ssl_algs.c \
+        bio_ssl.c ssl_err.c t1_reneg.c \
+        pqueue.c
+SRCS+=  s3_cbc.c
+SRCS+=  bs_ber.c bs_cbb.c bs_cbs.c
+
+HDRS=   srtp.h ssl.h ssl2.h ssl3.h ssl23.h tls1.h dtls1.h 
+
+.PATH:  ${.CURDIR}
+
+includes:
+        @test -d ${DESTDIR}/usr/include/openssl || \
+            mkdir ${DESTDIR}/usr/include/openssl
+        @cd ${.CURDIR}; for i in $(HDRS); do \
+            j="cmp -s $$i ${DESTDIR}/usr/include/openssl/`basename $$i` || \
+            ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 $$i\
+                ${DESTDIR}/usr/include/openssl"; \
+            echo $$j; \
+            eval "$$j"; \
+        done;
+
+.include <bsd.lib.mk>
+
 beforeinstall:
+        nm -o lib${LIB}.a | egrep -w 'printf|fprintf' && \
+            (echo please fix stdio usage in this library; false) || true
         /bin/sh ${.CURDIR}/generate_pkgconfig.sh -c ${.CURDIR} -o ${.OBJDIR}
 .for p in ${PC_FILES}
         ${INSTALL} ${INSTALL_COPY} -o root -g ${SHAREGRP} \
diff --git a/src/lib/libssl/generate_pkgconfig.sh b/src/lib/libssl/generate_pkgconfig.sh
index ea050120fb..de14a121fc 100644
--- a/src/lib/libssl/generate_pkgconfig.sh
+++ b/src/lib/libssl/generate_pkgconfig.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $OpenBSD: generate_pkgconfig.sh,v 1.8 2014/04/11 22:51:53 miod Exp $
+# $OpenBSD: generate_pkgconfig.sh,v 1.9 2016/09/03 12:42:42 beck Exp $
 #
 # Copyright (c) 2010,2011 Jasper Lievisse Adriaanse <jasper@openbsd.org>
 #
@@ -51,7 +51,7 @@ if [ ! -w "${objdir}" ]; then
 fi
 
 version_re="s/^#define[[:blank:]]+SHLIB_VERSION_NUMBER[[:blank:]]+\"(.*)\".*/\1/p"
-version_file=${curdir}/src/crypto/opensslv.h
+version_file=${curdir}/../libcrypto/opensslv.h
 lib_version=$(sed -nE ${version_re} ${version_file})
 
 # Put -I${includedir} into Cflags so configure script tests like
diff --git a/src/lib/libssl/man/Makefile b/src/lib/libssl/man/Makefile
index cb0b2661db..e30d3fbb42 100644
--- a/src/lib/libssl/man/Makefile
+++ b/src/lib/libssl/man/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.33 2016/03/30 06:38:43 jmc Exp $
+# $OpenBSD: Makefile,v 1.34 2016/09/03 12:42:45 beck Exp $
 
 .include <bsd.own.mk>           # for NOMAN
 
@@ -96,7 +96,7 @@ maninstall:
 
 .endif
 
-.PATH: ${.CURDIR}/../src/doc/ssl
+.PATH: ${.CURDIR}/../doc
 .SUFFIXES: .pod .1 .3 .7
 .for sect in 1 3 7
 .pod.${sect}: