8 files changed, 94 insertions, 133 deletions

diff --git a/converters/wkhtmltopdf/Makefile b/converters/wkhtmltopdf/Makefile
index c01cd6ac5912..b0387e693542 100644
--- a/converters/wkhtmltopdf/Makefile
+++ b/converters/wkhtmltopdf/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	tnef
-# Date created:		21 March 2010
-# Whom:			Martin Matuska <mm@FreeBSD.org>
-#
+# Created by: Martin Matuska <mm@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	wkhtmltopdf
 DISTVERSION=	0.11.0_rc1
@@ -28,10 +24,12 @@ USE_XORG=		x11 xext xrender
 USE_PERL5_BUILD=	yes
 USE_LDCONFIG=		yes
 USE_GMAKE=		yes
+USE_PKGCONFIG=		build
 HAS_CONFIGURE=		yes
 MAKE_JOBS_SAFE=		yes
 
-OPTIONS=	BUNDLED_LIBS "Use Qt-bundled jpeg, mng, png and tiff" off
+OPTIONS_DEFINE=	BUNDLED_LIBS
+BUNDLED_LIBS_DESC=	Use Qt-bundled jpeg, mng, png and tiff
 
 LICENSE=	LGPL3
 LICENSE_FILE_LGPL3=	${INSTALL_WRKSRC}/COPYING
@@ -63,7 +61,7 @@ BROKEN=		fails to extract on FreeBSD 7.X
 BROKEN=		Does not link on powerpc
 .endif
 
-.if defined(WITH_BUNDLED_LIBS)
+.if ${PORT_OPTIONS:MBUNDLED_LIBS}
 CONFIGURE_ARGS+=	-qt-libtiff -qt-libpng -qt-libmng -qt-libjpeg
 .else
 LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg \
diff --git a/devel/libevent2/Makefile b/devel/libevent2/Makefile
index 086c49c31ae2..d052536dc80a 100644
--- a/devel/libevent2/Makefile
+++ b/devel/libevent2/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	libevent2
-# Date created:				22 February 2011
-# Whom:					Martin Matuska <mm@FreeBSD.org>
-#
+# Created by: Martin Matuska <mm@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libevent2
 DISTVERSION=	2.0.20
@@ -22,32 +18,30 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 USE_LDCONFIG=	${PREFIX}/lib/event2
 
-OPTIONS=	OPENSSL "Enable OpenSSL support" on \
-		THREADS "Enable threads support" on
+OPTIONS_DEFINE=	OPENSSL THREADS
+OPTIONS_DEFAULT=	OPENSSL THREADS
 
 CONFIGURE_ARGS+=	--libdir=${PREFIX}/lib/event2
 
 .include <bsd.port.options.mk>
 
-.if !defined(WITH_OPENSSL)
-CONFIGURE_ARGS+=	--disable-openssl
-PLIST_SUB+=		OPENSSL="@comment "
-.else
+.if ${PORT_OPTIONS:MOPENSSL}
 USE_OPENSSL=	yes
 CPPFLAGS+=	-I${OPENSSLINC}
 LDFLAGS+=	-L${OPENSSLLIB}
 PLIST_SUB+=		OPENSSL=""
+.else
+CONFIGURE_ARGS+=	--disable-openssl
+PLIST_SUB+=		OPENSSL="@comment "
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if !defined(WITH_THREADS)
-CONFIGURE_ARGS+=	--disable-thread-support
-PLIST_SUB+=		THREADS="@comment "
-.else
+.if ${PORT_OPTIONS:MTHREADS}
 CONFIGURE_ENV+=		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 			PTHREAD_LIBS="${PTHREAD_LIBS}"
 PLIST_SUB+=		THREADS=""
+.else
+CONFIGURE_ARGS+=	--disable-thread-support
+PLIST_SUB+=		THREADS="@comment "
 .endif
 
 post-patch:
