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

(-)harvest/Makefile (-28 / +3 lines)
Lines 6-12 Link Here
6
#
6
#
7
7
8
PORTNAME=	harvest
8
PORTNAME=	harvest
9
PORTVERSION=	1.9.10
9
PORTVERSION=	1.9.13
10
CATEGORIES=	www
10
CATEGORIES=	www
11
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
11
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
12
MASTER_SITE_SUBDIR=	${PORTNAME}
12
MASTER_SITE_SUBDIR=	${PORTNAME}
Lines 20-45 Link Here
20
USE_LIBTOOL=		yes
20
USE_LIBTOOL=		yes
21
INSTALLS_SHLIB=		yes
21
INSTALLS_SHLIB=		yes
22
NO_MTREE=		yes
22
NO_MTREE=		yes
23
CONFIGURE_ARGS?=	--without-wish
23
CONFIGURE_ARGS?=	--prefix=${PREFIX}/${PORTNAME} --without-wish
24
24
25
STRIP=		# none
25
STRIP=		# none
26
26
27
MAN1=		curl-config.1 curl.1 yaz-client-ssl.1 yaz-client.1 \
28
		yaz-config.1 zebraidx.1 zoomsh.1
29
MAN3=		curl_easy_cleanup.3 curl_easy_duphandle.3 curl_easy_getinfo.3 \
30
		curl_easy_init.3 curl_easy_perform.3 curl_easy_setopt.3 \
31
		curl_escape.3 curl_formadd.3 curl_formfree.3 curl_formparse.3 \
32
		curl_free.3 curl_getdate.3 curl_getenv.3 curl_global_cleanup.3 \
33
		curl_global_init.3 curl_mprintf.3 curl_multi_add_handle.3 \
34
		curl_multi_cleanup.3 curl_multi_fdset.3 curl_multi_info_read.3 \
35
		curl_multi_init.3 curl_multi_perform.3 \
36
		curl_multi_remove_handle.3 curl_slist_append.3 \
37
		curl_slist_free_all.3 curl_strequal.3 curl_strnequal.3 \
38
		curl_unescape.3 curl_version.3 curl_version_info.3 \
39
		libcurl-errors.3 libcurl-multi.3 libcurl.3
40
MAN7=		yaz.7
41
MAN8=		yaz-ztest-ssl.8 yaz-ztest.8 zebrasrv.8
42
43
.include <bsd.port.pre.mk>
27
.include <bsd.port.pre.mk>
44
28
45
PREFIX:=	${PREFIX}/${PORTNAME}
29
PREFIX:=	${PREFIX}/${PORTNAME}
Lines 48-63 Link Here
48
	@${GREP} -lR "<malloc.h>" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \
32
	@${GREP} -lR "<malloc.h>" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \
49
		's|<malloc\.h>|<stdlib.h>|g'
33
		's|<malloc\.h>|<stdlib.h>|g'
50
34
51
post-configure:
35
port-configure:
52
.if ${OSVERSION} > 501101
53
	@${ECHO_MSG} "#define __STRICT_ANSI__ 1" >> ${WRKSRC}/src/common/include/autoconf.h
54
	@${REINPLACE_CMD} "s!DEFS\(.*\)!DEFS\1 -D__STRICT_ANSI__!" \
55
			${WRKSRC}/components/gatherer/standard/pstext/libs/src/sio/Makefile
56
	@${REINPLACE_CMD} "s!DEFS\(.*\)=\(.*\)!DEFS\1 = -D__STRICT_ANSI__ \2 !" \
57
			${WRKSRC}/components/gatherer/standard/pstext/libs/src/str/Makefile
58
	@${REINPLACE_CMD} "s!DEFS\(.*\)!DEFS\1 -D__STRICT_ANSI__!" \
59
			${WRKSRC}/components/gatherer/standard/pstext/pstext/Makefile
60
.endif
61
	@${REINPLACE_CMD} "s!^INSTALL =\(.*\)!INSTALL = ${INSTALL}!" \
36
	@${REINPLACE_CMD} "s!^INSTALL =\(.*\)!INSTALL = ${INSTALL}!" \
62
			${WRKSRC}/src/gatherer/curl/lib/Makefile
37
			${WRKSRC}/src/gatherer/curl/lib/Makefile
