51 files changed, 78 insertions, 85 deletions
diff --git a/devel/ireport/Makefile b/devel/ireport/Makefile
index 807f5b9919d..dc54276cc60 100644
--- a/devel/ireport/Makefile
+++ b/devel/ireport/Makefile
@@ -12,9 +12,10 @@ COMMENT=	A visual report builder/designer for JasperReports
 
 RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper
 
+USES=		dos2unix
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
-USE_DOS2UNIX=	*.txt
+DOS2UNIX_GLOB=	*.txt
 NO_BUILD=	yes
 
 #LICENSE=	GNU AFFERO GPL
diff --git a/devel/jgoodies-common/Makefile b/devel/jgoodies-common/Makefile
index f59737485e0..103c9ce8065 100644
--- a/devel/jgoodies-common/Makefile
+++ b/devel/jgoodies-common/Makefile
@@ -15,6 +15,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	${JAVALIBDIR}/junit.jar:${PORTSDIR}/java/junit
 
+USES=		dos2unix
 USE_ZIP=	yes
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
@@ -22,7 +23,6 @@ USE_ANT=	yes
 MAKE_ARGS+=	-Djunit4.jar=${LOCALBASE}/share/java/classes/junit.jar
 ALL_TARGET=	jar test
 EXTRACT_AFTER_ARGS=-d ${WRKDIR} -x '*/api/*' '*.jar'
-USE_DOS2UNIX=	yes
 REINPLACE_ARGS=	-i ""
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/devel/piklab/Makefile b/devel/piklab/Makefile
index 0657c315a0f..176670e0252 100644
--- a/devel/piklab/Makefile
+++ b/devel/piklab/Makefile
@@ -15,10 +15,10 @@ OPTIONS_DEFINE=	KDE4
 OPTIONS_DEFAULT=KDE4
 
 USE_BZIP2=	yes
-USE_DOS2UNIX=	Piklab.cmake
+DOS2UNIX_FILES=	Piklab.cmake
 USE_QT4=	corelib gui qt3support qtestlib xml \
 		moc_build qmake_build rcc_build uic_build
-USES=		cmake gettext readline
+USES=		cmake gettext readline dos2unix
 
 MAN1=		piklab-hex.1 piklab-prog.1
 
diff --git a/devel/sdts++/Makefile b/devel/sdts++/Makefile
index b3352873a69..25ce2bd4b22 100644
--- a/devel/sdts++/Makefile
+++ b/devel/sdts++/Makefile
@@ -13,9 +13,8 @@ COMMENT=	C++ library for SDTS related development
 
 LIB_DEPENDS=	boost_thread:${PORTSDIR}/devel/boost-libs
 
-USE_DOS2UNIX=	sdts++/io/sio_Utils.cpp
-USES=		bison
-USE_GMAKE=	yes
+DOS2UNIX_FILES=	sdts++/io/sio_Utils.cpp
+USES=		bison dos2unix gmake
 USE_AUTOTOOLS=	libtoolize aclocal automake autoconf
 LIBTOOLIZE_ARGS=--copy --force
 ACLOCAL_ARGS=	-I ${LOCALBASE}/share/aclocal
diff --git a/devel/stormlib-ghost++/Makefile b/devel/stormlib-ghost++/Makefile
index 1f5ccee83af..a51201f0787 100644
--- a/devel/stormlib-ghost++/Makefile
+++ b/devel/stormlib-ghost++/Makefile
@@ -15,11 +15,10 @@ PROJECTHOST=	ghostplusplus
 PROJECTVERSION=	17.1
 
 USE_ZIP=	yes
-USE_DOS2UNIX=	yes
+USES=		dos2unix gmake
 
 WRKSRC=		${WRKDIR}/ghost/StormLib/stormlib
 
-USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 
 NO_STAGE=	yes
diff --git a/devel/subcommander2/Makefile b/devel/subcommander2/Makefile
index 9a6e6328870..fcfd9f5a640 100644
--- a/devel/subcommander2/Makefile
+++ b/devel/subcommander2/Makefile
@@ -21,11 +21,11 @@ CONFLICTS=	subcommander-1.*
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R:S,.b,b,}p${PORTVERSION:E}
 
-USE_DOS2UNIX=	*.cpp *.h
+USES=		gmake dos2unix
+DOS2UNIX_GLOB=	*.cpp *.h
 USE_QT4=	corelib gui network qt3support moc_build rcc_build uic_build
 QT_NONSTANDARD=	yes
 USE_OPENSSL=	yes
