diff options
| author | rillig <rillig@pkgsrc.org> | 2008-01-05 20:41:25 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2008-01-05 20:41:25 +0000 |
| commit | d5a1ab057791e834af278a79bac21f4707d8d0dc (patch) | |
| tree | 0860272c4d786af0288617de4983640240b3435f | |
| parent | 621be15a96ab06a326f12e11a6c8d3bb98087fc0 (diff) | |
| download | pkgsrc-d5a1ab057791e834af278a79bac21f4707d8d0dc.tar.gz | |
Fixed a few pkglint warnings.
| -rw-r--r-- | security/openssl/Makefile | 4 | ||||
| -rw-r--r-- | security/openssl/buildlink3.mk | 7 | ||||
| -rw-r--r-- | security/openssl/builtin.mk | 4 |
3 files changed, 8 insertions, 7 deletions
diff --git a/security/openssl/Makefile b/security/openssl/Makefile index 9127683cb7f..7ce5585fc3c 100644 --- a/security/openssl/Makefile +++ b/security/openssl/Makefile @@ -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 @@ OWN_DIRS= ${PKG_SYSCONFDIR}/certs ${PKG_SYSCONFDIR}/private 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 --git a/security/openssl/buildlink3.mk b/security/openssl/buildlink3.mk index 98272ba6dbe..7a37e071a4f 100644 --- a/security/openssl/buildlink3.mk +++ b/security/openssl/buildlink3.mk @@ -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_PACKAGES+= openssl 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 --git a/security/openssl/builtin.mk b/security/openssl/builtin.mk index 5a48be954cd..77fdec55d0a 100644 --- a/security/openssl/builtin.mk +++ b/security/openssl/builtin.mk @@ -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 @@ BUILDLINK_TARGETS+= buildlink-openssl-des-h . 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"; \ |