10 files changed, 198 insertions, 259 deletions

diff --git a/irc/epic4/Makefile b/irc/epic4/Makefile
index 7b1e35727b52..8100e7966a52 100644
--- a/irc/epic4/Makefile
+++ b/irc/epic4/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: 	epic4
-# Date created:		11 November 1998
-# Whom:			Ben Hutchinson <benhutch@xfiles.org.uk>
-#
+# Created by: Ben Hutchinson <benhutch@xfiles.org.uk>
 # $FreeBSD$
-#
 
 PORTNAME=	epic4
 PORTVERSION=	2.10.1
@@ -31,54 +27,44 @@ USE_BZIP2=	yes
 WANT_PERL=	yes
 CFLAGS:=	${CFLAGS:C/-O2/-g -O/g}
 
-OPTIONS=	IPV6	"IPv6 support"		on \
-		TCL	"TCL support"		on \
-		PERL    "Perl scripting support" on \
-		SSL     "Enable SSL support" on \
-		TERMCAP	"Refuse to use terminfo/ncurses" off
+OPTIONS_DEFINE=	IPV6 TCL PERL SSL TERMCAP DOCS
+OPTIONS_DEFAULT=	TCL PERL SSL
+TERMCAP_DESC=	Refuse to use terminfo/ncurses
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-##  WITHOUT_IPV6:   disable IPv6 support
-#
-.if defined(WITHOUT_IPV6)
+.if ! ${PORT_OPTIONS:MIPV6}
 CONFIGURE_ARGS+=	--without-ipv6
 .endif
 
-##  WITH_TCL:       enable Tcl support
-#
-.if !defined(WITHOUT_TCL)
+.if ${PORT_OPTIONS:MTCL}
 LIB_DEPENDS+=		tcl84:${PORTSDIR}/lang/tcl84
 CONFIGURE_ARGS+=	--with-tcl
 .else
 CONFIGURE_ARGS+=	--without-tcl
 .endif
 
-##  WITH_PERL:      enable perl5 support (requires perl 5.6.1 or newer)
+#  enable perl5 support (requires perl 5.6.1 or newer)
 #
 # The path provided to --with-perl is needed, since the configure script
 # looks for libperl.so in places very specific to Linux.  Possibly a
 # patch to configure would be a better idea, but we need to rely on
 # SITE_PERL and PERL_VERSION to create the path.
 #
-.if defined(WITH_PERL)
+.if ${PORT_OPTIONS:MPERL}
 USE_PERL5=	yes
 CONFIGURE_ARGS+=	--with-perl=${SITE_PERL}/../../${PERL_VERSION}/mach/CORE
 .else
 CONFIGURE_ARGS+=	--without-perl
 .endif
 
-## WITH_SSL            enable SSL support
-#
-.if defined(WITH_SSL)
+.if ${PORT_OPTIONS:MSSL}
 CONFIGURE_ARGS+=	--with-ssl
 .else
 CONFIGURE_ARGS+=	--without-ssl
 .endif
 
-## WITH_TERMCAP                forceably refuse to use terminfo/ncurses
-#
-.if defined(WITH_TERMCAP)
+.if ${PORT_OPTIONS:MTERMCAP}
 CONFIGURE_ARGS+=	--with-termcap
 .endif
 
