diff options
| author | Michael Johnson <ahze@FreeBSD.org> | 2006-03-29 20:45:19 +0000 |
|---|---|---|
| committer | Michael Johnson <ahze@FreeBSD.org> | 2006-03-29 20:45:19 +0000 |
| commit | a3adfc2cf57b600a49a56665fa0155ad0158d27b (patch) | |
| tree | 1ea6dcbe22c4b4abf85465cadfe6918215b38d85 /www/mozilla | |
| parent | Chase another silent update: minor fixes in Bourne shell variables and help (diff) | |
- Readd firefox-devel at version 2.0a1
- Add support for USE_GECKO=firefox-devel
- Fix pkg-deinstall to not remove MOZDIR/extensions
Notes
Notes:
svn path=/head/; revision=158397
Diffstat (limited to 'www/mozilla')
| -rw-r--r-- | www/mozilla/Makefile.common | 16 | ||||
| -rw-r--r-- | www/mozilla/bsd.gecko.mk | 2 | ||||
| -rw-r--r-- | www/mozilla/pkg-deinstall.in | 1 |
3 files changed, 15 insertions, 4 deletions
diff --git a/www/mozilla/Makefile.common b/www/mozilla/Makefile.common index 3719edc177b2..b73954b51df4 100644 --- a/www/mozilla/Makefile.common +++ b/www/mozilla/Makefile.common @@ -74,6 +74,7 @@ USE_PERL5_BUILD=yes USE_X_PREFIX= yes USE_REINPLACE= yes +MOZILLA_SUFX?= none WRKSRC?= ${WRKDIR}/mozilla FAKEDIR?= ${WRKDIR}/fake PLIST?= ${WRKDIR}/plist @@ -238,10 +239,10 @@ MOZCONFIG_SED?= ${SED} ${MOZ_SED_ARGS} post-patch: gecko-post-patch gecko-moz-pis-patch gecko-post-patch: -.if exists(${.CURDIR}/pkg-install.in) +.if exists(${MASTER_DIR}/pkg-install.in) @${MOZCONFIG_SED} < ${MASTER_DIR}/pkg-install.in > ${PKGINSTALL} .endif -.if exists(${.CURDIR}/pkg-deinstall.in) +.if exists(${MASTER_DIR}/pkg-deinstall.in) @${MOZCONFIG_SED} < ${MASTER_DIR}/pkg-deinstall.in > ${PKGDEINSTALL} .endif @${RM} -f ${MOZCONFIG} @@ -316,6 +317,17 @@ gecko-create-plist: @${TOUCH} -f ${PLIST} @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \ ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET} +.if defined(MOZILLA_SUFX) && ${MOZILLA_SUFX}!="none" + ${MV} ${FAKEDIR}/bin/${MOZILLA:S/${MOZILLA_SUFX}//} ${FAKEDIR}/bin/${MOZILLA} + ${MV} ${FAKEDIR}/bin/${MOZILLA:S/${MOZILLA_SUFX}//}-config ${FAKEDIR}/bin/${MOZILLA}-config +.for pc in ${PKGCONFIG_FILES:S|${MOZILLA_SUFX}||} + ${MV} ${FAKEDIR}/lib/pkgconfig/${pc}.pc ${FAKEDIR}/lib/pkgconfig/${pc:S/${MOZILLA:S,${MOZILLA_SUFX},,}/${MOZILLA}/}.pc +.endfor + @${REINPLACE_CMD} -e 's|${MOZILLA}-bin|${MOZILLA:S/${MOZILLA_SUFX}//}|; \ + s|$${progbase}-bin|${MOZILLA:S/${MOZILLA_SUFX}//}-bin|' \ + ${FAKEDIR}/bin/${MOZILLA} \ + ${FAKEDIR}/bin/${MOZILLA}-config +.endif @${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|g' \ ${FAKEDIR}/bin/${MOZILLA} \ ${FAKEDIR}/bin/${MOZILLA}-config diff --git a/www/mozilla/bsd.gecko.mk b/www/mozilla/bsd.gecko.mk index 0453f20117b3..8f0c690a007b 100644 --- a/www/mozilla/bsd.gecko.mk +++ b/www/mozilla/bsd.gecko.mk @@ -64,7 +64,7 @@ Gecko_Pre_Include= bsd.gecko.mk # .endif .if ${OSVERSION} >= 500000 -_GECKO_ALL= firefox nvu seamonkey sunbird thunderbird xulrunner +_GECKO_ALL= firefox nvu seamonkey sunbird thunderbird xulrunner firefox-devel .endif _GECKO_ALL+= mozilla diff --git a/www/mozilla/pkg-deinstall.in b/www/mozilla/pkg-deinstall.in index b3ae343e37de..1d381a06fe88 100644 --- a/www/mozilla/pkg-deinstall.in +++ b/www/mozilla/pkg-deinstall.in @@ -22,7 +22,6 @@ rm -f ${MOZDIR}/components/*.dat rm -f ${MOZDIR}/components.ini rm -f ${MOZDIR}/defaults.ini rm -f ${MOZDIR}/chrome/app-chrome.manifest -rm -rf ${MOZDIR}/extensions rm -rf ${MOZDIR}/updates exit 0 |