Don't define static modfl and friends, it now conflicts with math.h.

Use our libltdl to avoid the libc.la hack.

4 files changed, 30 insertions, 5 deletions

diff --git a/lang/smalltalk/Makefile b/lang/smalltalk/Makefile
index 331feca6feb..f97f29296bf 100644
--- a/lang/smalltalk/Makefile
+++ b/lang/smalltalk/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.73 2013/02/16 11:22:53 wiz Exp $
+# $NetBSD: Makefile,v 1.74 2013/03/24 16:54:59 joerg Exp $
 
 DISTNAME=	smalltalk-3.2.4
-PKGREVISION=	11
+PKGREVISION=	12
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GNU:=smalltalk/}
 
@@ -17,6 +17,7 @@ USE_TOOLS+=		gawk gmake makeinfo pkg-config zip
 USE_GNU_READLINE=	YES
 USE_LIBTOOL=		YES
 GNU_CONFIGURE=		YES
+CONFIGURE_ARGS+=	--with-system-ltdl
 CONFIGURE_ARGS+=	--with-system-libsigsegv=${BUILDLINK_PREFIX.libsigsegv}/lib
 CONFIGURE_ARGS+=	--with-system-libffi=${BUILDLINK_PREFIX.libffi}/lib
 CONFIGURE_ARGS+=	--with-gdbm=${BUILDLINK_PREFIX.gdbm}/lib
@@ -64,6 +65,7 @@ post-extract:
 .include "../../databases/gdbm/buildlink3.mk"
 .include "../../devel/libsigsegv/buildlink3.mk"
 .include "../../devel/libffi/buildlink3.mk"
+.include "../../devel/libltdl/buildlink3.mk"
 .include "../../devel/gmp/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"
diff --git a/lang/smalltalk/PLIST b/lang/smalltalk/PLIST
index 36d871139b4..07891b43c52 100644
--- a/lang/smalltalk/PLIST
+++ b/lang/smalltalk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2011/04/30 11:46:15 asau Exp $
+@comment $NetBSD: PLIST,v 1.23 2013/03/24 16:54:59 joerg Exp $
 bin/gst
 bin/gst-blox
 bin/gst-browser
@@ -27,7 +27,6 @@ lib/smalltalk/gstglut.la
 lib/smalltalk/gstopengl.la
 lib/smalltalk/i18n.la
 lib/smalltalk/iconv.la
-lib/smalltalk/libc.la
 lib/smalltalk/zlib.la
 libexec/smalltalk/gnutls-wrapper
 libexec/smalltalk/vfs/deb
diff --git a/lang/smalltalk/distinfo b/lang/smalltalk/distinfo
index 40580bbca18..e3bbe02cdae 100644
--- a/lang/smalltalk/distinfo
+++ b/lang/smalltalk/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.23 2011/04/30 11:46:15 asau Exp $
+$NetBSD: distinfo,v 1.24 2013/03/24 16:54:59 joerg Exp $
 
 SHA1 (smalltalk-3.2.4.tar.gz) = 6b164e145c1118ad74770bb15614478d47f55523
 RMD160 (smalltalk-3.2.4.tar.gz) = d8ca6b888311a70748071ff4024e31adeb0a920f
 Size (smalltalk-3.2.4.tar.gz) = 5877496 bytes
 SHA1 (patch-ae) = c92422f2ac5378dafc65762a69c0dc840d974363
 SHA1 (patch-ah) = eaa03cf41f1c30acd1762cb6389dfe0157ce551b
+SHA1 (patch-snprintfv_snprintfv_format.c) = 3e44d61ac38197066b0a56e15c2e519a2b7d1661
diff --git a/lang/smalltalk/patches/patch-snprintfv_snprintfv_format.c b/lang/smalltalk/patches/patch-snprintfv_snprintfv_format.c
new file mode 100644
index 00000000000..5fa19646e86
--- /dev/null
+++ b/lang/smalltalk/patches/patch-snprintfv_snprintfv_format.c
@@ -0,0 +1,23 @@
+$NetBSD: patch-snprintfv_snprintfv_format.c,v 1.1 2013/03/24 16:54:59 joerg Exp $
+
+--- snprintfv/snprintfv/format.c.orig	2013-03-23 17:56:22.000000000 +0000
++++ snprintfv/snprintfv/format.c
+@@ -55,7 +55,8 @@
+ #   define isinfl(x) isnanl ((x) - (x))
+ #  endif
+ #  ifndef HAVE_MODFL
+-static snv_long_double modfl (long double x, long double *exp);
++static snv_long_double my_modfl (long double x, long double *exp);
++#define modfl(x,y) my_modfl(x,y)
+ #  endif
+ #  ifndef HAVE_COPYSIGNL
+ static snv_long_double copysignl (long double x, long double y);
+@@ -1098,7 +1099,7 @@ printf_string (STREAM *stream, struct pr
+ 
+ #if !defined NO_FLOAT_PRINTING && defined HAVE_LONG_DOUBLE
+ # ifndef HAVE_MODFL
+-static long double modfl (long double x, long double *exp)
++static long double my_modfl (long double x, long double *exp)
+ {
+   /* To compute the integer part of a positive integer (in this case
+      abs(X)), sum a big enough integer to the absolute value, so that