- Update mailsync from 4.4.4 -> 5.2.1

- Lots of changes and bugfixes - see NEWS file for full details
- In brief:
* Simulate option
* completely reengineered:
  - really object oriented
  - grouped sources together that belong together
  - simplified a lot of things

6 files changed, 110 insertions, 69 deletions

diff --git a/mail/mailsync/Makefile b/mail/mailsync/Makefile
index 47bb3d2873a..c57e2c08462 100644
--- a/mail/mailsync/Makefile
+++ b/mail/mailsync/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2004/10/03 00:12:53 tv Exp $
+# $NetBSD: Makefile,v 1.16 2004/11/16 18:56:46 adrianp Exp $
 #
 
-DISTNAME=	mailsync_4.4.4-1
-PKGNAME=	mailsync-4.4.4
-PKGREVISION=	1
+DISTNAME=	mailsync_5.2.1.orig
+PKGNAME=	mailsync-5.2.1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mailsync/}
 
@@ -11,27 +10,39 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://mailsync.sourceforge.net/
 COMMENT=	Mailsync is a way of synchronizing a collection of mailboxes
 
-WRKSRC=		${WRKDIR}/${PKGBASE}
+WRKSRC=		${WRKDIR}/${PKGNAME}
 USE_BUILDLINK3=	yes
 USE_GNU_TOOLS+=	make
 USE_LANGUAGES+=	c c++
-ALL_TARGET=	default
+GNU_CONFIGURE=	yes
 
-.include "../../mk/bsd.prefs.mk"
+CONFIGURE_ARGS+=	--with-openssl=${BUILDLINK_PREFIX.openssl}/include
+CONFIGURE_ARGS+=	--with-c-client=${BUILDLINK_DIR}/include/c-client
+CONFIGURE_ARGS+=	--without-krb5
+
+SUBST_CLASSES+=		conf
+SUBST_STAGE.conf=	pre-configure
+SUBST_FILES.conf=	configure doc/examples/mailsync doc/mailsync.1
+SUBST_SED.conf=		-e "s|@BUILDLINK_DIR@|${BUILDLINK_DIR}|g" \
+			-e "s|@SSLBASE@|${BUILDLINK_PREFIX.openssl}|g" \
+			-e "s|/usr/share|${PREFIX}/share|g"
+SUBST_MESSAGE.conf=	"Fixing configure script."
+
+DOCS=	COPYING NEWS README THANKS TODO doc/ABSTRACT doc/HACKING
 