@@ -61,4 +55,4 @@ post-install:
 regression-test: build
 	@(${SH} ${WRKSRC}/test/regress)
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/orc/Makefile b/devel/orc/Makefile
index 55d4b6939dfe..82dbf844a08c 100644
--- a/devel/orc/Makefile
+++ b/devel/orc/Makefile
@@ -1,11 +1,9 @@
-# New ports collection makefile for:	orc
-# Date created:				Mar 09, 2010
-# Whom:					mm
-#
+# Created by: mm
 # $FreeBSD$
 
 PORTNAME=	orc
 PORTVERSION=	0.4.16
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://code.entropywave.com/download/orc/
 
@@ -28,18 +26,18 @@ EXAMPLES_DATA=	example1orc.orc example2orc.orc example3orc.orc \
 		mt19937arorc.orc
 EXAMPLES_EXEC=	example1 example2 example3 mt19937ar volscale
 
-OPTIONS=	DOCS "Include gtk-doc documentation" off \
-		EXAMPLES "Install example files" off
+OPTIONS_DEFINE=	DOCS EXAMPLES
+DOCS_DESC=	Include gtk-doc documentation
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_DOCS) && !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 SUBDIRS+=	doc
 .else
 NOPORTDOCS=	yes
 .endif
 
-.if defined(WITH_EXAMPLES) && !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 SUBDIRS+=	examples
 .else
 NOPORTEXAMPLES=	yes
@@ -54,7 +52,7 @@ post-patch:
 		${WRKSRC}/configure 
 
 post-install:
-.if defined(WITH_EXAMPLES) && !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${EXAMPLESDIR}
 .for FILE in ${EXAMPLES_DATA}
 	@${INSTALL_DATA} ${WRKSRC}/examples/${FILE} ${EXAMPLESDIR}/${FILE}
@@ -64,4 +62,4 @@ post-install:
 .endfor
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/dns/udns/Makefile b/dns/udns/Makefile
index 72956834f111..c5006d5b176f 100644
--- a/dns/udns/Makefile
+++ b/dns/udns/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	udns
-# Date created:			Sat May 24, 2008
-# Whom:				Martin Matuska <mm@FreeBSD.org>
-#
+# Created by: Martin Matuska <mm@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	udns
 PORTVERSION=	0.2
@@ -17,7 +13,7 @@ HAS_CONFIGURE=	yes
 MAKE_JOBS_SAFE=	yes
 USE_LDCONFIG=	yes
 
-OPTIONS=	IPV6 "Enable IPv6 support" on
+OPTIONS_DEFINE=	IPV6 DOCS
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING.LGPL
@@ -31,9 +27,9 @@ SHLIB_MAJOR=	0
 MAN1=		dnsget.1 rblcheck.1
 MAN3=		udns.3
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_IPV6)
+.if ${PORT_OPTIONS:MIPV6}
 CONFIGURE_ARGS+=	--enable-ipv6
 .else
 CONFIGURE_ARGS+=	--disable-ipv6
@@ -59,11 +55,11 @@ do-install:
 .endfor
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 .for FILE in NEWS NOTES TODO
 	${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}/${FILE}
 .endfor
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/multimedia/libquicktime/Makefile b/multimedia/libquicktime/Makefile
index d01363175556..3e8d45bda8bc 100644
--- a/multimedia/libquicktime/Makefile
+++ b/multimedia/libquicktime/Makefile
@@ -1,9 +1,5 @@
-# Ports collection makefile for:	libquicktime
-# Date Created:			Jul 17, 2002
-# Whom:				ijliao
-#
+# Created by: ijliao
 # $FreeBSD$
-#
 
 PORTNAME=	libquicktime
 PORTVERSION=	1.2.4
@@ -22,7 +18,8 @@ LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USE_LDCONFIG=	yes
-USE_GNOME=	gnomehack pkgconfig
+USE_GNOME=	gnomehack
+USE_PKGCONFIG=	build
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
 MAKE_JOBS_SAFE=	yes
@@ -37,18 +34,9 @@ USE_XORG=	xaw xv
 CONFIGURE_ARGS=	--with-x --enable-gpl --without-doxygen --without-lame
 MAN1=		lqtplay.1
 
-OPTIONS=	ALSA "Enable ALSA support" Off \
-		DV "Enable libdv support for digital cameras" On \
-		FAAC "Enable FAAC support" Off \
-		FAAD "Enable FAAD support" On \
-		FFMPEG "Enable FFmpeg support" On \
-		GTK2 "Enable Gtk+2 Frontend" Off \
-		JPEG "Enable JPEG support" On \
-		OPENGL "Enable OpenGL support" On \
-		OPTIMIZED_CFLAGS "Enable Optimized CFLAGS" Off \
-		PNG "Enable PNG support" On \
-		SCHROEDINGER "Enable dirac support" On \
-		X264 "Enable X264 codec support" On
+OPTIONS_DEFINE=	ALSA DV FAAC FAAD FFMPEG GTK2 JPEG OPENGL OPTIMIZED_CFLAGS PNG \
+		SCHROEDINGER X264 DOCS
+OPTIONS_DEFAULT=	FFMPEG JPEG OPENGL PNG SCHROEDINGER X264
 
 PORTDOCS=	api_usage.html codecs.html qt4l_building.html \
 		qt4l_codecs.html qt4l_index.html \
@@ -57,17 +45,17 @@ PORTDOCS=	api_usage.html codecs.html qt4l_building.html \
 
 .else
 CONFIGURE_ARGS+=	--without-x --enable-gpl --without-doxygen
-OPTIONS=	OPTIMIZED_CFLAGS "Enable Optimized CFLAGS" Off
+OPTIONS_DEFINE=	OPTIMIZED_CFLAGS
 .endif
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITH_OPTIMIZED_CFLAGS)
+.if ! ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
 CONFIGURE_ARGS+=	--without-cpuflags
 .endif
 
 .if !defined(_BUILDING_LIBQUICKTIME_PLUGINS)
-.if ${HAVE_GNOME:Mgtk20}!="" && defined(WITH_GTK2)
+.if ${PORT_OPTIONS:MGTK2}
 USE_GNOME+=	gtk20
 CONFIGURE_ARGS+=	--with-gtk
 PLIST_SUB+=	GTK=""
@@ -76,20 +64,20 @@ CONFIGURE_ARGS+=	--without-gtk
 PLIST_SUB+=	GTK="@comment "
 .endif
 
-.if defined(WITH_ALSA)
+.if ${PORT_OPTIONS:MALSA}
 LIB_DEPENDS=	asound.2:${PORTSDIR}/audio/alsa-lib
 .else
 CONFIGURE_ARGS+=	--without-alsa
 .endif
 
-.if !defined(WITHOUT_OPENGL)
+.if ${PORT_OPTIONS:MOPENGL}
 USE_GL=		yes
 CONFIGURE_ARGS+=	--with-opengl
 .else
 CONFIGURE_ARGS+=	--without-opengl
 .endif
 
-.if !defined(WITHOUT_DV)
+.if ${PORT_OPTIONS:MDV}
 LIB_DEPENDS+=	dv.4:${PORTSDIR}/multimedia/libdv
 PLIST_SUB+=	DV=""
 CONFIGURE_ARGS+=	--with-libdv
@@ -98,7 +86,7 @@ PLIST_SUB+=	DV="@comment "
 CONFIGURE_ARGS+=	--without-libdv
 .endif
 
-.if !defined(WITHOUT_JPEG)
+.if ${PORT_OPTIONS:MJPEG}
 LIB_DEPENDS+=	jpeg.11:${PORTSDIR}/graphics/jpeg
 PLIST_SUB+=	JPEG=""
 CONFIGURE_ARGS+=	--with-libjpeg
