Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 20 Oct 2001 23:37:57 -0700 (PDT)
From:      Nuzrin Yaapar <p9711422@mmu.edu.my>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/31396: Port upgrade: www/mozilla-0.9.4 -> mozilla-0.9.5
Message-ID:  <200110210637.f9L6bvL23175@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         31396
>Category:       ports
>Synopsis:       Port upgrade: www/mozilla-0.9.4 -> mozilla-0.9.5
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Oct 20 23:40:00 PDT 2001
>Closed-Date:
>Last-Modified:
>Originator:     Nuzrin Yaapar
>Release:        4.4-STABLE
>Organization:
Multimedia University
>Environment:
[nuzrin@nuzrin ~]> uname -a
FreeBSD nuzrin.cyber.mmu.edu.my 4.4-STABLE FreeBSD 4.4-STABLE #0: Tue Oct 16 08:34:26 MYT 2001     root@nuzrin.cyber.mmu.edu.my:/usr/src/sys/compile/NUZRIN-ATHLON  i386

>Description:
* upgrade mozilla to 0.9.5
* now we can use *tab browsing*! so long galeon ;)
>How-To-Repeat:
None.
>Fix:
[nuzrin@nuzrin /usr/ports/www]> diff -ruN mozilla-new/ mozilla/
diff -ruN mozilla-new/Makefile mozilla/Makefile
--- mozilla-new/Makefile        Sun Oct 21 13:06:21 2001
+++ mozilla/Makefile    Tue Sep 18 16:12:08 2001
@@ -6,7 +6,7 @@
 #

 PORTNAME=      mozilla
-PORTVERSION=   0.9.5
+PORTVERSION=   0.9.4
 PORTEPOCH=     1
 CATEGORIES=    www
 MASTER_SITES=  ${MASTER_SITE_MOZILLA}
@@ -36,7 +36,6 @@
                --disable-cpp-rtti              \
                --disable-debug                 \
                --disable-idltool               \
-               --disable-logging               \
                --disable-md                    \
                --disable-pedantic              \
                --disable-xterm-updates         \
diff -ruN mozilla-new/distinfo mozilla/distinfo
--- mozilla-new/distinfo        Sun Oct 21 12:27:22 2001
+++ mozilla/distinfo    Tue Sep 18 16:12:08 2001
@@ -1 +1 @@
-MD5 (mozilla-source-0.9.5.tar.bz2) = 1d0062ce61a3ad4baa92bdcad496c682
+MD5 (mozilla-source-0.9.4.tar.bz2) = d1c9eca91e7df13c881f45bec54d7cc0
diff -ruN mozilla-new/files/patch-ak mozilla/files/patch-ak
--- mozilla-new/files/patch-ak  Sun Oct 21 12:36:24 2001
+++ mozilla/files/patch-ak      Fri Feb  4 15:45:34 2000
@@ -1,6 +1,6 @@
---- nsprpub/pr/include/md/_freebsd.h.orig      Sun Oct 21 12:33:18 2001
-+++ nsprpub/pr/include/md/_freebsd.h   Sun Oct 21 12:34:57 2001
-@@ -37,6 +37,7 @@
+--- nsprpub/pr/include/md/_freebsd.h.orig      Wed Dec 22 15:39:04 1999
++++ nsprpub/pr/include/md/_freebsd.h   Thu Feb  3 03:48:20 2000
+@@ -21,6 +21,7 @@

  #include "prthread.h"

@@ -8,7 +8,7 @@
  #include <sys/syscall.h>

  #define PR_LINKER_ARCH        "freebsd"
-@@ -65,7 +66,7 @@
+@@ -49,7 +50,7 @@
  #define _PR_HAVE_SOCKADDR_LEN
  #define _PR_STAT_HAS_ST_ATIMESPEC
  #define _PR_NO_LARGE_FILES
diff -ruN mozilla-new/files/patch-aq mozilla/files/patch-aq
--- mozilla-new/files/patch-aq  Sun Oct 21 12:38:40 2001
+++ mozilla/files/patch-aq      Sat Feb 17 01:29:24 2001
@@ -1,6 +1,6 @@
---- nsprpub/pr/include/md/_pth.h.orig  Sun Oct 21 12:36:47 2001
-+++ nsprpub/pr/include/md/_pth.h       Sun Oct 21 12:38:10 2001
-@@ -224,7 +224,7 @@
+--- nsprpub/pr/include/md/_pth.h.orig  Mon Apr  3 17:25:43 2000
++++ nsprpub/pr/include/md/_pth.h       Fri Feb 16 00:30:46 2001
+@@ -183,7 +183,7 @@
  #define PT_PRIO_MAX            sched_get_priority_max(SCHED_OTHER)
  #endif /* defined(_PR_DCETHREADS) */

@@ -9,7 +9,7 @@
  #define PT_PRIO_MIN            sched_get_priority_min(SCHED_OTHER)
  #define PT_PRIO_MAX            sched_get_priority_max(SCHED_OTHER)
  #elif defined(NTO)
-@@ -244,7 +244,7 @@
+@@ -203,7 +203,7 @@
   */
  #define PT_PRIO_MIN            1
  #define PT_PRIO_MAX            127