63
38
(-)harvest/distinfo (-1 / +1 lines)
Line 1 Link Here
1
MD5 (harvest-1.9.10.tar.bz2) = 7d9d06a86013eec63aa54b608cf0984c
1
MD5 (harvest-1.9.13.tar.bz2) = ff7687bf38d965235eb328389b9a80b4
(-)harvest/pkg-plist (-199 / +6 lines)
Lines 4-21 Link Here
4
bin/Harvest
4
bin/Harvest
5
bin/broker
5
bin/broker
6
bin/curl
6
bin/curl
7
bin/curl-config
8
bin/gather
7
bin/gather
9
bin/yaz-client
10
bin/yaz-comp
11
bin/yaz-config
12
bin/yaz-ztest
13
bin/zebraidx
8
bin/zebraidx
14
bin/zebrash
9
bin/zebrash
15
bin/zebrasrv
10
bin/zebrasrv
16
bin/zoomsh
11
bin/zoomsh
17
brokers/Attributes.html
12
brokers/Attributes.html
18
brokers/adminhelp.html
13
brokers/adminhelp.html
14
brokers/images/dutch.gif
19
brokers/images/english.gif
15
brokers/images/english.gif
20
brokers/images/french.gif
16
brokers/images/french.gif
21
brokers/images/german.gif
17
brokers/images/german.gif
Lines 48-58 Link Here
48
brokers/skeleton/query-glimpse-modern.html.fr.in
44
brokers/skeleton/query-glimpse-modern.html.fr.in
49
brokers/skeleton/query-glimpse-modern.html.in
45
brokers/skeleton/query-glimpse-modern.html.in
50
brokers/skeleton/query-glimpse-modern.html.it.in
46
brokers/skeleton/query-glimpse-modern.html.it.in
47
brokers/skeleton/query-glimpse-modern.html.nl.in
51
brokers/skeleton/query-glimpse-modern.html.ru.in
48
brokers/skeleton/query-glimpse-modern.html.ru.in
52
brokers/skeleton/query-glimpse-modern.html.se.in
49
brokers/skeleton/query-glimpse-modern.html.se.in
53
brokers/skeleton/query-glimpse.html.de.in
50
brokers/skeleton/query-glimpse.html.de.in
54
brokers/skeleton/query-glimpse.html.in
51
brokers/skeleton/query-glimpse.html.in
55
brokers/skeleton/query-glimpse.html.it.in
52
brokers/skeleton/query-glimpse.html.it.in
53
brokers/skeleton/query-glimpse.html.nl.in
56
brokers/skeleton/query-glimpse.html.se.in
54
brokers/skeleton/query-glimpse.html.se.in
57
brokers/skeleton/query-swish-modern.html.in
55
brokers/skeleton/query-swish-modern.html.in
58
brokers/skeleton/query-swish.html.in
56
brokers/skeleton/query-swish.html.in
Lines 70-79 Link Here
70
cgi-bin/displaySOIF.cgi
68
cgi-bin/displaySOIF.cgi
71
cgi-bin/lib/Sample.cf
69
cgi-bin/lib/Sample.cf
72
cgi-bin/lib/classic.cf
70
cgi-bin/lib/classic.cf
71
cgi-bin/lib/dutch.cf
73
cgi-bin/lib/french.cf
72
cgi-bin/lib/french.cf
74
cgi-bin/lib/german.cf
73
cgi-bin/lib/german.cf
75
cgi-bin/lib/italiano.cf
74
cgi-bin/lib/italiano.cf
76
cgi-bin/lib/modern.cf
75
cgi-bin/lib/modern.cf
76
cgi-bin/lib/rediris.cf
77
cgi-bin/lib/russian.cf
77
cgi-bin/lib/russian.cf
78
cgi-bin/lib/search.cf
78
cgi-bin/lib/search.cf
79
cgi-bin/lib/spanish.cf
79
cgi-bin/lib/spanish.cf
Lines 112-190 Link Here
112
gatherers/example-5/example-5.cf
112
gatherers/example-5/example-5.cf
113
gatherers/example-5/mydomain-host-filter
113
gatherers/example-5/mydomain-host-filter
114
gatherers/example-5/mydomain-url-filter
114
gatherers/example-5/mydomain-url-filter
115
include/curl/curl.h
116
include/curl/easy.h
117
include/curl/mprintf.h
118
include/curl/multi.h
119
include/curl/stdcheaders.h
120
include/curl/types.h
121
include/yaz/backend.h
122
include/yaz/ccl.h
123
include/yaz/charneg.h
124
include/yaz/comstack.h
125
include/yaz/cql.h
126
include/yaz/diagbib1.h
127
include/yaz/ill-core.h
128
include/yaz/ill.h
129
include/yaz/item-req.h
130
include/yaz/log.h
131
include/yaz/logrpn.h
132
include/yaz/marcdisp.h
133
include/yaz/nmem.h
134
include/yaz/odr.h
135
include/yaz/oid.h
136
include/yaz/options.h
137
include/yaz/otherinfo.h
138
include/yaz/pquery.h
139
include/yaz/proto.h
140
include/yaz/prt-ext.h
141
include/yaz/readconf.h
142
include/yaz/soap.h
143
include/yaz/sortspec.h
144
include/yaz/srw.h
145
include/yaz/statserv.h
146
include/yaz/tcpip.h
147
include/yaz/tpath.h
148
include/yaz/unix.h
149
include/yaz/wrbuf.h
150
include/yaz/xmalloc.h
151
include/yaz/yaz-ccl.h
152
include/yaz/yaz-iconv.h
153
include/yaz/yaz-util.h
154
include/yaz/yaz-version.h
155
include/yaz/yconfig.h
156
include/yaz/z-accdes1.h
157
include/yaz/z-accform1.h
158
include/yaz/z-acckrb1.h
159
include/yaz/z-charneg.h
160
include/yaz/z-core.h
161
include/yaz/z-date.h
162
include/yaz/z-diag1.h
163
include/yaz/z-espec1.h
164
include/yaz/z-estask.h
165
include/yaz/z-exp.h
166
include/yaz/z-grs.h
167
include/yaz/z-mterm2.h
168
include/yaz/z-opac.h
169
include/yaz/z-rrf1.h
170
include/yaz/z-rrf2.h
171
include/yaz/z-sum.h
172
include/yaz/z-sutrs.h
173
include/yaz/z-uifr1.h
174
include/yaz/z-univ.h
175
include/yaz/zes-admin.h
176
include/yaz/zes-expi.h
177
include/yaz/zes-exps.h
178
include/yaz/zes-order.h
179
include/yaz/zes-pquery.h
180
include/yaz/zes-psched.h
181
include/yaz/zes-pset.h
182
include/yaz/zes-update.h
183
include/yaz/zes-update0.h
184
include/yaz/zgdu.h
185
include/yaz/zoom.h
186
include/zebraapi.h
187
include/zebraver.h
188
lib/broker/BrokerRestart
115
lib/broker/BrokerRestart
189
lib/broker/agrep
116
lib/broker/agrep
190
lib/broker/brkclient
117
lib/broker/brkclient
Lines 195-202 Link Here
195
lib/broker/glimpseserver
122
lib/broker/glimpseserver
196
lib/broker/info-to-html.pl
123
lib/broker/info-to-html.pl
197
lib/broker/mkbrokerstats.pl
124
lib/broker/mkbrokerstats.pl
198
lib/broker/soif2gils.pl
125
lib/broker/soif2xml.pl
199
lib/broker/swish
200
lib/chat2.pl
126
lib/chat2.pl
201
lib/dateconv.pl
127
lib/dateconv.pl
202
lib/ftp.pl
128
lib/ftp.pl
Lines 412-423 Link Here
412
lib/libcurl.la
338
lib/libcurl.la
413
lib/libcurl.so
339
lib/libcurl.so
414
lib/libcurl.so.2
340
lib/libcurl.so.2
415
lib/libyaz.a
416
lib/libyaz.la
417
lib/libyazmalloc.a
418
lib/libyazmalloc.la
419
lib/libyazthread.a
420
lib/libyazthread.la
421
lib/lsparse.pl
341
lib/lsparse.pl
422
lib/md5
342
lib/md5
423
lib/newsget.pl
343
lib/newsget.pl
Lines 427-519 Link Here
427
lib/timelocal.pl
347
lib/timelocal.pl
428
lib/urlget
348
lib/urlget
429
lib/urlpurge
349
lib/urlpurge
430
share/aclocal/yaz.m4
431
share/curl/curl-ca-bundle.crt
350
share/curl/curl-ca-bundle.crt
432
share/doc/idzebra/administration.html
433
share/doc/idzebra/apps.html
434
share/doc/idzebra/configuration-file.html
435
share/doc/idzebra/data-model.html
436
share/doc/idzebra/example1.html
437
share/doc/idzebra/example2.html
438
share/doc/idzebra/examples.html
439
share/doc/idzebra/features.html
440
share/doc/idzebra/file-ids.html
441
share/doc/idzebra/formats.html
442
share/doc/idzebra/future.html
443
share/doc/idzebra/generic-ids.html
444
share/doc/idzebra/indexdata.html
445
share/doc/idzebra/installation.html
446
share/doc/idzebra/installation.win32.html
447
share/doc/idzebra/internal-representation.html
448
share/doc/idzebra/introduction.html
449
share/doc/idzebra/license.html
450
share/doc/idzebra/locating-records.html
451
share/doc/idzebra/protocol-support.html
452
share/doc/idzebra/quick-start.html
453
share/doc/idzebra/record-model.html
454
share/doc/idzebra/register-location.html
455
share/doc/idzebra/server.html
456
share/doc/idzebra/shadow-registers.html
457
share/doc/idzebra/simple-indexing.html
458
share/doc/idzebra/support.html
459
share/doc/idzebra/zebra.html
460
share/doc/idzebra/zebra.pdf
461
share/doc/idzebra/zebraidx.html
462
share/doc/yaz/apilayer.png
463
share/doc/yaz/asn.external.html
464
share/doc/yaz/asn.html
465
share/doc/yaz/asn.oid.html
466
share/doc/yaz/asn.pdu.html
467
share/doc/yaz/asn.preparing.html
468
share/doc/yaz/client.commands.html
469
share/doc/yaz/client.html
470
share/doc/yaz/client.invoking.html
471
share/doc/yaz/client.searching.html
472
share/doc/yaz/comstack.addresses.html
473
share/doc/yaz/comstack.client.html
474
share/doc/yaz/comstack.common.html
475
share/doc/yaz/comstack.diagnostics.html
476
share/doc/yaz/comstack.html
477
share/doc/yaz/comstack.introduction.html
478
share/doc/yaz/comstack.server.html
479
share/doc/yaz/comstack.summary.html
480
share/doc/yaz/credits.html
481
share/doc/yaz/future.html
482
share/doc/yaz/id.png
483
share/doc/yaz/indexdata.html
484
share/doc/yaz/installation.html
485
share/doc/yaz/installation.unix.html
486
share/doc/yaz/installation.win32.html
487
share/doc/yaz/introduction.api.html
488
share/doc/yaz/introduction.html
489
share/doc/yaz/license.html
490
share/doc/yaz/license.other.html
491
share/doc/yaz/odr.debugging.html
492
share/doc/yaz/odr.html
493
share/doc/yaz/odr.programming.html
494
share/doc/yaz/odr.use.html
495
share/doc/yaz/server.backend.html
496
share/doc/yaz/server.backendfunctions.html
497
share/doc/yaz/server.frontend.html
498
share/doc/yaz/server.html
499
share/doc/yaz/server.invocation.html
500
share/doc/yaz/server.main.html
501
share/doc/yaz/soap.html
502
share/doc/yaz/soap.http.html
503
share/doc/yaz/soap.srw.html
504
share/doc/yaz/soap.xml.html
505
share/doc/yaz/tools.html
506
share/doc/yaz/tools.nmem.html
507
share/doc/yaz/tools.oid.html
508
share/doc/yaz/yaz.html
509
share/doc/yaz/yaz.pdf
510
share/doc/yaz/zoom.events.html
511
share/doc/yaz/zoom.html
512
share/doc/yaz/zoom.options.html
513
share/doc/yaz/zoom.query.html
514
share/doc/yaz/zoom.records.html
515
share/doc/yaz/zoom.resultsets.html
516
share/doc/yaz/zoom.scan.html
517
share/idzebra/tab/bib1.att
351
share/idzebra/tab/bib1.att
518
share/idzebra/tab/dan1.att
352
share/idzebra/tab/dan1.att
519
share/idzebra/tab/danmarc.abs
353
share/idzebra/tab/danmarc.abs
Lines 545-551 Link Here
545
share/idzebra/tab/refer.flt
379
share/idzebra/tab/refer.flt
546
share/idzebra/tab/scan.chr
380
share/idzebra/tab/scan.chr
547
share/idzebra/tab/sgml.flt
381
share/idzebra/tab/sgml.flt
548
share/idzebra/tab/soif-harvest.flt
549
share/idzebra/tab/soif.flt
382
share/idzebra/tab/soif.flt
550
share/idzebra/tab/string.chr
383
share/idzebra/tab/string.chr
551
share/idzebra/tab/summary.abs
384
share/idzebra/tab/summary.abs
Lines 562-578 Link Here
562
share/idzebra/tab/wais-b.est
395
share/idzebra/tab/wais-b.est
563
share/idzebra/tab/wais-variant.est
396
share/idzebra/tab/wais-variant.est
564
share/idzebra/tab/wais.abs
397
share/idzebra/tab/wais.abs
565
share/yaz/ill/ill.tcl
566
share/yaz/ill/ill9702.asn
567
share/yaz/ill/item-req.asn
568
share/yaz/z39.50/charneg-3.asn
569
share/yaz/z39.50/datetime.asn
570
share/yaz/z39.50/esadmin.asn
571
share/yaz/z39.50/esupdate.asn
572
share/yaz/z39.50/mterm2.asn
573
share/yaz/z39.50/univres.asn
574
share/yaz/z39.50/z.tcl
575
share/yaz/z39.50/z3950v3.asn
576
@dirrm bin
398
@dirrm bin
577
@dirrm lib/gatherer/sgmls-lib/html-4.0
399
@dirrm lib/gatherer/sgmls-lib/html-4.0
578
@dirrm lib/gatherer/sgmls-lib/html-4.01
400
@dirrm lib/gatherer/sgmls-lib/html-4.01
Lines 604-626 Link Here
604
@dirrm gatherers/example-4
426
@dirrm gatherers/example-4
605
@dirrm gatherers/example-5
427
@dirrm gatherers/example-5
606
@dirrm gatherers
428
@dirrm gatherers
607
@dirrm man/man3
608
@dirrm man/man1
609
@dirrm man/man7
610
@dirrm man/man8
611
@dirrm man
612
@dirrm share/curl
429
@dirrm share/curl
613
@dirrm share/yaz/z39.50
614
@dirrm share/yaz/ill
615
@dirrm share/yaz
616
@dirrm share/doc/yaz
617
@dirrm share/doc/idzebra
618
@dirrm share/doc
619
@dirrm share/aclocal
620
@dirrm share/idzebra/tab
430
@dirrm share/idzebra/tab
621
@dirrm share/idzebra
431
@dirrm share/idzebra
622
@dirrm share
432
@dirrm share
623
@dirrm include/curl
624
@dirrm include/yaz
625
@dirrm include
626
@unexec rmdir %D
433
@unexec rmdir %D
(-)harvest/files/patch-components::gatherer::standard::pstext::libs::include::sio.h (-14 lines)
Removed Link Here
1
--- ./components/gatherer/standard/pstext/libs/include/sio.h.orig	Fri Aug  1 14:20:17 2003
2
+++ ./components/gatherer/standard/pstext/libs/include/sio.h	Fri Aug  1 14:20:27 2003
3
@@ -12,7 +12,11 @@
4
 #define __SIO_H
5
 
6
 #include <errno.h>
7
+#ifdef __STRICT_ANSI__
8
+#include <stdarg.h>
9
+#else
10
 #include <varargs.h>
11
+#endif
12
 
13
 /*
14
  * Naming conventions:
(-)harvest/files/patch-components::gatherer::standard::pstext::libs::include::str.h (-15 lines)
Removed Link Here
1
--- ./components/gatherer/standard/pstext/libs/include/str.h.orig	Fri Aug  1 14:17:54 2003
2
+++ ./components/gatherer/standard/pstext/libs/include/str.h	Fri Aug  1 14:19:40 2003
3
@@ -12,8 +12,11 @@
4
  * str.h,v 1.1.1.1 1994/04/26 19:08:08 hardy Exp
5
  */
6
 
7
+#ifdef __STRICT_ANSI__
8
+#include <stdarg.h>
9
+#else
10
 #include <varargs.h>
11
-
12
+#endif
13
 
14
 #ifdef __ARGS
15
 #undef __ARGS
(-)harvest/files/patch-components::gatherer::standard::pstext::libs::src::sio::sio.h (-27 lines)
Removed Link Here
1
--- ./components/gatherer/standard/pstext/libs/src/sio/sio.h.orig	Sun Mar 16 22:07:04 1997
2
+++ ./components/gatherer/standard/pstext/libs/src/sio/sio.h	Fri Aug  1 13:24:57 2003
3
@@ -12,7 +12,11 @@
4
 #define __SIO_H
