head	1.9;
access;
symbols
	old_old_RELEASE_7_2_0:1.8
	old_old_RELEASE_7_1_0:1.8
	old_old_RELEASE_6_4_0:1.8
	old_old_RELEASE_5_EOL:1.8
	old_old_RELEASE_7_0_0:1.8
	old_old_RELEASE_6_3_0:1.8
	old_old_PRE_XORG_7:1.8
	old_old_RELEASE_6_2_0:1.6
	old_old_old_RELEASE_6_0_0:1.1;
locks; strict;
comment	@# @;


1.9
date	2009.04.25.22.45.27;	author miwi;	state dead;
branches;
next	1.8;

1.8
date	2007.03.19.11.42.52;	author ahze;	state Exp;
branches;
next	1.7;

1.7
date	2006.11.01.13.25.56;	author ahze;	state dead;
branches;
next	1.6;

1.6
date	2006.10.09.00.04.49;	author ahze;	state Exp;
branches;
next	1.5;

1.5
date	2006.03.29.20.45.19;	author ahze;	state Exp;
branches;
next	1.4;

1.4
date	2005.11.29.22.55.39;	author ahze;	state dead;
branches;
next	1.3;

1.3
date	2005.11.18.03.35.16;	author ahze;	state Exp;
branches;
next	1.2;

1.2
date	2005.11.05.06.54.48;	author marcus;	state dead;
branches;
next	1.1;

1.1
date	2005.08.28.07.59.05;	author mezz;	state Exp;
branches;
next	;


desc
@@


1.9
log
@- Update to Firefox 3.1 BETA3

Firefox 3.1 Beta 3 is based on the Gecko 1.9.1 rendering platform,
which has been under development for the past 9 months. Firefox 3.1
is an incremental release on the previous version with significant
changes to improve web compatibility, performance, and ease of use:

    * Improved the new Private Browsing Mode.
    * Improvements to web worker thread support.
    * Improved performance and stability with the new TraceMonkey
      JavaScript engine.
    * New native JSON support.
    * Improvements to the Gecko layout engine, including speculative parsing
      for faster content rendering.
    * Support for new web technologies such as the <video> and <audio> elements,
      the W3C Geolocation API, JavaScript query selectors, CSS 2.1 and 3 properties,
      SVG transforms and offline applications.

Thanks to:	beat@@, nox@@, gahr@@, Florian Smeets,
@
text
@--- security/manager/ssl/src/Makefile.in.orig	Mon Aug 14 19:22:52 2006
+++ security/manager/ssl/src/Makefile.in	Thu Aug 31 15:17:20 2006
@@@@ -124,19 +124,19 @@@@
 		  pipboot \
 		  $(NULL)
 
-EXTRA_DEPS = $(NSS_DEP_LIBS)
 
 DEFINES += -DNSS_ENABLE_ECC
 
 # Use local includes because they are inserted before INCLUDES
 # so that Mozilla's nss.h is used, not glibc's
-LOCAL_INCLUDES += $(NSS_CFLAGS)
+LOCAL_INCLUDES += -I%%LOCALBASE%%/include/nss/nss
 
 EXTRA_DSO_LDOPTS += \
 		$(MOZ_UNICHARUTIL_LIBS) \
 		$(MOZ_COMPONENT_LIBS) \
 		$(MOZ_JS_LIBS) \
 		$(NSS_LIBS) \
+		$(LOCAL_INCLUDES) \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
@


1.8
log
@Readd firefox-devel at version 3.0.a2
@
text
@@


1.7
log
@- Remove firefox-devel now that Firefox 2.0 is stable
@
text
@a0 150
--- Makefile.in	Tue Sep 14 16:59:40 2004
+++ Makefile.in	Tue Aug  2 08:26:55 2005
@@@@ -102,6 +102,4 @@@@
 # tier 1 -  3rd party individual libraries
 #
-tier_1_dirs	+= dbm
-
 ifndef MOZ_NATIVE_JPEG
 tier_1_dirs	+= jpeg
--- security/manager/Makefile.in.orig	Tue Mar 28 14:36:54 2006
+++ security/manager/Makefile.in	Tue Mar 28 14:40:29 2006
@@@@ -54,22 +54,13 @@@@
 	SSL3_LIB \
 	SOFTOKEN3_LIB \
 	SOFTOKEN3_CHK \
