git: 9abe6dd39ff7 - main - www/webalizer: fix build for japanese
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 24 Apr 2024 16:57:29 UTC
The branch main has been updated by dinoex:
URL: https://cgit.FreeBSD.org/ports/commit/?id=9abe6dd39ff763f90e90a03a56e1b74a05cd36e2
commit 9abe6dd39ff763f90e90a03a56e1b74a05cd36e2
Author: Dirk Meyer <dinoex@FreeBSD.org>
AuthorDate: 2024-04-24 16:57:14 +0000
Commit: Dirk Meyer <dinoex@FreeBSD.org>
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 <META NAME="author" CONTENT="The Webalizer">
--#HTMLHead <META NAME="ROBOTS" CONTENT="NOINDEX, NOFOLLOW">
-+HTMLHead <META NAME="ROBOTS" CONTENT="NOINDEX, NOFOLLOW">
-+HTMLHead <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=x-euc-jp">
-
- # HTMLBody defined the HTML code to be inserted, starting with the
- # <BODY> 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'