From 2b2741c31b195e85bc69c5f73df00805025ce4b6 Mon Sep 17 00:00:00 2001
From: Oliver Lehmann <oliver@FreeBSD.org>
Date: Tue, 4 Oct 2005 05:27:15 +0000
Subject: fix build for 4
---
devel/mercator/Makefile | 3 ++-
devel/mercator/files/patch-Merecator-iround.h | 19 +++++++++++++++++++
devel/mercator/pkg-plist | 2 +-
3 files changed, 22 insertions(+), 2 deletions(-)
create mode 100644 devel/mercator/files/patch-Merecator-iround.h
(limited to 'devel/mercator')
diff --git a/devel/mercator/Makefile b/devel/mercator/Makefile
index 3b833105399a..a2eadfb21579 100644
--- a/devel/mercator/Makefile
+++ b/devel/mercator/Makefile
@@ -17,7 +17,8 @@ COMMENT= A procedural terrain library
LIB_DEPENDS= wfmath-0.3.3:${PORTSDIR}/math/wfmath
USE_GNOME= pkgconfig
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS= libtool:15:inc
+USE_GCC= 3.4
INSTALLS_SHLIB= yes
CXXFLAGS+= -include wchar.h
diff --git a/devel/mercator/files/patch-Merecator-iround.h b/devel/mercator/files/patch-Merecator-iround.h
new file mode 100644
index 000000000000..1bac80e786a9
--- /dev/null
+++ b/devel/mercator/files/patch-Merecator-iround.h
@@ -0,0 +1,19 @@
+--- Mercator/iround.h.orig Tue Oct 4 01:25:06 2005
++++ Mercator/iround.h Tue Oct 4 01:31:36 2005
+@@ -9,6 +9,16 @@
+ #error iround.h must be included after config.h
+ #endif
+
++#if defined(__FreeBSD__)
++#include <osreldate.h>
++#if __FreeBSD_version < 500000
++extern "C" {
++extern float fabsf __P((float));
++extern float rintf __P((float));
++}
++#endif
++#endif
++
+ #ifdef HAVE_LRINTF
+ #define I_ROUND(x) (::lrintf(x))
+ #elif defined(HAVE_RINTF)
diff --git a/devel/mercator/pkg-plist b/devel/mercator/pkg-plist
index 5469fdf3633c..e25c1b4b6fa8 100644
--- a/devel/mercator/pkg-plist
+++ b/devel/mercator/pkg-plist
@@ -1,4 +1,4 @@
-lib/libmercator-0.2.a
+lib/libmercator-0.2.la
lib/libmercator-0.2.so
lib/libmercator-0.2.so.4
include/Mercator-0.2/Mercator/Mercator.h
--
cgit v1.2.3