-USE_GMAKE=	yes
 USE_AUTOTOOLS=	aclocal automake autoheader autoconf
 ACLOCAL_ARGS=	-I ac-macros
 AUTOMAKE_ARGS=	--copy --force-missing --foreign
diff --git a/devel/vtcl/Makefile b/devel/vtcl/Makefile
index 245fd401020..2be3c61b76d 100644
--- a/devel/vtcl/Makefile
+++ b/devel/vtcl/Makefile
@@ -16,8 +16,8 @@ OPTIONS_DEFINE=	DOCS EXAMPLES
 
 NO_BUILD=	yes
 
-USES+=		tk:84
-USE_DOS2UNIX=	configure
+USES+=		tk:84 dos2unix
+DOS2UNIX_FILES=	configure
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	${PREFIX}
 
diff --git a/editors/madedit/Makefile b/editors/madedit/Makefile
index e9ce52e8a52..6132449144b 100644
--- a/editors/madedit/Makefile
+++ b/editors/madedit/Makefile
@@ -12,10 +12,9 @@ COMMENT=	An open-source and cross-platform text/hex editor
 
 LICENSE=	GPLv2
 
-USES=		gettext pkgconfig
+USES=		gettext pkgconfig dos2unix
 USE_WX=		2.6+
 WANT_UNICODE=	yes
-USE_DOS2UNIX=	yes
 
 LIB_DEPENDS+=	boost_regex:${PORTSDIR}/devel/boost-libs
 
diff --git a/emulators/dtcyber/Makefile b/emulators/dtcyber/Makefile
index 91b1f4ba1fd..4f165f214e7 100644
--- a/emulators/dtcyber/Makefile
+++ b/emulators/dtcyber/Makefile
@@ -13,9 +13,9 @@ DISTNAME=	dtcyber20b1
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Desktop CYBER Emulator
 
+USES=		dos2unix
 USE_ZIP=	yes
 USE_XORG=	x11
-USE_DOS2UNIX=	yes
 NO_WRKSUBDIR=	yes
 INSTALL_TARGET=
 MAKEFILE=	Makefile.x11
diff --git a/emulators/mame/Makefile b/emulators/mame/Makefile
index 2a850dcaddd..5628405570c 100644
--- a/emulators/mame/Makefile
+++ b/emulators/mame/Makefile
@@ -32,12 +32,12 @@ BUILTIN_DEBUGGER_DESC=	Builtin debugger support
 NO_WRKSUBDIR=	yes
 
 USE_ZIP=	yes
-USES=		gmake pkgconfig shebangfix
+USES=		gmake pkgconfig shebangfix dos2unix
 SHEBANG_FILES=	src/emu/cpu/m6502/m6502make.py \
 		src/emu/cpu/m6809/m6809make.py \
 		src/emu/cpu/mcs96/mcs96make.py \
 		src/emu/cpu/tms57002/tmsmake.py
-USE_DOS2UNIX=	src/osd/sdl/input.c \
+DOS2UNIX_FILES=	src/osd/sdl/input.c \
 		src/osd/sdl/testkeys.c
 USE_XORG=	xext xi xinerama xrender
 USE_GL=		gl
diff --git a/emulators/mess/Makefile b/emulators/mess/Makefile
index 32defec5fcd..61483b2e6ed 100644
--- a/emulators/mess/Makefile
+++ b/emulators/mess/Makefile
@@ -32,12 +32,12 @@ BUILTIN_DEBUGGER_DESC=	Builtin debugger support
 NO_WRKSUBDIR=	yes
 
 USE_ZIP=	yes
-USES=		gmake pkgconfig shebangfix
+USES=		gmake pkgconfig shebangfix dos2unix
 SHEBANG_FILES=	src/emu/cpu/m6502/m6502make.py \
 		src/emu/cpu/m6809/m6809make.py \
 		src/emu/cpu/mcs96/mcs96make.py \
 		src/emu/cpu/tms57002/tmsmake.py
-USE_DOS2UNIX=	src/osd/sdl/input.c \
+DOS2UNIX_FILES=	src/osd/sdl/input.c \
 		src/osd/sdl/testkeys.c
 USE_XORG=	xext xi xinerama xrender
 USE_GL=		gl
