- Replace security/gnutls with security/gnutls3 and update to 3.2.15

- Bump PORTREVISION on all ports that depend on security/gnutls and
  adjust all ports that depend on security/gnutls3
- Update mail/anubis to version 4.2 which supports gnutls 3.x
- Update mail/libvmime to a development snapshot (recommended by upstream
  developers)

PR:		191274
Exp-run by:	antoine
Approved by:	portmgr (antoine)

6 files changed, 24 insertions, 73 deletions

diff --git a/mail/anubis/Makefile b/mail/anubis/Makefile
index 27053a3a6ce7..89be871616cf 100644
--- a/mail/anubis/Makefile
+++ b/mail/anubis/Makefile
@@ -2,16 +2,15 @@
 # $FreeBSD$
 
 PORTNAME=	anubis
-PORTVERSION=	4.1.1
-PORTREVISION=	10
+PORTVERSION=	4.2
 CATEGORIES=	mail
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	GNU
 
 MAINTAINER=	jhale@FreeBSD.org
 COMMENT=	Outgoing SMTP mail processor
 
 LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 OPTIONS_DEFINE=	NLS EXAMPLES GUILE GPGME GNUTLS GSASL \
 		GDBM MYSQL PGSQL PCRE PAM SOCKS LIBWRAP
@@ -23,11 +22,12 @@ GSASL_DESC=	GSASL support (required for databases)
 GDBM_DESC=	GDBM backend
 SOCKS_DESC=	SOCKS proxy support
 
-USES=		makeinfo pkgconfig shebangfix
+USES=		charsetfix makeinfo pkgconfig shebangfix
+CHARSETFIX_MAKEFILEIN=	gnulib.mk
 SHEBANG_FILES=	contrib/msg2smtp.pl
 USE_RC_SUBR=	anubis
 USE_AUTOTOOLS=	aclocal autoheader autoconf automake
-ACLOCAL_ARGS=	-I m4 -I am
+ACLOCAL_ARGS=	-I m4 -I gint -I am
 AUTOMAKE_ARGS=	--force --add-missing
 
 INFO=		anubis
diff --git a/mail/anubis/distinfo b/mail/anubis/distinfo
index 5a21c9d0aa2b..b4d82e30637c 100644
--- a/mail/anubis/distinfo
+++ b/mail/anubis/distinfo
@@ -1,2 +1,2 @@
-SHA256 (anubis-4.1.1.tar.gz) = 93ef7a2d8bc3b50cd2e228cfe27e296ee14accadf8533bad9b2beee88a96e8fa
-SIZE (anubis-4.1.1.tar.gz) = 1104272
+SHA256 (anubis-4.2.tar.gz) = 5f3a2dd77c5ef52a593428c5b6d0042c1746eb8262c31bde9ee67455f8aad6d6
+SIZE (anubis-4.2.tar.gz) = 1623768
diff --git a/mail/anubis/files/patch-config.h.in b/mail/anubis/files/patch-config.h.in
deleted file mode 100644
index 246471ac1b43..000000000000
--- a/mail/anubis/files/patch-config.h.in
+++ /dev/null
@@ -1,23 +0,0 @@
---- ./config.h.in.orig	2008-12-19 13:30:37.000000000 -0500
-+++ ./config.h.in	2011-02-09 20:52:34.000000000 -0500
-@@ -180,9 +180,6 @@
- /* Define to 1 if you have the `pam' library (-lpam). */
- #undef HAVE_LIBPAM
- 
--/* Define to 1 if you have the `pam_misc' library (-lpam_misc). */
--#undef HAVE_LIBPAM_MISC
--
- /* Define to 1 if you have the `pcre' library (-lpcre). */
- #undef HAVE_LIBPCRE
- 
-@@ -252,8 +249,8 @@
- /* Define to 1 if you have the <security/pam_appl.h> header file. */
- #undef HAVE_SECURITY_PAM_APPL_H
- 
--/* Define to 1 if you have the <security/pam_misc.h> header file. */
--#undef HAVE_SECURITY_PAM_MISC_H
-+/* Define to 1 if you have the <security/openpam.h> header file. */
-+#undef HAVE_SECURITY_OPENPAM_H
- 
- /* Define to 1 if you have the `setegid' function. */
- #undef HAVE_SETEGID
diff --git a/mail/anubis/files/patch-configure.ac b/mail/anubis/files/patch-configure.ac
index 0c40e5fe4e4d..8e3b651a964c 100644
--- a/mail/anubis/files/patch-configure.ac
+++ b/mail/anubis/files/patch-configure.ac
@@ -1,27 +1,14 @@
 --- ./configure.ac.orig	2008-12-16 11:21:54.000000000 -0500
 +++ ./configure.ac	2011-02-09 20:52:34.000000000 -0500
-@@ -77,7 +77,6 @@
+@@ -78,7 +78,6 @@
  ])
  
  AC_CHECK_LIB(socket, socket)
 -AC_CHECK_LIB(nsl, gethostbyaddr)
  
- AC_SUBST(INCLUDES)
+ AC_SUBST(ADD_INCLUDES)
  case $build in