5
 
6
 #include <errno.h>
7
+#if defined(__STRICT_ANSI__)
8
+#include <stdarg.h>
9
+#else
10
 #include <varargs.h>
11
+#endif
12
 
13
 /*
14
  * Naming conventions:
15
@@ -240,8 +244,10 @@
16
  */
17
 int Swrite __ARGS( ( int fd, char *buf, int nbytes ) ) ;
18
 int Sputc __ARGS( ( int fd, char c ) ) ;
19
-int Sprint __ARGS( ( int fd, char *format, ... ) ) ;
20
-int Sprintv __ARGS( ( int fd, char *format, va_list ) ) ;
21
+#ifndef __STRICT_ANSI__
22
+int Sprint __ARGS( ( int fd, char *format , ...) ) ;
23
+#endif
24
+int Sprintv __ARGS( ( int fd, char *format, va_args ) ) ;
25
 
26
 /*
27
  * other functions
(-)harvest/files/patch-components::gatherer::standard::pstext::libs::src::sio::sprint.c (-31 lines)
Removed Link Here
1
--- ./components/gatherer/standard/pstext/libs/src/sio/sprint.c.orig	Fri Jan 31 17:25:04 2003
2
+++ ./components/gatherer/standard/pstext/libs/src/sio/sprint.c	Fri Aug  1 13:24:58 2003
3
@@ -132,6 +132,15 @@
4
  *     - all floating point arguments are passed as doubles
5
  */
