9 files changed, 61 insertions, 89 deletions

diff --git a/devel/fossil/Makefile b/devel/fossil/Makefile
index 0cc3b0b014fc..d4150f03cf87 100644
--- a/devel/fossil/Makefile
+++ b/devel/fossil/Makefile
@@ -19,8 +19,6 @@ PLIST_FILES=	bin/fossil
 
 HAS_CONFIGURE=	yes
 
-USE_GMAKE=	yes
-
 OPTIONS_DEFINE=	JSON MARKDOWN STATIC
 JSON_DESC=	JSON API support
 MARKDOWN_DESC=	Markdown format support
diff --git a/devel/giggle/Makefile b/devel/giggle/Makefile
index ce4ac2e482fa..0fd1edefa0ea 100644
--- a/devel/giggle/Makefile
+++ b/devel/giggle/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	giggle
-# Date created:		2008-10-01
-# Whom:			Ashish Shukla <wahjava@gmail.com>
-#
+# Created by: Ashish Shukla <wahjava@gmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	giggle
 PORTVERSION=	0.5
@@ -17,14 +13,17 @@ COMMENT=	GTK+ frontend for git version control system
 BUILD_DEPENDS=	git:${PORTSDIR}/devel/git \
 		p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
 RUN_DEPENDS=	git:${PORTSDIR}/devel/git
-OPTIONS=	EDS	"Evolution Data Server support"	On \
-		VTE	"Terminal Widget" On
+
+OPTIONS_DEFINE=	EDS VTE
+OPTIONS_DEFAULT=	EDS VTE
+EDS_DESC=	Evolution Data Server support
+VTE_DESC=	Terminal Widget
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_BZIP2=	yes
 USE_GNOME=	glib20 gtk20 gtksourceview2 libglade2
-USES=		gettext
+USES=		gettext pkgconfig
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
@@ -33,16 +32,16 @@ PLIST_SUB+=	GIGGLE_VER=${PORTVERSION}
 
 .include <bsd.port.options.mk>
 
-.if defined(WITHOUT_EDS)
-CONFIGURE_ARGS+=	--disable-evolution-data-server
-.elif defined(WITH_EDS)
+.if ${PORT_OPTIONS:MEDS}
 USE_GNOME+=	evolutiondataserver
+.else
+CONFIGURE_ARGS+=	--disable-evolution-data-server
 .endif
 
-.if defined(WITH_VTE)
+.if ${PORT_OPTIONS:MVTE}
 USE_GNOME+=	vte
 PLIST_SUB+=	VTE=""
-.elif defined(WITHOUT_VTE)
+.else
 CONFIGURE_ARGS+=	--disable-terminal
 PLIST_SUB+=	VTE="@comment "
 .endif
diff --git a/devel/jline/Makefile b/devel/jline/Makefile
index 2510a08709e1..b1cf4b183e2e 100644
--- a/devel/jline/Makefile
+++ b/devel/jline/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   libreadline-java
-# Date created:                21 September 2007
-# Whom:                        Martin Kammerhofer <mkamm@gmx.net>
-#
+# Created by: Martin Kammerhofer <mkamm@gmx.net>
 # $FreeBSD$
-#
 
 PORTNAME=		jline
 PORTVERSION=		0.9.94
@@ -18,14 +14,15 @@ LICENSE=	BSD
 PKGMESSAGE=	${WRKDIR}/pkg-message
 USE_JAVA=	yes
 USE_ZIP=	yes
-OPTIONS=	JLINEPATCH "Allow ConsoleRunner customized completion" OFF
+OPTIONS_DEFINE=	JLINEPATCH
+JLINEPATCH_DESC=	Allow ConsoleRunner customized completion
 JLINEJAR=	${WRKSRC}/jline-${PORTVERSION}.jar
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 # Update jar archive with patched jline.ConsoleRunner class.
 do-build:
-.ifdef(WITH_JLINEPATCH)
+.if ${PORT_OPTIONS:MJLINEPATCH}
 	${JAVAC} -classpath ${JLINEJAR} \
 		${WRKSRC}/src/src/main/java/jline/ConsoleRunner.java
 	${JAR} uvf ${JLINEJAR} -C ${WRKSRC}/src/src/main/java \
