sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 09:49:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Update to 2.0.0.0

Browse source 
Release Notes:	http://mozilla.com/thunderbird/2.0.0.0/releasenotes/
This commit is contained in:
Michael Johnson 2007-04-20 17:35:26 +00:00
parent afc4fca8e9
commit b39aab511c
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=190451
27 changed files with 348 additions and 585 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
mail/thunderbird-esr/Makefile
View file

@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
# #
# $FreeBSD$ # $FreeBSD$
# $MCom: ports/mail/thunderbird/Makefile,v 1.18 2006/10/12 09:06:46 ahze Exp $ # $MCom: ports/mail/thunderbird/Makefile,v 1.25 2007/04/20 14:29:23 ahze Exp $
# #
PORTNAME= thunderbird PORTNAME= thunderbird
DISTVERSION= 1.5.0.10 DISTVERSION= 2.0.0.0
CATEGORIES= mail ipv6 CATEGORIES= mail ipv6
MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED}
MASTER_SITE_SUBDIR= thunderbird/releases/${DISTVERSION}/source MASTER_SITE_SUBDIR= thunderbird/releases/${DISTVERSION}/source
@ -43,24 +43,22 @@ OPTIONS=
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.if ( ${ARCH} == "alpha" && ${OSVERSION} < 500035 ) GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} pthread | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE}
IGNORE= core dumps at runtime
.endif # ( ${ARCH} == "alpha" && ${OSVERSION} < 500035 )
.if (${ARCH}=="sparc64" && ${OSVERSION} < 601101) .if (${ARCH}=="sparc64" && ${OSVERSION} < 601101)
IGNORE= core dumps on ${ARCH}, kern.osreldate>=601101 needed IGNORE= core dumps on ${ARCH}, kern.osreldate>=601101 needed
.endif .endif
.if ${PERL_LEVEL} < 500600
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-config_make-jars.pl
.endif # ${PERL_LEVEL} < 500600
post-extract:: post-extract::
@${SED} -e 's|@PORTNAME_ICON@|${PORTNAME_ICON}|' \ @${SED} -e 's|@PORTNAME_ICON@|${PORTNAME_ICON}|' \
<${FILESDIR}/${PORTNAME}.desktop.in >${WRKDIR}/${PORTNAME}.desktop <${FILESDIR}/${PORTNAME}.desktop.in >${WRKDIR}/${PORTNAME}.desktop
post-patch: post-patch:
@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
${WRKSRC}/security/manager/ssl/src/Makefile.in
@${REINPLACE_CMD} -e 's|--without-nss||' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|--without-nss||' ${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS:C/-pthread/${GECKO_PTHREAD_LIBS}/}|' \
${WRKSRC}/storage/build/Makefile.in
@${REINPLACE_CMD} -e 's|/usr/local/netscape|${LOCALBASE}|g' \ @${REINPLACE_CMD} -e 's|/usr/local/netscape|${LOCALBASE}|g' \
-e 's|/usr/local/lib/netscape|${LOCALBASE}/lib|g' \ -e 's|/usr/local/lib/netscape|${LOCALBASE}/lib|g' \
${WRKSRC}/xpcom/*/SpecialSystemDirectory.cpp ${WRKSRC}/xpcom/*/SpecialSystemDirectory.cpp
@ -73,8 +71,11 @@ post-patch:
${WRKSRC}/xpcom/io/nsNativeCharsetUtils.cpp ${WRKSRC}/xpcom/io/nsNativeCharsetUtils.cpp
port-pre-install: port-pre-install:
${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' \
${FAKEDIR}/bin/thunderbird-config ${FAKEDIR}/bin/thunderbird
${RM} -f ${FAKEDIR}/bin/*.bak
${MKDIR} ${FAKEDIR}/lib/${PORTNAME}/defaults ${MKDIR} ${FAKEDIR}/lib/${PORTNAME}/defaults
${CP} -RL ${WRKSRC}/dist/bin/defaults/isp \ ${CP} -RL ${WRKSRC}/dist/bin/isp \
${FAKEDIR}/lib/${PORTNAME}/defaults ${FAKEDIR}/lib/${PORTNAME}/defaults
pre-install: pre-install:

6
mail/thunderbird-esr/distinfo
View file

@ -1,3 +1,3 @@
MD5 (thunderbird-1.5.0.10-source.tar.bz2) = 65087f8a7adb0773ae7198ec21cc2975 MD5 (thunderbird-2.0.0.0-source.tar.bz2) = 8e672d9f9206e0e1f03790dacb51e1bb
SHA256 (thunderbird-1.5.0.10-source.tar.bz2) = 9b6a5a2b893594180863d4cb412a6920c698d68d8ea047c0eb38c9794e74338d SHA256 (thunderbird-2.0.0.0-source.tar.bz2) = cb2f5ea449521438cf668ff8cf26cce958e5ab454686d3ce56a48e011d8da1eb
SIZE (thunderbird-1.5.0.10-source.tar.bz2) = 36159990 SIZE (thunderbird-2.0.0.0-source.tar.bz2) = 37379868

10
mail/thunderbird-esr/files/extra-patch-config_make-jars.pl
View file

@ -1,10 +0,0 @@
--- config/make-jars.pl.orig Wed Oct 13 16:17:11 2004
+++ config/make-jars.pl Wed Oct 13 16:17:07 2004
@@ -40,6 +40,7 @@
last if ($arg eq "--");
}
my $defines = join(' ', @ARGV[ $ddindex .. $#ARGV ]);
+splice @ARGV, $ddindex, $#ARGV;
getopts("d:s:t:f:avlD:o:p:xz:");

17
mail/thunderbird-esr/files/patch-config-rules.mk
View file

@ -1,14 +1,13 @@
--- config/rules.mk.orig Tue Aug 26 13:28:47 2003 --- config/rules.mk.orig Thu Sep 14 14:07:03 2006
+++ config/rules.mk Sun Feb 1 15:11:41 2004 +++ config/rules.mk Wed Oct 18 11:00:09 2006
@@ -444,7 +444,11 @@ @@ -442,9 +442,7 @@
endif
ifeq ($(OS_ARCH),FreeBSD) ifeq ($(OS_ARCH),FreeBSD)
ifdef IS_COMPONENT -ifdef IS_COMPONENT
+ifneq (,$(filter alpha ia64,$(OS_TEST))) -EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
-endif
+EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -lc +EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -lc
+else
EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
+endif
endif
endif endif
ifeq ($(OS_ARCH),NetBSD)

10
mail/thunderbird-esr/files/patch-js_src_Makefile.in Normal file
View file

@ -0,0 +1,10 @@
--- js/src/Makefile.in.orig Wed Oct 18 09:23:09 2006
+++ js/src/Makefile.in Wed Oct 18 09:27:27 2006
@@ -244,6 +244,7 @@
endif
LDFLAGS += $(pathsubst -l%,$(NSPR_STATIC_PATH)/%.a,$(NSPR_LIBS))
+LDFLAGS += -lc
# BeOS and HP-UX do not require the extra linking of "-lm"
ifeq (,$(filter BeOS HP-UX WINNT WINCE OpenVMS,$(OS_ARCH)))

25
mail/thunderbird-esr/files/patch-libm
View file

@ -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

14
mail/thunderbird-esr/files/patch-security-coreconf-FreeBSD.mk
View file

@ -1,6 +1,6 @@
--- security/coreconf/FreeBSD.mk.orig Wed Mar 26 20:17:25 2003 --- security/coreconf/FreeBSD.mk.orig Mon Sep 25 18:26:23 2006
+++ security/coreconf/FreeBSD.mk Sun Nov 21 22:59:49 2004 +++ security/coreconf/FreeBSD.mk Mon Sep 25 18:27:03 2006
@@ -43,8 +43,12 @@ @@ -45,8 +45,12 @@
ifeq ($(OS_TEST),alpha) ifeq ($(OS_TEST),alpha)
CPU_ARCH = alpha CPU_ARCH = alpha
else else
@ -13,16 +13,12 @@
OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
@@ -71,7 +75,11 @@ @@ -73,7 +77,7 @@
DLL_SUFFIX = so.1.0 DLL_SUFFIX = so.1.0
endif endif
-MKSHLIB = $(CC) $(DSO_LDOPTS) -MKSHLIB = $(CC) $(DSO_LDOPTS)
+ifneq (,$(filter alpha ia64,$(OS_TEST)))
+MKSHLIB = $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS) -o $@ +MKSHLIB = $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS) -o $@
+else
+MKSHLIB = $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS) -o $@
+endif
ifdef MAPFILE ifdef MAPFILE
# Add LD options to restrict exported symbols to those in the map file MKSHLIB += -Wl,--version-script,$(MAPFILE)
endif endif

10
mail/thunderbird-esr/files/patch-storage_build_Makefile.in Normal file
View file

@ -0,0 +1,10 @@
--- storage/build/Makefile.in.orig Tue Feb 21 11:18:56 2006
+++ storage/build/Makefile.in Sun Nov 5 16:16:06 2006
@@ -77,6 +77,7 @@
$(EXTRA_DSO_LIBS) \
$(MOZ_COMPONENT_LIBS) \
$(MOZ_JS_LIBS) \
+ %%PTHREAD_LIBS%% \
$(NULL)
include $(topsrcdir)/config/rules.mk

198
mail/thunderbird-esr/files/patch-sysnss
View file

@ -7,76 +7,9 @@
- -
ifndef MOZ_NATIVE_JPEG ifndef MOZ_NATIVE_JPEG
tier_1_dirs += jpeg tier_1_dirs += jpeg
--- security/manager/ssl/src/Makefile.in Wed Jan 7 08:36:51 2004 --- security/manager/Makefile.in.orig Tue Mar 28 14:36:54 2006
+++ security/manager/ssl/src/Makefile.in Tue Aug 2 09:13:07 2005 +++ security/manager/Makefile.in Tue Mar 28 14:40:29 2006
@@ -117,5 +117,5 @@ @@ -54,22 +54,13 @@
# 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)
--- 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);
--- security/manager/Makefile.in.orig Tue Dec 19 17:07:37 2006
+++ security/manager/Makefile.in Mon Mar 5 16:19:56 2007
@@ -52,21 +52,12 @@
SSL3_LIB \ SSL3_LIB \
SOFTOKEN3_LIB \ SOFTOKEN3_LIB \
SOFTOKEN3_CHK \ SOFTOKEN3_CHK \
@ -86,9 +19,10 @@
HAVE_FREEBL_LIBS_32INT64 \ HAVE_FREEBL_LIBS_32INT64 \
HAVE_FREEBL_LIBS_64 \ HAVE_FREEBL_LIBS_64 \
$(NULL) $(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) -NSS3_LIB = $(DLL_PREFIX)nss3$(DLL_SUFFIX)
-SMIME3_LIB = $(DLL_PREFIX)smime3$(DLL_SUFFIX) -SMIME3_LIB = $(DLL_PREFIX)smime3$(DLL_SUFFIX)
-SSL3_LIB = $(DLL_PREFIX)ssl3$(DLL_SUFFIX) -SSL3_LIB = $(DLL_PREFIX)ssl3$(DLL_SUFFIX)
@ -98,9 +32,9 @@
# Default # Default
HAVE_FREEBL_LIBS = 1 HAVE_FREEBL_LIBS = 1
@@ -190,11 +181,6 @@ @@ -217,11 +208,6 @@
.nss.cleaned: .nss.checkout .nss.cleaned: .nss.checkout
ifndef MOZ_NATIVE_NSS
$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean - $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
-ifndef SKIP_CHK -ifndef SKIP_CHK
@ -108,59 +42,17 @@
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean - $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
-endif -endif
touch $@ touch $@
endif
.nss.checkout: @@ -248,47 +234,6 @@
@@ -212,89 +198,6 @@ cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX)
$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) endif
ifeq ($(OS_ARCH),WINNT) ifndef MOZ_NATIVE_NSS
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
- $(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/lib $(DEFAULT_GMAKE_FLAGS)
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) - $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS)
-endif -endif
-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_LIBS
-ifndef SKIP_CHK
- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_CHK) $(GRE_DIST)
-endif
- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(GRE_DIST)
-endif
-ifdef HAVE_FREEBL_LIBS_32
-ifndef SKIP_CHK
- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT_CHK) $(GRE_DIST)
- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32FPU_CHK) $(GRE_DIST)
-endif
- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT_LIB) $(GRE_DIST)
- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32FPU_LIB) $(GRE_DIST)
-endif
-ifdef HAVE_FREEBL_LIBS_32INT64
-ifndef SKIP_CHK
- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT64_CHK) $(GRE_DIST)
-endif
- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT64_LIB) $(GRE_DIST)
-endif
-ifdef HAVE_FREEBL_LIBS_64
-ifndef SKIP_CHK
- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_64INT_CHK) $(GRE_DIST)
- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_64FPU_CHK) $(GRE_DIST)
-endif
- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(GRE_DIST)
- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(GRE_DIST)
-endif
-endif
-ifndef _SKIP_OLD_GRE_INSTALL
- $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin - $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin
-ifndef SKIP_CHK -ifndef SKIP_CHK
- $(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DIST)/bin - $(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DIST)/bin
@ -200,10 +92,10 @@
endif endif
$(MAKE) -C boot $@ $(MAKE) -C boot $@
$(MAKE) -C ssl $@ $(MAKE) -C ssl $@
@@ -304,20 +207,6 @@ @@ -299,42 +244,6 @@
endif
install:: install::
ifndef MOZ_NATIVE_NSS
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DESTDIR)$(mozappdir) - $(SYSINSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DESTDIR)$(mozappdir)
-ifndef SKIP_CHK -ifndef SKIP_CHK
- $(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DESTDIR)$(mozappdir) - $(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DESTDIR)$(mozappdir)
@ -218,18 +110,66 @@
-endif -endif
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(DESTDIR)$(mozappdir) - $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(DESTDIR)$(mozappdir)
-endif -endif
ifdef HAVE_FREEBL_LIBS_32 -ifdef HAVE_FREEBL_LIBS_32
ifndef SKIP_CHK -ifndef SKIP_CHK
$(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT_CHK) $(DESTDIR)$(mozappdir) - $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT_CHK) $(DESTDIR)$(mozappdir)
@@ -355,11 +244,6 @@ - $(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 $@ $(MAKE) -C pki $@
endif 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 - $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
-ifndef SKIP_CHK -ifndef SKIP_CHK
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean - $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean - $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
-endif -endif
endif
echo-requires-recursive:: echo-requires-recursive::
$(MAKE) -C boot $@ --- security/manager/ssl/src/Makefile.in.orig Mon Aug 14 19:22:52 2006
+++ security/manager/ssl/src/Makefile.in Wed Apr 18 20:16:36 2007
@@ -124,19 +124,20 @@
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) \
+ -L%%LOCALBASE%%/lib/nss \
+ $(LOCAL_INCLUDES) \
$(NULL)
include $(topsrcdir)/config/rules.mk

21
mail/thunderbird/Makefile
View file

@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
# #
# $FreeBSD$ # $FreeBSD$
# $MCom: ports/mail/thunderbird/Makefile,v 1.18 2006/10/12 09:06:46 ahze Exp $ # $MCom: ports/mail/thunderbird/Makefile,v 1.25 2007/04/20 14:29:23 ahze Exp $
# #
PORTNAME= thunderbird PORTNAME= thunderbird
DISTVERSION= 1.5.0.10 DISTVERSION= 2.0.0.0
CATEGORIES= mail ipv6 CATEGORIES= mail ipv6
MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED}
MASTER_SITE_SUBDIR= thunderbird/releases/${DISTVERSION}/source MASTER_SITE_SUBDIR= thunderbird/releases/${DISTVERSION}/source
@ -43,24 +43,22 @@ OPTIONS=
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.if ( ${ARCH} == "alpha" && ${OSVERSION} < 500035 ) GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} pthread | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE}
IGNORE= core dumps at runtime
.endif # ( ${ARCH} == "alpha" && ${OSVERSION} < 500035 )
.if (${ARCH}=="sparc64" && ${OSVERSION} < 601101) .if (${ARCH}=="sparc64" && ${OSVERSION} < 601101)
IGNORE= core dumps on ${ARCH}, kern.osreldate>=601101 needed IGNORE= core dumps on ${ARCH}, kern.osreldate>=601101 needed
.endif .endif
.if ${PERL_LEVEL} < 500600
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-config_make-jars.pl
.endif # ${PERL_LEVEL} < 500600
post-extract:: post-extract::
@${SED} -e 's|@PORTNAME_ICON@|${PORTNAME_ICON}|' \ @${SED} -e 's|@PORTNAME_ICON@|${PORTNAME_ICON}|' \
<${FILESDIR}/${PORTNAME}.desktop.in >${WRKDIR}/${PORTNAME}.desktop <${FILESDIR}/${PORTNAME}.desktop.in >${WRKDIR}/${PORTNAME}.desktop
post-patch: post-patch:
@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
${WRKSRC}/security/manager/ssl/src/Makefile.in
@${REINPLACE_CMD} -e 's|--without-nss||' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|--without-nss||' ${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS:C/-pthread/${GECKO_PTHREAD_LIBS}/}|' \
${WRKSRC}/storage/build/Makefile.in
@${REINPLACE_CMD} -e 's|/usr/local/netscape|${LOCALBASE}|g' \ @${REINPLACE_CMD} -e 's|/usr/local/netscape|${LOCALBASE}|g' \
-e 's|/usr/local/lib/netscape|${LOCALBASE}/lib|g' \ -e 's|/usr/local/lib/netscape|${LOCALBASE}/lib|g' \
${WRKSRC}/xpcom/*/SpecialSystemDirectory.cpp ${WRKSRC}/xpcom/*/SpecialSystemDirectory.cpp
@ -73,8 +71,11 @@ post-patch:
${WRKSRC}/xpcom/io/nsNativeCharsetUtils.cpp ${WRKSRC}/xpcom/io/nsNativeCharsetUtils.cpp
port-pre-install: port-pre-install:
${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' \
${FAKEDIR}/bin/thunderbird-config ${FAKEDIR}/bin/thunderbird
${RM} -f ${FAKEDIR}/bin/*.bak
${MKDIR} ${FAKEDIR}/lib/${PORTNAME}/defaults ${MKDIR} ${FAKEDIR}/lib/${PORTNAME}/defaults
${CP} -RL ${WRKSRC}/dist/bin/defaults/isp \ ${CP} -RL ${WRKSRC}/dist/bin/isp \
${FAKEDIR}/lib/${PORTNAME}/defaults ${FAKEDIR}/lib/${PORTNAME}/defaults
pre-install: pre-install:

6
mail/thunderbird/distinfo
View file

@ -1,3 +1,3 @@
MD5 (thunderbird-1.5.0.10-source.tar.bz2) = 65087f8a7adb0773ae7198ec21cc2975 MD5 (thunderbird-2.0.0.0-source.tar.bz2) = 8e672d9f9206e0e1f03790dacb51e1bb
SHA256 (thunderbird-1.5.0.10-source.tar.bz2) = 9b6a5a2b893594180863d4cb412a6920c698d68d8ea047c0eb38c9794e74338d SHA256 (thunderbird-2.0.0.0-source.tar.bz2) = cb2f5ea449521438cf668ff8cf26cce958e5ab454686d3ce56a48e011d8da1eb
SIZE (thunderbird-1.5.0.10-source.tar.bz2) = 36159990 SIZE (thunderbird-2.0.0.0-source.tar.bz2) = 37379868

10
mail/thunderbird/files/extra-patch-config_make-jars.pl
View file

@ -1,10 +0,0 @@
--- config/make-jars.pl.orig Wed Oct 13 16:17:11 2004
+++ config/make-jars.pl Wed Oct 13 16:17:07 2004
@@ -40,6 +40,7 @@
last if ($arg eq "--");
}
my $defines = join(' ', @ARGV[ $ddindex .. $#ARGV ]);
+splice @ARGV, $ddindex, $#ARGV;
getopts("d:s:t:f:avlD:o:p:xz:");

17
mail/thunderbird/files/patch-config-rules.mk
View file

@ -1,14 +1,13 @@
--- config/rules.mk.orig Tue Aug 26 13:28:47 2003 --- config/rules.mk.orig Thu Sep 14 14:07:03 2006
+++ config/rules.mk Sun Feb 1 15:11:41 2004 +++ config/rules.mk Wed Oct 18 11:00:09 2006
@@ -444,7 +444,11 @@ @@ -442,9 +442,7 @@
endif
ifeq ($(OS_ARCH),FreeBSD) ifeq ($(OS_ARCH),FreeBSD)
ifdef IS_COMPONENT -ifdef IS_COMPONENT
+ifneq (,$(filter alpha ia64,$(OS_TEST))) -EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
-endif
+EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -lc +EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -lc
+else
EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
+endif
endif
endif endif
ifeq ($(OS_ARCH),NetBSD)

10
mail/thunderbird/files/patch-js_src_Makefile.in Normal file
View file

@ -0,0 +1,10 @@
--- js/src/Makefile.in.orig Wed Oct 18 09:23:09 2006
+++ js/src/Makefile.in Wed Oct 18 09:27:27 2006
@@ -244,6 +244,7 @@
endif
LDFLAGS += $(pathsubst -l%,$(NSPR_STATIC_PATH)/%.a,$(NSPR_LIBS))
+LDFLAGS += -lc
# BeOS and HP-UX do not require the extra linking of "-lm"
ifeq (,$(filter BeOS HP-UX WINNT WINCE OpenVMS,$(OS_ARCH)))

25
mail/thunderbird/files/patch-libm
View file

@ -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

14
mail/thunderbird/files/patch-security-coreconf-FreeBSD.mk
View file

@ -1,6 +1,6 @@
--- security/coreconf/FreeBSD.mk.orig Wed Mar 26 20:17:25 2003 --- security/coreconf/FreeBSD.mk.orig Mon Sep 25 18:26:23 2006
+++ security/coreconf/FreeBSD.mk Sun Nov 21 22:59:49 2004 +++ security/coreconf/FreeBSD.mk Mon Sep 25 18:27:03 2006
@@ -43,8 +43,12 @@ @@ -45,8 +45,12 @@
ifeq ($(OS_TEST),alpha) ifeq ($(OS_TEST),alpha)
CPU_ARCH = alpha CPU_ARCH = alpha
else else
@ -13,16 +13,12 @@
OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
@@ -71,7 +75,11 @@ @@ -73,7 +77,7 @@
DLL_SUFFIX = so.1.0 DLL_SUFFIX = so.1.0
endif endif
-MKSHLIB = $(CC) $(DSO_LDOPTS) -MKSHLIB = $(CC) $(DSO_LDOPTS)
+ifneq (,$(filter alpha ia64,$(OS_TEST)))
+MKSHLIB = $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS) -o $@ +MKSHLIB = $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS) -o $@
+else
+MKSHLIB = $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS) -o $@
+endif
ifdef MAPFILE ifdef MAPFILE
# Add LD options to restrict exported symbols to those in the map file MKSHLIB += -Wl,--version-script,$(MAPFILE)
endif endif

10
mail/thunderbird/files/patch-storage_build_Makefile.in Normal file
View file

@ -0,0 +1,10 @@
--- storage/build/Makefile.in.orig Tue Feb 21 11:18:56 2006
+++ storage/build/Makefile.in Sun Nov 5 16:16:06 2006
@@ -77,6 +77,7 @@
$(EXTRA_DSO_LIBS) \
$(MOZ_COMPONENT_LIBS) \
$(MOZ_JS_LIBS) \
+ %%PTHREAD_LIBS%% \
$(NULL)
include $(topsrcdir)/config/rules.mk

198
mail/thunderbird/files/patch-sysnss
View file

@ -7,76 +7,9 @@
- -
ifndef MOZ_NATIVE_JPEG ifndef MOZ_NATIVE_JPEG
tier_1_dirs += jpeg tier_1_dirs += jpeg
--- security/manager/ssl/src/Makefile.in Wed Jan 7 08:36:51 2004 --- security/manager/Makefile.in.orig Tue Mar 28 14:36:54 2006
+++ security/manager/ssl/src/Makefile.in Tue Aug 2 09:13:07 2005 +++ security/manager/Makefile.in Tue Mar 28 14:40:29 2006
@@ -117,5 +117,5 @@ @@ -54,22 +54,13 @@
# 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)
--- 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);
--- security/manager/Makefile.in.orig Tue Dec 19 17:07:37 2006
+++ security/manager/Makefile.in Mon Mar 5 16:19:56 2007
@@ -52,21 +52,12 @@
SSL3_LIB \ SSL3_LIB \
SOFTOKEN3_LIB \ SOFTOKEN3_LIB \
SOFTOKEN3_CHK \ SOFTOKEN3_CHK \
@ -86,9 +19,10 @@
HAVE_FREEBL_LIBS_32INT64 \ HAVE_FREEBL_LIBS_32INT64 \
HAVE_FREEBL_LIBS_64 \ HAVE_FREEBL_LIBS_64 \
$(NULL) $(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) -NSS3_LIB = $(DLL_PREFIX)nss3$(DLL_SUFFIX)
-SMIME3_LIB = $(DLL_PREFIX)smime3$(DLL_SUFFIX) -SMIME3_LIB = $(DLL_PREFIX)smime3$(DLL_SUFFIX)
-SSL3_LIB = $(DLL_PREFIX)ssl3$(DLL_SUFFIX) -SSL3_LIB = $(DLL_PREFIX)ssl3$(DLL_SUFFIX)
@ -98,9 +32,9 @@
# Default # Default
HAVE_FREEBL_LIBS = 1 HAVE_FREEBL_LIBS = 1
@@ -190,11 +181,6 @@ @@ -217,11 +208,6 @@
.nss.cleaned: .nss.checkout .nss.cleaned: .nss.checkout
ifndef MOZ_NATIVE_NSS
$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean - $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
-ifndef SKIP_CHK -ifndef SKIP_CHK
@ -108,59 +42,17 @@
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean - $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
-endif -endif
touch $@ touch $@
endif
.nss.checkout: @@ -248,47 +234,6 @@
@@ -212,89 +198,6 @@ cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX)
$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) endif
ifeq ($(OS_ARCH),WINNT) ifndef MOZ_NATIVE_NSS
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
- $(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/lib $(DEFAULT_GMAKE_FLAGS)
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) - $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS)
-endif -endif
-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_LIBS
-ifndef SKIP_CHK
- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_CHK) $(GRE_DIST)
-endif
- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(GRE_DIST)
-endif
-ifdef HAVE_FREEBL_LIBS_32
-ifndef SKIP_CHK
- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT_CHK) $(GRE_DIST)
- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32FPU_CHK) $(GRE_DIST)
-endif
- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT_LIB) $(GRE_DIST)
- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32FPU_LIB) $(GRE_DIST)
-endif
-ifdef HAVE_FREEBL_LIBS_32INT64
-ifndef SKIP_CHK
- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT64_CHK) $(GRE_DIST)
-endif
- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT64_LIB) $(GRE_DIST)
-endif
-ifdef HAVE_FREEBL_LIBS_64
-ifndef SKIP_CHK
- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_64INT_CHK) $(GRE_DIST)
- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_64FPU_CHK) $(GRE_DIST)
-endif
- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(GRE_DIST)
- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(GRE_DIST)
-endif
-endif
-ifndef _SKIP_OLD_GRE_INSTALL
- $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin - $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin
-ifndef SKIP_CHK -ifndef SKIP_CHK
- $(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DIST)/bin - $(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DIST)/bin
@ -200,10 +92,10 @@
endif endif
$(MAKE) -C boot $@ $(MAKE) -C boot $@
$(MAKE) -C ssl $@ $(MAKE) -C ssl $@
@@ -304,20 +207,6 @@ @@ -299,42 +244,6 @@
endif
install:: install::
ifndef MOZ_NATIVE_NSS
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DESTDIR)$(mozappdir) - $(SYSINSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DESTDIR)$(mozappdir)
-ifndef SKIP_CHK -ifndef SKIP_CHK
- $(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DESTDIR)$(mozappdir) - $(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DESTDIR)$(mozappdir)
@ -218,18 +110,66 @@
-endif -endif
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(DESTDIR)$(mozappdir) - $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(DESTDIR)$(mozappdir)
-endif -endif
ifdef HAVE_FREEBL_LIBS_32 -ifdef HAVE_FREEBL_LIBS_32
ifndef SKIP_CHK -ifndef SKIP_CHK
$(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT_CHK) $(DESTDIR)$(mozappdir) - $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT_CHK) $(DESTDIR)$(mozappdir)
@@ -355,11 +244,6 @@ - $(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 $@ $(MAKE) -C pki $@
endif 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 - $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
-ifndef SKIP_CHK -ifndef SKIP_CHK
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean - $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean - $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
-endif -endif
endif
echo-requires-recursive:: echo-requires-recursive::
$(MAKE) -C boot $@ --- security/manager/ssl/src/Makefile.in.orig Mon Aug 14 19:22:52 2006
+++ security/manager/ssl/src/Makefile.in Wed Apr 18 20:16:36 2007
@@ -124,19 +124,20 @@
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) \
+ -L%%LOCALBASE%%/lib/nss \
+ $(LOCAL_INCLUDES) \
$(NULL)
include $(topsrcdir)/config/rules.mk

21
mail/thunderbird3/Makefile
View file

@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
# #
# $FreeBSD$ # $FreeBSD$
# $MCom: ports/mail/thunderbird/Makefile,v 1.18 2006/10/12 09:06:46 ahze Exp $ # $MCom: ports/mail/thunderbird/Makefile,v 1.25 2007/04/20 14:29:23 ahze Exp $
# #
PORTNAME= thunderbird PORTNAME= thunderbird
DISTVERSION= 1.5.0.10 DISTVERSION= 2.0.0.0
CATEGORIES= mail ipv6 CATEGORIES= mail ipv6
MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED}
MASTER_SITE_SUBDIR= thunderbird/releases/${DISTVERSION}/source MASTER_SITE_SUBDIR= thunderbird/releases/${DISTVERSION}/source
@ -43,24 +43,22 @@ OPTIONS=
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.if ( ${ARCH} == "alpha" && ${OSVERSION} < 500035 ) GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} pthread | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE}
IGNORE= core dumps at runtime
.endif # ( ${ARCH} == "alpha" && ${OSVERSION} < 500035 )
.if (${ARCH}=="sparc64" && ${OSVERSION} < 601101) .if (${ARCH}=="sparc64" && ${OSVERSION} < 601101)
IGNORE= core dumps on ${ARCH}, kern.osreldate>=601101 needed IGNORE= core dumps on ${ARCH}, kern.osreldate>=601101 needed
.endif .endif
.if ${PERL_LEVEL} < 500600
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-config_make-jars.pl
.endif # ${PERL_LEVEL} < 500600
post-extract:: post-extract::
@${SED} -e 's|@PORTNAME_ICON@|${PORTNAME_ICON}|' \ @${SED} -e 's|@PORTNAME_ICON@|${PORTNAME_ICON}|' \
<${FILESDIR}/${PORTNAME}.desktop.in >${WRKDIR}/${PORTNAME}.desktop <${FILESDIR}/${PORTNAME}.desktop.in >${WRKDIR}/${PORTNAME}.desktop
post-patch: post-patch:
@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
${WRKSRC}/security/manager/ssl/src/Makefile.in
@${REINPLACE_CMD} -e 's|--without-nss||' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|--without-nss||' ${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS:C/-pthread/${GECKO_PTHREAD_LIBS}/}|' \
${WRKSRC}/storage/build/Makefile.in
@${REINPLACE_CMD} -e 's|/usr/local/netscape|${LOCALBASE}|g' \ @${REINPLACE_CMD} -e 's|/usr/local/netscape|${LOCALBASE}|g' \
-e 's|/usr/local/lib/netscape|${LOCALBASE}/lib|g' \ -e 's|/usr/local/lib/netscape|${LOCALBASE}/lib|g' \
${WRKSRC}/xpcom/*/SpecialSystemDirectory.cpp ${WRKSRC}/xpcom/*/SpecialSystemDirectory.cpp
@ -73,8 +71,11 @@ post-patch:
${WRKSRC}/xpcom/io/nsNativeCharsetUtils.cpp ${WRKSRC}/xpcom/io/nsNativeCharsetUtils.cpp
port-pre-install: port-pre-install:
${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' \
${FAKEDIR}/bin/thunderbird-config ${FAKEDIR}/bin/thunderbird
${RM} -f ${FAKEDIR}/bin/*.bak
${MKDIR} ${FAKEDIR}/lib/${PORTNAME}/defaults ${MKDIR} ${FAKEDIR}/lib/${PORTNAME}/defaults
${CP} -RL ${WRKSRC}/dist/bin/defaults/isp \ ${CP} -RL ${WRKSRC}/dist/bin/isp \
${FAKEDIR}/lib/${PORTNAME}/defaults ${FAKEDIR}/lib/${PORTNAME}/defaults
pre-install: pre-install:

6
mail/thunderbird3/distinfo
View file

@ -1,3 +1,3 @@
MD5 (thunderbird-1.5.0.10-source.tar.bz2) = 65087f8a7adb0773ae7198ec21cc2975 MD5 (thunderbird-2.0.0.0-source.tar.bz2) = 8e672d9f9206e0e1f03790dacb51e1bb
SHA256 (thunderbird-1.5.0.10-source.tar.bz2) = 9b6a5a2b893594180863d4cb412a6920c698d68d8ea047c0eb38c9794e74338d SHA256 (thunderbird-2.0.0.0-source.tar.bz2) = cb2f5ea449521438cf668ff8cf26cce958e5ab454686d3ce56a48e011d8da1eb
SIZE (thunderbird-1.5.0.10-source.tar.bz2) = 36159990 SIZE (thunderbird-2.0.0.0-source.tar.bz2) = 37379868

10
mail/thunderbird3/files/extra-patch-config_make-jars.pl
View file

@ -1,10 +0,0 @@
--- config/make-jars.pl.orig Wed Oct 13 16:17:11 2004
+++ config/make-jars.pl Wed Oct 13 16:17:07 2004
@@ -40,6 +40,7 @@
last if ($arg eq "--");
}
my $defines = join(' ', @ARGV[ $ddindex .. $#ARGV ]);
+splice @ARGV, $ddindex, $#ARGV;
getopts("d:s:t:f:avlD:o:p:xz:");

17
mail/thunderbird3/files/patch-config-rules.mk
View file

@ -1,14 +1,13 @@
--- config/rules.mk.orig Tue Aug 26 13:28:47 2003 --- config/rules.mk.orig Thu Sep 14 14:07:03 2006
+++ config/rules.mk Sun Feb 1 15:11:41 2004 +++ config/rules.mk Wed Oct 18 11:00:09 2006
@@ -444,7 +444,11 @@ @@ -442,9 +442,7 @@
endif
ifeq ($(OS_ARCH),FreeBSD) ifeq ($(OS_ARCH),FreeBSD)
ifdef IS_COMPONENT -ifdef IS_COMPONENT
+ifneq (,$(filter alpha ia64,$(OS_TEST))) -EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
-endif
+EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -lc +EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -lc
+else
EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
+endif
endif
endif endif
ifeq ($(OS_ARCH),NetBSD)

10
mail/thunderbird3/files/patch-js_src_Makefile.in Normal file
View file

@ -0,0 +1,10 @@
--- js/src/Makefile.in.orig Wed Oct 18 09:23:09 2006
+++ js/src/Makefile.in Wed Oct 18 09:27:27 2006
@@ -244,6 +244,7 @@
endif
LDFLAGS += $(pathsubst -l%,$(NSPR_STATIC_PATH)/%.a,$(NSPR_LIBS))
+LDFLAGS += -lc
# BeOS and HP-UX do not require the extra linking of "-lm"
ifeq (,$(filter BeOS HP-UX WINNT WINCE OpenVMS,$(OS_ARCH)))

25
mail/thunderbird3/files/patch-libm
View file

@ -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

14
mail/thunderbird3/files/patch-security-coreconf-FreeBSD.mk
View file

@ -1,6 +1,6 @@
--- security/coreconf/FreeBSD.mk.orig Wed Mar 26 20:17:25 2003 --- security/coreconf/FreeBSD.mk.orig Mon Sep 25 18:26:23 2006
+++ security/coreconf/FreeBSD.mk Sun Nov 21 22:59:49 2004 +++ security/coreconf/FreeBSD.mk Mon Sep 25 18:27:03 2006
@@ -43,8 +43,12 @@ @@ -45,8 +45,12 @@
ifeq ($(OS_TEST),alpha) ifeq ($(OS_TEST),alpha)
CPU_ARCH = alpha CPU_ARCH = alpha
else else
@ -13,16 +13,12 @@
OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
@@ -71,7 +75,11 @@ @@ -73,7 +77,7 @@
DLL_SUFFIX = so.1.0 DLL_SUFFIX = so.1.0
endif endif
-MKSHLIB = $(CC) $(DSO_LDOPTS) -MKSHLIB = $(CC) $(DSO_LDOPTS)
+ifneq (,$(filter alpha ia64,$(OS_TEST)))
+MKSHLIB = $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS) -o $@ +MKSHLIB = $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS) -o $@
+else
+MKSHLIB = $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS) -o $@
+endif
ifdef MAPFILE ifdef MAPFILE
# Add LD options to restrict exported symbols to those in the map file MKSHLIB += -Wl,--version-script,$(MAPFILE)
endif endif

10
mail/thunderbird3/files/patch-storage_build_Makefile.in Normal file
View file

@ -0,0 +1,10 @@
--- storage/build/Makefile.in.orig Tue Feb 21 11:18:56 2006
+++ storage/build/Makefile.in Sun Nov 5 16:16:06 2006
@@ -77,6 +77,7 @@
$(EXTRA_DSO_LIBS) \
$(MOZ_COMPONENT_LIBS) \
$(MOZ_JS_LIBS) \
+ %%PTHREAD_LIBS%% \
$(NULL)
include $(topsrcdir)/config/rules.mk

198
mail/thunderbird3/files/patch-sysnss
View file

@ -7,76 +7,9 @@
- -
ifndef MOZ_NATIVE_JPEG ifndef MOZ_NATIVE_JPEG
tier_1_dirs += jpeg tier_1_dirs += jpeg
--- security/manager/ssl/src/Makefile.in Wed Jan 7 08:36:51 2004 --- security/manager/Makefile.in.orig Tue Mar 28 14:36:54 2006
+++ security/manager/ssl/src/Makefile.in Tue Aug 2 09:13:07 2005 +++ security/manager/Makefile.in Tue Mar 28 14:40:29 2006
@@ -117,5 +117,5 @@ @@ -54,22 +54,13 @@
# 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)
--- 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);
--- security/manager/Makefile.in.orig Tue Dec 19 17:07:37 2006
+++ security/manager/Makefile.in Mon Mar 5 16:19:56 2007
@@ -52,21 +52,12 @@
SSL3_LIB \ SSL3_LIB \
SOFTOKEN3_LIB \ SOFTOKEN3_LIB \
SOFTOKEN3_CHK \ SOFTOKEN3_CHK \
@ -86,9 +19,10 @@
HAVE_FREEBL_LIBS_32INT64 \ HAVE_FREEBL_LIBS_32INT64 \
HAVE_FREEBL_LIBS_64 \ HAVE_FREEBL_LIBS_64 \
$(NULL) $(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) -NSS3_LIB = $(DLL_PREFIX)nss3$(DLL_SUFFIX)
-SMIME3_LIB = $(DLL_PREFIX)smime3$(DLL_SUFFIX) -SMIME3_LIB = $(DLL_PREFIX)smime3$(DLL_SUFFIX)
-SSL3_LIB = $(DLL_PREFIX)ssl3$(DLL_SUFFIX) -SSL3_LIB = $(DLL_PREFIX)ssl3$(DLL_SUFFIX)
@ -98,9 +32,9 @@
# Default # Default
HAVE_FREEBL_LIBS = 1 HAVE_FREEBL_LIBS = 1
@@ -190,11 +181,6 @@ @@ -217,11 +208,6 @@
.nss.cleaned: .nss.checkout .nss.cleaned: .nss.checkout
ifndef MOZ_NATIVE_NSS
$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean - $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
-ifndef SKIP_CHK -ifndef SKIP_CHK
@ -108,59 +42,17 @@
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean - $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
-endif -endif
touch $@ touch $@
endif
.nss.checkout: @@ -248,47 +234,6 @@
@@ -212,89 +198,6 @@ cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX)
$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) endif
ifeq ($(OS_ARCH),WINNT) ifndef MOZ_NATIVE_NSS
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
- $(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/lib $(DEFAULT_GMAKE_FLAGS)
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) - $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS)
-endif -endif
-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_LIBS
-ifndef SKIP_CHK
- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_CHK) $(GRE_DIST)
-endif
- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(GRE_DIST)
-endif
-ifdef HAVE_FREEBL_LIBS_32
-ifndef SKIP_CHK
- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT_CHK) $(GRE_DIST)
- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32FPU_CHK) $(GRE_DIST)
-endif
- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT_LIB) $(GRE_DIST)
- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32FPU_LIB) $(GRE_DIST)
-endif
-ifdef HAVE_FREEBL_LIBS_32INT64
-ifndef SKIP_CHK
- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT64_CHK) $(GRE_DIST)
-endif
- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT64_LIB) $(GRE_DIST)
-endif
-ifdef HAVE_FREEBL_LIBS_64
-ifndef SKIP_CHK
- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_64INT_CHK) $(GRE_DIST)
- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_64FPU_CHK) $(GRE_DIST)
-endif
- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(GRE_DIST)
- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(GRE_DIST)
-endif
-endif
-ifndef _SKIP_OLD_GRE_INSTALL
- $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin - $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin
-ifndef SKIP_CHK -ifndef SKIP_CHK
- $(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DIST)/bin - $(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DIST)/bin
@ -200,10 +92,10 @@
endif endif
$(MAKE) -C boot $@ $(MAKE) -C boot $@
$(MAKE) -C ssl $@ $(MAKE) -C ssl $@
@@ -304,20 +207,6 @@ @@ -299,42 +244,6 @@
endif
install:: install::
ifndef MOZ_NATIVE_NSS
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DESTDIR)$(mozappdir) - $(SYSINSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DESTDIR)$(mozappdir)
-ifndef SKIP_CHK -ifndef SKIP_CHK
- $(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DESTDIR)$(mozappdir) - $(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DESTDIR)$(mozappdir)
@ -218,18 +110,66 @@
-endif -endif
- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(DESTDIR)$(mozappdir) - $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(DESTDIR)$(mozappdir)
-endif -endif
ifdef HAVE_FREEBL_LIBS_32 -ifdef HAVE_FREEBL_LIBS_32
ifndef SKIP_CHK -ifndef SKIP_CHK
$(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT_CHK) $(DESTDIR)$(mozappdir) - $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT_CHK) $(DESTDIR)$(mozappdir)
@@ -355,11 +244,6 @@ - $(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 $@ $(MAKE) -C pki $@
endif 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 - $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
-ifndef SKIP_CHK -ifndef SKIP_CHK
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean - $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean
- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean - $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
-endif -endif
endif
echo-requires-recursive:: echo-requires-recursive::
$(MAKE) -C boot $@ --- security/manager/ssl/src/Makefile.in.orig Mon Aug 14 19:22:52 2006
+++ security/manager/ssl/src/Makefile.in Wed Apr 18 20:16:36 2007
@@ -124,19 +124,20 @@
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) \
+ -L%%LOCALBASE%%/lib/nss \
+ $(LOCAL_INCLUDES) \
$(NULL)
include $(topsrcdir)/config/rules.mk