-.if ${OPSYS} == "Darwin" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "NetBSD"
-CFLAGS+=	-fno-operator-names
-.endif
+.include "../../mk/bsd.prefs.mk"
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/mailsync ${PREFIX}/bin
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mailsync
-	${INSTALL_DATA} ${WRKSRC}/examples/mailsync				\
-		${PREFIX}/share/examples/mailsync/dot.mailsync
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mailsync
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/mailsync
-	${INSTALL_DATA} ${WRKSRC}/WHATSNEW ${PREFIX}/share/doc/mailsync
-	${INSTALL_MAN} ${WRKSRC}/mailsync.1 ${PREFIX}/man/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/src/mailsync ${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/doc/examples/mailsync \
+		${PREFIX}/share/examples/mailsync/dot.mailsync
+	${INSTALL_MAN} ${WRKSRC}/doc/mailsync.1 ${PREFIX}/man/man1
+.	for d in ${DOCS}
+		${INSTALL_DATA} ${WRKSRC}/${d} ${PREFIX}/share/doc/mailsync
+.	endfor
+.	undef d
 
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mail/imap-uw/buildlink3.mk"
diff --git a/mail/mailsync/PLIST b/mail/mailsync/PLIST
index bbd6b2c5ece..9f3d9618c8c 100644
--- a/mail/mailsync/PLIST
+++ b/mail/mailsync/PLIST
@@ -1,8 +1,13 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/18 11:28:24 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/11/16 18:56:46 adrianp Exp $
 bin/mailsync
 man/man1/mailsync.1
+share/doc/mailsync/ABSTRACT
+share/doc/mailsync/COPYING
+share/doc/mailsync/HACKING
+share/doc/mailsync/NEWS
 share/doc/mailsync/README
-share/doc/mailsync/WHATSNEW
+share/doc/mailsync/THANKS
+share/doc/mailsync/TODO
 share/examples/mailsync/dot.mailsync
 @dirrm share/examples/mailsync
 @dirrm share/doc/mailsync
diff --git a/mail/mailsync/distinfo b/mail/mailsync/distinfo
index 7bcdb0e765b..cd4dce17bfc 100644
--- a/mail/mailsync/distinfo
+++ b/mail/mailsync/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.4 2004/04/22 23:41:27 ben Exp $
+$NetBSD: distinfo,v 1.5 2004/11/16 18:56:46 adrianp Exp $
 
-SHA1 (mailsync_4.4.4-1.tar.gz) = 0e45f1136c7aae78730317c0dd74734a0df2a873
-Size (mailsync_4.4.4-1.tar.gz) = 27408 bytes
-SHA1 (patch-aa) = b637925e91cca6b8675144be4e3f012ea7c219d0
-SHA1 (patch-ab) = 47530d92d127a3f45a6158d34b6f25dfb7d60192
+SHA1 (mailsync_5.2.1.orig.tar.gz) = ce32305c5d2d659ecc41d81036a78a346e97ebe0
+Size (mailsync_5.2.1.orig.tar.gz) = 139967 bytes
+SHA1 (patch-ac) = 7805db2f99a0c06c19b30cec3bf3367cf445f717
diff --git a/mail/mailsync/patches/patch-aa b/mail/mailsync/patches/patch-aa
deleted file mode 100644
index 79960f423c9..00000000000
--- a/mail/mailsync/patches/patch-aa
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2004/04/22 23:41:27 ben Exp $
-
---- Makefile.orig	Thu Oct 24 07:03:07 2002
-+++ Makefile
-@@ -1,13 +1,13 @@
- # 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-client.so
- # linkging statically
- #CCLIENTLIB = ../imap-2001a/c-client/c-client.a
- 
-@@ -16,10 +16,11 @@ CC = g++
- ##CC = g++-3.0
- 
- # flags for your compiler
--CFLAGS = -g  -O2 -Wall -I$(C)
-+CFLAGS += -I$(C)
- 
- # required libraries
--LDFLAGS = -lm -lssl -lgssapi_krb5
-+LDFLAGS += -lm -lssl 
-+# -lgssapi_krb5
- # if your system requires pam to access crypt() you have to link pam in
- #LDFLAGS = -lm -lssl -lpam
- 
diff --git a/mail/mailsync/patches/patch-ab b/mail/mailsync/patches/patch-ab
deleted file mode 100644
index 921118e56e9..00000000000
--- a/mail/mailsync/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2004/04/22 23:41:27 ben Exp $
-
---- mailsync.c.orig	Thu Apr 15 23:36:22 2004
-+++ mailsync.c
-@@ -17,6 +17,7 @@
- #include <ctype.h>
- #include <stdio.h>
- #include <errno.h>
-+#include <assert.h>
- extern int errno;               // Just in case
- #include <sys/stat.h>           // Stat()
- 
diff --git a/mail/mailsync/patches/patch-ac b/mail/mailsync/patches/patch-ac
new file mode 100644
index 00000000000..14a2879cf63
--- /dev/null
+++ b/mail/mailsync/patches/patch-ac
@@ -0,0 +1,72 @@
+$NetBSD: patch-ac,v 1.1 2004/11/16 18:56:46 adrianp Exp $
+
+--- configure.orig	2004-06-30 09:04:12.000000000 +0100
++++ configure	2004-11-16 15:55:22.000000000 +0000
+@@ -5025,7 +5025,7 @@
+    if test "$withval" = "no" ; then
+     OPENSSLLOCATIONS=""
+    else
+-    test "$withval" = "yes" || OPENSSLLOCATIONS="$withval,${OPENSSLLOCATIONS}"
++    test "$withval" = "yes" || OPENSSLLOCATIONS="@SSLBASE@/lib @SSLBASE@/include @SSLBASE@/include/openssl"
+    fi
+ 
+ 
+@@ -5035,7 +5035,7 @@
+  else
+   echo "$as_me:$LINENO: checking for libssl" >&5
+ echo $ECHO_N "checking for libssl... $ECHO_C" >&6
+-  for p in `eval "echo {${OPENSSLLOCATIONS}}{/lib,/lib64}"` ; do
++  for p in ${OPENSSLLOCATIONS} ; do
+    if test -r "${p}/libssl.a" -o -r "${p}/libssl.so" ; then
+     OPENSSL_LDFLAGS="-L${p}"
+     echo "$as_me:$LINENO: result: found in ${p}" >&5
+@@ -5190,7 +5190,7 @@
+    else
+     echo "$as_me:$LINENO: checking for openssl/ssl.h" >&5
+ echo $ECHO_N "checking for openssl/ssl.h... $ECHO_C" >&6
+-    for p in `eval "echo {${OPENSSLLOCATIONS}}{/include,}"` ; do
++    for p in ${OPENSSLLOCATIONS} ; do
+      if test -r "${p}/openssl/ssl.h" ; then
+       OPENSSL_INCLUDES="-I${p}"
+       echo "$as_me:$LINENO: result: found in ${p}" >&5
+@@ -5462,7 +5462,7 @@
+    if test "$withval" = "no" ; then
+     CCLIENTLOCATIONS=""
+    else
+-    test "$withval" = "yes" || CCLIENTLOCATIONS="$withval,${CCLIENTLOCATIONS}"
++    test "$withval" = "yes" || CCLIENTLOCATIONS="@BUILDLINK_DIR@/lib @BUILDLINK_DIR@/include/c-client"
+    fi
+ 
+ 
+@@ -5477,7 +5477,7 @@
+ 
+          echo "$as_me:$LINENO: checking for c-client.h" >&5
+ echo $ECHO_N "checking for c-client.h... $ECHO_C" >&6
+-  for p in `eval "echo {${CCLIENTLOCATIONS}}{,/c-client,/lib/c-client,/include/c-client,/include,/include/imap}"` ; do
++  for p in ${CCLIENTLOCATIONS} ; do
+    if test -r "${p}/c-client.h" -a -r "${p}/linkage.h" -a -r "${p}/linkage.c" ; then
+     CCLIENT_INCLUDES="-I${p}"
+     CCLIENT_LINKAGE_H="${p}/linkage.h"
+@@ -5501,11 +5501,11 @@
+ 
+             echo "$as_me:$LINENO: checking for c-client library" >&5
+ echo $ECHO_N "checking for c-client library... $ECHO_C" >&6
+-   for l in `eval "echo {${CCLIENTLOCATIONS}}{,/c-client,/lib/c-client,/lib,/lib64}/{libc-client,libc-client4,c-client}{${SOP}}"` ; do
++   for l in ${CCLIENTLOCATIONS} ; do
+     if test -r "$l" ; then
+      echo "$as_me:$LINENO: result: found ${l}" >&5
+ echo "${ECHO_T}found ${l}" >&6
+-     CCLIENT_LIBS="$l"
++     CCLIENT_LIBS="-L $l -lc-client"
+      break
+     fi
+    done
+@@ -5533,7 +5533,7 @@
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+   $EGREP "auth_gss" >/dev/null 2>&1; then
+ 
+-      need_krb=yes
++      need_krb=no
+       echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+