From c46da24c142eef5eab634a945d7e1d201115cb8b Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Sat, 14 Feb 2004 17:21:32 +0000
Subject: LIBTOOL_OVERRIDE and SHLIBTOOL_OVERRIDE are now lists of shell globs
 relative to ${WRKSRC}.  Remove redundant LIBTOOL_OVERRIDE settings that are
 automatically handled by the default setting in bsd.pkg.mk.

---
 mail/balsa/Makefile                             | 4 +---
 mail/balsa2/Makefile                            | 3 +--
 mail/clamav/Makefile                            | 3 +--
 mail/dovecot/Makefile                           | 4 +---
 mail/evolution/Makefile                         | 3 +--
 mail/evolution12/Makefile                       | 3 +--
 mail/libesmtp/Makefile                          | 4 +---
 mail/sylpheed-claws-ghostscript-viewer/Makefile | 3 +--
 mail/sylpheed-claws/Makefile                    | 3 +--
 mail/sylpheed-claws/plugins.mk                  | 4 ++--
 10 files changed, 11 insertions(+), 23 deletions(-)

(limited to 'mail')

diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile
index 98aba8e9c44..6a61a7ee48d 100644
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2004/01/03 18:49:45 reed Exp $
+# $NetBSD: Makefile,v 1.39 2004/02/14 17:21:44 jlam Exp $
 #
 
 DISTNAME=		balsa-1.4.3
@@ -17,8 +17,6 @@ USE_LIBTOOL=		yes
 USE_X11BASE=		yes
 USE_BUILDLINK2=		yes
 USE_PKGLOCALEDIR=	yes
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
-LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
 CONFIGURE_DIRS=		${WRKSRC}
 CONFIGURE_DIRS+=	${WRKSRC}/libmutt
diff --git a/mail/balsa2/Makefile b/mail/balsa2/Makefile
index c38d1fbdf46..b825cf61260 100644
--- a/mail/balsa2/Makefile
+++ b/mail/balsa2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2004/02/11 04:36:58 xtraeme Exp $
+# $NetBSD: Makefile,v 1.21 2004/02/14 17:21:44 jlam Exp $
 #
 
 DISTNAME=		balsa-2.0.16
@@ -19,7 +19,6 @@ USE_PKGINSTALL=		yes
 USE_BUILDLINK3=		yes
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 GNU_CONFIGURE=		yes
 
 CONFIGURE_ARGS+=	--with-gpgme=${BUILDLINK_PREFIX.gpgme}/bin/gpgme-config
diff --git a/mail/clamav/Makefile b/mail/clamav/Makefile
index d96a9c31b4c..2ac047a8bf2 100644
--- a/mail/clamav/Makefile
+++ b/mail/clamav/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/02/11 10:55:49 recht Exp $
+# $NetBSD: Makefile,v 1.11 2004/02/14 17:21:44 jlam Exp $
 
 DISTNAME=	clamav-0.66
 CATEGORIES=	mail
@@ -13,7 +13,6 @@ USE_BUILDLINK2=		yes
 GNU_CONFIGURE=		yes
 USE_PKGINSTALL=		yes
 USE_LIBTOOL=		yes
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 # disable the configure check for user and group:
 CONFIGURE_ARGS+=	--disable-clamav
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index f74e2096319..f00cb37c0e6 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/02/10 00:32:35 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2004/02/14 17:21:44 jlam Exp $
 
 DISTNAME=		dovecot-0.99.10.4
 CATEGORIES=		mail
@@ -17,8 +17,6 @@ USE_LIBTOOL=		YES
 USE_PKGINSTALL= 	YES
 GNU_CONFIGURE=		YES
 
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
-
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--localstatedir=/var
 CONFIGURE_ARGS+=	--with-ssldir=${SSLCERTS}
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 84c90ba736d..a117339a5f7 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2004/02/11 04:02:48 xtraeme Exp $
+# $NetBSD: Makefile,v 1.53 2004/02/14 17:21:44 jlam Exp $
 
 DISTNAME=		evolution-1.4.5
 PKGREVISION=		5
@@ -35,7 +35,6 @@ GNU_CONFIGURE=		YES
 USE_GNU_TOOLS+=		make
 USE_X11=		YES
 USE_LIBTOOL=		YES
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool ${WRKSRC}/libical/libtool
 USE_BUILDLINK2=		YES
 USE_PKGLOCALEDIR=	YES
 YACC=			${PREFIX}/bin/bison -y
