update to the latest mozilla release (1.4a)
add correct dependencies simplify configure options ok pvalchev@ XXX: this port is still marked BROKEN (doesn't run)
This commit is contained in:
david
parent
ff5820ad96
commit
783202879f
@ -1,9 +1,9 @@
|
||||
# $OpenBSD: Makefile,v 1.24 2002/12/29 15:03:57 fgsch Exp $
|
||||
# $OpenBSD: Makefile,v 1.25 2003/04/13 02:40:48 david Exp $
|
||||
# Uses pthreads
|
||||
|
||||
COMMENT= "free version of the Netscape browser"
|
||||
COMMENT= "open source version of the Netscape browser"
|
||||
|
||||
VER= 0.9.3
|
||||
VER= 1.4a
|
||||
DISTNAME= mozilla
|
||||
PKGNAME= mozilla-${VER}
|
||||
DISTFILES= mozilla-source-${VER}.tar.bz2
|
||||
@ -12,6 +12,8 @@ BROKEN= core dumps in dynamic library constructor
|
||||
|
||||
CATEGORIES= www
|
||||
|
||||
HOMEPAGE= http://www.mozilla.org/
|
||||
|
||||
PERMIT_PACKAGE_CDROM= Yes
|
||||
PERMIT_PACKAGE_FTP= Yes
|
||||
PERMIT_DISTFILES_CDROM= Yes
|
||||
@ -19,42 +21,32 @@ PERMIT_DISTFILES_FTP= Yes
|
||||
|
||||
MASTER_SITES= ftp://ftp.mozilla.org/pub/mozilla/releases/mozilla${VER}/src/
|
||||
|
||||
#BUILD_DEPENDS= zip:archivers/zip
|
||||
#LIB_DEPENDS= gtk.1.2::x11/gtk+ \
|
||||
# ORBit.2:devel/ORBit \
|
||||
# jpeg.9:graphics/jpeg \
|
||||
# png.4:graphics/png \
|
||||
# mng.1:graphics/libmng \
|
||||
# gdk-pixbuf.2:graphics/gdk-pixbuf
|
||||
BUILD_DEPENDS= :zip->=2.3:archivers/zip
|
||||
LIB_DEPENDS= gtk.1.2,gdk.1.2::x11/gtk+ \
|
||||
glib.1.2::devel/glib \
|
||||
IDL.4::devel/ORBit \
|
||||
jpeg.62::graphics/jpeg \
|
||||
png.3::graphics/png \
|
||||
mng.1::graphics/libmng
|
||||
|
||||
USE_X11= Yes
|
||||
USE_GMAKE= Yes
|
||||
|
||||
CONFIGURE_STYLE= autoconf
|
||||
CONFIGURE_ARGS= \
|
||||
--disable-cpp-exceptions \
|
||||
--disable-cpp-rtti \
|
||||
--disable-debug \
|
||||
--disable-idltool \
|
||||
--disable-md \
|
||||
--disable-pedantic \
|
||||
--disable-xterm-updates \
|
||||
--enable-crypto \
|
||||
--enable-double-buffer \
|
||||
--enable-editor \
|
||||
--enable-mailnews \
|
||||
--enable-mathml \
|
||||
--enable-optimize="${CFLAGS}" \
|
||||
--enable-pics \
|
||||
--enable-svg \
|
||||
--enable-tests \
|
||||
--enable-toolkit=gtk \
|
||||
--enable-x11-shm \
|
||||
--enable-chrome-format=jar \
|
||||
--with-jpeg=${LOCALBASE} \
|
||||
--with-png=${LOCALBASE} \
|
||||
--with-mng=${LOCALBASE} \
|
||||
--with-pthreads
|
||||
--with-system-jpeg=${LOCALBASE} \
|
||||
--with-system-mng=${LOCALBASE} \
|
||||
--with-system-png=${LOCALBASE} \
|
||||
--with-system-zlib=/usr/lib \
|
||||
--disable-ldap
|
||||
# disable this for now
|
||||
# --enable-crypto \
|
||||
# does not pass NSPR tests
|
||||
# --with-pthreads \
|
||||
# enable these once Mozilla actually runs
|
||||
# --disable-debug \
|
||||
# --enable-optimize="${CFLAGS}" \
|
||||
# --disable-tests \
|
||||
|
||||
CONFIGURE_ENV= BSD_PTHREAD_LIBS="-pthread" \
|
||||
CFLAGS="" CXXFLAGS=""
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
MD5 (mozilla-source-0.9.3.tar.bz2) = 8f98a2d73df28b2cee3da47c0df1dd22
|
||||
RMD160 (mozilla-source-0.9.3.tar.bz2) = a677dd4f60ef126c7789723a10997445925659c2
|
||||
SHA1 (mozilla-source-0.9.3.tar.bz2) = 99c2889bfd2add04b654af44b54392b6de0cbf45
|
||||
MD5 (mozilla-source-1.4a.tar.bz2) = 8b382d03e294771460ae9147a54d00ab
|
||||
RMD160 (mozilla-source-1.4a.tar.bz2) = 08689a8ff57a12c272359b782302b9610af29d6a
|
||||
SHA1 (mozilla-source-1.4a.tar.bz2) = 42a8b70fdeac01c310180e217c61fda63dbe3ea6
|
||||
|
||||
@ -1,19 +0,0 @@
|
||||
--- 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"
|
||||
|
||||
+#include <sys/param.h>
|
||||
#include <sys/syscall.h>
|
||||
|
||||
#define PR_LINKER_ARCH "freebsd"
|
||||
@@ -49,7 +50,7 @@
|
||||
#define _PR_HAVE_SOCKADDR_LEN
|
||||
#define _PR_STAT_HAS_ST_ATIMESPEC
|
||||
#define _PR_NO_LARGE_FILES
|
||||
-#if ( __FreeBSD__ > 2 )
|
||||
+#if ( __FreeBSD_version >= 220000 ) && ( __FreeBSD_version < 400008 )
|
||||
#if !defined(_PR_PTHREADS)
|
||||
/*
|
||||
* libc_r doesn't have poll(). Although libc has poll(), it is not
|
||||
@ -1,20 +0,0 @@
|
||||
--- 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) */
|
||||
|
||||
-#elif defined(LINUX)
|
||||
+#elif defined(LINUX) || defined(FREEBSD)
|
||||
#define PT_PRIO_MIN sched_get_priority_min(SCHED_OTHER)
|
||||
#define PT_PRIO_MAX sched_get_priority_max(SCHED_OTHER)
|
||||
#elif defined(NTO)
|
||||
@@ -203,7 +203,7 @@
|
||||
*/
|
||||
#define PT_PRIO_MIN 1
|
||||
#define PT_PRIO_MAX 127
|
||||
-#elif defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD) \
|
||||
+#elif defined(NETBSD) || defined(OPENBSD) \
|
||||
|| defined(BSDI) || defined(RHAPSODY) /* XXX */
|
||||
#define PT_PRIO_MIN 0
|
||||
#define PT_PRIO_MAX 126
|
||||
@ -1,35 +0,0 @@
|
||||
--- nsprpub/config/FreeBSD.mk.orig Wed Oct 20 14:19:53 1999
|
||||
+++ nsprpub/config/FreeBSD.mk Thu Dec 21 01:16:34 2000
|
||||
@@ -21,24 +21,26 @@
|
||||
|
||||
include $(MOD_DEPTH)/config/UNIX.mk
|
||||
|
||||
-CC = gcc
|
||||
-CCC = g++
|
||||
RANLIB = ranlib
|
||||
+CCC = ${CXX}
|
||||
+
|
||||
+# During FreeBSD port build, CFLAGS contains all of the optimizations
|
||||
+# flags desired...
|
||||
+OPTIMIZER = $(MOZ_OPTIMIZE_FLAGS)
|
||||
|
||||
ifeq ($(OS_TEST),alpha)
|
||||
CPU_ARCH = alpha
|
||||
else
|
||||
-OS_REL_CFLAGS = -Di386
|
||||
CPU_ARCH = x86
|
||||
endif
|
||||
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
|
||||
|
||||
ifeq ($(USE_PTHREADS),1)
|
||||
IMPL_STRATEGY = _PTH
|
||||
-DEFINES += -D_THREAD_SAFE
|
||||
-THREAD_FLAG += -pthread
|
||||
+DEFINES += -D_THREAD_SAFE -D_REENTRANT
|
||||
+DSO_LDOPTS += -pthread
|
||||
else
|
||||
IMPL_STRATEGY = _EMU
|
||||
DEFINES += -D_PR_LOCAL_THREADS_ONLY
|
||||
@ -1,50 +0,0 @@
|
||||
|
||||
$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
|
||||
|
||||
- QT_CFLAGS="-I${QTDIR}${QTINCDIR} -DQT_GENUINE_STR"
|
||||
+ QT_CFLAGS="-I${QTDIR}/include/X11/qt -DQT_GENUINE_STR"
|
||||
QT_LIBS="-L/usr/X11R6/lib -L${QTDIR}/lib -lqt -lXext -lX11"
|
||||
|
||||
# Check whether --with-static-qt or --without-static-qt was given.
|
||||
@@ -8587,6 +8587,9 @@
|
||||
os2*)
|
||||
LIBS=
|
||||
;;
|
||||
+freebsd*)
|
||||
+ CPPFLAGS="${CPPFLAGS} ${X_CFLAGS}"
|
||||
+ ;;
|
||||
esac
|
||||
for ac_hdr in sys/byteorder.h compat.h getopt.h
|
||||
do
|
||||
@@ -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"
|
||||
$PERL -pi.bak -e "s {^NSPR_LIBS\s*=.*} {NSPR_LIBS = $NSPR_LIBS }" config/autoconf.mk
|
||||
;;
|
||||
esac
|
||||
@ -1,76 +0,0 @@
|
||||
--- /dev/null Sat Aug 11 00:51:12 2001
|
||||
+++ security/coreconf/OpenBSD.mk Sat Aug 11 00:56:21 2001
|
||||
@@ -0,0 +1,73 @@
|
||||
+#
|
||||
+# The contents of this file are subject to the Mozilla Public
|
||||
+# License Version 1.1 (the "License"); you may not use this file
|
||||
+# except in compliance with the License. You may obtain a copy of
|
||||
+# the License at http://www.mozilla.org/MPL/
|
||||
+#
|
||||
+# Software distributed under the License is distributed on an "AS
|
||||
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
|
||||
+# implied. See the License for the specific language governing
|
||||
+# rights and limitations under the License.
|
||||
+#
|
||||
+# The Original Code is the Netscape security libraries.
|
||||
+#
|
||||
+# The Initial Developer of the Original Code is Netscape
|
||||
+# Communications Corporation. Portions created by Netscape are
|
||||
+# Copyright (C) 1994-2000 Netscape Communications Corporation. All
|
||||
+# Rights Reserved.
|
||||
+#
|
||||
+# Contributor(s):
|
||||
+#
|
||||
+# Alternatively, the contents of this file may be used under the
|
||||
+# terms of the GNU General Public License Version 2 or later (the
|
||||
+# "GPL"), in which case the provisions of the GPL are applicable
|
||||
+# instead of those above. If you wish to allow use of your
|
||||
+# version of this file only under the terms of the GPL and not to
|
||||
+# allow others to use your version of this file under the MPL,
|
||||
+# indicate your decision by deleting the provisions above and
|
||||
+# replace them with the notice and other provisions required by
|
||||
+# the GPL. If you do not delete the provisions above, a recipient
|
||||
+# may use your version of this file under either the MPL or the
|
||||
+# GPL.
|
||||
+#
|
||||
+# Config stuff for FreeBSD
|
||||
+#
|
||||
+
|
||||
+include $(CORE_DEPTH)/coreconf/UNIX.mk
|
||||
+
|
||||
+DEFAULT_COMPILER = cc
|
||||
+CC = cc
|
||||
+CCC = c++
|
||||
+RANLIB = ranlib
|
||||
+
|
||||
+ifeq ($(OS_TEST),alpha)
|
||||
+CPU_ARCH = alpha
|
||||
+else
|
||||
+OS_REL_CFLAGS = -Di386
|
||||
+CPU_ARCH = x86
|
||||
+endif
|
||||
+
|
||||
+OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall $(THREAD_FLAG) -DHAVE_STRERROR -DHAVE_BSD_FLOCK
|
||||
+
|
||||
+#
|
||||
+# The default implementation strategy for OpenBSD is pthreads.
|
||||
+#
|
||||
+ifndef CLASSIC_NSPR
|
||||
+USE_PTHREADS = 1
|
||||
+DEFINES += -D_THREAD_SAFE
|
||||
+THREAD_FLAG = -pthread
|
||||
+endif
|
||||
+
|
||||
+ARCH = openbsd
|
||||
+
|
||||
+DLL_SUFFIX = so.1.0
|
||||
+
|
||||
+DSO_CFLAGS = -fPIC
|
||||
+DSO_LDOPTS = -shared
|
||||
+DSO_LDFLAGS =
|
||||
+
|
||||
+MKSHLIB = $(CC) $(DSO_LDOPTS)
|
||||
+
|
||||
+G++INCLUDES = -I/usr/include/g++
|
||||
+
|
||||
+INCLUDES += -I/usr/X11R6/include
|
||||
@ -1,39 +0,0 @@
|
||||
--- /dev/null Sat Aug 11 00:51:12 2001
|
||||
+++ security/coreconf/OpenBSD2.9.mk Sat Aug 11 00:52:51 2001
|
||||
@@ -0,0 +1,36 @@
|
||||
+#
|
||||
+# The contents of this file are subject to the Mozilla Public
|
||||
+# License Version 1.1 (the "License"); you may not use this file
|
||||
+# except in compliance with the License. You may obtain a copy of
|
||||
+# the License at http://www.mozilla.org/MPL/
|
||||
+#
|
||||
+# Software distributed under the License is distributed on an "AS
|
||||
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
|
||||
+# implied. See the License for the specific language governing
|
||||
+# rights and limitations under the License.
|
||||
+#
|
||||
+# The Original Code is the Netscape security libraries.
|
||||
+#
|
||||
+# The Initial Developer of the Original Code is Netscape
|
||||
+# Communications Corporation. Portions created by Netscape are
|
||||
+# Copyright (C) 1994-2000 Netscape Communications Corporation. All
|
||||
+# Rights Reserved.
|
||||
+#
|
||||
+# Contributor(s):
|
||||
+#
|
||||
+# Alternatively, the contents of this file may be used under the
|
||||
+# terms of the GNU General Public License Version 2 or later (the
|
||||
+# "GPL"), in which case the provisions of the GPL are applicable
|
||||
+# instead of those above. If you wish to allow use of your
|
||||
+# version of this file only under the terms of the GPL and not to
|
||||
+# allow others to use your version of this file under the MPL,
|
||||
+# indicate your decision by deleting the provisions above and
|
||||
+# replace them with the notice and other provisions required by
|
||||
+# the GPL. If you do not delete the provisions above, a recipient
|
||||
+# may use your version of this file under either the MPL or the
|
||||
+# GPL.
|
||||
+#
|
||||
+# Config stuff for OpenBSD2.9
|
||||
+#
|
||||
+
|
||||
+include $(CORE_DEPTH)/coreconf/OpenBSD.mk
|
||||
Loading…
Reference in New Issue
Block a user