diff --git a/emulators/simh/Makefile b/emulators/simh/Makefile
index 03511553fed..bfc02843fd0 100644
--- a/emulators/simh/Makefile
+++ b/emulators/simh/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Emulates classic DEC, HP, GRI, IBM, Altair, SDS, Honeywell, and others
 
 NO_WRKSUBDIR=	yes
 
+USES=		gmake dos2unix
 USE_ZIP=	yes
-USE_DOS2UNIX=	VAX/vax_sysdev.c
-USE_GMAKE=	yes
+DOS2UNIX_FILES=	VAX/vax_sysdev.c
 MAKE_ENV=	GCC="${CC}" CFLAGS_O="${CFLAGS}" USE_NETWORK=1
 MAKEFILE=	makefile
 
diff --git a/games/cre/Makefile b/games/cre/Makefile
index 61a7842860a..b4ec5481269 100644
--- a/games/cre/Makefile
+++ b/games/cre/Makefile
@@ -13,7 +13,8 @@ COMMENT=	Corewars Redcode Evolver
 
 LICENSE=	GPLv2
 
-USE_DOS2UNIX=	*.txt
+USES=		dos2unix
+DOS2UNIX_FILES=	*.txt
 NO_WRKSUBDIR=	yes
 BUILD_WRKSRC=	${WRKSRC}/src
 
diff --git a/games/evq3/Makefile b/games/evq3/Makefile
index 30452525a96..611a6ae646b 100644
--- a/games/evq3/Makefile
+++ b/games/evq3/Makefile
@@ -16,9 +16,8 @@ COMMENT=	The Marriage of XreaL and Icculus.org Q3 w/ Improvements
 
 LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
 
+USES=		gmake dos2unix
 USE_BZIP2=	yes
-USE_DOS2UNIX=	yes
-USE_GMAKE=	yes
 ALL_TARGET=	release
 WRKSRC=		${WRKDIR}/${PORTNAME}
 CFLAGS+=	-DMAP_ANONYMOUS=MAP_ANON
diff --git a/games/exhaust-ma/Makefile b/games/exhaust-ma/Makefile
index 60dd9e1f7a3..2e7be1a308c 100644
--- a/games/exhaust-ma/Makefile
+++ b/games/exhaust-ma/Makefile
@@ -11,12 +11,10 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Redcode simulator easy to embed into applications
 
 USE_ZIP=	yes
-USES=		gmake
+USES=		gmake dos2unix
 
 NO_WRKSUBDIR=	yes
 
-USE_DOS2UNIX=	yes
-
 PLIST_FILES=	bin/${PORTNAME}
 
 do-install:
diff --git a/games/fteqw/Makefile b/games/fteqw/Makefile
index 2ca2c1b84dd..8f01e2bf88f 100644
--- a/games/fteqw/Makefile
+++ b/games/fteqw/Makefile
@@ -11,8 +11,7 @@ DISTNAME=	ftesrc${PORTVERSION}-all
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	QuakeWorld client with cool features, but still compatible
 
-USE_DOS2UNIX=	yes
-USE_GMAKE=	yes
+USES=		gmake dos2unix
 USE_CSTD=	gnu89
 NO_WRKSUBDIR=	yes
 
diff --git a/games/galaxyhack/Makefile b/games/galaxyhack/Makefile
index 9ffea71b872..9b28f4911a7 100644
--- a/games/galaxyhack/Makefile
+++ b/games/galaxyhack/Makefile
@@ -15,9 +15,8 @@ COMMENT=	AI script based strategy game
 LIB_DEPENDS=	boost_filesystem:${PORTSDIR}/devel/boost-libs \
 		freetype.9:${PORTSDIR}/print/freetype2
 
+USES=		dos2unix gmake
 USE_BZIP2=	yes
-USE_DOS2UNIX=	yes
-USE_GMAKE=	yes
 USE_SDL=	gfx image mixer sdl
 WRKSRC=		${WRKDIR}/${PORTNAME}/src
 
diff --git a/games/lwjgl/Makefile b/games/lwjgl/Makefile
index 84658399803..abbaeef7a0f 100644
--- a/games/lwjgl/Makefile
+++ b/games/lwjgl/Makefile
@@ -22,10 +22,10 @@ ONLY_FOR_ARCHS=	i386 amd64
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 EXTRACT_AFTER_ARGS=	-d ${WRKSRC}
 
