security/openssl/patches/patch-af

   1 $NetBSD: patch-af,v 1.24 2010/02/26 03:15:14 taca Exp $
   2
   3 --- Makefile.org.orig   2012-04-22 13:25:19.000000000 +0000
   4 +++ Makefile.org
   5 @@ -28,6 +28,7 @@ INSTALLTOP=/usr/local/ssl
   6
   7  # Do not edit this manually. Use Configure --openssldir=DIR do change this!
   8  OPENSSLDIR=/usr/local/ssl
   9 +EXAMPLEDIR=$(INSTALLTOP)/share/examples/openssl
  10
  11  # NO_IDEA - Define to build without the IDEA algorithm
  12  # NO_RC4  - Define to build without the RC4 algorithm
  13 @@ -157,7 +158,7 @@ TESTS = alltests
  14
  15  MAKEFILE= Makefile
  16
  17 -MANDIR=$(OPENSSLDIR)/man
  18 +MANDIR=$(INSTALLTOP)/$(PKGMANDIR)
  19  MAN1=1
  20  MAN3=3
  21  MANSUFFIX=
  22 @@ -174,6 +175,7 @@ SHARED_CRYPTO=libcrypto$(SHLIB_EXT)
  23  SHARED_SSL=libssl$(SHLIB_EXT)
  24  SHARED_LIBS=
  25  SHARED_LIBS_LINK_EXTS=
  26 +LIBRPATH=$(INSTALLTOP)/lib
  27  SHARED_LDFLAGS=
  28
  29  GENERAL=        Makefile
  30 @@ -537,7 +539,7 @@ dist:
  31  dist_pem_h:
  32         (cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)
  33
  34 -install: all install_docs install_sw
  35 +install: install_docs install_sw
  36
  37  install_sw:
  38         @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
  39 @@ -648,35 +650,53 @@ install_docs:
  40         set -e; for i in doc/apps/*.pod; do \
  41                 fn=`basename $$i .pod`; \
  42                 sec=`$(PERL) util/extract-section.pl 1 < $$i`; \
  43 -               echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \
  44 +               case "$$fn" in \
  45 +               CA.pl|openssl) ofn="$$fn" ;; \
  46 +               *) ofn="openssl_$$fn" ;; \
  47 +               esac; \
  48 +               echo "installing man$$sec/$$ofn.$${sec}$(MANSUFFIX)"; \
  49                 (cd `$(PERL) util/dirname.pl $$i`; \
  50                 sh -c "$$pod2man \
  51                         --section=$$sec --center=OpenSSL \
  52                         --release=$(VERSION) `basename $$i`") \
  53 -                       >  $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \
  54 +                       >  $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$ofn.$${sec}$(MANSUFFIX); \
  55                 $(PERL) util/extract-names.pl < $$i | \
  56                         (grep -v $$filecase "^$$fn\$$"; true) | \
  57                         (grep -v "[     ]"; true) | \
  58                         (cd $(INSTALL_PREFIX)$(MANDIR)/man$$sec/; \
  59                          while read n; do \
  60 -                               PLATFORM=$(PLATFORM) $$here/util/point.sh $$fn.$${sec}$(MANSUFFIX) "$$n".$${sec}$(MANSUFFIX); \
  61 +                               case "$$n" in \
  62 +                               CA.pl|openssl) on="$$n" ;; \
  63 +                               *) on="openssl_$$n" ;; \
  64 +                               esac; \
  65 +                               PLATFORM=$(PLATFORM) $$here/util/point.sh $$ofn.$${sec}$(MANSUFFIX) "$$on".$${sec}$(MANSUFFIX); \
  66                          done); \
  67         done; \
  68         set -e; for i in doc/crypto/*.pod doc/ssl/*.pod; do \
  69                 fn=`basename $$i .pod`; \
  70                 sec=`$(PERL) util/extract-section.pl 3 < $$i`; \
  71 -               echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \
  72 +               case "$$fn" in \
  73 +               ui*) ofn="openssl_$$fn" ;; \
  74 +               [A-Z]*|*_*) ofn="$$fn" ;; \
  75 +               *) ofn="openssl_$$fn" ;; \
  76 +               esac; \
  77 +               echo "installing man$$sec/$$ofn.$${sec}$(MANSUFFIX)"; \
  78                 (cd `$(PERL) util/dirname.pl $$i`; \
  79                 sh -c "$$pod2man \
  80                         --section=$$sec --center=OpenSSL \
  81                         --release=$(VERSION) `basename $$i`") \
  82 -                       >  $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \
  83 +                       >  $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$ofn.$${sec}$(MANSUFFIX); \
  84                 $(PERL) util/extract-names.pl < $$i | \
  85                         (grep -v $$filecase "^$$fn\$$"; true) | \
  86                         (grep -v "[     ]"; true) | \
  87                         (cd $(INSTALL_PREFIX)$(MANDIR)/man$$sec/; \
  88                          while read n; do \
  89 -                               PLATFORM=$(PLATFORM) $$here/util/point.sh $$fn.$${sec}$(MANSUFFIX) "$$n".$${sec}$(MANSUFFIX); \
  90 +                               case "$$n" in \
  91 +                               ui*) on="openssl_$$n" ;; \
  92 +                               [A-Z]*|*_*) on="$$n" ;; \
  93 +                               *) on="openssl_$$n" ;; \
  94 +                               esac; \
  95 +                               PLATFORM=$(PLATFORM) $$here/util/point.sh $$ofn.$${sec}$(MANSUFFIX) "$$on".$${sec}$(MANSUFFIX); \
  96                          done); \
  97         done
  98