From nobody Wed Apr 24 16:57:29 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 4VPlXT2hP5z5HyhC; Wed, 24 Apr 2024 16:57:29 +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 4VPlXT28Ywz4qH7; Wed, 24 Apr 2024 16:57:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713977849; 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=8nSoL/q8dwYY7QHaNOP86Ozs2odfIowUDZ84IeF/a7M=; b=kSMppBdzqhV93RkuC6UMKs7XlEPtPN8JrCunAryuVwFocLh1pnn+d/PhFZqbazn5SL15dX i7M4X53xHOVpiXbu9F9cs/fDL/p6XLAwCyOMBpeyRWNiO1CYWsdaI4/9QBjQVxxK74TMuA Q4BCE8dA4g+Jqa7f2ChnjiYEp7PYlHsyZbDrhPCkGVQRGTmMQ8j33sgjvu8LuNdAQHaRWr +5YiIKgZLdfeInRLAHWW1scZgoND+VouUSyA7aBFxFw2zVGBCjmxEZlGYUth1652/w3ZNH iuvdmvFMVxmFIHeyaBsLS0+g5mNmmGCHxBPIPRv61a2+CWvc7smnJ2REozJtXQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713977849; a=rsa-sha256; cv=none; b=FXP2InGbzn4EB8D9xDn/69Tmburi6Fw+wmRNRgOn2E0Q6PUmxEO44kWJc/Trs+l42Hvlon HPjJKMahwp9S3qexa16NyaLyG3DrxUgHudk2zWsJ/p7TzQdjZl/snK5AfAkYD5wTNnkMmm QScylgC8ge8bBqbalO7SzfzrUYmZpT4sMWTXOPstWMUGrCINmLGHWt1QhMEv/Ty0xtqFYP MZ+B6IwDLIuIx/RS16KCMGDBuytLI42SSyndGXELBsbCc8JtxDvxYHOG4cL4d7jwiYQbkJ 1B0H1ydhIMJj8uYCiwbT6duEwoGw5//3nzp8fp0l4pyIKAZAJUUE1DggWnOtyQ== 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=1713977849; 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=8nSoL/q8dwYY7QHaNOP86Ozs2odfIowUDZ84IeF/a7M=; b=T6nTrX4KcyAZKdpS446ncwBh7UJEdZ6PB35971GMhKTgnxBVvcGFItAlvvso4WSgnWjkjm oTS/SUC9670gxeLNrJVkbwGwvU6vhWdWxtXpMlNZYMM/BPj8a+7Gb9QnCvrA6RZ2zQvKGd wIzHevYoCSUEPbykt3s8e8JWk10J6QKPFq05gV09xyNbJnfn++Fx4R31aiAhl4L2Z0x3hG /r67XqkN3D6Ppo7l/PdcroFC9k00YuAtiaLA9PO3Op0oL8e8RGO1/xl1MxCISQe3WmQrsT lwS9w+r1VZT94CNqlBY9UW6oBz9S2QcNHwKFPGaa5zxajhe08VyAkwmqhjaFsQ== 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 4VPlXT1lsGzNpb; Wed, 24 Apr 2024 16:57:29 +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 43OGvTTm026087; Wed, 24 Apr 2024 16:57:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OGvTlk026084; Wed, 24 Apr 2024 16:57:29 GMT (envelope-from git) Date: Wed, 24 Apr 2024 16:57:29 GMT Message-Id: <202404241657.43OGvTlk026084@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: 9abe6dd39ff7 - main - www/webalizer: fix build for japanese 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: 9abe6dd39ff763f90e90a03a56e1b74a05cd36e2 Auto-Submitted: auto-generated The branch main has been updated by dinoex: URL: https://cgit.FreeBSD.org/ports/commit/?id=9abe6dd39ff763f90e90a03a56e1b74a05cd36e2 commit 9abe6dd39ff763f90e90a03a56e1b74a05cd36e2 Author: Dirk Meyer AuthorDate: 2024-04-24 16:57:14 +0000 Commit: Dirk Meyer CommitDate: 2024-04-24 16:57:14 +0000 www/webalizer: fix build for japanese mark option WEBALIZER_CONV as broken PR: 278400 --- www/webalizer/Makefile | 6 +-- www/webalizer/files/ja-webalizer.conf-dist.patch | 69 ------------------------ 2 files changed, 1 insertion(+), 74 deletions(-) diff --git a/www/webalizer/Makefile b/www/webalizer/Makefile index bc56f1271bbe..e6c9e9899f26 100644 --- a/www/webalizer/Makefile +++ b/www/webalizer/Makefile @@ -60,6 +60,7 @@ 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 @@ -112,11 +113,6 @@ SUPP_LANG= albanian arabic catalan chinese croatian czech danish dutch \ .if defined(WEBALIZER_LANG) CONFIGURE_ARGS+= --with-language=${WEBALIZER_LANG} -# The patch file is written by URASHIMA Akira -# see http://tyche.pu-toyama.ac.jp/~a-urasim/webalizer/ -.if ${WEBALIZER_LANG} == japanese -EXTRA_PATCHES+= ${FILESDIR}/ja-webalizer.conf-dist.patch -.endif .endif .if ${PORT_OPTIONS:MWEBALIZER_CONV} diff --git a/www/webalizer/files/ja-webalizer.conf-dist.patch b/www/webalizer/files/ja-webalizer.conf-dist.patch deleted file mode 100644 index c9d241df90e0..000000000000 --- a/www/webalizer/files/ja-webalizer.conf-dist.patch +++ /dev/null @@ -1,69 +0,0 @@ ---- sample.conf.orig 2008-07-01 22:09:31.000000000 +0200 -+++ sample.conf 2008-07-05 13:39:47.000000000 +0200 -@@ -107,9 +107,12 @@ - - PageType htm* - PageType cgi -+#PageType shtml - #PageType phtml - #PageType php3 -+#PageType php - #PageType pl -+#PageType rb - - # PagePrefix allows all requests with a specified prefix to be - # considered as 'pages'. If you want everything under /documents -@@ -242,7 +245,8 @@ - # is 80 characters, so use multiple lines if needed. - - #HTMLHead --#HTMLHead -+HTMLHead -+HTMLHead - - # HTMLBody defined the HTML code to be inserted, starting with the - # tag. If not specified, the default is shown below. If -@@ -545,6 +550,9 @@ - HideURL *.png - HideURL *.PNG - HideURL *.ra -+HideURL *.css -+HideURL *.CSS -+HideURL *.ico - - # Hiding agents is kind of futile - #HideAgent RealPlayer -@@ -564,6 +572,11 @@ - #GroupReferrer excite.com/ Excite - #GroupReferrer infoseek.com/ InfoSeek - #GroupReferrer webcrawler.com/ WebCrawler -+#GroupReferrer yahoo.co.jp/ Yahoo!Japan -+#GroupReferrer google.co.jp/ GoogleJapan -+#GroupReferrer infoseek.co.jp/ InfoSeekJapan -+#GroupReferrer goo.ne.jp/ Goo -+#GroupReferrer msn.co.jp/ MSNJapan - - #GroupUser root Admin users - #GroupUser admin Admin users -@@ -702,6 +715,21 @@ - #SearchEngine alltheweb.com q= - #SearchEngine northernlight.com qr= - -+SearchEngine yahoo.co.jp p= -+SearchEngine google.co.jp q= -+SearchEngine infoseek.co.jp qt= -+SearchEngine msn.co.jp q= -+# ocn -+SearchEngine goo.ne.jp MT= -+SearchEngine biglobe.ne.jp q= -+SearchEngine nifty.com Text= -+# so-net odn -+SearchEngine excite.co.jp search= -+SearchEngine livedoor.com q= -+SearchEngine jp.aol.com query= -+#SearchEngine .google. q= -+#SearchEngine bulkfeeds.net q= -+ - # Normally, search strings are converted to lower case in order to - # increase accuracy. The SearchCaseI option allows them to maintain - # case sensitivity, useful for some sites. The value can be 'yes'