+USES=		dos2unix
 USE_ZIP=	yes
 USE_JAVA=	yes
 USE_LDCONFIG=	yes
-USE_DOS2UNIX=	yes
 DOS2UNIX_REGEX=	.*.[^j][^a][^r]$
 JAVA_VERSION=	1.6+
 JAVA_OS=	native
diff --git a/games/nehquake/Makefile b/games/nehquake/Makefile
index b93ce1e3c53..0a303f04f6e 100644
--- a/games/nehquake/Makefile
+++ b/games/nehquake/Makefile
@@ -12,11 +12,10 @@ DISTNAME=	NehQuake-bjp-bin-src.linux
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Quake engine designed for playing Nehahra
 
+USES=		gmake dos2unix
 USE_BZIP2=	yes
-USE_DOS2UNIX=	yes
 USE_GL=		gl
 USE_XORG=	xxf86dga
-USE_GMAKE=	yes
 
 OPTIONS_DEFINE=	OPTIMIZED_CFLAGS SDL X86_ASM
 OPTIONS_DEFAULT=	OPTIMIZED_CFLAGS SDL X86_ASM
diff --git a/games/odamex/Makefile b/games/odamex/Makefile
index ad4248cb806..cdfbc660e8a 100644
--- a/games/odamex/Makefile
+++ b/games/odamex/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Standard in Online Multiplayer Doom
 
 USE_BZIP2=	yes
 USE_SDL=	sdl mixer
-USES=		cmake
-USE_DOS2UNIX=	CMakeLists.txt odalaunch/CMakeLists.txt common/d_main.cpp
+USES=		cmake dos2unix
+DOS2UNIX_FILES=	CMakeLists.txt odalaunch/CMakeLists.txt common/d_main.cpp
 
 OPTIONS_DEFINE=	LAUNCHER
 
diff --git a/games/ppracer/Makefile b/games/ppracer/Makefile
index 3c09488d4bd..b6a44ffb46c 100644
--- a/games/ppracer/Makefile
+++ b/games/ppracer/Makefile
@@ -14,11 +14,10 @@ LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png \
 		freetype:${PORTSDIR}/print/freetype2
 
 USE_BZIP2=	yes
-USES=		gmake pkgconfig
+USES=		gmake pkgconfig dos2unix
 USE_SDL=	mixer sdl
 USE_GL=		gl
 GNU_CONFIGURE=	yes
-USE_DOS2UNIX=	yes
 DOS2UNIX_REGEX=	.*\.(c|cpp|h)
 USE_XORG=	x11 xi xext xmu xt
 
diff --git a/games/q3cellshading/Makefile b/games/q3cellshading/Makefile
index a5b7d95d89f..302f4db76d3 100644
--- a/games/q3cellshading/Makefile
+++ b/games/q3cellshading/Makefile
@@ -14,9 +14,8 @@ COMMENT=	Quake III engine with Cell Shading capabilities
 ONLY_FOR_ARCHS=	i386
 ONLY_FOR_ARCHS_REASON=	does not run properly; try games/ioquake3 with option
 
-USES=		gmake
+USES=		gmake dos2unix
 USE_ZIP=	yes
-USE_DOS2UNIX=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 BUILD_WRKSRC=	${WRKSRC}/code/unix
 
diff --git a/games/quake-reaper/Makefile b/games/quake-reaper/Makefile
index 30519665a1e..dce82503bb6 100644
--- a/games/quake-reaper/Makefile
+++ b/games/quake-reaper/Makefile
@@ -11,8 +11,9 @@ DISTNAME=	reaprb81
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Quake 1 bots
 
+USES=		dos2unix
 USE_ZIP=	yes
-USE_DOS2UNIX=	${PORTDOCS}
+DOS2UNIX_GLOB=	${PORTDOCS}
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
diff --git a/games/sampsvr/Makefile b/games/sampsvr/Makefile
index 7c906e2e6a9..3b2ca1fff63 100644
--- a/games/sampsvr/Makefile
+++ b/games/sampsvr/Makefile
@@ -10,10 +10,11 @@ DISTNAME=	samp${PORTVERSION:S,.,,}svr
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Rockstar's GTA: San Andreas multiplayer modification dedicated server
 
