diff options
author | Oliver Lehmann <oliver@FreeBSD.org> | 2003-08-02 16:20:20 +0000 |
---|---|---|
committer | Oliver Lehmann <oliver@FreeBSD.org> | 2003-08-02 16:20:20 +0000 |
commit | 0a46264f4c625e375c726871af8c4195be1c2fb7 (patch) | |
tree | 9c77deae5bf2077488f87ba368bdef9ea3991f0b /www/harvest | |
parent | Fix build on 4-STABLE disabiling sanity check. (diff) |
- Update harvest to 1.9.10
- Fix build: use starg instead of vararg
- hand over maintainership
PR: ports/55162
Submitted by: Clement Laforet <sheepkiller@cultdeadsheep.org>
Notes
Notes:
svn path=/head/; revision=86194
Diffstat (limited to 'www/harvest')
16 files changed, 593 insertions, 66 deletions
diff --git a/www/harvest/Makefile b/www/harvest/Makefile index 2066f703509f..48bbe534ebbb 100644 --- a/www/harvest/Makefile +++ b/www/harvest/Makefile @@ -6,30 +6,64 @@ # PORTNAME= harvest -PORTVERSION= 1.9.3 +PORTVERSION= 1.9.10 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= sheepkiller@cultdeadsheep.org COMMENT= Collect information from all over the Internet USE_BZIP2= yes USE_PERL5= yes USE_REINPLACE= yes +USE_LIBTOOL= yes +INSTALLS_SHLIB= yes HAS_CONFIGURE= yes CONFIGURE_ARGS= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} \ --prefix=${PREFIX}/${PORTNAME} \ - --without-wish + --without-wish STRIP= # none +MAN1= curl-config.1 curl.1 yaz-client-ssl.1 yaz-client.1 \ + yaz-config.1 zebraidx.1 zoomsh.1 +MAN3= curl_easy_cleanup.3 curl_easy_duphandle.3 curl_easy_getinfo.3 \ + curl_easy_init.3 curl_easy_perform.3 curl_easy_setopt.3 \ + curl_escape.3 curl_formadd.3 curl_formfree.3 curl_formparse.3 \ + curl_free.3 curl_getdate.3 curl_getenv.3 curl_global_cleanup.3 \ + curl_global_init.3 curl_mprintf.3 curl_multi_add_handle.3 \ + curl_multi_cleanup.3 curl_multi_fdset.3 curl_multi_info_read.3 \ + curl_multi_init.3 curl_multi_perform.3 \ + curl_multi_remove_handle.3 curl_slist_append.3 \ + curl_slist_free_all.3 curl_strequal.3 curl_strnequal.3 \ + curl_unescape.3 curl_version.3 curl_version_info.3 \ + libcurl-errors.3 libcurl-multi.3 libcurl.3 +MAN7= yaz.7 +MAN8= yaz-ztest-ssl.8 yaz-ztest.8 zebrasrv.8 +MANPREFIX= ${PREFIX}/harvest + +.include <bsd.port.pre.mk> + post-patch: @${GREP} -lR "<malloc.h>" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \ 's|<malloc\.h>|<stdlib.h>|g' +post-configure: +.if ${OSVERSION} > 501101 + @${ECHO_MSG} "#define __STRICT_ANSI__ 1" >> ${WRKSRC}/src/common/include/autoconf.h + @${REINPLACE_CMD} "s!DEFS\(.*\)!DEFS\1 -D__STRICT_ANSI__!" \ + ${WRKSRC}/components/gatherer/standard/pstext/libs/src/sio/Makefile + @${REINPLACE_CMD} "s!DEFS\(.*\)=\(.*\)!DEFS\1 = -D__STRICT_ANSI__ \2 !" \ + ${WRKSRC}/components/gatherer/standard/pstext/libs/src/str/Makefile + @${REINPLACE_CMD} "s!DEFS\(.*\)!DEFS\1 -D__STRICT_ANSI__!" \ + ${WRKSRC}/components/gatherer/standard/pstext/pstext/Makefile +.endif + @${REINPLACE_CMD} "s!^INSTALL =\(.*\)!INSTALL = ${INSTALL}!" \ + ${WRKSRC}/src/gatherer/curl/lib/Makefile + post-install: @(cd ${PREFIX} && ${GREP} -v "@" ${PLIST} | \ ${XARGS} ${STRIP_CMD} 2> /dev/null || ${TRUE}) -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/www/harvest/distinfo b/www/harvest/distinfo index c63806a88995..ee423cdf5abb 100644 --- a/www/harvest/distinfo +++ b/www/harvest/distinfo @@ -1 +1 @@ -MD5 (harvest-1.9.3.tar.bz2) = 4998504309073f3172fbab2db42c0204 +MD5 (harvest-1.9.10.tar.bz2) = 7d9d06a86013eec63aa54b608cf0984c diff --git a/www/harvest/files/patch-components::broker::zebra::yaz::lib::Makefile.in b/www/harvest/files/patch-components::broker::zebra::yaz::lib::Makefile.in index 813658a2cc9a..3db09902635a 100644 --- a/www/harvest/files/patch-components::broker::zebra::yaz::lib::Makefile.in +++ b/www/harvest/files/patch-components::broker::zebra::yaz::lib::Makefile.in @@ -1,8 +1,8 @@ ---- components/broker/zebra/yaz/lib/Makefile.in.orig Sat Nov 30 00:47:25 2002 -+++ components/broker/zebra/yaz/lib/Makefile.in Thu Dec 5 21:44:41 2002 -@@ -190,7 +190,7 @@ +--- ./components/broker/zebra/yaz/lib/Makefile.in.orig Fri Apr 25 18:22:11 2003 ++++ ./components/broker/zebra/yaz/lib/Makefile.in Fri Aug 1 13:24:57 2003 +@@ -197,7 +197,7 @@ $(AUTOMAKE) --gnu lib/Makefile - Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -libLTLIBRARIES_INSTALL = $(INSTALL) +libLTLIBRARIES_INSTALL = $(INSTALL_DATA) diff --git a/www/harvest/files/patch-components::gatherer::WordPerfect::wp2x-2.3::Makefile.in b/www/harvest/files/patch-components::gatherer::WordPerfect::wp2x-2.3::Makefile.in index 3e51ae50620a..5dbd8d4f8411 100644 --- a/www/harvest/files/patch-components::gatherer::WordPerfect::wp2x-2.3::Makefile.in +++ b/www/harvest/files/patch-components::gatherer::WordPerfect::wp2x-2.3::Makefile.in @@ -1,8 +1,5 @@ - -$FreeBSD$ - ---- components/gatherer/WordPerfect/wp2x-2.3/Makefile.in.orig Wed Dec 18 23:55:21 2002 -+++ components/gatherer/WordPerfect/wp2x-2.3/Makefile.in Wed Dec 18 23:55:50 2002 +--- ./components/gatherer/WordPerfect/wp2x-2.3/Makefile.in.orig Thu Feb 7 23:19:22 2002 ++++ ./components/gatherer/WordPerfect/wp2x-2.3/Makefile.in Fri Aug 1 13:24:57 2003 @@ -29,7 +29,7 @@ OBJS = wp2x.o dopen.o tokens.o charsets.o diff --git a/www/harvest/files/patch-components::gatherer::standard::pstext::libs::include::sio.h b/www/harvest/files/patch-components::gatherer::standard::pstext::libs::include::sio.h new file mode 100644 index 000000000000..3f8a9fe386cd --- /dev/null +++ b/www/harvest/files/patch-components::gatherer::standard::pstext::libs::include::sio.h @@ -0,0 +1,14 @@ +--- ./components/gatherer/standard/pstext/libs/include/sio.h.orig Fri Aug 1 14:20:17 2003 ++++ ./components/gatherer/standard/pstext/libs/include/sio.h Fri Aug 1 14:20:27 2003 +@@ -12,7 +12,11 @@ + #define __SIO_H + + #include <errno.h> ++#ifdef __STRICT_ANSI__ ++#include <stdarg.h> ++#else + #include <varargs.h> ++#endif + + /* + * Naming conventions: diff --git a/www/harvest/files/patch-components::gatherer::standard::pstext::libs::include::str.h b/www/harvest/files/patch-components::gatherer::standard::pstext::libs::include::str.h new file mode 100644 index 000000000000..da261cc2aa18 --- /dev/null +++ b/www/harvest/files/patch-components::gatherer::standard::pstext::libs::include::str.h @@ -0,0 +1,15 @@ +--- ./components/gatherer/standard/pstext/libs/include/str.h.orig Fri Aug 1 14:17:54 2003 ++++ ./components/gatherer/standard/pstext/libs/include/str.h Fri Aug 1 14:19:40 2003 +@@ -12,8 +12,11 @@ + * str.h,v 1.1.1.1 1994/04/26 19:08:08 hardy Exp + */ + ++#ifdef __STRICT_ANSI__ ++#include <stdarg.h> ++#else + #include <varargs.h> +- ++#endif + + #ifdef __ARGS + #undef __ARGS diff --git a/www/harvest/files/patch-components::gatherer::standard::pstext::libs::src::sio::sio.h b/www/harvest/files/patch-components::gatherer::standard::pstext::libs::src::sio::sio.h new file mode 100644 index 000000000000..a4af0d1817eb --- /dev/null +++ b/www/harvest/files/patch-components::gatherer::standard::pstext::libs::src::sio::sio.h @@ -0,0 +1,27 @@ +--- ./components/gatherer/standard/pstext/libs/src/sio/sio.h.orig Sun Mar 16 22:07:04 1997 ++++ ./components/gatherer/standard/pstext/libs/src/sio/sio.h Fri Aug 1 13:24:57 2003 +@@ -12,7 +12,11 @@ + #define __SIO_H + + #include <errno.h> ++#if defined(__STRICT_ANSI__) ++#include <stdarg.h> ++#else + #include <varargs.h> ++#endif + + /* + * Naming conventions: +@@ -240,8 +244,10 @@ + */ + int Swrite __ARGS( ( int fd, char *buf, int nbytes ) ) ; + int Sputc __ARGS( ( int fd, char c ) ) ; +-int Sprint __ARGS( ( int fd, char *format, ... ) ) ; +-int Sprintv __ARGS( ( int fd, char *format, va_list ) ) ; ++#ifndef __STRICT_ANSI__ ++int Sprint __ARGS( ( int fd, char *format , ...) ) ; ++#endif ++int Sprintv __ARGS( ( int fd, char *format, va_args ) ) ; + + /* + * other functions diff --git a/www/harvest/files/patch-components::gatherer::standard::pstext::libs::src::sio::sprint.c b/www/harvest/files/patch-components::gatherer::standard::pstext::libs::src::sio::sprint.c new file mode 100644 index 000000000000..6658afb13538 --- /dev/null +++ b/www/harvest/files/patch-components::gatherer::standard::pstext::libs::src::sio::sprint.c @@ -0,0 +1,31 @@ +--- ./components/gatherer/standard/pstext/libs/src/sio/sprint.c.orig Fri Jan 31 17:25:04 2003 ++++ ./components/gatherer/standard/pstext/libs/src/sio/sprint.c Fri Aug 1 13:24:58 2003 +@@ -132,6 +132,15 @@ + * - all floating point arguments are passed as doubles + */ + /* VARARGS2 */ ++#if defined(__STRICT_ANSI__) ++int Sprint( int fd, char *fmt,... ) ++{ ++ __sio_descriptor_t *dp = &__sio_descriptors[ fd ] ; ++ register __sio_od_t *odp = ODP( dp ) ; ++ register int cc ; ++ va_list ap ; ++ va_start( ap,fmt ) ; ++#else + int Sprint( fd, fmt, va_alist ) + int fd ; + register char *fmt ; +@@ -141,10 +150,10 @@ + register __sio_od_t *odp = ODP( dp ) ; + register int cc ; + va_list ap ; +- ++ va_start( ap ) ; ++#endif + IO_SETUP( fd, dp, __SIO_OUTPUT_STREAM, SIO_ERR ) ; + +- va_start( ap ) ; + cc = __sio_converter( odp, fd, fmt, ap ) ; + va_end( ap ) ; + return( cc ) ; diff --git a/www/harvest/files/patch-components::gatherer::standard::pstext::libs::src::str::str.h b/www/harvest/files/patch-components::gatherer::standard::pstext::libs::src::str::str.h new file mode 100644 index 000000000000..2a24aab4429f --- /dev/null +++ b/www/harvest/files/patch-components::gatherer::standard::pstext::libs::src::str::str.h @@ -0,0 +1,54 @@ +--- ./components/gatherer/standard/pstext/libs/src/str/str.h.orig Sun Mar 16 22:07:27 1997 ++++ ./components/gatherer/standard/pstext/libs/src/str/str.h Fri Aug 1 13:47:57 2003 +@@ -11,9 +11,11 @@ + /* + * str.h,v 1.1.1.1 1994/04/26 19:08:12 hardy Exp + */ +- ++#ifdef __STRICT_ANSI__ ++#include <stdarg.h> ++#else + #include <varargs.h> +- ++#endif + + #ifdef __ARGS + #undef __ARGS +@@ -25,21 +27,32 @@ + # define __ARGS( s ) () + #endif + ++// void strx_print( int ccp, char *buf, int len, char *format, ... ) ++// char *strx_sprint( char *buf, int len, char *format, ... ) ++// int strx_nprint( char *buf, int len, char *format, ... ) ++// void str_print( int ccp, char *buf, char *format, ... ) ++// char *str_sprint( char *buf, char *format, ... ) ++// int str_nprint( char *buf, char *format, ... ) ++ + + /* + * strprint(3) functions + */ ++ ++#ifndef __STRICT_ANSI__ ++void strx_print __ARGS( ( int *count, char *buf, int len, char *fmt, ... ) ) ; ++int strx_nprint __ARGS( ( char *buf, int len, char *fmt, ... ) ) ; ++void str_print __ARGS( ( int *count, char *buf, char *fmt, ... ) ) ; ++char *strx_sprint __ARGS( ( char *buf, int len, char *fmt, ... ) ) ; ++int str_nprintv __ARGS( ( char *buf, char *fmt, va_list ) ) ; + char *str_sprint __ARGS( ( char *buf, char *fmt, ... ) ) ; + int str_nprint __ARGS( ( char *buf, char *fmt, ... ) ) ; +-void str_print __ARGS( ( int *count, char *buf, char *fmt, ... ) ) ; ++#endif ++ + + char *str_sprintv __ARGS( ( char *buf, char *fmt, va_list ) ) ; +-int str_nprintv __ARGS( ( char *buf, char *fmt, va_list ) ) ; + void str_printv __ARGS( ( int *count, char *buf, char *fmt, va_list ) ) ; + +-char *strx_sprint __ARGS( ( char *buf, int len, char *fmt, ... ) ) ; +-int strx_nprint __ARGS( ( char *buf, int len, char *fmt, ... ) ) ; +-void strx_print __ARGS( ( int *count, char *buf, int len, char *fmt, ... ) ) ; + + char *strx_sprintv __ARGS( ( char *buf, int len, char *fmt, va_list ) ) ; + int strx_nprintv __ARGS( ( char *buf, int len, char *fmt, va_list ) ) ; diff --git a/www/harvest/files/patch-components::gatherer::standard::pstext::libs::src::str::strprint.c b/www/harvest/files/patch-components::gatherer::standard::pstext::libs::src::str::strprint.c new file mode 100644 index 000000000000..f3d5f94ebbbf --- /dev/null +++ b/www/harvest/files/patch-components::gatherer::standard::pstext::libs::src::str::strprint.c @@ -0,0 +1,135 @@ +--- ./components/gatherer/standard/pstext/libs/src/str/strprint.c.orig Fri Aug 1 13:34:23 2003 ++++ ./components/gatherer/standard/pstext/libs/src/str/strprint.c Fri Aug 1 13:47:29 2003 +@@ -62,6 +62,13 @@ + } + + ++#ifdef __STRICT_ANSI__ ++void strx_print( int ccp, char *buf, int len, char *format, ... ) ++{ ++ va_list ap ; ++ ++ va_start( ap, *format ) ; ++#else + void strx_print( ccp, buf, len, format, va_alist ) + int *ccp ; + char *buf ; +@@ -70,13 +77,19 @@ + va_dcl + { + va_list ap ; +- + va_start( ap ) ; ++#endif + strx_printv( ccp, buf, len, format, ap ) ; + va_end( ap ) ; + } + ++#ifdef __STRICT_ANSI__ ++char *strx_sprint( char *buf, int len, char *format, ... ) ++{ ++ va_list ap ; + ++ va_start( ap, *format ) ; ++#else + char *strx_sprint( buf, len, format, va_alist ) + char *buf ; + int len ; +@@ -86,6 +99,7 @@ + va_list ap ; + + va_start( ap ) ; ++#endif + strx_printv( INT_NULL, buf, len, format, ap ) ; + va_end( ap ) ; + return( buf ) ; +@@ -102,7 +116,14 @@ + return( buf ) ; + } + ++#ifdef __STRICT_ANSI__ ++int strx_nprint( char *buf, int len, char *format, ... ) ++{ ++ int cc ; ++ va_list ap ; + ++ va_start( ap, *format ) ; ++#else + int strx_nprint( buf, len, format, va_alist ) + char *buf ; + int len ; +@@ -113,6 +134,7 @@ + va_list ap ; + + va_start( ap ) ; ++#endif + strx_printv( &cc, buf, len, format, ap ) ; + va_end( ap ) ; + return( cc ) ; +@@ -137,6 +159,13 @@ + * Group 2: the str_* functions + */ + ++#ifdef __STRICT_ANSI__ ++void str_print( int ccp, char *buf, char *format, ... ) ++{ ++ va_list ap ; ++ ++ va_start( ap, *format ) ; ++#else + void str_print( ccp, buf, format, va_alist ) + int *ccp ; + char *buf ; +@@ -146,6 +175,7 @@ + va_list ap ; + + va_start( ap ) ; ++#endif + strx_printv( ccp, buf, 0, format, ap ) ; + va_end( ap ) ; + } +@@ -160,7 +190,13 @@ + strx_printv( ccp, buf, 0, format, ap ) ; + } + ++#ifdef __STRICT_ANSI__ ++char *str_sprint( char *buf, char *format, ... ) ++{ ++ va_list ap ; + ++ va_start( ap, *format ) ; ++#else + char *str_sprint( buf, format, va_alist ) + char *buf ; + char *format ; +@@ -169,6 +205,7 @@ + va_list ap ; + + va_start( ap ) ; ++#endif + strx_printv( INT_NULL, buf, 0, format, ap ) ; + va_end( ap ) ; + return( buf ) ; +@@ -184,7 +221,14 @@ + return( buf ) ; + } + ++#ifdef __STRICT_ANSI__ ++int str_nprint( char *buf, char *format, ... ) ++{ ++ int cc ; ++ va_list ap ; + ++ va_start( ap, *format) ; ++#else + int str_nprint( buf, format, va_alist ) + char *buf ; + char *format ; +@@ -194,6 +238,7 @@ + va_list ap ; + + va_start( ap ) ; ++#endif + strx_printv( &cc, buf, 0, format, ap ) ; + va_end( ap ) ; + return( cc ) ; diff --git a/www/harvest/files/patch-components::gatherer::standard::pstext::pstext::common.c b/www/harvest/files/patch-components::gatherer::standard::pstext::pstext::common.c new file mode 100644 index 000000000000..872e38efcecb --- /dev/null +++ b/www/harvest/files/patch-components::gatherer::standard::pstext::pstext::common.c @@ -0,0 +1,35 @@ +--- ./components/gatherer/standard/pstext/pstext/common.c.orig Fri Aug 1 13:50:18 2003 ++++ ./components/gatherer/standard/pstext/pstext/common.c Fri Aug 1 14:09:05 2003 +@@ -6,7 +6,11 @@ + + static char RCSid[] = "common.c,v 1.4 1995/01/20 23:03:20 hardy Exp"; + ++#ifdef __STRICT_ANSI__ ++#include <stdarg.h> ++#else + #include <varargs.h> ++#endif + + void exit(); + char *malloc(); +@@ -143,6 +147,12 @@ + } + + ++#ifdef __STRICT_ANSI__ ++void error(char *fmt, ...) ++{ ++ va_list ap; ++ va_start(ap,fmt); ++#else + void error(fmt, va_alist) + char *fmt; + va_dcl +@@ -150,6 +160,7 @@ + va_list ap; + + va_start(ap); ++#endif + Sprint(2, "pstext: Line %d: ", line_count); + Sprintv(2, fmt, ap); + exit(1); diff --git a/www/harvest/files/patch-components::gatherer::standard::pstext::pstext::defs.h b/www/harvest/files/patch-components::gatherer::standard::pstext::pstext::defs.h new file mode 100644 index 000000000000..fe3724c42fe2 --- /dev/null +++ b/www/harvest/files/patch-components::gatherer::standard::pstext::pstext::defs.h @@ -0,0 +1,15 @@ +--- ./components/gatherer/standard/pstext/pstext/defs.h.orig Fri Aug 1 13:51:49 2003 ++++ ./components/gatherer/standard/pstext/pstext/defs.h Fri Aug 1 13:58:59 2003 +@@ -43,7 +43,12 @@ + TOK_STRING, TOK_NUMBER, TOK_OTHER, TOK_CMD + } token_e; + ++#ifdef __STRICT_ANSI__ ++void error (char *fmt, ...); ++#else + void error(); ++#endif ++ + void printout(); + + extern int line_count; diff --git a/www/harvest/files/patch-src::broker::log.c b/www/harvest/files/patch-src::broker::log.c new file mode 100644 index 000000000000..3c8361237305 --- /dev/null +++ b/www/harvest/files/patch-src::broker::log.c @@ -0,0 +1,53 @@ +--- ./src/broker/log.c.orig Fri May 2 20:34:44 1997 ++++ ./src/broker/log.c Fri Aug 1 13:24:58 2003 +@@ -151,10 +151,28 @@ + } + + /* Log Something */ +-int LOG_statlog(va_alist) ++#if defined(__STRICT_ANSI__) ++int LOG_statlog(char *fmt,...) ++{ ++ time_t curtime; ++ unsigned int type; ++ char *outstr = NULL; ++ char *statname = NULL; ++ char *url = NULL; ++ char *gn = NULL; ++ char *gh = NULL; ++ char *gv = NULL; ++ int gid; ++ fd_t FD; ++ ++ va_list ap; ++ va_start(ap,fmt); ++ va_list args; ++ va_start(args,fmt); ++#else ++int LOG_statlog(va_alist) + va_dcl + { +- va_list args; + time_t curtime; + unsigned int type; + char *outstr = NULL; +@@ -166,10 +184,18 @@ + int gid; + fd_t FD; + ++ va_list ap; ++ char *fmt; ++ va_list args; ++ va_start(ap); ++ fmt = va_arg(ap, char *); ++ fmt = va_arg(args, char *); ++ va_start(args); ++#endif /* __STRICT_ANSI__ */ ++ + if (!log_file) + return ERROR; + +- va_start(args); + type = va_arg(args, unsigned int); + if (LOG_do_logging(type) == TRUE) { + statname = va_arg(args, char *); diff --git a/www/harvest/files/patch-src::broker::log.h b/www/harvest/files/patch-src::broker::log.h new file mode 100644 index 000000000000..87add84b23ff --- /dev/null +++ b/www/harvest/files/patch-src::broker::log.h @@ -0,0 +1,13 @@ +--- ./src/broker/log.h.orig Fri Mar 21 17:20:01 1997 ++++ ./src/broker/log.h Fri Aug 1 13:24:58 2003 +@@ -147,8 +147,9 @@ + #define L_CONNECT_S "CONNECTION" + + /* ========== Logging Macros ========= */ +- ++#ifndef __STRICT_ANSI__ + int LOG_statlog(); ++#endif + + #define LOGUPDATE(X) \ + {LOG_statlog(L_UPDATE,L_UPDATE_S,(X)->url,(X)->FD,(X)->GID);} diff --git a/www/harvest/files/patch-src::configure b/www/harvest/files/patch-src::configure new file mode 100644 index 000000000000..57494d959a81 --- /dev/null +++ b/www/harvest/files/patch-src::configure @@ -0,0 +1,11 @@ +--- ./src/configure.orig Fri Aug 1 13:24:59 2003 ++++ ./src/configure Fri Aug 1 13:24:59 2003 +@@ -7299,7 +7299,7 @@ + ac_prev=prefix ;; + -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) + ;; +- *) ac_sub_configure_args="$ac_sub_configure_args $ac_arg" ;; ++ *) ac_sub_configure_args="$ac_arg" ;; + esac + done + diff --git a/www/harvest/pkg-plist b/www/harvest/pkg-plist index 7285ba26115c..0c91683279e1 100644 --- a/www/harvest/pkg-plist +++ b/www/harvest/pkg-plist @@ -3,13 +3,15 @@ harvest/bin/CreateBroker harvest/bin/Gatherer harvest/bin/Harvest harvest/bin/broker +harvest/bin/curl +harvest/bin/curl-config harvest/bin/gather harvest/bin/yaz-client harvest/bin/yaz-comp harvest/bin/yaz-config harvest/bin/yaz-ztest -harvest/bin/yclient harvest/bin/zebraidx +harvest/bin/zebrash harvest/bin/zebrasrv harvest/bin/zoomsh harvest/brokers/Attributes.html @@ -43,10 +45,12 @@ harvest/brokers/skeleton/admin/admin.html.in harvest/brokers/skeleton/admin/broker.conf.in harvest/brokers/skeleton/query-glimpse-modern.html.de.in harvest/brokers/skeleton/query-glimpse-modern.html.es.in +harvest/brokers/skeleton/query-glimpse-modern.html.fr.in harvest/brokers/skeleton/query-glimpse-modern.html.in harvest/brokers/skeleton/query-glimpse-modern.html.it.in harvest/brokers/skeleton/query-glimpse-modern.html.ru.in harvest/brokers/skeleton/query-glimpse-modern.html.se.in +harvest/brokers/skeleton/query-glimpse.html.de.in harvest/brokers/skeleton/query-glimpse.html.in harvest/brokers/skeleton/query-glimpse.html.it.in harvest/brokers/skeleton/query-glimpse.html.se.in @@ -60,12 +64,13 @@ harvest/brokers/soifhelp.html harvest/brokers/zquery/about.html harvest/brokers/zquery/contact.html harvest/brokers/zquery/help.html -harvest/brokers/zquery/query.html +harvest/brokers/zquery/index.html harvest/brokers/zquery/register.html harvest/cgi-bin/BrokerAdmin.pl.cgi harvest/cgi-bin/displaySOIF.cgi harvest/cgi-bin/lib/Sample.cf harvest/cgi-bin/lib/classic.cf +harvest/cgi-bin/lib/french.cf harvest/cgi-bin/lib/german.cf harvest/cgi-bin/lib/italiano.cf harvest/cgi-bin/lib/modern.cf @@ -107,6 +112,79 @@ harvest/gatherers/example-5/RunGatherer harvest/gatherers/example-5/example-5.cf harvest/gatherers/example-5/mydomain-host-filter harvest/gatherers/example-5/mydomain-url-filter +harvest/include/curl/curl.h +harvest/include/curl/easy.h +harvest/include/curl/mprintf.h +harvest/include/curl/multi.h +harvest/include/curl/stdcheaders.h +harvest/include/curl/types.h +harvest/include/yaz/backend.h +harvest/include/yaz/ccl.h +harvest/include/yaz/charneg.h +harvest/include/yaz/comstack.h +harvest/include/yaz/cql.h +harvest/include/yaz/diagbib1.h +harvest/include/yaz/ill-core.h +harvest/include/yaz/ill.h +harvest/include/yaz/item-req.h +harvest/include/yaz/log.h +harvest/include/yaz/logrpn.h +harvest/include/yaz/marcdisp.h +harvest/include/yaz/nmem.h +harvest/include/yaz/odr.h +harvest/include/yaz/oid.h +harvest/include/yaz/options.h +harvest/include/yaz/otherinfo.h +harvest/include/yaz/pquery.h +harvest/include/yaz/proto.h +harvest/include/yaz/prt-ext.h +harvest/include/yaz/readconf.h +harvest/include/yaz/soap.h +harvest/include/yaz/sortspec.h +harvest/include/yaz/srw.h +harvest/include/yaz/statserv.h +harvest/include/yaz/tcpip.h +harvest/include/yaz/tpath.h +harvest/include/yaz/unix.h +harvest/include/yaz/wrbuf.h +harvest/include/yaz/xmalloc.h +harvest/include/yaz/yaz-ccl.h +harvest/include/yaz/yaz-iconv.h +harvest/include/yaz/yaz-util.h +harvest/include/yaz/yaz-version.h +harvest/include/yaz/yconfig.h +harvest/include/yaz/z-accdes1.h +harvest/include/yaz/z-accform1.h +harvest/include/yaz/z-acckrb1.h +harvest/include/yaz/z-charneg.h +harvest/include/yaz/z-core.h +harvest/include/yaz/z-date.h +harvest/include/yaz/z-diag1.h +harvest/include/yaz/z-espec1.h +harvest/include/yaz/z-estask.h +harvest/include/yaz/z-exp.h +harvest/include/yaz/z-grs.h +harvest/include/yaz/z-mterm2.h +harvest/include/yaz/z-opac.h +harvest/include/yaz/z-rrf1.h +harvest/include/yaz/z-rrf2.h +harvest/include/yaz/z-sum.h +harvest/include/yaz/z-sutrs.h +harvest/include/yaz/z-uifr1.h +harvest/include/yaz/z-univ.h +harvest/include/yaz/zes-admin.h +harvest/include/yaz/zes-expi.h +harvest/include/yaz/zes-exps.h +harvest/include/yaz/zes-order.h +harvest/include/yaz/zes-pquery.h +harvest/include/yaz/zes-psched.h +harvest/include/yaz/zes-pset.h +harvest/include/yaz/zes-update.h +harvest/include/yaz/zes-update0.h +harvest/include/yaz/zgdu.h +harvest/include/yaz/zoom.h +harvest/include/zebraapi.h +harvest/include/zebraver.h harvest/lib/broker/BrokerRestart harvest/lib/broker/agrep harvest/lib/broker/brkclient @@ -117,11 +195,13 @@ harvest/lib/broker/glimpseindex.bin harvest/lib/broker/glimpseserver harvest/lib/broker/info-to-html.pl harvest/lib/broker/mkbrokerstats.pl +harvest/lib/broker/soif2gils.pl harvest/lib/broker/swish harvest/lib/chat2.pl harvest/lib/dateconv.pl harvest/lib/ftp.pl harvest/lib/ftpget +harvest/lib/ftpget.bin harvest/lib/gatherer/Archive.sum harvest/lib/gatherer/Binary-raw.sum harvest/lib/gatherer/Binary.sum @@ -139,10 +219,11 @@ harvest/lib/gatherer/HTMLurls harvest/lib/gatherer/HTTP-Query.sum harvest/lib/gatherer/HomeHTML.sum harvest/lib/gatherer/IMS-DOCUMENT.sum +harvest/lib/gatherer/MSExcel.sum +harvest/lib/gatherer/MSPowerpoint.sum harvest/lib/gatherer/MSWord.sum harvest/lib/gatherer/Mail.sum harvest/lib/gatherer/ManPage.sum -harvest/lib/gatherer/MSExcel.sum harvest/lib/gatherer/NewsArticle.sum harvest/lib/gatherer/NewsGroup.sum harvest/lib/gatherer/Object.sum @@ -237,6 +318,7 @@ harvest/lib/gatherer/mkgathererstats.pl harvest/lib/gatherer/mkindex harvest/lib/gatherer/mktemplate harvest/lib/gatherer/newsenum +harvest/lib/gatherer/ppthtml harvest/lib/gatherer/prepurls harvest/lib/gatherer/print-attr harvest/lib/gatherer/print-c-comments @@ -275,14 +357,6 @@ harvest/lib/gatherer/sgmls-lib/ISOlat1-no-convert.sgml harvest/lib/gatherer/sgmls-lib/ISOlat1.sgml harvest/lib/gatherer/sgmls-lib/README harvest/lib/gatherer/sgmls-lib/catalog -harvest/lib/gatherer/sgmls-lib/html/ISOlat1.sgml -harvest/lib/gatherer/sgmls-lib/html/catalog -harvest/lib/gatherer/sgmls-lib/html/html-0.dtd -harvest/lib/gatherer/sgmls-lib/html/html-1.dtd -harvest/lib/gatherer/sgmls-lib/html/html-1s.dtd -harvest/lib/gatherer/sgmls-lib/html/html-s.dtd -harvest/lib/gatherer/sgmls-lib/html/html.decl -harvest/lib/gatherer/sgmls-lib/html/html.dtd harvest/lib/gatherer/sgmls-lib/html-3.2/HTML32.cat harvest/lib/gatherer/sgmls-lib/html-3.2/HTML32.dtd harvest/lib/gatherer/sgmls-lib/html-3.2/ISOlat1.ent @@ -302,6 +376,14 @@ harvest/lib/gatherer/sgmls-lib/html-4.01/HTMLsymbol.ent harvest/lib/gatherer/sgmls-lib/html-4.01/frameset.dtd harvest/lib/gatherer/sgmls-lib/html-4.01/loose.dtd harvest/lib/gatherer/sgmls-lib/html-4.01/strict.dtd +harvest/lib/gatherer/sgmls-lib/html/ISOlat1.sgml +harvest/lib/gatherer/sgmls-lib/html/catalog +harvest/lib/gatherer/sgmls-lib/html/html-0.dtd +harvest/lib/gatherer/sgmls-lib/html/html-1.dtd +harvest/lib/gatherer/sgmls-lib/html/html-1s.dtd +harvest/lib/gatherer/sgmls-lib/html/html-s.dtd +harvest/lib/gatherer/sgmls-lib/html/html.decl +harvest/lib/gatherer/sgmls-lib/html/html.dtd harvest/lib/gatherer/sgmls-lib/htmlplus/HTMLplus.dtd harvest/lib/gatherer/sgmlsasp harvest/lib/gatherer/skim @@ -322,9 +404,14 @@ harvest/lib/gatherer/wp2x-lib/tex.cfg harvest/lib/gatherer/wp2x-lib/troff.cfg harvest/lib/gatherer/wp2x.sh harvest/lib/gatherer/wrapit +harvest/lib/gatherer/xlhtml harvest/lib/gatherer/xls2csv harvest/lib/gopherget.pl harvest/lib/harvest-check.pl +harvest/lib/libcurl.a +harvest/lib/libcurl.la +harvest/lib/libcurl.so +harvest/lib/libcurl.so.2 harvest/lib/libyaz.a harvest/lib/libyaz.la harvest/lib/libyazmalloc.a @@ -340,16 +427,8 @@ harvest/lib/soif.pl harvest/lib/timelocal.pl harvest/lib/urlget harvest/lib/urlpurge -harvest/man/man1/yaz-client-ssl.1 -harvest/man/man1/yaz-client.1 -harvest/man/man1/yaz-config.1 -harvest/man/man1/zebraidx.1 -harvest/man/man1/zoomsh.1 -harvest/man/man7/yaz.7 -harvest/man/man8/yaz-ztest-ssl.8 -harvest/man/man8/yaz-ztest.8 -harvest/man/man8/zebrasrv.8 harvest/share/aclocal/yaz.m4 +harvest/share/curl/curl-ca-bundle.crt harvest/share/doc/idzebra/administration.html harvest/share/doc/idzebra/apps.html harvest/share/doc/idzebra/configuration-file.html @@ -364,6 +443,7 @@ harvest/share/doc/idzebra/future.html harvest/share/doc/idzebra/generic-ids.html harvest/share/doc/idzebra/indexdata.html harvest/share/doc/idzebra/installation.html +harvest/share/doc/idzebra/installation.win32.html harvest/share/doc/idzebra/internal-representation.html harvest/share/doc/idzebra/introduction.html harvest/share/doc/idzebra/license.html @@ -379,6 +459,7 @@ harvest/share/doc/idzebra/support.html harvest/share/doc/idzebra/zebra.html harvest/share/doc/idzebra/zebra.pdf harvest/share/doc/idzebra/zebraidx.html +harvest/share/doc/yaz/apilayer.png harvest/share/doc/yaz/asn.external.html harvest/share/doc/yaz/asn.html harvest/share/doc/yaz/asn.oid.html @@ -403,6 +484,7 @@ harvest/share/doc/yaz/indexdata.html harvest/share/doc/yaz/installation.html harvest/share/doc/yaz/installation.unix.html harvest/share/doc/yaz/installation.win32.html +harvest/share/doc/yaz/introduction.api.html harvest/share/doc/yaz/introduction.html harvest/share/doc/yaz/license.html harvest/share/doc/yaz/license.other.html @@ -416,6 +498,10 @@ harvest/share/doc/yaz/server.frontend.html harvest/share/doc/yaz/server.html harvest/share/doc/yaz/server.invocation.html harvest/share/doc/yaz/server.main.html +harvest/share/doc/yaz/soap.html +harvest/share/doc/yaz/soap.http.html +harvest/share/doc/yaz/soap.srw.html +harvest/share/doc/yaz/soap.xml.html harvest/share/doc/yaz/tools.html harvest/share/doc/yaz/tools.nmem.html harvest/share/doc/yaz/tools.oid.html @@ -483,52 +569,59 @@ harvest/share/yaz/z39.50/charneg-3.asn harvest/share/yaz/z39.50/datetime.asn harvest/share/yaz/z39.50/esadmin.asn harvest/share/yaz/z39.50/esupdate.asn +harvest/share/yaz/z39.50/mterm2.asn harvest/share/yaz/z39.50/univres.asn harvest/share/yaz/z39.50/z.tcl harvest/share/yaz/z39.50/z3950v3.asn -@dirrm harvest/share/yaz/z39.50 -@dirrm harvest/share/yaz/ill -@dirrm harvest/share/yaz -@dirrm harvest/share/idzebra/tab -@dirrm harvest/share/idzebra -@dirrm harvest/share/doc/yaz -@dirrm harvest/share/doc/idzebra -@dirrm harvest/share/doc -@dirrm harvest/share/aclocal -@dirrm harvest/share -@dirrm harvest/man/man8 -@dirrm harvest/man/man7 -@dirrm harvest/man/man1 -@dirrm harvest/man -@dirrm harvest/lib/gatherer/wp2x-lib -@dirrm harvest/lib/gatherer/sgmls-lib/htmlplus -@dirrm harvest/lib/gatherer/sgmls-lib/html-4.01 + +@dirrm harvest/bin @dirrm harvest/lib/gatherer/sgmls-lib/html-4.0 -@dirrm harvest/lib/gatherer/sgmls-lib/html-3.2 +@dirrm harvest/lib/gatherer/sgmls-lib/html-4.01 +@dirrm harvest/lib/gatherer/sgmls-lib/HTML @dirrm harvest/lib/gatherer/sgmls-lib/html +@dirrm harvest/lib/gatherer/sgmls-lib/htmlplus @dirrm harvest/lib/gatherer/sgmls-lib/IMS -@dirrm harvest/lib/gatherer/sgmls-lib/HTML +@dirrm harvest/lib/gatherer/sgmls-lib/html-3.2 @dirrm harvest/lib/gatherer/sgmls-lib +@dirrm harvest/lib/gatherer/wp2x-lib @dirrm harvest/lib/gatherer/catdoc-lib @dirrm harvest/lib/gatherer @dirrm harvest/lib/broker @dirrm harvest/lib -@dirrm harvest/gatherers/example-5 -@dirrm harvest/gatherers/example-4/lib -@dirrm harvest/gatherers/example-4/bin -@dirrm harvest/gatherers/example-4 -@dirrm harvest/gatherers/example-3/lib -@dirrm harvest/gatherers/example-3 -@dirrm harvest/gatherers/example-2/lib -@dirrm harvest/gatherers/example-2 -@dirrm harvest/gatherers/example-1 -@dirrm harvest/gatherers @dirrm harvest/cgi-bin/lib @dirrm harvest/cgi-bin -@dirrm harvest/brokers/zquery +@dirrm harvest/brokers/images @dirrm harvest/brokers/skeleton/admin @dirrm harvest/brokers/skeleton -@dirrm harvest/brokers/images +@dirrm harvest/brokers/zquery @dirrm harvest/brokers -@dirrm harvest/bin +@dirrm harvest/gatherers/example-1 +@dirrm harvest/gatherers/example-2/lib +@dirrm harvest/gatherers/example-2 +@dirrm harvest/gatherers/example-3/lib +@dirrm harvest/gatherers/example-3 +@dirrm harvest/gatherers/example-4/bin +@dirrm harvest/gatherers/example-4/lib +@dirrm harvest/gatherers/example-4 +@dirrm harvest/gatherers/example-5 +@dirrm harvest/gatherers +@dirrm harvest/man/man3 +@dirrm harvest/man/man1 +@dirrm harvest/man/man7 +@dirrm harvest/man/man8 +@dirrm harvest/man +@dirrm harvest/share/curl +@dirrm harvest/share/yaz/z39.50 +@dirrm harvest/share/yaz/ill +@dirrm harvest/share/yaz +@dirrm harvest/share/doc/yaz +@dirrm harvest/share/doc/idzebra +@dirrm harvest/share/doc +@dirrm harvest/share/aclocal +@dirrm harvest/share/idzebra/tab +@dirrm harvest/share/idzebra +@dirrm harvest/share +@dirrm harvest/include/curl +@dirrm harvest/include/yaz +@dirrm harvest/include @dirrm harvest |