diff options
author | Andrey A. Chernov <ache@FreeBSD.org> | 2001-02-13 22:34:47 +0000 |
---|---|---|
committer | Andrey A. Chernov <ache@FreeBSD.org> | 2001-02-13 22:34:47 +0000 |
commit | f293e86b0552500f144b43f52997443d3a1fb5af (patch) | |
tree | eb8569683cda1018d8f8a4a218e406b0cfee9968 /www/mnogosearch | |
parent | Update to 3.7.2. Do away with the post-patch target. (diff) |
Upgrade to 3.1.10
Notes
Notes:
svn path=/head/; revision=38319
Diffstat (limited to 'www/mnogosearch')
-rw-r--r-- | www/mnogosearch/Makefile | 8 | ||||
-rw-r--r-- | www/mnogosearch/distinfo | 2 | ||||
-rw-r--r-- | www/mnogosearch/files/msql_ispell.txt | 21 | ||||
-rw-r--r-- | www/mnogosearch/files/msql_track.txt | 7 | ||||
-rw-r--r-- | www/mnogosearch/files/patch-ad | 92 | ||||
-rw-r--r-- | www/mnogosearch/files/patch-ae | 19 | ||||
-rw-r--r-- | www/mnogosearch/pkg-plist | 5 |
7 files changed, 6 insertions, 148 deletions
diff --git a/www/mnogosearch/Makefile b/www/mnogosearch/Makefile index 8f5f32cb6061..bfb1fd880913 100644 --- a/www/mnogosearch/Makefile +++ b/www/mnogosearch/Makefile @@ -6,8 +6,7 @@ # PORTNAME= mnogosearch -PORTVERSION= 3.1.9 -PORTREVISION= 3 +PORTVERSION= 3.1.10 CATEGORIES= www databases MASTER_SITES= http://search.mnogo.ru/Download/ @@ -55,11 +54,6 @@ pre-fetch: @${ECHO} .endif -# Add missing msql DB initialization files -post-patch: - ${CP} ${FILESDIR}/msql_ispell.txt ${WRKSRC}/create/msql/ispell.txt - ${CP} ${FILESDIR}/msql_track.txt ${WRKSRC}/create/msql/track.txt - pre-install: @${MKDIR} ${PREFIX}/share/mnogosearch diff --git a/www/mnogosearch/distinfo b/www/mnogosearch/distinfo index 3a5d3bf31c62..df407a1fae80 100644 --- a/www/mnogosearch/distinfo +++ b/www/mnogosearch/distinfo @@ -1 +1 @@ -MD5 (mnogosearch-3.1.9.tar.gz) = 016ba2b97e08a6dfb7a59af565dbe3aa +MD5 (mnogosearch-3.1.10.tar.gz) = 8751c774232ed65131a9bd4e80b69c0a diff --git a/www/mnogosearch/files/msql_ispell.txt b/www/mnogosearch/files/msql_ispell.txt deleted file mode 100644 index 12936c8bf252..000000000000 --- a/www/mnogosearch/files/msql_ispell.txt +++ /dev/null @@ -1,21 +0,0 @@ -DROP TABLE affix\g -DROP TABLE spell\g - -CREATE TABLE affix ( - flag char(1) NOT NULL, - type char(1) NOT NULL, - lang char(3) NOT NULL, - mask char(32) NOT NULL, - find char(32) NOT NULL, - repl char(32) NOT NULL -) \g - -CREATE TABLE spell ( - word char(64) NOT NULL, - flag text(32) NOT NULL, - lang char(3) NOT NULL -) \g - - -CREATE INDEX affix_flag ON affix (flag)\g -CREATE INDEX spell_word ON spell (word)\g diff --git a/www/mnogosearch/files/msql_track.txt b/www/mnogosearch/files/msql_track.txt deleted file mode 100644 index 8c3425a86ea1..000000000000 --- a/www/mnogosearch/files/msql_track.txt +++ /dev/null @@ -1,7 +0,0 @@ -DROP TABLE qtrack\g - -CREATE TABLE qtrack ( - qwords text(63) NOT NULL, - qtime int NOT NULL, - found int NOT NULL -) \g diff --git a/www/mnogosearch/files/patch-ad b/www/mnogosearch/files/patch-ad deleted file mode 100644 index 5de268297cd3..000000000000 --- a/www/mnogosearch/files/patch-ad +++ /dev/null @@ -1,92 +0,0 @@ ---- src/sql.c.bak Wed Jan 24 13:35:58 2001 -+++ src/sql.c Tue Jan 30 22:11:34 2001 -@@ -2205,8 +2205,13 @@ - } - int UdmMarkForReindex(UDM_AGENT *Indexer){ - char qbuf[UDMSTRSIZ]; -+#ifdef HAVE_MSQL -+ sprintf(qbuf,"UPDATE url SET next_index_time=%d WHERE rec_id<>0 %s%s%s%s%s",(int)now(), -+ Indexer->Conf->tagstr,Indexer->Conf->urlstr,Indexer->Conf->statusstr,Indexer->Conf->langstr,Indexer->Conf->catstr); -+#else - sprintf(qbuf,"UPDATE url SET next_index_time=%d WHERE 1=1 %s%s%s%s%s",(int)now(), - Indexer->Conf->tagstr,Indexer->Conf->urlstr,Indexer->Conf->statusstr,Indexer->Conf->langstr,Indexer->Conf->catstr); -+#endif - sql_query(Indexer,qbuf); - if(UdmDBErrorCode(Indexer->db))return(IND_ERROR); - return(IND_OK); -@@ -3136,6 +3141,18 @@ - char qbuf[UDMSTRSIZ]; - - if(query->Conf->tagstr[0] || query->Conf->statusstr[0] || query->Conf->urlstr[0] || query->Conf->langstr[0] || query->Conf->timestr[0] || query->Conf->catstr[0]){ -+#ifdef HAVE_MSQL -+ sprintf(qbuf,"\ -+SELECT rec_id \ -+FROM url \ -+WHERE rec_id<>0 %s%s%s%s%s%s", -+ query->Conf->tagstr, -+ query->Conf->statusstr, -+ query->Conf->urlstr, -+ query->Conf->langstr, -+ query->Conf->timestr, -+ query->Conf->catstr); -+#else - sprintf(qbuf,"\ - SELECT rec_id \ - FROM url \ -@@ -3146,7 +3163,7 @@ - query->Conf->langstr, - query->Conf->timestr, - query->Conf->catstr); -- -+#endif - ((DB*)(query->db))->res=sql_query(query,qbuf); - if(UdmDBErrorCode(query->db))return(NULL); - num=SQL_NUM_ROWS(((DB*)(query->db))->res); -@@ -3595,13 +3612,21 @@ - } - SQL_FREE(((DB*)(Indexer->db))->res); - #elif (HAVE_IBASE||HAVE_MSQL || HAVE_IODBC || HAVE_UNIXODBC || HAVE_SOLID || HAVE_VIRT || HAVE_EASYSOFT) -+#ifdef HAVE_MSQL -+ sprintf(qbuf,"SELECT status,next_index_time FROM url WHERE rec_id<>0 %s%s%s%s%s", -+ Indexer->Conf->tagstr, -+ Indexer->Conf->urlstr, -+ Indexer->Conf->statusstr, -+ Indexer->Conf->langstr, -+ Indexer->Conf->catstr); -+#else - sprintf(qbuf,"SELECT status,next_index_time FROM url WHERE 1=1 %s%s%s%s%s", - Indexer->Conf->tagstr, - Indexer->Conf->urlstr, - Indexer->Conf->statusstr, - Indexer->Conf->langstr, - Indexer->Conf->catstr); -- -+#endif - ((DB*)(Indexer->db))->res=sql_query(Indexer,qbuf); - if(UdmDBErrorCode(Indexer->db))return(IND_ERROR); - if(SQL_NUM_ROWS(((DB*)(Indexer->db))->res)){ -@@ -3698,6 +3723,15 @@ - #ifdef HAVE_SQL_LIMIT - sprintf(limit," LIMIT %d",URL_DELETE_CACHE); - #endif -+#ifdef HAVE_MSQL -+ sprintf(qbuf,"SELECT rec_id FROM url WHERE rec_id<>0 %s%s%s%s%s%s", -+ Indexer->Conf->tagstr, -+ Indexer->Conf->urlstr, -+ Indexer->Conf->statusstr, -+ Indexer->Conf->langstr, -+ Indexer->Conf->catstr, -+ limit); -+#else - sprintf(qbuf,"SELECT rec_id FROM url WHERE 1=1 %s%s%s%s%s%s", - Indexer->Conf->tagstr, - Indexer->Conf->urlstr, -@@ -3705,7 +3739,7 @@ - Indexer->Conf->langstr, - Indexer->Conf->catstr, - limit); -- -+#endif - ((DB*)(Indexer->db))->res=sql_query(Indexer,qbuf); - if(UdmDBErrorCode(Indexer->db))return(IND_ERROR); - if(SQL_NUM_ROWS(((DB*)(Indexer->db))->res)){ diff --git a/www/mnogosearch/files/patch-ae b/www/mnogosearch/files/patch-ae deleted file mode 100644 index 86336e9ad787..000000000000 --- a/www/mnogosearch/files/patch-ae +++ /dev/null @@ -1,19 +0,0 @@ ---- src/spell.c.bak Fri Jan 12 16:28:30 2001 -+++ src/spell.c Thu Feb 1 01:19:29 2001 -@@ -137,7 +137,7 @@ - __INDLIB__ int UdmDBImportDictionary(UDM_AGENT * Indexer,const char *lang,const char *filename, int dump){ - unsigned char str[BUFSIZ]; - unsigned char *s; -- const unsigned char *flag=NULL; -+ const unsigned char *flag; - int rej=0; - int imp=0; - FILE *dict; -@@ -145,6 +145,7 @@ - if(!(dict=fopen(filename,"r")))return(1); - while(fgets(str,sizeof(str),dict)){ - -+ flag=NULL; - if((s=strchr(str,'/'))){ - *s=0;s++;flag=s; - while(*s){ diff --git a/www/mnogosearch/pkg-plist b/www/mnogosearch/pkg-plist index 36c5b1226638..5ec82e1902a6 100644 --- a/www/mnogosearch/pkg-plist +++ b/www/mnogosearch/pkg-plist @@ -22,7 +22,6 @@ include/udm_indexer.h include/udm_log.h include/udm_mimetype.h include/udm_mutex.h -include/udm_os.h include/udm_parsehtml.h include/udm_parser.h include/udm_parseurl.h @@ -69,6 +68,7 @@ share/doc/mnogosearch/mp3.txt share/doc/mnogosearch/negotiation.txt share/doc/mnogosearch/parsers.txt share/doc/mnogosearch/performance.txt +share/doc/mnogosearch/relevancy.txt share/doc/mnogosearch/search.txt share/doc/mnogosearch/srv_table.txt share/doc/mnogosearch/storage.txt @@ -81,7 +81,9 @@ share/mnogosearch/create/ibase/create.sql share/mnogosearch/create/msql/crc-multi.txt share/mnogosearch/create/msql/crc.txt share/mnogosearch/create/msql/create.txt +share/mnogosearch/create/msql/ispell.txt share/mnogosearch/create/msql/multi.txt +share/mnogosearch/create/msql/track.txt share/mnogosearch/create/mssql/create.sql share/mnogosearch/create/mysql/categories.txt share/mnogosearch/create/mysql/crc-multi.txt @@ -104,6 +106,7 @@ share/mnogosearch/create/pgsql/crc-multi.txt share/mnogosearch/create/pgsql/crc.txt share/mnogosearch/create/pgsql/create.txt share/mnogosearch/create/pgsql/grant.txt +share/mnogosearch/create/pgsql/ispell.txt share/mnogosearch/create/pgsql/multi.txt share/mnogosearch/create/pgsql/news-extension.txt share/mnogosearch/create/pgsql/server.txt |