From owner-freebsd-gecko@FreeBSD.ORG Sun Oct 11 16:58:39 2009 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 87FCE106568B for ; Sun, 11 Oct 2009 16:58:39 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id E46D68FC08 for ; Sun, 11 Oct 2009 16:58:38 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.3/8.14.3) with ESMTP id n9BGwb3N017268 for ; Sun, 11 Oct 2009 16:58:37 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.3/8.14.3/Submit) id n9BGwVun016473 for freebsd-gecko@freebsd.org; Sun, 11 Oct 2009 16:58:31 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sun, 11 Oct 2009 16:58:31 GMT Message-Id: <200910111658.n9BGwVun016473@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r137 - in branches/experimental/www/seamonkey-devel: . files X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Oct 2009 16:58:39 -0000 Author: beat Date: Sun Oct 11 16:58:31 2009 New Revision: 137 Log: - Update to 2.0 RC1 Deleted: branches/experimental/www/seamonkey-devel/files/patch-mozilla-media-liboggplay-src-liboggplay-std_semaphore.h Modified: branches/experimental/www/seamonkey-devel/Makefile branches/experimental/www/seamonkey-devel/distinfo branches/experimental/www/seamonkey-devel/files/patch-configure branches/experimental/www/seamonkey-devel/files/patch-sysnss Modified: branches/experimental/www/seamonkey-devel/Makefile ============================================================================== --- branches/experimental/www/seamonkey-devel/Makefile Sun Oct 11 09:06:20 2009 (r136) +++ branches/experimental/www/seamonkey-devel/Makefile Sun Oct 11 16:58:31 2009 (r137) @@ -6,7 +6,7 @@ # PORTNAME= seamonkey -DISTVERSION= 2.0b2 +DISTVERSION= 2.0rc1 CATEGORIES?= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} MASTER_SITE_SUBDIR= seamonkey/releases/${DISTVERSION}/source @@ -31,7 +31,7 @@ CONFIGURE_ENV= LOCALBASE=${LOCALBASE} -GECKO_PLIST_PRE_FILES= lib/${MOZILLA}-${DISTVERSION}/chrome/icons/default/default.xpm +GECKO_PLIST_PRE_FILES= lib/${MOZILLA}/chrome/icons/default/default.xpm MOZ_EXTENSIONS= default MOZ_OPTIONS+= --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \ @@ -148,11 +148,17 @@ ${WRKDIR}/seamonkey.desktop ${LN} -s ${WRKSRC}/suite ${WRKSRC}/mozilla/suite +port-pre-install: + @${REINPLACE_CMD} -e 's|seamonkey-2.0|seamonkey|' \ + ${FAKEDIR}/bin/seamonkey + @${RM} -f ${FAKEDIR}/bin/seamonkey.bak + ${MV} ${FAKEDIR}/lib/seamonkey-2.0 ${FAKEDIR}/lib/seamonkey + pre-install: ${ECHO_CMD} share/applications/seamonkey.desktop >> ${PLIST} ${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST} ${CP} ${WRKSRC}/other-licenses/branding/sunbird/default.xpm \ - ${FAKEDIR}/lib/${MOZILLA}-${DISTVERSION}/chrome/icons/default/ + ${FAKEDIR}/lib/${MOZILLA}/chrome/icons/default/ do-install: ${MKDIR} ${PREFIX}/share/applications Modified: branches/experimental/www/seamonkey-devel/distinfo ============================================================================== --- branches/experimental/www/seamonkey-devel/distinfo Sun Oct 11 09:06:20 2009 (r136) +++ branches/experimental/www/seamonkey-devel/distinfo Sun Oct 11 16:58:31 2009 (r137) @@ -1,3 +1,3 @@ -MD5 (seamonkey-2.0b2.source.tar.bz2) = a058aeadc540a6fd58873ae1e51c23e0 -SHA256 (seamonkey-2.0b2.source.tar.bz2) = 04f83d57a66783e4e2aa31f2651b91f208e17ef4168349da3ca8ac3d9d4f99c2 -SIZE (seamonkey-2.0b2.source.tar.bz2) = 59739680 +MD5 (seamonkey-2.0rc1.source.tar.bz2) = d174e105939e0fea967b7f0df370cbfb +SHA256 (seamonkey-2.0rc1.source.tar.bz2) = aae11594de827d2299a2ffe0a9d7f8342be8db65e5efa00cb5934156fa82ce2f +SIZE (seamonkey-2.0rc1.source.tar.bz2) = 60155107 Modified: branches/experimental/www/seamonkey-devel/files/patch-configure ============================================================================== --- branches/experimental/www/seamonkey-devel/files/patch-configure Sun Oct 11 09:06:20 2009 (r136) +++ branches/experimental/www/seamonkey-devel/files/patch-configure Sun Oct 11 16:58:31 2009 (r137) @@ -1,6 +1,6 @@ ---- configure.orig 2009-09-03 19:50:42.000000000 +0200 -+++ configure 2009-09-14 19:56:30.000000000 +0200 -@@ -5788,7 +5788,7 @@ +--- configure.orig 2009-10-08 04:03:59.000000000 +0200 ++++ configure 2009-10-10 19:56:41.000000000 +0200 +@@ -5794,7 +5794,7 @@ CPU_ARCH=sparc ;; @@ -9,16 +9,16 @@ CPU_ARCH="$OS_TEST" ;; esac -@@ -10952,7 +10952,7 @@ +@@ -10890,7 +10890,7 @@ echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-liconv $LIBS" +LIBS="-L$LOCALBASE/lib -liconv $LIBS" cat > conftest.$ac_ext <&6 @@ -27,16 +27,16 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6 -@@ -10993,7 +10993,7 @@ +@@ -10931,7 +10931,7 @@ echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-liconv $LIBS" +LIBS="-L$LOCALBASE/lib -liconv $LIBS" cat > conftest.$ac_ext <&6 Deleted: branches/experimental/www/seamonkey-devel/files/patch-mozilla-media-liboggplay-src-liboggplay-std_semaphore.h ============================================================================== --- branches/experimental/www/seamonkey-devel/files/patch-mozilla-media-liboggplay-src-liboggplay-std_semaphore.h Sun Oct 11 16:58:31 2009 (r136) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- mozilla/media/liboggplay/src/liboggplay/std_semaphore.h.orig 2009-08-26 20:10:06.000000000 +0200 -+++ mozilla/media/liboggplay/src/liboggplay/std_semaphore.h 2009-08-26 20:10:29.000000000 +0200 -@@ -74,7 +74,7 @@ - * @retval non-zero on error - */ - --#if defined(linux) || defined(SOLARIS) -+#if defined(linux) || defined(SOLARIS) || defined(__FreeBSD__) - #include - #define SEM_CREATE(p,s) sem_init(&(p), 1, s) - #define SEM_SIGNAL(p) sem_post(&(p)) Modified: branches/experimental/www/seamonkey-devel/files/patch-sysnss ============================================================================== --- branches/experimental/www/seamonkey-devel/files/patch-sysnss Sun Oct 11 09:06:20 2009 (r136) +++ branches/experimental/www/seamonkey-devel/files/patch-sysnss Sun Oct 11 16:58:31 2009 (r137) @@ -1,5 +1,5 @@ ---- mozilla/security/manager/Makefile.in.orig 2009-08-26 19:01:17.000000000 +0200 -+++ mozilla/security/manager/Makefile.in 2009-08-26 19:04:53.000000000 +0200 +--- mozilla/security/manager/Makefile.in.orig 2009-10-08 04:03:28.000000000 +0200 ++++ mozilla/security/manager/Makefile.in 2009-10-11 00:38:00.000000000 +0200 @@ -46,16 +46,8 @@ MODULE = psm @@ -16,8 +16,8 @@ - ifndef NSS_DISABLE_DBM NSSDBM3_LIB = $(DLL_PREFIX)nssdbm3$(DLL_SUFFIX) - else -@@ -246,11 +238,6 @@ + NSSDBM3_CHK = $(DLL_PREFIX)nssdbm3.chk +@@ -249,11 +241,6 @@ .nss.cleaned: .nss.checkout ifndef MOZ_NATIVE_NSS $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean @@ -29,10 +29,11 @@ touch $@ endif -@@ -272,71 +259,6 @@ +@@ -274,76 +261,8 @@ + libs:: ifndef MOZ_NATIVE_NSS - $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) +- $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) -ifndef NSS_DISABLE_DBM - $(MAKE) -C $(topsrcdir)/security/dbm $(DEFAULT_GMAKE_FLAGS) -endif @@ -55,6 +56,9 @@ -endif - $(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DIST)/bin -ifndef NSS_DISABLE_DBM +-ifndef SKIP_CHK +- $(INSTALL) -m 644 $(DIST)/lib/$(NSSDBM3_CHK) $(DIST)/bin +-endif - $(INSTALL) -m 755 $(DIST)/lib/$(NSSDBM3_LIB) $(DIST)/bin -endif - $(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DIST)/bin @@ -99,9 +103,11 @@ - (cd $(DIST)/public/nss && tar $(TAR_CREATE_FLAGS) - .) | \ - (cd $(DIST)/sdk/include && tar -xf -) endif ++ $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) $(MAKE) -C boot $@ $(MAKE) -C ssl $@ -@@ -350,44 +272,6 @@ + $(MAKE) -C locales $@ +@@ -356,47 +275,6 @@ install:: ifndef MOZ_NATIVE_NSS @@ -110,6 +116,9 @@ - $(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DESTDIR)$(mozappdir) -endif - $(SYSINSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DESTDIR)$(mozappdir) +-ifndef SKIP_CHK +- $(SYSINSTALL) -m 644 $(DIST)/lib/$(NSSDBM3_CHK) $(DESTDIR)$(mozappdir) +-endif - $(SYSINSTALL) -m 755 $(DIST)/lib/$(NSSDBM3_LIB) $(DESTDIR)$(mozappdir) - $(SYSINSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DESTDIR)$(mozappdir) - $(SYSINSTALL) -m 755 $(DIST)/lib/$(NSSUTIL3_LIB) $(DESTDIR)$(mozappdir) @@ -146,7 +155,7 @@ endif $(MAKE) -C boot $@ $(MAKE) -C ssl $@ -@@ -404,12 +288,6 @@ +@@ -413,12 +291,6 @@ $(MAKE) -C pki $@ endif ifndef MOZ_NATIVE_NSS