diff options
| -rw-r--r-- | mail/mailsync/Makefile | 16 | ||||
| -rw-r--r-- | mail/mailsync/distinfo | 9 | ||||
| -rw-r--r-- | mail/mailsync/patches/patch-aa | 31 | ||||
| -rw-r--r-- | mail/mailsync/patches/patch-ab | 12 |
4 files changed, 41 insertions, 27 deletions
diff --git a/mail/mailsync/Makefile b/mail/mailsync/Makefile index 021e14036dd..ea1ae4b94d8 100644 --- a/mail/mailsync/Makefile +++ b/mail/mailsync/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.12 2004/04/15 23:24:04 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2004/04/22 23:41:27 ben Exp $ # -DISTNAME= mailsync_4.3-2 -PKGNAME= mailsync-4.3.2 -PKGREVISION= 1 +DISTNAME= mailsync_4.4.4-1 +PKGNAME= mailsync-4.4.4 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mailsync/} @@ -11,16 +10,15 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://mailsync.sourceforge.net/ COMMENT= Mailsync is a way of synchronizing a collection of mailboxes -DEPENDS+= imap-uw-[0-9]*:../../mail/imap-uw - -WRKSRC= ${WRKDIR}/mailsync-4.3 +WRKSRC= ${WRKDIR}/${PKGBASE} +USE_BUILDLINK3= yes USE_GNU_TOOLS+= make USE_GCC_SHLIB= yes ALL_TARGET= default .include "../../mk/bsd.prefs.mk" -.if ${OPSYS} == "Darwin" +.if ${OPSYS} == "Darwin" || ${OPSYS} == "FreeBSD" CFLAGS+= -fno-operator-names .endif @@ -34,4 +32,6 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/WHATSNEW ${PREFIX}/share/doc/mailsync ${INSTALL_MAN} ${WRKSRC}/mailsync.1 ${PREFIX}/man/man1 +.include "../../security/openssl/buildlink3.mk" +.include "../../mail/imap-uw/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/mailsync/distinfo b/mail/mailsync/distinfo index 4a11b95d927..7bcdb0e765b 100644 --- a/mail/mailsync/distinfo +++ b/mail/mailsync/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.3 2002/12/09 00:19:46 rh Exp $ +$NetBSD: distinfo,v 1.4 2004/04/22 23:41:27 ben Exp $ -SHA1 (mailsync_4.3-2.tar.gz) = 239f58aeb98718de347c1b53682fb6add156b7e3 -Size (mailsync_4.3-2.tar.gz) = 20257 bytes -SHA1 (patch-aa) = 2e18288d7549211ac0e77ee091fc24074d84d38f +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 diff --git a/mail/mailsync/patches/patch-aa b/mail/mailsync/patches/patch-aa index 25232f9e733..79960f423c9 100644 --- a/mail/mailsync/patches/patch-aa +++ b/mail/mailsync/patches/patch-aa @@ -1,33 +1,34 @@ -$NetBSD: patch-aa,v 1.2 2002/12/09 00:19:47 rh Exp $ +$NetBSD: patch-aa,v 1.3 2004/04/22 23:41:27 ben Exp $ ---- Makefile.orig Tue Apr 16 04:26:35 2002 +--- Makefile.orig Thu Oct 24 07:03:07 2002 +++ Makefile -@@ -1,7 +1,7 @@ +@@ -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 -@@ -15,16 +15,16 @@ CC = g++ + # 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 += -Wall -I$(C) +-CFLAGS = -g -O2 -Wall -I$(C) ++CFLAGS += -I$(C) # required libraries --LDFLAGS = -lm -lssl -+LDFLAGS+= -lm -lssl -lcrypto -lc-client +-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 - default: mailsync - --mailsync: mailsync.o $(CCLIENTLIB) -+mailsync: mailsync.o - $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) - - clean: diff --git a/mail/mailsync/patches/patch-ab b/mail/mailsync/patches/patch-ab new file mode 100644 index 00000000000..921118e56e9 --- /dev/null +++ b/mail/mailsync/patches/patch-ab @@ -0,0 +1,12 @@ +$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() + |