@@ -90,7 +76,7 @@ post-patch:
 
 post-install:
 	@${CP} -R ${WRKDIR}/help/* ${PREFIX}/share/epic/help
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 .for i in BUG_FORM COPYRIGHT KNOWNBUGS README UPDATES VOTES
 	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
@@ -98,4 +84,4 @@ post-install:
 	${CAT} ${PKGMESSAGE}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/irc/epic5/Makefile b/irc/epic5/Makefile
index 24b4c0367f44..b4fa28ce8820 100644
--- a/irc/epic5/Makefile
+++ b/irc/epic5/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   epic5
-# Date created:                24 February 2005
-# Whom:                        Josh Paetzel <josh@tcbug.org>
-#
+# Created by: Josh Paetzel <josh@tcbug.org>
 # $FreeBSD$
-#
 
 PORTNAME=	epic5
 PORTVERSION=	1.1.5
@@ -29,52 +25,41 @@ USE_BZIP2=	yes
 WANT_PERL=	yes
 CFLAGS:=	${CFLAGS:C/-O2/-g -O/g}
 
-OPTIONS=	IPV6	"IPv6 support"		on \
-		TCL	"TCL support"		on \
-		PERL	"Perl scripting support" on \
-		RUBY	"Ruby scripting support" on \
-		TERMCAP	"Refuse to use terminfo/ncurses" off
+OPTIONS_DEFINE=	IPV6 TCL PERL SSL TERMCAP DOCS RUBY
+OPTIONS_DEFAULT=	TCL PERL SSL RUBY
+TERMCAP_DESC=	Refuse to use terminfo/ncurses
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-##  WITHOUT_IPV6:   disable IPv6 support
-#
-.if defined(WITHOUT_IPV6)
+.if ! ${PORT_OPTIONS:MIPV6}
 CONFIGURE_ARGS+=	--without-ipv6
 .endif
 
-##  WITHOUT_TCL:    disable Tcl support
-#
-.if !defined(WITHOUT_TCL)
+.if ${PORT_OPTIONS:MTCL}
 LIB_DEPENDS+=		tcl84:${PORTSDIR}/lang/tcl84
 CONFIGURE_ARGS+=	--with-tcl
 .else
 CONFIGURE_ARGS+=	--without-tcl
 .endif
 
-##  WITH_PERL:      enable perl5 support (requires perl 5.6.1 or newer)
+#  enable perl5 support (requires perl 5.6.1 or newer)
 #
-.if defined(WITH_PERL)
+.if ${PORT_OPTIONS:MPERL}
 USE_PERL5=	yes
 CONFIGURE_ARGS+=	--with-perl
 .else
 CONFIGURE_ARGS+=	--without-perl
 .endif
 
-## WITH_RUBY:	enable ruby scripting support
-#
-.if defined(WITH_RUBY)
+.if ${PORT_OPTIONS:MRUBY}
 USE_RUBY=	yes
-.include "${PORTSDIR}/Mk/bsd.ruby.mk"
 CONFIGURE_ARGS+=	--with-ruby
 LDFLAGS+=	${PTHREAD_LIBS}
 .else
 CONFIGURE_ARGS+=	--without-ruby
 .endif
 
-## WITH_TERMCAP	forecably refuse to use terminfo/ncurses
-#
-.if defined(WITH_TERMCAP)
+.if ${PORT_OPTIONS:MTERMCAP}
 CONFIGURE_ARGS+=	--with-termcap
 .endif
 
@@ -85,7 +70,7 @@ post-extract:
 	@${FIND} ${WRKDIR} -type d -name CVS | ${XARGS} ${RM} -rf
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 .for i in BUG_FORM COPYRIGHT KNOWNBUGS README UPDATES VOTES
 	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
@@ -93,4 +78,4 @@ post-install:
 	@${CAT} ${PKGMESSAGE}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/irc/inspircd12/Makefile b/irc/inspircd12/Makefile
index bffa2b508506..420e18d21dbd 100644
--- a/irc/inspircd12/Makefile
+++ b/irc/inspircd12/Makefile
@@ -1,9 +1,5 @@
-# New ports collection Makefile for:   inspircd
-# Date created:        07 March 2011
-# Whom:                Maxim Ignatenko <gelraen.ua@gmail.com>
-#
+# Created by: Maxim Ignatenko <gelraen.ua@gmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	inspircd
 PORTVERSION=	1.2.9
@@ -53,35 +49,32 @@ CONFIGURE_ARGS=	--with-cc=${CXX} --config-dir=${ETCDIR}                   \
 		--disable-interactive
 MAKEFILE=	BSDmakefile
 
-OPTIONS=	LDAPMODULES    "Build m_ldap{auth,oper} modules"          off \
-		MYSQL       "Build m_mysql module"             off \
-		PGSQL       "Build m_pgsql module"             off \
-		SQLITE3     "Build m_sqlite3 module"           off \
-		SQLMODULES  "Build m_sql{log,oper,utils,auth}" off \
-		GNUTLS	    "Build m_ssl_gnutls module"        off \
-		OPENSSL     "Build m_ssl_openssl module"       on \
-		ZIPLINK     "Build m_ziplink module"           off \
-		POSIX_RE    "Build m_regex_posix module"       on \
-		PCRE        "Build m_regex_pcre module"        off \
-		TRE         "Build m_regex_tre module"         off \
-		IPV6        "Enable IPv6 support"              on
+OPTIONS_DEFINE=	LDAPMODULES MYSQL PGSQL SQLITE3 SQLMODULES GNUTLS OPENSSL \
+		ZIPLINK POSIX_RE PCRE TRE IPV6
+OPTIONS_DEFAULT=	OPENSSL POSIX_RE
+LDAPMODULES_DESC=	Build m_ldap{auth,oper} modules
+SQLMODULES_DESC=	Build m_sql{log,oper,utils,auth}
+ZIPLINK_DESC=		Build m_ziplink module
+POSIX_RE_DESC=		Build m_regex_posix module
+PCRE_DESC=		Build m_regex_pcre module
+TRE_DESC=		Build m_regex_tre module
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_IPV6) && !defined(WITHOUT_IPV6)
+.if ${PORT_OPTIONS:MIPV6}
 CONFIGURE_ARGS+=	--enable-ipv6 --enable-remote-ipv6
 .else
 CONFIGURE_ARGS+=	--disable-remote-ipv6
 .endif
 
-.if defined(WITH_POSIX_RE) && !defined(WITHOUT_POSIX_RE)
+.if ${PORT_OPTIONS:MPOSIX_RE}
 PLIST_SUB+=	POSIX_RE=""
 SYMLINK_FILES+=	m_regex_posix.cpp
 .else
 PLIST_SUB+=	POSIX_RE="@comment "
 .endif
 
-.if defined(WITH_PCRE) && !defined(WITHOUT_PCRE)
+.if ${PORT_OPTIONS:MPCRE}
 PLIST_SUB+=	PCRE=""
 LIB_DEPENDS+=	pcre:${PORTSDIR}/devel/pcre
 SYMLINK_FILES+=	m_regex_pcre.cpp
@@ -89,7 +82,7 @@ SYMLINK_FILES+=	m_regex_pcre.cpp
 PLIST_SUB+=	PCRE="@comment "
 .endif
 
-.if defined(WITH_TRE) && !defined(WITHOUT_TRE)
+.if ${PORT_OPTIONS:MTRE}
 PLIST_SUB+=	TRE=""
 LIB_DEPENDS+=	tre:${PORTSDIR}/textproc/libtre
 CONFIGURE_ARGS+=	--tre-includes=${LOCALBASE}/include
@@ -98,7 +91,7 @@ SYMLINK_FILES+=	m_regex_tre.cpp
 PLIST_SUB+=	TRE="@comment "
 .endif
 
-.if defined(WITH_LDAPMODULES) && !defined(WITHOUT_LDAPMODULES)
+.if ${PORT_OPTIONS:MLDAPMODULES}
 USE_OPENLDAP=	yes
 SYMLINK_FILES+=	m_ldapauth.cpp m_ldapoper.cpp
 PLIST_SUB+=	LDAPMODULES=""
@@ -106,7 +99,7 @@ PLIST_SUB+=	LDAPMODULES=""
 PLIST_SUB+=	LDAPMODULES="@comment "
 .endif
 
-.if defined(WITH_MYSQL) && !defined(WITHOUT_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
 USE_MYSQL=	yes
 SYMLINK_FILES+=	m_mysql.cpp m_sqlv2.h
 PLIST_SUB+=	MYSQL=""
@@ -114,7 +107,7 @@ PLIST_SUB+=	MYSQL=""
 PLIST_SUB+=	MYSQL="@comment "
 .endif
 
-.if defined(WITH_PGSQL) && !defined(WITHOUT_PGSQL)
+.if ${PORT_OPTIONS:MPGSQL}
 USE_PGSQL=	yes
 SYMLINK_FILES+=	m_pgsql.cpp m_sqlv2.h
 PLIST_SUB+=	PGSQL=""
@@ -122,7 +115,7 @@ PLIST_SUB+=	PGSQL=""
 PLIST_SUB+=	PGSQL="@comment "
 .endif
 
-.if defined(WITH_SQLITE3) && !defined(WITHOUT_SQLITE3)
+.if ${PORT_OPTIONS:MSQLITE3}
 USE_SQLITE=	3
 SYMLINK_FILES+=	m_sqlite3.cpp m_sqlv2.h
 PLIST_SUB+=	SQLITE3=""
@@ -130,8 +123,8 @@ PLIST_SUB+=	SQLITE3=""
 PLIST_SUB+=	SQLITE3="@comment "
 .endif
 
-.if defined(WITH_SQLMODULES) && !defined(WITHOUT_SQLMODULES)
-.if !defined(WITH_MYSQL) && !defined(WITH_PGSQL) && !defined(WITH_SQLITE3)
+.if ${PORT_OPTIONS:MSQLMODULES}
+.if ! ${PORT_OPTIONS:MMYSQL} && ! ${PORT_OPTIONS:MPGSQL} && !defined(WITH_SQLITE3}
 BROKEN=		Please enable at least one of MYSQL, PGSQL or SQLITE3 required by SQLMODULES
 .endif
 SYMLINK_FILES+=	m_sqlauth.cpp m_sqllog.cpp m_sqloper.cpp m_sqlutils.cpp \
@@ -141,7 +134,7 @@ PLIST_SUB+=	SQLMODULES=""
 PLIST_SUB+=	SQLMODULES="@comment "
 .endif
 
-.if defined(WITH_GNUTLS) && !defined(WITHOUT_GNUTLS)
+.if ${PORT_OPTIONS:MGNUTLS) && !defined(WITHOUT_GNUTLS}
 LIB_DEPENDS+=	gnutls.26:${PORTSDIR}/security/gnutls
 CONFIGURE_ARGS+=	--enable-gnutls
 SYMLINK_FILES+=	m_ssl_gnutls.cpp
@@ -150,7 +143,7 @@ PLIST_SUB+=	GNUTLS=""
 PLIST_SUB+=	GNUTLS="@comment "
 .endif
 
-.if defined(WITH_OPENSSL) && !defined(WITHOUT_OPENSSL)
+.if ${PORT_OPTIONS:MOPENSSL) && !defined(WITHOUT_OPENSSL}
 USE_OPENSSL=	yes
 CONFIGURE_ARGS+=	--enable-openssl
 SYMLINK_FILES+=	m_ssl_openssl.cpp
@@ -159,8 +152,8 @@ PLIST_SUB+=	OPENSSL=""
 PLIST_SUB+=	OPENSSL="@comment "
 .endif
 
-.if defined(WITH_SSLMODULES) && !defined(WITHOUT_SSLMODULES)
-.if !defined(WITH_GNUTLS) && !defined(WITH_OPENSSL)
+.if ${PORT_OPTIONS:MSSLMODULES) && !defined(WITHOUT_SSLMODULES}
+.if ! ${PORT_OPTIONS:MGNUTLS) && !defined(WITH_OPENSSL}
 BROKEN=		Please enable at least one of GNUTLS or OPENSSL required by SSLMODULES
 .endif
 SYMLINK_FILES+=	m_ssl_oper_cert.cpp m_sslinfo.cpp
@@ -169,7 +162,7 @@ PLIST_SUB+=	SSLMODULES=""
 PLIST_SUB+=	SSLMODULES="@comment "
 .endif
 
-.if defined(WITH_ZIPLINK) && !defined(WITHOUT_ZIPLINK)
+.if ${PORT_OPTIONS:MZIPLINK) && !defined(WITHOUT_ZIPLINK}
 SYMLINK_FILES+=	m_ziplink.cpp
 PLIST_SUB+=	ZIPLINK=""
 .else
diff --git a/irc/ircd-ratbox-devel/Makefile b/irc/ircd-ratbox-devel/Makefile
index 513ca7edc96f..3216c9158946 100644
--- a/irc/ircd-ratbox-devel/Makefile
+++ b/irc/ircd-ratbox-devel/Makefile
@@ -1,10 +1,5 @@
-# New ports collection makefile for:	ircd-ratbox
-# Date Created:				2006-01-27
-# Whom:					Shaun Amott <shaun@inerd.com>
-#
+# Created by: Shaun Amott <shaun@inerd.com>
 # $FreeBSD$
-#
-# ex: ts=8
 
 PORTNAME=	ircd-ratbox
 PORTVERSION=	3.0.7
@@ -51,48 +46,48 @@ PORTDOCS=	[^i]*.txt README.* technical/[^i]*.txt Tao-of-IRC.*
 
 #-- Options ------------------------------------------------------------
 
-OPTIONS=	OPENSSL		"Enable openssl support"			on  \
-		IPV6		"Enable IPv6 support"				on  \
-		ZIPLINKS	"Enable ziplinks support"			on  \
-		SHARED_MODULES	"Enable shared modules support"			on  \
-		ASSERT		"Enable debugging code"				off \
-		SMALL_NET	"Tune server for small networks"		off \
-		SERVICES	"Enable ratbox-services compatibility code"	off
+OPTIONS_DEFINE=	OPENSSL IPV6 ZIPLINKS SHARED_MODULES ASSERT SMALL_NET SERVICES DOCS
+OPTIONS_DEFAULT=	OPENSSL ZIPLINKS SHARED_MODULES
+ZIPLINKS_DESC=		ziplinks support
+SHARED_MODULES_DESC=	shared modules support
+ASSERT_DESC=		Enable debugging code
+SMALL_NET_DESC=		Tune server for small networks
+SERVICES_DESC=		ratbox-services compatibility code
 
 #----------------------------------------------------------------------
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_OPENSSL)
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
+.if ${PORT_OPTIONS:MOPENSSL}
+USE_OPENSSL=		yes
 CONFIGURE_ARGS+=	--enable-openssl
 .else
 CONFIGURE_ARGS+=	--disable-openssl
 .endif
 
-.if defined(WITHOUT_IPV6)
+.if ! ${PORT_OPTIONS:MIPV6}
 CONFIGURE_ARGS+=	--disable-ipv6
 .endif
 
-.if defined(WITHOUT_ZIPLINKS)
+.if ! ${PORT_OPTIONS:MZIPLINKS}
 CONFIGURE_ARGS+=	--disable-zlib
 .endif
 
-.if defined(WITHOUT_SHARED_MODULES)
+.if ! ${PORT_OPTIONS:MSHARED_MODULES}
 CONFIGURE_ARGS+=	--disable-shared-modules
 .endif
 
-.if defined(WITH_ASSERT)
+.if ${PORT_OPTIONS:MASSERT}
 CONFIGURE_ARGS+=	--enable-assert
 .else
 CONFIGURE_ARGS+=	--disable-assert
 .endif
 
-.if defined(WITH_SMALL_NET)
+.if ${PORT_OPTIONS:MSMALL_NET}
 CONFIGURE_ARGS+=	--enable-small-net
 .endif
 
-.if defined(WITH_SERVICES)
+.if ${PORT_OPTIONS:MSERVICES}
 CONFIGURE_ARGS+=	--enable-services
 .endif
 
@@ -195,7 +190,7 @@ pre-su-install:
 	${MKDIR} ${PREFIX}/lib/${PORTNAME}/modules
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif
@@ -226,4 +221,4 @@ post-install:
 
 #-----------------------------------------------------------------------
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/irc/ircd-ru/Makefile b/irc/ircd-ru/Makefile
index accb5cb885c2..963d54601d82 100644
--- a/irc/ircd-ru/Makefile
+++ b/irc/ircd-ru/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	ircd-ru
-# Date Created:				2003.07.11
-# Whom:					Khamushkin Ilya <ilya@ircd.ru>
-#
+# Created by: Khamushkin Ilya <ilya@ircd.ru>
 # $FreeBSD$
-#
 
 PORTNAME=	ircd-ru
 PORTVERSION=	1.0.7
@@ -27,60 +23,61 @@ GROUPS=		${USERS}
 VARDIR=		/var
 PLIST_SUB=	VARDIR=${VARDIR}
 
-OPTIONS=	WENET "irc.wenet.ru specific options" off \
-		HUB "hub support" off \
-		ENCRYPTION "enable RC4 crypt (server to server connection)" off \
-		SYSLOGFILE "log to file instead of syslog" off \
-		DRONEMODULE "enable dronemodule support" off \
-		AUTHMODULE "enable authmodule support" off \
-		DNSBL "enable DNSBL support" off \
-		SELECT "enable select I/O" off
+OPTIONS_DEFINE=	WENET HUB ENCRYPTION SYSLOGFILE DRONEMODULE AUTHMODULE DNSBL SELECT DOCS
+WENET_DESC=		irc.wenet.ru specific options
+HUB_DESC=		hub support
+ENCRYPTION_DESC=	RC4 crypt (server to server connection)
+SYSLOGFILE_DESC=	log to file instead of syslog
+DRONEMODULE_DESC=	dronemodule support
+AUTHMODULE_DESC=	authmodule support
+DNSBL_DESC=		DNSBL support
+SELECT_DESC=		enable select I/O
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 # irc.wenet.ru specific options
-.if defined(WITH_WENET)
+.if ${PORT_OPTIONS:MWENET}
 CONFIGURE_ARGS+=--enable-wenet XFLAGS=-g
 .endif
 
 # enable hub support
-.if defined(WITH_HUB)
+.if ${PORT_OPTIONS:MHUB}
 CONFIGURE_ARGS+=--enable-hub
 .endif
 
 # enable RC4 crypt (server to server connection)
-.if defined(WITH_ENCRYPTION)
+.if ${PORT_OPTIONS:MENCRYPTION}
 CONFIGURE_ARGS+=--enable-encryption
 LIB_DEPENDS+=	gmp.10:${PORTSDIR}/math/gmp
 .endif
 
 # log to file instead of syslog
-.if defined(WITH_SYSLOGFILE)
+.if ${PORT_OPTIONS:MSYSLOGFILE}
 CONFIGURE_ARGS+=--enable-syslogfile
 .endif
 
 # enable dronemodule support
-.if defined(WITH_DRONEMODULE)
+.if ${PORT_OPTIONS:MDRONEMODULE}
 CONFIGURE_ARGS+=--enable-dronemodule
 .endif
 
 # enable authmodule support
-.if defined(WITH_AUTHMODULE)
+.if ${PORT_OPTIONS:MAUTHMODULE}
 CONFIGURE_ARGS+=--enable-authmodule
 .endif
 
 # enable DNSBL support
-.if defined(WITH_DNSBL)
+.if ${PORT_OPTIONS:MDNSBL}
 CONFIGURE_ARGS+=--enable-dnsbl
 .endif
 
 # enable select I/O
-.if defined(WITH_SELECT)
+.if ${PORT_OPTIONS:MSELECT}
 CONFIGURE_ARGS+=--enable-select
 .endif
 
 post-patch:
-.if defined(NOPORTDOCS)
+.if ! ${PORT_OPTIONS:MDOCS}
 	@${REINPLACE_CMD} -Ee '/(dir_HPATH)|opers.txt/d' ${WRKSRC}/tools/install_ircd.in
 .endif
 
@@ -94,4 +91,4 @@ post-install:
 	@${CHOWN} -R ircd:ircd ${VARDIR}/log/ircd-ru
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/irc/ircproxy/Makefile b/irc/ircproxy/Makefile
index a78b96fafdea..cd919dbeb507 100644
--- a/irc/ircproxy/Makefile
+++ b/irc/ircproxy/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   ircproxy
-# Date created:        10 July 2003
-# Whom:                Jonas Kvinge <jonas@night-light.net>
-#
+# Created by: Jonas Kvinge <jonas@night-light.net>
 # $FreeBSD$
-#
 
 PORTNAME=	ircproxy
 PORTVERSION=	1.3.6
@@ -28,30 +24,30 @@ GROUPS=		ircproxyd
 SUB_LIST=	IRC_USR=${USERS} IRC_GRP=${GROUPS}
 SUB_FILES=	pkg-deinstall
 
-OPTIONS=	SSL "Enable SSL support" on \
-		IPV6 "Enable IPv6 support" on \
-		MEMDEBUG "Enable memory debugging" on \
-		FDDEBUG "Enable file descriptor debugging" on
+OPTIONS_DEFINE=	SSL IPV6 MEMDEBUG FDDEBUG
+OPTIONS_DEFAULT=	SSL MEMDEBUG FDDEBUG
+MEMDEBUG_DESC=	Enable memory debugging
+FDDEBUG_DESC=	Enable file descriptor debugging
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_SSL)
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
+.if ${PORT_OPTIONS:MSSL}
+USE_OPENSSL=		yes
 .else
 CONFIGURE_ARGS+=	--disable-ssl
 .endif
 
-.if !defined(WITH_IPV6)
+.if ! ${PORT_OPTIONS:MIPV6}
 CONFIGURE_ARGS+=	--disable-ipv6
 .endif
 
-.if defined(WITH_MEMDEBUG)
+.if ${PORT_OPTIONS:MMEMDEBUG}
 CONFIGURE_ARGS+=	--enable-memdebug
 .else
 CONFIGURE_ARGS+=	--disable-memdebug
 .endif
 
-.if defined(WITH_FDDEBUG)
+.if ${PORT_OPTIONS:MFDDEBUG}
 CONFIGURE_ARGS+=	--enable-fddebug
 .else
 CONFIGURE_ARGS+=	--disable-fddebug
@@ -61,4 +57,4 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|EUSER="ircproxy"|EUSER="ircproxyd"|g; \
 		s|EGROUP="users"|EGROUP="ircproxyd"|g' ${WRKSRC}/data/${PORTNAME}d.conf
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/irc/py-gozerbot/Makefile b/irc/py-gozerbot/Makefile
index 9ae9d45e6a65..27d5a2277ff0 100644
--- a/irc/py-gozerbot/Makefile
+++ b/irc/py-gozerbot/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	py-gozerbot
-# Date created:		Wed Sep 19 00:04:39 CEST 2007
-# Whom:			Sten Spans <sten@blinkenlights.nl>
-#
+# Created by: Sten Spans <sten@blinkenlights.nl>
 # $FreeBSD$
-#
 
 PORTNAME=	gozerbot
 PORTVERSION=	0.8.1.1
@@ -21,32 +17,33 @@ USE_PYTHON=	2.5+
 USE_PYDISTUTILS=	yes
 SUB_FILES=		pkg-message
 
-OPTIONS=	XMPP  "Jabber functions" off \
-		MYSQL "Mysql functions" off
+OPTIONS_DEFINE=	XMPP MYSQL DOCS
+XMPP_DESC=	Jabber functions
+MYSQL_DESC=	Mysql functions
 OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
 
 MAN1=		gozerbot.1
 
 RUN_DEPENDS+=	${LOCALBASE}/bin/gpg:${PORTSDIR}/security/gnupg
 
+.include <bsd.port.options.mk>
+
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	${CP} -R ${WRKSRC}/doc/ ${DOCSDIR}
 	${CP} ${WRKSRC}/README ${DOCSDIR}
 .endif
 	@${INSTALL_MAN} ${WRKSRC}/man/gozerbot.1.FreeBSD ${PREFIX}/man/man1/gozerbot.1
 
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=0:${PORTSDIR}/databases/py-MySQLdb
 .endif
 
-.if defined(WITH_XMPP)
+.if ${PORT_OPTIONS:MXMPP}
 RUN_DEPENDS+=${PYTHON_SITELIBDIR}/xmpp/__init__.py:${PORTSDIR}/net-im/py-xmpppy
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/irc/ratbox-services/Makefile b/irc/ratbox-services/Makefile
index 4db8be31017a..112395e330be 100644
--- a/irc/ratbox-services/Makefile
+++ b/irc/ratbox-services/Makefile
@@ -1,7 +1,4 @@
-# New ports collection makefile for:	ratbox-services
-# Date Created:				2006-01-27
-# Whom:					Shaun Amott <shaun@inerd.com>
-#
+# Created by: Shaun Amott <shaun@inerd.com>
 # $FreeBSD$
 
 PORTNAME=	ratbox-services
@@ -24,7 +21,7 @@ LOGDIR?=	/var/log
 RUNDIR?=	/var/run
 DBDIR?=		/var/db/${PORTNAME}
 PERL?=		${LOCALBASE}/bin/perl
-USE_GNOME=	pkgconfig
+USE_PKGCONFIG=	build
 SUB_FILES=	pkg-message pkg-install
 PLIST_SUB=	LOGDIR=${LOGDIR} RUNDIR=${RUNDIR} DBDIR=${DBDIR} PERL=${PERL}
 SUB_LIST=	LOGDIR=${LOGDIR} RUNDIR=${RUNDIR} DBDIR=${DBDIR} PERL=${PERL}
@@ -46,84 +43,83 @@ MAKE_JOBS_UNSAFE=yes
 
 #-- Options ------------------------------------------------------------
 
-OPTIONS=	NICKSERV	"Enable nickname registration service"		on \
-		CHANSERV	"Enable channel registration service"		on \
-		USERSERV	"Enable user service"				on \
-		OPERSERV	"Enable oper service"				on \
-		ALIS		"Enable advanced listing service"		on \
-		JUPESERV	"Enable jupe service"				on \
-		OPERBOT		"Enable operbot service"			on \
-		GLOBALMSG	"Enable global messaging service"		on \
-		BANSERV		"Enable ban service"				on \
-		WATCHSERV	"Enable command watching service"		on \
-		MEMOSERV	"Enable memo services"				on \
-		SQLITE		"Enable sqlite3 support (default)"		on \
-		MYSQL		"Enable mysql support"				off \
-		PGSQL		"Enable pgsql backend support"			off
+OPTIONS_DEFINE=	NICKSERV CHANSERV USERSERV OPERSERV ALIS JUPESERV OPERBOT GLOBALMSG \
+		BANSERV WATCHSERV MEMOSERV
+OPTIONS_DEFAULT=	NICKSERV CHANSERV USERSERV OPERSERV ALIS JUPESERV OPERBOT GLOBALMSG \
+			BANSERV WATCHSERV MEMOSERV SQLITE
+OPTIONS_MULTI=	DB
+OPTIONS_MULTI_DB=	MYSQL PGSQL SQLITE
+NICKSERV_DESC=	nickname registration service
+CHANSERV_DESC=	channel registration service
+USERSERV_DESC=	user service
+OPERSERV_DESC=	oper service
+ALIS_DESC=	advanced listing service
+JUPESERV_DESC=	jupe service
+OPERBOT_DESC=	operbot service
+GLOBALMSG_DESC=	global messaging service
+BANSERV_DESC=	ban service
+WATCHSERV_DESC=	command watching service
+MEMOSERV_DESC=	memo services
 
 #----------------------------------------------------------------------
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITHOUT_NICKSERV)
+.if ! ${PORT_OPTIONS:MNICKSERV}
 CONFIGURE_ARGS+=	--disable-nickserv
 .endif
 
-.if defined(WITHOUT_CHANSERV)
+.if ! ${PORT_OPTIONS:MCHANSERV}
 CONFIGURE_ARGS+=	--disable-chanserv
 .endif
 
-.if defined(WITHOUT_USERSERV)
+.if ! ${PORT_OPTIONS:MUSERSERV}
 CONFIGURE_ARGS+=	--disable-userserv
 .endif
 
-.if defined(WITHOUT_OPERSERV)
+.if ! ${PORT_OPTIONS:MOPERSERV}
 CONFIGURE_ARGS+=	--disable-operserv
 .endif
 
-.if defined(WITHOUT_ALIS)
+.if ! ${PORT_OPTIONS:MALIS}
 CONFIGURE_ARGS+=	--disable-alis
 .endif
 
-.if defined(WITHOUT_JUPESERV)
+.if ! ${PORT_OPTIONS:MJUPESERV}
 CONFIGURE_ARGS+=	--disable-jupeserv
 .endif
 
-.if defined(WITHOUT_OPERBOT)
+.if ! ${PORT_OPTIONS:MOPERBOT}
 CONFIGURE_ARGS+=	--disable-operbot
 .endif
 
-.if defined(WITHOUT_GLOBALMSG)
+.if ! ${PORT_OPTIONS:MGLOBALMSG}
 CONFIGURE_ARGS+=	--disable-global
 .endif
 
-.if defined(WITHOUT_BANSERV)
+.if ! ${PORT_OPTIONS:MBANSERV}
 CONFIGURE_ARGS+=	--disable-banserv
 .endif
 
-.if defined(WITHOUT_WATCHSERV)
+.if ! ${PORT_OPTIONS:MWATCHSERV}
 CONFIGURE_ARGS+=	--disable-watchserv
 .endif
 
-.if defined(WITHOUT_MEMOSERV)
+.if ! ${PORT_OPTIONS:MMEMOSERV}
 CONFIGURE_ARGS+=	--disable-memoserv
 .endif
 
-.if !defined(WITH_SQLITE) && !defined(WITH_MYSQL) && !defined(WITH_PGSQL)
-IGNORE=			requires either an sqlite, mysql or pgsql backend
-.endif
-
-.if defined(WITH_SQLITE)
+.if ${PORT_OPTIONS:MSQLITE}
 USE_SQLITE=		3
 CONFIGURE_ARGS+=	--enable-sqlite3=${LOCALBASE}
 .endif
 
-.if defined(WITH_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
 USE_MYSQL=		yes
 CONFIGURE_ARGS+=	--enable-mysql=${LOCALBASE}
 .endif
 
-.if defined(WITH_PGSQL)
+.if ${PORT_OPTIONS:MPGSQL}
 USE_PGSQL=		yes
 CONFIGURE_ARGS+=	--enable-pgsql=${LOCALBASE}
 .endif
@@ -172,7 +168,7 @@ pre-su-install:
 	${MKDIR} ${DATADIR}/help
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/INSTALL.mysql ${DOCSDIR}/INSTALL.mysql
@@ -202,4 +198,4 @@ post-install:
 
 #-----------------------------------------------------------------------
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/irc/undernet-ircu/Makefile b/irc/undernet-ircu/Makefile
index 8bf66f06d916..660c80d25163 100644
--- a/irc/undernet-ircu/Makefile
+++ b/irc/undernet-ircu/Makefile
@@ -1,7 +1,4 @@
-# New ports collection makefile for:	undernet-ircu
-# Date created:				2004-2-17
-# Whom:					Walter Venable <weaseal@users.sourceforge.net>
-#
+# Created by: Walter Venable <weaseal@users.sourceforge.net>
 # $FreeBSD$
 
 PORTNAME=	undernet-ircu
@@ -24,66 +21,67 @@ CONFIGURE_ARGS=		--with-dpath=${PREFIX}/etc/ --with-symlink=no
 
 PLIST_FILES=	bin/ircd bin/umkpasswd bin/convert-conf etc/ircd.conf.example
 
-OPTIONS=	IPV6 "Disable IPv6 support (default is autodetect)" off \
-		POLL "Force poll to be used even if not a sys call" off \
-		DEBUG "Turn on debugging mode" off \
-		ASSERTS "Disable assertion checking" off \
-		PROFILE "Enable profiling support" off \
-		PEDANTIC "Enable pedantic warnings" off \
-		WARNINGS "Enable warnings (add -Wall to CFLAGS)" off \
-		INLINES "Disable inlining for a few critical functions" off \
-		DEVPOLL "Disable the /dev/poll-based engine" off \
-		KQUEUE "Disable the kqueue-based engine" off \
-		EPOLL "Disable the epoll-based engine" off \
-		LEAKDETECT "Turn on the leak detector (reqs patched boehm)" off
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_IPV6)
+OPTIONS_DEFINE=	IPV6 POLL DEBUG ASSERTS PROFILE PEDANTIC WARNINGS INLINES DEVPOLL KQUEUE \
+		EPOLL LEAKDETECT
+POLL_DESC=	Force poll to be used even if not a sys call
+ASSERTS_DESC=	Disable assertion checking
+PEDANTIC_DESC=	Enable pedantic warnings
+WARNINGS_DESC=	Enable warnings (add -Wall to CFLAGS)
+INLINES_DESC=	Disable inlining for a few critical functions
+DEVPOLL_DESC=	Disable the /dev/poll-based engine
+KQUEUE_DESC=	Disable the kqueue-based engine
+EPOLL_DESC=	Disable the epoll-based engine
+LEAKDETECT_DESC=	Turn on the leak detector (reqs patched boehm)
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MIPV6}
+CONFIGURE_ARGS+=	--with-ipv6
+.else
 CONFIGURE_ARGS+=	--without-ipv6
 .endif
 
-.if defined(WITH_POLL)
+.if ${PORT_OPTIONS:MPOLL}
 CONFIGURE_ARGS+=	--enable-poll
 .endif
 
-.if defined(WITH_DEBUG)
+.if ${PORT_OPTIONS:MDEBUG}
 CONFIGURE_ARGS+=	--enable-debug
 .endif
 
-.if defined(WITH_ASSERTS)
+.if ${PORT_OPTIONS:MASSERTS}
 CONFIGURE_ARGS+=	--disable-asserts
 .endif
 
-.if defined(WITH_PROFILE)
+.if ${PORT_OPTIONS:MPROFILE}
 CONFIGURE_ARGS+=	--enable-profile
 .endif
 
-.if defined(WITH_PEDANTIC)
+.if ${PORT_OPTIONS:MPEDANTIC}
 CONFIGURE_ARGS+=	--enable-pedantic
 .endif
 
-.if defined(WITH_WARNINGS)
+.if ${PORT_OPTIONS:MWARNINGS}
 CONFIGURE_ARGS+=	--enable-warnings
 .endif
 
-.if defined(WITH_INLINES)
+.if ${PORT_OPTIONS:MINLINES}
 CONFIGURE_ARGS+=	--disable-inlines
 .endif
 
-.if defined(WITH_DEVPOLL)
+.if ${PORT_OPTIONS:MDEVPOLL}
 CONFIGURE_ARGS+=	--disable-devpoll
 .endif
 
-.if defined(WITH_KQUEUE)
+.if ${PORT_OPTIONS:MKQUEUE}
 CONFIGURE_ARGS+=	--disable-kqueue
 .endif
 
-.if defined(WITH_EPOLL)
+.if ${PORT_OPTIONS:MEPOLL}
 CONFIGURE_ARGS+=	--disable-epoll
 .endif
 
-.if defined(WITH_LEAKDETECT)
+.if ${PORT_OPTIONS:MLEAKDETECT}
 CONFIGURE_ARGS+=	--with-leak-detect
 .endif
 
@@ -98,4 +96,4 @@ post-install:
 	@${ECHO_MSG}    "	your needs.  See documentation at http://coder-com.undernet.org."
 	@${ECHO_MSG}    ""
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/irc/unreal/Makefile b/irc/unreal/Makefile
index 3ad1482541a2..8bbb67791f7a 100644
--- a/irc/unreal/Makefile
+++ b/irc/unreal/Makefile
@@ -1,9 +1,5 @@
-# Ports collection makefile for:	Unreal-IRCd
-# Date created:				15 April 2004
-# Whom:					Gerrit Beine (<tux@pinguru.net>)
-#
+# Created by: Gerrit Beine (<tux@pinguru.net>)
 # $FreeBSD$
-#
 
 PORTNAME=	Unreal
 PORTVERSION=	3.2.9
@@ -47,17 +43,17 @@ CONFIGURE_ARGS=	--with-listen=5 \
 		--with-fd-setsize=1024 \
 		--enable-dynamic-linking
 
-OPTIONS=	HUB "Configure as a hub (otherwise configure as a leaf)" on \
-		NOSPOOF "Enable anti-spoof protection" off \
-		ZIPLINKS "Enable ziplinks support" off \
-		SSL "Support SSL connecions" off \
-		IPV6 "Enable ipv6 support" off \
-		PREFIXAQ "Enable prefixes for chanadmin and chanowner" off \
-		REMOTE "Enable remote includes" off
+OPTIONS_DEFINE=	HIB NOSPOOF ZIPLINKS SSL IPV6 PREFIXAQ REMOTE DOCS
+OPTIONS_DEFAULT=	HUB
+HUB_DESC=	Configure as a hub (otherwise configure as a leaf)
+NOSPOOF_DESC=	Enable anti-spoof protection
+ZIPLINKS_DESC=	Enable ziplinks support
+PREFIXAQ_DESC=	Enable prefixes for chanadmin and chanowner
+REMOTE_DESC=	Enable remote includes
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 DOCS=		Donation doc/Authors doc/coding-guidelines \
 		doc/example.conf doc/tao.of.irc \
 		doc/translations.txt doc/unreal32docs.html \
@@ -66,34 +62,34 @@ DOCS=		Donation doc/Authors doc/coding-guidelines \
 		doc/technical/vl.txt
 .endif
 
-.if defined(WITH_HUB)
+.if ${PORT_OPTIONS:MHUB}
 CONFIGURE_ARGS+=	--enable-hub
 .endif
 
-.if defined(WITH_NOSPOOF)
+.if ${PORT_OPTIONS:MNOSPOOF}
 CONFIGURE_ARGS+=	--enable-nospoof
 .endif
 
-.if defined(WITH_ZIPLINKS)
+.if ${PORT_OPTIONS:MZIPLINKS}
 CONFIGURE_ARGS+=	--enable-ziplinks
 .endif
 
-.if defined(WITH_IPV6)
+.if ${PORT_OPTIONS:MIPV6}
 CONFIGURE_ARGS+=	--enable-inet6
 .endif
 
-.if defined(WITH_SSL)
+.if ${PORT_OPTIONS:MSSL}
 CONFIGURE_ARGS+=	--enable-ssl
 # we can't use USE_OPENSSL=yes after including bsd.port.pre.mk
 .include "${PORTSDIR}/Mk/bsd.openssl.mk"
 .endif
 
-.if defined(WITH_REMOTE)
+.if ${PORT_OPTIONS:MREMOTE}
 LIB_DEPENDS+=	curl.6:${PORTSDIR}/ftp/curl
 CONFIGURE_ARGS+=	--enable-libcurl=${LOCALBASE}
 .endif
 
-.if defined(WITH_PREFIXAQ)
+.if ${PORT_OPTIONS:MPREFIXAQ}
 CONFIGURE_ARGS+=	--enable-prefixaq
 .endif
 
@@ -153,7 +149,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/networks/networks.ndx ${DATADIR}/networks
 	${INSTALL_SCRIPT} ${WRKSRC}/networks/makenet ${DATADIR}/networks
 	${INSTALL} ${WRKSRC}/src/modules/*.so ${MODULESDIR}
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 .for file in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
@@ -186,4 +182,4 @@ post-install:
 	@${CP} ${WRKSRC}/SQLMod/LICENSE ${DOCSDIR}/LICENSE.sqlmod
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>