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

5 files changed, 60 insertions, 15 deletions

diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index 6672c470a0b..8e33020027a 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.35 2005/07/20 23:33:30 taya Exp $
+$NetBSD: distinfo,v 1.36 2005/07/25 15:46:51 adam Exp $
 
 SHA1 (firefox-1.0.6/firefox-1.0.6-source.tar.bz2) = 56183aa14a0185a27a6ab4337d2ade7d1d45c2a6
 RMD160 (firefox-1.0.6/firefox-1.0.6-source.tar.bz2) = 8af3fa48fad539f26a5f1b57526efc85b22fca00
 Size (firefox-1.0.6/firefox-1.0.6-source.tar.bz2) = 32782840 bytes
 SHA1 (patch-aa) = 9225a7a2c9b4545e800008169d4d88452c85d1a9
-SHA1 (patch-ab) = 0c1f2d6cca09b4dd6b168ed29d84d245967a3369
+SHA1 (patch-ab) = cbc4efd470f4678aee40628b8b95d919d0d15d1f
 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) = 7d6e0353666810992ab0b09d804f9f48ef90b984
+SHA1 (patch-bo) = 989520d608b6a60169c70bb6f5da3608aa36cf8d
 SHA1 (patch-bq) = 3b8a951828b0e6906e4352027b4d36c9b1f8aaae
 SHA1 (patch-br) = 6311da23ec126fe0959cb19502a22c106f8f975c
 SHA1 (patch-bs) = 81065130c96bf966b22e6abb767a5b674dcb52cb
diff --git a/www/firefox/patches/patch-ab b/www/firefox/patches/patch-ab
index 42befd6df27..c0ded09dc7a 100644
--- a/www/firefox/patches/patch-ab
+++ b/www/firefox/patches/patch-ab
@@ -1,9 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2004/06/23 16:47:12 taya Exp $
+$NetBSD: patch-ab,v 1.3 2005/07/25 15:46:51 adam Exp $
 
-diff -ru ../Orig/mozilla/configure.in ./configure.in
---- ../Orig/mozilla/configure.in	2004-05-14 06:57:46.000000000 +0900
-+++ ./configure.in	2004-06-15 23:55:39.000000000 +0900
-@@ -1017,6 +1017,9 @@
+--- configure.in.orig	2004-10-31 07:17:58.000000000 +0000
++++ configure.in
+@@ -1022,6 +1022,9 @@ case "$target" in
  #	MKSHLIB_FORCE_ALL='-Wl,-Bforcearchive'
  #	MKSHLIB_UNFORCE_ALL=''
  #    fi
@@ -13,7 +12,7 @@ diff -ru ../Orig/mozilla/configure.in ./configure.in
      ;; 
  
  *-hpux*)
-@@ -1308,6 +1311,13 @@
+@@ -1316,6 +1319,13 @@ case "$target" in
      if test "$LIBRUNPATH"; then
  	DSO_LDOPTS="-Wl,-R$LIBRUNPATH $DSO_LDOPTS"
      fi
@@ -27,7 +26,7 @@ diff -ru ../Orig/mozilla/configure.in ./configure.in
      ;;
  
  *-nto*) 
-@@ -1531,7 +1541,7 @@
+@@ -1539,7 +1549,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=''
@@ -36,3 +35,12 @@ diff -ru ../Orig/mozilla/configure.in ./configure.in
         AR_LIST="$AR t"
         AR_EXTRACT="$AR x"
         AR_DELETE="$AR d"
+@@ -4280,7 +4290,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/www/firefox/patches/patch-ap b/www/firefox/patches/patch-ap
new file mode 100644
index 00000000000..cf0434b6ec4
--- /dev/null
+++ b/www/firefox/patches/patch-ap
@@ -0,0 +1,13 @@
+$NetBSD: patch-ap,v 1.3 2005/07/25 15:46:51 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/www/firefox/patches/patch-aq b/www/firefox/patches/patch-aq
new file mode 100644
index 00000000000..b5fe35a314e
--- /dev/null
+++ b/www/firefox/patches/patch-aq
@@ -0,0 +1,13 @@
+$NetBSD: patch-aq,v 1.1 2005/07/25 15:46:51 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/www/firefox/patches/patch-bo b/www/firefox/patches/patch-bo
index 125b9c57987..4bdcac92de2 100644
--- a/www/firefox/patches/patch-bo
+++ b/www/firefox/patches/patch-bo
@@ -1,8 +1,17 @@
-$NetBSD: patch-bo,v 1.3 2004/12/04 04:43:49 taya Exp $
+$NetBSD: patch-bo,v 1.4 2005/07/25 15:46:51 adam Exp $
 
---- ../Orig/mozilla/nsprpub/configure.in	2004-04-17 07:28:02.000000000 +0900
-+++ ./nsprpub/configure.in	2004-07-27 01:25:32.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
@@ -12,7 +21,7 @@ $NetBSD: patch-bo,v 1.3 2004/12/04 04:43:49 taya Exp $
      ;;
  
  *-hpux*)
-@@ -1409,6 +1412,7 @@
+@@ -1417,6 +1420,7 @@ mips-nec-sysv*)
      AC_DEFINE(XP_UNIX)
      AC_DEFINE(NETBSD)
      AC_DEFINE(HAVE_BSD_FLOCK)