diff --git a/mail/evolution12/Makefile b/mail/evolution12/Makefile
index 35d1f5d1673..e2188b9d510 100644
--- a/mail/evolution12/Makefile
+++ b/mail/evolution12/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/01/24 13:55:30 grant Exp $
+# $NetBSD: Makefile,v 1.3 2004/02/14 17:21:44 jlam Exp $
 
 DISTNAME=		evolution-1.2.4
 PKGREVISION=		6
@@ -34,7 +34,6 @@ GNU_CONFIGURE=		YES
 USE_GNU_TOOLS+=		make
 USE_X11BASE=		YES
 USE_LIBTOOL=		YES
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool ${WRKSRC}/libical/libtool
 USE_BUILDLINK2=		YES
 USE_PKGLOCALEDIR=	YES
 YACC=			${PREFIX}/bin/bison -y
diff --git a/mail/libesmtp/Makefile b/mail/libesmtp/Makefile
index 432f32950cf..3d07654322c 100644
--- a/mail/libesmtp/Makefile
+++ b/mail/libesmtp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/02/11 02:54:41 xtraeme Exp $
+# $NetBSD: Makefile,v 1.12 2004/02/14 17:21:44 jlam Exp $
 
 DISTNAME=	libesmtp-1.0.1
 PKGREVISION=	1
@@ -17,8 +17,6 @@ USE_GNU_TOOLS+=	make
 USE_LIBTOOL=	yes
 GNU_CONFIGURE=	yes
 
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
-
 CONFIGURE_ARGS+=	--enable-all
 CONFIGURE_ARGS+=	--disable-isoc
 
diff --git a/mail/sylpheed-claws-ghostscript-viewer/Makefile b/mail/sylpheed-claws-ghostscript-viewer/Makefile
index 61d2d55a05c..692ff302b50 100644
--- a/mail/sylpheed-claws-ghostscript-viewer/Makefile
+++ b/mail/sylpheed-claws-ghostscript-viewer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/01/29 07:42:23 cube Exp $
+# $NetBSD: Makefile,v 1.4 2004/02/14 17:21:44 jlam Exp $
 #
 
 DISTNAME=	ghostscript-viewer-0.6
@@ -15,7 +15,6 @@ COMMENT=	Plugin to make Sylpheed-claws display PostScript and PDF attachments
 USE_BUILDLINK2=		YES
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 PLIST_SRC=	${.CURDIR}/../../mail/sylpheed-claws/PLIST.plugins
 PLIST_SUBST+=	PLUGIN_NAME=ghostscript_viewer
diff --git a/mail/sylpheed-claws/Makefile b/mail/sylpheed-claws/Makefile
index 454778a0610..994ea6dbf98 100644
--- a/mail/sylpheed-claws/Makefile
+++ b/mail/sylpheed-claws/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2004/01/13 13:03:46 adam Exp $
+# $NetBSD: Makefile,v 1.28 2004/02/14 17:21:44 jlam Exp $
 #
 
 .include "Makefile.common"
@@ -12,7 +12,6 @@ CONFLICTS=		sylpheed-[0-9]* sylpheed-gtk2-[0-9]*
 
 BUILD_USES_MSGFMT=	YES
 USE_PKGINSTALL=		YES
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 PKGCONFIG_OVERRIDE+=	${WRKSRC}/sylpheed-claws.pc.in
 
 CONFIGURE_ARGS+=        --enable-aspell
diff --git a/mail/sylpheed-claws/plugins.mk b/mail/sylpheed-claws/plugins.mk
index 0fe13140ab5..4c1376fd01f 100644
--- a/mail/sylpheed-claws/plugins.mk
+++ b/mail/sylpheed-claws/plugins.mk
@@ -1,4 +1,4 @@
-# $NetBSD: plugins.mk,v 1.1 2004/01/01 21:39:02 cube Exp $
+# $NetBSD: plugins.mk,v 1.2 2004/02/14 17:21:44 jlam Exp $
 #
 
 .include "../../mail/sylpheed-claws/Makefile.common"
@@ -10,7 +10,7 @@ CONFIGURE_DIRS=	${WRKDIR}/${DISTNAME}
 
 DEPENDS+=       sylpheed-claws>=${SYLPHEED_VERSION}:../../mail/sylpheed-claws
 
-LIBTOOL_OVERRIDE=	${WRKDIR}/${DISTNAME}/libtool
+LIBTOOL_OVERRIDE=	../../../libtool
 
 CONFIGURE_ARGS+=        --disable-aspell
 CONFIGURE_ARGS+=	--disable-nls
-- 
cgit v1.2.3