Update mail/up-imapproxy to 1.2.6

Remove unnecessary patchs
Moved pkg-plist

PR:		120140
Submitted by:	lippemail@gmail.com

8 files changed, 36 insertions, 73 deletions

diff --git a/mail/up-imapproxy/Makefile b/mail/up-imapproxy/Makefile
index b99a1b8cf80a..afad6d46e386 100644
--- a/mail/up-imapproxy/Makefile
+++ b/mail/up-imapproxy/Makefile
@@ -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-
@@ -18,16 +17,25 @@ COMMENT=	A caching IMAP proxy server
 
 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
+
+CONFIGURE_ARGS+=	--with-openssl=${OPENSSLBASE}
 
 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>
diff --git a/mail/up-imapproxy/distinfo b/mail/up-imapproxy/distinfo
index d43119a5ee9a..e76831a1ce6c 100644
--- a/mail/up-imapproxy/distinfo
+++ b/mail/up-imapproxy/distinfo
@@ -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
diff --git a/mail/up-imapproxy/files/patch-Makefile.in b/mail/up-imapproxy/files/patch-Makefile.in
deleted file mode 100644
index 596ad1774a18..000000000000
--- a/mail/up-imapproxy/files/patch-Makefile.in
+++ /dev/null
@@ -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@
diff --git a/mail/up-imapproxy/files/patch-config.h.in b/mail/up-imapproxy/files/patch-config.h.in
deleted file mode 100644
index 1520d0bb8b97..000000000000
--- a/mail/up-imapproxy/files/patch-config.h.in
+++ /dev/null
@@ -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
diff --git a/mail/up-imapproxy/files/patch-configure.in b/mail/up-imapproxy/files/patch-configure.in
deleted file mode 100644
index 277aa286cdf7..000000000000
--- a/mail/up-imapproxy/files/patch-configure.in
+++ /dev/null
@@ -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!!!])
diff --git a/mail/up-imapproxy/files/patch-src_imapcommon.c b/mail/up-imapproxy/files/patch-src_imapcommon.c
deleted file mode 100644
index 0dab2e8332d6..000000000000
--- a/mail/up-imapproxy/files/patch-src_imapcommon.c
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- 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>
diff --git a/mail/up-imapproxy/files/patch-ssl b/mail/up-imapproxy/files/patch-ssl
index 4851b132a984..b6a26e45679a 100644
--- a/mail/up-imapproxy/files/patch-ssl
+++ b/mail/up-imapproxy/files/patch-ssl
@@ -19,3 +19,14 @@
  
  /* Define to 1 if you have the <memory.h> header file. */
  #undef HAVE_MEMORY_H
+--- src/threads.c	2008-01-28 14:15:08.000000000 +0100
++++ src/threads.c	2008-02-25 13:50:40.000000000 +0100
+@@ -51,7 +51,7 @@
+ 
+ #define OPENSSL_THREAD_DEFINES
+ #include <openssl/opensslconf.h>
+-#if defined(OPENSSL_THREADS)
++#if defined(THREADS)
+ 
+ 
+ #include <stdio.h>
diff --git a/mail/up-imapproxy/pkg-plist b/mail/up-imapproxy/pkg-plist
index 94a603414c46..4d0bac495525 100644
--- a/mail/up-imapproxy/pkg-plist
+++ b/mail/up-imapproxy/pkg-plist
@@ -1,4 +1,11 @@
 @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%%