-	LOADABLE_ROOT_MODULE \
 	HAVE_FREEBL_LIBS \
 	HAVE_FREEBL_LIBS_32 \
 	HAVE_FREEBL_LIBS_32INT64 \
 	HAVE_FREEBL_LIBS_64 \
 	$(NULL)
-
-LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX)
 endif
 
-NSS3_LIB = $(DLL_PREFIX)nss3$(DLL_SUFFIX)
-SMIME3_LIB = $(DLL_PREFIX)smime3$(DLL_SUFFIX)
-SSL3_LIB =  $(DLL_PREFIX)ssl3$(DLL_SUFFIX)
-SOFTOKEN3_LIB = $(DLL_PREFIX)softokn3$(DLL_SUFFIX)
-SOFTOKEN3_CHK = $(DLL_PREFIX)softokn3.chk
-
 # Default
 HAVE_FREEBL_LIBS = 1
 
@@@@ -217,11 +208,6 @@@@
 .nss.cleaned: .nss.checkout
 ifndef MOZ_NATIVE_NSS
 	$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
-	$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
-ifndef SKIP_CHK
-	$(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean
-	$(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
-endif
 	touch $@@
 endif
 
@@@@ -248,47 +234,6 @@@@
 	cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX)
 endif
 ifndef MOZ_NATIVE_NSS
-	$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS)
-ifndef SKIP_CHK
-	$(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS)
-	$(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS)
-endif
-	$(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin
-ifndef SKIP_CHK
-	$(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DIST)/bin
-endif
-	$(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DIST)/bin
-	$(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DIST)/bin
-	$(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DIST)/bin
-	$(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DIST)/bin
-ifdef HAVE_FREEBL_LIBS
-ifndef SKIP_CHK
-	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_CHK) $(DIST)/bin
-endif
-	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(DIST)/bin
-endif
-ifdef HAVE_FREEBL_LIBS_32
-ifndef SKIP_CHK
-	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT_CHK) $(DIST)/bin
-	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32FPU_CHK) $(DIST)/bin
-endif
-	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT_LIB) $(DIST)/bin
-	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32FPU_LIB) $(DIST)/bin
-endif
-ifdef HAVE_FREEBL_LIBS_32INT64
-ifndef SKIP_CHK
-	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT64_CHK) $(DIST)/bin
-endif
-	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT64_LIB) $(DIST)/bin
-endif
-ifdef HAVE_FREEBL_LIBS_64
-ifndef SKIP_CHK
-	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_64INT_CHK) $(DIST)/bin
-	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_64FPU_CHK) $(DIST)/bin
-endif
-	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DIST)/bin
-	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DIST)/bin
-endif
 endif
 	$(MAKE) -C boot $@@
 	$(MAKE) -C ssl $@@
@@@@ -299,42 +244,6 @@@@
 
 install::
 ifndef MOZ_NATIVE_NSS
-	$(SYSINSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DESTDIR)$(mozappdir)
-ifndef SKIP_CHK
-	$(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DESTDIR)$(mozappdir)
-endif
-	$(SYSINSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DESTDIR)$(mozappdir)
-	$(SYSINSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DESTDIR)$(mozappdir)
-	$(SYSINSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DESTDIR)$(mozappdir)
-	$(SYSINSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DESTDIR)$(mozappdir)
-ifdef HAVE_FREEBL_LIBS
-ifndef SKIP_CHK
-	$(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_CHK) $(DESTDIR)$(mozappdir)
-endif
-	$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(DESTDIR)$(mozappdir)
-endif
-ifdef HAVE_FREEBL_LIBS_32
-ifndef SKIP_CHK
-	$(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT_CHK) $(DESTDIR)$(mozappdir)
-	$(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32FPU_CHK) $(DESTDIR)$(mozappdir)
-endif
-	$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT_LIB) $(DESTDIR)$(mozappdir)
-	$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32FPU_LIB) $(DESTDIR)$(mozappdir)
-endif
-ifdef HAVE_FREEBL_LIBS_32INT64
-ifndef SKIP_CHK
-	$(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT64_CHK) $(DESTDIR)$(mozappdir)
-endif
-	$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT64_LIB) $(DESTDIR)$(mozappdir)
-endif
-ifdef HAVE_FREEBL_LIBS_64
-ifndef SKIP_CHK
-	$(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_64INT_CHK) $(DESTDIR)$(mozappdir)
-	$(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_64FPU_CHK) $(DESTDIR)$(mozappdir)
-endif
-	$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DESTDIR)$(mozappdir)
-	$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DESTDIR)$(mozappdir)
-endif
 endif
 	$(MAKE) -C boot $@@
 	$(MAKE) -C ssl $@@
