Attachment 84186 Details for Bug 120140 – file.diff

[patch] file.diff

file.diff (text/plain), 6.69 KB, created by Felippe de Meirelles Motta on 2008-01-30 04:30:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Felippe de Meirelles Motta

Created: 2008-01-30 04:30:01 UTC

Size: 6.69 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/ncvs/ports/mail/up-imapproxy/Makefile,v
>retrieving revision 1.14
>diff -u -r1.14 Makefile
>--- Makefile	23 Nov 2006 17:24:43 -0000	1.14
>+++ Makefile	30 Jan 2008 04:28:00 -0000
>@@ -6,8 +6,7 @@
> #
> 
> PORTNAME=	imapproxy
>-PORTVERSION=	1.2.4
>-PORTREVISION=	1
>+PORTVERSION=	1.2.6
> CATEGORIES=	mail
> MASTER_SITES=	http://www.imapproxy.org/downloads/
> PKGNAMEPREFIX=	up-
>@@ -19,15 +18,23 @@
> GNU_CONFIGURE=	YES
> USE_RC_SUBR=	imapproxyd.sh
> 
>+DOCS=		COPYING ChangeLog README README.debian \
>+		README.known_issues README.ssl
>+SBINS=		in.imapproxyd pimpstat
>+
>+SUB_FILES=	pkg-message
>+
> post-patch:
> 	${REINPLACE_CMD} -e "s|-lc_r|${PTHREAD_LIBS}|g" \
> 		-e "s|-lpthread|${PTHREAD_LIBS}|g" ${WRKSRC}/configure
> 
>-post-install:
>-	${INSTALL_DATA} ${WRKSRC}/scripts/imapproxy.conf ${PREFIX}/etc/imapproxyd.conf.default
>-.if !exists(${PREFIX}/etc/imapproxyd.conf)
>-	${INSTALL_DATA} ${WRKSRC}/scripts/imapproxy.conf ${PREFIX}/etc/imapproxyd.conf
>+do-install:
>+.if !defined(NOPORTDOCS)
>+	@${MKDIR} ${DOCSDIR}
>+	@${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${DOCSDIR}
> .endif
>+	@${INSTALL_PROGRAM} ${SBINS:S,^,${WRKSRC}/bin/,} ${PREFIX}/sbin
>+	@${INSTALL_DATA} ${WRKSRC}/scripts/imapproxy.conf ${PREFIX}/etc/imapproxyd.conf.sample
> 	@${CAT} ${PKGMESSAGE}
> 
> .include <bsd.port.mk>
>Index: distinfo
>===================================================================
>RCS file: /home/ncvs/ports/mail/up-imapproxy/distinfo,v
>retrieving revision 1.5
>diff -u -r1.5 distinfo
>--- distinfo	22 Jan 2006 12:50:52 -0000	1.5
>+++ distinfo	30 Jan 2008 04:28:00 -0000
>@@ -1,3 +1,3 @@
>-MD5 (up-imapproxy-1.2.4.tar.gz) = ad68dd2258255ac6ef87165f518390e9
>-SHA256 (up-imapproxy-1.2.4.tar.gz) = f109a9a9e195154be8c790f458779529e00175e4824a3686980e8bc3533f1d86
>-SIZE (up-imapproxy-1.2.4.tar.gz) = 131331
>+MD5 (up-imapproxy-1.2.6.tar.gz) = decc6693a1497e5a1bc5704e5ed28c9b
>+SHA256 (up-imapproxy-1.2.6.tar.gz) = 2f5e841bc6c84799f890d24b984726efb7cce26c2ad95923864ddf0353fa3b01
>+SIZE (up-imapproxy-1.2.6.tar.gz) = 134745
>Index: pkg-message
>===================================================================
>RCS file: pkg-message
>diff -N pkg-message
>--- pkg-message	12 May 2004 12:47:18 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,9 +0,0 @@
>-****************************************************************************
>-
>-Please change the name of your mailserver in the imapproxyd.conf and setup
>-the correct ports.
>-
>-To run the imapproxyd from startup, add imapproxyd_enable="YES" in your
>-/etc/rc.conf.
>-
>-****************************************************************************
>Index: pkg-plist
>===================================================================
>RCS file: /home/ncvs/ports/mail/up-imapproxy/pkg-plist,v
>retrieving revision 1.4
>diff -u -r1.4 pkg-plist
>--- pkg-plist	28 Sep 2005 16:28:30 -0000	1.4
>+++ pkg-plist	30 Jan 2008 04:28:00 -0000
>@@ -1,4 +1,10 @@
>-@unexec if cmp -s %D/etc/imapproxyd.conf.default %D/etc/imapproxyd.conf; then rm -f %D/etc/imapproxyd.conf; fi
>-etc/imapproxyd.conf.default
>+etc/imapproxyd.conf.sample
> sbin/pimpstat
> sbin/in.imapproxyd
>+%%PORTDOCS%%%%DOCSDIR%%/COPYING
>+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
>+%%PORTDOCS%%%%DOCSDIR%%/README
>+%%PORTDOCS%%%%DOCSDIR%%/README.debian
>+%%PORTDOCS%%%%DOCSDIR%%/README.known_issues
>+%%PORTDOCS%%%%DOCSDIR%%/README.ssl
>+%%PORTDOCS%%@dirrm %%DOCSDIR%%
>Index: files/patch-Makefile.in
>===================================================================
>RCS file: files/patch-Makefile.in
>diff -N files/patch-Makefile.in
>--- files/patch-Makefile.in	12 May 2004 12:47:19 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,11 +0,0 @@
>---- Makefile.in.orig	Fri Nov  7 17:36:05 2003
>-+++ Makefile.in	Wed May 12 14:37:33 2004
>-@@ -24,7 +24,7 @@
>- rpm_prefix = @rpm_prefix@
>- 
>- CC = @CC@
>--CPPFLAGS = @CPPFLAGS@ 
>-+CPPFLAGS = @CPPFLAGS@ -DDEFAULT_CONFIG_FILE=\"$(prefix)/etc/imapproxyd.conf\"
>- LDFLAGS = @LDFLAGS@
>- LIBS = @LIBS@
>- DEFINES = @DEFINES@
>Index: files/patch-config.h.in
>===================================================================
>RCS file: files/patch-config.h.in
>diff -N files/patch-config.h.in
>--- files/patch-config.h.in	28 Sep 2005 16:28:31 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,13 +0,0 @@
>---- config.h.in.orig	Wed Sep 28 10:39:59 2005
>-+++ config.h.in	Wed Sep 28 10:40:09 2005
>-@@ -89,6 +89,10 @@
>- /* Define to empty if `const' does not conform to ANSI C. */
>- #undef const
>- 
>-+#if HAVE_SYS_TYPES_H
>-+#include <sys/types.h>
>-+#endif
>-+
>- #if HAVE_SYS_MMAN_H
>- #include <sys/mman.h>
>- #endif
>Index: files/patch-configure.in
>===================================================================
>RCS file: files/patch-configure.in
>diff -N files/patch-configure.in
>--- files/patch-configure.in	12 May 2004 12:47:19 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,26 +0,0 @@
>---- configure.in.orig	Wed May 12 14:17:03 2004
>-+++ configure.in	Wed May 12 14:17:15 2004
>-@@ -86,23 +86,6 @@
>-         LDFLAGS="${LDFLAGS} -L${with_libwrap}/lib"
>- fi
>- 
>--
>--dnl Check for libwrap
>--save_LIBS="$LIBS"
>--if test "$with_libwrap" != no; then
>--  AC_CHECK_LIB(nsl, yp_get_default_domain, , [
>--        with_libwrap=no
>--        AC_WARN([nsl library not found!!!  Wrappers will be disabled.])
>--  ])
>--  if test "$with_libwrap" != no; then
>--     AC_CHECK_LIB(wrap, request_init, , [
>--        LIBS="$save_LIBS"
>--        AC_WARN([Wrappers library not found!!!  Wrappers will be disabled.])
>--     ])
>--  fi
>--fi
>--
>--
>- dnl Check for crypto library
>- AC_CHECK_LIB(crypto, EVP_DigestInit, ,
>- 	AC_ERROR([Can't compile without OpenSSL crypto library!!!])
>Index: files/patch-src_imapcommon.c
>===================================================================
>RCS file: files/patch-src_imapcommon.c
>diff -N files/patch-src_imapcommon.c
>--- files/patch-src_imapcommon.c	23 Nov 2006 17:24:44 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,13 +0,0 @@
>-
>-$FreeBSD: ports/mail/up-imapproxy/files/patch-src_imapcommon.c,v 1.1 2006/11/23 17:24:44 pav Exp $
>-
>---- src/imapcommon.c.orig
>-+++ src/imapcommon.c
>-@@ -136,6 +136,7 @@
>- 
>- #include <openssl/evp.h>
>- #include <openssl/err.h>
>-+#include <openssl/md5.h>
>- 
>- #include <pthread.h>
>- #include <sys/types.h>
>Index: files/pkg-message.in
>===================================================================
>RCS file: files/pkg-message.in
>diff -N files/pkg-message.in
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/pkg-message.in	30 Jan 2008 04:28:00 -0000
>@@ -0,0 +1,9 @@
>+****************************************************************************
>+
>+Please change the name of your mailserver in the imapproxyd.conf and setup
>+the correct ports.
>+
>+To run the imapproxyd from startup, add imapproxyd_enable="YES" in your
>+/etc/rc.conf.
>+
>+****************************************************************************

Actions: View | Diff

Attachments on bug 120140: 84186