From owner-cvs-all@FreeBSD.ORG  Thu Jan  8 14:34:12 2004
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id D044D16A4CE; Thu,  8 Jan 2004 14:34:12 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id B4EC043D6A; Thu,  8 Jan 2004 14:34:05 -0800 (PST)
	(envelope-from linimon@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i08MY50B035503;
	Thu, 8 Jan 2004 14:34:05 -0800 (PST)
	(envelope-from linimon@repoman.freebsd.org)
Received: (from linimon@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i08MY5uN035502;
	Thu, 8 Jan 2004 14:34:05 -0800 (PST)
	(envelope-from linimon)
Message-Id: <200401082234.i08MY5uN035502@repoman.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Thu, 8 Jan 2004 14:34:05 -0800 (PST)
To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: ports/www/dansguardian Makefile pkg-plist
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Jan 2004 22:34:13 -0000

linimon     2004/01/08 14:34:05 PST

  FreeBSD ports repository

  Modified files:
    www/dansguardian     Makefile pkg-plist 
  Log:
  Fix conflicts.  Also check in the changes to the plist that I foolishly
  forgot last time (thank you cvs update!)
  
  PR:             ports/61098
  Submitted by:   Freddie Cash <fcash@sd73.bc.ca> (maintainer)
  
  Revision  Changes    Path
  1.13      +1 -1      ports/www/dansguardian/Makefile
  1.5       +42 -42    ports/www/dansguardian/pkg-plist