@@ -107,7 +95,7 @@ PLIST_SUB+=	JPEG="@comment "
 CONFIGURE_ARGS+=	--without-libjpeg
 .endif
 
-.if !defined(WITHOUT_PNG)
+.if ${PORT_OPTIONS:MPNG}
 LIB_DEPENDS+=	png15:${PORTSDIR}/graphics/png
 PLIST_SUB+=	PNG=""
 CONFIGURE_ARGS+=	--with-libpng
@@ -116,7 +104,7 @@ PLIST_SUB+=	PNG="@comment "
 CONFIGURE_ARGS+=	--without-libpng
 .endif
 
-.if !defined(WITHOUT_FFMPEG)
+.if ${PORT_OPTIONS:MFFMPEG}
 LIB_DEPENDS+=	avcodec.1:${PORTSDIR}/multimedia/ffmpeg
 PLIST_SUB+=	FFMPEG=""
 CONFIGURE_ARGS+=	--with-ffmpeg
@@ -125,7 +113,7 @@ PLIST_SUB+=	FFMPEG="@comment "
 CONFIGURE_ARGS+=	--without-ffmpeg
 .endif
 
-.if defined(WITH_FAAC)
+.if ${PORT_OPTIONS:MFAAC}
 LIB_DEPENDS+=	faac.0:${PORTSDIR}/audio/faac
 PLIST_SUB+=	FAAC=""
 CONFIGURE_ARGS+=	--with-faac
@@ -134,7 +122,7 @@ PLIST_SUB+=	FAAC="@comment "
 CONFIGURE_ARGS+=	--without-faac
 .endif
 
-.if !defined(WITHOUT_FAAD)
+.if ${PORT_OPTIONS:MFAAD}
 LIB_DEPENDS+=	faad.2:${PORTSDIR}/audio/faad
 PLIST_SUB+=	FAAD=""
 CONFIGURE_ARGS+=	--with-faad2
@@ -143,7 +131,7 @@ PLIST_SUB+=	FAAD="@comment "
 CONFIGURE_ARGS+=	--without-faad2
 .endif
 
-.if !defined(WITHOUT_X264)
+.if ${PORT_OPTIONS:MX264}
 LIB_DEPENDS+=	x264.125:${PORTSDIR}/multimedia/x264
 PLIST_SUB+=	X264=""
 CONFIGURE_ARGS+=	--with-x264
@@ -152,7 +140,7 @@ PLIST_SUB+=	X264="@comment "
 CONFIGURE_ARGS+=	--without-x264
 .endif
 
-.if !defined(WITHOUT_SCHROEDINGER)
+.if ${PORT_OPTIONS:MSCHROEDINGER}
 LIB_DEPENDS+=	schroedinger-1.0.11:${PORTSDIR}/multimedia/schroedinger
 PLIST_SUB+=	SCHROEDINGER=""
 .else
@@ -176,7 +164,7 @@ post-patch:
 pre-configure:
 	@${CHMOD} +x ${WRKSRC}/configure
 
-.if !defined(NOPORTDOCS) && !defined(_BUILDING_LIBQUICKTIME_PLUGINS)
+.if ${PORT_OPTIONS:MDOCS} && !defined(_BUILDING_LIBQUICKTIME_PLUGINS)
 post-install:
 	@${MKDIR} ${DOCSDIR}
 .for f in ${PORTDOCS}
@@ -184,4 +172,4 @@ post-install:
 .endfor
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net-im/jabberd/Makefile b/net-im/jabberd/Makefile
index f2a830a9fae6..f61d1b7248df 100644
--- a/net-im/jabberd/Makefile
+++ b/net-im/jabberd/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	jabberd
-# Date created:				29 December 2003
-# Whom:					Dmitry Sivachenko <demon@FreeBSD.org>
-#
+# Created by: Dmitry Sivachenko <demon@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	jabberd
 PORTVERSION=	2.2.16
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-im
 MASTER_SITES=	http://cloud.github.com/downloads/Jabberd2/jabberd2/
 DIST_SUBDIR=	jabber
