- Update to 1.2.3

PR:		ports/146094
Submitted by:	Grzegorz Blach <magik@rootback.net> (maintainer)

10 files changed, 66 insertions, 96 deletions

diff --git a/www/firefox-sync/Makefile b/www/firefox-sync/Makefile
index b7877ecc7ae6..e48657e2d05a 100644
--- a/www/firefox-sync/Makefile
+++ b/www/firefox-sync/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	weave
-PORTVERSION=	1.1
+PORTVERSION=	1.2.3
 PORTEPOCH=	2
 CATEGORIES=	www
 MASTER_SITES=	http://files.roorback.net/ \
@@ -25,14 +25,15 @@ USE_GMAKE=	yes
 
 .include <bsd.port.options.mk>
 
+REVID=		ad1ede89cbb2
 .if ${ARCH} == i386
 PLATFORM=	FreeBSD_x86-gcc3
 .elif ${ARCH} == amd64
 PLATFORM=	FreeBSD_amd64-gcc3
 .endif
 
-GMAKE_FLAGS=	sdkdir=${PREFIX}/lib/firefox3/sdk rebuild_crypto=1 release_build=1 platform_target=${PLATFORM}
-ALL_TARGET=	${GMAKE_FLAGS} build
+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}
@@ -42,6 +43,9 @@ 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
+
 post-install:
 	${MKDIR} ${XPI_DIR}
 	(cd ${XPI_DIR}; tar -xf ${WRKSRC}/dist/xpi/weave-${DISTVERSION}-rel.xpi)
diff --git a/www/firefox-sync/distinfo b/www/firefox-sync/distinfo
index 9bc6574221db..da3560fe18b8 100644
--- a/www/firefox-sync/distinfo
+++ b/www/firefox-sync/distinfo
@@ -1,3 +1,3 @@
-MD5 (weave-1.1.tar.bz2) = 1ccba18e4ef22ed6ee48cdf82e2689b7
-SHA256 (weave-1.1.tar.bz2) = 555fc3087abcc4b71467f57c7699c3e22a240b126a3abe49d663d7754977a290
-SIZE (weave-1.1.tar.bz2) = 434653
+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/firefox-sync/files/patch-Makefile b/www/firefox-sync/files/patch-Makefile
deleted file mode 100644
index 2b54edbfb25c..000000000000
--- a/www/firefox-sync/files/patch-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.orig	2009-10-01 01:19:33.000000000 +0000
-+++ Makefile	2009-10-04 19:49:04.000000000 +0000
-@@ -64,7 +64,7 @@
- buildid_short := $(buildid)
- ifeq ($(buildid),)
-   date    := $(shell date -u +%Y%m%d%H%M)
--  revid   := $(shell hg tip --template '{node|short}')
-+  revid   := f3eafbc14f44
-   buildid := $(date)-$(revid)
-   buildid_short := $(date)
- endif
diff --git a/www/firefox-sync/files/patch-crypto-src-Makefile b/www/firefox-sync/files/patch-crypto-obsolete-src-Makefile
index 8e2e919d544e..4a647c3cd761 100644
--- a/www/firefox-sync/files/patch-crypto-src-Makefile
+++ b/www/firefox-sync/files/patch-crypto-obsolete-src-Makefile
@@ -1,19 +1,6 @@
---- crypto/src/Makefile.orig    2009-08-27 22:08:18.000000000 +0200
-+++ crypto/src/Makefile 2009-09-18 21:52:06.000000000 +0200
-@@ -45,6 +45,12 @@
- sys := $(shell uname -s)
- wince = $(WINCE)
- 
-+ifeq ($(sys), FreeBSD)
-+  xpidl = $(PREFIX)/lib/libxul/xpidl \
-+    -I$(PREFIX)/share/idl/firefox3 \
-+    -I$(PREFIX)/share/idl/firefox3/stable
-+endif
-+
- ifeq ($(wince), 1)
-   os = WINNT
-   cxx = $(sdkdir)/sdk/bin/arm-wince-gcc
-@@ -66,6 +72,14 @@
+--- 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
@@ -24,11 +11,14 @@
 +  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
-@@ -92,6 +106,7 @@
+@@ -89,6 +100,7 @@
  endif
  endif
  endif
@@ -36,7 +26,7 @@
  
  # Arch detection
  
-@@ -121,6 +136,9 @@
+@@ -118,6 +130,9 @@
  ifeq ($(machine), x86_64)
    arch = x86_64
  else
@@ -46,7 +36,7 @@
    $(error: Sorry, your architecture is unknown/unsupported: $(machine))
  endif
  endif
-@@ -130,6 +148,7 @@
+@@ -127,6 +142,7 @@
  endif
  endif
  endif
@@ -54,7 +44,7 @@
  
  # Universal binary so no need for $(arch) for Darwin
  
-@@ -188,6 +207,14 @@
+@@ -183,6 +199,14 @@
            -I$(sdkdir)/include/nspr \
            -I$(sdkdir)/sdk/include
  
@@ -69,7 +59,7 @@
  # libraries
  libdirs := $(sdkdir)/lib $(sdkdir)/bin
  ifeq ($(wince),1)
-@@ -202,6 +229,10 @@
+@@ -197,6 +221,10 @@
  
  ifeq ($(os), Linux)
    libs := xpcom_core $(libs)
@@ -80,7 +70,7 @@
  endif
  
  # compiler and Linker Flags
-@@ -264,6 +295,25 @@
+@@ -259,6 +287,25 @@
               $(sdkdir)/lib/libxpcomglue_s.a \
               $(libdirs) $(libs)
  else
@@ -106,7 +96,7 @@
  ifeq ($(os), SunOS)
    libdirs := $(patsubst %,-L%,$(libdirs))
    libs := $(patsubst %,-l%,$(libs))
-@@ -303,6 +353,7 @@
+@@ -298,6 +345,7 @@
  endif
  endif
  endif
@@ -114,19 +104,19 @@
  
  ######################################################################
  
-@@ -361,6 +412,11 @@
+@@ -345,6 +393,11 @@
  	$(cxx) $(cppflags) -o $@ $(cpp_sources) $(ldflags)
  	chmod +x $@
  else
 +ifeq ($(os), FreeBSD)
-+  $(so_target): $(idl_headers)
++  $(so_target): $(idl_header)
 +	$(cxx) $(cppflags) -o $@ $(cpp_sources) $(ldflags)
 +	chmod +x $@
 +else
  ifeq ($(os), SunOS)
-   $(so_target): $(idl_headers)
+   $(so_target): $(idl_header)
  	$(cxx) $(cppflags) -o $@ $(cpp_sources) $(ldflags)
-@@ -380,3 +436,4 @@
+@@ -364,3 +417,4 @@
  endif
  endif
  endif
diff --git a/www/firefox-sync/pkg-plist b/www/firefox-sync/pkg-plist
index 08cee9751303..b7ebf9362d78 100644
--- a/www/firefox-sync/pkg-plist
+++ b/www/firefox-sync/pkg-plist
@@ -1,22 +1,24 @@
 %%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/clientData.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/history.js
-%%XPI_XPIDIR%%/modules/type_records/clientData.js
-%%XPI_XPIDIR%%/modules/type_records/forms.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
diff --git a/www/weave/Makefile b/www/weave/Makefile
index b7877ecc7ae6..e48657e2d05a 100644
--- a/www/weave/Makefile
+++ b/www/weave/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	weave
-PORTVERSION=	1.1
+PORTVERSION=	1.2.3
 PORTEPOCH=	2
 CATEGORIES=	www
 MASTER_SITES=	http://files.roorback.net/ \
@@ -25,14 +25,15 @@ USE_GMAKE=	yes
 
 .include <bsd.port.options.mk>
 
+REVID=		ad1ede89cbb2
 .if ${ARCH} == i386
 PLATFORM=	FreeBSD_x86-gcc3
 .elif ${ARCH} == amd64
 PLATFORM=	FreeBSD_amd64-gcc3
 .endif
 
-GMAKE_FLAGS=	sdkdir=${PREFIX}/lib/firefox3/sdk rebuild_crypto=1 release_build=1 platform_target=${PLATFORM}
-ALL_TARGET=	${GMAKE_FLAGS} build
+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}
@@ -42,6 +43,9 @@ 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
+
 post-install:
 	${MKDIR} ${XPI_DIR}
 	(cd ${XPI_DIR}; tar -xf ${WRKSRC}/dist/xpi/weave-${DISTVERSION}-rel.xpi)
