Get libtool from the right place.

5 files changed, 44 insertions, 32 deletions

diff --git a/devel/xdelta/patches/patch-aa b/devel/xdelta/patches/patch-aa
index 98ce3d91fca..60a59f4e64a 100644
--- a/devel/xdelta/patches/patch-aa
+++ b/devel/xdelta/patches/patch-aa
@@ -1,8 +1,20 @@
-$NetBSD: patch-aa,v 1.1 1998/08/22 13:40:38 garbled Exp $
---- configure.orig	Sat Aug 22 03:46:19 1998
-+++ configure	Sat Aug 22 03:51:53 1998
-@@ -2247,3 +2247,3 @@
+$NetBSD: patch-aa,v 1.2 1998/10/02 14:55:03 tv Exp $
+
+--- configure.orig	Fri Oct  2 10:43:32 1998
++++ configure	Fri Oct  2 10:43:55 1998
+@@ -2244,6 +2244,7 @@
+   echo "$ac_t""no" 1>&6
+ fi
+ 
++if false; then
  # Always use our own libtool.
--LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+LIBTOOL='$(SHELL) $(exec_prefix)/bin/libtool'
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+ 
+@@ -2289,6 +2290,7 @@
+ ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \
+ $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
+ || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
++fi
  
+ echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
+ echo "configure:2295: checking how to run the C preprocessor" >&5
diff --git a/graphics/tiff/patches/patch-ab b/graphics/tiff/patches/patch-ab
index 5bb47d85ff2..2929d561f60 100644
--- a/graphics/tiff/patches/patch-ab
+++ b/graphics/tiff/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.4 1998/08/07 10:40:54 agc Exp $
+$NetBSD: patch-ab,v 1.5 1998/10/02 14:57:52 tv Exp $
 
 --- libtiff/Makefile.in.orig	Mon Jul 20 11:13:09 1998
 +++ libtiff/Makefile.in	Mon Jul 20 11:40:13 1998
@@ -7,7 +7,7 @@ $NetBSD: patch-ab,v 1.4 1998/08/07 10:40:54 agc Exp $
  SHELL	= @SCRIPT_SH@
  NULL	=
 -CC	= @CCOMPILER@
-+CC	= ${PREFIX}/bin/libtool @CCOMPILER@
++CC	= ${LIBTOOL} @CCOMPILER@
  AR	= @AR@
  AROPTS	= @AROPTS@
  RANLIB	= @RANLIB@
@@ -38,7 +38,7 @@ $NetBSD: patch-ab,v 1.4 1998/08/07 10:40:54 agc Exp $
  install: all installHdrs
  	${INSTALL} -idb tiff.sw.dev -m 755 -dir @DIR_LIB@
 -	${INSTALL} -idb tiff.sw.dev -m 444 -F @DIR_LIB@ -O libtiff.a
-+	${PREFIX}/bin/libtool --mode=install ${BSD_INSTALL_DATA} libtiff.la @DIR_LIB@
++	${LIBTOOL} --mode=install ${BSD_INSTALL_DATA} libtiff.la @DIR_LIB@
  	if [ @DSO@dso != nodso ]; then					\
  	    ${MAKE} installDSO;						\
  	else								\
diff --git a/graphics/tiff/patches/patch-ac b/graphics/tiff/patches/patch-ac
index 66c914872f3..217243d44f3 100644
--- a/graphics/tiff/patches/patch-ac
+++ b/graphics/tiff/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.5 1998/08/07 10:40:54 agc Exp $
+$NetBSD: patch-ac,v 1.6 1998/10/02 14:57:53 tv Exp $
 
 --- tools/Makefile.in.orig	Mon Jul 20 11:17:11 1998
 +++ tools/Makefile.in	Mon Jul 20 11:43:58 1998
@@ -20,7 +20,7 @@ $NetBSD: patch-ac,v 1.5 1998/08/07 10:40:54 agc Exp $
  install: all
  	${INSTALL} -idb tiff.sw.tools -m 755 -dir @DIR_BIN@
 -	${INSTALL} -idb tiff.sw.tools -m 755 -F @DIR_BIN@ -O ${TARGETS}
-+	${PREFIX}/bin/libtool ${BSD_INSTALL_PROGRAM} ${TARGETS} @DIR_BIN@
++	${LIBTOOL} ${BSD_INSTALL_PROGRAM} ${TARGETS} @DIR_BIN@
  	@if [ "@LIBIMAGE@" = yes ]; then \
  	    ${INSTALL} -idb tiff.sw.tools -m 755 -F @DIR_BIN@ -O sgi2tiff; \
  	else \
