7 files changed, 102 insertions, 141 deletions

diff --git a/ftp/axel/Makefile b/ftp/axel/Makefile
index 73867c22f02f..ee3300825d59 100644
--- a/ftp/axel/Makefile
+++ b/ftp/axel/Makefile
@@ -1,10 +1,5 @@
-# ex:ts=8
-# New ports collection makefile for:	axel
-# Date created:			Jul 23, 2001
-# Whom:				ijliao
-#
+# Created by: ijliao
 # $FreeBSD$
-#
 
 PORTNAME=	axel
 PORTVERSION=	2.4
@@ -21,12 +16,11 @@ USE_GMAKE=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} --mandir=${MANPREFIX}/man
 
-OPTIONS=	NLS	"I18N support"		on	\
-		DEBUG	"Debugging support"	off
+OPTIONS_DEFINE=	NLS DEBUG
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
 USE_ICONV=	yes
 PLIST_SUB+=	NLS=""
@@ -36,7 +30,7 @@ PLIST_SUB+=	NLS="@comment "
 CONFIGURE_ARGS+=--i18n=0
 .endif
 
-.if defined(WITH_DEBUG)
+.if ${PORT_OPTIONS:MDEBUG}
 CONFIGURE_ARGS+=--debug=1 --strip=0
 .endif
 
@@ -47,4 +41,4 @@ post-configure:
 	@${REINPLACE_CMD} -e 's|gcc|${CC}|; \
 		s|-pthread|${PTHREAD_LIBS}|' ${WRKSRC}/Makefile.settings
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile
index 091eb2f89bb0..4db72a762027 100644
--- a/ftp/curl/Makefile
+++ b/ftp/curl/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	curl
-# Date created:		12 December 1998
-# Whom:			Neil Blakey-Milner <nbm@rucus.ru.ac.za>
-#
+# Created by: Neil Blakey-Milner <nbm@rucus.ru.ac.za>
 # $FreeBSD$
-#
 
 PORTNAME=	curl
 PORTVERSION=	7.24.0
@@ -18,21 +14,17 @@ COMMENT?=	Non-interactive tool to get files from FTP, GOPHER, HTTP(S) servers
 
 LICENSE=	MIT
 
-OPTIONS=	CARES "Asynchronous DNS resolution via c-ares" off \
-		CURL_DEBUG "Enable curl diagnostic output" off \
-		GNUTLS "Use GNU TLS if OPENSSL is OFF" off \
-		IPV6 "IPv6 support" on \
-		KERBEROS4 "Kerberos 4 authentication" off \
-		LDAP "LDAP support" off \
-		LDAPS "LDAPS support (requires LDAP and SSL)" off \
-		LIBIDN "Internationalized Domain Names via libidn" off \
-		LIBSSH2 "SCP/SFTP support via libssh2" off \
-		NTLM "NTLM authentication" off \
-		OPENSSL "OpenSSL support" on \
-		CA_BUNDLE "Install CA bundle for OpenSSL" on \
-		PROXY "Proxy support" on \
-		RTMP "RTMP streams support" off \
-		TRACKMEMORY "Enable curl memory diagnostic output" off
+OPTIONS_DEFINE=	CARES CURL_DEBUG IPV6 KERBEROS4 LDAP LDAPS LIBIDN LIBSSH2 \
+		NTLM CA_BUNDLE PROXY RTMP TRACKMEMORY DOCS EXAMPLES
+OPTIONS_RADIO=	SSL
+OPTIONS_RADIO_SSL=	OPENSSL GNUTLS
+OPTIONS_DEFAULT=	CA_BUNDLE PROXY OPENSSL
+CURL_DEBUG_DESC=	curl diagnostic output
+LIBIDN_DESC=		Internationalized Domain Names via libidn
+LIBSSH2_DESC=		SCP/SFTP support via libssh2
+NTLM_DESC=		NTLM authentication
+CA_BUNDLE_DESC=		Install CA bundle for OpenSSL
+TRACKMEMORY_DESC=	curl memory diagnostic output
 
 CONFIGURE_ARGS+=--disable-threaded-resolver --disable-werror \
 		--enable-imap --enable-pop3 --enable-rtsp --enable-smtp
