aboutsummaryrefslogtreecommitdiff
path: root/deskutils/sunbird
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2006-10-14 08:54:54 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2006-10-14 08:54:54 +0000
commit29747f458a1eb2ce23b4594b09d0256dd62760b8 (patch)
tree1b71ba5d9ffdd308b6c18130f7c116f5bab5dc12 /deskutils/sunbird
parent7aad84f808b93baa6a7077ce0b47573b9c4c79a0 (diff)
downloadports-29747f458a1eb2ce23b4594b09d0256dd62760b8.tar.gz
ports-29747f458a1eb2ce23b4594b09d0256dd62760b8.zip
Notes
Diffstat (limited to 'deskutils/sunbird')
-rw-r--r--deskutils/sunbird/Makefile37
-rw-r--r--deskutils/sunbird/distinfo6
-rw-r--r--deskutils/sunbird/files/patch-Makefile.in22
-rw-r--r--deskutils/sunbird/files/patch-config_rules.mk11
-rw-r--r--deskutils/sunbird/files/patch-content_xslt_public_txDouble.h20
-rw-r--r--deskutils/sunbird/files/patch-content_xslt_src_base_txDouble.cpp23
-rw-r--r--deskutils/sunbird/files/patch-libm25
-rw-r--r--deskutils/sunbird/files/patch-nothreads-sqlite12
-rw-r--r--deskutils/sunbird/files/patch-sysnss221
9 files changed, 173 insertions, 204 deletions
diff --git a/deskutils/sunbird/Makefile b/deskutils/sunbird/Makefile
index 721736cadcb2..ed85444dae41 100644
--- a/deskutils/sunbird/Makefile
+++ b/deskutils/sunbird/Makefile
@@ -3,16 +3,15 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/deskutils/sunbird/Makefile,v 1.13 2005/11/23 04:54:57 ahze Exp $
+# $MCom: ports/deskutils/sunbird/Makefile,v 1.19 2006/10/13 04:40:20 ahze Exp $
#
PORTNAME= sunbird
-PORTVERSION= 0.3a1
-PORTREVISION= 2
+PORTVERSION= 0.3
CATEGORIES= deskutils
-MASTER_SITES= ${MASTER_SITE_MOZILLA}
-MASTER_SITE_SUBDIR= sunbird/new-directory/releases/${DISTVERSION}/source
-DISTNAME= ${PORTNAME}-${DISTVERSION}-source
+MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED}
+MASTER_SITE_SUBDIR= calendar/sunbird/releases/${DISTVERSION}/source
+DISTNAME= ${PORTNAME}-${DISTVERSION}.source
MAINTAINER= gnome@FreeBSD.org
COMMENT= Redesign of the Mozilla Calendar with XUL interface
@@ -24,19 +23,20 @@ HAS_CONFIGURE= yes
USE_GMAKE= yes
USE_BZIP2= yes
WANT_GNOME= yes
-USE_X_PREFIX= yes
SUNBIRD= ${PORTNAME}
SUNBIRD_ICON_SRC= ${PREFIX}/lib/sunbird/icons/default.xpm
SUNBIRD_ICON= ${PORTNAME}.xpm
-
-MOZ_PROTOCOLS= about,http,ftp,file,jar,res
+LIBS= -Wl,-Bsymbolic -lc
+PKGCONFIG_FILES?= ${MOZILLA}-js \
+ ${MOZILLA}-xpcom ${MOZILLA}-plugin
MOZ_OPTIONS= --enable-application=calendar \
- --enable-plaintext-editor-only \
- --disable-plugins --disable-cookies
+ --enable-system-cairo \
+ --with-system-nss \
+ --enable-canvas
MOZ_MK_OPTIONS= MOZ_CO_PROJECT=calendar
.include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../www/mozilla/Makefile.common"
+.include "${PORTSDIR}/www/mozilla/Makefile.common"
.if ${OSVERSION} < 500000
BROKEN= does not build
@@ -50,21 +50,16 @@ IGNORE= does not build
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-config_make-jars.pl
.endif
-post-extract::
+post-patch:
@${SED} -e 's|@SUNBIRD_ICON@|${SUNBIRD_ICON}|' \
${FILESDIR}/sunbird.desktop.in >${WRKDIR}/sunbird.desktop
-
-post-patch:
-.for ii in modules/libpref/src/init extensions/sroaming/resources/content/prefs \
- embedding/minimo
- @${REINPLACE_CMD} -e '/accessibility.typeaheadfind.enablesound/s/true/false/ ; \
- /dom.disable_window_open_feature.toolbar/s/false/true/' \
- ${WRKSRC}/${ii}/all.js
-.endfor
+ @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
+ ${WRKSRC}/security/manager/ssl/src/Makefile.in
pre-install:
${ECHO_CMD} 'share/applications/sunbird.desktop' >> ${PLIST}
${ECHO_CMD} 'share/pixmaps/${SUNBIRD_ICON}' >> ${PLIST}
+ ${ECHO_CMD} "@dirrmtry share/pixmaps" >> ${PLIST}
${ECHO_CMD} '@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}' >> ${PLIST}
do-install:
diff --git a/deskutils/sunbird/distinfo b/deskutils/sunbird/distinfo
index 9a9b0708a6aa..6da5658bd86b 100644
--- a/deskutils/sunbird/distinfo
+++ b/deskutils/sunbird/distinfo
@@ -1,3 +1,3 @@
-MD5 (sunbird-0.3a1-source.tar.bz2) = f449ed2feb6acf4b9d1a5a2571f6e9c3
-SHA256 (sunbird-0.3a1-source.tar.bz2) = 7d3e3a09217feccc53a699385e0eff138002bff80d57c63cb25ea0cd9465bcda
-SIZE (sunbird-0.3a1-source.tar.bz2) = 34623798
+MD5 (sunbird-0.3.source.tar.bz2) = 5579069a44e382bb963e3bbf6897a366
+SHA256 (sunbird-0.3.source.tar.bz2) = e359a61363971ef8a7ab33ebfc9c645a03ad32f71ebcc3b6f414737d22b40224
+SIZE (sunbird-0.3.source.tar.bz2) = 32564480
diff --git a/deskutils/sunbird/files/patch-Makefile.in b/deskutils/sunbird/files/patch-Makefile.in
deleted file mode 100644
index b09d564958c6..000000000000
--- a/deskutils/sunbird/files/patch-Makefile.in
+++ /dev/null
@@ -1,22 +0,0 @@
---- Makefile.in.orig Thu Oct 21 19:25:55 2004
-+++ Makefile.in Thu Oct 21 19:26:46 2004
-@@ -80,8 +80,7 @@
- $(tier_1_dirs) \
- $(tier_2_dirs) \
- $(tier_9_dirs) \
-- $(tier_50_dirs) \
-- $(NULL)
-+ $(tier_50_dirs)
-
- ifdef GC_LEAK_DETECTOR
- DIRS += gc/boehm
-@@ -100,7 +99,8 @@
- DIRS += $(tier_98_dirs)
- endif
-
--DIRS += $(tier_99_dirs)
-+DIRS += $(tier_99_dirs) \
-+ $(NULL)
-
- #
- # tier 0 - base build config dirs
diff --git a/deskutils/sunbird/files/patch-config_rules.mk b/deskutils/sunbird/files/patch-config_rules.mk
index 16cb6ae1192e..7377726fdc66 100644
--- a/deskutils/sunbird/files/patch-config_rules.mk
+++ b/deskutils/sunbird/files/patch-config_rules.mk
@@ -1,14 +1,11 @@
---- config/rules.mk.orig Sun May 18 16:10:18 2003
-+++ config/rules.mk Sun Jul 20 18:07:26 2003
-@@ -448,7 +448,11 @@
+--- config/rules.mk.orig Fri Jul 7 00:13:36 2006
++++ config/rules.mk Sun Sep 3 00:04:03 2006
+@@ -443,7 +443,7 @@
ifeq ($(OS_ARCH),FreeBSD)
ifdef IS_COMPONENT
-+ifneq (,$(filter alpha ia64,$(OS_TEST)))
+-EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
+EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -lc
-+else
- EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
-+endif
endif
endif
diff --git a/deskutils/sunbird/files/patch-content_xslt_public_txDouble.h b/deskutils/sunbird/files/patch-content_xslt_public_txDouble.h
new file mode 100644
index 000000000000..534bccba48be
--- /dev/null
+++ b/deskutils/sunbird/files/patch-content_xslt_public_txDouble.h
@@ -0,0 +1,20 @@
+--- content/xslt/public/txDouble.h.orig Fri Oct 13 00:00:29 2006
++++ content/xslt/public/txDouble.h Fri Oct 13 00:00:53 2006
+@@ -41,7 +41,7 @@
+ #define __txdouble_h__
+
+ //A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
+-#ifdef __FreeBSD__
++/* #ifdef __FreeBSD__
+ #include <ieeefp.h>
+ #ifdef __alpha__
+ fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
+@@ -50,7 +50,7 @@
+ #endif
+ fp_except_t oldmask = fpsetmask(~allmask);
+ #endif
+-
++*/
+ /**
+ * Macros to workaround math-bugs bugs in various platforms
+ */
diff --git a/deskutils/sunbird/files/patch-content_xslt_src_base_txDouble.cpp b/deskutils/sunbird/files/patch-content_xslt_src_base_txDouble.cpp
deleted file mode 100644
index 6795f921501d..000000000000
--- a/deskutils/sunbird/files/patch-content_xslt_src_base_txDouble.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
---- content/xslt/src/base/txDouble.cpp.orig Mon Feb 6 15:40:52 2006
-+++ content/xslt/src/base/txDouble.cpp Mon Feb 6 15:51:01 2006
-@@ -52,11 +52,16 @@
- //A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
- #ifdef __FreeBSD__
- #include <ieeefp.h>
--#ifdef __alpha__
--fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
--#else
--fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML;
-+#if !defined(FP_X_DNML)
-+#define FP_X_DNML 0
- #endif
-+#if !defined(FP_X_STK)
-+#define FP_X_STK 0
-+#endif
-+#if !defined(FP_X_IOV)
-+#define FP_X_IOV 0
-+#endif
-+fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML|FP_X_STK|FP_X_IOV;
- fp_except_t oldmask = fpsetmask(~allmask);
- #endif
-
diff --git a/deskutils/sunbird/files/patch-libm b/deskutils/sunbird/files/patch-libm
deleted file mode 100644
index 7de64b2a5068..000000000000
--- a/deskutils/sunbird/files/patch-libm
+++ /dev/null
@@ -1,25 +0,0 @@
---- js/src/Makefile.in Thu Aug 4 22:26:52 2005
-+++ js/src/Makefile.in Thu Aug 4 23:02:32 2005
-@@ -148,5 +148,4 @@
- endif
-
--FDLIBM_LIBRARY = fdlibm/$(LIB_PREFIX)fdm.$(LIB_SUFFIX)
- JSMATH_PRELINK = jsmathtemp.o
- JS_SAFE_ARENA = 1
-@@ -320,7 +319,4 @@
- endif
- @$(RM) -f $(JSMATH_PRELINK)
--else
--# Create dependency so we build fdlibm
--jsmath.o: $(FDLIBM_LIBRARY) Makefile.in
- endif
-
---- js/Makefile.in Sun Mar 23 14:36:00 2003
-+++ js/Makefile.in Thu Aug 4 23:08:06 2005
-@@ -46,5 +46,5 @@
- #
-
--DIRS = src/fdlibm src
-+DIRS = src
-
- include $(topsrcdir)/config/rules.mk
diff --git a/deskutils/sunbird/files/patch-nothreads-sqlite b/deskutils/sunbird/files/patch-nothreads-sqlite
new file mode 100644
index 000000000000..1b1bbbcbda15
--- /dev/null
+++ b/deskutils/sunbird/files/patch-nothreads-sqlite
@@ -0,0 +1,12 @@
+--- db/sqlite3/src/Makefile.in.orig Mon Sep 25 18:38:04 2006
++++ db/sqlite3/src/Makefile.in Mon Sep 25 18:38:14 2006
+@@ -99,7 +99,8 @@
+ # REFEF_IO allows us to override IO functions, which is used in the AsyncIO
+ # -DSQLITE_SECURE_DELETE=1 will cause SQLITE to 0-fill delete data so we
+ # don't have to vacuum to make sure the data is not visible in the file.
+-DEFINES = -DSQLITE_ENABLE_REDEF_IO -DSQLITE_SECURE_DELETE=1 -DTHREADSAFE=1
++DEFINES = -DSQLITE_ENABLE_REDEF_IO -DSQLITE_SECURE_DELETE=1
++# -DTHREADSAFE=1
+
+ ifdef ENABLE_TESTS
+ ##LIBS = $(DIST)/lib/$(LIB_PREFIX)sqlite3_s.$(LIB_SUFFIX)
diff --git a/deskutils/sunbird/files/patch-sysnss b/deskutils/sunbird/files/patch-sysnss
index a9154ce9a292..f1397eb524a2 100644
--- a/deskutils/sunbird/files/patch-sysnss
+++ b/deskutils/sunbird/files/patch-sysnss
@@ -1,103 +1,55 @@
---- 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/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 @@
- # Use local includes because they are inserted before INCLUDES
- # so that Mozilla's nss.h is used, not glibc's
--LOCAL_INCLUDES += -I$(DIST)/public/nss \
-+LOCAL_INCLUDES += -I$(LOCALBASE)/include/nss/nss \
- $(NULL)
+--- 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)
---- 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
+-EXTRA_DEPS = $(NSS_DEP_LIBS)
--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 =
+ DEFINES += -DNSS_ENABLE_ECC
- 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 @@
- }
+ # 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
-+#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 @@
- }
+ EXTRA_DSO_LDOPTS += \
+ $(MOZ_UNICHARUTIL_LIBS) \
+ $(MOZ_COMPONENT_LIBS) \
+ $(MOZ_JS_LIBS) \
+ $(NSS_LIBS) \
++ $(LOCAL_INCLUDES) \
+ $(NULL)
-- 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);
---- security/manager/Makefile.in.orig Wed Nov 2 16:50:36 2005
-+++ security/manager/Makefile.in Fri Nov 11 02:14:27 2005
-@@ -52,18 +52,9 @@
+ include $(topsrcdir)/config/rules.mk
+--- security/manager/Makefile.in.orig Thu Jun 22 14:47:38 2006
++++ security/manager/Makefile.in Thu Oct 12 23:54:37 2006
+@@ -54,22 +54,13 @@
SSL3_LIB \
SOFTOKEN3_LIB \
SOFTOKEN3_CHK \
- LOADABLE_ROOT_MODULE \
- HAVE_FREEBL_MODULES \
+ HAVE_FREEBL_LIBS \
+ HAVE_FREEBL_LIBS_32 \
+ HAVE_FREEBL_LIBS_32INT64 \
+ HAVE_FREEBL_LIBS_64 \
$(NULL)
-
--LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX)
-
+-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
-
- ifneq (,$(filter SunOS HP-UX,$(OS_ARCH)))
- ifeq (,$(filter i86pc ia64,$(OS_TEST)))
- ifndef HAVE_64BIT_OS
-@@ -151,11 +142,6 @@
+ # 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
@@ -105,26 +57,66 @@
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
-endif
touch $@
-
- .nss.checkout:
-@@ -176,10 +162,10 @@
- else
- cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX)
endif
+
+@@ -242,95 +228,16 @@
+
+ libs::
+ ifndef MOZ_NATIVE_NSS
+- $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS)
+- $(MAKE) -C $(topsrcdir)/security/dbm $(DEFAULT_GMAKE_FLAGS)
- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS)
-+# $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS)
- ifndef SKIP_CHK
+-ifndef SKIP_CHK
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS)
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS)
-+# $(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
-@@ -203,20 +189,6 @@
+-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 $@
+ $(MAKE) -C locales $@
+ ifdef MOZ_XUL
+ $(MAKE) -C pki $@
endif
++endif
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)
@@ -133,24 +125,47 @@
- $(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_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)
+-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 $@
- $(MAKE) -C locales $@
-@@ -232,11 +204,6 @@
+@@ -347,12 +254,6 @@
$(MAKE) -C pki $@
endif
- $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
+ 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::
- $(MAKE) -C boot $@