@@ -29,43 +29,43 @@ $NetBSD: patch-ac,v 1.5 1998/08/07 10:40:54 agc Exp $
  
  tiffinfo: tiffinfo.o ${TIFFLIB}
 -	${CC} -o tiffinfo ${CFLAGS} tiffinfo.o ${LIBS}
-+	${PREFIX}/bin/libtool ${CC} -o tiffinfo ${CFLAGS} tiffinfo.o ${LIBS}
++	${LIBTOOL} ${CC} -o tiffinfo ${CFLAGS} tiffinfo.o ${LIBS}
  tiffinfo.o: ${SRCDIR}/tiffinfo.c
  	${CC} -c ${CFLAGS} ${SRCDIR}/tiffinfo.c
  
  tiffcmp:tiffcmp.o ${TIFFLIB}
 -	${CC} -o tiffcmp ${CFLAGS} tiffcmp.o ${LIBS}
-+	${PREFIX}/bin/libtool ${CC} -o tiffcmp ${CFLAGS} tiffcmp.o ${LIBS}
++	${LIBTOOL} ${CC} -o tiffcmp ${CFLAGS} tiffcmp.o ${LIBS}
  tiffcmp.o: ${SRCDIR}/tiffcmp.c
  	${CC} -c ${CFLAGS} ${SRCDIR}/tiffcmp.c
  
  tiffcp:	tiffcp.o ${TIFFLIB}
 -	${CC} -o tiffcp ${CFLAGS} tiffcp.o ${LIBS}
-+	${PREFIX}/bin/libtool ${CC} -o tiffcp ${CFLAGS} tiffcp.o ${LIBS}
++	${LIBTOOL} ${CC} -o tiffcp ${CFLAGS} tiffcp.o ${LIBS}
  tiffcp.o: ${SRCDIR}/tiffcp.c
  	${CC} -c ${CFLAGS} ${SRCDIR}/tiffcp.c
  
  tiffdump: tiffdump.o
 -	${CC} -o tiffdump ${CFLAGS} tiffdump.o ${LIBS}
-+	${PREFIX}/bin/libtool ${CC} -o tiffdump ${CFLAGS} tiffdump.o ${LIBS}
++	${LIBTOOL} ${CC} -o tiffdump ${CFLAGS} tiffdump.o ${LIBS}
  tiffdump.o: ${SRCDIR}/tiffdump.c
  	${CC} -c ${CFLAGS} ${SRCDIR}/tiffdump.c
  
  tiffmedian: tiffmedian.o ${TIFFLIB}
 -	${CC} -o tiffmedian ${CFLAGS} tiffmedian.o ${LIBS}
-+	${PREFIX}/bin/libtool ${CC} -o tiffmedian ${CFLAGS} tiffmedian.o ${LIBS}
++	${LIBTOOL} ${CC} -o tiffmedian ${CFLAGS} tiffmedian.o ${LIBS}
  tiffmedian.o: ${SRCDIR}/tiffmedian.c
  	${CC} -c ${CFLAGS} ${SRCDIR}/tiffmedian.c
  
  tiffsplit: tiffsplit.o ${TIFFLIB}
 -	${CC} -o tiffsplit ${CFLAGS} tiffsplit.o ${LIBS}
-+	${PREFIX}/bin/libtool ${CC} -o tiffsplit ${CFLAGS} tiffsplit.o ${LIBS}
++	${LIBTOOL} ${CC} -o tiffsplit ${CFLAGS} tiffsplit.o ${LIBS}
  tiffsplit.o: ${SRCDIR}/tiffsplit.c
  	${CC} -c ${CFLAGS} ${SRCDIR}/tiffsplit.c
  
  tiff2ps: tiff2ps.o ${TIFFLIB}
 -	${CC} -o tiff2ps ${CFLAGS} tiff2ps.o ${LIBS}
-+	${PREFIX}/bin/libtool ${CC} -o tiff2ps ${CFLAGS} tiff2ps.o ${LIBS}
++	${LIBTOOL} ${CC} -o tiff2ps ${CFLAGS} tiff2ps.o ${LIBS}
  tiff2ps.o: ${SRCDIR}/tiff2ps.c
  	${CC} -c ${CFLAGS} ${SRCDIR}/tiff2ps.c
  
@@ -74,70 +74,70 @@ $NetBSD: patch-ac,v 1.5 1998/08/07 10:40:54 agc Exp $
  # convert RGB image to B&W
  tiff2bw: tiff2bw.o ${TIFFLIB}
 -	${CC} -o tiff2bw ${CFLAGS} tiff2bw.o ${LIBS}
