diff options
| author | szptvlfn <szptvlfn> | 2017-03-20 10:54:46 +0000 |
|---|---|---|
| committer | szptvlfn <szptvlfn> | 2017-03-20 10:54:46 +0000 |
| commit | 39d9d50650559259a2d1631e084e6d4a5d954d93 (patch) | |
| tree | 6766b75b6258d95255e3274593286e387adf61d3 | |
| parent | f6fb96dc3aa7ca0654eed3f89a2f43788dcfab86 (diff) | |
| download | pkgsrc-39d9d50650559259a2d1631e084e6d4a5d954d93.tar.gz | |
reduce gtk2 include, move comment to options.mk
| -rw-r--r-- | www/firefox/mozilla-common.mk | 5 | ||||
| -rw-r--r-- | www/firefox/options.mk | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/www/firefox/mozilla-common.mk b/www/firefox/mozilla-common.mk index 25783224813..7f830c76dc9 100644 --- a/www/firefox/mozilla-common.mk +++ b/www/firefox/mozilla-common.mk @@ -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.3.0 .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 diff --git a/www/firefox/options.mk b/www/firefox/options.mk index 3201973632a..d58f71a14d6 100644 --- a/www/firefox/options.mk +++ b/www/firefox/options.mk @@ -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 |