- Update to 3.4.6

- Add several compile-time knobs:
  - WITHOUT_OPENSSL=yes   Disable the OpenSSL library support
  - 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
- Take maintainership

PR:		42746
Submitted by:	Sergei Kolobov <sergei@kolobov.com> (new maintainer)

3 files changed, 69 insertions, 16 deletions

diff --git a/mail/anubis/Makefile b/mail/anubis/Makefile
index 01319f2c45f5..8cd932164ca6 100644
--- a/mail/anubis/Makefile
+++ b/mail/anubis/Makefile
@@ -5,41 +5,92 @@
 #
 # $FreeBSD$
 #
+###########################################################################
+#
+# Following compile-time options are available:
+#
+# WITHOUT_OPENSSL=yes	Disable the OpenSSL library support
+# 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.4.2
+PORTVERSION=	3.4.6
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	sergei@kolobov.com
 
-LIB_DEPENDS=	gpgme:${PORTSDIR}/security/gpgme \
-		pcre:${PORTSDIR}/devel/pcre \
-		gnugetopt:${PORTSDIR}/devel/libgnugetopt
+LIB_DEPENDS=	gnugetopt:${PORTSDIR}/devel/libgnugetopt
 
 USE_REINPLACE=	yes
-USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -lgnugetopt"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib -lgnugetopt" \
+		MAKEINFO="makeinfo --no-split"
+
+# OpenSSL
+.if defined(WITHOUT_OPENSSL)
+CONFIGURE_ARGS+=	--without-openssl
+.else
+USE_OPENSSL=		yes
+.endif
+
+# GPGME
+.if defined(WITHOUT_GPGME)
+CONFIGURE_ARGS+=	--without-gpgme
+.else
+LIB_DEPENDS+=		gpgme:${PORTSDIR}/security/gpgme
+.endif
+
+# PCRE
+.if defined(WITH_PCRE)
+LIB_DEPENDS+=		pcre:${PORTSDIR}/devel/pcre
+CONFIGURE_ARGS+=	--with-pcre
+.endif
+
+# PAM
+.if defined(WITH_PAM)
+CONFIGURE_ARGS+=	--with-pam
+PLIST_SUB+=	PAM=""
+.else
+PLIST_SUB+=	PAM="@comment "
+.endif
+
+# TCP Wrappers
+.if defined(WITH_TCP_WRAPPERS)
+CONFIGURE_ARGS+=	--with-tcp-wrappers
+.endif
 
 MAN1=	anubis.1
-DOCS=	AUTHORS COPYING INSTALL NEWS README THANKS TODO
+DOCS=	AUTHORS INSTALL NEWS README THANKS TODO
+
+pre-everything::
+	@${CAT} ${PKGMESSAGE}
 
 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
 	@${MKDIR} ${EXAMPLESDIR}
-	${CP} -R ${WRKSRC}/examples/* ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/examples/*rc ${EXAMPLESDIR}
+.if defined(WITH_PAM)
+	@${MKDIR} ${EXAMPLESDIR}/pam
+	${INSTALL_DATA} ${WRKSRC}/examples/pam/* ${EXAMPLESDIR}/pam
+.endif
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/TUTORIAL ${DOCSDIR}
-.for file in ${DOCS} 
+.for file in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
 .endif
diff --git a/mail/anubis/distinfo b/mail/anubis/distinfo
index 172d34a52912..56ccbaaf152d 100644
--- a/mail/anubis/distinfo
+++ b/mail/anubis/distinfo
@@ -1 +1 @@
-MD5 (anubis-3.4.2.tar.gz) = e761ab843eeddaf4bbe5899312c93bf3
+MD5 (anubis-3.4.6.tar.gz) = 12e492c1b4287a93659530510db5b77b
diff --git a/mail/anubis/pkg-plist b/mail/anubis/pkg-plist
index 2ccaa5c3e16c..bb4cff781468 100644
--- a/mail/anubis/pkg-plist
+++ b/mail/anubis/pkg-plist
@@ -1,18 +1,20 @@
 sbin/anubis
 etc/rc.d/anubis.sh
+@unexec install-info --delete %D/info/anubis.info %D/info/dir
 info/anubis.info
 @exec install-info %D/info/anubis.info %D/info/dir
-@unexec install-info --delete %D/info/anubis.info %D/info/dir
 %%PORTDOCS%%share/doc/anubis/AUTHORS
-%%PORTDOCS%%share/doc/anubis/COPYING
 %%PORTDOCS%%share/doc/anubis/INSTALL
 %%PORTDOCS%%share/doc/anubis/NEWS
 %%PORTDOCS%%share/doc/anubis/README
 %%PORTDOCS%%share/doc/anubis/THANKS
 %%PORTDOCS%%share/doc/anubis/TODO
-%%PORTDOCS%%share/doc/anubis/TUTORIAL
 %%PORTDOCS%%@dirrm share/doc/anubis
 share/examples/anubis/1anubisrc
 share/examples/anubis/2anubisrc
 share/examples/anubis/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