-+	${PREFIX}/bin/libtool ${CC} -o tiff2bw ${CFLAGS} tiff2bw.o ${LIBS}
++	${LIBTOOL} ${CC} -o tiff2bw ${CFLAGS} tiff2bw.o ${LIBS}
  tiff2bw.o: ${SRCDIR}/tiff2bw.c
  	${CC} -c ${CFLAGS} ${SRCDIR}/tiff2bw.c
  
  # convert B&W image to bilevel w/ FS dithering
  tiffdither: tiffdither.o ${TIFFLIB}
 -	${CC} -o tiffdither ${CFLAGS} tiffdither.o ${LIBS}
-+	${PREFIX}/bin/libtool ${CC} -o tiffdither ${CFLAGS} tiffdither.o ${LIBS}
++	${LIBTOOL} ${CC} -o tiffdither ${CFLAGS} tiffdither.o ${LIBS}
  tiffdither.o: ${SRCDIR}/tiffdither.c
  	${CC} -c ${CFLAGS} ${SRCDIR}/tiffdither.c
  
  # simple Sun rasterfile converter
  ras2tiff: ras2tiff.o ${TIFFLIB}
 -	${CC} -o ras2tiff ${CFLAGS} ras2tiff.o ${LIBS}
-+	${PREFIX}/bin/libtool ${CC} -o ras2tiff ${CFLAGS} ras2tiff.o ${LIBS}
++	${LIBTOOL} ${CC} -o ras2tiff ${CFLAGS} ras2tiff.o ${LIBS}
  ras2tiff.o: ${SRCDIR}/ras2tiff.c
  	${CC} -c ${CFLAGS} ${SRCDIR}/ras2tiff.c
  
  # simple GIF converter
  gif2tiff: gif2tiff.o ${TIFFLIB}
 -	${CC} -o gif2tiff ${CFLAGS} gif2tiff.o ${LIBS}
-+	${PREFIX}/bin/libtool ${CC} -o gif2tiff ${CFLAGS} gif2tiff.o ${LIBS}
++	${LIBTOOL} ${CC} -o gif2tiff ${CFLAGS} gif2tiff.o ${LIBS}
  gif2tiff.o: ${SRCDIR}/gif2tiff.c
  	${CC} -c ${CFLAGS} ${SRCDIR}/gif2tiff.c
  
  # very limited PBM converter
  ppm2tiff: ppm2tiff.o ${TIFFLIB}
 -	${CC} -o ppm2tiff ${CFLAGS} ppm2tiff.o ${LIBS}
-+	${PREFIX}/bin/libtool ${CC} -o ppm2tiff ${CFLAGS} ppm2tiff.o ${LIBS}
++	${LIBTOOL} ${CC} -o ppm2tiff ${CFLAGS} ppm2tiff.o ${LIBS}
  ppm2tiff.o: ${SRCDIR}/ppm2tiff.c
  	${CC} -c ${CFLAGS} ${SRCDIR}/ppm2tiff.c
  
  # Group 3/4 FAX file converter
  fax2tiff: fax2tiff.o ${TIFFLIB}
 -	${CC} -o fax2tiff ${CFLAGS} fax2tiff.o ${LIBS}
-+	${PREFIX}/bin/libtool ${CC} -o fax2tiff ${CFLAGS} fax2tiff.o ${LIBS}
++	${LIBTOOL} ${CC} -o fax2tiff ${CFLAGS} fax2tiff.o ${LIBS}
  fax2tiff.o: ${SRCDIR}/fax2tiff.c
  	${CC} -c -I${LIBDIR} -I${DEPTH}/libtiff ${CFLAGS} ${SRCDIR}/fax2tiff.c
  
  # Group 3/4 FAX to encoded PS converter
  fax2ps: fax2ps.o ${TIFFLIB}
 -	${CC} -o fax2ps ${CFLAGS} fax2ps.o ${LIBS}
-+	${PREFIX}/bin/libtool ${CC} -o fax2ps ${CFLAGS} fax2ps.o ${LIBS}
++	${LIBTOOL} ${CC} -o fax2ps ${CFLAGS} fax2ps.o ${LIBS}
  fax2ps.o: ${SRCDIR}/fax2ps.c
  	${CC} -c ${CFLAGS} ${SRCDIR}/fax2ps.c
  
  # convert Palette image to RGB
  pal2rgb: pal2rgb.o ${TIFFLIB}
 -	${CC} -o pal2rgb ${CFLAGS} pal2rgb.o ${LIBS}
