From 0b457d53e843bca33688d7e38bf16a57a1f7d712 Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Thu, 24 Jan 2002 13:59:57 +0000
Subject: Strongly buildlinkify, use PKGLOCALEDIR instead of hardwiring
 `share'.

---
 mail/balsa/Makefile         | 25 ++++++++++++++-----------
 mail/balsa/distinfo         |  4 ++--
 mail/balsa/patches/patch-aa |  6 +++---
 3 files changed, 19 insertions(+), 16 deletions(-)

(limited to 'mail')

diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile
index bea5668d234..bbb649dac56 100644
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2001/09/27 23:18:20 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2002/01/24 13:59:57 wiz Exp $
 #
 
 DISTNAME=	balsa-1.0.0
@@ -10,16 +10,19 @@ MAINTAINER=	rh@netbsd.org
 HOMEPAGE=	http://www.balsa.net/
 COMMENT=	GNOME EMail client
 
-DEPENDS+=	libpspell-[0-9]*:../../textproc/libpspell
-DEPENDS+=	pth-[0-9]*:../../devel/pth
-DEPENDS+=	libproplist-[0-9]*:../../devel/libproplist
-DEPENDS+=	gnome-core-[0-9]*:../../x11/gnome-core
+GNU_CONFIGURE=		yes
+USE_LIBTOOL=		yes
+LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
+CONFIGURE_ARGS+=	--disable-more-warnings
+CONFIGURE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR}
+USE_BUILDLINK_ONLY=	yes
 
-GNU_CONFIGURE=	yes
-USE_X11BASE=	yes
-USE_LIBTOOL=	yes
-LTCONFIG_OVERRIDE=${WRKSRC}/ltconfig
-CONFIGURE_ARGS+=--disable-more-warnings
-CPPFLAGS+=	-I${LOCALBASE}/include
+USE_PTHREAD=	native pth
 
+.include "../../devel/libtool/buildlink.mk"
+.include "../../devel/libproplist/buildlink.mk"
+.include "../../textproc/libpspell/buildlink.mk"
+.include "../../x11/gnome-core/buildlink.mk"
+.include "../../mk/pthread.buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/balsa/distinfo b/mail/balsa/distinfo
index 51659dee69b..0c25d00c94a 100644
--- a/mail/balsa/distinfo
+++ b/mail/balsa/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2002/01/15 01:05:57 wiz Exp $
+$NetBSD: distinfo,v 1.4 2002/01/24 13:59:57 wiz Exp $
 
 SHA1 (balsa-1.0.0.tar.gz) = 84b60f40a3ede9bdf8537b56ccb7d8fadb9312f9
 Size (balsa-1.0.0.tar.gz) = 1964922 bytes
-SHA1 (patch-aa) = 19ae9ab48e6f9809ed5774515650a2e1430bacd4
+SHA1 (patch-aa) = df7b6d09f61dc90919b62ca2ce4e24238f576638
 SHA1 (patch-ab) = 6ff24736e7b69ccb0bdcb3c2ae6d8d5f3ffc1e8f
 SHA1 (patch-ac) = 5aba74fa2013599f7a575dfac8833160740b1d78
diff --git a/mail/balsa/patches/patch-aa b/mail/balsa/patches/patch-aa
index fcbd458c207..118d59f04ce 100644
--- a/mail/balsa/patches/patch-aa
+++ b/mail/balsa/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.5 2000/10/22 09:33:24 rh Exp $
+$NetBSD: patch-aa,v 1.6 2002/01/24 13:59:57 wiz Exp $
 
 --- configure.orig	Wed Oct 18 11:06:28 2000
 +++ configure
@@ -16,7 +16,7 @@ $NetBSD: patch-aa,v 1.5 2000/10/22 09:33:24 rh Exp $
    rm -rf conftest*
    CATOBJEXT=.mo
 -		   DATADIRNAME=lib
-+		   DATADIRNAME=share
++		   DATADIRNAME=${PKGLOCALEDIR}
  fi
  rm -f conftest*
  		INSTOBJEXT=.mo
@@ -25,7 +25,7 @@ $NetBSD: patch-aa,v 1.5 2000/10/22 09:33:24 rh Exp $
  		 CATOBJEXT=.cat
  		 INSTOBJEXT=.cat
 -		 DATADIRNAME=lib
-+		 DATADIRNAME=share
++		 DATADIRNAME=${PKGLOCALEDIR}
  		 INTLDEPS='$(top_builddir)/intl/libintl.a'
  		 INTLLIBS=$INTLDEPS
  		 LIBS=`echo $LIBS | sed -e 's/-lintl//'`
-- 
cgit v1.2.3