From fbe3298fa3e02852723c17de73d64a5d8c0fca3b Mon Sep 17 00:00:00 2001 From: martynas Date: Sun, 22 Apr 2007 15:04:39 +0000 Subject: [PATCH] - include all supported language packs; - generate chrome registry once (speeds up startup, esp. with lots of chromes -- our case), noticed by kurt@; - work around pref-contentpacks bug; discussed and tested by naddy@, kurt@, ajacoutot@ ok naddy@ --- www/seamonkey/Makefile | 46 +++++++++++--- www/seamonkey/distinfo | 60 +++++++++++++++++-- www/seamonkey/files/README.OpenBSD | 9 ++- www/seamonkey/files/genchrome | 28 +++++++++ ...ks_resources_content_pref-contentpacks_xul | 42 +++++++++++++ www/seamonkey/pkg/PLIST-main | 36 ++++++++++- 6 files changed, 205 insertions(+), 16 deletions(-) create mode 100644 www/seamonkey/files/genchrome create mode 100644 www/seamonkey/patches/patch-extensions_content-packs_resources_content_pref-contentpacks_xul diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile index 031d1f5d4cd..ec4da483967 100644 --- a/www/seamonkey/Makefile +++ b/www/seamonkey/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2007/04/07 17:41:12 martynas Exp $ +# $OpenBSD: Makefile,v 1.10 2007/04/22 15:04:39 martynas Exp $ SHARED_ONLY= Yes ONLY_FOR_ARCHS= alpha amd64 i386 powerpc sparc sparc64 @@ -9,8 +9,8 @@ COMMENT-devel= "devel files for Gecko" VER= 1.1.1 DISTNAME= seamonkey-${VER}.source PKGNAME= seamonkey-${VER} -PKGNAME-main= seamonkey-${VER}p0 -PKGNAME-devel= seamonkey-devel-${VER}p0 +PKGNAME-main= seamonkey-${VER}p1 +PKGNAME-devel= seamonkey-devel-${VER}p1 SO_VERSION= 10.0 # NOTE: Must bump minor version if any shlib's are removed from the @@ -46,17 +46,33 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes MASTER_SITES= http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/${VER}/ +MASTER_SITES0= http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/${VER}/contrib-localized/ + +LANGUAGES= de-AT be-BY ca-AD cs-CZ es-ES fr-FR he-IL it-IT pl-PL ru-RU +BINLANGS= be-BY fr-FR pl-PL + +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} + +.for i in ${LANGUAGES} +DISTFILES+= seamonkey-${VER}.$i.langpack.xpi:0 +.endfor + +EXTRACT_CASES += *.xpi) \ + ${UNZIP} -oq ${FULLDISTDIR}/$$archive -d ${WRKDIR}/`basename $$archive .langpack.xpi | sed "s/.*-${VER}\.//"`;; + +DIST_SUBDIR= seamonkey-${VER} MODULES= devel/gettext -BUILD_DEPENDS= :zip->=2.3:archivers/zip +BUILD_DEPENDS= :zip->=2.3:archivers/zip \ + :unzip-*:archivers/unzip LIB_DEPENDS= gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 \ nspr4.>=17,plc4.>=17,plds4.>=17:nspr->=4.6.4p1:devel/nspr \ nss3.>=19,smime3.>=19,softokn3.>=19,ssl3.>=19:nss->=3.11.4p1:security/nss WANTLIB= c glib-2.0 m pthread stdc++ RUN_DEPENDS-main= :esound-*:audio/esound -WANTLIB-main= ${WANTLIB} X11 Xext Xft Xinerama Xrender Xt atk-1.0 \ - cairo fontconfig freetype glitz gmodule-2.0 gobject-2.0 \ +WANTLIB-main= ${WANTLIB} X11 Xau Xdmcp Xft Xinerama Xrender Xt atk-1.0 \ + cairo expat fontconfig freetype glitz gmodule-2.0 gobject-2.0 \ jpeg pango-1.0 pangocairo-1.0 pangoft2-1.0 pangox-1.0 png z LIB_DEPENDS-devel= ${MODGETTEXT_LIB_DEPENDS} IDL-2::devel/libIDL \ @@ -117,6 +133,13 @@ MOB= ${WRKSRC}/dist/bin MOZ= ${PREFIX}/seamonkey post-extract: +.for i in ${BINLANGS} # normalize + @mv -f ${WRKDIR}/$i/bin/* ${WRKDIR}/$i/ + @rmdir ${WRKDIR}/$i/bin +.endfor +.for i in ${LANGUAGES} + @rm -f ${WRKDIR}/$i/chrome/*-{mac,win}.jar +.endfor @cp ${FILESDIR}/xptc* ${WRKSRC}/xpcom/reflect/xptcall/src/md/unix/ pre-configure: @@ -146,13 +169,18 @@ do-install: ${INSTALL_SCRIPT} ${MOB}/run-mozilla.sh ${MOZ} ${INSTALL_PROGRAM} ${MOB}/TestGtkEmbed \ ${MOB}/mozilla-xremote-client ${MOB}/nsinstall \ - ${MOB}/regxpcom ${MOB}/seamonkey-bin ${MOB}/xpcshell \ - ${MOB}/xpicleanup ${MOB}/xpidl ${MOB}/xpt_dump \ - ${MOB}/xpt_link ${MOZ} + ${MOB}/regchrome ${MOB}/regxpcom ${MOB}/seamonkey-bin \ + ${MOB}/xpcshell ${MOB}/xpicleanup ${MOB}/xpidl \ + ${MOB}/xpt_dump ${MOB}/xpt_link ${MOZ} ${INSTALL_DATA_DIR} ${PREFIX}/lib/pkgconfig ${INSTALL_DATA} ${WRKBUILD}/build/unix/*.pc ${PREFIX}/lib/pkgconfig @sed -e 's,!!PREFIX!!,${TRUEPREFIX},g' \ < ${FILESDIR}/README.OpenBSD > ${MOZ}/README.OpenBSD ${INSTALL_MAN} ${WRKSRC}/dist/man/man1/seamonkey.1 ${PREFIX}/man/man1/ +.for i in ${LANGUAGES} + ${INSTALL_DATA} ${WRKDIR}/$i/chrome/*.jar ${MOZ}/chrome/ + sh ${FILESDIR}/genchrome ${WRKDIR}/$i/install.js $i \ + >> ${MOZ}/chrome/installed-chrome.txt +.endfor .include diff --git a/www/seamonkey/distinfo b/www/seamonkey/distinfo index a0754fd8b72..e92030b3b52 100644 --- a/www/seamonkey/distinfo +++ b/www/seamonkey/distinfo @@ -1,5 +1,55 @@ -MD5 (seamonkey-1.1.1.source.tar.gz) = ttUKT46l7rKlB5vwSTueWA== -RMD160 (seamonkey-1.1.1.source.tar.gz) = 1qJaYvAShxfxqokerAwePt5Ndpo= -SHA1 (seamonkey-1.1.1.source.tar.gz) = y9QqVIypfjB8T8DIBMgPqwEBc6Y= -SHA256 (seamonkey-1.1.1.source.tar.gz) = IYi+qoNttBicklFKsbQmuAWhq33M96QxNilu/Tr498E= -SIZE (seamonkey-1.1.1.source.tar.gz) = 45190957 +MD5 (seamonkey-1.1.1/seamonkey-1.1.1.be-BY.langpack.xpi) = HinXbBJg2zDbIgMcoFlUIQ== +MD5 (seamonkey-1.1.1/seamonkey-1.1.1.ca-AD.langpack.xpi) = mbhU2J4bPT2DOlZ4fFPSnw== +MD5 (seamonkey-1.1.1/seamonkey-1.1.1.cs-CZ.langpack.xpi) = hKGKsR5xEg7uJsQjMf/MXQ== +MD5 (seamonkey-1.1.1/seamonkey-1.1.1.de-AT.langpack.xpi) = T19d6iv+GOhKgGVxUuHvIA== +MD5 (seamonkey-1.1.1/seamonkey-1.1.1.es-ES.langpack.xpi) = 4TEem92odjq5hHn8YMEADg== +MD5 (seamonkey-1.1.1/seamonkey-1.1.1.fr-FR.langpack.xpi) = jyuanDR0kZUGBy/e/MEaBw== +MD5 (seamonkey-1.1.1/seamonkey-1.1.1.he-IL.langpack.xpi) = pTrIf6++3AKPZV88V5mdSQ== +MD5 (seamonkey-1.1.1/seamonkey-1.1.1.it-IT.langpack.xpi) = zNnCWz2szJEBB6tuAVpxNQ== +MD5 (seamonkey-1.1.1/seamonkey-1.1.1.pl-PL.langpack.xpi) = WGDvISPr1L808KZG+5itYQ== +MD5 (seamonkey-1.1.1/seamonkey-1.1.1.ru-RU.langpack.xpi) = dd2I3q/23JhmwXazPnkQHQ== +MD5 (seamonkey-1.1.1/seamonkey-1.1.1.source.tar.gz) = ttUKT46l7rKlB5vwSTueWA== +RMD160 (seamonkey-1.1.1/seamonkey-1.1.1.be-BY.langpack.xpi) = 7VLEd5OuIzZuFZ70eq1iY3cNtYg= +RMD160 (seamonkey-1.1.1/seamonkey-1.1.1.ca-AD.langpack.xpi) = 5SIGJ32KT7TmPHRtbdPUvaN3+SQ= +RMD160 (seamonkey-1.1.1/seamonkey-1.1.1.cs-CZ.langpack.xpi) = U7w9yRmWIuoflXbe7AqqxKaYzSs= +RMD160 (seamonkey-1.1.1/seamonkey-1.1.1.de-AT.langpack.xpi) = YV6wkkSorhXZJlovDsy8FvDucok= +RMD160 (seamonkey-1.1.1/seamonkey-1.1.1.es-ES.langpack.xpi) = EhC5lL6EJwKeYc1B+E7VMvq/S04= +RMD160 (seamonkey-1.1.1/seamonkey-1.1.1.fr-FR.langpack.xpi) = 7n/Z9tc7O41sROeJ/OB04WeJtG4= +RMD160 (seamonkey-1.1.1/seamonkey-1.1.1.he-IL.langpack.xpi) = F9pfouI5eoAF+H+4bqwBXzo38eY= +RMD160 (seamonkey-1.1.1/seamonkey-1.1.1.it-IT.langpack.xpi) = /r7s4mxf9S8MunB1IBFfGUMe0ZA= +RMD160 (seamonkey-1.1.1/seamonkey-1.1.1.pl-PL.langpack.xpi) = uW/grmAshT3cZCjAmwupaA6YCeY= +RMD160 (seamonkey-1.1.1/seamonkey-1.1.1.ru-RU.langpack.xpi) = UXA6AtHzEusZ1rs13wwHiqZbYlA= +RMD160 (seamonkey-1.1.1/seamonkey-1.1.1.source.tar.gz) = 1qJaYvAShxfxqokerAwePt5Ndpo= +SHA1 (seamonkey-1.1.1/seamonkey-1.1.1.be-BY.langpack.xpi) = PUcrEm8wVibOfFodkTGckYJQce8= +SHA1 (seamonkey-1.1.1/seamonkey-1.1.1.ca-AD.langpack.xpi) = LXNxjU4OfizHNh+DvMBh7khWFBY= +SHA1 (seamonkey-1.1.1/seamonkey-1.1.1.cs-CZ.langpack.xpi) = 2MZCtiHpHuCCiy9vn0pye4/24kA= +SHA1 (seamonkey-1.1.1/seamonkey-1.1.1.de-AT.langpack.xpi) = w7wc3mk1QkQJPggwabgfqKoEQO8= +SHA1 (seamonkey-1.1.1/seamonkey-1.1.1.es-ES.langpack.xpi) = hRWUOoLlkEsptIED7ArBu9iaSd8= +SHA1 (seamonkey-1.1.1/seamonkey-1.1.1.fr-FR.langpack.xpi) = TTgwhWH7gJRATSQH1cAsLJgO9RE= +SHA1 (seamonkey-1.1.1/seamonkey-1.1.1.he-IL.langpack.xpi) = ZX/llck0u2IFQzRFbMs6r/jx9qQ= +SHA1 (seamonkey-1.1.1/seamonkey-1.1.1.it-IT.langpack.xpi) = n91cn2IsiGoZf4f5mwV9scyPdRU= +SHA1 (seamonkey-1.1.1/seamonkey-1.1.1.pl-PL.langpack.xpi) = FyynNjuhZZrMx1I//XDufJTx1OE= +SHA1 (seamonkey-1.1.1/seamonkey-1.1.1.ru-RU.langpack.xpi) = HnXHoNZFub2ZUJDd2ESNyJP+NSc= +SHA1 (seamonkey-1.1.1/seamonkey-1.1.1.source.tar.gz) = y9QqVIypfjB8T8DIBMgPqwEBc6Y= +SHA256 (seamonkey-1.1.1/seamonkey-1.1.1.be-BY.langpack.xpi) = 7eAKFcN80B+Rz6sXpfdnCsW/x2uHnDnt3WQt+HMK/Ng= +SHA256 (seamonkey-1.1.1/seamonkey-1.1.1.ca-AD.langpack.xpi) = Ml8+TUoJK76lDeBe8KxW8HReVix6eOmitnP42EXj55M= +SHA256 (seamonkey-1.1.1/seamonkey-1.1.1.cs-CZ.langpack.xpi) = DHyIypws/ApnwWejkWzHLBC0UZQfGPolOWtUTP/WQnY= +SHA256 (seamonkey-1.1.1/seamonkey-1.1.1.de-AT.langpack.xpi) = +9wSr4riFpwwyFZKyl8zJ+5XRZbt6zNqljib+pOtdKM= +SHA256 (seamonkey-1.1.1/seamonkey-1.1.1.es-ES.langpack.xpi) = idlGKvFkw2wTBpFAOaZBW2OCNDiESkEZBfV60cB3YiI= +SHA256 (seamonkey-1.1.1/seamonkey-1.1.1.fr-FR.langpack.xpi) = spNN47iDONam+rtZXNEpl8qcmGemwxKyCdRjZE9SSq4= +SHA256 (seamonkey-1.1.1/seamonkey-1.1.1.he-IL.langpack.xpi) = 1YoqkdGaL8dumR8ewHeBvDiIH3Gbg1h0BPw7oYn9j0I= +SHA256 (seamonkey-1.1.1/seamonkey-1.1.1.it-IT.langpack.xpi) = Rqs4tbJC/AYk4H/TbKLxwCxHwdQv6apvE8P+bLeiZ5I= +SHA256 (seamonkey-1.1.1/seamonkey-1.1.1.pl-PL.langpack.xpi) = NgJD4gFHiuLNjRIoh/tOnw2TelcL0kWDItYSVRFU6og= +SHA256 (seamonkey-1.1.1/seamonkey-1.1.1.ru-RU.langpack.xpi) = nwJclz1tcTZeU0zvWhoF/sHxAq8D4EmVL0px4dcE8P8= +SHA256 (seamonkey-1.1.1/seamonkey-1.1.1.source.tar.gz) = IYi+qoNttBicklFKsbQmuAWhq33M96QxNilu/Tr498E= +SIZE (seamonkey-1.1.1/seamonkey-1.1.1.be-BY.langpack.xpi) = 592784 +SIZE (seamonkey-1.1.1/seamonkey-1.1.1.ca-AD.langpack.xpi) = 1088735 +SIZE (seamonkey-1.1.1/seamonkey-1.1.1.cs-CZ.langpack.xpi) = 739652 +SIZE (seamonkey-1.1.1/seamonkey-1.1.1.de-AT.langpack.xpi) = 1656001 +SIZE (seamonkey-1.1.1/seamonkey-1.1.1.es-ES.langpack.xpi) = 745764 +SIZE (seamonkey-1.1.1/seamonkey-1.1.1.fr-FR.langpack.xpi) = 1056309 +SIZE (seamonkey-1.1.1/seamonkey-1.1.1.he-IL.langpack.xpi) = 743887 +SIZE (seamonkey-1.1.1/seamonkey-1.1.1.it-IT.langpack.xpi) = 631851 +SIZE (seamonkey-1.1.1/seamonkey-1.1.1.pl-PL.langpack.xpi) = 1756507 +SIZE (seamonkey-1.1.1/seamonkey-1.1.1.ru-RU.langpack.xpi) = 1111224 +SIZE (seamonkey-1.1.1/seamonkey-1.1.1.source.tar.gz) = 45190957 diff --git a/www/seamonkey/files/README.OpenBSD b/www/seamonkey/files/README.OpenBSD index 295327e2c07..a40dd34b0e8 100644 --- a/www/seamonkey/files/README.OpenBSD +++ b/www/seamonkey/files/README.OpenBSD @@ -1,4 +1,4 @@ -$OpenBSD: README.OpenBSD,v 1.2 2007/03/26 20:41:37 martynas Exp $ +$OpenBSD: README.OpenBSD,v 1.3 2007/04/22 15:04:39 martynas Exp $ To disable anti-aliasing (xft) set GDK_USE_XFT=0 in the environment. @@ -20,3 +20,10 @@ $ Information on building Java (on some platforms) can be found in http://www.openbsd.org/faq/faq13.html#javaflash + +Internationalization + +This package contains internationalizations for all supported +languages. To configure Seamonkey for your language, go to +Edit->Preferences->Appearance->Languages/Content and select your +favorite Language/Content pack. diff --git a/www/seamonkey/files/genchrome b/www/seamonkey/files/genchrome new file mode 100644 index 00000000000..c96bd5a8e37 --- /dev/null +++ b/www/seamonkey/files/genchrome @@ -0,0 +1,28 @@ +#!/bin/sh +# $OpenBSD: genchrome,v 1.1 2007/04/22 15:04:39 martynas Exp $ +# Generate installed-chrome.txt entries for SeaMonkey + +if [ $# -ne 2 ]; then + echo "usage: $0 [file] [language]" + exit 1 +fi + +xx=`echo "$2" | cut -d- -f1` +YY=`echo "$2" | cut -d- -f2` + +# xx-YY.jar +grep "registerChrome(.*[,(] *cf *,.*);" "$1" | + cut -d\" -f2 | + sed "s/^/locale,install,url,jar:resource:\/chrome\/$2.jar!\/locale\/$2\//" + +# YY.jar +grep "registerChrome(.*[,(] *rf *,.*);" "$1" | + cut -d\" -f2 | + sed "s/^/locale,install,url,jar:resource:\/chrome\/$YY.jar!\/locale\/$YY\//" + +# xx-unix.jar +grep "registerChrome(.*[,(] *pf *,.*);" "$1" | + cut -d\" -f2 | + sort | # not 100% true, but hey, i've checked + uniq | # and every install.js has same 3 entries. + sed "s/^/locale,install,url,jar:resource:\/chrome\/$xx-unix.jar!\/locale\/$2\//" diff --git a/www/seamonkey/patches/patch-extensions_content-packs_resources_content_pref-contentpacks_xul b/www/seamonkey/patches/patch-extensions_content-packs_resources_content_pref-contentpacks_xul new file mode 100644 index 00000000000..67e20bd8d83 --- /dev/null +++ b/www/seamonkey/patches/patch-extensions_content-packs_resources_content_pref-contentpacks_xul @@ -0,0 +1,42 @@ +$OpenBSD: patch-extensions_content-packs_resources_content_pref-contentpacks_xul,v 1.1 2007/04/22 15:04:39 martynas Exp $ +--- extensions/content-packs/resources/content/pref-contentpacks.xul.orig Sat Mar 11 02:03:19 2006 ++++ extensions/content-packs/resources/content/pref-contentpacks.xul Fri Apr 20 23:38:31 2007 +@@ -213,7 +213,8 @@ + + ++ value="rdf:http://www.mozilla.org/rdf/chrome#name" ++ style="height: 28px"/> + + + +@@ -232,7 +233,8 @@ + + + ++ translation="true" nselected="false" class="outofdate" ++ style="height: 28px"/> + + + +@@ -273,14 +275,16 @@ + + ++ value="rdf:http://www.mozilla.org/rdf/chrome#name" ++ style="height: 28px"/> + + + + + ++ value="rdf:http://www.mozilla.org/rdf/chrome#name" ++ style="height: 28px"/> + + + diff --git a/www/seamonkey/pkg/PLIST-main b/www/seamonkey/pkg/PLIST-main index e58a97807cc..6fbe68f0286 100644 --- a/www/seamonkey/pkg/PLIST-main +++ b/www/seamonkey/pkg/PLIST-main @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-main,v 1.5 2007/03/26 20:41:38 martynas Exp $ +@comment $OpenBSD: PLIST-main,v 1.6 2007/04/22 15:04:39 martynas Exp $ %%SHARED%% bin/seamonkey @man man/man1/seamonkey.1 @@ -7,17 +7,40 @@ seamonkey/LICENSE seamonkey/README.OpenBSD seamonkey/TestGtkEmbed seamonkey/chrome/ +seamonkey/chrome/AD.jar +seamonkey/chrome/AT.jar +seamonkey/chrome/BY.jar +seamonkey/chrome/CZ.jar +seamonkey/chrome/FR.jar +seamonkey/chrome/IL.jar +seamonkey/chrome/IT.jar +seamonkey/chrome/PL.jar +seamonkey/chrome/RU.jar seamonkey/chrome/US.jar +seamonkey/chrome/be-BY.jar +seamonkey/chrome/be-unix.jar +seamonkey/chrome/ca-AD.jar +seamonkey/chrome/ca-unix.jar seamonkey/chrome/chatzilla.jar seamonkey/chrome/chromelist.txt seamonkey/chrome/classic.jar seamonkey/chrome/comm.jar seamonkey/chrome/content-packs.jar +seamonkey/chrome/cs-CZ.jar +seamonkey/chrome/cs-unix.jar +seamonkey/chrome/de-AT.jar +seamonkey/chrome/de-unix.jar seamonkey/chrome/embed-sample.jar seamonkey/chrome/en-US.jar seamonkey/chrome/en-mac.jar seamonkey/chrome/en-unix.jar seamonkey/chrome/en-win.jar +seamonkey/chrome/es-ES.jar +seamonkey/chrome/es-unix.jar +seamonkey/chrome/fr-FR.jar +seamonkey/chrome/fr-unix.jar +seamonkey/chrome/he-IL.jar +seamonkey/chrome/he-unix.jar seamonkey/chrome/help.jar seamonkey/chrome/icons/ seamonkey/chrome/icons/default/ @@ -59,12 +82,18 @@ seamonkey/chrome/icons/default/winInspectorMain16.xpm seamonkey/chrome/inspector.jar seamonkey/chrome/inspector.manifest seamonkey/chrome/installed-chrome.txt +seamonkey/chrome/it-IT.jar +seamonkey/chrome/it-unix.jar seamonkey/chrome/messenger.jar seamonkey/chrome/modern.jar seamonkey/chrome/pipnss.jar seamonkey/chrome/pippki.jar +seamonkey/chrome/pl-PL.jar +seamonkey/chrome/pl-unix.jar seamonkey/chrome/reporter.jar seamonkey/chrome/reporter.manifest +seamonkey/chrome/ru-RU.jar +seamonkey/chrome/ru-unix.jar seamonkey/chrome/sroaming.jar seamonkey/chrome/toolkit.jar seamonkey/chrome/venkman.jar @@ -301,6 +330,7 @@ seamonkey/init.d/README seamonkey/mozilla-xremote-client seamonkey/nsinstall seamonkey/plugins/ +seamonkey/regchrome seamonkey/regxpcom seamonkey/res/ seamonkey/res/EditorOverride.css @@ -490,7 +520,11 @@ seamonkey/searchplugins/jeeves.gif seamonkey/searchplugins/jeeves.src @cwd ${LOCALBASE}/seamonkey @exec rm -rf /tmp/.mozilla +@exec cd %D && env HOME=/tmp LD_LIBRARY_PATH=%D ./regchrome @exec cd %D && env HOME=/tmp LD_LIBRARY_PATH=%D ./regxpcom @exec rm -rf /tmp/.mozilla +@unexec rm -f %D/chrome/chrome.rdf +@unexec rm -f %D/chrome/overlays.rdf +@unexec rm -f %D/chrome/stylesheets.rdf @unexec rm -f %D/components/compreg.dat @unexec rm -f %D/components/xpti.dat