- Update to version 0.2.5

- Convert to OptionsNG

PR:		ports/174107
Submitted by:	Eijiro Shibusawa <phd_kimberlite@yahoo.co.jp> (maintainer)

5 files changed, 47 insertions, 47 deletions

diff --git a/math/openblas/Makefile b/math/openblas/Makefile
index 8fe36c200e59..075af3cc9a4d 100644
--- a/math/openblas/Makefile
+++ b/math/openblas/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	openblas
-PORTVERSION=	0.2.4
+PORTVERSION=	0.2.5
 CATEGORIES=	math
 MASTER_SITES=	https://github.com/${GH_USER}/${GH_PORTNAME}/tarball/${GH_VERSION}/ \
 		NL:lapack,lapack_tmg
@@ -12,7 +12,7 @@ DISTFILES=	${GH_USER}-${GH_PORTNAME}-${GH_VERSION}-0-g${GH_REVISION}${EXTRACT_SU
 		large.tgz:lapack_tmg timing.tgz:lapack_tmg
 
 MAINTAINER=	phd_kimberlite@yahoo.co.jp
-COMMENT=	An optimized BLAS library based on GotoBLAS2
+COMMENT=	Optimized BLAS library based on GotoBLAS2
 
 LICENSE=	BSD
 LICENSE_FILE=	${WRKSRC}/LICENSE
@@ -21,7 +21,7 @@ DIST_SUBDIR=	openblas
 FETCH_ARGS=	-pRr
 GH_USER=	xianyi
 GH_PORTNAME=	OpenBLAS
-GH_REVISION=	3a26470
+GH_REVISION=	e01b3d4
 GH_VERSION=	v${PORTVERSION}
 LAPACKVER=	3.4.2
 LAPACK_SRCFILE=	lapack-${LAPACKVER}.tgz
@@ -39,21 +39,20 @@ OPENBLAS_FILES=	${OPENBLAS_LIBS:S|$|.so|} ${OPENBLAS_LIBS:S|$|.so.${OPENBLAS_SVE
 PLIST_FILES=	${OPENBLAS_FILES:S|^|lib/|}
 
 MAKE_JOBS_SAFE=	yes
-WRKSRC=		${WRKDIR}/${GH_USER}-${GH_PORTNAME}-ea9a46c
+WRKSRC=		${WRKDIR}/${GH_USER}-${GH_PORTNAME}-93dd133
+
+OPTIONS_DEFINE=		DYNAMIC_ARCH INTERFACE64 OPENMP AVX
+
+DYNAMIC_ARCH_DESC=	"Support multiple CPU types on i386 and amd64"
+INTERFACE64_DESC=	"Use 8 byte integers on 64-bit architectures"
+OPENMP_DESC=		"Use OpenMP for threading"
+AVX_DESC=		"Support Advanced Vector Extensions (AVX)"
 
 .if defined(PACKAGE_BUILDING)
-DYNAMIC_ARCH_DEFAULT=	on
-.else
-DYNAMIC_ARCH_DEFAULT=	off
+OPTIONS_DEFAULT=	DYNAMIC_ARCH
 .endif
 
-OPTIONS=	DYNAMIC_ARCH	"Support multiple CPU types on i386 and amd64" \
-							${DYNAMIC_ARCH_DEFAULT} \
-		INTERFACE64	"Use 8 byte integers on 64-bit architectures" off \
-		OPENMP		"Use OpenMP for threading" off \
-		AVX		"Support Advanced Vector Extensions (AVX)" off
-
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if defined(TARGET_CPU_ARCH)
 BUILDFLAGS+=	TARGET=${TARGET_CPU_ARCH}
@@ -67,28 +66,28 @@ BUILDFLAGS+=	BINARY32=1
 BUILDFLAGS+=	BINARY64=1
 .endif
 
-.if ! ( defined(WITH_DYNAMIC_ARCH) && ( ${ARCH} == "amd64" || ${ARCH} == "i386" ) )
+.if ! ( ${PORT_OPTIONS:MDYNAMIC_ARCH} && ( ${ARCH} == "amd64" || ${ARCH} == "i386" ) )
 MANUAL_PACKAGE_BUILD=	Optimizes for the build machine.
 .endif
 
-.if defined(WITH_DYNAMIC_ARCH)
+.if ${PORT_OPTIONS:MDYNAMIC_ARCH}
 BUILDFLAGS+=	DYNAMIC_ARCH=1
 .endif
 
-.if defined(WITH_INTERFACE64)
+.if ${PORT_OPTIONS:MINTERFACE64}
 BUILDFLAGS+=	INTERFACE64=1
 .endif
 
-.if defined(WITH_OPENMP)
+.if ${PORT_OPTIONS:MOPENMP}
 BUILDFLAGS+=	USE_OPENMP=1
 .endif
 
-.if defined(WITH_QUAD_PRECISION)
-BROKEN =	WITH_QUAD_PRECISION is broken; please disable this option
+.if ${PORT_OPTIONS:MQUAD_PRECISION}
+BROKEN =	QUAD_PRECISION is broken; please disable this option
 BUILDFLAGS+=	QUAD_PRECISION=1
 .endif
 
-.if ! ( defined(WITH_AVX) )
+.if empty ( ${PORT_OPTIONS:MAVX} )
 BUILDFLAGS+=	NO_AVX=1
 .endif
 
@@ -128,7 +127,7 @@ post-patch:
 	-e 's+$$(CROSS_SUFFIX)+${LOCALBASE}/bin/+' \
 	-e "s+%%LAPACKVER%%+${LAPACKVER}+g" \
 		${WRKSRC}/Makefile.system
-.if defined(WITH_OPENMP)
+.if ${PORT_OPTIONS:MOPENMP}
 	${REINPLACE_CMD} -e "s+OPENBLAS_NUM_THREADS+OMP_NUM_THREADS+g" \
 		${WRKSRC}/test/Makefile \
 		${WRKSRC}/ctest/Makefile
@@ -144,12 +143,12 @@ do-build:
 	USE_THREAD=1 ${GMAKE} ${MAKE_ARGS}
 	${CP} ${WRKSRC}/libopenblasp-${OPENBLAS_SUFX}.a ${WRKDIR}/lib/libopenblasp.a
 	${CP} ${WRKSRC}/libopenblasp-${OPENBLAS_SUFX}.so ${WRKDIR}/lib/libopenblasp.so.${OPENBLAS_SVER}
-.if !defined(WITH_DEBUG)
+.if !${PORT_OPTIONS:MDEBUG}
 	${LOCALBASE}/bin/strip -X ${WRKDIR}/lib/*.so.${OPENBLAS_SVER}
 .endif
 
 BENCHMARK_MAXTHREADS?=	${MAXTHREADS}
-.if defined(WITH_OPENMP)
+.if ${PORT_OPTIONS:MOPENMP}
 BENCHMARK_THREADS_FLAG =	OMP_NUM_THREADS=${BENCHMARK_MAXTHREADS}
 .else
 BENCHMARK_THREADS_FLAG =	OPENBLAS_NUM_THREADS=${BENCHMARK_MAXTHREADS}
@@ -170,4 +169,4 @@ do-install:
 		${LN} -sf $$i.${OPENBLAS_SVER} $$i ; \
 	done
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/math/openblas/distinfo b/math/openblas/distinfo
index f0032598261d..94c4cefe6b97 100644
--- a/math/openblas/distinfo
+++ b/math/openblas/distinfo
@@ -1,5 +1,5 @@
-SHA256 (openblas/xianyi-OpenBLAS-v0.2.4-0-g3a26470.tar.gz) = e5f7a46da2b2b2fc82a905650df14d0a0562c52c8ef6d83db8fe91899275335a
-SIZE (openblas/xianyi-OpenBLAS-v0.2.4-0-g3a26470.tar.gz) = 3249943
+SHA256 (openblas/xianyi-OpenBLAS-v0.2.5-0-ge01b3d4.tar.gz) = e5f097adc09d3384242e387ee39cc7710451e667273b4cb37c13f275e1da8650
+SIZE (openblas/xianyi-OpenBLAS-v0.2.5-0-ge01b3d4.tar.gz) = 3252581
 SHA256 (openblas/lapack-3.4.2.tgz) = 60a65daaf16ec315034675942618a2230521ea7adf85eea788ee54841072faf0
 SIZE (openblas/lapack-3.4.2.tgz) = 6168281
 SHA256 (openblas/large.tgz) = f328d88b7fa97722f271d7d0cfea1c220e0f8e5ed5ff01d8ef1eb51d6f4243a1
diff --git a/math/openblas/files/patch-Makefile b/math/openblas/files/patch-Makefile
index 1267e2b1b9c1..11c9747d23bf 100644
--- a/math/openblas/files/patch-Makefile
+++ b/math/openblas/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	2012-10-09 21:08:28.000000000 +0900
-+++ Makefile	2012-10-12 21:37:18.000000000 +0900
-@@ -201,7 +201,7 @@
+--- Makefile.orig	2012-11-27 08:24:53.000000000 +0900
++++ Makefile	2012-11-28 01:13:31.000000000 +0900
+@@ -203,7 +203,7 @@
  netlib : 
  
  else
@@ -9,7 +9,7 @@
  ifndef NOFORTRAN
  	-@$(MAKE) -C $(NETLIB_LAPACK_DIR) lapacklib
  endif
-@@ -210,7 +210,7 @@
+@@ -212,7 +212,7 @@
  endif
  endif
  
@@ -18,16 +18,16 @@
  	-@$(MAKE) -C $(NETLIB_LAPACK_DIR) lapack_prof
  
  $(NETLIB_LAPACK_DIR)/make.inc :
-@@ -223,7 +223,7 @@
- 	-@echo "LOADOPTS    = $(FFLAGS) $(EXTRALIB)" >> $(NETLIB_LAPACK_DIR)/make.inc
- 	-@echo "CC          = $(CC)" >> $(NETLIB_LAPACK_DIR)/make.inc
+@@ -229,7 +229,7 @@
+ else
  	-@echo "CFLAGS      = $(CFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc
+ endif
 -	-@echo "ARCH        = $(AR)" >> $(NETLIB_LAPACK_DIR)/make.inc
 +	-@echo "ARCH_       = $(AR)" >> $(NETLIB_LAPACK_DIR)/make.inc
  	-@echo "ARCHFLAGS   = -ru" >> $(NETLIB_LAPACK_DIR)/make.inc
  	-@echo "RANLIB      = $(RANLIB)" >> $(NETLIB_LAPACK_DIR)/make.inc
  	-@echo "LAPACKLIB   = ../$(LIBNAME)" >> $(NETLIB_LAPACK_DIR)/make.inc
-@@ -235,24 +235,19 @@
+@@ -241,24 +241,19 @@
  	-@cat  make.inc >> $(NETLIB_LAPACK_DIR)/make.inc
  endif
  
@@ -59,7 +59,7 @@
  ifndef NOFORTRAN
  #http://stackoverflow.com/questions/7656425/makefile-ifeq-logical-or
  ifeq ($(OSNAME), $(filter $(OSNAME),Darwin NetBSD))
-@@ -276,7 +271,7 @@
+@@ -282,7 +277,7 @@
  	-wget http://www.netlib.org/lapack/timing/timing.tgz
  endif
  
@@ -68,7 +68,7 @@
  ifndef NOFORTRAN
  	(cd $(NETLIB_LAPACK_DIR); $(TAR) zxf ../timing.tgz TIMING)
  	(cd $(NETLIB_LAPACK_DIR)/TIMING; $(TAR) zxf ../../large.tgz )
-@@ -314,4 +309,4 @@
+@@ -320,4 +315,4 @@
  	rm -rf $(NETLIB_LAPACK_DIR) ;\
  	fi
  	@rm -f *.grd Makefile.conf_last config_last.h
diff --git a/math/openblas/files/patch-exports+Makefile b/math/openblas/files/patch-exports+Makefile
index df60f4028327..71d6d1c9cd8c 100644
--- a/math/openblas/files/patch-exports+Makefile
+++ b/math/openblas/files/patch-exports+Makefile
@@ -1,10 +1,10 @@
---- exports/Makefile.orig	2012-02-05 16:32:13.000000000 +0900
-+++ exports/Makefile	2012-02-05 16:33:32.000000000 +0900
-@@ -107,6 +107,7 @@
- endif
+--- exports/Makefile.orig	2012-11-27 08:24:53.000000000 +0900
++++ exports/Makefile	2012-11-28 01:24:49.000000000 +0900
+@@ -122,6 +122,7 @@
+ #http://stackoverflow.com/questions/7656425/makefile-ifeq-logical-or
+ ifeq ($(OSNAME), $(filter $(OSNAME),FreeBSD NetBSD))
  
- ifeq ($(OSNAME), FreeBSD)
 +EXTRALIB += -lgfortran
- 
  so : ../$(LIBSONAME)
  
+ ../$(LIBSONAME) : ../$(LIBNAME) linux.def linktest.c
diff --git a/math/openblas/files/patch-exports+gensymbol b/math/openblas/files/patch-exports+gensymbol
index 06d7072ce8b7..07bd1e9c4864 100644
--- a/math/openblas/files/patch-exports+gensymbol
+++ b/math/openblas/files/patch-exports+gensymbol
@@ -1,13 +1,14 @@
---- exports/gensymbol.orig	2012-07-08 21:47:12.000000000 +0900
-+++ exports/gensymbol	2012-07-08 21:48:26.000000000 +0900
-@@ -2666,10 +2666,7 @@
+--- exports/gensymbol.orig	2012-11-27 08:24:53.000000000 +0900
++++ exports/gensymbol	2012-11-28 01:19:10.000000000 +0900
+@@ -2666,11 +2666,7 @@
  		#LAPACKE_zlagsy_work,
  		);
  
 -if ($ARGV[5] == 1) {
 -	#NO_LAPACK=1
 -	@underscore_objs = (@blasobjs, @misc_underscore_objs);
--} elsif (-d "../lapack-3.1.1" || -d "../lapack-3.4.0" || -d "../lapack-3.4.1") {
+-} elsif (-d "../lapack-3.1.1" || -d "../lapack-3.4.0" || -d "../lapack-3.4.1" ||
+-         -d "../lapack-3.4.2") {
 +if (-d "../lapack-%%LAPACKVER%%") {
      @underscore_objs = (@blasobjs, @lapackobjs, @lapackobjs2, @misc_underscore_objs);
  } else {