diff options
| -rw-r--r-- | www/firefox-esr/Makefile | 13 | ||||
| -rw-r--r-- | www/firefox/Makefile | 13 | ||||
| -rw-r--r-- | www/firefox10/Makefile | 13 | ||||
| -rw-r--r-- | www/firefox15/Makefile | 13 | ||||
| -rw-r--r-- | www/firefox36/Makefile | 13 | ||||
| -rw-r--r-- | www/flock/Makefile | 13 | ||||
| -rw-r--r-- | www/mozilla/Makefile.common | 9 |
7 files changed, 39 insertions, 48 deletions
diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile index 9a4d78c69b3e..2a797cb273f1 100644 --- a/www/firefox-esr/Makefile +++ b/www/firefox-esr/Makefile @@ -8,7 +8,7 @@ PORTNAME= firefox DISTVERSION= 1.5 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_MOZILLA} @@ -28,6 +28,9 @@ USE_BZIP2= yes USE_GMAKE= yes USE_GCC= 3.4+ +GECKO_PLIST_PRE_FILES= lib/${MOZILLA}/chrome/icons/default/default.xpm +GECKO_PLIST_PRE_DIRS= lib/${MOZILLA}/chrome/icons/default lib/${MOZILLA}/chrome/icons + FIREFOX_ICON= ${MOZILLA}.xpm FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/icons/default.xpm MOZ_OPTIONS= --enable-application=browser \ @@ -69,6 +72,7 @@ post-patch: pre-install: ${ECHO_CMD} 'share/applications/${MOZILLA}.desktop' >> ${PLIST} + ${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST} ${ECHO_CMD} 'share/pixmaps/${FIREFOX_ICON}' >> ${PLIST} .if !defined(WITHOUT_NEWTAB) ${ECHO_CMD} >> ${SYSTEM_PREFS} @@ -76,13 +80,6 @@ pre-install: ${ECHO_CMD} "pref(\"browser.link.open_external\", 3);" \ >> ${SYSTEM_PREFS} .endif # !defined(WITHOUT_NEWTAB) - ${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST} - ${ECHO_CMD} "lib/${MOZILLA}/chrome/icons/default/default.xpm" >> ${PLIST} - ${ECHO_CMD} "@dirrm lib/${MOZILLA}/chrome/icons/default" >> ${PLIST} - ${ECHO_CMD} "@dirrm lib/${MOZILLA}/chrome/icons" >> ${PLIST} -# Dirty hack to make sure stuff gets removed right. - ${SORT} -r ${PLIST} > ${PLIST}.tmp - ${MV} -f ${PLIST}.tmp ${PLIST} do-install: if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \ diff --git a/www/firefox/Makefile b/www/firefox/Makefile index 9a4d78c69b3e..2a797cb273f1 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -8,7 +8,7 @@ PORTNAME= firefox DISTVERSION= 1.5 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_MOZILLA} @@ -28,6 +28,9 @@ USE_BZIP2= yes USE_GMAKE= yes USE_GCC= 3.4+ +GECKO_PLIST_PRE_FILES= lib/${MOZILLA}/chrome/icons/default/default.xpm +GECKO_PLIST_PRE_DIRS= lib/${MOZILLA}/chrome/icons/default lib/${MOZILLA}/chrome/icons + FIREFOX_ICON= ${MOZILLA}.xpm FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/icons/default.xpm MOZ_OPTIONS= --enable-application=browser \ @@ -69,6 +72,7 @@ post-patch: pre-install: ${ECHO_CMD} 'share/applications/${MOZILLA}.desktop' >> ${PLIST} + ${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST} ${ECHO_CMD} 'share/pixmaps/${FIREFOX_ICON}' >> ${PLIST} .if !defined(WITHOUT_NEWTAB) ${ECHO_CMD} >> ${SYSTEM_PREFS} @@ -76,13 +80,6 @@ pre-install: ${ECHO_CMD} "pref(\"browser.link.open_external\", 3);" \ >> ${SYSTEM_PREFS} .endif # !defined(WITHOUT_NEWTAB) - ${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST} - ${ECHO_CMD} "lib/${MOZILLA}/chrome/icons/default/default.xpm" >> ${PLIST} - ${ECHO_CMD} "@dirrm lib/${MOZILLA}/chrome/icons/default" >> ${PLIST} - ${ECHO_CMD} "@dirrm lib/${MOZILLA}/chrome/icons" >> ${PLIST} -# Dirty hack to make sure stuff gets removed right. - ${SORT} -r ${PLIST} > ${PLIST}.tmp - ${MV} -f ${PLIST}.tmp ${PLIST} do-install: if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \ diff --git a/www/firefox10/Makefile b/www/firefox10/Makefile index 9a4d78c69b3e..2a797cb273f1 100644 --- a/www/firefox10/Makefile +++ b/www/firefox10/Makefile @@ -8,7 +8,7 @@ PORTNAME= firefox DISTVERSION= 1.5 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_MOZILLA} @@ -28,6 +28,9 @@ USE_BZIP2= yes USE_GMAKE= yes USE_GCC= 3.4+ +GECKO_PLIST_PRE_FILES= lib/${MOZILLA}/chrome/icons/default/default.xpm +GECKO_PLIST_PRE_DIRS= lib/${MOZILLA}/chrome/icons/default lib/${MOZILLA}/chrome/icons + FIREFOX_ICON= ${MOZILLA}.xpm FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/icons/default.xpm MOZ_OPTIONS= --enable-application=browser \ @@ -69,6 +72,7 @@ post-patch: pre-install: ${ECHO_CMD} 'share/applications/${MOZILLA}.desktop' >> ${PLIST} + ${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST} ${ECHO_CMD} 'share/pixmaps/${FIREFOX_ICON}' >> ${PLIST} .if !defined(WITHOUT_NEWTAB) ${ECHO_CMD} >> ${SYSTEM_PREFS} @@ -76,13 +80,6 @@ pre-install: ${ECHO_CMD} "pref(\"browser.link.open_external\", 3);" \ >> ${SYSTEM_PREFS} .endif # !defined(WITHOUT_NEWTAB) - ${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST} - ${ECHO_CMD} "lib/${MOZILLA}/chrome/icons/default/default.xpm" >> ${PLIST} - ${ECHO_CMD} "@dirrm lib/${MOZILLA}/chrome/icons/default" >> ${PLIST} - ${ECHO_CMD} "@dirrm lib/${MOZILLA}/chrome/icons" >> ${PLIST} -# Dirty hack to make sure stuff gets removed right. - ${SORT} -r ${PLIST} > ${PLIST}.tmp - ${MV} -f ${PLIST}.tmp ${PLIST} do-install: if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \ diff --git a/www/firefox15/Makefile b/www/firefox15/Makefile index 9a4d78c69b3e..2a797cb273f1 100644 --- a/www/firefox15/Makefile +++ b/www/firefox15/Makefile @@ -8,7 +8,7 @@ PORTNAME= firefox DISTVERSION= 1.5 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_MOZILLA} @@ -28,6 +28,9 @@ USE_BZIP2= yes USE_GMAKE= yes USE_GCC= 3.4+ +GECKO_PLIST_PRE_FILES= lib/${MOZILLA}/chrome/icons/default/default.xpm +GECKO_PLIST_PRE_DIRS= lib/${MOZILLA}/chrome/icons/default lib/${MOZILLA}/chrome/icons + FIREFOX_ICON= ${MOZILLA}.xpm FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/icons/default.xpm MOZ_OPTIONS= --enable-application=browser \ @@ -69,6 +72,7 @@ post-patch: pre-install: ${ECHO_CMD} 'share/applications/${MOZILLA}.desktop' >> ${PLIST} + ${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST} ${ECHO_CMD} 'share/pixmaps/${FIREFOX_ICON}' >> ${PLIST} .if !defined(WITHOUT_NEWTAB) ${ECHO_CMD} >> ${SYSTEM_PREFS} @@ -76,13 +80,6 @@ pre-install: ${ECHO_CMD} "pref(\"browser.link.open_external\", 3);" \ >> ${SYSTEM_PREFS} .endif # !defined(WITHOUT_NEWTAB) - ${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST} - ${ECHO_CMD} "lib/${MOZILLA}/chrome/icons/default/default.xpm" >> ${PLIST} - ${ECHO_CMD} "@dirrm lib/${MOZILLA}/chrome/icons/default" >> ${PLIST} - ${ECHO_CMD} "@dirrm lib/${MOZILLA}/chrome/icons" >> ${PLIST} -# Dirty hack to make sure stuff gets removed right. - ${SORT} -r ${PLIST} > ${PLIST}.tmp - ${MV} -f ${PLIST}.tmp ${PLIST} do-install: if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \ diff --git a/www/firefox36/Makefile b/www/firefox36/Makefile index 9a4d78c69b3e..2a797cb273f1 100644 --- a/www/firefox36/Makefile +++ b/www/firefox36/Makefile @@ -8,7 +8,7 @@ PORTNAME= firefox DISTVERSION= 1.5 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_MOZILLA} @@ -28,6 +28,9 @@ USE_BZIP2= yes USE_GMAKE= yes USE_GCC= 3.4+ +GECKO_PLIST_PRE_FILES= lib/${MOZILLA}/chrome/icons/default/default.xpm +GECKO_PLIST_PRE_DIRS= lib/${MOZILLA}/chrome/icons/default lib/${MOZILLA}/chrome/icons + FIREFOX_ICON= ${MOZILLA}.xpm FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/icons/default.xpm MOZ_OPTIONS= --enable-application=browser \ @@ -69,6 +72,7 @@ post-patch: pre-install: ${ECHO_CMD} 'share/applications/${MOZILLA}.desktop' >> ${PLIST} + ${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST} ${ECHO_CMD} 'share/pixmaps/${FIREFOX_ICON}' >> ${PLIST} .if !defined(WITHOUT_NEWTAB) ${ECHO_CMD} >> ${SYSTEM_PREFS} @@ -76,13 +80,6 @@ pre-install: ${ECHO_CMD} "pref(\"browser.link.open_external\", 3);" \ >> ${SYSTEM_PREFS} .endif # !defined(WITHOUT_NEWTAB) - ${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST} - ${ECHO_CMD} "lib/${MOZILLA}/chrome/icons/default/default.xpm" >> ${PLIST} - ${ECHO_CMD} "@dirrm lib/${MOZILLA}/chrome/icons/default" >> ${PLIST} - ${ECHO_CMD} "@dirrm lib/${MOZILLA}/chrome/icons" >> ${PLIST} -# Dirty hack to make sure stuff gets removed right. - ${SORT} -r ${PLIST} > ${PLIST}.tmp - ${MV} -f ${PLIST}.tmp ${PLIST} do-install: if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \ diff --git a/www/flock/Makefile b/www/flock/Makefile index 9a4d78c69b3e..2a797cb273f1 100644 --- a/www/flock/Makefile +++ b/www/flock/Makefile @@ -8,7 +8,7 @@ PORTNAME= firefox DISTVERSION= 1.5 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_MOZILLA} @@ -28,6 +28,9 @@ USE_BZIP2= yes USE_GMAKE= yes USE_GCC= 3.4+ +GECKO_PLIST_PRE_FILES= lib/${MOZILLA}/chrome/icons/default/default.xpm +GECKO_PLIST_PRE_DIRS= lib/${MOZILLA}/chrome/icons/default lib/${MOZILLA}/chrome/icons + FIREFOX_ICON= ${MOZILLA}.xpm FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/icons/default.xpm MOZ_OPTIONS= --enable-application=browser \ @@ -69,6 +72,7 @@ post-patch: pre-install: ${ECHO_CMD} 'share/applications/${MOZILLA}.desktop' >> ${PLIST} + ${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST} ${ECHO_CMD} 'share/pixmaps/${FIREFOX_ICON}' >> ${PLIST} .if !defined(WITHOUT_NEWTAB) ${ECHO_CMD} >> ${SYSTEM_PREFS} @@ -76,13 +80,6 @@ pre-install: ${ECHO_CMD} "pref(\"browser.link.open_external\", 3);" \ >> ${SYSTEM_PREFS} .endif # !defined(WITHOUT_NEWTAB) - ${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST} - ${ECHO_CMD} "lib/${MOZILLA}/chrome/icons/default/default.xpm" >> ${PLIST} - ${ECHO_CMD} "@dirrm lib/${MOZILLA}/chrome/icons/default" >> ${PLIST} - ${ECHO_CMD} "@dirrm lib/${MOZILLA}/chrome/icons" >> ${PLIST} -# Dirty hack to make sure stuff gets removed right. - ${SORT} -r ${PLIST} > ${PLIST}.tmp - ${MV} -f ${PLIST}.tmp ${PLIST} do-install: if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \ diff --git a/www/mozilla/Makefile.common b/www/mozilla/Makefile.common index 20395a8677dc..5058bcf8c755 100644 --- a/www/mozilla/Makefile.common +++ b/www/mozilla/Makefile.common @@ -15,6 +15,9 @@ # # Ports can use the following: # +# GECKO_PLIST_PRE_FILES List of files to add to the beginning of plist +# GECKO_PLIST_PRE_DIRS +# # MOZILLA_PLIST_DIRS List of directories to descend into when # installing and creating the plist # MOZ_PIS_SCRIPTS List of scripts residing in ${FILESDIR} to @@ -316,6 +319,12 @@ gecko-create-plist: ${FAKEDIR}/bin/${MOZILLA}-config ${RM} -f ${FAKEDIR}/bin/*.bak # Create the plist +.for f in ${GECKO_PLIST_PRE_FILES} + ${ECHO_CMD} ${f} >> ${PLIST} +.endfor +.for f in ${GECKO_PLIST_PRE_DIRS} + ${ECHO_CMD} "@dirrm ${f}" >> ${PLIST} +.endfor ${ECHO_CMD} "${BROWSER_PLUGINS_DIR}/.${MOZILLA}.keep" >> ${PLIST} ${ECHO_CMD} "@unexec ${RMDIR} %D/${BROWSER_PLUGINS_DIR} 2>/dev/null || ${TRUE}" >> ${PLIST} ${MKDIR} ${FAKEDIR}/libdata |