Author: beat Date: Thu Sep 29 19:12:04 2011 New Revision: 642 Log: - Full sync with ports
Added: branches/experimental/devel/nspr/files/patch-bugzilla-684758 branches/experimental/security/nss/files/patch-.._coreconf_arch.mk trunk/devel/nspr/files/patch-bugzilla-684758 Modified: branches/experimental/Mk/bsd.gecko.mk branches/experimental/deskutils/lightning-thunderbird/Makefile branches/experimental/deskutils/lightning/Makefile branches/experimental/devel/nspr/Makefile branches/experimental/devel/nspr/files/patch-.._pr_include_md__freebsd.h branches/experimental/mail/linux-thunderbird/Makefile branches/experimental/mail/thunderbird-i18n/Makefile branches/experimental/mail/thunderbird/Makefile branches/experimental/mail/thunderbird3-i18n/Makefile branches/experimental/mail/thunderbird3/Makefile branches/experimental/security/nss/Makefile branches/experimental/security/nss/distinfo branches/experimental/www/firefox-i18n/Makefile branches/experimental/www/firefox/Makefile branches/experimental/www/firefox36-i18n/Makefile branches/experimental/www/firefox36/Makefile branches/experimental/www/kompozer/Makefile branches/experimental/www/kompozer/distinfo branches/experimental/www/linux-firefox/Makefile branches/experimental/www/linux-seamonkey/Makefile branches/experimental/www/seamonkey-i18n/Makefile branches/experimental/www/seamonkey/Makefile branches/experimental/www/seamonkey2/Makefile branches/experimental/www/seamonkey2/pkg-descr branches/experimental/www/xpi-adblock/Makefile.xpi branches/experimental/www/xpi-adblock/distinfo trunk/Mk/bsd.gecko.mk trunk/deskutils/lightning-thunderbird/Makefile trunk/deskutils/lightning/Makefile trunk/devel/nspr/Makefile trunk/devel/nspr/distinfo trunk/devel/nspr/files/patch-.._pr_include_md__freebsd.cfg trunk/devel/nspr/files/patch-.._pr_include_md__freebsd.h trunk/devel/nspr/files/patch-tests trunk/devel/nspr/files/patch-warnings trunk/devel/nspr/pkg-plist trunk/mail/linux-thunderbird/Makefile trunk/mail/thunderbird-i18n/Makefile trunk/mail/thunderbird/Makefile trunk/mail/thunderbird3-i18n/Makefile trunk/mail/thunderbird3/Makefile trunk/www/firefox-i18n/Makefile trunk/www/firefox/Makefile trunk/www/kompozer/distinfo trunk/www/libxul/Makefile trunk/www/linux-firefox/Makefile trunk/www/seamonkey-i18n/Makefile trunk/www/seamonkey/Makefile trunk/www/seamonkey2/Makefile trunk/www/seamonkey2/pkg-descr Modified: branches/experimental/Mk/bsd.gecko.mk ============================================================================== --- branches/experimental/Mk/bsd.gecko.mk Wed Sep 28 16:11:49 2011 (r641) +++ branches/experimental/Mk/bsd.gecko.mk Thu Sep 29 19:12:04 2011 (r642) @@ -4,7 +4,7 @@ # Date created: 12 Nov 2005 # Whom: Michael Johnson <[email protected]> # -# $FreeBSD: ports/Mk/bsd.gecko.mk,v 1.39 2011/09/10 12:39:34 flo Exp $ +# $FreeBSD: ports/Mk/bsd.gecko.mk,v 1.42 2011/09/28 03:14:22 beat Exp $ # # 4 column tabs prevent hair loss and tooth decay! Modified: branches/experimental/deskutils/lightning-thunderbird/Makefile ============================================================================== --- branches/experimental/deskutils/lightning-thunderbird/Makefile Wed Sep 28 16:11:49 2011 (r641) +++ branches/experimental/deskutils/lightning-thunderbird/Makefile Thu Sep 29 19:12:04 2011 (r642) @@ -2,7 +2,7 @@ # Date created: 2005-02-26 # Whom: Michael Johnson <[email protected]> # -# $FreeBSD: ports/deskutils/lightning-thunderbird/Makefile,v 1.41 2011/08/23 18:39:01 kwm Exp $ +# $FreeBSD: ports/deskutils/lightning-thunderbird/Makefile,v 1.42 2011/09/01 14:52:54 flo Exp $ # PORTNAME= lightning @@ -17,7 +17,7 @@ MAINTAINER= [email protected] COMMENT= An integrated calendar for Thunderbird 3.1 -RUN_DEPENDS+= ${LOCALBASE}/lib/thunderbird/thunderbird-bin:${PORTSDIR}/mail/thunderbird3 +RUN_DEPENDS+= ${LOCALBASE}/lib/thunderbird3/thunderbird-bin:${PORTSDIR}/mail/thunderbird3 CONFLICTS_BUILD= spidermonkey-1.[0-7]* USE_AUTOTOOLS= autoconf213 libtool Modified: branches/experimental/deskutils/lightning/Makefile ============================================================================== --- branches/experimental/deskutils/lightning/Makefile Wed Sep 28 16:11:49 2011 (r641) +++ branches/experimental/deskutils/lightning/Makefile Thu Sep 29 19:12:04 2011 (r642) @@ -2,7 +2,7 @@ # Date created: 2005-02-26 # Whom: Michael Johnson <[email protected]> # -# $FreeBSD: ports/deskutils/lightning/Makefile,v 1.37 2011/07/04 20:46:09 flo Exp $ +# $FreeBSD: ports/deskutils/lightning/Makefile,v 1.41 2011/09/29 19:02:56 beat Exp $ # PORTNAME= lightning @@ -16,8 +16,12 @@ MAINTAINER= [email protected] COMMENT= An integrated calendar for Thunderbird and SeaMonkey +DEPRECATED= Depends on www/seamonkey2, which is FORBIDDEN + RUN_DEPENDS+= ${LOCALBASE}/lib/seamonkey/seamonkey-bin:${PORTSDIR}/www/seamonkey2 +BROKEN= unsatisfiable depobj + CONFLICTS_BUILD= spidermonkey-1.[0-7]* USE_AUTOTOOLS= autoconf213 libtool ALL_TARGET= default Modified: branches/experimental/devel/nspr/Makefile ============================================================================== --- branches/experimental/devel/nspr/Makefile Wed Sep 28 16:11:49 2011 (r641) +++ branches/experimental/devel/nspr/Makefile Thu Sep 29 19:12:04 2011 (r642) @@ -2,14 +2,14 @@ # Date created: 18 December 2001 # Whom: Maxim Sobolev <[email protected]> # -# $FreeBSD: ports/devel/nspr/Makefile,v 1.41 2010/11/21 18:17:03 marcus Exp $ +# $FreeBSD: ports/devel/nspr/Makefile,v 1.45 2011/09/10 10:35:10 flo Exp $ # $MCom: ports-experimental/devel/nspr/Makefile,v 1.6 2008/03/12 13:06:56 ahze Exp $ PORTNAME= nspr DISTVERSION= 4.8.8 +PORTREVISION= 1 CATEGORIES= devel -#MASTER_SITES= LOCAL/ahze -MASTER_SITES= ${MASTER_SITE_MOZILLA} +MASTER_SITES= MOZILLA MASTER_SITE_SUBDIR= nspr/releases/v${PORTVERSION}/src MAINTAINER= [email protected] @@ -34,11 +34,6 @@ post-patch: @${REINPLACE_CMD} -e 's,-lpthread,${PTHREAD_LIBS},g ; s,echo aout,echo elf,g' ${WRKSRC}/${CONFIGURE_SCRIPT} -.if ${OSVERSION} < 601104 - @${REINPLACE_CMD} -e 's|pthread_cond_wait|_pthread_cond_wait|g' \ - ${WRKSRC}/../pr/src/md/unix/pthreads_user.c \ - ${WRKSRC}/../pr/src/pthreads/ptsynch.c -.endif do-install: ${MKDIR} ${PREFIX}/include/nspr @@ -62,7 +57,7 @@ .endfor prtests: - env PTHREAD_LIBS="${PTHREAD_LIBS}" ${GMAKE} -C ${WRKSRC}/pr/tests + ${SETENV} PTHREAD_LIBS="${PTHREAD_LIBS}" ${GMAKE} -C ${WRKSRC}/pr/tests ${LN} -sf libmy.so.1 ${WRKSRC}/pr/tests/dll/libmy.so cd ${WRKSRC}/pr/tests && ../../../pr/tests/runtests.sh Modified: branches/experimental/devel/nspr/files/patch-.._pr_include_md__freebsd.h ============================================================================== --- branches/experimental/devel/nspr/files/patch-.._pr_include_md__freebsd.h Wed Sep 28 16:11:49 2011 (r641) +++ branches/experimental/devel/nspr/files/patch-.._pr_include_md__freebsd.h Thu Sep 29 19:12:04 2011 (r642) @@ -15,7 +15,7 @@ #define _PR_IPV6_V6ONLY_PROBE #endif -+#if (__FreeBSD_version >= 700016) || (__FreeBSD_version < 700000 && __FreeBSD_version >= 601103) ++#if (__FreeBSD_version >= 700016) +#if defined(_PR_PTHREADS) +#define _PR_HAVE_GETPROTO_R +#define _PR_HAVE_5_ARG_GETPROTO_R Added: branches/experimental/devel/nspr/files/patch-bugzilla-684758 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/devel/nspr/files/patch-bugzilla-684758 Thu Sep 29 19:12:04 2011 (r642) @@ -0,0 +1,11 @@ +--- ../pr/src/pthreads/ptio.c 2011-09-02 12:14:24.000000000 +0200 ++++ ../pr/src/pthreads/ptio.c 2011-09-02 12:14:27.000000000 +0200 +@@ -1635,7 +1635,7 @@ + PR_SetError(PR_BAD_DESCRIPTOR_ERROR, 0); + return PR_FAILURE; + } +- if ((out_flags & (PR_POLL_WRITE | PR_POLL_EXCEPT | PR_POLL_ERR)) == 0) ++ if ((out_flags & (PR_POLL_WRITE | PR_POLL_EXCEPT | PR_POLL_ERR | PR_POLL_HUP)) == 0) + { + PR_ASSERT(out_flags == 0); + PR_SetError(PR_IN_PROGRESS_ERROR, 0); Modified: branches/experimental/mail/linux-thunderbird/Makefile ============================================================================== --- branches/experimental/mail/linux-thunderbird/Makefile Wed Sep 28 16:11:49 2011 (r641) +++ branches/experimental/mail/linux-thunderbird/Makefile Thu Sep 29 19:12:04 2011 (r642) @@ -2,7 +2,7 @@ # Date created: 17 April 2006 # Whom: Andrew Pantyukhin <[email protected]> # -# $FreeBSD: ports/mail/linux-thunderbird/Makefile,v 1.43 2011/06/21 20:38:00 flo Exp $ +# $FreeBSD: ports/mail/linux-thunderbird/Makefile,v 1.47 2011/09/27 22:25:41 beat Exp $ # PORTNAME= thunderbird Modified: branches/experimental/mail/thunderbird-i18n/Makefile ============================================================================== --- branches/experimental/mail/thunderbird-i18n/Makefile Wed Sep 28 16:11:49 2011 (r641) +++ branches/experimental/mail/thunderbird-i18n/Makefile Thu Sep 29 19:12:04 2011 (r642) @@ -2,7 +2,7 @@ # Date created: 29 May 2006 # Whom: Andrew Pantyukhin <[email protected]> # -# $FreeBSD: ports/mail/thunderbird-i18n/Makefile,v 1.47 2011/08/23 08:00:17 ale Exp $ +# $FreeBSD: ports/mail/thunderbird-i18n/Makefile,v 1.50 2011/09/27 22:24:46 beat Exp $ # PORTNAME= thunderbird-i18n Modified: branches/experimental/mail/thunderbird/Makefile ============================================================================== --- branches/experimental/mail/thunderbird/Makefile Wed Sep 28 16:11:49 2011 (r641) +++ branches/experimental/mail/thunderbird/Makefile Thu Sep 29 19:12:04 2011 (r642) @@ -2,7 +2,7 @@ # Date created: 4 September 2003 # Whom: Joe Marcus Clarke <[email protected]> # -# $FreeBSD: ports/mail/thunderbird/Makefile,v 1.136 2011/09/06 20:15:18 flo Exp $ +# $FreeBSD: ports/mail/thunderbird/Makefile,v 1.137 2011/09/27 22:23:30 beat Exp $ # PORTNAME= thunderbird Modified: branches/experimental/mail/thunderbird3-i18n/Makefile ============================================================================== --- branches/experimental/mail/thunderbird3-i18n/Makefile Wed Sep 28 16:11:49 2011 (r641) +++ branches/experimental/mail/thunderbird3-i18n/Makefile Thu Sep 29 19:12:04 2011 (r642) @@ -2,7 +2,7 @@ # Date created: 29 May 2006 # Whom: Andrew Pantyukhin <[email protected]> # -# $FreeBSD: ports/mail/thunderbird3-i18n/Makefile,v 1.52 2011/09/06 20:14:57 flo Exp $ +# $FreeBSD: ports/mail/thunderbird3-i18n/Makefile,v 1.53 2011/09/28 02:41:54 beat Exp $ # PORTNAME= thunderbird3-i18n Modified: branches/experimental/mail/thunderbird3/Makefile ============================================================================== --- branches/experimental/mail/thunderbird3/Makefile Wed Sep 28 16:11:49 2011 (r641) +++ branches/experimental/mail/thunderbird3/Makefile Thu Sep 29 19:12:04 2011 (r642) @@ -2,7 +2,7 @@ # Date created: 4 September 2003 # Whom: Joe Marcus Clarke <[email protected]> # -# $FreeBSD: ports/mail/thunderbird3/Makefile,v 1.136 2011/09/06 20:14:57 flo Exp $ +# $FreeBSD: ports/mail/thunderbird3/Makefile,v 1.137 2011/09/28 02:41:54 beat Exp $ # PORTNAME= thunderbird Modified: branches/experimental/security/nss/Makefile ============================================================================== --- branches/experimental/security/nss/Makefile Wed Sep 28 16:11:49 2011 (r641) +++ branches/experimental/security/nss/Makefile Thu Sep 29 19:12:04 2011 (r642) @@ -2,27 +2,31 @@ # Date created: 18 December 2001 # Whom: Maxim Sobolev <[email protected]> # -# $FreeBSD: ports/security/nss/Makefile,v 1.54 2010/10/21 11:19:12 beat Exp $ +# $FreeBSD: ports/security/nss/Makefile,v 1.58 2011/09/04 13:23:51 mandree Exp $ # $MCom ports-experimental/security/nss/Makefile,v 1.4 2008/02/23 15:47:28 ahze Exp $ PORTNAME= nss PORTVERSION= ${_MAJOR}.${_MINOR}.${_PATCH} CATEGORIES= security MASTER_SITES= ${MASTER_SITE_MOZILLA} -MASTER_SITE_SUBDIR= security/nss/releases/NSS_${PORTVERSION:S/./_/g}_RTM/src +MASTER_SITE_SUBDIR= security/nss/releases/NSS_${PORTVERSION:S/./_/g}_WITH_CKBI_${CKBI_VER:S/./_/}_RTM/src +DISTNAME= nss-${PORTVERSION}.with.ckbi.${CKBI_VER} MAINTAINER= [email protected] COMMENT= Libraries to support development of security-enabled applications -BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip +BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip \ + nspr>=4.8.8:${PORTSDIR}/devel/nspr LIB_DEPENDS= nspr4.1:${PORTSDIR}/devel/nspr \ sqlite3.8:${PORTSDIR}/databases/sqlite3 _MAJOR= 3 _MINOR= 12 -_PATCH= 9 +_PATCH= 11 -WRKSRC= ${WRKDIR}/${DISTNAME}/mozilla/security/nss +CKBI_VER= 1.87 + +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/mozilla/security/nss MAKE_JOBS_UNSAFE= yes USE_LDCONFIG= ${PREFIX}/lib/nss @@ -75,6 +79,8 @@ @cd ${WRKSRC} && \ ${FIND} . -name "*.c" -o -name "*.h" | \ ${XARGS} ${REINPLACE_CMD} -e 's|"nspr.h"|<nspr.h>|' + @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ + ${WRKSRC}/lib/softoken/manifest.mn do-install: ${MKDIR} ${PREFIX}/include/nss/nss ${PREFIX}/lib/nss Modified: branches/experimental/security/nss/distinfo ============================================================================== --- branches/experimental/security/nss/distinfo Wed Sep 28 16:11:49 2011 (r641) +++ branches/experimental/security/nss/distinfo Thu Sep 29 19:12:04 2011 (r642) @@ -1,2 +1,2 @@ -SHA256 (nss-3.12.9.tar.gz) = 0dc77718016654bbf6ffdda09e968e2b2875c05dacec967abf5725b5daae5978 -SIZE (nss-3.12.9.tar.gz) = 5984608 +SHA256 (nss-3.12.11.with.ckbi.1.87.tar.gz) = 4b84a7cd361bf2d14935d0f27681dd148cf3124edf558a271cfde8882f7f7020 +SIZE (nss-3.12.11.with.ckbi.1.87.tar.gz) = 6035595 Added: branches/experimental/security/nss/files/patch-.._coreconf_arch.mk ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/security/nss/files/patch-.._coreconf_arch.mk Thu Sep 29 19:12:04 2011 (r642) @@ -0,0 +1,11 @@ +--- ../coreconf/arch.mk.orig 2011-03-03 18:13:52.000000000 +0100 ++++ ../coreconf/arch.mk 2011-03-03 18:14:09.000000000 +0100 +@@ -66,7 +66,7 @@ + # Attempt to differentiate between sparc and x86 Solaris + # + +-OS_TEST := $(shell uname -m) ++OS_TEST := $(shell uname -p) + ifeq ($(OS_TEST),i86pc) + OS_RELEASE := $(shell uname -r)_$(OS_TEST) + else Modified: branches/experimental/www/firefox-i18n/Makefile ============================================================================== --- branches/experimental/www/firefox-i18n/Makefile Wed Sep 28 16:11:49 2011 (r641) +++ branches/experimental/www/firefox-i18n/Makefile Thu Sep 29 19:12:04 2011 (r642) @@ -2,7 +2,7 @@ # Date created: 28 May 2006 # Whom: Andrew Pantyukhin <[email protected]> # -# $FreeBSD: ports/www/firefox-i18n/Makefile,v 1.57 2011/09/06 20:16:53 flo Exp $ +# $FreeBSD: ports/www/firefox-i18n/Makefile,v 1.58 2011/09/27 18:44:34 beat Exp $ # PORTNAME= firefox-i18n Modified: branches/experimental/www/firefox/Makefile ============================================================================== --- branches/experimental/www/firefox/Makefile Wed Sep 28 16:11:49 2011 (r641) +++ branches/experimental/www/firefox/Makefile Thu Sep 29 19:12:04 2011 (r642) @@ -2,7 +2,7 @@ # Date created: 2002/10/21 # Whom: Alan Eldridge <[email protected]> # -# $FreeBSD: ports/www/firefox/Makefile,v 1.249 2011/09/27 18:44:33 beat Exp $ +# $FreeBSD: ports/www/firefox/Makefile,v 1.250 2011/09/28 16:19:48 beat Exp $ # PORTNAME= firefox Modified: branches/experimental/www/firefox36-i18n/Makefile ============================================================================== --- branches/experimental/www/firefox36-i18n/Makefile Wed Sep 28 16:11:49 2011 (r641) +++ branches/experimental/www/firefox36-i18n/Makefile Thu Sep 29 19:12:04 2011 (r642) @@ -2,7 +2,7 @@ # Date created: 28 May 2006 # Whom: Andrew Pantyukhin <[email protected]> # -# $FreeBSD: ports/www/firefox36-i18n/Makefile,v 1.56 2011/08/18 10:01:12 ale Exp $ +# $FreeBSD: ports/www/firefox36-i18n/Makefile,v 1.59 2011/09/27 19:32:48 beat Exp $ # PORTNAME= firefox36-i18n Modified: branches/experimental/www/firefox36/Makefile ============================================================================== --- branches/experimental/www/firefox36/Makefile Wed Sep 28 16:11:49 2011 (r641) +++ branches/experimental/www/firefox36/Makefile Thu Sep 29 19:12:04 2011 (r642) @@ -2,7 +2,7 @@ # Date created: 2002/10/21 # Whom: Alan Eldridge <[email protected]> # -# $FreeBSD: ports/www/firefox36/Makefile,v 1.247 2011/09/06 20:16:25 flo Exp $ +# $FreeBSD: ports/www/firefox36/Makefile,v 1.248 2011/09/27 19:32:48 beat Exp $ # PORTNAME= firefox Modified: branches/experimental/www/kompozer/Makefile ============================================================================== --- branches/experimental/www/kompozer/Makefile Wed Sep 28 16:11:49 2011 (r641) +++ branches/experimental/www/kompozer/Makefile Thu Sep 29 19:12:04 2011 (r642) @@ -2,7 +2,7 @@ # Date created: August 21, 2004 # Whom: Thierry Thomas <[email protected]> # -# $FreeBSD: ports/www/kompozer/Makefile,v 1.48 2010/03/28 06:44:51 dinoex Exp $ +# $FreeBSD: ports/www/kompozer/Makefile,v 1.50 2011/08/16 18:36:10 flo Exp $ # $MCom: ports/www/nvu/Makefile,v 1.5 2006/07/18 15:07:36 ahze Exp $ # @@ -16,7 +16,6 @@ MAINTAINER= [email protected] COMMENT= Complete Web Authoring Suite -USE_AUTOTOOLS= autoconf213 WANT_GNOME= yes WANT_PERL= yes USE_BZIP2= yes @@ -40,9 +39,6 @@ .include <bsd.port.pre.mk> -pre-configure: - (cd ${WRKSRC} && ${AUTOCONF}) - post-patch: ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \ ${WRKSRC}/storage/build/Makefile.in Modified: branches/experimental/www/kompozer/distinfo ============================================================================== --- branches/experimental/www/kompozer/distinfo Wed Sep 28 16:11:49 2011 (r641) +++ branches/experimental/www/kompozer/distinfo Thu Sep 29 19:12:04 2011 (r642) @@ -1,3 +1,2 @@ -MD5 (kompozer-0.8b3-src.tar.bz2) = cd4664ecda908666b19ef0607010c627 SHA256 (kompozer-0.8b3-src.tar.bz2) = 9dfef34e5941ce1e68e2f952c9783b281a74be226dad3ab1a2b1b8c99df5c5e3 SIZE (kompozer-0.8b3-src.tar.bz2) = 41747177 Modified: branches/experimental/www/linux-firefox/Makefile ============================================================================== --- branches/experimental/www/linux-firefox/Makefile Wed Sep 28 16:11:49 2011 (r641) +++ branches/experimental/www/linux-firefox/Makefile Thu Sep 29 19:12:04 2011 (r642) @@ -2,7 +2,7 @@ # Date created: 2004-09-17 # Whom: voisine # -# $FreeBSD: ports/www/linux-firefox/Makefile,v 1.81 2011/06/21 20:35:48 flo Exp $ +# $FreeBSD: ports/www/linux-firefox/Makefile,v 1.84 2011/09/27 18:44:34 beat Exp $ # PORTNAME= firefox Modified: branches/experimental/www/linux-seamonkey/Makefile ============================================================================== --- branches/experimental/www/linux-seamonkey/Makefile Wed Sep 28 16:11:49 2011 (r641) +++ branches/experimental/www/linux-seamonkey/Makefile Thu Sep 29 19:12:04 2011 (r642) @@ -2,7 +2,7 @@ # Date created: 1 February 2006 # Whom: Andrew Pantyukhin <[email protected]> # -# $FreeBSD: ports/www/linux-seamonkey/Makefile,v 1.47 2011/03/03 04:39:49 beat Exp $ +# $FreeBSD: ports/www/linux-seamonkey/Makefile,v 1.51 2011/09/28 03:16:05 beat Exp $ # PORTNAME= seamonkey Modified: branches/experimental/www/seamonkey-i18n/Makefile ============================================================================== --- branches/experimental/www/seamonkey-i18n/Makefile Wed Sep 28 16:11:49 2011 (r641) +++ branches/experimental/www/seamonkey-i18n/Makefile Thu Sep 29 19:12:04 2011 (r642) @@ -2,7 +2,7 @@ # Date created: 28 May 2006 # Whom: Andrew Pantyukhin <[email protected]> # -# $FreeBSD: ports/www/seamonkey-i18n/Makefile,v 1.5 2011/08/23 08:00:17 ale Exp $ +# $FreeBSD: ports/www/seamonkey-i18n/Makefile,v 1.9 2011/09/28 03:14:22 beat Exp $ # PORTNAME= seamonkey-i18n Modified: branches/experimental/www/seamonkey/Makefile ============================================================================== --- branches/experimental/www/seamonkey/Makefile Wed Sep 28 16:11:49 2011 (r641) +++ branches/experimental/www/seamonkey/Makefile Thu Sep 29 19:12:04 2011 (r642) @@ -2,7 +2,7 @@ # Date created: 31 Mar 1998 # Whom: eivind/dima/jseger # -# $FreeBSD: ports/www/seamonkey/Makefile,v 1.309 2011/09/23 22:26:05 amdmi3 Exp $ +# $FreeBSD: ports/www/seamonkey/Makefile,v 1.310 2011/09/28 03:14:22 beat Exp $ # PORTNAME= seamonkey Modified: branches/experimental/www/seamonkey2/Makefile ============================================================================== --- branches/experimental/www/seamonkey2/Makefile Wed Sep 28 16:11:49 2011 (r641) +++ branches/experimental/www/seamonkey2/Makefile Thu Sep 29 19:12:04 2011 (r642) @@ -2,7 +2,7 @@ # Date created: 31 Mar 1998 # Whom: eivind/dima/jseger # -# $FreeBSD: ports/www/seamonkey2/Makefile,v 1.322 2011/08/18 09:57:39 ale Exp $ +# $FreeBSD: ports/www/seamonkey2/Makefile,v 1.324 2011/09/23 22:26:05 amdmi3 Exp $ # PORTNAME= seamonkey @@ -16,6 +16,10 @@ MAINTAINER= [email protected] COMMENT= The open source, standards compliant web browser +DEPRECATED= Upstream support dropped. Please consider using www/seamonkey instead. +EXPIRATION_DATE= 2011-10-01 +FORBIDDEN= several security vulnerabilities + CONFLICTS_BUILD= spidermonkey-1.[0-7]* LATEST_LINK= seamonkey2 USE_BZIP2= yes @@ -28,8 +32,9 @@ MAKE_JOBS_SAFE= yes MOZ_PIS_SCRIPTS= moz_pis_S50cleanhome MAKE_ENV= LD_LIBRARY_PATH=${WRKSRC}/dist/bin -CONFIGURE_ENV= LOCALBASE=${LOCALBASE} CPPFLAGS="-I${LOCALBASE}/include/cairo" \ +CONFIGURE_ENV= LOCALBASE=${LOCALBASE} \ ac_cv_func__Unwind_Backtrace=no +CPPFLAGS+= -I${LOCALBASE}/include/cairo USE_GCC= 4.2+ MOZ_EXTENSIONS= default Modified: branches/experimental/www/seamonkey2/pkg-descr ============================================================================== --- branches/experimental/www/seamonkey2/pkg-descr Wed Sep 28 16:11:49 2011 (r641) +++ branches/experimental/www/seamonkey2/pkg-descr Thu Sep 29 19:12:04 2011 (r642) @@ -1,4 +1,4 @@ -This is the current release of the Seamonkey open source web browser. It should +This is the 2.0.x release of the Seamonkey open source web browser. It should be fully compliant with all W3C standards, including HTML, CSS, XML, XSL, JavaScript, MathML, SSL encryption, SVG and RDF. Also supports Java with the use of the FreeBSD native Java plug-in. Modified: branches/experimental/www/xpi-adblock/Makefile.xpi ============================================================================== --- branches/experimental/www/xpi-adblock/Makefile.xpi Wed Sep 28 16:11:49 2011 (r641) +++ branches/experimental/www/xpi-adblock/Makefile.xpi Thu Sep 29 19:12:04 2011 (r642) @@ -5,7 +5,7 @@ # Date created: 28 March 2006 # Whom: Andrew Pantyukhin <[email protected]> # -# $FreeBSD: ports/www/xpi-adblock/Makefile.xpi,v 1.22 2009/12/14 12:02:53 beat Exp $ +# $FreeBSD: ports/www/xpi-adblock/Makefile.xpi,v 1.25 2011/08/18 09:51:58 ale Exp $ # # XPI_ID - Extension id, might be in {12345-...} or dev@org format @@ -85,11 +85,11 @@ EXTRACT_AFTER_ARGS= -d ${WRKSRC} XPI_DISTNAME?= ${PORTNAME} -XPI_APPS_ALL_WC= *firefox* *thunderbird* *flock* *sunbird* *seamonkey* +XPI_APPS_ALL_WC= *firefox* *thunderbird* *seamonkey* -XPI_APPS_ALL= firefox firefox3 firefox35 linux-firefox linux-firefox-devel \ - flock linux-flock thunderbird thunderbird3 linux-thunderbird \ - seamonkey sunbird linux-sunbird +XPI_APPS_ALL= firefox firefox3 linux-firefox linux-firefox-devel \ + thunderbird thunderbird3 linux-thunderbird \ + seamonkey seamonkey2 linux-seamonkey # kompozer linux-kompozer # Other apps: mango @@ -188,11 +188,19 @@ ${LN} -sf $$_xpi $$_app ${_Q} ; } ; } .endif +.if !target(xpi-post-extract) +xpi-post-extract: +.endif + +post-extract: xpi-post-extract + @${RM} -rf ${WRKSRC}/META-INF + # Maintainer section xpi-gen: extract @${ECHO_CMD} -n 'XPI_ID=' - @${GREP} -Em1 'em:id|<id>' ${WRKSRC}/install.rdf | ${CUT} -f2- -d\> | \ - ${CUT} -f1 -d\< | ${CUT} -f2 -d\" + @${SED} -En '/<(RDF:)?Description (RDF:)?about="urn:mozilla:install-manifest"/,/>/p' ${WRKSRC}/install.rdf | \ + ${GREP} -Em1 'em:id|<id>' | ${CUT} -f2- -d\> | \ + ${CUT} -f1 -d\< | ${CUT} -f2 -d\" @${ECHO_CMD} -n 'XPI_FILES=' @cd ${WRKSRC} && ${FIND} -s . -not -type d | cut -f2- -d/ | ${TR} '\n' ' ' @if [ -d ${FILESDIR} -a -f ${FILESDIR}/chrome.manifest ] ; \ Modified: branches/experimental/www/xpi-adblock/distinfo ============================================================================== --- branches/experimental/www/xpi-adblock/distinfo Wed Sep 28 16:11:49 2011 (r641) +++ branches/experimental/www/xpi-adblock/distinfo Thu Sep 29 19:12:04 2011 (r642) @@ -1,3 +1,2 @@ -MD5 (xpi/adblock-0.5.3.043-fx+fl+mz+ns.xpi) = da21eb170d6a5a68753eb47aae9c4e5f SHA256 (xpi/adblock-0.5.3.043-fx+fl+mz+ns.xpi) = 394856aca7e29f1cbe044342430580f3ad4c3b97bad143eec3d6ba7402ce1cd9 SIZE (xpi/adblock-0.5.3.043-fx+fl+mz+ns.xpi) = 77641 Modified: trunk/Mk/bsd.gecko.mk ============================================================================== --- trunk/Mk/bsd.gecko.mk Wed Sep 28 16:11:49 2011 (r641) +++ trunk/Mk/bsd.gecko.mk Thu Sep 29 19:12:04 2011 (r642) @@ -4,7 +4,7 @@ # Date created: 12 Nov 2005 # Whom: Michael Johnson <[email protected]> # -# $FreeBSD: ports/Mk/bsd.gecko.mk,v 1.39 2011/09/10 12:39:34 flo Exp $ +# $FreeBSD: ports/Mk/bsd.gecko.mk,v 1.42 2011/09/28 03:14:22 beat Exp $ # # 4 column tabs prevent hair loss and tooth decay! Modified: trunk/deskutils/lightning-thunderbird/Makefile ============================================================================== --- trunk/deskutils/lightning-thunderbird/Makefile Wed Sep 28 16:11:49 2011 (r641) +++ trunk/deskutils/lightning-thunderbird/Makefile Thu Sep 29 19:12:04 2011 (r642) @@ -2,7 +2,7 @@ # Date created: 2005-02-26 # Whom: Michael Johnson <[email protected]> # -# $FreeBSD: ports/deskutils/lightning-thunderbird/Makefile,v 1.41 2011/08/23 18:39:01 kwm Exp $ +# $FreeBSD: ports/deskutils/lightning-thunderbird/Makefile,v 1.42 2011/09/01 14:52:54 flo Exp $ # PORTNAME= lightning @@ -17,7 +17,7 @@ MAINTAINER= [email protected] COMMENT= An integrated calendar for Thunderbird 3.1 -RUN_DEPENDS+= ${LOCALBASE}/lib/thunderbird/thunderbird-bin:${PORTSDIR}/mail/thunderbird3 +RUN_DEPENDS+= ${LOCALBASE}/lib/thunderbird3/thunderbird-bin:${PORTSDIR}/mail/thunderbird3 CONFLICTS_BUILD= spidermonkey-1.[0-7]* USE_AUTOTOOLS= autoconf213 libtool Modified: trunk/deskutils/lightning/Makefile ============================================================================== --- trunk/deskutils/lightning/Makefile Wed Sep 28 16:11:49 2011 (r641) +++ trunk/deskutils/lightning/Makefile Thu Sep 29 19:12:04 2011 (r642) @@ -2,7 +2,7 @@ # Date created: 2005-02-26 # Whom: Michael Johnson <[email protected]> # -# $FreeBSD: ports/deskutils/lightning/Makefile,v 1.38 2011/08/16 18:36:10 flo Exp $ +# $FreeBSD: ports/deskutils/lightning/Makefile,v 1.41 2011/09/29 19:02:56 beat Exp $ # PORTNAME= lightning @@ -16,8 +16,12 @@ MAINTAINER= [email protected] COMMENT= An integrated calendar for Thunderbird and SeaMonkey +DEPRECATED= Depends on www/seamonkey2, which is FORBIDDEN + RUN_DEPENDS+= ${LOCALBASE}/lib/seamonkey/seamonkey-bin:${PORTSDIR}/www/seamonkey2 +BROKEN= unsatisfiable depobj + CONFLICTS_BUILD= spidermonkey-1.[0-7]* USE_AUTOTOOLS= autoconf213 libtool ALL_TARGET= default Modified: trunk/devel/nspr/Makefile ============================================================================== --- trunk/devel/nspr/Makefile Wed Sep 28 16:11:49 2011 (r641) +++ trunk/devel/nspr/Makefile Thu Sep 29 19:12:04 2011 (r642) @@ -2,14 +2,14 @@ # Date created: 18 December 2001 # Whom: Maxim Sobolev <[email protected]> # -# $FreeBSD: ports/devel/nspr/Makefile,v 1.39 2009/11/11 05:36:52 mi Exp $ +# $FreeBSD: ports/devel/nspr/Makefile,v 1.45 2011/09/10 10:35:10 flo Exp $ # $MCom: ports-experimental/devel/nspr/Makefile,v 1.6 2008/03/12 13:06:56 ahze Exp $ PORTNAME= nspr -DISTVERSION= 4.8.2 +DISTVERSION= 4.8.8 +PORTREVISION= 1 CATEGORIES= devel -#MASTER_SITES= LOCAL/ahze -MASTER_SITES= ${MASTER_SITE_MOZILLA} +MASTER_SITES= MOZILLA MASTER_SITE_SUBDIR= nspr/releases/v${PORTVERSION}/src MAINTAINER= [email protected] @@ -34,36 +34,30 @@ post-patch: @${REINPLACE_CMD} -e 's,-lpthread,${PTHREAD_LIBS},g ; s,echo aout,echo elf,g' ${WRKSRC}/${CONFIGURE_SCRIPT} -.if ${OSVERSION} < 601104 - @${REINPLACE_CMD} -e 's|pthread_cond_wait|_pthread_cond_wait|g' \ - ${WRKSRC}/../pr/src/md/unix/pthreads_user.c \ - ${WRKSRC}/../pr/src/pthreads/ptsynch.c -.endif do-install: ${MKDIR} ${PREFIX}/include/nspr ${TAR} -C ${WRKSRC}/dist/include --dereference -cf - . | \ - ${TAR} -C ${PREFIX}/include -xf - - ${FIND} ${PREFIX}/include/nspr | \ - ${XARGS} ${CHOWN} ${SHAREOWN}:${SHAREGRP} + ${TAR} -C ${PREFIX}/include -xof - ${FIND} ${PREFIX}/include/nspr -type d | \ ${XARGS} ${CHMOD} 0755 ${FIND} ${PREFIX}/include/nspr -type f | \ ${XARGS} ${CHMOD} ${SHAREMODE} ${TAR} -C ${WRKSRC}/dist/lib --dereference -cf - . | \ - ${TAR} -C ${PREFIX}/lib -xf - + ${TAR} -C ${PREFIX}/lib -xof - ${INSTALL_SCRIPT} ${WRKSRC}/config/nspr-config ${PREFIX}/bin ${MKDIR} ${PREFIX}/libdata/pkgconfig ${INSTALL_DATA} ${WRKSRC}/config/nspr.pc ${PREFIX}/libdata/pkgconfig .for lib in ${LIBS} +.if defined(STRIP) && ${STRIP} != "" ${STRIP_CMD} ${PREFIX}/lib/${lib} - ${CHOWN} ${BINOWN}:${BINGRP} ${PREFIX}/lib/${lib} +.endif ${CHMOD} ${BINMODE} ${PREFIX}/lib/${lib} ${LN} -sf ${lib} ${PREFIX}/lib/${lib:R} .endfor prtests: - env PTHREAD_LIBS="${PTHREAD_LIBS}" ${GMAKE} -C ${WRKSRC}/pr/tests + ${SETENV} PTHREAD_LIBS="${PTHREAD_LIBS}" ${GMAKE} -C ${WRKSRC}/pr/tests ${LN} -sf libmy.so.1 ${WRKSRC}/pr/tests/dll/libmy.so cd ${WRKSRC}/pr/tests && ../../../pr/tests/runtests.sh Modified: trunk/devel/nspr/distinfo ============================================================================== --- trunk/devel/nspr/distinfo Wed Sep 28 16:11:49 2011 (r641) +++ trunk/devel/nspr/distinfo Thu Sep 29 19:12:04 2011 (r642) @@ -1,3 +1,2 @@ -MD5 (nspr-4.8.2.tar.gz) = 2a6fbfa56c9760ed3651d527272249c7 -SHA256 (nspr-4.8.2.tar.gz) = 23ec182a42eec4b6df01f3c02c632ed9f7e004d6c320d048d5fe24054d319bce -SIZE (nspr-4.8.2.tar.gz) = 1232677 +SHA256 (nspr-4.8.8.tar.gz) = 92f3f4ded2ee313e396c180d5445cc3c718ff347d86c06b7bf14a1b5e049d4c9 +SIZE (nspr-4.8.8.tar.gz) = 1246068 Modified: trunk/devel/nspr/files/patch-.._pr_include_md__freebsd.cfg ============================================================================== --- trunk/devel/nspr/files/patch-.._pr_include_md__freebsd.cfg Wed Sep 28 16:11:49 2011 (r641) +++ trunk/devel/nspr/files/patch-.._pr_include_md__freebsd.cfg Thu Sep 29 19:12:04 2011 (r642) @@ -1,9 +1,55 @@ ---- ../pr/include/md/_freebsd.cfg -+++ ../pr/include/md/_freebsd.cfg -@@ -283,6 +283,51 @@ +--- ../pr/include/md/_freebsd.cfg.orig 2007-11-26 19:17:17.000000000 +0100 ++++ ../pr/include/md/_freebsd.cfg 2010-06-09 20:30:03.000000000 +0200 +@@ -283,6 +283,97 @@ #define PR_ALIGN_OF_POINTER 8 #define PR_ALIGN_OF_WORD 8 ++#elif defined(__powerpc64__) ++ ++#undef IS_LITTLE_ENDIAN ++#define IS_BIG_ENDIAN 1 ++#define IS_64 ++ ++#define PR_BYTES_PER_BYTE 1 ++#define PR_BYTES_PER_SHORT 2 ++#define PR_BYTES_PER_INT 4 ++#define PR_BYTES_PER_INT64 8 ++#define PR_BYTES_PER_LONG 8 ++#define PR_BYTES_PER_FLOAT 4 ++#define PR_BYTES_PER_DOUBLE 8 ++#define PR_BYTES_PER_WORD 8 ++#define PR_BYTES_PER_DWORD 8 ++ ++#define PR_BITS_PER_BYTE 8 ++#define PR_BITS_PER_SHORT 16 ++#define PR_BITS_PER_INT 32 ++#define PR_BITS_PER_INT64 64 ++#define PR_BITS_PER_LONG 64 ++#define PR_BITS_PER_FLOAT 32 ++#define PR_BITS_PER_DOUBLE 64 ++#define PR_BITS_PER_WORD 64 ++ ++#define PR_BITS_PER_BYTE_LOG2 3 ++#define PR_BITS_PER_SHORT_LOG2 4 ++#define PR_BITS_PER_INT_LOG2 5 ++#define PR_BITS_PER_INT64_LOG2 6 ++#define PR_BITS_PER_LONG_LOG2 6 ++#define PR_BITS_PER_FLOAT_LOG2 5 ++#define PR_BITS_PER_DOUBLE_LOG2 6 ++#define PR_BITS_PER_WORD_LOG2 6 ++ ++#define PR_ALIGN_OF_SHORT 2 ++#define PR_ALIGN_OF_INT 4 ++#define PR_ALIGN_OF_LONG 8 ++#define PR_ALIGN_OF_INT64 8 ++#define PR_ALIGN_OF_FLOAT 4 ++#define PR_ALIGN_OF_DOUBLE 8 ++#define PR_ALIGN_OF_POINTER 8 ++#define PR_ALIGN_OF_WORD 8 ++ ++#define PR_BYTES_PER_WORD_LOG2 3 ++#define PR_BYTES_PER_DWORD_LOG2 3 ++ +#elif defined(__powerpc__) + +#undef IS_LITTLE_ENDIAN Modified: trunk/devel/nspr/files/patch-.._pr_include_md__freebsd.h ============================================================================== --- trunk/devel/nspr/files/patch-.._pr_include_md__freebsd.h Wed Sep 28 16:11:49 2011 (r641) +++ trunk/devel/nspr/files/patch-.._pr_include_md__freebsd.h Thu Sep 29 19:12:04 2011 (r642) @@ -1,19 +1,21 @@ ---- ../pr/include/md/_freebsd.h -+++ ../pr/include/md/_freebsd.h -@@ -57,6 +57,8 @@ +--- ../pr/include/md/_freebsd.h.orig 2004-11-22 21:24:53.000000000 +0000 ++++ ../pr/include/md/_freebsd.h 2010-06-07 20:53:33.000000000 +0000 +@@ -57,6 +57,10 @@ #define _PR_SI_ARCHITECTURE "ia64" #elif defined(__amd64__) #define _PR_SI_ARCHITECTURE "amd64" ++#elif defined(__powerpc64__) ++#define _PR_SI_ARCHITECTURE "powerpc64" +#elif defined(__powerpc__) +#define _PR_SI_ARCHITECTURE "powerpc" #else #error "Unknown CPU architecture" #endif -@@ -106,6 +108,16 @@ +@@ -106,6 +110,16 @@ #define _PR_IPV6_V6ONLY_PROBE #endif -+#if (__FreeBSD_version >= 700016) || (__FreeBSD_version < 700000 && __FreeBSD_version >= 601103) ++#if (__FreeBSD_version >= 700016) +#if defined(_PR_PTHREADS) +#define _PR_HAVE_GETPROTO_R +#define _PR_HAVE_5_ARG_GETPROTO_R Added: trunk/devel/nspr/files/patch-bugzilla-684758 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/devel/nspr/files/patch-bugzilla-684758 Thu Sep 29 19:12:04 2011 (r642) @@ -0,0 +1,11 @@ +--- ../pr/src/pthreads/ptio.c 2011-09-02 12:14:24.000000000 +0200 ++++ ../pr/src/pthreads/ptio.c 2011-09-02 12:14:27.000000000 +0200 +@@ -1635,7 +1635,7 @@ + PR_SetError(PR_BAD_DESCRIPTOR_ERROR, 0); + return PR_FAILURE; + } +- if ((out_flags & (PR_POLL_WRITE | PR_POLL_EXCEPT | PR_POLL_ERR)) == 0) ++ if ((out_flags & (PR_POLL_WRITE | PR_POLL_EXCEPT | PR_POLL_ERR | PR_POLL_HUP)) == 0) + { + PR_ASSERT(out_flags == 0); + PR_SetError(PR_IN_PROGRESS_ERROR, 0); Modified: trunk/devel/nspr/files/patch-tests ============================================================================== --- trunk/devel/nspr/files/patch-tests Wed Sep 28 16:11:49 2011 (r641) +++ trunk/devel/nspr/files/patch-tests Thu Sep 29 19:12:04 2011 (r642) @@ -1437,79 +1437,95 @@ + DataRecord *Items; PRStack *list1, *list2; PRStackElem *node; ---- ../pr/tests/suspend.c Sun Apr 25 11:01:02 2004 -+++ ../pr/tests/suspend.c Mon Jul 25 22:28:14 2005 -@@ -74,5 +74,5 @@ +--- ../pr/tests/suspend.c.orig 2010-09-24 20:14:40.000000000 +0200 ++++ ../pr/tests/suspend.c 2011-01-15 13:56:43.000000000 +0100 +@@ -62,14 +62,14 @@ + Level_2_Thread(void *arg) { PR_Sleep(PR_MillisecondsToInterval(4 * 1000)); - printf("Level_2_Thread[0x%lx] exiting\n",PR_GetCurrentThread()); + printf("Level_2_Thread[%p] exiting\n",PR_GetCurrentThread()); return; } -@@ -81,5 +81,5 @@ + + void PR_CALLBACK Level_1_Thread(void *arg) { - PRUint32 tmp = (PRUint32)arg; + PRUint32 tmp = (PRUint32)(uintptr_t)arg; PRThreadScope scope = (PRThreadScope) tmp; PRThread *thr; -@@ -96,5 +96,5 @@ + +@@ -84,7 +84,7 @@ + if (!thr) { printf("Could not create thread!\n"); } else { - printf("Level_1_Thread[0x%lx] created %15s thread 0x%lx\n", + printf("Level_1_Thread[%p] created %15s thread %p\n", PR_GetCurrentThread(), (scope == PR_GLOBAL_THREAD) ? -@@ -107,5 +107,5 @@ + "PR_GLOBAL_THREAD" : "PR_LOCAL_THREAD", +@@ -95,7 +95,7 @@ + alive--; PR_Notify(mon); PR_ExitMonitor(mon); - printf("Thread[0x%lx] exiting\n",PR_GetCurrentThread()); + printf("Thread[%p] exiting\n",PR_GetCurrentThread()); } -@@ -116,11 +116,12 @@ + static PRStatus PR_CALLBACK print_thread(PRThread *thread, int i, void *arg) +@@ -104,14 +104,15 @@ + PRWord *registers; printf( - "\nprint_thread[0x%lx]: %-20s - i = %ld\n",thread, -+ "\nprint_thread[%p]: %-20s - i = %d\n",thread, ++ "\nprint_thread[%p]: %-20s - i = %ld\n",thread, (PR_GLOBAL_THREAD == PR_GetThreadScope(thread)) ? "PR_GLOBAL_THREAD" : "PR_LOCAL_THREAD", i); registers = PR_GetGCRegisters(thread, 0, (int *)&words); -- printf("Regsters R0 = 0x%x R1 = 0x%x R2 = 0x%x R3 = 0x%x\n", -- registers[0],registers[1],registers[2],registers[3]); + if (registers) +- printf("Registers R0 = 0x%x R1 = 0x%x R2 = 0x%x R3 = 0x%x\n", +- registers[0],registers[1],registers[2],registers[3]); - printf("Stack Pointer = 0x%lx\n", PR_GetSP(thread)); -+ printf("Regsters R0 = 0x%lx R1 = 0x%lx R2 = 0x%lx R3 = 0x%lx\n", -+ (unsigned long)registers[0], (unsigned long)registers[1], -+ (unsigned long)registers[2], (unsigned long)registers[3]); ++ printf("Regsters R0 = 0x%lx R1 = 0x%lx R2 = 0x%lx R3 = 0x%lx\n", ++ (unsigned long)registers[0], (unsigned long)registers[1], ++ (unsigned long)registers[2], (unsigned long)registers[3]); + printf("Stack Pointer = %p\n", PR_GetSP(thread)); return PR_SUCCESS; } -@@ -150,5 +151,5 @@ + +@@ -139,7 +140,7 @@ + printf("Could not create thread!\n"); alive--; } - printf("Level_0_Thread[0x%lx] created %15s thread 0x%lx\n", + printf("Level_0_Thread[%p] created %15s thread %p\n", PR_GetCurrentThread(), (scope1 == PR_GLOBAL_THREAD) ? -@@ -161,7 +162,8 @@ + "PR_GLOBAL_THREAD" : "PR_LOCAL_THREAD", +@@ -151,9 +152,10 @@ PR_EnumerateThreads(print_thread, NULL); registers = PR_GetGCRegisters(me, 1, (int *)&words); -- printf("My Registers: R0 = 0x%x R1 = 0x%x R2 = 0x%x R3 = 0x%x\n", -- registers[0],registers[1],registers[2],registers[3]); + if (registers) +- printf("My Registers: R0 = 0x%x R1 = 0x%x R2 = 0x%x R3 = 0x%x\n", +- registers[0],registers[1],registers[2],registers[3]); - printf("My Stack Pointer = 0x%lx\n", PR_GetSP(me)); -+ printf("My Registers: R0 = 0x%lx R1 = 0x%lx R2 = 0x%lx R3 = 0x%lx\n", -+ (unsigned long)registers[0], (unsigned long)registers[1], -+ (unsigned long)registers[2], (unsigned long)registers[3]); ++ printf("My Registers: R0 = 0x%lx R1 = 0x%lx R2 = 0x%lx R3 = 0x%lx\n", ++ (unsigned long)registers[0], (unsigned long)registers[1], ++ (unsigned long)registers[2], (unsigned long)registers[3]); + printf("My Stack Pointer = %p\n", PR_GetSP(me)); PR_ResumeAll(); -@@ -227,4 +229,6 @@ + /* Wait for all threads to exit */ +@@ -212,6 +214,8 @@ + CreateThreadsUU(); CreateThreadsKU(); PR_Cleanup(); + + return 0; } + #endif /* XP_BEOS */ --- ../pr/tests/testfile.c Tue Jun 20 17:46:54 2000 +++ ../pr/tests/testfile.c Mon Jul 25 22:36:39 2005 @@ -69,4 +69,7 @@ Modified: trunk/devel/nspr/files/patch-warnings ============================================================================== --- trunk/devel/nspr/files/patch-warnings Wed Sep 28 16:11:49 2011 (r641) +++ trunk/devel/nspr/files/patch-warnings Thu Sep 29 19:12:04 2011 (r642) @@ -123,15 +123,3 @@ +PRJob **polljobs = NULL; int poll_timeout; PRIntervalTime now; ---- ../pr/include/prlog.h 2009-02-22 14:56:13.000000000 -0500 -+++ ../pr/include/prlog.h 2009-11-04 15:30:48.000000000 -0500 -@@ -232,7 +232,8 @@ - #endif /* NO_NSPR_10_SUPPORT */ - -+NSPR_API(void) PR_Assert(const char *s, const char *file, PRIntn ln); -+ - #if defined(DEBUG) || defined(FORCE_PR_ASSERT) - --NSPR_API(void) PR_Assert(const char *s, const char *file, PRIntn ln); - #define PR_ASSERT(_expr) \ - ((_expr)?((void)0):PR_Assert(# _expr,__FILE__,__LINE__)) Modified: trunk/devel/nspr/pkg-plist ============================================================================== --- trunk/devel/nspr/pkg-plist Wed Sep 28 16:11:49 2011 (r641) +++ trunk/devel/nspr/pkg-plist Thu Sep 29 19:12:04 2011 (r642) @@ -42,7 +42,6 @@ include/nspr/plerror.h include/nspr/plgetopt.h include/nspr/plhash.h -include/nspr/plresolv.h include/nspr/plstr.h include/nspr/pratom.h include/nspr/prbit.h Modified: trunk/mail/linux-thunderbird/Makefile ============================================================================== --- trunk/mail/linux-thunderbird/Makefile Wed Sep 28 16:11:49 2011 (r641) +++ trunk/mail/linux-thunderbird/Makefile Thu Sep 29 19:12:04 2011 (r642) @@ -2,7 +2,7 @@ # Date created: 17 April 2006 # Whom: Andrew Pantyukhin <[email protected]> # -# $FreeBSD: ports/mail/linux-thunderbird/Makefile,v 1.43 2011/06/21 20:38:00 flo Exp $ +# $FreeBSD: ports/mail/linux-thunderbird/Makefile,v 1.47 2011/09/27 22:25:41 beat Exp $ # PORTNAME= thunderbird Modified: trunk/mail/thunderbird-i18n/Makefile ============================================================================== --- trunk/mail/thunderbird-i18n/Makefile Wed Sep 28 16:11:49 2011 (r641) +++ trunk/mail/thunderbird-i18n/Makefile Thu Sep 29 19:12:04 2011 (r642) @@ -2,7 +2,7 @@ # Date created: 29 May 2006 # Whom: Andrew Pantyukhin <[email protected]> # -# $FreeBSD: ports/mail/thunderbird-i18n/Makefile,v 1.47 2011/08/23 08:00:17 ale Exp $ +# $FreeBSD: ports/mail/thunderbird-i18n/Makefile,v 1.50 2011/09/27 22:24:46 beat Exp $ # PORTNAME= thunderbird-i18n Modified: trunk/mail/thunderbird/Makefile ============================================================================== --- trunk/mail/thunderbird/Makefile Wed Sep 28 16:11:49 2011 (r641) +++ trunk/mail/thunderbird/Makefile Thu Sep 29 19:12:04 2011 (r642) @@ -2,7 +2,7 @@ # Date created: 4 September 2003 # Whom: Joe Marcus Clarke <[email protected]> # -# $FreeBSD: ports/mail/thunderbird/Makefile,v 1.136 2011/09/06 20:15:18 flo Exp $ +# $FreeBSD: ports/mail/thunderbird/Makefile,v 1.137 2011/09/27 22:23:30 beat Exp $ # PORTNAME= thunderbird Modified: trunk/mail/thunderbird3-i18n/Makefile ============================================================================== --- trunk/mail/thunderbird3-i18n/Makefile Wed Sep 28 16:11:49 2011 (r641) +++ trunk/mail/thunderbird3-i18n/Makefile Thu Sep 29 19:12:04 2011 (r642) @@ -2,7 +2,7 @@ # Date created: 29 May 2006 # Whom: Andrew Pantyukhin <[email protected]> # -# $FreeBSD: ports/mail/thunderbird3-i18n/Makefile,v 1.52 2011/09/06 20:14:57 flo Exp $ +# $FreeBSD: ports/mail/thunderbird3-i18n/Makefile,v 1.53 2011/09/28 02:41:54 beat Exp $ # PORTNAME= thunderbird3-i18n Modified: trunk/mail/thunderbird3/Makefile ============================================================================== --- trunk/mail/thunderbird3/Makefile Wed Sep 28 16:11:49 2011 (r641) +++ trunk/mail/thunderbird3/Makefile Thu Sep 29 19:12:04 2011 (r642) @@ -2,7 +2,7 @@ # Date created: 4 September 2003 # Whom: Joe Marcus Clarke <[email protected]> # -# $FreeBSD: ports/mail/thunderbird3/Makefile,v 1.136 2011/09/06 20:14:57 flo Exp $ +# $FreeBSD: ports/mail/thunderbird3/Makefile,v 1.137 2011/09/28 02:41:54 beat Exp $ # PORTNAME= thunderbird Modified: trunk/www/firefox-i18n/Makefile ============================================================================== --- trunk/www/firefox-i18n/Makefile Wed Sep 28 16:11:49 2011 (r641) +++ trunk/www/firefox-i18n/Makefile Thu Sep 29 19:12:04 2011 (r642) @@ -2,7 +2,7 @@ # Date created: 28 May 2006 # Whom: Andrew Pantyukhin <[email protected]> # -# $FreeBSD: ports/www/firefox-i18n/Makefile,v 1.57 2011/09/06 20:16:53 flo Exp $ +# $FreeBSD: ports/www/firefox-i18n/Makefile,v 1.58 2011/09/27 18:44:34 beat Exp $ # PORTNAME= firefox-i18n Modified: trunk/www/firefox/Makefile ============================================================================== --- trunk/www/firefox/Makefile Wed Sep 28 16:11:49 2011 (r641) +++ trunk/www/firefox/Makefile Thu Sep 29 19:12:04 2011 (r642) @@ -2,7 +2,7 @@ # Date created: 2002/10/21 # Whom: Alan Eldridge <[email protected]> # -# $FreeBSD: ports/www/firefox/Makefile,v 1.249 2011/09/27 18:44:33 beat Exp $ +# $FreeBSD: ports/www/firefox/Makefile,v 1.250 2011/09/28 16:19:48 beat Exp $ # PORTNAME= firefox Modified: trunk/www/kompozer/distinfo ============================================================================== --- trunk/www/kompozer/distinfo Wed Sep 28 16:11:49 2011 (r641) +++ trunk/www/kompozer/distinfo Thu Sep 29 19:12:04 2011 (r642) @@ -1,3 +1,2 @@ -MD5 (kompozer-0.8b3-src.tar.bz2) = cd4664ecda908666b19ef0607010c627 SHA256 (kompozer-0.8b3-src.tar.bz2) = 9dfef34e5941ce1e68e2f952c9783b281a74be226dad3ab1a2b1b8c99df5c5e3 SIZE (kompozer-0.8b3-src.tar.bz2) = 41747177 Modified: trunk/www/libxul/Makefile ============================================================================== --- trunk/www/libxul/Makefile Wed Sep 28 16:11:49 2011 (r641) +++ trunk/www/libxul/Makefile Thu Sep 29 19:12:04 2011 (r642) @@ -6,8 +6,7 @@ # PORTNAME= libxul -DISTVERSION= 1.9.2.17 -PORTREVISION= 1 +DISTVERSION= 1.9.2.18 CATEGORIES?= www devel MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= xulrunner/releases/${DISTVERSION}/source Modified: trunk/www/linux-firefox/Makefile ============================================================================== --- trunk/www/linux-firefox/Makefile Wed Sep 28 16:11:49 2011 (r641) +++ trunk/www/linux-firefox/Makefile Thu Sep 29 19:12:04 2011 (r642) @@ -2,7 +2,7 @@ # Date created: 2004-09-17 # Whom: voisine # -# $FreeBSD: ports/www/linux-firefox/Makefile,v 1.81 2011/06/21 20:35:48 flo Exp $ +# $FreeBSD: ports/www/linux-firefox/Makefile,v 1.84 2011/09/27 18:44:34 beat Exp $ # PORTNAME= firefox Modified: trunk/www/seamonkey-i18n/Makefile ============================================================================== --- trunk/www/seamonkey-i18n/Makefile Wed Sep 28 16:11:49 2011 (r641) +++ trunk/www/seamonkey-i18n/Makefile Thu Sep 29 19:12:04 2011 (r642) @@ -2,7 +2,7 @@ # Date created: 28 May 2006 # Whom: Andrew Pantyukhin <[email protected]> # -# $FreeBSD: ports/www/seamonkey-i18n/Makefile,v 1.5 2011/08/23 08:00:17 ale Exp $ +# $FreeBSD: ports/www/seamonkey-i18n/Makefile,v 1.9 2011/09/28 03:14:22 beat Exp $ # PORTNAME= seamonkey-i18n Modified: trunk/www/seamonkey/Makefile ============================================================================== --- trunk/www/seamonkey/Makefile Wed Sep 28 16:11:49 2011 (r641) +++ trunk/www/seamonkey/Makefile Thu Sep 29 19:12:04 2011 (r642) @@ -2,7 +2,7 @@ # Date created: 31 Mar 1998 # Whom: eivind/dima/jseger # -# $FreeBSD: ports/www/seamonkey/Makefile,v 1.309 2011/09/23 22:26:05 amdmi3 Exp $ +# $FreeBSD: ports/www/seamonkey/Makefile,v 1.310 2011/09/28 03:14:22 beat Exp $ # PORTNAME= seamonkey Modified: trunk/www/seamonkey2/Makefile ============================================================================== --- trunk/www/seamonkey2/Makefile Wed Sep 28 16:11:49 2011 (r641) +++ trunk/www/seamonkey2/Makefile Thu Sep 29 19:12:04 2011 (r642) @@ -2,7 +2,7 @@ # Date created: 31 Mar 1998 # Whom: eivind/dima/jseger # -# $FreeBSD: ports/www/seamonkey2/Makefile,v 1.322 2011/08/18 09:57:39 ale Exp $ +# $FreeBSD: ports/www/seamonkey2/Makefile,v 1.324 2011/09/23 22:26:05 amdmi3 Exp $ # PORTNAME= seamonkey @@ -16,6 +16,10 @@ MAINTAINER= [email protected] COMMENT= The open source, standards compliant web browser +DEPRECATED= Upstream support dropped. Please consider using www/seamonkey instead. +EXPIRATION_DATE= 2011-10-01 +FORBIDDEN= several security vulnerabilities + CONFLICTS_BUILD= spidermonkey-1.[0-7]* LATEST_LINK= seamonkey2 USE_BZIP2= yes @@ -28,8 +32,9 @@ MAKE_JOBS_SAFE= yes MOZ_PIS_SCRIPTS= moz_pis_S50cleanhome MAKE_ENV= LD_LIBRARY_PATH=${WRKSRC}/dist/bin -CONFIGURE_ENV= LOCALBASE=${LOCALBASE} CPPFLAGS="-I${LOCALBASE}/include/cairo" \ +CONFIGURE_ENV= LOCALBASE=${LOCALBASE} \ ac_cv_func__Unwind_Backtrace=no +CPPFLAGS+= -I${LOCALBASE}/include/cairo USE_GCC= 4.2+ MOZ_EXTENSIONS= default Modified: trunk/www/seamonkey2/pkg-descr ============================================================================== --- trunk/www/seamonkey2/pkg-descr Wed Sep 28 16:11:49 2011 (r641) +++ trunk/www/seamonkey2/pkg-descr Thu Sep 29 19:12:04 2011 (r642) @@ -1,4 +1,4 @@ -This is the current release of the Seamonkey open source web browser. It should +This is the 2.0.x release of the Seamonkey open source web browser. It should be fully compliant with all W3C standards, including HTML, CSS, XML, XSL, JavaScript, MathML, SSL encryption, SVG and RDF. Also supports Java with the use of the FreeBSD native Java plug-in. _______________________________________________ [email protected] mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-gecko To unsubscribe, send any mail to "[email protected]"
