4 files changed, 35 insertions, 49 deletions

diff --git a/math/liblbfgs/Makefile b/math/liblbfgs/Makefile
index f7c5aa25dce0..3a28783760f6 100644
--- a/math/liblbfgs/Makefile
+++ b/math/liblbfgs/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	liblbfgs
-# Date created:		2010-06-08
-# Whom:			Hung-Yi Chen <gaod@hychen.org>
-#
+# Created by: Hung-Yi Chen <gaod@hychen.org>
 # $FreeBSD$
-#
 
 PORTNAME=	liblbfgs
 PORTVERSION=	1.10
@@ -11,7 +7,7 @@ CATEGORIES=	math
 MASTER_SITES=	http://cloud.github.com/downloads/chokkan/liblbfgs/
 
 MAINTAINER=	gaod@hychen.org
-COMMENT=	A library of Limited-memory Broyden-Fletcher-Goldfarb-Shanno
+COMMENT=	Library of Limited-memory Broyden-Fletcher-Goldfarb-Shanno
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
@@ -19,16 +15,13 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	autoconf:env
 
-OPTIONS=	OPTIMIZED "Enable SSE2 optimization routines" Off
+OPTIONS_DEFINE=	OPTIMIZED
+OPTIMIZED_DESC=	SSE2 optimization routines
 
-.include <bsd.port.pre.mk>
-
-.if (${OSVERSION} < 700000)
-IGNORE=	does not install properly on 6.x
-.endif
+.include <bsd.port.options.mk>
 
 # Enable/disable compilation optimizations.
-.if defined(WITH_OPTIMIZED)
+.if ${PORT_OPTIONS:MOPTIMIZED}
 CONFIGURE_ARGS+=	--enable-sse2
 .endif
 
@@ -38,8 +31,8 @@ PLIST_FILES=	lib/liblbfgs-1.10.so.0.0 lib/liblbfgs.a lib//liblbfgs.la \
 PORTDOCS=	README INSTALL COPYING AUTHORS ChangeLog NEWS
 
 post-patch:
-.if defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${REINPLACE_CMD} -e 's/install-data-am$$//' ${WRKSRC}/Makefile.in
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/math/libtsnnls/Makefile b/math/libtsnnls/Makefile
index 534ac8bd468e..4ef61840ff4b 100644
--- a/math/libtsnnls/Makefile
+++ b/math/libtsnnls/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   libtsnnls
-# Date created:        18 October 2010
-# Whom:                Tz-Huan Huang <tzhuan@gmail.com>
-#
+# Created by: Tz-Huan Huang <tzhuan@gmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	libtsnnls
 PORTVERSION=	2.3.3
@@ -17,21 +13,22 @@ GNU_CONFIGURE=	yes
 USE_FORTRAN=	yes
 USE_LDCONFIG=	yes
 
-OPTIONS=	GOTOBLAS "Use gotoblas (conflict with USE_ATLAS)" off \
-		ATLAS "Use atlas (conflict with USE_GOTOBLAS)" off
+OPTIONS_DEFINE=	GOTOBLAS ATLAS
+GOTOBLAS_DESC=	Use gotoblas (conflict with USE_ATLAS)
+ATLAS_DESC=	Use atlas (conflict with USE_GOTOBLAS)
 # DMALLOC "Use dmalloc" off
 
 .include <bsd.port.options.mk>
 
 WITH_BLAS=reference
-.if defined(WITH_GOTOBLAS)
+.if ${PORT_OPTIONS:MGOTOBLAS}
 WITH_BLAS=gotoblas
-.elif defined(WITH_ATLAS)
+.elif ${PORT_OPTIONS:MATLAS}
 WITH_BLAS=atlas
 .endif
 
 # FIXME compiling error when using dmalloc
-#.if defined(WITH_DMALLOC)
+#.if ${PORT_OPTIONS:MDMALLOC}
 #CONFIGURE_ARGS+=--with-dmalloc
 #LIB_DEPENDS+=dmalloc.1:${PORTSDIR}/devel/dmalloc
 #.endif
diff --git a/math/py-symeig/Makefile b/math/py-symeig/Makefile
index 0119969db158..74ec48ea34e6 100644
--- a/math/py-symeig/Makefile
+++ b/math/py-symeig/Makefile
@@ -1,9 +1,5 @@
-# Ports collection makefile for:	Symeig
-# Date created:			September 10, 2008
-# Whom:				Li-Lun Wang <llwang@infor.org>
-#
+# Created by: Li-Lun Wang <llwang@infor.org>
 # $FreeBSD$
-#
 
 PORTNAME=	symeig
 PORTVERSION=	1.4
@@ -25,9 +21,12 @@ USE_FORTRAN=	yes
 USE_PYTHON=	2.4+
 USE_PYDISTUTILS=	yes
 
-OPTIONS=	ATLAS "Use optimized blas library" OFF
+OPTIONS_DEFINE=	ATLAS
+ATLAS_DESC=	Use optimized blas library
 
-.if defined(WITH_ATLAS)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MATLAS}
 LIB_DEPENDS+=	atlas.2:${PORTSDIR}/math/atlas
 .if !exists(${LOCALBASE}/lib/libalapack.a)
 IGNORE=		atlas needs to be built with WITH_STATIC for symeig to function properly
