8 files changed, 12 insertions, 20 deletions

diff --git a/www/firefox-sync/Makefile b/www/firefox-sync/Makefile
index 83061f2549f6..bb7c4c338d66 100644
--- a/www/firefox-sync/Makefile
+++ b/www/firefox-sync/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	weave
-PORTVERSION=	0.7
+PORTVERSION=	1.0b1
 CATEGORIES=	www
 MASTER_SITES=	http://files.roorback.net/ \
 		LOCAL/glarkin
diff --git a/www/firefox-sync/distinfo b/www/firefox-sync/distinfo
index 9d0056de2186..cb06267c8c1d 100644
--- a/www/firefox-sync/distinfo
+++ b/www/firefox-sync/distinfo
@@ -1,3 +1,3 @@
-MD5 (weave-0.7.tar.bz2) = 147cf606f0b14d29970f8daf414e45a9
-SHA256 (weave-0.7.tar.bz2) = 58ab733c325aa9f130dacc1ef9f1f36dd02a065bee3b3a3c8d540d7203697ef9
-SIZE (weave-0.7.tar.bz2) = 807987
+MD5 (weave-1.0b1.tar.bz2) = 11d4d31548d987b2906a274cd2ab4f78
+SHA256 (weave-1.0b1.tar.bz2) = 21f2c9cf753f03c18b7e214234e85a1ff128b8414bc93cc9d68a2bbb41f87dcf
+SIZE (weave-1.0b1.tar.bz2) = 428074
diff --git a/www/firefox-sync/files/patch-Makefile b/www/firefox-sync/files/patch-Makefile
index 03bd5cffb53a..e16fbc88047b 100644
--- a/www/firefox-sync/files/patch-Makefile
+++ b/www/firefox-sync/files/patch-Makefile
@@ -5,7 +5,7 @@
  ifeq ($(buildid),)
    date    := $(shell date -u +%Y%m%d%H%M)
 -  revid   := $(shell hg tip --template '{node|short}')
-+  revid   := bc1857fb6754
++  revid   := 6fd2e74936a6
    buildid := $(date)-$(revid)
    buildid_short := $(date)
  endif
diff --git a/www/firefox-sync/pkg-plist b/www/firefox-sync/pkg-plist
index 3cabb800e2fb..2324b972afc4 100644
--- a/www/firefox-sync/pkg-plist
+++ b/www/firefox-sync/pkg-plist
@@ -30,14 +30,11 @@
 %%XPI_XPIDIR%%/modules/ext/Preferences.js
 %%XPI_XPIDIR%%/modules/ext/StringBundle.js
 %%XPI_XPIDIR%%/modules/ext/Sync.js
-%%XPI_XPIDIR%%/modules/xmpp/authenticationLayer.js
-%%XPI_XPIDIR%%/modules/xmpp/readme.txt
-%%XPI_XPIDIR%%/modules/xmpp/transportLayer.js
-%%XPI_XPIDIR%%/modules/xmpp/xmppClient.js
 %%XPI_XPIDIR%%/modules/auth.js
 %%XPI_XPIDIR%%/modules/notifications.js
 %%XPI_XPIDIR%%/modules/resource.js
 %%XPI_XPIDIR%%/modules/service.js
+%%XPI_XPIDIR%%/modules/status.js
 %%XPI_XPIDIR%%/modules/stores.js
 %%XPI_XPIDIR%%/modules/trackers.js
 %%XPI_XPIDIR%%/modules/util.js
@@ -52,7 +49,6 @@ lib/firefox3/extensions/%%XPI_XPIID%%
 @dirrm %%XPI_XPIDIR%%/platform/%%PLATFORM%%/components
 @dirrm %%XPI_XPIDIR%%/platform/%%PLATFORM%%
 @dirrm %%XPI_XPIDIR%%/platform
-@dirrm %%XPI_XPIDIR%%/modules/xmpp
 @dirrm %%XPI_XPIDIR%%/modules/ext
 @dirrm %%XPI_XPIDIR%%/modules/type_records
 @dirrm %%XPI_XPIDIR%%/modules/engines