@@ -36,7 +33,7 @@ do-install:
 	${INSTALL_DATA} ${JLINEJAR} ${JAVAJARDIR}
 	${LN} -nfs ${JAVAJARDIR}/jline-${PORTVERSION}.jar \
 		   ${JAVAJARDIR}/jline.jar
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	${CP} -R ${WRKSRC}/apidocs ${WRKSRC}/examples ${DOCSDIR}
 	${INSTALL_DATA} ${FILESDIR}/JLineCompleter.py ${DOCSDIR}/examples
@@ -64,4 +61,4 @@ plist:
 		${ECHO_CMD} "@dirrm %%DOCSDIR%%" ;	\
 	) | ${SED} -e 's/\.\//%%DOCSDIR%%\//' -e 's/^/%%PORTDOCS%%/' >>${PLIST}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/libdispatch/Makefile b/devel/libdispatch/Makefile
index 5109cfbc0735..d84263b4bac2 100644
--- a/devel/libdispatch/Makefile
+++ b/devel/libdispatch/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:		libdispatch
-# Date created:					2009-09-23
-# Whom:						stas
-#
+# Created by: stas
 # $FreeBSD$
-#
 
 PORTNAME=	libdispatch
 PORTVERSION=	210
@@ -22,7 +18,9 @@ USE_LDCONFIG=	yes
 # This is needed because PIC support check in autoconf could fail for clang otherwise.
 CONFIGURE_ENV=	lt_cv_prog_compiler_pic_works=yes
 
-OPTIONS=	CLANG "Build with LLVM/Clang (required for blocks support)" on
+OPTIONS_DEFINE=	CLANG
+OPTIONS_DEFAULT=	CLANG
+CLANG_DESC=	Build with LLVM/Clang (required for blocks support)
 
 MAN3=	dispatch.3 dispatch_after.3 dispatch_api.3 dispatch_apply.3 \
 	dispatch_async.3 dispatch_benchmark.3 dispatch_group_create.3 \
@@ -92,7 +90,7 @@ BROKEN=		Does not link on sparc64-9
 .endif
 .endif
 
-.if !defined(WITHOUT_CLANG)
+.if ${PORT_OPTIONS:MCLANG}
 . if ${OSVERSION} < 900024
 BUILD_DEPENDS+=	clang:${PORTSDIR}/lang/clang \
 		${LOCALBASE}/lib/libBlocksRuntime.so:${PORTSDIR}/devel/compiler-rt
diff --git a/devel/libmcs/Makefile b/devel/libmcs/Makefile
index 08244f94ffff..f00806a5758c 100644
--- a/devel/libmcs/Makefile
+++ b/devel/libmcs/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	libmcs
-# Date created:				27th February 2007
-# Whom:					Oliver Lehmann <oliver@FreeBSD.org>
-#
+# Created by: Oliver Lehmann <oliver@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libmcs
 PORTVERSION=	0.7.2
@@ -17,16 +13,17 @@ COMMENT=	A BSD licenced configuration database system
 
 LIB_DEPENDS=	mowgli.2:${PORTSDIR}/devel/libmowgli
 
-OPTIONS=	GCONF	"Enable gconf support"		on
+OPTIONS_DEFINE=	GCONF
+OPTIONS_DEFAULT=	GCONF
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USE_GMAKE=	yes
 USE_GNOME=	pkgconfig
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_GCONF)
+.if ${PORT_OPTIONS:MGCONF}
 USE_GNOME+=	gconf2
 CONFIGURE_ARGS+=--enable-gconf
 PLIST_SUB=	GCONF=""
@@ -39,4 +36,4 @@ post-patch:
 	@${REINPLACE_CMD} 's|$${libdir}/pkgconfig|$${prefix}/libdata/pkgconfig|g' \
 		${WRKSRC}/Makefile
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/libowfat/Makefile b/devel/libowfat/Makefile
index 37abbfb51fd6..4040108459c6 100644
--- a/devel/libowfat/Makefile
+++ b/devel/libowfat/Makefile
@@ -1,9 +1,5 @@
-# Ports collection Makefile for: libowfat
-# Date created:			Feb 21, 2004
-# Whom:				Thomas-Martin Seck <tmseck@netcologne.de>
-#
+# Created by: Thomas-Martin Seck <tmseck@netcologne.de>
 # $FreeBSD$