@@ -22,18 +18,14 @@ LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2 \
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-OPTIONS=	MYSQL "Support MySQL (storage/auth/reg)" on \
-		POSTGRESQL "Support PostgreSQL (storage/auth/reg)" off \
-		LDAP "Support OpenLDAP (storage/auth/reg)" off \
-		BDB "Support BerkeleyDB (storage/auth/reg)" off \
-		SQLITE "Support SQLite3 (storage/auth/reg)" off \
-		PAM "Enable PAM (auth/reg)" off \
-		PIPE "Enable pipe (auth/reg)" off \
-		ANON "Enable anonymous (auth/reg)" off \
-		FS "Filesystem storage (only for testing)" off \
-		DEBUG "Compile with debug messages" on \
-		REQUIRES "Add backend requires to startup script" off \
-		CYRUS "Use Cyrus SASL backend (not supported)" off
+OPTIONS_DEFINE=	MYSQL PGSQL LDAP BDB SQLITE FAM PIPE ANON FS DEBUG REQUIRES \
+		CYRUS DOCS
+OPTIONS_DEFAULT=	MYSQL DEBUG
+PIPE_DESC=	Enable pipe (auth/reg)
+ANON_DESC=	Enable anonymous (auth/reg)
+FS_DESC=	Filesystem storage (only for testing)
+REQUIRES_DESC=	Add backend requires to startup script
+CYRUS_DESC=	Use Cyrus SASL backend (not supported)
 
 GNU_CONFIGURE=	yes
 MAKE_JOBS_SAFE=	yes
@@ -73,16 +65,16 @@ DOCFILES=	AUTHORS COPYING ChangeLog INSTALL NEWS README \
 
 _REQUIRE=	LOGIN
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 ELP+=	${OPENSSLLIB}
 EIP+=	${OPENSSLINC}
 
-.if !defined(WITHOUT_DEBUG)
+.if ${PORT_OPTIONS:MDEBUG}
 CONFIGURE_ARGS+=--enable-debug
 .endif
 
-.if defined(WITH_POSTGRESQL)
+.if ${PORT_OPTIONS:MPGSQL}
 USE_PGSQL=	yes
 CONFIGURE_ARGS+=--enable-pgsql
 PLIST_SUB+=	SUB_PGSQL=""
@@ -92,7 +84,7 @@ CONFIGURE_ARGS+=--disable-pgsql
 PLIST_SUB+=	SUB_PGSQL="@comment "
 .endif
 
-.if defined(WITH_SQLITE)
+.if ${PORT_OPTIONS:MSQLITE}
 CONFIGURE_ARGS+=--enable-sqlite
 LIB_DEPENDS+=	sqlite3.8:${PORTSDIR}/databases/sqlite3
 CFLAGS+=	${PTHREAD_CFLAGS}
@@ -102,7 +94,7 @@ CONFIGURE_ARGS+=--disable-sqlite
 PLIST_SUB+=	SUB_SQLITE="@comment "
 .endif
 
