From owner-svn-ports-head@FreeBSD.ORG  Tue Jan  7 19:56:35 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@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 7EE2DE0E;
 Tue,  7 Jan 2014 19:56:35 +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 6B7A4181B;
 Tue,  7 Jan 2014 19:56:35 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s07JuZmn067514;
 Tue, 7 Jan 2014 19:56:35 GMT (envelope-from lx@svn.freebsd.org)
Received: (from lx@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s07JuZ6n067513;
 Tue, 7 Jan 2014 19:56:35 GMT (envelope-from lx@svn.freebsd.org)
Message-Id: <201401071956.s07JuZ6n067513@svn.freebsd.org>
From: David Thiel <lx@FreeBSD.org>
Date: Tue, 7 Jan 2014 19:56:35 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r339026 - head/www/publicfile
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 07 Jan 2014 19:56:35 -0000

Author: lx
Date: Tue Jan  7 19:56:34 2014
New Revision: 339026
URL: http://svnweb.freebsd.org/changeset/ports/339026

Log:
  Add legal text and conflicts
  
  Submitted by:	ketas

Modified:
  head/www/publicfile/Makefile

Modified: head/www/publicfile/Makefile
==============================================================================
--- head/www/publicfile/Makefile	Tue Jan  7 19:54:20 2014	(r339025)
+++ head/www/publicfile/Makefile	Tue Jan  7 19:56:34 2014	(r339026)
@@ -20,6 +20,9 @@ REDIRECT_SLASH_DESC=	do not require trai
 ENV_FILETYPES_DESC=	get mime types from the environment
 SSL_DESC=		provide SSL support through ucspi-ssl
 
+CONFLICTS=	xshttpd-3*
+LEGAL_TEXT=	No license -- see http://cr.yp.to/softwarelaw.html
+
 NO_STAGE=	yes
 .include <bsd.port.options.mk>