From 3a23faa538c0d695015c32343dcc7d2eac4891ef Mon Sep 17 00:00:00 2001
From: branch-fixup <branch-fixup>
Date: Thu, 8 Jan 2009 16:38:22 +0000
Subject: [PATCH] Add files from parent branch HEAD: 
 security/openssl/patches/patch-af

---
 security/openssl/patches/patch-af | 129 ++++++++++++++++++++++++++++++
 1 file changed, 129 insertions(+)
 create mode 100644 security/openssl/patches/patch-af

diff --git a/security/openssl/patches/patch-af b/security/openssl/patches/patch-af
new file mode 100644
index 000000000000..ba73c07ea92c
--- /dev/null
+++ b/security/openssl/patches/patch-af
@@ -0,0 +1,129 @@
+$NetBSD$
+
+--- Makefile.org.orig	2008-12-30 14:26:26.000000000 +0100
++++ 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
+@@ -131,8 +132,8 @@ FIPSCANLIB=
+ 
+ BASEADDR=
+ 
+-DIRS=   crypto fips ssl engines apps test tools
+-SHLIBDIRS= crypto ssl fips
++DIRS=   crypto ssl engines apps test tools # fips
++SHLIBDIRS= crypto ssl # fips
+ 
+ # dirs in crypto to build
+ SDIRS=  \
+@@ -152,7 +153,7 @@ TESTS = alltests
+ 
+ MAKEFILE= Makefile
+ 
+-MANDIR=$(OPENSSLDIR)/man
++MANDIR=$(INSTALLTOP)/$(PKGMANDIR)
+ MAN1=1
+ MAN3=3
+ MANSUFFIX=
+@@ -168,6 +169,7 @@ SHARED_SSL=libssl$(SHLIB_EXT)
+ SHARED_FIPS=
+ SHARED_LIBS=
+ SHARED_LIBS_LINK_EXTS=
++LIBRPATH=$(INSTALLTOP)/lib
+ SHARED_LDFLAGS=
+ 
+ GENERAL=        Makefile
+@@ -200,7 +202,7 @@ BUILDENV=	PLATFORM='${PLATFORM}' PROCESS
+ 		CC='${CC}' CFLAG='${CFLAG}' 			\
+ 		AS='${CC}' ASFLAG='${CFLAG} -c'			\
+ 		AR='${AR}' PERL='${PERL}' RANLIB='${RANLIB}'	\
+-		SDIRS='${SDIRS}' LIBRPATH='${INSTALLTOP}/lib'	\
++		SDIRS='${SDIRS}' LIBRPATH='${LIBRPATH}'		\
+ 		INSTALL_PREFIX='${INSTALL_PREFIX}'		\
+ 		INSTALLTOP='${INSTALLTOP}' OPENSSLDIR='${OPENSSLDIR}'	\
+ 		MAKEDEPEND='$$$${TOP}/util/domd $$$${TOP} -MD ${MAKEDEPPROG}' \
+@@ -608,7 +610,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 \
+@@ -616,9 +618,7 @@ install_sw:
+ 		$(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines \
+ 		$(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig \
+ 		$(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl \
+-		$(INSTALL_PREFIX)$(OPENSSLDIR)/misc \
+-		$(INSTALL_PREFIX)$(OPENSSLDIR)/certs \
+-		$(INSTALL_PREFIX)$(OPENSSLDIR)/private
++		$(INSTALL_PREFIX)$(EXAMPLEDIR)
+ 	@set -e; headerlist="$(EXHEADER)"; for i in $$headerlist;\
+ 	do \
+ 	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
+@@ -688,35 +688,53 @@ install_docs:
+ 	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" ;; \
++		esac; \
++		echo "installing man$$sec/$$ofn.$${sec}$(MANSUFFIX)"; \
+ 		(cd `$(PERL) util/dirname.pl $$i`; \
+ 		sh -c "$$pod2man \
+ 			--section=$$sec --center=OpenSSL \
+ 			--release=$(VERSION) `basename $$i`") \
+-			>  $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \
++			>  $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$ofn.$${sec}$(MANSUFFIX); \
+ 		$(PERL) util/extract-names.pl < $$i | \
+ 			(grep -v $$filecase "^$$fn\$$"; true) | \
+ 			(grep -v "[	]"; true) | \
+ 			(cd $(INSTALL_PREFIX)$(MANDIR)/man$$sec/; \
+ 			 while read n; do \
+-				$$here/util/point.sh $$fn.$${sec}$(MANSUFFIX) "$$n".$${sec}$(MANSUFFIX); \
++				case "$$n" in \
++				CA.pl|openssl) on="$$n" ;; \
++				*) on="openssl_$$n" ;; \
++				esac; \
++				$$here/util/point.sh $$ofn.$${sec}$(MANSUFFIX) "$$on".$${sec}$(MANSUFFIX); \
+ 			 done); \
+ 	done; \
+ 	set -e; for i in doc/crypto/*.pod doc/ssl/*.pod; do \
+ 		fn=`basename $$i .pod`; \
+ 		sec=`$(PERL) util/extract-section.pl 3 < $$i`; \
+-		echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \
++		case "$$fn" in \
++		ui*) ofn="openssl_$$fn" ;; \
++		[A-Z]*|*_*) ofn="$$fn" ;; \
++		*) ofn="openssl_$$fn" ;; \
++		esac; \
++		echo "installing man$$sec/$$ofn.$${sec}$(MANSUFFIX)"; \
+ 		(cd `$(PERL) util/dirname.pl $$i`; \
+ 		sh -c "$$pod2man \
+ 			--section=$$sec --center=OpenSSL \
+ 			--release=$(VERSION) `basename $$i`") \
+-			>  $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \
++			>  $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$ofn.$${sec}$(MANSUFFIX); \
+ 		$(PERL) util/extract-names.pl < $$i | \
+ 			(grep -v $$filecase "^$$fn\$$"; true) | \
+ 			(grep -v "[	]"; true) | \
+ 			(cd $(INSTALL_PREFIX)$(MANDIR)/man$$sec/; \
+ 			 while read n; do \
+-				$$here/util/point.sh $$fn.$${sec}$(MANSUFFIX) "$$n".$${sec}$(MANSUFFIX); \
++				case "$$n" in \
++				ui*) on="openssl_$$n" ;; \
++				[A-Z]*|*_*) on="$$n" ;; \
++				*) on="openssl_$$n" ;; \
++				esac; \
++				$$here/util/point.sh $$ofn.$${sec}$(MANSUFFIX) "$$on".$${sec}$(MANSUFFIX); \
+ 			 done); \
+ 	done
+ 
-- 
2.41.0