-#
 
 PORTNAME=	libowfat
 PORTVERSION=	0.29
@@ -19,13 +15,14 @@ ALL_TARGET=	dep all
 
 MAKEFILE=	GNUmakefile
 
-OPTIONS=	LIBOWFAT_OPTIMIZED_CFLAGS "Use optimized CFLAGS" on
+OPTIONS_DEFINE=	OPTIMIZED_CFLAGS DOCS
+OPTIONS_DEFAULT=	OPTIMIZED_CFLAGS
 
 .include <bsd.port.pre.mk>
 
 MAKE_ENV+=	INSTALL="${INSTALL}"
 
-.if defined(WITH_LIBOWFAT_OPTIMIZED_CFLAGS)
+.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
 CFLAGS+=	-O2 -fomit-frame-pointer
 .endif
 
@@ -53,7 +50,7 @@ post-patch:
 	${REINPLACE_CMD} -e '56s|return ||' ${WRKSRC}/CAS.h
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif
diff --git a/devel/lxr/Makefile b/devel/lxr/Makefile
index f1529ff9a86c..f4922809c79f 100644
--- a/devel/lxr/Makefile
+++ b/devel/lxr/Makefile
@@ -1,9 +1,5 @@
-# Ports collection makefile for:	lxr
-# Date created:				11 Dec 2008
-# Whom:					Eygene Ryabinkin
-#
+# Created by: Eygene Ryabinkin
 # $FreeBSD$
-#
 
 PORTNAME=	lxr
 PORTVERSION=	0.10.2
@@ -23,8 +19,10 @@ PATCH_STRIP=	-p1
 USE_PERL5=	yes
 NO_BUILD=	yes
 
-OPTIONS=	POSTGRESQL	"Enable PostgreSQL support"		on \
-		MYSQL		"Enable MySQL support (untested)"	off
+OPTIONS_DEFINE=	DOCS
+OPTIONS_SINGLE=	DB
+OPTIONS_SINGLE_DB=	PGSQL MYSQL
+OPTIONS_DEFAULT=	PGSQL
 
 # Name prefix for database tables, indexes, sequences and other stuff.
 DB_PREFIX=	lxr
@@ -44,23 +42,19 @@ PLIST_SUB+=	LXRTOPDIR=${LXRTOPDIR:S!^${PREFIX}/!!}
 SUB_LIST+=	LXRDIR=${LXRDIR}
 SUB_FILES+=	upgrade-0.9.10-postgres upgrade-0.9.10-mysql
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_POSTGRESQL) && defined(WITH_MYSQL)
-IGNORE=		you must choose only one database backend
-.endif
-
-.if defined(WITH_POSTGRESQL)
+.if ${PORT_OPTIONS:MPGSQL}
 BUILD_DEPENDS+=	p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg
 MSG_FILES+=	pkg_message.postgresql
 DB_DRIVER=	Pg
-.endif # defined(WITH_POSTGRESQL)
+.endif # ${PORT_OPTIONS:MPGSQL}
 
