13 files changed, 158 insertions, 57 deletions

diff --git a/mail/libpst/Makefile b/mail/libpst/Makefile
index 6b4aa5be61dc..57323a90ab3c 100644
--- a/mail/libpst/Makefile
+++ b/mail/libpst/Makefile
@@ -5,17 +5,18 @@
 # $FreeBSD$
 #
 
-PORTNAME=      libpst
-PORTVERSION=   0.4.1
-CATEGORIES=    mail converters
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	ol2mbox
-DISTNAME=      libpst_0.4.1
-EXTRACT_SUFX=  .tgz
+PORTNAME=	libpst
+PORTVERSION=	0.5.1
+CATEGORIES=	mail converters
+MASTER_SITES=	http://alioth.debian.org/download.php/844/
+EXTRACT_SUFX=	.tgz
 
-MAINTAINER=    natey@natey.com
+MAINTAINER=	natey@natey.com
 COMMENT=	A tool for converting Outlook .pst files to Unix mbox format
 
-PLIST_FILES=	bin/readpst
+USE_GMAKE=	YES
+
+MAN1=		readpst.1 readpstlog.1
+PLIST_FILES=	bin/readpst bin/readpstlog bin/lspst
 
 .include <bsd.port.mk>
diff --git a/mail/libpst/distinfo b/mail/libpst/distinfo
index c28955f92acd..234dffccf991 100644
--- a/mail/libpst/distinfo
+++ b/mail/libpst/distinfo
@@ -1,2 +1,2 @@
-MD5 (libpst_0.4.1.tgz) = c574f5c6938cb73bccf7b661b0ad1329
-SIZE (libpst_0.4.1.tgz) = 47443
+MD5 (libpst-0.5.1.tgz) = 0a80562bf7c503f9d3fdd96e0de10408
+SIZE (libpst-0.5.1.tgz) = 89256
diff --git a/mail/libpst/files/patch-Makefile b/mail/libpst/files/patch-Makefile
new file mode 100644
index 000000000000..5aefcbbd78aa
--- /dev/null
+++ b/mail/libpst/files/patch-Makefile
@@ -0,0 +1,40 @@
+--- Makefile.orig	Wed Nov 17 14:16:02 2004
++++ Makefile	Mon Sep 26 17:34:36 2005
+@@ -6,10 +6,10 @@
+ 
+ #---------------- Do not modify below this point ------------------
+ 
+-INSTALL_DIR     := $(INSTALL) -p -d -o root -g root -m 0755
+-INSTALL_FILE    := $(INSTALL) -p    -o root -g root -m 0644
+-INSTALL_PROGRAM := $(INSTALL) -p    -o root -g root -m 0755 # -s
+-INSTALL_SCRIPT  := $(INSTALL) -p    -o root -g root -m 0755
++INSTALL_DIR     := $(INSTALL) -p -d -o root -g wheel -m 0755
++INSTALL_FILE    := $(INSTALL) -p    -o root -g wheel -m 0644
++INSTALL_PROGRAM := $(INSTALL) -p    -o root -g wheel -m 0755 # -s
++INSTALL_SCRIPT  := $(INSTALL) -p    -o root -g wheel -m 0755
+ 
+ VERSION = $(shell cat VERSION)
+ 
+@@ -53,11 +53,18 @@
+ distclean: clean
+ 	rm -f libpst-*.tar.gz
+ 
+-install: all
++install: installbin
++
++installbin: all
+ 	$(INSTALL_DIR) $(DESTDIR)$(PREFIX)/bin
+-	$(INSTALL_PROGRAM) readpst{,log} $(DESTDIR)$(PREFIX)/bin
+-	$(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/man/man1
+-	$(INSTALL_FILE) readpst{,log}.1 $(DESTDIR)$(PREFIX)/share/man/man1/
++	$(INSTALL_PROGRAM) readpst $(DESTDIR)$(PREFIX)/bin
++	$(INSTALL_PROGRAM) readpstlog $(DESTDIR)$(PREFIX)/bin
++	$(INSTALL_PROGRAM) lspst $(DESTDIR)$(PREFIX)/bin
++	$(INSTALL_DIR) $(DESTDIR)$(PREFIX)/man/man1
++	$(INSTALL_FILE) readpst.1 $(DESTDIR)$(PREFIX)/man/man1/
++	$(INSTALL_FILE) readpstlog.1 $(DESTDIR)$(PREFIX)/man/man1/
++
++installdocs:
+ 	$(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/doc/libpst
+ 	$(INSTALL_FILE) $(DOCS) $(DESTDIR)$(PREFIX)/share/doc/libpst/
+ 
diff --git a/mail/libpst/files/patch-aa b/mail/libpst/files/patch-aa
deleted file mode 100644
index 94c74e3bc8a2..000000000000
--- a/mail/libpst/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- libpst.c.orig      Fri Dec 13 20:32:35 2002
-+++ libpst.c   Fri Dec 13 20:32:40 2002
-@@ -3,8 +3,6 @@
- #include <time.h>
- #include <string.h>
- #include <ctype.h>
--#include <getopt.h>
--//#include <values.h>
- #include <limits.h>
-
- #include <errno.h>
diff --git a/mail/libpst/files/patch-ab b/mail/libpst/files/patch-ab
deleted file mode 100644
index b71bb3d4d6f3..000000000000
--- a/mail/libpst/files/patch-ab
+++ /dev/null
@@ -1,10 +0,0 @@
---- readpst.c.orig     Fri Dec 13 20:26:53 2002
-+++ readpst.c  Fri Dec 13 20:27:06 2002
-@@ -3,7 +3,6 @@
- #include <time.h>
- #include <string.h>
- #include <ctype.h>
--#include <getopt.h>
- #include <limits.h>
-
- #ifndef WIN32
diff --git a/mail/libpst/files/patch-ac b/mail/libpst/files/patch-ac
deleted file mode 100644
index 3da7417d2a0c..000000000000
--- a/mail/libpst/files/patch-ac
+++ /dev/null
@@ -1,24 +0,0 @@
---- Makefile.orig	Fri Jan 17 18:09:52 2003
-+++ Makefile	Fri Jan 17 18:11:11 2003
-@@ -1,3 +1,6 @@
-+EPREFIX= $(PREFIX)
-+BINDIR=	$(EPREFIX)/bin
-+
- all: readpst getidblock
- 
- libpst.o: libpst.c libpst.h define.h
-@@ -19,6 +22,14 @@
- 
- getidblock: getidblock.c define.h libpst.o common.h debug.o
- 	gcc -Wall -Werror getidblock.c -g -o getidblock libpst.o debug.o timeconv.o
-+
-+install: installbin
-+
-+installbin: readpst
-+	mkdir -p $(BINDIR)
-+	cp readpst $(BINDIR)
-+	strip $(BINDIR)/readpst
-+	chmod 755 $(BINDIR)/readpst
- 
- clean: 
- 	rm -f core readpst libpst.o timeconv.o libstrfunc.o debug.o getidblock *~ 
diff --git a/mail/libpst/files/patch-libpst.c b/mail/libpst/files/patch-libpst.c
new file mode 100644
index 000000000000..0e7db5d03aa4
--- /dev/null
+++ b/mail/libpst/files/patch-libpst.c
@@ -0,0 +1,33 @@
+--- libpst.c.orig	Sun Sep 25 14:38:16 2005
++++ libpst.c	Sun Sep 25 14:39:04 2005
+@@ -261,7 +261,7 @@
+ int32_t pst_attach_to_file(pst_file *pf, pst_item_attach *attach, FILE* fp) {
+   pst_index_ll *ptr;
+   struct holder h = {NULL, fp, 0, "", 0};
+-  int32_t size;
++  int32_t size = 0;
+   DEBUG_ENT("pst_attach_to_file");
+   if (attach->id_val != -1) {
+     ptr = _pst_getID(pf, attach->id_val);
+@@ -283,7 +283,7 @@
+ int32_t pst_attach_to_file_base64(pst_file *pf, pst_item_attach *attach, FILE* fp) {
+   pst_index_ll *ptr;
+   struct holder h = {NULL, fp, 1, "", 0};
+-  int32_t size;
++  int32_t size = 0;
+   char *c;
+   DEBUG_ENT("pst_attach_to_file_base64");
+   if (attach->id_val != -1) {
+@@ -373,10 +373,10 @@
+   pst_desc_ll *p;
+   pst_num_array *na;
+   //  pst_index_ll *list;
+-  pst_index2_ll *list2;//, *t;
++  pst_index2_ll *list2 = NULL;//, *t;
+   unsigned char * buffer=NULL, *headerbuffer=NULL;//, *tc;
+   pst_x_attrib xattrib;
+-  int32_t bptr = 0, bsize, hsize, tint, err=0, x;
++  int32_t bptr = 0, bsize = 0, hsize = 0, tint, err=0, x;
+   pst_x_attrib_ll *ptr, *p_head=NULL, *p_sh=NULL, *p_sh2=NULL;
+   char *wt;
+ 
diff --git a/mail/libpst/files/patch-libpst.h b/mail/libpst/files/patch-libpst.h
new file mode 100644
index 000000000000..2ff9f0ba713c
--- /dev/null
+++ b/mail/libpst/files/patch-libpst.h
@@ -0,0 +1,13 @@
+--- libpst.h.orig	Sat Sep 24 23:28:03 2005
++++ libpst.h	Sun Sep 25 14:23:06 2005
+@@ -14,8 +14,9 @@
+ 
+ #ifndef FILETIME_DEFINED
+ #define FILETIME_DEFINED
++#include <sys/types.h>
+ //Win32 Filetime struct - copied from WINE
+-typedef struct {
++typedef struct _FILETIME {
+   u_int32_t dwLowDateTime;
+   u_int32_t dwHighDateTime;
+ } FILETIME;
diff --git a/mail/libpst/files/patch-lspst.c b/mail/libpst/files/patch-lspst.c
new file mode 100644
index 000000000000..31db4f1d33fb
--- /dev/null
+++ b/mail/libpst/files/patch-lspst.c
@@ -0,0 +1,21 @@
+--- lspst.c.orig	Sun Sep 25 13:39:52 2005
++++ lspst.c	Sun Sep 25 14:24:31 2005
+@@ -37,7 +37,9 @@
+ char *rfc2426_escape(char *str);
+ char *rfc2445_datetime_format(FILETIME *ft);
+ // }}}1
++#ifndef DEBUG_MAIN
+ #define DEBUG_MAIN(x) debug_print x;
++#endif // DEBUG_MAIN
+ // int main(int argc, char** argv) {{{1
+ int main(int argc, char** argv) {
+ 
+@@ -47,7 +49,7 @@
+ 	pst_desc_ll *d_ptr;
+ 	char *temp = NULL; //temporary char pointer
+ 	int skip_child = 0;
+-	struct file_ll  *f, *head;
++	struct file_ll  *f = NULL, *head;
+ 	// }}}2
+ 
+ 	if (argc <= 1)
diff --git a/mail/libpst/files/patch-lzfu.c b/mail/libpst/files/patch-lzfu.c
new file mode 100644
index 000000000000..c36c9176cee3
--- /dev/null
+++ b/mail/libpst/files/patch-lzfu.c
@@ -0,0 +1,11 @@
+--- lzfu.c.orig	Mon Sep 26 17:26:39 2005
++++ lzfu.c	Mon Sep 26 17:26:58 2005
+@@ -16,7 +16,7 @@
+ #include <stdio.h>
+ 
+ #ifndef _MSC_VER
+-#include <stdint.h>
++#include <inttypes.h>
+ #endif
+ 
+ #ifdef _MSC_VER
diff --git a/mail/libpst/files/patch-readpst.c b/mail/libpst/files/patch-readpst.c
new file mode 100644
index 000000000000..ef91bf6550e4
--- /dev/null
+++ b/mail/libpst/files/patch-readpst.c
@@ -0,0 +1,11 @@
+--- readpst.c.orig	Sun Sep 25 14:24:59 2005
++++ readpst.c	Sun Sep 25 14:25:19 2005
+@@ -144,7 +144,7 @@
+   int base64_body = 0;
+   //  int encrypt = 0;
+   FILE *fp;
+-  char *enc; // base64 encoded attachment
++  char *enc = NULL; // base64 encoded attachment
+   char *boundary = NULL, *b1, *b2; // the boundary marker between multipart sections
+   char *temp = NULL; //temporary char pointer
+   int attach_num = 0;
diff --git a/mail/libpst/files/patch-readpstlog.c b/mail/libpst/files/patch-readpstlog.c
new file mode 100644
index 000000000000..6db82d93f949
--- /dev/null
+++ b/mail/libpst/files/patch-readpstlog.c
@@ -0,0 +1,16 @@
+--- readpstlog.c.orig	Sun Sep 25 14:25:38 2005
++++ readpstlog.c	Sun Sep 25 14:29:10 2005
+@@ -21,11 +21,11 @@
+ 
+ int main(int argc, char** argv) {
+   int *i=NULL, x, ptr, stop=0, flag;  
+-  char *fname, *buf, format, rec_type;
++  char *fname, *buf, format = ' ', rec_type;
+   unsigned char version;
+   int *show_type=NULL, show_size=0;
+   int *ex_type=NULL, ex_size=0;
+-  unsigned int funcname, filename, text, end, dtype, line, c;
++  unsigned int funcname=0, filename=0, text=0, end=0, dtype=0, line=0, c;
+   FILE *fp;
+   struct _debug_file_rec_m mfile_rec;
+   struct _debug_file_rec_l lfile_rec;
diff --git a/mail/libpst/pkg-descr b/mail/libpst/pkg-descr
index 3db7a8831925..b66229b6a4b3 100644
--- a/mail/libpst/pkg-descr
+++ b/mail/libpst/pkg-descr
@@ -3,7 +3,7 @@ readpst: A tool for converting Outlook .pst files to Unix mbox format
 The aim of this project is to provide libraries and applications for the
 conversion of Outlook and Outlook Express data files to Linux MBOX format.
 
-WWW: http://sourceforge.net/projects/ol2mbox
+WWW: http://alioth.debian.org/projects/libpst/
 
 - Natey
 natey@natey.com