Sun Mar 24 16:54:59 2013 UTC ()
Don't define static modfl and friends, it now conflicts with math.h.
Use our libltdl to avoid the libc.la hack.


(joerg)
diff -r1.73 -r1.74 pkgsrc/lang/smalltalk/Makefile
diff -r1.22 -r1.23 pkgsrc/lang/smalltalk/PLIST
diff -r1.23 -r1.24 pkgsrc/lang/smalltalk/distinfo
diff -r0 -r1.1 pkgsrc/lang/smalltalk/patches/patch-snprintfv_snprintfv_format.c
cvs diff -r1.73 -r1.74 pkgsrc/lang/smalltalk/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/smalltalk/Makefile 2013/02/16 11:22:53 1.73
+++ pkgsrc/lang/smalltalk/Makefile 2013/03/24 16:54:59 1.74
@@ -1,32 +1,33 @@ @@ -1,32 +1,33 @@
1# $NetBSD: Makefile,v 1.73 2013/02/16 11:22:53 wiz Exp $ 1# $NetBSD: Makefile,v 1.74 2013/03/24 16:54:59 joerg Exp $
2 2
3DISTNAME= smalltalk-3.2.4 3DISTNAME= smalltalk-3.2.4
4PKGREVISION= 11 4PKGREVISION= 12
5CATEGORIES= lang 5CATEGORIES= lang
6MASTER_SITES= ${MASTER_SITE_GNU:=smalltalk/} 6MASTER_SITES= ${MASTER_SITE_GNU:=smalltalk/}
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.smalltalk.org/versions/GNUSmalltalk.html 9HOMEPAGE= http://www.smalltalk.org/versions/GNUSmalltalk.html
10COMMENT= GNU Smalltalk: A smalltalk-80 implementation 10COMMENT= GNU Smalltalk: A smalltalk-80 implementation
11 11
12ONLY_FOR_PLATFORM= *-*-i386 *-*-x86_64 *-*-sparc *-*-powerpc 12ONLY_FOR_PLATFORM= *-*-i386 *-*-x86_64 *-*-sparc *-*-powerpc
13 13
14MAKE_JOBS_SAFE= no 14MAKE_JOBS_SAFE= no
15 15
16USE_TOOLS+= gawk gmake makeinfo pkg-config zip 16USE_TOOLS+= gawk gmake makeinfo pkg-config zip
17USE_GNU_READLINE= YES 17USE_GNU_READLINE= YES
18USE_LIBTOOL= YES 18USE_LIBTOOL= YES
19GNU_CONFIGURE= YES 19GNU_CONFIGURE= YES
 20CONFIGURE_ARGS+= --with-system-ltdl
