diff options
author | ahze <ahze@FreeBSD.org> | 2004-12-11 02:11:23 +0000 |
---|---|---|
committer | ahze <ahze@FreeBSD.org> | 2004-12-11 02:11:23 +0000 |
commit | 8425079e49d4868610285e4c5978780d60668cc2 (patch) | |
tree | ae16c73d8b8deb9659dc0960a66fddbe8c964278 /www | |
parent | e852908b9fef4921606174105fe01fe7ed5de423 (diff) | |
download | FreeBSD-ports-8425079e49d4868610285e4c5978780d60668cc2.zip FreeBSD-ports-8425079e49d4868610285e4c5978780d60668cc2.tar.gz |
- Fix plist in firefox [1]
- Touch lib/browser_plugins/.${PORTNAME}.keep so this directory will not be removed durring deinstall of mozilla[-devel] or firefox if you still have mozilla[-devel] or firefox installed.
Pointed out by: pointy hat [1]
Diffstat (limited to 'www')
-rw-r--r-- | www/firefox-devel/Makefile | 3 | ||||
-rw-r--r-- | www/firefox-esr/Makefile | 3 | ||||
-rw-r--r-- | www/firefox/Makefile | 3 | ||||
-rw-r--r-- | www/firefox10/Makefile | 3 | ||||
-rw-r--r-- | www/firefox15/Makefile | 3 | ||||
-rw-r--r-- | www/firefox3-devel/Makefile | 3 | ||||
-rw-r--r-- | www/firefox35/Makefile | 3 | ||||
-rw-r--r-- | www/firefox36/Makefile | 3 | ||||
-rw-r--r-- | www/flock/Makefile | 3 | ||||
-rw-r--r-- | www/mozilla-devel/Makefile | 6 | ||||
-rw-r--r-- | www/seamonkey/Makefile | 6 | ||||
-rw-r--r-- | www/seamonkey2/Makefile | 6 |
12 files changed, 39 insertions, 6 deletions
diff --git a/www/firefox-devel/Makefile b/www/firefox-devel/Makefile index 68abd39..78ea6e7 100644 --- a/www/firefox-devel/Makefile +++ b/www/firefox-devel/Makefile @@ -188,6 +188,8 @@ pre-install: && ${FIND} -d * -type d | \ ${SED} -e 's|^|@dirrm include/${FIREFOX}/|' >> ${PLIST} ${ECHO_CMD} @dirrm include/${FIREFOX} >> ${PLIST} + ${ECHO_CMD} lib/browser_plugins/.${PORTNAME}.keep >> ${PLIST} + ${ECHO_CMD} "@unexec ${RMDIR} %D/lib/browser_plugins 2>/dev/null || ${TRUE}" >> ${PLIST} do-install: ${MKDIR} ${PREFIX}/lib/${FIREFOX} @@ -197,6 +199,7 @@ do-install: if [ ! -d ${PREFIX}/lib/browser_plugins ]; then \ ${MKDIR} ${PREFIX}/lib/browser_plugins ; \ fi + ${TOUCH} -f ${PREFIX}/lib/browser_plugins/.${PORTNAME}.keep if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \ for jpi in ${JPI_LIST}; do \ if [ -f $${jpi} ]; then \ diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile index 68abd39..78ea6e7 100644 --- a/www/firefox-esr/Makefile +++ b/www/firefox-esr/Makefile @@ -188,6 +188,8 @@ pre-install: && ${FIND} -d * -type d | \ ${SED} -e 's|^|@dirrm include/${FIREFOX}/|' >> ${PLIST} ${ECHO_CMD} @dirrm include/${FIREFOX} >> ${PLIST} + ${ECHO_CMD} lib/browser_plugins/.${PORTNAME}.keep >> ${PLIST} + ${ECHO_CMD} "@unexec ${RMDIR} %D/lib/browser_plugins 2>/dev/null || ${TRUE}" >> ${PLIST} do-install: ${MKDIR} ${PREFIX}/lib/${FIREFOX} @@ -197,6 +199,7 @@ do-install: if [ ! -d ${PREFIX}/lib/browser_plugins ]; then \ ${MKDIR} ${PREFIX}/lib/browser_plugins ; \ fi + ${TOUCH} -f ${PREFIX}/lib/browser_plugins/.${PORTNAME}.keep if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \ for jpi in ${JPI_LIST}; do \ if [ -f $${jpi} ]; then \ diff --git a/www/firefox/Makefile b/www/firefox/Makefile index 68abd39..78ea6e7 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -188,6 +188,8 @@ pre-install: && ${FIND} -d * -type d | \ ${SED} -e 's|^|@dirrm include/${FIREFOX}/|' >> ${PLIST} ${ECHO_CMD} @dirrm include/${FIREFOX} >> ${PLIST} + ${ECHO_CMD} lib/browser_plugins/.${PORTNAME}.keep >> ${PLIST} + ${ECHO_CMD} "@unexec ${RMDIR} %D/lib/browser_plugins 2>/dev/null || ${TRUE}" >> ${PLIST} do-install: ${MKDIR} ${PREFIX}/lib/${FIREFOX} @@ -197,6 +199,7 @@ do-install: if [ ! -d ${PREFIX}/lib/browser_plugins ]; then \ ${MKDIR} ${PREFIX}/lib/browser_plugins ; \ fi + ${TOUCH} -f ${PREFIX}/lib/browser_plugins/.${PORTNAME}.keep if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \ for jpi in ${JPI_LIST}; do \ if [ -f $${jpi} ]; then \ diff --git a/www/firefox10/Makefile b/www/firefox10/Makefile index 68abd39..78ea6e7 100644 --- a/www/firefox10/Makefile +++ b/www/firefox10/Makefile @@ -188,6 +188,8 @@ pre-install: && ${FIND} -d * -type d | \ ${SED} -e 's|^|@dirrm include/${FIREFOX}/|' >> ${PLIST} ${ECHO_CMD} @dirrm include/${FIREFOX} >> ${PLIST} + ${ECHO_CMD} lib/browser_plugins/.${PORTNAME}.keep >> ${PLIST} + ${ECHO_CMD} "@unexec ${RMDIR} %D/lib/browser_plugins 2>/dev/null || ${TRUE}" >> ${PLIST} do-install: ${MKDIR} ${PREFIX}/lib/${FIREFOX} @@ -197,6 +199,7 @@ do-install: if [ ! -d ${PREFIX}/lib/browser_plugins ]; then \ ${MKDIR} ${PREFIX}/lib/browser_plugins ; \ fi + ${TOUCH} -f ${PREFIX}/lib/browser_plugins/.${PORTNAME}.keep if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \ for jpi in ${JPI_LIST}; do \ if [ -f $${jpi} ]; then \ diff --git a/www/firefox15/Makefile b/www/firefox15/Makefile index 68abd39..78ea6e7 100644 --- a/www/firefox15/Makefile +++ b/www/firefox15/Makefile @@ -188,6 +188,8 @@ pre-install: && ${FIND} -d * -type d | \ ${SED} -e 's|^|@dirrm include/${FIREFOX}/|' >> ${PLIST} ${ECHO_CMD} @dirrm include/${FIREFOX} >> ${PLIST} + ${ECHO_CMD} lib/browser_plugins/.${PORTNAME}.keep >> ${PLIST} + ${ECHO_CMD} "@unexec ${RMDIR} %D/lib/browser_plugins 2>/dev/null || ${TRUE}" >> ${PLIST} do-install: ${MKDIR} ${PREFIX}/lib/${FIREFOX} @@ -197,6 +199,7 @@ do-install: if [ ! -d ${PREFIX}/lib/browser_plugins ]; then \ ${MKDIR} ${PREFIX}/lib/browser_plugins ; \ fi + ${TOUCH} -f ${PREFIX}/lib/browser_plugins/.${PORTNAME}.keep if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \ for jpi in ${JPI_LIST}; do \ if [ -f $${jpi} ]; then \ diff --git a/www/firefox3-devel/Makefile b/www/firefox3-devel/Makefile index 68abd39..78ea6e7 100644 --- a/www/firefox3-devel/Makefile +++ b/www/firefox3-devel/Makefile @@ -188,6 +188,8 @@ pre-install: && ${FIND} -d * -type d | \ ${SED} -e 's|^|@dirrm include/${FIREFOX}/|' >> ${PLIST} ${ECHO_CMD} @dirrm include/${FIREFOX} >> ${PLIST} + ${ECHO_CMD} lib/browser_plugins/.${PORTNAME}.keep >> ${PLIST} + ${ECHO_CMD} "@unexec ${RMDIR} %D/lib/browser_plugins 2>/dev/null || ${TRUE}" >> ${PLIST} do-install: ${MKDIR} ${PREFIX}/lib/${FIREFOX} @@ -197,6 +199,7 @@ do-install: if [ ! -d ${PREFIX}/lib/browser_plugins ]; then \ ${MKDIR} ${PREFIX}/lib/browser_plugins ; \ fi + ${TOUCH} -f ${PREFIX}/lib/browser_plugins/.${PORTNAME}.keep if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \ for jpi in ${JPI_LIST}; do \ if [ -f $${jpi} ]; then \ diff --git a/www/firefox35/Makefile b/www/firefox35/Makefile index 68abd39..78ea6e7 100644 --- a/www/firefox35/Makefile +++ b/www/firefox35/Makefile @@ -188,6 +188,8 @@ pre-install: && ${FIND} -d * -type d | \ ${SED} -e 's|^|@dirrm include/${FIREFOX}/|' >> ${PLIST} ${ECHO_CMD} @dirrm include/${FIREFOX} >> ${PLIST} + ${ECHO_CMD} lib/browser_plugins/.${PORTNAME}.keep >> ${PLIST} + ${ECHO_CMD} "@unexec ${RMDIR} %D/lib/browser_plugins 2>/dev/null || ${TRUE}" >> ${PLIST} do-install: ${MKDIR} ${PREFIX}/lib/${FIREFOX} @@ -197,6 +199,7 @@ do-install: if [ ! -d ${PREFIX}/lib/browser_plugins ]; then \ ${MKDIR} ${PREFIX}/lib/browser_plugins ; \ fi + ${TOUCH} -f ${PREFIX}/lib/browser_plugins/.${PORTNAME}.keep if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \ for jpi in ${JPI_LIST}; do \ if [ -f $${jpi} ]; then \ diff --git a/www/firefox36/Makefile b/www/firefox36/Makefile index 68abd39..78ea6e7 100644 --- a/www/firefox36/Makefile +++ b/www/firefox36/Makefile @@ -188,6 +188,8 @@ pre-install: && ${FIND} -d * -type d | \ ${SED} -e 's|^|@dirrm include/${FIREFOX}/|' >> ${PLIST} ${ECHO_CMD} @dirrm include/${FIREFOX} >> ${PLIST} + ${ECHO_CMD} lib/browser_plugins/.${PORTNAME}.keep >> ${PLIST} + ${ECHO_CMD} "@unexec ${RMDIR} %D/lib/browser_plugins 2>/dev/null || ${TRUE}" >> ${PLIST} do-install: ${MKDIR} ${PREFIX}/lib/${FIREFOX} @@ -197,6 +199,7 @@ do-install: if [ ! -d ${PREFIX}/lib/browser_plugins ]; then \ ${MKDIR} ${PREFIX}/lib/browser_plugins ; \ fi + ${TOUCH} -f ${PREFIX}/lib/browser_plugins/.${PORTNAME}.keep if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \ for jpi in ${JPI_LIST}; do \ if [ -f $${jpi} ]; then \ diff --git a/www/flock/Makefile b/www/flock/Makefile index 68abd39..78ea6e7 100644 --- a/www/flock/Makefile +++ b/www/flock/Makefile @@ -188,6 +188,8 @@ pre-install: && ${FIND} -d * -type d | \ ${SED} -e 's|^|@dirrm include/${FIREFOX}/|' >> ${PLIST} ${ECHO_CMD} @dirrm include/${FIREFOX} >> ${PLIST} + ${ECHO_CMD} lib/browser_plugins/.${PORTNAME}.keep >> ${PLIST} + ${ECHO_CMD} "@unexec ${RMDIR} %D/lib/browser_plugins 2>/dev/null || ${TRUE}" >> ${PLIST} do-install: ${MKDIR} ${PREFIX}/lib/${FIREFOX} @@ -197,6 +199,7 @@ do-install: if [ ! -d ${PREFIX}/lib/browser_plugins ]; then \ ${MKDIR} ${PREFIX}/lib/browser_plugins ; \ fi + ${TOUCH} -f ${PREFIX}/lib/browser_plugins/.${PORTNAME}.keep if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \ for jpi in ${JPI_LIST}; do \ if [ -f $${jpi} ]; then \ diff --git a/www/mozilla-devel/Makefile b/www/mozilla-devel/Makefile index 97ad72c..cb1eeec 100644 --- a/www/mozilla-devel/Makefile +++ b/www/mozilla-devel/Makefile @@ -7,7 +7,7 @@ PORTNAME?= mozilla PORTVERSION= 1.8.a5 -PORTREVISION= 0 +PORTREVISION= 1 PORTEPOCH?= 2 CATEGORIES?= www MASTER_SITES= ${MASTER_SITE_MOZILLA} @@ -293,8 +293,9 @@ pre-install: break; \ fi; \ done; \ - ${ECHO_CMD} @dirrm lib/browser_plugins >> ${PLIST} ; \ fi + ${ECHO_CMD} lib/browser_plugins/.${PORTNAME}.keep >> ${PLIST} + ${ECHO_CMD} "@unexec ${RMDIR} %D/lib/browser_plugins 2>/dev/null || ${TRUE}" >> ${PLIST} ${ECHO_CMD} lib/${MOZILLA}/mozilla >> ${PLIST} ${ECHO_CMD} lib/${MOZILLA}/mozilla-config >> ${PLIST} .if !defined(WITHOUT_MAILNEWS) @@ -328,6 +329,7 @@ do-install: if [ ! -d ${PREFIX}/lib/browser_plugins ]; then \ ${MKDIR} ${PREFIX}/lib/browser_plugins ; \ fi + ${TOUCH} -f ${PREFIX}/lib/browser_plugins/.${PORTNAME}.keep if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \ for jpi in ${JPI_LIST}; do \ if [ -f $${jpi} ]; then \ diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile index 97ad72c..cb1eeec 100644 --- a/www/seamonkey/Makefile +++ b/www/seamonkey/Makefile @@ -7,7 +7,7 @@ PORTNAME?= mozilla PORTVERSION= 1.8.a5 -PORTREVISION= 0 +PORTREVISION= 1 PORTEPOCH?= 2 CATEGORIES?= www MASTER_SITES= ${MASTER_SITE_MOZILLA} @@ -293,8 +293,9 @@ pre-install: break; \ fi; \ done; \ - ${ECHO_CMD} @dirrm lib/browser_plugins >> ${PLIST} ; \ fi + ${ECHO_CMD} lib/browser_plugins/.${PORTNAME}.keep >> ${PLIST} + ${ECHO_CMD} "@unexec ${RMDIR} %D/lib/browser_plugins 2>/dev/null || ${TRUE}" >> ${PLIST} ${ECHO_CMD} lib/${MOZILLA}/mozilla >> ${PLIST} ${ECHO_CMD} lib/${MOZILLA}/mozilla-config >> ${PLIST} .if !defined(WITHOUT_MAILNEWS) @@ -328,6 +329,7 @@ do-install: if [ ! -d ${PREFIX}/lib/browser_plugins ]; then \ ${MKDIR} ${PREFIX}/lib/browser_plugins ; \ fi + ${TOUCH} -f ${PREFIX}/lib/browser_plugins/.${PORTNAME}.keep if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \ for jpi in ${JPI_LIST}; do \ if [ -f $${jpi} ]; then \ diff --git a/www/seamonkey2/Makefile b/www/seamonkey2/Makefile index 97ad72c..cb1eeec 100644 --- a/www/seamonkey2/Makefile +++ b/www/seamonkey2/Makefile @@ -7,7 +7,7 @@ PORTNAME?= mozilla PORTVERSION= 1.8.a5 -PORTREVISION= 0 +PORTREVISION= 1 PORTEPOCH?= 2 CATEGORIES?= www MASTER_SITES= ${MASTER_SITE_MOZILLA} @@ -293,8 +293,9 @@ pre-install: break; \ fi; \ done; \ - ${ECHO_CMD} @dirrm lib/browser_plugins >> ${PLIST} ; \ fi + ${ECHO_CMD} lib/browser_plugins/.${PORTNAME}.keep >> ${PLIST} + ${ECHO_CMD} "@unexec ${RMDIR} %D/lib/browser_plugins 2>/dev/null || ${TRUE}" >> ${PLIST} ${ECHO_CMD} lib/${MOZILLA}/mozilla >> ${PLIST} ${ECHO_CMD} lib/${MOZILLA}/mozilla-config >> ${PLIST} .if !defined(WITHOUT_MAILNEWS) @@ -328,6 +329,7 @@ do-install: if [ ! -d ${PREFIX}/lib/browser_plugins ]; then \ ${MKDIR} ${PREFIX}/lib/browser_plugins ; \ fi + ${TOUCH} -f ${PREFIX}/lib/browser_plugins/.${PORTNAME}.keep if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \ for jpi in ${JPI_LIST}; do \ if [ -f $${jpi} ]; then \ |