From nobody Sat Sep 30 02:24:35 2023 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 4Ry9yr0Tw3z4v6pj; Sat, 30 Sep 2023 02:24:36 +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 4Ry9yq6zMrz4R10; Sat, 30 Sep 2023 02:24:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696040676; 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=CVMT08kAGXB/I15JMArO+mE/Yir1dNYfOiASnMP6wkc=; b=LzB8K2wGhcUnw0zMgRZ5lB8NJNCngenRXafJERaylz6/hE5904l1X65tYd0YqBPasKJ1Dy tEsv/ty+65wmEIebULhxIJ173W81mzOQufT3TgF0OW/0AJ80ekYgiGoPD+4865IK4PIluO itjdGYet9ODiokLwryagxRA5vUIGq/BoD+B6WdW5IC9IqXI/4fG0c91rgFDGqGcBOt8/mg 2GWLnuKFssH3dujJejfJixWVuRMhA3AbxvTq0L8Mew5UP2HowwwG9CebfUCBdNqKQVbjQi DTQ3vq7P/aVKxr64EOCkEBnbyCkXT8uRbva28VFCBlnzHNvqrVd6pnE38oVWdg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696040676; a=rsa-sha256; cv=none; b=efGPQ+DpoIpjyWQ1VJeuwfIibkTGjR/kYqjxtlX8BYyK+LKrq1oBfnKb1klYg+/gPleED5 uwy5PYdJvzg0CA761vDZjJbSnnDW2yOXIk1PhaJDlxdOEF7IZ/MnAtUMPjiv9JWbo6/S3o bsqpHKjNajivUr5zX37yxxo8TfB6PKTXSDhPhRLn5X9xNn62LWyPwU0ynue2DtWrob1TcN DAwkdb8gn0ymfM48kbG1y+hq+zkVI9lIde/A3jprSdHT/NqwTZ4UQALFcG9rkRvu8Vmopv 6i2dqN68GZEx1TIRQDY0M8aG/T03iSHgXDrUeSPPeXslFlO5hDqceMkJKHXVcg== 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=1696040676; 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=CVMT08kAGXB/I15JMArO+mE/Yir1dNYfOiASnMP6wkc=; b=c+rI97xf+WQDWfG9Ej9zARSVCIORqxBPa15hobMZST0ID3moH/Je6B3v76/v5KTFPNoZbR vS6Y1FcnGJxyCwo8gLNCRhzvPHUXbBuE1u48Re4adQ2a1ppD+5Zp71pvNxp0QLigEnSLUk 9JBL07HHcDvukvZapeNhISPqTmr+pFFIt0XXv2E/+fNgUUDrkTli8iJxByjZgFbPH+vtYg Gqnaq4qdEgsFiIzSv6zj3GKryEPTDX9438EcOTFx3tISmWDtmv1ZUcrYwSURcfdO7bcKNq 8b9bY6oQwhOXM5rzOc5gZG9qQPFLXXFXa30S3d+Pnvzf6YtHmlXur1NmgKFeUg== 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 4Ry9yq5XCszVLV; Sat, 30 Sep 2023 02:24:35 +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 38U2OZ19095699; Sat, 30 Sep 2023 02:24:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38U2OZIJ095696; Sat, 30 Sep 2023 02:24:35 GMT (envelope-from git) Date: Sat, 30 Sep 2023 02:24:35 GMT Message-Id: <202309300224.38U2OZIJ095696@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 7d272816979d - main - japanese/awffull: Remove expired port 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7d272816979dacf0e12ed03a46e2064996a067e3 Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=7d272816979dacf0e12ed03a46e2064996a067e3 commit 7d272816979dacf0e12ed03a46e2064996a067e3 Author: Muhammad Moinur Rahman AuthorDate: 2023-09-30 01:19:07 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-09-30 02:22:58 +0000 japanese/awffull: Remove expired port 2023-09-30 japanese/awffull: Abandonware, last release in 14+ years ago. Consider using www/awstats --- MOVED | 1 + japanese/Makefile | 1 - japanese/awffull/Makefile | 10 -- japanese/awffull/files/awffull-ja.diff | 267 --------------------------------- 4 files changed, 1 insertion(+), 278 deletions(-) diff --git a/MOVED b/MOVED index d7258dcebdf1..04eead5c1b90 100644 --- a/MOVED +++ b/MOVED @@ -7913,3 +7913,4 @@ sysutils/bareos19-client|sysutils/bareos20-client|2023-09-30|Has expired: Upstre sysutils/bareos19-server|sysutils/bareos20-server|2023-09-30|Has expired: Upstream EOL reached textproc/popup||2023-09-30|Has expired: Abandonware, last release in 2004 and dead upstream textproc/yamcha||2023-09-30|Has expired: Last upstream release was in 2005 +japanese/awffull||2023-09-30|Has expired: Abandonware, last release in 14+ years ago. Consider using www/awstats diff --git a/japanese/Makefile b/japanese/Makefile index 50f4a5e67a96..512c96098470 100644 --- a/japanese/Makefile +++ b/japanese/Makefile @@ -14,7 +14,6 @@ SUBDIR += alias-fonts SUBDIR += another-htmllint SUBDIR += anthy - SUBDIR += awffull SUBDIR += bible_names-fpw SUBDIR += boiled-mozc SUBDIR += bookview diff --git a/japanese/awffull/Makefile b/japanese/awffull/Makefile deleted file mode 100644 index 8d4aba58808a..000000000000 --- a/japanese/awffull/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -CATEGORIES= japanese www - -MAINTAINER= ports@FreeBSD.org - -CONFLICTS= awffull -MASTERDIR= ${.CURDIR}/../../www/awffull - -EXTRA_PATCHES= ${.CURDIR}/files/awffull-ja.diff - -.include "${MASTERDIR}/Makefile" diff --git a/japanese/awffull/files/awffull-ja.diff b/japanese/awffull/files/awffull-ja.diff deleted file mode 100644 index ff6d63c9c200..000000000000 --- a/japanese/awffull/files/awffull-ja.diff +++ /dev/null @@ -1,267 +0,0 @@ ---- src/awffull.c.orig 2008-12-13 11:28:35.000000000 +0900 -+++ src/awffull.c 2008-12-31 16:43:45.000000000 +0900 -@@ -37,6 +37,9 @@ - /* STANDARD INCLUDES */ - /*********************************************/ - #include "awffull.h" /* main header */ -+#ifdef HAVE_ICONV -+#include -+#endif - - /* internal function prototypes */ - -@@ -137,6 +140,10 @@ static char const ab_month_name[][4] = { - "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" - }; - -+#ifdef HAVE_ICONV -+iconv_t cd_from_sjis, cd_from_eucj; -+#endif -+ - /*********************************************/ - /* MAIN - start here */ - /*********************************************/ -@@ -339,6 +346,11 @@ main(int argc, char *argv[]) - - start_time = times(&mytms); - -+#ifdef HAVE_ICONV -+ cd_from_sjis = iconv_open("UTF-8", "Shift_JIS"); -+ cd_from_eucj = iconv_open("UTF-8", "EUC-JP"); -+#endif -+ - /********************************************* - * MAIN PROCESS LOOP - read through log file * - *********************************************/ -@@ -801,9 +813,17 @@ main(int argc, char *argv[]) - } - - del_htabs(); -+#ifdef HAVE_ICONV -+ iconv_close(cd_from_sjis); -+ iconv_close(cd_from_eucj); -+#endif - /* Whew, all done! Exit with completion status (0) */ - exit(0); - } else { -+#ifdef HAVE_ICONV -+ iconv_close(cd_from_sjis); -+ iconv_close(cd_from_eucj); -+#endif - /* No valid records found... exit with error (1) */ - VPRINT(VERBOSE1, "%s\n", _("No valid records found!")); - exit(1); -@@ -1740,6 +1760,26 @@ unescape(char *str) - if (!str) - return NULL; /* make sure strings valid */ - -+ /* for apache log's escape code. */ -+ while (*cp1) { -+ if (*cp1 == '\\' && *(cp1 + 1) == 'x' && -+ isxdigit(*(cp1 + 2)) && isxdigit(*(cp1 + 3))) { -+ *cp2 = from_hex(*(cp1 + 2)) * 16 + from_hex(*(cp1 + 3)); -+ if ((*cp2 < 32) || (*cp2 == 127)) -+ *cp2 = '_'; -+ cp1 += 4; -+ cp2++; -+ } else if (*cp1 == '\\' && *(cp1 + 1) == '\\') { -+ *cp2 = '\\'; -+ cp1 += 2; -+ cp2++; -+ } else { -+ *cp2++ = *cp1++; -+ } -+ } -+ *cp2 = *cp1; -+ cp1 = cp2 = str; -+ - while (*cp1) { - if (*cp1 == '%') { /* Found an escape? */ - cp1++; -@@ -1762,16 +1802,139 @@ unescape(char *str) - return str; /* return the string */ - } - -+#ifdef HAVE_ICONV -+ -+/*********************************************/ -+/* SCORE_XXX - calculate score */ -+/*********************************************/ -+ -+int score_eucj(unsigned char *str) -+{ -+ int stat=0; -+ int score=0; -+ int bad=0; -+ if(str==NULL) return -1; -+ -+ for(; *str!=0;str++){ -+ switch(stat){ -+ case 0: -+ if(*str>= 0x20 && *str <= 0x7e) score++; //ASCII -+ else if(*str >= 0xa1 && *str <= 0xfe) stat=1; //KANJI(1) -+ else if(*str == 0x8f); // HOJYO KANJI -+ else if(*str == 0x8e) stat=2; // KANA -+ else if(*str < 0x20); //CTRL -+ else bad=1; -+ break; -+ case 1: -+ if(*str >= 0xa1 && *str <= 0xfe) score += 2; //KANJI(2) -+ else bad=1; -+ stat=0; -+ break; -+ case 2: -+ if(*str >= 0xa1 && *str <= 0xdf); //hankaku <- 0 -+ else bad=1; -+ stat=0; -+ break; -+ } -+ } -+ if(bad != 0) score = -1; -+ return score; -+} -+ -+int score_sjis(unsigned char *str) -+{ -+ int stat=0; -+ int score=0; -+ int bad=0; -+ if(str==NULL) return -1; -+ -+ for(; *str != 0; str++){ -+ switch(stat){ -+ case 0: -+ if(*str>= 0x20 && *str <= 0x7e) score++;//ASCII -+ else if((*str >= 0x81 && *str <= 0x9f) || -+ (*str >= 0xe0 && *str <= 0xfc)) stat=1; //SJIS(1) -+ else if(*str >= 0xa1 && *str <= 0xdf); // KANA -+ else if(*str < 0x20); // CTRL -+ else bad=1; -+ break; -+ case 1: -+ if((*str >= 0x40 && *str <= 0x7e) || -+ (*str >= 0x80 && *str <= 0xfc)) score += 2; //SJIS(2) -+ else bad=1; -+ stat=0; -+ break; -+ } -+ } -+ if(bad != 0) score = -1; -+ return score; -+} -+ -+int score_utf8(unsigned char *str) -+{ -+ int stat=0; -+ int score=0; -+ int bad=0; -+ if(str==NULL) return -1; -+ -+ for(; *str != 0; str++){ -+ switch(stat){ -+ case 0: -+ if(*str>= 0x20 && *str <= 0x7e) score++; //ASCII -+ else if(*str >= 0xc0 && *str <= 0xdf) stat=1; //greek etc. -+ else if(*str >= 0xe0 && *str <= 0xef) stat=2; //KANJI etc. -+ else if(*str >= 0xf0 && *str <= 0xf7) stat=4; -+ else if(*str < 0x20); //CTRL -+ else bad=1; -+ break; -+ case 1: -+ if(*str >= 0x80 && *str <= 0xbf) score++; -+ else bad=1; -+ stat=0; -+ break; -+ case 2: -+ if(*str >= 0x80 && *str <= 0xbf) stat=3; //KANJI(2) -+ else {bad=1; stat=0;} -+ break; -+ case 3: -+ if(*str >= 0x80 && *str <= 0xbf) score+=3; //KANJI(3) -+ else bad=1; -+ stat=0; -+ break; -+ case 4: -+ case 5: -+ if(*str >= 0x80 && *str <= 0xbf) stat++; -+ else {bad=1; stat=0;} -+ break; -+ case 6: -+ if(*str >= 0x80 && *str <= 0xbf) score+=4; -+ else bad=1; -+ stat=0; -+ break; -+ } -+ } -+ if(bad != 0) score = -1; -+ return score; -+} -+ -+#endif -+ - /*********************************************/ - /* SRCH_STRING - get search strings from ref */ - /*********************************************/ - void - srch_string(char *refer, char *ptr) - { -- char tmpbuf[BUFSIZE]; -- char srch[80] = ""; -- char *cp1, *cp2, *cps; -+ unsigned char tmpbuf[BUFSIZE]; -+ unsigned char srch[80] = ""; -+ unsigned char *cp1, *cp2, *cps; - int sp_flg = 0; -+#ifdef HAVE_ICONV -+ int sjis, eucj, utf8; -+ unsigned char tmpbuf2[BUFSIZE]; -+ unsigned char *cp3; -+ size_t inlen, outlen; -+#endif - - /* Check if search engine referrer or return */ - if ((cps = isinlist(search_list, refer)) == NULL) -@@ -1832,6 +1995,35 @@ srch_string(char *refer, char *ptr) - else - break; - -+#ifdef HAVE_ICONV -+ utf8 = score_utf8(cp2); -+ sjis = score_sjis(cp2); -+ eucj = score_eucj(cp2); -+ if (sjis > utf8 && sjis > eucj) { -+ iconv(cd_from_sjis, NULL, 0, NULL, 0); -+ cp3 = cp2; -+ inlen = strlen(cp2) + 1; -+ cp1 = tmpbuf2; -+ outlen = sizeof(tmpbuf2); -+ if (iconv(cd_from_sjis, -+ (const char **)&cp3, &inlen, (char**)&cp1, &outlen) >= 0 && -+ inlen == 0) { -+ cp2 = tmpbuf2; -+ } -+ } else if (eucj > utf8 && eucj > sjis) { -+ iconv(cd_from_eucj, NULL, 0, NULL, 0); -+ cp3 = cp2; -+ inlen = strlen(cp2) + 1; -+ cp1 = tmpbuf2; -+ outlen = sizeof(tmpbuf2); -+ if (iconv(cd_from_eucj, -+ (const char **)&cp3, &inlen, (char**)&cp1, &outlen) >= 0 && -+ inlen == 0) { -+ cp2 = tmpbuf2; -+ } -+ } -+#endif -+ - /* strip invalid chars */ - cp1 = cp2; - while (*cp1 != '\0') { -@@ -2391,6 +2583,7 @@ cleanup_refer(char *refer, char *srchstr - - /* unescape referrer */ - unescape(refer); -+ unescape(refer); /* XXX */ - - /* fix referrer field */ - cp1 = refer;