20CONFIGURE_ARGS+= --with-system-libsigsegv=${BUILDLINK_PREFIX.libsigsegv}/lib 21CONFIGURE_ARGS+= --with-system-libsigsegv=${BUILDLINK_PREFIX.libsigsegv}/lib
21CONFIGURE_ARGS+= --with-system-libffi=${BUILDLINK_PREFIX.libffi}/lib 22CONFIGURE_ARGS+= --with-system-libffi=${BUILDLINK_PREFIX.libffi}/lib
22CONFIGURE_ARGS+= --with-gdbm=${BUILDLINK_PREFIX.gdbm}/lib 23CONFIGURE_ARGS+= --with-gdbm=${BUILDLINK_PREFIX.gdbm}/lib
23CONFIGURE_ARGS+= --with-gmp=${BUILDLINK_PREFIX.gmp}/lib 24CONFIGURE_ARGS+= --with-gmp=${BUILDLINK_PREFIX.gmp}/lib
24CONFIGURE_ARGS+= --with-lispdir=${PREFIX}/share/emacs/site-lisp 25CONFIGURE_ARGS+= --with-lispdir=${PREFIX}/share/emacs/site-lisp
25CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline}/lib 26CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline}/lib
26CONFIGURE_ARGS+= --with-tcl=${BUILDLINK_PREFIX.tcl}/lib 27CONFIGURE_ARGS+= --with-tcl=${BUILDLINK_PREFIX.tcl}/lib
27CONFIGURE_ARGS+= --with-tk=${BUILDLINK_PREFIX.tk}/lib 28CONFIGURE_ARGS+= --with-tk=${BUILDLINK_PREFIX.tk}/lib
28CONFIGURE_ARGS+= --without-emacs 29CONFIGURE_ARGS+= --without-emacs
29#CONFIGURE_ARGS+= --without-glib --without-gtk 30#CONFIGURE_ARGS+= --without-glib --without-gtk
30#CONFIGURE_ENV+= CFLAGS="-O2 -fsigned-char" 31#CONFIGURE_ENV+= CFLAGS="-O2 -fsigned-char"
31CONFIGURE_ENV+= ac_cv_header_sqlite3_h=no 32CONFIGURE_ENV+= ac_cv_header_sqlite3_h=no
32 33
@@ -54,21 +55,22 @@ post-extract: @@ -54,21 +55,22 @@ post-extract:
54 -e "s/LDBL_EPSILON/DBL_EPSILON/g" -e "s/truncl/trunc/g" \ 55 -e "s/LDBL_EPSILON/DBL_EPSILON/g" -e "s/truncl/trunc/g" \
55 ${WRKSRC:Q}/lib-src/truncl.c > ${WRKSRC:Q}/lib-src/trunc.c 56 ${WRKSRC:Q}/lib-src/truncl.c > ${WRKSRC:Q}/lib-src/trunc.c
56 sed -e "s/long double/float/g" -e "s/1.0L/1.0F/g" -e "s/0.0L/0.0F/g" \ 57 sed -e "s/long double/float/g" -e "s/1.0L/1.0F/g" -e "s/0.0L/0.0F/g" \
57 -e "s/LDBL_EPSILON/FLT_EPSILON/g" -e "s/truncl/truncf/g" \ 58 -e "s/LDBL_EPSILON/FLT_EPSILON/g" -e "s/truncl/truncf/g" \
58 ${WRKSRC}/lib-src/truncl.c > ${WRKSRC}/lib-src/truncf.c 59 ${WRKSRC}/lib-src/truncl.c > ${WRKSRC}/lib-src/truncf.c
59 60
60.include "../../graphics/glut/buildlink3.mk" 61.include "../../graphics/glut/buildlink3.mk"
61.include "../../graphics/glu/buildlink3.mk" 62.include "../../graphics/glu/buildlink3.mk"
62.include "../../x11/libICE/buildlink3.mk" 63.include "../../x11/libICE/buildlink3.mk"
63.include "../../converters/libiconv/buildlink3.mk" 64.include "../../converters/libiconv/buildlink3.mk"
64.include "../../databases/gdbm/buildlink3.mk" 65.include "../../databases/gdbm/buildlink3.mk"
65.include "../../devel/libsigsegv/buildlink3.mk" 66.include "../../devel/libsigsegv/buildlink3.mk"
66.include "../../devel/libffi/buildlink3.mk" 67.include "../../devel/libffi/buildlink3.mk"
 68.include "../../devel/libltdl/buildlink3.mk"
67.include "../../devel/gmp/buildlink3.mk" 69.include "../../devel/gmp/buildlink3.mk"
68.include "../../devel/gettext-lib/buildlink3.mk" 70.include "../../devel/gettext-lib/buildlink3.mk"
69.include "../../devel/readline/buildlink3.mk" 71.include "../../devel/readline/buildlink3.mk"
70.include "../../devel/zlib/buildlink3.mk" 72.include "../../devel/zlib/buildlink3.mk"
71.include "../../x11/gtk2/buildlink3.mk" 73.include "../../x11/gtk2/buildlink3.mk"
72.include "../../x11/tk/buildlink3.mk" 74.include "../../x11/tk/buildlink3.mk"
73.include "../../mk/pthread.buildlink3.mk" 75.include "../../mk/pthread.buildlink3.mk"
74.include "../../mk/bsd.pkg.mk" 76.include "../../mk/bsd.pkg.mk"
cvs diff -r1.22 -r1.23 pkgsrc/lang/smalltalk/PLIST (expand / switch to unified diff)

