diff options
| author | jlam <jlam> | 2005-01-12 21:31:29 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2005-01-12 21:31:29 +0000 |
| commit | 18ede6dfdb10d698e327548c0a1f14e63c71e590 (patch) | |
| tree | a01bdecaa9f2f7bec7ea28c9e9697a226b01e6b0 /www | |
| parent | 0173c61928796c45c1cbcb50537c8e509abec670 (diff) | |
| download | pkgsrc-18ede6dfdb10d698e327548c0a1f14e63c71e590.tar.gz | |
* 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 (limited to 'www')
| -rw-r--r-- | www/htdig/Makefile | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/www/htdig/Makefile b/www/htdig/Makefile index 819d0994e22..2a7d259f87a 100644 --- a/www/htdig/Makefile +++ b/www/htdig/Makefile @@ -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 @@ HOMEPAGE= http://htdig.sourceforge.net/ COMMENT= WWW indexing and searching system USE_BUILDLINK3= YES -USE_LANGUAGES= c c++ USE_PKGINSTALL= YES -USE_DB185= yes -BDB_ACCEPTED= db2 +USE_LANGUAGES= c c++ GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-cgi-bin-dir=${PREFIX}/libexec/cgi-bin \ @@ -28,22 +27,20 @@ CONFIGURE_ARGS= --with-cgi-bin-dir=${PREFIX}/libexec/cgi-bin \ --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= -c ${DISTNAME}/db* 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" |