Update to libpst-0.6.49.

converters/libpst/Makefile

@@ -1,14 +1,13 @@
-# $OpenBSD: Makefile,v 1.14 2010/11/15 00:22:50 espie Exp $
+# $OpenBSD: Makefile,v 1.15 2011/04/15 09:56:22 ajacoutot Exp $
 
 COMMENT-main=		read and convert Microsoft Outlook mail files
 COMMENT-python=		python interface to libpst
 
-DISTNAME=		libpst-0.6.45
+DISTNAME=		libpst-0.6.49
 SHARED_LIBS +=  pst                  1.0      # .4.1
 
 PKGNAME-main=		${DISTNAME}
 PKGNAME-python=		py-${DISTNAME}
-REVISION-python =	0
 
 CATEGORIES=		converters mail
 
@@ -20,11 +19,14 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB-main += c expat fontconfig freetype jpeg m png pthread stdc++
-WANTLIB-main += z
-WANTLIB-main += gd>=20 ${MODLIBICONV_WANTLIB}
+cWANTLIB += m pthread stdc++ ${MODLIBICONV_WANTLIB}
 
-WANTLIB-python += pst>=1 boost_python>=1 ${MODLIBICONV_WANTLIB}
+WANTLIB-main += ${cWANTLIB}
+WANTLIB-main += c expat fontconfig freetype jpeg m png pthread stdc++
+WANTLIB-main += gd>=20 z
+
+WANTLIB-python += ${cWANTLIB}
+WANTLIB-python += pst>=1 boost_python>=1 util
 
 MASTER_SITES=		${HOMEPAGE}/packages/
 
@@ -52,7 +54,6 @@ CONFIGURE_ARGS+=	${CONFIGURE_SHARED} \
 			--enable-static-tools=no \
 			--enable-libpst-shared
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include -I${MODPY_INCDIR}" \
-			LDFLAGS="-L${LOCALBASE}/lib -pthread" \
 			PYTHON_LDFLAGS="-L${LOCALBASE}/lib -lpython${MODPY_VERSION} -lm" \
 			PYTHON_BIN="python${MODPY_VERSION}"
 
@@ -66,4 +67,9 @@ CFLAGS+=        -O0
 FAKE_FLAGS+=		htmldir="${PREFIX}/share/doc/libpst/" \
 			htmldeveldir="${PREFIX}/share/doc/libpst/devel/"
 
+pre-configure:
+	perl -pi -e 's,!!MODPY_VERSION!!,${MODPY_VERSION},;' \
+		-e 's,!!LOCALBASE!!,${LOCALBASE},' \
+		${WRKSRC}/configure
+
 .include <bsd.port.mk>

converters/libpst/distinfo

@@ -1,5 +1,5 @@
-MD5 (libpst-0.6.45.tar.gz) = x3F0zUVm9HAaEpSMvHd3ow==
-RMD160 (libpst-0.6.45.tar.gz) = tJhDYs0SCCDU5cCm1BEW17lB6n4=
-SHA1 (libpst-0.6.45.tar.gz) = x54JeTBR53WGtgKydi5K4w+5Hwo=
-SHA256 (libpst-0.6.45.tar.gz) = sedxO58J1+5xeDc8HV3AN0kRn9GuL5/6KAiLZXxqrok=
-SIZE (libpst-0.6.45.tar.gz) = 1938405
+MD5 (libpst-0.6.49.tar.gz) = oKD5J+gqsUuwQr2LvZfDEg==
+RMD160 (libpst-0.6.49.tar.gz) = hjRgWJ9lhx4WOg98KpQmfQ/1Rz4=
+SHA1 (libpst-0.6.49.tar.gz) = wQ9K+dwdIrMxQgvDkxA2o9QRFcs=
+SHA256 (libpst-0.6.49.tar.gz) = YwK/kZlxo0sITxSW4XquvPOWNKaKiWLzUjDQebK+Mtk=
+SIZE (libpst-0.6.49.tar.gz) = 1962396

converters/libpst/patches/patch-Makefile_in

@@ -1,15 +0,0 @@
-$OpenBSD: patch-Makefile_in,v 1.2 2009/09/16 18:05:14 ajacoutot Exp $
-
-Don't bother installing files like AUTHORS and such.
-
---- Makefile.in.orig	Sat Sep 12 22:37:21 2009
-+++ Makefile.in	Wed Sep 16 08:33:29 2009
-@@ -639,7 +639,7 @@ info: info-recursive
- 
- info-am:
- 
--install-data-am: install-htmlDATA install-pkgconfigDATA
-+install-data-am: install-pkgconfigDATA
- 
- install-exec-am:
- 

converters/libpst/patches/patch-configure

@@ -0,0 +1,12 @@
+$OpenBSD: patch-configure,v 1.1 2011/04/15 09:56:22 ajacoutot Exp $
+--- configure.orig	Fri Apr 15 11:23:12 2011
++++ configure	Fri Apr 15 11:23:38 2011
+@@ -27789,7 +27789,7 @@ if eval "test \"\${$as_ac_Lib+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-l$ax_lib  $LIBS"
++LIBS="-l$ax_lib -L!!LOCALBASE!!/lib -lpython!!MODPY_VERSION!! -lm -lutil $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF

converters/libpst/pkg/PLIST-main

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-main,v 1.1 2009/09/16 18:05:14 ajacoutot Exp $
+@comment $OpenBSD: PLIST-main,v 1.2 2011/04/15 09:56:22 ajacoutot Exp $
 @pkgpath converters/libpst
 @bin bin/lspst
 @bin bin/pst2dii
@@ -22,6 +22,11 @@ lib/pkgconfig/libpst.pc
 @man man/man1/readpst.1
 @man man/man5/outlook.pst.5
 share/doc/libpst/
+share/doc/libpst/AUTHORS
+share/doc/libpst/COPYING
+share/doc/libpst/ChangeLog
+share/doc/libpst/NEWS
+share/doc/libpst/README
 share/doc/libpst/devel/
 share/doc/libpst/devel/annotated.html
 share/doc/libpst/devel/classes.html