1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-16 07:58:04 +00:00

- fix WITH_GEODB without WITH_BDB

Submitted by:	Nicolas Rachinsky

- update GeoDB.dat
This commit is contained in:
Dirk Meyer 2008-08-12 16:36:12 +00:00
parent f2650e5932
commit 245717ee1b
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=218468
3 changed files with 10 additions and 7 deletions

View File

@ -7,7 +7,7 @@
PORTNAME= webalizer
PORTVERSION= 2.20.1
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES+= www
MASTER_SITES= ftp://ftp.mrunix.net/pub/webalizer/:main \
MASTER_SITES= ftp://ftp.mrunix.net/pub/webalizer/geodb/:geodb \
@ -20,7 +20,7 @@ DISTFILES= ${DISTNAME}.tgz:main
DISTFILES+= webalizer-flags.tgz:main
.endif
.if defined(WITH_GEODB) || make(makesum) || defined(FETCH_ALL)
DISTFILES+= webalizer-geodb-20080701.tgz:geodb
DISTFILES+= webalizer-geodb-20080801.tgz:geodb
.endif
MAINTAINER?= dinoex@FreeBSD.org
@ -72,6 +72,9 @@ PLIST_SUB+= WITH_GEOIP="@comment "
.if defined(WITH_BDB_VER) || defined(WITH_BDB)
USE_BDB= yes
INVALID_BDB_VER= 2 3 40
.if defined(WITH_GEODB)
INVALID_BDB_VER+= 41 42 43 44 45
.endif
LDFLAGS+= -L${BDB_LIB_DIR}
CFLAGS+= -I${BDB_INCLUDE_DIR}
.else

View File

@ -4,6 +4,6 @@ SIZE (webalizer-2.20-01-src.tgz) = 538171
MD5 (webalizer-flags.tgz) = 2605387b6076b8bdc0ec41b8655095c1
SHA256 (webalizer-flags.tgz) = df9961fec7da2c16ed3faefb763f912c2db5ddce6a24e4f46647d7e64b8ab29a
SIZE (webalizer-flags.tgz) = 146658
MD5 (webalizer-geodb-20080701.tgz) = 696496638eec2fda07d674efe1fb226d
SHA256 (webalizer-geodb-20080701.tgz) = 4d5308dae66b747592abb1ff677d6edc82dec3a5b5bc7cbd2e8b9e431da798c9
SIZE (webalizer-geodb-20080701.tgz) = 288623
MD5 (webalizer-geodb-20080801.tgz) = f8a27ef0eb02939da76b702eb2b3681d
SHA256 (webalizer-geodb-20080801.tgz) = 8a84ab0d3c32bb4286149b2dd7af2af279f3c5699eefc17baf9e1bb30e733178
SIZE (webalizer-geodb-20080801.tgz) = 291747

View File

@ -183,8 +183,8 @@
buf[sizeof(buf)-1]='\0';
+#ifdef USE_DB185
+ dns_db = dbopen(buf, O_RDONLY, 0664, DB_HASH, NULL);
+ if (dns_db == NULL)
+ geo_db = dbopen(buf, O_RDONLY, 0664, DB_HASH, NULL);
+ if (geo_db == NULL)
+ return NULL;
+#else
/* create database thingie */