-.if !defined(WITHOUT_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
 USE_MYSQL=	yes
 CONFIGURE_ARGS+=--enable-mysql
 EIP+=:${LOCALBASE}/include/mysql
@@ -114,7 +106,7 @@ CONFIGURE_ARGS+=--disable-mysql
 PLIST_SUB+=	SUB_MYSQL="@comment "
 .endif
 
-.if defined(WITH_BDB)
+.if ${PORT_OPTIONS:MBDB}
 USE_BDB=	41+
 CONFIGURE_ARGS+=--enable-db
 CONFIGURE_ARGS+=--oldincludedir=/nonexistant
@@ -126,7 +118,7 @@ CONFIGURE_ARGS+=--disable-db
 PLIST_SUB+=	SUB_BDB="@comment "
 .endif
 
-.if defined(WITH_LDAP)
+.if ${PORT_OPTIONS:MLDAP}
 USE_OPENLDAP=	yes
 CONFIGURE_ARGS+=--enable-ldap
 PLIST_SUB+=	SUB_LDAP=""
@@ -136,7 +128,7 @@ CONFIGURE_ARGS+=--disable-ldap
 PLIST_SUB+=	SUB_LDAP="@comment "
 .endif
 
-.if defined(WITH_FS)
+.if ${PORT_OPTIONS:MFS}
 CONFIGURE_ARGS+=--enable-fs
 PLIST_SUB+=	SUB_FS=""
 .else
@@ -144,7 +136,7 @@ CONFIGURE_ARGS+=--disable-fs
 PLIST_SUB+=	SUB_FS="@comment "
 .endif
 
-.if defined(WITH_PAM)
+.if ${PORT_OPTIONS:MPAM}
 CONFIGURE_ARGS+=--enable-pam
 PLIST_SUB+=	SUB_PAM=""
 .else
@@ -152,27 +144,27 @@ CONFIGURE_ARGS+=--disable-pam
 PLIST_SUB+=	SUB_PAM="@comment "
 .endif
 
-.if defined(WITH_PIPE)
+.if ${PORT_OPTIONS:MPIPE}
 CONFIGURE_ARGS+=--enable-pipe
 PLIST_SUB+=	SUB_PIPE=""
 .else
 PLIST_SUB+=	SUB_PIPE="@comment "
 .endif
 
-.if defined(WITH_ANON)
+.if ${PORT_OPTIONS:MANON}
 CONFIGURE_ARGS+=--enable-anon
 PLIST_SUB+=	SUB_ANON=""
 .else
 PLIST_SUB+=	SUB_ANON="@comment "
 .endif
 
-.if defined(WITH_REQUIRES)
+.if ${PORT_OPTIONS:MREQUIRES}
 SUB_LIST+=	REQUIRE="${_REQUIRE}"
 .else
 SUB_LIST+=	REQUIRE="LOGIN"
 .endif
 
-.if defined(WITH_CYRUS)
+.if ${PORT_OPTIONS:MCYRUS}
 CONFIGURE_ARGS+=	--with-sasl=cyrus
 LIB_DEPENDS+=	sasl2:${PORTSDIR}/security/cyrus-sasl2
 .else
@@ -187,7 +179,7 @@ post-patch:
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|%%PERL%%|${PERL}|g' \
 		${WRKSRC}/tools/jabberd.in
-.if defined(WITH_CYRUS)
+.if ${PORT_OPTIONS:MCYRUS}
 	@${REINPLACE_CMD} -e '/^#error /d' \
 		${WRKSRC}/sx/sasl_cyrus.c
 .endif
@@ -197,7 +189,7 @@ post-install:
 	@${CHOWN} -R ${JABBER_USER}:${JABBER_GROUP} ${PREFIX}/etc/jabberd
 	@${FIND} ${PREFIX}/etc/jabberd -type d | ${XARGS} ${CHMOD} 750
 	@${FIND} ${PREFIX}/etc/jabberd -type f | ${XARGS} ${CHMOD} 660
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 .for FILE in ${DOCFILES}
 	@${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
@@ -207,4 +199,4 @@ post-install:
 .endfor
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/relayd/Makefile b/net/relayd/Makefile
index 3d9977449cc0..1d899d5e4125 100644
--- a/net/relayd/Makefile
+++ b/net/relayd/Makefile
@@ -1,7 +1,4 @@
-# New ports collection makefile for: relayd
-# Date created:         5 Jun 2007
-# Whom:                 Jun Kuriyama <kuriyama@FreeBSD.org>
-#
+# Created by: Jun Kuriyama <kuriyama@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	relayd
@@ -33,11 +30,12 @@ MAKE_ARGS+=	BINDIR=${PREFIX}/sbin MANDIR=${PREFIX}/man/man
 USERS=		_relayd
 GROUPS=		_relayd
 
-OPTIONS=	LIBEVENT_STATIC "Build with static libevent" Off
+OPTIONS_DEFINE=	LIBEVENT_STATIC
+LIBEVENT_STATIC_DESC=	Build with static libevent
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_LIBEVENT_STATIC)
+.if ${PORT_OPTIONS:MLIBEVENT_STATIC}
 BUILD_DEPENDS=	${LOCALBASE}/lib/libevent.a:${PORTSDIR}/devel/libevent
 MAKE_ARGS+=	LIBEVENT=${LOCALBASE}/lib/libevent.a
 .else
diff --git a/net/smbldap-tools/Makefile b/net/smbldap-tools/Makefile
index 509c4fa5af2a..2f2aa58dfe37 100644
--- a/net/smbldap-tools/Makefile
+++ b/net/smbldap-tools/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	smbldap-tools
-# Date created:				May 8 2004
-# Whom:					Florent Thoumie <flz@xbsd.org>
-#
+# Created by: Florent Thoumie <flz@xbsd.org>
 # $FreeBSD$
-#
 
 PORTNAME=	smbldap-tools
 PORTVERSION=	0.9.9
@@ -31,17 +27,18 @@ ALL_TARGET=	build
 
 PORTDOCS=	*
 
-OPTIONS=	MIGRATION_SCRIPTS	"Install migration scripts"	off \
-		PDF_DOC			"Install PDF documentation"	off
+OPTIONS_DEFINE=	MIGRATION_SCRIPTS PDF_DOC DOCS
+MIGRATION_SCRIPTS_DESC=	Install migration scripts
+PDF_DOC_DESC=	Install PDF documentation
 
 CONFIGURE_ARGS+=	--with-samba-sysconfdir=${LOCALBASE}/etc \
 			--with-samba-bindir=${LOCALBASE}/bin \
 			--with-perl=${PERL} \
 			--with-perl-libdir=sitelib
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_MIGRATION_SCRIPTS)
+.if ${PORT_OPTIONS:MMIGRATION_SCRIPTS}
 PLIST_SUB+=	MIGRATION_SCRIPTS=""
 .else
 PLIST_SUB+=	MIGRATION_SCRIPTS="@comment "
