From owner-svn-ports-head@FreeBSD.ORG  Mon May 26 09:29:51 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id C77716A6;
 Mon, 26 May 2014 09:29:51 +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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id B3D8E2BF5;
 Mon, 26 May 2014 09:29:51 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4Q9TpPm001067;
 Mon, 26 May 2014 09:29:51 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4Q9TpDJ001064;
 Mon, 26 May 2014 09:29:51 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201405260929.s4Q9TpDJ001064@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Mon, 26 May 2014 09:29:51 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r355293 - in head: . Mk
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.18
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: Mon, 26 May 2014 09:29:51 -0000

Author: bapt
Date: Mon May 26 09:29:50 2014
New Revision: 355293
URL: http://svnweb.freebsd.org/changeset/ports/355293
QAT: https://qat.redports.org/buildarchive/r355293/

Log:
  Drop compatibility code for USE_DOS2UNIX

Modified:
  head/CHANGES
  head/Mk/bsd.port.mk
  head/Mk/bsd.sanity.mk

Modified: head/CHANGES
==============================================================================
--- head/CHANGES	Mon May 26 09:24:47 2014	(r355292)
+++ head/CHANGES	Mon May 26 09:29:50 2014	(r355293)
@@ -10,6 +10,11 @@ in the release notes and/or placed into 
 
 All ports committers are allowed to commit to this file.
 
+20140526:
+AUTHOR: bapt@FreeBSD.org
+
+  USE_DOS2UNIX is no longer supported, USES=dos2unix should be used instead
+
 20140505:
 AUTHOR: bapt@FreeBSD.org
 

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Mon May 26 09:24:47 2014	(r355292)
+++ head/Mk/bsd.port.mk	Mon May 26 09:29:50 2014	(r355293)
@@ -1527,19 +1527,6 @@ PKGCOMPATDIR?=		${LOCALBASE}/lib/compat/
 USES+=	gmake
 .endif
 
-.if defined(USE_DOS2UNIX)
-.if ${USE_DOS2UNIX:tu}=="YES"
-DOS2UNIX_REGEX?=	.*
-.else
-.if ${USE_DOS2UNIX:M*/*}
-DOS2UNIX_FILES+=	${USE_DOS2UNIX}
-.else
-DOS2UNIX_GLOB+=	${USE_DOS2UNIX}
-.endif
-.endif
-USES+=	dos2unix
-.endif
-
 .if !defined(UID)
 UID!=	${ID} -u
 .endif

Modified: head/Mk/bsd.sanity.mk
==============================================================================
--- head/Mk/bsd.sanity.mk	Mon May 26 09:24:47 2014	(r355292)
+++ head/Mk/bsd.sanity.mk	Mon May 26 09:29:50 2014	(r355293)
@@ -91,7 +91,7 @@ DEV_ERROR+=	"you cannot include bsd.port
 .endif
 
 .if defined(USE_DOS2UNIX)
-DEV_WARNING+=	"USE_DOS2UNIX is deprecated, please use USES=dos2unix"
+DEV_ERROR+=	"USE_DOS2UNIX is no longer supported, please use USES=dos2unix"
 .endif
 
 .if defined(LICENSE)