--- pkgsrc/lang/smalltalk/PLIST 2011/04/30 11:46:15 1.22
+++ pkgsrc/lang/smalltalk/PLIST 2013/03/24 16:54:59 1.23
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.22 2011/04/30 11:46:15 asau Exp $ 1@comment $NetBSD: PLIST,v 1.23 2013/03/24 16:54:59 joerg Exp $
2bin/gst 2bin/gst
3bin/gst-blox 3bin/gst-blox
4bin/gst-browser 4bin/gst-browser
5bin/gst-config 5bin/gst-config
6bin/gst-convert 6bin/gst-convert
7bin/gst-doc 7bin/gst-doc
8bin/gst-load 8bin/gst-load
9bin/gst-package 9bin/gst-package
10bin/gst-profile 10bin/gst-profile
11bin/gst-reload 11bin/gst-reload
12bin/gst-remote 12bin/gst-remote
13bin/gst-sunit 13bin/gst-sunit
14include/gst.h 14include/gst.h
@@ -17,27 +17,26 @@ info/gst-base.info @@ -17,27 +17,26 @@ info/gst-base.info
17info/gst-libs.info 17info/gst-libs.info
18info/gst.info 18info/gst.info
19lib/libgst.la 19lib/libgst.la
20lib/pkgconfig/gnu-smalltalk.pc 20lib/pkgconfig/gnu-smalltalk.pc
21lib/smalltalk/blox-tk.la 21lib/smalltalk/blox-tk.la
22lib/smalltalk/digest.la 22lib/smalltalk/digest.la
23lib/smalltalk/expat.la 23lib/smalltalk/expat.la
24lib/smalltalk/gdbm.la 24lib/smalltalk/gdbm.la
25lib/smalltalk/gst-gtk.la 25lib/smalltalk/gst-gtk.la
26lib/smalltalk/gstglut.la 26lib/smalltalk/gstglut.la
27lib/smalltalk/gstopengl.la 27lib/smalltalk/gstopengl.la
28lib/smalltalk/i18n.la 28lib/smalltalk/i18n.la
29lib/smalltalk/iconv.la 29lib/smalltalk/iconv.la
30lib/smalltalk/libc.la 
31lib/smalltalk/zlib.la 30lib/smalltalk/zlib.la
32libexec/smalltalk/gnutls-wrapper 31libexec/smalltalk/gnutls-wrapper
33libexec/smalltalk/vfs/deb 32libexec/smalltalk/vfs/deb
34libexec/smalltalk/vfs/lslR 33libexec/smalltalk/vfs/lslR
35libexec/smalltalk/vfs/mailfs 34libexec/smalltalk/vfs/mailfs
36libexec/smalltalk/vfs/patchfs 35libexec/smalltalk/vfs/patchfs
37libexec/smalltalk/vfs/uar 36libexec/smalltalk/vfs/uar
38libexec/smalltalk/vfs/ucpio 37libexec/smalltalk/vfs/ucpio
39libexec/smalltalk/vfs/ulha 38libexec/smalltalk/vfs/ulha
40libexec/smalltalk/vfs/urar 39libexec/smalltalk/vfs/urar
41libexec/smalltalk/vfs/utar 40libexec/smalltalk/vfs/utar
42libexec/smalltalk/vfs/uzip 41libexec/smalltalk/vfs/uzip
43libexec/smalltalk/vfs/uzoo 42libexec/smalltalk/vfs/uzoo
cvs diff -r1.23 -r1.24 pkgsrc/lang/smalltalk/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/smalltalk/distinfo 2011/04/30 11:46:15 1.23
+++ pkgsrc/lang/smalltalk/distinfo 2013/03/24 16:54:59 1.24
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1$NetBSD: distinfo,v 1.23 2011/04/30 11:46:15 asau Exp $ 1$NetBSD: distinfo,v 1.24 2013/03/24 16:54:59 joerg Exp $
2 2
3SHA1 (smalltalk-3.2.4.tar.gz) = 6b164e145c1118ad74770bb15614478d47f55523 3SHA1 (smalltalk-3.2.4.tar.gz) = 6b164e145c1118ad74770bb15614478d47f55523
4RMD160 (smalltalk-3.2.4.tar.gz) = d8ca6b888311a70748071ff4024e31adeb0a920f 4RMD160 (smalltalk-3.2.4.tar.gz) = d8ca6b888311a70748071ff4024e31adeb0a920f
5Size (smalltalk-3.2.4.tar.gz) = 5877496 bytes 5Size (smalltalk-3.2.4.tar.gz) = 5877496 bytes
6SHA1 (patch-ae) = c92422f2ac5378dafc65762a69c0dc840d974363 6SHA1 (patch-ae) = c92422f2ac5378dafc65762a69c0dc840d974363
7SHA1 (patch-ah) = eaa03cf41f1c30acd1762cb6389dfe0157ce551b 7SHA1 (patch-ah) = eaa03cf41f1c30acd1762cb6389dfe0157ce551b
 8SHA1 (patch-snprintfv_snprintfv_format.c) = 3e44d61ac38197066b0a56e15c2e519a2b7d1661
File Added: pkgsrc/lang/smalltalk/patches/patch-snprintfv_snprintfv_format.c
$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