3 files changed, 25 insertions, 160 deletions

diff --git a/dns/fastresolve/Makefile b/dns/fastresolve/Makefile
index 785fa92a9d33..9c9515a23f5d 100644
--- a/dns/fastresolve/Makefile
+++ b/dns/fastresolve/Makefile
@@ -10,38 +10,31 @@ MASTER_SITES=	http://www.djmnet.org/sw/dist/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Programs that process web logs to get DNS and domain ownership info
 
-LIB_DEPENDS=	adns.1:${PORTSDIR}/dns/adns
+LIB_DEPENDS=	libadns.so:${PORTSDIR}/dns/adns
 RUN_DEPENDS=	p5-BerkeleyDB>=0:${PORTSDIR}/databases/p5-BerkeleyDB
 
 LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYING
+
+OPTIONS_DEFINE=	DOCS
 
 USES=		perl5
+USE_BDB=	yes
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	PERL=${PERL}
-LDFLAGS+=	-L${LOCALBASE}/lib
-CXXFLAGS+=	-I${LOCALBASE}/include
-USE_AUTOTOOLS=	aclocal14 automake14 autoconf213
-
-USE_BDB=	yes
-CONFIGURE_ARGS=	--with-bdb-lib=-l${BDB_LIB_CXX_NAME} --with-bdb-incdir=${BDB_INCLUDE_DIR}
-
-MAN1=	dns-terror.1 btree-dump.1 convert-dom-db.1 convert-ip-db.1 \
-	expire-ip-db.1 getdominfo.1 rebuild-dom-db.1 rebuild-ip-db.1 \
-	reresolve.1 make-report.1
+CONFIGURE_ENV=	PERL=${PERL} \
+		djm_cv_lib_db_Dbopen=yes
+LDFLAGS+=	-L${LOCALBASE}/lib -L${BDB_LIB_DIR}
+CXXFLAGS+=	-I${LOCALBASE}/include -I${BDB_INCLUDE_DIR}
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
+post-patch:
+	@${REINPLACE_CMD} -e 's/-ldb"/-ldb -l${BDB_LIB_CXX_NAME}"/g' ${WRKSRC}/configure
 
 post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in AUTHORS COPYING ChangeLog INSTALL NEWS README
-	@${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
-	@${INSTALL_DATA} ${WRKSRC}/doc/TODO ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/doc/timings ${DOCSDIR}
-.endif
+	@${INSTALL_DATA} ${WRKSRC}/doc/TODO ${STAGEDIR}${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/doc/timings ${STAGEDIR}${DOCSDIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/dns/fastresolve/files/patch-configure.in b/dns/fastresolve/files/patch-configure.in
deleted file mode 100644
index 31048a8cf5cb..000000000000
--- a/dns/fastresolve/files/patch-configure.in
+++ /dev/null
@@ -1,138 +0,0 @@
---- configure.in.orig	Sat May 17 20:15:26 2003
-+++ configure.in	Mon Sep  8 00:44:07 2003
-@@ -1,6 +1,5 @@
- AC_INIT
- AM_INIT_AUTOMAKE([fastresolve], [2.10])
--AC_ARG_PROGRAM
- AC_PATH_PROGS(PERL, [perl5 perl], [/usr/bin/perl])
- AC_PROG_CC
- AC_PROG_CXX
-@@ -26,6 +25,41 @@
- AC_DEFUN(DJM_LIB_DB_CXX,
- [dnl Check for a C++ interface, either version.
- 
-+AC_ARG_WITH(bdb-lib,
-+    [  --with-bdb-lib=PATH	Path to Berkeley DB C++ library],
-+    with_bdb_lib=$withval,
-+    [ test "${with_bdb_lib+set}" = set || with_bdb_lib=none])
-+AC_ARG_WITH(bdb-incdir,
-+    [  --with-bdb-incdir=DIR	Berkeley DB C++ includes are in DIR],
-+    with_bdb_incdir=$withval,
-+    [ test "${with_bdb_incdir+set}" = set || with_bdb_incdir=none])
-+
-+if test $with_bdb_incdir != none; then
-+CXXFLAGS="$CXXFLAGS -I$with_bdb_incdir"
-+fi
-+
-+if test $with_bdb_lib != none; then
-+
-+dnl Berkeley DB from supplied path
-+AC_MSG_CHECKING([for Db::open in ${with_bdb_lib}])
-+AC_LANG_SAVE
-+AC_LANG_CPLUSPLUS
-+djm_save_LIBS="$LIBS"
-+LIBS="$LIBS $with_bdb_lib"
-+AC_TRY_LINK([#include <db_cxx.h>], [Db *d = new Db(NULL, 0);],
-+	djm_cv_lib_bdb_cxx_Db=yes, djm_cv_lib_bdb_cxx_Db=no)
-+LIBS="$djm_save_LIBS"
-+AC_LANG_RESTORE
-+AC_MSG_RESULT($djm_cv_lib_bdb_cxx_Db)
-+
-+if test $djm_cv_lib_bdb_cxx_Db = yes; then
-+	LIBS="$LIBS $with_bdb_lib"
-+else
-+	AC_MSG_ERROR([Berkeley DB library 2.x-4.x configured with --enable-cxx is required])
-+fi
-+
-+else
-+
- dnl Berkeley DB 2.x.
- AC_CACHE_CHECK([for Db::open in -ldb], djm_cv_lib_db_Dbopen,
- [AC_LANG_SAVE
-@@ -41,54 +75,69 @@
- 	LIBS="$LIBS -ldb"
- else
- 
--dnl Berkeley DB 3.x installed as libdb.
--AC_CACHE_CHECK([for Db::open in -ldb_cxx], djm_cv_lib_db_cxx_Dbopen,
-+
-+dnl Berkeley DB 3.x or 4.x installed as libdb.
-+AC_CACHE_CHECK([for Db in -ldb_cxx], djm_cv_lib_db_cxx_Db,
- [AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
- djm_save_LIBS="$LIBS"
- LIBS="$LIBS -ldb -ldb_cxx"
--AC_TRY_LINK([#include <db_cxx.h>], [Db *d = new Db(NULL, 0);
--d->open(NULL, NULL, DB_BTREE, DB_CREATE, 0);],
--	djm_cv_lib_db_cxx_Dbopen=yes, djm_cv_lib_db_cxx_Dbopen=no)
-+AC_TRY_LINK([#include <db_cxx.h>], [Db *d = new Db(NULL, 0);],
-+	djm_cv_lib_db_cxx_Db=yes, djm_cv_lib_db_cxx_Db=no)
- LIBS="$djm_save_LIBS"
- AC_LANG_RESTORE])
- 
--if test $djm_cv_lib_db_cxx_Dbopen = yes; then
-+if test $djm_cv_lib_db_cxx_Db = yes; then
- 	LIBS="$LIBS -ldb -ldb_cxx"
- else
- 
- dnl Berkeley DB 3.x installed as libdb3 (as on FreeBSD).
--AC_CACHE_CHECK([for Db::open in -ldb3_cxx], djm_cv_lib_db3_cxx_Dbopen,
-+AC_CACHE_CHECK([for Db in -ldb3_cxx], djm_cv_lib_db3_cxx_Db,
- [AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
- djm_save_LIBS="$LIBS"
- LIBS="$LIBS -ldb3 -ldb3_cxx"
--AC_TRY_LINK([#include <db_cxx.h>], [Db *d = new Db(NULL, 0);
--d->open(NULL, NULL, DB_BTREE, DB_CREATE, 0);],
--	djm_cv_lib_db3_cxx_Dbopen=yes, djm_cv_lib_db3_cxx_Dbopen=no)
-+AC_TRY_LINK([#include <db_cxx.h>], [Db *d = new Db(NULL, 0);],
-+	djm_cv_lib_db3_cxx_Db=yes, djm_cv_lib_db3_cxx_Db=no)
- LIBS="$djm_save_LIBS"
- AC_LANG_RESTORE])
- 
--if test $djm_cv_lib_db3_cxx_Dbopen = yes; then
-+if test $djm_cv_lib_db3_cxx_Db = yes; then
- 	LIBS="$LIBS -ldb3 -ldb3_cxx"
- else
- 
--dnl Berkeley DB 4.x installed as libdb4 (as on FreeBSD).
--AC_CACHE_CHECK([for Db::open in -ldb4_cxx], djm_cv_lib_db4_cxx_Dbopen,
-+dnl Berkeley DB 4.0.x installed as libdb4 (as on FreeBSD).
-+AC_CACHE_CHECK([for Db in -ldb4_cxx], djm_cv_lib_db4_cxx_Db,
- [AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
- djm_save_LIBS="$LIBS"
- LIBS="$LIBS -ldb4 -ldb4_cxx"
--AC_TRY_LINK([#include <db_cxx.h>], [Db *d = new Db(NULL, 0);
--d->open(NULL, NULL, DB_BTREE, DB_CREATE, 0);],
--	djm_cv_lib_db4_cxx_Dbopen=yes, djm_cv_lib_db4_cxx_Dbopen=no)
-+AC_TRY_LINK([#include <db_cxx.h>], [Db *d = new Db(NULL, 0);],
-+	djm_cv_lib_db4_cxx_Db=yes, djm_cv_lib_db4_cxx_Db=no)
- LIBS="$djm_save_LIBS"
- AC_LANG_RESTORE])
- 
--if test $djm_cv_lib_db4_cxx_Dbopen = yes; then
-+if test $djm_cv_lib_db4_cxx_Db = yes; then
- 	LIBS="$LIBS -ldb4 -ldb4_cxx"
- else
-+
-+dnl Berkeley DB 4.1.x installed as libdb41 (as on FreeBSD).
-+AC_CACHE_CHECK([for Db in -ldb41_cxx], djm_cv_lib_db41_cxx_Db,
-+[AC_LANG_SAVE
-+AC_LANG_CPLUSPLUS
-+djm_save_LIBS="$LIBS"
-+LIBS="$LIBS -ldb41 -ldb41_cxx"
-+AC_TRY_LINK([#include <db_cxx.h>], [Db *d = new Db(NULL, 0);],
-+	djm_cv_lib_db41_cxx_Db=yes, djm_cv_lib_db41_cxx_Db=no)
-+LIBS="$djm_save_LIBS"
-+AC_LANG_RESTORE])
-+
-+if test $djm_cv_lib_db41_cxx_Db = yes; then
-+	LIBS="$LIBS -ldb41 -ldb41_cxx"
-+else
- 	AC_MSG_ERROR([Berkeley DB library 2.x-4.x configured with --enable-cxx is required])
-+fi
-+fi
- fi
- fi
- fi
diff --git a/dns/fastresolve/pkg-plist b/dns/fastresolve/pkg-plist
index 8d6f3ad22685..466a1bcb33a4 100644
--- a/dns/fastresolve/pkg-plist
+++ b/dns/fastresolve/pkg-plist
@@ -8,6 +8,16 @@ bin/rebuild-dom-db
 bin/rebuild-ip-db
 bin/reresolve
 bin/make-report
+man/man1/btree-dump.1.gz
+man/man1/convert-dom-db.1.gz
+man/man1/convert-ip-db.1.gz
+man/man1/dns-terror.1.gz
+man/man1/expire-ip-db.1.gz
+man/man1/getdominfo.1.gz
+man/man1/make-report.1.gz
+man/man1/rebuild-dom-db.1.gz
+man/man1/rebuild-ip-db.1.gz
+man/man1/reresolve.1.gz
 %%DATADIR%%/AddrCycle.pm
 %%DATADIR%%/analog.cfg
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS