--- Makefile.original   2012-10-31 17:12:38.000000000 +0800
+++ Makefile    2012-11-11 14:27:08.000000000 +0800
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   nuttcp
-# Date Created:                                17 Jul 2009
-# Whom:                                        Andy Clark <andrewclarkii@gmail.com>
-#
-# $FreeBSD: ports/benchmarks/nuttcp/Makefile,v 1.2 2009/11/10 06:47:19 linimon Exp $
-#
+# Created by:                                  Andy Clark <andrewclarkii@gmail.com>
+# $FreeBSD$
 
 PORTNAME=      nuttcp
 PORTVERSION=   6.1.2
@@ -26,11 +22,14 @@
 NUTTSCPVERSION=        1.7
 NUTTSCPDISTFILE=nuttscp-${NUTTSCPVERSION}
 
-OPTIONS=       NUTTSCP "Install script for copying files over nuttcp" on
+OPTIONS_DEFINE=        NUTTSCP
+OPTIONS_DEFAULT=       NUTTSCP
+
+NUTTSCP_DESC=  Install script for copying files over nuttcp
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_NUTTSCP)
+.if ${PORT_OPTIONS:MNUTTSCP}
 USE_PERL5=     yes
 PLIST_SUB+=    NUTTSCP=""
 .else
@@ -46,7 +45,7 @@
        ${REINPLACE_CMD} 's|/usr/bin/perl|${PERL}|g' ${WRKDIR}/nuttscp
 
 do-install:
-.      if defined(WITH_NUTTSCP)
+.      if ${PORT_OPTIONS:MNUTTSCP}
                ${INSTALL_SCRIPT} ${WRKDIR}/nuttscp ${PREFIX}/bin/
                ( cd ${PREFIX}/bin; ${LN} -sf nuttscp nuttrcp )
 .      endif
@@ -55,13 +54,13 @@
        ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.8 ${MAN8PREFIX}/man/man8/
 
        ${MKDIR} ${DATADIR}/
-.      for file in LICENSE README examples.txt
-               ${INSTALL_DATA} ${WRKSRC}/${file} ${DATADIR}/
+.      for ${FILE} in LICENSE README examples.txt
+               ${INSTALL_DATA} ${WRKSRC}/${FILE} ${DATADIR}/
 .      endfor
 
        ${MKDIR} ${PREFIX}/etc/xinetd.d/
-.      for file in ${PORTNAME} ${PORTNAME}4 ${PORTNAME}6
-               ${INSTALL_DATA} ${WRKSRC}/xinetd.d/${file} \
+.      for i${FILE} in ${PORTNAME} ${PORTNAME}4 ${PORTNAME}6
+               ${INSTALL_DATA} ${WRKSRC}/xinetd.d/${FILE} \
                        ${PREFIX}/etc/xinetd.d/
 .      endfor
end