Fixed warnings found by pkglint -Wall.

5 files changed, 51 insertions, 43 deletions

diff --git a/mail/ja-squirrelmail/Makefile b/mail/ja-squirrelmail/Makefile
index c554f7c6206..08f9fa9766e 100644
--- a/mail/ja-squirrelmail/Makefile
+++ b/mail/ja-squirrelmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2006/02/05 23:09:55 joerg Exp $
+# $NetBSD: Makefile,v 1.26 2006/02/17 07:04:25 martti Exp $
 
 DISTNAME=	squirrelmail-1.4.5
 PKGNAME=	ja-${DISTNAME}
@@ -9,7 +9,7 @@ EXTRACT_SUFX=	.tar.bz2
 
 PATCH_SITES=	http://www.yamaai-tech.com/~masato/Download/
 PATCHFILES=	squirrelmail-1.4.5-ja-20050714-patch.gz
-PATCH_DIST_STRIP= -p1
+PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	martti@NetBSD.org
 HOMEPAGE=	http://www.squirrelmail.jp/
@@ -25,12 +25,12 @@ DEPENDS+=	php-mbstring>=4.3.3:../../misc/php-mbstring
 USE_LANGUAGES=	# empty
 NO_BUILD=	yes
 USE_TOOLS+=	perl:run
-REPLACE_PERL=	config/conf.pl config/ri_once.pl
+REPLACE_PERL+=	config/conf.pl config/ri_once.pl
 
 .include "../../mk/bsd.prefs.mk"
 
 PKG_SYSCONFSUBDIR?=	httpd
-MESSAGE_SUBST+=		PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
+MESSAGE_SUBST+=		PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
 
 EGDIR=			${PREFIX}/share/examples/squirrelmail
 SMDIR=			${PREFIX}/share/squirrelmail
@@ -38,14 +38,17 @@ DATADIR=		${VARBASE}/spool/squirrelmail
 ATTACHMENTS_DIR=	${DATADIR}/attachments
 USER_PREFS_DIR=		${DATADIR}/data
 
-MESSAGE_SUBST+=		SMDIR=${SMDIR}
+MESSAGE_SUBST+=		SMDIR=${SMDIR:Q}
 FILES_SUBST+=		SMDIR=${SMDIR:Q}
 
-CONF_FILES=	${SMDIR}/config/config_default.php ${SMDIR}/config/config.php
-CONF_FILES+=	${SMDIR}/data/default_pref ${DATADIR}/data/default_pref
-CONF_FILES+=	${EGDIR}/squirrelmail.conf ${PKG_SYSCONFDIR}/squirrelmail.conf
+CONF_FILES=		${SMDIR:Q}/config/config_default.php \
+			${SMDIR:Q}/config/config.php
+CONF_FILES+=		${SMDIR:Q}/data/default_pref \
+			${DATADIR:Q}/data/default_pref
+CONF_FILES+=		${EGDIR:Q}/squirrelmail.conf \
+			${PKG_SYSCONFDIR:Q}/squirrelmail.conf
 
-REQD_DIRS=		${SMDIR} ${SMDIR}/config
+REQD_DIRS+=		${SMDIR:Q} ${SMDIR:Q}/config
 
 OWN_DIRS=		${DATADIR}
 OWN_DIRS_PERMS=		${ATTACHMENTS_DIR} ${ROOT_USER} ${APACHE_GROUP} 730
@@ -60,21 +63,22 @@ SUBST_SED.paths+=	-e 's,@SMDIR@,${SMDIR},g'
 SUBST_STAGE.paths=	post-patch
 
 post-extract:
-	${CP} ${FILESDIR}/squirrelmail.conf.dist ${WRKDIR}/squirrelmail.conf.dist
+	${CP} ${FILESDIR:Q}/squirrelmail.conf.dist \
+		${WRKDIR:Q}/squirrelmail.conf.dist
 
 pre-configure:
-	${FIND} ${WRKSRC} \( -name "*.orig*" -o -name ".cvsignore" \) -exec ${RM} -f {} \;
+	${FIND} ${WRKSRC:Q} \( -name "*.orig*" -o -name ".cvsignore" \) -exec ${RM} -f {} \;
 
 do-install:
-	${INSTALL_DATA_DIR} ${EGDIR}
-	${INSTALL_DATA_DIR} ${SMDIR}
-	${INSTALL_DATA} ${WRKDIR}/squirrelmail.conf.dist ${EGDIR}/squirrelmail.conf
-	${CP} -R ${WRKSRC}/* ${SMDIR}
+	${INSTALL_DATA_DIR} ${EGDIR:Q}
+	${INSTALL_DATA_DIR} ${SMDIR:Q}
+	${INSTALL_DATA} ${WRKDIR:Q}/squirrelmail.conf.dist ${EGDIR:Q}/squirrelmail.conf
+	${CP} -R ${WRKSRC:Q}/* ${SMDIR:Q}
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${SMDIR}
 	${FIND} ${SMDIR} -type d -print -exec ${CHMOD} ${PKGDIRMODE} {} \;
 	${FIND} ${SMDIR} -type f -print -exec ${CHMOD} ${SHAREMODE} {} \;
-	${CHMOD} a+x ${SMDIR}/config/conf.pl
-	${INSTALL_DATA} ${WRKSRC}/data/index.php ${USER_PREFS_DIR}/
-	${INSTALL_DATA} ${WRKSRC}/data/.htaccess ${USER_PREFS_DIR}/
+	${CHMOD} a+x ${SMDIR:Q}/config/conf.pl
+	${INSTALL_DATA} ${WRKSRC:Q}/data/index.php ${USER_PREFS_DIR:Q}/
+	${INSTALL_DATA} ${WRKSRC:Q}/data/.htaccess ${USER_PREFS_DIR:Q}/
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/squirrelmail-locales/Makefile b/mail/squirrelmail-locales/Makefile
index 96c41f83d12..46fb3916cc5 100644
--- a/mail/squirrelmail-locales/Makefile
+++ b/mail/squirrelmail-locales/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/02/05 23:09:58 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2006/02/17 07:04:25 martti Exp $
 #
 
 DISTNAME=	all_locales-${VER}-20050713
@@ -21,11 +21,11 @@ INSTALLATION_DIRS=	share/squirrelmail
 WRKSRC=		${WRKDIR}
 
 do-build:
-	cd ${WRKDIR}/help && ${RM} -rf en_US
+	cd ${WRKDIR:Q}/help && ${RM} -rf en_US
 
 do-install:
-	cd ${WRKDIR} && ${TAR} -cf - help images locale | \
-		${TAR} -xf - -C ${PREFIX}/share/squirrelmail/
+	cd ${WRKDIR:Q} && ${TAR} -cf - help images locale | \
+		${TAR} -xf - -C ${PREFIX:Q}/share/squirrelmail/
 
 .include "../../mail/squirrelmail/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/squirrelmail/Makefile b/mail/squirrelmail/Makefile
index f64686c5a98..08781915a96 100644
--- a/mail/squirrelmail/Makefile
+++ b/mail/squirrelmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2006/02/05 23:09:58 joerg Exp $
+# $NetBSD: Makefile,v 1.68 2006/02/17 07:04:25 martti Exp $
 
 DISTNAME=	squirrelmail-1.4.5
 PKGREVISION=	5
@@ -20,12 +20,12 @@ DEPENDS+=	php-gettext>=4.3.3:../../devel/php-gettext
 USE_LANGUAGES=	# empty
 NO_BUILD=	yes
 USE_TOOLS+=	perl:run
-REPLACE_PERL=	config/conf.pl config/ri_once.pl
+REPLACE_PERL+=	config/conf.pl config/ri_once.pl
 
 .include "../../mk/bsd.prefs.mk"
 
 PKG_SYSCONFSUBDIR?=	httpd
-MESSAGE_SUBST+=		PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
+MESSAGE_SUBST+=		PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
 
 EGDIR=			${PREFIX}/share/examples/squirrelmail
 SMDIR=			${PREFIX}/share/squirrelmail
@@ -33,14 +33,17 @@ DATADIR=		${VARBASE}/spool/squirrelmail
 ATTACHMENTS_DIR=	${DATADIR}/attachments
 USER_PREFS_DIR=		${DATADIR}/data
 
-MESSAGE_SUBST+=		SMDIR=${SMDIR}
+MESSAGE_SUBST+=		SMDIR=${SMDIR:Q}
 FILES_SUBST+=		SMDIR=${SMDIR:Q}
 
-CONF_FILES=	${SMDIR}/config/config_default.php ${SMDIR}/config/config.php
-CONF_FILES+=	${SMDIR}/data/default_pref ${DATADIR}/data/default_pref
-CONF_FILES+=	${EGDIR}/squirrelmail.conf ${PKG_SYSCONFDIR}/squirrelmail.conf
+CONF_FILES=		${SMDIR:Q}/config/config_default.php \
+			${SMDIR:Q}/config/config.php
+CONF_FILES+=		${SMDIR:Q}/data/default_pref \
+			${DATADIR:Q}/data/default_pref
+CONF_FILES+=		${EGDIR:Q}/squirrelmail.conf \
+			${PKG_SYSCONFDIR:Q}/squirrelmail.conf
 
-REQD_DIRS=		${SMDIR} ${SMDIR}/config
+REQD_DIRS+=		${SMDIR:Q} ${SMDIR:Q}/config
 
 OWN_DIRS=		${DATADIR}
 OWN_DIRS_PERMS=		${ATTACHMENTS_DIR} ${ROOT_USER} ${APACHE_GROUP} 730
@@ -55,21 +58,22 @@ SUBST_SED.paths+=	-e 's,@SMDIR@,${SMDIR},g'
 SUBST_STAGE.paths=	post-patch
 
 post-extract:
-	${CP} ${FILESDIR}/squirrelmail.conf.dist ${WRKDIR}/squirrelmail.conf.dist
+	${CP} ${FILESDIR:Q}/squirrelmail.conf.dist \
+		${WRKDIR:Q}/squirrelmail.conf.dist
 
 pre-configure:
-	${FIND} ${WRKSRC} \( -name "*.orig*" -o -name ".cvsignore" \) -exec ${RM} -f {} \;
+	${FIND} ${WRKSRC:Q} \( -name "*.orig*" -o -name ".cvsignore" \) -exec ${RM} -f {} \;
 
 do-install:
-	${INSTALL_DATA_DIR} ${EGDIR}
-	${INSTALL_DATA_DIR} ${SMDIR}
-	${INSTALL_DATA} ${WRKDIR}/squirrelmail.conf.dist ${EGDIR}/squirrelmail.conf
-	${CP} -R ${WRKSRC}/* ${SMDIR}
+	${INSTALL_DATA_DIR} ${EGDIR:Q}
+	${INSTALL_DATA_DIR} ${SMDIR:Q}
+	${INSTALL_DATA} ${WRKDIR:Q}/squirrelmail.conf.dist ${EGDIR:Q}/squirrelmail.conf
+	${CP} -R ${WRKSRC:Q}/* ${SMDIR:Q}
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${SMDIR}
 	${FIND} ${SMDIR} -type d -print -exec ${CHMOD} ${PKGDIRMODE} {} \;
 	${FIND} ${SMDIR} -type f -print -exec ${CHMOD} ${SHAREMODE} {} \;
-	${CHMOD} a+x ${SMDIR}/config/conf.pl
-	${INSTALL_DATA} ${WRKSRC}/data/index.php ${USER_PREFS_DIR}/
-	${INSTALL_DATA} ${WRKSRC}/data/.htaccess ${USER_PREFS_DIR}/
+	${CHMOD} a+x ${SMDIR:Q}/config/conf.pl
+	${INSTALL_DATA} ${WRKSRC:Q}/data/index.php ${USER_PREFS_DIR:Q}/
+	${INSTALL_DATA} ${WRKSRC:Q}/data/.htaccess ${USER_PREFS_DIR:Q}/
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/squirrelmail/buildlink3.mk b/mail/squirrelmail/buildlink3.mk
index 55a08c87fb9..01d47124448 100644
--- a/mail/squirrelmail/buildlink3.mk
+++ b/mail/squirrelmail/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/02/05 23:09:58 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/02/17 07:04:25 martti Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 SQUIRRELMAIL_BUILDLINK3_MK:=	${SQUIRRELMAIL_BUILDLINK3_MK}+
@@ -16,4 +16,4 @@ BUILDLINK_RECOMMENDED.squirrelmail?=	squirrelmail>=1.4.5nb5
 BUILDLINK_PKGSRCDIR.squirrelmail?=	../../mail/squirrelmail
 .endif	# SQUIRRELMAIL_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/mail/squirrelmail/plugin.mk b/mail/squirrelmail/plugin.mk
index 07339face9e..3b7cd1beb9b 100644
--- a/mail/squirrelmail/plugin.mk
+++ b/mail/squirrelmail/plugin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: plugin.mk,v 1.2 2005/12/05 20:50:35 rillig Exp $
+# $NetBSD: plugin.mk,v 1.3 2006/02/17 07:04:25 martti Exp $
 
 DISTNAME?=		${PLUGIN_NAME}-${PLUGIN_VERSION}
 PKGNAME=		sm-${PLUGIN_NAME}-${PLUGIN_VERSION}
@@ -18,7 +18,7 @@ INSTALLATION_DIRS+=	${PLUGIN_DIR}
 PLIST_SUBST+=		PLUGIN_DIR=${PLUGIN_DIR:Q}
 
 do-install:
-	cd ${WRKSRC} && \
+	cd ${WRKSRC:Q} && \
 		${FIND} . -type f ! -name '*.orig' 2>/dev/null | \
 		${PAX} -rw ${FULL_PLUGIN_DIR}