diff -ruN mozilla-new/files/patch-mi mozilla/files/patch-mi
--- mozilla-new/files/patch-mi  Sun Oct 21 14:28:32 2001
+++ mozilla/files/patch-mi      Tue Sep 18 16:12:08 2001
@@ -1,6 +1,9 @@
---- nsprpub/config/FreeBSD.mk.orig     Sun Oct 21 12:39:04 2001
-+++ nsprpub/config/FreeBSD.mk  Sun Oct 21 12:42:16 2001
-@@ -37,20 +37,21 @@
+
+$FreeBSD: ports/www/mozilla/files/patch-mi,v 1.6 2001/09/18 08:12:08 sobomax Exp $
+
+--- nsprpub/config/FreeBSD.mk.orig     Sat Jul 29 03:50:35 2000
++++ nsprpub/config/FreeBSD.mk  Mon Sep 17 10:47:08 2001
+@@ -37,19 +37,21 @@

  include $(MOD_DEPTH)/config/UNIX.mk

@@ -11,7 +14,7 @@

 +# During FreeBSD port build, CFLAGS contains all of the optimizations
 +# flags desired...
-+OPTIMIZER              = $(MOZ_OPTIMIZE_FLAGS)
++OPTIMIZER             = $(MOZ_OPTIMIZE_FLAGS)
 +
  ifeq ($(OS_TEST),alpha)
  CPU_ARCH              = alpha
@@ -22,19 +25,18 @@
  CPU_ARCH_TAG          = _$(CPU_ARCH)

 -OS_CFLAGS             = $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -pipe $(THREAD_FLAG) -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
--
-+OS_CFLAGS              = $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -pipe -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
++OS_CFLAGS             = $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -pipe -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
+
  #
  # The default implementation strategy for FreeBSD is pthreads.
- #
-@@ -60,8 +61,8 @@
+@@ -60,8 +62,8 @@
  else
  USE_PTHREADS          = 1
  IMPL_STRATEGY         = _PTH
 -DEFINES                       += -D_THREAD_SAFE
 -THREAD_FLAG           += -pthread
-+DEFINES                        += -D_THREAD_SAFE -D_REENTRANT
-+DSO_LDOPTS             += -pthread
++DEFINES                       += -D_THREAD_SAFE -D_REENTRANT
++DSO_LDOPTS            += -pthread
  endif

  ARCH                  = freebsd
diff -ruN mozilla-new/files/patch-qt mozilla/files/patch-qt
--- mozilla-new/files/patch-qt  Sun Oct 21 12:55:32 2001
+++ mozilla/files/patch-qt      Tue Aug  7 19:52:15 2001
@@ -1,6 +1,9 @@
---- configure.orig     Sun Oct 21 12:43:29 2001
-+++ configure  Sun Oct 21 12:54:59 2001
-@@ -6527,7 +6527,7 @@
+
+$FreeBSD: ports/www/mozilla/files/patch-qt,v 1.11 2001/08/07 11:52:15 sobomax Exp $
+
+--- configure.orig     Wed Jul 25 08:44:09 2001
++++ configure  Sat Aug  4 11:18:33 2001
+@@ -6528,7 +6528,7 @@
      echo "$ac_t""$HOST_MOC" 1>&6
      MOC=$HOST_MOC

@@ -9,7 +12,7 @@
      QT_LIBS="-L/usr/X11R6/lib -L${QTDIR}/lib -lqt -lXext -lX11"

      # Check whether --with-static-qt or --without-static-qt was given.
-@@ -8594,6 +8594,9 @@
+@@ -8587,6 +8587,9 @@
  os2*)
      LIBS=
      ;;
@@ -19,20 +22,29 @@
  esac
  for ac_hdr in sys/byteorder.h compat.h getopt.h
  do
-@@ -9289,8 +9292,6 @@
-       if test $? -eq 0; then
-               if test -z "`egrep -i '(unrecognize|unknown)' conftest.out | grep pthreads`" && test -z "`egrep -i '(error|incorrect)' conftest.out`" ; then
-                           ac_cv_have_dash_pthreads=yes
--                          CFLAGS="$CFLAGS -pthreads"
--                          CXXFLAGS="$CXXFLAGS -pthreads"
-                   fi
-           fi
-           rm -f conftest*
-@@ -13636,6 +13637,7 @@
+@@ -9316,8 +9319,6 @@
+       if test $? -eq 0; then
+               if test -z "`egrep -i '(unrecognize|unknown)' conftest.out | grep pthread`" && test -z "`egrep -i '(error|incorrect)' conftest.out`" ; then
+                       ac_cv_have_dash_pthread=yes
+-                      CFLAGS="$CFLAGS -pthread"
+-                      CXXFLAGS="$CXXFLAGS -pthread"
+               fi
+       fi
+       rm -f conftest*
+@@ -9351,7 +9352,7 @@
+ EOF
+
+                                               if test "$ac_cv_have_dash_pthread" = "yes"; then
+-                              _PTHREAD_LDFLAGS=""
++                              _PTHREAD_LDFLAGS="-pthread"
+                       else
+                               _PTHREAD_LDFLAGS="-lc_r"
+                       fi
+@@ -13701,6 +13702,7 @@
          ;;
      *)
          NSPR_LIBS=`./nsprpub/config/nspr-config --prefix=$MOZ_BUILD_ROOT/dist --exec-prefix=$MOZ_BUILD_ROOT/dist --libs`
-+        NSPR_LIBS="$NSPR_LIBS $BSD_PTHREAD_LIBS"
++      NSPR_LIBS="$NSPR_LIBS $BSD_PTHREAD_LIBS"
          $PERL -pi.bak -e "s {^NSPR_LIBS\s*=.*} {NSPR_LIBS = $NSPR_LIBS }" config/autoconf.mk
          ;;
      esac

>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200110210637.f9L6bvL23175>