6
 /* VARARGS2 */
7
+#if defined(__STRICT_ANSI__)
8
+int Sprint( int fd, char *fmt,... )
9
+{
10
+	__sio_descriptor_t *dp = &__sio_descriptors[ fd ] ;
11
+	register __sio_od_t *odp = ODP( dp ) ;
12
+	register int cc ;
13
+	va_list ap ;
14
+	va_start( ap,fmt ) ;
15
+#else
16
 int Sprint( fd, fmt, va_alist )
17
 	int fd ;
18
 	register char *fmt ;
19
@@ -141,10 +150,10 @@
20
 	register __sio_od_t *odp = ODP( dp ) ;
21
 	register int cc ;
22
 	va_list ap ;
23
-
24
+	va_start( ap ) ;
25
+#endif
26
 	IO_SETUP( fd, dp, __SIO_OUTPUT_STREAM, SIO_ERR ) ;
27
 
28
-	va_start( ap ) ;
29
 	cc = __sio_converter( odp, fd, fmt, ap ) ;
30
 	va_end( ap ) ;
31
 	return( cc ) ;
(-)harvest/files/patch-components::gatherer::standard::pstext::libs::src::str::str.h (-54 lines)
Removed Link Here
1
--- ./components/gatherer/standard/pstext/libs/src/str/str.h.orig	Sun Mar 16 22:07:27 1997
2
+++ ./components/gatherer/standard/pstext/libs/src/str/str.h	Fri Aug  1 13:47:57 2003
3
@@ -11,9 +11,11 @@
4
 /*
5
  * str.h,v 1.1.1.1 1994/04/26 19:08:12 hardy Exp
6
  */
7
-
8
+#ifdef __STRICT_ANSI__
9
+#include <stdarg.h>
10
+#else
11
 #include <varargs.h>
12
-
13
+#endif
14
 
15
 #ifdef __ARGS
16
 #undef __ARGS
17
@@ -25,21 +27,32 @@
18
 #   define __ARGS( s )               ()
19
 #endif
20
 
21
+// void strx_print( int ccp, char *buf, int len, char *format, ... )
22
+// char *strx_sprint( char *buf, int len, char *format, ... )
23
+// int strx_nprint( char *buf, int len, char *format, ... )
24
+// void str_print( int ccp, char *buf, char *format, ... )
25
+// char *str_sprint( char *buf, char *format, ... )
26
+// int str_nprint( char *buf, char *format, ... )
27
+
28
 
29
 /*
30
  * strprint(3) functions
31
  */
32
+
33
+#ifndef __STRICT_ANSI__
34
+void strx_print __ARGS( ( int *count, char *buf, int len, char *fmt, ... ) ) ;
35
+int strx_nprint __ARGS( ( char *buf, int len, char *fmt, ... ) ) ;
36
+void str_print __ARGS( ( int *count, char *buf, char *fmt, ... ) ) ;
37
+char *strx_sprint __ARGS( ( char *buf, int len, char *fmt, ... ) ) ;
38
+int str_nprintv __ARGS( ( char *buf, char *fmt, va_list ) ) ;
39
 char *str_sprint __ARGS( ( char *buf, char *fmt, ... ) ) ;
40
 int str_nprint __ARGS( ( char *buf, char *fmt, ... ) ) ;
41
-void str_print __ARGS( ( int *count, char *buf, char *fmt, ... ) ) ;
42
+#endif
43
+
44
 
45
 char *str_sprintv __ARGS( ( char *buf, char *fmt, va_list ) ) ;
46
-int str_nprintv __ARGS( ( char *buf, char *fmt, va_list ) ) ;
47
 void str_printv __ARGS( ( int *count, char *buf, char *fmt, va_list ) ) ;
48
 
49
-char *strx_sprint __ARGS( ( char *buf, int len, char *fmt, ... ) ) ;
50
-int strx_nprint __ARGS( ( char *buf, int len, char *fmt, ... ) ) ;
51
-void strx_print __ARGS( ( int *count, char *buf, int len, char *fmt, ... ) ) ;
52
 
53
 char *strx_sprintv __ARGS( ( char *buf, int len, char *fmt, va_list ) ) ;
54
 int strx_nprintv __ARGS( ( char *buf, int len, char *fmt, va_list ) ) ;
(-)harvest/files/patch-components::gatherer::standard::pstext::libs::src::str::strprint.c (-135 lines)
Removed Link Here
1
--- ./components/gatherer/standard/pstext/libs/src/str/strprint.c.orig	Fri Aug  1 13:34:23 2003
2
+++ ./components/gatherer/standard/pstext/libs/src/str/strprint.c	Fri Aug  1 13:47:29 2003
3
@@ -62,6 +62,13 @@
4
 }
