Sun Nov 29 03:28:04 2009 UTC ()
fix lint


(tnn)
diff -r1.63 -r1.64 pkgsrc/www/firefox/Makefile
cvs diff -r1.63 -r1.64 pkgsrc/www/firefox/Makefile (expand / switch to unified diff)

--- pkgsrc/www/firefox/Makefile 2009/11/27 16:59:18 1.63
+++ pkgsrc/www/firefox/Makefile 2009/11/29 03:28:04 1.64
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.63 2009/11/27 16:59:18 tnn Exp $ 1# $NetBSD: Makefile,v 1.64 2009/11/29 03:28:04 tnn Exp $
2# 2#
3 3
4.include "../../devel/xulrunner/dist.mk" 4.include "../../devel/xulrunner/dist.mk"
5PKGNAME= firefox-${FIREFOX_VER} 5PKGNAME= firefox-${FIREFOX_VER}
6PKGREVISION= 1 6PKGREVISION= 1
7CATEGORIES= www 7CATEGORIES= www
8 8
9MAINTAINER= tnn@NetBSD.org 9MAINTAINER= tnn@NetBSD.org
10HOMEPAGE= http://www.mozilla.com/en-US/firefox/ 10HOMEPAGE= http://www.mozilla.com/en-US/firefox/
11COMMENT= Web browser with support for extensions 11COMMENT= Web browser with support for extensions
12 12
13WRKSRC= ${WRKDIR}/mozilla-1.9.1 13WRKSRC= ${WRKDIR}/mozilla-1.9.1
14MOZILLA_DIR= # empty 14MOZILLA_DIR= # empty
@@ -24,41 +24,42 @@ ALL_ENV+= MOZILLA_PKG_NAME=firefox @@ -24,41 +24,42 @@ ALL_ENV+= MOZILLA_PKG_NAME=firefox
24 24
25MOZILLA=firefox 25MOZILLA=firefox
26.if !empty(PKG_OPTIONS:Mofficial-mozilla-branding) 26.if !empty(PKG_OPTIONS:Mofficial-mozilla-branding)
27MOZILLA_NAME= Firefox 3.5 27MOZILLA_NAME= Firefox 3.5
28MOZILLA_ICON= ${WRKSRC}/other-licenses/branding/firefox/default48.png 28MOZILLA_ICON= ${WRKSRC}/other-licenses/branding/firefox/default48.png
29.else 29.else
30MOZILLA_NAME= Browser 3.5 30MOZILLA_NAME= Browser 3.5
31MOZILLA_ICON= ${WRKSRC}/browser/branding/unofficial/default48.png 31MOZILLA_ICON= ${WRKSRC}/browser/branding/unofficial/default48.png
32.endif 32.endif
33 33
34pre-configure: 34pre-configure:
35 cd ${WRKSRC} && autoconf 35 cd ${WRKSRC} && autoconf
36 36
37post-install: 37post-build:
38 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/applications 38 ${SED} -e 's|@MOZILLA@|${MOZILLA}|g' \
39 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/pixmaps 
40 ${SED} -e 's|@MOZILLA@|${MOZILLA}|g' \ 
41 -e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|g' \ 39 -e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|g' \
42 -e 's|@FIREFOX_ICON@|${MOZILLA}.png|g' \ 40 -e 's|@FIREFOX_ICON@|${MOZILLA}.png|g' \
43 < ${FILESDIR}/desktop.in \ 41 < ${FILESDIR}/desktop.in \
44 > ${WRKDIR}/desktop 42 > ${WRKDIR}/desktop
 43 ${SED} -e 's|@PREFIX@|${PREFIX}|g' < ${FILESDIR}/firefox.sh.in \
 44 > ${WRKDIR}/firefox
 45
 46INSTALLATION_DIRS+= share/applications share/pixmaps
 47post-install:
45 ${INSTALL_DATA} ${WRKDIR}/desktop \ 48 ${INSTALL_DATA} ${WRKDIR}/desktop \
46 ${DESTDIR}${PREFIX}/share/applications/${MOZILLA}.desktop 49 ${DESTDIR}${PREFIX}/share/applications/${MOZILLA}.desktop
47 ${INSTALL_DATA} ${MOZILLA_ICON} \ 50 ${INSTALL_DATA} ${MOZILLA_ICON} \
48 ${DESTDIR}${PREFIX}/share/pixmaps/${MOZILLA}.png 51 ${DESTDIR}${PREFIX}/share/pixmaps/${MOZILLA}.png
49 rm -f ${DESTDIR}${PREFIX}/bin/firefox 52 rm -f ${DESTDIR}${PREFIX}/bin/firefox
50 ${SED} -e 's|@PREFIX@|${PREFIX}|g' < ${FILESDIR}/firefox.sh.in \ 
51 > ${WRKDIR}/firefox 
52 ${INSTALL_SCRIPT} ${WRKDIR}/firefox ${DESTDIR}${PREFIX}/bin 53 ${INSTALL_SCRIPT} ${WRKDIR}/firefox ${DESTDIR}${PREFIX}/bin
53 54
54BUILDLINK_API_DEPENDS.xulrunner+= xulrunner-1.9.1.5{,nb*} 55BUILDLINK_API_DEPENDS.xulrunner+= xulrunner-1.9.1.5{,nb*}
55.include "../../devel/xulrunner/buildlink3.mk" 56.include "../../devel/xulrunner/buildlink3.mk"
56PLIST_VARS+= gnome 57PLIST_VARS+= gnome
57.if !empty(PKG_BUILD_OPTIONS.xulrunner:Mgnome) 58.if !empty(PKG_BUILD_OPTIONS.xulrunner:Mgnome)
58CONFIGURE_ARGS+= --enable-gnomevfs --enable-dbus --enable-gnomeui 59CONFIGURE_ARGS+= --enable-gnomevfs --enable-dbus --enable-gnomeui
59PLIST.gnome= yes 60PLIST.gnome= yes
60.else 61.else
61CONFIGURE_ARGS+= --disable-gnomevfs --disable-dbus --disable-gnomeui 62CONFIGURE_ARGS+= --disable-gnomevfs --disable-dbus --disable-gnomeui
62.endif 63.endif
63.include "../../sysutils/desktop-file-utils/desktopdb.mk" 64.include "../../sysutils/desktop-file-utils/desktopdb.mk"
64.include "../../mk/bsd.pkg.mk" 65.include "../../mk/bsd.pkg.mk"