Attachment 51529 Details for Bug 78241 – file.diff

[patch] file.diff

file.diff (text/plain), 5.65 KB, created by Maxim Tulyuk on 2005-03-01 13:00:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Maxim Tulyuk

Created: 2005-03-01 13:00:43 UTC

Size: 5.65 KB

patch

obsolete

>diff -uNr /usr/ports/mail/mailsync/Makefile mailsync/Makefile
>--- /usr/ports/mail/mailsync/Makefile	Wed Jul 14 18:46:55 2004
>+++ mailsync/Makefile	Tue Mar  1 14:56:26 2005
>@@ -2,44 +2,58 @@
> # Date created:		03 Feb 2003
> # Whom:			Maxim Tulyuk <mt@primats.org.ua>
> #
>-# $FreeBSD: ports/mail/mailsync/Makefile,v 1.6 2004/07/14 15:46:55 pav Exp $
>+# $FreeBSD$
> #
> 
> 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
>+do-configure:
>+	cd ${WRKSRC} && ${SH} autogen.sh --exec-prefix=${PREFIX}
> 
>-post-patch:
>-	@${REINPLACE_CMD} -e 's|/usr|${PREFIX}|g' \
>-		${WRKSRC}/examples/mailsync \
>-		${WRKSRC}/mailsync.1
>+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 -uNr /usr/ports/mail/mailsync/distinfo mailsync/distinfo
>--- /usr/ports/mail/mailsync/distinfo	Tue Mar 23 11:37:21 2004
>+++ mailsync/distinfo	Tue Nov 16 14:35:54 2004
>@@ -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 -uNr /usr/ports/mail/mailsync/files/patch-Makefile mailsync/files/patch-Makefile
>--- /usr/ports/mail/mailsync/files/patch-Makefile	Wed Jul 14 18:46:55 2004
>+++ mailsync/files/patch-Makefile	Thu Jan  1 03:00:00 1970
>@@ -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 -uNr /usr/ports/mail/mailsync/files/patch-mailsync.c mailsync/files/patch-mailsync.c
>--- /usr/ports/mail/mailsync/files/patch-mailsync.c	Wed Jul 14 18:46:55 2004
>+++ mailsync/files/patch-mailsync.c	Thu Jan  1 03:00:00 1970
>@@ -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 -uNr /usr/ports/mail/mailsync/pkg-plist mailsync/pkg-plist
>--- /usr/ports/mail/mailsync/pkg-plist	Wed Nov 24 02:36:29 2004
>+++ mailsync/pkg-plist	Tue Mar  1 14:54:33 2005
>@@ -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%%

Actions: View | Diff

Attachments on bug 78241: 51529