@@ -79,32 +71,28 @@ SHLIB_VER=	6
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_GNUTLS) && defined(WITH_OPENSSL)
-IGNORE=		may only use GNU TLS if OpenSSL support is disabled
-.endif
-
-.if defined(WITH_LIBSSH2) && !defined(WITH_OPENSSL)
+.if ${PORT_OPTIONS:MLIBSSH2} && ! ${PORT_OPTIONS:MOPENSSL}
 IGNORE=		only supports LIBSSH2 with OpenSSL
 .endif
 
-.if defined(WITH_NTLM) && !defined(WITH_OPENSSL)
+.if ${PORT_OPTIONS:MNTLM} && ! ${PORT_OPTIONS:MOPENSSL}
 IGNORE=		only supports NTLM with OpenSSL
 .endif
 
-.if defined(WITH_LDAPS)
-.if !defined(WITH_LDAP)
+.if ${PORT_OPTIONS:MLDAPS}
+.if ! ${PORT_OPTIONS:MLDAP}
 IGNORE=		only supports LDAPS with LDAP
 .else
-.if !defined(WITH_OPENSSL) && !defined(WITH_GNUTLS)
+.if ! ${PORT_OPTIONS:MOPENSSL} && ! ${PORT_OPTIONS:MGNUTLS}
 IGNORE=		only supports LDAPS with SSL (OpenSSL or GNUTLS)
 .endif
 .endif
 .endif
 
-.if !defined(WITHOUT_OPENSSL)
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
+.if ${PORT_OPTIONS:MOPENSSL}
+USE_OPENSSL=	yes
 CONFIGURE_ARGS+=	--with-ssl=${OPENSSLBASE}
-.if !defined(WITHOUT_CA_BUNDLE)
+.if ${PORT_OPTIONS:MCA_BUNDLE}
 RUN_DEPENDS+=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
 CONFIGURE_ARGS+=	--with-ca-bundle=${LOCALBASE}/share/certs/ca-root-nss.crt
 .else
@@ -112,49 +100,49 @@ CONFIGURE_ARGS+=	--without-ca-bundle
 .endif
 .else
 CONFIGURE_ARGS+=	--without-ssl
-.if defined(WITH_CA_BUNDLE)
+.if ${PORT_OPTIONS:MCA_BUNDLE}
 IGNORE=			only supports CA bundle with OpenSSL
 .endif
 .endif
 
-.if defined(WITH_CARES)
+.if ${PORT_OPTIONS:MCARES}
 LIB_DEPENDS+=	cares.2:${PORTSDIR}/dns/c-ares
 CONFIGURE_ARGS+=	--enable-ares=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=	--disable-ares
 .endif
 
-.if defined(WITH_GNUTLS)
+.if ${PORT_OPTIONS:MGNUTLS}
 LIB_DEPENDS+=	gnutls:${PORTSDIR}/security/gnutls
 CONFIGURE_ARGS+=--with-gnutls=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=--without-gnutls
 .endif
 
-.if defined(WITH_OPENSSL) || defined(WITH_GNUTLS)
+.if ${PORT_OPTIONS:MOPENSSL} || ${PORT_OPTIONS:MGNUTLS}
 PLIST_SUB+=	SSL=""
 .else
 PLIST_SUB+=	SSL="@comment "
 .endif
 
-.if defined(WITH_IPV6)
+.if ${PORT_OPTIONS:MIPV6}
 CONFIGURE_ARGS+=	--enable-ipv6
 .else
 CONFIGURE_ARGS+=	--disable-ipv6
 .endif
 
-.if exists(/usr/lib/libkrb.a) && defined(WITH_KERBEROS4)
+.if exists(/usr/lib/libkrb.a) && ${PORT_OPTIONS:MKERBEROS4}
 CONFIGURE_ARGS += --with-krb4=/usr
 .else
 CONFIGURE_ARGS += --without-krb4
 .endif
 