+USES=		dos2unix
 USE_LINUX=	yes
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/samp03
-USE_DOS2UNIX=	*.txt *.pwn *.inc
+DOS2UNIX_GLOB=	*.txt *.pwn *.inc
 USE_RC_SUBR=	sampd
 SAMPDIR=	${PREFIX}/libexec/${PORTNAME}
 PORTDOCS=	LICENSE README
diff --git a/games/species/Makefile b/games/species/Makefile
index a06bcb8a0ec..b9974345669 100644
--- a/games/species/Makefile
+++ b/games/species/Makefile
@@ -11,9 +11,8 @@ DISTNAME=	redcoder
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Corewars evolver - generates warriors using genetic algorithms
 
-USE_DOS2UNIX=	yes
 USE_BZIP2=	yes
-USES=		gmake
+USES=		gmake dos2unix
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 OPTIONS_DEFINE=	VISITOOL
diff --git a/games/tenebrae/Makefile b/games/tenebrae/Makefile
index 333dbf6163f..3ead34bbe0d 100644
--- a/games/tenebrae/Makefile
+++ b/games/tenebrae/Makefile
@@ -14,9 +14,8 @@ COMMENT=	Quake engine with lighting similar to that in Doom III
 
 LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png
 
-USES=		gmake
+USES=		gmake dos2unix
 USE_ZIP=	yes
-USE_DOS2UNIX=	yes
 USE_GL=		glu
 USE_SDL=	yes
 USE_XORG=	xxf86dga
diff --git a/games/xevil/Makefile b/games/xevil/Makefile
index 85baf946479..7558ea85ecd 100644
--- a/games/xevil/Makefile
+++ b/games/xevil/Makefile
@@ -18,9 +18,10 @@ OPTIONS_DEFINE=	DOCS
 
 NO_WRKSUBDIR=yes
 
+USES=		dos2unix
 USE_ZIP=	yes
 USE_XORG=	xpm
-USE_DOS2UNIX=	*.cpp *.h config.mk makefile
+DOS2UNIX_GLOB=	*.cpp *.h config.mk makefile
 MAKEFILE=	makefile
 MAKE_ARGS=	DEPTH="${WRKSRC}"
 ALL_TARGET=	${OPSYS:L}
diff --git a/german/selfhtml/Makefile b/german/selfhtml/Makefile
index 25e9e00ad9b..62d83658a11 100644
--- a/german/selfhtml/Makefile
+++ b/german/selfhtml/Makefile
@@ -23,10 +23,9 @@ COMMENT=	Extensive German HTML reference
 
 WRKSRC=		${WRKDIR}
 
-USE_ZIP=	yes
 NO_BUILD=	yes
-
-USE_DOS2UNIX=	yes
+USES=		dos2unix
+USE_ZIP=	yes
 DOS2UNIX_REGEX=	.*\.(css|dhtml|diverses|editorial|grafik|helferlein|htm|inter|intro|javascript|layouts|navigation|perl|php|projekt|quellen|servercgi|src|xml|xls|dtd)$$
 
 PORTDOCS=	\
diff --git a/german/tipp10/Makefile b/german/tipp10/Makefile
index 416aaddbe37..acf2cbbb5ee 100644
--- a/german/tipp10/Makefile
+++ b/german/tipp10/Makefile
@@ -14,8 +14,8 @@ COMMENT=	10-finger touch typing learning program
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/license_en.txt
 
-USES=		qmake
-USE_DOS2UNIX=	*.pro *.cpp
+USES=		qmake dos2unix
+DOS2UNIX_GLOB=	*.pro *.cpp
 USE_ZIP=	yes
 USE_QT4=	gui sql corelib network script qtestlib \
 		qmake_build rcc_build uic_build moc_build \
diff --git a/graphics/k3d/Makefile b/graphics/k3d/Makefile
index 16e3b26c404..70b910b2cfa 100644
--- a/graphics/k3d/Makefile
+++ b/graphics/k3d/Makefile
@@ -36,10 +36,10 @@ OPENEXR_DESC=	OpenEXR file format module
 USE_BZIP2=	yes
 USE_GL=		glu
 USE_GNOME=	gtksourceview2
-USE_DOS2UNIX=	*.hpp
+DOS2UNIX_GLOB=	*.hpp
 USE_GCC=	yes
 USE_PYTHON=	yes