diff --git a/math/xblas/Makefile b/math/xblas/Makefile
index 5ccd37a5a470..0a5f8ee4e80a 100644
--- a/math/xblas/Makefile
+++ b/math/xblas/Makefile
@@ -1,10 +1,5 @@
-# ex:ts=8
-# Ports collection makefile for:	xblas
-# Date created:			5 January 2012
-# Whom:				bf@FreeBSD.org
-#
+# Created by: bf@FreeBSD.org
 # $FreeBSD$
-#
 
 PORTNAME=	xblas
 PORTVERSION=	1.0.248
@@ -25,8 +20,10 @@ HEADERS=	blas_dense_proto.h blas_enum.h blas_extended.h \
 		blas_extended_private.h blas_extended_proto.h blas_fpu.h \
 		blas_malloc.h f2c-bridge.h
 MAKE_ENV=	EXTRA_LIBS="-lm" LINKER="${CC}" M4="${M4}" RANLIB="${RANLIB}"
-OPTIONS=	SHARED "Build a shared library and PIC archive" on \
-		STATIC "Build a non-PIC archive" off
+OPTIONS_DEFINE=	SHARED STATIC
+OPTIONS_DEFAULT=	SHARED
+SHARED_DESC=	Build a shared library and PIC archive
+STATIC_DESC=	Build a non-PIC archive
 PLIST_DIRS=	${HDIR}
 PLIST_FILES=	${HEADERS:S|^|${HDIR}/|}
 SHLIB_MAJOR=	0
@@ -52,11 +49,11 @@ PICFLAG=	-fpic
 PORTDOCS=	report.ps
 .endif
 
-.ifdef(WITH_SHARED)
+.if ${PORT_OPTIONS:MSHARED}
 PLIST_FILES+=	lib/libxblas_pic.a lib/libxblas.so lib/libxblas.so.${SHLIB_MAJOR}
 .endif
 
-.ifdef(WITH_STATIC)
+.if ${PORT_OPTIONS:MSTATIC}
 PLIST_FILES+=	lib/libxblas.a
 .endif
 
@@ -64,7 +61,7 @@ post-patch:
 	@${REINPLACE_CMD} -E \
 	-e '/(ARCH|CC|(C|LD)FLAGS|EXTRA_LIBS|M4|M4_OPTS|RANLIB|XBLASLIB)[[:blank:]]*=/d' \
 		${WRKSRC}/make.inc
-.ifdef(WITH_STATIC)
+.if ${PORT_OPTIONS:MSTATIC}
 	@${CP} -af ${WRKSRC} ${WRKSRC}_STATIC
 .endif
 	@${PRINTF} "\nCFLAGS+=\t${PICFLAG}\n" >> ${WRKSRC}/make.inc
@@ -72,7 +69,7 @@ post-patch:
 do-build: build-shared build-static
 
 build-shared: patch
-.ifdef(WITH_SHARED)
+.if ${PORT_OPTIONS:MSHARED}
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} XBLASLIB="libxblas_pic.a" ${MAKE} \
 	${_MAKE_JOBS} ${MAKE_ARGS} ARCH="${AR}" lib ; \
 	${CC} ${CFLAGS} ${PICFLAG} ${LDFLAGS} -shared -Wl,-x \
@@ -81,7 +78,7 @@ build-shared: patch
 .endif
 
 build-static: patch
-.ifdef(WITH_STATIC)
+.if ${PORT_OPTIONS:MSTATIC}
 	@cd ${WRKSRC}_STATIC; ${SETENV} ${MAKE_ENV} XBLASLIB="libxblas.a" ${MAKE} \
 	${_MAKE_JOBS} ${MAKE_ARGS} ARCH="${AR}" lib
 .endif
@@ -89,12 +86,12 @@ build-static: patch
 do-install:
 	@${MKDIR} ${PREFIX}/${HDIR}
 	@cd ${WRKSRC}/src; ${INSTALL_DATA} ${HEADERS} ${PREFIX}/${HDIR}
-.ifdef(WITH_SHARED)
+.if ${PORT_OPTIONS:MSHARED}
 	@cd ${WRKSRC}; ${INSTALL_DATA} libxblas_pic.a \
 	libxblas.so.${SHLIB_MAJOR} ${PREFIX}/lib
 	@${LN} -sf libxblas.so.${SHLIB_MAJOR} ${PREFIX}/lib/libxblas.so
 .endif
-.ifdef(WITH_STATIC)
+.if ${PORT_OPTIONS:MSTATIC}
 	@${INSTALL_DATA} ${WRKSRC}_STATIC/libxblas.a ${PREFIX}/lib
 .endif
 .ifndef(NOPORTDOCS)
@@ -105,13 +102,13 @@ do-install:
 check regression-test test: test-shared test-static
 
 test-shared: build
-.ifdef(WITH_SHARED)
+.if ${PORT_OPTIONS:MSHARED}
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} XBLASLIB="libxblas_pic.a" ${MAKE} \
 	${_MAKE_JOBS} ${MAKE_ARGS} ARCH="${AR}" tests
 .endif
 
 test-static: build
-.ifdef(WITH_STATIC)
+.if ${PORT_OPTIONS:MSTATIC}
 	@cd ${WRKSRC}_STATIC; ${SETENV} ${MAKE_ENV} XBLASLIB="libxblas.a" ${MAKE} \
 	${_MAKE_JOBS} ${MAKE_ARGS} ARCH="${AR}" tests
 .endif