Avoid creating broken libc.la, bump revision.

5 files changed, 28 insertions, 9 deletions

diff --git a/lang/smalltalk/Makefile b/lang/smalltalk/Makefile
index b824102ce7f..11ccc48ab9e 100644
--- a/lang/smalltalk/Makefile
+++ b/lang/smalltalk/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.48 2009/12/15 23:41:46 joerg Exp $
+# $NetBSD: Makefile,v 1.49 2010/01/21 06:21:07 asau Exp $
 
 DISTNAME=	smalltalk-3.1
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GNU:=smalltalk/}
 
diff --git a/lang/smalltalk/PLIST b/lang/smalltalk/PLIST
index e8ef9c0aefd..675de362156 100644
--- a/lang/smalltalk/PLIST
+++ b/lang/smalltalk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2009/06/14 20:34:15 joerg Exp $
+@comment $NetBSD: PLIST,v 1.20 2010/01/21 06:21:07 asau Exp $
 bin/gst
 bin/gst-blox
 bin/gst-config
@@ -24,7 +24,6 @@ lib/smalltalk/gstglut.la
 lib/smalltalk/gstopengl.la
 lib/smalltalk/i18n.la
 lib/smalltalk/iconv.la
-lib/smalltalk/libc.la
 lib/smalltalk/sockets.la
 lib/smalltalk/zlib.la
 libexec/smalltalk/vfs/deb
diff --git a/lang/smalltalk/distinfo b/lang/smalltalk/distinfo
index f7a698be49b..0312c68cc09 100644
--- a/lang/smalltalk/distinfo
+++ b/lang/smalltalk/distinfo
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.18 2009/06/04 07:40:58 hasso Exp $
+$NetBSD: distinfo,v 1.19 2010/01/21 06:21:07 asau Exp $
 
 SHA1 (smalltalk-3.1.tar.gz) = 9b1602bf29d1483d9200d83419dc3cd0fc0d397b
 RMD160 (smalltalk-3.1.tar.gz) = cc9a593c1773ba66f2f999b1369944eebd722ef9
 Size (smalltalk-3.1.tar.gz) = 5282705 bytes
 SHA1 (patch-aa) = c82dfcc53ce4177ae051041106c6c2efdb61cb4e
 SHA1 (patch-ac) = e129e3ead2a1c8a0e5ce7e7d342ff131570a2f0b
-SHA1 (patch-ae) = ec673dd0fcd5a12096d23986d4f9c04df562a51a
+SHA1 (patch-ae) = 57d3949a8842607eb9518185482a6e7a107a3c65
 SHA1 (patch-af) = 76744e495b5bb180b5acdbcc450d7090ed708113
 SHA1 (patch-ag) = 5eec4c1f315e05dea00f33d8f31b6b17f32e557a
+SHA1 (patch-ah) = 3755b6bea32b49bacf5d6e099c19849445ae955b
diff --git a/lang/smalltalk/patches/patch-ae b/lang/smalltalk/patches/patch-ae
index b05498a05b0..a80b6831eb9 100644
--- a/lang/smalltalk/patches/patch-ae
+++ b/lang/smalltalk/patches/patch-ae
@@ -1,7 +1,7 @@
-$NetBSD: patch-ae,v 1.2 2009/04/10 17:36:43 asau Exp $
+$NetBSD: patch-ae,v 1.3 2010/01/21 06:21:07 asau Exp $
 
---- configure.orig	2009-04-07 20:00:09.000000000 +0400
-+++ configure	2009-04-07 20:23:39.000000000 +0400
+--- configure.orig	2008-10-19 15:25:04.000000000 +0400
++++ configure	2010-01-21 08:49:56.000000000 +0300
 @@ -20386,6 +20386,7 @@
  for ac_func in putenv strdup strerror strsignal mkstemp getpagesize \
  	getdtablesize strstr ftruncate floorl ceill sqrtl frexpl ldexpl asinl \
@@ -10,3 +10,12 @@ $NetBSD: patch-ae,v 1.2 2009/04/10 17:36:43 asau Exp $
  	symlink mkdtemp
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+@@ -34021,8 +34022,6 @@
+ 
+ ac_config_files="$ac_config_files tests/atlocal"
+ 
+-ac_config_files="$ac_config_files libc.la"
+-
+ 
+ ac_config_files="$ac_config_files Makefile"
+ 
diff --git a/lang/smalltalk/patches/patch-ah b/lang/smalltalk/patches/patch-ah
new file mode 100644
index 00000000000..ab4d301aa20
--- /dev/null
+++ b/lang/smalltalk/patches/patch-ah
@@ -0,0 +1,10 @@
+--- Makefile.in.orig	2008-10-19 15:25:08.000000000 +0400
++++ Makefile.in	2010-01-21 08:56:22.000000000 +0300
+@@ -426,7 +426,6 @@
+ ###########################################################
+ pkgconfigdir = $(libdir)/pkgconfig
+ nodist_pkgconfig_DATA = gnu-smalltalk.pc
+-pkglib_DATA = libc.la
+ noinst_DATA = gst.im
+ @WITH_EMACS_TRUE@nodist_lisp_LISP = smalltalk-mode.el $(am__append_2)
+ bin_SCRIPTS = gst-config