@@@@ -351,12 +260,6 @@@@
 	$(MAKE) -C pki $@@
 endif
 ifndef MOZ_NATIVE_NSS
-	$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
-	$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
-ifndef SKIP_CHK
-	$(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean
-	$(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
-endif
 endif
 
 echo-requires-recursive::
@


1.6
log
@- Update to 2.0rc2
@
text
@@


1.5
log
@- Readd firefox-devel at version 2.0a1
- Add support for USE_GECKO=firefox-devel
- Fix pkg-deinstall to not remove MOZDIR/extensions
@
text
@d151 3
a153 3
--- security/manager/ssl/src/Makefile.in.orig	Tue Jan 31 07:24:14 2006
+++ security/manager/ssl/src/Makefile.in	Tue Mar 28 15:30:44 2006
@@@@ -119,17 +119,16 @@@@
d158 3
a160 1
-
@


1.4
log
@- Remove firefox-devel since firefox 1.5 is stable now
@
text
@d10 4
a13 3
--- security/manager/Makefile.in	Mon Mar 28 19:56:36 2005
+++ security/manager/Makefile.in	Tue Aug  2 09:02:50 2005
@@@@ -37,16 +37,7 @@@@
d17 4
a20 1
 	HAVE_FREEBL_MODULES \
d22 3
a25 2
-LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX)
-
d32 4
a35 3
 ifneq (,$(filter SunOS HP-UX,$(OS_ARCH)))
 ifeq (,$(filter i86pc ia64,$(OS_TEST)))
@@@@ -132,9 +123,4 @@@@
d37 1
d45 1
d47 4
a50 6
@@@@ -153,43 +139,4 @@@@
 ifeq ($(OS_ARCH),WINNT)
 	cd $(DIST)/lib; cp -f $(LIB_PREFIX)dbm$(MOZ_BITS).$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX)