-USES=		cmake:outsource gettext
+USES=		cmake:outsource gettext dos2unix
 CMAKE_ARGS=	-DK3D_INTL_INCLUDE_DIRS:STRING="-I${LOCALBASE}/include" \
 		-DK3D_INTL_LIBS:STRING="-L${LOCALBASE}/lib -lintl" \
 		-DK3D_BUILD_CARVE_MODULE:BOOL=OFF \
diff --git a/graphics/openjpeg/Makefile b/graphics/openjpeg/Makefile
index 874efb54546..c058acd1879 100644
--- a/graphics/openjpeg/Makefile
+++ b/graphics/openjpeg/Makefile
@@ -17,9 +17,9 @@ LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff \
 		libpng15.so:${PORTSDIR}/graphics/png \
 		liblcms2.so:${PORTSDIR}/graphics/lcms2
 
-USE_DOS2UNIX=	opj_malloc.h
+DOS2UNIX_FILES=	opj_malloc.h
 GNU_CONFIGURE=	yes
-USES=		cmake
+USES=		cmake dos2unix
 USE_LDCONFIG=	yes
 
 .include <bsd.port.mk>
diff --git a/graphics/py-opengl/Makefile b/graphics/py-opengl/Makefile
index 5d2c7141a2c..024ab34aac5 100644
--- a/graphics/py-opengl/Makefile
+++ b/graphics/py-opengl/Makefile
@@ -22,14 +22,13 @@ OPTIONS_DEFAULT=	TKINTER
 TKINTER_DESC=	Build with tkinter for X support
 OPTIONSFILE?=	${PORT_DBDIR}/${PORTNAME}/options
 
+USES=		dos2unix
 USE_GL=		glut
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_PKGNAME=	PyOpenGL
 PYDISTUTILS_PKGVERSION=	${PORTVERSION:S/.b/b/}
 
-USE_DOS2UNIX=	yes
-
 NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
diff --git a/graphics/tifmerge/Makefile b/graphics/tifmerge/Makefile
index a668514e21e..a59489ea070 100644
--- a/graphics/tifmerge/Makefile
+++ b/graphics/tifmerge/Makefile
@@ -11,7 +11,8 @@ DISTNAME=	tiff
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Library to merge TIFF files into multi-page TIFF files
 
-USE_DOS2UNIX=	*.[ch]
+USES=		dos2unix
+DOS2UNIX_GLOB=	*.[ch]
 USE_LDCONFIG=	yes
 USE_ZIP=	yes
 NO_WRKSUBDIR=	yes
diff --git a/java/jasmin/Makefile b/java/jasmin/Makefile
index f8b5fcb6a60..65d1014502a 100644
--- a/java/jasmin/Makefile
+++ b/java/jasmin/Makefile
@@ -10,12 +10,12 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Java Assembler Interface
 
+USES=		dos2unix
 USE_ZIP=	yes
 USE_ANT=	yes
 ALL_TARGET=	jasmin
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
-USE_DOS2UNIX=	yes
 DOS2UNIX_REGEX=	.*\.(txt|xml|j|class|java|mf|css|bnf|html)
 
 SUB_FILES=	jasmin.sh
diff --git a/lang/bwbasic/Makefile b/lang/bwbasic/Makefile
index 092daf2c7b7..a91618b848c 100644
--- a/lang/bwbasic/Makefile
+++ b/lang/bwbasic/Makefile
@@ -11,8 +11,8 @@ COMMENT=	The Bywater Basic interpreter
 
 NO_WRKSUBDIR=	yes
 
+USES=		dos2unix
 USE_ZIP=	yes
-USE_DOS2UNIX=	yes
 GNU_CONFIGURE=	yes
 MAKE_ARGS=	CFLAGS="${CFLAGS} -ansi"
 ALL_TARGET=	${PORTNAME}
diff --git a/lang/cocor/Makefile b/lang/cocor/Makefile
index fe5b3120315..6fc3046120d 100644
--- a/lang/cocor/Makefile
+++ b/lang/cocor/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Compiler generator that combines the functionality of lex and yacc
 
 NO_WRKSUBDIR=	yes
 
-USE_DOS2UNIX=	yes
+USES=		dos2unix
 MAKE_ENV=	CRFRAMES="${WRKSRC}/frames"
 MAKEFILE=	unix.mk
 ALL_TARGET=	all1
