ports/146472: Port www/weave fixed build with Firefox 3.5 on amd64 platform

[Grzegorz Blach]

>Number:         146472
>Category:       ports
>Synopsis:       Port www/weave fixed build with Firefox 3.5 on amd64 platform
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon May 10 18:10:00 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Grzegorz Blach
>Release:        8.0-RELEASE-p2
>Organization:
>Environment:
FreeBSD silver.doors 8.0-RELEASE-p2 FreeBSD 8.0-RELEASE-p2 #1: Thu Apr 29 23:33:24 CEST 2010     root at silver.doors:/usr/obj/usr/src/sys/SILVER  amd64

>Description:
As in summary, fixed build with Firefox 3.5 on amd64 platform.

This patch do nothing change on i386 (with FF 3.5 and 3.6),
and on amd64 with FF 3.6, so I don't dump port revision.

Only build with FF 3.5 on amd64 is affected.

>How-To-Repeat:
On amd64 platform:
Build Firefox 3.5, and then build weave

When You log in to weave server and try to sync something,
You get error message, that weave can't load crypto module.

>Fix:
Apply attached patch, and rebuild weave.


Patch attached with submission follows:

diff -ruN weave.old/Makefile weave/Makefile
--- weave.old/Makefile	2010-05-05 22:59:32.741780432 +0200
+++ weave/Makefile	2010-05-10 19:56:03.458306205 +0200
@@ -23,13 +23,19 @@
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 
+OPTIONS=	FF35 "Build for Firefox 3.5 (only useful on amd64)" Off
+
 .include <bsd.port.options.mk>
 
 REVID=		ad1ede89cbb2
 .if ${ARCH} == i386
 PLATFORM=	FreeBSD_x86-gcc3
 .elif ${ARCH} == amd64
+.if defined(WITHOUT_FF35)
 PLATFORM=	FreeBSD_amd64-gcc3
+.else
+PLATFORM=	FreeBSD_x86_64-gcc3
+.endif
 .endif
 
 GMAKE_FLAGS=	sdkdir=${PREFIX}/lib/firefox3/sdk release_build=1 platform_target=${PLATFORM} TOPSRCDIR=${WRKSRC}
@@ -45,6 +51,9 @@
 
 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}


>Release-Note:
>Audit-Trail:
>Unformatted: