7 files changed, 12 insertions, 13 deletions

diff --git a/devel/ireport/Makefile b/devel/ireport/Makefile
index 807f5b9919db..dc54276cc600 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 f59737485e09..103c9ce80653 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 0657c315a0fa..176670e0252a 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 b3352873a696..25ce2bd4b221 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 1f5ccee83af5..a51201f07879 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 9a6e63288707..fcfd9f5a6405 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 245fd4010200..2be3c61b76d0 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}