diff options
| author | beat <beat@FreeBSD.org> | 2012-03-22 15:30:27 +0800 |
|---|---|---|
| committer | beat <beat@FreeBSD.org> | 2012-03-22 15:30:27 +0800 |
| commit | f4f72b501f7e8a2d798b1acdd63a9d7a6f8093b5 (patch) | |
| tree | 91e41dfb160cbecde345222bf95cf602729fbf91 /mail | |
| parent | 50bb6bf4136deb8b2d842612b56539131b653027 (diff) | |
| download | freebsd-ports-gnome-f4f72b501f7e8a2d798b1acdd63a9d7a6f8093b5.tar.gz freebsd-ports-gnome-f4f72b501f7e8a2d798b1acdd63a9d7a6f8093b5.tar.zst freebsd-ports-gnome-f4f72b501f7e8a2d798b1acdd63a9d7a6f8093b5.zip | |
- Make the language packs working again by generate the plist on the fly
instead of creating a jar file which contained all the needed files. The
latter way of installing a lang pack no longer works with current
Mozilla versions.
- Bump PORTREVISION.
Feature safe: yes
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/thunderbird-esr-i18n/Makefile | 18 | ||||
| -rw-r--r-- | mail/thunderbird-i18n/Makefile | 18 |
2 files changed, 24 insertions, 12 deletions
diff --git a/mail/thunderbird-esr-i18n/Makefile b/mail/thunderbird-esr-i18n/Makefile index e41f4801849c..de69a509b451 100644 --- a/mail/thunderbird-esr-i18n/Makefile +++ b/mail/thunderbird-esr-i18n/Makefile @@ -7,6 +7,7 @@ PORTNAME= thunderbird-i18n PORTVERSION= 10.0.3 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITE_SUBDIR= thunderbird/releases/${PORTVERSION}esr/linux-i686/xpi PKGNAMEPREFIX= @@ -18,6 +19,10 @@ COMMENT= Localized interface for Thunderbird EXTRACT_DEPENDS= zip:${PORTSDIR}/archivers/zip +PLIST?= ${WRKDIR}/plist +PLISTD?= ${WRKDIR}/plist_dirs +PLISTF?= ${WRKDIR}/plist_files + .ifndef WITHOUT_SWITCHER RUN_DEPENDS+= xpi-quick-locale-switcher>=0:${PORTSDIR}/www/xpi-quick-locale-switcher .endif @@ -46,8 +51,6 @@ WDIR= langpack-*@thunderbird.mozilla.org XPI_DISTNAMES= ${THUNDERBIRD_I18N_} .for dist in ${XPI_DISTNAMES} XPI_ID_${dist}= langpack-${dist}@thunderbird.mozilla.org -XPI_FILES_${dist}= chrome.manifest install.rdf chrome/${dist}.jar -XPI_DIRS_${dist}= chrome .endfor do-extract: @@ -58,11 +61,14 @@ do-extract: then \ exit 1; \ fi; \ - cd ${WRKSRC}/langpack-$$lang@thunderbird.mozilla.org/chrome/$$lang; \ - ${LOCALBASE}/bin/zip -r ../$$lang.jar locale; \ - cd ..; ${RM} -rf $$lang; cd ..; \ - ${REINPLACE_CMD} -i "" "s,chrome/$$lang,jar:chrome/$$lang.jar!," chrome.manifest; \ + cd ${WRKSRC}/langpack-$$lang@thunderbird.mozilla.org/; \ + ${FIND} -H -s * ! -type d | \ + ${SED} -e "s|^|lib/xpi/langpack-$$lang@thunderbird.mozilla.org/|" >> ${PLISTF} && \ + ${FIND} -d * -type d | \ + ${SED} -e "s|^|@dirrm lib/xpi/langpack-$$lang@thunderbird.mozilla.org/|" >> ${PLISTD}; \ done + ${CAT} ${PLISTF} | ${SORT} >> ${PLIST} + ${CAT} ${PLISTD} | ${SORT} -r >> ${PLIST} do-install: @${INSTALL} -d ${XPI_LIBDIR} ${XPI_SLDIRS_ALL} diff --git a/mail/thunderbird-i18n/Makefile b/mail/thunderbird-i18n/Makefile index e41f4801849c..de69a509b451 100644 --- a/mail/thunderbird-i18n/Makefile +++ b/mail/thunderbird-i18n/Makefile @@ -7,6 +7,7 @@ PORTNAME= thunderbird-i18n PORTVERSION= 10.0.3 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITE_SUBDIR= thunderbird/releases/${PORTVERSION}esr/linux-i686/xpi PKGNAMEPREFIX= @@ -18,6 +19,10 @@ COMMENT= Localized interface for Thunderbird EXTRACT_DEPENDS= zip:${PORTSDIR}/archivers/zip +PLIST?= ${WRKDIR}/plist +PLISTD?= ${WRKDIR}/plist_dirs +PLISTF?= ${WRKDIR}/plist_files + .ifndef WITHOUT_SWITCHER RUN_DEPENDS+= xpi-quick-locale-switcher>=0:${PORTSDIR}/www/xpi-quick-locale-switcher .endif @@ -46,8 +51,6 @@ WDIR= langpack-*@thunderbird.mozilla.org XPI_DISTNAMES= ${THUNDERBIRD_I18N_} .for dist in ${XPI_DISTNAMES} XPI_ID_${dist}= langpack-${dist}@thunderbird.mozilla.org -XPI_FILES_${dist}= chrome.manifest install.rdf chrome/${dist}.jar -XPI_DIRS_${dist}= chrome .endfor do-extract: @@ -58,11 +61,14 @@ do-extract: then \ exit 1; \ fi; \ - cd ${WRKSRC}/langpack-$$lang@thunderbird.mozilla.org/chrome/$$lang; \ - ${LOCALBASE}/bin/zip -r ../$$lang.jar locale; \ - cd ..; ${RM} -rf $$lang; cd ..; \ - ${REINPLACE_CMD} -i "" "s,chrome/$$lang,jar:chrome/$$lang.jar!," chrome.manifest; \ + cd ${WRKSRC}/langpack-$$lang@thunderbird.mozilla.org/; \ + ${FIND} -H -s * ! -type d | \ + ${SED} -e "s|^|lib/xpi/langpack-$$lang@thunderbird.mozilla.org/|" >> ${PLISTF} && \ + ${FIND} -d * -type d | \ + ${SED} -e "s|^|@dirrm lib/xpi/langpack-$$lang@thunderbird.mozilla.org/|" >> ${PLISTD}; \ done + ${CAT} ${PLISTF} | ${SORT} >> ${PLIST} + ${CAT} ${PLISTD} | ${SORT} -r >> ${PLIST} do-install: @${INSTALL} -d ${XPI_LIBDIR} ${XPI_SLDIRS_ALL} |