CVS commit: pkgsrc/www/firefox

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Mon Mar 20 13:39:33 UTC 2017

Modified Files:
        pkgsrc/www/firefox: options.mk

Log Message:
gtk2 is still required from gtk3 option. Fix configure


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 pkgsrc/www/firefox/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/firefox/options.mk
diff -u pkgsrc/www/firefox/options.mk:1.39 pkgsrc/www/firefox/options.mk:1.40
--- pkgsrc/www/firefox/options.mk:1.39  Mon Mar 20 10:54:46 2017
+++ pkgsrc/www/firefox/options.mk       Mon Mar 20 13:39:33 2017
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.39 2017/03/20 10:54:46 szptvlfn Exp $
+# $NetBSD: options.mk,v 1.40 2017/03/20 13:39:33 ryoon Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.firefox
 
@@ -31,7 +31,6 @@ PKG_SUGGESTED_OPTIONS.Linux+= webrtc
 PLIST_VARS+=           gtk3
 .if !empty(PKG_OPTIONS:Mgtk2)
 CONFIGURE_ARGS+=       --enable-default-toolkit=cairo-gtk2
-# gtk2 needed even if --enable-default-toolkit=cairo-gtk3
 BUILDLINK_API_DEPENDS.gtk2+=  gtk2+>=2.18.3nb1
 .include "../../x11/gtk2/buildlink3.mk"
 .endif
@@ -39,6 +38,9 @@ BUILDLINK_API_DEPENDS.gtk2+=  gtk2+>=2.1
 # As of firefox-51 gtk2 is still pulled in implicitly
 .if !empty(PKG_OPTIONS:Mgtk3)
 CONFIGURE_ARGS+=       --enable-default-toolkit=cairo-gtk3
+# gtk2 needed even if --enable-default-toolkit=cairo-gtk3
+BUILDLINK_API_DEPENDS.gtk2+=  gtk2+>=2.18.3nb1
+.include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/gtk3/buildlink3.mk"
 PLIST.gtk3=            yes
 .endif