-.if defined(WITH_LDAP)
+.if ${PORT_OPTIONS:MLDAP}
 CONFIGURE_ARGS+=	--enable-ldap
 USE_OPENLDAP=	yes
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-.if defined(WITH_LDAPS)
+.if ${PORT_OPTIONS:MLDAPS}
 CONFIGURE_ARGS+=	--enable-ldaps
 .else
 CONFIGURE_ARGS+=	--disable-ldaps
@@ -163,44 +151,44 @@ CONFIGURE_ARGS+=	--disable-ldaps
 CONFIGURE_ARGS+=	--disable-ldap --disable-ldaps
 .endif
 
-.if defined(WITH_LIBIDN)
+.if ${PORT_OPTIONS:MLIBIDN}
 LIB_DEPENDS+=	idn.17:${PORTSDIR}/dns/libidn
 CONFIGURE_ARGS+=	--with-libidn=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=	--without-libidn
 .endif
 
-.if defined(WITH_LIBSSH2)
+.if ${PORT_OPTIONS:MLIBSSH2}
 LIB_DEPENDS+=	ssh2.1:${PORTSDIR}/security/libssh2
 CONFIGURE_ARGS+=	--with-libssh2=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=	--without-libssh2
 .endif
 
-.if defined(WITH_CURL_DEBUG)
+.if ${PORT_OPTIONS:MCURL_DEBUG}
 CONFIGURE_ARGS+=	--enable-debug
 .endif
 
-.if defined(WITH_RTMP)
+.if ${PORT_OPTIONS:MRTMP}
 LIB_DEPENDS+=	rtmp.0:${PORTSDIR}/multimedia/rtmpdump
 CONFIGURE_ARGS+=	--with-librtmp=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=	--without-librtmp
 .endif
 
-.if defined(WITH_TRACKMEMORY)
+.if ${PORT_OPTIONS:MTRACKMEMORY}
 CONFIGURE_ARGS+=	--enable-curldebug
 .else
 CONFIGURE_ARGS+=	--disable-curldebug
 .endif
 
-.if defined(WITH_NTLM)
+.if ${PORT_OPTIONS:MNTLM}
 CONFIGURE_ARGS+=	--enable-ntlm
 .else
 CONFIGURE_ARGS+=	--disable-ntlm
 .endif
 
-.if !defined(WITHOUT_PROXY)
+.if ${PORT_OPTIONS:MPROXY}
 CONFIGURE_ARGS+=	--enable-proxy
 .else
 CONFIGURE_ARGS+=	--disable-proxy
@@ -213,12 +201,12 @@ post-patch:
 post-install:
 .if !defined(BUILDING_HIPHOP)
 	${INSTALL_DATA} ${WRKSRC}/docs/libcurl/libcurl.m4 ${PREFIX}/share/aclocal
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}/ ${DOCSDIR}/libcurl/
 	cd ${WRKSRC}/docs/ && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}/
 	cd ${WRKSRC}/docs/libcurl/ && ${INSTALL_DATA} ABI *.html *.pdf *.m4 ${DOCSDIR}/libcurl/
 .endif
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 	${MKDIR} ${EXAMPLESDIR}/
 	cd ${WRKSRC}/docs/examples/ && ${INSTALL_DATA} README Makefile.example makefile* *.c *.cc ${EXAMPLESDIR}/
 .endif
@@ -227,7 +215,7 @@ post-install:
 # Setting LC_ALL=C is a kludge; maybe curl/libcurl shouldn't actually use
 # the user's locale when dates are sent to the server.
 test:	build
-.if defined(WITHOUT_PROXY)
+.if ! ${PORT_OPTIONS:MPROXY}
 	@${ECHO_MSG} "******************************************"
 	@${ECHO_MSG} "* You have disabled curl proxy support.  *"
 	@${ECHO_MSG} "* Some tests SHALL FAIL!                 *"
diff --git a/ftp/gftp/Makefile b/ftp/gftp/Makefile
index 80f2c69ca09f..6b531fc1804c 100644
--- a/ftp/gftp/Makefile
+++ b/ftp/gftp/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	gftp
-# Date Created:		21 Feb 1999
-# Whom:			Damjan Marion <dmarion@open.hr>
-#
+# Created by: Damjan Marion <dmarion@open.hr>
 # $FreeBSD$
-#
 
 PORTNAME=	gftp
 PORTVERSION=	2.0.19
@@ -24,32 +20,32 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 
 WANT_GNOME=	yes
 
-OPTIONS=	X11	"Build with X11 frontend"			on \
-		NLS	"Native Language Support via gettext utilities"	on
+OPTIONS_DEFINE=	X11 NLS
+OPTIONS_DEFAULT=	X11
 
-.if !defined(WITHOUT_X11)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MX11}
 USE_XORG=	x11
 .endif
 
-.include <bsd.port.pre.mk>
-
-USE_GNOME+=	gnomehack
+USES=	pathfix
 
-.if defined(WITHOUT_X11)
-CONFIGURE_ARGS+=--disable-gtkport
-PKGNAMESUFFIX=	-nox11
-USE_GNOME+=	glib20
-PLIST_SUB+=	NOX11:="@comment "
-.else
+.if ${PORT_OPTIONS:MX11}
 PLIST_SUB+=	NOX11:=""
 WANT_GNOME=	yes
 USE_GNOME+=	gtk20
 CONFIGURE_ENV+=	_GTHREAD_LIBS="-lgthread-2.0"
+.else
+CONFIGURE_ARGS+=--disable-gtkport
+PKGNAMESUFFIX=	-nox11
+USE_GNOME+=	glib20
+PLIST_SUB+=	NOX11:="@comment "
 .endif
 
 MAN1=		gftp.1
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
 .else
@@ -57,7 +53,9 @@ CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-.if ${HAVE_GNOME:Mgnomelibs}!="" && !defined(WITH_GTK2)
+.include <bsd.port.pre.mk>
+
+.if ${HAVE_GNOME:Mgnomelibs}!="" && ! ${PORT_OPTIONS:MGTK2}
 USE_GNOME+=	gnomeprefix gnomelibs
 PKGNAMESUFFIX+=	-gnome
 PLIST_SUB+=	MYGNOME=""
@@ -73,7 +71,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|size_t dest_len|size_t *dest_len|g ; \
 		s|\(gftp_filename_from_utf8 (gftp_request \* request,\) int force_local,|\1|' \
 		${WRKSRC}/lib/charset-conv.c
-.if defined(WITHOUT_X11)
+.if ! ${PORT_OPTIONS:MX11}
 	@${REINPLACE_CMD} -e 's|: install-pkgdataDATA|: |' \
 		${WRKSRC}/docs/sample.gftp/Makefile.in
 .endif
diff --git a/ftp/spegla/Makefile b/ftp/spegla/Makefile
index c2c0fb10a21d..d239395bb5d5 100644
--- a/ftp/spegla/Makefile
+++ b/ftp/spegla/Makefile
@@ -1,10 +1,5 @@
-# ex:ts=8
-# New ports collection makefile for:    spegla
-# Date created:         Sun Apr 19 16:17:25 PDT 1998
-# Whom:                 Jordan Hubbard <jkh@FreeBSD.org>
-#
+# Created by: Jordan Hubbard <jkh@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	spegla
 PORTVERSION=	1.1p4
@@ -26,9 +21,11 @@ PORTEXAMPLES=	freebsd.org spegla.conf spegla.sh
 MANCOMPRESSED=	yes
 MAN1=		spegla.1
 
-OPTIONS=	IPV6	"IPv6 support"	on
+OPTIONS_DEFINE=	IPV6 NLS
 
-.if !defined(NOPORTEXAMPLES)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNLS}
 post-install:
 	${MKDIR} ${EXAMPLESDIR}
 	cd ${WRKSRC} && \
@@ -36,10 +33,8 @@ post-install:
 		${INSTALL_SCRIPT} spegla.sh ${EXAMPLESDIR}
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if !defined(WITHOUT_IPV6)
+.if ${PORT_OPTIONS:MIPV6}
 MAKE_ARGS+=	-DINET6
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/ftp/vsftpd-ext/Makefile b/ftp/vsftpd-ext/Makefile
index 9aae1023b9a9..0422b41297c7 100644
--- a/ftp/vsftpd-ext/Makefile
+++ b/ftp/vsftpd-ext/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: vsftpd-ext
-# Date created:		11 Mar 2009
-# Whom:			Maxim Ignatenko
-#
+# Created by: Maxim Ignatenko
 # $FreeBSD$
