From f670fae811492554b050bd1f39b78a2097974895 Mon Sep 17 00:00:00 2001 From: ahze Date: Tue, 26 Apr 2005 19:30:55 +0000 Subject: - 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. --- mail/thunderbird-devel/Makefile | 13 ++++++------- mail/thunderbird-esr/Makefile | 13 ++++++------- mail/thunderbird/Makefile | 13 ++++++------- mail/thunderbird3/Makefile | 13 ++++++------- www/firefox-devel/Makefile | 10 ++++------ www/firefox-esr/Makefile | 10 ++++------ www/firefox/Makefile | 10 ++++------ www/firefox10/Makefile | 10 ++++------ www/firefox15/Makefile | 10 ++++------ www/firefox3-devel/Makefile | 10 ++++------ www/firefox35/Makefile | 10 ++++------ www/firefox36/Makefile | 10 ++++------ www/flock/Makefile | 10 ++++------ www/mozilla-devel/Makefile | 19 ++++++++++--------- www/mozilla/Makefile | 22 ++++++---------------- www/seamonkey/Makefile | 19 ++++++++++--------- www/seamonkey2/Makefile | 19 ++++++++++--------- 17 files changed, 96 insertions(+), 125 deletions(-) diff --git a/mail/thunderbird-devel/Makefile b/mail/thunderbird-devel/Makefile index 8d6fa397cdff..6add3b28671d 100644 --- a/mail/thunderbird-devel/Makefile +++ b/mail/thunderbird-devel/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 diff --git a/mail/thunderbird-esr/Makefile b/mail/thunderbird-esr/Makefile index 8d6fa397cdff..6add3b28671d 100644 --- a/mail/thunderbird-esr/Makefile +++ b/mail/thunderbird-esr/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 diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile index 8d6fa397cdff..6add3b28671d 100644 --- a/mail/thunderbird/Makefile +++ b/mail/thunderbird/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 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 diff --git a/www/firefox-devel/Makefile b/www/firefox-devel/Makefile index 92ff29ca8e18..c710a0b39e36 100644 --- a/www/firefox-devel/Makefile +++ b/www/firefox-devel/Makefile @@ -48,8 +48,7 @@ EXTRACT_AFTER_ARGS= | ${TAR} -xf - --exclude */CVS/* \ FIREFOX= ${PORTNAME} FF_VER= ${PORTVERSION} -FIREFOX_ICON= firefox.png -FIREFOX_ICON_SRC=${WRKSRC}/other-licenses/branding/firefox/content/alert-exclam.png +FIREFOX_ICON= ${PREFIX}/lib/${FIREFOX}/chrome/icons/default/default.xpm PKGCONFIG_FILES=firefox-gtkmozembed firefox-js firefox-xpcom \ firefox-nspr firefox-nss firefox-plugin @@ -187,8 +186,7 @@ pre-install: Makefile ${MAKE_ARGS} install @${MKDIR} ${SCRIPTS_DIR} @${MKDIR} ${MOZ_PIS_DIR} - ${ECHO_CMD} 'share/gnome/pixmaps/${FIREFOX_ICON}' >> ${PLIST} - ${ECHO_CMD} 'share/gnome/applications/firefox.desktop' >> ${PLIST} + ${ECHO_CMD} 'share/applications/firefox.desktop' >> ${PLIST} ${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|g; \ s|${FIREFOX}-${FF_VER}|${FIREFOX}|' \ ${FAKEDIR}/bin/firefox \ @@ -265,8 +263,8 @@ post-install: .for i in ${EXTRA_SCRIPTS} ${INSTALL_SCRIPT} ${FILESDIR}/${i} ${PREFIX}/bin .endfor - ${INSTALL_DATA} ${FIREFOX_ICON_SRC} ${PREFIX}/share/gnome/pixmaps/${FIREFOX_ICON} - ${INSTALL_DATA} ${WRKDIR}/firefox.desktop ${PREFIX}/share/gnome/applications + ${MKDIR} ${PREFIX}/share/applications + ${INSTALL_DATA} ${WRKDIR}/firefox.desktop ${PREFIX}/share/applications ${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/firefox/default.xpm \ ${PREFIX}/lib/${FIREFOX}/chrome/icons/default/default.xpm @-update-desktop-database diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile index 92ff29ca8e18..c710a0b39e36 100644 --- a/www/firefox-esr/Makefile +++ b/www/firefox-esr/Makefile @@ -48,8 +48,7 @@ EXTRACT_AFTER_ARGS= | ${TAR} -xf - --exclude */CVS/* \ FIREFOX= ${PORTNAME} FF_VER= ${PORTVERSION} -FIREFOX_ICON= firefox.png -FIREFOX_ICON_SRC=${WRKSRC}/other-licenses/branding/firefox/content/alert-exclam.png +FIREFOX_ICON= ${PREFIX}/lib/${FIREFOX}/chrome/icons/default/default.xpm PKGCONFIG_FILES=firefox-gtkmozembed firefox-js firefox-xpcom \ firefox-nspr firefox-nss firefox-plugin @@ -187,8 +186,7 @@ pre-install: Makefile ${MAKE_ARGS} install @${MKDIR} ${SCRIPTS_DIR} @${MKDIR} ${MOZ_PIS_DIR} - ${ECHO_CMD} 'share/gnome/pixmaps/${FIREFOX_ICON}' >> ${PLIST} - ${ECHO_CMD} 'share/gnome/applications/firefox.desktop' >> ${PLIST} + ${ECHO_CMD} 'share/applications/firefox.desktop' >> ${PLIST} ${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|g; \ s|${FIREFOX}-${FF_VER}|${FIREFOX}|' \ ${FAKEDIR}/bin/firefox \ @@ -265,8 +263,8 @@ post-install: .for i in ${EXTRA_SCRIPTS} ${INSTALL_SCRIPT} ${FILESDIR}/${i} ${PREFIX}/bin .endfor - ${INSTALL_DATA} ${FIREFOX_ICON_SRC} ${PREFIX}/share/gnome/pixmaps/${FIREFOX_ICON} - ${INSTALL_DATA} ${WRKDIR}/firefox.desktop ${PREFIX}/share/gnome/applications + ${MKDIR} ${PREFIX}/share/applications + ${INSTALL_DATA} ${WRKDIR}/firefox.desktop ${PREFIX}/share/applications ${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/firefox/default.xpm \ ${PREFIX}/lib/${FIREFOX}/chrome/icons/default/default.xpm @-update-desktop-database diff --git a/www/firefox/Makefile b/www/firefox/Makefile index 92ff29ca8e18..c710a0b39e36 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -48,8 +48,7 @@ EXTRACT_AFTER_ARGS= | ${TAR} -xf - --exclude */CVS/* \ FIREFOX= ${PORTNAME} FF_VER= ${PORTVERSION} -FIREFOX_ICON= firefox.png -FIREFOX_ICON_SRC=${WRKSRC}/other-licenses/branding/firefox/content/alert-exclam.png +FIREFOX_ICON= ${PREFIX}/lib/${FIREFOX}/chrome/icons/default/default.xpm PKGCONFIG_FILES=firefox-gtkmozembed firefox-js firefox-xpcom \ firefox-nspr firefox-nss firefox-plugin @@ -187,8 +186,7 @@ pre-install: Makefile ${MAKE_ARGS} install @${MKDIR} ${SCRIPTS_DIR} @${MKDIR} ${MOZ_PIS_DIR} - ${ECHO_CMD} 'share/gnome/pixmaps/${FIREFOX_ICON}' >> ${PLIST} - ${ECHO_CMD} 'share/gnome/applications/firefox.desktop' >> ${PLIST} + ${ECHO_CMD} 'share/applications/firefox.desktop' >> ${PLIST} ${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|g; \ s|${FIREFOX}-${FF_VER}|${FIREFOX}|' \ ${FAKEDIR}/bin/firefox \ @@ -265,8 +263,8 @@ post-install: .for i in ${EXTRA_SCRIPTS} ${INSTALL_SCRIPT} ${FILESDIR}/${i} ${PREFIX}/bin .endfor - ${INSTALL_DATA} ${FIREFOX_ICON_SRC} ${PREFIX}/share/gnome/pixmaps/${FIREFOX_ICON} - ${INSTALL_DATA} ${WRKDIR}/firefox.desktop ${PREFIX}/share/gnome/applications + ${MKDIR} ${PREFIX}/share/applications + ${INSTALL_DATA} ${WRKDIR}/firefox.desktop ${PREFIX}/share/applications ${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/firefox/default.xpm \ ${PREFIX}/lib/${FIREFOX}/chrome/icons/default/default.xpm @-update-desktop-database diff --git a/www/firefox10/Makefile b/www/firefox10/Makefile index 92ff29ca8e18..c710a0b39e36 100644 --- a/www/firefox10/Makefile +++ b/www/firefox10/Makefile @@ -48,8 +48,7 @@ EXTRACT_AFTER_ARGS= | ${TAR} -xf - --exclude */CVS/* \ FIREFOX= ${PORTNAME} FF_VER= ${PORTVERSION} -FIREFOX_ICON= firefox.png -FIREFOX_ICON_SRC=${WRKSRC}/other-licenses/branding/firefox/content/alert-exclam.png +FIREFOX_ICON= ${PREFIX}/lib/${FIREFOX}/chrome/icons/default/default.xpm PKGCONFIG_FILES=firefox-gtkmozembed firefox-js firefox-xpcom \ firefox-nspr firefox-nss firefox-plugin @@ -187,8 +186,7 @@ pre-install: Makefile ${MAKE_ARGS} install @${MKDIR} ${SCRIPTS_DIR} @${MKDIR} ${MOZ_PIS_DIR} - ${ECHO_CMD} 'share/gnome/pixmaps/${FIREFOX_ICON}' >> ${PLIST} - ${ECHO_CMD} 'share/gnome/applications/firefox.desktop' >> ${PLIST} + ${ECHO_CMD} 'share/applications/firefox.desktop' >> ${PLIST} ${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|g; \ s|${FIREFOX}-${FF_VER}|${FIREFOX}|' \ ${FAKEDIR}/bin/firefox \ @@ -265,8 +263,8 @@ post-install: .for i in ${EXTRA_SCRIPTS} ${INSTALL_SCRIPT} ${FILESDIR}/${i} ${PREFIX}/bin .endfor - ${INSTALL_DATA} ${FIREFOX_ICON_SRC} ${PREFIX}/share/gnome/pixmaps/${FIREFOX_ICON} - ${INSTALL_DATA} ${WRKDIR}/firefox.desktop ${PREFIX}/share/gnome/applications + ${MKDIR} ${PREFIX}/share/applications + ${INSTALL_DATA} ${WRKDIR}/firefox.desktop ${PREFIX}/share/applications ${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/firefox/default.xpm \ ${PREFIX}/lib/${FIREFOX}/chrome/icons/default/default.xpm @-update-desktop-database diff --git a/www/firefox15/Makefile b/www/firefox15/Makefile index 92ff29ca8e18..c710a0b39e36 100644 --- a/www/firefox15/Makefile +++ b/www/firefox15/Makefile @@ -48,8 +48,7 @@ EXTRACT_AFTER_ARGS= | ${TAR} -xf - --exclude */CVS/* \ FIREFOX= ${PORTNAME} FF_VER= ${PORTVERSION} -FIREFOX_ICON= firefox.png -FIREFOX_ICON_SRC=${WRKSRC}/other-licenses/branding/firefox/content/alert-exclam.png +FIREFOX_ICON= ${PREFIX}/lib/${FIREFOX}/chrome/icons/default/default.xpm PKGCONFIG_FILES=firefox-gtkmozembed firefox-js firefox-xpcom \ firefox-nspr firefox-nss firefox-plugin @@ -187,8 +186,7 @@ pre-install: Makefile ${MAKE_ARGS} install @${MKDIR} ${SCRIPTS_DIR} @${MKDIR} ${MOZ_PIS_DIR} - ${ECHO_CMD} 'share/gnome/pixmaps/${FIREFOX_ICON}' >> ${PLIST} - ${ECHO_CMD} 'share/gnome/applications/firefox.desktop' >> ${PLIST} + ${ECHO_CMD} 'share/applications/firefox.desktop' >> ${PLIST} ${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|g; \ s|${FIREFOX}-${FF_VER}|${FIREFOX}|' \ ${FAKEDIR}/bin/firefox \ @@ -265,8 +263,8 @@ post-install: .for i in ${EXTRA_SCRIPTS} ${INSTALL_SCRIPT} ${FILESDIR}/${i} ${PREFIX}/bin .endfor - ${INSTALL_DATA} ${FIREFOX_ICON_SRC} ${PREFIX}/share/gnome/pixmaps/${FIREFOX_ICON} - ${INSTALL_DATA} ${WRKDIR}/firefox.desktop ${PREFIX}/share/gnome/applications + ${MKDIR} ${PREFIX}/share/applications + ${INSTALL_DATA} ${WRKDIR}/firefox.desktop ${PREFIX}/share/applications ${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/firefox/default.xpm \ ${PREFIX}/lib/${FIREFOX}/chrome/icons/default/default.xpm @-update-desktop-database diff --git a/www/firefox3-devel/Makefile b/www/firefox3-devel/Makefile index 92ff29ca8e18..c710a0b39e36 100644 --- a/www/firefox3-devel/Makefile +++ b/www/firefox3-devel/Makefile @@ -48,8 +48,7 @@ EXTRACT_AFTER_ARGS= | ${TAR} -xf - --exclude */CVS/* \ FIREFOX= ${PORTNAME} FF_VER= ${PORTVERSION} -FIREFOX_ICON= firefox.png -FIREFOX_ICON_SRC=${WRKSRC}/other-licenses/branding/firefox/content/alert-exclam.png +FIREFOX_ICON= ${PREFIX}/lib/${FIREFOX}/chrome/icons/default/default.xpm PKGCONFIG_FILES=firefox-gtkmozembed firefox-js firefox-xpcom \ firefox-nspr firefox-nss firefox-plugin @@ -187,8 +186,7 @@ pre-install: Makefile ${MAKE_ARGS} install @${MKDIR} ${SCRIPTS_DIR} @${MKDIR} ${MOZ_PIS_DIR} - ${ECHO_CMD} 'share/gnome/pixmaps/${FIREFOX_ICON}' >> ${PLIST} - ${ECHO_CMD} 'share/gnome/applications/firefox.desktop' >> ${PLIST} + ${ECHO_CMD} 'share/applications/firefox.desktop' >> ${PLIST} ${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|g; \ s|${FIREFOX}-${FF_VER}|${FIREFOX}|' \ ${FAKEDIR}/bin/firefox \ @@ -265,8 +263,8 @@ post-install: .for i in ${EXTRA_SCRIPTS} ${INSTALL_SCRIPT} ${FILESDIR}/${i} ${PREFIX}/bin .endfor - ${INSTALL_DATA} ${FIREFOX_ICON_SRC} ${PREFIX}/share/gnome/pixmaps/${FIREFOX_ICON} - ${INSTALL_DATA} ${WRKDIR}/firefox.desktop ${PREFIX}/share/gnome/applications + ${MKDIR} ${PREFIX}/share/applications + ${INSTALL_DATA} ${WRKDIR}/firefox.desktop ${PREFIX}/share/applications ${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/firefox/default.xpm \ ${PREFIX}/lib/${FIREFOX}/chrome/icons/default/default.xpm @-update-desktop-database diff --git a/www/firefox35/Makefile b/www/firefox35/Makefile index 92ff29ca8e18..c710a0b39e36 100644 --- a/www/firefox35/Makefile +++ b/www/firefox35/Makefile @@ -48,8 +48,7 @@ EXTRACT_AFTER_ARGS= | ${TAR} -xf - --exclude */CVS/* \ FIREFOX= ${PORTNAME} FF_VER= ${PORTVERSION} -FIREFOX_ICON= firefox.png -FIREFOX_ICON_SRC=${WRKSRC}/other-licenses/branding/firefox/content/alert-exclam.png +FIREFOX_ICON= ${PREFIX}/lib/${FIREFOX}/chrome/icons/default/default.xpm PKGCONFIG_FILES=firefox-gtkmozembed firefox-js firefox-xpcom \ firefox-nspr firefox-nss firefox-plugin @@ -187,8 +186,7 @@ pre-install: Makefile ${MAKE_ARGS} install @${MKDIR} ${SCRIPTS_DIR} @${MKDIR} ${MOZ_PIS_DIR} - ${ECHO_CMD} 'share/gnome/pixmaps/${FIREFOX_ICON}' >> ${PLIST} - ${ECHO_CMD} 'share/gnome/applications/firefox.desktop' >> ${PLIST} + ${ECHO_CMD} 'share/applications/firefox.desktop' >> ${PLIST} ${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|g; \ s|${FIREFOX}-${FF_VER}|${FIREFOX}|' \ ${FAKEDIR}/bin/firefox \ @@ -265,8 +263,8 @@ post-install: .for i in ${EXTRA_SCRIPTS} ${INSTALL_SCRIPT} ${FILESDIR}/${i} ${PREFIX}/bin .endfor - ${INSTALL_DATA} ${FIREFOX_ICON_SRC} ${PREFIX}/share/gnome/pixmaps/${FIREFOX_ICON} - ${INSTALL_DATA} ${WRKDIR}/firefox.desktop ${PREFIX}/share/gnome/applications + ${MKDIR} ${PREFIX}/share/applications + ${INSTALL_DATA} ${WRKDIR}/firefox.desktop ${PREFIX}/share/applications ${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/firefox/default.xpm \ ${PREFIX}/lib/${FIREFOX}/chrome/icons/default/default.xpm @-update-desktop-database diff --git a/www/firefox36/Makefile b/www/firefox36/Makefile index 92ff29ca8e18..c710a0b39e36 100644 --- a/www/firefox36/Makefile +++ b/www/firefox36/Makefile @@ -48,8 +48,7 @@ EXTRACT_AFTER_ARGS= | ${TAR} -xf - --exclude */CVS/* \ FIREFOX= ${PORTNAME} FF_VER= ${PORTVERSION} -FIREFOX_ICON= firefox.png -FIREFOX_ICON_SRC=${WRKSRC}/other-licenses/branding/firefox/content/alert-exclam.png +FIREFOX_ICON= ${PREFIX}/lib/${FIREFOX}/chrome/icons/default/default.xpm PKGCONFIG_FILES=firefox-gtkmozembed firefox-js firefox-xpcom \ firefox-nspr firefox-nss firefox-plugin @@ -187,8 +186,7 @@ pre-install: Makefile ${MAKE_ARGS} install @${MKDIR} ${SCRIPTS_DIR} @${MKDIR} ${MOZ_PIS_DIR} - ${ECHO_CMD} 'share/gnome/pixmaps/${FIREFOX_ICON}' >> ${PLIST} - ${ECHO_CMD} 'share/gnome/applications/firefox.desktop' >> ${PLIST} + ${ECHO_CMD} 'share/applications/firefox.desktop' >> ${PLIST} ${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|g; \ s|${FIREFOX}-${FF_VER}|${FIREFOX}|' \ ${FAKEDIR}/bin/firefox \ @@ -265,8 +263,8 @@ post-install: .for i in ${EXTRA_SCRIPTS} ${INSTALL_SCRIPT} ${FILESDIR}/${i} ${PREFIX}/bin .endfor - ${INSTALL_DATA} ${FIREFOX_ICON_SRC} ${PREFIX}/share/gnome/pixmaps/${FIREFOX_ICON} - ${INSTALL_DATA} ${WRKDIR}/firefox.desktop ${PREFIX}/share/gnome/applications + ${MKDIR} ${PREFIX}/share/applications + ${INSTALL_DATA} ${WRKDIR}/firefox.desktop ${PREFIX}/share/applications ${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/firefox/default.xpm \ ${PREFIX}/lib/${FIREFOX}/chrome/icons/default/default.xpm @-update-desktop-database diff --git a/www/flock/Makefile b/www/flock/Makefile index 92ff29ca8e18..c710a0b39e36 100644 --- a/www/flock/Makefile +++ b/www/flock/Makefile @@ -48,8 +48,7 @@ EXTRACT_AFTER_ARGS= | ${TAR} -xf - --exclude */CVS/* \ FIREFOX= ${PORTNAME} FF_VER= ${PORTVERSION} -FIREFOX_ICON= firefox.png -FIREFOX_ICON_SRC=${WRKSRC}/other-licenses/branding/firefox/content/alert-exclam.png +FIREFOX_ICON= ${PREFIX}/lib/${FIREFOX}/chrome/icons/default/default.xpm PKGCONFIG_FILES=firefox-gtkmozembed firefox-js firefox-xpcom \ firefox-nspr firefox-nss firefox-plugin @@ -187,8 +186,7 @@ pre-install: Makefile ${MAKE_ARGS} install @${MKDIR} ${SCRIPTS_DIR} @${MKDIR} ${MOZ_PIS_DIR} - ${ECHO_CMD} 'share/gnome/pixmaps/${FIREFOX_ICON}' >> ${PLIST} - ${ECHO_CMD} 'share/gnome/applications/firefox.desktop' >> ${PLIST} + ${ECHO_CMD} 'share/applications/firefox.desktop' >> ${PLIST} ${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|g; \ s|${FIREFOX}-${FF_VER}|${FIREFOX}|' \ ${FAKEDIR}/bin/firefox \ @@ -265,8 +263,8 @@ post-install: .for i in ${EXTRA_SCRIPTS} ${INSTALL_SCRIPT} ${FILESDIR}/${i} ${PREFIX}/bin .endfor - ${INSTALL_DATA} ${FIREFOX_ICON_SRC} ${PREFIX}/share/gnome/pixmaps/${FIREFOX_ICON} - ${INSTALL_DATA} ${WRKDIR}/firefox.desktop ${PREFIX}/share/gnome/applications + ${MKDIR} ${PREFIX}/share/applications + ${INSTALL_DATA} ${WRKDIR}/firefox.desktop ${PREFIX}/share/applications ${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/firefox/default.xpm \ ${PREFIX}/lib/${FIREFOX}/chrome/icons/default/default.xpm @-update-desktop-database diff --git a/www/mozilla-devel/Makefile b/www/mozilla-devel/Makefile index fe8717f5e75f..72080a79f9ea 100644 --- a/www/mozilla-devel/Makefile +++ b/www/mozilla-devel/Makefile @@ -32,7 +32,7 @@ EXTRACT_AFTER_ARGS= | ${TAR} -xf - --exclude */CVS/* \ --exclude .cvsignore \ --exclude makefile.win \ --exclude MANIFEST -USE_GNOME= gtk20 libidl +USE_GNOME= gtk20 libidl desktopfileutils USE_BZIP2= yes USE_X_PREFIX= yes USE_PERL5= yes @@ -104,8 +104,7 @@ OPTIONS=CALENDAR "Enable the Calendar module" off \ OPTIMIZED_CFLAGS "Enable -O2 optimizations" off \ CAIRO_RENDER "Enable SVG rendering with Cairo" off \ CAIRO "Enable Cairo-specific Canvas features" off \ - SMB "Enable smb:// URI support via gnomevfs" off \ - MENU_ENTRY "Add Mozilla to the GNOME menu" on + SMB "Enable smb:// URI support via gnomevfs" off .include @@ -289,9 +288,8 @@ pre-install: .if !defined(WITHOUT_MAILNEWS) @${CP} -RL ${WRKSRC}/dist/bin/defaults/isp ${FAKEDIR}/lib/${MOZILLA}/defaults .endif -.if !defined(WITHOUT_MENU_ENTRY) - ${ECHO_CMD} share/gnome/applications/mozilla-devel.desktop >> ${PLIST} -.endif + ${ECHO_CMD} share/applications/mozilla-devel.desktop >> ${PLIST} + ${ECHO_CMD} @unexec ${RMDIR} %D/share/applications 2>/dev/nulll || ${TRUE} >> ${PLIST} cd ${FAKEDIR}/lib/${MOZILLA} && ${FIND} -s * -type f -o -type l | \ ${SED} -e 's:^:lib/${MOZILLA}/:' >> ${PLIST} \ && ${FIND} -d * -type d | \ @@ -305,6 +303,8 @@ pre-install: && ${FIND} -d * -type d | \ ${SED} -e 's:^:@dirrm include/${MOZILLA}/:' >> ${PLIST} ${ECHO_CMD} @dirrm include/${MOZILLA} >> ${PLIST} + ${ECHO_CMD} "@exec ${LOCALBASE}/bin/update-desktop-database > /dev/null || ${TRUE}" >> ${PLIST} + ${ECHO_CMD} "@unexec ${LOCALBASE}/bin/update-desktop-database > /dev/null || ${TRUE}" >> ${PLIST} do-install: ${MKDIR} ${PREFIX}/lib/${MOZILLA} @@ -341,10 +341,11 @@ do-install: ${CHMOD} 755 ${PREFIX}/include/${MOZILLA} cd ${FAKEDIR}/include/${MOZILLA} && ${FIND} . | \ ${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/include/${MOZILLA} -.if !defined(WITHOUT_MENU_ENTRY) - ${MKDIR} ${PREFIX}/share/gnome/applications + ${MKDIR} ${PREFIX}/share/applications ${INSTALL_DATA} ${WRKDIR}/mozilla-devel.desktop \ ${PREFIX}/share/gnome/applications -.endif + +post-install: + @-update-desktop-database .include diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile index 0efd536d2121..e2882962f5f3 100644 --- a/www/mozilla/Makefile +++ b/www/mozilla/Makefile @@ -33,7 +33,7 @@ EXTRACT_AFTER_ARGS= | ${TAR} -xf - --exclude */CVS/* \ --exclude .cvsignore \ --exclude makefile.win \ --exclude MANIFEST -USE_GNOME= gtk20 libidl +USE_GNOME= gtk20 libidl desktopfileutils USE_BZIP2= yes USE_X_PREFIX= yes USE_PERL5= yes @@ -103,8 +103,7 @@ OPTIONS=XFT "Enable Xft font anti-aliasing" on \ JAVASCRIPT_DEBUGGER "Enable DTD and JavaScript debuggers" off \ OPTIMIZED_CFLAGS "Enable -O2 optimizations" off \ CAIRO_RENDER "Enable SVG rendering with Cairo" off \ - SMB "Enable smb:// URI support via gnomevfs" off \ - MENU_ENTRY "Add Mozilla to the GNOME menu" on + SMB "Enable smb:// URI support via gnomevfs" off .include @@ -215,10 +214,6 @@ CFLAGS+= -O2 CONFIGURE_ARGS+= --enable-optimize=-O2 .endif -.if !defined(WITHOUT_MENU_ENTRY) -USE_GNOME+= gnomehier desktopfileutils -.endif - post-patch: @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ ${WRKSRC}/build/unix/run-mozilla.sh @@ -307,9 +302,8 @@ pre-install: .if !defined(WITHOUT_MAILNEWS) @${CP} -RL ${WRKSRC}/dist/bin/defaults/isp ${FAKEDIR}/lib/${MOZILLA}/defaults .endif -.if !defined(WITHOUT_MENU_ENTRY) - ${ECHO_CMD} share/gnome/applications/mozilla.desktop >> ${PLIST} -.endif + ${ECHO_CMD} share/applications/mozilla.desktop >> ${PLIST} + ${ECHO_CMD} @unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE} >> ${PLIST} cd ${FAKEDIR}/lib/${MOZILLA} && ${FIND} -s * -type f -o -type l | \ ${SED} -e 's:^:lib/${MOZILLA}/:' >> ${PLIST} \ && ${FIND} -d * -type d | \ @@ -361,19 +355,15 @@ do-install: ${CHMOD} 755 ${PREFIX}/include/${MOZILLA} cd ${FAKEDIR}/include/mozilla && ${FIND} . | \ ${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/include/${MOZILLA} -.if !defined(WITHOUT_MENU_ENTRY) - ${MKDIR} ${PREFIX}/share/gnome/applications + ${MKDIR} ${PREFIX}/share/applications ${INSTALL_DATA} ${WRKDIR}/mozilla.desktop \ - ${PREFIX}/share/gnome/applications -.endif + ${PREFIX}/share/applications post-install: @${CHMOD} -R u-w ${PREFIX}/lib/${MOZILLA}/components .if !defined(PACKAGE_BUILDING) @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif -.if !defined(WITHOUT_MENU_ENTRY) @-update-desktop-database -.endif .include diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile index fe8717f5e75f..72080a79f9ea 100644 --- a/www/seamonkey/Makefile +++ b/www/seamonkey/Makefile @@ -32,7 +32,7 @@ EXTRACT_AFTER_ARGS= | ${TAR} -xf - --exclude */CVS/* \ --exclude .cvsignore \ --exclude makefile.win \ --exclude MANIFEST -USE_GNOME= gtk20 libidl +USE_GNOME= gtk20 libidl desktopfileutils USE_BZIP2= yes USE_X_PREFIX= yes USE_PERL5= yes @@ -104,8 +104,7 @@ OPTIONS=CALENDAR "Enable the Calendar module" off \ OPTIMIZED_CFLAGS "Enable -O2 optimizations" off \ CAIRO_RENDER "Enable SVG rendering with Cairo" off \ CAIRO "Enable Cairo-specific Canvas features" off \ - SMB "Enable smb:// URI support via gnomevfs" off \ - MENU_ENTRY "Add Mozilla to the GNOME menu" on + SMB "Enable smb:// URI support via gnomevfs" off .include @@ -289,9 +288,8 @@ pre-install: .if !defined(WITHOUT_MAILNEWS) @${CP} -RL ${WRKSRC}/dist/bin/defaults/isp ${FAKEDIR}/lib/${MOZILLA}/defaults .endif -.if !defined(WITHOUT_MENU_ENTRY) - ${ECHO_CMD} share/gnome/applications/mozilla-devel.desktop >> ${PLIST} -.endif + ${ECHO_CMD} share/applications/mozilla-devel.desktop >> ${PLIST} + ${ECHO_CMD} @unexec ${RMDIR} %D/share/applications 2>/dev/nulll || ${TRUE} >> ${PLIST} cd ${FAKEDIR}/lib/${MOZILLA} && ${FIND} -s * -type f -o -type l | \ ${SED} -e 's:^:lib/${MOZILLA}/:' >> ${PLIST} \ && ${FIND} -d * -type d | \ @@ -305,6 +303,8 @@ pre-install: && ${FIND} -d * -type d | \ ${SED} -e 's:^:@dirrm include/${MOZILLA}/:' >> ${PLIST} ${ECHO_CMD} @dirrm include/${MOZILLA} >> ${PLIST} + ${ECHO_CMD} "@exec ${LOCALBASE}/bin/update-desktop-database > /dev/null || ${TRUE}" >> ${PLIST} + ${ECHO_CMD} "@unexec ${LOCALBASE}/bin/update-desktop-database > /dev/null || ${TRUE}" >> ${PLIST} do-install: ${MKDIR} ${PREFIX}/lib/${MOZILLA} @@ -341,10 +341,11 @@ do-install: ${CHMOD} 755 ${PREFIX}/include/${MOZILLA} cd ${FAKEDIR}/include/${MOZILLA} && ${FIND} . | \ ${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/include/${MOZILLA} -.if !defined(WITHOUT_MENU_ENTRY) - ${MKDIR} ${PREFIX}/share/gnome/applications + ${MKDIR} ${PREFIX}/share/applications ${INSTALL_DATA} ${WRKDIR}/mozilla-devel.desktop \ ${PREFIX}/share/gnome/applications -.endif + +post-install: + @-update-desktop-database .include diff --git a/www/seamonkey2/Makefile b/www/seamonkey2/Makefile index fe8717f5e75f..72080a79f9ea 100644 --- a/www/seamonkey2/Makefile +++ b/www/seamonkey2/Makefile @@ -32,7 +32,7 @@ EXTRACT_AFTER_ARGS= | ${TAR} -xf - --exclude */CVS/* \ --exclude .cvsignore \ --exclude makefile.win \ --exclude MANIFEST -USE_GNOME= gtk20 libidl +USE_GNOME= gtk20 libidl desktopfileutils USE_BZIP2= yes USE_X_PREFIX= yes USE_PERL5= yes @@ -104,8 +104,7 @@ OPTIONS=CALENDAR "Enable the Calendar module" off \ OPTIMIZED_CFLAGS "Enable -O2 optimizations" off \ CAIRO_RENDER "Enable SVG rendering with Cairo" off \ CAIRO "Enable Cairo-specific Canvas features" off \ - SMB "Enable smb:// URI support via gnomevfs" off \ - MENU_ENTRY "Add Mozilla to the GNOME menu" on + SMB "Enable smb:// URI support via gnomevfs" off .include @@ -289,9 +288,8 @@ pre-install: .if !defined(WITHOUT_MAILNEWS) @${CP} -RL ${WRKSRC}/dist/bin/defaults/isp ${FAKEDIR}/lib/${MOZILLA}/defaults .endif -.if !defined(WITHOUT_MENU_ENTRY) - ${ECHO_CMD} share/gnome/applications/mozilla-devel.desktop >> ${PLIST} -.endif + ${ECHO_CMD} share/applications/mozilla-devel.desktop >> ${PLIST} + ${ECHO_CMD} @unexec ${RMDIR} %D/share/applications 2>/dev/nulll || ${TRUE} >> ${PLIST} cd ${FAKEDIR}/lib/${MOZILLA} && ${FIND} -s * -type f -o -type l | \ ${SED} -e 's:^:lib/${MOZILLA}/:' >> ${PLIST} \ && ${FIND} -d * -type d | \ @@ -305,6 +303,8 @@ pre-install: && ${FIND} -d * -type d | \ ${SED} -e 's:^:@dirrm include/${MOZILLA}/:' >> ${PLIST} ${ECHO_CMD} @dirrm include/${MOZILLA} >> ${PLIST} + ${ECHO_CMD} "@exec ${LOCALBASE}/bin/update-desktop-database > /dev/null || ${TRUE}" >> ${PLIST} + ${ECHO_CMD} "@unexec ${LOCALBASE}/bin/update-desktop-database > /dev/null || ${TRUE}" >> ${PLIST} do-install: ${MKDIR} ${PREFIX}/lib/${MOZILLA} @@ -341,10 +341,11 @@ do-install: ${CHMOD} 755 ${PREFIX}/include/${MOZILLA} cd ${FAKEDIR}/include/${MOZILLA} && ${FIND} . | \ ${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/include/${MOZILLA} -.if !defined(WITHOUT_MENU_ENTRY) - ${MKDIR} ${PREFIX}/share/gnome/applications + ${MKDIR} ${PREFIX}/share/applications ${INSTALL_DATA} ${WRKDIR}/mozilla-devel.desktop \ ${PREFIX}/share/gnome/applications -.endif + +post-install: + @-update-desktop-database .include -- cgit