View | Details | Raw Unified | Return to bug 101164
Collapse All | Expand All

(-)/home/staff/gslin/work/udmsearch/Makefile (-27 / +18 lines)
Lines 6-13 Link Here
6
#
6
#
7
7
8
PORTNAME=	udmsearch
8
PORTNAME=	udmsearch
9
PORTVERSION=	3.0.23
9
PORTVERSION=	3.1.5
10
PORTREVISION=	3
11
CATEGORIES=	www databases
10
CATEGORIES=	www databases
12
MASTER_SITES=	http://search.mnogo.ru/Download/ \
11
MASTER_SITES=	http://search.mnogo.ru/Download/ \
13
		http://udmsearch.real-time.com/Download/
12
		http://udmsearch.real-time.com/Download/
Lines 15-65 Link Here
15
MAINTAINER=	ports@FreeBSD.org
14
MAINTAINER=	ports@FreeBSD.org
16
COMMENT=	Full featured SQL-based hypertext search engine
15
COMMENT=	Full featured SQL-based hypertext search engine
17
16
18
MAN1=		indexer.1
17
OPTIONS=	MSQL "MSQL support" off \
19
MAN5=		indexer.conf.5
18
		MYSQL "MYSQL support" on \
19
		PGSQL "PGSQL support" off
20
20
21
USE_GMAKE=	yes
22
GNU_CONFIGURE=	yes
21
GNU_CONFIGURE=	yes
23
CONFIGURE_ARGS=	--enable-charset-guesser \
22
CONFIGURE_ARGS=	--enable-charset-guesser \
24
		--enable-freebsd-pthreads \
23
		--enable-freebsd-pthreads \
25
		--sysconfdir=${PREFIX}/etc/udmsearch \
24
		--sysconfdir=${PREFIX}/etc/udmsearch \
26
		--localstatedir=/var/udmsearch
25
		--localstatedir=/var/udmsearch
27
26
28
.if defined(WITH_PGSQL)
27
MAN1=		indexer.1
29
USE_PGSQL=		YES
28
MAN5=		indexer.conf.5
30
CONFIGURE_ARGS+=	--with-pgsql=${LOCALBASE}/pgsql
29
30
.include <bsd.port.pre.mk>
31
31
32
.elif defined(WITH_MSQL)
32
.if defined(WITH_MSQL)
33
BUILD_DEPENDS=		${PREFIX}/lib/libmsql.a:${PORTSDIR}/databases/msql
33
BUILD_DEPENDS=		${PREFIX}/lib/libmsql.a:${PORTSDIR}/databases/msql
34
CONFIGURE_ARGS+=	--with-msql=${LOCALBASE}
34
CONFIGURE_ARGS+=	--with-msql=${LOCALBASE}
35
.endif
35
36
36
.else
37
.if !defined(WITHOUT_MYSQL)
37
# default to mysql
38
USE_MYSQL=		YES
38
USE_MYSQL=		YES
39
CONFIGURE_ARGS+=	--with-mysql=${LOCALBASE}
39
CONFIGURE_ARGS+=	--with-mysql=${LOCALBASE}
40
41
pre-everything::
42
.if !defined(WITH_MYSQL)
43
	@${ECHO_MSG}
44
	@${ECHO_MSG} "Defaulting to udmsearch with mysql support."
45
	@${ECHO_MSG}
46
	@${ECHO_MSG} "You may alternately build udmsearch with either msql or"
47
	@${ECHO_MSG} "postgresql support by invoking make with WITH_MSQL=yes or"
48
	@${ECHO_MSG} "WITH_PGSQL=yes respectively."
49
	@${ECHO_MSG}
50
.endif
40
.endif
51
41
42
.if defined(WITH_PGSQL)
43
USE_PGSQL=		YES
44
CONFIGURE_ARGS+=	--with-pgsql=${LOCALBASE}/pgsql
52
.endif
45
.endif
53
46
54
pre-install:
47
pre-install:
55
	@${MKDIR} ${PREFIX}/share/udmsearch
48
	@${MKDIR} ${DATADIR}
56
49
57
post-install:
50
post-install:
58
	@cp -R ${WRKSRC}/create ${PREFIX}/share/udmsearch
51
	@${CP} -R ${WRKSRC}/create ${DATADIR}
