3 files changed, 28 insertions, 38 deletions

diff --git a/math/kash3/Makefile b/math/kash3/Makefile
index 5b24daa7a3cd..ba539b230633 100644
--- a/math/kash3/Makefile
+++ b/math/kash3/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	kash3
-# Date created:		2006-02-26
-# Whom:			Nicola Vitale	<nivit@email.it>
-#
+# Created by: Nicola Vitale	<nivit@email.it>
 # $FreeBSD$
-#
 
 PORTNAME=	kash3
 PORTVERSION=	2008.07.31
@@ -20,7 +16,9 @@ RUN_DEPENDS=	curl:${PORTSDIR}/ftp/curl
 NO_CDROM=	not for commercial distribution or use
 NO_BUILD=	yes
 
-OPTIONS=	OPTLIB	"Install optional functions library" on
+OPTIONS_DEFINE=		OPTLIB DOCS
+OPTIONS_DEFAULT=	OPTLIB
+OPTLIB_DESC=		Install optional functions library
 
 PLIST_SUB=	OPTLIB=${OPTLIB}
 
@@ -35,16 +33,16 @@ FIND_DATA=	-type f -mindepth 1 -exec ${INSTALL_DATA} {} ${DATADIR}/{} \;
 FIND_DIRS=	-type d	-exec ${MKDIR} ${DATADIR}/{} \;
 FIND_HERE=	data gap lib
 
-.if !defined(NOPORTDOCS)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
 FIND_HERE+=	html pdf
 .endif
 
 LN_OPTS=	-sf
 ELFTYPE=	Linux
 
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_OPTLIB)
+.if ${PORT_OPTIONS:MOPTLIB}
 DISTFILES+=	${PORTNAME:U}-lib-archindep-${PORTVERSION:S|.|-|g}.tar.bz2
 OPTLIB=
 .else
@@ -53,7 +51,7 @@ OPTLIB=	"@comment "
 
 do-install:
 	${MKDIR} ${DATADIR};
-.if defined(WITH_OPTLIB)
+.if ${PORT_OPTIONS:MOPTLIB}
 	cd ${WRKDIR}/${PORTNAME:U}-lib-archindep-${PORTVERSION:S|.|-|g}; \
 	${COPYTREE_SHARE} . ${DATADIR}
 .endif
@@ -63,9 +61,9 @@ do-install:
 	${BRANDELF} -t ${ELFTYPE} ${PORTNAME}; \
 	${INSTALL_PROGRAM} ${PORTNAME} ${DATADIR}/${PORTNAME};
 	${INSTALL_SCRIPT} ${WRKDIR}/${SUB_FILES} ${PREFIX}/bin/${PORTNAME}
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}; \
 	${MV} ${DATADIR}/html ${DATADIR}/pdf ${DOCSDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/math/parmetis/Makefile b/math/parmetis/Makefile
index ce3ee812a496..b342345827ea 100644
--- a/math/parmetis/Makefile
+++ b/math/parmetis/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	ParMETIS
-# Date created:         19 May 99
-# Whom:                 Eoin Lawless (eoin@maths.tcd.ie)
-#
+# Created by: Eoin Lawless (eoin@maths.tcd.ie)
 # $FreeBSD$
-#
 
 PORTNAME=	ParMetis
 PORTVERSION=	4.0
@@ -21,7 +17,8 @@ LICENSE_NAME=	University of Minnesota METIS License
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 LICENSE_PERMS=	auto-accept
 
-OPTIONS=	OPENMPI "Use openmpi instead of mpich2" off
+OPTIONS_DEFINE=	OPENMPI DOCS
+OPENMPI_DESC=	Use openmpi instead of mpich2
 
 USE_CMAKE=	yes
 USE_GMAKE=	yes
@@ -31,9 +28,9 @@ PLIST_FILES=	include/parmetis/parmetis.h \
 		lib/parmetis/libmetis.a lib/parmetis/libparmetis.a
 PLIST_DIRS=	include/parmetis lib/parmetis
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_OPENMPI)
+.if ${PORT_OPTIONS:MOPENMPI}
 BUILD_DEPENDS+=	${LOCALBASE}/mpi/openmpi/bin/mpicc:${PORTSDIR}/net/openmpi
 RUN_DEPENDS+=	${LOCALBASE}/mpi/openmpi/bin/mpirun:${PORTSDIR}/net/openmpi
 MPICC=		${LOCALBASE}/mpi/openmpi/bin/mpicc
@@ -60,9 +57,9 @@ do-install:
 	@${MKDIR} ${PREFIX}/lib/parmetis
 	${INSTALL_DATA} ${WRKSRC}/build/libmetis/libmetis.a ${PREFIX}/lib/parmetis
 	${INSTALL_DATA} ${WRKSRC}/build/libparmetis/libparmetis.a ${PREFIX}/lib/parmetis
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/manual/manual.pdf ${DOCSDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/math/pspp/Makefile b/math/pspp/Makefile
index 0966e33dfdf4..39e64483ada8 100644
--- a/math/pspp/Makefile
+++ b/math/pspp/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   pspp
-# Date created:                        22 Apr 2000
-# Whom:                                Andrew L. Neporada <andrew@chg.ru>
-#
+# Created by: Andrew L. Neporada <andrew@chg.ru>
 # $FreeBSD$
-#
 
 PORTNAME=	pspp
 PORTVERSION=	0.6.2
@@ -17,8 +13,7 @@ COMMENT=	Program for statistical analysis of sampled data
 LIB_DEPENDS=	plot.4:${PORTSDIR}/graphics/plotutils \
 		gslcblas.0:${PORTSDIR}/math/gsl
 
-OPTIONS=	GUI "Build the PSPPIRE gui" off \
-		PGSQL "Compile in PostgreSQL capability" off
+OPTIONS_DEFINE=	GUI PGSQL
 
 USE_GNOME=	libxml2
 USE_PERL5_BUILD=yes
@@ -32,17 +27,17 @@ INFO=		pspp pspp-dev
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITHOUT_NLS)
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.else
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
+.else
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB+=	NLS="@comment "
 .endif
 
-.if defined(WITH_GUI)
+.if ${PORT_OPTIONS:MGUI}
 LIB_DEPENDS+=	gladeui-1:${PORTSDIR}/devel/glade3
 RUN_DEPENDS+=	yelp:${PORTSDIR}/x11/yelp
 USE_GNOME+=	libglade2
@@ -53,7 +48,7 @@ CONFIGURE_ARGS+=	--without-gui
 PLIST_SUB+=	GUI="@comment "
 .endif
 
-.if defined(WITH_PGSQL)
+.if ${PORT_OPTIONS:MPGSQL}
 USE_PGSQL=	yes
 .else
 CONFIGURE_ARGS+=	--without-libpq
@@ -65,4 +60,4 @@ post-patch:
 post-install:
 	@${TOUCH} ${PREFIX}/lib/pspp/.keep_me
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>