From 5fc221343d12a9578994a66f4e409618539ae0cc Mon Sep 17 00:00:00 2001 From: martynas Date: Sat, 27 Sep 2008 19:14:32 +0000 Subject: [PATCH] simplify, since main is not special anymore. adapted from naddy@'s diff for mozilla-dicts. ok naddy@ --- mail/thunderbird-i18n/Makefile | 26 ++++++----------- .../thunderbird-i18n/pkg/DESCR-en-GB | 2 +- mail/thunderbird-i18n/pkg/PLIST-en-GB | 8 ++++++ mail/thunderbird-i18n/pkg/PLIST-main | 8 ------ www/firefox-i18n/Makefile | 28 +++++++------------ .../firefox-i18n/pkg/DESCR-en-GB | 2 +- www/firefox-i18n/pkg/PLIST-en-GB | 8 ++++++ www/firefox-i18n/pkg/PLIST-main | 8 ------ 8 files changed, 37 insertions(+), 53 deletions(-) rename www/firefox-i18n/pkg/DESCR-main => mail/thunderbird-i18n/pkg/DESCR-en-GB (81%) create mode 100644 mail/thunderbird-i18n/pkg/PLIST-en-GB delete mode 100644 mail/thunderbird-i18n/pkg/PLIST-main rename mail/thunderbird-i18n/pkg/DESCR-main => www/firefox-i18n/pkg/DESCR-en-GB (80%) create mode 100644 www/firefox-i18n/pkg/PLIST-en-GB delete mode 100644 www/firefox-i18n/pkg/PLIST-main diff --git a/mail/thunderbird-i18n/Makefile b/mail/thunderbird-i18n/Makefile index 444912e0bb7..547d087323d 100644 --- a/mail/thunderbird-i18n/Makefile +++ b/mail/thunderbird-i18n/Makefile @@ -1,12 +1,10 @@ -# $OpenBSD: Makefile,v 1.22 2008/09/26 19:35:47 martynas Exp $ +# $OpenBSD: Makefile,v 1.23 2008/09/27 19:14:32 martynas Exp $ PKG_ARCH= * -COMMENT-main= ${MAINLANG} language pack for Thunderbird V= 2.0.0.17 NAME= thunderbird-i18n -PKGNAME= ${NAME}-${MAINLANG}-${V} -PKGNAME-main= ${NAME}-${MAINLANG}-${V} # also see below +PKGNAME= ${NAME}-${V} CATEGORIES= mail @@ -22,10 +20,8 @@ PERMIT_DISTFILES_FTP= Yes MASTER_SITES= http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/${V}/linux-i686/xpi/ -# define one language for the main package -MAINLANG= en-GB -OTHERLANGS= be bg ca cs da de el es-AR es-ES eu fi fr ga-IE \ - hu it ja ko lt nb-NO nl nn-NO pl pt-BR pt-PT \ +LANGUAGES= be bg ca cs da de el en-GB es-AR es-ES eu fi fr \ + ga-IE hu it ja ko lt nb-NO nl nn-NO pl pt-BR pt-PT \ ru sk sl sv-SE tr zh-CN zh-TW # broken: mk pa-IN @@ -36,12 +32,10 @@ DIST_SUBDIR= ${NAME}-${V} NO_BUILD= Yes NO_REGRESS= Yes -DISTFILES= ${MAINLANG}.xpi -LPACKDIR-${MAINLANG}=${PREFIX}/mozilla-thunderbird/extensions/langpack-${MAINLANG}@thunderbird.mozilla.org +# define one language for the main package +SUBPACKAGE?= -en-GB -MULTI_PACKAGES= -main - -.for i in ${OTHERLANGS} +.for i in ${LANGUAGES} MULTI_PACKAGES+=-$i DISTFILES+= $i.xpi PKGNAME-$i= ${NAME}-$i-${V} @@ -52,16 +46,14 @@ LPACKDIR-$i= ${PREFIX}/mozilla-thunderbird/extensions/langpack-$i@thunderbird.mo # use the same for all subpackages MESSAGE= ${PKGDIR}/MESSAGE -SUBST_VARS= MAINLANG - do-extract: -.for i in ${MAINLANG} ${OTHERLANGS} +.for i in ${LANGUAGES} @mkdir -p ${WRKDIR}/$i @${UNZIP} -oq ${FULLDISTDIR}/$i.xpi -d ${WRKDIR}/$i .endfor do-install: -.for i in ${MAINLANG} ${OTHERLANGS} +.for i in ${LANGUAGES} ${INSTALL_DATA_DIR} ${LPACKDIR-$i}/chrome ${INSTALL_DATA} ${WRKSRC}/$i/chrome.manifest ${LPACKDIR-$i} ${INSTALL_DATA} ${WRKSRC}/$i/install.rdf ${LPACKDIR-$i} diff --git a/www/firefox-i18n/pkg/DESCR-main b/mail/thunderbird-i18n/pkg/DESCR-en-GB similarity index 81% rename from www/firefox-i18n/pkg/DESCR-main rename to mail/thunderbird-i18n/pkg/DESCR-en-GB index 4ba5681b7ea..83342fe9495 100644 --- a/www/firefox-i18n/pkg/DESCR-main +++ b/mail/thunderbird-i18n/pkg/DESCR-en-GB @@ -1,4 +1,4 @@ -Language pack (${MAINLANG}) for Firefox by MLP. +Language pack (en-GB) for Thunderbird by MLP. Mozilla Localization Project, abbreviated as MLP, tries to help and ease the availability of mozilla.org products toward different world cultures and languages through the support of the open source community. diff --git a/mail/thunderbird-i18n/pkg/PLIST-en-GB b/mail/thunderbird-i18n/pkg/PLIST-en-GB new file mode 100644 index 00000000000..4b179013706 --- /dev/null +++ b/mail/thunderbird-i18n/pkg/PLIST-en-GB @@ -0,0 +1,8 @@ +@comment $OpenBSD: PLIST-en-GB,v 1.1 2008/09/27 19:14:33 martynas Exp $ +@pkgpath mail/thunderbird-i18n +mozilla-thunderbird/extensions/langpack-en-GB@thunderbird.mozilla.org/ +mozilla-thunderbird/extensions/langpack-en-GB@thunderbird.mozilla.org/chrome/ +mozilla-thunderbird/extensions/langpack-en-GB@thunderbird.mozilla.org/chrome.manifest +mozilla-thunderbird/extensions/langpack-en-GB@thunderbird.mozilla.org/chrome/chromelist.txt +mozilla-thunderbird/extensions/langpack-en-GB@thunderbird.mozilla.org/chrome/en-GB.jar +mozilla-thunderbird/extensions/langpack-en-GB@thunderbird.mozilla.org/install.rdf diff --git a/mail/thunderbird-i18n/pkg/PLIST-main b/mail/thunderbird-i18n/pkg/PLIST-main deleted file mode 100644 index 6cf11a0eb68..00000000000 --- a/mail/thunderbird-i18n/pkg/PLIST-main +++ /dev/null @@ -1,8 +0,0 @@ -@comment $OpenBSD: PLIST-main,v 1.1 2006/11/22 07:54:11 steven Exp $ -@pkgpath mail/thunderbird-i18n -mozilla-thunderbird/extensions/langpack-${MAINLANG}@thunderbird.mozilla.org/ -mozilla-thunderbird/extensions/langpack-${MAINLANG}@thunderbird.mozilla.org/chrome/ -mozilla-thunderbird/extensions/langpack-${MAINLANG}@thunderbird.mozilla.org/chrome.manifest -mozilla-thunderbird/extensions/langpack-${MAINLANG}@thunderbird.mozilla.org/chrome/chromelist.txt -mozilla-thunderbird/extensions/langpack-${MAINLANG}@thunderbird.mozilla.org/chrome/${MAINLANG}.jar -mozilla-thunderbird/extensions/langpack-${MAINLANG}@thunderbird.mozilla.org/install.rdf diff --git a/www/firefox-i18n/Makefile b/www/firefox-i18n/Makefile index d6a353ffa69..645b098f442 100644 --- a/www/firefox-i18n/Makefile +++ b/www/firefox-i18n/Makefile @@ -1,12 +1,10 @@ -# $OpenBSD: Makefile,v 1.28 2008/09/24 19:52:05 martynas Exp $ +# $OpenBSD: Makefile,v 1.29 2008/09/27 19:14:33 martynas Exp $ PKG_ARCH= * -COMMENT-main= ${MAINLANG} language pack for Firefox V= 2.0.0.17 NAME= firefox-i18n -PKGNAME= ${NAME}-${MAINLANG}-${V} -PKGNAME-main= ${NAME}-${MAINLANG}-${V} +PKGNAME= ${NAME}-${V} CATEGORIES= www @@ -22,11 +20,9 @@ PERMIT_DISTFILES_FTP= Yes MASTER_SITES= http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${V}/linux-i686/xpi/ -# define one language for the main package -MAINLANG= en-GB -OTHERLANGS= af ar be bg ca cs da de el es-AR es-ES eu fi fr ga-IE gu-IN \ - he hu it ja ka ko ku lt mn nb-NO nl nn-NO pl pt-BR ru sk sl \ - sv-SE tr zh-CN zh-TW +LANGUAGES= af ar be bg ca cs da de el en-GB es-AR es-ES eu fi \ + fr ga-IE gu-IN he hu it ja ka ko ku lt mn nb-NO nl \ + nn-NO pl pt-BR ru sk sl sv-SE tr zh-CN zh-TW # broken/inexistent: fy-NL mk pa-IN pt-PT ro BUILD_DEPENDS= :unzip-*:archivers/unzip @@ -36,12 +32,10 @@ DIST_SUBDIR= ${NAME}-${V} NO_BUILD= Yes NO_REGRESS= Yes -DISTFILES= ${MAINLANG}.xpi -LPACKDIR-${MAINLANG}=${PREFIX}/mozilla-firefox/extensions/langpack-${MAINLANG}@firefox.mozilla.org +# define one language for the main package +SUBPACKAGE?= -en-GB -MULTI_PACKAGES= -main - -.for i in ${OTHERLANGS} +.for i in ${LANGUAGES} MULTI_PACKAGES+=-$i DISTFILES+= $i.xpi PKGNAME-$i= ${NAME}-$i-${V} @@ -49,19 +43,17 @@ COMMENT-$i= $i language pack for Firefox LPACKDIR-$i= ${PREFIX}/mozilla-firefox/extensions/langpack-$i@firefox.mozilla.org .endfor -SUBST_VARS= MAINLANG - # use the same for all subpackages MESSAGE= ${PKGDIR}/MESSAGE do-extract: -.for i in ${MAINLANG} ${OTHERLANGS} +.for i in ${LANGUAGES} @mkdir -p ${WRKDIR}/$i @${UNZIP} -oq ${FULLDISTDIR}/$i.xpi -d ${WRKDIR}/$i .endfor do-install: -.for i in ${MAINLANG} ${OTHERLANGS} +.for i in ${LANGUAGES} ${INSTALL_DATA_DIR} ${LPACKDIR-$i}/chrome ${INSTALL_DATA} ${WRKSRC}/$i/chrome.manifest ${LPACKDIR-$i} ${INSTALL_DATA} ${WRKSRC}/$i/install.rdf ${LPACKDIR-$i} diff --git a/mail/thunderbird-i18n/pkg/DESCR-main b/www/firefox-i18n/pkg/DESCR-en-GB similarity index 80% rename from mail/thunderbird-i18n/pkg/DESCR-main rename to www/firefox-i18n/pkg/DESCR-en-GB index 3c7014f48f8..001fa7d7e9d 100644 --- a/mail/thunderbird-i18n/pkg/DESCR-main +++ b/www/firefox-i18n/pkg/DESCR-en-GB @@ -1,4 +1,4 @@ -Language pack (${MAINLANG}) for Thunderbird by MLP. +Language pack (en-GB) for Firefox by MLP. Mozilla Localization Project, abbreviated as MLP, tries to help and ease the availability of mozilla.org products toward different world cultures and languages through the support of the open source community. diff --git a/www/firefox-i18n/pkg/PLIST-en-GB b/www/firefox-i18n/pkg/PLIST-en-GB new file mode 100644 index 00000000000..4726e15e96f --- /dev/null +++ b/www/firefox-i18n/pkg/PLIST-en-GB @@ -0,0 +1,8 @@ +@comment $OpenBSD: PLIST-en-GB,v 1.1 2008/09/27 19:14:33 martynas Exp $ +@pkgpath www/firefox-i18n +mozilla-firefox/extensions/langpack-en-GB@firefox.mozilla.org/ +mozilla-firefox/extensions/langpack-en-GB@firefox.mozilla.org/chrome/ +mozilla-firefox/extensions/langpack-en-GB@firefox.mozilla.org/chrome.manifest +mozilla-firefox/extensions/langpack-en-GB@firefox.mozilla.org/chrome/chromelist.txt +mozilla-firefox/extensions/langpack-en-GB@firefox.mozilla.org/chrome/en-GB.jar +mozilla-firefox/extensions/langpack-en-GB@firefox.mozilla.org/install.rdf diff --git a/www/firefox-i18n/pkg/PLIST-main b/www/firefox-i18n/pkg/PLIST-main deleted file mode 100644 index 45c9f05dc3d..00000000000 --- a/www/firefox-i18n/pkg/PLIST-main +++ /dev/null @@ -1,8 +0,0 @@ -@comment $OpenBSD: PLIST-main,v 1.1 2006/11/22 07:40:24 steven Exp $ -@pkgpath www/firefox-i18n -mozilla-firefox/extensions/langpack-${MAINLANG}@firefox.mozilla.org/ -mozilla-firefox/extensions/langpack-${MAINLANG}@firefox.mozilla.org/chrome/ -mozilla-firefox/extensions/langpack-${MAINLANG}@firefox.mozilla.org/chrome.manifest -mozilla-firefox/extensions/langpack-${MAINLANG}@firefox.mozilla.org/chrome/chromelist.txt -mozilla-firefox/extensions/langpack-${MAINLANG}@firefox.mozilla.org/chrome/${MAINLANG}.jar -mozilla-firefox/extensions/langpack-${MAINLANG}@firefox.mozilla.org/install.rdf