head	1.4;
access;
symbols
	RELEASE_8_3_0:1.3
	RELEASE_9_0_0:1.3
	RELEASE_7_4_0:1.3
	RELEASE_8_2_0:1.3
	RELEASE_6_EOL:1.3
	RELEASE_8_1_0:1.3
	RELEASE_7_3_0:1.3
	RELEASE_8_0_0:1.3
	RELEASE_7_2_0:1.2
	RELEASE_7_1_0:1.2
	RELEASE_6_4_0:1.2
	RELEASE_5_EOL:1.2
	RELEASE_7_0_0:1.2
	RELEASE_6_3_0:1.2
	old_PRE_XORG_7:1.1
	old_RELEASE_4_EOL:1.1
	old_RELEASE_6_2_0:1.1
	old_RELEASE_6_1_0:1.1
	old_RELEASE_5_5_0:1.1;
locks; strict;
comment	@# @;


1.4
date	2013.03.22.13.08.37;	author svnexp;	state dead;
branches;
next	1.3;

1.3
date	2009.09.03.14.47.04;	author beat;	state Exp;
branches;
next	1.2;

1.2
date	2007.10.09.00.26.21;	author ahze;	state Exp;
branches;
next	1.1;

1.1
date	2005.11.29.21.14.01;	author ahze;	state Exp;
branches;
next	;


desc
@@


1.4
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/314899
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@--- 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	2009-05-02 18:42:16.000000000 +0200
+++ security/manager/Makefile.in	2009-08-31 14:54:01.000000000 +0200
@@@@ -54,22 +54,14 @@@@
 	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
 
@@@@ -218,11 +210,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
 
@@@@ -245,8 +232,6 @@@@
 endif
 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
 ifndef MOZ_NATIVE_NSS
 	$(MAKE) -C $(topsrcdir)/security/nss/lib/util $(DEFAULT_GMAKE_FLAGS) clean
@@@@ -256,48 +241,6 @@@@
 	$(MAKE) -C $(topsrcdir)/security/nss-fips/lib/softoken $(DEFAULT_GMAKE_FLAGS) libs
 	$(MAKE) -C $(topsrcdir)/security/nss-fips/lib/util $(DEFAULT_GMAKE_FLAGS) clean
 	# In NSS 3.11.8-3.11.9, lib/ssl/derive.c includes cmd/lib/secutil.h.
-	$(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) export
-	$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) DIRS="util base dev pki pki1 certdb certhigh pk11wrap cryptohi nss ssl pkcs12 pkcs7 smime crmf jar ckfw ckfw/builtins"
-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 $@@
@@@@ -308,42 +251,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 $@@
@@@@ -361,11 +268,6 @@@@
 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::
--- security/manager/ssl/src/Makefile.in.orig	2009-05-02 18:42:14.000000000 +0200
+++ security/manager/ssl/src/Makefile.in	2009-08-31 14:56:30.000000000 +0200
@@@@ -131,7 +131,8 @@@@
 
 # 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 \
+		$(NULL)	
 
 EXTRA_DSO_LDOPTS += \
 		$(MOZ_UNICHARUTIL_LIBS) \
--- security/manager/ssl/src/nsNSSComponent.cpp.orig	2009-08-31 14:58:10.000000000 +0200
+++ security/manager/ssl/src/nsNSSComponent.cpp	2009-08-31 15:00:26.000000000 +0200
@@@@ -124,6 +124,10 @@@@
 #include "p12plcy.h"
 }
 
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <errno.h>
+
 #ifdef PR_LOGGING
 PRLogModuleInfo* gPIPNSSLog = nsnull;
 #endif
@@@@ -703,6 +707,7 @@@@
 
     const char *possible_ckbi_locations[] = {
       NS_GRE_DIR,
+      NS_UNIX_LIB_DIR,
       NS_XPCOM_CURRENT_PROCESS_DIR,
       0 // This special value means: 
         //   search for ckbi in the directories on the shared
@@@@ -711,12 +716,20 @@@@
 
     for (size_t il = 0; il < sizeof(possible_ckbi_locations)/sizeof(const char*); ++il) {
       nsCOMPtr<nsILocalFile> mozFile;
-      char *fullModuleName = nsnull;
+      char *fullModuleName;
 
       if (!possible_ckbi_locations[il])
       {
         fullModuleName = PR_GetLibraryName(nsnull, "nssckbi");
       }
+      if (fullModuleName == nsnull)
+        continue;
+      struct stat sb;
+      if (stat(fullModuleName, &sb)) {
+         if (errno != ENOENT)
+           perror(fullModuleName);
+         continue;
+      }
       else
       {
         directoryService->Get( possible_ckbi_locations[il],
@


1.3
log
@- Unbreak and update to 0.8a4

With hat:	gecko
@
text
@@


1.2
log
@Add kompozer

Complete Web Authoring System that combines web file management and easy-to-use
WYSIWYG web page editing. Kompozer (formally Nvu) is based on the Firefox
codebase and is designed to be extremely easy to use, making it ideal for
non-technical computer users who want to create an attractive, professional
looking web site without needing to know HTML or web coding.

Features:
 - FTP site manager
 - A new color picker
 - Tabs!
 - CSS editor
 - A dash of style(s)
 - Customizable toolbars
 - Forms
 - Cleaner markup
 - Visible marks

WWW: http://www.kompozer.net/

Repocopied from:	www/nvu
Repocopied by:		marcus
@
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 \
d24 2
a25 1
-
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 2
a48 1
@@@@ -153,43 +139,4 @@@@
d53 9
a61 2
-endif
-	$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS)
a65 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
d74 27
a100 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
d104 2
a105 1
@@@@ -200,18 +147,4 @@@@
d108 1
d117 24
a140 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)
d142 4
d148 1
a148 1
@@@@ -227,9 +160,4 @@@@
d150 1
d157 1
d160 4
a163 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 @@@@
d166 1
a166 1
-LOCAL_INCLUDES += -I$(DIST)/public/nss \
d168 1
a168 1
                   $(NULL)
d170 6
a175 24
--- 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 @@@@
d184 3
a186 1
@@@@ -406,4 +410,5 @@@@
d190 4
a193 4
       NS_XPCOM_CURRENT_PROCESS_DIR
     };
@@@@ -419,5 +424,5 @@@@
       }
d195 2
d199 5
a203 5
 #ifdef XP_MAC
       nsCAutoString nativePath;
@@@@ -431,4 +436,12 @@@@
       fullModuleName = PR_GetLibraryName(processDir.get(), "nssckbi");
 #endif
d208 3
a210 3
+        if (errno != ENOENT)
+          perror(fullModuleName);
+        continue;
d212 3
a214 2
       /* If a module exists with the same name, delete it. */
       NS_ConvertUCS2toUTF8 modNameUTF8(modName);
@


1.1
log
@- Use new Makefile.common from mozilla
@
text
@@

