Make squeak build again:

- correctly override the libtool used by the build.
- patch-ao: rearrange linker arguments so that vm/vm.a pulls in the libraries.
- patch-ap: fix building of npsqueak browser plugin (use cc as compiler. add
  .so suffix to plugin)
- for whatever reason the plugins are now installed with .a and .so suffixes.
  adjust PLISTs accordingly.

I can now at least start the vm again.

7 files changed, 85 insertions, 20 deletions

diff --git a/lang/squeak/Makefile b/lang/squeak/Makefile
index 2700605fd27..42ad013b628 100644
--- a/lang/squeak/Makefile
+++ b/lang/squeak/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2009/05/08 06:35:51 hasso Exp $
+# $NetBSD: Makefile,v 1.40 2010/02/10 23:33:09 bad Exp $
 #
 
 DISTNAME=	Squeak-3.9-8
@@ -27,6 +27,7 @@ BUILD_DIRS=		${WRKDIR}/build
 CONFIGURE_DIRS=		${WRKDIR}/build
 CONFIGURE_SCRIPT=	${WRKSRC}/platforms/unix/config/configure
 OVERRIDE_DIRDEPTH=	3
+LIBTOOL_OVERRIDE=	${BUILD_DIRS}/libtool
 DIST_SUBDIR=		squeak
 
 SQUEAK_CHANGES= Squeak3.9-final-7067/Squeak3.9-final-7067.changes.gz
diff --git a/lang/squeak/PLIST b/lang/squeak/PLIST
index 989b41ff271..ddb8c7c17ca 100644
--- a/lang/squeak/PLIST
+++ b/lang/squeak/PLIST
@@ -1,18 +1,28 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:03:41 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2010/02/10 23:33:09 bad Exp $
 bin/inisqueak
 bin/squeak
-lib/squeak/3.9-8/AioPlugin
-lib/squeak/3.9-8/B3DAcceleratorPlugin
-lib/squeak/3.9-8/PseudoTTYPlugin
-lib/squeak/3.9-8/Squeak3D
-lib/squeak/3.9-8/UnixOSProcessPlugin
-lib/squeak/3.9-8/XDisplayControlPlugin
+lib/squeak/3.9-8/AioPlugin.a
+lib/squeak/3.9-8/AioPlugin.so
+lib/squeak/3.9-8/B3DAcceleratorPlugin.a
+lib/squeak/3.9-8/B3DAcceleratorPlugin.so
+lib/squeak/3.9-8/PseudoTTYPlugin.a
+lib/squeak/3.9-8/PseudoTTYPlugin.so
+lib/squeak/3.9-8/Squeak3D.a
+lib/squeak/3.9-8/Squeak3D.so
+lib/squeak/3.9-8/UnixOSProcessPlugin.a
+lib/squeak/3.9-8/UnixOSProcessPlugin.so
+lib/squeak/3.9-8/XDisplayControlPlugin.a
+lib/squeak/3.9-8/XDisplayControlPlugin.so
 lib/squeak/3.9-8/npsqueak.so
 lib/squeak/3.9-8/squeak
-lib/squeak/3.9-8/vm-display-X11
-lib/squeak/3.9-8/vm-display-null
-lib/squeak/3.9-8/vm-sound-NAS
-lib/squeak/3.9-8/vm-sound-null
+lib/squeak/3.9-8/vm-display-X11.a
+lib/squeak/3.9-8/vm-display-X11.so
+lib/squeak/3.9-8/vm-display-null.a
+lib/squeak/3.9-8/vm-display-null.so
+lib/squeak/3.9-8/vm-sound-NAS.a
+lib/squeak/3.9-8/vm-sound-NAS.so
+lib/squeak/3.9-8/vm-sound-null.a
+lib/squeak/3.9-8/vm-sound-null.so
 lib/squeak/Squeak3.9-final-7067.changes.gz
 lib/squeak/Squeak3.9-final-7067.image.gz
 lib/squeak/SqueakV39.sources