diff --git a/www/weave/Makefile b/www/weave/Makefile
index 83061f2549f6..bb7c4c338d66 100644
--- a/www/weave/Makefile
+++ b/www/weave/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	weave
-PORTVERSION=	0.7
+PORTVERSION=	1.0b1
 CATEGORIES=	www
 MASTER_SITES=	http://files.roorback.net/ \
 		LOCAL/glarkin
diff --git a/www/weave/distinfo b/www/weave/distinfo
index 9d0056de2186..cb06267c8c1d 100644
--- a/www/weave/distinfo
+++ b/www/weave/distinfo
@@ -1,3 +1,3 @@
-MD5 (weave-0.7.tar.bz2) = 147cf606f0b14d29970f8daf414e45a9
-SHA256 (weave-0.7.tar.bz2) = 58ab733c325aa9f130dacc1ef9f1f36dd02a065bee3b3a3c8d540d7203697ef9
-SIZE (weave-0.7.tar.bz2) = 807987
+MD5 (weave-1.0b1.tar.bz2) = 11d4d31548d987b2906a274cd2ab4f78
+SHA256 (weave-1.0b1.tar.bz2) = 21f2c9cf753f03c18b7e214234e85a1ff128b8414bc93cc9d68a2bbb41f87dcf
+SIZE (weave-1.0b1.tar.bz2) = 428074
diff --git a/www/weave/files/patch-Makefile b/www/weave/files/patch-Makefile
index 03bd5cffb53a..e16fbc88047b 100644
--- a/www/weave/files/patch-Makefile
+++ b/www/weave/files/patch-Makefile
@@ -5,7 +5,7 @@
  ifeq ($(buildid),)
    date    := $(shell date -u +%Y%m%d%H%M)
 -  revid   := $(shell hg tip --template '{node|short}')
-+  revid   := bc1857fb6754
++  revid   := 6fd2e74936a6
    buildid := $(date)-$(revid)
    buildid_short := $(date)
  endif
diff --git a/www/weave/pkg-plist b/www/weave/pkg-plist
index 3cabb800e2fb..2324b972afc4 100644
--- a/www/weave/pkg-plist
+++ b/www/weave/pkg-plist
@@ -30,14 +30,11 @@
 %%XPI_XPIDIR%%/modules/ext/Preferences.js
 %%XPI_XPIDIR%%/modules/ext/StringBundle.js
 %%XPI_XPIDIR%%/modules/ext/Sync.js
-%%XPI_XPIDIR%%/modules/xmpp/authenticationLayer.js
-%%XPI_XPIDIR%%/modules/xmpp/readme.txt
-%%XPI_XPIDIR%%/modules/xmpp/transportLayer.js
-%%XPI_XPIDIR%%/modules/xmpp/xmppClient.js
 %%XPI_XPIDIR%%/modules/auth.js
 %%XPI_XPIDIR%%/modules/notifications.js
 %%XPI_XPIDIR%%/modules/resource.js
 %%XPI_XPIDIR%%/modules/service.js
+%%XPI_XPIDIR%%/modules/status.js
 %%XPI_XPIDIR%%/modules/stores.js
 %%XPI_XPIDIR%%/modules/trackers.js
 %%XPI_XPIDIR%%/modules/util.js
@@ -52,7 +49,6 @@ lib/firefox3/extensions/%%XPI_XPIID%%
 @dirrm %%XPI_XPIDIR%%/platform/%%PLATFORM%%/components
 @dirrm %%XPI_XPIDIR%%/platform/%%PLATFORM%%
 @dirrm %%XPI_XPIDIR%%/platform
-@dirrm %%XPI_XPIDIR%%/modules/xmpp
 @dirrm %%XPI_XPIDIR%%/modules/ext
 @dirrm %%XPI_XPIDIR%%/modules/type_records
 @dirrm %%XPI_XPIDIR%%/modules/engines