mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-06 06:30:19 +00:00
update to 2.3
Security: http://www.vuxml.org/freebsd/834591a9-c82f-11e0-897d-6c626dd55a41.html
This commit is contained in:
Florian Smeets
parent
a5c46aa5b0
commit
3a7b9de6bc
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=279833
@ -6,8 +6,7 @@
|
||||
#
|
||||
|
||||
PORTNAME= seamonkey
|
||||
DISTVERSION= 2.2
|
||||
PORTREVISION= 1
|
||||
DISTVERSION= 2.3
|
||||
CATEGORIES?= www ipv6
|
||||
MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED}
|
||||
MASTER_SITE_SUBDIR= seamonkey/releases/${DISTVERSION}/source
|
||||
@ -39,7 +38,7 @@ USE_GCC= 4.2+
|
||||
|
||||
CONFIGURE_ENV= LOCALBASE=${LOCALBASE}
|
||||
|
||||
MOZILLA= ${PORTNAME}-${PORTVERSION}
|
||||
MOZILLA= ${PORTNAME}
|
||||
MOZILLA_EXEC_NAME= ${PORTNAME}
|
||||
MOZ_EXTENSIONS= default
|
||||
MOZ_OPTIONS+= --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \
|
||||
@ -72,8 +71,6 @@ OPTIONS=MAILNEWS "Enable Mail and News modules" on \
|
||||
MOZSRC:= ${WRKDIR}/comm-release/mozilla
|
||||
WRKSRC= ${WRKDIR}/comm-release
|
||||
|
||||
GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE}
|
||||
|
||||
.if ${HAVE_GNOME:Mlibgnomeui}!=""
|
||||
USE_GNOME+= libgnomeui
|
||||
MOZ_OPTIONS+= --enable-gnomeui
|
||||
@ -131,7 +128,7 @@ post-patch:
|
||||
@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
|
||||
${WRKSRC}/mozilla/security/manager/ssl/src/Makefile.in \
|
||||
${WRKSRC}/mozilla/js/src/config/mkdepend/Makefile.in
|
||||
${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS:C/-pthread/${GECKO_PTHREAD_LIBS}/}|' \
|
||||
${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \
|
||||
${MOZSRC}/storage/build/Makefile.in \
|
||||
${MOZSRC}/toolkit/library/Makefile.in \
|
||||
${MOZSRC}/db/sqlite3/src/Makefile.in
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (seamonkey-2.2.source.tar.bz2) = 0b713e2f78a2c5139bf16736bd12e87017cdbc675948d4a8893a3d834bf8c13a
|
||||
SIZE (seamonkey-2.2.source.tar.bz2) = 87478968
|
||||
SHA256 (seamonkey-2.3.source.tar.bz2) = a709ac32c166448da4c9558ca17809ddbfa87f7e0e2a0638387ae080fb6758a4
|
||||
SIZE (seamonkey-2.3.source.tar.bz2) = 87002565
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
--- configure.in.orig 2011-07-28 00:58:59.534861026 +0200
|
||||
+++ configure.in 2011-07-28 01:00:05.591863508 +0200
|
||||
--- configure.in.orig 2011-07-15 07:42:33.000000000 +0200
|
||||
+++ configure.in 2011-07-22 13:43:44.000000000 +0200
|
||||
@@ -1438,7 +1438,7 @@
|
||||
CPU_ARCH=sparc
|
||||
;;
|
||||
@ -18,3 +18,104 @@
|
||||
INTEL_ARCHITECTURE=1
|
||||
esac
|
||||
|
||||
@@ -1781,7 +1781,7 @@
|
||||
esac
|
||||
|
||||
case "${host_cpu}" in
|
||||
- x86_64)
|
||||
+ amd64 | x86_64)
|
||||
HOST_CFLAGS="$HOST_CFLAGS -D_AMD64_"
|
||||
;;
|
||||
esac
|
||||
@@ -2437,6 +2437,9 @@
|
||||
x86_64-*)
|
||||
AC_DEFINE(_AMD64_)
|
||||
;;
|
||||
+ amd64*)
|
||||
+ AC_DEFINE(_AMD64_)
|
||||
+ ;;
|
||||
*)
|
||||
AC_DEFINE(_CPU_ARCH_NOT_DEFINED)
|
||||
;;
|
||||
@@ -2508,7 +2511,7 @@
|
||||
else
|
||||
DLL_SUFFIX=".so.1.0"
|
||||
fi
|
||||
- MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib -Wl,-rpath-link,$(if $(X11BASE),$(X11BASE),/usr/X11R6)/lib'
|
||||
+ MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib -Wl,-rpath-link,$(if $(X11BASE),$(X11BASE),/usr/local)/lib'
|
||||
DSO_CFLAGS=''
|
||||
DSO_PIC_CFLAGS='-fPIC'
|
||||
DSO_LDOPTS='-shared -fPIC'
|
||||
@@ -3326,11 +3329,11 @@
|
||||
;;
|
||||
*)
|
||||
MOZ_CHECK_PTHREADS(pthreads,
|
||||
- USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthreads",
|
||||
+ USE_PTHREADS=1 _PTHREAD_LDFLAGS="-pthreads",
|
||||
MOZ_CHECK_PTHREADS(pthread,
|
||||
- USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthread",
|
||||
+ USE_PTHREADS=1 _PTHREAD_LDFLAGS="-pthread",
|
||||
MOZ_CHECK_PTHREADS(c_r,
|
||||
- USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lc_r",
|
||||
+ USE_PTHREADS=1 _PTHREAD_LDFLAGS="-pthread",
|
||||
MOZ_CHECK_PTHREADS(c,
|
||||
USE_PTHREADS=1
|
||||
)
|
||||
@@ -3405,18 +3408,18 @@
|
||||
*-*-freebsd*)
|
||||
AC_DEFINE(_REENTRANT)
|
||||
AC_DEFINE(_THREAD_SAFE)
|
||||
- dnl -pthread links in -lc_r, so don't specify it explicitly.
|
||||
+ dnl -pthread links in -pthread, so don't specify it explicitly.
|
||||
if test "$ac_cv_have_dash_pthread" = "yes"; then
|
||||
_PTHREAD_LDFLAGS="-pthread"
|
||||
else
|
||||
- _PTHREAD_LDFLAGS="-lc_r"
|
||||
+ _PTHREAD_LDFLAGS="-pthread"
|
||||
fi
|
||||
;;
|
||||
|
||||
*-*-openbsd*|*-*-bsdi*)
|
||||
AC_DEFINE(_REENTRANT)
|
||||
AC_DEFINE(_THREAD_SAFE)
|
||||
- dnl -pthread links in -lc_r, so don't specify it explicitly.
|
||||
+ dnl -pthread links in -pthread, so don't specify it explicitly.
|
||||
if test "$ac_cv_have_dash_pthread" = "yes"; then
|
||||
_PTHREAD_LDFLAGS="-pthread"
|
||||
fi
|
||||
@@ -3591,7 +3594,7 @@
|
||||
ac_cv_func_iconv,
|
||||
[AC_TRY_LINK([
|
||||
#include <stdlib.h>
|
||||
- #include <iconv.h>
|
||||
+ #include "/usr/local/include/iconv.h"
|
||||
],
|
||||
[
|
||||
iconv_t h = iconv_open("", "");
|
||||
@@ -3612,7 +3615,7 @@
|
||||
ac_cv_func_const_iconv,
|
||||
[AC_TRY_COMPILE([
|
||||
#include <stdlib.h>
|
||||
- #include <iconv.h>
|
||||
+ #include "/usr/local/include/iconv.h"
|
||||
],
|
||||
[
|
||||
const char *input = "testing";
|
||||
@@ -4409,7 +4412,7 @@
|
||||
LDFLAGS=$_SAVE_LDFLAGS
|
||||
LIBS=$_SAVE_LIBS
|
||||
|
||||
-if test "${ZLIB_DIR}" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then
|
||||
+if test "${ZLIB_DIR}" -a "${ZLIB_DIR}" != "/usr" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then
|
||||
ZLIB_CFLAGS="-I${ZLIB_DIR}/include"
|
||||
ZLIB_LIBS="-L${ZLIB_DIR}/lib ${ZLIB_LIBS}"
|
||||
fi
|
||||
@@ -5966,7 +5969,7 @@
|
||||
i*86)
|
||||
MOZ_CRT_CPU_ARCH=intel
|
||||
;;
|
||||
- x86_64)
|
||||
+ amd64 | x86_64)
|
||||
MOZ_CRT_CPU_ARCH=amd64
|
||||
;;
|
||||
*)
|
||||
|
||||
@ -1,10 +1,41 @@
|
||||
--- mozilla/js/src/Makefile.in.orig 2009-08-25 18:58:30.000000000 +0200
|
||||
+++ mozilla/js/src/Makefile.in 2009-08-25 18:58:47.000000000 +0200
|
||||
@@ -428,6 +428,7 @@
|
||||
--- mozilla/js/src/Makefile.in.orig 2011-07-06 05:09:22.000000000 +0200
|
||||
+++ mozilla/js/src/Makefile.in 2011-07-06 22:23:46.363233778 +0200
|
||||
@@ -416,7 +416,7 @@
|
||||
# END enclude sources for V8 dtoa
|
||||
#############################################
|
||||
|
||||
-ifeq (,$(filter arm% sparc %86 x86_64,$(TARGET_CPU)))
|
||||
+ifeq (,$(filter arm% sparc %86 amd64 x86_64,$(TARGET_CPU)))
|
||||
|
||||
VPATH += $(srcdir)/assembler \
|
||||
$(srcdir)/assembler/wtf \
|
||||
@@ -469,6 +469,9 @@
|
||||
else
|
||||
#CPPSRCS += only_on_x86.cpp
|
||||
endif
|
||||
+ifeq (amd64, $(TARGET_CPU))
|
||||
+#CPPSRCS += only_on_x86_64.cpp
|
||||
+endif
|
||||
endif
|
||||
ifeq (arm, $(TARGET_CPU))
|
||||
#CPPSRCS += only_on_arm.cpp
|
||||
@@ -739,7 +742,7 @@
|
||||
# to reliably get limit macros defined, we'd always have to define the
|
||||
# one below before including any header, but that's obscure and
|
||||
# fragile, so we do it here.
|
||||
-DEFINES += -D__STDC_LIMIT_MACROS
|
||||
+DEFINES += -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS
|
||||
|
||||
INCLUDES += -I$(srcdir)
|
||||
|
||||
@@ -793,7 +796,8 @@
|
||||
endif # WINNT
|
||||
|
||||
ifeq ($(OS_ARCH),FreeBSD)
|
||||
EXTRA_LIBS += -pthread
|
||||
+LDFLAGS += -lc
|
||||
-EXTRA_LIBS += -pthread
|
||||
+DEFINES += -DFREEBSD
|
||||
+EXTRA_LIBS += -pthread -lc
|
||||
endif
|
||||
ifeq ($(OS_ARCH),IRIX)
|
||||
ifdef USE_N32
|
||||
|
||||
|
||||
@ -1,26 +0,0 @@
|
||||
--- mozilla/js/src/configure.orig 2010-10-08 21:56:36.000000000 +0200
|
||||
+++ mozilla/js/src/configure 2010-10-10 21:48:36.000000000 +0200
|
||||
@@ -5373,7 +5373,7 @@
|
||||
CPU_ARCH=sparc
|
||||
;;
|
||||
|
||||
-x86_64 | ia64)
|
||||
+amd64 | x86_64 | ia64)
|
||||
CPU_ARCH="$OS_TEST"
|
||||
;;
|
||||
|
||||
@@ -7346,14 +7346,6 @@
|
||||
EOF
|
||||
|
||||
;;
|
||||
-sparc*-*)
|
||||
- ENABLE_TRACEJIT=1
|
||||
- NANOJIT_ARCH=Sparc
|
||||
- cat >> confdefs.h <<\EOF
|
||||
-#define JS_CPU_SPARC 1
|
||||
-EOF
|
||||
-
|
||||
- ;;
|
||||
esac
|
||||
|
||||
# Check whether --enable-methodjit or --disable-methodjit was given.
|
||||
@ -164,6 +164,6 @@ Exec=seamonkey %U
|
||||
StartupNotify=true
|
||||
Terminal=false
|
||||
Type=Application
|
||||
Icon=%%PREFIX%%/lib/seamonkey-2.2/chrome/icons/default/default48.png
|
||||
Icon=%%PREFIX%%/lib/seamonkey-2.3/chrome/icons/default/default48.png
|
||||
Categories=Application;Network;
|
||||
MimeType=text/html;text/xml;application/xhtml+xml;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user