diff options
| author | Michael Johnson <ahze@FreeBSD.org> | 2006-04-16 16:06:55 +0000 |
|---|---|---|
| committer | Michael Johnson <ahze@FreeBSD.org> | 2006-04-16 16:06:55 +0000 |
| commit | 5b63cd82a0c24d096709f58da1e796a710da063a (patch) | |
| tree | a5b51a21d6d87d9d148bc45e1559215283d46d33 /www/mozilla | |
| parent | 627817031970243cb4544aa79285445da3967988 (diff) | |
Notes
Diffstat (limited to 'www/mozilla')
| -rw-r--r-- | www/mozilla/Makefile.common | 10 | ||||
| -rw-r--r-- | www/mozilla/pkg-deinstall.in | 1 |
2 files changed, 7 insertions, 4 deletions
diff --git a/www/mozilla/Makefile.common b/www/mozilla/Makefile.common index d8b58d49e95c..5a43d6383b76 100644 --- a/www/mozilla/Makefile.common +++ b/www/mozilla/Makefile.common @@ -94,6 +94,8 @@ MOZILLA_PLIST_DIRS?= bin include lib share/idl PKGINSTALL?= ${WRKDIR}/pkg-install PKGDEINSTALL?= ${WRKDIR}/pkg-deinstall +PKGINSTALL_INC?= ${MASTERDIR}/pkg-install.in +PKGDEINSTALL_INC?= ${MASTERDIR}/pkg-deinstall.in EXTRACT_AFTER_ARGS?= | ${TAR} -xf - --exclude */CVS/* \ --exclude */macbuild/* \ @@ -239,11 +241,11 @@ MOZCONFIG_SED?= ${SED} ${MOZ_SED_ARGS} post-patch: gecko-post-patch gecko-moz-pis-patch gecko-post-patch: -.if exists(${MASTER_DIR}/pkg-install.in) - @${MOZCONFIG_SED} < ${MASTER_DIR}/pkg-install.in > ${PKGINSTALL} +.if exists(${PKGINSTALL_INC}) + @${MOZCONFIG_SED} < ${PKGINSTALL_INC} > ${PKGINSTALL} .endif -.if exists(${MASTER_DIR}/pkg-deinstall.in) - @${MOZCONFIG_SED} < ${MASTER_DIR}/pkg-deinstall.in > ${PKGDEINSTALL} +.if exists(${PKGDEINSTALL_INC}) + @${MOZCONFIG_SED} < ${PKGDEINSTALL_INC} > ${PKGDEINSTALL} .endif @${RM} -f ${MOZCONFIG} .if !defined(NOMOZCONFIG) diff --git a/www/mozilla/pkg-deinstall.in b/www/mozilla/pkg-deinstall.in index 1d381a06fe88..ca02bac44de0 100644 --- a/www/mozilla/pkg-deinstall.in +++ b/www/mozilla/pkg-deinstall.in @@ -23,5 +23,6 @@ rm -f ${MOZDIR}/components.ini rm -f ${MOZDIR}/defaults.ini rm -f ${MOZDIR}/chrome/app-chrome.manifest rm -rf ${MOZDIR}/updates +rm -rf ${MOZDIR}/extensions exit 0 |