USE_LIBTOOL & LTCONFIG_OVERRIDE -> minus one patch

Also add some missing libraries to PLIST.

4 files changed, 53 insertions, 53 deletions

diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile
index 5747ccfd5e3..1d768e18f55 100644
--- a/graphics/imlib/Makefile
+++ b/graphics/imlib/Makefile
@@ -1,33 +1,34 @@
-# $NetBSD: Makefile,v 1.35 2000/06/01 11:23:29 rh Exp $
+# $NetBSD: Makefile,v 1.36 2000/06/09 11:06:20 wiz Exp $
 #
 
-DISTNAME=	imlib-1.9.8.1
-CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_GNOME:=stable/sources/imlib/}
+DISTNAME=		imlib-1.9.8.1
+CATEGORIES=		graphics
+MASTER_SITES=		${MASTER_SITE_GNOME:=stable/sources/imlib/}
 
-MAINTAINER=	tron@netbsd.org
-HOMEPAGE=	http://www.labs.redhat.com/imlib/
+MAINTAINER=		tron@netbsd.org
+HOMEPAGE=		http://www.labs.redhat.com/imlib/
 
-DEPENDS+=	gtk+-1.2.*:../../x11/gtk
-DEPENDS+=	libungif-*:../../graphics/libungif
-DEPENDS+=	jpeg-6b:../../graphics/jpeg
-DEPENDS+=	netpbm-*:../../graphics/netpbm
-DEPENDS+=	png>=1.0.6:../../graphics/png
-DEPENDS+=	tiff-*:../../graphics/tiff
+DEPENDS+=		gtk+-1.2.*:../../x11/gtk
+DEPENDS+=		libungif-*:../../graphics/libungif
+DEPENDS+=		jpeg-6b:../../graphics/jpeg
+DEPENDS+=		netpbm-*:../../graphics/netpbm
+DEPENDS+=		png>=1.0.6:../../graphics/png
+DEPENDS+=		tiff>=3.5.4:../../graphics/tiff
 
-USE_X11BASE=	yes
-USE_PKGLIBTOOL=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}"
-PLIST_SUBST+=	LOCALBASE=${LOCALBASE}
+USE_X11BASE=		yes
+USE_LIBTOOL=		yes
+LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
+GNU_CONFIGURE=		yes
+CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
+PLIST_SUBST+=		LOCALBASE=${LOCALBASE}
 
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "SunOS"
-CPPFLAGS=	-DENABLE_NLS
+CPPFLAGS=		-DENABLE_NLS
 .endif
 
-CPPFLAGS+=	-I${LOCALBASE}/include
+CPPFLAGS+=		-I${LOCALBASE}/include
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/imlib
diff --git a/graphics/imlib/files/patch-sum b/graphics/imlib/files/patch-sum
index 68e0d78e94b..2402ac121c3 100644
--- a/graphics/imlib/files/patch-sum
+++ b/graphics/imlib/files/patch-sum
@@ -1,3 +1,6 @@
-$NetBSD: patch-sum,v 1.4 1999/10/28 00:23:10 jlam Exp $
+$NetBSD: patch-sum,v 1.5 2000/06/09 11:06:21 wiz Exp $
 
-MD5 (patch-aa) = a5b00b12a2802f68100acd33a7507666
+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/imlib/patches/patch-aa b/graphics/imlib/patches/patch-aa
deleted file mode 100644
index cbef76089cd..00000000000
--- a/graphics/imlib/patches/patch-aa
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-aa,v 1.9 1999/10/28 00:23:10 jlam Exp $
-
---- configure.orig	Mon Oct 18 19:52:34 1999
-+++ configure	Wed Oct 27 20:20:38 1999
-@@ -1531,6 +1531,7 @@
- fi
- 
- 
-+if false; then
- # Check for any special flags to pass to ltconfig.
- libtool_flags="--cache-file=$cache_file"
- test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
-@@ -1831,6 +1832,7 @@
- # Redirect the config.log output again, so that the ltconfig log is not
- # clobbered by the next message.
- exec 5>>./config.log
-+fi
- 
- 
- echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-@@ -2400,6 +2402,9 @@
-   LIBS="$oLIBS"
-   CFLAGS="$oCFLAGS"
- fi
-+
-+# NetBSD's ld.so doesn't support library dependencies
-+dynworks=false
- 
- if $dynworks; then
-    imlib_libtool_config="${CONFIG_SHELL-/bin/sh} libtool --config"
diff --git a/graphics/imlib/pkg/PLIST b/graphics/imlib/pkg/PLIST
index c2777f40bda..e236f07e6cf 100644
--- a/graphics/imlib/pkg/PLIST
+++ b/graphics/imlib/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2000/02/12 03:24:16 wiz Exp $
+@comment $NetBSD: PLIST,v 1.9 2000/06/09 11:06:22 wiz Exp $
 bin/imlib_config
 bin/imlib-config
 etc/imrc
@@ -11,10 +11,36 @@ include/gdk_imlib_types.h
 include/Imlib.h
 include/Imlib_private.h
 include/Imlib_types.h
-lib/libImlib.so.10.8
 lib/libImlib.a
+lib/libImlib.la
+lib/libImlib.so.10.8
 lib/libgdk_imlib.a
+lib/libgdk_imlib.la
 lib/libgdk_imlib.so.10.8
+lib/libimlib-bmp.a
+lib/libimlib-bmp.la
+lib/libimlib-bmp.so.0.0
+lib/libimlib-gif.a
+lib/libimlib-gif.la
+lib/libimlib-gif.so.0.0
+lib/libimlib-jpeg.a
+lib/libimlib-jpeg.la
+lib/libimlib-jpeg.so.0.0
+lib/libimlib-png.a
+lib/libimlib-png.la
+lib/libimlib-png.so.0.0
+lib/libimlib-ppm.a
+lib/libimlib-ppm.la
+lib/libimlib-ppm.so.0.0
+lib/libimlib-ps.a
+lib/libimlib-ps.la
+lib/libimlib-ps.so.0.0
+lib/libimlib-tiff.a
+lib/libimlib-tiff.la
+lib/libimlib-tiff.so.0.0
+lib/libimlib-xpm.a
+lib/libimlib-xpm.la
+lib/libimlib-xpm.so.0.0
 share/aclocal/imlib.m4
 share/doc/imlib/bg.gif
 share/doc/imlib/border_diag.gif