[pkgsrc/trunk]: pkgsrc/security/openssl Honor CFLAGS/LDFLAGS from the environ...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3ee6ef5d6c41
branches:  trunk
changeset: 461083:3ee6ef5d6c41
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Sep 10 16:05:09 2003 +0000

description:
Honor CFLAGS/LDFLAGS from the environment.

diffstat:

 security/openssl/Makefile         |   6 ++++--
 security/openssl/distinfo         |   4 ++--
 security/openssl/patches/patch-ac |  15 ++++++++++++---
 3 files changed, 18 insertions(+), 7 deletions(-)

diffs (70 lines):

diff -r 157b6c5f89d6 -r 3ee6ef5d6c41 security/openssl/Makefile
--- a/security/openssl/Makefile Wed Sep 10 16:02:09 2003 +0000
+++ b/security/openssl/Makefile Wed Sep 10 16:05:09 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.77 2003/09/10 01:57:06 jlam Exp $
+# $NetBSD: Makefile,v 1.78 2003/09/10 16:05:09 jlam Exp $
 
 DISTNAME=              openssl-0.9.6g
 PKGREVISION=           2
@@ -68,7 +68,7 @@
 
 .if defined(USE_RSAREF2) && ${USE_RSAREF2} == "YES"
 .  include "../../security/rsaref/buildlink2.mk"
-CONFIGURE_ARGS+=       rsaref -L${BUILDLINK_PREFIX.rsaref}/lib
+CONFIGURE_ARGS+=       rsaref
 PLIST_RSAREF=          ${PKGDIR}/PLIST.rsaref
 .endif
 
@@ -87,4 +87,6 @@
 .  endif
 .endif
 
+CONFIGURE_ARGS+=       ${CFLAGS} ${LDFLAGS}
+
 .include  "../../mk/bsd.pkg.mk"
diff -r 157b6c5f89d6 -r 3ee6ef5d6c41 security/openssl/distinfo
--- a/security/openssl/distinfo Wed Sep 10 16:02:09 2003 +0000
+++ b/security/openssl/distinfo Wed Sep 10 16:05:09 2003 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.20 2003/09/10 01:57:06 jlam Exp $
+$NetBSD: distinfo,v 1.21 2003/09/10 16:05:09 jlam Exp $
 
 SHA1 (openssl-0.9.6g.tar.gz) = 5b3cdad1d33134c97f659a8ad5dbf4ca4cf3d9c8
 Size (openssl-0.9.6g.tar.gz) = 2170570 bytes
@@ -6,7 +6,7 @@
 Size (openssl-0.9.6g-20020810-netbsd.patch.gz) = 27608 bytes
 SHA1 (patch-aa) = c4766edba4704374ae67d75c2f9454bc70782eea
 SHA1 (patch-ab) = 9bdac032996bd97834b00cb661f79c00dc31bac1
-SHA1 (patch-ac) = cae2a44ac400833cef8b74fb051b5ef51a21436c
+SHA1 (patch-ac) = 3d8fcb927da1dcf51a87b5c0cd89fadccafe0955
 SHA1 (patch-ad) = 950d57633fcb494564641f9b7e6385b96912c05d
 SHA1 (patch-ae) = f4bf6ae5aa41b55d9978376e4e50ee10c10dd288
 SHA1 (patch-af) = 25481e491acd7c2e3cd9587fe038a37e41071a24
diff -r 157b6c5f89d6 -r 3ee6ef5d6c41 security/openssl/patches/patch-ac
--- a/security/openssl/patches/patch-ac Wed Sep 10 16:02:09 2003 +0000
+++ b/security/openssl/patches/patch-ac Wed Sep 10 16:05:09 2003 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.12 2003/09/10 01:57:06 jlam Exp $
+$NetBSD: patch-ac,v 1.13 2003/09/10 16:05:10 jlam Exp $
 
---- Configure.orig     Sun Aug 24 15:03:44 2003
-+++ Configure  Sun Aug 24 15:05:19 2003
+--- Configure.orig     Wed Sep 10 11:47:42 2003
++++ Configure  Wed Sep 10 11:56:17 2003
 @@ -129,55 +129,6 @@
  "gcc",                "gcc:-O3::(unknown)::BN_LLONG:::",
  "cc",         "cc:-O::(unknown):::::",
@@ -179,3 +179,12 @@
  );
  
  my @WinTargets=qw(VC-NT VC-WIN32 VC-WIN16 VC-W31-16 VC-W31-32 VC-MSDOS BC-32
+@@ -673,7 +690,7 @@
+                       }
+               elsif (/^[-+]/)
+                       {
+-                      if (/^-[lL](.*)$/)
++                      if (/^-[lL](.*)$/ or /^-Wl,(.*)$/)
+                               {
+                               $libs.=$_." ";
+                               }