6 files changed, 62 insertions, 79 deletions

diff --git a/lang/f2c/Makefile b/lang/f2c/Makefile
index 0a54713ba90c..132a86a6f29b 100644
--- a/lang/f2c/Makefile
+++ b/lang/f2c/Makefile
@@ -1,9 +1,5 @@
-# Ports collection makefile for:	f2c-freebsd
-# Date created:				28 DEC 1998
-# Whom:					Steven G. Kargl
-#
+# Created by: Steven G. Kargl
 # $FreeBSD$
-#
 
 PORTNAME=	f2c
 PORTVERSION=	20060810
@@ -24,13 +20,16 @@ GUNZIP_CMD=	minigzip -d
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 
-OPTIONS=	LEAD_0 "Print with leading zeros" Off
+OPTIONS_DEFINE=	LEAD_0
+LEAD_0_DESC=	Print with leading zeros
 
 
 # Set FCNAME to the name of the Fortran 77 / F2C wrapper.
 FCNAME?=	fc
 PLIST_SUB=	FCNAME=${FCNAME}
-.if defined(WITH_FC)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MFC}
 PLIST_SUB+=	FC=""
 .else
 PLIST_SUB+=	FC="@comment "
@@ -53,7 +52,7 @@ pre-patch:
 
 pre-configure:
 	${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/fc
-.if !defined(WITHOUT_LEAD_0)
+.if ${PORT_OPTIONS:MLEAD_0}
 	${REINPLACE_CMD} -e 's|CFLAGS += -fPIC|CFLAGS += -fPIC -DWANT_LEAD_0|' ${WRKSRC}/libf2c/Makefile
 	${REINPLACE_CMD} -e 's|#CFLAGS = -O|CFLAGS = -O -DWANT_LEAD_0|' ${WRKSRC}/src/Makefile
 .endif
@@ -71,7 +70,7 @@ do-build:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/f2c ${PREFIX}/bin
-.if defined(WITH_FC)
+.if defined(WITH_MFC)
 	${INSTALL_SCRIPT} ${WRKSRC}/fc ${PREFIX}/bin/${FCNAME}
 .endif
 	${INSTALL_DATA} ${WRKSRC}/src/f2c.h ${PREFIX}/include
@@ -81,7 +80,7 @@ do-install:
 	${LN} -sf libf2c.so.2 ${PREFIX}/lib/libf2c.so
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
 	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
diff --git a/lang/harbour/Makefile b/lang/harbour/Makefile
index 0af4fbf796a6..2457f3bd8fad 100644
--- a/lang/harbour/Makefile
+++ b/lang/harbour/Makefile
@@ -15,11 +15,8 @@ LIB_DEPENDS=	slang.2:${PORTSDIR}/devel/libslang2\
 BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-OPTIONS=	MYSQL "MySQL database support" off \
-		SQLITE3 "SQLite 3.x database support" off \
-		FIREBIRD "Firebird (Interbase) database support" off \
-		PGSQL "PostgreSQL database support" off \
-		CLANG "Build harbour with Clang (gcc if disabled)" off
+OPTIONS_DEFINE=	MYSQL SQLITE FIREBIRD PGSQL CLANG
+CLANG_DESC=	Build harbour with Clang (gcc if disabled)
 
 NOT_FOR_ARCHS=	sparc64
 NOT_FOR_ARCHS_REASON=	does not compile on sparc64: assertion failed
@@ -84,15 +81,15 @@ MAKE_ENV=	HB_ARCHITECTURE=${HB_ARCH} \
 		HB_USER_CFLAGS=${HB_USER_CFLAGS} \
 		HB_USER_LDFLAGS=${HB_USER_LDFLAGS}
 
-.if !defined(NOPORTDOCS)
+.include <bsd.port.pre.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
 MAKE_ENV+=	HB_INSTALL_DOC=${DOCSDIR}
 .else
 MAKE_ENV+=	HB_INSTALL_DOC=no
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_CLANG)
+.if ${PORT_OPTIONS:MCLANG}
 HB_COMPILER=	clang
 .if ${OSVERSION} < 900033
 BUILD_DEPENDS+=	clang:${PORTSDIR}/lang/clang
@@ -102,14 +99,14 @@ HB_COMPILER=	gcc
 USE_GCC=	4.2+
 .endif
 
-.if defined(WITH_FIREBIRD)
+.if ${PORT_OPTIONS:MFIREBIRD}
 USE_FIREBIRD=	yes
 MAKE_ENV+=	HB_WITH_FIREBIRD=nolocal
 .else
 MAKE_ENV+=	HB_WITH_FIREBIRD=no
 .endif
 