diff --git a/lang/squirrel/Makefile b/lang/squirrel/Makefile
index 67e482a69a2..47d90aa52fd 100644
--- a/lang/squirrel/Makefile
+++ b/lang/squirrel/Makefile
@@ -11,7 +11,8 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	High level imperative/OO programming language
 
 CONFLICTS=	squsq-[0-9]*
-USE_DOS2UNIX=	yes
+
+USES=		dos2unix
 USE_LDCONFIG=	yes
 WRKSRC=		${WRKDIR}/SQUIRREL2
 
diff --git a/mail/gml/Makefile b/mail/gml/Makefile
index 375cb47d051..4d6251e9744 100644
--- a/mail/gml/Makefile
+++ b/mail/gml/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Mbox & Maildir to Gmail loader
 USE_PYTHON_RUN=	-2.7
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
-USE_DOS2UNIX=	yes
+USES=		dos2unix
 PLIST_FILES=	bin/${PORTNAME}
 
 PORTDOCS=	README
diff --git a/misc/projectionlib/Makefile b/misc/projectionlib/Makefile
index 84ae9acc359..a8f599f4df3 100644
--- a/misc/projectionlib/Makefile
+++ b/misc/projectionlib/Makefile
@@ -14,8 +14,9 @@ LIB_DEPENDS=	gctpc.1:${PORTSDIR}/misc/gctpc
 
 WRKSRC=		${WRKDIR}/dlgv32/ProjectionLib
 
+USES=		dos2unix
 USE_ZIP=	yes
-USE_DOS2UNIX=	*.cpp *.h
+DOS2UNIX_GLOB=	*.cpp *.h
 USE_LDCONFIG=	yes
 MAKEFILE=	${FILESDIR}/Makefile
 
diff --git a/misc/tkman/Makefile b/misc/tkman/Makefile
index 4a81bff847b..31a0bbe6141 100644
--- a/misc/tkman/Makefile
+++ b/misc/tkman/Makefile
@@ -13,8 +13,7 @@ COMMENT=	Tcl/Tk based manual browser
 RUN_DEPENDS=	glimpse:${PORTSDIR}/textproc/glimpse \
 		rman:${PORTSDIR}/textproc/rman
 
-USES+=		gmake tk
-USE_DOS2UNIX=	yes
+USES+=		gmake tk dos2unix
 MAKE_ARGS=	WISH="${WISH}" \
 		texinfodir="${PREFIX}/${INFO_PATH}" \
 		gzgrep="\"/usr/bin/zgrep -E\"" \
diff --git a/net-im/libjingle/Makefile b/net-im/libjingle/Makefile
index 875e8bb0418..fb2c8b9095b 100644
--- a/net-im/libjingle/Makefile
+++ b/net-im/libjingle/Makefile
@@ -21,11 +21,10 @@ LIB_DEPENDS=	speex:${PORTSDIR}/audio/speex \
 CONFLICTS=	krb4-[0-9]* krb5-[0-9]* heimdal-[0-9]* srp-[0-9]* \
 		clusterit-[0-9]* pcp-[0-9]* synce-librapi2-[0-9]*
 
-USES=		pkgconfig
-USE_DOS2UNIX=	README
+USES=		pkgconfig dos2unix gmake
+DOS2UNIX_FILES=	README
 USE_GNOME=	glib20
 USE_OPENSSL=	yes
-USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ENV=	EXPAT_CFLAGS="-I${LOCALBASE}/include" \
 		EXPAT_LIBS="-L${LOCALBASE}/lib -lexpat" \
diff --git a/net-im/ramblercontacts/Makefile b/net-im/ramblercontacts/Makefile
index e67c0794e64..050367a5561 100644
--- a/net-im/ramblercontacts/Makefile
+++ b/net-im/ramblercontacts/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Free, multi-service communication client from Rambler
 
 LICENSE=	GPLv3
 
-USES=		qmake
-USE_DOS2UNIX=	config.inc
+USES=		qmake dos2unix
+DOS2UNIX_FILES=	config.inc
 USE_XORG=	xscrnsaver
 USE_QT4=	qmake_build moc_build rcc_build uic_build designer_build \
 		webkit
diff --git a/net-mgmt/phpip/Makefile b/net-mgmt/phpip/Makefile
index 78af53d4764..5f6e56ce050 100644
--- a/net-mgmt/phpip/Makefile
+++ b/net-mgmt/phpip/Makefile
@@ -14,7 +14,7 @@ COMMENT=	A complete IPv4 IPAM (IP address management) suite
 SNAPSHOT=	200611081420
 NO_BUILD=	yes
 USE_PHP=	mysql
