Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 30 Sep 2023 02:24:35 GMT
From:      Muhammad Moinur Rahman <bofh@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 7d272816979d - main - japanese/awffull: Remove expired port
Message-ID:  <202309300224.38U2OZIJ095696@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by bofh:

URL: https://cgit.FreeBSD.org/ports/commit/?id=7d272816979dacf0e12ed03a46e2064996a067e3

commit 7d272816979dacf0e12ed03a46e2064996a067e3
Author:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2023-09-30 01:19:07 +0000
Commit:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
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 <iconv.h>
-+#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;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202309300224.38U2OZIJ095696>