Attachment #51529 for bug #78241

View | Details | Raw Unified | Return to bug 78241
Collapse All | Expand All




# Date created:		03 Feb 2003
# Whom:			Maxim Tulyuk <mt@primats.org.ua>
#
# $FreeBSD$
#

PORTNAME=	mailsync
PORTVERSION=	5.2.1
PORTREVISION=	1
CATEGORIES=	mail
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	${PORTNAME}
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}-${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

pre-patch:
	@${REINPLACE_CMD} -e 's|^aclocal|${ACLOCAL}|; \
		s|^autoconf|${AUTOCONF}|; s|automake|${AUTOMAKE}|; \
		s|^autoheader|${AUTOHEADER}|; s|678|9|' ${WRKSRC}/autogen.sh

do-configure:
	cd ${WRKSRC} && ${SH} autogen.sh --exec-prefix=${PREFIX}

MAN1=		mailsync.1
	@${REINPLACE_CMD} -e 's|/usr|${PREFIX}|g' \
		${WRKSRC}/examples/mailsync \
		${WRKSRC}/mailsync.1

do-install:
	${INSTALL_SCRIPT} ${WRKSRC}/src/mailsync ${PREFIX}/bin
	${INSTALL_MAN} ${WRKSRC}/doc/mailsync.1 ${PREFIX}/man/man1
.if !defined(NOPORTDOCS)
	${MKDIR} ${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}/doc/examples/mailsync ${EXAMPLESDIR}

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)mailsync/distinfo (-2 / +2 lines)
1	MD5 (mailsync_4.4.4-1.tar.gz) = d1a947725d03a002ee5c01185189e230	1	MD5 (mailsync_5.2.1.orig.tar.gz) = 67c9f68575756b76581cf9be74608aa5
2	SIZE (mailsync_4.4.4-1.tar.gz) = 27408	2	SIZE (mailsync_5.2.1.orig.tar.gz) = 139967




--- 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




--- 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  -------------------------------

Lines 1-5 Link Here

(-)mailsync/pkg-plist (-2 / +12 lines)
1	bin/mailsync	1	bin/mailsync
		2	%%PORTDOCS%%%%DOCSDIR%%/ABSTRACT
		3	%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
		4	%%PORTDOCS%%%%DOCSDIR%%/COPYING
		5	%%PORTDOCS%%%%DOCSDIR%%/HACKING
		6	%%PORTDOCS%%%%DOCSDIR%%/NEWS
2	%%PORTDOCS%%%%DOCSDIR%%/README	7	%%PORTDOCS%%%%DOCSDIR%%/README
3	%%EXAMPLESDIR%%/mailsync	8	%%PORTDOCS%%%%DOCSDIR%%/THANKS
4	@dirrm %%EXAMPLESDIR%%	9	%%PORTDOCS%%%%DOCSDIR%%/TODO
		10	%%PORTDOCS%%%%DOCSDIR%%/mail_open_close_flowchart.dia
		11	%%PORTDOCS%%%%DOCSDIR%%/mail_open_close_flowchart.svg
		12	%%PORTDOCS%%%%DOCSDIR%%/mail_open_close_flowchart2.svg
		13	%%PORTDOCS%%%%EXAMPLESDIR%%/mailsync
		14	%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
5	%%PORTDOCS%%@dirrm %%DOCSDIR%%	15	%%PORTDOCS%%@dirrm %%DOCSDIR%%

Return to bug 78241

Lines 2-45 Link Here

(-)mailsync/Makefile (-16 / +30 lines)
2	# Date created: 03 Feb 2003	2	# Date created: 03 Feb 2003
3	# Whom: Maxim Tulyuk <mt@primats.org.ua>	3	# Whom: Maxim Tulyuk <mt@primats.org.ua>
4	#	4	#
5	# $FreeBSD: ports/mail/mailsync/Makefile,v 1.6 2004/07/14 15:46:55 pav Exp $	5	# $FreeBSD$
6	#	6	#
7		7
8	PORTNAME= mailsync	8	PORTNAME= mailsync
9	PORTVERSION= 4.4.4	9	PORTVERSION= 5.2.1
10	PORTREVISION= 1
11	CATEGORIES= mail	10	CATEGORIES= mail
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
13	MASTER_SITE_SUBDIR= ${PORTNAME}	12	MASTER_SITE_SUBDIR= ${PORTNAME}
14	DISTNAME= ${PORTNAME}_${PORTVERSION}-1	13	DISTNAME= ${PORTNAME}_${PORTVERSION}.orig
15		14
16	MAINTAINER= mt@primats.org.ua	15	MAINTAINER= mt@primats.org.ua
17	COMMENT= Mailsync is a way of keeping a collection of mailboxes synchronized	16	COMMENT= Mailsync is a way of keeping a collection of mailboxes synchronized
18		17
19	LIB_DEPENDS= c-client4.8:${PORTSDIR}/mail/cclient	18	LIB_DEPENDS= c-client4.8:${PORTSDIR}/mail/cclient
20		19
21	WRKSRC= ${WRKDIR}/${PORTNAME}	20	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
22
23	USE_GMAKE= yes	21	USE_GMAKE= yes
		22	USE_OPENSSL= yes
		23	USE_GCC= 2.95+
		24	#CONFIGURE_ARGS= CC=gcc --exec-prefix=${PREFIX}
		25	#CONFIGURE_ARGS+= --exec-prefix=${PREFIX} \
		26	# --includedir="${PREFIX}/include ${PREFIX}/include/c-client"
		27	#CONFIGURE_ENV+= CPPFLAGS="-I${PREFIX}/include/c-client"
		28
		29	USE_AUTOMAKE_VER= 19
		30	USE_AUTOCONF_VER= 259
		31	USE_AUTOHEADER_VER= 259
