Update to use our pkg version of libtool, rather than its own private

copy.

3 files changed, 55 insertions, 4 deletions

diff --git a/graphics/jpeg/Makefile b/graphics/jpeg/Makefile
index 06803d55ea3..074710e907a 100644
--- a/graphics/jpeg/Makefile
+++ b/graphics/jpeg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 1998/07/04 09:37:29 mycroft Exp $
+# $NetBSD: Makefile,v 1.10 1998/07/17 14:33:52 tv Exp $
 #
 
 DISTNAME=       jpegsrc.v6b
@@ -8,9 +8,11 @@ MASTER_SITES=   ftp://ftp.uu.net/graphics/jpeg/
 
 MAINTAINER=	mycroft@netbsd.org
 
+BUILD_DEPENDS=	${PREFIX}/bin/libtool:../../devel/libtool
+
 WRKSRC=         ${WRKDIR}/jpeg-6b
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--enable-shared --enable-static
+CONFIGURE_ENV=	LIBTOOL=${PREFIX}/bin/libtool
 INSTALL_TARGET= install install-lib
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/jpeg/patches/patch-aa b/graphics/jpeg/patches/patch-aa
new file mode 100644
index 00000000000..bd35c415ceb
--- /dev/null
+++ b/graphics/jpeg/patches/patch-aa
@@ -0,0 +1,50 @@
+--- configure.orig	Fri Jul 17 10:11:37 1998
++++ configure	Fri Jul 17 10:12:37 1998
+@@ -1511,38 +1511,12 @@
+ fi
+ 
+ 
+-# Decide whether to use libtool,
+-# and if so whether to build shared, static, or both flavors of library.
+-LTSHARED="no"
+-# Check whether --enable-shared or --disable-shared was given.
+-if test "${enable_shared+set}" = set; then
+-  enableval="$enable_shared"
+-  LTSHARED="$enableval"
+-fi
+-
+-LTSTATIC="no"
+-# Check whether --enable-static or --disable-static was given.
+-if test "${enable_static+set}" = set; then
+-  enableval="$enable_static"
+-  LTSTATIC="$enableval"
+-fi
+-
+-if test "x$LTSHARED" != xno  -o  "x$LTSTATIC" != xno; then
+   USELIBTOOL="yes"
+-  LIBTOOL="./libtool"
+   O="lo"
+   A="la"
+   LN='$(LIBTOOL) --mode=link $(CC)'
+   INSTALL_LIB='$(LIBTOOL) --mode=install ${INSTALL}'
+   INSTALL_PROGRAM="\$(LIBTOOL) --mode=install $INSTALL_PROGRAM"
+-else
+-  USELIBTOOL="no"
+-  LIBTOOL=""
+-  O="o"
+-  A="a"
+-  LN='$(CC)'
+-  INSTALL_LIB="$INSTALL_DATA"
+-fi
+ 
+ 
+ 
+@@ -1550,7 +1524,7 @@
+ 
+ 
+ # Configure libtool if needed.
+-if test $USELIBTOOL = yes; then
++if false; then
+   disable_shared=
+   disable_static=
+   if test "x$LTSHARED" = xno; then
diff --git a/graphics/jpeg/pkg/PLIST b/graphics/jpeg/pkg/PLIST
index 06cc75dc84a..451878d6442 100644
--- a/graphics/jpeg/pkg/PLIST
+++ b/graphics/jpeg/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 1998/07/15 12:51:37 agc Exp $
+@comment $NetBSD: PLIST,v 1.8 1998/07/17 14:33:53 tv Exp $
 bin/cjpeg
 bin/djpeg
 bin/jpegtran
@@ -9,7 +9,6 @@ include/jpeglib.h
 include/jmorecfg.h
 include/jerror.h
 lib/libjpeg.a
-lib/libjpeg.la
 lib/libjpeg.so.62.0
 man/man1/cjpeg.1.gz
 man/man1/djpeg.1.gz