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

6 files changed, 62 insertions, 15 deletions

diff --git a/www/mozilla/Makefile.common b/www/mozilla/Makefile.common
index f00281b91d6..65e0e3d9113 100644
--- a/www/mozilla/Makefile.common
+++ b/www/mozilla/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.60 2005/07/21 16:29:59 wiz Exp $
+# $NetBSD: Makefile.common,v 1.61 2005/07/25 15:47:20 adam Exp $
 
 MOZ_DIST_VER?=	${MOZ_VER}
 DISTNAME?=	mozilla-${MOZ_DIST_VER}-source
@@ -164,6 +164,7 @@ post-extract:
 pre-configure:
 	cd ${WRKSRC} && autoconf
 	cd ${WRKSRC}/nsprpub && autoconf
+	cd ${WRKSRC}/directory/c-sdk && autoconf
 
 post-build:
 	${ECHO} skin,install,select,classic/1.0 >> \
diff --git a/www/mozilla/distinfo b/www/mozilla/distinfo
index 24d54fa8f09..9414bb01868 100644
--- a/www/mozilla/distinfo
+++ b/www/mozilla/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.81 2005/07/24 06:59:31 taya Exp $
+$NetBSD: distinfo,v 1.82 2005/07/25 15:47:20 adam Exp $
 
 SHA1 (mozilla-1.7.10-source.tar.bz2) = 4540caa7cd78916e3c3b64c80095b7ea46a108d8
 RMD160 (mozilla-1.7.10-source.tar.bz2) = 85c414baef33c0967fc222b186766e7cb9c4bf53
 Size (mozilla-1.7.10-source.tar.bz2) = 30443617 bytes
 SHA1 (patch-aa) = be62070f062e8ae13f06bd7b3f4f0d4a9ee67bef
-SHA1 (patch-ab) = 77038a3dee47573782d912a928327d046c6d3c7f
+SHA1 (patch-ab) = ceff4fae4f3c1f7d23db41a04e5da81e1c897424
 SHA1 (patch-ac) = 32aa4b92eea19aca07077a292cb759d074026642
 SHA1 (patch-ad) = 2210b695a2eedefb82c16698a51f4f0f6b2e53e4
 SHA1 (patch-ae) = f3c8ffcdfc8c0d5cc75413602c97c731721d751e
@@ -17,12 +17,14 @@ SHA1 (patch-ak) = 13082ce164b46edd8025cbc2866018dc121a919a
 SHA1 (patch-al) = 4c76cff49af5d5ef39136548a4de657ec804be5a
 SHA1 (patch-an) = 99ac2da44322db96f8d65fbfdb380727b9da96fe
 SHA1 (patch-ao) = 617d232bd335bc988388f2004ca919c829e371da
+SHA1 (patch-ap) = 6ef426340470468f8fb3a73f9d332c970e2ad9e0
+SHA1 (patch-aq) = d1fa4af006ea7486fa04b628379187a7f8e41a91
 SHA1 (patch-aw) = b42ddb3075fe9eb84334aec27f1c8e4ab3714b9b
 SHA1 (patch-ax) = 480094894cb53dee8d51c15b24dc03502c52071b
 SHA1 (patch-ba) = f5b7bf6356ecc373e1d201ca58fa24b34d7e122a
 SHA1 (patch-bb) = b59212ceaab164769b17ca32d9161affc535a0ef
 SHA1 (patch-bm) = 3e297a2dece8dcad7bde86f79f944a98d09174a7
-SHA1 (patch-bo) = 7d6e0353666810992ab0b09d804f9f48ef90b984
+SHA1 (patch-bo) = c97af513fc7942dfad8db0bb07a54409affa5f56
 SHA1 (patch-bq) = 2a08f3eb1b6a8ea00e712d08b4bcafad3b766a81
 SHA1 (patch-br) = 52d5b595f1e25ac5d6664864ab0cbe5e14012168
 SHA1 (patch-bs) = fb9f8f13ce481c04a0f7ecfd0ad4d8016cddc2e4
diff --git a/www/mozilla/patches/patch-ab b/www/mozilla/patches/patch-ab
index 626961a7ad2..f7b552b0712 100644
--- a/www/mozilla/patches/patch-ab
+++ b/www/mozilla/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.33 2004/08/31 02:37:57 danw Exp $
+$NetBSD: patch-ab,v 1.34 2005/07/25 15:47:20 adam Exp $
 
---- configure.in.orig	Thu May 13 17:57:46 2004
+--- configure.in.orig	2004-10-12 04:13:29.000000000 +0000
 +++ configure.in
-@@ -996,7 +996,6 @@ case "$target" in
+@@ -998,7 +998,6 @@ case "$target" in
      powerpc*)
          _PLATFORM_DEFAULT_TOOLKIT='mac'
          DSO_LDOPTS="$DSO_LDOPTS -arch ppc"
@@ -10,7 +10,7 @@ $NetBSD: patch-ab,v 1.33 2004/08/31 02:37:57 danw Exp $
          # set MACOSX to generate lib/mac/MoreFiles/Makefile
          MACOSX=1
          ;;
-@@ -1017,6 +1016,9 @@ case "$target" in
+@@ -1019,6 +1018,9 @@ case "$target" in
  #	MKSHLIB_FORCE_ALL='-Wl,-Bforcearchive'
  #	MKSHLIB_UNFORCE_ALL=''
  #    fi
@@ -20,7 +20,7 @@ $NetBSD: patch-ab,v 1.33 2004/08/31 02:37:57 danw Exp $
      ;; 
  
  *-hpux*)
-@@ -1308,6 +1310,13 @@ case "$target" in
+@@ -1313,6 +1315,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.33 2004/08/31 02:37:57 danw Exp $
      ;;
  
  *-nto*) 
-@@ -1531,7 +1540,7 @@ dnl the qsort routine under solaris is f
+@@ -1536,7 +1545,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.33 2004/08/31 02:37:57 danw Exp $
         AR_LIST="$AR t"
         AR_EXTRACT="$AR x"
         AR_DELETE="$AR d"
+@@ -4195,7 +4204,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/mozilla/patches/patch-ap b/www/mozilla/patches/patch-ap
new file mode 100644
index 00000000000..eaba60dc5d6
--- /dev/null
+++ b/www/mozilla/patches/patch-ap
@@ -0,0 +1,13 @@
+$NetBSD: patch-ap,v 1.3 2005/07/25 15:47:20 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/mozilla/patches/patch-aq b/www/mozilla/patches/patch-aq
new file mode 100644
index 00000000000..e78d24f8189
--- /dev/null
+++ b/www/mozilla/patches/patch-aq
@@ -0,0 +1,13 @@
+$NetBSD: patch-aq,v 1.7 2005/07/25 15:47:20 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/mozilla/patches/patch-bo b/www/mozilla/patches/patch-bo
index 54d055ba8fb..cf05a9a2858 100644
--- a/www/mozilla/patches/patch-bo
+++ b/www/mozilla/patches/patch-bo
@@ -1,8 +1,17 @@
-$NetBSD: patch-bo,v 1.8 2004/07/26 23:36:01 taya Exp $
+$NetBSD: patch-bo,v 1.9 2005/07/25 15:47:20 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 21:14:38.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.8 2004/07/26 23:36:01 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)