-.if defined(WITH_SQLITE3)
+.if ${PORT_OPTIONS:MSQLITE3}
 LIB_DEPENDS+=	sqlite3:${PORTSDIR}/databases/sqlite3
 MAKE_ENV+=	HB_WITH_SQLITE3=nolocal
 PLIST_SUB+=	WITH_SQLITE3=""
@@ -118,14 +115,14 @@ MAKE_ENV+=	HB_WITH_SQLITE3=no
 PLIST_SUB+=	WITH_SQLITE3="@comment "
 .endif
 
-.if defined(WITH_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
 USE_MYSQL=	yes
 MAKE_ENV+=	HB_WITH_MYSQL=nolocal
 .else
 MAKE_ENV+=	HB_WITH_MYSQL=no
 .endif
 
-.if defined(WITH_PGSQL)
+.if ${PORT_OPTIONS:MPGSQL}
 USE_PGSQL=	yes
 MAKE_ENV+=	HB_WITH_PGSQL=nolocal
 .else
diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile
index d95f36427e81..393dfe9b10d6 100644
--- a/lang/ocaml/Makefile
+++ b/lang/ocaml/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	ocaml
-# Date created:		24 December 1996
-# Whom:			Kiriyama Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
-#
+# Created by: Kiriyama Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
 # $FreeBSD$
-#
 
 PORTNAME=	ocaml
 PORTVERSION=	3.12.1
@@ -28,11 +24,11 @@ MAKE_JOBS_UNSAFE=	yes
 
 CONFIGURE_ARGS=	-verbose -prefix "${PREFIX}" -cc "${CC}" -as "${AS}" \
 		-aspp "${CC} -c" -partialld "${LD} -r"
-OPTIONS=	X11	"Build with X11 support" on \
-		TK	"Build LablTk library (requires X11 support)" on \
-		THREADS	"Build with Posix threads support" on \
-		CMP_LIB	"Install compiler's libraries" off \
-		OPT_DEF	"Use system-optimized binaries by default" off
+OPTIONS_DEFINE=	X11 TK THREADS CMP_LIB OPT_DEF
+OPTIONS_DEFAULT=	X11 TK THREADS
+TK_DESC=	LablTk library (requires X11 support)
+CMP_LIB_DESC=	Install compiler's libraries
+OPT_DEF_DESC=	Use system-optimized binaries by default
 
 MODOPT=		camlp4o camlp4r ocamlc ocamldep ocamldoc ocamllex ocamlopt
 PATTERN=	[[:space:]]*(do|then)?[[:space:]]*)(\$$\(CP\)|cp)([[:space:]]
@@ -51,7 +47,7 @@ PLIST_SUB+=	PROF=""
 
 .include "${FILESDIR}/manfiles"
 
-.if !defined(WITHOUT_THREADS)
+.if ${PORT_OPTIONS:MTHREADS}
 PLIST_SUB+=	THREADS=""
 THR_CPP=	${PTHREAD_CFLAGS}
 THR_LD=		${PTHREAD_LIBS}
@@ -62,7 +58,7 @@ THR_LD=		#empty
 CONFIGURE_ARGS+=-no-pthread
 .endif
 
-.if !defined(WITHOUT_X11)
+.if ${PORT_OPTIONS:MX11}
 PLIST_SUB+=	X11=""
 USE_XORG=	x11
 CONFIGURE_ARGS+=-x11include ${LOCALBASE}/include -x11lib ${LOCALBASE}/lib
@@ -74,9 +70,9 @@ CONFLICTS+=	ocaml-[0-9]* ocaml-notk-[0-9]*
 CONFIGURE_ARGS+=-no-x11
 .endif
 
-.if defined(WITHOUT_TK)
+.if ! ${PORT_OPTIONS:MTK}
 PLIST_SUB+=	TK="@comment "
-.if !defined(WITHOUT_X11)
+.if ${PORT_OPTIONS:MX11}
 SFX=		-notk
 CONFLICTS+=	ocaml-[0-9]* ocaml-nox11-[0-9]*
 .endif
@@ -115,7 +111,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|gcc|$$(CC)|' \
 		${WRKSRC}/*/Makefile \
 		${WRKSRC}/*/*/Makefile
-.if defined(WITH_TK)
+.if ${PORT_OPTIONS:MTK}
 	@${REINPLACE_CMD} -e 's|/usr/bin/wish|${WISH}|' \
 		${WRKSRC}/otherlibs/labltk/examples_labltk/hello.tcl
 .endif
@@ -146,7 +142,7 @@ check test: install
 
 post-install:
 	@${TOUCH} ${PREFIX}/lib/ocaml/ocamldoc/custom/.keep
-.if !defined(WITHOUT_TK)
+.if ${PORT_OPTIONS:MTK}
 	@${MKDIR} ${EXAMPLESDIR}
 	@(cd ${WRKSRC}/otherlibs/labltk && \
 		${COPYTREE_SHARE} examples_labltk ${EXAMPLESDIR} \
@@ -164,7 +160,7 @@ post-install:
 	@${CHMOD} 644 ${PREFIX}/lib/ocaml/ld.conf
 
 # Do we want .opt version of tools to be the default ?
-.if defined(WITH_OPT_DEF)
+.if ${PORT_OPTIONS:MOPT_DEF}
 . for module in ${MODOPT}
 #	First, we save bytecode version
 	@${MV} ${PREFIX}/bin/${module} ${PREFIX}/bin/${module}.byte
@@ -177,7 +173,7 @@ post-install:
 .endif
 
 # Add compiler's libs if required
-.if defined(WITH_CMP_LIB)
+.if ${PORT_OPTIONS:MCMP_LIB}
 	@${MKDIR}  ${PREFIX}/lib/ocaml/compiler-lib
 	@${INSTALL_DATA} ${WRKSRC}/utils/*.cm* ${PREFIX}/lib/ocaml/compiler-lib
 	@${INSTALL_DATA} ${WRKSRC}/utils/*.o ${PREFIX}/lib/ocaml/compiler-lib
diff --git a/lang/sml-nj-devel/Makefile b/lang/sml-nj-devel/Makefile
index 1a16af72ad64..a4fb53598e14 100644
--- a/lang/sml-nj-devel/Makefile
+++ b/lang/sml-nj-devel/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: sml/nj
-# Date created:        7 July 1998
-# Whom:                jkoshy
-#
+# Created by: jkoshy
 # $FreeBSD$
-#
 
 PORTNAME=	smlnj
 PORTVERSION=	110.71
@@ -23,9 +19,10 @@ USE_GMAKE=	yes
 
 ONLY_FOR_ARCHS=	i386
 
-OPTIONS=	EVERYTHING "install everything from the SML/NJ distribution" off \
-		RECOMPILE  "recompile the SML compiler - implies EVERYTHING" off \
-		POSITION64 "use 64bit fi""le positions - implies RECOMPILE"  off
+OPTIONS_DEFINE=	EVERYTHING RECOMPILE POSITION64
+EVERYTHING_DESC=	install everything from the SML/NJ distribution
+RECOMPILE_DESC=		recompile the SML compiler - implies EVERYTHING
+POSITION64_DESC=	use 64bit fi""le positions - implies RECOMPILE
 
 SUB_FILES=	pkg-install
 SUB_LIST=	EXEBINDIR=${MLBINRELATIVE} EXENAMES="${MLEXE}"
@@ -45,18 +42,18 @@ DISTFILES+=	MLRISC.tgz ckit.tgz cml.tgz heap2asm.tgz ml-lpt.tgz \
 
 PLIST_SUB=	MLARCH=${MLARCH}
 
-.if defined(WITH_POSITION64)
+.if ${PORT_OPTIONS:MPOSITION64}
 WITH_RECOMPILE?=	${WITH_POSITION64}
 CMB_COMMAND=	'(\#set o CMB.symval) "USE_64_BIT_POSITIONS" (SOME 1);'
 .else
 CMB_COMMAND=
 .endif
 
-.if defined(WITH_RECOMPILE)
+.if ${PORT_OPTIONS:MRECOMPILE}
 WITH_EVERYTHING?=	${WITH_RECOMPILE}
 .endif
 
-.if defined(WITH_EVERYTHING)
+.if ${PORT_OPTIONS:MEVERYTHING}
 DISTFILES+=	cm.tgz compiler.tgz eXene.tgz ml-burg.tgz \
 		nlffi.tgz pgraph.tgz smlnj-c.tgz system.tgz
 .endif
@@ -76,7 +73,7 @@ MLSRCS+=	${MLROOT}/${srcdir}
 MLTARGETS=	heap2asm
 MLEXE=		heap2exec ml-antlr ml-build ml-lex ml-makedepend \
 		ml-ulex ml-yacc sml
-.if defined(WITH_EVERYTHING)
+.if ${PORT_OPTIONS:MEVERYTHING}
 MLTARGETS+=	eXene ml-burg ml-nlffi-lib ml-nlffigen \
 		mlrisc-tools nowhere pgraph-util src-smlnj
 MLEXE+=		ml-burg ml-nlffigen nowhere
@@ -89,7 +86,7 @@ MLPLISTFILES=	${.CURDIR}/pkg-plist ${FILESDIR}/plist-everything \
 
 pre-fetch:
 	@${ECHO}
-.if !defined(WITH_EVERYTHING)
+.if ! ${PORT_OPTIONS:MEVERYTHING}
 	@${ECHO} 'Use make WITH_EVERYTHING=yes to also build/install'
 	@${ECHO} ' eXene (X Windows toolkit),'
 	@${ECHO} ' ml-burg (tree transformer),'
@@ -97,11 +94,11 @@ pre-fetch:
 	@${ECHO} ' nowhere (preprocessor for conditional patterns),'
 	@${ECHO} ' various libraries, and all the sources.'
 .endif
-.if !defined(WITH_RECOMPILE)
+.if ! ${PORT_OPTIONS:MRECOMPILE}
 	@${ECHO} 'Use make WITH_RECOMPILE=yes to recompile the compiler.'
 	@${ECHO} ' This implies WITH_EVERYTHING.'
 .endif
-.if !defined(WITH_POSITION64)
+.if ! ${PORT_OPTIONS:MPOSITION64}
 	@${ECHO} 'Use make WITH_POSITION64=yes to use 64bit file positions.'
 	@${ECHO} ' This implies WITH_RECOMPILE.'
 .endif
@@ -128,7 +125,7 @@ do-configure:
 # Recompilation requires ml-lex and ml-yacc. All requested targets
 # will be built later using the recompiled core system after
 # removing targets.customized. See "do-build" below.
-.if defined(WITH_RECOMPILE)
+.if ${PORT_OPTIONS:MRECOMPILE}
 	( ${ECHO_CMD} "request	ml-yacc" && \
 	  ${ECHO_CMD} "request	ml-lex" && \
 	  ${ECHO_CMD} "request	ml-lex-mllex-tool" && \
@@ -141,7 +138,7 @@ do-configure:
 # a subsequent make install.
 # See base/system/README for information on recompiling the compiler.
 
-.if defined(WITH_RECOMPILE)
+.if ${PORT_OPTIONS:MRECOMPILE}
 RECOMPILEDIR=	base/system
 .else
 RECOMPILEDIR=
@@ -159,7 +156,7 @@ MLSTANDARDPATCHDIRS_CMD=	cd ${FILESDIR} && \
 			  do if ${LS} do-patch-$${srcdir}_* 1>&- 2>&- ; \
 			     then ${ECHO_CMD} -n $${srcdir} " " ; break ; fi ; \
 			  done ) || ${TRUE}
-.if defined(WITH_EVERYTHING)
+.if ${PORT_OPTIONS:MEVERYTHING}
 MLSOURCEPATCHES_CMD=	cd ${FILESDIR} && \
 			( ${LS} do-patch-* 2>&- || \
 			  ${TRUE} )
@@ -176,7 +173,7 @@ do-build:
 	MLSTANDARDPATCHDIRS=`${MLSTANDARDPATCHDIRS_CMD}` \
 	MLSOURCEPATCHES=`${MLSOURCEPATCHES_CMD}` \
 	./config/install.sh
-.if defined(WITH_RECOMPILE)
+.if ${PORT_OPTIONS:MRECOMPILE}
 	-${RM} ${WRKDIR}/config/targets.customized
 	@${ECHO} '(* Recompiling the core system: *)'
 	cd ${WRKDIR}/${RECOMPILEDIR} && ( \
@@ -205,9 +202,9 @@ do-build:
 # Nowadays PLIST has to be computed before installation. We do it in
 # "pre-install" because source extraction happens during "build".
 
-.if defined(WITH_EVERYTHING)
+.if ${PORT_OPTIONS:MEVERYTHING}
 MLNOINSTALL=	.cm
-.if defined(WITH_RECOMPILE)
+.if ${PORT_OPTIONS:MRECOMPILE}
 MLNOINSTALL+=	sml.bin.${MLARCH}-unix sml.boot.${MLARCH}-unix \
 		sml.lib sml.${MLARCH}-bsd
 .endif
@@ -248,7 +245,7 @@ pre-install:
 # In case of recompilation, installml installs the sml heap and the
 # libraries built during compiler bootstrap to ${MLBIN} and ${MLLIB}.
 
-.if defined(WITH_EVERYTHING)
+.if ${PORT_OPTIONS:MEVERYTHING}
 MLSRCEXCLUDES=
 .for excl in ${MLNOINSTALL}
 MLSRCEXCLUDES+=	--exclude "${excl}"
@@ -257,7 +254,7 @@ MLSRCEXCLUDES+=	--exclude "${excl}"
 
 do-install:
 	${MKDIR} "${MLROOT}"
-.if !defined(WITH_RECOMPILE)
+.if ! ${PORT_OPTIONS:MRECOMPILE}
 	cd ${WRKDIR} && unset PWD && \
 	FILESDIR="${FILESDIR}" PATCH="${PATCH}" PATCH_ARGS="${PATCH_ARGS}" \
 	INSTALLDIR="${MLROOT}" ./config/install.sh
@@ -281,7 +278,7 @@ do-install:
 	( eval $${MLARCHOPSYS} ; \
 	${STRIP_CMD} "${MLBIN}/.run/run.$${ARCH}-$${OPSYS}" )
 	@${CHOWN} -R ${BINOWN}:${BINGRP} "${MLBIN}" "${MLLIB}"
-.if defined(WITH_EVERYTHING)
+.if ${PORT_OPTIONS:MEVERYTHING}
 	@${ECHO} '(* Cleaning base/runtime: *)'
 	cd ${WRKDIR}/base/runtime/objs && ${GMAKE} clean
 	@${ECHO} -n '(* Installing sources into ${MLROOT} ...'
diff --git a/lang/spidermonkey17/Makefile b/lang/spidermonkey17/Makefile
index 84ba0948cb25..ca6091ca605b 100644
--- a/lang/spidermonkey17/Makefile
+++ b/lang/spidermonkey17/Makefile
@@ -1,7 +1,4 @@
-# Ports collection makefile for:	spidermonkey
-# Date created:		Fri Apr 18, 2003
-# Whom:			Dan Rench <citric@cubicone.tmetic.com>
-#
+# Created by: Dan Rench <citric@cubicone.tmetic.com>
 # $FreeBSD$
 
 PORTNAME=	spidermonkey17
@@ -44,11 +41,11 @@ PLIST_FILES=	bin/js lib/libjs.so lib/libjs.so.1 ${JSH:S,^,include/,}
 WRKSRC=		${WRKDIR}/${SRC_DIR}
 EXTRACT_AFTER_ARGS= --exclude js/jsd
 
-OPTIONS=	UTF8 "Enable UTF8 support" Off
+OPTIONS_DEFINE=	UTF8
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_UTF8)
+.if ${PORT_OPTIONS:MUTF8}
 CFLAGS+=	-DJS_C_STRINGS_ARE_UTF8
 .endif
 
diff --git a/lang/tinypy/Makefile b/lang/tinypy/Makefile
index 4ae1bab04658..9d0239eeb6dc 100644
--- a/lang/tinypy/Makefile
+++ b/lang/tinypy/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	tinypy
-# Date created:		2009-02-26
-# Whom:			Marcin Cieslak <saper@SYSTEM.PL>
-#
+# Created by: Marcin Cieslak <saper@SYSTEM.PL>
 # $FreeBSD$
-#
 
 PORTNAME=	tinypy
 PORTVERSION=	1.1
@@ -22,11 +18,12 @@ PYDISTUTILS_NOEGGINFO=		yes
 PLIST_FILES=	bin/tinypy
 PORTEXAMPLES=	*
 
-OPTIONS=	PYGAME "Enable PyGame support (requires SDL)" off
+OPTIONS_DEFINE=	PYGAME
+PYGAME_DESC=	PyGame support (requires SDL)
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_PYGAME)
+.if ${PORT_OPTIONS:MPYGAME}
 PYDISTUTILS_BUILD_TARGET+=	pygame
 USE_SDL=	sdl
 .endif
@@ -42,7 +39,7 @@ do-configure:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/build/tinypy ${PREFIX}/bin
-.if !defined(NOPORTEXAMPLES) && defined(WITH_PYGAME)
+.if ${PORT_OPTIONS:MEXAMPLES} && ${PORT_OPTIONS:MPYGAME}
 	@${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/julia.py ${EXAMPLESDIR}
 .endif