5 files changed, 44 insertions, 84 deletions

diff --git a/math/openlibm/Makefile b/math/openlibm/Makefile
index 83700a3eab38..a439ebf51a70 100644
--- a/math/openlibm/Makefile
+++ b/math/openlibm/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	openlibm
-PORTVERSION=	0.4.1
+PORTVERSION=	0.5.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	math
 MASTER_SITES=	GH
@@ -25,12 +25,6 @@ USE_LDCONFIG=	yes
 
 MAKE_ENV+=	prefix=${PREFIX}
 
-.if ${ARCH} == "amd64" || ${ARCH} == "i386"
-PLIST_SUB+=	EXTRA_HEADER=""
-.else
-PLIST_SUB+=	EXTRA_HEADER="@comment "
-.endif
-
 TEST_TARGET=	check
 
 .include <bsd.port.post.mk>
diff --git a/math/openlibm/distinfo b/math/openlibm/distinfo
index bb3873a1ba78..693b54c78ce4 100644
--- a/math/openlibm/distinfo
+++ b/math/openlibm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (JuliaLang-openlibm-v0.4.1_GH0.tar.gz) = d6269849348027b0a02ef5f7707968185017b4bb9607acd2fd7348ba28c69833
-SIZE (JuliaLang-openlibm-v0.4.1_GH0.tar.gz) = 277924
+SHA256 (JuliaLang-openlibm-v0.5.0_GH0.tar.gz) = a9a03644b38fd611a63838f1924925bc27f756ee04f69a90e2af7594f34558b8
+SIZE (JuliaLang-openlibm-v0.5.0_GH0.tar.gz) = 352346
diff --git a/math/openlibm/files/patch-Make.inc b/math/openlibm/files/patch-Make.inc
index e3c5ad37d1fc..0b0ad6e03c46 100644
--- a/math/openlibm/files/patch-Make.inc
+++ b/math/openlibm/files/patch-Make.inc
@@ -1,41 +1,16 @@
---- Make.inc.orig	2014-12-01 13:10:35 UTC
+--- Make.inc.orig	2016-03-11 16:57:11 UTC
 +++ Make.inc
-@@ -7,11 +7,17 @@ VERSION = 0.4
- SOMAJOR = 1
- SOMINOR = 0
+@@ -3,11 +3,11 @@
+ OS := $(shell uname)
+ # Do not forget to bump SOMINOR when changing VERSION,
+ # and SOMAJOR when breaking ABI in a backward-incompatible way
+-VERSION = 0.5-dev
++VERSION = 0.5
+ SOMAJOR = 2
+ SOMINOR = 1
  DESTDIR =
 -prefix = /usr/local
 +prefix ?= /usr/local
  bindir = $(prefix)/bin
  libdir = $(prefix)/lib
  includedir = $(prefix)/include
- 
-+pkgconfigdir = $(libdir)/pkgconfig
-+
-+ifeq ($(OS), FreeBSD)
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
-+endif
-+
- USEGCC = 1
- USECLANG = 0
- 
-@@ -20,6 +26,11 @@ USEGCC = 0
- USECLANG = 1
- endif
- 
-+ifeq ($(OS), FreeBSD)
-+USEGCC = 0
-+USECLANG = 1
-+endif
-+
- AR = ar
- 
- ifeq ($(USECLANG),1)
-@@ -90,6 +101,7 @@ ifeq ($(OS), FreeBSD)
- SHLIB_EXT = so
- SONAME_FLAG = -soname
- CFLAGS_add+=-fPIC
-+libdatadir = $(prefix)/libdata
- endif
- 
- ifeq ($(OS), Darwin)
diff --git a/math/openlibm/files/patch-Makefile b/math/openlibm/files/patch-Makefile
index ff3b98ac8bea..2307bbb645ef 100644
--- a/math/openlibm/files/patch-Makefile
+++ b/math/openlibm/files/patch-Makefile
@@ -1,42 +1,16 @@
---- Makefile.orig	2014-12-01 13:10:35 UTC
+--- Makefile.orig	2016-03-08 10:28:02 UTC
 +++ Makefile