diff --git a/www/weave/distinfo b/www/weave/distinfo
index 9bc6574221db..da3560fe18b8 100644
--- a/www/weave/distinfo
+++ b/www/weave/distinfo
@@ -1,3 +1,3 @@
-MD5 (weave-1.1.tar.bz2) = 1ccba18e4ef22ed6ee48cdf82e2689b7
-SHA256 (weave-1.1.tar.bz2) = 555fc3087abcc4b71467f57c7699c3e22a240b126a3abe49d663d7754977a290
-SIZE (weave-1.1.tar.bz2) = 434653
+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-Makefile b/www/weave/files/patch-Makefile
deleted file mode 100644
index 2b54edbfb25c..000000000000
--- a/www/weave/files/patch-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.orig	2009-10-01 01:19:33.000000000 +0000
-+++ Makefile	2009-10-04 19:49:04.000000000 +0000
-@@ -64,7 +64,7 @@
- buildid_short := $(buildid)
- ifeq ($(buildid),)
-   date    := $(shell date -u +%Y%m%d%H%M)
--  revid   := $(shell hg tip --template '{node|short}')
-+  revid   := f3eafbc14f44
-   buildid := $(date)-$(revid)
-   buildid_short := $(date)
- endif
diff --git a/www/weave/files/patch-crypto-src-Makefile b/www/weave/files/patch-crypto-obsolete-src-Makefile
index 8e2e919d544e..4a647c3cd761 100644
--- a/www/weave/files/patch-crypto-src-Makefile
+++ b/www/weave/files/patch-crypto-obsolete-src-Makefile
@@ -1,19 +1,6 @@
---- crypto/src/Makefile.orig    2009-08-27 22:08:18.000000000 +0200
-+++ crypto/src/Makefile 2009-09-18 21:52:06.000000000 +0200
-@@ -45,6 +45,12 @@
- sys := $(shell uname -s)
- wince = $(WINCE)
- 
-+ifeq ($(sys), FreeBSD)
-+  xpidl = $(PREFIX)/lib/libxul/xpidl \
-+    -I$(PREFIX)/share/idl/firefox3 \
-+    -I$(PREFIX)/share/idl/firefox3/stable
-+endif
-+
- ifeq ($(wince), 1)
-   os = WINNT
-   cxx = $(sdkdir)/sdk/bin/arm-wince-gcc
-@@ -66,6 +72,14 @@
+--- 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
@@ -24,11 +11,14 @@
 +  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
-@@ -92,6 +106,7 @@
+@@ -89,6 +100,7 @@
  endif
  endif
  endif
@@ -36,7 +26,7 @@
  
  # Arch detection
  
-@@ -121,6 +136,9 @@
+@@ -118,6 +130,9 @@
  ifeq ($(machine), x86_64)
    arch = x86_64
  else
@@ -46,7 +36,7 @@
    $(error: Sorry, your architecture is unknown/unsupported: $(machine))
  endif
  endif
-@@ -130,6 +148,7 @@
+@@ -127,6 +142,7 @@
  endif
  endif
  endif
@@ -54,7 +44,7 @@
  
  # Universal binary so no need for $(arch) for Darwin
  
-@@ -188,6 +207,14 @@
+@@ -183,6 +199,14 @@
            -I$(sdkdir)/include/nspr \
            -I$(sdkdir)/sdk/include
  
@@ -69,7 +59,7 @@
  # libraries
  libdirs := $(sdkdir)/lib $(sdkdir)/bin
  ifeq ($(wince),1)
-@@ -202,6 +229,10 @@
+@@ -197,6 +221,10 @@
  
  ifeq ($(os), Linux)
    libs := xpcom_core $(libs)
@@ -80,7 +70,7 @@
  endif
  
  # compiler and Linker Flags
-@@ -264,6 +295,25 @@
+@@ -259,6 +287,25 @@
               $(sdkdir)/lib/libxpcomglue_s.a \
               $(libdirs) $(libs)
  else
@@ -106,7 +96,7 @@
  ifeq ($(os), SunOS)
    libdirs := $(patsubst %,-L%,$(libdirs))
    libs := $(patsubst %,-l%,$(libs))
-@@ -303,6 +353,7 @@
+@@ -298,6 +345,7 @@
  endif
  endif
  endif
@@ -114,19 +104,19 @@
  
  ######################################################################
  
-@@ -361,6 +412,11 @@
+@@ -345,6 +393,11 @@
  	$(cxx) $(cppflags) -o $@ $(cpp_sources) $(ldflags)
  	chmod +x $@
  else
 +ifeq ($(os), FreeBSD)
-+  $(so_target): $(idl_headers)
++  $(so_target): $(idl_header)
 +	$(cxx) $(cppflags) -o $@ $(cpp_sources) $(ldflags)
 +	chmod +x $@
 +else
  ifeq ($(os), SunOS)
-   $(so_target): $(idl_headers)
+   $(so_target): $(idl_header)
  	$(cxx) $(cppflags) -o $@ $(cpp_sources) $(ldflags)
-@@ -380,3 +436,4 @@
+@@ -364,3 +417,4 @@
  endif
  endif
  endif
diff --git a/www/weave/pkg-plist b/www/weave/pkg-plist
index 08cee9751303..b7ebf9362d78 100644
--- a/www/weave/pkg-plist
+++ b/www/weave/pkg-plist
@@ -1,22 +1,24 @@
 %%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/clientData.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/history.js
-%%XPI_XPIDIR%%/modules/type_records/clientData.js
-%%XPI_XPIDIR%%/modules/type_records/forms.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