[MAINTAINER] Update mail/anubis to 3.6.2

PR:		ports/46669
Submitted by:	Sergei Kolobov <sergei@kolobov.com>

3 files changed, 37 insertions, 37 deletions

diff --git a/mail/anubis/Makefile b/mail/anubis/Makefile
index 152113dfd564..530d8d97f27c 100644
--- a/mail/anubis/Makefile
+++ b/mail/anubis/Makefile
@@ -9,16 +9,16 @@
 #
 # Following compile-time options are available:
 #
-# WITHOUT_OPENSSL=yes	Disable the OpenSSL library support
+# WITH_GNUTLS=yes	Enable GnuTLS API instead of default OpenSSL API
+# WITHOUT_OPENSSL=yes	Disable the OpenSSL support; unless WITH_GNUTLS
+#			is specified, this will disables TLS/SSL suport
 # WITHOUT_GPGME=yes	Disable the GnuPG (GPGME library) support
 # WITH_PCRE=yes		Enable the PCRE library support
-# WITH_PAM=yes		Enable the Pluggable Authentication Modules support
-# WITH_TCP_WRAPPERS=yes Enable the libwrap (TCP wrappers) support
 #
 ###########################################################################
 
 PORTNAME=	anubis
-PORTVERSION=	3.6.0
+PORTVERSION=	3.6.2
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -29,14 +29,20 @@ LIB_DEPENDS=	gnugetopt:${PORTSDIR}/devel/libgnugetopt
 
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -lgnugetopt" \
 		MAKEINFO="makeinfo --no-split"
 
-# OpenSSL
-.if !defined(WITHOUT_OPENSSL)
+# Select TLS/SSL API: either OpenSSL (default), GnuTLS, or none
+.if defined(WITH_GNUTLS)
+USE_GNUTLS=		yes
+LIB_DEPENDS+=		gnutls:${PORTSDIR}/security/gnutls
+.elif !defined(WITHOUT_OPENSSL)
 USE_OPENSSL=		yes
 CONFIGURE_ARGS+=	--with-openssl
+.else
+CONFIGURE_ARGS+=	--without-gnutls
 .endif
 
 # GPGME
@@ -53,65 +59,59 @@ CONFIGURE_ARGS+=	--with-pcre
 .endif
 
 # PAM
-.if defined(WITH_PAM)
+.if exists(/usr/lib/libpam.so)
+USE_PAM=		yes
 CONFIGURE_ARGS+=	--with-pam
-PLIST_SUB+=	PAM=""
+PLIST_SUB+=		PAM=""
 .else
-PLIST_SUB+=	PAM="@comment "
+PLIST_SUB+=		PAM="@comment "
 .endif
 
 # TCP Wrappers
-.if defined(WITH_TCP_WRAPPERS)
+.if exists(/usr/include/tcpd.h)
+USE_TCP_WRAPPERS=	yes
 CONFIGURE_ARGS+=	--with-tcp-wrappers
 .endif
 
 MAN1=	anubis.1
 DOCS=	AUTHORS INSTALL NEWS README THANKS TODO
 
-pre-fetch:
+pre-configure:
 	@${ECHO_MSG} ""
-.if defined(WITHOUT_OPENSSL)
-	@${ECHO_MSG} "Building Anubis without OpenSSL support"
+.if defined(USE_OPENSSL)
+	@${ECHO_MSG} "Using OpenSSL as TLS/SSL API"
+.elif defined(USE_GNUTLS)
+	@${ECHO_MSG} "Using GnuTLS as TLS/SSL API"
 .else
-	@${ECHO_MSG} "Building Anubis with OpenSSL support (default)"
-	@${ECHO_MSG} "-- You could define WITHOUT_OPENSSL to disable OpenSSL support"
+	@${ECHO_MSG} "Disabling TLS/SSL support"
 .endif
 .if defined(WITHOUT_GPGME)
