From nobody Sun Apr 28 09:07:02 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VS0vp63DQz5JKQ0; Sun, 28 Apr 2024 09:07:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VS0vp5XQPz4Hrh; Sun, 28 Apr 2024 09:07:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714295222; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NWcRH3b/q1ET3zHmOnbrFt6zJUIW8CHOT6KZ5hA1rGU=; b=Dp+ih/W0ADF2iemb00TXc1hNlW5MakGESI1ohxqdg9ORI5G6uVhkzA7kSsgy6XLroQU6wk M7+Hlz5TPejb3vtC8cGHpRDFphbgwK9ckCJW1zKl+DWbceQD49hLVEDuCMvP3ZTTedjUf7 NhBEp1gg85bsoJwVueGSmp/vq1jwEY1k56cIwltScjK4PwkJFzYDHLhLjISmdZrSljTrVf cq+etzEmCiHiyrq0cCwKby/P9l8WFBcHduTqBjVbN7qYk/a5RzQN8X3XSernKBPZuzkPlP bFOAVZGpvf48RfI+GxXpOWnJBumJCgsVEMOWHGnMzFX2ZT04aiLwOHj1sVFO1A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714295222; a=rsa-sha256; cv=none; b=x948ldpdmm0rvdnGdB9efh3iK2YEzbqGPweEumaYsFGZr42RTv81pTdFMUA+F/3iM7sgRS 4LkXTrFvgMMK/vGFkHcB54C1eqrt+5rS3WKCxgno7TQkHVgrs5Trr86crr+FcQIv+f0p4S dIvdlXvByL9mAfLYihDMoQT6Zq0SXNKBQdHYBwFZVR51j7xFXfu1uZkdhgSZxDQ+vZOsxn ddA1Hwvo+63i6nyzIo5GACALdQVtBePIkkRHMGKOBhLHBwEG3+O+si5XWF8sAArXFa+veX 0BhfK7Sqb/QtHO4nXJQJTQAGZB76E5LUJZV1Zrw1zcKOklhdc/jggDrhphJQdw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714295222; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NWcRH3b/q1ET3zHmOnbrFt6zJUIW8CHOT6KZ5hA1rGU=; b=tdtT5dtZg4+vTZ4yC3M4taODqGtdI/wlHju6Qsk8a5KFAh1bkSLBZnBZCPNHg18CZyzww8 fCQS9SiSq40sT4dpPe3og6xAX+KqS9lvN8yNihjq7CW9wsxfFvZhQYO9n6Ywp7BtLuWBi5 VsiSp8BtTe0fwW4xOFlDSW8rmyc4LDHomn8CeItb74lU7ZiYHlzfDUolU5wGgpoiro7tXY gU5OKu321HIgh4nqrth4ogS0mSHyNF9K0TYj514/C4JqhVCF+4+DL8w21E8A/YaKayGKd9 y7Dw42PenTU/tEbOYBycZPoG5lVzgbqFv+/4O+J7xTtBZD+T09KyRH5oykq6Og== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VS0vp4xYJzJwV; Sun, 28 Apr 2024 09:07:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43S972RW079141; Sun, 28 Apr 2024 09:07:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43S972eQ079138; Sun, 28 Apr 2024 09:07:02 GMT (envelope-from git) Date: Sun, 28 Apr 2024 09:07:02 GMT Message-Id: <202404280907.43S972eQ079138@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dirk Meyer Subject: git: de1d4bd375fe - main - www/webalizer: support japanese EUC-JP and japanese UTF-8 encodings List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dinoex X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: de1d4bd375fe512044ef28f23fca25c3f9558f45 Auto-Submitted: auto-generated The branch main has been updated by dinoex: URL: https://cgit.FreeBSD.org/ports/commit/?id=de1d4bd375fe512044ef28f23fca25c3f9558f45 commit de1d4bd375fe512044ef28f23fca25c3f9558f45 Author: Dirk Meyer AuthorDate: 2024-04-28 09:06:49 +0000 Commit: Dirk Meyer CommitDate: 2024-04-28 09:06:49 +0000 www/webalizer: support japanese EUC-JP and japanese UTF-8 encodings PR: 278400 --- www/webalizer/Makefile | 22 +++++++++++++++++----- ...japanese => patch-webalizer_lang.japanese-utf8} | 4 ++-- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/www/webalizer/Makefile b/www/webalizer/Makefile index e6c9e9899f26..c82824a9e309 100644 --- a/www/webalizer/Makefile +++ b/www/webalizer/Makefile @@ -1,6 +1,6 @@ PORTNAME= webalizer PORTVERSION= 2.23.8 -PORTREVISION= 16 +PORTREVISION= 17 CATEGORIES+= www MASTER_SITES= ftp://ftp.dinoex.de/pub/FreeBSD/distfiles/:main \ http://flags.blogpotato.de/zip/:flags @@ -38,7 +38,7 @@ OPTIONS_SINGLE_DB= BDB1 BDB NO_OPTIONS_SORT=yes OPTIONS_SUB=yes GEODB_DESC=Enable Webalizers IP-Database support -WEBALIZER_CONV_DESC=Japanese character code convert patch +WEBALIZER_CONV_DESC=Japanese character code convert to EUC-JP FULL_CGI_REFS_DESC=Show full cgi parameters in referers CLICKABLE_REFERER_DESC=Make referers clickable IP_AS_HOSTNAME_DESC=Show IP as hostname when IP does not resolve @@ -60,7 +60,6 @@ WEBALIZER_CONV_USES= iconv WEBALIZER_CONV_CONFIGURE_ON= --enable-mininls WEBALIZER_CONV_CPPFLAGS= -I${LOCALBASE}/include WEBALIZER_CONV_LIBS= -L${LOCALBASE}/lib ${ICONV_LIB} -WEBALIZER_CONV_BROKEN= no conversion from UTF-8 needed FULL_CGI_REFS_CFLAGS= -DUSE_FULL_CGI_REFS CLICKABLE_REFERER_CFLAGS= -DUSE_CLICKABLE_REFERER IP_AS_HOSTNAME_CFLAGS= -DUSE_IP_AS_HOSTNAME @@ -105,8 +104,8 @@ 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 korean \ - latvian lithuanian malay norwegian polish portuguese \ + 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 @@ -116,11 +115,18 @@ CONFIGURE_ARGS+= --with-language=${WEBALIZER_LANG} .endif .if ${PORT_OPTIONS:MWEBALIZER_CONV} +.if ${WEBALIZER_LANG} != japanese +BROKEN= no conversion from UTF-8 needed +.endif # The patch file is written by URASHIMA Akira # see http://tyche.pu-toyama.ac.jp/~a-urasim/webalizer/ 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 @@ -143,6 +149,12 @@ pre-configure: -e "s|-lGeoIP|-lmaxminddb|" \ ${WRKSRC}/configure .endif +.if defined(WEBALIZER_LANG) +.if ${WEBALIZER_LANG} == japanese + ${REINPLACE_CMD} -e 's|charset=UTF-8|charset=x-euc-jp|' \ + ${WRKSRC}/sample.conf +.endif +.endif .if !defined(WEBALIZER_LANG) @${ECHO_MSG} "You can customize the language by typing" diff --git a/www/webalizer/files/patch-webalizer_lang.japanese b/www/webalizer/files/patch-webalizer_lang.japanese-utf8 similarity index 98% rename from www/webalizer/files/patch-webalizer_lang.japanese rename to www/webalizer/files/patch-webalizer_lang.japanese-utf8 index 16749bb2ace7..7f9a7926298e 100644 --- a/www/webalizer/files/patch-webalizer_lang.japanese +++ b/www/webalizer/files/patch-webalizer_lang.japanese-utf8 @@ -1,5 +1,5 @@ ---- lang/webalizer_lang.japanese.orig 2008-07-01 22:24:12 UTC -+++ lang/webalizer_lang.japanese +--- 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 */