Always use correct --mode argument for libtool.

8 files changed, 43 insertions, 28 deletions

diff --git a/editors/pico/Makefile b/editors/pico/Makefile
index e9042c46e16..0fa7177983c 100644
--- a/editors/pico/Makefile
+++ b/editors/pico/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.76 2009/05/19 08:59:12 wiz Exp $
+# $NetBSD: Makefile,v 1.77 2009/11/26 00:10:42 joerg Exp $
 #
 # NOTE:
 # When updating, it is necessary to change the shlib version, located in
@@ -57,7 +57,8 @@ post-extract:
 
 do-build:
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./build ${BUILDNAME} \
-		CC="${LIBTOOL} ${CC}" \
+		CC="${LIBTOOL} --mode=compile ${CC}" \
+		LDCC="${LIBTOOL} --mode=link ${CC}" \
 		PREFIX=${PREFIX} OPTIMIZE="${CFLAGS}" \
 		EXTRALDFLAGS="${LIBS}"
 
diff --git a/editors/pico/distinfo b/editors/pico/distinfo
index 611f5b7cfd7..0ede38ab222 100644
--- a/editors/pico/distinfo
+++ b/editors/pico/distinfo
@@ -1,13 +1,14 @@
-$NetBSD: distinfo,v 1.24 2008/03/04 22:00:30 jlam Exp $
+$NetBSD: distinfo,v 1.25 2009/11/26 00:10:42 joerg Exp $
 
 SHA1 (pine4.64.tar.bz2) = b88aeb64ec2fa30bbb38fda3a051d98dc0e19c5e
 RMD160 (pine4.64.tar.bz2) = 8661cd3c0875e46c8cd5eafa7c7c964f79a3b3fd
 Size (pine4.64.tar.bz2) = 3110790 bytes
-SHA1 (patch-aa) = cda803b835c5d0d7cb4e4c3f162a680db2b8a0b1
+SHA1 (patch-aa) = 4bc4703182de5bb8ddca77339ca163b9a61f94fb
 SHA1 (patch-ac) = a6de88e9ab5f1464d58476cbbeb0579938d51427
 SHA1 (patch-ad) = a5145664372b0ad308a0ee2501211e927d343971
-SHA1 (patch-ae) = 143fa40c6c597c23fc7ac187c683cbff7bf85688
-SHA1 (patch-af) = 82bc822744e6a74d0bd86bafb1654d0fac0a8b81
-SHA1 (patch-ag) = e92dbb0cacb7104570c356f093ad2fb1cd3b9d2d
-SHA1 (patch-ah) = 65f713181af150c64a28ec6547fc966eddae1961
+SHA1 (patch-ae) = c73be96a2b97f70be8e2f1ccb12767cab35ab2f7
+SHA1 (patch-af) = 59cc95b758dbdd03848bd3d17b5105f6bc909e09
+SHA1 (patch-ag) = 21c6474fed212cd3c45cf210d9b879c96ed4f0b8
+SHA1 (patch-ah) = bc26f6e3d7aed7e718ae924f0f348f448d495864
 SHA1 (patch-ai) = 7e2a70ee4322aa85de80089c2e4470ec12bfe110
+SHA1 (patch-aj) = fc44b6786797184c4323b40aa2a73960cc421f2d
diff --git a/editors/pico/patches/patch-aa b/editors/pico/patches/patch-aa
index bbf5809086b..1d7115aa5e9 100644
--- a/editors/pico/patches/patch-aa
+++ b/editors/pico/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.16 2006/01/12 21:00:52 adam Exp $
+$NetBSD: patch-aa,v 1.17 2009/11/26 00:10:42 joerg Exp $
 
 --- pico/makefile.neb.orig	2001-10-24 00:19:07.000000000 +0200
 +++ pico/makefile.neb	2003-07-28 14:04:16.000000000 +0200
@@ -29,17 +29,17 @@ $NetBSD: patch-aa,v 1.16 2006/01/12 21:00:52 adam Exp $
  
  pico:		main.o
 -		$(CC) $(CFLAGS) main.o libpico.a $(LIBS) -o pico
-+		$(CC) $(CFLAGS) main.o libpico.la $(LIBS) -o pico
++		$(LDCC) $(CFLAGS) main.o libpico.la $(LIBS) -o pico
  
  pilot:		pilot.o
 -		$(CC) $(CFLAGS) pilot.o libpico.a $(LIBS) -o pilot