-.if defined(WITH_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
 BUILD_DEPENDS+=	p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
 MSG_FILES+=	pkg_message.mysql
 DB_DRIVER=	mysql
-.endif # defined(WITH_MYSQL)
+.endif # ${PORT_OPTIONS:MMYSQL}
 
 MSG_FILES+=	pkg_message
 
@@ -111,12 +105,12 @@ do-install:
 .for f in ${LXR_CONF}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${LXRDIR}
 .endfor # ${LXR_CONF}
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 .for f in ${LXR_DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
 .endfor # ${LXR_DOCS}
-.endif # !defined(NOPORTDOCS)
+.endif # ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${PREFIX}/${SITE_PERL_REL}
 	${INSTALL_DATA} ${WRKSRC}/Local.pm ${PREFIX}/${SITE_PERL_REL}
 	${INSTALL_DATA} ${WRKSRC}/LXRversion.pm ${PREFIX}/${SITE_PERL_REL}
@@ -134,4 +128,4 @@ post-install:
 	@${CAT} ${WRKDIR}/${f}
 .endfor # ${MSG_FILES}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/mono-addins/Makefile b/devel/mono-addins/Makefile
index 43c008043bcf..010aa572739d 100644
--- a/devel/mono-addins/Makefile
+++ b/devel/mono-addins/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	mono-addins
-# Date created:				Aug 25 2008
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	mono-addins
 PORTVERSION=	0.6.2
@@ -24,7 +19,8 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomehack pkgconfig
 MAKE_JOBS_UNSAFE=	yes
 
-OPTIONS=	GTK2 "Enable GTK support" on
+OPTIONS_DEFINE=	GTK2
+OPTIONS_DEFAULT=	GTK2
 
 MAN1=		mautil.1
 
@@ -33,7 +29,7 @@ PLIST_SUB+=	VER=0.6.0
 .include <bsd.port.pre.mk>
 .include "${.CURDIR}/../../lang/mono/bsd.mono.mk"
 
-.if !defined(WITHOUT_GTK2) && !defined(WITHOUT_GUI) && !defined(WITHOUT_X11)
+.if ${PORT_OPTIONS:MGTK2} && ${PORT_OPTIONS:MGUI} && ${PORT_OPTIONS:MX11}
 USE_GNOME+=	gtksharp20
 CONFIGURE_ARGS+=	--enable-gui
 PLIST_SUB+=	OPT_GTK2=""
diff --git a/devel/monodevelop/Makefile b/devel/monodevelop/Makefile
index 7bd8faa0187f..4e0af389ee39 100644
--- a/devel/monodevelop/Makefile
+++ b/devel/monodevelop/Makefile
@@ -1,10 +1,5 @@
-# New ports collection makefile for:    	monodevelop
-# Date created:         			20040906
-# Whom:				Tom McLaughlin <tmclaugh@sdf.lonestar.org>
-#
+# Created by: Tom McLaughlin <tmclaugh@sdf.lonestar.org>
 # $FreeBSD$
-#   $Id: Makefile,v 1.48 2007/11/07 20:30:04 killfill Exp $
-#
 
 PORTNAME=	monodevelop
 PORTVERSION=	3.0.2
@@ -29,16 +24,17 @@ MAN1=		mdtool.1 monodevelop.1
 USES=		gettext
 INSTALLS_ICONS=	yes
 
-OPTIONS=	MONOEXT "Enable extensions for Mono development" on \
-		GIT "Enable git support" on \
-		SVN "Enable subversion support" on
+OPTIONS_DEFINE=	MONOEXT GIT SVN
+OPTIONS_DEFAULT=	MONOEXT GIT SVN
+MONOEXT_DESC=	Extensions for Mono development
+GIT_DESC=	git support
 
 # Restrict to stable (even) versions, indicated by the second component.
 PORTSCOUT=	limitw:1,even
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_MONOEXT)
+.if ${PORT_OPTIONS:MMONOEXT}
 CONFIGURE_ARGS+=--enable-monoextensions
 PLIST_SUB+=	MONOEXT=""
 .else
@@ -46,7 +42,7 @@ CONFIGURE_ARGS+=--disable-monoextensions
 PLIST_SUB+=	MONOEXT="@comment "
 .endif
 
-.if !defined(WITHOUT_GIT)
+.if ${PORT_OPTIONS:MGIT}
 RUN_DEPENDS+=	git:${PORTSDIR}/devel/git
 CONFIGURE_ARGS+=--enable-git
 PLIST_SUB+=	GIT=""
@@ -55,7 +51,7 @@ CONFIGURE_ARGS+=--disable-git
 PLIST_SUB+=	GIT="@comment "
 .endif
 
-.if !defined(WITHOUT_SVN)
+.if ${PORT_OPTIONS:MSVN}
 RUN_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
 CONFIGURE_ARGS+=--enable-subversion
 PLIST_SUB+=	SVN=""
@@ -77,4 +73,4 @@ post-install:
 	@-update-desktop-database
 
 .include "${.CURDIR}/../../lang/mono/bsd.mono.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>