@@ -58,7 +55,7 @@ post-install:
 	@[ -f ${PREFIX}/etc/smbldap-tools/$i ] || ${INSTALL_DATA} ${WRKSRC}/$i ${PREFIX}/etc/smbldap-tools/$i
 .endfor
 
-.if defined(WITH_MIGRATION_SCRIPTS)
+.if ${PORT_OPTIONS:MMIGRATION_SCRIPTS}
 . for i in smbldap-migrate-pwdump-accounts smbldap-migrate-pwdump-groups \
 smbldap-migrate-unix-accounts smbldap-migrate-unix-groups
 	@${SED} -e 's|/usr/bin/perl|${PERL}|g' \
@@ -66,7 +63,7 @@ smbldap-migrate-unix-accounts smbldap-migrate-unix-groups
 . endfor
 .endif
 
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/smbldap-config.cmd ${DOCSDIR}/smbldap-config
 	${INSTALL_SCRIPT} ${WRKSRC}/smbldap-upgrade-0.9.6.cmd ${DOCSDIR}/smbldap-upgrade-0.9.6
@@ -74,9 +71,9 @@ smbldap-migrate-unix-accounts smbldap-migrate-unix-groups
 	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}/
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/doc/smbldap-tools.html ${DOCSDIR}/smbldap-tools.html
-.if defined(WITH_PDF_DOC)
+.if ${PORT_OPTIONS:MPDF_DOC}
 	${INSTALL_DATA} ${WRKSRC}/doc/smbldap-tools.pdf ${DOCSDIR}/smbldap-tools.pdf
 .endif
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>