Use pkgsrc optimisation (CFLAGS, CXXFLAGS) = faster binary, less memory usage

5 files changed, 59 insertions, 14 deletions

diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo
index fa3eab1e581..6e3e880eaac 100644
--- a/mail/thunderbird/distinfo
+++ b/mail/thunderbird/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.15 2005/07/24 02:58:33 taya Exp $
+$NetBSD: distinfo,v 1.16 2005/07/25 15:46:02 adam Exp $
 
 SHA1 (thunderbird-1.0.6-source.tar.bz2) = 3edb2b98ceda5cb4cbd107757b629587f1a57069
 RMD160 (thunderbird-1.0.6-source.tar.bz2) = 121bd34f1f8a75efb206515b5acaf4c633b2cc6f
 Size (thunderbird-1.0.6-source.tar.bz2) = 33366077 bytes
 SHA1 (patch-aa) = 9225a7a2c9b4545e800008169d4d88452c85d1a9
-SHA1 (patch-ab) = 77038a3dee47573782d912a928327d046c6d3c7f
+SHA1 (patch-ab) = 7b2652811549f5eca4e2cf5718b89a3f26a69f73
 SHA1 (patch-ac) = 32aa4b92eea19aca07077a292cb759d074026642
 SHA1 (patch-ad) = 19afc8dfaf9f14439d747e42ee2f64a9c1a9dc3d
 SHA1 (patch-ae) = 364b91f0bf51e49bb140e13dfb775a89ea38bb28
@@ -17,12 +17,14 @@ SHA1 (patch-ak) = 6fb6ed901990efbb1a25ca5666470f8f2467fa8a
 SHA1 (patch-al) = ece2c5591e3a86f80ce8257b87a802aa2fda6494
 SHA1 (patch-an) = 47bb24afbb0def95d30d466700c1983f18a14641
 SHA1 (patch-ao) = 4162763cc7af61deb1795f85fdbd96e3ef930d4d
+SHA1 (patch-ap) = 6ef426340470468f8fb3a73f9d332c970e2ad9e0
+SHA1 (patch-aq) = d1fa4af006ea7486fa04b628379187a7f8e41a91
 SHA1 (patch-aw) = e2968bcf9e1175a660dcc715d68b33cdc221ef81
 SHA1 (patch-ax) = 2421096cf84bd174cfe576db855cca2338615495
 SHA1 (patch-ba) = a0d70d713d2d4746d9128724c382b019f353f5af
 SHA1 (patch-bb) = 9ba4bcd86e581496bbc6b40b3a3f062dfd5e416f
 SHA1 (patch-bm) = 6bd7bf1262cec43b0324693d43929497c3fb3991
-SHA1 (patch-bo) = 357c4cacdc179191d6fe263b4eb62cc56b7ec25f
+SHA1 (patch-bo) = eae0edcfdb535d04523b77bd4f09f14b4c148e9d
 SHA1 (patch-bq) = 3b8a951828b0e6906e4352027b4d36c9b1f8aaae
 SHA1 (patch-br) = 52d5b595f1e25ac5d6664864ab0cbe5e14012168
 SHA1 (patch-bs) = 81065130c96bf966b22e6abb767a5b674dcb52cb
diff --git a/mail/thunderbird/patches/patch-ab b/mail/thunderbird/patches/patch-ab
index f4f4226db19..a72bccfcbde 100644
--- a/mail/thunderbird/patches/patch-ab
+++ b/mail/thunderbird/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.4 2004/12/04 02:16:03 taya Exp $
+$NetBSD: patch-ab,v 1.5 2005/07/25 15:46:02 adam Exp $
 
---- configure.in.orig	Thu May 13 17:57:46 2004
+--- configure.in.orig	2004-10-31 07:17:58.000000000 +0000
 +++ configure.in
-@@ -996,7 +996,6 @@ case "$target" in
+@@ -1001,7 +1001,6 @@ case "$target" in
      powerpc*)
          _PLATFORM_DEFAULT_TOOLKIT='mac'
          DSO_LDOPTS="$DSO_LDOPTS -arch ppc"
@@ -10,7 +10,7 @@ $NetBSD: patch-ab,v 1.4 2004/12/04 02:16:03 taya Exp $
          # set MACOSX to generate lib/mac/MoreFiles/Makefile
          MACOSX=1
          ;;
-@@ -1017,6 +1016,9 @@ case "$target" in
+@@ -1022,6 +1021,9 @@ case "$target" in
  #	MKSHLIB_FORCE_ALL='-Wl,-Bforcearchive'
  #	MKSHLIB_UNFORCE_ALL=''
  #    fi
@@ -20,7 +20,7 @@ $NetBSD: patch-ab,v 1.4 2004/12/04 02:16:03 taya Exp $
      ;; 
  
  *-hpux*)
-@@ -1308,6 +1310,13 @@ case "$target" in
+@@ -1316,6 +1318,13 @@ case "$target" in
      if test "$LIBRUNPATH"; then
  	DSO_LDOPTS="-Wl,-R$LIBRUNPATH $DSO_LDOPTS"
      fi
