From owner-svn-ports-branches@FreeBSD.ORG  Tue Jan 14 22:32:38 2014
Return-Path: <owner-svn-ports-branches@FreeBSD.ORG>
Delivered-To: svn-ports-branches@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 0EC86957;
 Tue, 14 Jan 2014 22:32:38 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id EE511114C;
 Tue, 14 Jan 2014 22:32:37 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0EMWbCM099654;
 Tue, 14 Jan 2014 22:32:37 GMT
 (envelope-from madpilot@svn.freebsd.org)
Received: (from madpilot@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0EMWbl5099652;
 Tue, 14 Jan 2014 22:32:37 GMT
 (envelope-from madpilot@svn.freebsd.org)
Message-Id: <201401142232.s0EMWbl5099652@svn.freebsd.org>
From: Guido Falsi <madpilot@FreeBSD.org>
Date: Tue, 14 Jan 2014 22:32:37 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r339729 - in branches/2014Q1/www/squidguard: . files
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
 <svn-ports-branches.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 14 Jan 2014 22:32:38 -0000

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@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)