Merge from internat.freebsd.org; make RSAREF=YES work correctly, although

this is not very useful as the US repo is missing bits.

secure/lib/libcrypto/Makefile

@@ -132,6 +132,7 @@ SRCS+=	rsa_eay.c				# native rsa
 .else
 SRCS+=	rsar_err.c rsaref.c rsaref_stubs.c	# external rsaref
 HDRS+=	../rsaref/rsaref.h
+CFLAGS+=-DRSAref
 .endif
 .endif
 

secure/lib/libcrypto/Makefile.inc

@@ -17,6 +17,5 @@ LOCALBASE?=	/usr/local
 
 WITH_RSA?= YES
 .if (!defined(USA_RESIDENT) || ${USA_RESIDENT} != NO) && ${WITH_RSA} != NO
-CFLAGS+= -DRSAref
 RSAREF= YES
 .endif