diff --git a/lang/squeak/PLIST.Linux b/lang/squeak/PLIST.Linux
index 2f844457077..2e55dfe97cb 100644
--- a/lang/squeak/PLIST.Linux
+++ b/lang/squeak/PLIST.Linux
@@ -1,5 +1,9 @@
-@comment $NetBSD: PLIST.Linux,v 1.1 2008/02/06 18:45:32 reed Exp $
-lib/squeak/3.9-8/UUIDPlugin
-lib/squeak/3.9-8/vm-display-fbdev
-lib/squeak/3.9-8/vm-sound-ALSA
-lib/squeak/3.9-8/vm-sound-OSS
+@comment $NetBSD: PLIST.Linux,v 1.2 2010/02/10 23:33:09 bad Exp $
+lib/squeak/3.9-8/UUIDPlugin.a
+lib/squeak/3.9-8/UUIDPlugin.so
+lib/squeak/3.9-8/vm-display-fbdev.a
+lib/squeak/3.9-8/vm-display-fbdev.so
+lib/squeak/3.9-8/vm-sound-ALSA.a
+lib/squeak/3.9-8/vm-sound-ALSA.so
+lib/squeak/3.9-8/vm-sound-OSS.a
+lib/squeak/3.9-8/vm-sound-OSS.so
diff --git a/lang/squeak/PLIST.NetBSD b/lang/squeak/PLIST.NetBSD
index 530ec11117b..1ee8aa1101e 100644
--- a/lang/squeak/PLIST.NetBSD
+++ b/lang/squeak/PLIST.NetBSD
@@ -1,2 +1,3 @@
-@comment $NetBSD: PLIST.NetBSD,v 1.1 2008/02/06 18:45:31 reed Exp $
-lib/squeak/3.9-8/vm-sound-NetBSD
+@comment $NetBSD: PLIST.NetBSD,v 1.2 2010/02/10 23:33:09 bad Exp $
+lib/squeak/3.9-8/vm-sound-NetBSD.a
+lib/squeak/3.9-8/vm-sound-NetBSD.so
diff --git a/lang/squeak/distinfo b/lang/squeak/distinfo
index 3897ae553f5..5a5e1d305de 100644
--- a/lang/squeak/distinfo
+++ b/lang/squeak/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2008/01/14 20:39:35 bad Exp $
+$NetBSD: distinfo,v 1.13 2010/02/10 23:33:09 bad Exp $
 
 SHA1 (squeak/Squeak-3.9-8.src.tar.gz) = 9d8b88de09b07a6603cea7447cd3cdfe6c23d463
 RMD160 (squeak/Squeak-3.9-8.src.tar.gz) = d97bc098a3a948edc59c522e8a8baeda97fd9de9
@@ -20,3 +20,5 @@ SHA1 (patch-ak) = fabbf4d71aaa39fb77d2b51a6e0402500d825009
 SHA1 (patch-al) = d58a1800600ff1a124c3db7aa382b085218160f3
 SHA1 (patch-am) = a302a00bceff51e43b2af3299433f710917526c3
 SHA1 (patch-an) = ab36cdee3ecf1b374ce75780d310596cefe40152
+SHA1 (patch-ao) = ff65b7596568178fd1c4e6eb3f8418f6daa8410f
+SHA1 (patch-ap) = ebc1dafbbb5018bd19e8775e7d6fb6bd4d0d6cc0
diff --git a/lang/squeak/patches/patch-ao b/lang/squeak/patches/patch-ao
new file mode 100644
index 00000000000..ec23caae351
--- /dev/null
+++ b/lang/squeak/patches/patch-ao
@@ -0,0 +1,22 @@
+$NetBSD: patch-ao,v 1.1 2010/02/10 23:33:09 bad Exp $
+
+--- platforms/unix/config/Makefile.in.orig	2006-04-05 19:40:24.000000000 +0200
++++ platforms/unix/config/Makefile.in	2010-02-08 01:34:56.000000000 +0100
+@@ -52,7 +52,7 @@
+ # VM
+ 
+ $(squeak) : config.sh $(SQLIBS) version.o
+-	$(LINK) $(squeak) $(SQLIBS) version.o $(LIBS) [plibs] vm/vm.a
++	$(LINK) $(squeak) vm/vm.a $(SQLIBS) version.o $(LIBS) [plibs]
+ 	@echo
+ 	@size $(squeak)
+ 	@echo
+@@ -123,7 +123,7 @@
+ 
+ NPSqueak : config.sh $(SQLIBS) version.o $(NPOBJS)
+ 	gcc -bundle -flat_namespace -undefined suppress -o NPSqueak \
+-	  $(NPLIBS) $(SQLIBS) version.o $(LIBS)  vm/vm.a
++	  $(NPLIBS) vm/vm.a $(SQLIBS) version.o $(LIBS) 
+ 
+ # manual page
+ 
diff --git a/lang/squeak/patches/patch-ap b/lang/squeak/patches/patch-ap
new file mode 100644
index 00000000000..81041c68f9e
--- /dev/null
+++ b/lang/squeak/patches/patch-ap
@@ -0,0 +1,25 @@
+$NetBSD: patch-ap,v 1.1 2010/02/10 23:33:09 bad Exp $
+
+--- platforms/unix/npsqueak/MakefileMakefile.orig	2006-10-10 21:01:44.000000000 +0200
++++ platforms/unix/npsqueak/MakefileMakefile	2010-02-11 00:13:25.000000000 +0100
+@@ -5,9 +5,9 @@
+ ############ Customize flags here #######################
+ 
+ INC	= -I./include -I/usr/X11R6/include
+-CC	= gcc
++CC	= cc
+ CFLAGS	= $(INC) -O2 -fPIC -Wall
+-LD	= gcc
++LD	= cc
+ LDFLAGS = 
+ 
+ # usually overridden from top level makefile
+@@ -26,7 +26,7 @@
+ 
+ npsqueak.so : npsqueak.la 
+ 	-@rm -f $@ 
+-	ln .libs/npsqueak $@ 
++	ln .libs/npsqueak.so $@ 
+ 
+ npsqueak.la : npsqueak.lo npunix.lo 
+ 	../libtool --mode=link $(LD) $(LDFLAGS) npsqueak.lo npunix.lo -avoid-version -module -rpath $(plgdir) -o $@