diff options
author | Sergey A. Osokin <osa@FreeBSD.org> | 2003-09-03 10:59:27 +0000 |
---|---|---|
committer | Sergey A. Osokin <osa@FreeBSD.org> | 2003-09-03 10:59:27 +0000 |
commit | 972542c246cc0fb5ef4d848e5fd72be4cf90f43f (patch) | |
tree | 6e256eb57e1c74377f1e978f5c3e55259ca45e82 /sysutils/fastresolve | |
parent | Correct package list due to changes from previous version. (diff) |
Fix building on -CURRENT by update to 2.10.
Reset maintainership.
Update based on PR 50411, which was submitted
by Martin Matuska <martin@tradex.sk>
Spotted by: Mark Linimon <linimon@lonesome.com>
Approved by: maintainer timeout ( >3 monthes )
Notes
Notes:
svn path=/head/; revision=88431
Diffstat (limited to 'sysutils/fastresolve')
-rw-r--r-- | sysutils/fastresolve/Makefile | 30 | ||||
-rw-r--r-- | sysutils/fastresolve/distinfo | 2 | ||||
-rw-r--r-- | sysutils/fastresolve/files/patch-configure.in | 43 | ||||
-rw-r--r-- | sysutils/fastresolve/files/patch-scripts::convert-ip-db-in | 34 | ||||
-rw-r--r-- | sysutils/fastresolve/pkg-plist | 9 |
5 files changed, 24 insertions, 94 deletions
diff --git a/sysutils/fastresolve/Makefile b/sysutils/fastresolve/Makefile index 1fded2ff7ac0..de8ed4f51247 100644 --- a/sysutils/fastresolve/Makefile +++ b/sysutils/fastresolve/Makefile @@ -6,21 +6,19 @@ # PORTNAME= fastresolve -PORTVERSION= 2.8 -PORTREVISION= 1 +PORTVERSION= 2.10 CATEGORIES= sysutils -MASTER_SITES= http://www.pix.net/staff/djm/sw/dist/ +MASTER_SITES= http://www.djmnet.org/sw/dist/ -MAINTAINER= verm@drunkmonk.net +MAINTAINER= ports@FreeBSD.org COMMENT= Programs that process web logs to get DNS and domain ownership info LIB_DEPENDS= db3.3:${PORTSDIR}/databases/db3 \ adns.1:${PORTSDIR}/net/adns USE_BZIP2= yes -USE_GMAKE= yes -USE_AUTOMAKE= yes -AUTOMAKE_ARGS= -a +USE_PERL5= yes +GNU_CONFIGURE= yes CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \ CXXFLAGS="-I${LOCALBASE}/include/db3 -I${LOCALBASE}/include" @@ -28,19 +26,19 @@ 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 -.include <bsd.port.pre.mk> - -.if ${OSVERSION} >= 500113 -BROKEN= "Does not compile (bad C++ code)" +post-install: +.if !defined(NOPORTDOCS) + @${MKDIR} ${DOCSDIR} +.for f in AUTHORS COPYING ChangeLog INSTALL NEWS README + @${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR} +.endfor + @${INSTALL_DATA} ${WRKSRC}/doc/TODO ${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/doc/timings ${DOCSDIR} .endif -pre-configure: - @(cd ${WRKSRC} && aclocal14) - -post-install: @${ECHO_MSG} "" @${ECHO_MSG} "If you want to use the convert-ip-db script you must" @${ECHO_MSG} "install the databases/p5-BerkeleyDB port" @${ECHO_MSG} "" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/fastresolve/distinfo b/sysutils/fastresolve/distinfo index 5cff43aa88c1..b1f1d4744f5d 100644 --- a/sysutils/fastresolve/distinfo +++ b/sysutils/fastresolve/distinfo @@ -1 +1 @@ -MD5 (fastresolve-2.8.tar.bz2) = 246a80314c7330f71117913bdf7ddc03 +MD5 (fastresolve-2.10.tar.bz2) = 56650c9bd027c4eb2f98a26e1f06c8d1 diff --git a/sysutils/fastresolve/files/patch-configure.in b/sysutils/fastresolve/files/patch-configure.in deleted file mode 100644 index 04094e1eb987..000000000000 --- a/sysutils/fastresolve/files/patch-configure.in +++ /dev/null @@ -1,43 +0,0 @@ ---- configure.in.orig Wed Nov 15 14:50:37 2000 -+++ configure.in Tue Jun 11 06:16:24 2002 -@@ -27,26 +27,26 @@ - [dnl Check for a C++ interface, either version. - - dnl 2.x. --AC_CACHE_CHECK([for Db::open in -ldb], djm_cv_lib_db_Dbopen, -+AC_CACHE_CHECK([for Db::open in -ldb3], djm_cv_lib_db_Dbopen, - [AC_LANG_SAVE - AC_LANG_CPLUSPLUS - djm_save_LIBS="$LIBS" --LIBS="$LIBS -ldb" -+LIBS="$LIBS -ldb3" - AC_TRY_LINK([#include <db_cxx.h>], [Db::open(NULL, DB_BTREE, DB_CREATE, 0, NULL, NULL, NULL);], - djm_cv_lib_db_Dbopen=yes, djm_cv_lib_db_Dbopen=no) - LIBS="$djm_save_LIBS" - AC_LANG_RESTORE]) - - if test $djm_cv_lib_db_Dbopen = yes; then -- LIBS="$LIBS -ldb" -+ LIBS="$LIBS -ldb3" - else - - dnl 3.x. --AC_CACHE_CHECK([for Db::open in -ldb_cxx], djm_cv_lib_db_cxx_Dbopen, -+AC_CACHE_CHECK([for Db::open in -ldb3_cxx], djm_cv_lib_db_cxx_Dbopen, - [AC_LANG_SAVE - AC_LANG_CPLUSPLUS - djm_save_LIBS="$LIBS" --LIBS="$LIBS -ldb -ldb_cxx" -+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_db_cxx_Dbopen=yes, djm_cv_lib_db_cxx_Dbopen=no) -@@ -54,7 +54,7 @@ - AC_LANG_RESTORE]) - - if test $djm_cv_lib_db_cxx_Dbopen = yes; then -- LIBS="$LIBS -ldb -ldb_cxx" -+ LIBS="$LIBS -ldb3 -ldb3_cxx" - else - AC_MSG_ERROR([Berkeley DB library 2.x or 3.x configured with --enable-cxx is required]) - fi diff --git a/sysutils/fastresolve/files/patch-scripts::convert-ip-db-in b/sysutils/fastresolve/files/patch-scripts::convert-ip-db-in deleted file mode 100644 index bbb2ddb0e872..000000000000 --- a/sysutils/fastresolve/files/patch-scripts::convert-ip-db-in +++ /dev/null @@ -1,34 +0,0 @@ ---- scripts/convert-ip-db.in.orig Wed Sep 29 12:13:42 1999 -+++ scripts/convert-ip-db.in Wed Sep 4 02:31:43 2002 -@@ -13,6 +13,7 @@ - # Written by Chris Ross <cross@eng.us.uu.net> - # and David MacKenzie <djm@web.us.uu.net> - # Please send comments and bug reports to fastresolve-bugs@web.us.uu.net. -+# Updated to use BerkeleyDB (db3) by Harold Paulson <haroldp@internal.org> - - ############################################################################## - # Copyright 1999 UUNET, an MCI WorldCom company. -@@ -33,8 +34,7 @@ - # 02111-1307, USA. - ############################################################################## - --use DB_File; --use Fcntl; -+use BerkeleyDB; - - main(); - exit(0); -@@ -45,8 +45,11 @@ - - $dbfile = shift @ARGV || "ip2host.db"; - -- tie(%input, "DB_File", $dbfile, O_RDONLY, 0640, $DB_BTREE) -- || die "$0: Can't read $dbfile: $!\n"; -+ tie(%input, 'BerkeleyDB::Btree', -+ -Filename => $dbfile, -+ -Flags => DB_RDONLY, -+ -Mode => 0640) -+ || die "$0: Can't read $dbfile: $!\n"; - - while (($ipaddr, $domain) = each(%input)) { - ($timestamp, $domain) = unpack("IA*", $domain); diff --git a/sysutils/fastresolve/pkg-plist b/sysutils/fastresolve/pkg-plist index 9feca9d40935..3bcb6f11a052 100644 --- a/sysutils/fastresolve/pkg-plist +++ b/sysutils/fastresolve/pkg-plist @@ -10,4 +10,13 @@ bin/reresolve bin/make-report share/fastresolve/AddrCycle.pm share/fastresolve/analog.cfg +%%PORTDOCS%%%%DOCSDIR%%/AUTHORS +%%PORTDOCS%%%%DOCSDIR%%/COPYING +%%PORTDOCS%%%%DOCSDIR%%/ChangeLog +%%PORTDOCS%%%%DOCSDIR%%/INSTALL +%%PORTDOCS%%%%DOCSDIR%%/NEWS +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/TODO +%%PORTDOCS%%%%DOCSDIR%%/timings +%%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm share/fastresolve |