[SVN-Commit] r86 - in branches/experimental/mail/thunderbird-devel: . files

[svn-freebsd-gecko at chruetertee.ch]

Author: beat
Date: Tue Aug 18 15:11:42 2009
New Revision: 86

Log:
- Fix installation

Added:
   branches/experimental/mail/thunderbird-devel/files/patch-mail-installer-Makefile.in
Modified:
   branches/experimental/mail/thunderbird-devel/Makefile

Modified: branches/experimental/mail/thunderbird-devel/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird-devel/Makefile	Mon Aug 17 17:05:10 2009	(r85)
+++ branches/experimental/mail/thunderbird-devel/Makefile	Tue Aug 18 15:11:42 2009	(r86)
@@ -43,6 +43,8 @@
 	--enable-application=mail --enable-official-branding
 MOZ_MK_OPTIONS=	MOZ_MOZ_THUNDERBIRD=1
 MOZ_EXPORT=		MOZ_THUNDERBIRD=1
+MOZILLA_PLIST_DIRS=	bin lib
+MOZ_PKGCONFIG_FILES=
 
 PORTNAME_ICON=	${PREFIX}/lib/${PORTNAME}/icons/default.xpm
 
@@ -78,6 +80,7 @@
 	${SED} -e 's|@MOZILLA_ICON@|${MOZILLA_ICON}|' -e 's|@MOZILLA@|${MOZILLA}|' \
 		-e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|' \
 		<${FILESDIR}/thunderbird.desktop.in >${WRKDIR}/${MOZILLA}.desktop
+	${LN} -s  ${WRKDIR}/mail ${WRKDIR}/mozilla/mail
 
 post-patch:
 	${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS:C/-pthread/${GECKO_PTHREAD_LIBS}/}|' \
@@ -95,11 +98,9 @@
 
 port-pre-install:
 	${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' \
-	${FAKEDIR}/bin/thunderbird-config ${FAKEDIR}/bin/thunderbird
+	${FAKEDIR}/bin/thunderbird
 	${RM} -f ${FAKEDIR}/bin/*.bak
-	${MKDIR} ${FAKEDIR}/lib/${PORTNAME}/defaults
-	${CP} -RL ${WRKSRC}/dist/bin/isp \
-		${FAKEDIR}/lib/${PORTNAME}
+	${MKDIR} -p ${FAKEDIR}/lib/${PORTNAME}/defaults
 
 pre-install:
 	@${ECHO_CMD} 'share/applications/${PORTNAME}.desktop' >> ${PLIST}
@@ -108,7 +109,5 @@
 post-install:
 	${MKDIR} ${PREFIX}/share/applications
 	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${PREFIX}/share/applications
-	${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/${PORTNAME}/default.xpm \
-		${PORTNAME_ICON}
 
 .include <bsd.port.post.mk>

Added: branches/experimental/mail/thunderbird-devel/files/patch-mail-installer-Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/mail/thunderbird-devel/files/patch-mail-installer-Makefile.in	Tue Aug 18 15:11:42 2009	(r86)
@@ -0,0 +1,19 @@
+--- mail/installer/Makefile.in.orig	2009-08-18 12:13:50.420163449 +0200
++++ mail/installer/Makefile.in	2009-08-18 12:15:14.099421567 +0200
+@@ -92,11 +92,11 @@
+ # where xpcshell will work, to run tests on packaged builds. If you want to
+ # package, install, or build an installer, build with --enable-static in your
+ # mozconfig instead.
+-ifndef MAIL_PKG_SHARED
+-ifndef BUILD_STATIC_LIBS
+-$(error you need an "--enable-static" build to package a build)
+-endif
+-endif
++#ifndef MAIL_PKG_SHARED
++#ifndef BUILD_STATIC_LIBS
++#$(error you need an "--enable-static" build to package a build)
++#endif
++#endif
+ 
+ include $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/packager.mk
+