[pkgsrc/trunk]: pkgsrc/math/R Fixed pkglint warnings.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/dbb449e11a54
branches:  trunk
changeset: 514244:dbb449e11a54
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Fri Jun 09 11:15:32 2006 +0000

description:
Fixed pkglint warnings.

diffstat:

 math/R/Makefile           |  14 +++++++-------
 math/R/Makefile.extension |  22 +++++++++++-----------
 math/R/buildlink3.mk      |   3 +--
 3 files changed, 19 insertions(+), 20 deletions(-)

diffs (84 lines):

diff -r 6e6fbe54bfd1 -r dbb449e11a54 math/R/Makefile
--- a/math/R/Makefile   Fri Jun 09 11:08:53 2006 +0000
+++ b/math/R/Makefile   Fri Jun 09 11:15:32 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.83 2006/04/17 13:46:39 wiz Exp $
+# $NetBSD: Makefile,v 1.84 2006/06/09 11:15:32 rillig Exp $
 
 DISTNAME=              R-2.2.1
 PKGREVISION=           3
@@ -17,7 +17,7 @@
 
 TEST_TARGET=           check
 USE_TOOLS+=            gmake gzip:run makeinfo perl:run sed xmkmf
-USE_GNU_READLINE=      # uses callback interface
+USE_GNU_READLINE=      yes             # uses callback interface
 USE_LANGUAGES=         c fortran
 USE_LIBTOOL=           yes
 TEXINFO_REQD=          4.5
@@ -110,14 +110,14 @@
        ) | ${GREP} -v "lib/R/doc/html/packages.html" |                 \
        ${GREP} -v "lib/R/doc/html/search/index.txt" |                  \
        ${SORT} -u >> ${PLIST_SRC}
-       ${ECHO} "@unexec ${RM} -f %D/lib/R/doc/html/packages.html" >> ${PLIST_SRC}
-       ${ECHO} "@unexec ${RM} -f %D/lib/R/doc/html/search/index.txt" >> ${PLIST_SRC}
-       ( cd ${PREFIX};                                                 \
+       ${ECHO} "@unexec "${RM:Q}" -f %D/lib/R/doc/html/packages.html" >> ${PLIST_SRC}
+       ${ECHO} "@unexec "${RM:Q}" -f %D/lib/R/doc/html/search/index.txt" >> ${PLIST_SRC}
+       ( cd ${PREFIX} &&                                               \
          for dir in ${R_INSTALL_DIRS}; do                              \
                ${FIND} $${dir#${PREFIX}/} -type d -print;              \
          done;                                                         \
        ) | ${SORT} -ur | ${SED} -e "s|^|@dirrm |" >> ${PLIST_SRC}
-       ${ECHO} "@exec R CMD ${PERL5} %D/lib/R/share/perl/build-help.pl --htmllists 2>/dev/null" >> ${PLIST_SRC}
-       ${ECHO} "@exec ${CAT} %D/lib/R/library/*/CONTENTS > %D/lib/R/doc/html/search/index.txt 2>/dev/null" >> ${PLIST_SRC}
+       ${ECHO} "@exec R CMD "${PERL5:Q}" %D/lib/R/share/perl/build-help.pl --htmllists 2>/dev/null" >> ${PLIST_SRC}
+       ${ECHO} "@exec "${CAT:Q}" %D/lib/R/library/*/CONTENTS > %D/lib/R/doc/html/search/index.txt 2>/dev/null" >> ${PLIST_SRC}
 
 .include "../../mk/bsd.pkg.mk"
diff -r 6e6fbe54bfd1 -r dbb449e11a54 math/R/Makefile.extension
--- a/math/R/Makefile.extension Fri Jun 09 11:08:53 2006 +0000
+++ b/math/R/Makefile.extension Fri Jun 09 11:15:32 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.extension,v 1.7 2005/11/03 12:00:32 rillig Exp $
+# $NetBSD: Makefile.extension,v 1.8 2006/06/09 11:15:32 rillig Exp $
 #
 # This Makefile fragment is included by packages for R library packages.
 #
@@ -29,16 +29,16 @@
 R_LIB=                 lib/R/library
 R_INST_DIRS?=          ${R_PKGNAME}
 
-R_PACKLIST_FILES=      ( cd ${PREFIX}; for dir in ${R_INST_DIRS}; do \
+R_PACKLIST_FILES_CMD=  ( cd ${PREFIX}; for dir in ${R_INST_DIRS}; do \
        ${FIND} ${R_LIB}/$${dir} \( -type f -o -type l \) -print; done ) | ${SORT} -u
-R_PACKLIST_DIRS=       ( cd ${PREFIX}; for dir in ${R_INST_DIRS}; do \
+R_PACKLIST_DIRS_CMD=   ( cd ${PREFIX}; for dir in ${R_INST_DIRS}; do \
        ${FIND} ${R_LIB}/$${dir} -type d -print; done ) | ${SORT} -ur | ${SED} -e "s|^|@dirrm |"
-R_PACKLIST_CMDS=       ( ${ECHO} '@exec R CMD ${PERL5} %D/lib/R/share/perl/build-help.pl --htmllists 2>/dev/null'; \
-       ${ECHO} '@exec ${CAT} %D/lib/R/library/*/CONTENTS > %D/lib/R/doc/html/search/index.txt 2>/dev/null'; \
-       ${ECHO} '@unexec R CMD ${PERL5} %D/lib/R/share/perl/build-help.pl --htmllists 2>/dev/null'; \
-       ${ECHO} '@unexec ${CAT} %D/lib/R/library/*/CONTENTS > %D/lib/R/doc/html/search/index.txt 2>/dev/null' )
+R_PACKLIST_CMDS_CMD=   ( ${ECHO} '@exec R CMD '${PERL5:Q}' %D/lib/R/share/perl/build-help.pl --htmllists 2>/dev/null'; \
+       ${ECHO} '@exec '${CAT:Q}' %D/lib/R/library/*/CONTENTS > %D/lib/R/doc/html/search/index.txt 2>/dev/null'; \
+       ${ECHO} '@unexec R CMD '${PERL5:Q}' %D/lib/R/share/perl/build-help.pl --htmllists 2>/dev/null'; \
+       ${ECHO} '@unexec '${CAT:Q}' %D/lib/R/library/*/CONTENTS > %D/lib/R/doc/html/search/index.txt 2>/dev/null' )
 
-R_GENERATE_PLIST=      ${R_PACKLIST_FILES}; \
-                       ${R_PACKLIST_DIRS}; \
-                       ${R_PACKLIST_CMDS}
-GENERATE_PLIST+=       ${R_GENERATE_PLIST};
+R_GENERATE_PLIST=      ${R_PACKLIST_FILES_CMD}; \
+                       ${R_PACKLIST_DIRS_CMD}; \
+                       ${R_PACKLIST_CMDS_CMD};
+GENERATE_PLIST+=       ${R_GENERATE_PLIST}
diff -r 6e6fbe54bfd1 -r dbb449e11a54 math/R/buildlink3.mk
--- a/math/R/buildlink3.mk      Fri Jun 09 11:08:53 2006 +0000
+++ b/math/R/buildlink3.mk      Fri Jun 09 11:15:32 2006 +0000
@@ -1,5 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2006/04/12 10:27:25 rillig Exp $
-# XXX  BUILDLINK_DEPMETHOD.R?= build
+# $NetBSD: buildlink3.mk,v 1.5 2006/06/09 11:15:32 rillig Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 R_BUILDLINK3_MK:=      ${R_BUILDLINK3_MK}+