1 files changed, 18 insertions, 11 deletions

diff --git a/update.sh b/update.sh
index e4d74fb..842ecd2 100755
--- a/update.sh
+++ b/update.sh
@@ -26,7 +26,7 @@ libssl_src=$CWD/openbsd/src/lib/libssl
 libssl_regress=$CWD/openbsd/src/regress/lib/libssl
 libtls_src=$CWD/openbsd/src/lib/libtls
 libtls_regress=$CWD/openbsd/src/regress/lib/libtls
-openssl_app_src=$CWD/openbsd/src/usr.bin/openssl
+app_src=$CWD/openbsd/src/usr.bin
 
 # load library versions
 . $libcrypto_src/crypto/shlib_version
@@ -210,15 +210,25 @@ $CP m4/check*.m4 \
 sed -e "s/compat\///" crypto/Makefile.am.arc4random > \
         libtls-standalone/compat/Makefile.am.arc4random
 
+# copy nc(1) source
+echo "copying nc(1) source"
+rm -f apps/nc/*.c apps/nc/*.h
+for i in `awk '/SOURCES|HEADERS|MANS/ { print $3 }' apps/nc/Makefile.am` ; do
+        if [ -e $app_src/nc/$i ]; then
+                $CP $app_src/nc/$i apps/nc
+        fi
+done
+
 # copy openssl(1) source
 echo "copying openssl(1) source"
-$CP $libc_src/stdlib/strtonum.c apps
-$CP $libcrypto_src/cert.pem apps
-$CP $libcrypto_src/openssl.cnf apps
-$CP $libcrypto_src/x509v3.cnf apps
-for i in `awk '/SOURCES|HEADERS/ { print $3 }' apps/Makefile.am` ; do
-        if [ -e $openssl_app_src/$i ]; then
-                $CP $openssl_app_src/$i apps
+rm -f apps/openssl/*.c apps/openssl/*.h
+$CP $libc_src/stdlib/strtonum.c apps/openssl/compat
+$CP $libcrypto_src/cert.pem apps/openssl
+$CP $libcrypto_src/openssl.cnf apps/openssl
+$CP $libcrypto_src/x509v3.cnf apps/openssl
+for i in `awk '/SOURCES|HEADERS|MANS/ { print $3 }' apps/openssl/Makefile.am` ; do
+        if [ -e $app_src/openssl/$i ]; then
+                $CP $app_src/openssl/$i apps/openssl
         fi
 done
 
@@ -298,9 +308,6 @@ echo "copying manpages"
 echo EXTRA_DIST = CMakeLists.txt > man/Makefile.am
 echo dist_man_MANS = >> man/Makefile.am
 
-$CP $openssl_app_src/openssl.1 man
-echo "dist_man_MANS += openssl.1" >> man/Makefile.am
-
 $CP $libtls_src/tls_init.3 man
 echo "dist_man_MANS += tls_init.3" >> man/Makefile.am