[pkgsrc/trunk]: pkgsrc/www/htdig * Fix breakage after recent bdb.buildlink3.m...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1797069c90f3
branches:  trunk
changeset: 487337:1797069c90f3
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Jan 12 21:31:29 2005 +0000

description:
* Fix breakage after recent bdb.buildlink3.mk changes.  We now directly
  include db2 since this package requires exactly databases/db and nothing
  else will do.  Also remove USE_DB185 setting this htdig doesn't use the
  db-1.85 interface.

* Honor ${VARBASE} in locating the htdig database directory.

* Use ${LOCALBASE}/bin/acroread as the path the the PDF reader instead of
  /usr/local/bin/acroread.

* Add missing dependency on zlib.  This package was just picking up and
  using the system zlib before.

Bump the PKGREVISION to 1.

diffstat:

 www/htdig/Makefile |  20 +++++++++++---------
 1 files changed, 11 insertions(+), 9 deletions(-)

diffs (61 lines):

diff -r 84188fef699e -r 1797069c90f3 www/htdig/Makefile
--- a/www/htdig/Makefile        Wed Jan 12 21:15:12 2005 +0000
+++ b/www/htdig/Makefile        Wed Jan 12 21:31:29 2005 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2004/11/15 17:54:50 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2005/01/12 21:31:29 jlam Exp $
 
 DISTNAME=      htdig-3.1.6
+PKGREVISION=   1
 CATEGORIES=    www databases
 MASTER_SITES=  http://www.htdig.org/files/ \
                ftp://ftp.htdig.org/ \
@@ -16,10 +17,8 @@
 COMMENT=       WWW indexing and searching system
 
 USE_BUILDLINK3=        YES
+USE_PKGINSTALL=        YES
 USE_LANGUAGES= c c++
-USE_PKGINSTALL=        YES
-USE_DB185=     yes
-BDB_ACCEPTED=  db2
 
 GNU_CONFIGURE= yes
 CONFIGURE_ARGS=        --with-cgi-bin-dir=${PREFIX}/libexec/cgi-bin \
@@ -28,22 +27,20 @@
                --with-database-dir=${DBDIR} \
                --with-image-dir=${PREFIX}/share/examples/htdig \
                --with-search-dir=${PREFIX}/share/examples/htdig
+CONFIGURE_ENV+=        PDF_PARSER="${LOCALBASE}/bin/acroread"
 CXXFLAGS+=     -Wno-deprecated
 CPPFLAGS+=     ${CXXFLAGS}
 
 INSTALL_EXTRA_TMPL=     ${PKGDIR}/INSTALL
 PKG_SYSCONFSUBDIR=     htdig
 
-DBDIR?=                /var/db/htdig
+DBDIR?=                ${VARBASE}/db/htdig
 MESSAGE_SUBST+=        DBDIR=${DBDIR}
 OWN_DIRS+=     ${DBDIR}
 
 CONF_FILES+=   ${PREFIX}/share/examples/htdig/htdig.conf \
                ${PKG_SYSCONFDIR}/htdig.conf
 
-post-patch:
-       ${TOUCH} ${WRKSRC}/configure
-
 .include "../../mk/bsd.prefs.mk"
 .if defined(EXTRACT_USING_PAX)
 EXTRACT_ELEMENTS= -c ${DISTNAME}/db*
@@ -51,5 +48,10 @@
 EXTRACT_ELEMENTS= --exclude ${DISTNAME}/db*
 .endif
 
-.include "../../mk/bdb.buildlink3.mk"
+.include "../../databases/db/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+
+post-patch:
+       ${TOUCH} ${WRKSRC}/configure
+
 .include "../../mk/bsd.pkg.mk"