Attachment 126498 Details for Bug 170228 – moz_objdir.diff

[patch] moz_objdir.diff

moz_objdir.diff (text/plain), 1.99 KB, created by Jan Beich on 2012-07-28 08:30:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2012-07-28 08:30:09 UTC

Size: 1.99 KB

patch

obsolete

>Index: mail/enigmail/Makefile
>===================================================================
>--- mail/enigmail/Makefile	(revision 301624)
>+++ mail/enigmail/Makefile	(working copy)
>@@ -45,9 +45,12 @@ GECKO_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
> .endif
> 
> .if defined(GECKO_EXTDIR)
>-GECKO_WRKSRC=	${WRKDIR}/../../../${GECKO_PORTDIR}/work/${GECKO_EXTDIR}
>+. if !defined(BUILDING_INDEX)
>+GECKO_BUILD_WRKSRC!=${MAKE} -V BUILD_WRKSRC -C${PORTSDIR}/${GECKO_PORTDIR}
>+GECKO_WRKSRC!=	${MAKE} -V WRKSRC -C${PORTSDIR}/${GECKO_PORTDIR}
>+. endif
> WRKSRC=		${WRKDIR}/${GECKO_EXTDIR}
>-MOZSRC=		${WRKSRC}/mozilla
>+MOZSRC=		${GECKO_BUILD_WRKSRC:S,${GECKO_WRKSRC},${WRKSRC},}/mozilla
> .else
> GECKO_WRKSRC=	${WRKDIR}/../../../${GECKO_PORTDIR}/work/mozilla
> WRKSRC=		${WRKDIR}/mozilla
>@@ -58,7 +61,7 @@ USE_GMAKE=	yes
> 
> .include <bsd.port.pre.mk>
> 
>-XPI_FILE=	${MOZSRC}/dist/bin/${DISTNAME}-freebsd-${ARCH}.xpi
>+XPI_FILE=	${MOZSRC}/dist/bin/${DISTNAME}-freebsd-${ARCH:S/amd64/x86_64/}.xpi
> XPI_LIBDIR=	${PREFIX}/lib/xpi
> XPI_ORIG_ID=	{847b3a00-7ab1-11d4-8f02-006008948af5}
> XPI_ID=		${GECKO}@mozilla-enigmail.org
>@@ -79,6 +82,6 @@ do-extract:
> 
> pre-patch:
> 	@${REINPLACE_CMD} -e "s|${GECKO_PORTDIR}|${GECKO_PORTDIR:S/www/mail/:S/\//\/enigmail-/}|g" \
>-		`${FIND} ${WRKSRC} -name autoconf.mk`
>+		`${FIND} ${MOZSRC}/.. -name autoconf.mk`
> 
> post-patch:
>@@ -95,9 +100,11 @@ do-build:
> 	${SETENV} ${MAKE_ENV} ${GMAKE} -C ${MOZSRC}/xpcom/string
> 	${SETENV} ${MAKE_ENV} ${GMAKE} -C ${MOZSRC}/xpcom
> .endif
>-	cd ${WRKSRC}/mailnews/extensions/enigmail && ./makemake -r
>-	cd ${WRKSRC}/mailnews/extensions/enigmail && ${SETENV} ${MAKE_ENV} ${GMAKE}
>-	cd ${WRKSRC}/mailnews/extensions/enigmail && ${SETENV} ${MAKE_ENV} ${GMAKE} xpi
>+	cd ${WRKSRC}/mailnews/extensions/enigmail && \
>+		./makemake -r -o ${MOZSRC}/..
>+	cd ${MOZSRC}/../mailnews/extensions/enigmail && \
>+		${SETENV} ${MAKE_ENV} ${GMAKE} ${_MAKE_JOBS}; \
>+		${SETENV} ${MAKE_ENV} ${GMAKE} ${_MAKE_JOBS} xpi
> 
> do-install:
> 	@${MKDIR} ${XPI_LIBDIR}/${XPI_ID} ${XPI_LIBDIR}/symlinks/${GECKO}

Actions: View | Diff

Attachments on bug 170228: 126498