cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- update to 2.0.0.1 from Martynas Venckus <martynas at altroot.org>

Browse Source 
- add a -devel sub-package for vlc plugin
input and testing from many - thanks! okay naddy@ pvalchev@
This commit is contained in:
kurt 2007-01-12 21:46:17 +00:00
parent 322623e931
commit c07becdd02
37 changed files with 3404 additions and 451 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
www/mozilla-firefox/Makefile
View File

@ -1,23 +1,26 @@
# $OpenBSD: Makefile,v 1.62 2006/12/21 09:53:43 bernd Exp $
# $OpenBSD: Makefile,v 1.63 2007/01/12 21:46:17 kurt Exp $
ONLY_FOR_ARCHS= alpha amd64 i386 powerpc sparc sparc64
COMMENT= "redesign of Mozilla's browser component"
COMMENT-main= "redesign of Mozilla's browser component"
COMMENT-devel= "devel files for Gecko"
VER= 1.5.0.9
VER= 2.0.0.1
DISTNAME= mozilla
PKGNAME= mozilla-firefox-${VER}
SO_VERSION= 18.0
PKGNAME-main= mozilla-firefox-${VER}
PKGNAME-devel= mozilla-firefox-devel-${VER}
SO_VERSION= 19.0
# NOTE: Must bump minor version if any shlib's are removed from the
# components dir to avoid pkg_add -r issues.
.for _lib in accessibility appcomps auth autoconfig browsercomps \
browserdirprovider caps chrome commandlines composer cookie docshell \
editor embedcomponents fileview gfx_gtk gfxps gfxpsshar gkgfx \
gklayout gkplugin gtkembedmoz gtkxtbin htmlpars i18n imglib2 inspector \
jar50 jsd jsj mork mozfind mozjs necko necko2 nsappshell nss3 \
nssckbi oji permissions pipboot pipnss pippki pref rdf \
remoteservice searchservice smime3 softokn3 ssl3 system-pref \
toolkitcomps transformiix txmgr uconv ucvmath universalchardet \
gklayout gkplugin gtkembedmoz gtkxtbin htmlpars i18n imglib2 jar50 \
jsd jsj mork mozfind mozjs myspell necko necko2 nsappshell nullplugin \
oji permissions pipboot pipnss pippki pref rdf remoteservice \
searchservice spellchecker storagecomps system-pref toolkitcomps \
transformiix txmgr uconv ucvmath universalchardet unixprintplugin \
webbrwsr websrvcs widget_gtk2 xmlextras xpcom xpcom_compat \
xpcom_compat_c xpcom_core xpconnect xpinstall xpistub
SHARED_LIBS+= ${_lib} ${SO_VERSION}
@ -27,27 +30,33 @@ CATEGORIES= www
HOMEPAGE= http://www.mozilla.org/projects/firefox/
MULTI_PACKAGES= -main -devel
# mozilla public license
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= X11 Xext Xft Xrender Xinerama Xt c fontconfig freetype m \
pthread z \
atk-1.0 cairo glib-2.0 glitz gmodule-2.0 gobject-2.0 \
jpeg pango-1.0 pangocairo-1.0 \
pangoft2-1.0 png stdc++
MASTER_SITES= http://ftp.eu.mozilla.org/pub/mozilla.org/firefox/releases/${VER}/source/ \
http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${VER}/source/
MASTER_SITES= http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${VER}/source/
DISTFILES= firefox-${VER}-source.tar.bz2
MODULES= gettext
MODULES= devel/gettext
RUN_DEPENDS= :esound-*:audio/esound
BUILD_DEPENDS= :libIDL-*:devel/libIDL \
:zip->=2.3:archivers/zip
BUILD_DEPENDS= :zip->=2.3:archivers/zip
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
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= X11 Xext Xrender atk-1.0 c cairo fontconfig freetype \
glib-2.0 glitz gmodule-2.0 gobject-2.0 m pango-1.0 \
pangocairo-1.0 pangoft2-1.0 png pthread stdc++ z
WANTLIB-main= ${WANTLIB} Xft Xinerama Xt jpeg
LIB_DEPENDS-devel= ${MODGETTEXT_LIB_DEPENDS} IDL-2::devel/libIDL \
mozilla-firefox/gtkembedmoz,mozilla-firefox/mozjs,mozilla-firefox/xpcom,mozilla-firefox/xpcom_core:${PKGNAME-main}:www/mozilla-firefox,-main
WANTLIB-devel= ${WANTLIB} gdk-x11-2.0 gdk_pixbuf-2.0 gtk-x11-2.0 \
nspr4 plc4 plds4
VMEM_WARNING= Yes
@ -55,7 +64,7 @@ USE_X11= Yes
USE_GMAKE= Yes
# Regression tests are too hard to adapt to run here
NO_REGRESS= Yes
SUBST_VARS= LOCALBASE SO_VERSION
SUBST_VARS= LOCALBASE
MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/build/autoconf
@ -65,6 +74,7 @@ CONFIGURE_ARGS= --with-system-jpeg=${LOCALBASE} \
--with-system-png=${LOCALBASE} \
--with-system-zlib=/usr/lib \
--with-system-nspr \
--with-system-nss \
--with-pthreads \
--enable-xft \
--enable-optimize=-Os \
@ -89,7 +99,8 @@ MAKE_ENV= MOZ_CO_PROJECT=browser \
LD_LIBRARY_PATH="${WRKSRC}/dist/bin" \
BUILD_OFFICIAL=1 \
MOZILLA_OFFICIAL=1 \
SO_VERSION="${SO_VERSION}"
SO_VERSION="${SO_VERSION}" \
NSS_ENABLE_ECC=1
CONFIGURE_ENV= ${MAKE_ENV} \
PKG_CONFIG_PATH="${LOCALBASE}/lib/pkgconfig:${X11BASE}/lib/pkgconfig"
@ -100,31 +111,46 @@ post-extract:
@cp ${FILESDIR}/xptc* ${WRKSRC}/xpcom/reflect/xptcall/src/md/unix/
pre-configure:
@cd ${WRKSRC}/browser/base/branding/ && cp aboutCredits.png about.png
@cd ${WRKSRC}/browser/base/branding && cp aboutCredits.png about.png
@perl -pi -e 's|_LOCALBASE_|${LOCALBASE}|g; s|_X11BASE_|${X11BASE}|g' \
${WRKSRC}/browser/app/mozilla.in
@perl -pi -e 's|_SO_VERSION_|${SO_VERSION}|g' \
${WRKSRC}/xpcom/components/nsNativeComponentLoader.cpp
do-install:
.for dir in chrome components defaults extensions greprefs res searchplugins
.for dir in include idl
${INSTALL_DATA_DIR} ${MOZ}/${dir}
@cd ${MOB} && ${TAR} -chf - ${dir} | \
@cd ${WRKSRC}/dist && ${TAR} -chf - ${dir} | \
${TAR} -xf - -C ${MOZ}
.endfor
@cd ${MOB} && ${TAR} -chf - *.so.??.? | \
.for dir in chrome components defaults dictionaries extensions greprefs icons \
init.d plugins res searchplugins
${INSTALL_DATA_DIR} ${MOZ}/${dir}
@cd ${MOB} && ${TAR} -chf - ${dir}/ | \
${TAR} -xf - -C ${MOZ}
@chmod 444 ${MOZ}/*.so.??.? ${MOZ}/components/*.so.??.? ${MOZ}/components/*.js
.endfor
@cd ${MOB} && ${TAR} -chf - *.so.${SO_VERSION} | \
${TAR} -xf - -C ${MOZ}
@chmod 444 ${MOZ}/*.so.${SO_VERSION} \
${MOZ}/components/*.so.${SO_VERSION} \
${MOZ}/components/*.js \
${MOZ}/plugins/*.so.${SO_VERSION}
chown -R ${SHAREOWN}:${SHAREGRP} ${MOZ}
${INSTALL_DATA} ${WRKSRC}/LICENSE ${MOZ}
${INSTALL_DATA} ${WRKSRC}/browser/app/mozicon16.xpm ${WRKSRC}/browser/app/mozicon50.xpm ${MOZ}
${INSTALL_SCRIPT} ${MOB}/firefox ${MOB}/firefox-config ${PREFIX}/bin/
${INSTALL_DATA} ${WRKSRC}/LICENSE \
${MOB}/bloaturls.txt \
${MOB}/browserconfig.properties ${MOZ}
${INSTALL_SCRIPT} ${MOB}/firefox \
${MOB}/firefox-config ${PREFIX}/bin
ln -f ${PREFIX}/bin/firefox ${PREFIX}/bin/mozilla-firefox
${INSTALL_SCRIPT} ${MOB}/run-mozilla.sh ${MOZ}
${INSTALL_PROGRAM} ${MOB}/regxpcom ${MOB}/firefox-bin ${MOB}/mozilla-xremote-client ${MOZ}
${INSTALL_PROGRAM} ${MOB}/firefox-bin ${MOB}/mozilla-xremote-client \
${MOB}/regxpcom ${MOB}/TestGtkEmbed ${MOB}/nsinstall \
${MOB}/xpcshell ${MOB}/xpicleanup ${MOB}/xpidl \
${MOB}/xpt_dump ${MOB}/xpt_link ${MOZ}
ln -f ${MOZ}/firefox-bin ${MOZ}/mozilla-firefox-bin
@sed -e 's,!!PREFIX!!,${TRUEPREFIX},g' \
< ${FILESDIR}/README.OpenBSD > ${MOZ}/README.OpenBSD
${INSTALL_DATA_DIR} ${PREFIX}/lib/pkgconfig
${INSTALL_DATA} ${WRKBUILD}/build/unix/*.pc ${PREFIX}/lib/pkgconfig
.include <bsd.port.mk>

8
www/mozilla-firefox/distinfo
View File

@ -1,4 +1,4 @@
MD5 (firefox-1.5.0.9-source.tar.bz2) = 383d3f3a17ba819ead94c2edc6739773
RMD160 (firefox-1.5.0.9-source.tar.bz2) = b83bca8f317a6bc00dd40fd0d868cbe82536f45e
SHA1 (firefox-1.5.0.9-source.tar.bz2) = 55147ecf4882baf618d1e5eb5f5a438086706425
SIZE (firefox-1.5.0.9-source.tar.bz2) = 35600822
MD5 (firefox-2.0.0.1-source.tar.bz2) = 7a1fc804ed735c5b7e9b1498bac8b5db
RMD160 (firefox-2.0.0.1-source.tar.bz2) = ce86c30f1e2038d2af05c7119fdab5609c21d12d
SHA1 (firefox-2.0.0.1-source.tar.bz2) = 52728b8f1fba8ab7d51962f6d021b31f02585e3f
SIZE (firefox-2.0.0.1-source.tar.bz2) = 37056207

31
www/mozilla-firefox/files/README.OpenBSD
View File

@ -1,17 +1,23 @@
$OpenBSD: README.OpenBSD,v 1.2 2006/05/23 14:03:22 bernd Exp $
$OpenBSD: README.OpenBSD,v 1.3 2007/01/12 21:46:17 kurt Exp $
If you encounter strange problems relating to bookmarks, downloads,
window placement, toolbars, history, or other settings, it is
recommended that you create a new profile and attempt to
reproduce the problem before filing bugs. To create a new profile,
start Firefox with the --profilemanager switch, e.g.
firefox --profilemanager, and click "Create Profile".
start Firefox with the -ProfileManager switch, e.g.
firefox -ProfileManager, and click "Create Profile".
If Firefox doesn't start at all, first try to remove compreg.dat,
xpti.dat and extensions/Extensions.rdf from your profile-dir, or you
could just remove the old profile-dir,
rm -r ~/.mozilla/firefox/<profile-dir> ~/.firefox/<profile-dir>
(this will delete your saved bookmarks.html).
If Firefox doesn't start at all, first try starting it with
-safe-mode switch, which disables extensions and themes for your
session.
If you still can't start Firefox, recompile it with --enable-debug.
If you can't fix the problem yourself, remember to provide output
when sending bug report.
Firefox will silently fail to print when it runs out of file
descriptors. If Firefox doesn't print a page increase your file
descriptors limit and try again.
To disable anti-aliasing (xft) set GDK_USE_XFT=0 in the environment.
@ -47,3 +53,12 @@ $
Information on building Java (on some platforms) can be found in
http://www.openbsd.org/faq/faq13.html#javaflash
Enabling ECC cipher suites
Open the URL about:config and type security.ssl3 in the search
filter. This will bring up a list of all available cipher suites.
Double-click on any cipher to toggle its state. For example, to
enable TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA, double-click on
security.ssl3.ecdhe_ecdsa_aes128_sha until its boolean entry in the
Value column changes to true.

12
www/mozilla-firefox/patches/patch-browser_app_Makefile_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-browser_app_Makefile_in,v 1.1 2007/01/12 21:46:17 kurt Exp $
--- browser/app/Makefile.in.orig Tue Aug 29 05:03:07 2006
+++ browser/app/Makefile.in Fri Nov 3 22:36:08 2006
@@ -178,7 +178,7 @@ endif
APP_VERSION = $(shell cat $(srcdir)/../config/version.txt)
DEFINES += -DAPP_VERSION="$(APP_VERSION)"
-APP_UA_NAME = $(shell echo $(MOZ_APP_DISPLAYNAME) | sed -e's/[^A-Za-z]//g')
+APP_UA_NAME = Firefox
DEFINES += -DAPP_UA_NAME="$(APP_UA_NAME)"
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))

16
www/mozilla-firefox/patches/patch-browser_locales_en-US_chrome_branding_brand_dtd
View File

@ -1,11 +1,9 @@
$OpenBSD: patch-browser_locales_en-US_chrome_branding_brand_dtd,v 1.1 2005/12/20 23:44:00 bernd Exp $
--- browser/locales/en-US/chrome/branding/brand.dtd.orig Thu Dec 1 18:34:19 2005
+++ browser/locales/en-US/chrome/branding/brand.dtd Thu Dec 1 18:35:24 2005
@@ -1,5 +1,5 @@
-<!ENTITY brandShortName "Deer Park">
-<!ENTITY brandFullName "Deer Park">
$OpenBSD: patch-browser_locales_en-US_chrome_branding_brand_dtd,v 1.2 2007/01/12 21:46:17 kurt Exp $
--- browser/locales/en-US/chrome/branding/brand.dtd.orig Fri Aug 25 03:02:37 2006
+++ browser/locales/en-US/chrome/branding/brand.dtd Mon Oct 30 18:18:43 2006
@@ -1,3 +1,3 @@
-<!ENTITY brandShortName "Bon Echo">
-<!ENTITY brandFullName "Bon Echo">
+<!ENTITY brandShortName "Firefox Community Edition">
+<!ENTITY brandFullName "Firefox Community Edition">
+<!ENTITY brandFullName "Firefox Community Edition">
<!ENTITY vendorShortName "Mozilla">
<!ENTITY releaseURL "http://www.mozilla.org/">

10
www/mozilla-firefox/patches/patch-browser_locales_en-US_chrome_branding_brand_properties
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-browser_locales_en-US_chrome_branding_brand_properties,v 1.1 2005/12/20 23:44:00 bernd Exp $
--- browser/locales/en-US/chrome/branding/brand.properties.orig Fri Dec 2 14:42:57 2005
+++ browser/locales/en-US/chrome/branding/brand.properties Fri Dec 2 14:43:20 2005
$OpenBSD: patch-browser_locales_en-US_chrome_branding_brand_properties,v 1.2 2007/01/12 21:46:17 kurt Exp $
--- browser/locales/en-US/chrome/branding/brand.properties.orig Fri Mar 17 06:17:56 2006
+++ browser/locales/en-US/chrome/branding/brand.properties Fri Oct 27 11:55:48 2006
@@ -1,3 +1,3 @@
-brandShortName=Deer Park
-brandFullName=Deer Park
-brandShortName=Bon Echo
-brandFullName=Bon Echo
+brandShortName=Firefox Community Edition
+brandFullName=Firefox Community Edition
vendorShortName=Mozilla

11
www/mozilla-firefox/patches/patch-browser_locales_en-US_chrome_browser_aboutDialog_dtd Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-browser_locales_en-US_chrome_browser_aboutDialog_dtd,v 1.1 2007/01/12 21:46:17 kurt Exp $
--- browser/locales/en-US/chrome/browser/aboutDialog.dtd.orig Mon May 15 23:26:11 2006
+++ browser/locales/en-US/chrome/browser/aboutDialog.dtd Mon Oct 30 18:18:43 2006
@@ -1,6 +1,6 @@
<!ENTITY aboutDialog.title "About &brandFullName;">
<!ENTITY copyright "Credits">
-<!ENTITY aboutLink "&lt; About &brandFullName;">
+<!ENTITY aboutLink "&lt; About">
<!ENTITY aboutVersion "version">
<!ENTITY copyrightText "&#169;1998-2006 Contributors. All Rights Reserved. Firefox and the
Firefox logos are trademarks of the Mozilla Foundation. All rights

12
www/mozilla-firefox/patches/patch-browser_locales_en-US_chrome_browser_preferences_preferences_dtd Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-browser_locales_en-US_chrome_browser_preferences_preferences_dtd,v 1.1 2007/01/12 21:46:17 kurt Exp $
--- browser/locales/en-US/chrome/browser/preferences/preferences.dtd.orig Mon Jul 31 12:20:47 2006
+++ browser/locales/en-US/chrome/browser/preferences/preferences.dtd Mon Oct 30 18:18:43 2006
@@ -3,7 +3,7 @@
<!ENTITY prefWindow.titleGNOME "&brandShortName; Preferences">
<!ENTITY prefWindow.styleWin "width: 42em; height: 40em;">
<!ENTITY prefWindow.styleMac "width: 47em;">
-<!ENTITY prefWindow.styleGNOME "width: 42em; height: 38.5em;">
+<!ENTITY prefWindow.styleGNOME "width: 48em; height: 38.5em;">
<!ENTITY paneMain.title "Main">
<!ENTITY paneTabs.title "Tabs">

6
www/mozilla-firefox/patches/patch-build_autoconf_altoptions_m4
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-build_autoconf_altoptions_m4,v 1.2 2005/12/20 23:44:00 bernd Exp $
--- build/autoconf/altoptions.m4.orig Sun Apr 18 16:17:09 2004
+++ build/autoconf/altoptions.m4 Sat Sep 10 09:47:31 2005
$OpenBSD: patch-build_autoconf_altoptions_m4,v 1.3 2007/01/12 21:46:17 kurt Exp $
--- build/autoconf/altoptions.m4.orig Sun Apr 18 17:17:09 2004
+++ build/autoconf/altoptions.m4 Fri Nov 3 22:35:39 2006
@@ -143,14 +143,3 @@ echo "
[$3]
fi

20
www/mozilla-firefox/patches/patch-config_autoconf_mk_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-config_autoconf_mk_in,v 1.4 2006/06/05 09:30:06 bernd Exp $
--- config/autoconf.mk.in.orig Fri Apr 21 22:50:30 2006
+++ config/autoconf.mk.in Fri Jun 2 10:33:47 2006
@@ -56,13 +56,13 @@ MOZ_PKG_SPECIAL = @MOZ_PKG_SPECIAL@
$OpenBSD: patch-config_autoconf_mk_in,v 1.5 2007/01/12 21:46:17 kurt Exp $
--- config/autoconf.mk.in.orig Thu Sep 14 21:07:03 2006
+++ config/autoconf.mk.in Mon Dec 11 15:51:39 2006
@@ -57,13 +57,13 @@ MOZ_PKG_SPECIAL = @MOZ_PKG_SPECIAL@
prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
@ -10,19 +10,11 @@ $OpenBSD: patch-config_autoconf_mk_in,v 1.4 2006/06/05 09:30:06 bernd Exp $
libdir = @libdir@
datadir = @datadir@
mandir = @mandir@
idldir = @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-idldir = @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+idldir = $(prefix)/mozilla-firefox/idl
-mozappdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+mozappdir = $(prefix)/mozilla-firefox
mredir = $(libdir)/mre/mre-$(MOZ_APP_VERSION)
mrelibdir = $(mredir)/lib
@@ -242,7 +242,7 @@ OS_LDFLAGS = @LDFLAGS@
OS_COMPILE_CFLAGS = $(OS_CPPFLAGS) @COMPILE_CFLAGS@
OS_COMPILE_CXXFLAGS = $(OS_CPPFLAGS) @COMPILE_CXXFLAGS@
-OS_INCLUDES = $(NSPR_CFLAGS) $(JPEG_CFLAGS) $(PNG_CFLAGS) $(ZLIB_CFLAGS)
+OS_INCLUDES = $(NSPR_CFLAGS) $(FT2_CFLAGS) $(LIBIDL_CFLAGS) $(JPEG_CFLAGS) $(PNG_CFLAGS) $(ZLIB_CFLAGS)
OS_LIBS = @LIBS@
ACDEFINES = @MOZ_DEFINES@

68
www/mozilla-firefox/patches/patch-config_rules_mk
View File

@ -1,67 +1,7 @@
$OpenBSD: patch-config_rules_mk,v 1.3 2005/12/20 23:44:00 bernd Exp $
--- config/rules.mk.orig Tue Oct 11 01:16:39 2005
+++ config/rules.mk Thu Nov 3 10:44:13 2005
@@ -667,7 +667,7 @@ ifdef SHARED_LIBRARY
ifdef IS_COMPONENT
ifdef GRE_MODULE
ifndef DISABLE_DIST_GRE
- $(INSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(GRE_DIST)/components
+ $(INSTALL) $(IFLAGS1) $(SHARED_LIBRARY) $(GRE_DIST)/components
$(ELF_DYNSTR_GC) $(GRE_DIST)/components/$(SHARED_LIBRARY)
ifdef BEOS_ADDON_WORKAROUND
( cd $(GRE_DIST)/components && $(CC) -nostart -o $(SHARED_LIBRARY).stub $(SHARED_LIBRARY) )
@@ -675,7 +675,7 @@ endif
endif
endif # GRE_MODULE
ifndef _SKIP_OLD_GRE_INSTALL
- $(INSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(FINAL_TARGET)/components
+ $(INSTALL) $(IFLAGS1) $(SHARED_LIBRARY) $(FINAL_TARGET)/components
$(ELF_DYNSTR_GC) $(FINAL_TARGET)/components/$(SHARED_LIBRARY)
ifdef BEOS_ADDON_WORKAROUND
( cd $(FINAL_TARGET)/components && $(CC) -nostart -o $(SHARED_LIBRARY).stub $(SHARED_LIBRARY) )
@@ -684,7 +684,7 @@ endif # ! _SKIP_OLD_GRE_INSTALL
else # ! IS_COMPONENT
ifdef GRE_MODULE
ifndef DISABLE_DIST_GRE
- $(INSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(GRE_DIST)
+ $(INSTALL) $(IFLAGS1) $(SHARED_LIBRARY) $(GRE_DIST)
ifdef BEOS_ADDON_WORKAROUND
( cd $(GRE_DIST) && $(CC) -nostart -o $(SHARED_LIBRARY).stub $(SHARED_LIBRARY) )
endif
@@ -694,10 +694,10 @@ endif # GRE_MODULE
ifneq (,$(filter OS2 WINNT WINCE,$(OS_ARCH)))
$(INSTALL) $(IFLAGS2) $(IMPORT_LIBRARY) $(DIST)/lib
else
- $(INSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(DIST)/lib
+ $(INSTALL) $(IFLAGS1) $(SHARED_LIBRARY) $(DIST)/lib
endif
ifndef _SKIP_OLD_GRE_INSTALL
- $(INSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(FINAL_TARGET)
+ $(INSTALL) $(IFLAGS1) $(SHARED_LIBRARY) $(FINAL_TARGET)
ifdef BEOS_ADDON_WORKAROUND
( cd $(FINAL_TARGET) && $(CC) -nostart -o $(SHARED_LIBRARY).stub $(SHARED_LIBRARY) )
endif
@@ -765,15 +765,15 @@ ifndef NO_INSTALL
ifdef SHARED_LIBRARY
ifdef IS_COMPONENT
ifdef MRE_DIST
- $(SYSINSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(DESTDIR)$(mredir)/components
+ $(SYSINSTALL) $(IFLAGS1) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(DESTDIR)$(mredir)/components
else
- $(SYSINSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(DESTDIR)$(mozappdir)/components
+ $(SYSINSTALL) $(IFLAGS1) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(DESTDIR)$(mozappdir)/components
endif
else
ifdef MRE_DIST
- $(SYSINSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(DESTDIR)$(mredir)
+ $(SYSINSTALL) $(IFLAGS1) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(DESTDIR)$(mredir)
else
- $(SYSINSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(DESTDIR)$(mozappdir)
+ $(SYSINSTALL) $(IFLAGS1) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(DESTDIR)$(mozappdir)
endif
endif
endif # SHARED_LIBRARY
@@ -1043,7 +1043,6 @@ endif # NO_LD_ARCHIVE_FLAGS
$OpenBSD: patch-config_rules_mk,v 1.4 2007/01/12 21:46:17 kurt Exp $
--- config/rules.mk.orig Tue Nov 28 19:03:37 2006
+++ config/rules.mk Mon Dec 11 15:50:49 2006
@@ -1014,7 +1014,6 @@ endif # NO_LD_ARCHIVE_FLAGS
else # os2 vacpp
$(MKSHLIB) -O:$@ -DLL -INC:_dllentry $(LDFLAGS) $(OBJS) $(LOBJS) $(EXTRA_DSO_LDOPTS) $(OS_LIBS) $(EXTRA_LIBS) $(DEF_FILE)
endif # !os2 vacpp

22
www/mozilla-firefox/patches/patch-configure_in
View File

@ -1,20 +1,22 @@
$OpenBSD: patch-configure_in,v 1.7 2006/07/31 09:32:19 bernd Exp $
--- configure.in.orig Thu Jun 15 15:29:32 2006
+++ configure.in Thu Jul 27 10:21:22 2006
@@ -1291,9 +1291,9 @@ dnl Get mozilla version from central mil
$OpenBSD: patch-configure_in,v 1.8 2007/01/12 21:46:17 kurt Exp $
--- configure.in.orig Fri Sep 15 16:13:01 2006
+++ configure.in Fri Nov 3 22:36:05 2006
@@ -1317,10 +1317,10 @@ dnl Get mozilla version from central mil
MOZILLA_VERSION=`$PERL $srcdir/config/milestone.pl -topsrcdir $srcdir`
dnl Get version of various core apps from the version files.
-FIREFOX_VERSION=`cat $topsrcdir/browser/config/version.txt`
-THUNDERBIRD_VERSION=`cat $topsrcdir/mail/config/version.txt`
-SUNBIRD_VERSION=`cat $topsrcdir/calendar/sunbird/config/version.txt`
-SEAMONKEY_VERSION=`cat $topsrcdir/xpfe/bootstrap/version.txt`
+FIREFOX_VERSION=`cat ./browser/config/version.txt`
+THUNDERBIRD_VERSION=`cat ./mail/config/version.txt`
+SUNBIRD_VERSION=`cat ./calendar/sunbird/config/version.txt`
+SEAMONKEY_VERSION=`cat ./xpfe/bootstrap/version.txt`
AC_DEFINE_UNQUOTED(MOZILLA_VERSION,"$MOZILLA_VERSION")
AC_DEFINE_UNQUOTED(MOZILLA_VERSION_U,$MOZILLA_VERSION)
@@ -1863,7 +1863,7 @@ case "$target" in
@@ -1931,7 +1931,7 @@ case "$target" in
;;
*-openbsd*)
@ -23,7 +25,7 @@ $OpenBSD: patch-configure_in,v 1.7 2006/07/31 09:32:19 bernd Exp $
DSO_CFLAGS=''
DSO_PIC_CFLAGS='-fPIC'
DSO_LDOPTS='-shared -fPIC'
@@ -3647,7 +3647,7 @@ _SAVE_LIBS=$LIBS
@@ -3804,7 +3804,7 @@ _SAVE_LIBS=$LIBS
CFLAGS="$ZLIB_CFLAGS $CFLAGS"
LDFLAGS="$ZLIB_LIBS -lz $LDFLAGS"
if test -n "${PNG_DIR}" -a "${PNG_DIR}" != "yes"; then
@ -32,7 +34,7 @@ $OpenBSD: patch-configure_in,v 1.7 2006/07/31 09:32:19 bernd Exp $
LDFLAGS="-L${PNG_DIR}/lib $LDFLAGS"
fi
if test -z "$PNG_DIR" -o "$PNG_DIR" = no; then
@@ -3677,7 +3677,7 @@ LDFLAGS=$_SAVE_LDFLAGS
@@ -3834,7 +3834,7 @@ LDFLAGS=$_SAVE_LDFLAGS
LIBS=$_SAVE_LIBS
if test "${PNG_DIR}" -a -d "${PNG_DIR}" -a "$SYSTEM_PNG" = 1; then
@ -41,12 +43,12 @@ $OpenBSD: patch-configure_in,v 1.7 2006/07/31 09:32:19 bernd Exp $
PNG_LIBS="-L${PNG_DIR}/lib ${PNG_LIBS}"
fi
@@ -4079,7 +4079,7 @@ suite)
@@ -4243,7 +4243,7 @@ suite)
browser)
MOZ_APP_NAME=firefox
- MOZ_APP_DISPLAYNAME=DeerPark
- MOZ_APP_DISPLAYNAME=BonEcho
+ MOZ_APP_DISPLAYNAME=FirefoxCommunityEdition
MOZ_XUL_APP=1
MOZ_PHOENIX=1
MOZ_APP_VERSION=$FIREFOX_VERSION
MOZ_SAFE_BROWSING=1

22
www/mozilla-firefox/patches/patch-db_mork_src_morkSink_cpp
View File

@ -1,22 +0,0 @@
$OpenBSD: patch-db_mork_src_morkSink_cpp,v 1.1 2005/12/21 15:33:01 kurt Exp $
--- db/mork/src/morkSink.cpp.orig Sat Apr 17 17:49:24 2004
+++ db/mork/src/morkSink.cpp Tue Dec 20 21:47:21 2005
@@ -115,15 +115,10 @@ morkSpool::SpillPutc(morkEnv* ev, int c)
coil->mBuf_Fill = fill;
if ( at >= end ) // need to grow the coil?
{
- if ( size > 2048 ) // grow slower over 2K?
- size += 512;
+ if ( size > 65536 )
+ size += 65536;
else
- {
- mork_size growth = ( size * 4 ) / 3; // grow by 33%
- if ( growth < 64 ) // grow faster under (64 * 3)?
- growth = 64;
- size += growth;
- }
+ size *= 2;
if ( coil->GrowCoil(ev, size) ) // made coil bigger?
{
body = (mork_u1*) coil->mBuf_Body;

53
www/mozilla-firefox/patches/patch-gfx_src_gtk_nsFontMetricsXft_cpp
View File

@ -1,53 +0,0 @@
$OpenBSD: patch-gfx_src_gtk_nsFontMetricsXft_cpp,v 1.2 2006/06/05 09:30:06 bernd Exp $
--- gfx/src/gtk/nsFontMetricsXft.cpp.orig Tue Apr 25 01:58:36 2006
+++ gfx/src/gtk/nsFontMetricsXft.cpp Fri Jun 2 10:33:47 2006
@@ -871,8 +871,14 @@ nsFontMetricsXft::CacheFontMetrics(void)
mXHeight = nscoord(mXHeight * f);
// mUnderlineOffset (offset for underlines)
- val = CONVERT_DESIGN_UNITS_TO_PIXELS(face->underline_position,
+ if (face) {
+ val = CONVERT_DESIGN_UNITS_TO_PIXELS(face->underline_position,
face->size->metrics.y_scale);
+ }
+ else {
+ val = 0.0f;
+ }
+
if (val) {
mUnderlineOffset = NSToIntRound(val * f);
}
@@ -882,8 +888,14 @@ nsFontMetricsXft::CacheFontMetrics(void)
}
// mUnderlineSize (thickness of an underline)
- val = CONVERT_DESIGN_UNITS_TO_PIXELS(face->underline_thickness,
+ if (face) {
+ val = CONVERT_DESIGN_UNITS_TO_PIXELS(face->underline_thickness,
face->size->metrics.y_scale);
+ }
+ else {
+ val = 0.0f;
+ }
+
if (val) {
mUnderlineSize = nscoord(PR_MAX(f, NSToIntRound(val * f)));
}
@@ -895,7 +907,7 @@ nsFontMetricsXft::CacheFontMetrics(void)
TT_OS2 *os2 = (TT_OS2 *) FT_Get_Sfnt_Table(face, ft_sfnt_os2);
// mSuperscriptOffset
- if (os2 && os2->ySuperscriptYOffset) {
+ if (face && os2 && os2->ySuperscriptYOffset) {
val = CONVERT_DESIGN_UNITS_TO_PIXELS(os2->ySuperscriptYOffset,
face->size->metrics.y_scale);
mSuperscriptOffset = nscoord(PR_MAX(f, NSToIntRound(val * f)));
@@ -905,7 +917,7 @@ nsFontMetricsXft::CacheFontMetrics(void)
}
// mSubscriptOffset
- if (os2 && os2->ySubscriptYOffset) {
+ if (face && os2 && os2->ySubscriptYOffset) {
val = CONVERT_DESIGN_UNITS_TO_PIXELS(os2->ySubscriptYOffset,
face->size->metrics.y_scale);
// some fonts have the incorrect sign.

37
www/mozilla-firefox/patches/patch-gfx_src_ps_nsFontMetricsPS_cpp
View File

@ -1,27 +1,12 @@
$OpenBSD: patch-gfx_src_ps_nsFontMetricsPS_cpp,v 1.6 2006/11/10 14:15:49 wilfried Exp $
--- gfx/src/ps/nsFontMetricsPS.cpp.orig Fri Oct 6 19:26:54 2006
+++ gfx/src/ps/nsFontMetricsPS.cpp Wed Nov 8 10:28:51 2006
@@ -1044,8 +1044,10 @@ nsFontPSXft::Init(nsXftEntry* aEntry,
$OpenBSD: patch-gfx_src_ps_nsFontMetricsPS_cpp,v 1.7 2007/01/12 21:46:17 kurt Exp $
--- gfx/src/ps/nsFontMetricsPS.cpp.orig Thu Nov 30 04:17:21 2006
+++ gfx/src/ps/nsFontMetricsPS.cpp Mon Dec 11 15:49:56 2006
@@ -995,7 +995,7 @@ nsFontPSXft::FindFont(PRUnichar aChar, c
nsFontPSXft::~nsFontPSXft()
{
- if (mEntry->mFace)
+ if (mEntry->mFace) {
FT_Done_Face(mEntry->mFace);
+ mEntry->mFace = nsnull;
+ }
if (FT_Done_FreeType(mFreeTypeLibrary))
return;
@@ -2336,8 +2338,10 @@ nsXftType1Generator::Init(nsXftEntry* aE
nsXftType1Generator::~nsXftType1Generator()
{
- if (mEntry->mFace)
+ if (mEntry->mFace) {
FT_Done_Face(mEntry->mFace);
+ mEntry->mFace = nsnull;
+ }
if (FT_Done_FreeType(mFreeTypeLibrary))
return;
fontps *fps = new fontps;
fps->entry = xftEntry;
- fps->charset = fc_charset;
+ fps->charset = FcCharSetCopy(fc_charset);
fps->fontps = nsnull;
fpi.fontps->AppendElement(fps);
}

57
www/mozilla-firefox/patches/patch-modules_libpref_src_init_all_js
View File

@ -1,7 +1,56 @@
$OpenBSD: patch-modules_libpref_src_init_all_js,v 1.5 2006/09/17 21:02:58 steven Exp $
--- modules/libpref/src/init/all.js.orig Sat Aug 19 00:12:03 2006
+++ modules/libpref/src/init/all.js Fri Sep 15 07:41:32 2006
@@ -2051,7 +2051,7 @@ pref("font.scale.outline.min", 6);
$OpenBSD: patch-modules_libpref_src_init_all_js,v 1.6 2007/01/12 21:46:17 kurt Exp $
--- modules/libpref/src/init/all.js.orig Sat Aug 19 08:56:14 2006
+++ modules/libpref/src/init/all.js Fri Nov 3 22:35:40 2006
@@ -1931,33 +1931,33 @@ pref("font.name.monospace.ko", "monospac
// th
-pref("font.name.serif.tr", "Times");
-pref("font.name.sans-serif.tr", "Helvetica");
-pref("font.name.monospace.tr", "Courier");
+pref("font.name.serif.tr", "serif");
+pref("font.name.sans-serif.tr", "sans-serif");
+pref("font.name.monospace.tr", "monospace");
pref("font.name.serif.x-baltic", "serif");
pref("font.name.sans-serif.x-baltic", "sans-serif");
pref("font.name.monospace.x-baltic", "monospace");
-pref("font.name.serif.x-central-euro", "Times");
-pref("font.name.sans-serif.x-central-euro", "Helvetica");
-pref("font.name.monospace.x-central-euro", "Courier");
+pref("font.name.serif.x-central-euro", "serif");
+pref("font.name.sans-serif.x-central-euro", "sans-serif");
+pref("font.name.monospace.x-central-euro", "monospace");
pref("font.name.serif.x-cyrillic", "serif");
pref("font.name.sans-serif.x-cyrillic", "sans-serif");
pref("font.name.monospace.x-cyrillic", "monospace");
-pref("font.name.serif.x-unicode", "Times");
-pref("font.name.sans-serif.x-unicode", "Helvetica");
-pref("font.name.monospace.x-unicode", "Courier");
+pref("font.name.serif.x-unicode", "serif");
+pref("font.name.sans-serif.x-unicode", "sans-serif");
+pref("font.name.monospace.x-unicode", "monospace");
-pref("font.name.serif.x-user-def", "Times");
-pref("font.name.sans-serif.x-user-def", "Helvetica");
-pref("font.name.monospace.x-user-def", "Courier");
+pref("font.name.serif.x-user-def", "serif");
+pref("font.name.sans-serif.x-user-def", "sans-serif");
+pref("font.name.monospace.x-user-def", "monospace");
-pref("font.name.serif.x-western", "Times");
-pref("font.name.sans-serif.x-western", "Helvetica");
-pref("font.name.monospace.x-western", "Courier");
+pref("font.name.serif.x-western", "serif");
+pref("font.name.sans-serif.x-western", "sans-serif");
+pref("font.name.monospace.x-western", "monospace");
pref("font.name.serif.zh-CN", "serif");
pref("font.name.sans-serif.zh-CN", "sans-serif");
@@ -2097,7 +2097,7 @@ pref("font.scale.outline.min", 6);
// TrueType
pref("font.FreeType2.enable", false);

12
www/mozilla-firefox/patches/patch-security_coreconf_OpenBSD_mk
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-security_coreconf_OpenBSD_mk,v 1.5 2006/11/17 19:14:51 kurt Exp $
--- security/coreconf/OpenBSD.mk.orig Sun Apr 25 11:02:17 2004
+++ security/coreconf/OpenBSD.mk Mon Nov 6 16:39:58 2006
$OpenBSD: patch-security_coreconf_OpenBSD_mk,v 1.6 2007/01/12 21:46:17 kurt Exp $
--- security/coreconf/OpenBSD.mk.orig Sun Apr 25 18:02:17 2004
+++ security/coreconf/OpenBSD.mk Fri Nov 3 22:38:43 2006
@@ -37,12 +37,12 @@
include $(CORE_DEPTH)/coreconf/UNIX.mk
@ -27,7 +27,7 @@ $OpenBSD: patch-security_coreconf_OpenBSD_mk,v 1.5 2006/11/17 19:14:51 kurt Exp
OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -pipe -DOPENBSD
@@ -64,8 +64,9 @@ OS_LIBS =
@@ -64,8 +64,8 @@ OS_LIBS =
ARCH = openbsd
DSO_CFLAGS = -fPIC -DPIC
@ -35,6 +35,6 @@ $OpenBSD: patch-security_coreconf_OpenBSD_mk,v 1.5 2006/11/17 19:14:51 kurt Exp
+DSO_LDOPTS = -shared -fPIC -Wl,-soname,lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
DSO_LDFLAGS =
MKSHLIB = $(CC) $(DSO_LDOPTS)
-MKSHLIB = $(CC) $(DSO_LDOPTS)
+MKSHLIB = $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS)
+NSPR_LIBS = $(shell pkg-config --libs nspr)

10
www/mozilla-firefox/patches/patch-security_coreconf_rules_mk
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-security_coreconf_rules_mk,v 1.2 2005/12/20 23:44:00 bernd Exp $
--- security/coreconf/rules.mk.orig Fri Apr 15 02:36:28 2005
+++ security/coreconf/rules.mk Sat Sep 10 09:47:32 2005
@@ -352,7 +352,6 @@ ifdef XP_OS2_VACPP
$OpenBSD: patch-security_coreconf_rules_mk,v 1.3 2007/01/12 21:46:17 kurt Exp $
--- security/coreconf/rules.mk.orig Mon Oct 2 08:18:13 2006
+++ security/coreconf/rules.mk Mon Dec 11 15:49:56 2006
@@ -348,7 +348,6 @@ ifdef XP_OS2_VACPP
else
$(MKSHLIB) -o $@ $(OBJS) $(SUB_SHLOBJS) $(LD_LIBS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS)
$(MKSHLIB) -o $@ $(OBJS) $(SUB_SHLOBJS) $(LD_LIBS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS)
endif
- chmod +x $@
ifeq ($(OS_TARGET),Darwin)

12
www/mozilla-firefox/patches/patch-security_manager_Makefile_in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-security_manager_Makefile_in,v 1.1 2006/11/17 19:14:51 kurt Exp $
--- security/manager/Makefile.in.orig Mon Nov 6 14:42:50 2006
+++ security/manager/Makefile.in Mon Nov 6 14:41:57 2006
@@ -79,7 +79,7 @@ endif
# NSS makefiles are not safe for parallel execution.
DEFAULT_GMAKE_FLAGS = MAKE="$(MAKE) -j1" -j1
DEFAULT_GMAKE_FLAGS += CC="$(CC)"
-DEFAULT_GMAKE_FLAGS += MOZILLA_INCLUDES="-I$(MOZ_BUILD_ROOT)/dist/include/nspr -I$(MOZ_BUILD_ROOT)/dist/include/dbm"
+DEFAULT_GMAKE_FLAGS += MOZILLA_INCLUDES="$(NSPR_CFLAGS) -I$(MOZ_BUILD_ROOT)/dist/include/dbm"
DEFAULT_GMAKE_FLAGS += SOURCE_MD_DIR=$(MOZ_BUILD_ROOT)/dist
DEFAULT_GMAKE_FLAGS += DIST=$(MOZ_BUILD_ROOT)/dist
DEFAULT_GMAKE_FLAGS += MOZILLA_CLIENT=1

14
www/mozilla-firefox/patches/patch-security_manager_ssl_src_Makefile_in Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-security_manager_ssl_src_Makefile_in,v 1.1 2007/01/12 21:46:17 kurt Exp $
--- security/manager/ssl/src/Makefile.in.orig Wed Jan 10 13:09:11 2007
+++ security/manager/ssl/src/Makefile.in Wed Jan 10 14:17:42 2007
@@ -126,7 +126,10 @@ REQUIRES = nspr \
EXTRA_DEPS = $(NSS_DEP_LIBS)
+NSS_LIBDIR = $(shell $(NSS_CONFIG) --libdir)
+
DEFINES += -DNSS_ENABLE_ECC
+DEFINES += -DNSS_LIBDIR=\"$(NSS_LIBDIR)\"
# Use local includes because they are inserted before INCLUDES
# so that Mozilla's nss.h is used, not glibc's

27
www/mozilla-firefox/patches/patch-security_manager_ssl_src_nsNSSComponent_cpp Normal file
View File

@ -0,0 +1,27 @@
$OpenBSD: patch-security_manager_ssl_src_nsNSSComponent_cpp,v 1.1 2007/01/12 21:46:17 kurt Exp $
--- security/manager/ssl/src/nsNSSComponent.cpp.orig Mon May 15 21:24:30 2006
+++ security/manager/ssl/src/nsNSSComponent.cpp Wed Jan 10 18:13:16 2007
@@ -699,11 +699,10 @@ nsNSSComponent::InstallLoadableRoots()
return;
const char *possible_ckbi_locations[] = {
+ 0, // This special value means:
+ // search for ckbi in the the system NSS_LIBDIR
NS_GRE_DIR,
- NS_XPCOM_CURRENT_PROCESS_DIR,
- 0 // This special value means:
- // search for ckbi in the directories on the shared
- // library/DLL search path
+ NS_XPCOM_CURRENT_PROCESS_DIR
};
for (size_t il = 0; il < sizeof(possible_ckbi_locations)/sizeof(const char*); ++il) {
@@ -712,7 +711,7 @@ nsNSSComponent::InstallLoadableRoots()
if (!possible_ckbi_locations[il])
{
- fullModuleName = PR_GetLibraryName(nsnull, "nssckbi");
+ fullModuleName = PR_GetLibraryName(NSS_LIBDIR, "nssckbi");
}
else
{

12
www/mozilla-firefox/patches/patch-security_nss_Makefile
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-security_nss_Makefile,v 1.1 2006/11/17 19:14:51 kurt Exp $
--- security/nss/Makefile.orig Mon Nov 6 14:33:02 2006
+++ security/nss/Makefile Mon Nov 6 14:33:51 2006
@@ -78,7 +78,7 @@ include $(CORE_DEPTH)/coreconf/rules.mk
# (7) Execute "local" rules. (OPTIONAL). #
#######################################################################
-nss_build_all: build_coreconf build_nspr build_dbm all
+nss_build_all: build_coreconf build_dbm all
build_coreconf:
cd $(CORE_DEPTH)/coreconf ; $(MAKE)

13
www/mozilla-firefox/patches/patch-security_nss_cmd_pkiutil_platlibs_mk
View File

@ -1,13 +0,0 @@
$OpenBSD: patch-security_nss_cmd_pkiutil_platlibs_mk,v 1.1 2006/11/17 19:14:51 kurt Exp $
--- security/nss/cmd/pkiutil/platlibs.mk.orig Mon Nov 6 18:34:15 2006
+++ security/nss/cmd/pkiutil/platlibs.mk Mon Nov 6 18:34:40 2006
@@ -50,8 +50,6 @@ EXTRA_SHARED_LIBS += \
-L$(DIST)/lib/ \
-lnsspki3 \
-lnss3 \
- -lplc4 \
- -lplds4 \
- -lnspr4 \
+ $(NSPR_LIBS) \
$(NULL)

26
www/mozilla-firefox/patches/patch-security_nss_cmd_platlibs_mk
View File

@ -1,26 +0,0 @@
$OpenBSD: patch-security_nss_cmd_platlibs_mk,v 1.1 2006/11/17 19:14:51 kurt Exp $
--- security/nss/cmd/platlibs.mk.orig Mon Nov 6 17:57:12 2006
+++ security/nss/cmd/platlibs.mk Mon Nov 6 21:13:35 2006
@@ -136,10 +136,7 @@ EXTRA_SHARED_LIBS += \
$(NULL)
else
EXTRA_SHARED_LIBS += \
- -L$(DIST)/lib \
- -lplc4 \
- -lplds4 \
- -lnspr4 \
+ $(NSPR_LIBS) \
$(NULL)
endif
endif
@@ -222,9 +219,7 @@ EXTRA_SHARED_LIBS += \
-lssl3 \
-lsmime3 \
-lnss3 \
- -lplc4 \
- -lplds4 \
- -lnspr4 \
+ $(NSPR_LIBS) \
$(NULL)
JAR_LIBS = $(DIST)/lib/$(LIB_PREFIX)jar.$(LIB_SUFFIX) \

14
www/mozilla-firefox/patches/patch-security_nss_lib_ckfw_builtins_Makefile
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-security_nss_lib_ckfw_builtins_Makefile,v 1.1 2006/11/17 19:14:51 kurt Exp $
--- security/nss/lib/ckfw/builtins/Makefile.orig Mon Nov 6 20:15:16 2006
+++ security/nss/lib/ckfw/builtins/Makefile Mon Nov 6 20:15:58 2006
@@ -68,8 +68,8 @@ endif
else
EXTRA_LIBS += \
- $(DIST)/lib/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \
- $(DIST)/lib/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \
+ $(LOCALBASE)/lib/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \
+ $(LOCALBASE)/lib/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \
$(NULL)
endif

14
www/mozilla-firefox/patches/patch-security_nss_lib_fortcrypt_swfort_pkcs11_Makefile
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-security_nss_lib_fortcrypt_swfort_pkcs11_Makefile,v 1.1 2006/11/17 19:14:51 kurt Exp $
--- security/nss/lib/fortcrypt/swfort/pkcs11/Makefile.orig Tue Nov 7 08:42:33 2006
+++ security/nss/lib/fortcrypt/swfort/pkcs11/Makefile Tue Nov 7 08:44:01 2006
@@ -98,8 +98,8 @@ EXTRA_LIBS += \
$(DIST)/lib/$(LIB_PREFIX)softokn.$(LIB_SUFFIX) \
$(CRYPTO_LIB) \
$(DIST)/lib/$(LIB_PREFIX)secutil.$(LIB_SUFFIX) \
- $(DIST)/lib/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \
- $(DIST)/lib/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \
+ $(LOCALBASE)/lib/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \
+ $(LOCALBASE)/lib/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \
$(NULL)
endif

14
www/mozilla-firefox/patches/patch-security_nss_lib_nss_config_mk
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-security_nss_lib_nss_config_mk,v 1.1 2006/11/17 19:14:51 kurt Exp $
--- security/nss/lib/nss/config.mk.orig Mon Nov 6 15:46:02 2006
+++ security/nss/lib/nss/config.mk Mon Nov 6 15:46:24 2006
@@ -74,9 +74,7 @@ else
EXTRA_SHARED_LIBS += \
-L$(DIST)/lib/ \
-lsoftokn3 \
- -lplc4 \
- -lplds4 \
- -lnspr4 \
+ $(NSPR_LIBS) \
$(NULL)
endif

14
www/mozilla-firefox/patches/patch-security_nss_lib_smime_config_mk
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-security_nss_lib_smime_config_mk,v 1.1 2006/11/17 19:14:51 kurt Exp $
--- security/nss/lib/smime/config.mk.orig Mon Nov 6 15:45:25 2006
+++ security/nss/lib/smime/config.mk Mon Nov 6 15:45:49 2006
@@ -68,9 +68,7 @@ else
EXTRA_SHARED_LIBS += \
-L$(DIST)/lib/ \
-lnss3 \
- -lplc4 \
- -lplds4 \
- -lnspr4 \
+ $(NSPR_LIBS) \
$(NULL)
ifeq ($(OS_ARCH), Darwin)

15
www/mozilla-firefox/patches/patch-security_nss_lib_softoken_config_mk
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-security_nss_lib_softoken_config_mk,v 1.1 2006/11/17 19:14:51 kurt Exp $
--- security/nss/lib/softoken/config.mk.orig Mon Nov 6 15:41:50 2006
+++ security/nss/lib/softoken/config.mk Mon Nov 6 15:45:13 2006
@@ -80,10 +80,7 @@ else
# $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS)
# $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX.
EXTRA_SHARED_LIBS += \
- -L$(DIST)/lib/ \
- -lplc4 \
- -lplds4 \
- -lnspr4 \
+ $(NSPR_LIBS) \
$(NULL)
endif

14
www/mozilla-firefox/patches/patch-security_nss_lib_ssl_config_mk
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-security_nss_lib_ssl_config_mk,v 1.1 2006/11/17 19:14:51 kurt Exp $
--- security/nss/lib/ssl/config.mk.orig Mon Nov 6 15:44:07 2006
+++ security/nss/lib/ssl/config.mk Mon Nov 6 15:44:53 2006
@@ -73,9 +73,7 @@ else
EXTRA_SHARED_LIBS += \
-L$(DIST)/lib/ \
-lnss3 \
- -lplc4 \
- -lplds4 \
- -lnspr4 \
+ $(NSPR_LIBS) \
$(NULL)
ifeq ($(OS_ARCH), BeOS)

10
www/mozilla-firefox/pkg/DESCR
View File

@ -1,10 +0,0 @@
The Mozilla Firefox project is a redesign of Mozilla's browser
component, written using the XUL user interface language and designed
to be cross-platform.
Firefox looks for plugins in ~/.mozilla/plugins
${LOCALBASE}/mozilla-firefox/plugins
and ${LOCALBASE}/lib/mozilla-plugins.
To disable anti-aliasing (xft) altogether set GDK_USE_XFT=0 in the
environment.

1
www/mozilla-firefox/pkg/DESCR-devel Normal file
View File

@ -0,0 +1 @@
include and idl files for programs that use the Gecko layout engine

15
www/mozilla-firefox/pkg/DESCR-main Normal file
View File

@ -0,0 +1,15 @@
Firefox 2 is the next generation release of the award-winning Firefox
web browser from Mozilla. It is full of helpful features to make your
time online more productive.
* Improved Tabbed Browsing;
* Spell Checking;
* Search Suggestions;
* Session Restore;
* Web Feeds (RSS);
* Live Titles;
* Integrated Search;
* Live Bookmarks;
* Pop-up Blocker;
* Phishing Protection;
* Search Engine Manager.

0
www/mozilla-firefox/pkg/MESSAGE → www/mozilla-firefox/pkg/MESSAGE-main
View File

13
www/mozilla-firefox/pkg/PFRAG.shared → www/mozilla-firefox/pkg/PFRAG.shared-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PFRAG.shared,v 1.10 2006/11/17 19:14:51 kurt Exp $
@comment $OpenBSD: PFRAG.shared-main,v 1.1 2007/01/12 21:46:17 kurt Exp $
@lib mozilla-firefox/components/libaccessibility.so.${LIBaccessibility_VERSION}
@lib mozilla-firefox/components/libappcomps.so.${LIBappcomps_VERSION}
@lib mozilla-firefox/components/libauth.so.${LIBauth_VERSION}
@ -25,6 +25,7 @@
@lib mozilla-firefox/components/libjsd.so.${LIBjsd_VERSION}
@lib mozilla-firefox/components/libmork.so.${LIBmork_VERSION}
@lib mozilla-firefox/components/libmozfind.so.${LIBmozfind_VERSION}
@lib mozilla-firefox/components/libmyspell.so.${LIBmyspell_VERSION}
@lib mozilla-firefox/components/libnecko.so.${LIBnecko_VERSION}
@lib mozilla-firefox/components/libnecko2.so.${LIBnecko2_VERSION}
@lib mozilla-firefox/components/libnsappshell.so.${LIBnsappshell_VERSION}
@ -37,6 +38,8 @@
@lib mozilla-firefox/components/librdf.so.${LIBrdf_VERSION}
@lib mozilla-firefox/components/libremoteservice.so.${LIBremoteservice_VERSION}
@lib mozilla-firefox/components/libsearchservice.so.${LIBsearchservice_VERSION}
@lib mozilla-firefox/components/libspellchecker.so.${LIBspellchecker_VERSION}
@lib mozilla-firefox/components/libstoragecomps.so.${LIBstoragecomps_VERSION}
@lib mozilla-firefox/components/libsystem-pref.so.${LIBsystem-pref_VERSION}
@lib mozilla-firefox/components/libtoolkitcomps.so.${LIBtoolkitcomps_VERSION}
@lib mozilla-firefox/components/libtransformiix.so.${LIBtransformiix_VERSION}
@ -51,19 +54,15 @@
@lib mozilla-firefox/components/libxpcom_compat_c.so.${LIBxpcom_compat_c_VERSION}
@lib mozilla-firefox/components/libxpconnect.so.${LIBxpconnect_VERSION}
@lib mozilla-firefox/components/libxpinstall.so.${LIBxpinstall_VERSION}
@lib mozilla-firefox/extensions/inspector@mozilla.org/components/libinspector.so.${LIBinspector_VERSION}
@lib mozilla-firefox/libgfxpsshar.so.${LIBgfxpsshar_VERSION}
@lib mozilla-firefox/libgkgfx.so.${LIBgkgfx_VERSION}
@lib mozilla-firefox/libgtkembedmoz.so.${LIBgtkembedmoz_VERSION}
@lib mozilla-firefox/libgtkxtbin.so.${LIBgtkxtbin_VERSION}
@lib mozilla-firefox/libjsj.so.${LIBjsj_VERSION}
@lib mozilla-firefox/libmozjs.so.${LIBmozjs_VERSION}
@lib mozilla-firefox/libnss3.so.${LIBnss3_VERSION}
@lib mozilla-firefox/libnssckbi.so.${LIBnssckbi_VERSION}
@lib mozilla-firefox/libsmime3.so.${LIBsmime3_VERSION}
@lib mozilla-firefox/libsoftokn3.so.${LIBsoftokn3_VERSION}
@lib mozilla-firefox/libssl3.so.${LIBssl3_VERSION}
@lib mozilla-firefox/libxpcom.so.${LIBxpcom_VERSION}
@lib mozilla-firefox/libxpcom_compat.so.${LIBxpcom_compat_VERSION}
@lib mozilla-firefox/libxpcom_core.so.${LIBxpcom_core_VERSION}
@lib mozilla-firefox/libxpistub.so.${LIBxpistub_VERSION}
@lib mozilla-firefox/plugins/libnullplugin.so.${LIBnullplugin_VERSION}
@lib mozilla-firefox/plugins/libunixprintplugin.so.${LIBunixprintplugin_VERSION}

3057
www/mozilla-firefox/pkg/PLIST-devel Normal file
View File

File diff suppressed because it is too large Load Diff

73
www/mozilla-firefox/pkg/PLIST → www/mozilla-firefox/pkg/PLIST-main
View File

@ -1,12 +1,14 @@
@comment $OpenBSD: PLIST,v 1.15 2005/12/26 02:17:53 ian Exp $
@comment $OpenBSD: PLIST-main,v 1.1 2007/01/12 21:46:17 kurt Exp $
@conflict mozilla-firebird-*
@pkgpath www/mozilla-firefox
%%SHARED%%
bin/firefox
bin/firefox-config
bin/mozilla-firefox
mozilla-firefox/
mozilla-firefox/LICENSE
mozilla-firefox/README.OpenBSD
mozilla-firefox/bloaturls.txt
mozilla-firefox/browserconfig.properties
mozilla-firefox/chrome/
mozilla-firefox/chrome/browser.jar
mozilla-firefox/chrome/browser.manifest
@ -27,6 +29,10 @@ mozilla-firefox/chrome/reporter.manifest
mozilla-firefox/chrome/toolkit.jar
mozilla-firefox/chrome/toolkit.manifest
mozilla-firefox/components/
mozilla-firefox/components/FeedConverter.js
mozilla-firefox/components/FeedProcessor.js
mozilla-firefox/components/FeedWriter.js
mozilla-firefox/components/WebContentConverter.js
mozilla-firefox/components/accessibility-atk.xpt
mozilla-firefox/components/accessibility.xpt
mozilla-firefox/components/alerts.xpt
@ -35,7 +41,9 @@ mozilla-firefox/components/appstartup.xpt
mozilla-firefox/components/autocomplete.xpt
mozilla-firefox/components/autoconfig.xpt
mozilla-firefox/components/bookmarks.xpt
mozilla-firefox/components/browser-feeds.xpt
mozilla-firefox/components/browsercompsbase.xpt
mozilla-firefox/components/browsersearch.xpt
mozilla-firefox/components/caps.xpt
mozilla-firefox/components/chardet.xpt
mozilla-firefox/components/chrome.xpt
@ -60,6 +68,8 @@ mozilla-firefox/components/dom_events.xpt
mozilla-firefox/components/dom_html.xpt
mozilla-firefox/components/dom_loadsave.xpt
mozilla-firefox/components/dom_range.xpt
mozilla-firefox/components/dom_sidebar.xpt
mozilla-firefox/components/dom_storage.xpt
mozilla-firefox/components/dom_stylesheets.xpt
mozilla-firefox/components/dom_svg.xpt
mozilla-firefox/components/dom_traversal.xpt
@ -73,13 +83,16 @@ mozilla-firefox/components/embed_base.xpt
mozilla-firefox/components/extensions.xpt
mozilla-firefox/components/exthandler.xpt
mozilla-firefox/components/fastfind.xpt
mozilla-firefox/components/feeds.xpt
mozilla-firefox/components/filepicker.xpt
mozilla-firefox/components/find.xpt
mozilla-firefox/components/gfx.xpt
mozilla-firefox/components/gksvgrenderer.xpt
mozilla-firefox/components/globalstore.js
mozilla-firefox/components/history.xpt
mozilla-firefox/components/htmlparser.xpt
mozilla-firefox/components/imglib2.xpt
mozilla-firefox/components/inspector.xpt
mozilla-firefox/components/intl.xpt
mozilla-firefox/components/jar.xpt
mozilla-firefox/components/jsconsole-clhandler.js
@ -91,6 +104,7 @@ mozilla-firefox/components/layout_xul.xpt
mozilla-firefox/components/layout_xul_tree.xpt
mozilla-firefox/components/locale.xpt
mozilla-firefox/components/lwbrk.xpt
mozilla-firefox/components/microsummaries.xpt
mozilla-firefox/components/migration.xpt
mozilla-firefox/components/mimetype.xpt
mozilla-firefox/components/mozbrwsr.xpt
@ -109,6 +123,7 @@ mozilla-firefox/components/necko_res.xpt
mozilla-firefox/components/necko_socket.xpt
mozilla-firefox/components/necko_strconv.xpt
mozilla-firefox/components/necko_viewsource.xpt
mozilla-firefox/components/nsBookmarkTransactionManager.js
mozilla-firefox/components/nsBrowserContentHandler.js
mozilla-firefox/components/nsBrowserGlue.js
mozilla-firefox/components/nsCloseAllWindows.js
@ -119,12 +134,22 @@ mozilla-firefox/components/nsFilePicker.js
mozilla-firefox/components/nsHelperAppDlg.js
mozilla-firefox/components/nsInterfaceInfoToIDL.js
mozilla-firefox/components/nsKillAll.js
mozilla-firefox/components/nsMicrosummaryService.js
mozilla-firefox/components/nsProgressDialog.js
mozilla-firefox/components/nsProxyAutoConfig.js
mozilla-firefox/components/nsResetPref.js
mozilla-firefox/components/nsSafebrowsingApplication.js
mozilla-firefox/components/nsSearchService.js
mozilla-firefox/components/nsSearchSuggestions.js
mozilla-firefox/components/nsSessionStartup.js
mozilla-firefox/components/nsSessionStore.js
mozilla-firefox/components/nsSetDefaultBrowser.js
mozilla-firefox/components/nsSidebar.js
mozilla-firefox/components/nsURLFormatter.js
mozilla-firefox/components/nsUpdateService.js
mozilla-firefox/components/nsUrlClassifierLib.js
mozilla-firefox/components/nsUrlClassifierListManager.js
mozilla-firefox/components/nsUrlClassifierTable.js
mozilla-firefox/components/nsXmlRpcClient.js
mozilla-firefox/components/oji.xpt
mozilla-firefox/components/passwordmgr.xpt
@ -138,11 +163,15 @@ mozilla-firefox/components/profile.xpt
mozilla-firefox/components/progressDlg.xpt
mozilla-firefox/components/proxyObjInst.xpt
mozilla-firefox/components/rdf.xpt
mozilla-firefox/components/safebrowsing.xpt
mozilla-firefox/components/satchel.xpt
mozilla-firefox/components/saxparser.xpt
mozilla-firefox/components/search.xpt
mozilla-firefox/components/sessionstore.xpt
mozilla-firefox/components/shellservice.xpt
mozilla-firefox/components/shistory.xpt
mozilla-firefox/components/sidebar.xpt
mozilla-firefox/components/spellchecker.xpt
mozilla-firefox/components/storage.xpt
mozilla-firefox/components/toolkitprofile.xpt
mozilla-firefox/components/toolkitremote.xpt
mozilla-firefox/components/txmgr.xpt
@ -151,6 +180,8 @@ mozilla-firefox/components/uconv.xpt
mozilla-firefox/components/unicharutil.xpt
mozilla-firefox/components/update.xpt
mozilla-firefox/components/uriloader.xpt
mozilla-firefox/components/url-classifier.xpt
mozilla-firefox/components/urlformatter.xpt
mozilla-firefox/components/webBrowser_core.xpt
mozilla-firefox/components/webbrowserpersist.xpt
mozilla-firefox/components/webshell_idls.xpt
@ -159,7 +190,6 @@ mozilla-firefox/components/widget.xpt
mozilla-firefox/components/windowds.xpt
mozilla-firefox/components/windowwatcher.xpt
mozilla-firefox/components/xml-rpc.xpt
mozilla-firefox/components/xmlextras.xpt
mozilla-firefox/components/xpcom_base.xpt
mozilla-firefox/components/xpcom_components.xpt
mozilla-firefox/components/xpcom_ds.xpt
@ -178,6 +208,7 @@ mozilla-firefox/defaults/autoconfig/platform.js
mozilla-firefox/defaults/autoconfig/prefcalls.js
mozilla-firefox/defaults/pref/
mozilla-firefox/defaults/pref/channel-prefs.js
mozilla-firefox/defaults/pref/firefox-branding.js
mozilla-firefox/defaults/pref/firefox-l10n.js
mozilla-firefox/defaults/pref/firefox.js
mozilla-firefox/defaults/pref/reporter.js
@ -190,6 +221,9 @@ mozilla-firefox/defaults/profile/localstore.rdf
mozilla-firefox/defaults/profile/mimeTypes.rdf
mozilla-firefox/defaults/profile/prefs.js
mozilla-firefox/defaults/profile/search.rdf
mozilla-firefox/dictionaries/
mozilla-firefox/dictionaries/en-US.aff
mozilla-firefox/dictionaries/en-US.dic
mozilla-firefox/extensions/
mozilla-firefox/extensions/inspector@mozilla.org/
mozilla-firefox/extensions/inspector@mozilla.org/chrome/
@ -198,7 +232,6 @@ mozilla-firefox/extensions/inspector@mozilla.org/chrome/chromelist.txt
mozilla-firefox/extensions/inspector@mozilla.org/chrome/inspector.jar
mozilla-firefox/extensions/inspector@mozilla.org/components/
mozilla-firefox/extensions/inspector@mozilla.org/components/inspector-cmdline.js
mozilla-firefox/extensions/inspector@mozilla.org/components/inspector.xpt
mozilla-firefox/extensions/inspector@mozilla.org/defaults/
mozilla-firefox/extensions/inspector@mozilla.org/defaults/preferences/
mozilla-firefox/extensions/inspector@mozilla.org/defaults/preferences/inspector.js
@ -210,10 +243,16 @@ mozilla-firefox/greprefs/
mozilla-firefox/greprefs/all.js
mozilla-firefox/greprefs/security-prefs.js
mozilla-firefox/greprefs/xpinstall.js
mozilla-firefox/mozicon16.xpm
mozilla-firefox/mozicon50.xpm
mozilla-firefox/icons/
mozilla-firefox/icons/document.png
mozilla-firefox/icons/mozicon128.png
mozilla-firefox/icons/mozicon16.xpm
mozilla-firefox/icons/mozicon50.xpm
mozilla-firefox/init.d/
mozilla-firefox/init.d/README
mozilla-firefox/mozilla-firefox-bin
mozilla-firefox/mozilla-xremote-client
mozilla-firefox/plugins/
mozilla-firefox/regxpcom
mozilla-firefox/res/
mozilla-firefox/res/EditorOverride.css
@ -379,23 +418,15 @@ mozilla-firefox/res/viewer.properties
mozilla-firefox/res/viewsource.css
mozilla-firefox/run-mozilla.sh
mozilla-firefox/searchplugins/
mozilla-firefox/searchplugins/amazondotcom.png
mozilla-firefox/searchplugins/amazondotcom.src
mozilla-firefox/searchplugins/answers.png
mozilla-firefox/searchplugins/answers.src
mozilla-firefox/searchplugins/creativecommons.png
mozilla-firefox/searchplugins/creativecommons.src
mozilla-firefox/searchplugins/eBay.gif
mozilla-firefox/searchplugins/eBay.src
mozilla-firefox/searchplugins/google.gif
mozilla-firefox/searchplugins/google.src
mozilla-firefox/searchplugins/yahoo.gif
mozilla-firefox/searchplugins/yahoo.src
mozilla-firefox/searchplugins/amazondotcom.xml
mozilla-firefox/searchplugins/answers.xml
mozilla-firefox/searchplugins/creativecommons.xml
mozilla-firefox/searchplugins/eBay.xml
mozilla-firefox/searchplugins/google.xml
mozilla-firefox/searchplugins/yahoo.xml
@cwd ${LOCALBASE}/mozilla-firefox
@exec rm -rf /tmp/.mozilla
@exec cd %D && env HOME=/tmp LD_LIBRARY_PATH=%D ./regxpcom
@exec rm -rf /tmp/.mozilla
@unexec rm -f %D/components/compreg.dat
@unexec rm -f %D/components/xpti.dat
@unexec rm -f %D/chrome/chrome.rdf
@unexec rm -rf %D/chrome/overlayinfo