-else
-	cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX)
-endif
a55 17
-ifndef DISABLE_DIST_GRE
-	$(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(GRE_DIST)
-ifndef SKIP_CHK
-	$(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(GRE_DIST)
-endif
-	$(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(GRE_DIST)
-	$(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(GRE_DIST)
-	$(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(GRE_DIST)
-	$(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(GRE_DIST)
-ifdef HAVE_FREEBL_MODULES
-	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(GRE_DIST)
-	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(GRE_DIST)
-	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(GRE_DIST)
-	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(GRE_DIST)
-endif
-endif
-ifndef _SKIP_OLD_GRE_INSTALL
d64 27
a90 5
-ifdef HAVE_FREEBL_MODULES
-	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(DIST)/bin
-	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(DIST)/bin
-	$(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(DIST)/bin
-	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DIST)/bin
d94 2
a95 1
@@@@ -200,18 +147,4 @@@@
d98 1
d107 19
a125 5
-ifdef HAVE_FREEBL_MODULES
-	$(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(DESTDIR)$(mozappdir)
-	$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(DESTDIR)$(mozappdir)
-	$(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(DESTDIR)$(mozappdir)
-	$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DESTDIR)$(mozappdir)
d127 9
d138 2
a139 1
@@@@ -227,9 +160,4 @@@@
d141 2
a142 1
 	$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
d148 1
d151 8
a158 3
--- security/manager/ssl/src/Makefile.in	Wed Jan  7 08:36:51 2004
+++ security/manager/ssl/src/Makefile.in	Tue Aug  2 09:13:07 2005
@@@@ -117,5 +117,5 @@@@
d161 12
a172 62
-LOCAL_INCLUDES += -I$(DIST)/public/nss \
+LOCAL_INCLUDES += -I$(LOCALBASE)/include/nss/nss \
                   $(NULL)
 
--- config/config.mk	Tue Oct 12 00:11:11 2004
+++ config/config.mk	Tue Aug  2 09:19:18 2005
@@@@ -170,5 +170,4 @@@@
 NSS_LIBS	= \
 	$(LIBS_DIR) \
-	$(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
 	-lsmime3 \
 	-lssl3 \
@@@@ -189,11 +188,5 @@@@
 endif
 
-NSS_DEP_LIBS	= \
-	$(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
-	$(DIST)/lib/$(DLL_PREFIX)smime3$(DLL_SUFFIX) \
-	$(DIST)/lib/$(DLL_PREFIX)ssl3$(DLL_SUFFIX) \
-	$(DIST)/lib/$(DLL_PREFIX)nss3$(DLL_SUFFIX) \
-	$(DIST)/lib/$(DLL_PREFIX)softokn3$(DLL_SUFFIX) \
-	$(NULL)
+NSS_DEP_LIBS	=
 
 MOZ_UNICHARUTIL_LIBS = $(DIST)/lib/$(LIB_PREFIX)unicharutil_s.$(LIB_SUFFIX)
--- security/manager/ssl/src/nsNSSComponent.cpp	Thu Apr 22 15:48:30 2004
+++ security/manager/ssl/src/nsNSSComponent.cpp	Thu Aug  4 16:44:27 2005
@@@@ -88,4 +88,8 @@@@
 }
 
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <errno.h>
+
 #ifdef PR_LOGGING
 PRLogModuleInfo* gPIPNSSLog = nsnull;
@@@@ -406,4 +410,5 @@@@
     const char *possible_ckbi_locations[] = {
       NS_GRE_DIR,
+      NS_UNIX_LIB_DIR,
       NS_XPCOM_CURRENT_PROCESS_DIR
     };
@@@@ -419,5 +424,5 @@@@
       }
 
-      char *fullModuleName = nsnull;
+      char *fullModuleName;
 #ifdef XP_MAC
       nsCAutoString nativePath;
@@@@ -431,4 +436,12 @@@@
       fullModuleName = PR_GetLibraryName(processDir.get(), "nssckbi");
 #endif
+      if (fullModuleName == nsnull)
+        continue;
+      struct stat sb;
+      if (stat(fullModuleName, &sb)) {
+        if (errno != ENOENT)
+          perror(fullModuleName);
+        continue;
+      }
       /* If a module exists with the same name, delete it. */
       NS_ConvertUCS2toUTF8 modNameUTF8(modName);
@


1.3
log
@- Update to 1.5rc3
- Use system nss/nspr/libm [1]

Obtained from:	www/firefox [1]
Release notes:	http://www.mozilla.org/products/firefox/releases/1.5.html
@
text
@@


1.2
log
@Add firefox-devel after a repocopy from ports/www/firefox.  Firefox-devel
represents work in progress towards Firefox 1.5.  See
http://www.mozilla.org/products/firefox/releases/1.5.html for more details.

Most of this work was done by ahze and mnag.
@
text
@@


1.1
log
@- Make portlint happier.
- Add Java 5 plugins support. [1]
- Use system's libm (/usr/src/lib/msun), nss, nspr and etc. Also, do
  not extract those. Better explain, use external dependencies. [1]
- Teach firefox-config and *.pc files for nspr that will making other
  third apps to buildable like epiphany, vlc-devel's mozilla plugins
  and etc. Have been tested with full GNOME 2.11.x build too.
- Add four patches: [1]

	patch-bugzilla243151:
		https://bugzilla.mozilla.org/show_bug.cgi?id=243151

	patch-jsosdep:
		Fix the FreeBSD define

	patch-oji-threads:
		64-bit wide pthread_t

	patch-xptcinvoke_x86_64_linux:
		Setting a possibly uninitialized variable (value).

- Fix a crash that can occur using gtk+-2.7 and possibly 2.6.10 when closing
  windows. https://bugzilla.mozilla.org/show_bug.cgi?id=3002 [2]
- Get rid of FIREFOX and FF_VER, best to use PORTNAME and PORTVERSION
  varibles that are arleady exist and lesser complicate.
- Change all hardcore of 'firefox' to PORTNAME.
- Change a manual loop for patch all.js to find(1), so we can sleep
  on it.

Submitted by:	mi [1], marcus [2]
Reviewed by:	my team, FreeBSD GNOME Team.
Tested by:	many
@
text
@@

