Date: Tue, 02 Aug 2005 20:23:25 -0500 From: "Jeremy Messenger" <mezz7@cox.net> To: mi@aldan.algebra.com Cc: ports@freebsd.org, gnome@freebsd.org Subject: Re: leaner and meaner www/firefox Message-ID: <op.suwrhbsm9aq2h7@mezz.mezzweb.com> In-Reply-To: <200508030114.j731EKZQ067861@blue.virtual-estates.net> References: <200508030114.j731EKZQ067861@blue.virtual-estates.net>
next in thread | previous in thread | raw e-mail | index | archive | help
On Tue, 02 Aug 2005 20:14:20 -0500, Mikhail T. <mi@aldan.algebra.com>
wrote:
> Attached are the diffs to make www/firefox build without its own jpeg,
> zlib, dbm, nspr, and nss using respected ports or FreeBSD's main
> libraries (-lz for zlib and -lc for dbm) instead.
>
> I'm using it right now (on FreeBSD/amd64-5.4-stable). Anyone else cares
> to try?
>
> You'll need very recent versions of devel/nspr and security/nss ports.
> The earlier version of nspr (4.4.1) is too old and does not supply some
> of the functionality needed by firefox.
>
> -mi
>
> cvs diff: Diffing .
> Index: Makefile
> ===================================================================
> RCS file: /home/pcvs/ports/www/firefox/Makefile,v
> retrieving revision 1.127
> diff -U2 -p -r1.127 Makefile
> --- Makefile 30 Jul 2005 04:36:55 -0000 1.127
> +++ Makefile 3 Aug 2005 01:11:40 -0000
> @@ -8,5 +8,5 @@
> PORTNAME= firefox
> PORTVERSION= 1.0.6
> -PORTREVISION= 1
> +PORTREVISION= 2
> PORTEPOCH= 1
> CATEGORIES= www
> @@ -18,6 +18,8 @@ MAINTAINER= gnome@FreeBSD.org
> COMMENT= Web browser based on the browser portion of Mozilla
> -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
> - png.5:${PORTSDIR}/graphics/png
> +LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \
> + nspr4:${PORTSDIR}/devel/nspr \
> + png:${PORTSDIR}/graphics/png \
> + nss3:${PORTSDIR}/security/nss
I like it, but change those back to jpeg.9, png.5 and etc.
Thanks,
Mezz
> BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip
> @@ -42,5 +44,11 @@ PKGDEINSTALL= ${WRKDIR}/pkg-deinstall
> EXTRACT_AFTER_ARGS= | ${TAR} -xf - --exclude */CVS/* \
> --exclude */macbuild/*\
> + --exclude */nsprpub/*\
> --exclude */package/* \
> + --exclude */zlib/ \
> + --exclude mozilla/modules/libimg/png \
> + --exclude mozilla/jpeg \
> + --exclude mozilla/dbm \
> + --exclude mozilla/security/nss \
> --exclude .cvsignore \
> --exclude makefile.win \
> @@ -53,5 +61,5 @@ FIREFOX_ICON= ${PREFIX}/lib/${FIREFOX}/c
> PKGCONFIG_FILES=firefox-gtkmozembed firefox-js firefox-xpcom \
> - firefox-nspr firefox-nss firefox-plugin
> + firefox-plugin
> JPI_LIST?=\
> @@ -158,8 +166,6 @@ post-patch:
> @${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \
> s|-lpthread|${PTHREAD_LIBS}|g' \
> - ${WRKSRC}/configure \
> - ${WRKSRC}/nsprpub/configure
> + ${WRKSRC}/configure
> @${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \
> - ${WRKSRC}/nsprpub/config/config.mk \
> ${WRKSRC}/security/coreconf/FreeBSD.mk \
> ${WRKSRC}/directory/c-sdk/config/FreeBSD.mk \
> cvs diff: Diffing files
> Index: files/mozconfig.in
> ===================================================================
> RCS file: /home/pcvs/ports/www/firefox/files/mozconfig.in,v
> retrieving revision 1.31
> diff -U2 -p -r1.31 mozconfig.in
> --- files/mozconfig.in 14 Apr 2005 03:09:30 -0000 1.31
> +++ files/mozconfig.in 3 Aug 2005 01:11:40 -0000
> @@ -33,5 +33,5 @@ ac_add_options --with-system-jpeg=@LOCAL
> ac_add_options --with-system-zlib
> ac_add_options --with-system-png=@LOCALBASE@
> -ac_add_options --without-system-nspr
> +ac_add_options --with-system-nspr
> ac_add_options --with-gssapi=/usr
> ######################################################################
> Index: files/patch-gfx-src-gtk-Makefile.in
> ===================================================================
> RCS file: files/patch-gfx-src-gtk-Makefile.in
> diff -N files/patch-gfx-src-gtk-Makefile.in
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ files/patch-gfx-src-gtk-Makefile.in 3 Aug 2005 01:11:40 -0000
> @@ -0,0 +1,15 @@
> +When using ``--with-system-nspr'' option, MOZ_COMPONENT_LIBS does not
> +contain the ``-L../../../dist/lib'' -- only ``-L../../../dist/bin''.
> +
> +This causes an error, because libgfxshared_s is only under dist/lib.
> +
> + -mi
> +
> +--- gfx/src/gtk/Makefile.in Mon Nov 10 07:24:51 2003
> ++++ gfx/src/gtk/Makefile.in Thu Jul 21 23:58:26 2005
> +@@ -165,4 +165,5 @@
> + ifdef MOZ_ENABLE_GTK2
> + EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) \
> ++ $(LIBS_DIR) \
> + -lgkgfx \
> + -lgfxshared_s \
> Index: files/patch-nspr-unix.c
> ===================================================================
> RCS file: files/patch-nspr-unix.c
> diff -N files/patch-nspr-unix.c
> --- files/patch-nspr-unix.c 10 Mar 2005 00:43:22 -0000 1.3
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,23 +0,0 @@
> -$FreeBSD: ports/www/firefox/files/patch-nspr-unix.c,v 1.3 2005/03/10
> 00:43:22 marcus Exp $
> -
> ---- nsprpub/pr/src/md/unix/unix.c.orig Sat May 31 18:06:04 2003
> -+++ nsprpub/pr/src/md/unix/unix.c Sat May 31 18:04:43 2003
> -@@ -65,7 +65,8 @@
> - * PRInt32* pointer to a _PRSockLen_t* pointer.
> - */
> - #if defined(HAVE_SOCKLEN_T) \
> -- || (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2)
> -+ || (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) \
> -+ || defined(FREEBSD)
> - #define _PRSockLen_t socklen_t
> - #elif defined(IRIX) || defined(HPUX) || defined(OSF1) ||
> defined(SOLARIS) \
> - || defined(AIX4_1) || defined(LINUX) || defined(SONY) \
> -@@ -73,7 +74,7 @@
> - || defined(SUNOS4) || defined(NCR) || defined(DARWIN) \
> - || defined(NEXTSTEP) || defined(QNX)
> - #define _PRSockLen_t int
> --#elif (defined(AIX) && !defined(AIX4_1)) || defined(FREEBSD) \
> -+#elif (defined(AIX) && !defined(AIX4_1)) \
> - || defined(NETBSD) || defined(OPENBSD) || defined(UNIXWARE) \
> - || defined(DGUX) || defined(VMS) || defined(NTO)
> - #define _PRSockLen_t size_t
> Index: files/patch-nsprpub-pr-include-md-_freebsd.cfg
> ===================================================================
> RCS file: files/patch-nsprpub-pr-include-md-_freebsd.cfg
> diff -N files/patch-nsprpub-pr-include-md-_freebsd.cfg
> --- files/patch-nsprpub-pr-include-md-_freebsd.cfg 10 Mar 2005 00:43:22
> -0000 1.4
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,163 +0,0 @@
> -$FreeBSD:
> ports/www/firefox/files/patch-nsprpub-pr-include-md-_freebsd.cfg,v 1.4
> 2005/03/10 00:43:22 marcus Exp $
> -
> ---- nsprpub/pr/include/md/_freebsd.cfg.orig Wed Jan 2 18:38:25 2002
> -+++ nsprpub/pr/include/md/_freebsd.cfg Sun Feb 1 15:09:53 2004
> -@@ -91,7 +91,7 @@
> - #define PR_ALIGN_OF_DOUBLE 4
> - #define PR_ALIGN_OF_POINTER 4
> -
> --#elif defined(__alpha)
> -+#elif defined(__alpha__)
> -
> - #define IS_LITTLE_ENDIAN 1
> - #undef IS_BIG_ENDIAN
> -@@ -138,6 +138,149 @@
> - #define PR_ALIGN_OF_DOUBLE 8
> - #define PR_ALIGN_OF_POINTER 8
> -
> -+#elif defined(__sparc64__)
> -+#undef IS_LITTLE_ENDIAN
> -+#define IS_BIG_ENDIAN 1
> -+#define PR_ALIGN_OF_INT64 8
> -+#define PR_ALIGN_OF_DOUBLE 8
> -+#define IS_64
> -+
> -+#define PR_BYTES_PER_BYTE 1
> -+#define PR_BYTES_PER_SHORT 2
> -+#define PR_BYTES_PER_INT 4
> -+#define PR_BYTES_PER_INT64 8
> -+#define PR_BYTES_PER_LONG 8
> -+#define PR_BYTES_PER_FLOAT 4
> -+#define PR_BYTES_PER_DOUBLE 8
> -+#define PR_BYTES_PER_WORD 8
> -+#define PR_BYTES_PER_DWORD 8
> -+#define PR_BYTES_PER_WORD_LOG2 3
> -+#define PR_BYTES_PER_DWORD_LOG2 3
> -+
> -+#define PR_BITS_PER_BYTE 8
> -+#define PR_BITS_PER_SHORT 16
> -+#define PR_BITS_PER_INT 32
> -+#define PR_BITS_PER_INT64 64
> -+#define PR_BITS_PER_LONG 64
> -+#define PR_BITS_PER_FLOAT 32
> -+#define PR_BITS_PER_DOUBLE 64
> -+#define PR_BITS_PER_WORD 64
> -+
> -+#define PR_BITS_PER_BYTE_LOG2 3
> -+#define PR_BITS_PER_SHORT_LOG2 4
> -+#define PR_BITS_PER_INT_LOG2 5
> -+#define PR_BITS_PER_INT64_LOG2 6
> -+#define PR_BITS_PER_LONG_LOG2 6
> -+#define PR_BITS_PER_FLOAT_LOG2 5
> -+#define PR_BITS_PER_DOUBLE_LOG2 6
> -+#define PR_BITS_PER_WORD_LOG2 6
> -+
> -+#define PR_ALIGN_OF_SHORT 2
> -+#define PR_ALIGN_OF_INT 4
> -+#define PR_ALIGN_OF_LONG 8
> -+#define PR_ALIGN_OF_FLOAT 4
> -+#define PR_ALIGN_OF_POINTER 8
> -+
> -+#define HAVE_LONG_LONG
> -+#define HAVE_ALIGNED_DOUBLES
> -+#define HAVE_ALIGNED_LONGLONGS
> -+
> -+#elif defined(__ia64__)
> -+#define IS_LITTLE_ENDIAN 1
> -+#undef IS_BIG_ENDIAN
> -+#define HAVE_LONG_LONG
> -+#define HAVE_ALIGNED_DOUBLES
> -+#define HAVE_ALIGNED_LONGLONGS
> -+#define IS_64
> -+
> -+#define PR_BYTES_PER_BYTE 1
> -+#define PR_BYTES_PER_SHORT 2
> -+#define PR_BYTES_PER_INT 4
> -+#define PR_BYTES_PER_INT64 8
> -+#define PR_BYTES_PER_LONG 8
> -+#define PR_BYTES_PER_FLOAT 4
> -+#define PR_BYTES_PER_DOUBLE 8
> -+#define PR_BYTES_PER_WORD 8
> -+#define PR_BYTES_PER_DWORD 8
> -+
> -+#define PR_BITS_PER_BYTE 8
> -+#define PR_BITS_PER_SHORT 16
> -+#define PR_BITS_PER_INT 32
> -+#define PR_BITS_PER_INT64 64
> -+#define PR_BITS_PER_LONG 64
> -+#define PR_BITS_PER_FLOAT 32
> -+#define PR_BITS_PER_DOUBLE 64
> -+#define PR_BITS_PER_WORD 64
> -+
> -+#define PR_BITS_PER_BYTE_LOG2 3
> -+#define PR_BITS_PER_SHORT_LOG2 4
> -+#define PR_BITS_PER_INT_LOG2 5
> -+#define PR_BITS_PER_INT64_LOG2 6
> -+#define PR_BITS_PER_LONG_LOG2 6
> -+#define PR_BITS_PER_FLOAT_LOG2 5
> -+#define PR_BITS_PER_DOUBLE_LOG2 6
> -+#define PR_BITS_PER_WORD_LOG2 6
> -+
> -+#define PR_ALIGN_OF_SHORT 2
> -+#define PR_ALIGN_OF_INT 4
> -+#define PR_ALIGN_OF_LONG 8
> -+#define PR_ALIGN_OF_INT64 8
> -+#define PR_ALIGN_OF_FLOAT 4
> -+#define PR_ALIGN_OF_DOUBLE 8
> -+#define PR_ALIGN_OF_POINTER 8
> -+#define PR_ALIGN_OF_WORD 8
> -+
> -+#define PR_BYTES_PER_WORD_LOG2 3
> -+#define PR_BYTES_PER_DWORD_LOG2 3
> -+
> -+#elif defined(__amd64__)
> -+#define IS_LITTLE_ENDIAN 1
> -+#undef IS_BIG_ENDIAN
> -+#define IS_64
> -+
> -+#define PR_BYTES_PER_BYTE 1
> -+#define PR_BYTES_PER_SHORT 2
> -+#define PR_BYTES_PER_INT 4
> -+#define PR_BYTES_PER_INT64 8
> -+#define PR_BYTES_PER_LONG 8
> -+#define PR_BYTES_PER_FLOAT 4
> -+#define PR_BYTES_PER_DOUBLE 8
> -+#define PR_BYTES_PER_WORD 8
> -+#define PR_BYTES_PER_DWORD 8
> -+
> -+#define PR_BITS_PER_BYTE 8
> -+#define PR_BITS_PER_SHORT 16
> -+#define PR_BITS_PER_INT 32
> -+#define PR_BITS_PER_INT64 64
> -+#define PR_BITS_PER_LONG 64
> -+#define PR_BITS_PER_FLOAT 32
> -+#define PR_BITS_PER_DOUBLE 64
> -+#define PR_BITS_PER_WORD 64
> -+
> -+#define PR_BITS_PER_BYTE_LOG2 3
> -+#define PR_BITS_PER_SHORT_LOG2 4
> -+#define PR_BITS_PER_INT_LOG2 5
> -+#define PR_BITS_PER_INT64_LOG2 6
> -+#define PR_BITS_PER_LONG_LOG2 6
> -+#define PR_BITS_PER_FLOAT_LOG2 5
> -+#define PR_BITS_PER_DOUBLE_LOG2 6
> -+#define PR_BITS_PER_WORD_LOG2 6
> -+
> -+#define PR_ALIGN_OF_SHORT 2
> -+#define PR_ALIGN_OF_INT 4
> -+#define PR_ALIGN_OF_LONG 8
> -+#define PR_ALIGN_OF_INT64 8
> -+#define PR_ALIGN_OF_FLOAT 4
> -+#define PR_ALIGN_OF_DOUBLE 8
> -+#define PR_ALIGN_OF_POINTER 8
> -+#define PR_ALIGN_OF_WORD 8
> -+
> -+#define PR_BYTES_PER_WORD_LOG2 3
> -+#define PR_BYTES_PER_DWORD_LOG2 3
> -+
> -+#define HAVE_LONG_LONG
> -+#define HAVE_ALIGNED_DOUBLES
> -+#define HAVE_ALIGNED_LONGLONGS
> - #else
> -
> - #error "Unknown CPU architecture"
> Index: files/patch-nsprpub-pr-include-md-_freebsd.h
> ===================================================================
> RCS file: files/patch-nsprpub-pr-include-md-_freebsd.h
> diff -N files/patch-nsprpub-pr-include-md-_freebsd.h
> --- files/patch-nsprpub-pr-include-md-_freebsd.h 10 Mar 2005 00:43:22
> -0000 1.4
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,15 +0,0 @@
> -$FreeBSD:
> ports/www/firefox/files/patch-nsprpub-pr-include-md-_freebsd.h,v 1.4
> 2005/03/10 00:43:22 marcus Exp $
> -
> ---- nsprpub/pr/include/md/_freebsd.h.orig Sat Nov 15 23:36:13 2003
> -+++ nsprpub/pr/include/md/_freebsd.h Mon Feb 9 22:24:39 2004
> -@@ -50,6 +50,10 @@
> - #define _PR_SI_ARCHITECTURE "alpha"
> - #elif defined(__sparc__)
> - #define _PR_SI_ARCHITECTURE "sparc"
> -+#elif defined(__ia64__)
> -+#define _PR_SI_ARCHITECTURE "ia64"
> -+#elif defined(__amd64__)
> -+#define _PR_SI_ARCHITECTURE "amd64"
> - #else
> - #error "Unknown CPU architecture"
> - #endif
> Index: files/patch-nsprpub-pr-include-md-_pth.h
> ===================================================================
> RCS file: files/patch-nsprpub-pr-include-md-_pth.h
> diff -N files/patch-nsprpub-pr-include-md-_pth.h
> --- files/patch-nsprpub-pr-include-md-_pth.h 27 Jul 2004 14:18:27
> -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,11 +0,0 @@
> ---- nsprpub/pr/include/md/_pth.h.orig Mon Jul 26 07:23:42 2004
> -+++ nsprpub/pr/include/md/_pth.h Mon Jul 26 07:18:37 2004
> -@@ -90,7 +90,7 @@
> - #define _PT_PTHREAD_MUTEXATTR_INIT pthread_mutexattr_init
> - #define _PT_PTHREAD_MUTEXATTR_DESTROY pthread_mutexattr_destroy
> - #define _PT_PTHREAD_MUTEX_INIT(m, a) pthread_mutex_init(&(m),
> &(a))
> --#define _PT_PTHREAD_MUTEX_IS_LOCKED(m) (EBUSY ==
> pthread_mutex_trylock(&(m)))
> -+#define _PT_PTHREAD_MUTEX_IS_LOCKED(m) (0 !=
> pthread_mutex_trylock(&(m)))
> - #if defined(DARWIN)
> - #define _PT_PTHREAD_CONDATTR_INIT(x) 0
> - #else
> Index: files/patch-nsprpub-pr-src-io-prprf.c
> ===================================================================
> RCS file: files/patch-nsprpub-pr-src-io-prprf.c
> diff -N files/patch-nsprpub-pr-src-io-prprf.c
> --- files/patch-nsprpub-pr-src-io-prprf.c 16 Jun 2004 00:10:12 -0000 1.3
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,14 +0,0 @@
> ---- nsprpub/pr/src/io/prprf.c.orig Mon Mar 8 22:18:19 2004
> -+++ nsprpub/pr/src/io/prprf.c Tue Jun 15 13:17:30 2004
> -@@ -51,7 +51,10 @@
> - ** Note: on some platforms va_list is defined as an array,
> - ** and requires array notation.
> - */
> --#if (defined(LINUX) && defined(__x86_64__))
> -+#if defined(__amd64__)
> -+#include <stdarg.h>
> -+#define VARARGS_ASSIGN(foo, bar) va_copy((foo), (bar))
> -+#elif (defined(LINUX) && defined(__x86_64__))
> - #define VARARGS_ASSIGN(foo, bar) __va_copy((foo), (bar))
> - #elif (defined(LINUX) && defined(__powerpc__)) || \
> - (defined(LINUX) && defined(__s390__)) || \
> Index: files/patch-nsprpub-pr-src-pthreads-ptio.c
> ===================================================================
> RCS file: files/patch-nsprpub-pr-src-pthreads-ptio.c
> diff -N files/patch-nsprpub-pr-src-pthreads-ptio.c
> --- files/patch-nsprpub-pr-src-pthreads-ptio.c 10 Mar 2005 00:43:22
> -0000 1.5
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,31 +0,0 @@
> -$FreeBSD:
> ports/www/firefox/files/patch-nsprpub-pr-src-pthreads-ptio.c,v 1.5
> 2005/03/10 00:43:22 marcus Exp $
> -
> ---- nsprpub/pr/src/pthreads/ptio.c.orig Mon Jul 14 21:59:47 2003
> -+++ nsprpub/pr/src/pthreads/ptio.c Fri Oct 17 05:25:43 2003
> -@@ -189,7 +189,7 @@
> - #endif
> - #endif
> -
> --#ifdef DARWIN
> -+#if defined(DARWIN) || defined(FREEBSD)
> - static PRBool _pr_ipv6_v6only_on_by_default;
> - /* The IPV6_V6ONLY socket option is not defined on Mac OS X 10.1. */
> - #ifndef IPV6_V6ONLY
> -@@ -1154,7 +1154,7 @@
> - _pr_stderr = pt_SetMethods(2, PR_DESC_FILE, PR_FALSE, PR_TRUE);
> - PR_ASSERT(_pr_stdin && _pr_stdout && _pr_stderr);
> -
> --#ifdef DARWIN
> -+#if defined(DARWIN) || defined(FREEBSD)
> - /* In Mac OS X v10.3 Panther Beta the IPV6_V6ONLY socket option
> - * is turned on by default, contrary to what RFC 3493, Section
> - * 5.3 says. So we have to turn it off. Find out whether we
> -@@ -3462,7 +3462,7 @@
> - if (osfd == -1) pt_MapError(_PR_MD_MAP_SOCKET_ERROR, errno);
> - else
> - {
> --#ifdef DARWIN
> -+#if defined(DARWIN) || defined(FREEBSD)
> - if ((domain == AF_INET6) && _pr_ipv6_v6only_on_by_default)
> - {
> - int on = 0;
> Index: files/patch-sysnss
> ===================================================================
> RCS file: files/patch-sysnss
> diff -N files/patch-sysnss
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ files/patch-sysnss 3 Aug 2005 01:11:40 -0000
> @@ -0,0 +1,141 @@
> +--- 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 Mon Mar 28 19:56:36 2005
> ++++ security/manager/Makefile.in Tue Aug 2 09:02:50 2005
> +@@ -37,16 +37,7 @@
> + SOFTOKEN3_LIB \
> + SOFTOKEN3_CHK \
> +- LOADABLE_ROOT_MODULE \
> + HAVE_FREEBL_MODULES \
> + $(NULL)
> +
> +-LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX)
> +-
> +-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)))
> +@@ -132,9 +123,4 @@
> + .nss.cleaned: .nss.checkout
> + $(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 $@
> +
> +@@ -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
> +- $(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
> +-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
> +- $(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_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
> +-endif
> + endif
> + $(MAKE) -C boot $@
> +@@ -200,18 +147,4 @@
> +
> + install::
> +- $(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_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)
> +-endif
> + $(MAKE) -C boot $@
> + $(MAKE) -C ssl $@
> +@@ -227,9 +160,4 @@
> + endif
> + $(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
> +
> + echo-requires-recursive::
> +--- 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)
> +
> +--- 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)
--
mezz7@cox.net - mezz@FreeBSD.org
FreeBSD GNOME Team
http://www.FreeBSD.org/gnome/ - gnome@FreeBSD.org
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?op.suwrhbsm9aq2h7>