@@ -34,7 +34,7 @@ $NetBSD: patch-ab,v 1.4 2004/12/04 02:16:03 taya Exp $
      ;;
  
  *-nto*) 
-@@ -1531,7 +1540,7 @@ dnl the qsort routine under solaris is f
+@@ -1539,7 +1548,7 @@ dnl the qsort routine under solaris is f
         MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -Wl,-z -Wl,muldefs -o $@'
         MKSHLIB_FORCE_ALL='-Qoption ld -z,allextract'
         MKSHLIB_UNFORCE_ALL=''
@@ -43,3 +43,12 @@ $NetBSD: patch-ab,v 1.4 2004/12/04 02:16:03 taya Exp $
         AR_LIST="$AR t"
         AR_EXTRACT="$AR x"
         AR_DELETE="$AR d"
+@@ -4280,7 +4289,7 @@ dnl = Enable code optimization. OFF by d
+ dnl ========================================================
+ MOZ_OPTIMIZE=
+ if test -z "$MOZ_OPTIMIZE_FLAGS"; then
+-	MOZ_OPTIMIZE_FLAGS="-O"
++	MOZ_OPTIMIZE_FLAGS=""
+ fi
+ 
+ MOZ_ARG_ENABLE_STRING(optimize,
diff --git a/mail/thunderbird/patches/patch-ap b/mail/thunderbird/patches/patch-ap
new file mode 100644
index 00000000000..d99ad3206f2
--- /dev/null
+++ b/mail/thunderbird/patches/patch-ap
@@ -0,0 +1,13 @@
+$NetBSD: patch-ap,v 1.1 2005/07/25 15:46:02 adam Exp $
+
+--- security/coreconf/command.mk.orig	2005-07-25 11:03:35.000000000 +0000
++++ security/coreconf/command.mk
+@@ -42,7 +42,7 @@ CCF           = $(CC) $(CFLAGS)
+ LINK_DLL      = $(LINK) $(OS_DLLFLAGS) $(DLLFLAGS)
+ LINK_EXE      = $(LINK) $(OS_LFLAGS) $(LFLAGS)
+ NFSPWD        = $(NSINSTALL_DIR)/nfspwd
+-CFLAGS        = $(OPTIMIZER) $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \
++CFLAGS       += $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \
+ 		$(XCFLAGS)
+ RANLIB        = echo
+ TAR           = /bin/tar
diff --git a/mail/thunderbird/patches/patch-aq b/mail/thunderbird/patches/patch-aq
new file mode 100644
index 00000000000..442736c3289
--- /dev/null
+++ b/mail/thunderbird/patches/patch-aq
@@ -0,0 +1,13 @@
+$NetBSD: patch-aq,v 1.1 2005/07/25 15:46:02 adam Exp $
+
+--- directory/c-sdk/configure.in.orig	2005-07-23 11:36:39.000000000 +0000
++++ directory/c-sdk/configure.in
+@@ -52,7 +52,7 @@ USE_64=
+ USE_CPLUS=
+ USE_IPV6=
+ USE_MDUPDATE=
+-_OPTIMIZE_FLAGS=-O
++_OPTIMIZE_FLAGS=
+ _DEBUG_FLAGS=-g
+ MOZ_DEBUG=1
+ MOZ_OPTIMIZE=
diff --git a/mail/thunderbird/patches/patch-bo b/mail/thunderbird/patches/patch-bo
index 114b75c3fd7..685cabed943 100644
--- a/mail/thunderbird/patches/patch-bo
+++ b/mail/thunderbird/patches/patch-bo
@@ -1,9 +1,17 @@
-$NetBSD: patch-bo,v 1.3 2004/06/24 23:09:56 taya Exp $
+$NetBSD: patch-bo,v 1.4 2005/07/25 15:46:02 adam Exp $
 
-diff -ru ../Orig/mozilla/nsprpub/configure.in ./nsprpub/configure.in
---- ../Orig/mozilla/nsprpub/configure.in	2004-06-05 14:46:38.000000000 +0900
-+++ ./nsprpub/configure.in	2004-06-15 23:56:41.000000000 +0900
-@@ -933,6 +933,9 @@
+--- nsprpub/configure.in.orig	2004-09-14 20:59:41.000000000 +0000
++++ nsprpub/configure.in
+@@ -56,7 +56,7 @@ USE_CPLUS=
+ USE_IPV6=
+ USE_MDUPDATE=
+ MACOS_DEPLOYMENT_TARGET=
+-_OPTIMIZE_FLAGS=-O
++_OPTIMIZE_FLAGS=
+ _DEBUG_FLAGS=-g
+ MOZ_DEBUG=1
+ MOZ_OPTIMIZE=
+@@ -933,6 +933,9 @@ case "$target" in
      DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
      MDCPUCFG_H=_freebsd.cfg
      PR_MD_CSRCS=freebsd.c