pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/lang/ocaml Fixed pkglint warnings.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/035e78c51a62
branches:  trunk
changeset: 513052:035e78c51a62
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sat May 20 09:10:51 2006 +0000

description:
Fixed pkglint warnings.

diffstat:

 lang/ocaml/Makefile.common |   8 ++++----
 lang/ocaml/buildlink3.mk   |  18 +++++++++---------
 2 files changed, 13 insertions(+), 13 deletions(-)

diffs (70 lines):

diff -r 04d2632a387b -r 035e78c51a62 lang/ocaml/Makefile.common
--- a/lang/ocaml/Makefile.common        Sat May 20 08:53:19 2006 +0000
+++ b/lang/ocaml/Makefile.common        Sat May 20 09:10:51 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.15 2006/04/25 04:58:32 hiramatsu Exp $
+# $NetBSD: Makefile.common,v 1.16 2006/05/20 09:10:51 rillig Exp $
 
 DISTNAME=      ocaml-3.09.2
 CATEGORIES=    lang
@@ -33,11 +33,11 @@
 
 .PHONY: cp-power-bsd
 cp-power-bsd:
-       @${CP} ${WRKSRC:Q}/asmrun/power-elf.S ${WRKSRC:Q}/asmrun/power-bsd.S
+       ${CP} ${WRKSRC:Q}/asmrun/power-elf.S ${WRKSRC:Q}/asmrun/power-bsd.S
 
 .PHONY: cp-gnu-config
 cp-gnu-config:
-       @${CP} ${PKGSRCDIR:Q}/mk/gnu-config/config.guess ${WRKSRC:Q}/config/gnu/
-       @${CP} ${PKGSRCDIR:Q}/mk/gnu-config/config.sub ${WRKSRC:Q}/config/gnu/
+       ${CP} ${PKGSRCDIR:Q}/mk/gnu-config/config.guess ${WRKSRC:Q}/config/gnu/
+       ${CP} ${PKGSRCDIR:Q}/mk/gnu-config/config.sub ${WRKSRC:Q}/config/gnu/
 
 .include "../../mk/pthread.buildlink3.mk"
diff -r 04d2632a387b -r 035e78c51a62 lang/ocaml/buildlink3.mk
--- a/lang/ocaml/buildlink3.mk  Sat May 20 08:53:19 2006 +0000
+++ b/lang/ocaml/buildlink3.mk  Sat May 20 09:10:51 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2006/04/06 06:22:12 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2006/05/20 09:10:51 rillig Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 OCAML_BUILDLINK3_MK:=  ${OCAML_BUILDLINK3_MK}+
@@ -9,17 +9,17 @@
 
 BUILDLINK_PACKAGES:=           ${BUILDLINK_PACKAGES:Nocaml}
 BUILDLINK_PACKAGES+=           ocaml
-BUILDLINK_DEPMETHOD.ocaml?=    build
 
 .if !empty(OCAML_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.ocaml+=  ocaml>=3.08.2
-BUILDLINK_ABI_DEPENDS.ocaml?=  ocaml>=3.09.1nb2
+BUILDLINK_ABI_DEPENDS.ocaml+=  ocaml>=3.09.1nb2
 BUILDLINK_PKGSRCDIR.ocaml?=    ../../lang/ocaml
+BUILDLINK_DEPMETHOD.ocaml?=    build
 
-. include "../../mk/bsd.prefs.mk"
-. if ${OPSYS} == "Darwin"
+.  include "../../mk/bsd.prefs.mk"
+.  if ${OPSYS} == "Darwin"
 INSTALL_UNSTRIPPED=            yes
-. endif
+.  endif
 
 PRINT_PLIST_AWK+=      /^@dirrm lib\/ocaml$$/ \
                                { print "@comment in ocaml: " $$0; next }
@@ -33,10 +33,10 @@
 ocaml-wrappers:
        ${_PKG_SILENT}${_PKG_DEBUG} set -e;                             \
        for w in ${OCAML_WRAPPERS}; do                                  \
-               ${SED}  -e 's|@SH@|${SH}|g'                             \
+               ${SED}  -e 's|@SH@|'${SH:Q}'|g'                         \
                        -e 's|@OCAML_PREFIX@|${BUILDLINK_PREFIX.ocaml}|g' \
-                       -e 's|@CFLAGS@|${CFLAGS}|g'                     \
-                       -e 's|@LDFLAGS@|${LDFLAGS}|g'                   \
+                       -e 's|@CFLAGS@|'${CFLAGS:Q}'|g'                 \
+                       -e 's|@LDFLAGS@|'${LDFLAGS:Q}'|g'               \
                        < ${.CURDIR:Q}/../../lang/ocaml/files/wrapper.sh \
                        > ${BUILDLINK_DIR:Q}/bin/"$$w";                 \
                ${CHMOD} +x ${BUILDLINK_DIR:Q}/bin/"$$w";               \



Home | Main Index | Thread Index | Old Index