* Fix run-time linker flags for libetpan-config and libetpan.

* Add pthread.bl3.mk into the buildlink file.

5 files changed, 42 insertions, 3 deletions

diff --git a/mail/libetpan/Makefile b/mail/libetpan/Makefile
index 3c11fc7b171..4f03d51fbe1 100644
--- a/mail/libetpan/Makefile
+++ b/mail/libetpan/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/08/05 19:29:56 xtraeme Exp $
+# $NetBSD: Makefile,v 1.5 2005/08/05 20:55:19 xtraeme Exp $
 #
 
 DISTNAME=		libetpan-0.38
@@ -12,6 +12,12 @@ COMMENT=		Really nice mail library
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 
+SUBST_CLASSES=		conf
+SUBST_STAGE.conf=	pre-configure
+SUBST_FILES.conf=	libetpan-config.in
+SUBST_SED.conf=		-e "s|@COMPILERFLAGS@|${COMPILER_RPATH_FLAG}|g"
+SUBST_MESSAGE.conf=	Fixing libetpan-config.
+
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../databases/db4/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
diff --git a/mail/libetpan/buildlink3.mk b/mail/libetpan/buildlink3.mk
index 088ed77ec37..0893d6c0950 100644
--- a/mail/libetpan/buildlink3.mk
+++ b/mail/libetpan/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2005/08/05 19:29:56 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2005/08/05 20:55:19 xtraeme Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBETPAN_BUILDLINK3_MK:=	${LIBETPAN_BUILDLINK3_MK}+
@@ -18,5 +18,6 @@ BUILDLINK_PKGSRCDIR.libetpan?=	../../mail/libetpan
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../databases/db4/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/mail/libetpan/distinfo b/mail/libetpan/distinfo
index 8e62bc068f3..f9e22eec311 100644
--- a/mail/libetpan/distinfo
+++ b/mail/libetpan/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.3 2005/08/05 19:29:56 xtraeme Exp $
+$NetBSD: distinfo,v 1.4 2005/08/05 20:55:19 xtraeme Exp $
 
 SHA1 (libetpan-0.38.tar.gz) = be36c67708d1784b4a7a87ee84c7948064ab3f19
 RMD160 (libetpan-0.38.tar.gz) = 2e1825e74f1cc46a5ddc57d6d4060c5f027d4ad0
 Size (libetpan-0.38.tar.gz) = 1104864 bytes
+SHA1 (patch-aa) = f98ad5c2959ec167c8923c2b3d7c79b54708fcb2
+SHA1 (patch-ab) = 07d149a3896deeb55ef503138d2eb664b4dae847
diff --git a/mail/libetpan/patches/patch-aa b/mail/libetpan/patches/patch-aa
new file mode 100644
index 00000000000..b5231b85be7
--- /dev/null
+++ b/mail/libetpan/patches/patch-aa
@@ -0,0 +1,15 @@
+$NetBSD: patch-aa,v 1.1 2005/08/05 20:55:19 xtraeme Exp $
+
+--- libetpan-config.in.orig	2005-08-05 22:36:50.000000000 +0200
++++ libetpan-config.in	2005-08-05 22:37:38.000000000 +0200
+@@ -47,8 +47,8 @@
+       echo $includedir
+       ;;
+     --libs)
+-      libdir=-L@libdir@
+-      echo $libdir -letpan@LIBSUFFIX@ @LDFLAGS@ @SSLLIBS@ @LIBICONV@ @DBLIB@ @LIBS@ @SASLLIBS@
++      libdir="-L@libdir@ @COMPILERFLAGS@@libdir@"
++      echo $libdir -letpan@LIBSUFFIX@ @SSLLIBS@ @LIBICONV@ @DBLIB@ @LIBS@ @SASLLIBS@
+       ;;
+     *)
+       echo "${usage}" 1>&2
diff --git a/mail/libetpan/patches/patch-ab b/mail/libetpan/patches/patch-ab
new file mode 100644
index 00000000000..3ea245ace89
--- /dev/null
+++ b/mail/libetpan/patches/patch-ab
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.1 2005/08/05 20:55:19 xtraeme Exp $
+
+--- src/Makefile.in.orig	2005-08-05 22:44:16.000000000 +0200
++++ src/Makefile.in	2005-08-05 22:45:08.000000000 +0200
+@@ -14,8 +14,8 @@
+ TARGET = libetpan@LIBSUFFIX@.la
+ 
+ VERSINFO    = @API_VERSION@
+-CC          = @CC@
+-LDFLAGS     = @LIBS@ @SSLLIBS@ @LDFLAGS@ @DBLIB@ @GNUTLSLIB@
++#CC          = @CC@
++LDFLAGS += @LIBS@ @SSLLIBS@ @LDFLAGS@ @DBLIB@ @GNUTLSLIB@
+ 
+ SUBLIBS = data-types/libdata-types.la \
+ 	low-level/liblow-level.la \