-@@ -37,6 +37,16 @@ else
- 	@-ln -sf libopenlibm.$(SHLIB_EXT).$(SOMAJOR).$(SOMINOR) libopenlibm.$(SHLIB_EXT)
- endif
- 
-+check test: test/test-double test/test-float
-+	test/test-double
-+	test/test-float
-+
-+test/test-double: libopenlibm.$(SHLIB_EXT)
-+	$(MAKE) -C test test-double
-+
-+test/test-float: libopenlibm.$(SHLIB_EXT)
-+	$(MAKE) -C test test-float
-+
- clean:
- 	@for dir in $(SUBDIRS) .; do \
- 		rm -fr $$dir/*.o $$dir/*.a $$dir/*.$(SHLIB_EXT)*; \
-@@ -53,15 +63,15 @@ openlibm.pc: openlibm.pc.in Make.inc Mak
- 
- install: all openlibm.pc
+@@ -66,8 +66,8 @@ install: all openlibm.pc
  	mkdir -p $(DESTDIR)$(shlibdir)
--	mkdir -p $(DESTDIR)$(libdir)/pkgconfig
-+	mkdir -p $(DESTDIR)$(pkgconfigdir)
+ 	mkdir -p $(DESTDIR)$(pkgconfigdir)
  	mkdir -p $(DESTDIR)$(includedir)/openlibm
--	cp -a libopenlibm.$(SHLIB_EXT)* $(DESTDIR)$(shlibdir)/
--	cp -a libopenlibm.a $(DESTDIR)$(libdir)/
--	cp -a src/openlibm.h $(DESTDIR)$(includedir)/
--	cp -a openlibm.pc $(DESTDIR)$(libdir)/pkgconfig/
+-	cp -f -a libopenlibm.$(SHLIB_EXT)* $(DESTDIR)$(shlibdir)/
+-	cp -f -a libopenlibm.a $(DESTDIR)$(libdir)/
+-	cp -f -a include/*.h $(DESTDIR)$(includedir)/openlibm
+-	cp -f -a src/*.h $(DESTDIR)$(includedir)/openlibm
+-	cp -f -a openlibm.pc $(DESTDIR)$(pkgconfigdir)/
 +	${BSD_INSTALL_LIB} libopenlibm.$(SHLIB_EXT)* $(DESTDIR)$(shlibdir)/
 +	${BSD_INSTALL_DATA} libopenlibm.a $(DESTDIR)$(libdir)/
-+	${BSD_INSTALL_DATA} src/openlibm.h $(DESTDIR)$(includedir)/
++	${BSD_INSTALL_DATA} include/*.h $(DESTDIR)$(includedir)/openlibm
++	${BSD_INSTALL_DATA} src/*.h $(DESTDIR)$(includedir)/openlibm
 +	${BSD_INSTALL_DATA} openlibm.pc $(DESTDIR)$(pkgconfigdir)/
- ifneq ($(wildcard $(ARCH)/bsd_asm.h),)
--	cp -a $(ARCH)/bsd_asm.h $(DESTDIR)$(includedir)/openlibm/
-+	${BSD_INSTALL_DATA} $(ARCH)/bsd_asm.h $(DESTDIR)$(includedir)/openlibm/
- endif
- ifneq ($(wildcard $(ARCH)/bsd_cdefs.h),)
--	cp -a $(ARCH)/bsd_cdefs.h $(DESTDIR)$(includedir)/openlibm/
-+	${BSD_INSTALL_DATA} $(ARCH)/bsd_cdefs.h $(DESTDIR)$(includedir)/openlibm/
- endif
diff --git a/math/openlibm/pkg-plist b/math/openlibm/pkg-plist
index 9f17e36d683e..ac20996ca205 100644
--- a/math/openlibm/pkg-plist
+++ b/math/openlibm/pkg-plist
@@ -1,9 +1,26 @@
 @comment $FreeBSD$
-include/openlibm.h
-%%EXTRA_HEADER%%include/openlibm/bsd_asm.h
-%%EXTRA_HEADER%%include/openlibm/bsd_cdefs.h
+include/openlibm/aarch64_fpmath.h
+include/openlibm/amd64_fpmath.h
+include/openlibm/bsd_cdefs.h
+include/openlibm/cdefs-compat.h
+include/openlibm/fpmath.h
+include/openlibm/i386_fpmath.h
+include/openlibm/k_log.h
+include/openlibm/k_logf.h
+include/openlibm/math_private.h
+include/openlibm/math_private_openbsd.h
+include/openlibm/openlibm.h
+include/openlibm/openlibm_complex.h
+include/openlibm/openlibm_fenv.h
+include/openlibm/openlibm_fenv_amd64.h
+include/openlibm/openlibm_fenv_arm.h
+include/openlibm/openlibm_fenv_i387.h
+include/openlibm/openlibm_fenv_powerpc.h
+include/openlibm/openlibm_math.h
+include/openlibm/powerpc_fpmath.h
+include/openlibm/types-compat.h
 lib/libopenlibm.a
 lib/libopenlibm.so
-lib/libopenlibm.so.1
-lib/libopenlibm.so.1.0
+lib/libopenlibm.so.2
+lib/libopenlibm.so.2.1
 libdata/pkgconfig/openlibm.pc