pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/security/openssl Fixed a few pkglint warnings.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/b691fef98e1e
branches:  trunk
changeset: 537271:b691fef98e1e
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sat Jan 05 20:41:25 2008 +0000

description:
Fixed a few pkglint warnings.

diffstat:

 security/openssl/Makefile      |  4 ++--
 security/openssl/buildlink3.mk |  7 ++++---
 security/openssl/builtin.mk    |  4 ++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diffs (61 lines):

diff -r a22c8ef27cea -r b691fef98e1e security/openssl/Makefile
--- a/security/openssl/Makefile Sat Jan 05 20:35:14 2008 +0000
+++ b/security/openssl/Makefile Sat Jan 05 20:41:25 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.129 2008/01/04 22:08:09 rillig Exp $
+# $NetBSD: Makefile,v 1.130 2008/01/05 20:41:25 rillig Exp $
 
 OPENSSL_SNAPSHOT?=     # empty
 OPENSSL_STABLE?=       # empty
@@ -126,7 +126,7 @@
 pre-configure:
        cd ${WRKSRC};                                                   \
        for file in fips/*/Makefile; do                                 \
-               if ${GREP} "^EXHEADER=[         ]*$$" $$file >/dev/null; then \
+               if ${GREP} "^EXHEADER=[         ]*\$$" $$file >/dev/null; then \
                        ${ECHO} "Fixing 'install' target in $$file.";   \
                        ${MV} -f $$file $$file.preawk;                  \
                        ${AWK} '/^install:/ { printf "install:\n\nnot-install:\n"; next } { print }' \
diff -r a22c8ef27cea -r b691fef98e1e security/openssl/buildlink3.mk
--- a/security/openssl/buildlink3.mk    Sat Jan 05 20:35:14 2008 +0000
+++ b/security/openssl/buildlink3.mk    Sat Jan 05 20:41:25 2008 +0000
@@ -1,10 +1,8 @@
-# $NetBSD: buildlink3.mk,v 1.37 2007/09/07 17:26:23 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.38 2008/01/05 20:41:25 rillig Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 OPENSSL_BUILDLINK3_MK:=        ${OPENSSL_BUILDLINK3_MK}+
 
-.include "../../mk/bsd.fast.prefs.mk"
-
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=    openssl
 .endif
@@ -14,6 +12,9 @@
 BUILDLINK_ORDER:=      ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}openssl
 
 .if !empty(OPENSSL_BUILDLINK3_MK:M+)
+
+.  include "../../mk/bsd.fast.prefs.mk"
+
 BUILDLINK_API_DEPENDS.openssl+=        openssl>=0.9.6m
 .  if defined(USE_FEATURES.openssl) && !empty(USE_FEATURES.openssl:Mthreads)
 BUILDLINK_ABI_DEPENDS.openssl+=        openssl>=0.9.7inb4
diff -r a22c8ef27cea -r b691fef98e1e security/openssl/builtin.mk
--- a/security/openssl/builtin.mk       Sat Jan 05 20:35:14 2008 +0000
+++ b/security/openssl/builtin.mk       Sat Jan 05 20:41:25 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.22 2007/09/07 17:26:23 jlam Exp $
+# $NetBSD: builtin.mk,v 1.23 2008/01/05 20:41:26 rillig Exp $
 
 BUILTIN_PKG:=  openssl
 
@@ -193,7 +193,7 @@
 .    if !target(buildlink-openssl-des-h)
 .PHONY: buildlink-openssl-des-h
 buildlink-openssl-des-h:
-       ${_PKG_SILENT}${_PKG_DEBUG}                                     \
+       ${RUN}                                                          \
        bl_odes_h="${BUILDLINK_DIR}/include/openssl/des.h";             \
        bl_odes_old_h="${BUILDLINK_DIR}/include/openssl/des_old.h";     \
        odes_h="${BUILDLINK_PREFIX.openssl}/include/openssl/des.h";     \



Home | Main Index | Thread Index | Old Index