USE_LIBTOOL instead of USE_PKGLIBTOOL, losing a patch.

4 files changed, 21 insertions, 67 deletions

diff --git a/graphics/jpeg/Makefile b/graphics/jpeg/Makefile
index 547a1544169..c6408c4e24e 100644
--- a/graphics/jpeg/Makefile
+++ b/graphics/jpeg/Makefile
@@ -1,19 +1,21 @@
-# $NetBSD: Makefile,v 1.15 2000/06/01 11:23:29 rh Exp $
+# $NetBSD: Makefile,v 1.16 2000/06/03 19:17:43 wiz Exp $
 #
 
-DISTNAME=	jpegsrc.v6b
-PKGNAME=	jpeg-6b
-CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.uu.net/graphics/jpeg/
+DISTNAME=		jpegsrc.v6b
+PKGNAME=		jpeg-6b
+WRKSRC=			${WRKDIR}/${PKGNAME}
+CATEGORIES=		graphics
+MASTER_SITES=		ftp://ftp.uu.net/graphics/jpeg/
 
-MAINTAINER=	mycroft@netbsd.org
-HOMEPAGE=	http://www.ijg.org/
+MAINTAINER=		mycroft@netbsd.org
+HOMEPAGE=		http://www.ijg.org/
 
-USE_PKGLIBTOOL=	yes
+USE_LIBTOOL=		yes
+LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
-GNU_CONFIGURE=	yes
-INSTALL_TARGET= install install-lib
-
-WRKSRC=		${WRKDIR}/jpeg-6b
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--enable-shared
+CONFIGURE_ARGS+=	--enable-static
+INSTALL_TARGET=		install install-lib
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/jpeg/files/patch-sum b/graphics/jpeg/files/patch-sum
index 66f63d393cb..817ad76a596 100644
--- a/graphics/jpeg/files/patch-sum
+++ b/graphics/jpeg/files/patch-sum
@@ -1,3 +1,6 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 13:51:09 agc Exp $
+$NetBSD: patch-sum,v 1.2 2000/06/03 19:17:44 wiz Exp $
 
-MD5 (patch-aa) = 3358eb3ead6e848e56e1724abb0e894f
+This placeholder file is generated by the ``makepatchsum'' target
+whenever the patches directory is empty or missing. Its purpose
+is to ensure that the presence of any obsolete patches will cause
+the proper error to be emitted at build time.
diff --git a/graphics/jpeg/patches/patch-aa b/graphics/jpeg/patches/patch-aa
deleted file mode 100644
index 4bd4438997e..00000000000
--- a/graphics/jpeg/patches/patch-aa
+++ /dev/null
@@ -1,52 +0,0 @@
-$NetBSD: patch-aa,v 1.6 1998/08/07 10:40:48 agc Exp $
-
---- 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 451878d6442..42820294c56 100644
--- a/graphics/jpeg/pkg/PLIST
+++ b/graphics/jpeg/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 1998/07/17 14:33:53 tv Exp $
+@comment $NetBSD: PLIST,v 1.9 2000/06/03 19:17:44 wiz Exp $
 bin/cjpeg
 bin/djpeg
 bin/jpegtran
@@ -9,6 +9,7 @@ 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