Fixed pkglint warnings.

3 files changed, 20 insertions, 21 deletions

diff --git a/math/R/Makefile b/math/R/Makefile
index a9d54c3cc3c..40c1b612df5 100644
--- a/math/R/Makefile
+++ b/math/R/Makefile
@@ -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 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 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 @@ post-install:
 	) | ${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 --git a/math/R/Makefile.extension b/math/R/Makefile.extension
index bfa537d2d2e..1f449baf06d 100644
--- a/math/R/Makefile.extension
+++ b/math/R/Makefile.extension
@@ -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 @@ do-install:
 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_GENERATE_PLIST=	${R_PACKLIST_FILES}; \
-			${R_PACKLIST_DIRS}; \
-			${R_PACKLIST_CMDS}
-GENERATE_PLIST+=	${R_GENERATE_PLIST};
+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_CMD}; \
+			${R_PACKLIST_DIRS_CMD}; \
+			${R_PACKLIST_CMDS_CMD};
+GENERATE_PLIST+=	${R_GENERATE_PLIST}
diff --git a/math/R/buildlink3.mk b/math/R/buildlink3.mk
index 75308453c27..e02adaa2af4 100644
--- a/math/R/buildlink3.mk
+++ b/math/R/buildlink3.mk
@@ -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}+