-+	${PREFIX}/bin/libtool ${CC} -o pal2rgb ${CFLAGS} pal2rgb.o ${LIBS}
++	${LIBTOOL} ${CC} -o pal2rgb ${CFLAGS} pal2rgb.o ${LIBS}
  pal2rgb.o: ${SRCDIR}/pal2rgb.c
  	${CC} -c ${CFLAGS} ${SRCDIR}/pal2rgb.c
  
  # convert RGB image to YCbCr
  rgb2ycbcr: rgb2ycbcr.o ${TIFFLIB}
 -	${CC} -o rgb2ycbcr ${CFLAGS} rgb2ycbcr.o ${LIBS}
-+	${PREFIX}/bin/libtool ${CC} -o rgb2ycbcr ${CFLAGS} rgb2ycbcr.o ${LIBS}
++	${LIBTOOL} ${CC} -o rgb2ycbcr ${CFLAGS} rgb2ycbcr.o ${LIBS}
  rgb2ycbcr.o: ${SRCDIR}/rgb2ycbcr.c
  	${CC} -c ${CFLAGS} ${SRCDIR}/rgb2ycbcr.c
  
  # generate thumbnail images from fax (example of SubIFD usage)
  thumbnail: thumbnail.o ${TIFFLIB}
 -	${CC} -o thumbnail ${CFLAGS} thumbnail.o ${LIBS}
-+	${PREFIX}/bin/libtool ${CC} -o thumbnail ${CFLAGS} thumbnail.o ${LIBS}
++	${LIBTOOL} ${CC} -o thumbnail ${CFLAGS} thumbnail.o ${LIBS}
  thumbnail.o: ${SRCDIR}/thumbnail.c
  	${CC} -c ${CFLAGS} ${SRCDIR}/thumbnail.c
  
diff --git a/x11/qt/patches/patch-aa b/x11/qt/patches/patch-aa
index 63f2ef190c7..eb35d088628 100644
--- a/x11/qt/patches/patch-aa
+++ b/x11/qt/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 1998/08/07 11:18:13 agc Exp $
+$NetBSD: patch-aa,v 1.3 1998/10/02 15:02:33 tv Exp $
 
 --- configs/netbsd-g++-static.orig	Sun Jul 19 14:18:04 1998
 +++ configs/netbsd-g++-static	Sun Jul 19 16:51:29 1998
@@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.2 1998/08/07 11:18:13 agc Exp $
  #
 -SYSCONF_AR		= ar cqs
 -SYSCONF_LINK_TARGET_STATIC = lib$(TARGET).a
-+SYSCONF_AR		= $(LOCALBASE)/bin/libtool $(SYSCONF_CC) -rpath $(PREFIX)/lib -version-info $(VER_MAJ):$(VER_MIN) -o
++SYSCONF_AR		= $(LIBTOOL) $(SYSCONF_CC) -rpath $(PREFIX)/lib -version-info $(VER_MAJ):$(VER_MIN) -o
 +SYSCONF_LINK_TARGET_STATIC = lib$(TARGET).la
  SYSCONF_LINK_LIB_STATIC	= rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC);  \
 -				 $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC)
diff --git a/x11/qt/patches/patch-ab b/x11/qt/patches/patch-ab
index 98603a6a21a..94ed9afbb33 100644
--- a/x11/qt/patches/patch-ab
+++ b/x11/qt/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.2 1998/08/07 11:18:13 agc Exp $
+$NetBSD: patch-ab,v 1.3 1998/10/02 15:02:33 tv Exp $
 
 --- src/Makefile.in.orig	Sun Jul 19 14:30:55 1998
 +++ src/Makefile.in	Sun Jul 19 16:51:42 1998
@@ -7,7 +7,7 @@ $NetBSD: patch-ab,v 1.2 1998/08/07 11:18:13 agc Exp $
  ####### Compiler, tools and options
  
 -CC	=	$(SYSCONF_CC)
-+CC	=	$(LOCALBASE)/bin/libtool $(SYSCONF_CC)
++CC	=	$(LIBTOOL) $(SYSCONF_CC)
  CFLAGS	=	$(SYSCONF_CFLAGS_QT) $(SYSCONF_CFLAGS_X11) $(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB)
  LFLAGS	=	$(SYSCONF_LFLAGS_X11) $(SYSCONF_LFLAGS)
  LIBS	=	$(SYSCONF_LIBS_X11)