-USE_DOS2UNIX=	yes
+USES=		dos2unix
 WANT_PHP_WEB=	yes
 
 PHPIP?=		www/phpip
diff --git a/net-p2p/bittyrant/Makefile b/net-p2p/bittyrant/Makefile
index 0a8fe7a6e0d..1088d4cdd1e 100644
--- a/net-p2p/bittyrant/Makefile
+++ b/net-p2p/bittyrant/Makefile
@@ -17,8 +17,9 @@ BUILD_DEPENDS=	${JAVALIBDIR}/log4j.jar:${PORTSDIR}/devel/log4j \
 		${JAVALIBDIR}/${SWT}.jar:${PORTSDIR}/x11-toolkits/${SWT}
 RUN_DEPENDS=	${JAVALIBDIR}/${SWT}.jar:${PORTSDIR}/x11-toolkits/${SWT}
 
+USES=		dos2unix
 USE_ZIP=	yes
-USE_DOS2UNIX=	build.xml \
+DOS2UNIX_FILES=	build.xml \
 		org/gudy/azureus2/ui/swt/test/PrintTransferTypes.java \
 		org/gudy/azureus2/platform/macosx/access/jnilib/OSXAccess.java
 USE_JAVA=	yes
diff --git a/net-p2p/solidcoin/Makefile b/net-p2p/solidcoin/Makefile
index 5cc33679b55..c2c6db3ae8f 100644
--- a/net-p2p/solidcoin/Makefile
+++ b/net-p2p/solidcoin/Makefile
@@ -22,14 +22,13 @@ OPTIONS_DEFAULT=	WXGTK
 
 WRKSRC=		${WRKDIR}/src
 
+USES=		gmake dos2unix
 USE_ZIP=	yes
-USE_DOS2UNIX=	yes
 USE_GNOME=	glib20
 USE_OPENSSL=	yes
 USE_BDB=	yes
 WANT_BDB_VER=	47
 USE_GCC=	any
-USE_GMAKE=	yes
 ALL_TARGET=	${BINARY}
 
 CXXFLAGS+=	-Wno-invalid-offsetof
diff --git a/net/py-impacket/Makefile b/net/py-impacket/Makefile
index fc0902f7dcd..efa9f920f27 100644
--- a/net/py-impacket/Makefile
+++ b/net/py-impacket/Makefile
@@ -18,7 +18,7 @@ LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pcapy>=0:${PORTSDIR}/net/py-pcapy \
 		${PYTHON_PKGNAMEPREFIX}pycrypto>=0:${PORTSDIR}/security/py-pycrypto
 
-USE_DOS2UNIX=	yes
+USES=		dos2unix
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
 PORTDOCS=	README
diff --git a/science/hdf-java/Makefile b/science/hdf-java/Makefile
index 506f217d454..1ad2cac7ab2 100644
--- a/science/hdf-java/Makefile
+++ b/science/hdf-java/Makefile
@@ -19,10 +19,9 @@ JAVA_VERSION=	1.6+
 JAVA_BUILD=	yes
 JAVA_RUN=	yes
 
-USE_DOS2UNIX=	yes
+USES=		dos2unix gmake
 DOS2UNIX_REGEX=	.*/examples/.*Makefile.in
 
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-jdk=${JAVA_HOME}/include,${JAVA_HOME}/jre/lib/ \
 		--with-hdf5=${LOCALBASE}/include \
diff --git a/science/py-netCDF4/Makefile b/science/py-netCDF4/Makefile
index 3027267504d..516f1a86517 100644
--- a/science/py-netCDF4/Makefile
+++ b/science/py-netCDF4/Makefile
	Commit message (Expand)	Author	Age	Files	Lines
*	Declare CONFLICTS between freedesktop.org X extension/library ports and	lofi	2004-03-25	1	-0/+2
*	Whoa there, boy, that's a mighty big commit y'all have there...	ade	2004-03-14	1	-1/+1
*	Bump PORTREVISION on all ports that depend on gettext to aid with upgrading.	marcus	2004-02-04	1	-0/+1
*	Update to 0.1.1	anholt	2004-01-25	1	-5/+4
*	New port: Prerelease version of libXau from freedesktop.org:	anholt	2003-12-22	1	-0/+29