summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--www/epiphany/Makefile5
-rw-r--r--www/galeon/Makefile2
-rw-r--r--www/galeon2/Makefile4
-rw-r--r--www/mozilla-devel/Makefile30
-rw-r--r--www/mozilla-devel/distinfo2
-rw-r--r--www/mozilla-devel/files/patch-Makefile.in10
-rw-r--r--www/mozilla-devel/files/patch-nsprpub_pr_src_misc_prtime.c11
-rw-r--r--www/mozilla-gtk1/Makefile2
-rw-r--r--www/mozilla-gtk2/Makefile2
-rw-r--r--www/mozilla/Makefile26
-rw-r--r--www/seamonkey/Makefile30
-rw-r--r--www/seamonkey/distinfo2
-rw-r--r--www/seamonkey/files/patch-Makefile.in10
-rw-r--r--www/seamonkey/files/patch-nsprpub_pr_src_misc_prtime.c11
-rw-r--r--www/seamonkey2/Makefile30
-rw-r--r--www/seamonkey2/distinfo2
-rw-r--r--www/seamonkey2/files/patch-Makefile.in10
-rw-r--r--www/seamonkey2/files/patch-nsprpub_pr_src_misc_prtime.c11
18 files changed, 79 insertions, 121 deletions
diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index e357a7d7c995..f60f1b3fbc38 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -7,6 +7,7 @@
PORTNAME= epiphany
PORTVERSION= 1.0.4
+PORTREVISION= 1
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.0
@@ -31,7 +32,7 @@ HEADERS_SUFX=
.if ${WITH_MOZILLA}=="mozilla-devel-gtk2"
MOZILLA= ${WITH_MOZILLA}
HEADERS_SUFX= -devel
-MOZ_CONFIGURE_ARGS= --with-mozilla-snapshot="1.5b"
+MOZ_CONFIGURE_ARGS= --with-mozilla-snapshot="1.6a"
.else
MOZILLA= mozilla-gtk2
HEADERS_SUFX=
@@ -88,7 +89,7 @@ post-extract:
.endfor
post-patch:
- @${REINPLACE_CMD} -e 's|mozilla-gtkmozembed|mozilla-gtkmozembed${HEADERS_SUFX}|g' ${WRKSRC}/configure
+ @${REINPLACE_CMD} -e 's|mozilla-gtkmozembed|mozilla-gtkmozembed${HEADERS_SUFX}-gtk2|g' ${WRKSRC}/configure
@${FIND} ${WRKSRC} -name "Makefile.in*" | ${XARGS} ${REINPLACE_CMD} -e \
's|-lpthread|${PTHREAD_LIBS}|g'
@${FIND} ${WRKSRC} -name "*.cpp" | ${XARGS} ${REINPLACE_CMD} -e \
diff --git a/www/galeon/Makefile b/www/galeon/Makefile
index c08a8e55dbbf..8facb362bc66 100644
--- a/www/galeon/Makefile
+++ b/www/galeon/Makefile
@@ -20,7 +20,7 @@ BUILD_DEPENDS= ${X11BASE}/include/mozilla${HEADERS_SUFX}/gtkembedmoz/gtkmozembed
LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
RUN_DEPENDS= ${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA}
-MOZ_CONFIGURE_ARGS=--with-mozilla-snapshot="1.5b"
+MOZ_CONFIGURE_ARGS=--with-mozilla-snapshot="trunk"
.if !defined(WITH_MOZILLA)
MOZILLA= mozilla
diff --git a/www/galeon2/Makefile b/www/galeon2/Makefile
index 63b8ac1b0ba4..97b9730916ea 100644
--- a/www/galeon2/Makefile
+++ b/www/galeon2/Makefile
@@ -31,7 +31,7 @@ HEADERS_SUFX=
.if ${WITH_MOZILLA}=="mozilla-devel-gtk2"
MOZILLA= ${WITH_MOZILLA}
HEADERS_SUFX= -devel
-MOZ_CONFIGURE_ARGS= --with-mozilla-snapshot="1.5b"
+MOZ_CONFIGURE_ARGS= --with-mozilla-snapshot="1.6a"
.else
MOZILLA= mozilla-gtk2
HEADERS_SUFX=
@@ -78,7 +78,7 @@ pre-everything::
@${ECHO_MSG} ""
post-patch:
- @${REINPLACE_CMD} -e 's|mozilla-gtkmozembed|mozilla-gtkmozembed${HEADERS_SUFX}|g' \
+ @${REINPLACE_CMD} -e 's|mozilla-gtkmozembed|mozilla-gtkmozembed${HEADERS_SUFX}-gtk2|g' \
${WRKSRC}/configure
@${FIND} ${WRKSRC} -name "Makefile.in*" | xargs ${REINPLACE_CMD} -e \
's|-lpthread|${PTHREAD_LIBS}|g'
diff --git a/www/mozilla-devel/Makefile b/www/mozilla-devel/Makefile
index 88f715d3ed00..e9365bbb8cab 100644
--- a/www/mozilla-devel/Makefile
+++ b/www/mozilla-devel/Makefile
@@ -6,15 +6,15 @@
#
PORTNAME?= mozilla
-PORTVERSION= 1.5b
+PORTVERSION= 1.6.a
PORTREVISION?= 0
PORTEPOCH?= 1
CATEGORIES?= www
MASTER_SITES= ${MASTER_SITE_MOZILLA} \
${MASTER_SITE_LOCAL:S/$/:local/}
-MASTER_SITE_SUBDIR= mozilla/releases/${PORTNAME}${PORTVERSION:S/.rc/rc/}/src \
+MASTER_SITE_SUBDIR= mozilla/releases/${PORTNAME}${PORTVERSION:S/.a/a/}/src \
marcus/:local
-DISTFILES= ${PORTNAME}-source-${PORTVERSION:S/.rc/rc/}${EXTRACT_SUFX} \
+DISTFILES= ${PORTNAME}-source-${PORTVERSION:S/.a/a/}${EXTRACT_SUFX} \
libart_lgpl${EXTRACT_SUFX}:local
MAINTAINER= gnome@FreeBSD.org
@@ -140,8 +140,6 @@ CONFIGURE_ARGS+= --disable-composer
.if defined(WITH_GTK2)
CONFIGURE_ARGS+= --enable-default-toolkit=gtk2
-PKGCONFIG_FILES= mozilla-gtkmozembed mozilla-js mozilla-xpcom \
- mozilla-nspr mozilla-nss mozilla-plugin
.else
CONFIGURE_ARGS+= --enable-default-toolkit=gtk
.endif
@@ -152,6 +150,9 @@ CONFIGURE_ARGS+= --enable-xft
CONFIGURE_ARGS+= --disable-xft
.endif
+PKGCONFIG_FILES=mozilla-gtkmozembed mozilla-js mozilla-xpcom \
+ mozilla-nspr mozilla-nss mozilla-plugin
+
.include <bsd.port.pre.mk>
MAKE_ENV= LD_LIBRARY_PATH=${WRKSRC}/dist/bin \
@@ -203,19 +204,18 @@ post-patch:
@${FIND} ${WRKSRC}/other-licenses/libical -name "*.c" | ${XARGS} \
${REINPLACE_CMD} 's|<malloc.h>|<stdlib.h>|g'
@${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g' \
- ${WRKSRC}/configure
+ ${WRKSRC}/configure \
+ ${WRKSRC}/nsprpub/configure
@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \
- ${WRKSRC}/nsprpub/config/FreeBSD.mk \
+ ${WRKSRC}/nsprpub/configure \
${WRKSRC}/security/coreconf/FreeBSD.mk \
${WRKSRC}/directory/c-sdk/config/FreeBSD.mk \
${WRKSRC}/js/src/Makefile.in
-.if defined(WITH_GTK2)
@for pcfile in ${PKGCONFIG_FILES}; do \
- ${REINPLACE_CMD} -e 's|mozilla-xpcom|mozilla-xpcom${MOZ_SUFX}|g ; \
- s|mozilla-nspr|mozilla-nspr${MOZ_SUFX}|g' \
+ ${REINPLACE_CMD} -e 's|mozilla-xpcom|mozilla-xpcom${MOZ_SUFX}${PKGNAMESUFFIX}|g ; \
+ s|mozilla-nspr|mozilla-nspr${MOZ_SUFX}${PKGNAMESUFFIX}|g' \
${WRKSRC}/build/unix/$${pcfile}.pc.in; \
done
-.endif
post-build:
${SED} -e "s|%%PREFIX%%|${PREFIX}|g" -e "s|%%MOZILLA%%|${MOZILLA}|g" \
@@ -243,11 +243,9 @@ pre-install:
&& ${FIND} -d * -type d | \
${SED} -e 's:^:@dirrm lib/${MOZILLA}/:' >> ${PLIST}
${ECHO_CMD} @dirrm lib/${MOZILLA} >> ${PLIST}
-.if defined(WITH_GTK2)
for pcfile in ${PKGCONFIG_FILES}; do \
- ${ECHO_CMD} libdata/pkgconfig/$${pcfile}${MOZ_SUFX}.pc >> ${PLIST} ; \
+ ${ECHO_CMD} libdata/pkgconfig/$${pcfile}${MOZ_SUFX}${PKGNAMESUFFIX}.pc >> ${PLIST} ; \
done
-.endif
do-install:
${MKDIR} ${PREFIX}/lib/${MOZILLA}
@@ -265,12 +263,10 @@ do-install:
${LN} -sf ${LOCALBASE}/jdk1.3.1/jre/plugin/${ARCH}/ns600/libjavaplugin_oji.so \
${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ; \
fi
-.if defined(WITH_GTK2)
for pcfile in ${PKGCONFIG_FILES}; do \
${INSTALL_DATA} ${WRKSRC}/build/unix/$${pcfile}.pc \
- ${PREFIX}/libdata/pkgconfig/$${pcfile}${MOZ_SUFX}.pc ; \
+ ${PREFIX}/libdata/pkgconfig/$${pcfile}${MOZ_SUFX}${PKGNAMESUFFIX}.pc ; \
done
-.endif
post-install:
@${CHMOD} -R u-w ${PREFIX}/lib/${MOZILLA}/components
diff --git a/www/mozilla-devel/distinfo b/www/mozilla-devel/distinfo
index 3ea8f7003d22..a48393697b4d 100644
--- a/www/mozilla-devel/distinfo
+++ b/www/mozilla-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (mozilla-source-1.5b.tar.bz2) = 011f6d02768b9ef9c0fbcb04a1b5ea31
+MD5 (mozilla-source-1.6a.tar.bz2) = 0e0f050af00b9b53d4d70cbb27634747
MD5 (libart_lgpl.tar.bz2) = f332c3c026adc1c2c0ceb3ac5847d5f5
diff --git a/www/mozilla-devel/files/patch-Makefile.in b/www/mozilla-devel/files/patch-Makefile.in
index 5dd8b3ca224e..5480cb799b3d 100644
--- a/www/mozilla-devel/files/patch-Makefile.in
+++ b/www/mozilla-devel/files/patch-Makefile.in
@@ -1,16 +1,16 @@
---- Makefile.in.orig Thu Aug 14 19:50:21 2003
-+++ Makefile.in Fri Aug 29 15:36:07 2003
-@@ -66,8 +66,7 @@
- $(tier_1_dirs) \
+--- Makefile.in.orig Fri Aug 29 20:20:58 2003
++++ Makefile.in Sat Oct 18 15:34:15 2003
+@@ -67,8 +67,7 @@
$(tier_2_dirs) \
$(tier_9_dirs) \
+ $(tier_40_dirs) \
- $(tier_50_dirs) \
- $(NULL)
+ $(tier_50_dirs)
ifdef GC_LEAK_DETECTOR
DIRS += gc/boehm
-@@ -89,7 +88,8 @@
+@@ -87,7 +86,8 @@
DIRS += $(tier_98_dirs)
endif
diff --git a/www/mozilla-devel/files/patch-nsprpub_pr_src_misc_prtime.c b/www/mozilla-devel/files/patch-nsprpub_pr_src_misc_prtime.c
deleted file mode 100644
index f13ae2faa20e..000000000000
--- a/www/mozilla-devel/files/patch-nsprpub_pr_src_misc_prtime.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- nsprpub/pr/src/misc/prtime.c.orig Wed Feb 26 19:01:02 2003
-+++ nsprpub/pr/src/misc/prtime.c Mon Jun 30 23:18:29 2003
-@@ -1666,7 +1666,7 @@
- */
-
- #if defined(SUNOS4) || (__GLIBC__ >= 2) || defined(XP_BEOS) \
-- || defined(NETBSD)
-+ || defined(NETBSD) || defined(FREEBSD)
- a.tm_zone = NULL;
- a.tm_gmtoff = tm->tm_params.tp_gmt_offset + tm->tm_params.tp_dst_offset;
- #endif
diff --git a/www/mozilla-gtk1/Makefile b/www/mozilla-gtk1/Makefile
index f12696c810a9..0704a7a60094 100644
--- a/www/mozilla-gtk1/Makefile
+++ b/www/mozilla-gtk1/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= mozilla
-PORTREVISION= 0
+PORTREVISION= 1
PORTEPOCH= 0
CATEGORIES= www
diff --git a/www/mozilla-gtk2/Makefile b/www/mozilla-gtk2/Makefile
index f12696c810a9..0704a7a60094 100644
--- a/www/mozilla-gtk2/Makefile
+++ b/www/mozilla-gtk2/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= mozilla
-PORTREVISION= 0
+PORTREVISION= 1
PORTEPOCH= 0
CATEGORIES= www
diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile
index 91ae1a03ebcf..39e2efac81bc 100644
--- a/www/mozilla/Makefile
+++ b/www/mozilla/Makefile
@@ -7,14 +7,14 @@
PORTNAME?= mozilla
PORTVERSION= 1.5
-PORTREVISION?= 0
+PORTREVISION?= 1
PORTEPOCH?= 2
CATEGORIES?= www
MASTER_SITES= ${MASTER_SITE_MOZILLA} \
${MASTER_SITE_LOCAL:S/$/:local/}
-MASTER_SITE_SUBDIR= mozilla/releases/${PORTNAME}${PORTVERSION:S/.rc/rc/}/src \
+MASTER_SITE_SUBDIR= mozilla/releases/${PORTNAME}${PORTVERSION}/src \
marcus/:local
-DISTFILES= ${PORTNAME}-source-${PORTVERSION:S/.rc/rc/}${EXTRACT_SUFX} \
+DISTFILES= ${PORTNAME}-source-${PORTVERSION}${EXTRACT_SUFX} \
libart_lgpl${EXTRACT_SUFX}:local
MAINTAINER= gnome@FreeBSD.org
@@ -139,8 +139,6 @@ CONFIGURE_ARGS+= --disable-composer
.if defined(WITH_GTK2)
CONFIGURE_ARGS+= --enable-default-toolkit=gtk2
-PKGCONFIG_FILES= mozilla-gtkmozembed.pc mozilla-js.pc mozilla-xpcom.pc \
- mozilla-nspr.pc mozilla-nss.pc mozilla-plugin.pc
.else
CONFIGURE_ARGS+= --enable-default-toolkit=gtk
.endif
@@ -151,6 +149,9 @@ CONFIGURE_ARGS+= --enable-xft
CONFIGURE_ARGS+= --disable-xft
.endif
+PKGCONFIG_FILES= mozilla-gtkmozembed mozilla-js mozilla-xpcom \
+ mozilla-nspr mozilla-nss mozilla-plugin
+
.include <bsd.port.pre.mk>
MAKE_ENV= LD_LIBRARY_PATH=${WRKSRC}/dist/bin \
@@ -208,6 +209,11 @@ post-patch:
${WRKSRC}/security/coreconf/FreeBSD.mk \
${WRKSRC}/directory/c-sdk/config/FreeBSD.mk \
${WRKSRC}/js/src/Makefile.in
+ @for pcfile in ${PKGCONFIG_FILES}; do \
+ ${REINPLACE_CMD} -e 's|mozilla-xpcom|mozilla-xpcom${PKGNAMESUFFIX}|g ; \
+ s|mozilla-nspr|mozilla-nspr${MOZ_SUFX}${PKGNAMESUFFIX}|g' \
+ ${WRKSRC}/build/unix/$${pcfile}.pc.in; \
+ done
post-build:
${SED} -e "s|%%PREFIX%%|${PREFIX}|g" -e "s|%%MOZILLA%%|${MOZILLA}|g" \
@@ -237,11 +243,9 @@ pre-install:
&& ${FIND} -d * -type d | \
${SED} -e 's:^:@dirrm lib/${MOZILLA}/:' >> ${PLIST}
${ECHO_CMD} @dirrm lib/${MOZILLA} >> ${PLIST}
-.if defined(WITH_GTK2)
for pcfile in ${PKGCONFIG_FILES}; do \
- ${ECHO_CMD} libdata/pkgconfig/$$pcfile >> ${PLIST} ; \
+ ${ECHO_CMD} libdata/pkgconfig/$${pcfile}${PKGNAMESUFFIX}.pc >> ${PLIST} ; \
done
-.endif
do-install:
${MKDIR} ${PREFIX}/lib/${MOZILLA}
@@ -259,12 +263,10 @@ do-install:
${LN} -sf ${LOCALBASE}/jdk1.3.1/jre/plugin/${ARCH}/ns600/libjavaplugin_oji.so \
${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ; \
fi
-.if defined(WITH_GTK2)
for pcfile in ${PKGCONFIG_FILES}; do \
- ${INSTALL_DATA} ${WRKSRC}/build/unix/$$pcfile \
- ${PREFIX}/libdata/pkgconfig ; \
+ ${INSTALL_DATA} ${WRKSRC}/build/unix/$${pcfile}.pc \
+ ${PREFIX}/libdata/pkgconfig/$${pcfile}${PKGNAMESUFFIX}.pc ; \
done
-.endif
post-install:
@${CHMOD} -R u-w ${PREFIX}/lib/${MOZILLA}/components
diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile
index 88f715d3ed00..e9365bbb8cab 100644
--- a/www/seamonkey/Makefile
+++ b/www/seamonkey/Makefile
@@ -6,15 +6,15 @@
#
PORTNAME?= mozilla
-PORTVERSION= 1.5b
+PORTVERSION= 1.6.a
PORTREVISION?= 0
PORTEPOCH?= 1
CATEGORIES?= www
MASTER_SITES= ${MASTER_SITE_MOZILLA} \
${MASTER_SITE_LOCAL:S/$/:local/}
-MASTER_SITE_SUBDIR= mozilla/releases/${PORTNAME}${PORTVERSION:S/.rc/rc/}/src \
+MASTER_SITE_SUBDIR= mozilla/releases/${PORTNAME}${PORTVERSION:S/.a/a/}/src \
marcus/:local
-DISTFILES= ${PORTNAME}-source-${PORTVERSION:S/.rc/rc/}${EXTRACT_SUFX} \
+DISTFILES= ${PORTNAME}-source-${PORTVERSION:S/.a/a/}${EXTRACT_SUFX} \
libart_lgpl${EXTRACT_SUFX}:local
MAINTAINER= gnome@FreeBSD.org
@@ -140,8 +140,6 @@ CONFIGURE_ARGS+= --disable-composer
.if defined(WITH_GTK2)
CONFIGURE_ARGS+= --enable-default-toolkit=gtk2
-PKGCONFIG_FILES= mozilla-gtkmozembed mozilla-js mozilla-xpcom \
- mozilla-nspr mozilla-nss mozilla-plugin
.else
CONFIGURE_ARGS+= --enable-default-toolkit=gtk
.endif
@@ -152,6 +150,9 @@ CONFIGURE_ARGS+= --enable-xft
CONFIGURE_ARGS+= --disable-xft
.endif
+PKGCONFIG_FILES=mozilla-gtkmozembed mozilla-js mozilla-xpcom \
+ mozilla-nspr mozilla-nss mozilla-plugin
+
.include <bsd.port.pre.mk>
MAKE_ENV= LD_LIBRARY_PATH=${WRKSRC}/dist/bin \
@@ -203,19 +204,18 @@ post-patch:
@${FIND} ${WRKSRC}/other-licenses/libical -name "*.c" | ${XARGS} \
${REINPLACE_CMD} 's|<malloc.h>|<stdlib.h>|g'
@${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g' \
- ${WRKSRC}/configure
+ ${WRKSRC}/configure \
+ ${WRKSRC}/nsprpub/configure
@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \
- ${WRKSRC}/nsprpub/config/FreeBSD.mk \
+ ${WRKSRC}/nsprpub/configure \
${WRKSRC}/security/coreconf/FreeBSD.mk \
${WRKSRC}/directory/c-sdk/config/FreeBSD.mk \
${WRKSRC}/js/src/Makefile.in
-.if defined(WITH_GTK2)
@for pcfile in ${PKGCONFIG_FILES}; do \
- ${REINPLACE_CMD} -e 's|mozilla-xpcom|mozilla-xpcom${MOZ_SUFX}|g ; \
- s|mozilla-nspr|mozilla-nspr${MOZ_SUFX}|g' \
+ ${REINPLACE_CMD} -e 's|mozilla-xpcom|mozilla-xpcom${MOZ_SUFX}${PKGNAMESUFFIX}|g ; \
+ s|mozilla-nspr|mozilla-nspr${MOZ_SUFX}${PKGNAMESUFFIX}|g' \
${WRKSRC}/build/unix/$${pcfile}.pc.in; \
done
-.endif
post-build:
${SED} -e "s|%%PREFIX%%|${PREFIX}|g" -e "s|%%MOZILLA%%|${MOZILLA}|g" \
@@ -243,11 +243,9 @@ pre-install:
&& ${FIND} -d * -type d | \
${SED} -e 's:^:@dirrm lib/${MOZILLA}/:' >> ${PLIST}
${ECHO_CMD} @dirrm lib/${MOZILLA} >> ${PLIST}
-.if defined(WITH_GTK2)
for pcfile in ${PKGCONFIG_FILES}; do \
- ${ECHO_CMD} libdata/pkgconfig/$${pcfile}${MOZ_SUFX}.pc >> ${PLIST} ; \
+ ${ECHO_CMD} libdata/pkgconfig/$${pcfile}${MOZ_SUFX}${PKGNAMESUFFIX}.pc >> ${PLIST} ; \
done
-.endif
do-install:
${MKDIR} ${PREFIX}/lib/${MOZILLA}
@@ -265,12 +263,10 @@ do-install:
${LN} -sf ${LOCALBASE}/jdk1.3.1/jre/plugin/${ARCH}/ns600/libjavaplugin_oji.so \
${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ; \
fi
-.if defined(WITH_GTK2)
for pcfile in ${PKGCONFIG_FILES}; do \
${INSTALL_DATA} ${WRKSRC}/build/unix/$${pcfile}.pc \
- ${PREFIX}/libdata/pkgconfig/$${pcfile}${MOZ_SUFX}.pc ; \
+ ${PREFIX}/libdata/pkgconfig/$${pcfile}${MOZ_SUFX}${PKGNAMESUFFIX}.pc ; \
done
-.endif
post-install:
@${CHMOD} -R u-w ${PREFIX}/lib/${MOZILLA}/components
diff --git a/www/seamonkey/distinfo b/www/seamonkey/distinfo
index 3ea8f7003d22..a48393697b4d 100644
--- a/www/seamonkey/distinfo
+++ b/www/seamonkey/distinfo
@@ -1,2 +1,2 @@
-MD5 (mozilla-source-1.5b.tar.bz2) = 011f6d02768b9ef9c0fbcb04a1b5ea31
+MD5 (mozilla-source-1.6a.tar.bz2) = 0e0f050af00b9b53d4d70cbb27634747
MD5 (libart_lgpl.tar.bz2) = f332c3c026adc1c2c0ceb3ac5847d5f5
diff --git a/www/seamonkey/files/patch-Makefile.in b/www/seamonkey/files/patch-Makefile.in
index 5dd8b3ca224e..5480cb799b3d 100644
--- a/www/seamonkey/files/patch-Makefile.in
+++ b/www/seamonkey/files/patch-Makefile.in
@@ -1,16 +1,16 @@
---- Makefile.in.orig Thu Aug 14 19:50:21 2003
-+++ Makefile.in Fri Aug 29 15:36:07 2003
-@@ -66,8 +66,7 @@
- $(tier_1_dirs) \
+--- Makefile.in.orig Fri Aug 29 20:20:58 2003
++++ Makefile.in Sat Oct 18 15:34:15 2003
+@@ -67,8 +67,7 @@
$(tier_2_dirs) \
$(tier_9_dirs) \
+ $(tier_40_dirs) \
- $(tier_50_dirs) \
- $(NULL)
+ $(tier_50_dirs)
ifdef GC_LEAK_DETECTOR
DIRS += gc/boehm
-@@ -89,7 +88,8 @@
+@@ -87,7 +86,8 @@
DIRS += $(tier_98_dirs)
endif
diff --git a/www/seamonkey/files/patch-nsprpub_pr_src_misc_prtime.c b/www/seamonkey/files/patch-nsprpub_pr_src_misc_prtime.c
deleted file mode 100644
index f13ae2faa20e..000000000000
--- a/www/seamonkey/files/patch-nsprpub_pr_src_misc_prtime.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- nsprpub/pr/src/misc/prtime.c.orig Wed Feb 26 19:01:02 2003
-+++ nsprpub/pr/src/misc/prtime.c Mon Jun 30 23:18:29 2003
-@@ -1666,7 +1666,7 @@
- */
-
- #if defined(SUNOS4) || (__GLIBC__ >= 2) || defined(XP_BEOS) \
-- || defined(NETBSD)
-+ || defined(NETBSD) || defined(FREEBSD)
- a.tm_zone = NULL;
- a.tm_gmtoff = tm->tm_params.tp_gmt_offset + tm->tm_params.tp_dst_offset;
- #endif
diff --git a/www/seamonkey2/Makefile b/www/seamonkey2/Makefile
index 88f715d3ed00..e9365bbb8cab 100644
--- a/www/seamonkey2/Makefile
+++ b/www/seamonkey2/Makefile
@@ -6,15 +6,15 @@
#
PORTNAME?= mozilla
-PORTVERSION= 1.5b
+PORTVERSION= 1.6.a
PORTREVISION?= 0
PORTEPOCH?= 1
CATEGORIES?= www
MASTER_SITES= ${MASTER_SITE_MOZILLA} \
${MASTER_SITE_LOCAL:S/$/:local/}
-MASTER_SITE_SUBDIR= mozilla/releases/${PORTNAME}${PORTVERSION:S/.rc/rc/}/src \
+MASTER_SITE_SUBDIR= mozilla/releases/${PORTNAME}${PORTVERSION:S/.a/a/}/src \
marcus/:local
-DISTFILES= ${PORTNAME}-source-${PORTVERSION:S/.rc/rc/}${EXTRACT_SUFX} \
+DISTFILES= ${PORTNAME}-source-${PORTVERSION:S/.a/a/}${EXTRACT_SUFX} \
libart_lgpl${EXTRACT_SUFX}:local
MAINTAINER= gnome@FreeBSD.org
@@ -140,8 +140,6 @@ CONFIGURE_ARGS+= --disable-composer
.if defined(WITH_GTK2)
CONFIGURE_ARGS+= --enable-default-toolkit=gtk2
-PKGCONFIG_FILES= mozilla-gtkmozembed mozilla-js mozilla-xpcom \
- mozilla-nspr mozilla-nss mozilla-plugin
.else
CONFIGURE_ARGS+= --enable-default-toolkit=gtk
.endif
@@ -152,6 +150,9 @@ CONFIGURE_ARGS+= --enable-xft
CONFIGURE_ARGS+= --disable-xft
.endif
+PKGCONFIG_FILES=mozilla-gtkmozembed mozilla-js mozilla-xpcom \
+ mozilla-nspr mozilla-nss mozilla-plugin
+
.include <bsd.port.pre.mk>
MAKE_ENV= LD_LIBRARY_PATH=${WRKSRC}/dist/bin \
@@ -203,19 +204,18 @@ post-patch:
@${FIND} ${WRKSRC}/other-licenses/libical -name "*.c" | ${XARGS} \
${REINPLACE_CMD} 's|<malloc.h>|<stdlib.h>|g'
@${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g' \
- ${WRKSRC}/configure
+ ${WRKSRC}/configure \
+ ${WRKSRC}/nsprpub/configure
@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \
- ${WRKSRC}/nsprpub/config/FreeBSD.mk \
+ ${WRKSRC}/nsprpub/configure \
${WRKSRC}/security/coreconf/FreeBSD.mk \
${WRKSRC}/directory/c-sdk/config/FreeBSD.mk \
${WRKSRC}/js/src/Makefile.in
-.if defined(WITH_GTK2)
@for pcfile in ${PKGCONFIG_FILES}; do \
- ${REINPLACE_CMD} -e 's|mozilla-xpcom|mozilla-xpcom${MOZ_SUFX}|g ; \
- s|mozilla-nspr|mozilla-nspr${MOZ_SUFX}|g' \
+ ${REINPLACE_CMD} -e 's|mozilla-xpcom|mozilla-xpcom${MOZ_SUFX}${PKGNAMESUFFIX}|g ; \
+ s|mozilla-nspr|mozilla-nspr${MOZ_SUFX}${PKGNAMESUFFIX}|g' \
${WRKSRC}/build/unix/$${pcfile}.pc.in; \
done
-.endif
post-build:
${SED} -e "s|%%PREFIX%%|${PREFIX}|g" -e "s|%%MOZILLA%%|${MOZILLA}|g" \
@@ -243,11 +243,9 @@ pre-install:
&& ${FIND} -d * -type d | \
${SED} -e 's:^:@dirrm lib/${MOZILLA}/:' >> ${PLIST}
${ECHO_CMD} @dirrm lib/${MOZILLA} >> ${PLIST}
-.if defined(WITH_GTK2)
for pcfile in ${PKGCONFIG_FILES}; do \
- ${ECHO_CMD} libdata/pkgconfig/$${pcfile}${MOZ_SUFX}.pc >> ${PLIST} ; \
+ ${ECHO_CMD} libdata/pkgconfig/$${pcfile}${MOZ_SUFX}${PKGNAMESUFFIX}.pc >> ${PLIST} ; \
done
-.endif
do-install:
${MKDIR} ${PREFIX}/lib/${MOZILLA}
@@ -265,12 +263,10 @@ do-install:
${LN} -sf ${LOCALBASE}/jdk1.3.1/jre/plugin/${ARCH}/ns600/libjavaplugin_oji.so \
${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ; \
fi
-.if defined(WITH_GTK2)
for pcfile in ${PKGCONFIG_FILES}; do \
${INSTALL_DATA} ${WRKSRC}/build/unix/$${pcfile}.pc \
- ${PREFIX}/libdata/pkgconfig/$${pcfile}${MOZ_SUFX}.pc ; \
+ ${PREFIX}/libdata/pkgconfig/$${pcfile}${MOZ_SUFX}${PKGNAMESUFFIX}.pc ; \
done
-.endif
post-install:
@${CHMOD} -R u-w ${PREFIX}/lib/${MOZILLA}/components
diff --git a/www/seamonkey2/distinfo b/www/seamonkey2/distinfo
index 3ea8f7003d22..a48393697b4d 100644
--- a/www/seamonkey2/distinfo
+++ b/www/seamonkey2/distinfo
@@ -1,2 +1,2 @@
-MD5 (mozilla-source-1.5b.tar.bz2) = 011f6d02768b9ef9c0fbcb04a1b5ea31
+MD5 (mozilla-source-1.6a.tar.bz2) = 0e0f050af00b9b53d4d70cbb27634747
MD5 (libart_lgpl.tar.bz2) = f332c3c026adc1c2c0ceb3ac5847d5f5
diff --git a/www/seamonkey2/files/patch-Makefile.in b/www/seamonkey2/files/patch-Makefile.in
index 5dd8b3ca224e..5480cb799b3d 100644
--- a/www/seamonkey2/files/patch-Makefile.in
+++ b/www/seamonkey2/files/patch-Makefile.in
@@ -1,16 +1,16 @@
---- Makefile.in.orig Thu Aug 14 19:50:21 2003
-+++ Makefile.in Fri Aug 29 15:36:07 2003
-@@ -66,8 +66,7 @@
- $(tier_1_dirs) \
+--- Makefile.in.orig Fri Aug 29 20:20:58 2003
++++ Makefile.in Sat Oct 18 15:34:15 2003
+@@ -67,8 +67,7 @@
$(tier_2_dirs) \
$(tier_9_dirs) \
+ $(tier_40_dirs) \
- $(tier_50_dirs) \
- $(NULL)
+ $(tier_50_dirs)
ifdef GC_LEAK_DETECTOR
DIRS += gc/boehm
-@@ -89,7 +88,8 @@
+@@ -87,7 +86,8 @@
DIRS += $(tier_98_dirs)
endif
diff --git a/www/seamonkey2/files/patch-nsprpub_pr_src_misc_prtime.c b/www/seamonkey2/files/patch-nsprpub_pr_src_misc_prtime.c
deleted file mode 100644
index f13ae2faa20e..000000000000
--- a/www/seamonkey2/files/patch-nsprpub_pr_src_misc_prtime.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- nsprpub/pr/src/misc/prtime.c.orig Wed Feb 26 19:01:02 2003
-+++ nsprpub/pr/src/misc/prtime.c Mon Jun 30 23:18:29 2003
-@@ -1666,7 +1666,7 @@
- */
-
- #if defined(SUNOS4) || (__GLIBC__ >= 2) || defined(XP_BEOS) \
-- || defined(NETBSD)
-+ || defined(NETBSD) || defined(FREEBSD)
- a.tm_zone = NULL;
- a.tm_gmtoff = tm->tm_params.tp_gmt_offset + tm->tm_params.tp_dst_offset;
- #endif
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 13:18:41 +0000