-+		$(CC) $(CFLAGS) pilot.o libpico.la $(LIBS) -o pilot
++		$(LDCC) $(CFLAGS) pilot.o libpico.la $(LIBS) -o pilot
  
 -libpico.a:	$(OFILES)
 -		$(LIBCMD) $(LIBARGS) libpico.a $(OFILES)
 -		$(RANLIB) libpico.a
 +libpico.la:	$(OFILES)
-+		$(CC) -o libpico.la $(OFILES:.o=.lo) -rpath $(PREFIX)/lib \
++		$(LDCC) -o libpico.la $(OFILES:.o=.lo) -rpath $(PREFIX)/lib \
 +			-version-info 6:0
  
  clean:
diff --git a/editors/pico/patches/patch-ae b/editors/pico/patches/patch-ae
index 0ccad04e9f3..059c2023daf 100644
--- a/editors/pico/patches/patch-ae
+++ b/editors/pico/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.9 2006/01/12 21:00:52 adam Exp $
+$NetBSD: patch-ae,v 1.10 2009/11/26 00:10:42 joerg Exp $
 
 --- pico/makefile.sol.orig	Tue Oct 23 22:19:09 2001
 +++ pico/makefile.sol	Fri Dec 14 19:11:59 2001
@@ -39,17 +39,17 @@ $NetBSD: patch-ae,v 1.9 2006/01/12 21:00:52 adam Exp $
  
  pico:		main.o
 -		$(LDCC) $(CFLAGS) main.o libpico.a $(LIBS) -o pico
-+		$(CC) $(CFLAGS) main.o libpico.la $(LIBS) -o pico
++		$(LDCC) $(CFLAGS) main.o libpico.la $(LIBS) -o pico
  
  pilot:		pilot.o
 -		$(LDCC) $(CFLAGS) pilot.o libpico.a $(LIBS) -o pilot
-+		$(CC) $(CFLAGS) pilot.o libpico.la $(LIBS) -o pilot
++		$(LDCC) $(CFLAGS) pilot.o libpico.la $(LIBS) -o pilot
  
 -libpico.a:	$& $(OFILES)
 -		$(LIBCMD) $(LIBARGS) libpico.a $(OFILES)
 -		$(RANLIB) libpico.a
 +libpico.la:	$(OFILES)
-+		$(CC) -o libpico.la $(OFILES:.o=.lo) -rpath $(PREFIX)/lib \
++		$(LDCC) -o libpico.la $(OFILES:.o=.lo) -rpath $(PREFIX)/lib \
 +			-version-info 6:0
  
  clean:
diff --git a/editors/pico/patches/patch-af b/editors/pico/patches/patch-af
index 5a5866b4310..cb17919d18a 100644
--- a/editors/pico/patches/patch-af
+++ b/editors/pico/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.7 2008/03/04 22:00:30 jlam Exp $
+$NetBSD: patch-af,v 1.8 2009/11/26 00:10:42 joerg Exp $
 
 --- pico/makefile.osx.orig	2002-09-20 14:23:11.000000000 -0400
 +++ pico/makefile.osx
@@ -22,17 +22,17 @@ $NetBSD: patch-af,v 1.7 2008/03/04 22:00:30 jlam Exp $
  
  pico:		main.o
 -		$(CC) $(CFLAGS) main.o libpico.a $(LIBS) -o pico
-+		$(CC) $(CFLAGS) main.o libpico.la $(LIBS) -o pico
++		$(LDCC) $(CFLAGS) main.o libpico.la $(LIBS) -o pico
  
  pilot:		pilot.o
 -		$(CC) $(CFLAGS) pilot.o libpico.a $(LIBS) -o pilot
-+		$(CC) $(CFLAGS) pilot.o libpico.la $(LIBS) -o pilot
++		$(LDCC) $(CFLAGS) pilot.o libpico.la $(LIBS) -o pilot
  
 -libpico.a:	$(OFILES)
 -		$(LIBCMD) $(LIBARGS) libpico.a $(OFILES)
 -		$(RANLIB) libpico.a
 +libpico.la:	$(OFILES)
-+		$(CC) -o libpico.la $(OFILES:.o=.lo) -rpath $(PREFIX)/lib \
++		$(LDCC) -o libpico.la $(OFILES:.o=.lo) -rpath $(PREFIX)/lib \
 +			-version-info 6:0
  
  clean:
diff --git a/editors/pico/patches/patch-ag b/editors/pico/patches/patch-ag
index 8520f1cafae..16b1438da12 100644
--- a/editors/pico/patches/patch-ag
+++ b/editors/pico/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.4 2006/01/12 21:00:52 adam Exp $
+$NetBSD: patch-ag,v 1.5 2009/11/26 00:10:42 joerg Exp $
 
 --- pico/makefile.lnx.orig	Tue Oct 23 15:19:06 2001
 +++ pico/makefile.lnx
@@ -32,17 +32,17 @@ $NetBSD: patch-ag,v 1.4 2006/01/12 21:00:52 adam Exp $
  
  pico:		main.o
 -		$(CC) $(CFLAGS) main.o libpico.a $(LIBS) -o pico
-+		$(CC) $(CFLAGS) main.o libpico.la $(LIBS) -o pico
++		$(LDCC) $(CFLAGS) main.o libpico.la $(LIBS) -o pico
  
  pilot:		pilot.o
 -		$(CC) $(CFLAGS) pilot.o libpico.a $(LIBS) -o pilot
-+		$(CC) $(CFLAGS) pilot.o libpico.la $(LIBS) -o pilot
++		$(LDCC) $(CFLAGS) pilot.o libpico.la $(LIBS) -o pilot
  
 -libpico.a:	$(OFILES)
 -		$(LIBCMD) $(LIBARGS) libpico.a $(OFILES)
 -		$(RANLIB) libpico.a
 +libpico.la:	$(OFILES)
-+		$(CC) -o libpico.la $(OFILES:.o=.lo) -rpath $(PREFIX)/lib \
++		$(LDCC) -o libpico.la $(OFILES:.o=.lo) -rpath $(PREFIX)/lib \
 +			-version-info 6:0
  
  clean:
diff --git a/editors/pico/patches/patch-ah b/editors/pico/patches/patch-ah
index 3fb5e8424f5..ccd91a1e8a0 100644
--- a/editors/pico/patches/patch-ah
+++ b/editors/pico/patches/patch-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.4 2006/01/12 21:00:52 adam Exp $
+$NetBSD: patch-ah,v 1.5 2009/11/26 00:10:42 joerg Exp $
 
 --- pico/makefile.sgi.orig	Mon Jan 17 22:03:01 2005
 +++ pico/makefile.sgi	Mon Jan 17 22:04:34 2005
@@ -28,17 +28,17 @@ $NetBSD: patch-ah,v 1.4 2006/01/12 21:00:52 adam Exp $
  
  pico:		main.o
 -		$(CC) $(CFLAGS) main.o libpico.a $(LIBS) -o pico
-+		$(CC) $(CFLAGS) main.o libpico.la $(LIBS) -o pico
++		$(LDCC) $(CFLAGS) main.o libpico.la $(LIBS) -o pico
  
  pilot:		pilot.o
 -		$(CC) $(CFLAGS) pilot.o libpico.a $(LIBS) -o pilot
-+		$(CC) $(CFLAGS) pilot.o libpico.la $(LIBS) -o pilot
++		$(LDCC) $(CFLAGS) pilot.o libpico.la $(LIBS) -o pilot
  
 -libpico.a:	$(OFILES)
 -		$(LIBCMD) $(LIBARGS) libpico.a $(OFILES)
 -		$(RANLIB) libpico.a
 +libpico.la:	$(OFILES)
-+		$(CC) -o libpico.la $(OFILES:.o=.lo) -rpath $(PREFIX)/lib \
++		$(LDCC) -o libpico.la $(OFILES:.o=.lo) -rpath $(PREFIX)/lib \
 +			-version-info 6:0
  
  clean:
diff --git a/editors/pico/patches/patch-aj b/editors/pico/patches/patch-aj
new file mode 100644
index 00000000000..71166b66d81
--- /dev/null
+++ b/editors/pico/patches/patch-aj
@@ -0,0 +1,13 @@
+$NetBSD: patch-aj,v 1.1 2009/11/26 00:10:42 joerg Exp $
+
+--- pico/osdep/makefile.orig	2009-11-26 01:05:39.000000000 +0100
++++ pico/osdep/makefile
+@@ -21,7 +21,7 @@ ALL=	os-a32.c os-a41.c os-aix.c \
+ all:		includer $(ALL)
+ 
+ includer:	includer.c
+-		$(CC) -o includer includer.c
++		$(LDCC) -o includer includer.c
+ 
+ clean:
+ 		$(RM) $(ALL) includer