4 files changed, 15 insertions, 42 deletions

diff --git a/www/mozilla-devel/Makefile b/www/mozilla-devel/Makefile
index 230675cf4737..aa3d6f3df230 100644
--- a/www/mozilla-devel/Makefile
+++ b/www/mozilla-devel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME?=	mozilla
-PORTVERSION=	1.3a
-PORTREVISION?=	1
+PORTVERSION=	1.3b
 PORTEPOCH?=	1
 CATEGORIES?=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA} \
@@ -36,7 +35,8 @@ WITHOUT_CHATZILLA=	"Contains a buffer overflow reported at http://online.securit
 LIB_DEPENDS+=	gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20 \
 		ORBit-2.0:${PORTSDIR}/devel/ORBit2
 .else
-USE_GNOME=	gtk12
+USE_GNOMENG=	yes
+USE_GNOME=	gtk12 orbit
 .endif
 
 .if !defined(WITHOUT_XFT)
@@ -90,11 +90,6 @@ CONFIGURE_ARGS=					\
 		--with-system-png=${LOCALBASE}	\
 		--with-pthreads
 
-.if !defined(WITH_GTK2)
-USE_GNOMENG=	yes
-USE_GNOME+=	orbit
-.endif
-
 PLIST=	${WRKDIR}/pkg-plist
 # LDAP is only used by mail and news so disable both together
 .if defined(WITHOUT_MAILNEWS)
@@ -152,6 +147,7 @@ CONFIGURE_ARGS+=	--enable-reorder
 .endif
 
 .if ${ARCH} == "alpha"
+CFLAGS+=	-O0
 BROKEN=	"core dumps on alpha during post-build"
 .endif
 
diff --git a/www/mozilla-devel/distinfo b/www/mozilla-devel/distinfo
index 1126faf71474..81d931e64bf9 100644
--- a/www/mozilla-devel/distinfo
+++ b/www/mozilla-devel/distinfo
@@ -1,2 +1,3 @@
-MD5 (mozilla-source-1.3a.tar.gz) = 3f5d70a6db244735ac5fe8861fce048f
-MD5 (libart_lgpl-1.3a.tar.gz) = db14696f2bf83333f2020fa87fbe630c
+MD5 (mozilla-source-1.3b.tar.gz) = 51c4a31cd7cf7d2a00a9b1aa343d6716
+MD5 (libart_lgpl-1.3b.tar.gz) = db14696f2bf83333f2020fa87fbe630c
+MD5 (mozilla-calendar-1.3b.tar.gz) = 2e4db8a23c0960d6d8d859c2c31f97d8
diff --git a/www/mozilla-devel/files/patch-gfx_src_gtk_Makefile.in b/www/mozilla-devel/files/patch-gfx_src_gtk_Makefile.in
deleted file mode 100644
index 85c868f6717b..000000000000
--- a/www/mozilla-devel/files/patch-gfx_src_gtk_Makefile.in
+++ /dev/null
@@ -1,24 +0,0 @@
---- gfx/src/gtk/Makefile.in.orig	Sun Jan  5 03:49:41 2003
-+++ gfx/src/gtk/Makefile.in	Sun Jan  5 03:49:59 2003
-@@ -135,6 +135,10 @@
- 
- include $(topsrcdir)/config/rules.mk
- 
-+ifdef MOZ_ENABLE_XINERAMA
-+GFX_XINERAMA_LIBS += $(MOZ_XINERAMA_LIBS)
-+endif
-+
- ifdef MOZ_ENABLE_GTK
- EXTRA_DSO_LDOPTS += \
- 		$(LIBS_DIR) \
-@@ -159,10 +163,6 @@
- EXTRA_DSO_LDOPTS += $(MOZ_GTK_LDFLAGS) $(MOZ_XFT_LIBS) $(MOZ_GTK2_LIBS)
- CXXFLAGS	+= $(MOZ_GTK_CFLAGS) $(MOZ_GTK2_CFLAGS)
- CFLAGS		+= $(MOZ_GTK_CFLAGS) $(MOZ_GTK2_CFLAGS)
--
--ifdef MOZ_ENABLE_XINERAMA
--GFX_XINERAMA_LIBS += $(MOZ_XINERAMA_LIBS)
--endif
- 
- ifeq ($(OS_ARCH), Linux)
- DEFINES         += -D_BSD_SOURCE
diff --git a/www/mozilla-devel/files/patch-qt b/www/mozilla-devel/files/patch-qt
index 9bf05f639a6c..032397d35040 100644
--- a/www/mozilla-devel/files/patch-qt
+++ b/www/mozilla-devel/files/patch-qt
@@ -1,15 +1,15 @@
---- configure.orig	Tue Oct 15 19:39:37 2002
-+++ configure	Fri Oct 18 18:20:50 2002
-@@ -10646,7 +10646,7 @@
+--- configure.orig	Thu Feb  6 17:15:12 2003
++++ configure	Tue Feb 11 22:52:48 2003
+@@ -10974,7 +10974,7 @@
      fi
      MOC=$HOST_MOC
  
--    QT_CFLAGS="-I${QTDIR}${QTINCDIR} -DQT_GENUINE_STR"
+-    QT_CFLAGS="-I${QTDIR}${QTINCDIR} -DQT_GENUINE_STR -DQT_NO_STL"
 +    QT_CFLAGS="-I${QTDIR}/include/X11/qt -DQT_GENUINE_STR"
-     QT_LIBS="-L/usr/X11R6/lib -L${QTDIR}/lib -lqt -lXext -lX11"
- 
-     MOZ_QT_LDFLAGS=$QT_LIBS
-@@ -11402,9 +11402,9 @@
+     if test -z "$MOZ_DEBUG"; then
+       QT_CFLAGS="$QT_CFLAGS -DQT_NO_DEBUG -DNO_DEBUG"
+     fi
+@@ -11840,9 +11840,9 @@