59
	@${INSTALL_DATA} ${WRKSRC}/INSTALL ${PREFIX}/share/doc/udmsearch
52
	@${INSTALL_DATA} ${WRKSRC}/INSTALL ${DOCSDIR}
60
	@${STRIP_CMD} ${PREFIX}/sbin/indexer
61
	@${STRIP_CMD} ${PREFIX}/share/udmsearch/search.cgi
62
	@${ECHO_MSG}
53
	@${ECHO_MSG}
63
	@${CAT} ${PKGMESSAGE}
54
	@${CAT} ${PKGMESSAGE}
64
55
65
.include <bsd.port.mk>
56
.include <bsd.port.post.mk>
(-)/home/staff/gslin/work/udmsearch/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
MD5 (udmsearch-3.0.23.tar.gz) = 8b6742482b89c57f198bf0a46fa56614
1
MD5 (udmsearch-3.1.5.tar.gz) = ee57e13852ee7adf2551879d9f3bcdf9
2
SHA256 (udmsearch-3.0.23.tar.gz) = d9cec387247e23a5df01a4350ef4fcd4bf1664a3d8bfb6870208475b1a459f71
2
SHA256 (udmsearch-3.1.5.tar.gz) = 75eae3042d6c1b96f71d0fad58957340dbc3d91d5ab261c95377cd5aef3167d6
3
SIZE (udmsearch-3.0.23.tar.gz) = 253488
3
SIZE (udmsearch-3.1.5.tar.gz) = 350832
(-)/home/staff/gslin/work/udmsearch/files/patch-aa (-16 lines)
Lines 1-16 Link Here
1
diff -ru ../udmsearch-3.0.19/doc/Makefile.in ./doc/Makefile.in
2
--- ../udmsearch-3.0.19/doc/Makefile.in	Thu Jun 15 10:27:15 2000
3
+++ ./doc/Makefile.in	Sat Jul  8 15:09:00 2000
4
@@ -273,9 +273,9 @@
5
 
6
 
7
 install-data-local:
8
-	$(mkinstalldirs) $(prefix)/doc
9
-	echo ${INSTALL_DATA} docs $(DESTDIR)$(prefix)/doc/
10
-	${INSTALL_DATA} ${txt_DOCS} $(DESTDIR)$(prefix)/doc/
11
+	$(mkinstalldirs) $(prefix)/share/doc/udmsearch
12
+	echo ${INSTALL_DATA} docs $(DESTDIR)$(prefix)/share/doc/udmsearch
13
+	${INSTALL_DATA} ${txt_DOCS} $(DESTDIR)$(prefix)/share/doc/udmsearch
14
 
15
 dist-hook:
16
 	cp -rf samples $(distdir)
(-)/home/staff/gslin/work/udmsearch/files/patch-ab (-11 lines)
Lines 1-11 Link Here
1
--- src/Makefile.in.orig	Mon Jul 31 17:10:02 2000
2
+++ src/Makefile.in	Mon Jul 31 17:12:21 2000
3
@@ -225,7 +225,7 @@
4
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
5
 	  if test -f $$p; then \
6
 	    echo "  $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
7
-	     $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
8
+	     $(INSTALL_PROGRAM) $$p $(DESTDIR)$(prefix)/share/udmsearch/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
9
 	  else :; fi; \
10
 	done
11
 
(-)/home/staff/gslin/work/udmsearch/files/patch-configure.in (+16 lines)
Line 0 Link Here
1
diff -ru ../udmsearch-3.0.19/doc/Makefile.in ./doc/Makefile.in
2
--- ../udmsearch-3.0.19/doc/Makefile.in	Thu Jun 15 10:27:15 2000
3
+++ ./doc/Makefile.in	Sat Jul  8 15:09:00 2000
4
@@ -273,9 +273,9 @@
5
 
6
 
7
 install-data-local:
8
-	$(mkinstalldirs) $(prefix)/doc
9
-	echo ${INSTALL_DATA} docs $(DESTDIR)$(prefix)/doc/
10
-	${INSTALL_DATA} ${txt_DOCS} $(DESTDIR)$(prefix)/doc/
11
+	$(mkinstalldirs) $(prefix)/share/doc/udmsearch
12
+	echo ${INSTALL_DATA} docs $(DESTDIR)$(prefix)/share/doc/udmsearch
13
+	${INSTALL_DATA} ${txt_DOCS} $(DESTDIR)$(prefix)/share/doc/udmsearch
14
 