-#
 
 PORTNAME=	vsftpd-ext
 PORTVERSION=	${UPSTREAMVERSION}.${EXTVERSION}
@@ -15,7 +11,7 @@ DISTNAME=	vsFTPd-${UPSTREAMVERSION}-ext${EXTVERSION}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	gelraen.ua@gmail.com
-COMMENT=	A FTP daemon that aims to be "very secure". Extended build
+COMMENT=	FTP daemon that aims to be "very secure". Extended build
 
 CONFLICTS=	vsftpd-2* vsftpd${SSL_SUFFIX}${PKGNAMESUFFIX2}-2*
 
@@ -30,20 +26,18 @@ DOCFILES=	AUDIT BENCHMARKS BUGS Changelog FAQ INSTALL LICENSE \
 		README README.security README.ssl REFS REWARD \
 		SIZE SPEED TODO TUNING
 
-OPTIONS=	RC_SCRIPT	"install RC_SCRIPT"		on \
-		VSFTPD_SSL	"Include support for SSL"	off
+OPTIONS_DEFINE=	RC_SCRIPT SSL DOCS
+OPTIONS_DEFAULTL=	RC_SCRIPT
+RC_SCRIPT_DESC=	install RC_SCRIPT
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_RC_SCRIPT)
+.if ${PORT_OPTIONS:MRC_SCRIPT}
 USE_RC_SUBR=	vsftpd
 .endif
 
-.if defined(WITH_VSFTPD_SSL) && !defined(WITHOUT_SSL)
-.if ${OSVERSION} < 700000
-WITH_OPENSSL_PORT=	yes
-.endif
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
+.if ${PORT_OPTIONS:MSSL}
+USE_OPENSSL=	yes
 SSL_SUFFIX=	-ssl
 CFLAGS+=	-I${OPENSSLINC}
 LDFLAGS+=	-L${OPENSSLLIB}
@@ -73,7 +67,7 @@ do-configure:
 		-e 's|delay_failed_logins|delay_failed_login|' \
 		-e 's|delay_successful_logins|delay_successful_login|' \
 		${WRKSRC}/vsftpd.8 ${WRKSRC}/vsftpd.conf.5 ${WRKSRC}/tunables.c
-.if !defined(WITHOUT_SSL) && defined(WITH_VSFTPD_SSL)
+.if ${PORT_OPTIONS:MSSL}
 	${REINPLACE_CMD} -e \
 		"s|#undef VSF_BUILD_SSL|#define VSF_BUILD_SSL 1|" \
 		${WRKSRC}/builddefs.h
@@ -97,7 +91,7 @@ do-install:
 		${INSTALL_MAN} -m 644 ${WRKSRC}/$${i} ${MANPREFIX}/man/man5/ ; \
 		done
 	${MKDIR} /var/ftp
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 .for i in ${DOCFILES}
 	${INSTALL_DATA} -m 644 ${WRKSRC}/${i} ${DOCSDIR}
@@ -109,4 +103,4 @@ do-install:
 .endfor
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/ftp/wget/Makefile b/ftp/wget/Makefile
index 26aa27bac071..626468661dd7 100644
--- a/ftp/wget/Makefile
+++ b/ftp/wget/Makefile
@@ -17,23 +17,19 @@ USE_PERL5_BUILD=yes
 GNU_CONFIGURE=	yes
 MAKE_JOBS_SAFE=	yes
 