-@@ -143,10 +142,10 @@
- else
-  AC_PATH_PROG(GPG, gpg)
-  findgpgmedir() { :
--  if test -f "$1/include/gpgme.h"; then
-+  if test -f "$1/include/gpgme/gpgme.h"; then
-    gpgmedir=1
-    INCLUDES="$INCLUDES -I$1/include"
--   AC_MSG_CHECKING(for $1/include/gpgme.h)
-+   AC_MSG_CHECKING(for $1/include/gpgme/gpgme.h)
-    AC_MSG_RESULT([yes])
-    return 0
-   fi
-@@ -158,7 +157,7 @@
+@@ -137,7 +136,7 @@
   if test $gpgmedir; then
    AC_DEFINE(HAVE_GPGME_H, 1, [Define to 1 if HAVE_GPGME_H is requested.])
   else
@@ -30,15 +17,7 @@
   fi
   ANUBIS_GPGFILES='$(GPGFILES)'
   M4_DEFS="$M4_DEFS -DWITH_GPG"
-@@ -189,6 +188,7 @@
- WITH_MYSQL=no
- WITH_POSTGRES=no
- WITH_GDBM=no
-+WITH_GSASL=no
- 
- dnl Use option --with-gsasl to compile GSASL library support.
- MU_CHECK_GSASL(0.2.3, [
-@@ -199,11 +199,21 @@
+@@ -179,11 +178,21 @@
      ANUBIS_BIN_ADM='$(adm_bin_programs)'
      M4_DEFS="$M4_DEFS -DWITH_GSASL"
  
@@ -61,17 +40,7 @@
  
      AC_ARG_WITH(mysql,
  	AC_HELP_STRING([--with-mysql],
-@@ -277,7 +287,8 @@
- if test $with_gnutls = yes; then
-   AC_CHECK_HEADERS(gnutls/gnutls.h)
-   if test $ac_cv_header_gnutls_gnutls_h != no; then
--    AM_PATH_LIBGNUTLS("1.0.0",
-+    PKG_CHECK_MODULES([LIBGNUTLS],
-+                      [gnutls >= 1.0.0],
-                       [M4_DEFS="$M4_DEFS -DWITH_SSL -DWITH_GNUTLS"
-                       AC_DEFINE(USE_GNUTLS, 1,
-                                 [Define to 1 if USE_GNUTLS is requested.])],
-@@ -327,8 +338,8 @@
+@@ -285,8 +294,8 @@
  	[with_pam=no])
  if test "$with_pam" = "yes"; then
   AC_CHECK_LIB(pam, main,, with_pam=no)
@@ -82,7 +51,7 @@
  fi
  if test "$with_pam" = "yes"; then
   AC_MSG_RESULT([Enabling PAM support...])
-@@ -342,7 +353,6 @@
+@@ -300,7 +309,6 @@
  	[with_tcp_wrappers=no])
  if test "$with_tcp_wrappers" = "yes"; then
   AC_CHECK_LIB(wrap, main,, with_tcp_wrappers=no)
diff --git a/mail/anubis/files/patch-src__headers.h b/mail/anubis/files/patch-src__headers.h
index 3e835d0ce897..107cd74d50a5 100644
--- a/mail/anubis/files/patch-src__headers.h
+++ b/mail/anubis/files/patch-src__headers.h
@@ -1,9 +1,9 @@
 --- ./src/headers.h.orig	2008-12-16 11:21:54.000000000 -0500
 +++ ./src/headers.h	2011-02-09 20:52:34.000000000 -0500
-@@ -51,11 +51,11 @@
- # else
- #  error POSIX Regular Expressions are required!
- # endif	/* HAVE_REGEX_H and HAVE_REGCOMP */
+@@ -43,11 +43,11 @@
+ #   define HAVE_PCRE
+ #  endif /* HAVE_PCRE_H or HAVE_PCRE_PCRE_H */
+ # endif	/* HAVE_LIBPCRE */
 -# if defined(HAVE_LIBPAM) && defined(HAVE_LIBPAM_MISC)
 -#  if defined(HAVE_SECURITY_PAM_APPL_H) && defined(HAVE_SECURITY_PAM_MISC_H)
 +# if defined(HAVE_LIBPAM)
@@ -16,7 +16,7 @@
  # if defined(HAVE_LIBWRAP) && defined(HAVE_TCPD_H)
  #  define USE_LIBWRAP
  # endif	/* HAVE_LIBWRAP and HAVE_TCPD_H */
-@@ -121,7 +121,7 @@
+@@ -111,7 +111,7 @@
  
  #ifdef HAVE_PAM
  # include <security/pam_appl.h>
diff --git a/mail/anubis/pkg-plist b/mail/anubis/pkg-plist
index f6487e0d8ef4..9017250f9db0 100644
--- a/mail/anubis/pkg-plist
+++ b/mail/anubis/pkg-plist
@@ -9,7 +9,10 @@ man/man1/anubis.1.gz
 %%GUILE%%share/anubis/rot-13.scm
 %%NLS%%share/locale/da/LC_MESSAGES/anubis.mo
 %%NLS%%share/locale/de/LC_MESSAGES/anubis.mo
+%%NLS%%share/locale/es/LC_MESSAGES/anubis.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/anubis.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/anubis.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/anubis.mo
 %%NLS%%share/locale/id/LC_MESSAGES/anubis.mo
 %%NLS%%share/locale/it/LC_MESSAGES/anubis.mo
 %%NLS%%share/locale/ms/LC_MESSAGES/anubis.mo
@@ -18,8 +21,10 @@ man/man1/anubis.1.gz
 %%NLS%%share/locale/pl/LC_MESSAGES/anubis.mo
 %%NLS%%share/locale/ro/LC_MESSAGES/anubis.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/anubis.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/anubis.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/anubis.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/anubis.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/anubis.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/anubis.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/anubis.mo
 @dirrm share/anubis