 @@ -1,38 +1,38 @@
-# $NetBSD: Makefile,v 1.185.2.1 2014/04/08 10:09:26 tron Exp $
+# $NetBSD: Makefile,v 1.185.2.2 2014/06/05 13:20:18 tron Exp $
-DISTNAME=	openssl-1.0.1g
+DISTNAME=	openssl-1.0.1h
 MASTER_SITES=	http://ftp.openssl.org/source/
 SVR4_PKGNAME=	ossl
 CATEGORIES=	security
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.openssl.org/
 COMMENT=	Secure Socket Layer and cryptographic library
 LICENSE=	openssl
 CONFLICTS=	SSLeay-[0-9]* ssleay-[0-9]*
 CRYPTO=		yes
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 BUILD_DEPENDS+=	{p5-Perl4-CoreLibs-[0-9]*,perl<5.16}:../../devel/p5-Perl4-CoreLibs
 USE_GCC_RUNTIME=	yes
 .include "../../mk/bsd.prefs.mk"
 .include "../../mk/compiler.mk"
 EXTRACT_USING=		gtar
 USE_TOOLS+=		fgrep gmake perl
 TEST_TARGET=		tests
 MAKE_JOBS_SAFE=		no
 HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	./config
 CONFIGURE_ARGS+=	--prefix=${PREFIX:Q}
 CONFIGURE_ARGS+=	--install_prefix=${DESTDIR}
 CONFIGURE_ARGS+=	--openssldir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_ARGS+=	shared no-fips
 .if ${OPSYS} == "SunOS"
 .  if ${MACHINE_ARCH} == "sparc"
 @@ -115,26 +115,29 @@ CONFIGURE_ARGS+=	hpux-ia64-${CC}
 .  endif
 .elif ${OPSYS} == "Linux"
 .  if ${MACHINE_ARCH} == "powerpc64"
 CONFIGURE_SCRIPT=	./Configure
 CONFIGURE_ARGS+=	linux-ppc64
 .  endif
 .endif
 .include "../../security/openssl/options.mk"
 CONFIGURE_ARGS+=	${CFLAGS} ${LDFLAGS}
 CONFIGURE_ENV+=		PERL=${PERL5:Q}
 PKGCONFIG_OVERRIDE+=		libcrypto.pc libssl.pc openssl.pc
 PKGCONFIG_OVERRIDE_STAGE=	post-build
 PLIST_SRC+=		${PKGDIR}/PLIST.common
 USE_PLIST_SHLIB?=	yes
 .if ${USE_PLIST_SHLIB} == "yes"
 PLIST_SRC+=		${PKGDIR}/PLIST.shlib
 .endif
 PLIST_SUBST+=		SHLIB_VERSION=${OPENSSL_VERS:C/[^0-9]*$//}
 PLIST_SUBST+=		SHLIB_MAJOR=${OPENSSL_VERS:C/\..*$//}
 PKG_SYSCONFSUBDIR=	openssl
 CONF_FILES=		${PREFIX}/share/examples/openssl/openssl.cnf	\
 			${PKG_SYSCONFDIR}/openssl.cnf
 OWN_DIRS=		${PKG_SYSCONFDIR}/certs ${PKG_SYSCONFDIR}/private

 @@ -1,21 +1,21 @@
-# $NetBSD: builtin.mk,v 1.38 2014/03/03 06:56:35 obache Exp $
+# $NetBSD: builtin.mk,v 1.38.2.1 2014/06/05 13:20:18 tron Exp $
 BUILTIN_PKG:=	openssl
 BUILTIN_FIND_LIBS:=		crypto des ssl
 BUILTIN_FIND_HEADERS_VAR:=	H_OPENSSLCONF H_OPENSSLV
 BUILTIN_FIND_HEADERS.H_OPENSSLCONF=	openssl/opensslconf.h
 BUILTIN_FIND_HEADERS.H_OPENSSLV=	openssl/opensslv.h
 .include "../../mk/buildlink3/bsd.builtin.mk"
 ###
 ### Determine if there is a built-in implementation of the package and
 ### set IS_BUILTIN.<pkg> appropriately ("yes" or "no").
 ###
 .if !defined(IS_BUILTIN.openssl)
 IS_BUILTIN.openssl=	no
 .  if empty(H_OPENSSLV:M__nonexistent__) && empty(H_OPENSSLV:M${LOCALBASE}/*)
 IS_BUILTIN.openssl=	yes
 .  endif
 .endif
 @@ -44,69 +44,26 @@ BUILTIN_VERSION.openssl!=						\
 			i += index(hex, substr($$3, 9, 1)) - 1;		\
 			if (i == 0) {					\
 				patchlevel = "";			\
 			} else if (i > 26) {				\
 				patchlevel = "a";			\
 			} else {					\
 				patchlevel = substr(alpha,i,1);			\
 			}						\
 			printf "%s%s%s%s\n",				\
 				major, minor, teeny, patchlevel;	\
 			exit 0;						\
 		}							\
 	' ${H_OPENSSLV}
 .  if !empty(BUILTIN_VERSION.openssl:M0\.9\.6g) && \
       empty(H_OPENSSLV:M__nonexistent__)
 # If the native OpenSSL contains the security fixes pulled up to the
 # netbsd-1-6 branch on 2003-11-07, then pretend it's openssl-0.9.6l.
 BUILTIN_OPENSSL_HAS_20031107_FIX!=					\
 	${AWK} 'BEGIN { ans = "no" }					\
 		/OPENSSL_HAS_20031107_FIX/ { ans = "yes" }		\
 		END { print ans; exit 0 }				\
 	' ${H_OPENSSLV}
 .    if !empty(BUILTIN_OPENSSL_HAS_20031107_FIX:M[yY][eE][sS])
 BUILTIN_VERSION.openssl=	0.9.6l
 .    endif
 # If the native OpenSSL contains the security fixes pulled up to the
 # netbsd-1-6 branch on 2004-04-01, then pretend it's openssl-0.9.6m.
 BUILTIN_OPENSSL_HAS_20040401_FIX!=					\
 	${AWK} 'BEGIN { ans = "no" }					\
 		/OPENSSL_HAS_20040401_FIX/ { ans = "yes" }		\
 		END { print ans; exit 0 }				\
 	' ${H_OPENSSLV}
 .    if !empty(BUILTIN_OPENSSL_HAS_20040401_FIX:M[yY][eE][sS])
 BUILTIN_VERSION.openssl=	0.9.6m
 .    endif
 .  elif !empty(BUILTIN_VERSION.openssl:M0\.9\.7d) && \
         empty(H_OPENSSLV:M__nonexistent__)
 # If the native OpenSSL contains the security fixes pulled up to the
 # netbsd-2-0, netbsd-2, and netbsd-3-0 branches on 2005-10-11, then
 # pretend it's openssl-0.9.7h.
 BUILTIN_OPENSSL_HAS_20051011_FIX!=					\
 	${AWK} 'BEGIN { ans = "no" }					\
 		/OPENSSL_HAS_20051011_FIX/ { ans = "yes" }		\
 		END { print ans; exit 0 }				\
 	' ${H_OPENSSLV}
 .    if !empty(BUILTIN_OPENSSL_HAS_20051011_FIX:M[yY][eE][sS])
 BUILTIN_VERSION.openssl=	0.9.7h
 .    endif
 .  endif
 BUILTIN_PKG.openssl=	openssl-${BUILTIN_VERSION.openssl}
 .endif
 MAKEVARS+=	BUILTIN_PKG.openssl
 MAKEVARS+=	BUILTIN_VERSION.openssl
 .if !defined(BUILTIN_OPENSSL_HAS_THREADS) && \
     !empty(IS_BUILTIN.openssl:M[yY][eE][sS]) && \
     empty(H_OPENSSLCONF:M__nonexistent__)
 BUILTIN_OPENSSL_HAS_THREADS!=						\
 	${AWK} 'BEGIN { ans = "no" }					\
 		/\#[ 	]*define[ 	]*OPENSSL_THREADS/ { ans= "yes" } \
 		/\#[ 	]*define[ 	]*THREADS/ { ans = "yes" }	\
 		END { print ans; exit 0 }				\
 @@ -157,26 +114,28 @@ MAKEVARS+=	USE_BUILTIN.openssl
 ### The section below only applies if we are not including this file
 ### solely to determine whether a built-in implementation exists.
 ###
 CHECK_BUILTIN.openssl?=	no
 .if !empty(CHECK_BUILTIN.openssl:M[nN][oO])
 .  if !empty(USE_BUILTIN.openssl:M[yY][eE][sS])
 .    if empty(H_OPENSSLV:M__nonexistent__)
 .      if !empty(H_OPENSSLV:M/usr/sfw/*)
 BUILDLINK_PREFIX.openssl=	/usr/sfw
 BUILDLINK_PASSTHRU_DIRS+=	/usr/sfw
 .      elif !empty(H_OPENSSLV:M/usr/*)
 BUILDLINK_PREFIX.openssl=	/usr
 .      elif !empty(H_OPENSSLV:M/boot/system/develop/*)
 BUILDLINK_PREFIX.openssl=	/boot/system/develop
 .      elif !empty(H_OPENSSLV:M/boot/common/*)
 BUILDLINK_PREFIX.openssl=	/boot/common
 .      endif
 .    endif
 .  endif
 # By default, we don't bother with the old DES API.
 USE_OLD_DES_API?=	no
 .  if !empty(USE_OLD_DES_API:M[yY][eE][sS])
+#
 # If we're using the old DES API, then check to see if the old DES
 # code was factored out into a separate library and header files and
 # no longer a part of libcrypto.
 @@ -239,48 +198,53 @@ buildlink-openssl-des-h:
 	else								\
 		${ECHO} "Unable to find headers for old DES API.";	\
 		exit 1;							\
 	fi
 .    endif
 .  endif  # USE_OLD_DES_API == yes
 .  if defined(PKG_SYSCONFDIR.openssl)
 SSLDIR=	${PKG_SYSCONFDIR.openssl}
 .  elif !empty(USE_BUILTIN.openssl:M[yY][eE][sS])
 .    if ${OPSYS} == "NetBSD"
 SSLDIR=	/etc/openssl
 .    elif ${OPSYS} == "Haiku"
 .      if exists(/boot/system/data/ssl)
 SSLDIR=	/boot/system/data/ssl
 .      else
 SSLDIR=	/boot/common/data/ssl
 .      endif
 .    else
 SSLDIR=	/etc/ssl 		# most likely place
 .    endif
 .  else
 SSLDIR=	${PKG_SYSCONFBASEDIR}/openssl
 .  endif
 SSLCERTS=	${SSLDIR}/certs
 SSLKEYS=	${SSLDIR}/private
 BUILD_DEFS+=	SSLDIR SSLCERTS SSLKEYS
 # create pc files for builtin version; other versions assumed to contain them
 # If we are using the builtin version, check whether it has a *.pc
 # files or not.  If the latter, generate fake ones.
 .  if !empty(USE_BUILTIN.openssl:M[Yy][Ee][Ss])
 BUILDLINK_TARGETS+=	openssl-fake-pc
 .    if !defined(HAS_OPENSSL_FAKE_PC)
 HAS_OPENSSL_FAKE_PC=
 .PHONY: openssl-fake-pc
 openssl-fake-pc:
 	${RUN} \
 	src=${BUILDLINK_PREFIX.openssl}/lib${LIBABISUFFIX}/pkgconfig/libcrypto.pc; \
 	dst=${BUILDLINK_DIR}/lib/pkgconfig/libcrypto.pc; \
 	${MKDIR} ${BUILDLINK_DIR}/lib/pkgconfig; \
 	if ${TEST} -f $${src}; then \
 		${LN} -sf $${src} $${dst}; \
 	else \
 		{ ${ECHO} 'prefix=${BUILDLINK_PREFIX.openssl}'; \
 		${ECHO} 'exec_prefix=$${prefix}'; \
 		${ECHO} 'libdir=$${exec_prefix}/lib${LIBABISUFFIX}'; \
 		${ECHO} 'includedir=$${prefix}/include'; \
 		${ECHO}; \

 @@ -1,33 +1,15 @@
-$NetBSD: distinfo,v 1.102.2.2 2014/04/09 09:58:03 tron Exp $
+$NetBSD: distinfo,v 1.102.2.3 2014/06/05 13:20:18 tron Exp $
-SHA1 (openssl-1.0.1g.tar.gz) = b28b3bcb1dc3ee7b55024c9f795be60eb3183e3c
+SHA1 (openssl-1.0.1h.tar.gz) = b2239599c8bf8f7fc48590a55205c26abe560bf8
-RMD160 (openssl-1.0.1g.tar.gz) = cd2eb879646a2b91b2f67dfaf99eb9668ba5d7ea
+RMD160 (openssl-1.0.1h.tar.gz) = aeb1e0f41074d499d5411510fd645455730ed05e
-Size (openssl-1.0.1g.tar.gz) = 4509047 bytes
+Size (openssl-1.0.1h.tar.gz) = 4475692 bytes
-SHA1 (patch-Configure) = ecdafa378e73bd2d6789c985ea28ef4ab2126aa6
+SHA1 (patch-Configure) = f8b8b3ecfa9d23530d13f8f93582db857f772fc4
-SHA1 (patch-Makefile.org) = 8780f8829b8a010d4283f00740c264a4dc15c7c6
+SHA1 (patch-Makefile.org) = be55df602286c7f0265a8c5c3d8edaea13b1d966
-SHA1 (patch-Makefile.shared) = 1b47a1d3d95391217b15663d3558545780263fbb
+SHA1 (patch-Makefile.shared) = 709283ba4bb4bd568e289fe111b8dea319968328
-SHA1 (patch-apps_Makefile) = e575ccead86bb39205260b03c00a88fa4d21a906
+SHA1 (patch-apps_Makefile) = 745e01fb967979f5105896f8a728fd7a041af6c9
-SHA1 (patch-config) = 3d33888b6ed4b9e3f6dfc2d3b6bb304e48d1360a
+SHA1 (patch-config) = ac8ced00cfa7d31b84afb08aedc38102fd777824
-SHA1 (patch-crypto_bn_bn__prime.pl) = 049250b9bd42e6f155145703135dab39a7ec17e0
+SHA1 (patch-crypto_bn_bn__prime.pl) = c07e8ccba319e4260af46e714c3be56f70579fa6
-SHA1 (patch-crypto_dso_dso__dlfcn.c) = d5d6ca9a517151357efecb6aa9a5f528a5014290
+SHA1 (patch-crypto_des_Makefile) = 31d772eb8c80b577b9cd05337262ddfad297d9b1
-SHA1 (patch-doc_apps_cms.pod) = 24792a0db2d8566e0f8b52833de300f538f6a92e
+SHA1 (patch-crypto_dso_dso__dlfcn.c) = 065a8254d9c93b17d300a4be9b9a35a919e8b364
-SHA1 (patch-doc_apps_smine.pod) = 277aee087892f867402ea73bae10383fe24d6e08
+SHA1 (patch-engines_ccgost_Makefile) = 8834074c74abab604ef1ba7959750c22c0ffb6e7
-SHA1 (patch-doc_ssl_SSL__COMP__add__compression__method.pod) = f3fcbe0eae26ac8e24fe937e529ea0dba6ea1639
+SHA1 (patch-tools_Makefile) = 6e7324d01c0cd5e290085fe8124315bcac8cf198
 SHA1 (patch-doc_ssl_SSL__CTX__add__session.pod) = db72b7e04bb74595a78bc09379854957dcfaa4c7
 SHA1 (patch-doc_ssl_SSL__CTX__load__verify__locations.pod) = d0fd17e118a1bd19c729a0930a52925b9bb81d6d
 SHA1 (patch-doc_ssl_SSL__CTX__set__client__CA__list.pod) = df3ab7287667f32454357a3a2eaca8275f01ce08
 SHA1 (patch-doc_ssl_SSL__CTX__set__session__id__context.pod) = b5d711fcf9512c82ec2c7aa61303377006ebfca7
 SHA1 (patch-doc_ssl_SSL__CTX__set__ssl__version.pod) = 79340b3f4cfa4293362a79c336e0768711153930
 SHA1 (patch-doc_ssl_SSL__CTX__use__psk__identity__hint.pod) = eb4d8ccfa47ecc3f50dbda5b0ffd98ea740f4ebf
 SHA1 (patch-doc_ssl_SSL__accept.pod) = c68aa6eb518d5ca72ae5bd142fd3895e378ca638
 SHA1 (patch-doc_ssl_SSL__clear.pod) = c7d2eb126137ee642294466f0ea9019fcd5e9b92
 SHA1 (patch-doc_ssl_SSL__connect.pod) = 07327bdb408493c6696efb71070b1b0f7294982c
 SHA1 (patch-doc_ssl_SSL__do__handshake.pod) = f62a43b7b9e59b321cd8dd00d6ea448e3c11d77f
 SHA1 (patch-doc_ssl_SSL__read.pod) = 2a6db16242aceeee645f5b48a9725c5530fbbb8c
 SHA1 (patch-doc_ssl_SSL__session__reused.pod) = 0ed7425cf8b098c97ab223cd368c4b18f5187ae5
 SHA1 (patch-doc_ssl_SSL__set__fd.pod) = 68e3f6f3ff0fdfb2113cebb8f08e6d42c442fa2f
 SHA1 (patch-doc_ssl_SSL__set__session.pod) = e4d8442f4fc827520ca20f108050fcd6314dd41d
 SHA1 (patch-doc_ssl_SSL__shutdown.pod) = 21682f3385a66ba8f0ebd11bb9bb3c6198352783
 SHA1 (patch-doc_ssl_SSL__write.pod) = 67efd6d0de0a0db34c18c62e4a939c0ea49442ca
 SHA1 (patch-engines_ccgost_Makefile) = 08999f0f40969883482ad9ffc1aa9959ed7d402c
 SHA1 (patch-tools_Makefile) = d67f3ea397674adbe3360e4df9c2e417dbcab56a

 @@ -1,69 +1,70 @@
-$NetBSD: patch-Configure,v 1.1.2.2 2014/04/08 10:09:26 tron Exp $
+$NetBSD: patch-Configure,v 1.1.2.3 2014/06/05 13:20:18 tron Exp $
 * Avoid -fast on Solaris, creates non-portable packages which depend on
   host-specific CPU features.
 * Add GNU/kFreeBSD support.
---- Configure.orig	2013-02-11 15:26:04.000000000 +0000
+--- Configure.orig	Mon Mar 17 16:14:20 2014
 +++ Configure
 @@ -225,8 +225,8 @@ my %table=(
  "solaris64-x86_64-gcc","gcc:-m64 -O3 -Wall -DL_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:solaris-shared:-fPIC:-m64 -shared -static-libgcc:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::/64",
  #### Solaris x86 with Sun C setups
 -"solaris-x86-cc","cc:-fast -O -Xa::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 -"solaris64-x86_64-cc","cc:-fast -xarch=amd64 -xstrconst -Xa -DL_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:solaris-shared:-KPIC:-xarch=amd64 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::/64",
 +"solaris-x86-cc","cc:-xO5 -Xa::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"solaris64-x86_64-cc","cc:-xO5 -xarch=amd64 -xstrconst -Xa -DL_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:solaris-shared:-KPIC:-xarch=amd64 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::/64",
  #### SPARC Solaris with GNU C setups
  "solaris-sparcv7-gcc","gcc:-O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 @@ -338,6 +338,7 @@ my %table=(
+ #
  "osf1-alpha-gcc", "gcc:-O3::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_RISC1:${alpha_asm}:dlfcn:alpha-osf1-shared:::.so",
  "osf1-alpha-cc",  "cc:-std1 -tune host -O4 -readonly_strings::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:alpha-osf1-shared:::.so",
 +"tru64-alpha-gcc", "gcc:-O3::-pthread:::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${no_asm}:dlfcn:alpha-osf1-shared::-Wl,-msym:.so",
  "tru64-alpha-cc", "cc:-std1 -tune host -fast -readonly_strings::-pthread:::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:alpha-osf1-shared::-msym:.so",
  ####
-@@ -422,6 +423,28 @@ my %table=(
+@@ -422,7 +423,29 @@ my %table=(
  "BSD-sparc64",	"gcc:-DB_ENDIAN -DTERMIOS -O3 -DMD32_REG_T=int -Wall::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC2 BF_PTR:${sparcv9_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
  "BSD-ia64",	"gcc:-DL_ENDIAN -DTERMIOS -O3 -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_INT:${ia64_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
  "BSD-x86_64",	"gcc:-DL_ENDIAN -DTERMIOS -O3 -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"NetBSD","gcc:-DTERMIOS -O2 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"NetBSD-alpha", "gcc:-DTERMIOS -DL_ENDIAN -O2 -Wall::(unknown):::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"NetBSD-arm", "gcc:-DTERMIOS -DL_ENDIAN -O2 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"NetBSD-arm32", "gcc:-DTERMIOS -DL_ENDIAN -O2 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"NetBSD-m68000", "gcc:-DTERMIOS -DB_ENDIAN -O2 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"NetBSD-m68k", "gcc:-DTERMIOS -DB_ENDIAN -O2 -m68020-40 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"NetBSD-mipseb", "gcc:-DTERMIOS -DB_ENDIAN -O2 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"NetBSD-mipsel", "gcc:-DTERMIOS -DL_ENDIAN -O2 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"NetBSD-ns32k", "gcc:-DTERMIOS -DL_ENDIAN -O2 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"NetBSD-powerpc", "gcc:-DTERMIOS -DB_ENDIAN -O2 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"NetBSD-sparc", "gcc:-DTERMIOS -DB_ENDIAN -O2 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"NetBSD-sparc64", "gcc:-DB_ENDIAN -DTERMIOS -O3 -DMD32_REG_T=int -Wall::(unknown):ULTRASPARC::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2 BF_PTR:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"NetBSD-vax", "gcc:-DTERMIOS -DL_ENDIAN -O2 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"NetBSD-x86-aout", "gcc:-DTERMIOS -DL_ENDIAN -O2 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_asm}:a.out:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"NetBSD-x86-elf", "gcc:-DTERMIOS -DL_ENDIAN -O2 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"NetBSD-x86_64", "gcc:-DTERMIOS -DL_ENDIAN -DMD32_REG_T=int -O2::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"Interix","gcc:-DTERMIOS -DL_ENDIAN -O2 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${no_asm}:dlfcn:bsd-gcc-shared::-Wl,--image-base,0x5e000000:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"DragonFly-i386",  "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::-pthread -D_REENTRANT -D_THREAD_SAFE -D_THREADSAFE:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"DragonFly-x86_64",    "gcc:-DL_ENDIAN -DTERMIOS -O3 -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"GNU/kFreeBSD-x86_64", "gcc:-m64 -DL_ENDIAN -DTERMIOS -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 +"GNU/kFreeBSD-i386", "gcc:-DL_ENDIAN -DTERMIOS -march=i486::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++
  "bsdi-elf-gcc",     "gcc:-DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall::(unknown)::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
  "nextstep",	"cc:-O -Wall:<libc.h>:(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::",
 @@ -865,13 +888,13 @@ PROCESS_ARGS:
  			# The check for the option is there so scripts aren't
  			# broken
+ 			}
 -		elsif (/^[-+]/)
 +		elsif (/^[-+\/]/)
+ 			{
  			if (/^-[lL](.*)$/ or /^-Wl,/)
+ 				{
  				$libs.=$_." ";
+ 				}
 -			elsif (/^-[^-]/ or /^\+/)
 +			elsif (/^-[^-]/ or /^\+/ or /^\//)

 @@ -1,54 +1,54 @@
-$NetBSD: patch-Makefile.org,v 1.1.2.2 2014/04/08 10:09:26 tron Exp $
+$NetBSD: patch-Makefile.org,v 1.1.2.3 2014/06/05 13:20:18 tron Exp $
 Adjust build procedure.
---- Makefile.org.orig	2013-02-11 15:26:04.000000000 +0000
+--- Makefile.org.orig	Mon Mar 17 16:14:20 2014
 +++ Makefile.org
 @@ -28,6 +28,7 @@ INSTALLTOP=/usr/local/ssl
  # Do not edit this manually. Use Configure --openssldir=DIR do change this!
  OPENSSLDIR=/usr/local/ssl
 +EXAMPLEDIR=$(INSTALLTOP)/share/examples/openssl
  # NO_IDEA - Define to build without the IDEA algorithm
  # NO_RC4  - Define to build without the RC4 algorithm
 @@ -157,7 +158,7 @@ TESTS = alltests
  MAKEFILE= Makefile
 -MANDIR=$(OPENSSLDIR)/man
 +MANDIR=$(INSTALLTOP)/$(PKGMANDIR)
  MAN1=1
  MAN3=3
  MANSUFFIX=
 @@ -174,6 +175,7 @@ SHARED_CRYPTO=libcrypto$(SHLIB_EXT)
  SHARED_SSL=libssl$(SHLIB_EXT)
  SHARED_LIBS=
  SHARED_LIBS_LINK_EXTS=
 +LIBRPATH=$(INSTALLTOP)/lib
  SHARED_LDFLAGS=
  GENERAL=        Makefile
-@@ -537,7 +539,7 @@ dist:
+@@ -538,7 +540,7 @@ dist:
  dist_pem_h:
  	(cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)
 -install: all install_docs install_sw
 +install: install_docs install_sw
  install_sw:
  	@$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
-@@ -642,41 +644,56 @@ install_docs:
+@@ -643,41 +645,56 @@ install_docs:
  	@pod2man="`cd ./util; ./pod2mantest $(PERL)`"; \
  	here="`pwd`"; \
  	filecase=; \
 -	if [ "$(PLATFORM)" = "DJGPP" -o "$(PLATFORM)" = "Cygwin" -o "$(PLATFORM)" = "mingw" ]; then \
 -		filecase=-i; \
 -	fi; \
  	set -e; for i in doc/apps/*.pod; do \
  		fn=`basename $$i .pod`; \
  		sec=`$(PERL) util/extract-section.pl 1 < $$i`; \
 -		echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \
 +		case "$$fn" in \
 +		CA.pl|openssl) ofn="$$fn" ;; \
 +		*) ofn="openssl_$$fn" ;; \

 @@ -1,82 +1,81 @@
-$NetBSD: patch-config,v 1.1.2.2 2014/04/08 10:09:26 tron Exp $
+$NetBSD: patch-config,v 1.1.2.3 2014/06/05 13:20:18 tron Exp $
 Adjust config procedure.
---- config.orig	Mon Feb 11 15:25:39 2013
+--- config.orig	Mon Mar 17 16:14:20 2014
 +++ config
 @@ -49,6 +49,7 @@ done
  # First get uname entries that we use below
  [ "$MACHINE" ] || MACHINE=`(uname -m) 2>/dev/null` || MACHINE="unknown"
 +[ "$MACHINE_ARCH" ] || MACHINE_ARCH=`(uname -p) 2>/dev/null` || MACHINE_ARCH="unknown"
  [ "$RELEASE" ] || RELEASE=`(uname -r) 2>/dev/null` || RELEASE="unknown"
  [ "$SYSTEM" ] || SYSTEM=`(uname -s) 2>/dev/null`  || SYSTEM="unknown"
  [ "$BUILD" ] || VERSION=`(uname -v) 2>/dev/null` || VERSION="unknown"
-@@ -162,6 +163,10 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${
+@@ -162,6 +163,10 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
  	echo "mips4-sgi-irix64"; exit 0
  	;;
 +    Interix:*)
 +	echo "i386-pc-interix"; exit 0
 +	;;
++
      Linux:[2-9].*)
  	echo "${MACHINE}-whatever-linux2"; exit 0
  	;;
-@@ -170,6 +175,10 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${
+@@ -170,6 +175,10 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
  	echo "${MACHINE}-whatever-linux1"; exit 0
  	;;
 +    GNU/kFreeBSD:*)
 +	echo "${MACHINE}-whatever-gnukfreebsd"; exit 0
 +	;;
++
      GNU*)
  	echo "hurd-x86"; exit 0;
  	;;
-@@ -218,15 +227,15 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${
+@@ -218,15 +227,15 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
  	echo "${MACHINE}-whatever-freebsd"; exit 0
  	;;
 -    NetBSD:*:*:*386*)
 -        echo "`(/usr/sbin/sysctl -n hw.model || /sbin/sysctl -n hw.model) | sed 's,.*\(.\)86-class.*,i\186,'`-whatever-netbsd"; exit 0
 +    DragonFly:*)
 +	echo "${MACHINE}-whatever-dragonfly"; exit 0
  	;;
      NetBSD:*)
 -	echo "${MACHINE}-whatever-netbsd"; exit 0
 +	echo "${MACHINE_ARCH}-whatever-netbsd"; exit 0
  	;;
 -    OpenBSD:*)
 +    OpenBSD:*|MirBSD:*)
  	echo "${MACHINE}-whatever-openbsd"; exit 0
  	;;
-@@ -728,6 +737,11 @@ case "$GUESSOS" in
+@@ -728,12 +737,19 @@ case "$GUESSOS" in
  	;;
    *-*-sunos4)		OUT="sunos-$CC" ;;
 +  alpha-*-netbsd|arm-*-netbsd|arm32-*-netbsd|m68000-*-netbsd|m68k-*-netbsd|\
 +  mipseb-*-netbsd|mipsel-*-netbsd|ns32k-*-netbsd|powerpc-*-netbsd|\
 +  sparc-*-netbsd|sparc64-*-netbsd|vax-*-netbsd|x86_64-*-netbsd)
 +			OUT="NetBSD-${MACHINE_ARCH}" ;;
++
    *86*-*-bsdi4)		OUT="BSD-x86-elf"; options="$options no-sse2 -ldl" ;;
    alpha*-*-*bsd*)	OUT="BSD-generic64"; options="$options -DL_ENDIAN" ;;
    powerpc64-*-*bsd*)	OUT="BSD-generic64"; options="$options -DB_ENDIAN" ;;
@@ -734,6 +748,8 @@ case "$GUESSOS" in
    sparc64-*-*bsd*)	OUT="BSD-sparc64" ;;
    ia64-*-*bsd*)		OUT="BSD-ia64" ;;
    amd64-*-*bsd*)	OUT="BSD-x86_64" ;;
 +  i386-*-dragonfly*|x86_64-*-dragonfly*)	OUT="DragonFly-${MACHINE_ARCH}";;
 +  i386-*-gnukfreebsd*|x86_64-*-gnukfreebsd*)	OUT="GNU/kFreeBSD-${MACHINE}";;
    *86*-*-*bsd*)		# mimic ld behaviour when it's looking for libc...
  			if [ -L /usr/lib/libc.so ]; then	# [Free|Net]BSD
  			    libc=/usr/lib/libc.so
 @@ -746,6 +762,8 @@ case "$GUESSOS" in
  			*)	OUT="BSD-x86"; options="$options no-sse2" ;;
  			esac ;;
    *-*-*bsd*)		OUT="BSD-generic32" ;;
++

 @@ -1,18 +1,18 @@
-$NetBSD: patch-Makefile.shared,v 1.1.2.2 2014/04/08 10:09:26 tron Exp $
+$NetBSD: patch-Makefile.shared,v 1.1.2.3 2014/06/05 13:20:18 tron Exp $
 Adjust build procedure.
---- Makefile.shared.orig	2010-08-21 11:37:17.000000000 +0000
+--- Makefile.shared.orig	Mon Mar 17 16:14:20 2014
 +++ Makefile.shared
 @@ -315,6 +315,11 @@ link_o.alpha-osf1:
  	@ if $(DETECT_GNU_LD); then \
  		$(DO_GNU_SO); \
  	else \
 +		if ($(CC) -v 2>&1 | grep gcc) > /dev/null; then \
 +			WL="-Wl,"; DELIM=","; \
 +		else \
 +			WL=""; DELIM=" "; \
 +		fi; \
  		SHLIB=lib$(LIBNAME).so; \
  		SHLIB_SUFFIX=; \
  		SHLIB_HIST=`echo "$(LIBCOMPATVERSIONS)" | cut -d';' -f2 | sed -e 's/ */:/'`; \

 @@ -1,19 +1,19 @@
-$NetBSD: patch-apps_Makefile,v 1.1.2.2 2014/04/08 10:09:26 tron Exp $
+$NetBSD: patch-apps_Makefile,v 1.1.2.3 2014/06/05 13:20:18 tron Exp $
 Adjust build procedure.
---- apps/Makefile.orig	2007-02-23 02:01:03.000000000 +0100
+--- apps/Makefile.orig	Mon Apr  7 16:55:44 2014
-+++ apps/Makefile	2007-07-31 17:18:49.000000000 +0200
++++ apps/Makefile
 @@ -4,6 +4,7 @@
  DIR=		apps
  TOP=		..
 +EXAMPLEDIR=	$(INSTALLTOP)/share/examples/openssl
  CC=		cc
  INCLUDES=	-I$(TOP) -I../include $(KRB5_INCLUDES)
  CFLAG=		-g -static
 @@ -109,13 +110,13 @@ install:
  	@set -e; for i in $(SCRIPTS); \
  	do  \
  	(echo installing $$i; \
 -	 cp $$i $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i.new; \

 @@ -1,17 +1,17 @@
-$NetBSD: patch-crypto_bn_bn__prime.pl,v 1.1.2.2 2014/04/08 10:09:26 tron Exp $
+$NetBSD: patch-crypto_bn_bn__prime.pl,v 1.1.2.3 2014/06/05 13:20:18 tron Exp $
---- crypto/bn/bn_prime.pl.orig	2003-09-25 15:57:58.000000000 +0200
+--- crypto/bn/bn_prime.pl.orig	Mon Mar 17 16:14:20 2014
-+++ crypto/bn/bn_prime.pl	2007-07-31 17:53:39.000000000 +0200
++++ crypto/bn/bn_prime.pl
 @@ -1,6 +1,8 @@
  #!/usr/local/bin/perl
  # bn_prime.pl
 +use POSIX;
++
  $num=2048;
  $num=$ARGV[0] if ($#ARGV >= 0);
 @@ -9,7 +11,7 @@ $p=1;
  loop: while ($#primes < $num-1)
+ 	{
  	$p+=2;

 @@ -1,19 +1,19 @@
-$NetBSD: patch-tools_Makefile,v 1.1.2.2 2014/04/08 10:09:26 tron Exp $
+$NetBSD: patch-tools_Makefile,v 1.1.2.3 2014/06/05 13:20:18 tron Exp $
 Adjust build procedure.
---- tools/Makefile.orig	2006-02-04 02:49:36.000000000 +0100
+--- tools/Makefile.orig	Mon Mar 17 16:14:20 2014
-+++ tools/Makefile	2007-07-31 17:20:05.000000000 +0200
++++ tools/Makefile
 @@ -4,6 +4,7 @@
  DIR=	tools
  TOP=	..
 +EXAMPLEDIR=	$(INSTALLTOP)/share/examples/openssl
  CC=	cc
  INCLUDES= -I$(TOP) -I../../include
  CFLAG=-g
 @@ -28,9 +29,9 @@ install:
  	done;
  	@for i in $(MISC_APPS) ; \
  	do  \
 -	(cp $$i $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i.new; \

 @@ -1,15 +1,15 @@
-$NetBSD: patch-crypto_dso_dso__dlfcn.c,v 1.1 2013/07/26 11:27:02 ryoon Exp $
+$NetBSD: patch-crypto_dso_dso__dlfcn.c,v 1.1.6.1 2014/06/05 13:20:18 tron Exp $
 * Debian GNU/kFreeBSD needs _GNU_SOURCE.
---- crypto/dso/dso_dlfcn.c.orig	2013-02-11 15:26:04.000000000 +0000
+--- crypto/dso/dso_dlfcn.c.orig	Mon Mar 17 16:14:20 2014
 +++ crypto/dso/dso_dlfcn.c
 @@ -60,7 +60,7 @@
     that handle _GNU_SOURCE and other similar macros.  Defining it later
     is simply too late, because those headers are protected from re-
     inclusion.  */
 -#ifdef __linux
 +#if defined(__linux) || defined(__FreeBSD_kernel__)
  # ifndef _GNU_SOURCE
  #  define _GNU_SOURCE	/* make sure dladdr is declared */
  # endif

 @@ -1,15 +1,15 @@
-$NetBSD: patch-engines_ccgost_Makefile,v 1.1 2013/02/06 21:40:34 jperkin Exp $
+$NetBSD: patch-engines_ccgost_Makefile,v 1.1.10.1 2014/06/05 13:20:18 tron Exp $
 * Make sure rpath is set properly on the libgost.so engine lib.
---- engines/ccgost/Makefile.orig	2012-04-26 10:42:20.000000000 +0000
+--- engines/ccgost/Makefile.orig	Mon Apr  7 16:55:42 2014
-+++ engines/ccgost/Makefile	2013-02-04 13:27:37.220193130 +0000
++++ engines/ccgost/Makefile
 @@ -32,7 +32,7 @@ lib: $(LIBOBJ)
  		$(MAKE) -f $(TOP)/Makefile.shared -e \
  			LIBNAME=$(LIBNAME) \
  			LIBEXTRAS='$(LIBOBJ)' \
 -			LIBDEPS='-L$(TOP) -lcrypto' \
 +			LIBDEPS='-L$(TOP) -lcrypto $(EX_LIBS)' \
  			link_o.$(SHLIB_TARGET); \
  	else \
  		$(AR) $(LIB) $(LIBOBJ); \