- Update to 5.2.1

PR:		ports/78241
Submitted by:	maintainer

5 files changed, 45 insertions, 81 deletions

diff --git a/mail/mailsync/Makefile b/mail/mailsync/Makefile
index 975058be548b..82c031765f48 100644
--- a/mail/mailsync/Makefile
+++ b/mail/mailsync/Makefile
@@ -6,40 +6,56 @@
 #
 
 PORTNAME=	mailsync
-PORTVERSION=	4.4.4
-PORTREVISION=	1
+PORTVERSION=	5.2.1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	${PORTNAME}_${PORTVERSION}-1
+DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
 
 MAINTAINER=	mt@primats.org.ua
 COMMENT=	Mailsync is a way of keeping a collection of mailboxes synchronized
 
 LIB_DEPENDS=	c-client4.8:${PORTSDIR}/mail/cclient
 
-WRKSRC=		${WRKDIR}/${PORTNAME}
-
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USE_GMAKE=	yes
+USE_OPENSSL=	yes
+USE_GCC=	2.95+
+#CONFIGURE_ARGS=	CC=gcc --exec-prefix=${PREFIX}
+#CONFIGURE_ARGS+=	--exec-prefix=${PREFIX} \
+#		--includedir="${PREFIX}/include ${PREFIX}/include/c-client"
+#CONFIGURE_ENV+=	CPPFLAGS="-I${PREFIX}/include/c-client"
+
+USE_AUTOMAKE_VER=	19
+USE_AUTOCONF_VER=	259
+USE_AUTOHEADER_VER=	259
 USE_REINPLACE=	yes
 
-ALL_TARGET=	default
+pre-patch:
+	@${REINPLACE_CMD} -e 's|^aclocal|${ACLOCAL}|; \
+		s|^autoconf|${AUTOCONF}|; s|automake|${AUTOMAKE}|; \
+		s|^autoheader|${AUTOHEADER}|; s|678|9|' ${WRKSRC}/autogen.sh
 
-MAN1=		mailsync.1
+run-autotools:
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|/usr|${PREFIX}|g' \
-		${WRKSRC}/examples/mailsync \
-		${WRKSRC}/mailsync.1
+do-configure:
+	cd ${WRKSRC} && ${SH} autogen.sh --exec-prefix=${PREFIX}
+
+MAN1=		mailsync.1
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/mailsync ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/mailsync.1  ${PREFIX}/man/man1
+	${INSTALL_SCRIPT} ${WRKSRC}/src/mailsync ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/doc/mailsync.1 ${PREFIX}/man/man1
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README   ${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} AUTHORS COPYING NEWS README \
+		THANKS TODO ${DOCSDIR}
+	cd ${WRKSRC}/doc && ${INSTALL_DATA} ABSTRACT HACKING \
+		mail_open_close_flowchart.dia \
+		mail_open_close_flowchart.svg \
+		mail_open_close_flowchart2.svg ${DOCSDIR}
 .endif
 	${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/examples/mailsync ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/examples/mailsync ${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/mail/mailsync/distinfo b/mail/mailsync/distinfo
index 220882b56b79..d67b3e7b6c3a 100644
--- a/mail/mailsync/distinfo
+++ b/mail/mailsync/distinfo
@@ -1,2 +1,2 @@
-MD5 (mailsync_4.4.4-1.tar.gz) = d1a947725d03a002ee5c01185189e230
-SIZE (mailsync_4.4.4-1.tar.gz) = 27408
+MD5 (mailsync_5.2.1.orig.tar.gz) = 67c9f68575756b76581cf9be74608aa5
+SIZE (mailsync_5.2.1.orig.tar.gz) = 139967
diff --git a/mail/mailsync/files/patch-Makefile b/mail/mailsync/files/patch-Makefile
deleted file mode 100644
index 9c43172f9eca..000000000000
--- a/mail/mailsync/files/patch-Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
---- Makefile.orig	Thu Oct 24 17:03:07 2002
-+++ Makefile	Wed Jul 14 04:02:48 2004
-@@ -1,32 +1,32 @@
- # compiling with g++-3 worked for me with the commented ## lines - tpo
- 
- # path to c-client headers
--C = /usr/include/c-client
-+C = ${PREFIX}/include/c-client
- #C = ../../libs/imap-2002.RC5/c-client/
- ##C = /usr/include/c-client -I/usr/include/g++-v3/
- 
- # path to c-client library
- # linking dynamically
--CCLIENTLIB = /usr/lib/libc-client.so
-+CCLIENTLIB = ${PREFIX}/lib/libc-client4.so
- # linkging statically
- #CCLIENTLIB = ../imap-2001a/c-client/c-client.a
- 
- # compiler
--CC = g++
-+CC = ${CXX}
- ##CC = g++-3.0
- 
- # flags for your compiler
--CFLAGS = -g  -O2 -Wall -I$(C)
-+CFLAGS += -Wall -fno-operator-names -I$(C)
- 
- # required libraries
--LDFLAGS = -lm -lssl -lgssapi_krb5
-+LDFLAGS = -lm -lssl
- # if your system requires pam to access crypt() you have to link pam in
- #LDFLAGS = -lm -lssl -lpam
- 
- default: mailsync
- 
- mailsync: mailsync.o $(CCLIENTLIB)
--	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
-+	${CC} $(CFLAGS) -o $@ $^ $(LDFLAGS)
- 
- clean:
- 	rm -f mailsync mailsync.o core
diff --git a/mail/mailsync/files/patch-mailsync.c b/mail/mailsync/files/patch-mailsync.c
deleted file mode 100644
index 1fa875fbd6f2..000000000000
--- a/mail/mailsync/files/patch-mailsync.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- mailsync.c.orig	Thu Nov  7 12:05:46 2002
-+++ mailsync.c	Wed Jul 14 03:52:22 2004
-@@ -20,6 +20,7 @@
- extern int errno;               // Just in case
- #include <sys/stat.h>           // Stat()
- 
-+#include <cassert>
- #include <string>
- #include <set>
- #include <map>
-@@ -30,8 +31,8 @@
- using std::vector;
- using std::make_pair;
- 
--#include "c-client.h"
--#include "flstring.h"
-+#include <c-client.h>
-+#include <flstring.h>
- #include "msgstring.c"
- 
- //------------------------------- Defines  -------------------------------
diff --git a/mail/mailsync/pkg-plist b/mail/mailsync/pkg-plist
index 71a70687dfc5..072018dd5497 100644
--- a/mail/mailsync/pkg-plist
+++ b/mail/mailsync/pkg-plist
@@ -1,5 +1,15 @@
 bin/mailsync
+%%PORTDOCS%%%%DOCSDIR%%/ABSTRACT
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/HACKING
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%EXAMPLESDIR%%/mailsync
-@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%%%DOCSDIR%%/THANKS
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/mail_open_close_flowchart.dia
+%%PORTDOCS%%%%DOCSDIR%%/mail_open_close_flowchart.svg
+%%PORTDOCS%%%%DOCSDIR%%/mail_open_close_flowchart2.svg
+%%PORTDOCS%%%%EXAMPLESDIR%%/mailsync
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%