[SVN-Commit] r196 - branches/experimental/mail/thunderbird3
svn-freebsd-gecko at chruetertee.ch
svn-freebsd-gecko at chruetertee.ch
Sat Dec 12 20:15:17 UTC 2009
Author: beat
Date: Sat Dec 12 20:15:10 2009
New Revision: 196
Log:
- Ensure that Thunderbird 3 and its extensions use the same install
directory.
Modified:
branches/experimental/mail/thunderbird3/Makefile
Modified: branches/experimental/mail/thunderbird3/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird3/Makefile Sat Dec 12 12:06:55 2009 (r195)
+++ branches/experimental/mail/thunderbird3/Makefile Sat Dec 12 20:15:10 2009 (r196)
@@ -33,6 +33,8 @@
USE_BZIP2= yes
USE_GMAKE= yes
+MOZILLA= ${PORTNAME}-${PORTVERSION}
+MOZILLA_EXEC_NAME= ${PORTNAME}
MOZ_PROTOCOLS= http,ftp,file,viewsource,res,data
MOZ_GRAPHICS= default,-xbm
MOZ_OPTIONS= --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \
@@ -80,7 +82,7 @@
post-extract::
${SED} -e 's|@MOZILLA_ICON@|${MOZILLA_ICON}|' -e 's|@MOZILLA@|${MOZILLA}|' \
-e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|' \
- <${FILESDIR}/thunderbird.desktop.in >${WRKDIR}/${MOZILLA}.desktop
+ <${FILESDIR}/thunderbird.desktop.in >${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop
${LN} -s ${WRKSRC}/mail ${WRKSRC}/mozilla/mail
post-patch:
@@ -106,7 +108,7 @@
${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' \
${FAKEDIR}/bin/thunderbird
${RM} -f ${FAKEDIR}/bin/*.bak
- ${MKDIR} ${FAKEDIR}/lib/${PORTNAME}/defaults
+ ${MKDIR} ${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION}/defaults
pre-install:
@${ECHO_CMD} 'share/applications/${PORTNAME}.desktop' >> ${PLIST}
@@ -114,6 +116,6 @@
post-install:
${MKDIR} ${PREFIX}/share/applications
- ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${PREFIX}/share/applications
+ ${INSTALL_DATA} ${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop ${PREFIX}/share/applications
.include <bsd.port.post.mk>
More information about the freebsd-gecko
mailing list