svn commit: r355293 - in head: . Mk

[Baptiste Daroussin]

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 at FreeBSD.org
+
+  USE_DOS2UNIX is no longer supported, USES=dos2unix should be used instead
+
 20140505:
 AUTHOR: bapt at 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)