15
 dist-hook:
16
 	cp -rf samples $(distdir)
(-)/home/staff/gslin/work/udmsearch/files/patch-sql.c (-12 lines)
Lines 1-12 Link Here
1
--- src/sql.c.orig	Tue Sep 19 17:14:21 2000
2
+++ src/sql.c	Mon Oct 13 09:59:28 2003
3
@@ -204,7 +204,8 @@
4
 #define unlock_url(db)	sql_query(db,"UNLOCK TABLES")
5
 
6
 static int InitDB(DB*db){
7
-	if (!(mysql_connect(&(db->mysql),DBHost,DBUser,DBPass))){
8
+	mysql_init(&(db->mysql));
9
+	if (!(mysql_real_connect(&(db->mysql),DBHost,DBUser,DBPass,DB_DEFAULT,0,NULL,0))){
10
 		db->errcode=1;
11
 		return(1);
12
 	}
(-)/home/staff/gslin/work/udmsearch/files/patch-src-sql.c (+11 lines)
Line 0 Link Here
1
--- src/sql.c.orig	Tue Aug  1 19:17:38 2006
2
+++ src/sql.c	Tue Aug  1 19:18:11 2006
3
@@ -200,7 +200,7 @@
4
 	db=(DB*)Indexer->db;
5
 	db->mysql.port=Indexer->Conf->DBPort;
6
 	db->mysql.unix_socket="/var/tmp/xxx";
7
-	if (!(mysql_connect(&(db->mysql),Indexer->Conf->DBHost,Indexer->Conf->DBUser,Indexer->Conf->DBPass))){
8
+	if (!(mysql_real_connect(&(db->mysql),Indexer->Conf->DBHost,Indexer->Conf->DBUser,Indexer->Conf->DBPass,NULL,0,NULL,0))){
9
 		db->errcode=1;
10
 		return(1);
11
 	}
(-)/home/staff/gslin/work/udmsearch/pkg-plist (-73 / +104 lines)
Lines 1-91 Link Here
1
@comment $FreeBSD$
2
%%DATADIR%%/create/ibase/create.sql
3
%%DATADIR%%/create/msql/crc-multi.txt
4
%%DATADIR%%/create/msql/crc.txt
5
%%DATADIR%%/create/msql/create.txt
6
%%DATADIR%%/create/msql/multi.txt
7
%%DATADIR%%/create/mssql/create.sql
8
%%DATADIR%%/create/mysql/categories.txt
9
%%DATADIR%%/create/mysql/crc-multi.txt
10
%%DATADIR%%/create/mysql/crc.txt
11
%%DATADIR%%/create/mysql/create.txt
12
%%DATADIR%%/create/mysql/ispell.txt
13
%%DATADIR%%/create/mysql/multi.txt
14
%%DATADIR%%/create/mysql/track.txt
15
%%DATADIR%%/create/oracle/categories.sql
16
%%DATADIR%%/create/oracle/crc-multi.sql
17
%%DATADIR%%/create/oracle/crc.sql
18
%%DATADIR%%/create/oracle/create.sql
19
%%DATADIR%%/create/oracle/multi.sql
20
%%DATADIR%%/create/oracle/track.sql
21
%%DATADIR%%/create/pgsql/categories.txt
22
%%DATADIR%%/create/pgsql/crc-multi.txt
23
%%DATADIR%%/create/pgsql/crc.txt
24
%%DATADIR%%/create/pgsql/create.txt
25
%%DATADIR%%/create/pgsql/grant.txt
26
%%DATADIR%%/create/pgsql/multi.txt
27
%%DATADIR%%/create/pgsql/track.txt
28
%%DATADIR%%/create/solid/README
29
%%DATADIR%%/create/solid/create.txt
30
%%DATADIR%%/create/solid/multi.txt
31
%%DATADIR%%/create/stopwords/stop.cz.txt
32
%%DATADIR%%/create/stopwords/stop.de.txt
33
%%DATADIR%%/create/stopwords/stop.dk.txt
34
%%DATADIR%%/create/stopwords/stop.en.big
35
%%DATADIR%%/create/stopwords/stop.en.huge
36
%%DATADIR%%/create/stopwords/stop.en.txt
37
%%DATADIR%%/create/stopwords/stop.es.txt
38
%%DATADIR%%/create/stopwords/stop.fr.txt
39
%%DATADIR%%/create/stopwords/stop.it.txt
40
%%DATADIR%%/create/stopwords/stop.nl.txt
41
%%DATADIR%%/create/stopwords/stop.no.txt
42
%%DATADIR%%/create/stopwords/stop.pl.txt
43
%%DATADIR%%/create/stopwords/stop.pt.txt
44
%%DATADIR%%/create/stopwords/stop.ru.txt
45
%%DATADIR%%/create/stopwords/stop.sk.txt
46
%%DATADIR%%/create/stopwords/stop.ua.txt
47
%%DATADIR%%/create/sybase/README
48
%%DATADIR%%/create/sybase/create.sql
49
%%DATADIR%%/create/virtuoso/crc.txt
50
%%DATADIR%%/create/virtuoso/create.txt
51
%%DATADIR%%/create/virtuoso/multi.txt
52
%%DOCSDIR%%/HTDB.txt
53
%%DOCSDIR%%/HTTP-codes.txt
54
%%DOCSDIR%%/INSTALL
55
%%DOCSDIR%%/NEWS.html
56
%%DOCSDIR%%/UdmSearch-Oracle8.html
57
%%DOCSDIR%%/bugs.txt
58
%%DOCSDIR%%/cachemode.txt
59
%%DOCSDIR%%/categories.txt
60
%%DOCSDIR%%/charset.txt
61
%%DOCSDIR%%/follow.txt
62
%%DOCSDIR%%/hrefonly.txt
63
%%DOCSDIR%%/html.txt
64
%%DOCSDIR%%/ispell.txt
65
%%DOCSDIR%%/lib.txt
66
%%DOCSDIR%%/mp3.txt
67
%%DOCSDIR%%/parsers.txt
68
%%DOCSDIR%%/performance.txt
69
%%DOCSDIR%%/search.txt
70
%%DOCSDIR%%/storage.txt
71
%%DOCSDIR%%/syslog.txt
72
%%DOCSDIR%%/tags.txt
73
%%DOCSDIR%%/templates.txt
74
%%DOCSDIR%%/tracking.txt
75
%%DOCSDIR%%/usage.txt
76
bin/search.cgi
77
bin/udm-config
1
etc/udmsearch/indexer.conf-dist
78
etc/udmsearch/indexer.conf-dist
2
etc/udmsearch/search.htm-dist
79
etc/udmsearch/search.htm-dist
3
share/udmsearch/search.cgi
80
include/udm_boolean.h
4
share/udmsearch/create/oracle/crc-multi.sql
81
include/udm_cache.h
5
share/udmsearch/create/oracle/create.sql
6
share/udmsearch/create/oracle/multi.sql
7
share/udmsearch/create/sybase/create.sql
8
share/udmsearch/create/sybase/README
9
share/udmsearch/create/stopwords/stop.en.1.txt
10
share/udmsearch/create/stopwords/stop.ru.txt
11
share/udmsearch/create/stopwords/stop.pt.txt
12
share/udmsearch/create/stopwords/stop.no.txt
13
share/udmsearch/create/stopwords/stop.nl.txt
14
share/udmsearch/create/stopwords/stop.fr.txt
15
share/udmsearch/create/stopwords/stop.es.txt
16
share/udmsearch/create/stopwords/stop.pl.txt
17
share/udmsearch/create/stopwords/stop.en.txt
18
share/udmsearch/create/stopwords/stop.de.txt
19
share/udmsearch/create/stopwords/stop.dk.txt
20
share/udmsearch/create/stopwords/stop.it.txt
21
share/udmsearch/create/stopwords/stop.ua.txt
22
share/udmsearch/create/stopwords/stop.cz.txt
23
share/udmsearch/create/solid/create.txt
24
share/udmsearch/create/solid/README
25
share/udmsearch/create/solid/multi.txt
26
share/udmsearch/create/pgsql/create.txt
27
share/udmsearch/create/pgsql/crc.txt
28
share/udmsearch/create/pgsql/multi.txt
29
share/udmsearch/create/pgsql/crc-multi.txt
30
share/udmsearch/create/virtuoso/create.txt
31
share/udmsearch/create/virtuoso/multi.txt
32
share/udmsearch/create/virtuoso/crc.txt
33
share/udmsearch/create/mysql/create.txt
34
share/udmsearch/create/mysql/crc.txt
35
share/udmsearch/create/mysql/multi.txt
36
share/udmsearch/create/mysql/crc-multi.txt
37
share/udmsearch/create/mysql/ispell.txt
38
share/udmsearch/create/mssql/create.sql
39
share/udmsearch/create/msql/multi.txt
40
share/udmsearch/create/msql/create.txt
41
share/udmsearch/create/msql/crc.txt
42
share/udmsearch/create/msql/crc-multi.txt
43
share/udmsearch/create/ibase/create.sql
44
include/udm_charset.h
82
include/udm_charset.h
45
include/udm_common.h
83
include/udm_common.h
46
include/udm_conf.h
84
include/udm_conf.h
47
include/udm_config.h
85
include/udm_config.h
86
include/udm_crc32.h
48
include/udm_db.h
87
include/udm_db.h
88
include/udm_ftp.h
89
include/udm_host.h
49
include/udm_hrefs.h
90
include/udm_hrefs.h
91
include/udm_http.h
92
include/udm_id3.h
50
include/udm_indexer.h
93
include/udm_indexer.h
51
include/udm_log.h
94
include/udm_log.h
52
include/udm_mutex.h
95
include/udm_mutex.h
53
include/udm_os.h
96
include/udm_os.h
54
include/udm_parseurl.h
97
include/udm_parseurl.h
98
include/udm_search_tl.h
99
include/udm_searchtool.h
100
include/udm_socket.h
55
include/udm_spell.h
101
include/udm_spell.h
56
include/udm_utils.h
102
include/udm_utils.h
103
include/udm_xmalloc.h
57
include/udmsearch.h
104
include/udmsearch.h
58
lib/libudmsearch.a
105
lib/libudmsearch.a
106
lib/libudmsearch.la
59
sbin/indexer
107
sbin/indexer
60
bin/udm-config
108
sbin/splitter
61
share/doc/udmsearch/INSTALL
109
@dirrmtry %%DATADIR%%/create/ibase
62
share/doc/udmsearch/parsers.txt
110
@dirrmtry %%DATADIR%%/create/msql
63
share/doc/udmsearch/syslog.txt
111
@dirrmtry %%DATADIR%%/create/mssql
64
share/doc/udmsearch/templates.txt
112
@dirrmtry %%DATADIR%%/create/mysql
65
share/doc/udmsearch/usage.txt
113
@dirrmtry %%DATADIR%%/create/oracle
66
share/doc/udmsearch/HTTP-codes.txt
114
@dirrmtry %%DATADIR%%/create/pgsql
67
share/doc/udmsearch/HTDB.txt
115
@dirrmtry %%DATADIR%%/create/solid
68
share/doc/udmsearch/search.txt
116
@dirrmtry %%DATADIR%%/create/stopwords
69
share/doc/udmsearch/ispell.txt
117
@dirrmtry %%DATADIR%%/create/sybase
70
share/doc/udmsearch/follow.txt
118
@dirrmtry %%DATADIR%%/create/virtuoso
71
share/doc/udmsearch/storage.txt
119
@dirrmtry %%DATADIR%%/create
72
share/doc/udmsearch/hrefonly.txt
120
@dirrmtry %%DATADIR%%
73
share/doc/udmsearch/UdmSearch-Oracle8.html
121
@dirrmtry %%DOCSDIR%%
74
share/doc/udmsearch/NEWS.html
122
@dirrmtry etc/udmsearch
75
share/doc/udmsearch/lib.txt
76
share/doc/udmsearch/html.txt
77
share/doc/udmsearch/charset.txt
78
@dirrm share/doc/udmsearch
79
@dirrm share/udmsearch/create/ibase
80
@dirrm share/udmsearch/create/msql
81
@dirrm share/udmsearch/create/mssql
82
@dirrm share/udmsearch/create/mysql
83
@dirrm share/udmsearch/create/oracle
84
@dirrm share/udmsearch/create/pgsql
85
@dirrm share/udmsearch/create/solid
86
@dirrm share/udmsearch/create/stopwords
87
@dirrm share/udmsearch/create/sybase
88
@dirrm share/udmsearch/create/virtuoso
89
@dirrm share/udmsearch/create
90
@dirrm share/udmsearch
91
@dirrm etc/udmsearch

Return to bug 101164