CVS commit: pkgsrc/www/seamonkey

["David Brownlee" <abs%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   abs
Date:           Sat Feb 11 12:12:25 UTC 2017

Modified Files:
        pkgsrc/www/seamonkey: Makefile PLIST options.mk

Log Message:
Add gtk3 (cairo-gtk3) option for seamonkey.
Default build is unchanged with gtk2 (cairo-gtk2)


To generate a diff of this commit:
cvs rdiff -u -r1.155 -r1.156 pkgsrc/www/seamonkey/Makefile
cvs rdiff -u -r1.56 -r1.57 pkgsrc/www/seamonkey/PLIST
cvs rdiff -u -r1.34 -r1.35 pkgsrc/www/seamonkey/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/seamonkey/Makefile
diff -u pkgsrc/www/seamonkey/Makefile:1.155 pkgsrc/www/seamonkey/Makefile:1.156
--- pkgsrc/www/seamonkey/Makefile:1.155 Mon Feb  6 13:56:06 2017
+++ pkgsrc/www/seamonkey/Makefile       Sat Feb 11 12:12:25 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.155 2017/02/06 13:56:06 wiz Exp $
+# $NetBSD: Makefile,v 1.156 2017/02/11 12:12:25 abs Exp $
 
 DISTNAME=      seamonkey-${SM_VER}.source
 PKGNAME=       seamonkey-${SM_VER:S/b/beta/}
@@ -21,8 +21,9 @@ USE_TOOLS+=   unzip pax
 NOT_PAX_MPROTECT_SAFE+=        lib/seamonkey/seamonkey
 NOT_PAX_MPROTECT_SAFE+=        lib/seamonkey/seamonkey-bin
 
-.include "../../www/firefox/mozilla-common.mk"
+.include "../../mk/bsd.prefs.mk"
 .include "options.mk"
+.include "../../www/firefox/mozilla-common.mk"
 
 # Workaround to fix pixman.h detection
 CFLAGS+=       -I${BUILDLINK_PREFIX.pixman}/include/pixman-1

Index: pkgsrc/www/seamonkey/PLIST
diff -u pkgsrc/www/seamonkey/PLIST:1.56 pkgsrc/www/seamonkey/PLIST:1.57
--- pkgsrc/www/seamonkey/PLIST:1.56     Sun Jan  1 16:14:07 2017
+++ pkgsrc/www/seamonkey/PLIST  Sat Feb 11 12:12:25 2017
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.56 2017/01/01 16:14:07 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.57 2017/02/11 12:12:25 abs Exp $
 bin/seamonkey
 lib/seamonkey/application.ini
 lib/seamonkey/blocklist.xml
@@ -4406,6 +4406,7 @@ lib/seamonkey/extensions/{972ce4c6-7e08-
 lib/seamonkey/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
 lib/seamonkey/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/preview.png
 lib/seamonkey/greprefs.js
+${PLIST.gtk3}lib/seamonkey/gtk2/libmozgtk.so
 lib/seamonkey/hyphenation/hyph_af.dic
 lib/seamonkey/hyphenation/hyph_bg.dic
 lib/seamonkey/hyphenation/hyph_ca.dic
@@ -4452,6 +4453,7 @@ lib/seamonkey/isp/rss.rdf
 lib/seamonkey/libldap60.so
 lib/seamonkey/libldif60.so
 lib/seamonkey/liblgpllibs.so
+${PLIST.gtk3}lib/seamonkey/libmozgtk.so
 lib/seamonkey/libmozsqlite3.so
 lib/seamonkey/libprldap60.so
 lib/seamonkey/libxul.so

Index: pkgsrc/www/seamonkey/options.mk
diff -u pkgsrc/www/seamonkey/options.mk:1.34 pkgsrc/www/seamonkey/options.mk:1.35
--- pkgsrc/www/seamonkey/options.mk:1.34        Sun Jan  1 16:14:07 2017
+++ pkgsrc/www/seamonkey/options.mk     Sat Feb 11 12:12:25 2017
@@ -1,11 +1,16 @@
-# $NetBSD: options.mk,v 1.34 2017/01/01 16:14:07 ryoon Exp $
+# $NetBSD: options.mk,v 1.35 2017/02/11 12:12:25 abs Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.seamonkey
+
+PKG_OPTIONS_REQUIRED_GROUPS=   gtk
+PKG_OPTIONS_GROUP.gtk=         gtk2 gtk3
 PKG_SUPPORTED_OPTIONS= alsa dbus debug mozilla-jemalloc
 PKG_SUPPORTED_OPTIONS+=        mozilla-lightning webrtc mozilla-chatzilla pulseaudio
 
 PLIST_VARS+=   debug gnome jemalloc
 
+PKG_SUGGESTED_OPTIONS= gtk2
+
 PKG_SUGGESTED_OPTIONS.Linux+=  mozilla-jemalloc
 PKG_SUGGESTED_OPTIONS.SunOS+=  mozilla-jemalloc
 
@@ -22,6 +27,19 @@ PKG_SUGGESTED_OPTIONS+=      dbus pulseaudio
 
 .include "../../mk/bsd.options.mk"
 
+PLIST_VARS+=           gtk3
+.if !empty(PKG_OPTIONS:Mgtk2)
+CONFIGURE_ARGS+=       --enable-default-toolkit=cairo-gtk2
+.include "../../x11/gtk2/buildlink3.mk"
+PLIST.gtk3=            no
+.endif
+
+.if !empty(PKG_OPTIONS:Mgtk3)
+CONFIGURE_ARGS+=       --enable-default-toolkit=cairo-gtk3
+.include "../../x11/gtk3/buildlink3.mk"
+PLIST.gtk3=            yes
+.endif
+
 .if !empty(PKG_OPTIONS:Malsa)
 CONFIGURE_ARGS+=       --enable-alsa
 .include "../../audio/alsa-lib/buildlink3.mk"