diff options
| author | ahze <ahze@FreeBSD.org> | 2005-04-27 03:30:55 +0800 |
|---|---|---|
| committer | ahze <ahze@FreeBSD.org> | 2005-04-27 03:30:55 +0800 |
| commit | f670fae811492554b050bd1f39b78a2097974895 (patch) | |
| tree | 8b0de4349f5365c1ca3eddb539aed8f1de8b9ece /mail/thunderbird3 | |
| parent | 00f173e7a687bb55519e3896e7d1787905b3b837 (diff) | |
| download | freebsd-ports-gnome-f670fae811492554b050bd1f39b78a2097974895.tar.gz freebsd-ports-gnome-f670fae811492554b050bd1f39b78a2097974895.tar.zst freebsd-ports-gnome-f670fae811492554b050bd1f39b78a2097974895.zip | |
- Install .desktop file in share/applications instead of
share/gnome/applications so we can remove the gnomehier
dependency so non-gnome users don't have to install a bunch
of un-needed gnome directories.
- Remove WITH_MENU option from mozilla[-devel], .desktop file
will always be installed now.
Diffstat (limited to 'mail/thunderbird3')
| -rw-r--r-- | mail/thunderbird3/Makefile | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/mail/thunderbird3/Makefile b/mail/thunderbird3/Makefile index 8d6fa397cdff..6add3b28671d 100644 --- a/mail/thunderbird3/Makefile +++ b/mail/thunderbird3/Makefile @@ -31,7 +31,7 @@ HAS_CONFIGURE= yes NO_MTREE= yes PLIST= ${WRKDIR}/plist ALL_TARGET= default -USE_GNOME= gtk20 libidl gnomehier +USE_GNOME= gtk20 libidl CONFIGURE_ENV= LOCALBASE=${LOCALBASE} PKGINSTALL= ${WRKDIR}/pkg-install PKGDEINSTALL= ${WRKDIR}/pkg-deinstall @@ -44,8 +44,7 @@ LOCAL_PREFIX= ${PREFIX}/${LOCAL_SUBDIR} ESD_LIB= libesd.so.2 THUNDERBIRD= ${PORTNAME} -THUNDERBIRD_ICON= thunderbird.xpm -THUNDERBIRD_ICON_SRC= ${WRKSRC}/other-licenses/branding/thunderbird/default.xpm +THUNDERBIRD_ICON= ${PREFIX}/lib/${PORTNAME}-${PORTVERSION}/chrome/icons/default/default.xpm MOZ_PIS_SCRIPTS= S50cleanhome SCRIPTS_DIR= ${FAKEDIR}/${LOCAL_SUBDIR}/lib/${PORTNAME}-${PORTVERSION} MOZ_PIS_DIR= ${SCRIPTS_DIR}/init.d @@ -191,8 +190,8 @@ pre-install: "s:^:@unexec ${RMDIR} %D/:" -e "s:$$: || true:" >> ${PLIST}; \ ${FIND} * -type d ! -empty | ${SORT} -r | ${SED} -e "s:^:@dirrm :" | \ ${GREP} / >> ${PLIST} - ${ECHO_CMD} 'share/gnome/pixmaps/${THUNDERBIRD_ICON}' >> ${PLIST} - ${ECHO_CMD} 'share/gnome/applications/thunderbird.desktop' >> ${PLIST} + ${ECHO_CMD} 'share/applications/thunderbird.desktop' >> ${PLIST} + ${ECHO_CMD} '@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE} >> ${PLIST} do-install: # This is the actual installation. First, the contents of FAKEDIR are @@ -213,8 +212,8 @@ post-install: ${LOCAL_PREFIX}/bin/thunderbird-config ${FIND} ${LOCAL_PREFIX}/lib/pkgconfig -type f | ${XARGS} \ ${PERL} -pi -e 's|${FAKEDIR}|${PREFIX}|g' - ${INSTALL_DATA} ${THUNDERBIRD_ICON_SRC} ${PREFIX}/share/gnome/pixmaps/${THUNDERBIRD_ICON} - ${INSTALL_DATA} ${WRKDIR}/thunderbird.desktop ${PREFIX}/share/gnome/applications + ${MKDIR} ${PREFIX}/share/applications + ${INSTALL_DATA} ${WRKDIR}/thunderbird.desktop ${PREFIX}/share/applications ${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/thunderbird/default.xpm \ ${LOCAL_PREFIX}/lib/${PORTNAME}-${PORTVERSION}/chrome/icons/default/default.xpm |