summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authorjtb <jtb>2003-07-02 22:35:37 +0000
committerjtb <jtb>2003-07-02 22:35:37 +0000
commit6f1c6d2ad4a5cc665548dad2b4fc369e83b93415 (patch)
tree43e8f93973de48b4a35905e8f92c99c54f7f1498 /lang
parent7ff73d91b72d6e2efd2488c7fb65ac2e67ba338f (diff)
downloadpkgsrc-6f1c6d2ad4a5cc665548dad2b4fc369e83b93415.tar.gz
Use LIBTOOL_OVERRIDE rather than LTCONFIG_OVERRIDE.
Diffstat (limited to 'lang')
-rw-r--r--lang/smalltalk/Makefile10
-rw-r--r--lang/smalltalk/distinfo5
-rw-r--r--lang/smalltalk/patches/patch-ab20
3 files changed, 18 insertions, 17 deletions
diff --git a/lang/smalltalk/Makefile b/lang/smalltalk/Makefile
index df230e0e478..cd1cfe40212 100644
--- a/lang/smalltalk/Makefile
+++ b/lang/smalltalk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2003/07/02 00:00:22 jtb Exp $
+# $NetBSD: Makefile,v 1.16 2003/07/02 22:35:37 jtb Exp $
DISTNAME= smalltalk-2.1.3
CATEGORIES= lang
@@ -10,9 +10,12 @@ COMMENT= GNU Smalltalk: A smalltalk-80 implementation
ONLY_FOR_PLATFORM= *-*-i386 *-*-sparc *-*-powerpc
+USE_BUILDLINK2= YES
USE_GMAKE= YES
USE_GNU_READLINE= YES
-USE_BUILDLINK2= YES
+
+USE_LIBTOOL= YES
+LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --with-gmp=${BUILDLINK_PREFIX.gmp}/lib
@@ -25,10 +28,9 @@ CONFIGURE_ARGS+= --without-glib --without-gtk
CONFIGURE_ARGS+= --with-lispdir=${PREFIX}/share/emacs/site-lisp
CONFIGURE_ENV+= CFLAGS="-O2 -fsigned-char"
-LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
-
TEST_TARGET= check
+.include "../../devel/libtool/buildlink2.mk"
.include "../../devel/gmp/buildlink2.mk"
.include "../../devel/gettext-lib/buildlink2.mk"
.include "../../devel/readline/buildlink2.mk"
diff --git a/lang/smalltalk/distinfo b/lang/smalltalk/distinfo
index 19bb40bb263..1b7c41860b7 100644
--- a/lang/smalltalk/distinfo
+++ b/lang/smalltalk/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.6 2003/07/02 00:00:23 jtb Exp $
+$NetBSD: distinfo,v 1.7 2003/07/02 22:35:37 jtb Exp $
SHA1 (smalltalk-2.1.3.tar.gz) = c38735c51357f5535097234b19ab4401615992f5
Size (smalltalk-2.1.3.tar.gz) = 3416268 bytes
-SHA1 (patch-aa) = 41e3ca795c13aef9ef5f837e5341e306bcfa9352
-SHA1 (patch-ab) = ad2fbdb3a63c2bcff9d080d563ba29294b7b8e03
+SHA1 (patch-ab) = 9c63774baf798d6ce73bd45c0f1829bb59a8632b
diff --git a/lang/smalltalk/patches/patch-ab b/lang/smalltalk/patches/patch-ab
index 137fb8bdb5e..5695d9533f3 100644
--- a/lang/smalltalk/patches/patch-ab
+++ b/lang/smalltalk/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.5 2003/07/02 00:00:23 jtb Exp $
+$NetBSD: patch-ab,v 1.6 2003/07/02 22:35:38 jtb Exp $
--- Makefile.in.orig
+++ Makefile.in
@@ -11,12 +11,12 @@ $NetBSD: patch-ab,v 1.5 2003/07/02 00:00:23 jtb Exp $
LIBS = @LIBS@
LIBSNPRINTFV = @LIBSNPRINTFV@
LIBTCLTK = @LIBTCLTK@
-@@ -349,7 +349,7 @@
- done
- gst$(EXEEXT): $(gst_OBJECTS) $(gst_DEPENDENCIES)
- @rm -f gst$(EXEEXT)
-- $(LINK) $(gst_LDFLAGS) $(gst_OBJECTS) $(gst_LDADD) $(LIBS)
-+ $(LINK) $(gst_LDFLAGS) $(gst_OBJECTS) $(gst_LDADD) $(LIBS) $(LIBREADLINE)
- binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
- install-binSCRIPTS: $(bin_SCRIPTS)
- @$(NORMAL_INSTALL)
+@@ -216,7 +216,7 @@
+ bin_SCRIPTS = gst-package gst-config
+
+ gst_SOURCES = main.c
+-gst_LDADD = libgst/libgst.la @ICON@
++gst_LDADD = libgst/libgst.la $(LIBGMP) $(LIBLTDL) $(LIBREADLINE) $(LIBSNPRINTFV)
+ gst_LDFLAGS = -export-dynamic
+ gst_DEPENDENCIES = libgst/libgst.la @ICON@
+ INCLUDES = -I$(top_srcdir)/libgst