Mon Mar 20 10:54:46 2017 UTC ()
reduce gtk2 include, move comment to options.mk


(szptvlfn)
diff -r1.89 -r1.90 pkgsrc/www/firefox/mozilla-common.mk
diff -r1.38 -r1.39 pkgsrc/www/firefox/options.mk
cvs diff -r1.89 -r1.90 pkgsrc/www/firefox/mozilla-common.mk (expand / switch to context diff)
--- pkgsrc/www/firefox/mozilla-common.mk 2017/03/07 20:45:43 1.89
+++ pkgsrc/www/firefox/mozilla-common.mk 2017/03/20 10:54:46 1.90
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.89 2017/03/07 20:45:43 ryoon Exp $
+# $NetBSD: mozilla-common.mk,v 1.90 2017/03/20 10:54:46 szptvlfn Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -192,9 +192,6 @@
 .include "../../multimedia/libvpx/buildlink3.mk"
 .include "../../net/libIDL/buildlink3.mk"
 .include "../../textproc/hunspell/buildlink3.mk"
-# gtk2 needed even if --enable-default-toolkit=cairo-gtk3
-BUILDLINK_API_DEPENDS.gtk2+=  gtk2+>=2.18.3nb1
-.include "../../x11/gtk2/buildlink3.mk"
 .include "../../multimedia/ffmpeg3/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
 BUILDLINK_API_DEPENDS.pixman+= pixman>=0.25.2
cvs diff -r1.38 -r1.39 pkgsrc/www/firefox/options.mk (expand / switch to context diff)
--- pkgsrc/www/firefox/options.mk 2017/03/07 20:45:43 1.38
+++ pkgsrc/www/firefox/options.mk 2017/03/20 10:54:46 1.39
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.38 2017/03/07 20:45:43 ryoon Exp $
+# $NetBSD: options.mk,v 1.39 2017/03/20 10:54:46 szptvlfn Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.firefox
 
@@ -31,6 +31,7 @@
 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