CVS commit: pkgsrc/www/firefox

["Ryosuke Moro" <szptvlfn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   szptvlfn
Date:           Mon Mar 20 10:54:46 UTC 2017

Modified Files:
        pkgsrc/www/firefox: mozilla-common.mk options.mk

Log Message:
reduce gtk2 include, move comment to options.mk


To generate a diff of this commit:
cvs rdiff -u -r1.89 -r1.90 pkgsrc/www/firefox/mozilla-common.mk
cvs rdiff -u -r1.38 -r1.39 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/mozilla-common.mk
diff -u pkgsrc/www/firefox/mozilla-common.mk:1.89 pkgsrc/www/firefox/mozilla-common.mk:1.90
--- pkgsrc/www/firefox/mozilla-common.mk:1.89   Tue Mar  7 20:45:43 2017
+++ pkgsrc/www/firefox/mozilla-common.mk        Mon Mar 20 10:54:46 2017
@@ -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 @@ BUILDLINK_API_DEPENDS.libvpx+=      libvpx>=1
 .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

Index: pkgsrc/www/firefox/options.mk
diff -u pkgsrc/www/firefox/options.mk:1.38 pkgsrc/www/firefox/options.mk:1.39
--- pkgsrc/www/firefox/options.mk:1.38  Tue Mar  7 20:45:43 2017
+++ pkgsrc/www/firefox/options.mk       Mon Mar 20 10:54:46 2017
@@ -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 @@ 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