www/webalizer: add support for most UTF-8 encodings

german/webalizer2/Makefile

@@ -3,7 +3,7 @@ CATEGORIES=	german
 MAINTAINER=	dinoex@FreeBSD.org
 
 MASTERDIR?=	${.CURDIR}/../../www/webalizer
-WEBALIZER_LANG=	german
+WEBALIZER_LANG=	german-utf8
 
 .sinclude "Makefile.local"
 .include "${MASTERDIR}/Makefile"

www/webalizer/Makefile

@@ -1,6 +1,6 @@
 PORTNAME=	webalizer
 PORTVERSION=	2.23.8
-PORTREVISION=	17
+PORTREVISION=	18
 CATEGORIES+=	www
 MASTER_SITES=	ftp://ftp.dinoex.de/pub/FreeBSD/distfiles/:main \
 		http://flags.blogpotato.de/zip/:flags
@@ -16,6 +16,7 @@ LICENSE=	GPLv2
 
 LIB_DEPENDS+=	libpng.so:graphics/png
 
+USES=		iconv:build
 GNU_CONFIGURE=	yes
 DOCSDIR?=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 EXAMPLESDIR?=	${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
@@ -102,14 +103,38 @@ DOC1=		CHANGES Copyright INSTALL \
 EXAMPLES1=	msfree.png sample.conf webalizer.png
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-src$//}
 PLIST_SUB+=	PKGNAMEPREFIX=${PKGNAMEPREFIX}
-SUPP_LANG=	albanian arabic catalan chinese croatian czech danish dutch \
-		english estonian finnish french galician german greek \
-		hungarian icelandic indonesian italian japanese japanese-utf8 \
-		korean latvian lithuanian malay norwegian polish portuguese \
-		portuguese_brazil romanian romanian-iso-8859-2 russian \
-		serbian simplified_chinese slovak slovene spanish swedish \
-		thai turkish ukrainian
-
+CHARSETS=	ISO-8859-1 ISO-8859-2 ISO-8859-5 ISO-8859-7 ISO-8859-13 \
+		ISO-8859-15 BIG5 EUC-CN EUC-JP EUC-KR TIS620 WINDOWS-1250
+CHARSET_ISO-8859-1=	catalan danish finnish french galician galician \
+			german icelandic norwegian portuguese \
+			portuguese_brazil spanish swedish
+CHARSET_ISO-8859-2=	czech hungarian polish slovak
+CHARSET_ISO-8859-7=	greek
+CHARSET_ISO-8859-5=	russian ukrainian
+CHARSET_ISO-8859-13=	latvian lithuanian 
+CHARSET_ISO-8859-15=	estonian
+CHARSET_BIG5=	chinese
+CHARSET_EUC-CN=	simplified_chinese
+CHARSET_EUC-JP=	japanese
+CHARSET_EUC-KR=	korean
+CHARSET_TIS620=	thai
+CHARSET_WINDOWS-1250=	slovene
+SUPP_LANG=	albanian arabic catalan catalan-utf8 chinese chinese-utf8 \
+		croatian czech czech-utf8 danish danish-utf8 dutch english \
+		estonian estonian-utf8 finnish finnish-utf8 \
+		french french-utf8 galician galician-utf8 german german-utf8 \
+		greek greek-utf8 hungarian hungarian-utf8 \
+		icelandic icelandic-uf8 indonesian italian \
+		japanese japanese-utf8 korean korean-utf8 \
+		latvian latvian-utf8 lithuanian lithuanian-utf8 malay \
+		norwegian norwegian-utf8 polish polish-utf8 \
+		portuguese portuguese-utf8 \
+		portuguese_brazil portuguese_brazil-utf8 \
+		romanian romanian-iso-8859-2 russian russian-utf8 \
+		serbian simplified_chinese simplified_chinese-utf8 \
+		slovak slovak-utf8 slovene slovene-utf8 spanish spanish-utf8 \
+		swedish swedish-utf8 thai thai-utf8 turkish \
+		ukrainian ukrainian-utf8
 .if defined(WEBALIZER_LANG)
 CONFIGURE_ARGS+=	--with-language=${WEBALIZER_LANG}
 .endif
@@ -123,10 +148,6 @@ BROKEN=		no conversion from UTF-8 needed
 EXTRA_PATCHES+=		${FILESDIR}/webalizer-a-urasim_2.patch
 .endif
 
-post-extract:
-	${CP} -p ${WRKSRC}/lang/webalizer_lang.japanese \
-		${WRKSRC}/lang/webalizer_lang.japanese-utf8
-
 pre-configure:
 	${REINPLACE_CMD} -e "s|/etc|${PREFIX}/etc|" \
 		${WRKSRC}/webalizer.1
@@ -149,6 +170,12 @@ pre-configure:
 		-e "s|-lGeoIP|-lmaxminddb|" \
 		${WRKSRC}/configure
 .endif
+.for charset in ${CHARSETS}
+.for i in ${CHARSET_${charset}}
+	${ICONV_CMD} -f ${charset} -t UTF-8 ${WRKSRC}/lang/webalizer_lang.${i} \
+		> ${WRKSRC}/lang/webalizer_lang.${i}-utf8
+.endfor
+.endfor
 .if defined(WEBALIZER_LANG)
 .if ${WEBALIZER_LANG} == japanese
 	${REINPLACE_CMD} -e 's|charset=UTF-8|charset=x-euc-jp|' \

www/webalizer/files/patch-webalizer_lang.japanese-utf8

@@ -1,159 +0,0 @@
---- lang/webalizer_lang.japanese-utf8.orig	2008-07-01 22:24:12 UTC
-+++ lang/webalizer_lang.japanese-utf8
-@@ -186,16 +186,16 @@ char *h_msg[]= {
- 
- /* header strings */
- /* char *msg_hhdr_sp = "Summary Period";*/
--char *msg_hhdr_sp = "讓煌渝棉";
--char *msg_hhdr_gt = "綜嶽ざ凜";
-+char *msg_hhdr_sp = "蝯梯<E89DAF><E6A2AF>罸<EFBFBD>";
-+char *msg_hhdr_gt = "雿𨀣<E99BBF><F0A880A3>交<EFBFBD>";
- 
- /* main index strings */
- char *msg_main_us = "Usage summary for";
--/* char *msg_main_per= "聊蛔12仳畸"; */
--char *msg_main_per= "畸及讓煌";
--char *msg_main_sum= "畸及讓煌";
--char *msg_main_da = "域ざ丐凶曰及尪剽";
--char *msg_main_mt = "畸寧煌";
-+/* char *msg_main_per= "<22>𤾸縧12<31>嗆<EFBFBD>"; */
-+char *msg_main_per= "<22><><EFBFBD>蝯梯<E89DAF>";
-+char *msg_main_sum= "<22><><EFBFBD>蝯梯<E89DAF>";
-+char *msg_main_da = "銝<><E98A9D>乓<EFBFBD><E4B993>麄<EFBFBD><E9BA84>桀像<E6A180><E5838F>";
-+char *msg_main_mt = "<22><><EFBFBD>閮<EFBFBD>";
- 
- /* month HTML page strings */
- char *msg_hmth_du = "Daily usage for";
-@@ -203,77 +203,77 @@ char *msg_hmth_hu = "Hourly usage for";
- 
- /* table header strings */
- char *msg_h_by    = "By";
--char *msg_h_avg   = "尪剽";
--char *msg_h_max   = "瘉釐";
--char *msg_h_total = "寧煌";
--char *msg_h_totals= "鍚寧煌";
--char *msg_h_day   = "ざ";
--char *msg_h_mth   = "畸";
--char *msg_h_hour  = "凜";
-+char *msg_h_avg   = "撟喳<E6929F>";
-+char *msg_h_max   = "<22><>憭<EFBFBD>";
-+char *msg_h_total = "<22><><EFBFBD>";
-+char *msg_h_totals= "蝺誩<E89DBA>閮<EFBFBD>";
-+char *msg_h_day   = "<22><>";
-+char *msg_h_mth   = "<22><>";
-+char *msg_h_hour  = "<22><>";
- char *msg_h_hits  = "Hits";
- char *msg_h_pages = "Pages";
- char *msg_h_visits= "Visits";
- char *msg_h_files = "Files";
- char *msg_h_sites = "Sites";
- char *msg_h_xfer  = "KBytes";
--char *msg_h_hname = "石旦玄抩";
-+char *msg_h_hname = "<22>䜘<EFBFBD><E49C98><EFBFBD><EFBFBD>";
- char *msg_h_url   = "URL";
--char *msg_h_agent = "交□扒巨□斥尼件玄";
--char *msg_h_ref   = "伉白央仿□";
--char *msg_h_ctry  = "嶄";
--char *msg_h_search= "腹綢妐儂昫";
--char *msg_h_uname = "交□扒抩";
-+char *msg_h_agent = "<22>艾<EFBFBD><E889BE>嗚<EFBFBD><E5979A>潦<EFBFBD><E6BDA6>扼<EFBFBD><E689BC><EFBFBD>";
-+char *msg_h_ref   = "<22>芥<EFBFBD><E88AA5>～<EFBFBD><EFBD9E><EFBFBD>";
-+char *msg_h_ctry  = "<22><>";
-+char *msg_h_search= "璊𦦵揣<F0A6A6B5><E68FA3><EFBFBD><EFBFBD><EFBFBD>";
-+char *msg_h_uname = "<22>艾<EFBFBD><E889BE>嗅<EFBFBD>";
- 
- /* links along top of page */
--char *msg_hlnk_ds = "ざ仍午及讓煌";
--char *msg_hlnk_hs = "凜棉仍午及讓煌";
-+char *msg_hlnk_ds = "<22>乓<EFBFBD><E4B993>具<EFBFBD>蝯梯<E89DAF>";
-+char *msg_hlnk_hs = "<22><><EFBFBD><EFBFBD>𢛵<EFBFBD><F0A29BB5>桃絞閮<E7B59E>";
- char *msg_hlnk_u  = "URL";
--char *msg_hlnk_s  = "扔奶玄";
--char *msg_hlnk_a  = "巨□斥尼件玄";
--char *msg_hlnk_c  = "嶄";
--char *msg_hlnk_r  = "伉白央仿□";
--char *msg_hlnk_en = "巨件玄伉□";
-+char *msg_hlnk_s  = "<22>萸<EFBFBD><E890B8><EFBFBD>";
-+char *msg_hlnk_a  = "<22>具<EFBFBD><E585B7>詻<EFBFBD><E8A9BB>喋<EFBFBD>";
-+char *msg_hlnk_c  = "<22><>";
-+char *msg_hlnk_r  = "<22>芥<EFBFBD><E88AA5>～<EFBFBD><EFBD9E><EFBFBD>";
-+char *msg_hlnk_en = "<22>具<EFBFBD><E585B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD>";
- char *msg_hlnk_ex = "Exit";
--char *msg_hlnk_sr = "腹綢妐儂昫";
--char *msg_hlnk_i  = "交□扒醒";
-+char *msg_hlnk_sr = "璊𦦵揣<F0A6A6B5><E68FA3><EFBFBD><EFBFBD><EFBFBD>";
-+char *msg_hlnk_i  = "<22>艾<EFBFBD><E889BE>嗆㺭";
- 
- /* monthly total table */
--char *msg_mtot_ms = "畸及讓煌";
--char *msg_mtot_th = "蟈甲永玄醒";
--char *msg_mtot_tf = "蟈白央奶伙醒";
--char *msg_mtot_tx = "蟈 KBytes醒";
--char *msg_mtot_us = "蜊帎扔奶玄醒";
--char *msg_mtot_ur = "蜊帎伉白央仿□醒";
--char *msg_mtot_ua = "蜊帎交□扒巨□斥尼件玄醒";
--char *msg_mtot_uu = "蜊帎URL醒";
--char *msg_mtot_ui = "蜊帎交□扒醒";
--char *msg_mtot_mhd= "域ざ丐凶曰及甲永玄醒";
--char *msg_mtot_mhh= "域凜棉丐凶曰及甲永玄醒";
--char *msg_mtot_mfd= "域ざ丐凶曰及白央奶伙醒";
--char *msg_mtot_mpd= "域ざ丐凶曰及矢□斥醒";
-+char *msg_mtot_ms = "<22><><EFBFBD>蝯梯<E89DAF>";
-+char *msg_mtot_th = "<22>具<EFBFBD><E585B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD>";
-+char *msg_mtot_tf = "<22>具<EFBFBD><E585B7>～<EFBFBD><EFBD9E>急㺭";
-+char *msg_mtot_tx = "<22><> KBytes<65><73>";
-+char *msg_mtot_us = "<22>见ê̌<C3AA>萸<EFBFBD><E890B8><EFBFBD>㺭";
-+char *msg_mtot_ur = "<22>见ê̌<C3AA>芥<EFBFBD><E88AA5>～<EFBFBD><EFBD9E>潭㺭";
-+char *msg_mtot_ua = "<22>见ê̌<C3AA>艾<EFBFBD><E889BE>嗚<EFBFBD><E5979A>潦<EFBFBD><E6BDA6>扼<EFBFBD><E689BC><EFBFBD>㺭";
-+char *msg_mtot_uu = "<22>见ê̌URL<52><4C>";
-+char *msg_mtot_ui = "<22>见ê̌<C3AA>艾<EFBFBD><E889BE>嗆㺭";
-+char *msg_mtot_mhd= "銝<><E98A9D>乓<EFBFBD><E4B993>麄<EFBFBD><E9BA84>柴<EFBFBD><E69FB4><EFBFBD><EFBFBD><EFBFBD><EFBFBD>";
-+char *msg_mtot_mhh= "銝<><E98A9D><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>𨳍<EFBFBD><F0A8B38D>鉝<EFBFBD><E9899D><EFBFBD>㺭";
-+char *msg_mtot_mfd= "銝<><E98A9D>乓<EFBFBD><E4B993>麄<EFBFBD><E9BA84>柴<EFBFBD><E69FB4>～<EFBFBD><EFBD9E>急㺭";
-+char *msg_mtot_mpd= "銝<><E98A9D>乓<EFBFBD><E4B993>麄<EFBFBD><E9BA84>柴<EFBFBD><E69FB4>潦<EFBFBD><E6BDA6><EFBFBD>";
- char *msg_mtot_msd= "Sites per Day";
--char *msg_mtot_mvd= "域ざ丐凶曰及邠杽樊醒";
--char *msg_mtot_mkd= "域ざ丐凶曰及KBytes醒";
--char *msg_mtot_rc = "伊旦禾件旦戊□玉仍午及甲永玄醒";
-+char *msg_mtot_mvd= "銝<><E98A9D>乓<EFBFBD><E4B993>麄<EFBFBD><E9BA84>株赤<E6A0AA>讛<EFBFBD><E8AE9B>㺭";
-+char *msg_mtot_mkd= "銝<><E98A9D>乓<EFBFBD><E4B993>麄<EFBFBD><E9BA84>堉Bytes<65><73>";
-+char *msg_mtot_rc = "<22>研<EFBFBD><E7A094>腈<EFBFBD><E88588>嫘<EFBFBD><E5AB98>潦<EFBFBD><E6BDA6>𢛵<EFBFBD><F0A29BB5>柴<EFBFBD><E69FB4><EFBFBD><EFBFBD><EFBFBD><EFBFBD>";
- 
- /* daily total table */
--char *msg_dtot_ds = "ざ仍午及讓煌";
-+char *msg_dtot_ds = "<22>乓<EFBFBD><E4B993>具<EFBFBD>蝯梯<E89DAF>";
- 
- /* hourly total table */
--char *msg_htot_hs = "凜棉仍午及讓煌";
-+char *msg_htot_hs = "<22><><EFBFBD><EFBFBD>𢛵<EFBFBD><F0A29BB5>桃絞閮<E7B59E>";
- 
- /* country pie chart */
- char *msg_ctry_use= "Usage by Country for";
- 
- /* top tables */
- /* Formatted as "Top xxx of xxx Total something" */
--char *msg_top_top = "玄永皿";
-+char *msg_top_top = "<22><><EFBFBD><EFBFBD><EFBFBD>";
- char *msg_top_of  = "of";
--char *msg_top_s   = "扔奶玄";
--char *msg_top_u   = "蟈URL";
--char *msg_top_r   = "伉白央仿□";
--char *msg_top_a   = "交□扒巨□斥尼件玄";
--char *msg_top_c   = "嶄";
-+char *msg_top_s   = "<22>萸<EFBFBD><E890B8><EFBFBD>";
-+char *msg_top_u   = "<22>沃RL";
-+char *msg_top_r   = "<22>芥<EFBFBD><E88AA5>～<EFBFBD><EFBD9E><EFBFBD>";
-+char *msg_top_a   = "<22>艾<EFBFBD><E889BE>嗚<EFBFBD><E5979A>潦<EFBFBD><E6BDA6>扼<EFBFBD><E689BC><EFBFBD>";
-+char *msg_top_c   = "<22><>";
- char *msg_top_en  = "Total Entry Pages";
- char *msg_top_ex  = "Total Exit Pages";
- char *msg_top_sr  = "Total Search Strings";
-@@ -340,7 +340,7 @@ struct response_code response[] =
-          { "Code 504 - Gateway Timeout",                 0 },
-          { "Code 505 - HTTP Version Not Supported",      0 } };
- 
--char *msg_title   = "厙迕讓煌";
-+char *msg_title   = "<22>拍鍂蝯梯<E89DAF>";
- char *msg_h_other = "Other";
- 
- /* Country codes (previously in ctry.h header file) */