Sun Mar 11 12:34:26 2012 UTC ()
www/firefox: Fix indirect linking issue on DragonFly

More fallout from nss3 update.  Only DragonFly build affected by this commit.


(marino)
diff -r1.98 -r1.99 pkgsrc/www/firefox/Makefile

cvs diff -r1.98 -r1.99 pkgsrc/www/firefox/Makefile (expand / switch to unified diff)

--- pkgsrc/www/firefox/Makefile 2012/03/10 03:09:42 1.98
+++ pkgsrc/www/firefox/Makefile 2012/03/11 12:34:26 1.99
@@ -1,33 +1,35 @@ @@ -1,33 +1,35 @@
1# $NetBSD: Makefile,v 1.98 2012/03/10 03:09:42 ryoon Exp $ 1# $NetBSD: Makefile,v 1.99 2012/03/11 12:34:26 marino Exp $
2 2
3.include "../../devel/xulrunner/dist.mk" 3.include "../../devel/xulrunner/dist.mk"
4PKGNAME= firefox-${FIREFOX_VER} 4PKGNAME= firefox-${FIREFOX_VER}
5PKGREVISION= 1 5PKGREVISION= 1
6CATEGORIES= www 6CATEGORIES= www
7 7
8MAINTAINER= tnn@NetBSD.org 8MAINTAINER= tnn@NetBSD.org
9HOMEPAGE= http://www.mozilla.com/en-US/firefox/ 9HOMEPAGE= http://www.mozilla.com/en-US/firefox/
10COMMENT= Web browser with support for extensions 10COMMENT= Web browser with support for extensions
11LICENSE= mpl-1.1 11LICENSE= mpl-1.1
12 12
13MOZILLA_DIR= # empty 13MOZILLA_DIR= # empty
14 14
15CONFIGURE_ARGS+= --enable-application=browser 15CONFIGURE_ARGS+= --enable-application=browser
16CONFIGURE_ARGS+= --with-libxul-sdk=${PREFIX}/lib/xulrunner-sdk 16CONFIGURE_ARGS+= --with-libxul-sdk=${PREFIX}/lib/xulrunner-sdk
17CONFIGURE_ARGS+= --with-system-libxul 17CONFIGURE_ARGS+= --with-system-libxul
18 18
19ALL_ENV+= MOZILLA_PKG_NAME=firefox 19ALL_ENV+= MOZILLA_PKG_NAME=firefox
20 20
 21LDFLAGS.DragonFly= -lplc4 -lnspr4
 22
21.include "../../devel/xulrunner/mozilla-common.mk" 23.include "../../devel/xulrunner/mozilla-common.mk"
22.include "options.mk" 24.include "options.mk"
23 25
24MOZILLA=firefox 26MOZILLA=firefox
25MOZILLA_ICON= ${WRKSRC}/dist/firefox/chrome/icons/default/default48.png 27MOZILLA_ICON= ${WRKSRC}/dist/firefox/chrome/icons/default/default48.png
26.if !empty(PKG_OPTIONS:Mofficial-mozilla-branding) 28.if !empty(PKG_OPTIONS:Mofficial-mozilla-branding)
27MOZILLA_NAME= Firefox 29MOZILLA_NAME= Firefox
28.else 30.else
29MOZILLA_NAME= Browser 31MOZILLA_NAME= Browser
30.endif 32.endif
31 33
32pre-configure: 34pre-configure:
33 cd ${WRKSRC} && autoconf 35 cd ${WRKSRC} && autoconf