5
 
6
 
7
+#ifdef __STRICT_ANSI__
8
+void strx_print( int ccp, char *buf, int len, char *format, ... )
9
+{
10
+	va_list ap ;
11
+
12
+	va_start( ap, *format ) ;
13
+#else
14
 void strx_print( ccp, buf, len, format, va_alist )
15
 	int *ccp ;
16
 	char *buf ;
17
@@ -70,13 +77,19 @@
18
 	va_dcl
19
 {
20
 	va_list ap ;
21
-
22
 	va_start( ap ) ;
23
+#endif
24
 	strx_printv( ccp, buf, len, format, ap ) ;
25
 	va_end( ap ) ;
26
 }
27
 
28
+#ifdef __STRICT_ANSI__
29
+char *strx_sprint( char *buf, int len, char *format, ... )
30
+{
31
+	va_list ap ;
32
 
33
+	va_start( ap, *format ) ;
34
+#else
35
 char *strx_sprint( buf, len, format, va_alist )
36
 	char *buf ;
37
 	int len ;
38
@@ -86,6 +99,7 @@
39
 	va_list ap ;
40
 
41
 	va_start( ap ) ;
42
+#endif
43
 	strx_printv( INT_NULL, buf, len, format, ap ) ;
44
 	va_end( ap ) ;
45
 	return( buf ) ;
46
@@ -102,7 +116,14 @@
47
 	return( buf ) ;
48
 }
49
 
50
+#ifdef __STRICT_ANSI__
51
+int strx_nprint( char *buf, int len, char *format, ... )
52
+{
53
+	int cc ;
54
+	va_list ap ;
55
 
56
+	va_start( ap, *format ) ;
57
+#else
58
 int strx_nprint( buf, len, format, va_alist )
59
 	char *buf ;
60
 	int len ;
61
@@ -113,6 +134,7 @@
62
 	va_list ap ;
63
 
64
 	va_start( ap ) ;
65
+#endif
66
 	strx_printv( &cc, buf, len, format, ap ) ;
67
 	va_end( ap ) ;
68
 	return( cc ) ;
69
@@ -137,6 +159,13 @@
70
  * Group 2: the str_* functions
71
  */
72
 
73
+#ifdef __STRICT_ANSI__
74
+void str_print( int ccp, char *buf, char *format, ... )
75
+{
76
+	va_list ap ;
77
+
78
+	va_start( ap, *format ) ;
79
+#else
80
 void str_print( ccp, buf, format, va_alist )
81
 	int *ccp ;
82
 	char *buf ;
83
@@ -146,6 +175,7 @@
84
 	va_list ap ;
85
 
86
 	va_start( ap ) ;
87
+#endif
88
 	strx_printv( ccp, buf, 0, format, ap ) ;
89
 	va_end( ap ) ;
90
 }
91
@@ -160,7 +190,13 @@
92
 	strx_printv( ccp, buf, 0, format, ap ) ;
93
 }
94
 
95
+#ifdef __STRICT_ANSI__
96
+char *str_sprint( char *buf, char *format, ... )
97
+{
98
+	va_list ap ;
99
 
100
+	va_start( ap, *format ) ;
101
+#else
102
 char *str_sprint( buf, format, va_alist )
103
 	char *buf ;
104
 	char *format ;
105
@@ -169,6 +205,7 @@
106
 	va_list ap ;
107
 
108
 	va_start( ap ) ;
109
+#endif
110
 	strx_printv( INT_NULL, buf, 0, format, ap ) ;
111
 	va_end( ap ) ;
112
 	return( buf ) ;
113
@@ -184,7 +221,14 @@
114
 	return( buf ) ;
115
 }
116
 
117
+#ifdef __STRICT_ANSI__
118
+int str_nprint( char *buf, char *format, ... )
119
+{
120
+	int cc ;
121
+	va_list ap ;
122
 
123
+	va_start( ap, *format) ;
124
+#else
125
 int str_nprint( buf, format, va_alist )
126
 	char *buf ;
127
 	char *format ;
128
@@ -194,6 +238,7 @@
129
 	va_list ap ;
130
 
131
 	va_start( ap ) ;
132
+#endif
133
 	strx_printv( &cc, buf, 0, format, ap ) ;
134
 	va_end( ap ) ;
135
 	return( cc ) ;
(-)harvest/files/patch-components::gatherer::standard::pstext::pstext::common.c (-35 lines)
Removed Link Here
1
--- ./components/gatherer/standard/pstext/pstext/common.c.orig	Fri Aug  1 13:50:18 2003
2
+++ ./components/gatherer/standard/pstext/pstext/common.c	Fri Aug  1 14:09:05 2003
3
@@ -6,7 +6,11 @@
4
 
5
 static char RCSid[] = "common.c,v 1.4 1995/01/20 23:03:20 hardy Exp";
6
 
7
+#ifdef __STRICT_ANSI__
8
+#include <stdarg.h>
9
+#else
10
 #include <varargs.h>
11
+#endif
12
 
13
 void exit();
14
 char *malloc();
15
@@ -143,6 +147,12 @@
16
 }
17
 
18
 
19
+#ifdef __STRICT_ANSI__
20
+void error(char *fmt, ...)
21
+{
22
+	va_list ap;
23
+	va_start(ap,fmt);
24
+#else
25
 void error(fmt, va_alist)
26
 char *fmt;
27
 va_dcl
28
@@ -150,6 +160,7 @@
29
 	va_list ap;
30
 
31
 	va_start(ap);
32
+#endif
33
 	Sprint(2, "pstext: Line %d: ", line_count);
34
 	Sprintv(2, fmt, ap);
35
 	exit(1);
(-)harvest/files/patch-components::gatherer::standard::pstext::pstext::defs.h (-15 lines)
Removed Link Here
1
--- ./components/gatherer/standard/pstext/pstext/defs.h.orig	Fri Aug  1 13:51:49 2003
2
+++ ./components/gatherer/standard/pstext/pstext/defs.h	Fri Aug  1 13:58:59 2003
3
@@ -43,7 +43,12 @@
4
 	TOK_STRING, TOK_NUMBER, TOK_OTHER, TOK_CMD
5
 } token_e;
6
 
7
+#ifdef __STRICT_ANSI__
8
+void error (char *fmt, ...);
9
+#else
10
 void error();
11
+#endif
12
+
13
 void printout();
14
 
15
 extern int line_count;
(-)harvest/files/patch-src::broker::log.c (-53 lines)
Removed Link Here
1
--- ./src/broker/log.c.orig	Fri May  2 20:34:44 1997
2
+++ ./src/broker/log.c	Fri Aug  1 13:24:58 2003
3
@@ -151,10 +151,28 @@
4
 }
