Sat Feb 11 12:12:25 2017 UTC ()
Add gtk3 (cairo-gtk3) option for seamonkey.
Default build is unchanged with gtk2 (cairo-gtk2)


(abs)
diff -r1.155 -r1.156 pkgsrc/www/seamonkey/Makefile
diff -r1.56 -r1.57 pkgsrc/www/seamonkey/PLIST
diff -r1.34 -r1.35 pkgsrc/www/seamonkey/options.mk
cvs diff -r1.155 -r1.156 pkgsrc/www/seamonkey/Makefile (expand / switch to unified diff)

--- pkgsrc/www/seamonkey/Makefile 2017/02/06 13:56:06 1.155
+++ pkgsrc/www/seamonkey/Makefile 2017/02/11 12:12:25 1.156
@@ -1,38 +1,39 @@ @@ -1,38 +1,39 @@
1# $NetBSD: Makefile,v 1.155 2017/02/06 13:56:06 wiz Exp $ 1# $NetBSD: Makefile,v 1.156 2017/02/11 12:12:25 abs Exp $
2 2
3DISTNAME= seamonkey-${SM_VER}.source 3DISTNAME= seamonkey-${SM_VER}.source
4PKGNAME= seamonkey-${SM_VER:S/b/beta/} 4PKGNAME= seamonkey-${SM_VER:S/b/beta/}
5PKGREVISION= 4 5PKGREVISION= 4
6SM_VER= 2.46 6SM_VER= 2.46
7CATEGORIES= www 7CATEGORIES= www
8MASTER_SITES= ${MASTER_SITE_MOZILLA:=seamonkey/releases/${SM_VER}/source/} 8MASTER_SITES= ${MASTER_SITE_MOZILLA:=seamonkey/releases/${SM_VER}/source/}
9EXTRACT_SUFX= .tar.xz 9EXTRACT_SUFX= .tar.xz
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= http://www.seamonkey-project.org/ 12HOMEPAGE= http://www.seamonkey-project.org/
13COMMENT= Full-featured gecko-based browser 13COMMENT= Full-featured gecko-based browser
14 14
15WRKSRC= ${WRKDIR}/${DISTNAME:S/.source//} 15WRKSRC= ${WRKDIR}/${DISTNAME:S/.source//}
16MOZILLA_DIR= mozilla/ 16MOZILLA_DIR= mozilla/
17PLIST_SRC+= ${PLIST_SRC_DFLT} 17PLIST_SRC+= ${PLIST_SRC_DFLT}
18USE_LANGUAGES+= c c++ 18USE_LANGUAGES+= c c++
19USE_TOOLS+= unzip pax 19USE_TOOLS+= unzip pax
20 20
21NOT_PAX_MPROTECT_SAFE+= lib/seamonkey/seamonkey 21NOT_PAX_MPROTECT_SAFE+= lib/seamonkey/seamonkey
22NOT_PAX_MPROTECT_SAFE+= lib/seamonkey/seamonkey-bin 22NOT_PAX_MPROTECT_SAFE+= lib/seamonkey/seamonkey-bin
23 23
24.include "../../www/firefox/mozilla-common.mk" 24.include "../../mk/bsd.prefs.mk"
25.include "options.mk" 25.include "options.mk"
 26.include "../../www/firefox/mozilla-common.mk"
26 27
27# Workaround to fix pixman.h detection 28# Workaround to fix pixman.h detection
28CFLAGS+= -I${BUILDLINK_PREFIX.pixman}/include/pixman-1 29CFLAGS+= -I${BUILDLINK_PREFIX.pixman}/include/pixman-1
29 30
30CONFIG_GUESS_OVERRIDE+= ldap/sdks/c-sdk/config/autoconf/config.guess 31CONFIG_GUESS_OVERRIDE+= ldap/sdks/c-sdk/config/autoconf/config.guess
31CONFIG_SUB_OVERRIDE+= ldap/sdks/c-sdk/config/autoconf/config.sub 32CONFIG_SUB_OVERRIDE+= ldap/sdks/c-sdk/config/autoconf/config.sub
32 33
33CONFIGURE_ARGS+= --enable-application=suite 34CONFIGURE_ARGS+= --enable-application=suite
34 35
35ALL_ENV+= MOZILLA_PKG_NAME=seamonkey 36ALL_ENV+= MOZILLA_PKG_NAME=seamonkey
36 37
37.include "../../mk/bsd.prefs.mk" 38.include "../../mk/bsd.prefs.mk"
38 39
cvs diff -r1.56 -r1.57 pkgsrc/www/seamonkey/PLIST (expand / switch to unified diff)

--- pkgsrc/www/seamonkey/PLIST 2017/01/01 16:14:07 1.56
+++ pkgsrc/www/seamonkey/PLIST 2017/02/11 12:12:25 1.57
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.56 2017/01/01 16:14:07 ryoon Exp $ 1@comment $NetBSD: PLIST,v 1.57 2017/02/11 12:12:25 abs Exp $
2bin/seamonkey 2bin/seamonkey
3lib/seamonkey/application.ini 3lib/seamonkey/application.ini
4lib/seamonkey/blocklist.xml 4lib/seamonkey/blocklist.xml
5lib/seamonkey/chrome.manifest 5lib/seamonkey/chrome.manifest
6lib/seamonkey/chrome/chrome.manifest 6lib/seamonkey/chrome/chrome.manifest
7lib/seamonkey/chrome/classic/skin/classic/communicator/aboutPrivateBrowsing.css 7lib/seamonkey/chrome/classic/skin/classic/communicator/aboutPrivateBrowsing.css
8lib/seamonkey/chrome/classic/skin/classic/communicator/aboutSessionRestore.css 8lib/seamonkey/chrome/classic/skin/classic/communicator/aboutSessionRestore.css
9lib/seamonkey/chrome/classic/skin/classic/communicator/aboutSyncTabs.css 9lib/seamonkey/chrome/classic/skin/classic/communicator/aboutSyncTabs.css
10lib/seamonkey/chrome/classic/skin/classic/communicator/blockedSite.css 10lib/seamonkey/chrome/classic/skin/classic/communicator/blockedSite.css
11lib/seamonkey/chrome/classic/skin/classic/communicator/bookmarks/allBookmarks.png 11lib/seamonkey/chrome/classic/skin/classic/communicator/bookmarks/allBookmarks.png
12lib/seamonkey/chrome/classic/skin/classic/communicator/bookmarks/bookmark-folder-closed.png 12lib/seamonkey/chrome/classic/skin/classic/communicator/bookmarks/bookmark-folder-closed.png
13lib/seamonkey/chrome/classic/skin/classic/communicator/bookmarks/bookmark-folder-dis.png 13lib/seamonkey/chrome/classic/skin/classic/communicator/bookmarks/bookmark-folder-dis.png
14lib/seamonkey/chrome/classic/skin/classic/communicator/bookmarks/bookmark-folder-open.png 14lib/seamonkey/chrome/classic/skin/classic/communicator/bookmarks/bookmark-folder-open.png
@@ -4396,26 +4396,27 @@ lib/seamonkey/extensions/modern@themes.m @@ -4396,26 +4396,27 @@ lib/seamonkey/extensions/modern@themes.m
4396lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/navigator/pageInfo.css 4396lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/navigator/pageInfo.css
4397lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/navigator/tabbrowser.css 4397lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/navigator/tabbrowser.css
4398lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/navigator/toolbar/ubhist-arrow-act.gif 4398lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/navigator/toolbar/ubhist-arrow-act.gif
4399lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/navigator/toolbar/ubhist-arrow.gif 4399lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/navigator/toolbar/ubhist-arrow.gif
4400lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/navigator/webDeveloper.css 4400lib/seamonkey/extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/navigator/webDeveloper.css
4401lib/seamonkey/extensions/modern@themes.mozilla.org/icon.png 4401lib/seamonkey/extensions/modern@themes.mozilla.org/icon.png
4402lib/seamonkey/extensions/modern@themes.mozilla.org/install.rdf 4402lib/seamonkey/extensions/modern@themes.mozilla.org/install.rdf
4403lib/seamonkey/extensions/modern@themes.mozilla.org/preview.png 4403lib/seamonkey/extensions/modern@themes.mozilla.org/preview.png
4404lib/seamonkey/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/chrome.manifest 4404lib/seamonkey/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/chrome.manifest
4405lib/seamonkey/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png 4405lib/seamonkey/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
4406lib/seamonkey/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf 4406lib/seamonkey/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
4407lib/seamonkey/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/preview.png 4407lib/seamonkey/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/preview.png
4408lib/seamonkey/greprefs.js 4408lib/seamonkey/greprefs.js
 4409${PLIST.gtk3}lib/seamonkey/gtk2/libmozgtk.so
4409lib/seamonkey/hyphenation/hyph_af.dic 4410lib/seamonkey/hyphenation/hyph_af.dic
4410lib/seamonkey/hyphenation/hyph_bg.dic 4411lib/seamonkey/hyphenation/hyph_bg.dic
4411lib/seamonkey/hyphenation/hyph_ca.dic 4412lib/seamonkey/hyphenation/hyph_ca.dic
4412lib/seamonkey/hyphenation/hyph_cy.dic 4413lib/seamonkey/hyphenation/hyph_cy.dic
4413lib/seamonkey/hyphenation/hyph_da.dic 4414lib/seamonkey/hyphenation/hyph_da.dic
4414lib/seamonkey/hyphenation/hyph_de-1901.dic 4415lib/seamonkey/hyphenation/hyph_de-1901.dic
4415lib/seamonkey/hyphenation/hyph_de-1996.dic 4416lib/seamonkey/hyphenation/hyph_de-1996.dic
4416lib/seamonkey/hyphenation/hyph_de-CH.dic 4417lib/seamonkey/hyphenation/hyph_de-CH.dic
4417lib/seamonkey/hyphenation/hyph_en_US.dic 4418lib/seamonkey/hyphenation/hyph_en_US.dic
4418lib/seamonkey/hyphenation/hyph_eo.dic 4419lib/seamonkey/hyphenation/hyph_eo.dic
4419lib/seamonkey/hyphenation/hyph_es.dic 4420lib/seamonkey/hyphenation/hyph_es.dic
4420lib/seamonkey/hyphenation/hyph_et.dic 4421lib/seamonkey/hyphenation/hyph_et.dic
4421lib/seamonkey/hyphenation/hyph_fi.dic 4422lib/seamonkey/hyphenation/hyph_fi.dic
@@ -4442,26 +4443,27 @@ lib/seamonkey/hyphenation/hyph_sl.dic @@ -4442,26 +4443,27 @@ lib/seamonkey/hyphenation/hyph_sl.dic
4442lib/seamonkey/hyphenation/hyph_sv.dic 4443lib/seamonkey/hyphenation/hyph_sv.dic
4443lib/seamonkey/hyphenation/hyph_tr.dic 4444lib/seamonkey/hyphenation/hyph_tr.dic
4444lib/seamonkey/hyphenation/hyph_uk.dic 4445lib/seamonkey/hyphenation/hyph_uk.dic
4445lib/seamonkey/isp/Bogofilter.sfd 4446lib/seamonkey/isp/Bogofilter.sfd
4446lib/seamonkey/isp/DSPAM.sfd 4447lib/seamonkey/isp/DSPAM.sfd
4447lib/seamonkey/isp/POPFile.sfd 4448lib/seamonkey/isp/POPFile.sfd
4448lib/seamonkey/isp/SpamAssassin.sfd 4449lib/seamonkey/isp/SpamAssassin.sfd
4449lib/seamonkey/isp/SpamPal.sfd 4450lib/seamonkey/isp/SpamPal.sfd
4450lib/seamonkey/isp/movemail.rdf 4451lib/seamonkey/isp/movemail.rdf
4451lib/seamonkey/isp/rss.rdf 4452lib/seamonkey/isp/rss.rdf
4452lib/seamonkey/libldap60.so 4453lib/seamonkey/libldap60.so
4453lib/seamonkey/libldif60.so 4454lib/seamonkey/libldif60.so
4454lib/seamonkey/liblgpllibs.so 4455lib/seamonkey/liblgpllibs.so
 4456${PLIST.gtk3}lib/seamonkey/libmozgtk.so
4455lib/seamonkey/libmozsqlite3.so 4457lib/seamonkey/libmozsqlite3.so
4456lib/seamonkey/libprldap60.so 4458lib/seamonkey/libprldap60.so
4457lib/seamonkey/libxul.so 4459lib/seamonkey/libxul.so
4458lib/seamonkey/license.txt 4460lib/seamonkey/license.txt
4459lib/seamonkey/modules/ABQueryUtils.jsm 4461lib/seamonkey/modules/ABQueryUtils.jsm
4460lib/seamonkey/modules/AboutReader.jsm 4462lib/seamonkey/modules/AboutReader.jsm
4461lib/seamonkey/modules/ActivitiesService.jsm 4463lib/seamonkey/modules/ActivitiesService.jsm
4462lib/seamonkey/modules/ActivitiesServiceFilter.jsm 4464lib/seamonkey/modules/ActivitiesServiceFilter.jsm
4463lib/seamonkey/modules/AddonManager.jsm 4465lib/seamonkey/modules/AddonManager.jsm
4464lib/seamonkey/modules/AddonWatcher.jsm 4466lib/seamonkey/modules/AddonWatcher.jsm
4465lib/seamonkey/modules/AlarmDB.jsm 4467lib/seamonkey/modules/AlarmDB.jsm
4466lib/seamonkey/modules/AlarmService.jsm 4468lib/seamonkey/modules/AlarmService.jsm
4467lib/seamonkey/modules/AppConstants.jsm 4469lib/seamonkey/modules/AppConstants.jsm
cvs diff -r1.34 -r1.35 pkgsrc/www/seamonkey/options.mk (expand / switch to unified diff)

--- pkgsrc/www/seamonkey/options.mk 2017/01/01 16:14:07 1.34
+++ pkgsrc/www/seamonkey/options.mk 2017/02/11 12:12:25 1.35
@@ -1,37 +1,55 @@ @@ -1,37 +1,55 @@
1# $NetBSD: options.mk,v 1.34 2017/01/01 16:14:07 ryoon Exp $ 1# $NetBSD: options.mk,v 1.35 2017/02/11 12:12:25 abs Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.seamonkey 3PKG_OPTIONS_VAR= PKG_OPTIONS.seamonkey
 4
 5PKG_OPTIONS_REQUIRED_GROUPS= gtk
 6PKG_OPTIONS_GROUP.gtk= gtk2 gtk3
4PKG_SUPPORTED_OPTIONS= alsa dbus debug mozilla-jemalloc 7PKG_SUPPORTED_OPTIONS= alsa dbus debug mozilla-jemalloc
5PKG_SUPPORTED_OPTIONS+= mozilla-lightning webrtc mozilla-chatzilla pulseaudio 8PKG_SUPPORTED_OPTIONS+= mozilla-lightning webrtc mozilla-chatzilla pulseaudio
6 9
7PLIST_VARS+= debug gnome jemalloc 10PLIST_VARS+= debug gnome jemalloc
8 11
 12PKG_SUGGESTED_OPTIONS= gtk2
 13
9PKG_SUGGESTED_OPTIONS.Linux+= mozilla-jemalloc 14PKG_SUGGESTED_OPTIONS.Linux+= mozilla-jemalloc
10PKG_SUGGESTED_OPTIONS.SunOS+= mozilla-jemalloc 15PKG_SUGGESTED_OPTIONS.SunOS+= mozilla-jemalloc
11 16
12# On NetBSD/amd64 6.99.21 libxul.so is invalid when --enable-webrtc is set. 17# On NetBSD/amd64 6.99.21 libxul.so is invalid when --enable-webrtc is set.
13.if (${OPSYS} == "FreeBSD") || (${OPSYS} == "Linux") || (${OPSYS} == "OpenBSD") 18.if (${OPSYS} == "FreeBSD") || (${OPSYS} == "Linux") || (${OPSYS} == "OpenBSD")
14PKG_SUGGESTED_OPTIONS+= webrtc 19PKG_SUGGESTED_OPTIONS+= webrtc
15.endif 20.endif
16 21
17.if ${OPSYS} == "Linux" 22.if ${OPSYS} == "Linux"
18PKG_SUGGESTED_OPTIONS+= alsa dbus 23PKG_SUGGESTED_OPTIONS+= alsa dbus
19.else 24.else
20PKG_SUGGESTED_OPTIONS+= dbus pulseaudio 25PKG_SUGGESTED_OPTIONS+= dbus pulseaudio
21.endif 26.endif
22 27
23.include "../../mk/bsd.options.mk" 28.include "../../mk/bsd.options.mk"
24 29
 30PLIST_VARS+= gtk3
 31.if !empty(PKG_OPTIONS:Mgtk2)
 32CONFIGURE_ARGS+= --enable-default-toolkit=cairo-gtk2
 33.include "../../x11/gtk2/buildlink3.mk"
 34PLIST.gtk3= no
 35.endif
 36
 37.if !empty(PKG_OPTIONS:Mgtk3)
 38CONFIGURE_ARGS+= --enable-default-toolkit=cairo-gtk3
 39.include "../../x11/gtk3/buildlink3.mk"
 40PLIST.gtk3= yes
 41.endif
 42
25.if !empty(PKG_OPTIONS:Malsa) 43.if !empty(PKG_OPTIONS:Malsa)
26CONFIGURE_ARGS+= --enable-alsa 44CONFIGURE_ARGS+= --enable-alsa
27.include "../../audio/alsa-lib/buildlink3.mk" 45.include "../../audio/alsa-lib/buildlink3.mk"
28.else 46.else
29CONFIGURE_ARGS+= --disable-alsa 47CONFIGURE_ARGS+= --disable-alsa
30.endif 48.endif
31 49
32.if !empty(PKG_OPTIONS:Mdbus) 50.if !empty(PKG_OPTIONS:Mdbus)
33.include "../../sysutils/dbus-glib/buildlink3.mk" 51.include "../../sysutils/dbus-glib/buildlink3.mk"
34CONFIGURE_ARGS+= --enable-dbus 52CONFIGURE_ARGS+= --enable-dbus
35.else 53.else
36CONFIGURE_ARGS+= --disable-dbus 54CONFIGURE_ARGS+= --disable-dbus
37.endif 55.endif