Index: head/audio/mp3gain/Makefile
===================================================================
--- head/audio/mp3gain/Makefile	(revision 338974)
+++ head/audio/mp3gain/Makefile	(revision 338975)
@@ -1,26 +1,26 @@
 # Created by: Simon 'corecode' Schubert <corecode@corecode.ath.cx>
 # $FreeBSD$
 
 PORTNAME=	mp3gain
 PORTVERSION=	1.5.2
 CATEGORIES=	audio
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-${PORTVERSION:C/\./_/g}-src
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Tool to normalize the gain of MP3 files
 
 LICENSE=	LGPL21
 
 USES=		uidfix
 
 USE_ZIP=	yes
-USE_DOS2UNIX=	yes
+USES=		dos2unix
 NO_WRKSUBDIR=	yes
 PLIST_FILES=	bin/mp3gain
 
 post-patch:
 	@${CP} ${FILESDIR}/Makefile.main ${WRKSRC}/Makefile
 	@${CP} ${FILESDIR}/Makefile.lib ${WRKSRC}/mpglibDBL/Makefile
 
 .include <bsd.port.mk>
Index: head/irc/xchat-fish/Makefile
===================================================================
--- head/irc/xchat-fish/Makefile	(revision 338974)
+++ head/irc/xchat-fish/Makefile	(revision 338975)
@@ -1,47 +1,47 @@
 # Created by: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
 # $FreeBSD$
 #    $MCom: ports/irc/xchat-fish/Makefile,v 1.1 2006/10/04 22:30:07 ahze Exp $
 
 PORTNAME=	fish
 DISTVERSION=	0.98
 PORTREVISION=	4
 CATEGORIES=	irc security
 MASTER_SITES=	http://wirehack7.opsys.de/FiSH/xchat/ \
 		ftp://ftp.dinoex.de/pub/FreeBSD/distfiles/
 PKGNAMEPREFIX=	xchat-
 DISTNAME=	FiSH-XChat.v${DISTVERSION}-source
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	An encryption plugin for XChat
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libmiracl.a:${PORTSDIR}/math/miracl
 RUN_DEPENDS=	xchat:${PORTSDIR}/irc/xchat
 
 USE_ZIP=	yes
+USES=		dos2unix
 NO_WRKSUBDIR=	yes
-USE_DOS2UNIX=	yes
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 CCFLAGS+=	-Wall -O2 -I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_ENV+=	CCFLAGS="${CCFLAGS}"
 
 PLIST_FILES=	lib/xchat/plugins/xfish.so
 PORTDOCS=	FiSH-xchat.txt \
 		FiSH-xchat_History.txt
 
 .include <bsd.port.options.mk>
 
 post-patch:
 	${RM} -f ${WRKSRC}/mir*
 	${CP} -pf ${FILESDIR}/Makefile ${WRKSRC}/
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/xchat/plugins
 	${INSTALL_PROGRAM} ${WRKSRC}/xfish.so \
 		${STAGEDIR}${PREFIX}/lib/xchat/plugins/
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/
 .endif
 
 .include <bsd.port.mk>
Index: head/irc/xchat-mircryption/Makefile
===================================================================
--- head/irc/xchat-mircryption/Makefile	(revision 338974)
+++ head/irc/xchat-mircryption/Makefile	(revision 338975)
@@ -1,62 +1,62 @@
 # Created by: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
 # $FreeBSD$
 #    $MCom: ports/irc/xchat-mircryption/Makefile,v 1.2 2006/10/10 20:22:11 mezz Exp $
 
 PORTNAME=	mircryption
 DISTVERSION=	0.3.3
 PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	irc security
 MASTER_SITES=	http://mircryption.sourceforge.net/Downloads/
 PKGNAMEPREFIX=	xchat-
 DISTNAME=	mircryption_xchatsrc
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	A free encryption add-on for the popular XChat irc client
 
 RUN_DEPENDS=	xchat:${PORTSDIR}/irc/xchat
 
 USE_ZIP=	yes
-USE_DOS2UNIX=	yes
+USES=		dos2unix
 ALL_TARGET=	freebsd
 CFLAGS+=	-fPIC
 USE_LDCONFIG=	yes
 
 WRKSRC=		${WRKDIR}/src/xchat/
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 EXAMPLESDIR=	${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
 
 PLIST_FILES=	lib/xchat/plugins/mircryption.so
 
 PORTDOCS=	README.txt
 PORTEXAMPLES=	mcps_masterkey_on_start.pl
 
 .include <bsd.port.options.mk>
 
 post-patch:
 	${REINPLACE_CMD} -E \
 		-e 's|^(CFLAGS.+)"$$|\1 ${CFLAGS}"|' \
 		-e 's|^(LDFLAGS.+)"$$|\1 ${LDFLAGS}"|' \
 		-e 's|^(LOAD).*$$|LOAD=${CXX}|' \
 		${WRKSRC}/${MAKEFILE}
 	${REINPLACE_CMD} -E \
 		-e 's|/usr/bin/perl|${PERL5}|' \
 		${WRKSRC}/extras/mcps_masterkey_on_start.pl
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/xchat/plugins
 	${INSTALL_PROGRAM} ${WRKSRC}/mircryption.so \
 		${STAGEDIR}${PREFIX}/lib/xchat/plugins
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.txt \
 		${STAGEDIR}${DOCSDIR}/
 .endif
 .if ${PORT_OPTIONS:MEXAMPLES}
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_SCRIPT} \
 		${WRKSRC}/extras/mcps_masterkey_on_start.pl \
 		${STAGEDIR}${EXAMPLESDIR}/
 .endif
 
 .include <bsd.port.mk>