5
 
6
 /* Log Something */
7
-int LOG_statlog(va_alist)
8
+#if defined(__STRICT_ANSI__)
9
+int LOG_statlog(char *fmt,...)
10
+{
11
+	time_t curtime;
12
+	unsigned int type;
13
+	char *outstr = NULL;
14
+	char *statname = NULL;
15
+	char *url = NULL;
16
+	char *gn = NULL;
17
+	char *gh = NULL;
18
+	char *gv = NULL;
19
+	int gid;
20
+	fd_t FD;
21
+
22
+    va_list ap;
23
+    va_start(ap,fmt);
24
+    va_list args;
25
+    va_start(args,fmt);
26
+#else
27
+int LOG_statlog(va_alist) 
28
 va_dcl
29
 {
30
-	va_list args;
31
 	time_t curtime;
32
 	unsigned int type;
33
 	char *outstr = NULL;
34
@@ -166,10 +184,18 @@
35
 	int gid;
36
 	fd_t FD;
37
 
38
+    va_list ap;
39
+    char *fmt;
40
+    va_list args;
41
+    va_start(ap);
42
+    fmt = va_arg(ap, char *);
43
+    fmt = va_arg(args, char *);
44
+    va_start(args);
45
+#endif /* __STRICT_ANSI__ */
46
+
47
 	if (!log_file)
48
 		return ERROR;
49
 
50
-	va_start(args);
51
 	type = va_arg(args, unsigned int);
52
 	if (LOG_do_logging(type) == TRUE) {
53
 		statname = va_arg(args, char *);
(-)harvest/files/patch-src::broker::log.h (-13 lines)
Removed Link Here
1
--- ./src/broker/log.h.orig	Fri Mar 21 17:20:01 1997
2
+++ ./src/broker/log.h	Fri Aug  1 13:24:58 2003
3
@@ -147,8 +147,9 @@
4
 #define L_CONNECT_S    	"CONNECTION"
5
 
6
 /* ========== Logging Macros ========= */
7
-
8
+#ifndef __STRICT_ANSI__
9
 int LOG_statlog();
10
+#endif
11
 
12
 #define LOGUPDATE(X) \
13
 	{LOG_statlog(L_UPDATE,L_UPDATE_S,(X)->url,(X)->FD,(X)->GID);}
(-)harvest/files/patch-src::gatherer::curl::lib::Makefile.in (+11 lines)
Added Link Here
1
--- src/gatherer/curl/lib/Makefile.in.orig	Mon Nov 10 10:40:40 2003
2
+++ src/gatherer/curl/lib/Makefile.in	Mon Nov 10 10:40:58 2003
3
@@ -27,7 +27,7 @@
4
 top_builddir = ..
5
 
6
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
7
-INSTALL = @INSTALL@
8
+INSTALL = $(install_sh)
9
 install_sh_DATA = $(install_sh) -c -m 644
10
 install_sh_PROGRAM = $(install_sh) -c
11
 install_sh_SCRIPT = $(install_sh) -c

Return to bug 59113