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

Grzegorz Blach magik at roorback.net
Fri May 14 18:28:32 UTC 2010


I added knobs for Firefox 3.6 too,
and set depends to proper version of Firefox.

Also I set BUILD_DEPENDS, and RUN_DEPENDS individually,
because USE_GMAKE adds gmake to BUILD_DEPENDS
(and gmake wrongly was added to RUN_DEPENDS too).
-------------- next part --------------
diff -ruN weave.old/Makefile weave/Makefile
--- weave.old/Makefile	2010-05-02 17:56:46.000000000 +0200
+++ weave/Makefile	2010-05-14 20:02:58.724816635 +0200
@@ -15,21 +15,34 @@
 MAINTAINER=	magik at roorback.net
 COMMENT=	Mozilla Weave extension
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/firefox3/firefox:${PORTSDIR}/www/firefox \
-		${LOCALBASE}/lib/libxul/xpidl:${PORTSDIR}/www/libxul
-RUN_DEPENDS=	${BUILD_DEPENDS}
+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=	FF36 "Build for Firefox 3.6 (default)" On \
+		FF35 "Build for Firefox 3.5" Off
+
 .include <bsd.port.options.mk>
 
+.if defined(WITHOUT_FF36) && defined(WITH_FF35)
+FF_DEPENDS=	${LOCALBASE}/lib/firefox3/firefox:${PORTSDIR}/www/firefox35
+AMD64_ARCH=	x86_64
+.else
+FF_DEPENDS=	${LOCALBASE}/lib/firefox3/firefox:${PORTSDIR}/www/firefox
+AMD64_ARCH=	amd64
+.endif
+
+BUILD_DEPENDS+=	${FF_DEPENDS}
+RUN_DEPENDS+=	${FF_DEPENDS}
+
 REVID=		ad1ede89cbb2
 .if ${ARCH} == i386
 PLATFORM=	FreeBSD_x86-gcc3
 .elif ${ARCH} == amd64
-PLATFORM=	FreeBSD_amd64-gcc3
+PLATFORM=	FreeBSD_${AMD64_ARCH}-gcc3
 .endif
 
 GMAKE_FLAGS=	sdkdir=${PREFIX}/lib/firefox3/sdk release_build=1 platform_target=${PLATFORM} TOPSRCDIR=${WRKSRC}
@@ -45,6 +58,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}


More information about the freebsd-ports-bugs mailing list