svn commit: r339729 - in branches/2014Q1/www/squidguard: . files

[Guido Falsi]

Author: madpilot
Date: Tue Jan 14 22:32:37 2014
New Revision: 339729
URL: http://svnweb.freebsd.org/changeset/ports/339729
QAT: https://qat.redports.org/buildarchive/r339729/

Log:
  MFH: r339702
  
  Fix when compiled with BerkeleyDB 6.
  
  PR:		ports/185737
  Submitted by:	Leonid Nevecherya <nlv at imbera.ru>
  
  Approved by:	portmgr (mat)

Modified:
  branches/2014Q1/www/squidguard/Makefile
  branches/2014Q1/www/squidguard/files/patch-src_sgDB.c   (contents, props changed)
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/www/squidguard/Makefile
==============================================================================
--- branches/2014Q1/www/squidguard/Makefile	Tue Jan 14 22:04:12 2014	(r339728)
+++ branches/2014Q1/www/squidguard/Makefile	Tue Jan 14 22:32:37 2014	(r339729)
@@ -2,7 +2,7 @@
 
 PORTNAME=	squidGuard
 PORTVERSION=	1.4
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	www
 MASTER_SITES=	http://www.squidguard.org/Downloads/:a \
 		http://www.squidguard.org/Downloads/Contrib/:b

Modified: branches/2014Q1/www/squidguard/files/patch-src_sgDB.c
==============================================================================
--- branches/2014Q1/www/squidguard/files/patch-src_sgDB.c	Tue Jan 14 22:04:12 2014	(r339728)
+++ branches/2014Q1/www/squidguard/files/patch-src_sgDB.c	Tue Jan 14 22:32:37 2014	(r339729)
@@ -1,5 +1,5 @@
 --- src/sgDb.c.orig	2008-07-14 20:29:41.000000000 +0200
-+++ src/sgDb.c	2011-11-15 12:00:23.744601663 +0100
++++ src/sgDb.c	2014-01-14 11:53:55.712138134 +0100
 @@ -119,14 +119,39 @@
      flag = DB_CREATE;
      if(createdb)
@@ -24,7 +24,7 @@
 +    }
 +  }
 +#endif
-+#if DB_VERSION_MAJOR == 5
++#if DB_VERSION_MAJOR >= 5
 +  if(globalUpdate || createdb || (dbfile != NULL && stat(dbfile,&st))){
 +    flag = DB_CREATE;
 +    if(createdb)