diff options
| author | sborrill <sborrill> | 2007-01-24 10:25:15 +0000 |
|---|---|---|
| committer | sborrill <sborrill> | 2007-01-24 10:25:15 +0000 |
| commit | 6c1bd01b1f98051cbefdb8c4c18766af2bc276d0 (patch) | |
| tree | 6e64b31fb401b177f161ae1f7a57a47a1e5b5cc9 /www/htdig | |
| parent | 637d66b34726f088fd866c302a0dfbd18ba5ca97 (diff) | |
| download | pkgsrc-6c1bd01b1f98051cbefdb8c4c18766af2bc276d0.tar.gz | |
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 (limited to 'www/htdig')
| -rw-r--r-- | www/htdig/Makefile | 7 | ||||
| -rw-r--r-- | www/htdig/distinfo | 3 | ||||
| -rw-r--r-- | www/htdig/patches/patch-ai | 22 |
3 files changed, 28 insertions, 4 deletions
diff --git a/www/htdig/Makefile b/www/htdig/Makefile index 121a0143b2c..6ad24b7716d 100644 --- a/www/htdig/Makefile +++ b/www/htdig/Makefile @@ -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 @@ MASTER_SITES= http://www.htdig.org/files/ \ 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 HOMEPAGE= http://htdig.sourceforge.net/ @@ -32,6 +31,8 @@ CPPFLAGS+= ${CXXFLAGS} PKG_SYSCONFSUBDIR= htdig +BUILD_DEFS+= VARBASE + DBDIR?= ${VARBASE}/db/htdig MESSAGE_SUBST+= DBDIR=${DBDIR} OWN_DIRS+= ${DBDIR} diff --git a/www/htdig/distinfo b/www/htdig/distinfo index 660af3c4893..58b6fe3c2b2 100644 --- a/www/htdig/distinfo +++ b/www/htdig/distinfo @@ -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-ae) = 1be8e82b97bb9b16dcc301f3f02e642a41945878 SHA1 (patch-af) = f9c83efb788cb735f42df606ee451324795140d6 SHA1 (patch-ag) = d3c0c1b043e27706834aecf7ac0b07651ed5b438 SHA1 (patch-ah) = e4df51f19717527c3a368cdcaffb4f3c8e7be521 +SHA1 (patch-ai) = 123411dbd3cd53a8765f1130299873eb1aa91389 diff --git a/www/htdig/patches/patch-ai b/www/htdig/patches/patch-ai new file mode 100644 index 00000000000..f5e5d7dbad6 --- /dev/null +++ b/www/htdig/patches/patch-ai @@ -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]; |