diff options
author | fredb <fredb> | 1999-09-23 01:33:29 +0000 |
---|---|---|
committer | fredb <fredb> | 1999-09-23 01:33:29 +0000 |
commit | ce7365fa2851231ba54b7169450ca073b9012b35 (patch) | |
tree | 526e29ec9bcab733934b227b49eb9c5756937e10 /www | |
parent | 319edf59862f159dc2cc9cd675619be8777662a6 (diff) | |
download | pkgsrc-ce7365fa2851231ba54b7169450ca073b9012b35.tar.gz |
- - Adjust paths of configs and sample databases, per
suggestions by Kimmo Suominen.
- - Disable build on NetBSD-1.3[A-J] (needs libstdc++).
- - Use databases/db (currently db-2.7.3), instead of
included db-2.6.4.
Diffstat (limited to 'www')
-rw-r--r-- | www/htdig/Makefile | 28 | ||||
-rw-r--r-- | www/htdig/files/patch-sum | 8 | ||||
-rw-r--r-- | www/htdig/patches/patch-aa | 22 | ||||
-rw-r--r-- | www/htdig/patches/patch-ab | 23 | ||||
-rw-r--r-- | www/htdig/patches/patch-ac | 20 | ||||
-rw-r--r-- | www/htdig/patches/patch-ad | 21 | ||||
-rw-r--r-- | www/htdig/patches/patch-ae | 568 | ||||
-rw-r--r-- | www/htdig/pkg/COMMENT | 2 | ||||
-rw-r--r-- | www/htdig/pkg/DEINSTALL | 8 | ||||
-rw-r--r-- | www/htdig/pkg/DESCR | 4 | ||||
-rw-r--r-- | www/htdig/pkg/MESSAGE | 9 | ||||
-rw-r--r-- | www/htdig/pkg/PLIST | 77 |
12 files changed, 740 insertions, 50 deletions
diff --git a/www/htdig/Makefile b/www/htdig/Makefile index bf53a17c896..217972736a3 100644 --- a/www/htdig/Makefile +++ b/www/htdig/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 1999/09/20 02:40:46 fredb Exp $ +# $NetBSD: Makefile,v 1.2 1999/09/23 01:33:29 fredb Exp $ # DISTNAME= htdig-3.1.2 @@ -9,9 +9,29 @@ MASTER_SITES= ${MASTER_SITE_SUNSITE:=apps/www/indexing/} \ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.htdig.org/ -GNU_CONFIGURE= YES -CONFIGURE_ARGS= --with-cgi-bin-dir=${PREFIX}/sbin \ - --with-image-dir=${PREFIX}/share/httpd/htdocs/htdig \ +DEPENDS+= db-2.7.3:../../databases/db + +# Needs libstdc++ +# XXX fill-in/correct as needed +NOT_FOR_PLATFORM= NetBSD-1.3[A-J]*-* + +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --with-cgi-bin-dir=${PREFIX}/bin \ + --with-image-dir=${PREFIX}/share/examples/htdig \ --with-search-dir=${PREFIX}/share/examples/htdig +CONFIGURE_ENV= CPPFLAGS=-I${PREFIX}/include/db2 + +MESSAGE_FILE= ${WRKDIR}/MESSAGE + +post-build: + ${SED} 's#@PREFIX@#${PREFIX}#g' < ${PKGDIR}/MESSAGE > ${WRKDIR}/MESSAGE + +post-install: + if [ ! -f ${PREFIX}/etc/htdig/htdig.conf ]; then \ + ${CP} ${PREFIX}/share/examples/htdig/htdig.conf ${PREFIX}/etc/htdig/; \ + fi + ${PREFIX}/bin/htfuzzy -v synonyms + ${PREFIX}/bin/htfuzzy -v endings + ${MKDIR} /var/db/htdig .include "../../mk/bsd.pkg.mk" diff --git a/www/htdig/files/patch-sum b/www/htdig/files/patch-sum index a4b6d7189c2..d8d9e514b03 100644 --- a/www/htdig/files/patch-sum +++ b/www/htdig/files/patch-sum @@ -1,3 +1,7 @@ -$NetBSD: patch-sum,v 1.1.1.1 1999/09/20 02:40:46 fredb Exp $ +$NetBSD: patch-sum,v 1.2 1999/09/23 01:33:30 fredb Exp $ -MD5 (patch-aa) = f849cbac8ebdd03763259e1654c6102c +MD5 (patch-aa) = f0f1d8f4f8140b748cd16107fe166d9a +MD5 (patch-ab) = aef75b4d67a833783914f626d6e56f69 +MD5 (patch-ac) = d7fa6f9391e8bb3c7505f14f59dc041a +MD5 (patch-ad) = b9d6c0357a2eda5141a687abe3f7e7e0 +MD5 (patch-ae) = e1c1c73ff1ead9ae7e25a884f3e551b2 diff --git a/www/htdig/patches/patch-aa b/www/htdig/patches/patch-aa index 9ea3d408eb1..b1345a9489c 100644 --- a/www/htdig/patches/patch-aa +++ b/www/htdig/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.1.1.1 1999/09/20 02:40:46 fredb Exp $ +$NetBSD: patch-aa,v 1.2 1999/09/23 01:33:30 fredb Exp $ --- CONFIG.in.orig Wed Apr 21 21:47:53 1999 -+++ CONFIG.in Sun Sep 19 18:08:24 1999 ++++ CONFIG.in Wed Sep 22 11:40:27 1999 @@ -23,7 +23,7 @@ # # This specifies the root of the directory tree to be used by ht://Dig @@ -11,3 +11,21 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/09/20 02:40:46 fredb Exp $ # # BIN_DIR +@@ -35,7 +35,7 @@ + # CONFIG_DIR + # This is the directory that contains ht://Dig configuration files + # +-CONFIG_DIR= $(DEST)/conf ++CONFIG_DIR= $(prefix)/etc/htdig + + # + # COMMON_DIR +@@ -48,7 +48,7 @@ + # DATABASE_DIR + # The default directory where the search databases will reside. + # +-DATABASE_DIR= $(DEST)/db ++DATABASE_DIR= /var/db/htdig + + # + # DEFAULT_CONFIG_FILE diff --git a/www/htdig/patches/patch-ab b/www/htdig/patches/patch-ab new file mode 100644 index 00000000000..0ec1b03d017 --- /dev/null +++ b/www/htdig/patches/patch-ab @@ -0,0 +1,23 @@ +$NetBSD: patch-ab,v 1.1 1999/09/23 01:33:30 fredb Exp $ + +--- Makefile.in.orig Wed Apr 21 21:47:53 1999 ++++ Makefile.in Wed Sep 22 15:01:33 1999 +@@ -26,8 +26,7 @@ + top_builddir= . + include Makefile.config + +-DIRS= db/dist \ +- htlib htcommon htfuzzy htdig \ ++DIRS= htlib htcommon htfuzzy htdig \ + htsearch htmerge htnotify + INSTALLDIRS= htfuzzy htdig \ + htsearch htmerge htnotify +@@ -93,7 +92,7 @@ + done && test -z "$$fail" + @echo "" + @echo "Installing default configuration files..." +- @if [ ! -f $(INSTALL_ROOT)$(CONFIG_DIR)/htdig.conf ]; then sed -e s%@DATABASE_DIR@%$(DATABASE_DIR)% -e s%@IMAGEDIR@%$(IMAGE_URL_PREFIX)% $(top_srcdir)/installdir/htdig.conf >$(INSTALL_ROOT)$(CONFIG_DIR)/htdig.conf; echo $(INSTALL_ROOT)$(CONFIG_DIR)/htdig.conf;fi ++ @if [ ! -f $(INSTALL_ROOT)$(SEARCH_DIR)/htdig.conf ]; then sed -e s%@DATABASE_DIR@%$(DATABASE_DIR)% -e s%@IMAGEDIR@%$(IMAGE_URL_PREFIX)% $(top_srcdir)/installdir/htdig.conf >$(INSTALL_ROOT)$(SEARCH_DIR)/htdig.conf; echo $(INSTALL_ROOT)$(SEARCH_DIR)/htdig.conf;fi + @if [ ! -f $(INSTALL_ROOT)$(SEARCH_DIR)/$(SEARCH_FORM) ]; then sed -e s%@IMAGEDIR@%$(IMAGE_URL_PREFIX)% $(top_srcdir)/installdir/search.html >$(INSTALL_ROOT)$(SEARCH_DIR)/$(SEARCH_FORM); echo $(INSTALL_ROOT)$(SEARCH_DIR)/$(SEARCH_FORM);fi + @for i in $(COMMONHTML); do \ + if [ ! -f $(INSTALL_ROOT)$(COMMON_DIR)/$$i ]; then sed -e s%@IMAGEDIR@%$(IMAGE_URL_PREFIX)% $(top_srcdir)/installdir/$$i >$(INSTALL_ROOT)$(COMMON_DIR)/$$i; echo $(INSTALL_ROOT)$(COMMON_DIR)/$$i;fi; \ diff --git a/www/htdig/patches/patch-ac b/www/htdig/patches/patch-ac new file mode 100644 index 00000000000..6141fd2bbd0 --- /dev/null +++ b/www/htdig/patches/patch-ac @@ -0,0 +1,20 @@ +$NetBSD: patch-ac,v 1.1 1999/09/23 01:33:30 fredb Exp $ + +--- Makefile.config.in.orig Wed Apr 21 21:47:53 1999 ++++ Makefile.config.in Wed Sep 22 06:18:03 1999 +@@ -24,12 +24,11 @@ + SENDMAIL= @SENDMAIL@ + + DEFINES= -DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\" +-LIBDIRS= -L../htlib -L../htcommon -L../db/dist -L/usr/lib ++LIBDIRS= -L../htlib -L../htcommon + INCS= -I$(top_srcdir)/htlib -I$(top_srcdir)/htcommon \ +- -I../db/dist -I../include ++ -I$(prefix)/include/db2 -I../include + HTLIBS= ../htcommon/libcommon.a \ +- ../htlib/libht.a \ +- ../db/dist/libdb.a ++ ../htlib/libht.a + LIBS= $(HTLIBS) @LIBS@ + + DIST= @PACKAGE@-@VERSION@ diff --git a/www/htdig/patches/patch-ad b/www/htdig/patches/patch-ad new file mode 100644 index 00000000000..4bfe855fd3f --- /dev/null +++ b/www/htdig/patches/patch-ad @@ -0,0 +1,21 @@ +$NetBSD: patch-ad,v 1.1 1999/09/23 01:33:30 fredb Exp $ + +--- configure.in.orig Wed Apr 21 21:47:53 1999 ++++ configure.in Tue Sep 21 15:43:57 1999 +@@ -64,6 +64,7 @@ + AC_AIX + + dnl Checks for libraries. ++AC_CHECK_LIB(db2, db_appinit) + AC_CHECK_LIB(socket, socket) + AC_CHECK_LIB(nsl, t_accept) + if test $WITH_ZLIB = yes; then +@@ -140,7 +141,7 @@ + if test ! -d "./db"; then + mkdir db + fi +-AC_CONFIG_SUBDIRS(db/dist) ++dnl AC_CONFIG_SUBDIRS(db/dist) + + AC_OUTPUT(CONFIG Makefile Makefile.config htcommon/Makefile htlib/Makefile htdig/Makefile htmerge/Makefile htnotify/Makefile htfuzzy/Makefile htsearch/Makefile makedp, chmod +x makedp, echo timestamp > stamp-h) + diff --git a/www/htdig/patches/patch-ae b/www/htdig/patches/patch-ae new file mode 100644 index 00000000000..7b9d715cf8b --- /dev/null +++ b/www/htdig/patches/patch-ae @@ -0,0 +1,568 @@ +$NetBSD: patch-ae,v 1.1 1999/09/23 01:33:30 fredb Exp $ + +--- configure.orig Wed Apr 21 21:47:53 1999 ++++ configure Tue Sep 21 15:55:01 1999 +@@ -1675,8 +1675,55 @@ + + + ++echo $ac_n "checking for db_appinit in -ldb2""... $ac_c" 1>&6 ++echo "configure:1680: checking for db_appinit in -ldb2" >&5 ++ac_lib_var=`echo db2'_'db_appinit | sed 'y%./+-%__p_%'` ++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ ac_save_LIBS="$LIBS" ++LIBS="-ldb2 $LIBS" ++cat > conftest.$ac_ext <<EOF ++#line 1688 "configure" ++#include "confdefs.h" ++/* Override any gcc2 internal prototype to avoid an error. */ ++/* We use char because int might match the return type of a gcc2 ++ builtin and then its argument prototype would still apply. */ ++char db_appinit(); ++ ++int main() { ++db_appinit() ++; return 0; } ++EOF ++if { (eval echo configure:1699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=no" ++fi ++rm -f conftest* ++LIBS="$ac_save_LIBS" ++ ++fi ++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 ++ ac_tr_lib=HAVE_LIB`echo db2 | sed -e 's/[^a-zA-Z0-9_]/_/g' \ ++ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` ++ cat >> confdefs.h <<EOF ++#define $ac_tr_lib 1 ++EOF ++ ++ LIBS="-ldb2 $LIBS" ++ ++else ++ echo "$ac_t""no" 1>&6 ++fi ++ + echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 +-echo "configure:1680: checking for socket in -lsocket" >&5 ++echo "configure:1727: checking for socket in -lsocket" >&5 + ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -1684,7 +1731,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lsocket $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 1688 "configure" ++#line 1735 "configure" + #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ + /* We use char because int might match the return type of a gcc2 +@@ -1695,7 +1742,7 @@ + socket() + ; return 0; } + EOF +-if { (eval echo configure:1699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:1746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -1723,7 +1770,7 @@ + fi + + echo $ac_n "checking for t_accept in -lnsl""... $ac_c" 1>&6 +-echo "configure:1727: checking for t_accept in -lnsl" >&5 ++echo "configure:1774: checking for t_accept in -lnsl" >&5 + ac_lib_var=`echo nsl'_'t_accept | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -1731,7 +1778,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lnsl $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 1735 "configure" ++#line 1782 "configure" + #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ + /* We use char because int might match the return type of a gcc2 +@@ -1742,7 +1789,7 @@ + t_accept() + ; return 0; } + EOF +-if { (eval echo configure:1746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:1793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -1771,7 +1818,7 @@ + + if test $WITH_ZLIB = yes; then + echo $ac_n "checking for deflate in -lz""... $ac_c" 1>&6 +-echo "configure:1775: checking for deflate in -lz" >&5 ++echo "configure:1822: checking for deflate in -lz" >&5 + ac_lib_var=`echo z'_'deflate | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -1779,7 +1826,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lz $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 1783 "configure" ++#line 1830 "configure" + #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ + /* We use char because int might match the return type of a gcc2 +@@ -1790,7 +1837,7 @@ + deflate() + ; return 0; } + EOF +-if { (eval echo configure:1794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:1841: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -1821,12 +1868,12 @@ + + + echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 +-echo "configure:1825: checking for ANSI C header files" >&5 ++echo "configure:1872: checking for ANSI C header files" >&5 + if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 1830 "configure" ++#line 1877 "configure" + #include "confdefs.h" + #include <stdlib.h> + #include <stdarg.h> +@@ -1834,7 +1881,7 @@ + #include <float.h> + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:1838: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:1885: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -1851,7 +1898,7 @@ + if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. + cat > conftest.$ac_ext <<EOF +-#line 1855 "configure" ++#line 1902 "configure" + #include "confdefs.h" + #include <string.h> + EOF +@@ -1869,7 +1916,7 @@ + if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat > conftest.$ac_ext <<EOF +-#line 1873 "configure" ++#line 1920 "configure" + #include "confdefs.h" + #include <stdlib.h> + EOF +@@ -1890,7 +1937,7 @@ + : + else + cat > conftest.$ac_ext <<EOF +-#line 1894 "configure" ++#line 1941 "configure" + #include "confdefs.h" + #include <ctype.h> + #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +@@ -1901,7 +1948,7 @@ + exit (0); } + + EOF +-if { (eval echo configure:1905: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:1952: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + : + else +@@ -1925,12 +1972,12 @@ + fi + + echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 +-echo "configure:1929: checking whether time.h and sys/time.h may both be included" >&5 ++echo "configure:1976: checking whether time.h and sys/time.h may both be included" >&5 + if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 1934 "configure" ++#line 1981 "configure" + #include "confdefs.h" + #include <sys/types.h> + #include <sys/time.h> +@@ -1939,7 +1986,7 @@ + struct tm *tp; + ; return 0; } + EOF +-if { (eval echo configure:1943: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:1990: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_header_time=yes + else +@@ -1968,7 +2015,7 @@ + cross_compiling=$ac_cv_prog_cxx_cross + + echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 +-echo "configure:1972: checking how to run the C++ preprocessor" >&5 ++echo "configure:2019: checking how to run the C++ preprocessor" >&5 + if test -z "$CXXCPP"; then + if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -1981,12 +2028,12 @@ + cross_compiling=$ac_cv_prog_cxx_cross + CXXCPP="${CXX-g++} -E" + cat > conftest.$ac_ext <<EOF +-#line 1985 "configure" ++#line 2032 "configure" + #include "confdefs.h" + #include <stdlib.h> + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:1990: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:2037: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + : +@@ -2014,17 +2061,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:2018: checking for $ac_hdr" >&5 ++echo "configure:2065: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 2023 "configure" ++#line 2070 "configure" + #include "confdefs.h" + #include <$ac_hdr> + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:2028: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:2075: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -2052,17 +2099,17 @@ + + ac_safe=`echo "fstream.h" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for fstream.h""... $ac_c" 1>&6 +-echo "configure:2056: checking for fstream.h" >&5 ++echo "configure:2103: checking for fstream.h" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 2061 "configure" ++#line 2108 "configure" + #include "confdefs.h" + #include <fstream.h> + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:2066: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:2113: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -2096,12 +2143,12 @@ + cross_compiling=$ac_cv_prog_cc_cross + + echo $ac_n "checking for working const""... $ac_c" 1>&6 +-echo "configure:2100: checking for working const" >&5 ++echo "configure:2147: checking for working const" >&5 + if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 2105 "configure" ++#line 2152 "configure" + #include "confdefs.h" + + int main() { +@@ -2150,7 +2197,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:2154: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:2201: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_c_const=yes + else +@@ -2171,12 +2218,12 @@ + fi + + echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 +-echo "configure:2175: checking whether struct tm is in sys/time.h or time.h" >&5 ++echo "configure:2222: checking whether struct tm is in sys/time.h or time.h" >&5 + if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 2180 "configure" ++#line 2227 "configure" + #include "confdefs.h" + #include <sys/types.h> + #include <time.h> +@@ -2184,7 +2231,7 @@ + struct tm *tp; tp->tm_sec; + ; return 0; } + EOF +-if { (eval echo configure:2188: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:2235: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_struct_tm=time.h + else +@@ -2208,12 +2255,12 @@ + for ac_func in strdup strerror strstr + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:2212: checking for $ac_func" >&5 ++echo "configure:2259: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 2217 "configure" ++#line 2264 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func(); below. */ +@@ -2236,7 +2283,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:2240: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:2287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" + else +@@ -2263,12 +2310,12 @@ + for ac_func in localtime_r + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:2267: checking for $ac_func" >&5 ++echo "configure:2314: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 2272 "configure" ++#line 2319 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func(); below. */ +@@ -2291,7 +2338,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:2295: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:2342: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" + else +@@ -2318,12 +2365,12 @@ + for ac_func in timegm + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:2322: checking for $ac_func" >&5 ++echo "configure:2369: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 2327 "configure" ++#line 2374 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func(); below. */ +@@ -2346,7 +2393,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:2350: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:2397: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" + else +@@ -2379,9 +2426,9 @@ + cross_compiling=$ac_cv_prog_cxx_cross + + echo $ac_n "checking whether we need gethostname() prototype?""... $ac_c" 1>&6 +-echo "configure:2383: checking whether we need gethostname() prototype?" >&5 ++echo "configure:2430: checking whether we need gethostname() prototype?" >&5 + cat > conftest.$ac_ext <<EOF +-#line 2385 "configure" ++#line 2432 "configure" + #include "confdefs.h" + #include <unistd.h> + #include <stdio.h> +@@ -2399,7 +2446,7 @@ + gethostname("sdsu.edu", (int) 8); + ; return 0; } + EOF +-if { (eval echo configure:2403: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:2450: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + echo "$ac_t""yes" 1>&6;cat >> confdefs.h <<\EOF + #define NEED_PROTO_GETHOSTNAME 1 +@@ -2421,11 +2468,11 @@ + cross_compiling=$ac_cv_prog_cc_cross + + echo $ac_n "checking how to call getpeername?""... $ac_c" 1>&6 +-echo "configure:2425: checking how to call getpeername?" >&5 ++echo "configure:2472: checking how to call getpeername?" >&5 + for sock_t in 'struct sockaddr' 'void'; do + for getpeername_length_t in 'size_t' 'int' 'unsigned int' 'socklen_t'; do + cat > conftest.$ac_ext <<EOF +-#line 2429 "configure" ++#line 2476 "configure" + #include "confdefs.h" + #include <sys/types.h> + #include <sys/socket.h> +@@ -2433,7 +2480,7 @@ + extern getpeername(int, $sock_t *, $getpeername_length_t *) + ; return 0; } + EOF +-if { (eval echo configure:2437: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:2484: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_found=yes ; break 2 + else +@@ -2470,8 +2517,6 @@ + if test ! -d "./db"; then + mkdir db + fi +-subdirs="db/dist" +- + + trap '' 1 2 15 + cat > confcache <<\EOF +@@ -2634,7 +2679,6 @@ + s%@SENDMAIL@%$SENDMAIL%g + s%@CPP@%$CPP%g + s%@CXXCPP@%$CXXCPP%g +-s%@subdirs@%$subdirs%g + + CEOF + EOF +@@ -2853,103 +2897,6 @@ + chmod +x $CONFIG_STATUS + rm -fr confdefs* $ac_clean_files + test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 +- +-if test "$no_recursion" != yes; then +- +- # Remove --cache-file and --srcdir arguments so they do not pile up. +- ac_sub_configure_args= +- ac_prev= +- for ac_arg in $ac_configure_args; do +- if test -n "$ac_prev"; then +- ac_prev= +- continue +- fi +- case "$ac_arg" in +- -cache-file | --cache-file | --cache-fil | --cache-fi \ +- | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) +- ac_prev=cache_file ;; +- -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ +- | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) +- ;; +- -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) +- ac_prev=srcdir ;; +- -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) +- ;; +- *) ac_sub_configure_args="$ac_sub_configure_args $ac_arg" ;; +- esac +- done +- +- for ac_config_dir in db/dist; do +- +- # Do not complain, so a configure script can configure whichever +- # parts of a large source tree are present. +- if test ! -d $srcdir/$ac_config_dir; then +- continue +- fi +- +- echo configuring in $ac_config_dir +- +- case "$srcdir" in +- .) ;; +- *) +- if test -d ./$ac_config_dir || mkdir ./$ac_config_dir; then :; +- else +- { echo "configure: error: can not create `pwd`/$ac_config_dir" 1>&2; exit 1; } +- fi +- ;; +- esac +- +- ac_popdir=`pwd` +- cd $ac_config_dir +- +- # A "../" for each directory in /$ac_config_dir. +- ac_dots=`echo $ac_config_dir|sed -e 's%^\./%%' -e 's%[^/]$%&/%' -e 's%[^/]*/%../%g'` +- +- case "$srcdir" in +- .) # No --srcdir option. We are building in place. +- ac_sub_srcdir=$srcdir ;; +- /*) # Absolute path. +- ac_sub_srcdir=$srcdir/$ac_config_dir ;; +- *) # Relative path. +- ac_sub_srcdir=$ac_dots$srcdir/$ac_config_dir ;; +- esac +- +- # Check for guested configure; otherwise get Cygnus style configure. +- if test -f $ac_sub_srcdir/configure; then +- ac_sub_configure=$ac_sub_srcdir/configure +- elif test -f $ac_sub_srcdir/configure.in; then +- ac_sub_configure=$ac_configure +- else +- echo "configure: warning: no configuration information is in $ac_config_dir" 1>&2 +- ac_sub_configure= +- fi +- +- # The recursion is here. +- if test -n "$ac_sub_configure"; then +- +- # Make the cache file name correct relative to the subdirectory. +- case "$cache_file" in +- /*) ac_sub_cache_file=$cache_file ;; +- *) # Relative path. +- ac_sub_cache_file="$ac_dots$cache_file" ;; +- esac +- case "$ac_given_INSTALL" in +- [/$]*) INSTALL="$ac_given_INSTALL" ;; +- *) INSTALL="$ac_dots$ac_given_INSTALL" ;; +- esac +- +- echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir" +- # The eval makes quoting arguments work. +- if eval ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir +- then : +- else +- { echo "configure: error: $ac_sub_configure failed for $ac_config_dir" 1>&2; exit 1; } +- fi +- fi +- +- cd $ac_popdir +- done +-fi + + + echo "" diff --git a/www/htdig/pkg/COMMENT b/www/htdig/pkg/COMMENT index 740f3b901f4..ac15b7304cf 100644 --- a/www/htdig/pkg/COMMENT +++ b/www/htdig/pkg/COMMENT @@ -1 +1 @@ -a WWW indexing and searching system. +WWW indexing and searching system. diff --git a/www/htdig/pkg/DEINSTALL b/www/htdig/pkg/DEINSTALL new file mode 100644 index 00000000000..b5928662f15 --- /dev/null +++ b/www/htdig/pkg/DEINSTALL @@ -0,0 +1,8 @@ +#!/bin/sh +if [ "$2" = "POST-DEINSTALL" ]; then +echo Please note: +echo +echo If you do not intend to reinstall the htdig package, you may wish to +echo remove the config directory, ${PKG_PREFIX}/etc/htdig, as well as any +echo database directories you created. +fi diff --git a/www/htdig/pkg/DESCR b/www/htdig/pkg/DESCR index a894c9b6d33..041c39aa196 100644 --- a/www/htdig/pkg/DESCR +++ b/www/htdig/pkg/DESCR @@ -1,4 +1,2 @@ -The ht://Dig system is a complete world wide web indexing and searching +The ht://Dig system is a complete world wide web indexing and searching system for a small domain or intranet. - -ht://Dig incorporates version 2.6.4 of Sleepycat Software's Berkeley DB. diff --git a/www/htdig/pkg/MESSAGE b/www/htdig/pkg/MESSAGE new file mode 100644 index 00000000000..62c1f70a511 --- /dev/null +++ b/www/htdig/pkg/MESSAGE @@ -0,0 +1,9 @@ +A sample ht://Dig config file has been installed to @PREFIX@/etc/htdig/htdig.conf, +unless that file existed already. The sample @PREFIX@/bin/rundig script may be run +to create a database in the newly created empty directory, /var/db/htdig. +A sample search form, which may be used to search that database, has been +installed to @PREFIX@/share/examples/htdig/search.html. + +For an example of how to set up ht://Dig and integrate it with your web site, +you may wish to examine the scripts installed into /var/wwwoffle/html/htdig/scripts +by the www/wwwoffle package. diff --git a/www/htdig/pkg/PLIST b/www/htdig/pkg/PLIST index 3ff601353b5..36cd80b1426 100644 --- a/www/htdig/pkg/PLIST +++ b/www/htdig/pkg/PLIST @@ -1,14 +1,44 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 1999/09/20 02:40:46 fredb Exp $ +@comment $NetBSD: PLIST,v 1.2 1999/09/23 01:33:31 fredb Exp $ bin/htdig bin/htfuzzy bin/htmerge bin/htnotify bin/rundig -sbin/htsearch +bin/htsearch share/examples/htdig/search.html +share/examples/htdig/htdig.conf +share/examples/htdig/button1.gif +share/examples/htdig/button2.gif +share/examples/htdig/button3.gif +share/examples/htdig/button4.gif +share/examples/htdig/button5.gif +share/examples/htdig/button6.gif +share/examples/htdig/button7.gif +share/examples/htdig/button8.gif +share/examples/htdig/button9.gif +share/examples/htdig/buttonl.gif +share/examples/htdig/buttonr.gif +share/examples/htdig/button10.gif +share/examples/htdig/htdig.gif +share/examples/htdig/star.gif +share/examples/htdig/star_blank.gif +share/examples/htdig/button1.png +share/examples/htdig/button2.png +share/examples/htdig/button3.png +share/examples/htdig/button4.png +share/examples/htdig/button5.png +share/examples/htdig/button6.png +share/examples/htdig/button7.png +share/examples/htdig/button8.png +share/examples/htdig/button9.png +share/examples/htdig/buttonl.png +share/examples/htdig/buttonr.png +share/examples/htdig/button10.png +share/examples/htdig/htdig.png +share/examples/htdig/star.png +share/examples/htdig/star_blank.png @dirrm share/examples/htdig -share/htdig/conf/htdig.conf -@dirrm share/htdig/conf +@exec mkdir -p %D/etc/htdig; if [ ! -f %D/etc/htdig/htdig.conf ]; then cp %D/%F %D/etc/htdig/; fi share/htdig/common/header.html share/htdig/common/footer.html share/htdig/common/wrapper.html @@ -20,39 +50,10 @@ share/htdig/common/bad_words share/htdig/common/english.0 share/htdig/common/english.aff share/htdig/common/synonyms +share/htdig/common/synonyms.db +share/htdig/common/word2root.db +share/htdig/common/root2word.db @dirrm share/htdig/common -@dirrm share/htdig/db @dirrm share/htdig -share/httpd/htdocs/htdig/button1.gif -share/httpd/htdocs/htdig/button2.gif -share/httpd/htdocs/htdig/button3.gif -share/httpd/htdocs/htdig/button4.gif -share/httpd/htdocs/htdig/button5.gif -share/httpd/htdocs/htdig/button6.gif -share/httpd/htdocs/htdig/button7.gif -share/httpd/htdocs/htdig/button8.gif -share/httpd/htdocs/htdig/button9.gif -share/httpd/htdocs/htdig/buttonl.gif -share/httpd/htdocs/htdig/buttonr.gif -share/httpd/htdocs/htdig/button10.gif -share/httpd/htdocs/htdig/htdig.gif -share/httpd/htdocs/htdig/star.gif -share/httpd/htdocs/htdig/star_blank.gif -share/httpd/htdocs/htdig/button1.png -share/httpd/htdocs/htdig/button2.png -share/httpd/htdocs/htdig/button3.png -share/httpd/htdocs/htdig/button4.png -share/httpd/htdocs/htdig/button5.png -share/httpd/htdocs/htdig/button6.png -share/httpd/htdocs/htdig/button7.png -share/httpd/htdocs/htdig/button8.png -share/httpd/htdocs/htdig/button9.png -share/httpd/htdocs/htdig/buttonl.png -share/httpd/htdocs/htdig/buttonr.png -share/httpd/htdocs/htdig/button10.png -share/httpd/htdocs/htdig/htdig.png -share/httpd/htdocs/htdig/star.png -share/httpd/htdocs/htdig/star_blank.png -@dirrm share/httpd/htdocs/htdig -@dirrm share/httpd/htdocs -@dirrm share/httpd +@exec mkdir -p /var/db/htdig +@unexec (rmdir /var/db/htdig && echo Empty database directory /var/db/htdig deleted) || true |