Index: head/crypto/openssl/FREEBSD-Xlist
===================================================================
--- head/crypto/openssl/FREEBSD-Xlist	(revision 183228)
+++ head/crypto/openssl/FREEBSD-Xlist	(nonexistent)
@@ -1,50 +0,0 @@
-$FreeBSD$
-INSTALL.DJGPP
-INSTALL.MacOS
-INSTALL.NW
-INSTALL.OS2
-INSTALL.VMS
-INSTALL.W32
-INSTALL.W64
-INSTALL.WCE
-MacOS/
-VMS/
-Netware/
-*.com
-*.bak
-*.def
-*.mak
-*/*.bat
-*/*.com
-*/*/*.bat
-*/*/*.com
-apps/openssl-vms.cnf
-crypto/bn/asm/pa-risc2.s.old
-crypto/bn/asm/vms.mar
-crypto/bn/vms-helper.c
-crypto/buildinf.h
-crypto/dso/dso_vms.c
-crypto/dso/dso_win32.c
-crypto/threads/solaris.sh
-demos/engines/rsaref/
-diffs.*
-do_patch.sh
-fips/
-ms/
-op
-os2/
-rsaref/
-shlib/Makefile.hpux10-cc
-shlib/hpux10-cc.sh
-shlib/irix.sh
-shlib/solaris-sc4.sh
-shlib/solaris.sh
-shlib/sun.sh
-shlib/sco5-shared-installed
-shlib/sco5-shared-gcc.sh
-shlib/sco5-shared.sh
-shlib/svr5-shared-gcc.sh
-shlib/svr5-shared-installed
-shlib/svr5-shared.sh
-test/fips_aes_data
-util/cygwin.sh

Property changes on: head/crypto/openssl/FREEBSD-Xlist
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: head/crypto/openssl/FREEBSD-upgrade
===================================================================
--- head/crypto/openssl/FREEBSD-upgrade	(revision 183228)
+++ head/crypto/openssl/FREEBSD-upgrade	(nonexistent)
@@ -1,43 +0,0 @@
-
-This contains various notes used to import a new OpenSSL version into
-the FreeBSD base system.  It is not expected to be complete but just to
-contain some hints for imports.  Note that this doesn't actually deal
-with getting OpenSSL to compile...
-
-setenv OSSLVER 0.9.8e
-# OSSLTAG format: v0_9_8e
-setenv OSSLTAG v`echo ${OSSLVER} | tr . _`
-fetch  http://www.openssl.org/source/openssl-${OSSLVER}.tar.gz \
-	http://www.openssl.org/source/openssl-${OSSLVER}.tar.gz.asc
-gpg --verify openssl-${OSSLVER}.tar.gz.asc openssl-${OSSLVER}.tar.gz
-tar xf openssl-${OSSLVER}.tar.gz
-mv openssl-${OSSLVER} openssl
-cd openssl
-find . -type l -delete
-sh -c 'while read glob ; do rm -rvf $glob ; done' </usr/src/crypto/openssl/FREEBSD-Xlist
-# Check for new files
-cvs -n import src/crypto/openssl OPENSSL x | grep \^N
-cvs import -m "Vendor import of OpenSSL ${OSSLVER}." src/crypto/openssl OPENSSL ${OSSLTAG}
-cvs checkout -j<prev_rel_tag> -j${OSSLTAG} src/crypto/openssl
-# Resolve conflicts manually
-cd src/crypto/openssl
-cvs ci -m "Resolve conflicts after import of OpenSSL ${OSSLVER}."
-
-cd ../../secure
-# Do something so it actually compiles...
-# Update version number in lib/libcrypto/Makefile.inc
-cd lib/libcrypto
-make man-makefile-update && make man-update
-cd ../libssl
-make man-makefile-update && make man-update
-cd ../../usr.bin/openssl
-make man-makefile-update && make man-update
-cd ../..
-cvs add lib/libcrypto/man/*.3 lib/libssl/man/*.3 usr.bin/openssl/man/*.1
-cvs update
-# check for files not added
-cvs ci -m "Upgrade to OpenSSL ${OSSLVER}."
-
-					-- simon@
-
-$FreeBSD$

Property changes on: head/crypto/openssl/FREEBSD-upgrade
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Index: vendor-crypto/openssl/dist/FREEBSD-Xlist
===================================================================
--- vendor-crypto/openssl/dist/FREEBSD-Xlist	(nonexistent)
+++ vendor-crypto/openssl/dist/FREEBSD-Xlist	(revision 183229)
@@ -0,0 +1,50 @@
+$FreeBSD$
+INSTALL.DJGPP
+INSTALL.MacOS
+INSTALL.NW
+INSTALL.OS2
+INSTALL.VMS
+INSTALL.W32
+INSTALL.W64
+INSTALL.WCE
+MacOS/
+VMS/
+Netware/
+*.com
+*.bak
+*.def
+*.mak
+*/*.bat
+*/*.com
+*/*/*.bat
+*/*/*.com
+apps/openssl-vms.cnf
+crypto/bn/asm/pa-risc2.s.old
+crypto/bn/asm/vms.mar
+crypto/bn/vms-helper.c
+crypto/buildinf.h
+crypto/dso/dso_vms.c
+crypto/dso/dso_win32.c
+crypto/threads/solaris.sh
+demos/engines/rsaref/
+diffs.*
+do_patch.sh
+fips/
+ms/
+op
+os2/
+rsaref/
+shlib/Makefile.hpux10-cc
+shlib/hpux10-cc.sh
+shlib/irix.sh
+shlib/solaris-sc4.sh
+shlib/solaris.sh
+shlib/sun.sh
+shlib/sco5-shared-installed
+shlib/sco5-shared-gcc.sh
+shlib/sco5-shared.sh
+shlib/svr5-shared-gcc.sh
+shlib/svr5-shared-installed
+shlib/svr5-shared.sh
+test/fips_aes_data
+util/cygwin.sh

Property changes on: vendor-crypto/openssl/dist/FREEBSD-Xlist
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /vendor-crypto/openssl/dist/FREEBSD-Xlist:r55100-182044
Index: vendor-crypto/openssl/dist/FREEBSD-upgrade
===================================================================
--- vendor-crypto/openssl/dist/FREEBSD-upgrade	(nonexistent)
+++ vendor-crypto/openssl/dist/FREEBSD-upgrade	(revision 183229)
@@ -0,0 +1,43 @@
+
+This contains various notes used to import a new OpenSSL version into
+the FreeBSD base system.  It is not expected to be complete but just to
+contain some hints for imports.  Note that this doesn't actually deal
+with getting OpenSSL to compile...
+
+setenv OSSLVER 0.9.8e
+# OSSLTAG format: v0_9_8e
+setenv OSSLTAG v`echo ${OSSLVER} | tr . _`
+fetch  http://www.openssl.org/source/openssl-${OSSLVER}.tar.gz \
+	http://www.openssl.org/source/openssl-${OSSLVER}.tar.gz.asc
+gpg --verify openssl-${OSSLVER}.tar.gz.asc openssl-${OSSLVER}.tar.gz
+tar xf openssl-${OSSLVER}.tar.gz
+mv openssl-${OSSLVER} openssl
+cd openssl
+find . -type l -delete
+sh -c 'while read glob ; do rm -rvf $glob ; done' </usr/src/crypto/openssl/FREEBSD-Xlist
+# Check for new files
+cvs -n import src/crypto/openssl OPENSSL x | grep \^N
+cvs import -m "Vendor import of OpenSSL ${OSSLVER}." src/crypto/openssl OPENSSL ${OSSLTAG}
+cvs checkout -j<prev_rel_tag> -j${OSSLTAG} src/crypto/openssl
+# Resolve conflicts manually
+cd src/crypto/openssl
+cvs ci -m "Resolve conflicts after import of OpenSSL ${OSSLVER}."
+
+cd ../../secure
+# Do something so it actually compiles...
+# Update version number in lib/libcrypto/Makefile.inc
+cd lib/libcrypto
+make man-makefile-update && make man-update
+cd ../libssl
+make man-makefile-update && make man-update
+cd ../../usr.bin/openssl
+make man-makefile-update && make man-update
+cd ../..
+cvs add lib/libcrypto/man/*.3 lib/libssl/man/*.3 usr.bin/openssl/man/*.1
+cvs update
+# check for files not added
+cvs ci -m "Upgrade to OpenSSL ${OSSLVER}."
+
+					-- simon@
+
+$FreeBSD$

Property changes on: vendor-crypto/openssl/dist/FREEBSD-upgrade
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /vendor-crypto/openssl/dist/FREEBSD-upgrade:r55100-182044