Date: Thu, 22 Mar 2012 07:41:40 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r704 - branches/experimental/mail/thunderbird-esr-i18n branches/experimental/mail/thunderbird-i18n branches/experimental/www/firefox-esr-i18n branches/experimental/www/firefox-i18n branches/experimental/www/seamonkey-i18n trunk/mail/thunderbird-i18n trunk/www/firefox-i18n trunk/www/seamonkey-i18n Message-ID: <201203220741.q2M7feoG066679@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: beat
Date: Thu Mar 22 07:41:39 2012
New Revision: 704
Log:
- 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.
Modified:
branches/experimental/mail/thunderbird-esr-i18n/Makefile
branches/experimental/mail/thunderbird-i18n/Makefile
branches/experimental/www/firefox-esr-i18n/Makefile
branches/experimental/www/firefox-i18n/Makefile
branches/experimental/www/seamonkey-i18n/Makefile
trunk/mail/thunderbird-i18n/Makefile
trunk/www/firefox-i18n/Makefile
trunk/www/seamonkey-i18n/Makefile
Modified: branches/experimental/mail/thunderbird-esr-i18n/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird-esr-i18n/Makefile Fri Mar 16 12:34:27 2012 (r703)
+++ branches/experimental/mail/thunderbird-esr-i18n/Makefile Thu Mar 22 07:41:39 2012 (r704)
@@ -2,11 +2,12 @@
# Date created: 29 May 2006
# Whom: Andrew Pantyukhin <infofarmer@FreeBSD.org>
#
-# $FreeBSD: ports/mail/thunderbird-i18n/Makefile,v 1.59 2012/03/14 09:49:01 beat Exp $
+# $FreeBSD: ports/mail/thunderbird-i18n/Makefile,v 1.60 2012/03/22 07:30:27 beat Exp $
#
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 @@
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
@@ -47,8 +52,6 @@
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:
@@ -59,11 +62,14 @@
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}
Modified: branches/experimental/mail/thunderbird-i18n/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird-i18n/Makefile Fri Mar 16 12:34:27 2012 (r703)
+++ branches/experimental/mail/thunderbird-i18n/Makefile Thu Mar 22 07:41:39 2012 (r704)
@@ -18,6 +18,10 @@
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 +50,6 @@
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 +60,14 @@
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}
Modified: branches/experimental/www/firefox-esr-i18n/Makefile
==============================================================================
--- branches/experimental/www/firefox-esr-i18n/Makefile Fri Mar 16 12:34:27 2012 (r703)
+++ branches/experimental/www/firefox-esr-i18n/Makefile Thu Mar 22 07:41:39 2012 (r704)
@@ -2,11 +2,12 @@
# Date created: 28 May 2006
# Whom: Andrew Pantyukhin <infofarmer@FreeBSD.org>
#
-# $FreeBSD: ports/www/firefox-i18n/Makefile,v 1.68 2012/03/14 09:36:57 beat Exp $
+# $FreeBSD: ports/www/firefox-i18n/Makefile,v 1.69 2012/03/22 07:30:27 beat Exp $
#
PORTNAME= firefox-i18n
PORTVERSION= 10.0.3
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITE_SUBDIR= firefox/releases/${PORTVERSION}esr/linux-i686/xpi
PKGNAMEPREFIX=
@@ -28,6 +29,10 @@
XPI_DISTNAMES= ${FIREFOX_I18N_}
+PLIST?= ${WRKDIR}/plist
+PLISTD?= ${WRKDIR}/plist_dirs
+PLISTF?= ${WRKDIR}/plist_files
+
.include "${.CURDIR}/Makefile.option"
.include <bsd.port.pre.mk>
@@ -41,8 +46,6 @@
.for dist in ${XPI_DISTNAMES}
XPI_ID_${dist}= langpack-${dist}@firefox.mozilla.org
-XPI_FILES_${dist}= chrome.manifest install.rdf chrome/${dist}.jar
-XPI_DIRS_${dist}= chrome
.endfor
pre-everything::
@@ -57,11 +60,14 @@
then \
exit 1; \
fi; \
- cd ${WRKSRC}/langpack-$$lang@firefox.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@firefox.mozilla.org/; \
+ ${FIND} -H -s * ! -type d | \
+ ${SED} -e "s|^|lib/xpi/langpack-$$lang@firefox.mozilla.org/|" >> ${PLISTF} && \
+ ${FIND} -d * -type d | \
+ ${SED} -e "s|^|@dirrm lib/xpi/langpack-$$lang@firefox.mozilla.org/|" >> ${PLISTD}; \
done
+ ${CAT} ${PLISTF} | ${SORT} >> ${PLIST}
+ ${CAT} ${PLISTD} | ${SORT} -r >> ${PLIST}
.if !exists(${OPTIONSFILE}) && !defined(PACKAGE_BUILDING)
pre-configure: config
Modified: branches/experimental/www/firefox-i18n/Makefile
==============================================================================
--- branches/experimental/www/firefox-i18n/Makefile Fri Mar 16 12:34:27 2012 (r703)
+++ branches/experimental/www/firefox-i18n/Makefile Thu Mar 22 07:41:39 2012 (r704)
@@ -27,6 +27,10 @@
XPI_DISTNAMES= ${FIREFOX_I18N_}
+PLIST?= ${WRKDIR}/plist
+PLISTD?= ${WRKDIR}/plist_dirs
+PLISTF?= ${WRKDIR}/plist_files
+
.include "${.CURDIR}/Makefile.option"
.include <bsd.port.pre.mk>
@@ -40,8 +44,6 @@
.for dist in ${XPI_DISTNAMES}
XPI_ID_${dist}= langpack-${dist}@firefox.mozilla.org
-XPI_FILES_${dist}= chrome.manifest install.rdf chrome/${dist}.jar
-XPI_DIRS_${dist}= chrome
.endfor
pre-everything::
@@ -56,11 +58,14 @@
then \
exit 1; \
fi; \
- cd ${WRKSRC}/langpack-$$lang@firefox.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@firefox.mozilla.org/; \
+ ${FIND} -H -s * ! -type d | \
+ ${SED} -e "s|^|lib/xpi/langpack-$$lang@firefox.mozilla.org/|" >> ${PLISTF} && \
+ ${FIND} -d * -type d | \
+ ${SED} -e "s|^|@dirrm lib/xpi/langpack-$$lang@firefox.mozilla.org/|" >> ${PLISTD}; \
done
+ ${CAT} ${PLISTF} | ${SORT} >> ${PLIST}
+ ${CAT} ${PLISTD} | ${SORT} -r >> ${PLIST}
.if !exists(${OPTIONSFILE}) && !defined(PACKAGE_BUILDING)
pre-configure: config
Modified: branches/experimental/www/seamonkey-i18n/Makefile
==============================================================================
--- branches/experimental/www/seamonkey-i18n/Makefile Fri Mar 16 12:34:27 2012 (r703)
+++ branches/experimental/www/seamonkey-i18n/Makefile Thu Mar 22 07:41:39 2012 (r704)
@@ -2,11 +2,12 @@
# Date created: 28 May 2006
# Whom: Andrew Pantyukhin <infofarmer@FreeBSD.org>
#
-# $FreeBSD: ports/www/seamonkey-i18n/Makefile,v 1.19 2012/03/14 15:50:04 beat Exp $
+# $FreeBSD: ports/www/seamonkey-i18n/Makefile,v 1.20 2012/03/22 07:30:27 beat Exp $
#
PORTNAME= seamonkey-i18n
PORTVERSION= 2.8
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITE_SUBDIR= seamonkey/releases/${PORTVERSION}/langpack
PKGNAMEPREFIX=
@@ -18,6 +19,10 @@
EXTRACT_DEPENDS= zip:${PORTSDIR}/archivers/zip
+PLIST?= ${WRKDIR}/plist
+PLISTD?= ${WRKDIR}/plist_dirs
+PLISTF?= ${WRKDIR}/plist_files
+
USE_SEAMONKEY= 28
USE_XPI= seamonkey linux-seamonkey
@@ -39,8 +44,6 @@
.for dist in ${XPI_DISTNAMES}
XPI_ID_${dist}= langpack-${dist}@seamonkey.mozilla.org
-XPI_FILES_${dist}= chrome.manifest install.rdf chrome/${dist}.jar
-XPI_DIRS_${dist}= chrome
.endfor
pre-everything::
@@ -55,11 +58,14 @@
then \
exit 1; \
fi; \
- cd ${WRKSRC}/langpack-$$lang@seamonkey.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@seamonkey.mozilla.org/; \
+ ${FIND} -H -s * ! -type d | \
+ ${SED} -e "s|^|lib/xpi/langpack-$$lang@seamonkey.mozilla.org/|" >> ${PLISTF} && \
+ ${FIND} -d * -type d | \
+ ${SED} -e "s|^|@dirrm lib/xpi/langpack-$$lang@seamonkey.mozilla.org/|" >> ${PLISTD}; \
done
+ ${CAT} ${PLISTF} | ${SORT} >> ${PLIST}
+ ${CAT} ${PLISTD} | ${SORT} -r >> ${PLIST}
do-install:
@${INSTALL} -d ${XPI_LIBDIR} ${XPI_SLDIRS_ALL}
Modified: trunk/mail/thunderbird-i18n/Makefile
==============================================================================
--- trunk/mail/thunderbird-i18n/Makefile Fri Mar 16 12:34:27 2012 (r703)
+++ trunk/mail/thunderbird-i18n/Makefile Thu Mar 22 07:41:39 2012 (r704)
@@ -2,11 +2,12 @@
# Date created: 29 May 2006
# Whom: Andrew Pantyukhin <infofarmer@FreeBSD.org>
#
-# $FreeBSD: ports/mail/thunderbird-i18n/Makefile,v 1.59 2012/03/14 09:49:01 beat Exp $
+# $FreeBSD: ports/mail/thunderbird-i18n/Makefile,v 1.60 2012/03/22 07:30:27 beat Exp $
#
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 @@
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 @@
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 @@
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}
Modified: trunk/www/firefox-i18n/Makefile
==============================================================================
--- trunk/www/firefox-i18n/Makefile Fri Mar 16 12:34:27 2012 (r703)
+++ trunk/www/firefox-i18n/Makefile Thu Mar 22 07:41:39 2012 (r704)
@@ -2,11 +2,12 @@
# Date created: 28 May 2006
# Whom: Andrew Pantyukhin <infofarmer@FreeBSD.org>
#
-# $FreeBSD: ports/www/firefox-i18n/Makefile,v 1.68 2012/03/14 09:36:57 beat Exp $
+# $FreeBSD: ports/www/firefox-i18n/Makefile,v 1.69 2012/03/22 07:30:27 beat Exp $
#
PORTNAME= firefox-i18n
PORTVERSION= 10.0.3
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITE_SUBDIR= firefox/releases/${PORTVERSION}esr/linux-i686/xpi
PKGNAMEPREFIX=
@@ -27,6 +28,10 @@
XPI_DISTNAMES= ${FIREFOX_I18N_}
+PLIST?= ${WRKDIR}/plist
+PLISTD?= ${WRKDIR}/plist_dirs
+PLISTF?= ${WRKDIR}/plist_files
+
.include "${.CURDIR}/Makefile.option"
.include <bsd.port.pre.mk>
@@ -40,8 +45,6 @@
.for dist in ${XPI_DISTNAMES}
XPI_ID_${dist}= langpack-${dist}@firefox.mozilla.org
-XPI_FILES_${dist}= chrome.manifest install.rdf chrome/${dist}.jar
-XPI_DIRS_${dist}= chrome
.endfor
pre-everything::
@@ -56,11 +59,14 @@
then \
exit 1; \
fi; \
- cd ${WRKSRC}/langpack-$$lang@firefox.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@firefox.mozilla.org/; \
+ ${FIND} -H -s * ! -type d | \
+ ${SED} -e "s|^|lib/xpi/langpack-$$lang@firefox.mozilla.org/|" >> ${PLISTF} && \
+ ${FIND} -d * -type d | \
+ ${SED} -e "s|^|@dirrm lib/xpi/langpack-$$lang@firefox.mozilla.org/|" >> ${PLISTD}; \
done
+ ${CAT} ${PLISTF} | ${SORT} >> ${PLIST}
+ ${CAT} ${PLISTD} | ${SORT} -r >> ${PLIST}
.if !exists(${OPTIONSFILE}) && !defined(PACKAGE_BUILDING)
pre-configure: config
Modified: trunk/www/seamonkey-i18n/Makefile
==============================================================================
--- trunk/www/seamonkey-i18n/Makefile Fri Mar 16 12:34:27 2012 (r703)
+++ trunk/www/seamonkey-i18n/Makefile Thu Mar 22 07:41:39 2012 (r704)
@@ -2,11 +2,12 @@
# Date created: 28 May 2006
# Whom: Andrew Pantyukhin <infofarmer@FreeBSD.org>
#
-# $FreeBSD: ports/www/seamonkey-i18n/Makefile,v 1.19 2012/03/14 15:50:04 beat Exp $
+# $FreeBSD: ports/www/seamonkey-i18n/Makefile,v 1.20 2012/03/22 07:30:27 beat Exp $
#
PORTNAME= seamonkey-i18n
PORTVERSION= 2.8
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITE_SUBDIR= seamonkey/releases/${PORTVERSION}/langpack
PKGNAMEPREFIX=
@@ -18,6 +19,10 @@
EXTRACT_DEPENDS= zip:${PORTSDIR}/archivers/zip
+PLIST?= ${WRKDIR}/plist
+PLISTD?= ${WRKDIR}/plist_dirs
+PLISTF?= ${WRKDIR}/plist_files
+
USE_SEAMONKEY= 28
USE_XPI= seamonkey linux-seamonkey
@@ -39,8 +44,6 @@
.for dist in ${XPI_DISTNAMES}
XPI_ID_${dist}= langpack-${dist}@seamonkey.mozilla.org
-XPI_FILES_${dist}= chrome.manifest install.rdf chrome/${dist}.jar
-XPI_DIRS_${dist}= chrome
.endfor
pre-everything::
@@ -55,11 +58,14 @@
then \
exit 1; \
fi; \
- cd ${WRKSRC}/langpack-$$lang@seamonkey.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@seamonkey.mozilla.org/; \
+ ${FIND} -H -s * ! -type d | \
+ ${SED} -e "s|^|lib/xpi/langpack-$$lang@seamonkey.mozilla.org/|" >> ${PLISTF} && \
+ ${FIND} -d * -type d | \
+ ${SED} -e "s|^|@dirrm lib/xpi/langpack-$$lang@seamonkey.mozilla.org/|" >> ${PLISTD}; \
done
+ ${CAT} ${PLISTF} | ${SORT} >> ${PLIST}
+ ${CAT} ${PLISTD} | ${SORT} -r >> ${PLIST}
do-install:
@${INSTALL} -d ${XPI_LIBDIR} ${XPI_SLDIRS_ALL}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201203220741.q2M7feoG066679>