pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/mail/squirrelmail Some pkglint -Wall fixes.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/e3b1b0e03b62
branches:  trunk
changeset: 528617:e3b1b0e03b62
user:      martti <martti%pkgsrc.org@localhost>
date:      Thu May 10 10:08:24 2007 +0000

description:
Some pkglint -Wall fixes.

diffstat:

 mail/squirrelmail/Makefile  |  23 +++++++++++++----------
 mail/squirrelmail/plugin.mk |   6 +++---
 2 files changed, 16 insertions(+), 13 deletions(-)

diffs (66 lines):

diff -r ce91da56ea5d -r e3b1b0e03b62 mail/squirrelmail/Makefile
--- a/mail/squirrelmail/Makefile        Thu May 10 09:25:00 2007 +0000
+++ b/mail/squirrelmail/Makefile        Thu May 10 10:08:24 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.84 2007/05/10 09:24:44 martti Exp $
+# $NetBSD: Makefile,v 1.85 2007/05/10 10:08:24 martti Exp $
 
 DISTNAME=      squirrelmail-1.4.10a
 CATEGORIES=    mail www
@@ -58,25 +58,28 @@
 SUBST_SED.paths+=      -e 's,@SMDIR@,${SMDIR},g'
 SUBST_STAGE.paths=     post-patch
 
-INSTALLATION_DIRS=     ${PKGMANDIR}/man8 share/examples/squirrelmail share/squirrelmail
+INSTALLATION_DIRS=     ${PKGMANDIR}/man8
+INSTALLATION_DIRS+=    share/examples/squirrelmail
+INSTALLATION_DIRS+=    share/squirrelmail
 
 post-extract:
-       ${CP} ${FILESDIR:Q}/squirrelmail.conf.dist \
+       cp ${FILESDIR:Q}/squirrelmail.conf.dist \
                ${WRKDIR:Q}/squirrelmail.conf.dist
 
 pre-configure:
-       ${FIND} ${WRKSRC:Q} \( -name "*.orig*" -o -name ".cvsignore" \) -print | ${XARGS} ${RM} -f
+       find ${WRKSRC:Q} \( -name '*.orig*' -or -name '.cvsignore' \) \
+               -exec rm -f {} \;
 
 do-install:
        ${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 | ${XARGS} ${CHMOD} ${PKGDIRMODE}
-       ${FIND} ${SMDIR} -type f -print | ${XARGS} ${CHMOD} ${SHAREMODE}
-       ${CHMOD} a+x ${SMDIR:Q}/config/conf.pl
+       cp -R ${WRKSRC:Q}/* ${SMDIR:Q}
+       chown -R ${SHAREOWN}:${SHAREGRP} ${SMDIR}
+       find ${SMDIR} -type d -exec chmod ${PKGDIRMODE} {} \;
+       find ${SMDIR} -type f -exec chmod ${SHAREMODE} {} \;
+       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}/
-       ${MV} ${PREFIX}/share/squirrelmail/contrib/conf.pl.8 \
+       mv ${PREFIX}/share/squirrelmail/contrib/conf.pl.8 \
          ${PREFIX}/${PKGMANDIR}/man8/squirrelmail-conf.pl.8
 
 .include "../../lang/php/phpversion.mk"
diff -r ce91da56ea5d -r e3b1b0e03b62 mail/squirrelmail/plugin.mk
--- a/mail/squirrelmail/plugin.mk       Thu May 10 09:25:00 2007 +0000
+++ b/mail/squirrelmail/plugin.mk       Thu May 10 10:08:24 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: plugin.mk,v 1.3 2006/02/17 07:04:25 martti Exp $
+# $NetBSD: plugin.mk,v 1.4 2007/05/10 10:08:24 martti Exp $
 
 DISTNAME?=             ${PLUGIN_NAME}-${PLUGIN_VERSION}
 PKGNAME=               sm-${PLUGIN_NAME}-${PLUGIN_VERSION}
@@ -19,7 +19,7 @@
 
 do-install:
        cd ${WRKSRC:Q} && \
-               ${FIND} . -type f ! -name '*.orig' 2>/dev/null | \
-               ${PAX} -rw ${FULL_PLUGIN_DIR}
+               find . -type f ! -name '*.orig' 2>/dev/null | \
+               pax -rw ${FULL_PLUGIN_DIR}
 
 .include "../../mail/squirrelmail/buildlink3.mk"



Home | Main Index | Thread Index | Old Index