24	USE_REINPLACE= yes	32	USE_REINPLACE= yes
25		33
26	ALL_TARGET= default	34	pre-patch:
		35	@${REINPLACE_CMD} -e 's\|^aclocal\|${ACLOCAL}\|; \
		36	s\|^autoconf\|${AUTOCONF}\|; s\|automake\|${AUTOMAKE}\|; \
		37	s\|^autoheader\|${AUTOHEADER}\|; s\|678\|9\|' ${WRKSRC}/autogen.sh
27		38
28	MAN1= mailsync.1	39	do-configure:
		40	cd ${WRKSRC} && ${SH} autogen.sh --exec-prefix=${PREFIX}
29		41
30	post-patch:	42	MAN1= mailsync.1
31	@${REINPLACE_CMD} -e 's\|/usr\|${PREFIX}\|g' \
32	${WRKSRC}/examples/mailsync \
33	${WRKSRC}/mailsync.1
34		43
35	do-install:	44	do-install:
36	${INSTALL_SCRIPT} ${WRKSRC}/mailsync ${PREFIX}/bin	45	${INSTALL_SCRIPT} ${WRKSRC}/src/mailsync ${PREFIX}/bin
37	${INSTALL_MAN} ${WRKSRC}/mailsync.1 ${PREFIX}/man/man1	46	${INSTALL_MAN} ${WRKSRC}/doc/mailsync.1 ${PREFIX}/man/man1
38	.if !defined(NOPORTDOCS)	47	.if !defined(NOPORTDOCS)
39	${MKDIR} ${DOCSDIR}	48	${MKDIR} ${DOCSDIR}
40	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}	49	cd ${WRKSRC} && ${INSTALL_DATA} AUTHORS COPYING NEWS README \
		50	THANKS TODO ${DOCSDIR}
		51	cd ${WRKSRC}/doc && ${INSTALL_DATA} ABSTRACT HACKING \
		52	mail_open_close_flowchart.dia \
		53	mail_open_close_flowchart.svg \
		54	mail_open_close_flowchart2.svg ${DOCSDIR}
41	.endif	55	.endif
42	${MKDIR} ${EXAMPLESDIR}	56	${MKDIR} ${EXAMPLESDIR}
43	${INSTALL_DATA} ${WRKSRC}/examples/mailsync ${EXAMPLESDIR}	57	${INSTALL_DATA} ${WRKSRC}/doc/examples/mailsync ${EXAMPLESDIR}
44		58
45	.include <bsd.port.mk>	59	.include <bsd.port.mk>

Lines 1-41 Link Here

(-)mailsync/files/patch-Makefile (-41 lines)
1	--- Makefile.orig Thu Oct 24 17:03:07 2002
2	+++ Makefile Wed Jul 14 04:02:48 2004
3	@@ -1,32 +1,32 @@
4	# compiling with g++-3 worked for me with the commented ## lines - tpo
5
6	# path to c-client headers
7	-C = /usr/include/c-client
8	+C = ${PREFIX}/include/c-client
9	#C = ../../libs/imap-2002.RC5/c-client/
10	##C = /usr/include/c-client -I/usr/include/g++-v3/
11
12	# path to c-client library
13	# linking dynamically
14	-CCLIENTLIB = /usr/lib/libc-client.so
15	+CCLIENTLIB = ${PREFIX}/lib/libc-client4.so
16	# linkging statically
17	#CCLIENTLIB = ../imap-2001a/c-client/c-client.a
18
19	# compiler
20	-CC = g++
21	+CC = ${CXX}
22	##CC = g++-3.0
23
24	# flags for your compiler
25	-CFLAGS = -g -O2 -Wall -I$(C)
26	+CFLAGS += -Wall -fno-operator-names -I$(C)
27
28	# required libraries
29	-LDFLAGS = -lm -lssl -lgssapi_krb5
30	+LDFLAGS = -lm -lssl
31	# if your system requires pam to access crypt() you have to link pam in
32	#LDFLAGS = -lm -lssl -lpam
33
34	default: mailsync
35
36	mailsync: mailsync.o $(CCLIENTLIB)
37	- $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
38	+ ${CC} $(CFLAGS) -o $@ $^ $(LDFLAGS)
39
40	clean:
41	rm -f mailsync mailsync.o core

Lines 1-21 Link Here

(-)mailsync/files/patch-mailsync.c (-21 lines)
1	--- mailsync.c.orig Thu Nov 7 12:05:46 2002
2	+++ mailsync.c Wed Jul 14 03:52:22 2004
3	@@ -20,6 +20,7 @@
4	extern int errno; // Just in case
5	#include <sys/stat.h> // Stat()
6
7	+#include <cassert>
8	#include <string>
9	#include <set>
10	#include <map>
11	@@ -30,8 +31,8 @@
12	using std::vector;
13	using std::make_pair;
14
15	-#include "c-client.h"
16	-#include "flstring.h"
17	+#include <c-client.h>
18	+#include <flstring.h>
19	#include "msgstring.c"
20
21	//------------------------------- Defines -------------------------------