aboutsummaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
Diffstat (limited to 'www')
-rw-r--r--www/firefox-devel/Makefile10
-rw-r--r--www/firefox-esr/Makefile10
-rw-r--r--www/firefox/Makefile10
-rw-r--r--www/firefox10/Makefile10
-rw-r--r--www/firefox15/Makefile10
-rw-r--r--www/firefox3-devel/Makefile10
-rw-r--r--www/firefox35/Makefile10
-rw-r--r--www/firefox36/Makefile10
-rw-r--r--www/flock/Makefile10
-rw-r--r--www/mozilla-devel/Makefile19
-rw-r--r--www/mozilla/Makefile22
-rw-r--r--www/seamonkey/Makefile19
-rw-r--r--www/seamonkey2/Makefile19
13 files changed, 72 insertions, 97 deletions
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 <bsd.port.pre.mk>
@@ -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 <bsd.port.post.mk>
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 <bsd.port.pre.mk>
@@ -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 <bsd.port.post.mk>
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 <bsd.port.pre.mk>
@@ -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 <bsd.port.post.mk>
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 <bsd.port.pre.mk>
@@ -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 <bsd.port.post.mk>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-12 16:10:15 +0000