-	@${ECHO_MSG} "Building Anubis without GnuPG (GPGME library) support"
-.else
-	@${ECHO_MSG} "Building Anubis with GnuPG (GPGME library) support (default)"
-	@${ECHO_MSG} "-- You could define WITHOUT_GPGME to disable GPGME support"
+	@${ECHO_MSG} "Disabling GnuPG (GPGME) support"
 .endif
 .if defined(WITH_PCRE)
-	@${ECHO_MSG} "Building Anubis with PCRE library support"
+	@${ECHO_MSG} "Enabling PCRE support"
 .else
-	@${ECHO_MSG} "You could define WITH_PCRE to build Anubis with PCRE support"
+	@${ECHO_MSG} "You could define WITH_PCRE to enable PCRE support"
 .endif
-.if defined(WITH_PAM)
-	@${ECHO_MSG} "Building Anubis with PAM library support"
-.else
-	@${ECHO_MSG} "You could define WITH_PAM to build Anubis with PAM support"
+.if defined(USE_PAM)
+	@${ECHO_MSG} "Enabling PAM support"
 .endif
-.if defined(WITH_TCP_WRAPPERS)
-	@${ECHO_MSG} "Building Anubis with TCP wrappers support"
-.else
-	@${ECHO_MSG} "You could define WITH_TCP_WRAPPERS to build Anubis with TCP wrappers support"
+.if defined(USE_TCP_WRAPPERS)
+	@${ECHO_MSG} "Enabling TCP wrappers support"
 .endif
 	@${ECHO_MSG} ""
+	@${RM} -f ${WRKSRC}/doc/anubis.info*
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|/etc|${PREFIX}/etc|g" ${WRKSRC}/src/headers.h
 	@${SED} -e "s|%%PREFIX%%|${PREFIX}|g" ${FILESDIR}/anubis.sh > \
 		${WRKSRC}/anubis.sh
 
-pre-configure:
-	@${RM} -f ${WRKSRC}/doc/anubis.info*
-
 post-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/anubis.sh ${PREFIX}/etc/rc.d
+	${INSTALL_SCRIPT} ${WRKSRC}/anubis.sh ${PREFIX}/etc/rc.d/anubis.sh.sample
 	@${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/*rc ${EXAMPLESDIR}
-.if defined(WITH_PAM)
+.if defined(USE_PAM)
 	@${MKDIR} ${EXAMPLESDIR}/pam
 	${INSTALL_DATA} ${WRKSRC}/examples/pam/* ${EXAMPLESDIR}/pam
 .endif
diff --git a/mail/anubis/distinfo b/mail/anubis/distinfo
index 02a331df565b..9bee01b68777 100644
--- a/mail/anubis/distinfo
+++ b/mail/anubis/distinfo
@@ -1 +1 @@
-MD5 (anubis-3.6.0.tar.gz) = 048382b1b52b1fb7a7762614fe75290b
+MD5 (anubis-3.6.2.tar.gz) = 9e705e38cafe4a57025a6ad89fd73226
diff --git a/mail/anubis/pkg-plist b/mail/anubis/pkg-plist
index dd760dbba07f..86e19a9c3b99 100644
--- a/mail/anubis/pkg-plist
+++ b/mail/anubis/pkg-plist
@@ -1,6 +1,6 @@
 @comment $FreeBSD$
 sbin/anubis
-etc/rc.d/anubis.sh
+etc/rc.d/anubis.sh.sample
 @unexec install-info --delete %D/info/anubis.info %D/info/dir
 info/anubis.info
 @exec install-info %D/info/anubis.info %D/info/dir
@@ -13,10 +13,10 @@ info/anubis.info
 %%PORTDOCS%%@dirrm share/doc/anubis
 share/examples/anubis/1anubisrc
 share/examples/anubis/2anubisrc
-share/examples/anubis/redhat-defaultrc
 %%PAM%%share/examples/anubis/pam/anubis
 %%PAM%%share/examples/anubis/pam/anubis.allow
 %%PAM%%share/examples/anubis/pam/anubis.deny
 %%PAM%%@dirrm share/examples/anubis/pam
 @dirrm share/examples/anubis
 share/locale/fr/LC_MESSAGES/anubis.mo
+share/locale/tr/LC_MESSAGES/anubis.mo