pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc fix lint



details:   https://anonhg.NetBSD.org/pkgsrc/rev/672cae740eb7
branches:  trunk
changeset: 567922:672cae740eb7
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Sun Nov 29 03:28:04 2009 +0000

description:
fix lint

diffstat:

 mail/thunderbird/Makefile |  11 ++++++-----
 www/firefox/Makefile      |  15 ++++++++-------
 2 files changed, 14 insertions(+), 12 deletions(-)

diffs (67 lines):

diff -r 6fdf4bd515ea -r 672cae740eb7 mail/thunderbird/Makefile
--- a/mail/thunderbird/Makefile Sun Nov 29 03:10:50 2009 +0000
+++ b/mail/thunderbird/Makefile Sun Nov 29 03:28:04 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2009/11/29 03:06:42 tnn Exp $
+# $NetBSD: Makefile,v 1.41 2009/11/29 03:28:35 tnn Exp $
 #
 
 DISTNAME=      thunderbird-${TB_VER}.source
@@ -45,14 +45,15 @@
 
 MOZILLA=thunderbird
 MOZILLA_NAME=Thunderbird
-post-install:
-       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/applications
-       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/pixmaps
-       ${SED}  -e 's|@MOZILLA@|${MOZILLA}|g'                           \
+post-build:
+       ${SED} -e 's|@MOZILLA@|${MOZILLA}|g'                            \
          -e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|g'                       \
          -e 's|@MOZILLA_ICON@|${MOZILLA}.png|g'                        \
          < ${FILESDIR}/desktop.in                                      \
          > ${WRKDIR}/desktop
+
+INSTALLATION_DIRS+=    share/applications share/pixmaps
+post-install:
        ${INSTALL_DATA} ${WRKDIR}/desktop                               \
          ${DESTDIR}${PREFIX}/share/applications/${MOZILLA}.desktop
        ${INSTALL_DATA} ${WRKSRC}/mail/branding/nightly/mailicon48.png  \
diff -r 6fdf4bd515ea -r 672cae740eb7 www/firefox/Makefile
--- a/www/firefox/Makefile      Sun Nov 29 03:10:50 2009 +0000
+++ b/www/firefox/Makefile      Sun Nov 29 03:28:04 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2009/11/27 16:59:18 tnn Exp $
+# $NetBSD: Makefile,v 1.64 2009/11/29 03:28:04 tnn Exp $
 #
 
 .include "../../devel/xulrunner/dist.mk"
@@ -34,21 +34,22 @@
 pre-configure:
        cd ${WRKSRC} && autoconf
 
-post-install:
-       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/applications
-       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/pixmaps
-       ${SED}  -e 's|@MOZILLA@|${MOZILLA}|g'                           \
+post-build:
+       ${SED} -e 's|@MOZILLA@|${MOZILLA}|g'                            \
          -e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|g'                       \
          -e 's|@FIREFOX_ICON@|${MOZILLA}.png|g'                        \
          < ${FILESDIR}/desktop.in                                      \
          > ${WRKDIR}/desktop
+       ${SED} -e 's|@PREFIX@|${PREFIX}|g' < ${FILESDIR}/firefox.sh.in  \
+         > ${WRKDIR}/firefox
+
+INSTALLATION_DIRS+=    share/applications share/pixmaps
+post-install:
        ${INSTALL_DATA} ${WRKDIR}/desktop                               \
          ${DESTDIR}${PREFIX}/share/applications/${MOZILLA}.desktop
        ${INSTALL_DATA} ${MOZILLA_ICON}                                 \
          ${DESTDIR}${PREFIX}/share/pixmaps/${MOZILLA}.png
        rm -f ${DESTDIR}${PREFIX}/bin/firefox
-       ${SED} -e 's|@PREFIX@|${PREFIX}|g' < ${FILESDIR}/firefox.sh.in  \
-         > ${WRKDIR}/firefox
        ${INSTALL_SCRIPT} ${WRKDIR}/firefox ${DESTDIR}${PREFIX}/bin
 
 BUILDLINK_API_DEPENDS.xulrunner+=      xulrunner-1.9.1.5{,nb*}



Home | Main Index | Thread Index | Old Index