- Disconnect www/weave

- Connect www/firefox-sync
- Add MOVED entry
- Remove www/weave

6 files changed, 1 insertions, 265 deletions

diff --git a/www/Makefile b/www/Makefile
index e238a6f8fb6b..187bc754ffc3 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -224,6 +224,7 @@
     SUBDIR += ffproxy
     SUBDIR += fhttpd
     SUBDIR += firefox
+    SUBDIR += firefox-sync
     SUBDIR += firefox-i18n
     SUBDIR += firefox-remote
     SUBDIR += firefox3
@@ -1768,7 +1769,6 @@
     SUBDIR += wadcomblog
     SUBDIR += wb0
     SUBDIR += wcol
-    SUBDIR += weave
     SUBDIR += web-traceroute
     SUBDIR += web2ldap
     SUBDIR += webalizer
diff --git a/www/weave/Makefile b/www/weave/Makefile
deleted file mode 100644
index f0ccc4f952c6..000000000000
--- a/www/weave/Makefile
+++ /dev/null
@@ -1,75 +0,0 @@
-# New ports collection makefile for:	weave
-# Date created:				31 Aug 2009
-# Whom:					Grzegorz Blach <magik@roorback.net>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	weave
-PORTVERSION=	1.2.3
-PORTEPOCH=	2
-CATEGORIES=	www
-MASTER_SITES=	http://files.roorback.net/ \
-		LOCAL/glarkin
-
-MAINTAINER=	magik@roorback.net
-COMMENT=	Mozilla Weave extension
-
-BUILD_DEPENDS=	${LOCALBASE}/lib/libxul/xpidl:${PORTSDIR}/www/libxul
-RUN_DEPENDS=	${LOCALBASE}/lib/libxul/xpidl:${PORTSDIR}/www/libxul
-
-ONLY_FOR_ARCHS=	i386 amd64
-USE_BZIP2=	yes
-USE_GMAKE=	yes
-
-OPTIONS=	FF35 "Build for Firefox 3.5 instead of 3.6" Off
-
-.include <bsd.port.options.mk>
-
-.if defined(WITHOUT_FF35)
-FF_DEPENDS=	${LOCALBASE}/lib/firefox3/firefox:${PORTSDIR}/www/firefox
-AMD64_ARCH=	amd64
-.else
-FF_DEPENDS=	${LOCALBASE}/lib/firefox3/firefox:${PORTSDIR}/www/firefox35
-AMD64_ARCH=	x86_64
-.endif
-
-BUILD_DEPENDS+=	${FF_DEPENDS}
-RUN_DEPENDS+=	${FF_DEPENDS}
-
-REVID=		ad1ede89cbb2
-.if ${ARCH} == i386
-PLATFORM=	FreeBSD_x86-gcc3
-.elif ${ARCH} == amd64
-PLATFORM=	FreeBSD_${AMD64_ARCH}-gcc3
-.else
-PLATFORM=	dummy
-IGNORE=		unsupported platform
-.endif
-
-GMAKE_FLAGS=	sdkdir=${PREFIX}/lib/firefox3/sdk release_build=1 platform_target=${PLATFORM} TOPSRCDIR=${WRKSRC}
-ALL_TARGET=	${GMAKE_FLAGS} crypto crypto-obsolete-build build
-INSTALL_TARGET=	${GMAKE_FLAGS} xpi
-
-XPI_ID=		{340c2bbc-ce74-4362-90b5-7c26312808ef}
-XPI_DIR=	${PREFIX}/lib/xpi/${XPI_ID}
-
-PLIST_SUB+=	XPI_XPIDIR="${XPI_DIR:S,^${PREFIX}/,,}" \
-		XPI_XPIID=${XPI_ID} \
-		PLATFORM=${PLATFORM}
-
-post-patch:
-	@${REINPLACE_CMD} -e "s|\$$(shell hg tip --template '{node\|short}')|${REVID}|g" ${WRKSRC}/Makefile
-.if ${PLATFORM} == FreeBSD_x86_64-gcc3
-	${REINPLACE_CMD} -e 's|arch = amd64|arch = x86_64|g' ${WRKSRC}/crypto-obsolete/src/Makefile
-.endif
-
-post-install:
-	${MKDIR} ${XPI_DIR}
-	(cd ${XPI_DIR}; tar -xf ${WRKSRC}/dist/xpi/weave-${DISTVERSION}-rel.xpi)
-	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${XPI_DIR}/
-	${CHMOD} -R a+rX,go-w ${XPI_DIR}/
-	${MKDIR} ${PREFIX}/lib/firefox3/extensions
-	${LN} -sf ${XPI_DIR} ${PREFIX}/lib/firefox3/extensions
-
-.include <bsd.port.mk>
diff --git a/www/weave/distinfo b/www/weave/distinfo
deleted file mode 100644
index da3560fe18b8..000000000000
--- a/www/weave/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (weave-1.2.3.tar.bz2) = e5664338fd75da19360f64aa4f73a6e3
-SHA256 (weave-1.2.3.tar.bz2) = 4ea8064d4b30533a49d64dc963cb688c9d3bc819718a6b58ff47cfb96c0e48e8
-SIZE (weave-1.2.3.tar.bz2) = 487537
diff --git a/www/weave/files/patch-crypto-obsolete-src-Makefile b/www/weave/files/patch-crypto-obsolete-src-Makefile
deleted file mode 100644
index 4a647c3cd761..000000000000
--- a/www/weave/files/patch-crypto-obsolete-src-Makefile
+++ /dev/null
@@ -1,123 +0,0 @@
---- crypto-obsolete/src/Makefile.orig	2010-04-29 01:34:41.000000000 +0200
-+++ crypto-obsolete/src/Makefile	2010-05-01 12:44:11.424608405 +0200
-@@ -63,6 +63,17 @@
-   so = so
-   cppflags += -shared
- else
-+ifeq ($(sys), FreeBSD)
-+  os = FreeBSD
-+  compiler = gcc3
-+  cxx = c++
-+  so = so
-+  cppflags += -shared
-+  ldflags += -L$(PREFIX)/lib/firefox3 -L$(PREFIX)/lib -lc
-+  xpidl = $(PREFIX)/lib/libxul/xpidl \
-+    -I$(PREFIX)/share/idl/firefox3 \
-+    -I$(PREFIX)/share/idl/firefox3/stable
-+else
- ifeq ($(sys), MINGW32_NT-6.1)
-   os = WINNT
-   compiler = msvc
-@@ -89,6 +100,7 @@
- endif
- endif
- endif
-+endif
- 
- # Arch detection
- 
-@@ -118,6 +130,9 @@
- ifeq ($(machine), x86_64)
-   arch = x86_64
- else
-+ifeq ($(machine), amd64)
-+  arch = amd64
-+else
-   $(error: Sorry, your architecture is unknown/unsupported: $(machine))
- endif
- endif
-@@ -127,6 +142,7 @@
- endif
- endif
- endif
-+endif
- 
- # Universal binary so no need for $(arch) for Darwin
- 
-@@ -183,6 +199,14 @@
-           -I$(sdkdir)/include/nspr \
-           -I$(sdkdir)/sdk/include
- 
-+ifeq ($(sys), FreeBSD)
-+  headers += -I$(PREFIX)/include/firefox3 \
-+             -I$(PREFIX)/include/firefox3/stable \
-+             -I$(PREFIX)/include/nspr \
-+             -I$(PREFIX)/include/nss \
-+             -I$(PREFIX)/include/firefox3/unstable
-+endif
-+
- # libraries
- libdirs := $(sdkdir)/lib $(sdkdir)/bin
- ifeq ($(wince),1)
-@@ -197,6 +221,10 @@
- 
- ifeq ($(os), Linux)
-   libs := xpcom_core $(libs)
-+else
-+ifeq ($(os), FreeBSD)
-+  libs := xpcom $(libs)
-+endif
- endif
- 
- # compiler and Linker Flags
-@@ -259,6 +287,25 @@
-              $(sdkdir)/lib/libxpcomglue_s.a \
-              $(libdirs) $(libs)
- else
-+ifeq ($(os), FreeBSD)
-+  libdirs := $(patsubst %,-L%,$(libdirs))
-+  libs := $(patsubst %,-l%,$(libs))
-+  cppflags += -pipe -O2 \
-+              -fPIC -fno-rtti -fno-exceptions -fno-strict-aliasing \
-+              -fno-common -pthread \
-+              -Wall -Wconversion -Wpointer-arith -Woverloaded-virtual -Wsynth \
-+              -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor -Wcast-align \
-+              -Wno-long-long \
-+              -include xpcom-config.h $(headers) \
-+              -fshort-wchar
-+  ldflags += -pthread -pipe -DMOZILLA_STRICT_API \
-+             -Wl,-dead_strip \
-+             -Wl,-exported_symbol \
-+             -Wl,-z,defs -Wl,-h,WeaveCrypto.so \
-+             -Wl,-rpath-link,$(sdkdir)/bin \
-+             $(sdkdir)/lib/libxpcomglue_s.a \
-+             $(libdirs) $(libs)
-+else
- ifeq ($(os), SunOS)
-   libdirs := $(patsubst %,-L%,$(libdirs))
-   libs := $(patsubst %,-l%,$(libs))
-@@ -298,6 +345,7 @@
- endif
- endif
- endif
-+endif
- 
- ######################################################################
- 
-@@ -345,6 +393,11 @@
- 	$(cxx) $(cppflags) -o $@ $(cpp_sources) $(ldflags)
- 	chmod +x $@
- else
-+ifeq ($(os), FreeBSD)
-+  $(so_target): $(idl_header)
-+	$(cxx) $(cppflags) -o $@ $(cpp_sources) $(ldflags)
-+	chmod +x $@
-+else
- ifeq ($(os), SunOS)
-   $(so_target): $(idl_header)
- 	$(cxx) $(cppflags) -o $@ $(cpp_sources) $(ldflags)
-@@ -364,3 +417,4 @@
- endif
- endif
- endif
-+endif
diff --git a/www/weave/pkg-descr b/www/weave/pkg-descr
deleted file mode 100644
index c465c468b869..000000000000
--- a/www/weave/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-Weave is a Mozilla Labs project to explore ways in which
-the browser can broker richer experiences on the Web,
-by integrating more closely with online services.
-
-WWW: http://labs.mozilla.com/weave/
diff --git a/www/weave/pkg-plist b/www/weave/pkg-plist
deleted file mode 100644
index b7ebf9362d78..000000000000
--- a/www/weave/pkg-plist
+++ /dev/null
@@ -1,58 +0,0 @@
-%%XPI_XPIDIR%%/chrome/sync.jar
-%%XPI_XPIDIR%%/defaults/preferences/sync.js
-%%XPI_XPIDIR%%/components/FormNotifier.js
-%%XPI_XPIDIR%%/components/IWeaveCrypto.xpt
-%%XPI_XPIDIR%%/components/Weave.js
-%%XPI_XPIDIR%%/components/WeaveCrypto.js
-%%XPI_XPIDIR%%/modules/base_records/collection.js
-%%XPI_XPIDIR%%/modules/base_records/crypto.js
-%%XPI_XPIDIR%%/modules/base_records/keys.js
-%%XPI_XPIDIR%%/modules/base_records/wbo.js
-%%XPI_XPIDIR%%/modules/engines/clients.js
-%%XPI_XPIDIR%%/modules/engines/forms.js
-%%XPI_XPIDIR%%/modules/engines/history.js
-%%XPI_XPIDIR%%/modules/engines/passwords.js
-%%XPI_XPIDIR%%/modules/engines/prefs.js
-%%XPI_XPIDIR%%/modules/engines/tabs.js
-%%XPI_XPIDIR%%/modules/engines/bookmarks.js
-%%XPI_XPIDIR%%/modules/type_records/bookmark.js
-%%XPI_XPIDIR%%/modules/type_records/clients.js
-%%XPI_XPIDIR%%/modules/type_records/forms.js
-%%XPI_XPIDIR%%/modules/type_records/history.js
-%%XPI_XPIDIR%%/modules/type_records/passwords.js
-%%XPI_XPIDIR%%/modules/type_records/prefs.js
-%%XPI_XPIDIR%%/modules/type_records/tabs.js
-%%XPI_XPIDIR%%/modules/ext/Observers.js
-%%XPI_XPIDIR%%/modules/ext/Preferences.js
-%%XPI_XPIDIR%%/modules/ext/StringBundle.js
-%%XPI_XPIDIR%%/modules/ext/Sync.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
-%%XPI_XPIDIR%%/modules/log4moz.js
-%%XPI_XPIDIR%%/modules/engines.js
-%%XPI_XPIDIR%%/modules/identity.js
-%%XPI_XPIDIR%%/modules/constants.js
-%%XPI_XPIDIR%%/platform/%%PLATFORM%%/components/WeaveCrypto.so
-%%XPI_XPIDIR%%/install.rdf
-%%XPI_XPIDIR%%/chrome.manifest
-lib/firefox3/extensions/%%XPI_XPIID%%
-@dirrm %%XPI_XPIDIR%%/platform/%%PLATFORM%%/components
-@dirrm %%XPI_XPIDIR%%/platform/%%PLATFORM%%
-@dirrm %%XPI_XPIDIR%%/platform
-@dirrm %%XPI_XPIDIR%%/modules/ext
-@dirrm %%XPI_XPIDIR%%/modules/type_records
-@dirrm %%XPI_XPIDIR%%/modules/engines
-@dirrm %%XPI_XPIDIR%%/modules/base_records
-@dirrm %%XPI_XPIDIR%%/modules
-@dirrm %%XPI_XPIDIR%%/components
-@dirrm %%XPI_XPIDIR%%/defaults/preferences
-@dirrm %%XPI_XPIDIR%%/defaults
-@dirrm %%XPI_XPIDIR%%/chrome
-@dirrm %%XPI_XPIDIR%%
-@dirrmtry lib/xpi