[pkgsrc/trunk]: pkgsrc/www/htdig Stop htnotify coredumping if prefix or suffi...

[sborrill <sborrill%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/32125a016253
branches:  trunk
changeset: 524358:32125a016253
user:      sborrill <sborrill%pkgsrc.org@localhost>
date:      Wed Jan 24 10:25:15 2007 +0000

description:
Stop htnotify coredumping if prefix or suffix file settings aren't set.
Inspired by ftp://ftp.ccsf.org/htdig-patches/3.1.6/htnotifyNull.0
Plus some pkglint cleanups.

diffstat:

 www/htdig/Makefile         |   7 ++++---
 www/htdig/distinfo         |   3 ++-
 www/htdig/patches/patch-ai |  22 ++++++++++++++++++++++
 3 files changed, 28 insertions(+), 4 deletions(-)

diffs (70 lines):

diff -r 277a56fc0bfc -r 32125a016253 www/htdig/Makefile
--- a/www/htdig/Makefile        Wed Jan 24 09:59:02 2007 +0000
+++ b/www/htdig/Makefile        Wed Jan 24 10:25:15 2007 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.34 2006/04/10 12:20:32 joerg Exp $
+# $NetBSD: Makefile,v 1.35 2007/01/24 10:25:15 sborrill Exp $
 
 DISTNAME=      htdig-3.1.6
-PKGREVISION=   4
+PKGREVISION=   5
 CATEGORIES=    www databases
 MASTER_SITES=  http://www.htdig.org/files/ \
                ftp://ftp.htdig.org/ \
@@ -11,7 +11,6 @@
                http://www.it.htdig.org/files/ \
                ftp://www.it.htdig.org/pub/htdig/ \
                http://www.opdenbrouw.nl/htdig/maindocs/files/
-EXTRACT_SUFX=  .tar.gz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://htdig.sourceforge.net/
@@ -32,6 +31,8 @@
 
 PKG_SYSCONFSUBDIR=     htdig
 
+BUILD_DEFS+=   VARBASE
+
 DBDIR?=                ${VARBASE}/db/htdig
 MESSAGE_SUBST+=        DBDIR=${DBDIR}
 OWN_DIRS+=     ${DBDIR}
diff -r 277a56fc0bfc -r 32125a016253 www/htdig/distinfo
--- a/www/htdig/distinfo        Wed Jan 24 09:59:02 2007 +0000
+++ b/www/htdig/distinfo        Wed Jan 24 10:25:15 2007 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2005/03/20 20:34:27 salo Exp $
+$NetBSD: distinfo,v 1.6 2007/01/24 10:25:15 sborrill Exp $
 
 SHA1 (htdig-3.1.6.tar.gz) = 603fc244ba59ee1efcbe8f2ba087567cb14468d0
 RMD160 (htdig-3.1.6.tar.gz) = 1414943255f16cd278a31b8014a5bfe6c4400ead
@@ -10,3 +10,4 @@
 SHA1 (patch-af) = f9c83efb788cb735f42df606ee451324795140d6
 SHA1 (patch-ag) = d3c0c1b043e27706834aecf7ac0b07651ed5b438
 SHA1 (patch-ah) = e4df51f19717527c3a368cdcaffb4f3c8e7be521
+SHA1 (patch-ai) = 123411dbd3cd53a8765f1130299873eb1aa91389
diff -r 277a56fc0bfc -r 32125a016253 www/htdig/patches/patch-ai
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/htdig/patches/patch-ai        Wed Jan 24 10:25:15 2007 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-ai,v 1.1 2007/01/24 10:25:15 sborrill Exp $
+
+--- htnotify/htnotify.cc.orig  2002-01-31 23:47:18.000000000 +0000
++++ htnotify/htnotify.cc       2007-01-24 09:50:09.000000000 +0000
+@@ -185,7 +185,7 @@
+     // define default preamble text - blank string
+     preambleText = "";
+ 
+-    if (prefixfile != NULL)
++    if (prefixfile != NULL && prefixfile[0] != 0)
+     {
+         ifstream    in(prefixfile);
+         char        buffer[1024];
+@@ -212,7 +212,7 @@
+     postambleText << "    http://www.htdig.org/meta.html\n\n";;
+     postambleText << "Cheers!\n\nht://Dig Notification Service\n";
+ 
+-    if (suffixfile != NULL)
++    if (suffixfile != NULL && suffixfile[0] != 0)
+     {
+         ifstream    in(suffixfile);
+         char        buffer[1024];