diff options
author | martti <martti> | 2006-02-17 07:04:25 +0000 |
---|---|---|
committer | martti <martti> | 2006-02-17 07:04:25 +0000 |
commit | d7263bbe9cb695423edea7cbdad05e735eacf463 (patch) | |
tree | 56281dd9749f0c3d3a4053c5d4389fb0f5748553 /mail/squirrelmail | |
parent | d1bb2fbb98e7072eb912b7399c668a80e7bc5210 (diff) | |
download | pkgsrc-d7263bbe9cb695423edea7cbdad05e735eacf463.tar.gz |
Fixed warnings found by pkglint -Wall.
Diffstat (limited to 'mail/squirrelmail')
-rw-r--r-- | mail/squirrelmail/Makefile | 38 | ||||
-rw-r--r-- | mail/squirrelmail/buildlink3.mk | 4 | ||||
-rw-r--r-- | mail/squirrelmail/plugin.mk | 4 |
3 files changed, 25 insertions, 21 deletions
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} |