From bf116f664c5ace9aeddb308e43e7be5d34eb1eb5 Mon Sep 17 00:00:00 2001 From: fredb Date: Tue, 5 Oct 1999 19:25:54 +0000 Subject: Update htdig to 3.1.3. Bug fixes. Full details may be found in the ChangeLog or at . To the package - - Remove NOT_FOR_PLATFORM, as I failed to duplicate the reported problem (using a mac68k-1.3H system). - - Move htsearch to libexec/cgi-bin, where apache might look for it. - - Don't extract included db-2.6.4 directory. - - Add comment to patch for configure.in, explaining how to reconstruct patch to configure. Committing them both eases maintenance and permits building without extracting htdig-*/db, and without autoconf. --- www/htdig/Makefile | 17 ++++++++++------- www/htdig/files/md5 | 4 ++-- www/htdig/files/patch-sum | 6 +++--- www/htdig/patches/patch-ad | 14 +++++++++++++- www/htdig/patches/patch-ae | 13 +++++++++---- www/htdig/pkg/PLIST | 7 ++++--- 6 files changed, 41 insertions(+), 20 deletions(-) (limited to 'www/htdig') diff --git a/www/htdig/Makefile b/www/htdig/Makefile index 217972736a3..a1260cbd100 100644 --- a/www/htdig/Makefile +++ b/www/htdig/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.2 1999/09/23 01:33:29 fredb Exp $ +# $NetBSD: Makefile,v 1.3 1999/10/05 19:25:54 fredb Exp $ # -DISTNAME= htdig-3.1.2 +DISTNAME= htdig-3.1.3 CATEGORIES= www databases MASTER_SITES= ${MASTER_SITE_SUNSITE:=apps/www/indexing/} \ http://www.htdig.org/files/ @@ -11,12 +11,8 @@ HOMEPAGE= http://www.htdig.org/ 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 \ +CONFIGURE_ARGS= --with-cgi-bin-dir=${PREFIX}/libexec/cgi-bin \ --with-image-dir=${PREFIX}/share/examples/htdig \ --with-search-dir=${PREFIX}/share/examples/htdig CONFIGURE_ENV= CPPFLAGS=-I${PREFIX}/include/db2 @@ -34,4 +30,11 @@ post-install: ${PREFIX}/bin/htfuzzy -v endings ${MKDIR} /var/db/htdig +.include "../../mk/bsd.prefs.mk" +.if defined(EXTRACT_USING_PAX) +EXTRACT_ELEMENTS= -c ${DISTNAME}/db* +.else +EXTRACT_ELEMENTS= --exclude ${DISTNAME}/db* +.endif + .include "../../mk/bsd.pkg.mk" diff --git a/www/htdig/files/md5 b/www/htdig/files/md5 index 0ea17256ef2..d60e8c4e749 100644 --- a/www/htdig/files/md5 +++ b/www/htdig/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.1.1.1 1999/09/20 02:40:46 fredb Exp $ +$NetBSD: md5,v 1.2 1999/10/05 19:25:55 fredb Exp $ -MD5 (htdig-3.1.2.tar.gz) = ddd0305d420e2d6025694d4e1448d5f7 +MD5 (htdig-3.1.3.tar.gz) = 02c8e8e04c01932111958d4cd7bdd674 diff --git a/www/htdig/files/patch-sum b/www/htdig/files/patch-sum index d8d9e514b03..18e8f2d3657 100644 --- a/www/htdig/files/patch-sum +++ b/www/htdig/files/patch-sum @@ -1,7 +1,7 @@ -$NetBSD: patch-sum,v 1.2 1999/09/23 01:33:30 fredb Exp $ +$NetBSD: patch-sum,v 1.3 1999/10/05 19:25:55 fredb Exp $ MD5 (patch-aa) = f0f1d8f4f8140b748cd16107fe166d9a MD5 (patch-ab) = aef75b4d67a833783914f626d6e56f69 MD5 (patch-ac) = d7fa6f9391e8bb3c7505f14f59dc041a -MD5 (patch-ad) = b9d6c0357a2eda5141a687abe3f7e7e0 -MD5 (patch-ae) = e1c1c73ff1ead9ae7e25a884f3e551b2 +MD5 (patch-ad) = 2b33b3a4f75bb4bf338d60d511cbec8d +MD5 (patch-ae) = 86f51a8b9b761ff9d4769891b2123d6c diff --git a/www/htdig/patches/patch-ad b/www/htdig/patches/patch-ad index 4bfe855fd3f..d0bbc289a88 100644 --- a/www/htdig/patches/patch-ad +++ b/www/htdig/patches/patch-ad @@ -1,4 +1,16 @@ -$NetBSD: patch-ad,v 1.1 1999/09/23 01:33:30 fredb Exp $ +$NetBSD: patch-ad,v 1.2 1999/10/05 19:25:55 fredb Exp $ + +Note to Porters +=============== + +This patch isn't actually used by the package, rather it's included for +the convenience of the packagers. If the subsequent patch to configure +fails, the patched configure.in can be used to regenerate configure... + + (cd work && tar xzvf /usr/pkgsrc/distfiles/htdig-* htdig-*/db) + make do-configure; cd work/htdig-*; gmake configure + +and the new configure can be used to reconstruct the patch. --- configure.in.orig Wed Apr 21 21:47:53 1999 +++ configure.in Tue Sep 21 15:43:57 1999 diff --git a/www/htdig/patches/patch-ae b/www/htdig/patches/patch-ae index 7b9d715cf8b..d3dede2ab11 100644 --- a/www/htdig/patches/patch-ae +++ b/www/htdig/patches/patch-ae @@ -1,7 +1,12 @@ -$NetBSD: patch-ae,v 1.1 1999/09/23 01:33:30 fredb Exp $ +$NetBSD: patch-ae,v 1.2 1999/10/05 19:25:55 fredb Exp $ ---- configure.orig Wed Apr 21 21:47:53 1999 -+++ configure Tue Sep 21 15:55:01 1999 +Note to Porters +=============== + +This file is generated from patch-ad. See the notes in that file. + +--- configure.orig Wed Sep 22 11:18:09 1999 ++++ configure Tue Oct 5 11:40:03 1999 @@ -1675,8 +1675,55 @@ @@ -429,7 +434,7 @@ $NetBSD: patch-ae,v 1.1 1999/09/23 01:33:30 fredb Exp $ -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 + for getpeername_length_t in 'size_t' 'int' 'unsigned int' 'long unsigned int' 'socklen_t'; do cat > conftest.$ac_ext </dev/null >/dev/null) || true share/examples/htdig/search.html share/examples/htdig/htdig.conf share/examples/htdig/button1.gif @@ -56,4 +57,4 @@ share/htdig/common/root2word.db @dirrm share/htdig/common @dirrm share/htdig @exec mkdir -p /var/db/htdig -@unexec (rmdir /var/db/htdig && echo Empty database directory /var/db/htdig deleted) || true +@unexec (rm -rf /var/db/htdig) || true -- cgit v1.2.3