-OPTIONS=	GNUTLS "Support for SSL via GnuTLS" Off \
-		IPV6 "Support for IPv6" On \
-		NLS "Native Language Support with gettext" On \
-		OPENSSL "Support for SSL via OpenSSL" On \
-		IDN "Support IDN (Internationalized Domain Names)" On
+OPTIONS_RADIO=	SSL
+OPTIONS_RADIO_SSL=	GNUTLS OPENSSL
+OPTIONS_DEFINE=	IPV6 NLS IDN
+OPTIONs_DEFAULT=	OPENSSL IDN
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_OPENSSL)
-.if !defined(WITHOUT_GNUTLS)
-IGNORE=		GNUTLS and OPENSSL are mutually exclusive, enable at most one of them
-.endif
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
+.if ${PORT_OPTIONS:MOPENSSL}
+USE_OPENSSL=	yes
 CONFIGURE_ARGS+=--with-ssl=openssl
 CPPFLAGS+=	-I${OPENSSLINC}
 LDFLAGS+=	-L${OPENSSLLIB}
-.elif !defined(WITHOUT_GNUTLS)
+.elif ${PORT_OPTIONS:MGNUTLS}
 LIB_DEPENDS+=	gnutls:${PORTSDIR}/security/gnutls
 CONFIGURE_ARGS+=--with-ssl=gnutls
 CPPFLAGS+=	-I${LOCALBASE}/include
@@ -42,13 +38,13 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS+=--without-ssl
 .endif
 
-.if !defined(WITHOUT_IPV6)
+.if ${PORT_OPTIONS:MIPV6}
 CONFIGURE_ARGS+=--enable-ipv6
 .else
 CONFIGURE_ARGS+=--disable-ipv6
 .endif
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
 CONFIGURE_ARGS+=--enable-nls
 CPPFLAGS+=	-I${LOCALBASE}/include
@@ -59,7 +55,7 @@ CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB=	NLS="@comment "
 .endif
 
-.if !defined(WITHOUT_IDN)
+.if ${PORT_OPTIONS:MIDN}
 LIB_DEPENDS+=	idn:${PORTSDIR}/dns/libidn
 CONFIGURE_ARGS+=--enable-iri --with-libidn=${LOCALBASE}
 .else
@@ -77,4 +73,4 @@ post-patch:
 			 -e 's,@file{},@file{${PREFIX}},' \
 		${WRKSRC}/doc/sample.wgetrc* ${WRKSRC}/doc/wget.texi
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/ftp/wput/Makefile b/ftp/wput/Makefile
index d0f60eaabf85..e2b3eef8fdc1 100644
--- a/ftp/wput/Makefile
+++ b/ftp/wput/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	wput
-# Date created:				2 December 2003
-# Whom:					Nosov Artem <chip-set@mail.ru>
-#
+# Created by: Nosov Artem <chip-set@mail.ru>
 # $FreeBSD$
-#
 
 PORTNAME=	wput
 PORTVERSION=	0.6.2
@@ -24,21 +20,21 @@ CONFIGURE_ENV=	LIBS="${LDFLAGS}"
 CFLAGS+=	-I${LOCALBASE}/include
 MAKE_JOBS_UNSAFE=yes
 
-OPTIONS=	TLS "Enable TLS support" On \
-		NLS "Native Language Support with gettext" On
+OPTIONS_DEFINE=	TLS NLS DOCS EXAMPLES
+OPTIONS_DEFAULT=	TLS
 
 MAN1=		wdel.1 wput.1
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_TLS)
+.if ${PORT_OPTIONS:MTLS}
 LIB_DEPENDS+=	gnutls.26:${PORTSDIR}/security/gnutls
 CONFIGURE_ARGS+=	--with-ssl
 .else
 CONFIGURE_ARGS+=	--without-ssl
 .endif
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_ICONV=	yes
 USE_GETTEXT=	yes
 CONFIGURE_ARGS+=	--enable-nls \
@@ -58,14 +54,14 @@ pre-configure:
 post-install:
 	@${INSTALL_MAN}	${MAN1:S,^,${WRKSRC}/doc/,} ${MANPREFIX}/man/man1/
 
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${INSTALL} -d ${DOCSDIR}
 	@${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}
 .endif
 
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 	@${INSTALL} -d ${EXAMPLESDIR}
 	@${INSTALL_DATA} ${PORTEXAMPLES:S,^,${WRKSRC}/doc/,} ${EXAMPLESDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>